Should answer all comments, there are still some TODO: error message left

1 files changed, 51 insertions, 51 deletions

diff --git a/compiler/PrintPure.ml b/compiler/PrintPure.ml
index 3008e1bd..6ef87194 100644
--- a/compiler/PrintPure.ml
+++ b/compiler/PrintPure.ml
@@ -351,7 +351,7 @@ let adt_field_to_string ?(meta = None) (env : fmt_env) (adt_id : type_id)
 (** TODO: we don't need a general function anymore (it is now only used for
     patterns)
  *)
-let adt_g_value_to_string (meta : Meta.meta) (env : fmt_env) (value_to_string : 'v -> string)
+let adt_g_value_to_string ?(meta : Meta.meta option = None) (env : fmt_env) (value_to_string : 'v -> string)
     (variant_id : VariantId.id option) (field_values : 'v list) (ty : ty) :
     string =
   let field_values = List.map value_to_string field_values in
@@ -386,50 +386,50 @@ let adt_g_value_to_string (meta : Meta.meta) (env : fmt_env) (value_to_string :
       match aty with
       | TState | TRawPtr _ ->
           (* This type is opaque: we can't get there *)
-          craise meta "Unreachable"
+          craise_opt_meta meta "Unreachable"
       | TResult ->
           let variant_id = Option.get variant_id in
           if variant_id = result_return_id then
             match field_values with
             | [ v ] -> "@Result::Return " ^ v
-            | _ -> craise meta "Result::Return takes exactly one value"
+            | _ -> craise_opt_meta meta "Result::Return takes exactly one value"
           else if variant_id = result_fail_id then
             match field_values with
             | [ v ] -> "@Result::Fail " ^ v
-            | _ -> craise meta "Result::Fail takes exactly one value"
+            | _ -> craise_opt_meta meta "Result::Fail takes exactly one value"
           else
-            craise meta "Unreachable: improper variant id for result type"
+            craise_opt_meta meta "Unreachable: improper variant id for result type"
       | TError ->
-          cassert (field_values = []) meta "TODO: error message";
+          cassert_opt_meta (field_values = []) meta "TODO: error message";
           let variant_id = Option.get variant_id in
           if variant_id = error_failure_id then "@Error::Failure"
           else if variant_id = error_out_of_fuel_id then "@Error::OutOfFuel"
-          else craise meta "Unreachable: improper variant id for error type"
+          else craise_opt_meta meta "Unreachable: improper variant id for error type"
       | TFuel ->
           let variant_id = Option.get variant_id in
           if variant_id = fuel_zero_id then (
-            cassert (field_values = []) meta "TODO: error message";
+            cassert_opt_meta (field_values = []) meta "TODO: error message";
             "@Fuel::Zero")
           else if variant_id = fuel_succ_id then
             match field_values with
             | [ v ] -> "@Fuel::Succ " ^ v
-            | _ -> craise meta "@Fuel::Succ takes exactly one value"
-          else craise meta "Unreachable: improper variant id for fuel type"
+            | _ -> craise_opt_meta meta "@Fuel::Succ takes exactly one value"
+          else craise_opt_meta meta "Unreachable: improper variant id for fuel type"
       | TArray | TSlice | TStr ->
-          cassert (variant_id = None) meta "TODO: error message";
+          cassert_opt_meta (variant_id = None) meta "TODO: error message";
           let field_values =
             List.mapi (fun i v -> string_of_int i ^ " -> " ^ v) field_values
           in
           let id = assumed_ty_to_string aty in
           id ^ " [" ^ String.concat "; " field_values ^ "]")
   | _ ->
-      craise
+      craise_opt_meta
         meta
            ("Inconsistently typed value: expected ADT type but found:"
           ^ "\n- ty: " ^ ty_to_string env false ty ^ "\n- variant_id: "
            ^ Print.option_to_string VariantId.to_string variant_id)
 
-let rec typed_pattern_to_string (meta : Meta.meta) (env : fmt_env) (v : typed_pattern) : string =
+let rec typed_pattern_to_string ?(meta : Meta.meta option = None) (env : fmt_env) (v : typed_pattern) : string =
   match v.value with
   | PatConstant cv -> literal_to_string cv
   | PatVar (v, None) -> var_to_string env v
@@ -440,8 +440,8 @@ let rec typed_pattern_to_string (meta : Meta.meta) (env : fmt_env) (v : typed_pa
       ^ ")"
   | PatDummy -> "_"
   | PatAdt av ->
-      adt_g_value_to_string meta env
-        (typed_pattern_to_string meta env)
+      adt_g_value_to_string ~meta:meta env
+        (typed_pattern_to_string ~meta:meta env)
         av.variant_id av.field_values v.ty
 
 let fun_sig_to_string (env : fmt_env) (sg : fun_sig) : string =
@@ -522,7 +522,7 @@ let fun_or_op_id_to_string (env : fmt_env) (fun_id : fun_or_op_id) : string =
       binop_to_string binop ^ "<" ^ integer_type_to_string int_ty ^ ">"
 
 (** [inside]: controls the introduction of parentheses *)
-let rec texpression_to_string (metadata : Meta.meta) (env : fmt_env) (inside : bool) (indent : string)
+let rec texpression_to_string ?(metadata : Meta.meta option = None) (env : fmt_env) (inside : bool) (indent : string)
     (indent_incr : string) (e : texpression) : string =
   match e.e with
   | Var var_id -> var_id_to_string env var_id
@@ -532,22 +532,22 @@ let rec texpression_to_string (metadata : Meta.meta) (env : fmt_env) (inside : b
       (* Recursively destruct the app, to have a pair (app, arguments list) *)
       let app, args = destruct_apps e in
       (* Convert to string *)
-      app_to_string metadata env inside indent indent_incr app args
+      app_to_string ~meta:metadata env inside indent indent_incr app args
   | Lambda _ ->
       let xl, e = destruct_lambdas e in
-      let e = lambda_to_string metadata env indent indent_incr xl e in
+      let e = lambda_to_string ~meta:metadata env indent indent_incr xl e in
       if inside then "(" ^ e ^ ")" else e
   | Qualif _ ->
       (* Qualifier without arguments *)
-      app_to_string metadata env inside indent indent_incr e []
+      app_to_string ~meta:metadata env inside indent indent_incr e []
   | Let (monadic, lv, re, e) ->
-      let e = let_to_string metadata env indent indent_incr monadic lv re e in
+      let e = let_to_string ~meta:metadata env indent indent_incr monadic lv re e in
       if inside then "(" ^ e ^ ")" else e
   | Switch (scrutinee, body) ->
-      let e = switch_to_string metadata env indent indent_incr scrutinee body in
+      let e = switch_to_string ~meta:metadata env indent indent_incr scrutinee body in
       if inside then "(" ^ e ^ ")" else e
   | Loop loop ->
-      let e = loop_to_string metadata env indent indent_incr loop in
+      let e = loop_to_string ~meta:metadata env indent indent_incr loop in
       if inside then "(" ^ e ^ ")" else e
   | StructUpdate supd -> (
       let s =
@@ -566,7 +566,7 @@ let rec texpression_to_string (metadata : Meta.meta) (env : fmt_env) (inside : b
               (fun (fid, fe) ->
                 let field = FieldId.nth field_names fid in
                 let fe =
-                  texpression_to_string metadata env false indent2 indent_incr fe
+                  texpression_to_string ~metadata:metadata env false indent2 indent_incr fe
                 in
                 "\n" ^ indent1 ^ field ^ " := " ^ fe ^ ";")
               supd.updates
@@ -577,21 +577,21 @@ let rec texpression_to_string (metadata : Meta.meta) (env : fmt_env) (inside : b
           let fields =
             List.map
               (fun (_, fe) ->
-                texpression_to_string metadata env false indent2 indent_incr fe)
+                texpression_to_string ~metadata:metadata env false indent2 indent_incr fe)
               supd.updates
           in
           "[ " ^ String.concat ", " fields ^ " ]"
-      | _ -> craise metadata "Unexpected")
+      | _ -> craise_opt_meta metadata "Unexpected")
   | Meta (meta, e) -> (
-      let meta_s = emeta_to_string metadata env meta in
-      let e = texpression_to_string metadata env inside indent indent_incr e in
+      let meta_s = emeta_to_string ~metadata:metadata env meta in
+      let e = texpression_to_string ~metadata:metadata env inside indent indent_incr e in
       match meta with
       | Assignment _ | SymbolicAssignments _ | SymbolicPlaces _ | Tag _ ->
           let e = meta_s ^ "\n" ^ indent ^ e in
           if inside then "(" ^ e ^ ")" else e
       | MPlace _ -> "(" ^ meta_s ^ " " ^ e ^ ")")
 
-and app_to_string (meta : Meta.meta) (env : fmt_env) (inside : bool) (indent : string)
+and app_to_string ?(meta : Meta.meta option = None) (env : fmt_env) (inside : bool) (indent : string)
     (indent_incr : string) (app : texpression) (args : texpression list) :
     string =
   (* There are two possibilities: either the [app] is an instantiated,
@@ -611,13 +611,13 @@ and app_to_string (meta : Meta.meta) (env : fmt_env) (inside : bool) (indent : s
             (global_decl_id_to_string env global_id, generics)
         | AdtCons adt_cons_id ->
             let variant_s =
-              adt_variant_to_string ~meta:(Some meta) env adt_cons_id.adt_id
+              adt_variant_to_string ~meta:meta env adt_cons_id.adt_id
                 adt_cons_id.variant_id
             in
             (ConstStrings.constructor_prefix ^ variant_s, [])
         | Proj { adt_id; field_id } ->
-            let adt_s = adt_variant_to_string ~meta:(Some meta) env adt_id None in
-            let field_s = adt_field_to_string ~meta:(Some meta) env adt_id field_id in
+            let adt_s = adt_variant_to_string ~meta:meta env adt_id None in
+            let field_s = adt_field_to_string ~meta:meta env adt_id field_id in
             (* Adopting an F*-like syntax *)
             (ConstStrings.constructor_prefix ^ adt_s ^ "?." ^ field_s, [])
         | TraitConst (trait_ref, const_name) ->
@@ -627,7 +627,7 @@ and app_to_string (meta : Meta.meta) (env : fmt_env) (inside : bool) (indent : s
     | _ ->
         (* "Regular" expression case *)
         let inside = args <> [] || (args = [] && inside) in
-        (texpression_to_string meta env inside indent indent_incr app, [])
+        (texpression_to_string ~metadata:meta env inside indent indent_incr app, [])
   in
   (* Convert the arguments.
    * The arguments are expressions, so indentation might get weird... (though
@@ -635,7 +635,7 @@ and app_to_string (meta : Meta.meta) (env : fmt_env) (inside : bool) (indent : s
   let arg_to_string =
     let inside = true in
     let indent1 = indent ^ indent_incr in
-    texpression_to_string meta env inside indent1 indent_incr
+    texpression_to_string ~metadata:meta env inside indent1 indent_incr
   in
   let args = List.map arg_to_string args in
   let all_args = List.append generics args in
@@ -646,31 +646,31 @@ and app_to_string (meta : Meta.meta) (env : fmt_env) (inside : bool) (indent : s
   (* Add parentheses *)
   if all_args <> [] && inside then "(" ^ e ^ ")" else e
 
-and lambda_to_string (meta : Meta.meta) (env : fmt_env) (indent : string) (indent_incr : string)
+and lambda_to_string ?(meta : Meta.meta option = None) (env : fmt_env) (indent : string) (indent_incr : string)
     (xl : typed_pattern list) (e : texpression) : string =
-  let xl = List.map (typed_pattern_to_string meta env) xl in
-  let e = texpression_to_string meta env false indent indent_incr e in
+  let xl = List.map (typed_pattern_to_string ~meta:meta env) xl in
+  let e = texpression_to_string ~metadata:meta env false indent indent_incr e in
   "λ " ^ String.concat " " xl ^ ". " ^ e
 
-and let_to_string (meta : Meta.meta) (env : fmt_env) (indent : string) (indent_incr : string)
+and let_to_string ?(meta : Meta.meta option = None) (env : fmt_env) (indent : string) (indent_incr : string)
     (monadic : bool) (lv : typed_pattern) (re : texpression) (e : texpression) :
     string =
   let indent1 = indent ^ indent_incr in
   let inside = false in
-  let re = texpression_to_string meta env inside indent1 indent_incr re in
-  let e = texpression_to_string meta env inside indent indent_incr e in
-  let lv = typed_pattern_to_string meta env lv in
+  let re = texpression_to_string ~metadata:meta env inside indent1 indent_incr re in
+  let e = texpression_to_string ~metadata:meta env inside indent indent_incr e in
+  let lv = typed_pattern_to_string ~meta:meta env lv in
   if monadic then lv ^ " <-- " ^ re ^ ";\n" ^ indent ^ e
   else "let " ^ lv ^ " = " ^ re ^ " in\n" ^ indent ^ e
 
-and switch_to_string (meta : Meta.meta) (env : fmt_env) (indent : string) (indent_incr : string)
+and switch_to_string ?(meta : Meta.meta option = None) (env : fmt_env) (indent : string) (indent_incr : string)
     (scrutinee : texpression) (body : switch_body) : string =
   let indent1 = indent ^ indent_incr in
   (* Printing can mess up on the scrutinee, because it is an expression - but
    * in most situations it will be a value or a function call, so it should be
    * ok*)
-  let scrut = texpression_to_string meta env true indent1 indent_incr scrutinee in
-  let e_to_string = texpression_to_string meta env false indent1 indent_incr in
+  let scrut = texpression_to_string ~metadata:meta env true indent1 indent_incr scrutinee in
+  let e_to_string = texpression_to_string ~metadata:meta env false indent1 indent_incr in
   match body with
   | If (e_true, e_false) ->
       let e_true = e_to_string e_true in
@@ -679,13 +679,13 @@ and switch_to_string (meta : Meta.meta) (env : fmt_env) (indent : string) (inden
       ^ indent ^ "else\n" ^ indent1 ^ e_false
   | Match branches ->
       let branch_to_string (b : match_branch) : string =
-        let pat = typed_pattern_to_string meta env b.pat in
+        let pat = typed_pattern_to_string ~meta:meta env b.pat in
         indent ^ "| " ^ pat ^ " ->\n" ^ indent1 ^ e_to_string b.branch
       in
       let branches = List.map branch_to_string branches in
       "match " ^ scrut ^ " with\n" ^ String.concat "\n" branches
 
-and loop_to_string (meta : Meta.meta) (env : fmt_env) (indent : string) (indent_incr : string)
+and loop_to_string ?(meta : Meta.meta option = None) (env : fmt_env) (indent : string) (indent_incr : string)
     (loop : loop) : string =
   let indent1 = indent ^ indent_incr in
   let indent2 = indent1 ^ indent_incr in
@@ -696,17 +696,17 @@ and loop_to_string (meta : Meta.meta) (env : fmt_env) (indent : string) (indent_
   in
   let output_ty = "output_ty: " ^ ty_to_string env false loop.output_ty in
   let fun_end =
-    texpression_to_string meta env false indent2 indent_incr loop.fun_end
+    texpression_to_string ~metadata:meta env false indent2 indent_incr loop.fun_end
   in
   let loop_body =
-    texpression_to_string meta env false indent2 indent_incr loop.loop_body
+    texpression_to_string ~metadata:meta env false indent2 indent_incr loop.loop_body
   in
   "loop {\n" ^ indent1 ^ loop_inputs ^ "\n" ^ indent1 ^ output_ty ^ "\n"
   ^ indent1 ^ "fun_end: {\n" ^ indent2 ^ fun_end ^ "\n" ^ indent1 ^ "}\n"
   ^ indent1 ^ "loop_body: {\n" ^ indent2 ^ loop_body ^ "\n" ^ indent1 ^ "}\n"
   ^ indent ^ "}"
 
-and emeta_to_string (metadata : Meta.meta) (env : fmt_env) (meta : emeta) : string =
+and emeta_to_string ?(metadata : Meta.meta option = None) (env : fmt_env) (meta : emeta) : string =
   let meta =
     match meta with
     | Assignment (lp, rv, rp) ->
@@ -716,14 +716,14 @@ and emeta_to_string (metadata : Meta.meta) (env : fmt_env) (meta : emeta) : stri
           | Some rp -> " [@src=" ^ mplace_to_string env rp ^ "]"
         in
         "@assign(" ^ mplace_to_string env lp ^ " := "
-        ^ texpression_to_string metadata env false "" "" rv
+        ^ texpression_to_string ~metadata:metadata env false "" "" rv
         ^ rp ^ ")"
     | SymbolicAssignments info ->
         let infos =
           List.map
             (fun (var_id, rv) ->
               VarId.to_string var_id ^ " == "
-              ^ texpression_to_string metadata env false "" "" rv)
+              ^ texpression_to_string ~metadata:metadata env false "" "" rv)
             info
         in
         let infos = String.concat ", " infos in
@@ -756,5 +756,5 @@ let fun_decl_to_string (env : fmt_env) (def : fun_decl) : string =
         if inputs = [] then indent
         else "  fun " ^ String.concat " " inputs ^ " ->\n" ^ indent
       in
-      let body = texpression_to_string def.meta env inside indent indent body.body in
+      let body = texpression_to_string ~metadata:(Some def.meta) env inside indent indent body.body in
       "let " ^ name ^ " :\n  " ^ signature ^ " =\n" ^ inputs ^ body