start to switch completely to the new interpreter

README.md

@@ -81,7 +81,7 @@ val link_state : Link.state =
 ...
 # let () =
     Log.debug_on := true;
-    match Interpret.modul module_to_run with
+    match Interpret.I.modul module_to_run with
     | Ok () -> ()
     | Error e -> failwith e;;
 interpreting ...

example/README.md

@@ -111,7 +111,7 @@ let module_to_run =
 
 (* let's run it ! it will print the values as defined in the print_i32 function *)
 let () =
-  match Interpret.modul module_to_run with
+  match Interpret.I.modul module_to_run with
   | Error msg -> failwith msg
   | Ok () -> ()
 ```

example/extern.ml

@@ -45,6 +45,6 @@ let module_to_run =
 
 (* let's run it ! it will print the values as defined in the print_i32 function *)
 let () =
-  match Interpret.modul link_state.envs module_to_run with
+  match Interpret.I.modul link_state.envs module_to_run with
   | Error msg -> failwith msg
   | Ok () -> ()

example/life_game/life_console.ml

@@ -62,7 +62,7 @@ let module_to_run, link_state =
 
 (* let's run it ! First module to be interpreted *)
 let () =
-  match Interpret.modul link_state.envs module_to_run with
+  match Interpret.I.modul link_state.envs module_to_run with
   | Error msg -> failwith msg
   | Ok () -> ()
 
@@ -82,6 +82,6 @@ let module_to_run =
 
 (* let's run it ! it will animate the game of life in console *)
 let () =
-  match Interpret.modul link_state.envs module_to_run with
+  match Interpret.I.modul link_state.envs module_to_run with
   | Error msg -> failwith msg
   | Ok () -> ()

example/life_game/life_graphics.ml

@@ -74,7 +74,7 @@ let module_to_run, link_state =
 
 (* let's run it ! First module to be interpreted *)
 let () =
-  match Interpret.modul link_state.envs module_to_run with
+  match Interpret.I.modul link_state.envs module_to_run with
   | Error msg -> failwith msg
   | Ok () -> ()
 
@@ -94,6 +94,6 @@ let module_to_run =
 
 (* let's run it ! it will animate the game of life in a graphics window *)
 let () =
-  match Interpret.modul link_state.envs module_to_run with
+  match Interpret.I.modul link_state.envs module_to_run with
   | Error msg -> failwith msg
   | Ok () -> ()

src/bin/owi.ml

@@ -1,8 +1,6 @@
 open Owi
 open Syntax
 
-let test = true
-
 let simplify_then_link_then_run ~optimize file =
   let* to_run, link_state =
     list_fold_left
@@ -17,8 +15,7 @@ let simplify_then_link_then_run ~optimize file =
         | _ -> Ok acc )
       ([], Link.empty_state) file
   in
-  let interp_modul = if test then Interpret2.I.modul else Interpret.modul in
-  list_iter (interp_modul link_state.envs) (List.rev to_run)
+  list_iter (Interpret.I.modul link_state.envs) (List.rev to_run)
 
 let run_file exec filename =
   if not @@ Sys.file_exists filename then

src/bin/owi_sym.ml

@@ -1,6 +1,5 @@
 open Owi
 open Syntax
-
 module Choice = Sym_state.P.Choice
 
 let print_extern_module : Sym_state.P.extern_func Link.extern_module =
@@ -20,8 +19,8 @@ let print_extern_module : Sym_state.P.extern_func Link.extern_module =
 let assert_extern_module : Sym_state.P.extern_func Link.extern_module =
   let positive_i32 (i : Sym_value.S.int32) : unit Choice.t =
    fun thread ->
-     let c = Sym_value.S.I32.ge i (Sym_value.S.I32.zero) in
-     [(), { thread with pc = c :: thread.pc } ]
+    let c = Sym_value.S.I32.ge i Sym_value.S.I32.zero in
+    [ ((), { thread with pc = c :: thread.pc }) ]
   in
   (* we need to describe their types *)
   let functions =
@@ -91,7 +90,7 @@ let simplify_then_link_then_run ~optimize pc file =
       ([], link_state) file
   in
   let f pc to_run =
-    let c = (Interpret2.S.modul link_state.envs) to_run in
+    let c = (Interpret.S.modul link_state.envs) to_run in
     let results = List.flatten @@ List.map c pc in
     let results =
       List.map (function Ok (), t -> t | Error _, _ -> assert false) results

src/compile.ml

@@ -32,5 +32,5 @@ let until_link link_state ~optimize ~name m =
 
 let until_interpret link_state ~optimize ~name m =
   let* m, link_state = until_link link_state ~optimize ~name m in
-  let* () = Interpret.modul link_state.envs m in
+  let* () = Interpret.I.modul link_state.envs m in
   Ok link_state

src/dune

@@ -20,7 +20,6 @@
   int64
   func_intf
   interpret
-  interpret2
   interpret_functor
   value_intf
   value_test
@@ -54,6 +53,7 @@
   string_map
   symbolic
   syntax
+  trap
   typecheck
   types
   value