Merge branch 'master' of bitbucket.org:Peter_Sewell/l2

Conflicts:
	src/Makefile

1 files changed, 10 insertions, 0 deletions

diff --git a/src/initial_check_full_ast.mli b/src/initial_check_full_ast.mli
new file mode 100644
index 00000000..57346dcf
--- /dev/null
+++ b/src/initial_check_full_ast.mli
@@ -0,0 +1,10 @@
+
+open Ast
+open Type_internal
+
+(*Envs is a tuple of used names (currently unused), map from id to kind, default order for vector types and literal vectors *)
+type envs = Nameset.t * kind Envmap.t * Ast.order 
+type 'a envs_out = 'a * envs
+
+val to_checked_ast : Nameset.t -> kind Envmap.t -> Ast.order -> tannot defs -> tannot defs * kind Envmap.t * Ast.order
+val to_exp : kind Envmap.t -> Ast.order -> exp -> exp