python_MODE = python
# scheme (chibi, kawa, gauche, chicken, sagittarius, cyclone, foment)
scheme_MODE = chibi
-# wasmtime js node wace_libc wace_fooboot
+# wasmtime wasmer lucet wax node warpy wace_libc
wasm_MODE = wasmtime
# Path to loccount for counting LOC stats
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 \
- matlab miniMAL nasm nim objc objpascal ocaml perl perl6 php picolisp plpgsql \
- plsql powershell ps python r racket rexx rpython ruby rust scala scheme skew \
- swift swift3 swift4 tcl ts vala vb vhdl vimscript wasm yorick
+ 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 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))
-ada.2_STEP_TO_PROG = ada.2/$($(1))
-awk_STEP_TO_PROG = awk/$($(1)).awk
-bash_STEP_TO_PROG = bash/$($(1)).sh
-basic_STEP_TO_PROG = $(basic_STEP_TO_PROG_$(basic_MODE))
-bbc-basic_STEP_TO_PROG = bbc-basic/$($(1)).bbc
-c_STEP_TO_PROG = c/$($(1))
-chuck_STEP_TO_PROG = chuck/$($(1)).ck
-clojure_STEP_TO_PROG = $(clojure_STEP_TO_PROG_$(clojure_MODE))
-coffee_STEP_TO_PROG = coffee/$($(1)).coffee
-common-lisp_STEP_TO_PROG = common-lisp/$($(1))
-cpp_STEP_TO_PROG = cpp/$($(1))
-crystal_STEP_TO_PROG = crystal/$($(1))
-cs_STEP_TO_PROG = cs/$($(1)).exe
-d_STEP_TO_PROG = d/$($(1))
-dart_STEP_TO_PROG = dart/$($(1)).dart
-elisp_STEP_TO_PROG = elisp/$($(1)).el
-elixir_STEP_TO_PROG = elixir/lib/mix/tasks/$($(1)).ex
-elm_STEP_TO_PROG = elm/$($(1)).js
-erlang_STEP_TO_PROG = erlang/$($(1))
-es6_STEP_TO_PROG = es6/$($(1)).mjs
-factor_STEP_TO_PROG = factor/$($(1))/$($(1)).factor
-fantom_STEP_TO_PROG = fantom/lib/fan/$($(1)).pod
-forth_STEP_TO_PROG = forth/$($(1)).fs
-fsharp_STEP_TO_PROG = fsharp/$($(1)).exe
-go_STEP_TO_PROG = go/$($(1))
-groovy_STEP_TO_PROG = groovy/$($(1)).groovy
-gnu-smalltalk_STEP_TO_PROG = gnu-smalltalk/$($(1)).st
-guile_STEP_TO_PROG = guile/$($(1)).scm
-haskell_STEP_TO_PROG = haskell/$($(1))
-haxe_STEP_TO_PROG = $(haxe_STEP_TO_PROG_$(haxe_MODE))
-hy_STEP_TO_PROG = hy/$($(1)).hy
-io_STEP_TO_PROG = io/$($(1)).io
-java_STEP_TO_PROG = java/target/classes/mal/$($(1)).class
-js_STEP_TO_PROG = js/$($(1)).js
-julia_STEP_TO_PROG = julia/$($(1)).jl
-kotlin_STEP_TO_PROG = kotlin/$($(1)).jar
-livescript_STEP_TO_PROG = livescript/$($(1)).js
-logo_STEP_TO_PROG = logo/$($(1)).lg
-lua_STEP_TO_PROG = lua/$($(1)).lua
-make_STEP_TO_PROG = make/$($(1)).mk
-mal_STEP_TO_PROG = mal/$($(1)).mal
-matlab_STEP_TO_PROG = matlab/$($(1)).m
-miniMAL_STEP_TO_PROG = miniMAL/$($(1)).json
-nasm_STEP_TO_PROG = nasm/$($(1))
-nim_STEP_TO_PROG = nim/$($(1))
-objc_STEP_TO_PROG = objc/$($(1))
-objpascal_STEP_TO_PROG = objpascal/$($(1))
-ocaml_STEP_TO_PROG = ocaml/$($(1))
-perl_STEP_TO_PROG = perl/$($(1)).pl
-perl6_STEP_TO_PROG = perl6/$($(1)).pl
-php_STEP_TO_PROG = php/$($(1)).php
-picolisp_STEP_TO_PROG = picolisp/$($(1)).l
-plpgsql_STEP_TO_PROG = plpgsql/$($(1)).sql
-plsql_STEP_TO_PROG = plsql/$($(1)).sql
-powershell_STEP_TO_PROG = powershell/$($(1)).ps1
-ps_STEP_TO_PROG = ps/$($(1)).ps
-python_STEP_TO_PROG = python/$($(1)).py
-r_STEP_TO_PROG = r/$($(1)).r
-racket_STEP_TO_PROG = racket/$($(1)).rkt
-rexx_STEP_TO_PROG = rexx/$($(1)).rexxpp
-rpython_STEP_TO_PROG = rpython/$($(1))
-ruby_STEP_TO_PROG = ruby/$($(1)).rb
-rust_STEP_TO_PROG = rust/$($(1))
-scala_STEP_TO_PROG = scala/target/scala-2.11/classes/$($(1)).class
-scheme_STEP_TO_PROG = $(scheme_STEP_TO_PROG_$(scheme_MODE))
-skew_STEP_TO_PROG = skew/$($(1)).js
-swift_STEP_TO_PROG = swift/$($(1))
-swift3_STEP_TO_PROG = swift3/$($(1))
-swift4_STEP_TO_PROG = swift4/$($(1))
-tcl_STEP_TO_PROG = tcl/$($(1)).tcl
-ts_STEP_TO_PROG = ts/$($(1)).js
-vala_STEP_TO_PROG = vala/$($(1))
-vb_STEP_TO_PROG = vb/$($(1)).exe
-vhdl_STEP_TO_PROG = vhdl/$($(1))
-vimscript_STEP_TO_PROG = vimscript/$($(1)).vim
-wasm_STEP_TO_PROG = wasm/$($(1)).wasm
-yorick_STEP_TO_PROG = yorick/$($(1)).i
-
+ada_STEP_TO_PROG = impls/ada/$($(1))
+ada.2_STEP_TO_PROG = impls/ada.2/$($(1))
+awk_STEP_TO_PROG = impls/awk/$($(1)).awk
+bash_STEP_TO_PROG = impls/bash/$($(1)).sh
+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))
+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))
+crystal_STEP_TO_PROG = impls/crystal/$($(1))
+cs_STEP_TO_PROG = impls/cs/$($(1)).exe
+d_STEP_TO_PROG = impls/d/$($(1))
+dart_STEP_TO_PROG = impls/dart/$($(1)).dart
+elisp_STEP_TO_PROG = impls/elisp/$($(1)).el
+elixir_STEP_TO_PROG = impls/elixir/lib/mix/tasks/$($(1)).ex
+elm_STEP_TO_PROG = impls/elm/$($(1)).js
+erlang_STEP_TO_PROG = impls/erlang/$($(1))
+es6_STEP_TO_PROG = impls/es6/$($(1)).mjs
+factor_STEP_TO_PROG = impls/factor/$($(1))/$($(1)).factor
+fantom_STEP_TO_PROG = impls/fantom/lib/fan/$($(1)).pod
+forth_STEP_TO_PROG = impls/forth/$($(1)).fs
+fsharp_STEP_TO_PROG = impls/fsharp/$($(1)).exe
+go_STEP_TO_PROG = impls/go/$($(1))
+groovy_STEP_TO_PROG = impls/groovy/$($(1)).groovy
+gnu-smalltalk_STEP_TO_PROG = impls/gnu-smalltalk/$($(1)).st
+guile_STEP_TO_PROG = impls/guile/$($(1)).scm
+haskell_STEP_TO_PROG = impls/haskell/$($(1))
+haxe_STEP_TO_PROG = $(haxe_STEP_TO_PROG_$(haxe_MODE))
+hy_STEP_TO_PROG = impls/hy/$($(1)).hy
+io_STEP_TO_PROG = impls/io/$($(1)).io
+java_STEP_TO_PROG = impls/java/target/classes/mal/$($(1)).class
+js_STEP_TO_PROG = impls/js/$($(1)).js
+jq_STEP_PROG = impls/jq/$($(1)).jq
+julia_STEP_TO_PROG = impls/julia/$($(1)).jl
+kotlin_STEP_TO_PROG = impls/kotlin/$($(1)).jar
+livescript_STEP_TO_PROG = impls/livescript/$($(1)).js
+logo_STEP_TO_PROG = impls/logo/$($(1)).lg
+lua_STEP_TO_PROG = impls/lua/$($(1)).lua
+make_STEP_TO_PROG = impls/make/$($(1)).mk
+mal_STEP_TO_PROG = impls/mal/$($(1)).mal
+matlab_STEP_TO_PROG = impls/matlab/$($(1)).m
+miniMAL_STEP_TO_PROG = impls/miniMAL/$($(1)).json
+nasm_STEP_TO_PROG = impls/nasm/$($(1))
+nim_STEP_TO_PROG = impls/nim/$($(1))
+objc_STEP_TO_PROG = impls/objc/$($(1))
+objpascal_STEP_TO_PROG = impls/objpascal/$($(1))
+ocaml_STEP_TO_PROG = impls/ocaml/$($(1))
+perl_STEP_TO_PROG = impls/perl/$($(1)).pl
+perl6_STEP_TO_PROG = impls/perl6/$($(1)).pl
+php_STEP_TO_PROG = impls/php/$($(1)).php
+picolisp_STEP_TO_PROG = impls/picolisp/$($(1)).l
+pike_STEP_TO_PROG = impls/pike/$($(1)).pike
+plpgsql_STEP_TO_PROG = impls/plpgsql/$($(1)).sql
+plsql_STEP_TO_PROG = impls/plsql/$($(1)).sql
+powershell_STEP_TO_PROG = impls/powershell/$($(1)).ps1
+ps_STEP_TO_PROG = impls/ps/$($(1)).ps
+python_STEP_TO_PROG = impls/python/$($(1)).py
+python.2_STEP_TO_PROG = impls/python.2/$($(1)).py
+r_STEP_TO_PROG = impls/r/$($(1)).r
+racket_STEP_TO_PROG = impls/racket/$($(1)).rkt
+rexx_STEP_TO_PROG = impls/rexx/$($(1)).rexxpp
+rpython_STEP_TO_PROG = impls/rpython/$($(1))
+ruby_STEP_TO_PROG = impls/ruby/$($(1)).rb
+rust_STEP_TO_PROG = impls/rust/$($(1))
+scala_STEP_TO_PROG = impls/scala/target/scala-2.11/classes/$($(1)).class
+scheme_STEP_TO_PROG = $(scheme_STEP_TO_PROG_$(scheme_MODE))
+skew_STEP_TO_PROG = impls/skew/$($(1)).js
+swift_STEP_TO_PROG = impls/swift/$($(1))
+swift3_STEP_TO_PROG = impls/swift3/$($(1))
+swift4_STEP_TO_PROG = impls/swift4/$($(1))
+swift5_STEP_TO_PROG = impls/swift5/$($(1))
+tcl_STEP_TO_PROG = impls/tcl/$($(1)).tcl
+ts_STEP_TO_PROG = impls/ts/$($(1)).js
+vala_STEP_TO_PROG = impls/vala/$($(1))
+vb_STEP_TO_PROG = impls/vb/$($(1)).exe
+vhdl_STEP_TO_PROG = impls/vhdl/$($(1))
+vimscript_STEP_TO_PROG = impls/vimscript/$($(1)).vim
+wasm_STEP_TO_PROG = impls/wasm/$($(1)).$(if $(filter lucet,$(wasm_MODE)),so,wasm)
+wren_STEP_TO_PROG = impls/wren/$($(1)).wren
+yorick_STEP_TO_PROG = impls/yorick/$($(1)).i
+xslt_STEP_TO_PROG = impls/xslt/$($(1))
+zig_STEP_TO_PROG = impls/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 "Makefile|node_modules" $(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
HCoop / jackhill / mal.git / blobdiff