Register the option type in ctx when used in lcalc

compiler/driver.ml

@@ -237,14 +237,14 @@ module Passes = struct
           "Option --avoid-exceptions is not compatible with option --trace"
       | true, _, Untyped _ ->
         Program.untype
-          (Lcalc.Compile_without_exceptions.translate_program
+          (Lcalc.From_dcalc.translate_program_without_exceptions
              (Shared_ast.Typing.program ~leave_unresolved:false prg))
       | true, _, Typed _ ->
-        Lcalc.Compile_without_exceptions.translate_program prg
+        Lcalc.From_dcalc.translate_program_without_exceptions prg
       | false, _, Typed _ ->
-        Program.untype (Lcalc.Compile_with_exceptions.translate_program prg)
+        Program.untype (Lcalc.From_dcalc.translate_program_with_exceptions prg)
       | false, _, Untyped _ ->
-        Lcalc.Compile_with_exceptions.translate_program prg
+        Lcalc.From_dcalc.translate_program_with_exceptions prg
       | _, _, Custom _ -> invalid_arg "Driver.Passes.lcalc"
     in
     let prg =

compiler/lcalc/from_dcalc.ml

@@ -14,8 +14,21 @@
    License for the specific language governing permissions and limitations under
    the License. *)
 
+open Shared_ast
+
+let add_option_type ctx =
+  {
+    ctx with
+    ctx_enums =
+      EnumName.Map.add Expr.option_enum Expr.option_enum_config ctx.ctx_enums;
+  }
+
+let add_option_type_program prg =
+  { prg with decl_ctx = add_option_type prg.decl_ctx }
+
 let translate_program_with_exceptions =
   Compile_with_exceptions.translate_program
 
-let translate_program_without_exceptions =
+let translate_program_without_exceptions prg =
-  Compile_without_exceptions.translate_program
+  let prg = add_option_type_program prg in
+  Compile_without_exceptions.translate_program prg

compiler/lcalc/from_dcalc.mli

@@ -14,12 +14,14 @@
    License for the specific language governing permissions and limitations under
    the License. *)
 
+open Shared_ast
+
 val translate_program_with_exceptions : 'm Dcalc.Ast.program -> 'm Ast.program
 (** Translation from the default calculus to the lambda calculus. This
     translation uses exceptions to handle empty default terms. *)
 
 val translate_program_without_exceptions :
