[interpreter] Directory reorg (#500)

Reorganise directory structure of interpreter sources into smaller parts that match structure of spec document. The prior spec/ directory is split into

* `syntax`: the definition of abstract syntax; corresponds to the "Structure" section
* `valid`: validation of code and modules; corresponds to the "Validation" section
* `exec`: execution and module instantiation; corresponds to the "Execution" section
* `binary`: encoding and decoding of binary format; corresponds to the "Binary Format" section
* `text`: parsing and printing of text format; corresponds to the "Text Format" section

Similarly, the former host/ directory is split into

* `script`: abstract syntax and execution of the extended script language
* `main`: main program

The former host/imports becomes just host/.

And finally, the auxiliary directories `findlib`, `jslib`, and `travis` are moved under `meta/`.

Also, bump version of the interpreter to 1.0 and update `wast.js`.

Author: rossberg

.travis.yml

@@ -2,9 +2,9 @@ language: c++
 
 sudo: off
 
-install: ./interpreter/travis/install-ocaml.sh
+install: ./interpreter/meta/travis/install-ocaml.sh
 
-script: ./interpreter/travis/build-test.sh
+script: ./interpreter/meta/travis/build-test.sh
 
 os:
   - linux

interpreter/Makefile

@@ -17,7 +17,7 @@ ZIP =		$(NAME).zip
 JSLIB =		wast.js
 WINMAKE =	winmake.bat
 
-DIRS =		util spec text host host/import
+DIRS =		util syntax binary text valid exec script host main
 LIBS =		bigarray
 FLAGS = 	-cflags '-w +a-4-27-42-44-45 -warn-error +a'
 OCB =		ocamlbuild $(FLAGS) $(DIRS:%=-I %) $(LIBS:%=-libs %)
@@ -26,36 +26,48 @@ JS =		# set to JS shell command to run JS tests
 
 # Main targets
 
-.PHONY:		default opt unopt libopt libunopt all land zip
+.PHONY:		default opt unopt libopt libunopt jslib all land zip
 
 default:	opt
 opt:		$(OPT)
 unopt:		$(UNOPT)
 libopt:		_build/$(LIB).cmx
 libunopt:	_build/$(LIB).cmo
+jslib:		$(JSLIB)
 all:		unopt opt libunopt libopt test
 land:		all $(WINMAKE)
 zip: 		$(ZIP)
 
 
 # Building executable
 
+empty =
+space =		$(empty) $(empty)
+comma =		,
+
+.INTERMEDIATE:	_tags
+_tags:
+		echo >$@ "true: bin_annot"
+		echo >>$@ "<{$(subst $(space),$(comma),$(DIRS))}/*.cmx>: for-pack($(PACK))"
+
 $(UNOPT):	main.d.byte
 		mv $< $@
 
 $(OPT):		main.native
 		mv $< $@
 
 .PHONY:		main.d.byte main.native
-main.d.byte:
+main.d.byte:	_tags
 		$(OCB) -quiet $@
 
-main.native:
+main.native:	_tags
 		$(OCB) -quiet $@
 
 
 # Building library
 
+PACK =		$(shell echo `echo $(LIB) | sed 's/^\(.\).*$$/\\1/g' | tr [:lower:] [:upper:]``echo $(LIB) | sed 's/^.\(.*\)$$/\\1/g'`)
+
 .INTERMEDIATE:	$(LIB).mlpack
 $(LIB).mlpack:	$(DIRS)
 		ls $(DIRS:%=%/*.ml*) \
@@ -76,8 +88,8 @@ _build/$(LIB).cmx: $(LIB).mlpack
 .PHONY:		$(JSLIB)
 $(JSLIB):	$(UNOPT)
 		mkdir -p _build/jslib/src
-		cp jslib/* _build/jslib
-		cp $(DIRS:%=_build/%/*.ml*) jslib/*.ml _build/jslib/src
+		cp meta/jslib/* _build/jslib
+		cp $(DIRS:%=_build/%/*.ml*) meta/jslib/*.ml _build/jslib/src
 		rm _build/jslib/src/*.ml[^i]
 		(cd _build/jslib; ./build.sh ../../$@)
 
@@ -124,7 +136,7 @@ $(ZIP):		$(WINMAKE)
 		git archive --format=zip --prefix=$(NAME)/ -o $@ HEAD
 
 clean:
-		rm -rf _build/jslib wasm.mlpack
+		rm -rf _build/jslib wasm.mlpack _tags
 		$(OCB) -clean
 
 
@@ -138,7 +150,7 @@ check:
 		ocamlfind query $(LIBS)
 
 install:	_build/$(LIB).cmx _build/$(LIB).cmo
-		ocamlfind install wasm findlib/META _build/wasm.o \
+		ocamlfind install wasm meta/findlib/META _build/wasm.o \
 		  $(wildcard _build/$(LIB).cm*) \
 		  $(wildcard $(DIRS:%=%/*.mli))
 

interpreter/README.md

@@ -1,14 +1,12 @@
 let name = "wasm"
-let version = "0.7"
+let version = "1.0"
 
 let configure () =
   Import.register (Utf8.decode "spectest") Spectest.lookup;
   Import.register (Utf8.decode "env") Env.lookup
 
 let banner () =
-  print_endline
-    (name ^ "-" ^ Printf.sprintf "0x%lX" Encode.version ^
-     " " ^ version ^ " reference interpreter")
+  print_endline (name ^ " " ^ version ^ " reference interpreter")
 
 let usage = "Usage: " ^ name ^ " [option] [file ...]"
 

interpreter/_tags

@@ -74,7 +74,7 @@ echo 1>&2 ==== Compiling ====
 BSPATH=`which bsb`
 BPATH=`dirname $BSPATH`/../lib/js
 echo 1>&2 BSPATH = $BSPATH
-bsb || exit 1
+bsb.exe || exit 1
 cp `dirname $BSPATH`/../lib/js/*.js lib/js/src
 
 echo 1>&2 ==== Linking full version ====

interpreter/spec/decode.ml renamed to interpreter/binary/decode.ml

@@ -5,7 +5,7 @@ set -x
 
 # Move to a location relative to the script so it runs
 # from anywhere.
-cd $(dirname ${BASH_SOURCE[0]})/..
+cd $(dirname ${BASH_SOURCE[0]})/../..
 
 export PATH=$PWD/../ocaml/install/bin:$PATH
 

interpreter/spec/decode.mli renamed to interpreter/binary/decode.mli

@@ -3,11 +3,11 @@
 set -e
 
 # Move to a location relative to the script so it runs
-# from anywhere. Go two levels down to get out of interpreter/
+# from anywhere. Go three levels down to get out of interpreter/
 # and into the top-level dir, since we'll run ocamlbuild
 # inside of interpreter/ and it goes pear-shaped if it
 # encounters ocaml's own build directory.
-cd $(dirname ${BASH_SOURCE[0]})/../..
+cd $(dirname ${BASH_SOURCE[0]})/../../..
 
 rm -rf ocaml
 mkdir ocaml