From 56b456d137956b8598a4adc7ffdb3084ac59ff5f Mon Sep 17 00:00:00 2001 From: Louis Gesbert Date: Fri, 3 May 2024 15:04:56 +0200 Subject: [PATCH] Message formatting: final touches --- compiler/catala_utils/message.ml | 1 + compiler/catala_utils/message.mli | 1 + compiler/catala_utils/pos.ml | 2 +- compiler/desugared/print.ml | 2 +- compiler/driver.ml | 6 +-- tests/arithmetic/good/priorities.catala_en | 1 - tests/arithmetic/good/rounding.catala_en | 1 - tests/arithmetic/good/trivial.catala_en | 1 - tests/array/good/aggregation.catala_en | 2 - tests/array/good/aggregation_2.catala_en | 2 - tests/array/good/aggregation_3.catala_en | 1 - tests/array/good/concatenation.catala_en | 1 - tests/array/good/filter.catala_en | 2 - tests/array/good/filter_map.catala_en | 2 - tests/array/good/fold.catala_en | 2 - tests/array/good/map.catala_en | 1 - tests/array/good/simple.catala_en | 2 - tests/array/good/simpler.catala_en | 1 - tests/array/good/simplest.catala_en | 1 - tests/bool/good/test_bool.catala_en | 1 - tests/bool/good/test_precedence.catala_en | 1 - tests/bool/good/test_xor.catala_en | 1 - tests/date/good/durations.catala_en | 1 - tests/date/good/rounding_option_en.catala_en | 1 - tests/date/good/rounding_option_fr.catala_fr | 1 - tests/date/good/simple.catala_en | 1 - tests/dec/good/infinite_precision.catala_en | 1 - tests/dec/good/rounding.catala_en | 1 - tests/dec/good/simple.catala_en | 1 - tests/dec/good/zero_after_comma.catala_en | 1 - .../good/mutliple_definitions.catala_en | 1 - tests/enum/bad/useless_wildcard.catala_en | 1 - tests/enum/good/disambiguated_cases.catala_en | 1 - tests/enum/good/quick_pattern_check.catala_en | 1 - tests/enum/good/simple.catala_en | 1 - tests/enum/good/wildcard.catala_en | 2 - .../exception/good/duplicate_labels.catala_en | 1 - tests/exception/good/exception.catala_en | 1 - .../good/exceptions_squared.catala_en | 1 - .../good/grouped_exceptions.catala_en | 1 - .../good/groups_of_exceptions.catala_en | 1 - .../good/same_label_two_variables.catala_en | 1 - .../good/split_unlabeled_exception.catala_en | 1 - .../two_exceptions_same_outcome.catala_en | 1 - .../good/two_unlabeled_exceptions.catala_en | 1 - .../good/unlabeled_exception.catala_en | 1 - .../unsorted_unlabeled_exceptions.catala_en | 1 - tests/func/bad/bad_func.catala_en | 1 - .../func/good/closure_through_scope.catala_en | 1 - tests/func/good/func.catala_en | 1 - tests/func/good/param_consistency.catala_en | 2 - .../scope_call_func_struct_closure.catala_en | 1 - .../good/test_grave_char_en.catala_en | 4 -- .../good/test_grave_char_fr.catala_fr | 1 - .../good/test_grave_char_pl.catala_pl | 1 - .../good/test_markup_refactoring.catala_en | 2 - tests/modules/good/external_use.catala_en | 1 - tests/modules/good/mod_def_context.catala_en | 3 -- tests/modules/good/mod_use.catala_en | 1 - tests/modules/good/mod_use2.catala_en | 2 - tests/modules/good/mod_use3.catala_en | 1 - tests/modules/good/mod_use_context.catala_en | 3 -- tests/modules/good/prorata_syntax.catala_en | 1 - tests/money/good/literal_parsing.catala_en | 1 - tests/money/good/simple.catala_en | 1 - tests/name_resolution/good/let_in.catala_en | 6 +-- tests/name_resolution/good/let_in2.catala_en | 1 - .../good/out_of_order.catala_en | 1 - .../good/toplevel_defs.catala_en | 40 +++++++++---------- .../good/toplevel_defs_simple.catala_en | 1 - .../scope/good/grand_parent_caller.catala_en | 3 -- .../good/local-capture-subscope.catala_en | 1 - tests/scope/good/out_sub_scope.catala_en | 1 - tests/scope/good/scope_call.catala_en | 1 - tests/scope/good/scope_call2.catala_en | 1 - tests/scope/good/scope_call3.catala_en | 1 - tests/scope/good/scope_call4.catala_en | 2 - tests/scope/good/scope_struct.catala_en | 1 - tests/scope/good/sub_scope.catala_en | 2 - tests/scope/good/sub_sub_scope.catala_en | 3 -- ...ubscope_function_arg_not_defined.catala_en | 1 - tests/struct/good/ambiguous_fields.catala_en | 1 - tests/struct/good/nested3.catala_en | 2 - tests/struct/good/same_name_fields.catala_en | 1 - tests/struct/good/simple.catala_en | 1 - tests/struct/good/struct_update.catala_en | 1 - tests/tuples/good/tuples.catala_en | 1 - tests/tuples/good/tuplists.catala_en | 1 - tests/typing/good/overload.catala_en | 1 - tests/variable_state/good/simple.catala_en | 1 - .../good/state_access.catala_en | 1 - tests/variable_state/good/subscope.catala_en | 1 - 92 files changed, 27 insertions(+), 140 deletions(-) diff --git a/compiler/catala_utils/message.ml b/compiler/catala_utils/message.ml index cd93603c1..fa6d1b12b 100644 --- a/compiler/catala_utils/message.ml +++ b/compiler/catala_utils/message.ml @@ -394,5 +394,6 @@ let make let debug = make ~level:Debug ~cont:emit let log = make ~level:Log ~cont:emit let result = make ~level:Result ~cont:emit +let results r = emit (List.flatten (List.map of_result r)) Result let warning = make ~level:Warning ~cont:emit let error = make ~level:Error ~cont:(fun m _ -> raise (CompilerError m)) diff --git a/compiler/catala_utils/message.mli b/compiler/catala_utils/message.mli index 60ec7061b..3e97c9a8b 100644 --- a/compiler/catala_utils/message.mli +++ b/compiler/catala_utils/message.mli @@ -99,3 +99,4 @@ val debug : ('a, unit) emitter val result : ('a, unit) emitter val warning : ('a, unit) emitter val error : ('a, 'b) emitter +val results : Content.message list -> unit diff --git a/compiler/catala_utils/pos.ml b/compiler/catala_utils/pos.ml index 9a115d408..ea150e0bd 100644 --- a/compiler/catala_utils/pos.ml +++ b/compiler/catala_utils/pos.ml @@ -129,7 +129,7 @@ let format_loc_text_parts (pos : t) = None ) else let pr_head ppf = - Format.fprintf ppf "@{─➤ %s:@}@," (to_string_short pos) + Format.fprintf ppf "@{─➤ @{%s:@}@}@," (to_string_short pos) in let pr_context, pr_legal = try diff --git a/compiler/desugared/print.ml b/compiler/desugared/print.ml index 303d5811b..483e7e03b 100644 --- a/compiler/desugared/print.ml +++ b/compiler/desugared/print.ml @@ -92,7 +92,7 @@ let print_exceptions_graph Ast.ScopeDef.format var ScopeName.format scope; Dependency.ExceptionsDependencies.iter_vertex (fun ex -> - Message.result "@[Definitions with label \"%a\":@]" LabelName.format + Message.result "Definitions with label@ \"%a\":" LabelName.format ex.Dependency.ExceptionVertex.label ~extra_pos: (List.map diff --git a/compiler/driver.ml b/compiler/driver.ml index d22df9d66..adfc07eed 100644 --- a/compiler/driver.ml +++ b/compiler/driver.ml @@ -691,9 +691,9 @@ module Commands = struct let language = Cli.file_lang (Global.input_src_file options.Global.input_src) in - Message.result "Computation successful!%s" - (if List.length results > 0 then " Results:" else "") - ~outcome: + if results = [] then Message.result "Computation successful!" + else + Message.results (List.map (fun ((var, _), result) ppf -> Format.fprintf ppf "@[%s@ =@ %a@]" var diff --git a/tests/arithmetic/good/priorities.catala_en b/tests/arithmetic/good/priorities.catala_en index 9778e8a83..9e0014a9f 100644 --- a/tests/arithmetic/good/priorities.catala_en +++ b/tests/arithmetic/good/priorities.catala_en @@ -27,7 +27,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │w = 0 │x = 4 │y = 4 diff --git a/tests/arithmetic/good/rounding.catala_en b/tests/arithmetic/good/rounding.catala_en index 6471c4ea4..a0ff83840 100644 --- a/tests/arithmetic/good/rounding.catala_en +++ b/tests/arithmetic/good/rounding.catala_en @@ -47,7 +47,6 @@ scope A: ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │o = false └─ ``` diff --git a/tests/arithmetic/good/trivial.catala_en b/tests/arithmetic/good/trivial.catala_en index b16e61382..291349965 100644 --- a/tests/arithmetic/good/trivial.catala_en +++ b/tests/arithmetic/good/trivial.catala_en @@ -21,7 +21,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │w = 6 └─ ``` diff --git a/tests/array/good/aggregation.catala_en b/tests/array/good/aggregation.catala_en index 5ccfd39f7..ac27e18e7 100644 --- a/tests/array/good/aggregation.catala_en +++ b/tests/array/good/aggregation.catala_en @@ -38,7 +38,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = [$0.00; $9.00; $5.20] └─ ``` @@ -46,7 +45,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │max = $18.00 │min = $5.00 │y = $17.20 diff --git a/tests/array/good/aggregation_2.catala_en b/tests/array/good/aggregation_2.catala_en index 7d74f2701..384a4d9e9 100644 --- a/tests/array/good/aggregation_2.catala_en +++ b/tests/array/good/aggregation_2.catala_en @@ -44,7 +44,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = │ [ │ S { -- id: 0 -- income: $0.00 }; S { -- id: 1 -- income: $9.00 }; @@ -56,7 +55,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │argmax = S { -- id: 1 -- income: $9.00 } │argmin = S { -- id: 0 -- income: $0.00 } └─ diff --git a/tests/array/good/aggregation_3.catala_en b/tests/array/good/aggregation_3.catala_en index 819db8afa..34d4309fa 100644 --- a/tests/array/good/aggregation_3.catala_en +++ b/tests/array/good/aggregation_3.catala_en @@ -95,7 +95,6 @@ let scope S (x: integer|internal|output) = ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │x = 0 └─ ``` diff --git a/tests/array/good/concatenation.catala_en b/tests/array/good/concatenation.catala_en index 876e8cfd2..d3c0c7c50 100644 --- a/tests/array/good/concatenation.catala_en +++ b/tests/array/good/concatenation.catala_en @@ -25,7 +25,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = [0; 1; 2; 3; 4; 5; 6] │y = [0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10] └─ diff --git a/tests/array/good/filter.catala_en b/tests/array/good/filter.catala_en index 1cb8dc08c..363084c1e 100644 --- a/tests/array/good/filter.catala_en +++ b/tests/array/good/filter.catala_en @@ -31,7 +31,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = [$0.00; $9.00; $5.20] └─ ``` @@ -39,7 +38,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │y = [$9.00; $5.20] └─ ``` diff --git a/tests/array/good/filter_map.catala_en b/tests/array/good/filter_map.catala_en index bea5d1470..3b4ef0dfd 100644 --- a/tests/array/good/filter_map.catala_en +++ b/tests/array/good/filter_map.catala_en @@ -32,7 +32,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = [$0.00; $9.00; $5.20] └─ ``` @@ -40,7 +39,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │y = [$9.00; $5.20] │z = [false; true; true] └─ diff --git a/tests/array/good/fold.catala_en b/tests/array/good/fold.catala_en index 7d74f2701..384a4d9e9 100644 --- a/tests/array/good/fold.catala_en +++ b/tests/array/good/fold.catala_en @@ -44,7 +44,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = │ [ │ S { -- id: 0 -- income: $0.00 }; S { -- id: 1 -- income: $9.00 }; @@ -56,7 +55,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │argmax = S { -- id: 1 -- income: $9.00 } │argmin = S { -- id: 0 -- income: $0.00 } └─ diff --git a/tests/array/good/map.catala_en b/tests/array/good/map.catala_en index 62ec80a6b..cc2b628ec 100644 --- a/tests/array/good/map.catala_en +++ b/tests/array/good/map.catala_en @@ -25,7 +25,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │x = [$4.00; $8.00] │z = [false; true] └─ diff --git a/tests/array/good/simple.catala_en b/tests/array/good/simple.catala_en index 74cbf1f51..d22714608 100644 --- a/tests/array/good/simple.catala_en +++ b/tests/array/good/simple.catala_en @@ -36,7 +36,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = [0; 9; 64] └─ ``` @@ -44,7 +43,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │v = 3 │w = true │y = true diff --git a/tests/array/good/simpler.catala_en b/tests/array/good/simpler.catala_en index c621dd0a9..fcbbc138a 100644 --- a/tests/array/good/simpler.catala_en +++ b/tests/array/good/simpler.catala_en @@ -25,7 +25,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │w = false │x = [0; 9; 64] └─ diff --git a/tests/array/good/simplest.catala_en b/tests/array/good/simplest.catala_en index bbbb53498..ae6b45985 100644 --- a/tests/array/good/simplest.catala_en +++ b/tests/array/good/simplest.catala_en @@ -23,7 +23,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = [0; 4; 8] └─ ``` diff --git a/tests/bool/good/test_bool.catala_en b/tests/bool/good/test_bool.catala_en index 34acfef66..ce1d1fe57 100644 --- a/tests/bool/good/test_bool.catala_en +++ b/tests/bool/good/test_bool.catala_en @@ -48,7 +48,6 @@ TestBool ```catala-test-inline $ catala test-scope TestBool ┌─[RESULT]─ -│Computation successful! Results: │bar = 1 │foo = true └─ diff --git a/tests/bool/good/test_precedence.catala_en b/tests/bool/good/test_precedence.catala_en index 4545ffc43..d2f760374 100644 --- a/tests/bool/good/test_precedence.catala_en +++ b/tests/bool/good/test_precedence.catala_en @@ -23,7 +23,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope TestBool ┌─[RESULT]─ -│Computation successful! Results: │foo = true └─ ``` diff --git a/tests/bool/good/test_xor.catala_en b/tests/bool/good/test_xor.catala_en index 1387b7265..291ca07d3 100644 --- a/tests/bool/good/test_xor.catala_en +++ b/tests/bool/good/test_xor.catala_en @@ -29,7 +29,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope TestXor ┌─[RESULT]─ -│Computation successful! Results: │f_xor_f = false │f_xor_t = true │t_xor_f = true diff --git a/tests/date/good/durations.catala_en b/tests/date/good/durations.catala_en index 38f33ade7..00dae0f5c 100644 --- a/tests/date/good/durations.catala_en +++ b/tests/date/good/durations.catala_en @@ -38,7 +38,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │m = [11874 days] │m2 = [6 months] │x = 2019-01-01 diff --git a/tests/date/good/rounding_option_en.catala_en b/tests/date/good/rounding_option_en.catala_en index 79553159a..26762202b 100644 --- a/tests/date/good/rounding_option_en.catala_en +++ b/tests/date/good/rounding_option_en.catala_en @@ -37,7 +37,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Test ┌─[RESULT]─ -│Computation successful! Results: │r = true └─ ``` diff --git a/tests/date/good/rounding_option_fr.catala_fr b/tests/date/good/rounding_option_fr.catala_fr index 9e5b1ec4b..ac0e9656d 100644 --- a/tests/date/good/rounding_option_fr.catala_fr +++ b/tests/date/good/rounding_option_fr.catala_fr @@ -37,7 +37,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Test ┌─[RESULT]─ -│Computation successful! Results: │r = vrai └─ ``` diff --git a/tests/date/good/simple.catala_en b/tests/date/good/simple.catala_en index 51448dce4..bbd4efd5e 100644 --- a/tests/date/good/simple.catala_en +++ b/tests/date/good/simple.catala_en @@ -27,7 +27,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 2019-01-01 │y = 2002-09-30 │z = [5937 days] diff --git a/tests/dec/good/infinite_precision.catala_en b/tests/dec/good/infinite_precision.catala_en index b7a27ecad..2f82c0566 100644 --- a/tests/dec/good/infinite_precision.catala_en +++ b/tests/dec/good/infinite_precision.catala_en @@ -29,7 +29,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │a = │ -0.000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,078,695,580,959,228,473,468… │x = 84.648,665,652,656,896,23 diff --git a/tests/dec/good/rounding.catala_en b/tests/dec/good/rounding.catala_en index 93becf286..0f2fd4996 100644 --- a/tests/dec/good/rounding.catala_en +++ b/tests/dec/good/rounding.catala_en @@ -29,7 +29,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 84.648,665 │x1 = 85.0 │y = 4.368,297 diff --git a/tests/dec/good/simple.catala_en b/tests/dec/good/simple.catala_en index fb856420b..a1e1f271a 100644 --- a/tests/dec/good/simple.catala_en +++ b/tests/dec/good/simple.catala_en @@ -29,7 +29,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │k = 0.333,333,333,333,333,333,33… │x = 84.648,665 │y = 4.368,297 diff --git a/tests/dec/good/zero_after_comma.catala_en b/tests/dec/good/zero_after_comma.catala_en index 25c8c88ef..5bc7fdb2a 100644 --- a/tests/dec/good/zero_after_comma.catala_en +++ b/tests/dec/good/zero_after_comma.catala_en @@ -26,7 +26,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 4.0 │y = 1.04 └─ diff --git a/tests/default/good/mutliple_definitions.catala_en b/tests/default/good/mutliple_definitions.catala_en index dd73c86ec..fd3c8fc9f 100644 --- a/tests/default/good/mutliple_definitions.catala_en +++ b/tests/default/good/mutliple_definitions.catala_en @@ -54,7 +54,6 @@ $ catala test-scope A │ │ ‾‾‾‾‾‾‾‾‾‾‾‾ └─ ┌─[RESULT]─ -│Computation successful! Results: │w = 3 └─ ``` diff --git a/tests/enum/bad/useless_wildcard.catala_en b/tests/enum/bad/useless_wildcard.catala_en index 73957b0fe..b2491d156 100644 --- a/tests/enum/bad/useless_wildcard.catala_en +++ b/tests/enum/bad/useless_wildcard.catala_en @@ -30,7 +30,6 @@ $ catala test-scope A │ │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └─ Useless wildcard ┌─[RESULT]─ -│Computation successful! Results: │x = Case1 () │y = 42 └─ diff --git a/tests/enum/good/disambiguated_cases.catala_en b/tests/enum/good/disambiguated_cases.catala_en index 5ba84a562..3ec42e41d 100644 --- a/tests/enum/good/disambiguated_cases.catala_en +++ b/tests/enum/good/disambiguated_cases.catala_en @@ -36,7 +36,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │e = Case1 () │f = Case1 2 │x = 2 diff --git a/tests/enum/good/quick_pattern_check.catala_en b/tests/enum/good/quick_pattern_check.catala_en index bd41fe96d..888d23ce7 100644 --- a/tests/enum/good/quick_pattern_check.catala_en +++ b/tests/enum/good/quick_pattern_check.catala_en @@ -31,7 +31,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = Case1 2 │y = true │z = false diff --git a/tests/enum/good/simple.catala_en b/tests/enum/good/simple.catala_en index fdaa21ca2..85c06dcd6 100644 --- a/tests/enum/good/simple.catala_en +++ b/tests/enum/good/simple.catala_en @@ -31,7 +31,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = Case1 2 │y = 42 └─ diff --git a/tests/enum/good/wildcard.catala_en b/tests/enum/good/wildcard.catala_en index 4f89f690f..b706ddc52 100644 --- a/tests/enum/good/wildcard.catala_en +++ b/tests/enum/good/wildcard.catala_en @@ -51,7 +51,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Simple_case_2 ┌─[RESULT]─ -│Computation successful! Results: │x = Case3 () │y = 31 └─ @@ -60,7 +59,6 @@ $ catala test-scope Simple_case_2 ```catala-test-inline $ catala test-scope Simple_case ┌─[RESULT]─ -│Computation successful! Results: │x = Case1 2 │y = 31 └─ diff --git a/tests/exception/good/duplicate_labels.catala_en b/tests/exception/good/duplicate_labels.catala_en index 17fabddcc..265166073 100644 --- a/tests/exception/good/duplicate_labels.catala_en +++ b/tests/exception/good/duplicate_labels.catala_en @@ -33,7 +33,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 0 │y = 0 └─ diff --git a/tests/exception/good/exception.catala_en b/tests/exception/good/exception.catala_en index 88cf816c0..06192e071 100644 --- a/tests/exception/good/exception.catala_en +++ b/tests/exception/good/exception.catala_en @@ -27,7 +27,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 1 └─ ``` diff --git a/tests/exception/good/exceptions_squared.catala_en b/tests/exception/good/exceptions_squared.catala_en index 78e5a94ed..a031bfe00 100644 --- a/tests/exception/good/exceptions_squared.catala_en +++ b/tests/exception/good/exceptions_squared.catala_en @@ -31,7 +31,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 2 └─ ``` diff --git a/tests/exception/good/grouped_exceptions.catala_en b/tests/exception/good/grouped_exceptions.catala_en index a56171338..55a1b8221 100644 --- a/tests/exception/good/grouped_exceptions.catala_en +++ b/tests/exception/good/grouped_exceptions.catala_en @@ -61,7 +61,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Benefit ┌─[RESULT]─ -│Computation successful! Results: │benefit = $2,000.00 │person = Person { -- age: 26 -- disabled: true } └─ diff --git a/tests/exception/good/groups_of_exceptions.catala_en b/tests/exception/good/groups_of_exceptions.catala_en index a2740b828..44ac667d2 100644 --- a/tests/exception/good/groups_of_exceptions.catala_en +++ b/tests/exception/good/groups_of_exceptions.catala_en @@ -55,7 +55,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Test ┌─[RESULT]─ -│Computation successful! Results: │x = 2 └─ ``` diff --git a/tests/exception/good/same_label_two_variables.catala_en b/tests/exception/good/same_label_two_variables.catala_en index 7a369d0aa..27e28761d 100644 --- a/tests/exception/good/same_label_two_variables.catala_en +++ b/tests/exception/good/same_label_two_variables.catala_en @@ -34,7 +34,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 0 │y = 1 │z = 0 diff --git a/tests/exception/good/split_unlabeled_exception.catala_en b/tests/exception/good/split_unlabeled_exception.catala_en index af1dfc35b..c2f054d75 100644 --- a/tests/exception/good/split_unlabeled_exception.catala_en +++ b/tests/exception/good/split_unlabeled_exception.catala_en @@ -29,7 +29,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 1 └─ ``` diff --git a/tests/exception/good/two_exceptions_same_outcome.catala_en b/tests/exception/good/two_exceptions_same_outcome.catala_en index efa7bc261..18c6c6e03 100644 --- a/tests/exception/good/two_exceptions_same_outcome.catala_en +++ b/tests/exception/good/two_exceptions_same_outcome.catala_en @@ -35,7 +35,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 0 └─ ``` diff --git a/tests/exception/good/two_unlabeled_exceptions.catala_en b/tests/exception/good/two_unlabeled_exceptions.catala_en index 93bd4db86..f9268e094 100644 --- a/tests/exception/good/two_unlabeled_exceptions.catala_en +++ b/tests/exception/good/two_unlabeled_exceptions.catala_en @@ -32,7 +32,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 1 │y = 3 └─ diff --git a/tests/exception/good/unlabeled_exception.catala_en b/tests/exception/good/unlabeled_exception.catala_en index 017835291..142d15deb 100644 --- a/tests/exception/good/unlabeled_exception.catala_en +++ b/tests/exception/good/unlabeled_exception.catala_en @@ -26,7 +26,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 1 └─ ``` diff --git a/tests/exception/good/unsorted_unlabeled_exceptions.catala_en b/tests/exception/good/unsorted_unlabeled_exceptions.catala_en index 63743b797..0bd0ca9fd 100644 --- a/tests/exception/good/unsorted_unlabeled_exceptions.catala_en +++ b/tests/exception/good/unsorted_unlabeled_exceptions.catala_en @@ -32,7 +32,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 1 │y = 2 └─ diff --git a/tests/func/bad/bad_func.catala_en b/tests/func/bad/bad_func.catala_en index 1c6099f57..1c59d85a1 100644 --- a/tests/func/bad/bad_func.catala_en +++ b/tests/func/bad/bad_func.catala_en @@ -24,7 +24,6 @@ scope R: ```catala-test-inline $ catala test-scope R ┌─[RESULT]─ -│Computation successful! Results: │r = 30 └─ ``` diff --git a/tests/func/good/closure_through_scope.catala_en b/tests/func/good/closure_through_scope.catala_en index 1eae67412..1cafb3de6 100644 --- a/tests/func/good/closure_through_scope.catala_en +++ b/tests/func/good/closure_through_scope.catala_en @@ -47,7 +47,6 @@ let scope T (T_in: T_in): T {y: integer} = ```catala-test-inline $ catala Interpret --lcalc -s T --avoid-exceptions -O --closure-conversion ┌─[RESULT]─ -│Computation successful! Results: │y = -2 └─ ``` diff --git a/tests/func/good/func.catala_en b/tests/func/good/func.catala_en index e78a905f0..7d78dae01 100644 --- a/tests/func/good/func.catala_en +++ b/tests/func/good/func.catala_en @@ -36,7 +36,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope R ┌─[RESULT]─ -│Computation successful! Results: │r = 30 └─ ``` diff --git a/tests/func/good/param_consistency.catala_en b/tests/func/good/param_consistency.catala_en index de5f7aece..d2a9bc03a 100644 --- a/tests/func/good/param_consistency.catala_en +++ b/tests/func/good/param_consistency.catala_en @@ -48,7 +48,6 @@ scope T1: ```catala-test-inline $ catala test-scope T1 ┌─[RESULT]─ -│Computation successful! Results: │o1 = 20.0 │o2 = 5.0 └─ @@ -76,7 +75,6 @@ scope T2: ```catala-test-inline $ catala test-scope T2 ┌─[RESULT]─ -│Computation successful! Results: │o = 40.0 └─ ``` diff --git a/tests/func/good/scope_call_func_struct_closure.catala_en b/tests/func/good/scope_call_func_struct_closure.catala_en index 2dd8bf283..906c25537 100644 --- a/tests/func/good/scope_call_func_struct_closure.catala_en +++ b/tests/func/good/scope_call_func_struct_closure.catala_en @@ -164,7 +164,6 @@ let scope Foo ```catala-test-inline $ catala Interpret --lcalc -s Foo --avoid-exceptions -O --closure-conversion ┌─[RESULT]─ -│Computation successful! Results: │z = 11 └─ ``` diff --git a/tests/literate/good/test_grave_char_en.catala_en b/tests/literate/good/test_grave_char_en.catala_en index fd311c3c6..100b1c464 100644 --- a/tests/literate/good/test_grave_char_en.catala_en +++ b/tests/literate/good/test_grave_char_en.catala_en @@ -44,7 +44,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │literate_parsing_is_ok = true └─ ``` @@ -52,7 +51,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │literate_parsing_is_ok = true └─ ``` @@ -110,7 +108,6 @@ $ catala Typecheck --check-invariants \begin{verbatim} $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │literate_parsing_is_ok = true └─ \end{verbatim} @@ -118,7 +115,6 @@ $ catala test-scope A \begin{verbatim} $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │literate_parsing_is_ok = true └─ \end{verbatim} diff --git a/tests/literate/good/test_grave_char_fr.catala_fr b/tests/literate/good/test_grave_char_fr.catala_fr index 4ab3629a8..ad29196e9 100644 --- a/tests/literate/good/test_grave_char_fr.catala_fr +++ b/tests/literate/good/test_grave_char_fr.catala_fr @@ -42,7 +42,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │literate_parsing_is_ok = vrai └─ ``` diff --git a/tests/literate/good/test_grave_char_pl.catala_pl b/tests/literate/good/test_grave_char_pl.catala_pl index 37bbef39b..e77729c00 100644 --- a/tests/literate/good/test_grave_char_pl.catala_pl +++ b/tests/literate/good/test_grave_char_pl.catala_pl @@ -30,7 +30,6 @@ int main(void) { return 0; } ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │literate_parsing_is_ok = prawda └─ ``` diff --git a/tests/metadata/good/test_markup_refactoring.catala_en b/tests/metadata/good/test_markup_refactoring.catala_en index 0d32ea0c1..a5ef91b22 100644 --- a/tests/metadata/good/test_markup_refactoring.catala_en +++ b/tests/metadata/good/test_markup_refactoring.catala_en @@ -43,7 +43,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope S2 ┌─[RESULT]─ -│Computation successful! Results: │b = B () └─ ``` @@ -51,7 +50,6 @@ $ catala test-scope S2 ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │a = A () └─ ``` diff --git a/tests/modules/good/external_use.catala_en b/tests/modules/good/external_use.catala_en index 996757cda..8efb8d07d 100644 --- a/tests/modules/good/external_use.catala_en +++ b/tests/modules/good/external_use.catala_en @@ -19,7 +19,6 @@ scope S: ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │result1 = [$3.33; $0.83; $0.83; $3.33; $0.83; $0.85] │result2 = [$3.33; $0.83; $0.83; $3.34; $0.84; $0.83] └─ diff --git a/tests/modules/good/mod_def_context.catala_en b/tests/modules/good/mod_def_context.catala_en index c5a80e333..c060020d4 100644 --- a/tests/modules/good/mod_def_context.catala_en +++ b/tests/modules/good/mod_def_context.catala_en @@ -71,7 +71,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Stest ┌─[RESULT]─ -│Computation successful! Results: │o1 = S { -- ci: 0 -- cm: $0.00 -- cfun1: -- cfun2: } │o2 = S { -- ci: 1 -- cm: $1.00 -- cfun1: -- cfun2: } │x11 = 12.0 @@ -102,7 +101,6 @@ scope TestSubDefault: ```catala-test-inline $ catala test-scope TestSubDefault ┌─[RESULT]─ -│Computation successful! Results: │ci = 0 │cm = $0.00 │x11 = 12.0 @@ -132,7 +130,6 @@ scope TestSubOverride: ```catala-test-inline $ catala test-scope TestSubOverride ┌─[RESULT]─ -│Computation successful! Results: │ci = 1 │cm = $1.00 │x21 = 8.0 diff --git a/tests/modules/good/mod_use.catala_en b/tests/modules/good/mod_use.catala_en index 919da94fd..c273a374b 100644 --- a/tests/modules/good/mod_use.catala_en +++ b/tests/modules/good/mod_use.catala_en @@ -38,7 +38,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope T2 ┌─[RESULT]─ -│Computation successful! Results: │o1 = No () │o2 = Maybe () │o3 = $1,000.00 diff --git a/tests/modules/good/mod_use2.catala_en b/tests/modules/good/mod_use2.catala_en index a7dc1d35c..fdc80716f 100644 --- a/tests/modules/good/mod_use2.catala_en +++ b/tests/modules/good/mod_use2.catala_en @@ -30,7 +30,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope T ┌─[RESULT]─ -│Computation successful! Results: │o1 = Mod_def.S { -- sr: $1,000.00 -- e1: Maybe () } │o2 = $2,500.00 │o3 = $132.00 @@ -44,7 +43,6 @@ The following tests multiple inclusion of the same module (Mod_def is used throu ```catala-test-inline $ catala test-scope T2 ┌─[RESULT]─ -│Computation successful! Results: │o1 = No () │o2 = Maybe () │o3 = $1,000.00 diff --git a/tests/modules/good/mod_use3.catala_en b/tests/modules/good/mod_use3.catala_en index e013ecb94..0c521ea71 100644 --- a/tests/modules/good/mod_use3.catala_en +++ b/tests/modules/good/mod_use3.catala_en @@ -34,7 +34,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope T ┌─[RESULT]─ -│Computation successful! Results: │o1 = Mod_def.S { -- sr: $1,000.00 -- e1: Maybe () } │o2 = $2,500.00 │o3 = $132.00 diff --git a/tests/modules/good/mod_use_context.catala_en b/tests/modules/good/mod_use_context.catala_en index 932448b26..abb5a230b 100644 --- a/tests/modules/good/mod_use_context.catala_en +++ b/tests/modules/good/mod_use_context.catala_en @@ -55,7 +55,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope TestCall ┌─[RESULT]─ -│Computation successful! Results: │o_default = │ Mod_def_context.S { │ -- ci: 0 @@ -99,7 +98,6 @@ scope TestSubDefault: ```catala-test-inline $ catala test-scope TestSubDefault ┌─[RESULT]─ -│Computation successful! Results: │ci = 0 │cm = $0.00 │x11 = 12.0 @@ -129,7 +127,6 @@ scope TestSubOverride: ```catala-test-inline $ catala test-scope TestSubOverride ┌─[RESULT]─ -│Computation successful! Results: │ci = 1 │cm = $1.00 │x21 = 8.0 diff --git a/tests/modules/good/prorata_syntax.catala_en b/tests/modules/good/prorata_syntax.catala_en index 734e542de..074a71c71 100644 --- a/tests/modules/good/prorata_syntax.catala_en +++ b/tests/modules/good/prorata_syntax.catala_en @@ -47,7 +47,6 @@ $ catala typecheck --check-invariants ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │result = │ [ │ HouseholdMemberTaxed { diff --git a/tests/money/good/literal_parsing.catala_en b/tests/money/good/literal_parsing.catala_en index 02180ac82..5d20f6431 100644 --- a/tests/money/good/literal_parsing.catala_en +++ b/tests/money/good/literal_parsing.catala_en @@ -26,7 +26,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = $0.30 │y = -$0.30 └─ diff --git a/tests/money/good/simple.catala_en b/tests/money/good/simple.catala_en index 1f57deeee..f6b8d11ab 100644 --- a/tests/money/good/simple.catala_en +++ b/tests/money/good/simple.catala_en @@ -27,7 +27,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = $123.54 │y = $8,548,650.96 │z = $7.23 diff --git a/tests/name_resolution/good/let_in.catala_en b/tests/name_resolution/good/let_in.catala_en index cfb4890ce..f4817d2a1 100644 --- a/tests/name_resolution/good/let_in.catala_en +++ b/tests/name_resolution/good/let_in.catala_en @@ -40,7 +40,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │a = A { -- x: -2.0 -- y: B { -- y: false -- z: -1.0 } } │b = B { -- y: true -- z: 42.0 } └─ @@ -66,13 +65,12 @@ $ catala test-scope S2 │ Unused varible: x does not contribute to computing any of scope S2 │ outputs. Did you forget something? │ -├─➤ tests/name_resolution/good/let_in.catala_en:53.4-53.5: +├─➤ tests/name_resolution/good/let_in.catala_en:52.4-52.5: │ │ -│ 53 │ x scope S +│ 52 │ x scope S │ │ ‾ └─ Check scope of let-in vs scope variable ┌─[RESULT]─ -│Computation successful! Results: │y = 1 └─ ``` diff --git a/tests/name_resolution/good/let_in2.catala_en b/tests/name_resolution/good/let_in2.catala_en index 1c5eea2d8..6b41d0630 100644 --- a/tests/name_resolution/good/let_in2.catala_en +++ b/tests/name_resolution/good/let_in2.catala_en @@ -28,7 +28,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │a = true └─ ``` diff --git a/tests/name_resolution/good/out_of_order.catala_en b/tests/name_resolution/good/out_of_order.catala_en index d9efc484e..791b1e1dd 100644 --- a/tests/name_resolution/good/out_of_order.catala_en +++ b/tests/name_resolution/good/out_of_order.catala_en @@ -33,7 +33,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │a = A { -- x: 0 -- y: B { -- y: true -- z: 0.0 } } │b = B { -- y: true -- z: 0.0 } └─ diff --git a/tests/name_resolution/good/toplevel_defs.catala_en b/tests/name_resolution/good/toplevel_defs.catala_en index 55f844e6c..41c49889d 100644 --- a/tests/name_resolution/good/toplevel_defs.catala_en +++ b/tests/name_resolution/good/toplevel_defs.catala_en @@ -34,7 +34,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │a = 1,946.574,4 │b = A { -- y: true -- z: 2,091.0 } └─ @@ -57,7 +56,6 @@ scope S2: ```catala-test-inline $ catala test-scope S2 ┌─[RESULT]─ -│Computation successful! Results: │a = 154.0 └─ ``` @@ -79,7 +77,6 @@ scope S3: ```catala-test-inline $ catala test-scope S3 ┌─[RESULT]─ -│Computation successful! Results: │a = 2,480.0 └─ ``` @@ -104,7 +101,6 @@ scope S4: ```catala-test-inline $ catala test-scope S4 ┌─[RESULT]─ -│Computation successful! Results: │a = 6,001.0 └─ ``` @@ -438,8 +434,8 @@ def s2(s2_in:S2In): return (glob3(money_of_cents_string("4400")) + decimal_of_string("100.")) return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=54, start_column=24, - end_line=54, end_column=43, + start_line=53, start_column=24, + end_line=53, end_column=43, law_headings=["Test toplevel function defs"]), [], temp_a_1, temp_a_2) def temp_a_3(_:Unit): @@ -447,15 +443,15 @@ def s2(s2_in:S2In): def temp_a_4(_:Unit): raise Empty temp_a_5 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=51, start_column=10, - end_line=51, end_column=11, + start_line=50, start_column=10, + end_line=50, end_column=11, law_headings=["Test toplevel function defs"]), [temp_a], temp_a_3, temp_a_4) except Empty: raise NoValue(SourcePosition( filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=51, start_column=10, - end_line=51, end_column=11, + start_line=50, start_column=10, + end_line=50, end_column=11, law_headings=["Test toplevel function defs"])) a = temp_a_5 return S2(a = a) @@ -470,8 +466,8 @@ def s3(s3_in:S3In): glob4(money_of_cents_string("4400"), decimal_of_string("55."))) return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=76, start_column=24, - end_line=76, end_column=47, + start_line=74, start_column=24, + end_line=74, end_column=47, law_headings=["Test function def with two args"]), [], temp_a_7, temp_a_8) def temp_a_9(_:Unit): @@ -479,15 +475,15 @@ def s3(s3_in:S3In): def temp_a_10(_:Unit): raise Empty temp_a_11 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=73, start_column=10, - end_line=73, end_column=11, + start_line=71, start_column=10, + end_line=71, end_column=11, law_headings=["Test function def with two args"]), [temp_a_6], temp_a_9, temp_a_10) except Empty: raise NoValue(SourcePosition( filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=73, start_column=10, - end_line=73, end_column=11, + start_line=71, start_column=10, + end_line=71, end_column=11, law_headings=["Test function def with two args"])) a_1 = temp_a_11 return S3(a = a_1) @@ -500,8 +496,8 @@ def s4(s4_in:S4In): def temp_a_14(_:Unit): return (glob5 + decimal_of_string("1.")) return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=101, start_column=24, - end_line=101, end_column=34, + start_line=98, start_column=24, + end_line=98, end_column=34, law_headings=["Test inline defs in toplevel defs"]), [], temp_a_13, temp_a_14) def temp_a_15(_:Unit): @@ -509,15 +505,15 @@ def s4(s4_in:S4In): def temp_a_16(_:Unit): raise Empty temp_a_17 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=98, start_column=10, - end_line=98, end_column=11, + start_line=95, start_column=10, + end_line=95, end_column=11, law_headings=["Test inline defs in toplevel defs"]), [temp_a_12], temp_a_15, temp_a_16) except Empty: raise NoValue(SourcePosition( filename="tests/name_resolution/good/toplevel_defs.catala_en", - start_line=98, start_column=10, - end_line=98, end_column=11, + start_line=95, start_column=10, + end_line=95, end_column=11, law_headings=["Test inline defs in toplevel defs"])) a_2 = temp_a_17 return S4(a = a_2) diff --git a/tests/name_resolution/good/toplevel_defs_simple.catala_en b/tests/name_resolution/good/toplevel_defs_simple.catala_en index c79bccd13..36fb02785 100644 --- a/tests/name_resolution/good/toplevel_defs_simple.catala_en +++ b/tests/name_resolution/good/toplevel_defs_simple.catala_en @@ -25,7 +25,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │a = true └─ ``` diff --git a/tests/scope/good/grand_parent_caller.catala_en b/tests/scope/good/grand_parent_caller.catala_en index 985f834c7..794e1da3b 100644 --- a/tests/scope/good/grand_parent_caller.catala_en +++ b/tests/scope/good/grand_parent_caller.catala_en @@ -44,7 +44,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │x = 0 └─ ``` @@ -52,7 +51,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │y1 = 1 │y2 = 1 └─ @@ -61,7 +59,6 @@ $ catala test-scope B ```catala-test-inline $ catala test-scope C ┌─[RESULT]─ -│Computation successful! Results: │z1 = 2 │z2 = 2 └─ diff --git a/tests/scope/good/local-capture-subscope.catala_en b/tests/scope/good/local-capture-subscope.catala_en index 9b69abf33..e6e6dd92d 100644 --- a/tests/scope/good/local-capture-subscope.catala_en +++ b/tests/scope/good/local-capture-subscope.catala_en @@ -31,7 +31,6 @@ $ catala test-scope S │ │ ‾ └─ ┌─[RESULT]─ -│Computation successful! Results: │so = 42 └─ ``` diff --git a/tests/scope/good/out_sub_scope.catala_en b/tests/scope/good/out_sub_scope.catala_en index b250dd7ca..f91f20673 100644 --- a/tests/scope/good/out_sub_scope.catala_en +++ b/tests/scope/good/out_sub_scope.catala_en @@ -22,7 +22,6 @@ scope B: ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │a = A { -- o: 99 -- io: 100 } │b = 99 └─ diff --git a/tests/scope/good/scope_call.catala_en b/tests/scope/good/scope_call.catala_en index fd71ad4f3..da8ee52f8 100644 --- a/tests/scope/good/scope_call.catala_en +++ b/tests/scope/good/scope_call.catala_en @@ -35,7 +35,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Foo ┌─[RESULT]─ -│Computation successful! Results: │example = -7 └─ ``` diff --git a/tests/scope/good/scope_call2.catala_en b/tests/scope/good/scope_call2.catala_en index 8c077ff96..c5bb58265 100644 --- a/tests/scope/good/scope_call2.catala_en +++ b/tests/scope/good/scope_call2.catala_en @@ -53,7 +53,6 @@ $ catala test-scope Titi │ │ ‾‾‾‾ └─ ┌─[RESULT]─ -│Computation successful! Results: │fizz = Toto { -- foo: 1,213 } │fuzz = Toto { -- foo: 1,323 } └─ diff --git a/tests/scope/good/scope_call3.catala_en b/tests/scope/good/scope_call3.catala_en index 770e71e4f..4c5af2099 100644 --- a/tests/scope/good/scope_call3.catala_en +++ b/tests/scope/good/scope_call3.catala_en @@ -91,7 +91,6 @@ $ catala Interpret -t -s HousingComputation --debug [LOG] ≔ HousingComputation.result: 3 [DEBUG] End of interpretation ┌─[RESULT]─ -│Computation successful! Results: │f = λ (x: integer) → │ error_empty │ ⟨ ⟨true diff --git a/tests/scope/good/scope_call4.catala_en b/tests/scope/good/scope_call4.catala_en index 9d60e1508..f59a9081c 100644 --- a/tests/scope/good/scope_call4.catala_en +++ b/tests/scope/good/scope_call4.catala_en @@ -52,7 +52,6 @@ $ catala interpret -s RentComputation --debug [DEBUG] Starting interpretation... [DEBUG] End of interpretation ┌─[RESULT]─ -│Computation successful! Results: │f1 = λ (x: integer) → │ error_empty │ ⟨ ⟨true @@ -90,7 +89,6 @@ $ catala Interpret --lcalc -s RentComputation --avoid-exceptions --optimize --de [DEBUG] Starting interpretation... [DEBUG] End of interpretation ┌─[RESULT]─ -│Computation successful! Results: │f1 = λ (x: integer) → let x1 : integer = x + 1 in │ ((x1 + 1)) │f2 = λ (x: integer) → let x1 : integer = x + 1 in diff --git a/tests/scope/good/scope_struct.catala_en b/tests/scope/good/scope_struct.catala_en index 623051f2a..c55b62dc8 100644 --- a/tests/scope/good/scope_struct.catala_en +++ b/tests/scope/good/scope_struct.catala_en @@ -36,7 +36,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Foo ┌─[RESULT]─ -│Computation successful! Results: │example = SubFoo { -- z1: 4 -- z2: 0 } └─ ``` diff --git a/tests/scope/good/sub_scope.catala_en b/tests/scope/good/sub_scope.catala_en index 711286f09..4902f3a7a 100644 --- a/tests/scope/good/sub_scope.catala_en +++ b/tests/scope/good/sub_scope.catala_en @@ -38,7 +38,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │a = -1 │a_base = 1 │b = false @@ -48,7 +47,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │a = 42 │b = true └─ diff --git a/tests/scope/good/sub_sub_scope.catala_en b/tests/scope/good/sub_sub_scope.catala_en index f94a4bf9a..8c678b5cf 100644 --- a/tests/scope/good/sub_sub_scope.catala_en +++ b/tests/scope/good/sub_sub_scope.catala_en @@ -85,7 +85,6 @@ $ catala test-scope A │ │ ‾ └─ Article ┌─[RESULT]─ -│Computation successful! Results: │u = true │x = 0 └─ @@ -114,7 +113,6 @@ $ catala test-scope B │ │ ‾ └─ Article ┌─[RESULT]─ -│Computation successful! Results: │y = 1 └─ ``` @@ -142,7 +140,6 @@ $ catala test-scope C │ │ ‾ └─ Article ┌─[RESULT]─ -│Computation successful! Results: │z = 2 └─ ``` diff --git a/tests/scope/good/subscope_function_arg_not_defined.catala_en b/tests/scope/good/subscope_function_arg_not_defined.catala_en index ec76c7c25..07227b53d 100644 --- a/tests/scope/good/subscope_function_arg_not_defined.catala_en +++ b/tests/scope/good/subscope_function_arg_not_defined.catala_en @@ -32,7 +32,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope Caller ┌─[RESULT]─ -│Computation successful! Results: │y = 1 └─ ``` diff --git a/tests/struct/good/ambiguous_fields.catala_en b/tests/struct/good/ambiguous_fields.catala_en index 854ea3cff..1eb57affc 100644 --- a/tests/struct/good/ambiguous_fields.catala_en +++ b/tests/struct/good/ambiguous_fields.catala_en @@ -49,7 +49,6 @@ $ catala test-scope A │ │ ‾‾‾ └─ Article ┌─[RESULT]─ -│Computation successful! Results: │y = 1 └─ ``` diff --git a/tests/struct/good/nested3.catala_en b/tests/struct/good/nested3.catala_en index 03b577c20..17436c2db 100644 --- a/tests/struct/good/nested3.catala_en +++ b/tests/struct/good/nested3.catala_en @@ -49,7 +49,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │t = T { -- a: S { -- x: 0 -- y: false } -- b: S { -- x: 1 -- y: true } } └─ ``` @@ -57,7 +56,6 @@ $ catala test-scope A ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │out = 1 │t = T { -- a: S { -- x: 0 -- y: false } -- b: S { -- x: 1 -- y: true } } └─ diff --git a/tests/struct/good/same_name_fields.catala_en b/tests/struct/good/same_name_fields.catala_en index ec66e742e..36aa0195f 100644 --- a/tests/struct/good/same_name_fields.catala_en +++ b/tests/struct/good/same_name_fields.catala_en @@ -49,7 +49,6 @@ $ catala test-scope A │ │ ‾‾‾ └─ Article ┌─[RESULT]─ -│Computation successful! Results: │x = Foo { -- f: 1 } │y = 1 └─ diff --git a/tests/struct/good/simple.catala_en b/tests/struct/good/simple.catala_en index 7dfd48b4f..48fad35ef 100644 --- a/tests/struct/good/simple.catala_en +++ b/tests/struct/good/simple.catala_en @@ -32,7 +32,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │s = S { -- x: 1 -- y: 2 } │z = 3 └─ diff --git a/tests/struct/good/struct_update.catala_en b/tests/struct/good/struct_update.catala_en index ba0bd6e65..c4d9a18db 100644 --- a/tests/struct/good/struct_update.catala_en +++ b/tests/struct/good/struct_update.catala_en @@ -42,7 +42,6 @@ $ catala test-scope S │ │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └─ ┌─[RESULT]─ -│Computation successful! Results: │s1 = Str { -- fld1: 99 -- fld2: $1.00 -- fld3: 2003-01-01 } │s2 = Str { -- fld1: 0 -- fld2: $99.00 -- fld3: 2003-01-01 } │s3 = Str { -- fld1: 99 -- fld2: $99.00 -- fld3: 2099-01-01 } diff --git a/tests/tuples/good/tuples.catala_en b/tests/tuples/good/tuples.catala_en index 13384fa86..5576eeb49 100644 --- a/tests/tuples/good/tuples.catala_en +++ b/tests/tuples/good/tuples.catala_en @@ -44,7 +44,6 @@ $ catala typecheck --check-invariants ```catala-test-inline $ catala test-scope Test ┌─[RESULT]─ -│Computation successful! Results: │o = (2001-01-03, 6.0) └─ ``` diff --git a/tests/tuples/good/tuplists.catala_en b/tests/tuples/good/tuplists.catala_en index 54b9c1d76..470c8dbf6 100644 --- a/tests/tuples/good/tuplists.catala_en +++ b/tests/tuples/good/tuplists.catala_en @@ -51,7 +51,6 @@ $ catala typecheck ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │r1 = │ [ │ ($120.00, 0.5); ($13.00, 0.005); ($1,400.00, 10.0); diff --git a/tests/typing/good/overload.catala_en b/tests/typing/good/overload.catala_en index 92ccb1300..82852d829 100644 --- a/tests/typing/good/overload.catala_en +++ b/tests/typing/good/overload.catala_en @@ -72,7 +72,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope S ┌─[RESULT]─ -│Computation successful! Results: │o_b = true │o_d = [-13 days] │o_i = -5 diff --git a/tests/variable_state/good/simple.catala_en b/tests/variable_state/good/simple.catala_en index e88db6939..511f6557b 100644 --- a/tests/variable_state/good/simple.catala_en +++ b/tests/variable_state/good/simple.catala_en @@ -30,7 +30,6 @@ $ catala Typecheck --check-invariants ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │foo = 3 └─ ``` diff --git a/tests/variable_state/good/state_access.catala_en b/tests/variable_state/good/state_access.catala_en index 4bc6faa78..f519482bd 100644 --- a/tests/variable_state/good/state_access.catala_en +++ b/tests/variable_state/good/state_access.catala_en @@ -26,7 +26,6 @@ scope A: ```catala-test-inline $ catala test-scope A ┌─[RESULT]─ -│Computation successful! Results: │bar = 5 │foo = 6 └─ diff --git a/tests/variable_state/good/subscope.catala_en b/tests/variable_state/good/subscope.catala_en index 0d65144af..e773ff965 100644 --- a/tests/variable_state/good/subscope.catala_en +++ b/tests/variable_state/good/subscope.catala_en @@ -57,7 +57,6 @@ let scope A (foo_bar: ⟨integer⟩|context) (foo_baz: integer|internal) ```catala-test-inline $ catala test-scope B ┌─[RESULT]─ -│Computation successful! Results: │foofoo = 4 │foofoofoo = 6 └─