sync with upstream

kanaka · Aug 9, 2024 · cac7e10 · cac7e10
1 parent 5d69e71
commit cac7e10
Show file tree

Hide file tree

Showing 24 changed files with 8 additions and 5 deletions.
diff --git a/IMPLS.yml b/IMPLS.yml
@@ -9,6 +9,7 @@ IMPL:
   - {IMPL: c}
   - {IMPL: c.2}
   - {IMPL: cpp}
+  - {IMPL: cpp.2}
   - {IMPL: coffee}
   - {IMPL: cs}
   - {IMPL: chuck, NO_SELF_HOST_PERF: 1}  # perf OOM

diff --git a/Makefile.impls b/Makefile.impls
@@ -34,7 +34,7 @@ wasm_MODE = wasmtime
 # Implementation specific settings
 #
 
-IMPLS = ada ada.2 awk bash basic bbc-basic c c.2 cc chuck clojure coffee common-lisp cpp crystal cs d dart \
+IMPLS = ada ada.2 awk bash basic bbc-basic c c.2 chuck clojure coffee common-lisp cpp cpp.2 crystal cs d dart \
 	elisp elixir elm erlang es6 factor fantom fennel forth fsharp go groovy gnu-smalltalk \
 	guile haskell haxe hy io janet java java-truffle js jq julia kotlin latex3 livescript logo lua make mal \
 	matlab miniMAL nasm nim objc objpascal ocaml perl perl6 php picolisp pike plpgsql \
@@ -112,12 +112,12 @@ basic_STEP_TO_PROG =         $(basic_STEP_TO_PROG_$(basic_MODE))
 bbc-basic_STEP_TO_PROG =     impls/bbc-basic/$($(1)).bas
 c_STEP_TO_PROG =             impls/c/$($(1))
 c.2_STEP_TO_PROG =           impls/c.2/$($(1))
-cc_STEP_TO_PROG =            impls/cc/$($(1))
 chuck_STEP_TO_PROG =         impls/chuck/$($(1)).ck
 clojure_STEP_TO_PROG =       $(clojure_STEP_TO_PROG_$(clojure_MODE))
 coffee_STEP_TO_PROG =        impls/coffee/$($(1)).coffee
 common-lisp_STEP_TO_PROG =   impls/common-lisp/$($(1))
 cpp_STEP_TO_PROG =           impls/cpp/$($(1))
+cpp.2_STEP_TO_PROG =         impls/cpp.2/$($(1))
 crystal_STEP_TO_PROG =       impls/crystal/$($(1))
 cs_STEP_TO_PROG =            impls/cs/$($(1)).exe
 d_STEP_TO_PROG =             impls/d/$($(1))

diff --git a/impls/cc/Dockerfile → impls/cpp.2/Dockerfile b/impls/cc/Dockerfile → impls/cpp.2/Dockerfile
@@ -1,6 +1,7 @@
-FROM ubuntu:focal
+FROM ubuntu:24.04
 MAINTAINER Le Yang <qtxzh0125@gmail.com>
-
+LABEL org.opencontainers.image.source=https://github.com/kanaka/mal
+LABEL org.opencontainers.image.description="mal test container: cpp.2"
 ##########################################################
 # General requirements for testing or common across many
 # implementations
@@ -9,7 +10,8 @@ MAINTAINER Le Yang <qtxzh0125@gmail.com>
 RUN apt-get -y update
 
 # Required for running tests
-RUN apt-get -y install make python
+RUN apt-get -y install make python3
+RUN ln -sf /usr/bin/python3 /usr/bin/python
 
 # Some typical implementation and test requirements
 RUN apt-get -y install curl libreadline-dev libedit-dev

diff --git a/impls/cc/Makefile → impls/cpp.2/Makefile b/impls/cc/Makefile → impls/cpp.2/Makefile
diff --git a/impls/cc/core.cc → impls/cpp.2/core.cc b/impls/cc/core.cc → impls/cpp.2/core.cc
diff --git a/impls/cc/core.hh → impls/cpp.2/core.hh b/impls/cc/core.hh → impls/cpp.2/core.hh
diff --git a/impls/cc/env.hh → impls/cpp.2/env.hh b/impls/cc/env.hh → impls/cpp.2/env.hh
diff --git a/impls/cc/printer.cc → impls/cpp.2/printer.cc b/impls/cc/printer.cc → impls/cpp.2/printer.cc
diff --git a/impls/cc/printer.hh → impls/cpp.2/printer.hh b/impls/cc/printer.hh → impls/cpp.2/printer.hh
diff --git a/impls/cc/reader.cc → impls/cpp.2/reader.cc b/impls/cc/reader.cc → impls/cpp.2/reader.cc
diff --git a/impls/cc/reader.hh → impls/cpp.2/reader.hh b/impls/cc/reader.hh → impls/cpp.2/reader.hh
diff --git a/impls/cc/run → impls/cpp.2/run b/impls/cc/run → impls/cpp.2/run
diff --git a/impls/cc/step0_repl.cc → impls/cpp.2/step0_repl.cc b/impls/cc/step0_repl.cc → impls/cpp.2/step0_repl.cc
diff --git a/impls/cc/step1_read_print.cc → impls/cpp.2/step1_read_print.cc b/impls/cc/step1_read_print.cc → impls/cpp.2/step1_read_print.cc
diff --git a/impls/cc/step2_eval.cc → impls/cpp.2/step2_eval.cc b/impls/cc/step2_eval.cc → impls/cpp.2/step2_eval.cc
diff --git a/impls/cc/step3_env.cc → impls/cpp.2/step3_env.cc b/impls/cc/step3_env.cc → impls/cpp.2/step3_env.cc
diff --git a/impls/cc/step4_if_fn_do.cc → impls/cpp.2/step4_if_fn_do.cc b/impls/cc/step4_if_fn_do.cc → impls/cpp.2/step4_if_fn_do.cc
diff --git a/impls/cc/step5_tco.cc → impls/cpp.2/step5_tco.cc b/impls/cc/step5_tco.cc → impls/cpp.2/step5_tco.cc
diff --git a/impls/cc/step6_file.cc → impls/cpp.2/step6_file.cc b/impls/cc/step6_file.cc → impls/cpp.2/step6_file.cc
diff --git a/impls/cc/step7_quote.cc → impls/cpp.2/step7_quote.cc b/impls/cc/step7_quote.cc → impls/cpp.2/step7_quote.cc
diff --git a/impls/cc/step8_macros.cc → impls/cpp.2/step8_macros.cc b/impls/cc/step8_macros.cc → impls/cpp.2/step8_macros.cc
diff --git a/impls/cc/step9_try.cc → impls/cpp.2/step9_try.cc b/impls/cc/step9_try.cc → impls/cpp.2/step9_try.cc
diff --git a/impls/cc/stepA_mal.cc → impls/cpp.2/stepA_mal.cc b/impls/cc/stepA_mal.cc → impls/cpp.2/stepA_mal.cc
diff --git a/impls/cc/types.hh → impls/cpp.2/types.hh b/impls/cc/types.hh → impls/cpp.2/types.hh