Remove last prints, adapt JSON

2 files changed, 3 insertions, 6 deletions

diff --git a/src/FunsAnalysis.ml b/src/FunsAnalysis.ml
index ee4f71c1..5a623450 100644
--- a/src/FunsAnalysis.ml
+++ b/src/FunsAnalysis.ml
@@ -74,9 +74,6 @@ let analyze_module (m : llbc_module) (funs_map : fun_decl FunDeclId.Map.t)
                   can_fail := EU.binop_can_fail bop || !can_fail
     
           method! visit_Call env call =
-            pp_fun_id Format.std_formatter call.func;
-            print_newline ();
-
             (match call.func with
             | Regular id ->
                 if FunDeclId.Set.mem id fun_ids then divergent := true
diff --git a/src/LlbcOfJson.ml b/src/LlbcOfJson.ml
index 3ff45077..c157b667 100644
--- a/src/LlbcOfJson.ml
+++ b/src/LlbcOfJson.ml
@@ -644,13 +644,13 @@ let global_decl_of_json (js : json) (gid_conv : A.global_id_converter) : (A.fun_
         [
           ("def_id", def_id);
           ("name", name);
-          ("type_", type_);
+          ("ty", ty);
           ("body", body);
         ] ->
         let* global_id = A.GlobalDeclId.id_of_json def_id in
         let def_id = A.global_to_fun_id gid_conv global_id in
         let* name = fun_name_of_json name in
-        let* type_ = ety_of_json type_ in
+        let* ty = ety_of_json ty in
         let* body = option_of_json (fun js -> fun_body_of_json js gid_conv) body in
         let signature : A.fun_sig = {
           region_params = [];
@@ -658,7 +658,7 @@ let global_decl_of_json (js : json) (gid_conv : A.global_id_converter) : (A.fun_
           regions_hierarchy = [];
           type_params = [];
           inputs = [];
-          output = TU.ety_no_regions_to_sty type_;
+          output = TU.ety_no_regions_to_sty ty;
         } in
         Ok { A.def_id; name; signature; body; is_global = true; }
     | _ -> Error "")