From cac7e10cad3d8ba6bcc49710a72a5e9b604aa026 Mon Sep 17 00:00:00 2001 From: Yang Le Date: Fri, 9 Aug 2024 20:50:14 +0800 Subject: [PATCH] sync with upstream --- IMPLS.yml | 1 + Makefile.impls | 4 ++-- impls/{cc => cpp.2}/Dockerfile | 8 +++++--- impls/{cc => cpp.2}/Makefile | 0 impls/{cc => cpp.2}/core.cc | 0 impls/{cc => cpp.2}/core.hh | 0 impls/{cc => cpp.2}/env.hh | 0 impls/{cc => cpp.2}/printer.cc | 0 impls/{cc => cpp.2}/printer.hh | 0 impls/{cc => cpp.2}/reader.cc | 0 impls/{cc => cpp.2}/reader.hh | 0 impls/{cc => cpp.2}/run | 0 impls/{cc => cpp.2}/step0_repl.cc | 0 impls/{cc => cpp.2}/step1_read_print.cc | 0 impls/{cc => cpp.2}/step2_eval.cc | 0 impls/{cc => cpp.2}/step3_env.cc | 0 impls/{cc => cpp.2}/step4_if_fn_do.cc | 0 impls/{cc => cpp.2}/step5_tco.cc | 0 impls/{cc => cpp.2}/step6_file.cc | 0 impls/{cc => cpp.2}/step7_quote.cc | 0 impls/{cc => cpp.2}/step8_macros.cc | 0 impls/{cc => cpp.2}/step9_try.cc | 0 impls/{cc => cpp.2}/stepA_mal.cc | 0 impls/{cc => cpp.2}/types.hh | 0 24 files changed, 8 insertions(+), 5 deletions(-) rename impls/{cc => cpp.2}/Dockerfile (73%) rename impls/{cc => cpp.2}/Makefile (100%) rename impls/{cc => cpp.2}/core.cc (100%) rename impls/{cc => cpp.2}/core.hh (100%) rename impls/{cc => cpp.2}/env.hh (100%) rename impls/{cc => cpp.2}/printer.cc (100%) rename impls/{cc => cpp.2}/printer.hh (100%) rename impls/{cc => cpp.2}/reader.cc (100%) rename impls/{cc => cpp.2}/reader.hh (100%) rename impls/{cc => cpp.2}/run (100%) rename impls/{cc => cpp.2}/step0_repl.cc (100%) rename impls/{cc => cpp.2}/step1_read_print.cc (100%) rename impls/{cc => cpp.2}/step2_eval.cc (100%) rename impls/{cc => cpp.2}/step3_env.cc (100%) rename impls/{cc => cpp.2}/step4_if_fn_do.cc (100%) rename impls/{cc => cpp.2}/step5_tco.cc (100%) rename impls/{cc => cpp.2}/step6_file.cc (100%) rename impls/{cc => cpp.2}/step7_quote.cc (100%) rename impls/{cc => cpp.2}/step8_macros.cc (100%) rename impls/{cc => cpp.2}/step9_try.cc (100%) rename impls/{cc => cpp.2}/stepA_mal.cc (100%) rename impls/{cc => cpp.2}/types.hh (100%) diff --git a/IMPLS.yml b/IMPLS.yml index 1421b0bba2..f6f84a26d3 100644 --- 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 index 3267383715..78f6ce3a9d 100644 --- 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 b/impls/cpp.2/Dockerfile similarity index 73% rename from impls/cc/Dockerfile rename to impls/cpp.2/Dockerfile index 81b14becec..db1cfc7122 100644 --- a/impls/cc/Dockerfile +++ b/impls/cpp.2/Dockerfile @@ -1,6 +1,7 @@ -FROM ubuntu:focal +FROM ubuntu:24.04 MAINTAINER Le Yang - +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 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 b/impls/cpp.2/Makefile similarity index 100% rename from impls/cc/Makefile rename to impls/cpp.2/Makefile diff --git a/impls/cc/core.cc b/impls/cpp.2/core.cc similarity index 100% rename from impls/cc/core.cc rename to impls/cpp.2/core.cc diff --git a/impls/cc/core.hh b/impls/cpp.2/core.hh similarity index 100% rename from impls/cc/core.hh rename to impls/cpp.2/core.hh diff --git a/impls/cc/env.hh b/impls/cpp.2/env.hh similarity index 100% rename from impls/cc/env.hh rename to impls/cpp.2/env.hh diff --git a/impls/cc/printer.cc b/impls/cpp.2/printer.cc similarity index 100% rename from impls/cc/printer.cc rename to impls/cpp.2/printer.cc diff --git a/impls/cc/printer.hh b/impls/cpp.2/printer.hh similarity index 100% rename from impls/cc/printer.hh rename to impls/cpp.2/printer.hh diff --git a/impls/cc/reader.cc b/impls/cpp.2/reader.cc similarity index 100% rename from impls/cc/reader.cc rename to impls/cpp.2/reader.cc diff --git a/impls/cc/reader.hh b/impls/cpp.2/reader.hh similarity index 100% rename from impls/cc/reader.hh rename to impls/cpp.2/reader.hh diff --git a/impls/cc/run b/impls/cpp.2/run similarity index 100% rename from impls/cc/run rename to impls/cpp.2/run diff --git a/impls/cc/step0_repl.cc b/impls/cpp.2/step0_repl.cc similarity index 100% rename from impls/cc/step0_repl.cc rename to impls/cpp.2/step0_repl.cc diff --git a/impls/cc/step1_read_print.cc b/impls/cpp.2/step1_read_print.cc similarity index 100% rename from impls/cc/step1_read_print.cc rename to impls/cpp.2/step1_read_print.cc diff --git a/impls/cc/step2_eval.cc b/impls/cpp.2/step2_eval.cc similarity index 100% rename from impls/cc/step2_eval.cc rename to impls/cpp.2/step2_eval.cc diff --git a/impls/cc/step3_env.cc b/impls/cpp.2/step3_env.cc similarity index 100% rename from impls/cc/step3_env.cc rename to impls/cpp.2/step3_env.cc diff --git a/impls/cc/step4_if_fn_do.cc b/impls/cpp.2/step4_if_fn_do.cc similarity index 100% rename from impls/cc/step4_if_fn_do.cc rename to impls/cpp.2/step4_if_fn_do.cc diff --git a/impls/cc/step5_tco.cc b/impls/cpp.2/step5_tco.cc similarity index 100% rename from impls/cc/step5_tco.cc rename to impls/cpp.2/step5_tco.cc diff --git a/impls/cc/step6_file.cc b/impls/cpp.2/step6_file.cc similarity index 100% rename from impls/cc/step6_file.cc rename to impls/cpp.2/step6_file.cc diff --git a/impls/cc/step7_quote.cc b/impls/cpp.2/step7_quote.cc similarity index 100% rename from impls/cc/step7_quote.cc rename to impls/cpp.2/step7_quote.cc diff --git a/impls/cc/step8_macros.cc b/impls/cpp.2/step8_macros.cc similarity index 100% rename from impls/cc/step8_macros.cc rename to impls/cpp.2/step8_macros.cc diff --git a/impls/cc/step9_try.cc b/impls/cpp.2/step9_try.cc similarity index 100% rename from impls/cc/step9_try.cc rename to impls/cpp.2/step9_try.cc diff --git a/impls/cc/stepA_mal.cc b/impls/cpp.2/stepA_mal.cc similarity index 100% rename from impls/cc/stepA_mal.cc rename to impls/cpp.2/stepA_mal.cc diff --git a/impls/cc/types.hh b/impls/cpp.2/types.hh similarity index 100% rename from impls/cc/types.hh rename to impls/cpp.2/types.hh