Don't Eval.eval into existing module

Author: lukewagner

ml-proto/src/eval.ml

@@ -266,6 +266,7 @@ let invoke m x vs =
   let f = export m (x @@ Source.no_region) in
   eval_func m f vs
 
-let eval m e =
-  let f = {params = []; results = []; locals = []; body = e} @@ Source.no_region
-  in unary (eval_func m f []) e.at
+let eval e =
+  let f = {params = []; results = []; locals = []; body = e} @@ Source.no_region in
+  let m = {funcs = [f]; exports = [f]; tables = []; globals = []; memory = (Memory.create 0)} in
+  unary (eval_func m f []) e.at

ml-proto/src/eval.mli

@@ -8,4 +8,4 @@ type value = Values.value
 val init : Ast.modul -> module_instance
 val invoke : module_instance -> int -> value list -> value list
   (* raise Error.Error *)
-val eval : module_instance -> Ast.expr -> value (* raise Error.Error *)
+val eval : Ast.expr -> value (* raise Error.Error *)

ml-proto/src/script.ml

@@ -35,11 +35,11 @@ let run_command cmd =
       current_module := Some (Eval.init m)
     | Invoke (i, es) ->
       trace "Invoking...";
+      let vs = List.map Eval.eval es in
       let m = match !current_module with
         | Some m -> m
         | None -> Error.error cmd.at "no module defined to invoke"
       in
-      let vs = List.map (Eval.eval m) es in
       let vs' = Eval.invoke m i vs in
       if vs' <> [] then Print.print_values vs'
     | AssertEqInvoke (i, arg_es, expect_es) ->
@@ -48,10 +48,9 @@ let run_command cmd =
         | Some m -> m
         | None -> Error.error cmd.at "no module defined to invoke"
       in
-      let eval = Eval.eval m in
-      let arg_vs = List.map eval arg_es in
+      let arg_vs = List.map Eval.eval arg_es in
       let got_vs = Eval.invoke m i arg_vs in
-      let expect_vs = List.map eval expect_es in
+      let expect_vs = List.map Eval.eval expect_es in
       if List.exists2 (<>) got_vs expect_vs then begin
         print_string "Got: ";
         Print.print_values got_vs;