From 75c2a24b98c07bfc482208faf723c7fc260e93b9 Mon Sep 17 00:00:00 2001 From: Denis Merigoux Date: Mon, 17 Apr 2023 18:07:22 +0200 Subject: [PATCH] Changed position formatting --- .../tests/test_nsw_social_housie.catala_en | 16 +++---- .../bad/division_by_zero.catala_en | 30 ++++++------ .../bad/logical_prio.catala_en | 4 +- tests/test_array/bad/fold_error.catala_en | 6 +-- tests/test_bool/bad/bad_assert.catala_en | 6 +-- .../test_bool/bad/test_xor_with_int.catala_en | 6 +-- tests/test_date/bad/rounding_option.catala_en | 2 +- tests/test_date/bad/rounding_option.catala_fr | 2 +- .../bad/rounding_option_conflict.catala_en | 4 +- .../bad/uncomparable_duration.catala_en | 48 +++++++++---------- tests/test_default/bad/conflict.catala_en | 6 +-- tests/test_default/bad/empty.catala_en | 6 +-- .../bad/empty_with_rules.catala_en | 4 +- tests/test_enum/bad/ambiguous_cases.catala_en | 2 +- .../bad/ambiguous_wildcard.catala_en | 2 +- tests/test_enum/bad/duplicate_case.catala_en | 4 +- tests/test_enum/bad/empty.catala_en | 2 +- tests/test_enum/bad/missing_case.catala_en | 6 +-- .../bad/not_ending_wildcard.catala_en | 8 ++-- tests/test_enum/bad/quick_pattern_2.catala_en | 6 +-- tests/test_enum/bad/quick_pattern_3.catala_en | 6 +-- tests/test_enum/bad/quick_pattern_4.catala_en | 6 +-- .../bad/quick_pattern_fail.catala_en | 2 +- tests/test_enum/bad/too_many_cases.catala_en | 2 +- .../test_enum/bad/useless_wildcard.catala_en | 2 +- .../ambiguous_unlabeled_exception.catala_en | 6 +-- .../bad/dangling_exception.catala_en | 2 +- .../bad/exceptions_cycle.catala_en | 8 ++-- .../missing_unlabeled_definition.catala_en | 2 +- .../bad/one_ambiguous_exception.catala_en | 6 +-- .../bad/self_exception.catala_en | 4 +- .../bad/two_exceptions.catala_en | 6 +-- .../good/double_definition.catala_en | 8 ++-- tests/test_func/bad/bad_func.catala_en | 4 +- .../bad/param_inconsistency.catala_en | 4 +- .../bad/param_inconsistency2.catala_en | 4 +- .../bad/param_inconsistency3.catala_en | 4 +- tests/test_func/bad/recursive.catala_en | 2 +- tests/test_func/good/context_func.catala_en | 6 +-- tests/test_io/bad/forgot_input.catala_en | 4 +- .../bad/inputing_to_not_input.catala_en | 6 +-- tests/test_io/bad/redefining_input.catala_en | 6 +-- tests/test_io/bad/using_non_output.catala_en | 8 ++-- tests/test_money/bad/no_mingle.catala_en | 6 +-- .../bad/toplevel_defs.catala_en | 2 +- .../bad/array_length-empty.catala_en | 4 +- .../bad/array_length-overlap.catala_en | 4 +- tests/test_proof/bad/assert-empty.catala_en | 2 +- .../bad/dates_get_year-empty.catala_en | 4 +- .../bad/dates_get_year-overlap.catala_en | 4 +- .../bad/dates_simple-empty.catala_en | 4 +- .../bad/dates_simple-overlap.catala_en | 4 +- tests/test_proof/bad/duration-empty.catala_en | 4 +- .../test_proof/bad/duration-overlap.catala_en | 4 +- tests/test_proof/bad/enums-empty.catala_en | 6 +-- .../bad/enums-nonbool-empty.catala_en | 6 +-- .../bad/enums-nonbool-overlap.catala_en | 6 +-- tests/test_proof/bad/enums-overlap.catala_en | 6 +-- .../test_proof/bad/enums_inj-empty.catala_en | 6 +-- .../bad/enums_inj-overlap.catala_en | 4 +- .../test_proof/bad/enums_unit-empty.catala_en | 4 +- .../bad/enums_unit-overlap.catala_en | 4 +- .../bad/let_in_condition-empty.catala_en | 4 +- tests/test_proof/bad/money-empty.catala_en | 4 +- tests/test_proof/bad/money-overlap.catala_en | 4 +- .../test_proof/bad/no_vars-conflict.catala_en | 4 +- tests/test_proof/bad/no_vars-empty.catala_en | 4 +- .../bad/prolala_motivating_example.catala_en | 10 ++-- .../test_proof/bad/rationals-empty.catala_en | 4 +- .../bad/rationals-overlap.catala_en | 4 +- tests/test_proof/bad/sat_solving.catala_en | 4 +- tests/test_proof/bad/structs-empty.catala_en | 4 +- .../test_proof/bad/structs-overlap.catala_en | 4 +- tests/test_proof/good/array_length.catala_en | 2 +- .../test_proof/good/dates_get_year.catala_en | 2 +- tests/test_proof/good/dates_simple.catala_en | 2 +- tests/test_proof/good/duration.catala_en | 2 +- tests/test_proof/good/enums-arith.catala_en | 4 +- tests/test_proof/good/enums-nonbool.catala_en | 4 +- tests/test_proof/good/enums.catala_en | 4 +- tests/test_proof/good/enums_inj.catala_en | 2 +- tests/test_proof/good/enums_unit.catala_en | 2 +- tests/test_proof/good/functions.catala_en | 2 +- .../good/let_in_condition.catala_en | 2 +- tests/test_proof/good/money.catala_en | 2 +- tests/test_proof/good/no_vars.catala_en | 2 +- tests/test_proof/good/rationals.catala_en | 2 +- tests/test_proof/good/simple_vars.catala_en | 2 +- tests/test_proof/good/structs.catala_en | 2 +- tests/test_scope/bad/cycle_in_scope.catala_en | 6 +-- .../bad/cyclic_scope_calls.catala_en | 6 +-- tests/test_scope/bad/cyclic_scopes.catala_en | 4 +- tests/test_scope/bad/scope.catala_en | 8 ++-- .../bad/scope_call_duplicate.catala_en | 2 +- .../test_scope/bad/scope_call_extra.catala_en | 4 +- .../bad/scope_call_missing.catala_en | 6 +-- .../bad/sub_vars_in_sub_var.catala_en | 2 +- .../191_fix_record_name_confusion.catala_en | 2 +- tests/test_scope/good/nothing.catala_en | 2 +- tests/test_scope/good/scope_call.catala_en | 2 +- tests/test_scope/good/scope_call3.catala_en | 10 ++-- tests/test_struct/bad/bug_107.catala_en | 4 +- tests/test_struct/bad/empty_struct.catala_en | 2 +- tests/test_struct/bad/nested.catala_en | 6 +-- tests/test_struct/bad/nested2.catala_en | 14 +++--- .../bad/nonexisting_struct.catala_en | 2 +- .../bad/wrong_qualified_field.catala_en | 2 +- .../good/ambiguous_fields.catala_en | 4 +- .../good/same_name_fields.catala_en | 2 +- tests/test_typing/bad/err1.catala_en | 6 +-- tests/test_typing/bad/err2.catala_en | 6 +-- tests/test_typing/bad/err3.catala_en | 16 +++---- tests/test_typing/bad/err4.catala_en | 12 ++--- tests/test_typing/bad/err5.catala_en | 6 +-- tests/test_typing/bad/err6.catala_en | 6 +-- .../bad/def_no_state.catala_en | 4 +- .../bad/no_cross_exceptions.catala_en | 2 +- .../bad/self_reference_first_state.catala_en | 2 +- .../bad/state_cycle.catala_en | 8 ++-- .../bad/unknown_state.catala_en | 4 +- 120 files changed, 306 insertions(+), 306 deletions(-) diff --git a/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en b/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en index 64e781a2..5c2e2463 100644 --- a/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en +++ b/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en @@ -33,14 +33,14 @@ Message: expected either 'condition', or 'content' followed by the expected vari Autosuggestion: did you mean "content", or maybe "condition"? Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.20-25: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.10-19: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ @@ -77,14 +77,14 @@ Message: expected either 'condition', or 'content' followed by the expected vari Autosuggestion: did you mean "content", or maybe "condition"? Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.20-25: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.10-19: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ @@ -121,14 +121,14 @@ Message: expected either 'condition', or 'content' followed by the expected vari Autosuggestion: did you mean "content", or maybe "condition"? Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.20-25: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.10-19: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ @@ -167,14 +167,14 @@ Message: expected either 'condition', or 'content' followed by the expected vari Autosuggestion: did you mean "content", or maybe "condition"? Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.20-25: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.10-19: +┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_arithmetic/bad/division_by_zero.catala_en b/tests/test_arithmetic/bad/division_by_zero.catala_en index dae37ecb..0a48801a 100644 --- a/tests/test_arithmetic/bad/division_by_zero.catala_en +++ b/tests/test_arithmetic/bad/division_by_zero.catala_en @@ -35,7 +35,7 @@ scope Money: $ catala Interpret -s Dec [WARNING] In scope "Int", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:7.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:7.11-7.12: └─┐ 7 │ context i content decimal │ ‾ @@ -43,7 +43,7 @@ $ catala Interpret -s Dec └─ with integers [WARNING] In scope "Dec", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:17.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:17.11-17.12: └──┐ 17 │ context i content decimal │ ‾ @@ -51,7 +51,7 @@ $ catala Interpret -s Dec └─ with decimals [WARNING] In scope "Money", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:27.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:27.11-27.12: └──┐ 27 │ context i content decimal │ ‾ @@ -60,7 +60,7 @@ $ catala Interpret -s Dec [ERROR] division by zero at runtime The division operator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:20.22-29: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:20.23-20.30: └──┐ 20 │ definition i equals 1. / 0. │ ‾‾‾‾‾‾‾ @@ -68,7 +68,7 @@ The division operator: └─ with decimals The null denominator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:20.27-29: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:20.28-20.30: └──┐ 20 │ definition i equals 1. / 0. │ ‾‾ @@ -81,7 +81,7 @@ The null denominator: $ catala Interpret -s Int [WARNING] In scope "Int", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:7.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:7.11-7.12: └─┐ 7 │ context i content decimal │ ‾ @@ -89,7 +89,7 @@ $ catala Interpret -s Int └─ with integers [WARNING] In scope "Dec", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:17.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:17.11-17.12: └──┐ 17 │ context i content decimal │ ‾ @@ -97,7 +97,7 @@ $ catala Interpret -s Int └─ with decimals [WARNING] In scope "Money", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:27.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:27.11-27.12: └──┐ 27 │ context i content decimal │ ‾ @@ -106,7 +106,7 @@ $ catala Interpret -s Int [ERROR] division by zero at runtime The division operator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:10.22-27: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:10.23-10.28: └──┐ 10 │ definition i equals 1 / 0 │ ‾‾‾‾‾ @@ -114,7 +114,7 @@ The division operator: └─ with integers The null denominator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:10.26-27: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:10.27-10.28: └──┐ 10 │ definition i equals 1 / 0 │ ‾ @@ -127,7 +127,7 @@ The null denominator: $ catala Interpret -s Money [WARNING] In scope "Int", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:7.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:7.11-7.12: └─┐ 7 │ context i content decimal │ ‾ @@ -135,7 +135,7 @@ $ catala Interpret -s Money └─ with integers [WARNING] In scope "Dec", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:17.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:17.11-17.12: └──┐ 17 │ context i content decimal │ ‾ @@ -143,7 +143,7 @@ $ catala Interpret -s Money └─ with decimals [WARNING] In scope "Money", the variable "i" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:27.10-11: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:27.11-27.12: └──┐ 27 │ context i content decimal │ ‾ @@ -152,7 +152,7 @@ $ catala Interpret -s Money [ERROR] division by zero at runtime The division operator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:30.22-34: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:30.23-30.35: └──┐ 30 │ definition i equals $10.0 / $0.0 │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -160,7 +160,7 @@ The division operator: └─ with money The null denominator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:30.30-34: +┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:30.31-30.35: └──┐ 30 │ definition i equals $10.0 / $0.0 │ ‾‾‾‾ diff --git a/tests/test_arithmetic/bad/logical_prio.catala_en b/tests/test_arithmetic/bad/logical_prio.catala_en index b01ded67..fc562ace 100644 --- a/tests/test_arithmetic/bad/logical_prio.catala_en +++ b/tests/test_arithmetic/bad/logical_prio.catala_en @@ -10,13 +10,13 @@ scope S1: $ catala typecheck -s S1 [ERROR] Please add parentheses to explicit which of these operators should be applied first -┌─⯈ tests/test_arithmetic/bad/logical_prio.catala_en:6.27-30: +┌─⯈ tests/test_arithmetic/bad/logical_prio.catala_en:6.28-6.31: └─┐ 6 │ definition o equals true and (false and true and true) or false │ ‾‾‾ -┌─⯈ tests/test_arithmetic/bad/logical_prio.catala_en:6.57-59: +┌─⯈ tests/test_arithmetic/bad/logical_prio.catala_en:6.58-6.60: └─┐ 6 │ definition o equals true and (false and true and true) or false │ ‾‾ diff --git a/tests/test_array/bad/fold_error.catala_en b/tests/test_array/bad/fold_error.catala_en index c89365b4..9c399559 100644 --- a/tests/test_array/bad/fold_error.catala_en +++ b/tests/test_array/bad/fold_error.catala_en @@ -15,21 +15,21 @@ $ catala Interpret -s A [ERROR] I don't know how to apply operator >= on types integer and money -┌─⯈ tests/test_array/bad/fold_error.catala_en:10.49-51: +┌─⯈ tests/test_array/bad/fold_error.catala_en:10.50-10.52: └──┐ 10 │ definition list_high_count equals number of (m >= $7) for m among list │ ‾‾ └─ Article Type integer coming from expression: -┌─⯈ tests/test_array/bad/fold_error.catala_en:5.34-41: +┌─⯈ tests/test_array/bad/fold_error.catala_en:5.35-5.42: └─┐ 5 │ context list content collection integer │ ‾‾‾‾‾‾‾ └─ Article Type money coming from expression: -┌─⯈ tests/test_array/bad/fold_error.catala_en:10.52-54: +┌─⯈ tests/test_array/bad/fold_error.catala_en:10.53-10.55: └──┐ 10 │ definition list_high_count equals number of (m >= $7) for m among list │ ‾‾ diff --git a/tests/test_bool/bad/bad_assert.catala_en b/tests/test_bool/bad/bad_assert.catala_en index aa628081..2dba3b02 100644 --- a/tests/test_bool/bad/bad_assert.catala_en +++ b/tests/test_bool/bad/bad_assert.catala_en @@ -17,21 +17,21 @@ $ catala Interpret -s Foo --> bool Error coming from typechecking the following expression: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.12-13: +┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.13-9.14: └─┐ 9 │ assertion x │ ‾ └─ Test Type integer coming from expression: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:5.21-28: +┌─⯈ tests/test_bool/bad/bad_assert.catala_en:5.22-5.29: └─┐ 5 │ internal x content integer │ ‾‾‾‾‾‾‾ └─ Test Type bool coming from expression: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.12-13: +┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.13-9.14: └─┐ 9 │ assertion x │ ‾ diff --git a/tests/test_bool/bad/test_xor_with_int.catala_en b/tests/test_bool/bad/test_xor_with_int.catala_en index c3662a02..99816caf 100644 --- a/tests/test_bool/bad/test_xor_with_int.catala_en +++ b/tests/test_bool/bad/test_xor_with_int.catala_en @@ -15,21 +15,21 @@ $ catala Typecheck --> bool Error coming from typechecking the following expression: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.29-31: +┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.30-8.32: └─┐ 8 │ definition test_var equals 10 xor 20 │ ‾‾ └─ 'xor' should be a boolean operator Type integer coming from expression: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.29-31: +┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.30-8.32: └─┐ 8 │ definition test_var equals 10 xor 20 │ ‾‾ └─ 'xor' should be a boolean operator Type bool coming from expression: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.32-35: +┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.33-8.36: └─┐ 8 │ definition test_var equals 10 xor 20 │ ‾‾‾ diff --git a/tests/test_date/bad/rounding_option.catala_en b/tests/test_date/bad/rounding_option.catala_en index 43132888..f75c39e0 100644 --- a/tests/test_date/bad/rounding_option.catala_en +++ b/tests/test_date/bad/rounding_option.catala_en @@ -17,7 +17,7 @@ catala: internal error, uncaught exception: [WARNING] In scope "Test", the variable "ambiguous" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/rounding_option.catala_en:5.10-19: +┌─⯈ tests/test_date/bad/rounding_option.catala_en:5.11-5.20: └─┐ 5 │ context ambiguous content boolean │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_date/bad/rounding_option.catala_fr b/tests/test_date/bad/rounding_option.catala_fr index e1248303..27c0f706 100644 --- a/tests/test_date/bad/rounding_option.catala_fr +++ b/tests/test_date/bad/rounding_option.catala_fr @@ -17,7 +17,7 @@ catala: internal error, uncaught exception: [WARNING] In scope "Test", the variable "ambiguité" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/rounding_option.catala_fr:5.11-20: +┌─⯈ tests/test_date/bad/rounding_option.catala_fr:5.12-5.21: └─┐ 5 │ contexte ambiguité contenu booléen │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_date/bad/rounding_option_conflict.catala_en b/tests/test_date/bad/rounding_option_conflict.catala_en index 0a5217cc..c6f75c59 100644 --- a/tests/test_date/bad/rounding_option_conflict.catala_en +++ b/tests/test_date/bad/rounding_option_conflict.catala_en @@ -27,13 +27,13 @@ scope Test: $ catala Interpret -s Test [ERROR] You cannot set multiple date rounding modes -┌─⯈ tests/test_date/bad/rounding_option_conflict.catala_en:10.13-23: +┌─⯈ tests/test_date/bad/rounding_option_conflict.catala_en:10.14-10.24: └──┐ 10 │ date round decreasing │ ‾‾‾‾‾‾‾‾‾‾ -┌─⯈ tests/test_date/bad/rounding_option_conflict.catala_en:12.13-23: +┌─⯈ tests/test_date/bad/rounding_option_conflict.catala_en:12.14-12.24: └──┐ 12 │ date round increasing │ ‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_date/bad/uncomparable_duration.catala_en b/tests/test_date/bad/uncomparable_duration.catala_en index a4cbad79..d0bc1a7b 100644 --- a/tests/test_date/bad/uncomparable_duration.catala_en +++ b/tests/test_date/bad/uncomparable_duration.catala_en @@ -44,7 +44,7 @@ scope Ge: $ catala Interpret -s Ge [WARNING] In scope "Lt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.11-7.12: └─┐ 7 │ context d content boolean │ ‾ @@ -52,7 +52,7 @@ $ catala Interpret -s Ge └─ `<` operator [WARNING] In scope "Le", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.11-17.12: └──┐ 17 │ context d content boolean │ ‾ @@ -60,7 +60,7 @@ $ catala Interpret -s Ge └─ `<=` operator [WARNING] In scope "Gt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.11-27.12: └──┐ 27 │ context d content boolean │ ‾ @@ -68,7 +68,7 @@ $ catala Interpret -s Ge └─ `<=` operator [WARNING] In scope "Ge", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.11-37.12: └──┐ 37 │ context d content boolean │ ‾ @@ -76,14 +76,14 @@ $ catala Interpret -s Ge └─ `>=` operator [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:40.22-29: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:40.23-40.30: └──┐ 40 │ definition d equals 1 month >= 2 day │ ‾‾‾‾‾‾‾ └┬ `UncomparableDurations` exception management └─ `>=` operator -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:40.33-38: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:40.34-40.39: └──┐ 40 │ definition d equals 1 month >= 2 day │ ‾‾‾‾‾ @@ -96,7 +96,7 @@ $ catala Interpret -s Ge $ catala Interpret -s Gt [WARNING] In scope "Lt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.11-7.12: └─┐ 7 │ context d content boolean │ ‾ @@ -104,7 +104,7 @@ $ catala Interpret -s Gt └─ `<` operator [WARNING] In scope "Le", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.11-17.12: └──┐ 17 │ context d content boolean │ ‾ @@ -112,7 +112,7 @@ $ catala Interpret -s Gt └─ `<=` operator [WARNING] In scope "Gt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.11-27.12: └──┐ 27 │ context d content boolean │ ‾ @@ -120,7 +120,7 @@ $ catala Interpret -s Gt └─ `<=` operator [WARNING] In scope "Ge", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.11-37.12: └──┐ 37 │ context d content boolean │ ‾ @@ -128,14 +128,14 @@ $ catala Interpret -s Gt └─ `>=` operator [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:30.22-29: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:30.23-30.30: └──┐ 30 │ definition d equals 1 month > 2 day │ ‾‾‾‾‾‾‾ └┬ `UncomparableDurations` exception management └─ `<=` operator -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:30.32-37: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:30.33-30.38: └──┐ 30 │ definition d equals 1 month > 2 day │ ‾‾‾‾‾ @@ -148,7 +148,7 @@ $ catala Interpret -s Gt $ catala Interpret -s Le [WARNING] In scope "Lt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.11-7.12: └─┐ 7 │ context d content boolean │ ‾ @@ -156,7 +156,7 @@ $ catala Interpret -s Le └─ `<` operator [WARNING] In scope "Le", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.11-17.12: └──┐ 17 │ context d content boolean │ ‾ @@ -164,7 +164,7 @@ $ catala Interpret -s Le └─ `<=` operator [WARNING] In scope "Gt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.11-27.12: └──┐ 27 │ context d content boolean │ ‾ @@ -172,7 +172,7 @@ $ catala Interpret -s Le └─ `<=` operator [WARNING] In scope "Ge", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.11-37.12: └──┐ 37 │ context d content boolean │ ‾ @@ -180,14 +180,14 @@ $ catala Interpret -s Le └─ `>=` operator [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:20.22-29: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:20.23-20.30: └──┐ 20 │ definition d equals 1 month <= 2 day │ ‾‾‾‾‾‾‾ └┬ `UncomparableDurations` exception management └─ `<=` operator -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:20.33-38: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:20.34-20.39: └──┐ 20 │ definition d equals 1 month <= 2 day │ ‾‾‾‾‾ @@ -200,7 +200,7 @@ $ catala Interpret -s Le $ catala Interpret -s Lt [WARNING] In scope "Lt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:7.11-7.12: └─┐ 7 │ context d content boolean │ ‾ @@ -208,7 +208,7 @@ $ catala Interpret -s Lt └─ `<` operator [WARNING] In scope "Le", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:17.11-17.12: └──┐ 17 │ context d content boolean │ ‾ @@ -216,7 +216,7 @@ $ catala Interpret -s Lt └─ `<=` operator [WARNING] In scope "Gt", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:27.11-27.12: └──┐ 27 │ context d content boolean │ ‾ @@ -224,7 +224,7 @@ $ catala Interpret -s Lt └─ `<=` operator [WARNING] In scope "Ge", the variable "d" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.10-11: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:37.11-37.12: └──┐ 37 │ context d content boolean │ ‾ @@ -232,14 +232,14 @@ $ catala Interpret -s Lt └─ `>=` operator [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:10.22-29: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:10.23-10.30: └──┐ 10 │ definition d equals 1 month < 2 day │ ‾‾‾‾‾‾‾ └┬ `UncomparableDurations` exception management └─ `<` operator -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:10.32-37: +┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:10.33-10.38: └──┐ 10 │ definition d equals 1 month < 2 day │ ‾‾‾‾‾ diff --git a/tests/test_default/bad/conflict.catala_en b/tests/test_default/bad/conflict.catala_en index 0d3ca38b..34a819c7 100644 --- a/tests/test_default/bad/conflict.catala_en +++ b/tests/test_default/bad/conflict.catala_en @@ -13,7 +13,7 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_default/bad/conflict.catala_en:5.10-11: +┌─⯈ tests/test_default/bad/conflict.catala_en:5.11-5.12: └─┐ 5 │ context x content integer │ ‾ @@ -21,14 +21,14 @@ $ catala Interpret -s A [ERROR] There is a conflict between multiple valid consequences for assigning the same variable. This consequence has a valid justification: -┌─⯈ tests/test_default/bad/conflict.catala_en:8.55-56: +┌─⯈ tests/test_default/bad/conflict.catala_en:8.56-8.57: └─┐ 8 │ definition x under condition true consequence equals 1 │ ‾ └─ Article This consequence has a valid justification: -┌─⯈ tests/test_default/bad/conflict.catala_en:9.55-56: +┌─⯈ tests/test_default/bad/conflict.catala_en:9.56-9.57: └─┐ 9 │ definition x under condition true consequence equals 0 │ ‾ diff --git a/tests/test_default/bad/empty.catala_en b/tests/test_default/bad/empty.catala_en index 8161d2b8..a155498f 100644 --- a/tests/test_default/bad/empty.catala_en +++ b/tests/test_default/bad/empty.catala_en @@ -13,21 +13,21 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_default/bad/empty.catala_en:5.10-11: +┌─⯈ tests/test_default/bad/empty.catala_en:5.11-5.12: └─┐ 5 │ context x content integer │ ‾ └─ Article [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_default/bad/empty.catala_en:6.10-11: +┌─⯈ tests/test_default/bad/empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Article [ERROR] This variable evaluated to an empty term (no rule that defined it applied in this situation) -┌─⯈ tests/test_default/bad/empty.catala_en:6.10-11: +┌─⯈ tests/test_default/bad/empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_default/bad/empty_with_rules.catala_en b/tests/test_default/bad/empty_with_rules.catala_en index 7094bea9..0dd26944 100644 --- a/tests/test_default/bad/empty_with_rules.catala_en +++ b/tests/test_default/bad/empty_with_rules.catala_en @@ -16,14 +16,14 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_default/bad/empty_with_rules.catala_en:5.10-11: +┌─⯈ tests/test_default/bad/empty_with_rules.catala_en:5.11-5.12: └─┐ 5 │ context x content integer │ ‾ └─ Article [ERROR] This variable evaluated to an empty term (no rule that defined it applied in this situation) -┌─⯈ tests/test_default/bad/empty_with_rules.catala_en:5.10-11: +┌─⯈ tests/test_default/bad/empty_with_rules.catala_en:5.11-5.12: └─┐ 5 │ context x content integer │ ‾ diff --git a/tests/test_enum/bad/ambiguous_cases.catala_en b/tests/test_enum/bad/ambiguous_cases.catala_en index 10a8b096..d86dbc1a 100644 --- a/tests/test_enum/bad/ambiguous_cases.catala_en +++ b/tests/test_enum/bad/ambiguous_cases.catala_en @@ -18,7 +18,7 @@ scope A: $ catala Interpret -s A [ERROR] This constructor name is ambiguous, it can belong to E or F. Desambiguate it by prefixing it with the enum name. -┌─⯈ tests/test_enum/bad/ambiguous_cases.catala_en:14.22-27: +┌─⯈ tests/test_enum/bad/ambiguous_cases.catala_en:14.23-14.28: └──┐ 14 │ definition e equals Case1 │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/ambiguous_wildcard.catala_en b/tests/test_enum/bad/ambiguous_wildcard.catala_en index dcd209d4..040bacc4 100644 --- a/tests/test_enum/bad/ambiguous_wildcard.catala_en +++ b/tests/test_enum/bad/ambiguous_wildcard.catala_en @@ -19,7 +19,7 @@ scope A: $ catala Interpret -s A [ERROR] Couldn't infer the enumeration name from lonely wildcard (wildcard cannot be used as single match case) -┌─⯈ tests/test_enum/bad/ambiguous_wildcard.catala_en:15.4-20: +┌─⯈ tests/test_enum/bad/ambiguous_wildcard.catala_en:15.5-15.21: └──┐ 15 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/duplicate_case.catala_en b/tests/test_enum/bad/duplicate_case.catala_en index 01ee3bdb..72bdc509 100644 --- a/tests/test_enum/bad/duplicate_case.catala_en +++ b/tests/test_enum/bad/duplicate_case.catala_en @@ -22,13 +22,13 @@ scope A: $ catala Interpret -s A [ERROR] The constructor Case3 has been matched twice: -┌─⯈ tests/test_enum/bad/duplicate_case.catala_en:18.15-19: +┌─⯈ tests/test_enum/bad/duplicate_case.catala_en:18.16-18.20: └──┐ 18 │ -- Case3 : true │ ‾‾‾‾ └─ Article -┌─⯈ tests/test_enum/bad/duplicate_case.catala_en:17.15-20: +┌─⯈ tests/test_enum/bad/duplicate_case.catala_en:17.16-17.21: └──┐ 17 │ -- Case3 : false │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/empty.catala_en b/tests/test_enum/bad/empty.catala_en index 785d46d3..8929c17b 100644 --- a/tests/test_enum/bad/empty.catala_en +++ b/tests/test_enum/bad/empty.catala_en @@ -11,7 +11,7 @@ declaration scope Bar: $ catala Typecheck [ERROR] The enum Foo does not have any cases; give it some for Catala to be able to accept it. -┌─⯈ tests/test_enum/bad/empty.catala_en:4.24-27: +┌─⯈ tests/test_enum/bad/empty.catala_en:4.25-4.28: └─┐ 4 │ declaration enumeration Foo: │ ‾‾‾ diff --git a/tests/test_enum/bad/missing_case.catala_en b/tests/test_enum/bad/missing_case.catala_en index 08198a63..c4338af2 100644 --- a/tests/test_enum/bad/missing_case.catala_en +++ b/tests/test_enum/bad/missing_case.catala_en @@ -20,21 +20,21 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "out" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_enum/bad/missing_case.catala_en:11.10-13: +┌─⯈ tests/test_enum/bad/missing_case.catala_en:11.11-11.14: └──┐ 11 │ context out content boolean │ ‾‾‾ └─ Article [WARNING] The constructor "Case3" of enumeration "E" is never used; maybe it's unnecessary? -┌─⯈ tests/test_enum/bad/missing_case.catala_en:7.5-10: +┌─⯈ tests/test_enum/bad/missing_case.catala_en:7.6-7.11: └─┐ 7 │ -- Case3 │ ‾‾‾‾‾ └─ Article [ERROR] The constructor Case3 of enum E is missing from this pattern matching -┌─⯈ tests/test_enum/bad/missing_case.catala_en:14.24-16.21: +┌─⯈ tests/test_enum/bad/missing_case.catala_en:14.25-16.22: └──┐ 14 │ definition out equals match e with pattern │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/not_ending_wildcard.catala_en b/tests/test_enum/bad/not_ending_wildcard.catala_en index ce4882cf..aba6cf0c 100644 --- a/tests/test_enum/bad/not_ending_wildcard.catala_en +++ b/tests/test_enum/bad/not_ending_wildcard.catala_en @@ -41,7 +41,7 @@ $ catala Interpret -s First_case [ERROR] Wildcard must be the last match case Not ending wildcard: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:19.4-20: +┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:19.5-19.21: └──┐ 19 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -49,7 +49,7 @@ Not ending wildcard: └─ Wildcard can't be the first case Next reachable case: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:20.4-17: +┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:20.5-20.18: └──┐ 20 │ -- Case2 : 42 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -63,7 +63,7 @@ $ catala Interpret -s Middle_case [ERROR] Wildcard must be the last match case Not ending wildcard: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:19.4-20: +┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:19.5-19.21: └──┐ 19 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -71,7 +71,7 @@ Not ending wildcard: └─ Wildcard can't be the first case Next reachable case: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:20.4-17: +┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:20.5-20.18: └──┐ 20 │ -- Case2 : 42 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_2.catala_en b/tests/test_enum/bad/quick_pattern_2.catala_en index 8620c02c..967df6ce 100644 --- a/tests/test_enum/bad/quick_pattern_2.catala_en +++ b/tests/test_enum/bad/quick_pattern_2.catala_en @@ -35,21 +35,21 @@ $ catala Interpret -s A --> F Error coming from typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.22-23: +┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.23-28.24: └──┐ 28 │ definition y equals x with pattern Case3 │ ‾ └─ Article Type E coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:17.20-21: +┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:17.21-17.22: └──┐ 17 │ context x content E │ ‾ └─ Article Type F coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.22-42: +┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.23-28.43: └──┐ 28 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_3.catala_en b/tests/test_enum/bad/quick_pattern_3.catala_en index 6bc655e1..d5b2f13f 100644 --- a/tests/test_enum/bad/quick_pattern_3.catala_en +++ b/tests/test_enum/bad/quick_pattern_3.catala_en @@ -25,21 +25,21 @@ $ catala Interpret -s A --> F Error coming from typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.20-21: +┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.21-18.22: └──┐ 18 │ definition y equals x with pattern Case3 │ ‾ └─ Article Type E coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:13.18-19: +┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:13.19-13.20: └──┐ 13 │ context x content E │ ‾ └─ Article Type F coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.20-40: +┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.21-18.41: └──┐ 18 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_4.catala_en b/tests/test_enum/bad/quick_pattern_4.catala_en index a56402e6..689ac8f0 100644 --- a/tests/test_enum/bad/quick_pattern_4.catala_en +++ b/tests/test_enum/bad/quick_pattern_4.catala_en @@ -24,21 +24,21 @@ $ catala Interpret -s A --> F Error coming from typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.20-21: +┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.21-17.22: └──┐ 17 │ definition y equals x with pattern Case3 │ ‾ └─ Test Type E coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:12.18-19: +┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:12.19-12.20: └──┐ 12 │ context x content E │ ‾ └─ Test Type F coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.20-40: +┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.21-17.41: └──┐ 17 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_fail.catala_en b/tests/test_enum/bad/quick_pattern_fail.catala_en index 1ae27234..b96619a4 100644 --- a/tests/test_enum/bad/quick_pattern_fail.catala_en +++ b/tests/test_enum/bad/quick_pattern_fail.catala_en @@ -19,7 +19,7 @@ scope A: $ catala Interpret -s A [ERROR] The name of this constructor has not been defined before, maybe it is a typo? -┌─⯈ tests/test_enum/bad/quick_pattern_fail.catala_en:15.37-42: +┌─⯈ tests/test_enum/bad/quick_pattern_fail.catala_en:15.38-15.43: └──┐ 15 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/too_many_cases.catala_en b/tests/test_enum/bad/too_many_cases.catala_en index c8ef84df..bb8c1955 100644 --- a/tests/test_enum/bad/too_many_cases.catala_en +++ b/tests/test_enum/bad/too_many_cases.catala_en @@ -25,7 +25,7 @@ scope A: $ catala Interpret -s A [ERROR] This case matches a constructor of enumeration E but previous case were matching constructors of enumeration F -┌─⯈ tests/test_enum/bad/too_many_cases.catala_en:21.7-12: +┌─⯈ tests/test_enum/bad/too_many_cases.catala_en:21.8-21.13: └──┐ 21 │ -- Case4 : true │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/useless_wildcard.catala_en b/tests/test_enum/bad/useless_wildcard.catala_en index 4e655398..97e5ec9f 100644 --- a/tests/test_enum/bad/useless_wildcard.catala_en +++ b/tests/test_enum/bad/useless_wildcard.catala_en @@ -21,7 +21,7 @@ scope A: $ catala Interpret -s A [WARNING] Unreachable match case, all constructors of the enumeration E are already specified -┌─⯈ tests/test_enum/bad/useless_wildcard.catala_en:17.4-20: +┌─⯈ tests/test_enum/bad/useless_wildcard.catala_en:17.5-17.21: └──┐ 17 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en b/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en index ef7e75cf..b385e4b0 100644 --- a/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en +++ b/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en @@ -18,7 +18,7 @@ $ catala Interpret -s A [ERROR] This exception can refer to several definitions. Try using labels to disambiguate Ambiguous exception -┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:12.2-13.14: +┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:12.3-13.15: └──┐ 12 │ exception │ ‾‾‾‾‾‾‾‾‾ @@ -27,14 +27,14 @@ Ambiguous exception └─ Test Candidate definition -┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:10.13-14: +┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:10.14-10.15: └──┐ 10 │ definition x equals 1 │ ‾ └─ Test Candidate definition -┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:8.13-14: +┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:8.14-8.15: └─┐ 8 │ definition x equals 0 │ ‾ diff --git a/tests/test_exception/bad/dangling_exception.catala_en b/tests/test_exception/bad/dangling_exception.catala_en index 8ec7a131..565d503d 100644 --- a/tests/test_exception/bad/dangling_exception.catala_en +++ b/tests/test_exception/bad/dangling_exception.catala_en @@ -17,7 +17,7 @@ scope A: $ catala Interpret -s A [ERROR] Unknown label for the scope variable x: "base_y" -┌─⯈ tests/test_exception/bad/dangling_exception.catala_en:12.12-18: +┌─⯈ tests/test_exception/bad/dangling_exception.catala_en:12.13-12.19: └──┐ 12 │ exception base_y │ ‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/exceptions_cycle.catala_en b/tests/test_exception/bad/exceptions_cycle.catala_en index 1376fd54..3258872f 100644 --- a/tests/test_exception/bad/exceptions_cycle.catala_en +++ b/tests/test_exception/bad/exceptions_cycle.catala_en @@ -22,14 +22,14 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:5.10-11: +┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:5.11-5.12: └─┐ 5 │ context x content integer │ ‾ └─ Test [ERROR] Exception cycle detected when defining x: each of these 3 exceptions applies over the previous one, and the first applies over the last -┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:8.2-10.14: +┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:8.3-10.15: └──┐ 8 │ label base_x │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -39,7 +39,7 @@ $ catala Interpret -s A │ ‾‾‾‾‾‾‾‾‾‾‾‾ -┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:12.2-14.14: +┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:12.3-14.15: └──┐ 12 │ label exception_x │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -49,7 +49,7 @@ $ catala Interpret -s A │ ‾‾‾‾‾‾‾‾‾‾‾‾ -┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:16.2-18.14: +┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:16.3-18.15: └──┐ 16 │ label exception_exception_x │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/missing_unlabeled_definition.catala_en b/tests/test_exception/bad/missing_unlabeled_definition.catala_en index ba9e47af..aae38a1b 100644 --- a/tests/test_exception/bad/missing_unlabeled_definition.catala_en +++ b/tests/test_exception/bad/missing_unlabeled_definition.catala_en @@ -13,7 +13,7 @@ scope A: $ catala Interpret -s A [ERROR] This exception does not have a corresponding definition -┌─⯈ tests/test_exception/bad/missing_unlabeled_definition.catala_en:8.2-9.14: +┌─⯈ tests/test_exception/bad/missing_unlabeled_definition.catala_en:8.3-9.15: └─┐ 8 │ exception │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/one_ambiguous_exception.catala_en b/tests/test_exception/bad/one_ambiguous_exception.catala_en index da96f475..3171d7dc 100644 --- a/tests/test_exception/bad/one_ambiguous_exception.catala_en +++ b/tests/test_exception/bad/one_ambiguous_exception.catala_en @@ -24,7 +24,7 @@ $ catala Interpret -s A [ERROR] This exception can refer to several definitions. Try using labels to disambiguate Ambiguous exception -┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:18.2-19.14: +┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:18.3-19.15: └──┐ 18 │ exception │ ‾‾‾‾‾‾‾‾‾ @@ -33,14 +33,14 @@ Ambiguous exception └─ Test Candidate definition -┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:16.13-14: +┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:16.14-16.15: └──┐ 16 │ definition y equals 4 │ ‾ └─ Test Candidate definition -┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:14.13-14: +┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:14.14-14.15: └──┐ 14 │ definition y equals 2 │ ‾ diff --git a/tests/test_exception/bad/self_exception.catala_en b/tests/test_exception/bad/self_exception.catala_en index 93be5ea4..e53a3052 100644 --- a/tests/test_exception/bad/self_exception.catala_en +++ b/tests/test_exception/bad/self_exception.catala_en @@ -14,14 +14,14 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_exception/bad/self_exception.catala_en:5.10-11: +┌─⯈ tests/test_exception/bad/self_exception.catala_en:5.11-5.12: └─┐ 5 │ context y content integer │ ‾ └─ Test [ERROR] Cannot define rule as an exception to itself -┌─⯈ tests/test_exception/bad/self_exception.catala_en:9.12-18: +┌─⯈ tests/test_exception/bad/self_exception.catala_en:9.13-9.19: └─┐ 9 │ exception base_y │ ‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/two_exceptions.catala_en b/tests/test_exception/bad/two_exceptions.catala_en index e5ffd953..c188137e 100644 --- a/tests/test_exception/bad/two_exceptions.catala_en +++ b/tests/test_exception/bad/two_exceptions.catala_en @@ -19,7 +19,7 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_exception/bad/two_exceptions.catala_en:5.10-11: +┌─⯈ tests/test_exception/bad/two_exceptions.catala_en:5.11-5.12: └─┐ 5 │ context x content integer │ ‾ @@ -27,14 +27,14 @@ $ catala Interpret -s A [ERROR] There is a conflict between multiple valid consequences for assigning the same variable. This consequence has a valid justification: -┌─⯈ tests/test_exception/bad/two_exceptions.catala_en:12.22-23: +┌─⯈ tests/test_exception/bad/two_exceptions.catala_en:12.23-12.24: └──┐ 12 │ definition x equals 1 │ ‾ └─ Test This consequence has a valid justification: -┌─⯈ tests/test_exception/bad/two_exceptions.catala_en:15.22-23: +┌─⯈ tests/test_exception/bad/two_exceptions.catala_en:15.23-15.24: └──┐ 15 │ definition x equals 2 │ ‾ diff --git a/tests/test_exception/good/double_definition.catala_en b/tests/test_exception/good/double_definition.catala_en index cc7430ba..1463b936 100644 --- a/tests/test_exception/good/double_definition.catala_en +++ b/tests/test_exception/good/double_definition.catala_en @@ -14,13 +14,13 @@ scope Foo: $ catala Scopelang -s Foo [WARNING] These definitions have identical justifications and consequences; is it a mistake? -┌─⯈ tests/test_exception/good/double_definition.catala_en:9.2-14: +┌─⯈ tests/test_exception/good/double_definition.catala_en:9.3-9.15: └─┐ 9 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ └─ Foo -┌─⯈ tests/test_exception/good/double_definition.catala_en:8.2-14: +┌─⯈ tests/test_exception/good/double_definition.catala_en:8.3-8.15: └─┐ 8 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -40,13 +40,13 @@ Dcalc translation below. $ catala Dcalc -s Foo [WARNING] These definitions have identical justifications and consequences; is it a mistake? -┌─⯈ tests/test_exception/good/double_definition.catala_en:9.2-14: +┌─⯈ tests/test_exception/good/double_definition.catala_en:9.3-9.15: └─┐ 9 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ └─ Foo -┌─⯈ tests/test_exception/good/double_definition.catala_en:8.2-14: +┌─⯈ tests/test_exception/good/double_definition.catala_en:8.3-8.15: └─┐ 8 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_func/bad/bad_func.catala_en b/tests/test_func/bad/bad_func.catala_en index b6167259..0d97dfcb 100644 --- a/tests/test_func/bad/bad_func.catala_en +++ b/tests/test_func/bad/bad_func.catala_en @@ -32,14 +32,14 @@ $ catala Interpret -s S [ERROR] There is a conflict between multiple valid consequences for assigning the same variable. This consequence has a valid justification: -┌─⯈ tests/test_func/bad/bad_func.catala_en:14.64-69: +┌─⯈ tests/test_func/bad/bad_func.catala_en:14.65-14.70: └──┐ 14 │ definition f of x under condition (x >= x) consequence equals x + x │ ‾‾‾‾‾ └─ Article This consequence has a valid justification: -┌─⯈ tests/test_func/bad/bad_func.catala_en:15.61-66: +┌─⯈ tests/test_func/bad/bad_func.catala_en:15.62-15.67: └──┐ 15 │ definition f of x under condition not b consequence equals x * x │ ‾‾‾‾‾ diff --git a/tests/test_func/bad/param_inconsistency.catala_en b/tests/test_func/bad/param_inconsistency.catala_en index 9ebfc0c1..b7aed2ae 100644 --- a/tests/test_func/bad/param_inconsistency.catala_en +++ b/tests/test_func/bad/param_inconsistency.catala_en @@ -17,14 +17,14 @@ $ catala typecheck [ERROR] Function argument name mismatch between declaration ('x') and definition ('y') Argument declared here: -┌─⯈ tests/test_func/bad/param_inconsistency.catala_en:4.41-42: +┌─⯈ tests/test_func/bad/param_inconsistency.catala_en:4.42-4.43: └─┐ 4 │ internal f1 content decimal depends on x content integer │ ‾ Defined here: -┌─⯈ tests/test_func/bad/param_inconsistency.catala_en:10.19-20: +┌─⯈ tests/test_func/bad/param_inconsistency.catala_en:10.20-10.21: └──┐ 10 │ definition f1 of y under condition not cond │ ‾ diff --git a/tests/test_func/bad/param_inconsistency2.catala_en b/tests/test_func/bad/param_inconsistency2.catala_en index 429bfc37..14979e88 100644 --- a/tests/test_func/bad/param_inconsistency2.catala_en +++ b/tests/test_func/bad/param_inconsistency2.catala_en @@ -16,14 +16,14 @@ $ catala typecheck [ERROR] Function argument name mismatch between declaration ('x') and definition ('y') Argument declared here: -┌─⯈ tests/test_func/bad/param_inconsistency2.catala_en:4.41-42: +┌─⯈ tests/test_func/bad/param_inconsistency2.catala_en:4.42-4.43: └─┐ 4 │ internal f1 content decimal depends on x content integer │ ‾ Defined here: -┌─⯈ tests/test_func/bad/param_inconsistency2.catala_en:9.29-30: +┌─⯈ tests/test_func/bad/param_inconsistency2.catala_en:9.30-9.31: └─┐ 9 │ exception definition f1 of y under condition not cond │ ‾ diff --git a/tests/test_func/bad/param_inconsistency3.catala_en b/tests/test_func/bad/param_inconsistency3.catala_en index a8ba13f4..cefbe7c6 100644 --- a/tests/test_func/bad/param_inconsistency3.catala_en +++ b/tests/test_func/bad/param_inconsistency3.catala_en @@ -16,14 +16,14 @@ $ catala typecheck [ERROR] Function argument name mismatch between declaration ('x') and definition ('y') Argument declared here: -┌─⯈ tests/test_func/bad/param_inconsistency3.catala_en:4.41-42: +┌─⯈ tests/test_func/bad/param_inconsistency3.catala_en:4.42-4.43: └─┐ 4 │ internal f1 content decimal depends on x content integer │ ‾ Defined here: -┌─⯈ tests/test_func/bad/param_inconsistency3.catala_en:9.29-30: +┌─⯈ tests/test_func/bad/param_inconsistency3.catala_en:9.30-9.31: └─┐ 9 │ exception definition f1 of y under condition not cond │ ‾ diff --git a/tests/test_func/bad/recursive.catala_en b/tests/test_func/bad/recursive.catala_en index bb8b606d..f1cf9cd8 100644 --- a/tests/test_func/bad/recursive.catala_en +++ b/tests/test_func/bad/recursive.catala_en @@ -12,7 +12,7 @@ scope RecursiveFunc: $ catala Interpret -s RecursiveFunc [ERROR] The variable f is used in one of its definitions, but recursion is forbidden in Catala -┌─⯈ tests/test_func/bad/recursive.catala_en:8.27-28: +┌─⯈ tests/test_func/bad/recursive.catala_en:8.28-8.29: └─┐ 8 │ definition f of x equals f of x + 1 │ ‾ diff --git a/tests/test_func/good/context_func.catala_en b/tests/test_func/good/context_func.catala_en index ad7d2396..79e044fb 100644 --- a/tests/test_func/good/context_func.catala_en +++ b/tests/test_func/good/context_func.catala_en @@ -19,7 +19,7 @@ scope B: $ catala Scopelang -s B [WARNING] In scope "A", the variable "f" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_func/good/context_func.catala_en:5.10-11: +┌─⯈ tests/test_func/good/context_func.catala_en:5.11-5.12: └─┐ 5 │ context f content integer depends on x content integer │ ‾ @@ -34,7 +34,7 @@ let scope B (b: bool|input) = $ catala Dcalc -s A [WARNING] In scope "A", the variable "f" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_func/good/context_func.catala_en:5.10-11: +┌─⯈ tests/test_func/good/context_func.catala_en:5.11-5.12: └─┐ 5 │ context f content integer depends on x content integer │ ‾ @@ -51,7 +51,7 @@ let scope A (A_in: A_in): A = $ catala Dcalc -s B [WARNING] In scope "A", the variable "f" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_func/good/context_func.catala_en:5.10-11: +┌─⯈ tests/test_func/good/context_func.catala_en:5.11-5.12: └─┐ 5 │ context f content integer depends on x content integer │ ‾ diff --git a/tests/test_io/bad/forgot_input.catala_en b/tests/test_io/bad/forgot_input.catala_en index 3da56fa0..37f769da 100644 --- a/tests/test_io/bad/forgot_input.catala_en +++ b/tests/test_io/bad/forgot_input.catala_en @@ -19,14 +19,14 @@ $ catala Typecheck [ERROR] This subscope variable is a mandatory input but no definition was provided. Incriminated subscope: -┌─⯈ tests/test_io/bad/forgot_input.catala_en:9.2-3: +┌─⯈ tests/test_io/bad/forgot_input.catala_en:9.3-9.4: └─┐ 9 │ a scope A │ ‾ └─ Test Incriminated variable: -┌─⯈ tests/test_io/bad/forgot_input.catala_en:6.8-9: +┌─⯈ tests/test_io/bad/forgot_input.catala_en:6.9-6.10: └─┐ 6 │ input x content integer │ ‾ diff --git a/tests/test_io/bad/inputing_to_not_input.catala_en b/tests/test_io/bad/inputing_to_not_input.catala_en index 262d973f..54a0260d 100644 --- a/tests/test_io/bad/inputing_to_not_input.catala_en +++ b/tests/test_io/bad/inputing_to_not_input.catala_en @@ -19,21 +19,21 @@ $ catala Typecheck [ERROR] It is impossible to give a definition to a subscope variable not tagged as input or context. Incriminated subscope: -┌─⯈ tests/test_io/bad/inputing_to_not_input.catala_en:8.2-3: +┌─⯈ tests/test_io/bad/inputing_to_not_input.catala_en:8.3-8.4: └─┐ 8 │ a scope A │ ‾ └─ Test Incriminated variable: -┌─⯈ tests/test_io/bad/inputing_to_not_input.catala_en:5.9-10: +┌─⯈ tests/test_io/bad/inputing_to_not_input.catala_en:5.10-5.11: └─┐ 5 │ output a content integer │ ‾ └─ Test Incriminated subscope variable definition: -┌─⯈ tests/test_io/bad/inputing_to_not_input.catala_en:14.2-16: +┌─⯈ tests/test_io/bad/inputing_to_not_input.catala_en:14.3-14.17: └──┐ 14 │ definition a.a equals 0 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_io/bad/redefining_input.catala_en b/tests/test_io/bad/redefining_input.catala_en index 07dc743c..ca484f67 100644 --- a/tests/test_io/bad/redefining_input.catala_en +++ b/tests/test_io/bad/redefining_input.catala_en @@ -11,7 +11,7 @@ scope A: $ catala Typecheck [WARNING] In scope "A", the variable "a" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_io/bad/redefining_input.catala_en:5.8-9: +┌─⯈ tests/test_io/bad/redefining_input.catala_en:5.9-5.10: └─┐ 5 │ input a content integer │ ‾ @@ -19,14 +19,14 @@ $ catala Typecheck [ERROR] It is impossible to give a definition to a scope variable tagged as input. Incriminated variable: -┌─⯈ tests/test_io/bad/redefining_input.catala_en:5.8-9: +┌─⯈ tests/test_io/bad/redefining_input.catala_en:5.9-5.10: └─┐ 5 │ input a content integer │ ‾ └─ Test Incriminated variable definition: -┌─⯈ tests/test_io/bad/redefining_input.catala_en:8.2-14: +┌─⯈ tests/test_io/bad/redefining_input.catala_en:8.3-8.15: └─┐ 8 │ definition a equals 0 │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_io/bad/using_non_output.catala_en b/tests/test_io/bad/using_non_output.catala_en index 2b3114b8..09019c0f 100644 --- a/tests/test_io/bad/using_non_output.catala_en +++ b/tests/test_io/bad/using_non_output.catala_en @@ -17,7 +17,7 @@ scope B: $ catala Typecheck [WARNING] In scope "A", the variable "a" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_io/bad/using_non_output.catala_en:5.11-12: +┌─⯈ tests/test_io/bad/using_non_output.catala_en:5.12-5.13: └─┐ 5 │ internal a content integer │ ‾ @@ -25,21 +25,21 @@ $ catala Typecheck [ERROR] The variable a.a cannot be used here, as it is not part of subscope a's results. Maybe you forgot to qualify it as an output? Incriminated variable usage: -┌─⯈ tests/test_io/bad/using_non_output.catala_en:14.12-15: +┌─⯈ tests/test_io/bad/using_non_output.catala_en:14.13-14.16: └──┐ 14 │ assertion a.a = 0 │ ‾‾‾ └─ Test Incriminated subscope variable declaration: -┌─⯈ tests/test_io/bad/using_non_output.catala_en:5.11-12: +┌─⯈ tests/test_io/bad/using_non_output.catala_en:5.12-5.13: └─┐ 5 │ internal a content integer │ ‾ └─ Test Incriminated subscope declaration: -┌─⯈ tests/test_io/bad/using_non_output.catala_en:8.2-3: +┌─⯈ tests/test_io/bad/using_non_output.catala_en:8.3-8.4: └─┐ 8 │ a scope A │ ‾ diff --git a/tests/test_money/bad/no_mingle.catala_en b/tests/test_money/bad/no_mingle.catala_en index 3a5ba492..776f6ef7 100644 --- a/tests/test_money/bad/no_mingle.catala_en +++ b/tests/test_money/bad/no_mingle.catala_en @@ -17,21 +17,21 @@ $ catala Interpret -s A [ERROR] I don't know how to apply operator * on types money and money -┌─⯈ tests/test_money/bad/no_mingle.catala_en:12.25-26: +┌─⯈ tests/test_money/bad/no_mingle.catala_en:12.26-12.27: └──┐ 12 │ definition z equals (x * y) │ ‾ └─ Article Type money coming from expression: -┌─⯈ tests/test_money/bad/no_mingle.catala_en:5.20-25: +┌─⯈ tests/test_money/bad/no_mingle.catala_en:5.21-5.26: └─┐ 5 │ context x content money │ ‾‾‾‾‾ └─ Article Type money coming from expression: -┌─⯈ tests/test_money/bad/no_mingle.catala_en:6.20-25: +┌─⯈ tests/test_money/bad/no_mingle.catala_en:6.21-6.26: └─┐ 6 │ context y content money │ ‾‾‾‾‾ diff --git a/tests/test_name_resolution/bad/toplevel_defs.catala_en b/tests/test_name_resolution/bad/toplevel_defs.catala_en index 49c526af..ac447416 100644 --- a/tests/test_name_resolution/bad/toplevel_defs.catala_en +++ b/tests/test_name_resolution/bad/toplevel_defs.catala_en @@ -15,7 +15,7 @@ declaration glob5 content decimal $ catala typecheck [ERROR] Scope calls are not allowed outside of a scope -┌─⯈ tests/test_name_resolution/bad/toplevel_defs.catala_en:11.10-22: +┌─⯈ tests/test_name_resolution/bad/toplevel_defs.catala_en:11.11-11.23: └──┐ 11 │ equals (output of S1).a │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_proof/bad/array_length-empty.catala_en b/tests/test_proof/bad/array_length-empty.catala_en index 109bfc0b..e3582e01 100644 --- a/tests/test_proof/bad/array_length-empty.catala_en +++ b/tests/test_proof/bad/array_length-empty.catala_en @@ -14,13 +14,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/array_length-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/array_length-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/array_length-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/array_length-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/array_length-overlap.catala_en b/tests/test_proof/bad/array_length-overlap.catala_en index 79d00a3b..14d9d75c 100644 --- a/tests/test_proof/bad/array_length-overlap.catala_en +++ b/tests/test_proof/bad/array_length-overlap.catala_en @@ -15,13 +15,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/array_length-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/array_length-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/array_length-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/array_length-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/assert-empty.catala_en b/tests/test_proof/bad/assert-empty.catala_en index af0d6b0e..43398ff1 100644 --- a/tests/test_proof/bad/assert-empty.catala_en +++ b/tests/test_proof/bad/assert-empty.catala_en @@ -25,7 +25,7 @@ scope Foo: ```catala-test-inline $ catala Proof --disable_counterexamples [ERROR] [Foo.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/assert-empty.catala_en:4.10-11: +┌─⯈ tests/test_proof/bad/assert-empty.catala_en:4.11-4.12: └─┐ 4 │ output x content integer │ ‾ diff --git a/tests/test_proof/bad/dates_get_year-empty.catala_en b/tests/test_proof/bad/dates_get_year-empty.catala_en index 39f33a8b..12d34cb9 100644 --- a/tests/test_proof/bad/dates_get_year-empty.catala_en +++ b/tests/test_proof/bad/dates_get_year-empty.catala_en @@ -17,13 +17,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/dates_get_year-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_get_year-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/dates_get_year-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_get_year-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/dates_get_year-overlap.catala_en b/tests/test_proof/bad/dates_get_year-overlap.catala_en index 52783c32..40fa90d0 100644 --- a/tests/test_proof/bad/dates_get_year-overlap.catala_en +++ b/tests/test_proof/bad/dates_get_year-overlap.catala_en @@ -17,13 +17,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/dates_get_year-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_get_year-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/dates_get_year-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_get_year-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/dates_simple-empty.catala_en b/tests/test_proof/bad/dates_simple-empty.catala_en index e038a7fc..53e2edca 100644 --- a/tests/test_proof/bad/dates_simple-empty.catala_en +++ b/tests/test_proof/bad/dates_simple-empty.catala_en @@ -16,13 +16,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/dates_simple-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_simple-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/dates_simple-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_simple-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/dates_simple-overlap.catala_en b/tests/test_proof/bad/dates_simple-overlap.catala_en index fb3298d9..0b29bced 100644 --- a/tests/test_proof/bad/dates_simple-overlap.catala_en +++ b/tests/test_proof/bad/dates_simple-overlap.catala_en @@ -17,13 +17,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/dates_simple-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_simple-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/dates_simple-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/dates_simple-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/duration-empty.catala_en b/tests/test_proof/bad/duration-empty.catala_en index af3c2456..2bf0979c 100644 --- a/tests/test_proof/bad/duration-empty.catala_en +++ b/tests/test_proof/bad/duration-empty.catala_en @@ -14,13 +14,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/duration-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/duration-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/duration-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/duration-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/duration-overlap.catala_en b/tests/test_proof/bad/duration-overlap.catala_en index f46405ff..86e41ede 100644 --- a/tests/test_proof/bad/duration-overlap.catala_en +++ b/tests/test_proof/bad/duration-overlap.catala_en @@ -15,13 +15,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/duration-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/duration-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/duration-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/duration-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/enums-empty.catala_en b/tests/test_proof/bad/enums-empty.catala_en index f6c679e7..af8a2eba 100644 --- a/tests/test_proof/bad/enums-empty.catala_en +++ b/tests/test_proof/bad/enums-empty.catala_en @@ -25,20 +25,20 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-empty.catala_en:15.10-11: +┌─⯈ tests/test_proof/bad/enums-empty.catala_en:15.11-15.12: └──┐ 15 │ context x content integer │ ‾ └─ Test [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-empty.catala_en:7.6-7: +┌─⯈ tests/test_proof/bad/enums-empty.catala_en:7.7-7.8: └─┐ 7 │ -- C content boolean │ ‾ └─ Test [ERROR] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums-empty.catala_en:15.10-11: +┌─⯈ tests/test_proof/bad/enums-empty.catala_en:15.11-15.12: └──┐ 15 │ context x content integer │ ‾ diff --git a/tests/test_proof/bad/enums-nonbool-empty.catala_en b/tests/test_proof/bad/enums-nonbool-empty.catala_en index 3dce3679..c7e44a10 100644 --- a/tests/test_proof/bad/enums-nonbool-empty.catala_en +++ b/tests/test_proof/bad/enums-nonbool-empty.catala_en @@ -23,20 +23,20 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ └─ Test [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:5.6-7: +┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ └─ Test [ERROR] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ diff --git a/tests/test_proof/bad/enums-nonbool-overlap.catala_en b/tests/test_proof/bad/enums-nonbool-overlap.catala_en index a1ea7a44..44819cbd 100644 --- a/tests/test_proof/bad/enums-nonbool-overlap.catala_en +++ b/tests/test_proof/bad/enums-nonbool-overlap.catala_en @@ -23,20 +23,20 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ └─ Test [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:5.6-7: +┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ └─ Test [ERROR] [A.x] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ diff --git a/tests/test_proof/bad/enums-overlap.catala_en b/tests/test_proof/bad/enums-overlap.catala_en index 22facd10..5b27d153 100644 --- a/tests/test_proof/bad/enums-overlap.catala_en +++ b/tests/test_proof/bad/enums-overlap.catala_en @@ -25,20 +25,20 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:15.10-11: +┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:15.11-15.12: └──┐ 15 │ context x content integer │ ‾ └─ Test [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:7.6-7: +┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:7.7-7.8: └─┐ 7 │ -- C content boolean │ ‾ └─ Test [ERROR] [A.x] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:15.10-11: +┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:15.11-15.12: └──┐ 15 │ context x content integer │ ‾ diff --git a/tests/test_proof/bad/enums_inj-empty.catala_en b/tests/test_proof/bad/enums_inj-empty.catala_en index fa935e10..d37473e6 100644 --- a/tests/test_proof/bad/enums_inj-empty.catala_en +++ b/tests/test_proof/bad/enums_inj-empty.catala_en @@ -18,20 +18,20 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ └─ Article [WARNING] The constructor "C2" of enumeration "E" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:6.5-7: +┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:6.6-6.8: └─┐ 6 │ -- C2 │ ‾‾ └─ Article [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ diff --git a/tests/test_proof/bad/enums_inj-overlap.catala_en b/tests/test_proof/bad/enums_inj-overlap.catala_en index 7edd3a2d..29acfc1b 100644 --- a/tests/test_proof/bad/enums_inj-overlap.catala_en +++ b/tests/test_proof/bad/enums_inj-overlap.catala_en @@ -20,13 +20,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums_inj-overlap.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_inj-overlap.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ └─ Article [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums_inj-overlap.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_inj-overlap.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ diff --git a/tests/test_proof/bad/enums_unit-empty.catala_en b/tests/test_proof/bad/enums_unit-empty.catala_en index 17ff5e07..e4da526b 100644 --- a/tests/test_proof/bad/enums_unit-empty.catala_en +++ b/tests/test_proof/bad/enums_unit-empty.catala_en @@ -23,13 +23,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums_unit-empty.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_unit-empty.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ └─ Article [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums_unit-empty.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_unit-empty.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ diff --git a/tests/test_proof/bad/enums_unit-overlap.catala_en b/tests/test_proof/bad/enums_unit-overlap.catala_en index 9d24d237..b28ef302 100644 --- a/tests/test_proof/bad/enums_unit-overlap.catala_en +++ b/tests/test_proof/bad/enums_unit-overlap.catala_en @@ -23,13 +23,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums_unit-overlap.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_unit-overlap.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ └─ Article [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums_unit-overlap.catala_en:10.10-11: +┌─⯈ tests/test_proof/bad/enums_unit-overlap.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ diff --git a/tests/test_proof/bad/let_in_condition-empty.catala_en b/tests/test_proof/bad/let_in_condition-empty.catala_en index 7ab21603..2005388d 100644 --- a/tests/test_proof/bad/let_in_condition-empty.catala_en +++ b/tests/test_proof/bad/let_in_condition-empty.catala_en @@ -15,13 +15,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/let_in_condition-empty.catala_en:5.10-11: +┌─⯈ tests/test_proof/bad/let_in_condition-empty.catala_en:5.11-5.12: └─┐ 5 │ context x content boolean │ ‾ └─ Test [ERROR] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/let_in_condition-empty.catala_en:5.10-11: +┌─⯈ tests/test_proof/bad/let_in_condition-empty.catala_en:5.11-5.12: └─┐ 5 │ context x content boolean │ ‾ diff --git a/tests/test_proof/bad/money-empty.catala_en b/tests/test_proof/bad/money-empty.catala_en index 604fc278..0e3c43d2 100644 --- a/tests/test_proof/bad/money-empty.catala_en +++ b/tests/test_proof/bad/money-empty.catala_en @@ -18,13 +18,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/money-empty.catala_en:8.10-11: +┌─⯈ tests/test_proof/bad/money-empty.catala_en:8.11-8.12: └─┐ 8 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/money-empty.catala_en:8.10-11: +┌─⯈ tests/test_proof/bad/money-empty.catala_en:8.11-8.12: └─┐ 8 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/money-overlap.catala_en b/tests/test_proof/bad/money-overlap.catala_en index 62d93850..4ec36b4b 100644 --- a/tests/test_proof/bad/money-overlap.catala_en +++ b/tests/test_proof/bad/money-overlap.catala_en @@ -19,13 +19,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/money-overlap.catala_en:8.10-11: +┌─⯈ tests/test_proof/bad/money-overlap.catala_en:8.11-8.12: └─┐ 8 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/money-overlap.catala_en:8.10-11: +┌─⯈ tests/test_proof/bad/money-overlap.catala_en:8.11-8.12: └─┐ 8 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/no_vars-conflict.catala_en b/tests/test_proof/bad/no_vars-conflict.catala_en index 9500bd28..9d373c78 100644 --- a/tests/test_proof/bad/no_vars-conflict.catala_en +++ b/tests/test_proof/bad/no_vars-conflict.catala_en @@ -19,13 +19,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/no_vars-conflict.catala_en:8.10-11: +┌─⯈ tests/test_proof/bad/no_vars-conflict.catala_en:8.11-8.12: └─┐ 8 │ context y content integer │ ‾ └─ Test [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/no_vars-conflict.catala_en:8.10-11: +┌─⯈ tests/test_proof/bad/no_vars-conflict.catala_en:8.11-8.12: └─┐ 8 │ context y content integer │ ‾ diff --git a/tests/test_proof/bad/no_vars-empty.catala_en b/tests/test_proof/bad/no_vars-empty.catala_en index 93e193aa..02adc29c 100644 --- a/tests/test_proof/bad/no_vars-empty.catala_en +++ b/tests/test_proof/bad/no_vars-empty.catala_en @@ -18,13 +18,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/no_vars-empty.catala_en:7.10-11: +┌─⯈ tests/test_proof/bad/no_vars-empty.catala_en:7.11-7.12: └─┐ 7 │ context y content integer │ ‾ └─ Test [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/no_vars-empty.catala_en:7.10-11: +┌─⯈ tests/test_proof/bad/no_vars-empty.catala_en:7.11-7.12: └─┐ 7 │ context y content integer │ ‾ diff --git a/tests/test_proof/bad/prolala_motivating_example.catala_en b/tests/test_proof/bad/prolala_motivating_example.catala_en index 544bb9af..7926716b 100644 --- a/tests/test_proof/bad/prolala_motivating_example.catala_en +++ b/tests/test_proof/bad/prolala_motivating_example.catala_en @@ -125,7 +125,7 @@ scope Amount: $ catala Proof --disable_counterexamples [WARNING] In scope "Amount", the variable "amount" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:60.10-16: +┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:60.11-60.17: └──┐ 60 │ context amount content integer │ ‾‾‾‾‾‾ @@ -133,14 +133,14 @@ $ catala Proof --disable_counterexamples └─ Amount [WARNING] In scope "Amount", the variable "correct_amount" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:61.10-24: +┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:61.11-61.25: └──┐ 61 │ context correct_amount content integer │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └┬ ProLaLa 2022 Super Cash Bonus └─ Amount [ERROR] [Amount.amount] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:60.10-16: +┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:60.11-60.17: └──┐ 60 │ context amount content integer │ ‾‾‾‾‾‾ @@ -148,7 +148,7 @@ $ catala Proof --disable_counterexamples └─ Amount Counterexample generation is disabled so none was generated. [ERROR] [Eligibility.is_eligible] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:11.9-20: +┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:11.10-11.21: └──┐ 11 │ output is_eligible content boolean │ ‾‾‾‾‾‾‾‾‾‾‾ @@ -156,7 +156,7 @@ Counterexample generation is disabled so none was generated. └─ Eligibility Counterexample generation is disabled so none was generated. [ERROR] [Eligibility.is_eligible] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:11.9-20: +┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:11.10-11.21: └──┐ 11 │ output is_eligible content boolean │ ‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_proof/bad/rationals-empty.catala_en b/tests/test_proof/bad/rationals-empty.catala_en index 8ad8f085..9df73261 100644 --- a/tests/test_proof/bad/rationals-empty.catala_en +++ b/tests/test_proof/bad/rationals-empty.catala_en @@ -14,13 +14,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/rationals-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/rationals-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/rationals-empty.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/rationals-empty.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/rationals-overlap.catala_en b/tests/test_proof/bad/rationals-overlap.catala_en index 8ab7df7b..e7faf33e 100644 --- a/tests/test_proof/bad/rationals-overlap.catala_en +++ b/tests/test_proof/bad/rationals-overlap.catala_en @@ -15,13 +15,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/rationals-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/rationals-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ └─ Test [ERROR] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/rationals-overlap.catala_en:6.10-11: +┌─⯈ tests/test_proof/bad/rationals-overlap.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/bad/sat_solving.catala_en b/tests/test_proof/bad/sat_solving.catala_en index 40774f40..1defbded 100644 --- a/tests/test_proof/bad/sat_solving.catala_en +++ b/tests/test_proof/bad/sat_solving.catala_en @@ -42,13 +42,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x10" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/sat_solving.catala_en:15.10-13: +┌─⯈ tests/test_proof/bad/sat_solving.catala_en:15.11-15.14: └──┐ 15 │ context x10 content boolean │ ‾‾‾ └─ Test [ERROR] [A.x10] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/sat_solving.catala_en:15.10-13: +┌─⯈ tests/test_proof/bad/sat_solving.catala_en:15.11-15.14: └──┐ 15 │ context x10 content boolean │ ‾‾‾ diff --git a/tests/test_proof/bad/structs-empty.catala_en b/tests/test_proof/bad/structs-empty.catala_en index bdcc0c31..e0a19b23 100644 --- a/tests/test_proof/bad/structs-empty.catala_en +++ b/tests/test_proof/bad/structs-empty.catala_en @@ -23,13 +23,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/structs-empty.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/structs-empty.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ └─ Test [ERROR] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/structs-empty.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/structs-empty.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ diff --git a/tests/test_proof/bad/structs-overlap.catala_en b/tests/test_proof/bad/structs-overlap.catala_en index ca52ae1d..d5ee7210 100644 --- a/tests/test_proof/bad/structs-overlap.catala_en +++ b/tests/test_proof/bad/structs-overlap.catala_en @@ -23,13 +23,13 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/structs-overlap.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/structs-overlap.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ └─ Test [ERROR] [A.x] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/structs-overlap.catala_en:13.10-11: +┌─⯈ tests/test_proof/bad/structs-overlap.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ diff --git a/tests/test_proof/good/array_length.catala_en b/tests/test_proof/good/array_length.catala_en index 669b6222..d4047d91 100644 --- a/tests/test_proof/good/array_length.catala_en +++ b/tests/test_proof/good/array_length.catala_en @@ -15,7 +15,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/array_length.catala_en:6.10-11: +┌─⯈ tests/test_proof/good/array_length.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/good/dates_get_year.catala_en b/tests/test_proof/good/dates_get_year.catala_en index 40ab8c71..d3abf4fd 100644 --- a/tests/test_proof/good/dates_get_year.catala_en +++ b/tests/test_proof/good/dates_get_year.catala_en @@ -17,7 +17,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/dates_get_year.catala_en:6.10-11: +┌─⯈ tests/test_proof/good/dates_get_year.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/good/dates_simple.catala_en b/tests/test_proof/good/dates_simple.catala_en index 96c4e837..fd8a4131 100644 --- a/tests/test_proof/good/dates_simple.catala_en +++ b/tests/test_proof/good/dates_simple.catala_en @@ -17,7 +17,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/dates_simple.catala_en:6.10-11: +┌─⯈ tests/test_proof/good/dates_simple.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/good/duration.catala_en b/tests/test_proof/good/duration.catala_en index 092f11b6..e2295f58 100644 --- a/tests/test_proof/good/duration.catala_en +++ b/tests/test_proof/good/duration.catala_en @@ -15,7 +15,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/duration.catala_en:6.10-11: +┌─⯈ tests/test_proof/good/duration.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/good/enums-arith.catala_en b/tests/test_proof/good/enums-arith.catala_en index 032cd1ee..1f5970a2 100644 --- a/tests/test_proof/good/enums-arith.catala_en +++ b/tests/test_proof/good/enums-arith.catala_en @@ -23,14 +23,14 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-arith.catala_en:13.10-11: +┌─⯈ tests/test_proof/good/enums-arith.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ └─ Test [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-arith.catala_en:5.6-7: +┌─⯈ tests/test_proof/good/enums-arith.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ diff --git a/tests/test_proof/good/enums-nonbool.catala_en b/tests/test_proof/good/enums-nonbool.catala_en index e8d6d82a..dd8a307a 100644 --- a/tests/test_proof/good/enums-nonbool.catala_en +++ b/tests/test_proof/good/enums-nonbool.catala_en @@ -23,14 +23,14 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-nonbool.catala_en:13.10-11: +┌─⯈ tests/test_proof/good/enums-nonbool.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ └─ Test [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-nonbool.catala_en:5.6-7: +┌─⯈ tests/test_proof/good/enums-nonbool.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ diff --git a/tests/test_proof/good/enums.catala_en b/tests/test_proof/good/enums.catala_en index c7a75a48..6125d0d1 100644 --- a/tests/test_proof/good/enums.catala_en +++ b/tests/test_proof/good/enums.catala_en @@ -22,14 +22,14 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums.catala_en:13.10-11: +┌─⯈ tests/test_proof/good/enums.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ └─ Test [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums.catala_en:5.6-7: +┌─⯈ tests/test_proof/good/enums.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ diff --git a/tests/test_proof/good/enums_inj.catala_en b/tests/test_proof/good/enums_inj.catala_en index 2577a07a..31749c42 100644 --- a/tests/test_proof/good/enums_inj.catala_en +++ b/tests/test_proof/good/enums_inj.catala_en @@ -19,7 +19,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums_inj.catala_en:10.10-11: +┌─⯈ tests/test_proof/good/enums_inj.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ diff --git a/tests/test_proof/good/enums_unit.catala_en b/tests/test_proof/good/enums_unit.catala_en index 609e59e3..e88591c5 100644 --- a/tests/test_proof/good/enums_unit.catala_en +++ b/tests/test_proof/good/enums_unit.catala_en @@ -23,7 +23,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums_unit.catala_en:10.10-11: +┌─⯈ tests/test_proof/good/enums_unit.catala_en:10.11-10.12: └──┐ 10 │ context y content integer │ ‾ diff --git a/tests/test_proof/good/functions.catala_en b/tests/test_proof/good/functions.catala_en index b6aaae8c..88eccebb 100644 --- a/tests/test_proof/good/functions.catala_en +++ b/tests/test_proof/good/functions.catala_en @@ -16,7 +16,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "z" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/functions.catala_en:6.10-11: +┌─⯈ tests/test_proof/good/functions.catala_en:6.11-6.12: └─┐ 6 │ context z content integer │ ‾ diff --git a/tests/test_proof/good/let_in_condition.catala_en b/tests/test_proof/good/let_in_condition.catala_en index 6a68a0e2..1cb2a5a9 100644 --- a/tests/test_proof/good/let_in_condition.catala_en +++ b/tests/test_proof/good/let_in_condition.catala_en @@ -15,7 +15,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/let_in_condition.catala_en:5.10-11: +┌─⯈ tests/test_proof/good/let_in_condition.catala_en:5.11-5.12: └─┐ 5 │ context x content boolean │ ‾ diff --git a/tests/test_proof/good/money.catala_en b/tests/test_proof/good/money.catala_en index d956f989..990a0c0c 100644 --- a/tests/test_proof/good/money.catala_en +++ b/tests/test_proof/good/money.catala_en @@ -17,7 +17,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/money.catala_en:6.10-11: +┌─⯈ tests/test_proof/good/money.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/good/no_vars.catala_en b/tests/test_proof/good/no_vars.catala_en index fce54a27..5c6f309d 100644 --- a/tests/test_proof/good/no_vars.catala_en +++ b/tests/test_proof/good/no_vars.catala_en @@ -12,7 +12,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/no_vars.catala_en:5.10-11: +┌─⯈ tests/test_proof/good/no_vars.catala_en:5.11-5.12: └─┐ 5 │ context x content integer │ ‾ diff --git a/tests/test_proof/good/rationals.catala_en b/tests/test_proof/good/rationals.catala_en index 9f9f4825..83483784 100644 --- a/tests/test_proof/good/rationals.catala_en +++ b/tests/test_proof/good/rationals.catala_en @@ -15,7 +15,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/rationals.catala_en:6.10-11: +┌─⯈ tests/test_proof/good/rationals.catala_en:6.11-6.12: └─┐ 6 │ context y content boolean │ ‾ diff --git a/tests/test_proof/good/simple_vars.catala_en b/tests/test_proof/good/simple_vars.catala_en index 7e465a44..c32fc910 100644 --- a/tests/test_proof/good/simple_vars.catala_en +++ b/tests/test_proof/good/simple_vars.catala_en @@ -18,7 +18,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "z" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/simple_vars.catala_en:7.10-11: +┌─⯈ tests/test_proof/good/simple_vars.catala_en:7.11-7.12: └─┐ 7 │ context z content integer │ ‾ diff --git a/tests/test_proof/good/structs.catala_en b/tests/test_proof/good/structs.catala_en index c183a703..7d60b0cc 100644 --- a/tests/test_proof/good/structs.catala_en +++ b/tests/test_proof/good/structs.catala_en @@ -22,7 +22,7 @@ scope A: $ catala Proof --disable_counterexamples [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/structs.catala_en:13.10-11: +┌─⯈ tests/test_proof/good/structs.catala_en:13.11-13.12: └──┐ 13 │ context x content integer │ ‾ diff --git a/tests/test_scope/bad/cycle_in_scope.catala_en b/tests/test_scope/bad/cycle_in_scope.catala_en index fe40adee..41348c49 100644 --- a/tests/test_scope/bad/cycle_in_scope.catala_en +++ b/tests/test_scope/bad/cycle_in_scope.catala_en @@ -20,21 +20,21 @@ $ catala Interpret -s A z → x → y → z z is used here in the definition of x: -┌─⯈ tests/test_scope/bad/cycle_in_scope.catala_en:14.22-23: +┌─⯈ tests/test_scope/bad/cycle_in_scope.catala_en:14.23-14.24: └──┐ 14 │ definition x equals z │ ‾ └─ Article x is used here in the definition of y: -┌─⯈ tests/test_scope/bad/cycle_in_scope.catala_en:11.31-32: +┌─⯈ tests/test_scope/bad/cycle_in_scope.catala_en:11.32-11.33: └──┐ 11 │ definition y under condition x >= 0 consequence equals x │ ‾ └─ Article y is used here in the definition of z: -┌─⯈ tests/test_scope/bad/cycle_in_scope.catala_en:13.31-32: +┌─⯈ tests/test_scope/bad/cycle_in_scope.catala_en:13.32-13.33: └──┐ 13 │ definition z under condition y < 1 consequence equals y │ ‾ diff --git a/tests/test_scope/bad/cyclic_scope_calls.catala_en b/tests/test_scope/bad/cyclic_scope_calls.catala_en index 22e2593b..50391b75 100644 --- a/tests/test_scope/bad/cyclic_scope_calls.catala_en +++ b/tests/test_scope/bad/cyclic_scope_calls.catala_en @@ -32,21 +32,21 @@ $ catala typecheck S4 → S3 → S2 → S4 S4 is used here in the definition of S3: -┌─⯈ tests/test_scope/bad/cyclic_scope_calls.catala_en:21.23-35: +┌─⯈ tests/test_scope/bad/cyclic_scope_calls.catala_en:21.24-21.36: └──┐ 21 │ definition o equals (output of S4).o │ ‾‾‾‾‾‾‾‾‾‾‾‾ S3 is used here in the definition of S2: -┌─⯈ tests/test_scope/bad/cyclic_scope_calls.catala_en:18.42-54: +┌─⯈ tests/test_scope/bad/cyclic_scope_calls.catala_en:18.43-18.55: └──┐ 18 │ definition o equals (output of S1).o + (output of S3).o │ ‾‾‾‾‾‾‾‾‾‾‾‾ S2 is used here in the definition of S4: -┌─⯈ tests/test_scope/bad/cyclic_scope_calls.catala_en:24.23-35: +┌─⯈ tests/test_scope/bad/cyclic_scope_calls.catala_en:24.24-24.36: └──┐ 24 │ definition o equals (output of S2).o │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_scope/bad/cyclic_scopes.catala_en b/tests/test_scope/bad/cyclic_scopes.catala_en index 2b45d34d..32f258fa 100644 --- a/tests/test_scope/bad/cyclic_scopes.catala_en +++ b/tests/test_scope/bad/cyclic_scopes.catala_en @@ -21,14 +21,14 @@ $ catala Interpret -s A [ERROR] Cyclic dependency detected between the following scopes: B → A → B B is used here in the definition of A: -┌─⯈ tests/test_scope/bad/cyclic_scopes.catala_en:5.2-3: +┌─⯈ tests/test_scope/bad/cyclic_scopes.catala_en:5.3-5.4: └─┐ 5 │ b scope B │ ‾ └─ Article A is used here in the definition of B: -┌─⯈ tests/test_scope/bad/cyclic_scopes.catala_en:9.2-3: +┌─⯈ tests/test_scope/bad/cyclic_scopes.catala_en:9.3-9.4: └─┐ 9 │ a scope A │ ‾ diff --git a/tests/test_scope/bad/scope.catala_en b/tests/test_scope/bad/scope.catala_en index 8b486f77..341ecbbf 100644 --- a/tests/test_scope/bad/scope.catala_en +++ b/tests/test_scope/bad/scope.catala_en @@ -18,14 +18,14 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "a" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_scope/bad/scope.catala_en:5.10-11: +┌─⯈ tests/test_scope/bad/scope.catala_en:5.11-5.12: └─┐ 5 │ context a content integer │ ‾ └─ Article [WARNING] In scope "A", the variable "b" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_scope/bad/scope.catala_en:6.10-11: +┌─⯈ tests/test_scope/bad/scope.catala_en:6.11-6.12: └─┐ 6 │ context b content integer │ ‾ @@ -33,14 +33,14 @@ $ catala Interpret -s A [ERROR] There is a conflict between multiple valid consequences for assigning the same variable. This consequence has a valid justification: -┌─⯈ tests/test_scope/bad/scope.catala_en:13.56-60: +┌─⯈ tests/test_scope/bad/scope.catala_en:13.57-13.61: └──┐ 13 │ definition b under condition not c consequence equals 1337 │ ‾‾‾‾ └─ Article This consequence has a valid justification: -┌─⯈ tests/test_scope/bad/scope.catala_en:14.56-57: +┌─⯈ tests/test_scope/bad/scope.catala_en:14.57-14.58: └──┐ 14 │ definition b under condition not c consequence equals 0 │ ‾ diff --git a/tests/test_scope/bad/scope_call_duplicate.catala_en b/tests/test_scope/bad/scope_call_duplicate.catala_en index a1019dde..f2afbc36 100644 --- a/tests/test_scope/bad/scope_call_duplicate.catala_en +++ b/tests/test_scope/bad/scope_call_duplicate.catala_en @@ -18,7 +18,7 @@ scope Titi: $ catala dcalc -s Titi [ERROR] Duplicate definition of scope input variable 'bar' -┌─⯈ tests/test_scope/bad/scope_call_duplicate.catala_en:14.69-72: +┌─⯈ tests/test_scope/bad/scope_call_duplicate.catala_en:14.70-14.73: └──┐ 14 │ definition fizz equals output of Toto with {--bar: 1 --baz: 2.1 -- bar: 3} │ ‾‾‾ diff --git a/tests/test_scope/bad/scope_call_extra.catala_en b/tests/test_scope/bad/scope_call_extra.catala_en index a382300a..4c87987a 100644 --- a/tests/test_scope/bad/scope_call_extra.catala_en +++ b/tests/test_scope/bad/scope_call_extra.catala_en @@ -18,14 +18,14 @@ scope Titi: $ catala dcalc -s Titi [ERROR] Scope Toto has no input variable biz -┌─⯈ tests/test_scope/bad/scope_call_extra.catala_en:14.48-51: +┌─⯈ tests/test_scope/bad/scope_call_extra.catala_en:14.49-14.52: └──┐ 14 │ definition fizz equals output of Toto with {--biz: 1} │ ‾‾‾ Scope Toto declared here -┌─⯈ tests/test_scope/bad/scope_call_extra.catala_en:2.18-22: +┌─⯈ tests/test_scope/bad/scope_call_extra.catala_en:2.19-2.23: └─┐ 2 │ declaration scope Toto: │ ‾‾‾‾ diff --git a/tests/test_scope/bad/scope_call_missing.catala_en b/tests/test_scope/bad/scope_call_missing.catala_en index f5a0b907..59edf133 100644 --- a/tests/test_scope/bad/scope_call_missing.catala_en +++ b/tests/test_scope/bad/scope_call_missing.catala_en @@ -18,21 +18,21 @@ scope Titi: $ catala dcalc -s Titi [WARNING] In scope "Toto", the variable "baz" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:4.8-11: +┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:4.9-4.12: └─┐ 4 │ input baz content decimal │ ‾‾‾ [ERROR] Definition of input variable 'baz' missing in this scope call -┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:14.25-55: +┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:14.26-14.56: └──┐ 14 │ definition fizz equals output of Toto with {--bar: 1} │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ Declaration of the missing input variable -┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:4.8-11: +┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:4.9-4.12: └─┐ 4 │ input baz content decimal │ ‾‾‾ diff --git a/tests/test_scope/bad/sub_vars_in_sub_var.catala_en b/tests/test_scope/bad/sub_vars_in_sub_var.catala_en index c5b3c29b..500c2e11 100644 --- a/tests/test_scope/bad/sub_vars_in_sub_var.catala_en +++ b/tests/test_scope/bad/sub_vars_in_sub_var.catala_en @@ -17,7 +17,7 @@ scope B: $ catala Interpret -s A [ERROR] The subscope a is used when defining one of its inputs, but recursion is forbidden in Catala -┌─⯈ tests/test_scope/bad/sub_vars_in_sub_var.catala_en:13.27-30: +┌─⯈ tests/test_scope/bad/sub_vars_in_sub_var.catala_en:13.28-13.31: └──┐ 13 │ definition a.y equals if a.x then 0 else 1 │ ‾‾‾ diff --git a/tests/test_scope/good/191_fix_record_name_confusion.catala_en b/tests/test_scope/good/191_fix_record_name_confusion.catala_en index 2ee03aeb..35afc652 100644 --- a/tests/test_scope/good/191_fix_record_name_confusion.catala_en +++ b/tests/test_scope/good/191_fix_record_name_confusion.catala_en @@ -19,7 +19,7 @@ scope ScopeB: $ catala OCaml -O [WARNING] In scope "ScopeB", the variable "a" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_scope/good/191_fix_record_name_confusion.catala_en:8.10-11: +┌─⯈ tests/test_scope/good/191_fix_record_name_confusion.catala_en:8.11-8.12: └─┐ 8 │ context a content boolean │ ‾ diff --git a/tests/test_scope/good/nothing.catala_en b/tests/test_scope/good/nothing.catala_en index 03d2350a..5ab14826 100644 --- a/tests/test_scope/good/nothing.catala_en +++ b/tests/test_scope/good/nothing.catala_en @@ -9,7 +9,7 @@ declaration scope Foo2: $ catala Scalc -s Foo2 -O -t [WARNING] In scope "Foo2", the variable "bar" is declared but never defined; did you forget something? -┌─⯈ tests/test_scope/good/nothing.catala_en:5.9-12: +┌─⯈ tests/test_scope/good/nothing.catala_en:5.10-5.13: └─┐ 5 │ output bar content integer │ ‾‾‾ diff --git a/tests/test_scope/good/scope_call.catala_en b/tests/test_scope/good/scope_call.catala_en index b3734bf1..00cf1c06 100644 --- a/tests/test_scope/good/scope_call.catala_en +++ b/tests/test_scope/good/scope_call.catala_en @@ -28,7 +28,7 @@ scope Foo: $ catala interpret -s Foo [WARNING] The structure "Test" is never used; maybe it's unnecessary? -┌─⯈ tests/test_scope/good/scope_call.catala_en:2.22-26: +┌─⯈ tests/test_scope/good/scope_call.catala_en:2.23-2.27: └─┐ 2 │ declaration structure Test: │ ‾‾‾‾ diff --git a/tests/test_scope/good/scope_call3.catala_en b/tests/test_scope/good/scope_call3.catala_en index d037ac42..3fa98163 100644 --- a/tests/test_scope/good/scope_call3.catala_en +++ b/tests/test_scope/good/scope_call3.catala_en @@ -20,7 +20,7 @@ scope RentComputation: $ catala Interpret -t -s HousingComputation [LOG] ≔ HousingComputation.f: [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:8.13-19: + ┌─⯈ tests/test_scope/good/scope_call3.catala_en:8.14-8.20: └─┐ 8 │ definition result equals f of 1 │ ‾‾‾‾‾‾ @@ -28,7 +28,7 @@ $ catala Interpret -t -s HousingComputation [LOG] → HousingComputation.f [LOG] ≔ HousingComputation.f.input0: 1 [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:7.13-14: + ┌─⯈ tests/test_scope/good/scope_call3.catala_en:7.14-7.15: └─┐ 7 │ definition f of x equals (output of RentComputation).f of x │ ‾ @@ -38,7 +38,7 @@ $ catala Interpret -t -s HousingComputation [LOG] ≔ RentComputation.g: [LOG] ≔ RentComputation.f: [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:7.28-53: + ┌─⯈ tests/test_scope/good/scope_call3.catala_en:7.29-7.54: └─┐ 7 │ definition f of x equals (output of RentComputation).f of x │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -48,7 +48,7 @@ $ catala Interpret -t -s HousingComputation [LOG] → RentComputation.f [LOG] ≔ RentComputation.f.input0: 1 [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:16.13-14: + ┌─⯈ tests/test_scope/good/scope_call3.catala_en:16.14-16.15: └──┐ 16 │ definition f of x equals g of (x + 1) │ ‾ @@ -56,7 +56,7 @@ $ catala Interpret -t -s HousingComputation [LOG] → RentComputation.g [LOG] ≔ RentComputation.g.input0: 2 [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:15.13-14: + ┌─⯈ tests/test_scope/good/scope_call3.catala_en:15.14-15.15: └──┐ 15 │ definition g of x equals x + 1 │ ‾ diff --git a/tests/test_struct/bad/bug_107.catala_en b/tests/test_struct/bad/bug_107.catala_en index 88c43b37..2248e75c 100644 --- a/tests/test_struct/bad/bug_107.catala_en +++ b/tests/test_struct/bad/bug_107.catala_en @@ -21,14 +21,14 @@ $ catala Interpret -s A [ERROR] struct name "S" already defined First definition: -┌─⯈ tests/test_struct/bad/bug_107.catala_en:4.22-23: +┌─⯈ tests/test_struct/bad/bug_107.catala_en:4.23-4.24: └─┐ 4 │ declaration structure S: │ ‾ └─ https://github.com/CatalaLang/catala/issues/107 Second definition: -┌─⯈ tests/test_struct/bad/bug_107.catala_en:8.22-23: +┌─⯈ tests/test_struct/bad/bug_107.catala_en:8.23-8.24: └─┐ 8 │ declaration structure S: │ ‾ diff --git a/tests/test_struct/bad/empty_struct.catala_en b/tests/test_struct/bad/empty_struct.catala_en index fe4d3e60..21d5e6dc 100644 --- a/tests/test_struct/bad/empty_struct.catala_en +++ b/tests/test_struct/bad/empty_struct.catala_en @@ -11,7 +11,7 @@ declaration scope Bar: $ catala Typecheck [ERROR] The struct Foo does not have any fields; give it some for Catala to be able to accept it. -┌─⯈ tests/test_struct/bad/empty_struct.catala_en:4.22-25: +┌─⯈ tests/test_struct/bad/empty_struct.catala_en:4.23-4.26: └─┐ 4 │ declaration structure Foo: │ ‾‾‾ diff --git a/tests/test_struct/bad/nested.catala_en b/tests/test_struct/bad/nested.catala_en index 89897403..5dca2ac4 100644 --- a/tests/test_struct/bad/nested.catala_en +++ b/tests/test_struct/bad/nested.catala_en @@ -16,21 +16,21 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_struct/bad/nested.catala_en:9.10-11: +┌─⯈ tests/test_struct/bad/nested.catala_en:9.11-9.12: └─┐ 9 │ context y content E │ ‾ └─ Article [WARNING] The constructor "Rec" of enumeration "E" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/bad/nested.catala_en:6.5-8: +┌─⯈ tests/test_struct/bad/nested.catala_en:6.6-6.9: └─┐ 6 │ -- Rec content E │ ‾‾‾ └─ Article [ERROR] The type E is defined using itself, which is forbidden since Catala does not provide recursive types -┌─⯈ tests/test_struct/bad/nested.catala_en:6.17-18: +┌─⯈ tests/test_struct/bad/nested.catala_en:6.18-6.19: └─┐ 6 │ -- Rec content E │ ‾ diff --git a/tests/test_struct/bad/nested2.catala_en b/tests/test_struct/bad/nested2.catala_en index 1adcff9b..3dee6f91 100644 --- a/tests/test_struct/bad/nested2.catala_en +++ b/tests/test_struct/bad/nested2.catala_en @@ -17,21 +17,21 @@ declaration scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_struct/bad/nested2.catala_en:13.10-11: +┌─⯈ tests/test_struct/bad/nested2.catala_en:13.11-13.12: └──┐ 13 │ context x content E │ ‾ └─ Article [WARNING] The structure "S" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/bad/nested2.catala_en:4.22-23: +┌─⯈ tests/test_struct/bad/nested2.catala_en:4.23-4.24: └─┐ 4 │ declaration structure S: │ ‾ └─ Article [WARNING] The enumeration "E" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/bad/nested2.catala_en:8.24-25: +┌─⯈ tests/test_struct/bad/nested2.catala_en:8.25-8.26: └─┐ 8 │ declaration enumeration E: │ ‾ @@ -39,28 +39,28 @@ $ catala Interpret -s A [ERROR] Cyclic dependency detected between types! Cycle type S, declared: -┌─⯈ tests/test_struct/bad/nested2.catala_en:4.22-23: +┌─⯈ tests/test_struct/bad/nested2.catala_en:4.23-4.24: └─┐ 4 │ declaration structure S: │ ‾ └─ Article Used here in the definition of another cycle type E: -┌─⯈ tests/test_struct/bad/nested2.catala_en:10.19-20: +┌─⯈ tests/test_struct/bad/nested2.catala_en:10.20-10.21: └──┐ 10 │ -- Case2 content S │ ‾ └─ Article Cycle type E, declared: -┌─⯈ tests/test_struct/bad/nested2.catala_en:8.24-25: +┌─⯈ tests/test_struct/bad/nested2.catala_en:8.25-8.26: └─┐ 8 │ declaration enumeration E: │ ‾ └─ Article Used here in the definition of another cycle type S: -┌─⯈ tests/test_struct/bad/nested2.catala_en:5.17-18: +┌─⯈ tests/test_struct/bad/nested2.catala_en:5.18-5.19: └─┐ 5 │ data x content E │ ‾ diff --git a/tests/test_struct/bad/nonexisting_struct.catala_en b/tests/test_struct/bad/nonexisting_struct.catala_en index ceb159e4..27df1718 100644 --- a/tests/test_struct/bad/nonexisting_struct.catala_en +++ b/tests/test_struct/bad/nonexisting_struct.catala_en @@ -17,7 +17,7 @@ scope A: $ catala Interpret -s A [ERROR] No struct named Fo found -┌─⯈ tests/test_struct/bad/nonexisting_struct.catala_en:13.24-26: +┌─⯈ tests/test_struct/bad/nonexisting_struct.catala_en:13.25-13.27: └──┐ 13 │ definition y equals x.Fo.f │ ‾‾ diff --git a/tests/test_struct/bad/wrong_qualified_field.catala_en b/tests/test_struct/bad/wrong_qualified_field.catala_en index 4b9d592f..26ca5889 100644 --- a/tests/test_struct/bad/wrong_qualified_field.catala_en +++ b/tests/test_struct/bad/wrong_qualified_field.catala_en @@ -21,7 +21,7 @@ scope A: $ catala Interpret -s A [ERROR] Field "g" does not belong to structure "Foo", but to "Bar" -┌─⯈ tests/test_struct/bad/wrong_qualified_field.catala_en:17.22-29: +┌─⯈ tests/test_struct/bad/wrong_qualified_field.catala_en:17.23-17.30: └──┐ 17 │ definition y equals x.Foo.g │ ‾‾‾‾‾‾‾ diff --git a/tests/test_struct/good/ambiguous_fields.catala_en b/tests/test_struct/good/ambiguous_fields.catala_en index 7e4b7d8e..9098ae20 100644 --- a/tests/test_struct/good/ambiguous_fields.catala_en +++ b/tests/test_struct/good/ambiguous_fields.catala_en @@ -20,14 +20,14 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "y" is never used anywhere; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:12.10-11: +┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:12.11-12.12: └──┐ 12 │ context y content integer │ ‾ └─ Article [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:7.22-25: +┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ diff --git a/tests/test_struct/good/same_name_fields.catala_en b/tests/test_struct/good/same_name_fields.catala_en index 81afc769..0ce0c643 100644 --- a/tests/test_struct/good/same_name_fields.catala_en +++ b/tests/test_struct/good/same_name_fields.catala_en @@ -20,7 +20,7 @@ scope A: $ catala Interpret -s A [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/same_name_fields.catala_en:7.22-25: +┌─⯈ tests/test_struct/good/same_name_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ diff --git a/tests/test_typing/bad/err1.catala_en b/tests/test_typing/bad/err1.catala_en index a7bf3a19..231881d4 100644 --- a/tests/test_typing/bad/err1.catala_en +++ b/tests/test_typing/bad/err1.catala_en @@ -17,21 +17,21 @@ $ catala Typecheck --> integer Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err1.catala_en:7.22-25: +┌─⯈ tests/test_typing/bad/err1.catala_en:7.23-7.26: └─┐ 7 │ Structure { -- i: 4.1 -- e: y }; │ ‾‾‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/err1.catala_en:7.22-25: +┌─⯈ tests/test_typing/bad/err1.catala_en:7.23-7.26: └─┐ 7 │ Structure { -- i: 4.1 -- e: y }; │ ‾‾‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:8.17-24: +┌─⯈ tests/test_typing/bad/common.catala_en:8.18-8.25: └─┐ 8 │ data i content integer │ ‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err2.catala_en b/tests/test_typing/bad/err2.catala_en index 620397a5..e1f4fa92 100644 --- a/tests/test_typing/bad/err2.catala_en +++ b/tests/test_typing/bad/err2.catala_en @@ -17,21 +17,21 @@ $ catala Typecheck --> collection Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.38-41: +┌─⯈ tests/test_typing/bad/err2.catala_en:10.39-10.42: └──┐ 10 │ definition a equals number of (z ++ 1.1) / 2 │ ‾‾‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.38-41: +┌─⯈ tests/test_typing/bad/err2.catala_en:10.39-10.42: └──┐ 10 │ definition a equals number of (z ++ 1.1) / 2 │ ‾‾‾ Type collection coming from expression: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.35-37: +┌─⯈ tests/test_typing/bad/err2.catala_en:10.36-10.38: └──┐ 10 │ definition a equals number of (z ++ 1.1) / 2 │ ‾‾ diff --git a/tests/test_typing/bad/err3.catala_en b/tests/test_typing/bad/err3.catala_en index c152b64a..a93dcae7 100644 --- a/tests/test_typing/bad/err3.catala_en +++ b/tests/test_typing/bad/err3.catala_en @@ -14,7 +14,7 @@ scope S: $ catala Typecheck [WARNING] The constructor "Dec" of enumeration "Enum" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/bad/common.catala_en:4.5-8: +┌─⯈ tests/test_typing/bad/common.catala_en:4.6-4.9: └─┐ 4 │ -- Dec content decimal │ ‾‾‾ @@ -24,21 +24,21 @@ $ catala Typecheck --> decimal Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.41-42: +┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.41-42: +┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:15.19-26: +┌─⯈ tests/test_typing/bad/common.catala_en:15.20-15.27: └──┐ 15 │ output a content decimal │ ‾‾‾‾‾‾‾ @@ -52,7 +52,7 @@ Re-putting the same check again, to ensure that the `Typecheck` and `ocaml` subc $ catala ocaml [WARNING] The constructor "Dec" of enumeration "Enum" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/bad/common.catala_en:4.5-8: +┌─⯈ tests/test_typing/bad/common.catala_en:4.6-4.9: └─┐ 4 │ -- Dec content decimal │ ‾‾‾ @@ -62,21 +62,21 @@ $ catala ocaml --> decimal Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.41-42: +┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.41-42: +┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:15.19-26: +┌─⯈ tests/test_typing/bad/common.catala_en:15.20-15.27: └──┐ 15 │ output a content decimal │ ‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err4.catala_en b/tests/test_typing/bad/err4.catala_en index 698e5c0f..26d33243 100644 --- a/tests/test_typing/bad/err4.catala_en +++ b/tests/test_typing/bad/err4.catala_en @@ -12,21 +12,21 @@ Should be "catala Typecheck", see test err3 $ catala ocaml [WARNING] The structure "Structure" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/bad/common.catala_en:7.22-31: +┌─⯈ tests/test_typing/bad/common.catala_en:7.23-7.32: └─┐ 7 │ declaration structure Structure: │ ‾‾‾‾‾‾‾‾‾ [WARNING] The constructor "Dec" of enumeration "Enum" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/bad/common.catala_en:4.5-8: +┌─⯈ tests/test_typing/bad/common.catala_en:4.6-4.9: └─┐ 4 │ -- Dec content decimal │ ‾‾‾ [WARNING] The constructor "Dat" of enumeration "Enum" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/bad/common.catala_en:5.5-8: +┌─⯈ tests/test_typing/bad/common.catala_en:5.6-5.9: └─┐ 5 │ -- Dat content date │ ‾‾‾ @@ -36,21 +36,21 @@ $ catala ocaml --> Structure Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err4.catala_en:5.24-37: +┌─⯈ tests/test_typing/bad/err4.catala_en:5.25-5.38: └─┐ 5 │ definition z equals [ Int content x ] │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ Type Enum coming from expression: -┌─⯈ tests/test_typing/bad/err4.catala_en:5.24-37: +┌─⯈ tests/test_typing/bad/err4.catala_en:5.25-5.38: └─┐ 5 │ definition z equals [ Int content x ] │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ Type Structure coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:14.30-39: +┌─⯈ tests/test_typing/bad/common.catala_en:14.31-14.40: └──┐ 14 │ output z content collection Structure │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err5.catala_en b/tests/test_typing/bad/err5.catala_en index a2cfb9aa..5bbafb91 100644 --- a/tests/test_typing/bad/err5.catala_en +++ b/tests/test_typing/bad/err5.catala_en @@ -17,21 +17,21 @@ $ catala Typecheck --> Structure Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err5.catala_en:8.4-8: +┌─⯈ tests/test_typing/bad/err5.catala_en:8.5-8.9: └─┐ 8 │ 1040 │ ‾‾‾‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/err5.catala_en:8.4-8: +┌─⯈ tests/test_typing/bad/err5.catala_en:8.5-8.9: └─┐ 8 │ 1040 │ ‾‾‾‾ Type Structure coming from expression: -┌─⯈ tests/test_typing/bad/err5.catala_en:6.4-45: +┌─⯈ tests/test_typing/bad/err5.catala_en:6.5-6.46: └─┐ 6 │ Structure { -- i: 3 -- e: Int content x }; │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err6.catala_en b/tests/test_typing/bad/err6.catala_en index 36143776..69ea3669 100644 --- a/tests/test_typing/bad/err6.catala_en +++ b/tests/test_typing/bad/err6.catala_en @@ -33,21 +33,21 @@ $ catala ocaml --> integer Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err6.catala_en:20.26-29: +┌─⯈ tests/test_typing/bad/err6.catala_en:20.27-20.30: └──┐ 20 │ definition sub.x equals 44. │ ‾‾‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/err6.catala_en:20.26-29: +┌─⯈ tests/test_typing/bad/err6.catala_en:20.27-20.30: └──┐ 20 │ definition sub.x equals 44. │ ‾‾‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:12.18-25: +┌─⯈ tests/test_typing/bad/common.catala_en:12.19-12.26: └──┐ 12 │ input x content integer │ ‾‾‾‾‾‾‾ diff --git a/tests/test_variable_state/bad/def_no_state.catala_en b/tests/test_variable_state/bad/def_no_state.catala_en index 9cff6608..9728ab02 100644 --- a/tests/test_variable_state/bad/def_no_state.catala_en +++ b/tests/test_variable_state/bad/def_no_state.catala_en @@ -14,14 +14,14 @@ scope A: $ catala Typecheck [ERROR] This definition does not indicate which state has to be considered for variable foo. -┌─⯈ tests/test_variable_state/bad/def_no_state.catala_en:10.13-16: +┌─⯈ tests/test_variable_state/bad/def_no_state.catala_en:10.14-10.17: └──┐ 10 │ definition foo equals 2 │ ‾‾‾ └─ Test Variable declaration: -┌─⯈ tests/test_variable_state/bad/def_no_state.catala_en:5.9-12: +┌─⯈ tests/test_variable_state/bad/def_no_state.catala_en:5.10-5.13: └─┐ 5 │ output foo content integer │ ‾‾‾ diff --git a/tests/test_variable_state/bad/no_cross_exceptions.catala_en b/tests/test_variable_state/bad/no_cross_exceptions.catala_en index 0c9c3eea..49f59781 100644 --- a/tests/test_variable_state/bad/no_cross_exceptions.catala_en +++ b/tests/test_variable_state/bad/no_cross_exceptions.catala_en @@ -18,7 +18,7 @@ scope A: $ catala Typecheck [ERROR] Unknown label for the scope variable foo.baz: "thing" -┌─⯈ tests/test_variable_state/bad/no_cross_exceptions.catala_en:14.12-17: +┌─⯈ tests/test_variable_state/bad/no_cross_exceptions.catala_en:14.13-14.18: └──┐ 14 │ exception thing definition foo state baz under condition true consequence equals 3 │ ‾‾‾‾‾ diff --git a/tests/test_variable_state/bad/self_reference_first_state.catala_en b/tests/test_variable_state/bad/self_reference_first_state.catala_en index 1727413c..12613210 100644 --- a/tests/test_variable_state/bad/self_reference_first_state.catala_en +++ b/tests/test_variable_state/bad/self_reference_first_state.catala_en @@ -16,7 +16,7 @@ scope A: $ catala Typecheck [ERROR] It is impossible to refer to the variable you are defining when defining its first state. -┌─⯈ tests/test_variable_state/bad/self_reference_first_state.catala_en:10.34-37: +┌─⯈ tests/test_variable_state/bad/self_reference_first_state.catala_en:10.35-10.38: └──┐ 10 │ definition foo state bar equals foo + 1 │ ‾‾‾ diff --git a/tests/test_variable_state/bad/state_cycle.catala_en b/tests/test_variable_state/bad/state_cycle.catala_en index 48911d54..bc399a49 100644 --- a/tests/test_variable_state/bad/state_cycle.catala_en +++ b/tests/test_variable_state/bad/state_cycle.catala_en @@ -25,28 +25,28 @@ $ catala Typecheck foofoo@bar → foofoo@baz → foo@bar → foo@baz → foofoo@bar foofoo@bar is used here in the definition of foofoo@baz: -┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:19.37-43: +┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:19.38-19.44: └──┐ 19 │ definition foofoo state baz equals foofoo + 1 │ ‾‾‾‾‾‾ └─ Test foofoo@baz is used here in the definition of foo@bar: -┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:13.34-40: +┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:13.35-13.41: └──┐ 13 │ definition foo state bar equals foofoo │ ‾‾‾‾‾‾ └─ Test foo@bar is used here in the definition of foo@baz: -┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:15.34-37: +┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:15.35-15.38: └──┐ 15 │ definition foo state baz equals foo + 1 │ ‾‾‾ └─ Test foo@baz is used here in the definition of foofoo@bar: -┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:17.37-40: +┌─⯈ tests/test_variable_state/bad/state_cycle.catala_en:17.38-17.41: └──┐ 17 │ definition foofoo state bar equals foo │ ‾‾‾ diff --git a/tests/test_variable_state/bad/unknown_state.catala_en b/tests/test_variable_state/bad/unknown_state.catala_en index e13494ae..f681a473 100644 --- a/tests/test_variable_state/bad/unknown_state.catala_en +++ b/tests/test_variable_state/bad/unknown_state.catala_en @@ -16,14 +16,14 @@ scope A: $ catala Typecheck [ERROR] This identifier is not a state declared for variable foo. -┌─⯈ tests/test_variable_state/bad/unknown_state.catala_en:12.23-27: +┌─⯈ tests/test_variable_state/bad/unknown_state.catala_en:12.24-12.28: └──┐ 12 │ definition foo state basz equals foo + 1 │ ‾‾‾‾ └─ Test Variable declaration: -┌─⯈ tests/test_variable_state/bad/unknown_state.catala_en:5.9-12: +┌─⯈ tests/test_variable_state/bad/unknown_state.catala_en:5.10-5.13: └─┐ 5 │ output foo content integer │ ‾‾‾