aboutsummaryrefslogtreecommitdiff
path: root/ocaml
diff options
context:
space:
mode:
authorMiki Tebeka <miki.tebeka@gmail.com>2015-03-01 06:12:42 +0200
committerMiki Tebeka <miki.tebeka@gmail.com>2015-03-01 06:12:42 +0200
commit9fb199e2cb2cf44cd61c2a226193a70f6013aadc (patch)
tree325a2a8e33e3e8d18217d10854152cab82ac8b61 /ocaml
parent49916f9402e30a5277146355be878b32ec30f46d (diff)
parent2cb013877c4ed41d245ce7c5525405c4833c503d (diff)
downloadmal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.tar.gz
mal-9fb199e2cb2cf44cd61c2a226193a70f6013aadc.zip
Merge branch 'master' of https://github.com/kanaka/mal
Diffstat (limited to 'ocaml')
-rw-r--r--ocaml/Makefile6
-rw-r--r--ocaml/stepA_mal.ml (renamed from ocaml/stepA_interop.ml)0
2 files changed, 3 insertions, 3 deletions
diff --git a/ocaml/Makefile b/ocaml/Makefile
index 71c7e6b..9245dd5 100644
--- a/ocaml/Makefile
+++ b/ocaml/Makefile
@@ -1,6 +1,6 @@
STEPS = step0_repl.ml step1_read_print.ml step2_eval.ml step3_env.ml \
step4_if_fn_do.ml step5_tco.ml step6_file.ml step7_quote.ml \
- step8_macros.ml step9_try.ml stepA_interop.ml
+ step8_macros.ml step9_try.ml stepA_mal.ml
MODULES = types.ml reader.ml printer.ml env.ml core.ml
LIBS = str.cmxa unix.cmxa
MAL_LIB = mal_lib.cmxa
@@ -28,10 +28,10 @@ $(STEP_BINS): %: %.ml $(MAL_LIB)
clean:
rm -f $(STEP_BINS) mal mal_lib.* *.cmo *.cmx *.cmi *.o
-stats: $(MODULES) stepA_interop.ml
+stats: $(MODULES) stepA_mal.ml
@wc $^
-stats-lisp: env.ml core.ml stepA_interop.ml
+stats-lisp: env.ml core.ml stepA_mal.ml
@wc $^
.PHONY: all repl clean stats stats-lisp
diff --git a/ocaml/stepA_interop.ml b/ocaml/stepA_mal.ml
index 1aab28a..1aab28a 100644
--- a/ocaml/stepA_interop.ml
+++ b/ocaml/stepA_mal.ml