-  Shared_ast.typed Dcalc.Ast.program -> Shared_ast.untyped Ast.program
+  typed Dcalc.Ast.program -> untyped Ast.program
 (** Translation from the default calculus to the lambda calculus. This
     translation uses an option monad to handle empty defaults terms. This
     transformation is one piece to permit to compile toward legacy languages

compiler/shared_ast/expr.ml

@@ -262,8 +262,8 @@ let none_constr = EnumConstructor.fresh ("ENone", Pos.no_pos)
 let some_constr = EnumConstructor.fresh ("ESome", Pos.no_pos)
 
 let option_enum_config =
-  EnumConstructor.Map.singleton none_constr (TLit TUnit, Pos.no_pos)
+  EnumConstructor.Map.of_list
-  |> EnumConstructor.Map.add some_constr (TAny, Pos.no_pos)
+    [none_constr, (TLit TUnit, Pos.no_pos); some_constr, (TAny, Pos.no_pos)]
 
 (* - Traversal functions - *)
 

tests/test_func/good/closure_conversion.catala_en

@@ -26,7 +26,7 @@ $ catala Typecheck --check-invariants
 
 ```catala-test-inline
 $ catala Lcalc --avoid-exceptions -O --closure-conversion
-
+type Eoption =  | ENone of unit  | ESome of any 
 
 type S_in = { x_in: bool; }
 

tests/test_func/good/closure_return.catala_en

@@ -24,7 +24,7 @@ $ catala Typecheck --check-invariants
 
 ```catala-test-inline
 $ catala Lcalc --avoid-exceptions -O --closure-conversion
-
+type Eoption =  | ENone of unit  | ESome of any 
 
 type S_in = { x_in: bool; }
 

tests/test_io/good/all_io.catala_en

@@ -21,24 +21,12 @@ scope A:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [68/68]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [73/73]
+[RESULT] Invariant app_inversion checked. result: [2/2]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [2/2]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [10/10]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [7/7]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [7/7]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [10/10]
 [RESULT] Typechecking successful!
 ```
 

tests/test_io/good/condition_only_input.catala_en

@@ -18,24 +18,12 @@ scope B:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [34/34]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [35/35]
+[RESULT] Invariant app_inversion checked. result: [1/1]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [1/1]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [4/4]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [4/4]
 [RESULT] Typechecking successful!
 ```
 

tests/test_io/good/subscope.catala_en

@@ -24,24 +24,12 @@ scope B:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [63/63]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [66/66]
+[RESULT] Invariant app_inversion checked. result: [2/2]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [1/1]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [2/2]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [9/9]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [5/5]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [5/5]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [9/9]
 [RESULT] Typechecking successful!
 ```
 

tests/test_literate/good/test_grave_char_en.catala_en

@@ -31,24 +31,12 @@ int main(void) { return 0; }
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [19/19]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [19/19]
+[RESULT] Invariant app_inversion checked. result: [1/1]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [1/1]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [3/3]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [3/3]
 [RESULT] Typechecking successful!
 ```
 

tests/test_literate/good/test_grave_char_fr.catala_fr

@@ -31,24 +31,12 @@ int main(void) { return 0; }
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [19/19]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [19/19]
+[RESULT] Invariant app_inversion checked. result: [1/1]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [1/1]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [3/3]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [3/3]
 [RESULT] Typechecking successful!
 ```
 

tests/test_metadata/good/test_markup_refactoring.catala_en

@@ -32,24 +32,12 @@ scope S2:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [40/40]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [40/40]
+[RESULT] Invariant app_inversion checked. result: [2/2]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [2/2]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [6/6]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [6/6]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/mod_def.catala_en

@@ -31,24 +31,12 @@ scope S:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [24/24]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [25/25]
+[RESULT] Invariant app_inversion checked. result: [0/0]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [1/1]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [0/0]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [4/4]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [4/4]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/mod_def_context.catala_en

@@ -60,24 +60,12 @@ scope Stest:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [207/207]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [210/210]
+[RESULT] Invariant app_inversion checked. result: [18/18]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [17/17]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [18/18]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [22/22]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [21/21]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [17/17]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [21/21]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [22/22]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/mod_middle.catala_en

@@ -21,24 +21,12 @@ scope S:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [65/65]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [70/70]
+[RESULT] Invariant app_inversion checked. result: [4/4]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [2/2]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [4/4]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [7/7]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [9/9]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [9/9]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [7/7]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/mod_use.catala_en

@@ -27,24 +27,12 @@ scope T2:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [74/74]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [79/79]
+[RESULT] Invariant app_inversion checked. result: [2/2]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [2/2]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [8/8]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [7/7]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [7/7]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [8/8]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/mod_use2.catala_en

@@ -19,24 +19,12 @@ scope T:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [49/49]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [49/49]
+[RESULT] Invariant app_inversion checked. result: [1/1]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [1/1]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [1/1]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [8/8]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [8/8]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/mod_use3.catala_en

@@ -23,24 +23,12 @@ scope T:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [49/49]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [49/49]
+[RESULT] Invariant app_inversion checked. result: [1/1]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [1/1]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [1/1]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [8/8]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [1/1]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [8/8]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/mod_use_context.catala_en

@@ -44,24 +44,12 @@ scope TestCall:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [146/146]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [148/148]
+[RESULT] Invariant app_inversion checked. result: [15/15]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [16/16]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [15/15]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [13/13]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [17/17]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [16/16]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [17/17]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [13/13]
 [RESULT] Typechecking successful!
 ```
 

tests/test_modules/good/output/mod_def.ml

@@ -30,12 +30,15 @@ let s (s_in: S_in.t) : S.t =
   let sr_: money = 
     try
       (handle_default
-         {filename = ""; start_line=0; start_column=1;
+         {filename = "tests/test_modules/good/mod_def.catala_en";
-           end_line=0; end_column=1; law_headings=[]}
+           start_line=16; start_column=10; end_line=16; end_column=12;
+           law_headings=["Test modules + inclusions 1"]}
          ([|(fun (_: unit) ->
                handle_default
-                 {filename = ""; start_line=0; start_column=1;
+                 {filename = "tests/test_modules/good/mod_def.catala_en";
-                   end_line=0; end_column=1; law_headings=[]} ([||])
+                   start_line=16; start_column=10;
+                   end_line=16; end_column=12;
+                   law_headings=["Test modules + inclusions 1"]} ([||])
                  (fun (_: unit) -> true)
                  (fun (_: unit) -> money_of_cents_string "100000"))|])
          (fun (_: unit) -> false) (fun (_: unit) -> raise EmptyError))
@@ -47,12 +50,15 @@ let s (s_in: S_in.t) : S.t =
   let e1_: Enum1.t = 
     try
       (handle_default
-         {filename = ""; start_line=0; start_column=1;
+         {filename = "tests/test_modules/good/mod_def.catala_en";
-           end_line=0; end_column=1; law_headings=[]}
+           start_line=17; start_column=10; end_line=17; end_column=12;
+           law_headings=["Test modules + inclusions 1"]}
          ([|(fun (_: unit) ->
                handle_default
-                 {filename = ""; start_line=0; start_column=1;
+                 {filename = "tests/test_modules/good/mod_def.catala_en";
-                   end_line=0; end_column=1; law_headings=[]} ([||])
+                   start_line=17; start_column=10;
+                   end_line=17; end_column=12;
+                   law_headings=["Test modules + inclusions 1"]} ([||])
                  (fun (_: unit) -> true) (fun (_: unit) -> Enum1.Maybe ()))|])
          (fun (_: unit) -> false) (fun (_: unit) -> raise EmptyError))
     with

tests/test_money/good/literal_parsing.catala_en

@@ -15,24 +15,12 @@ scope A:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [25/25]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [27/27]
+[RESULT] Invariant app_inversion checked. result: [0/0]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [0/0]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [4/4]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [4/4]
 [RESULT] Typechecking successful!
 ```
 

tests/test_money/good/simple.catala_en

@@ -16,24 +16,12 @@ scope A:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [61/61]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [64/64]
+[RESULT] Invariant app_inversion checked. result: [3/3]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [3/3]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [9/9]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [6/6]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [6/6]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [9/9]
 [RESULT] Typechecking successful!
 ```
 

tests/test_name_resolution/good/let_in.catala_en

@@ -29,24 +29,12 @@ scope S:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [62/62]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [64/64]
+[RESULT] Invariant app_inversion checked. result: [5/5]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [3/3]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [5/5]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [6/6]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [7/7]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [3/3]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [7/7]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [6/6]
 [RESULT] Typechecking successful!
 ```
 

tests/test_name_resolution/good/let_in2.catala_en

@@ -17,24 +17,12 @@ scope S:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [27/27]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [28/28]
+[RESULT] Invariant app_inversion checked. result: [3/3]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [2/2]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [3/3]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [3/3]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [4/4]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [4/4]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [3/3]
 [RESULT] Typechecking successful!
 ```
 
@@ -75,19 +63,23 @@ let s (s_in: S_in.t) : S.t =
   let a_: bool = 
     try
       (handle_default
-         {filename = ""; start_line=0; start_column=1;
+         {filename = "tests/test_name_resolution/good/let_in2.catala_en";
-           end_line=0; end_column=1; law_headings=[]}
+           start_line=7; start_column=18; end_line=7; end_column=19;
-         ([|(fun (_: unit) -> a_ ())|]) (fun (_: unit) -> true)
+           law_headings=["Article"]} ([|(fun (_: unit) -> a_ ())|])
+         (fun (_: unit) -> true)
          (fun (_: unit) -> 
             try
               (handle_default
-                 {filename = ""; start_line=0; start_column=1;
+                 {filename = "tests/test_name_resolution/good/let_in2.catala_en";
-                   end_line=0; end_column=1; law_headings=[]}
+                   start_line=7; start_column=18; end_line=7; end_column=19;
+                   law_headings=["Article"]}
                  ([|(fun (_: unit) ->
                        handle_default
-                         {filename = ""; start_line=0; start_column=1;
+                         {filename = "tests/test_name_resolution/good/let_in2.catala_en";
-                           end_line=0; end_column=1; law_headings=[]} (
+                           start_line=7; start_column=18;
-                         [||]) (fun (_: unit) -> true)
+                           end_line=7; end_column=19;
+                           law_headings=["Article"]} ([||])
+                         (fun (_: unit) -> true)
                          (fun (_: unit) -> (let a_ : bool = false
                             in
                             (let a_ : bool = (o_or a_ true) in

tests/test_name_resolution/good/out_of_order.catala_en

@@ -22,24 +22,12 @@ scope S:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [41/41]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [41/41]
+[RESULT] Invariant app_inversion checked. result: [2/2]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [2/2]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [6/6]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [2/2]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [6/6]
 [RESULT] Typechecking successful!
 ```
 

tests/test_name_resolution/good/toplevel_defs.catala_en

@@ -23,24 +23,12 @@ scope S:
 
 ```catala-test-inline
 $ catala Typecheck --check-invariants
-[RESULT]
+[RESULT] Invariant typing_defaults checked. result: [29/29]
-Invariant Dcalc__Invariants.invariant_typing_defaults
+[RESULT] Invariant match_inversion checked. result: [0/0]
-   checked. result: [32/32]
+[RESULT] Invariant app_inversion checked. result: [0/0]
-[RESULT]
+[RESULT] Invariant no_return_a_function checked. result: [0/0]
-Invariant Dcalc__Invariants.invariant_match_inversion
+[RESULT] Invariant no_partial_evaluation checked. result: [0/0]
-   checked. result: [0/0]
+[RESULT] Invariant default_no_arrow checked. result: [4/4]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_app_inversion
-   checked. result: [3/3]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_return_a_function
-   checked. result: [0/0]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_no_partial_evaluation
-   checked. result: [3/3]
-[RESULT]
-Invariant Dcalc__Invariants.invariant_default_no_arrow
-   checked. result: [4/4]
 [RESULT] Typechecking successful!
 ```
 
@@ -454,18 +442,21 @@ def s2(s2_in:S2In):
                     decimal_of_string("100."))
             def temp_a_4(_:Unit):
                 return True
-            return handle_default(SourcePosition(filename="", start_line=0,
+            return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                  start_column=1, end_line=0, end_column=1,
+                                  start_line=50, start_column=10,
-                                  law_headings=[]), [], temp_a_4, temp_a_3)
+                                  end_line=50, end_column=11,
-        temp_a_5 = handle_default(SourcePosition(filename="", start_line=0,
+                                  law_headings=["Test toplevel function defs"]), [],
-                                  start_column=1, end_line=0, end_column=1,
+                                  temp_a_4, temp_a_3)
-                                  law_headings=[]), [temp_a_2], temp_a_1,
+        temp_a_5 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                  temp_a)
+                                  start_line=50, start_column=10,
+                                  end_line=50, end_column=11,
+                                  law_headings=["Test toplevel function defs"]), [temp_a_2],
+                                  temp_a_1, temp_a)
     except EmptyError:
         temp_a_5 = dead_value
         raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                             start_line=62, start_column=10,
+                                             start_line=50, start_column=10,
-                                             end_line=62, end_column=11,
+                                             end_line=50, end_column=11,
                                              law_headings=["Test toplevel function defs"]))
     a = temp_a_5
     return S2(a = a)
@@ -483,18 +474,21 @@ def s3(s3_in:S3In):
                           decimal_of_string("55.")))
             def temp_a_10(_:Unit):
                 return True
-            return handle_default(SourcePosition(filename="", start_line=0,
+            return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                  start_column=1, end_line=0, end_column=1,
+                                  start_line=70, start_column=10,
-                                  law_headings=[]), [], temp_a_10, temp_a_9)
+                                  end_line=70, end_column=11,
-        temp_a_11 = handle_default(SourcePosition(filename="", start_line=0,
+                                  law_headings=["Test function def with two args"]), [],
-                                   start_column=1, end_line=0, end_column=1,
+                                  temp_a_10, temp_a_9)
-                                   law_headings=[]), [temp_a_8], temp_a_7,
+        temp_a_11 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                   temp_a_6)
+                                   start_line=70, start_column=10,
+                                   end_line=70, end_column=11,
+                                   law_headings=["Test function def with two args"]), [temp_a_8],
+                                   temp_a_7, temp_a_6)
     except EmptyError:
         temp_a_11 = dead_value
         raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                             start_line=82, start_column=10,
+                                             start_line=70, start_column=10,
-                                             end_line=82, end_column=11,
+                                             end_line=70, end_column=11,
                                              law_headings=["Test function def with two args"]))
     a_1 = temp_a_11
     return S3(a = a_1)
@@ -510,18 +504,21 @@ def s4(s4_in:S4In):
                 return (glob5_1 + decimal_of_string("1."))
             def temp_a_16(_:Unit):
                 return True
-            return handle_default(SourcePosition(filename="", start_line=0,
+            return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                  start_column=1, end_line=0, end_column=1,
+                                  start_line=93, start_column=10,
-                                  law_headings=[]), [], temp_a_16, temp_a_15)
+                                  end_line=93, end_column=11,
-        temp_a_17 = handle_default(SourcePosition(filename="", start_line=0,
+                                  law_headings=["Test inline defs in toplevel defs"]), [],
-                                   start_column=1, end_line=0, end_column=1,
+                                  temp_a_16, temp_a_15)
-                                   law_headings=[]), [temp_a_14], temp_a_13,
+        temp_a_17 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                   temp_a_12)
+                                   start_line=93, start_column=10,
+                                   end_line=93, end_column=11,
+                                   law_headings=["Test inline defs in toplevel defs"]), [temp_a_14],
+                                   temp_a_13, temp_a_12)
     except EmptyError:
         temp_a_17 = dead_value
         raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                             start_line=105, start_column=10,
+                                             start_line=93, start_column=10,
-                                             end_line=105, end_column=11,
+                                             end_line=93, end_column=11,
                                              law_headings=["Test inline defs in toplevel defs"]))
     a_2 = temp_a_17
     return S4(a = a_2)
@@ -537,13 +534,16 @@ def s(s_in:SIn):
                 return (glob1 * glob1)
             def temp_a_22(_:Unit):
                 return True
-            return handle_default(SourcePosition(filename="", start_line=0,
+            return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                  start_column=1, end_line=0, end_column=1,
+                                  start_line=7, start_column=10,
-                                  law_headings=[]), [], temp_a_22, temp_a_21)
+                                  end_line=7, end_column=11,
-        temp_a_23 = handle_default(SourcePosition(filename="", start_line=0,
+                                  law_headings=["Test basic toplevel values defs"]), [],
-                                   start_column=1, end_line=0, end_column=1,
+                                  temp_a_22, temp_a_21)
-                                   law_headings=[]), [temp_a_20], temp_a_19,
+        temp_a_23 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                   temp_a_18)
+                                   start_line=7, start_column=10,
+                                   end_line=7, end_column=11,
+                                   law_headings=["Test basic toplevel values defs"]), [temp_a_20],
+                                   temp_a_19, temp_a_18)
     except EmptyError:
         temp_a_23 = dead_value
         raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
@@ -561,13 +561,16 @@ def s(s_in:SIn):
                 return glob2
             def temp_b_4(_:Unit):
                 return True
-            return handle_default(SourcePosition(filename="", start_line=0,
+            return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                  start_column=1, end_line=0, end_column=1,
+                                  start_line=8, start_column=10,
-                                  law_headings=[]), [], temp_b_4, temp_b_3)
+                                  end_line=8, end_column=11,
-        temp_b_5 = handle_default(SourcePosition(filename="", start_line=0,
+                                  law_headings=["Test basic toplevel values defs"]), [],
-                                  start_column=1, end_line=0, end_column=1,
+                                  temp_b_4, temp_b_3)
-                                  law_headings=[]), [temp_b_2], temp_b_1,
+        temp_b_5 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",
-                                  temp_b)
+                                  start_line=8, start_column=10,
+                                  end_line=8, end_column=11,
+                                  law_headings=["Test basic toplevel values defs"]), [temp_b_2],
+                                  temp_b_1, temp_b)
     except EmptyError:
         temp_b_5 = dead_value
         raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en",