Merge pull request #48 from WebAssembly/split-files

Split files into given, spec and host dirs
WebAssembly · Sep 8, 2015 · 97aacc3 · 97aacc3
2 parents ce645d2 + 92af51d
commit 97aacc3
Show file tree

Hide file tree

Showing 31 changed files with 20 additions and 17 deletions.
diff --git a/ml-proto/README.md b/ml-proto/README.md
@@ -28,7 +28,7 @@ You'll get an executable named `src/wasm`.
 Alternatively, you can also say (in `src`):
 
 ```
-ocamlbuild -libs "bigarray, nums, str" main.native
+ocamlbuild -Is "given, spec, host" -libs "bigarray, nums, str" main.native
 ```
 
 and get an executable named `src/main.native`.

diff --git a/ml-proto/runtests.py b/ml-proto/runtests.py
@@ -51,7 +51,7 @@ def find_interpreter(path):
 def rebuild_interpreter(path):
   print("// building %s" % path)
   sys.stdout.flush()
-  exitCode = subprocess.call(["ocamlbuild", "-libs", "bigarray, nums, str", "main.native"], cwd=os.path.abspath("src"))
+  exitCode = subprocess.call(["ocamlbuild", "-libs", "bigarray, nums, str", "-Is", "given, spec, host", "host/main.native"], cwd=os.path.abspath("src"))
   if (exitCode != 0):
     raise Exception("ocamlbuild failed with exit code %i" % exitCode)
   if not os.path.exists(path):

diff --git a/ml-proto/src/Makefile b/ml-proto/src/Makefile
@@ -3,15 +3,16 @@
 #
 
 NAME = wasm
+INCLUDES = -I host -I given -I spec
 MODULES = \
-  flags lib source error \
-  types values memory ast \
-  check arithmetic eval print script \
-  lexer parser \
-  main
-NOMLI = flags types values ast sexpr main
-PARSERS = parser
-LEXERS = lexer
+  host/flags given/lib given/source spec/error \
+  spec/types spec/values spec/memory spec/ast \
+  spec/check spec/arithmetic spec/eval host/print host/script \
+  host/lexer host/parser \
+  host/main
+NOMLI = host/flags spec/types spec/values spec/ast host/main
+PARSERS = host/parser
+LEXERS = host/lexer
 LIBRARIES = bigarray nums str
 SAMPLES = 
 TEXTS = 
@@ -38,7 +39,7 @@ $(filter-out $(NOMLI:%=%.cmo), $(CMOS)): %.cmo: %.cmi
 $(filter-out $(NOMLI:%=%.cmx), $(CMXS)): %.cmx: %.cmi
 
 Makefile.depend: $(MLS) $(MLIS) Makefile
-	ocamldep $^ >$@
+	ocamldep $(INCLUDES) $^ >$@
 
 -include Makefile.depend
 
@@ -50,22 +51,24 @@ zip: $(MLS) $(MLIS) $(MLYS) $(MLLS) Makefile $(IMLS) $(TXTS)
 	rm -r tmp
 
 clean:
