IMPLS = ada ada.2 awk bash basic bbc-basic c chuck clojure coffee common-lisp cpp crystal cs d dart \
elisp elixir elm erlang es6 factor fantom forth fsharp go groovy gnu-smalltalk \
- guile haskell haxe hy io java js julia kotlin livescript logo lua make mal \
+ guile haskell haxe hy io java js jq julia kotlin livescript logo lua make mal \
matlab miniMAL nasm nim objc objpascal ocaml perl perl6 php picolisp pike plpgsql \
plsql powershell ps python python.2 r racket rexx rpython ruby rust scala scheme skew \
- swift swift3 swift4 swift5 tcl ts vala vb vhdl vimscript wasm wren yorick
+ swift swift3 swift4 swift5 tcl ts vala vb vhdl vimscript wasm wren yorick xslt zig
EXTENSION = .mal
# Implementation specific utility functions
#
-basic_STEP_TO_PROG_cbm = basic/$($(1)).bas
-basic_STEP_TO_PROG_qbasic = basic/$($(1))
+basic_STEP_TO_PROG_cbm = impls/basic/$($(1)).bas
+basic_STEP_TO_PROG_qbasic = impls/basic/$($(1))
-clojure_STEP_TO_PROG_clj = clojure/target/$($(1)).jar
-clojure_STEP_TO_PROG_cljs = clojure/src/mal/$($(1)).cljc
+clojure_STEP_TO_PROG_clj = impls/clojure/target/$($(1)).jar
+clojure_STEP_TO_PROG_cljs = impls/clojure/src/mal/$($(1)).cljc
-haxe_STEP_TO_PROG_neko = haxe/$($(1)).n
-haxe_STEP_TO_PROG_python = haxe/$($(1)).py
-haxe_STEP_TO_PROG_cpp = haxe/cpp/$($(1))
-haxe_STEP_TO_PROG_js = haxe/$($(1)).js
+haxe_STEP_TO_PROG_neko = impls/haxe/$($(1)).n
+haxe_STEP_TO_PROG_python = impls/haxe/$($(1)).py
+haxe_STEP_TO_PROG_cpp = impls/haxe/cpp/$($(1))
+haxe_STEP_TO_PROG_js = impls/haxe/$($(1)).js
-scheme_STEP_TO_PROG_chibi = scheme/$($(1)).scm
-scheme_STEP_TO_PROG_kawa = scheme/out/$($(1)).class
-scheme_STEP_TO_PROG_gauche = scheme/$($(1)).scm
-scheme_STEP_TO_PROG_chicken = scheme/$($(1))
-scheme_STEP_TO_PROG_sagittarius = scheme/$($(1)).scm
-scheme_STEP_TO_PROG_cyclone = scheme/$($(1))
-scheme_STEP_TO_PROG_foment = scheme/$($(1)).scm
+scheme_STEP_TO_PROG_chibi = impls/scheme/$($(1)).scm
+scheme_STEP_TO_PROG_kawa = impls/scheme/out/$($(1)).class
+scheme_STEP_TO_PROG_gauche = impls/scheme/$($(1)).scm
+scheme_STEP_TO_PROG_chicken = impls/scheme/$($(1))
+scheme_STEP_TO_PROG_sagittarius = impls/scheme/$($(1)).scm
+scheme_STEP_TO_PROG_cyclone = impls/scheme/$($(1))
+scheme_STEP_TO_PROG_foment = impls/scheme/$($(1)).scm
# Map of step (e.g. "step8") to executable file for that step
ada_STEP_TO_PROG = ada/$($(1))
io_STEP_TO_PROG = io/$($(1)).io
java_STEP_TO_PROG = java/target/classes/mal/$($(1)).class
js_STEP_TO_PROG = js/$($(1)).js
+jq_STEP_PROG = jq/$($(1)).jq
julia_STEP_TO_PROG = julia/$($(1)).jl
kotlin_STEP_TO_PROG = kotlin/$($(1)).jar
livescript_STEP_TO_PROG = livescript/$($(1)).js
wasm_STEP_TO_PROG = wasm/$($(1)).$(if $(filter lucet,$(wasm_MODE)),so,wasm)
wren_STEP_TO_PROG = wren/$($(1)).wren
yorick_STEP_TO_PROG = yorick/$($(1)).i
-
+xslt_STEP_TO_PROG = xslt/$($(1))
+zig_STEP_TO_PROG = zig/$($(1))
#
# General settings and utility functions
$(filter-out $(if $(filter $(1),$(step5_EXCLUDES)),step5,),\
$(regress_$(2)))\
,$(2)),\
- $(1)/tests/$($(s))$(EXTENSION) tests/$($(s))$(EXTENSION))))
+ impls/$(1)/tests/$($(s))$(EXTENSION) impls/tests/$($(s))$(EXTENSION))))
# DOCKERIZE utility functions
lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))
docker run \
-it --rm -u $(shell id -u) \
-v $(dir $(abspath $(lastword $(MAKEFILE_LIST)))):/mal \
- -w /mal/$(1) \
+ -w /mal/impls/$(1) \
$(if $(strip $($(mode))),-e $(mode)=$($(mode)),) \
$(if $(filter factor,$(1)),-e FACTOR_ROOTS=$(FACTOR_ROOTS),) \
$(call impl_to_image,$(1)) \
$(MAKE) $(if $(strip $($(mode))),$(mode)=$($(mode)),) \
,\
- $(MAKE) $(if $(strip $($(mode))),$(mode)=$($(mode)),) -C $(impl))))
+ $(MAKE) $(if $(strip $($(mode))),$(mode)=$($(mode)),) -C impls/$(impl))))
# Takes impl and step args. Optional env vars and dockerize args
# Returns a command prefix (docker command and environment variables)
docker run -e STEP=$($2) -e MAL_IMPL=$(MAL_IMPL) \
-it --rm -u $(shell id -u) \
-v $(dir $(abspath $(lastword $(MAKEFILE_LIST)))):/mal \
- -w /mal/$(call actual_impl,$(1)) \
+ -w /mal/impls/$(call actual_impl,$(1)) \
$(if $(strip $($(mode))),-e $(mode)=$($(mode)),) \
$(if $(filter factor,$(1)),-e FACTOR_ROOTS=$(FACTOR_ROOTS),) \
$(foreach env,$(3),-e $(env)) \
# Takes impl and step
# Returns the runtest command prefix (with runtest options) for testing the given step
get_runtest_cmd = $(call get_run_prefix,$(1),$(2),$(if $(filter cs fsharp mal tcl vb,$(1)),RAW=1,)) \
- ../runtest.py $(opt_HARD) $(opt_DEFERRABLE) $(opt_OPTIONAL) $(call $(1)_TEST_OPTS) $(TEST_OPTS)
+ ../../runtest.py $(opt_HARD) $(opt_DEFERRABLE) $(opt_OPTIONAL) $(call $(1)_TEST_OPTS) $(TEST_OPTS)
# Takes impl and step
# Returns the runtest command prefix (with runtest options) for testing the given step
-get_argvtest_cmd = $(call get_run_prefix,$(1),$(2)) ../run_argv_test.sh
+get_argvtest_cmd = $(call get_run_prefix,$(1),$(2)) ../tests/run_argv_test.sh
# Derived lists
STEPS = $(sort $(filter-out %_EXCLUDES,$(filter step%,$(.VARIABLES))))
# encoded in the implementation Makefile not here
.PHONY: $(foreach i,$(DO_IMPLS),$(foreach s,$(STEPS),$(call $(i)_STEP_TO_PROG,$(s))))
$(foreach i,$(DO_IMPLS),$(foreach s,$(STEPS),$(call $(i)_STEP_TO_PROG,$(s)))):
- $(foreach impl,$(word 1,$(subst /, ,$(@))),\
+ $(foreach impl,$(word 2,$(subst /, ,$(@))),\
$(if $(DOCKERIZE), \
- $(call get_build_command,$(impl)) $(patsubst $(impl)/%,%,$(@)), \
- $(call get_build_command,$(impl)) $(subst $(impl)/,,$(@))))
+ $(call get_build_command,$(impl)) $(patsubst impls/$(impl)/%,%,$(@)), \
+ $(call get_build_command,$(impl)) $(subst impls/$(impl)/,,$(@))))
# Allow IMPL, build^IMPL, IMPL^STEP, and build^IMPL^STEP
$(DO_IMPLS): $$(foreach s,$$(STEPS),$$(call $$(@)_STEP_TO_PROG,$$(s)))
$(ALL_TESTS): $$(call $$(word 2,$$(subst ^, ,$$(@)))_STEP_TO_PROG,$$(word 3,$$(subst ^, ,$$(@))))
@$(foreach impl,$(word 2,$(subst ^, ,$(@))),\
$(foreach step,$(word 3,$(subst ^, ,$(@))),\
- cd $(call actual_impl,$(impl)) && \
- $(foreach test,$(call STEP_TEST_FILES,$(impl),$(step)),\
+ echo "(call STEP_TEST_FILES,$(impl),$(step)): $(call STEP_TEST_FILES,$(impl),$(step))" && \
+ cd impls/$(call actual_impl,$(impl)) && \
+ $(foreach test,$(patsubst impls/%,%,$(call STEP_TEST_FILES,$(impl),$(step))),\
echo '----------------------------------------------' && \
echo 'Testing $@; step file: $+, test file: $(test)' && \
echo 'Running: $(call get_runtest_cmd,$(impl),$(step)) ../$(test) -- ../$(impl)/run' && \
@echo "----------------------------------------------"; \
$(foreach impl,$(word 2,$(subst ^, ,$(@))),\
echo "Running: docker build -t $(call impl_to_image,$(impl)) .:"; \
- cd $(impl) && docker build -t $(call impl_to_image,$(impl)) .)
+ cd impls/$(impl) && docker build -t $(call impl_to_image,$(impl)) .)
#
# Docker shell rules
$(IMPL_PERF):
@echo "----------------------------------------------"; \
$(foreach impl,$(word 2,$(subst ^, ,$(@))),\
- cd $(call actual_impl,$(impl)); \
+ cd impls/$(call actual_impl,$(impl)); \
echo "Performance test for $(impl):"; \
echo 'Running: $(call get_run_prefix,$(impl),stepA) ../$(impl)/run ../tests/perf1.mal'; \
$(call get_run_prefix,$(impl),stepA) ../$(impl)/run ../tests/perf1.mal; \
$(ALL_REPL): $$(call $$(word 2,$$(subst ^, ,$$(@)))_STEP_TO_PROG,$$(word 3,$$(subst ^, ,$$(@))))
@$(foreach impl,$(word 2,$(subst ^, ,$(@))),\
$(foreach step,$(word 3,$(subst ^, ,$(@))),\
- cd $(call actual_impl,$(impl)); \
+ cd impls/$(call actual_impl,$(impl)); \
echo 'REPL implementation $(impl), step file: $+'; \
echo 'Running: $(call get_run_prefix,$(impl),$(step)) ../$(impl)/run $(RUN_ARGS)'; \
$(call get_run_prefix,$(impl),$(step)) ../$(impl)/run $(RUN_ARGS);))
$(IMPL_STATS):
@$(foreach impl,$(word 2,$(subst ^, ,$(@))),\
echo "Stats for $(impl):"; \
- $(LOCCOUNT) -x "[sS]tep[0-9]_.*|[.]md$$|tests|examples|Makefile|package.json|tsconfig.json|Cargo.toml|project.clj|node_modules|getline.cs|terminal.cs|elm-stuff|objpascal/regexpr|rdyncall|swift/templates" $(impl))
+ $(LOCCOUNT) -x "[sS]tep[0-9]_.*|[.]md$$|tests|examples|Makefile|package.json|tsconfig.json|Cargo.toml|project.clj|node_modules|getline.cs|terminal.cs|elm-stuff|objpascal/regexpr|rdyncall|swift/templates" impls/$(impl))
#
# Utility functions