-	rm -f *.cmi *.cmo *.cmx *.o *.output *.depend
-	rm -f *.native *.byte $(NAME) $(NAME).opt $(NAME).zip
+	rm -f given/*.cmi given/*.cmo given/*.cmx given/*.o
+	rm -f spec/*.cmi spec/*.cmo spec/*.cmx spec/*.o
+	rm -f host/*.cmi host/*.cmo host/*.cmx host/*.o host/*.output
+	rm -f *.depend *.native *.byte $(NAME) $(NAME).opt $(NAME).zip
 	rm -rf _build
 	rm -f *~
 
 distclean: clean
 	rm -f $(PARSERS:%=%.mli) $(PARSERS:%=%.ml) $(LEXERS:%=%.ml)
 
 %.cmi: %.mli
-	ocamlc -c $(OCAMLCOPTS) $<
+	ocamlc -c $(INCLUDES) $(OCAMLCOPTS) $<
 
 %.cmo: %.ml
-	ocamlc -c $(OCAMLCOPTS) -g $<
+	ocamlc -c $(INCLUDES) $(OCAMLCOPTS) -g $<
 
 %.cmx: %.ml
-	ocamlopt -c $(OCAMLCOPTS) $<
+	ocamlopt -c $(INCLUDES) $(OCAMLCOPTS) $<
 
 %.ml: %.mly
 	ocamlyacc -v $<

diff --git a/ml-proto/src/lib.ml → ml-proto/src/given/lib.ml b/ml-proto/src/lib.ml → ml-proto/src/given/lib.ml
diff --git a/ml-proto/src/lib.mli → ml-proto/src/given/lib.mli b/ml-proto/src/lib.mli → ml-proto/src/given/lib.mli
diff --git a/ml-proto/src/source.ml → ml-proto/src/given/source.ml b/ml-proto/src/source.ml → ml-proto/src/given/source.ml
diff --git a/ml-proto/src/source.mli → ml-proto/src/given/source.mli b/ml-proto/src/source.mli → ml-proto/src/given/source.mli
diff --git a/ml-proto/src/flags.ml → ml-proto/src/host/flags.ml b/ml-proto/src/flags.ml → ml-proto/src/host/flags.ml
diff --git a/ml-proto/src/lexer.mli → ml-proto/src/host/lexer.mli b/ml-proto/src/lexer.mli → ml-proto/src/host/lexer.mli
diff --git a/ml-proto/src/lexer.mll → ml-proto/src/host/lexer.mll b/ml-proto/src/lexer.mll → ml-proto/src/host/lexer.mll
diff --git a/ml-proto/src/load.ml → ml-proto/src/host/load.ml b/ml-proto/src/load.ml → ml-proto/src/host/load.ml
diff --git a/ml-proto/src/main.ml → ml-proto/src/host/main.ml b/ml-proto/src/main.ml → ml-proto/src/host/main.ml
diff --git a/ml-proto/src/parser.mly → ml-proto/src/host/parser.mly b/ml-proto/src/parser.mly → ml-proto/src/host/parser.mly
diff --git a/ml-proto/src/print.ml → ml-proto/src/host/print.ml b/ml-proto/src/print.ml → ml-proto/src/host/print.ml
diff --git a/ml-proto/src/print.mli → ml-proto/src/host/print.mli b/ml-proto/src/print.mli → ml-proto/src/host/print.mli
diff --git a/ml-proto/src/script.ml → ml-proto/src/host/script.ml b/ml-proto/src/script.ml → ml-proto/src/host/script.ml
diff --git a/ml-proto/src/script.mli → ml-proto/src/host/script.mli b/ml-proto/src/script.mli → ml-proto/src/host/script.mli
diff --git a/ml-proto/src/arithmetic.ml → ml-proto/src/spec/arithmetic.ml b/ml-proto/src/arithmetic.ml → ml-proto/src/spec/arithmetic.ml
diff --git a/ml-proto/src/arithmetic.mli → ml-proto/src/spec/arithmetic.mli b/ml-proto/src/arithmetic.mli → ml-proto/src/spec/arithmetic.mli
diff --git a/ml-proto/src/ast.ml → ml-proto/src/spec/ast.ml b/ml-proto/src/ast.ml → ml-proto/src/spec/ast.ml
diff --git a/ml-proto/src/check.ml → ml-proto/src/spec/check.ml b/ml-proto/src/check.ml → ml-proto/src/spec/check.ml
diff --git a/ml-proto/src/check.mli → ml-proto/src/spec/check.mli b/ml-proto/src/check.mli → ml-proto/src/spec/check.mli
diff --git a/ml-proto/src/error.ml → ml-proto/src/spec/error.ml b/ml-proto/src/error.ml → ml-proto/src/spec/error.ml
diff --git a/ml-proto/src/error.mli → ml-proto/src/spec/error.mli b/ml-proto/src/error.mli → ml-proto/src/spec/error.mli
diff --git a/ml-proto/src/eval.ml → ml-proto/src/spec/eval.ml b/ml-proto/src/eval.ml → ml-proto/src/spec/eval.ml
diff --git a/ml-proto/src/eval.mli → ml-proto/src/spec/eval.mli b/ml-proto/src/eval.mli → ml-proto/src/spec/eval.mli
diff --git a/ml-proto/src/memory.ml → ml-proto/src/spec/memory.ml b/ml-proto/src/memory.ml → ml-proto/src/spec/memory.ml
diff --git a/ml-proto/src/memory.mli → ml-proto/src/spec/memory.mli b/ml-proto/src/memory.mli → ml-proto/src/spec/memory.mli
diff --git a/ml-proto/src/types.ml → ml-proto/src/spec/types.ml b/ml-proto/src/types.ml → ml-proto/src/spec/types.ml
diff --git a/ml-proto/src/values.ml → ml-proto/src/spec/values.ml b/ml-proto/src/values.ml → ml-proto/src/spec/values.ml
diff --git a/ml-proto/travis/build-test.sh b/ml-proto/travis/build-test.sh
@@ -11,7 +11,7 @@ export PATH=$PWD/ocaml/install/bin:$PATH
 
 cd src
 
-ocamlbuild -libs "bigarray, nums, str" main.native
+ocamlbuild -libs "bigarray, nums, str" -Is "given, spec, host" main.native
 
 cd ..