diff --git a/tests/test_arithmetic/bad/division_by_zero.catala_en b/tests/arithmetic/bad/division_by_zero.catala_en similarity index 80% rename from tests/test_arithmetic/bad/division_by_zero.catala_en rename to tests/arithmetic/bad/division_by_zero.catala_en index c0c7352b..a86641cc 100644 --- a/tests/test_arithmetic/bad/division_by_zero.catala_en +++ b/tests/arithmetic/bad/division_by_zero.catala_en @@ -37,7 +37,7 @@ $ catala Interpret -s Dec division by zero at runtime The division operator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:20.23-20.30: +┌─⯈ tests/arithmetic/bad/division_by_zero.catala_en:20.23-20.30: └──┐ 20 │ definition i equals 1. / 0. │ ‾‾‾‾‾‾‾ @@ -45,7 +45,7 @@ The division operator: └─ with decimals The null denominator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:20.28-20.30: +┌─⯈ tests/arithmetic/bad/division_by_zero.catala_en:20.28-20.30: └──┐ 20 │ definition i equals 1. / 0. │ ‾‾ @@ -60,7 +60,7 @@ $ catala Interpret -s Int division by zero at runtime The division operator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:10.23-10.28: +┌─⯈ tests/arithmetic/bad/division_by_zero.catala_en:10.23-10.28: └──┐ 10 │ definition i equals 1 / 0 │ ‾‾‾‾‾ @@ -68,7 +68,7 @@ The division operator: └─ with integers The null denominator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:10.27-10.28: +┌─⯈ tests/arithmetic/bad/division_by_zero.catala_en:10.27-10.28: └──┐ 10 │ definition i equals 1 / 0 │ ‾ @@ -83,7 +83,7 @@ $ catala Interpret -s Money division by zero at runtime The division operator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:30.23-30.35: +┌─⯈ tests/arithmetic/bad/division_by_zero.catala_en:30.23-30.35: └──┐ 30 │ definition i equals $10.0 / $0.0 │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -91,7 +91,7 @@ The division operator: └─ with money The null denominator: -┌─⯈ tests/test_arithmetic/bad/division_by_zero.catala_en:30.31-30.35: +┌─⯈ tests/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/arithmetic/bad/logical_prio.catala_en similarity index 80% rename from tests/test_arithmetic/bad/logical_prio.catala_en rename to tests/arithmetic/bad/logical_prio.catala_en index 0eed46b8..11bba650 100644 --- a/tests/test_arithmetic/bad/logical_prio.catala_en +++ b/tests/arithmetic/bad/logical_prio.catala_en @@ -11,12 +11,12 @@ $ catala typecheck [ERROR] Please add parentheses to explicit which of these operators should be applied first -┌─⯈ tests/test_arithmetic/bad/logical_prio.catala_en:6.28-6.31: +┌─⯈ tests/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.58-6.60: +┌─⯈ tests/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_arithmetic/good/priorities.catala_en b/tests/arithmetic/good/priorities.catala_en similarity index 100% rename from tests/test_arithmetic/good/priorities.catala_en rename to tests/arithmetic/good/priorities.catala_en diff --git a/tests/test_arithmetic/good/rounding.catala_en b/tests/arithmetic/good/rounding.catala_en similarity index 100% rename from tests/test_arithmetic/good/rounding.catala_en rename to tests/arithmetic/good/rounding.catala_en diff --git a/tests/test_arithmetic/good/trivial.catala_en b/tests/arithmetic/good/trivial.catala_en similarity index 100% rename from tests/test_arithmetic/good/trivial.catala_en rename to tests/arithmetic/good/trivial.catala_en diff --git a/tests/test_arithmetic/good/trivial.ml b/tests/arithmetic/good/trivial.ml similarity index 100% rename from tests/test_arithmetic/good/trivial.ml rename to tests/arithmetic/good/trivial.ml diff --git a/tests/test_array/bad/fold_error.catala_en b/tests/array/bad/fold_error.catala_en similarity index 83% rename from tests/test_array/bad/fold_error.catala_en rename to tests/array/bad/fold_error.catala_en index b7309aa5..04869405 100644 --- a/tests/test_array/bad/fold_error.catala_en +++ b/tests/array/bad/fold_error.catala_en @@ -16,21 +16,21 @@ $ catala Interpret -s A I don't know how to apply operator >= on types integer and money -┌─⯈ tests/test_array/bad/fold_error.catala_en:10.48-10.55: +┌─⯈ tests/array/bad/fold_error.catala_en:10.48-10.55: └──┐ 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.32-5.39: +┌─⯈ tests/array/bad/fold_error.catala_en:5.32-5.39: └─┐ 5 │ context list content list of integer │ ‾‾‾‾‾‾‾ └─ Article Type money coming from expression: -┌─⯈ tests/test_array/bad/fold_error.catala_en:10.53-10.55: +┌─⯈ tests/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_array/good/aggregation.catala_en b/tests/array/good/aggregation.catala_en similarity index 100% rename from tests/test_array/good/aggregation.catala_en rename to tests/array/good/aggregation.catala_en diff --git a/tests/test_array/good/aggregation_2.catala_en b/tests/array/good/aggregation_2.catala_en similarity index 100% rename from tests/test_array/good/aggregation_2.catala_en rename to tests/array/good/aggregation_2.catala_en diff --git a/tests/test_array/good/aggregation_3.catala_en b/tests/array/good/aggregation_3.catala_en similarity index 100% rename from tests/test_array/good/aggregation_3.catala_en rename to tests/array/good/aggregation_3.catala_en diff --git a/tests/test_array/good/concatenation.catala_en b/tests/array/good/concatenation.catala_en similarity index 100% rename from tests/test_array/good/concatenation.catala_en rename to tests/array/good/concatenation.catala_en diff --git a/tests/test_array/good/filter.catala_en b/tests/array/good/filter.catala_en similarity index 100% rename from tests/test_array/good/filter.catala_en rename to tests/array/good/filter.catala_en diff --git a/tests/test_array/good/filter_map.catala_en b/tests/array/good/filter_map.catala_en similarity index 100% rename from tests/test_array/good/filter_map.catala_en rename to tests/array/good/filter_map.catala_en diff --git a/tests/test_array/good/fold.catala_en b/tests/array/good/fold.catala_en similarity index 100% rename from tests/test_array/good/fold.catala_en rename to tests/array/good/fold.catala_en diff --git a/tests/test_array/good/map.catala_en b/tests/array/good/map.catala_en similarity index 100% rename from tests/test_array/good/map.catala_en rename to tests/array/good/map.catala_en diff --git a/tests/test_array/good/simple.catala_en b/tests/array/good/simple.catala_en similarity index 100% rename from tests/test_array/good/simple.catala_en rename to tests/array/good/simple.catala_en diff --git a/tests/test_array/good/simpler.catala_en b/tests/array/good/simpler.catala_en similarity index 100% rename from tests/test_array/good/simpler.catala_en rename to tests/array/good/simpler.catala_en diff --git a/tests/test_array/good/simplest.catala_en b/tests/array/good/simplest.catala_en similarity index 100% rename from tests/test_array/good/simplest.catala_en rename to tests/array/good/simplest.catala_en diff --git a/tests/test_backends/output/main.c b/tests/backends/output/main.c similarity index 100% rename from tests/test_backends/output/main.c rename to tests/backends/output/main.c diff --git a/tests/test_backends/output/simple.c b/tests/backends/output/simple.c similarity index 94% rename from tests/test_backends/output/simple.c rename to tests/backends/output/simple.c index 8d306397..95aab2b5 100644 --- a/tests/test_backends/output/simple.c +++ b/tests/backends/output/simple.c @@ -121,7 +121,7 @@ baz_struct baz_func(baz_in_struct baz_in) { } if (exception_conflict) { catala_fatal_error_raised.code = catala_conflict; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 11; catala_fatal_error_raised.position.start_column = 11; catala_fatal_error_raised.position.end_line = 11; @@ -158,7 +158,7 @@ baz_struct baz_func(baz_in_struct baz_in) { } if (exception_conflict_1) { catala_fatal_error_raised.code = catala_conflict; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 11; catala_fatal_error_raised.position.start_column = 11; catala_fatal_error_raised.position.end_line = 11; @@ -181,7 +181,7 @@ baz_struct baz_func(baz_in_struct baz_in) { if (match_arg.code == option_1_enum_none_1_cons) { void* /* unit */ dummy_var = match_arg.payload.none_1_cons; catala_fatal_error_raised.code = catala_no_value_provided; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 11; catala_fatal_error_raised.position.start_column = 11; catala_fatal_error_raised.position.end_line = 11; @@ -203,7 +203,7 @@ baz_struct baz_func(baz_in_struct baz_in) { if (match_arg_1.code == option_1_enum_none_1_cons) { void* /* unit */ dummy_var = match_arg_1.payload.none_1_cons; catala_fatal_error_raised.code = catala_no_value_provided; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 11; catala_fatal_error_raised.position.start_column = 11; catala_fatal_error_raised.position.end_line = 11; @@ -249,7 +249,7 @@ baz_struct baz_func(baz_in_struct baz_in) { } if (exception_conflict_2) { catala_fatal_error_raised.code = catala_conflict; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 12; catala_fatal_error_raised.position.start_column = 10; catala_fatal_error_raised.position.end_line = 12; @@ -282,7 +282,7 @@ baz_struct baz_func(baz_in_struct baz_in) { } if (exception_conflict_3) { catala_fatal_error_raised.code = catala_conflict; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 12; catala_fatal_error_raised.position.start_column = 10; catala_fatal_error_raised.position.end_line = 12; @@ -332,7 +332,7 @@ baz_struct baz_func(baz_in_struct baz_in) { } if (exception_conflict_4) { catala_fatal_error_raised.code = catala_conflict; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 12; catala_fatal_error_raised.position.start_column = 10; catala_fatal_error_raised.position.end_line = 12; @@ -361,7 +361,7 @@ baz_struct baz_func(baz_in_struct baz_in) { if (match_arg_4.code == option_2_enum_none_2_cons) { void* /* unit */ dummy_var = match_arg_4.payload.none_2_cons; catala_fatal_error_raised.code = catala_no_value_provided; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 12; catala_fatal_error_raised.position.start_column = 10; catala_fatal_error_raised.position.end_line = 12; @@ -402,7 +402,7 @@ baz_struct baz_func(baz_in_struct baz_in) { } if (exception_conflict_5) { catala_fatal_error_raised.code = catala_conflict; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 13; catala_fatal_error_raised.position.start_column = 10; catala_fatal_error_raised.position.end_line = 13; @@ -425,7 +425,7 @@ baz_struct baz_func(baz_in_struct baz_in) { if (match_arg_5.code == option_3_enum_none_3_cons) { void* /* unit */ dummy_var = match_arg_5.payload.none_3_cons; catala_fatal_error_raised.code = catala_no_value_provided; - catala_fatal_error_raised.position.filename = "tests/test_backends/simple.catala_en"; + catala_fatal_error_raised.position.filename = "tests/backends/simple.catala_en"; catala_fatal_error_raised.position.start_line = 13; catala_fatal_error_raised.position.start_column = 10; catala_fatal_error_raised.position.end_line = 13; diff --git a/tests/test_backends/simple.catala_en b/tests/backends/simple.catala_en similarity index 100% rename from tests/test_backends/simple.catala_en rename to tests/backends/simple.catala_en diff --git a/tests/test_bool/bad/bad_assert.catala_en b/tests/bool/bad/bad_assert.catala_en similarity index 76% rename from tests/test_bool/bad/bad_assert.catala_en rename to tests/bool/bad/bad_assert.catala_en index 2f4b6a78..33746df0 100644 --- a/tests/test_bool/bad/bad_assert.catala_en +++ b/tests/bool/bad/bad_assert.catala_en @@ -18,21 +18,21 @@ Error during typechecking, incompatible types: └─⯈ bool While typechecking the following expression: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.13-9.14: +┌─⯈ tests/bool/bad/bad_assert.catala_en:9.13-9.14: └─┐ 9 │ assertion x │ ‾ └─ Test Type integer is coming from: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:5.20-5.27: +┌─⯈ tests/bool/bad/bad_assert.catala_en:5.20-5.27: └─┐ 5 │ output x content integer │ ‾‾‾‾‾‾‾ └─ Test Type bool is coming from: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.13-9.14: +┌─⯈ tests/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/bool/bad/test_xor_with_int.catala_en similarity index 83% rename from tests/test_bool/bad/test_xor_with_int.catala_en rename to tests/bool/bad/test_xor_with_int.catala_en index 5b9947f8..718549c1 100644 --- a/tests/test_bool/bad/test_xor_with_int.catala_en +++ b/tests/bool/bad/test_xor_with_int.catala_en @@ -16,14 +16,14 @@ Error during typechecking, incompatible types: └─⯈ bool This expression has type integer: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.30-8.32: +┌─⯈ tests/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 Expected type bool coming from expression: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.33-8.36: +┌─⯈ tests/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_bool/good/test_bool.catala_en b/tests/bool/good/test_bool.catala_en similarity index 100% rename from tests/test_bool/good/test_bool.catala_en rename to tests/bool/good/test_bool.catala_en diff --git a/tests/test_bool/good/test_precedence.catala_en b/tests/bool/good/test_precedence.catala_en similarity index 100% rename from tests/test_bool/good/test_precedence.catala_en rename to tests/bool/good/test_precedence.catala_en diff --git a/tests/test_bool/good/test_xor.catala_en b/tests/bool/good/test_xor.catala_en similarity index 100% rename from tests/test_bool/good/test_xor.catala_en rename to tests/bool/good/test_xor.catala_en diff --git a/tests/test_date/bad/rounding_option_conflict.catala_en b/tests/date/bad/rounding_option_conflict.catala_en similarity index 84% rename from tests/test_date/bad/rounding_option_conflict.catala_en rename to tests/date/bad/rounding_option_conflict.catala_en index 2fc1d085..6749a713 100644 --- a/tests/test_date/bad/rounding_option_conflict.catala_en +++ b/tests/date/bad/rounding_option_conflict.catala_en @@ -28,12 +28,12 @@ $ catala Interpret -s Test [ERROR] You cannot set multiple date rounding modes -┌─⯈ tests/test_date/bad/rounding_option_conflict.catala_en:10.14-10.24: +┌─⯈ tests/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.14-12.24: +┌─⯈ tests/date/bad/rounding_option_conflict.catala_en:12.14-12.24: └──┐ 12 │ date round increasing │ ‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_date/bad/rounding_option_en.catala_en b/tests/date/bad/rounding_option_en.catala_en similarity index 100% rename from tests/test_date/bad/rounding_option_en.catala_en rename to tests/date/bad/rounding_option_en.catala_en diff --git a/tests/test_date/bad/rounding_option_fr.catala_fr b/tests/date/bad/rounding_option_fr.catala_fr similarity index 100% rename from tests/test_date/bad/rounding_option_fr.catala_fr rename to tests/date/bad/rounding_option_fr.catala_fr diff --git a/tests/test_date/bad/substraction.catala_en b/tests/date/bad/substraction.catala_en similarity index 80% rename from tests/test_date/bad/substraction.catala_en rename to tests/date/bad/substraction.catala_en index bb58420e..05724c2f 100644 --- a/tests/test_date/bad/substraction.catala_en +++ b/tests/date/bad/substraction.catala_en @@ -12,19 +12,19 @@ $ catala Interpret -s A I don't know how to apply operator <= on types date and duration -┌─⯈ tests/test_date/bad/substraction.catala_en:6.23-6.52: +┌─⯈ tests/date/bad/substraction.catala_en:6.23-6.52: └─┐ 6 │ definition o equals |2024-01-16| - 0 day <= 0 day │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ Type date coming from expression: -┌─⯈ tests/test_date/bad/substraction.catala_en:6.23-6.43: +┌─⯈ tests/date/bad/substraction.catala_en:6.23-6.43: └─┐ 6 │ definition o equals |2024-01-16| - 0 day <= 0 day │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ Type duration coming from expression: -┌─⯈ tests/test_date/bad/substraction.catala_en:6.47-6.52: +┌─⯈ tests/date/bad/substraction.catala_en:6.47-6.52: └─┐ 6 │ definition o equals |2024-01-16| - 0 day <= 0 day │ ‾‾‾‾‾ diff --git a/tests/test_date/bad/uncomparable_duration.catala_en b/tests/date/bad/uncomparable_duration.catala_en similarity index 82% rename from tests/test_date/bad/uncomparable_duration.catala_en rename to tests/date/bad/uncomparable_duration.catala_en index 4fbed2e8..b2120e9e 100644 --- a/tests/test_date/bad/uncomparable_duration.catala_en +++ b/tests/date/bad/uncomparable_duration.catala_en @@ -45,14 +45,14 @@ $ catala Interpret -s Ge [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:40.23-40.30: +┌─⯈ tests/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.34-40.39: +┌─⯈ tests/date/bad/uncomparable_duration.catala_en:40.34-40.39: └──┐ 40 │ definition d equals 1 month >= 2 day │ ‾‾‾‾‾ @@ -66,14 +66,14 @@ $ catala Interpret -s Gt [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:30.23-30.30: +┌─⯈ tests/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.33-30.38: +┌─⯈ tests/date/bad/uncomparable_duration.catala_en:30.33-30.38: └──┐ 30 │ definition d equals 1 month > 2 day │ ‾‾‾‾‾ @@ -87,14 +87,14 @@ $ catala Interpret -s Le [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:20.23-20.30: +┌─⯈ tests/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.34-20.39: +┌─⯈ tests/date/bad/uncomparable_duration.catala_en:20.34-20.39: └──┐ 20 │ definition d equals 1 month <= 2 day │ ‾‾‾‾‾ @@ -108,14 +108,14 @@ $ catala Interpret -s Lt [ERROR] Cannot compare together durations that cannot be converted to a precise number of days -┌─⯈ tests/test_date/bad/uncomparable_duration.catala_en:10.23-10.30: +┌─⯈ tests/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.33-10.38: +┌─⯈ tests/date/bad/uncomparable_duration.catala_en:10.33-10.38: └──┐ 10 │ definition d equals 1 month < 2 day │ ‾‾‾‾‾ diff --git a/tests/test_date/good/durations.catala_en b/tests/date/good/durations.catala_en similarity index 100% rename from tests/test_date/good/durations.catala_en rename to tests/date/good/durations.catala_en diff --git a/tests/test_date/good/rounding_option_en.catala_en b/tests/date/good/rounding_option_en.catala_en similarity index 100% rename from tests/test_date/good/rounding_option_en.catala_en rename to tests/date/good/rounding_option_en.catala_en diff --git a/tests/test_date/good/rounding_option_fr.catala_fr b/tests/date/good/rounding_option_fr.catala_fr similarity index 100% rename from tests/test_date/good/rounding_option_fr.catala_fr rename to tests/date/good/rounding_option_fr.catala_fr diff --git a/tests/test_date/good/simple.catala_en b/tests/date/good/simple.catala_en similarity index 100% rename from tests/test_date/good/simple.catala_en rename to tests/date/good/simple.catala_en diff --git a/tests/test_dec/good/infinite_precision.catala_en b/tests/dec/good/infinite_precision.catala_en similarity index 100% rename from tests/test_dec/good/infinite_precision.catala_en rename to tests/dec/good/infinite_precision.catala_en diff --git a/tests/test_dec/good/rounding.catala_en b/tests/dec/good/rounding.catala_en similarity index 100% rename from tests/test_dec/good/rounding.catala_en rename to tests/dec/good/rounding.catala_en diff --git a/tests/test_dec/good/simple.catala_en b/tests/dec/good/simple.catala_en similarity index 100% rename from tests/test_dec/good/simple.catala_en rename to tests/dec/good/simple.catala_en diff --git a/tests/test_dec/good/zero_after_comma.catala_en b/tests/dec/good/zero_after_comma.catala_en similarity index 100% rename from tests/test_dec/good/zero_after_comma.catala_en rename to tests/dec/good/zero_after_comma.catala_en diff --git a/tests/default/bad/conflict.catala_en b/tests/default/bad/conflict.catala_en new file mode 100644 index 00000000..6975b20f --- /dev/null +++ b/tests/default/bad/conflict.catala_en @@ -0,0 +1,18 @@ +## Article + +```catala +declaration scope A: + output x content integer + +scope A: + definition x under condition true consequence equals 1 + definition x under condition true consequence equals 0 +``` + +```catala-test-inline +$ catala Interpret -s A --message=gnu +tests/default/bad/conflict.catala_en:8.56-8.57: [ERROR] There is a conflict between multiple valid consequences for assigning the same variable. +tests/default/bad/conflict.catala_en:8.56-8.57: [ERROR] This consequence has a valid justification: +tests/default/bad/conflict.catala_en:9.56-9.57: [ERROR] This consequence has a valid justification: +#return code 123# +``` diff --git a/tests/test_default/bad/empty.catala_en b/tests/default/bad/empty.catala_en similarity index 83% rename from tests/test_default/bad/empty.catala_en rename to tests/default/bad/empty.catala_en index 3c2e6db9..c522134a 100644 --- a/tests/test_default/bad/empty.catala_en +++ b/tests/default/bad/empty.catala_en @@ -13,7 +13,7 @@ scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "y" is declared but never defined; did you forget something? -┌─⯈ tests/test_default/bad/empty.catala_en:6.10-6.11: +┌─⯈ tests/default/bad/empty.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ @@ -22,7 +22,7 @@ $ catala Interpret -s A This variable evaluated to an empty term (no rule that defined it applied in this situation): error_empty ⟨false ⊢ ∅⟩ -┌─⯈ tests/test_default/bad/empty.catala_en:6.10-6.11: +┌─⯈ tests/default/bad/empty.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_default/bad/empty_with_rules.catala_en b/tests/default/bad/empty_with_rules.catala_en similarity index 90% rename from tests/test_default/bad/empty_with_rules.catala_en rename to tests/default/bad/empty_with_rules.catala_en index bf16c9ed..cbc74306 100644 --- a/tests/test_default/bad/empty_with_rules.catala_en +++ b/tests/default/bad/empty_with_rules.catala_en @@ -19,7 +19,7 @@ This variable evaluated to an empty term (no rule that defined it applied in thi error_empty ⟨ ⟨ ⟨ ⟨1 = 4 ⊢ ⟨1⟩⟩ | 1 = 3 ⊢ ⟨1⟩ ⟩ | 1 = 2 ⊢ ⟨1⟩ ⟩ | false ⊢ ∅ ⟩ -┌─⯈ tests/test_default/bad/empty_with_rules.catala_en:5.10-5.11: +┌─⯈ tests/default/bad/empty_with_rules.catala_en:5.10-5.11: └─┐ 5 │ output x content integer │ ‾ diff --git a/tests/test_default/bad/typing_or_logical_error.catala_en b/tests/default/bad/typing_or_logical_error.catala_en similarity index 82% rename from tests/test_default/bad/typing_or_logical_error.catala_en rename to tests/default/bad/typing_or_logical_error.catala_en index b22a00ea..bda799e6 100644 --- a/tests/test_default/bad/typing_or_logical_error.catala_en +++ b/tests/default/bad/typing_or_logical_error.catala_en @@ -21,13 +21,13 @@ or "under condition", or "." Error token: -┌─⯈ tests/test_default/bad/typing_or_logical_error.catala_en:8.30-8.31: +┌─⯈ tests/default/bad/typing_or_logical_error.catala_en:8.30-8.31: └─┐ 8 │ definition wrong_definition = 1 │ ‾ Last good token: -┌─⯈ tests/test_default/bad/typing_or_logical_error.catala_en:8.13-8.29: +┌─⯈ tests/default/bad/typing_or_logical_error.catala_en:8.13-8.29: └─┐ 8 │ definition wrong_definition = 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_default/good/mutliple_definitions.catala_en b/tests/default/good/mutliple_definitions.catala_en similarity index 75% rename from tests/test_default/good/mutliple_definitions.catala_en rename to tests/default/good/mutliple_definitions.catala_en index b904ed75..ce4ebd9c 100644 --- a/tests/test_default/good/mutliple_definitions.catala_en +++ b/tests/default/good/mutliple_definitions.catala_en @@ -15,12 +15,12 @@ scope A: $ catala Typecheck --check-invariants [WARNING] These definitions have identical justifications and consequences; is it a mistake? -┌─⯈ tests/test_default/good/mutliple_definitions.catala_en:9.3-9.15: +┌─⯈ tests/default/good/mutliple_definitions.catala_en:9.3-9.15: └─┐ 9 │ definition w equals 3 │ ‾‾‾‾‾‾‾‾‾‾‾‾ -┌─⯈ tests/test_default/good/mutliple_definitions.catala_en:6.3-6.15: +┌─⯈ tests/default/good/mutliple_definitions.catala_en:6.3-6.15: └─┐ 6 │ definition w equals 3 │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -32,12 +32,12 @@ $ catala Typecheck --check-invariants $ catala Interpret -s A [WARNING] These definitions have identical justifications and consequences; is it a mistake? -┌─⯈ tests/test_default/good/mutliple_definitions.catala_en:9.3-9.15: +┌─⯈ tests/default/good/mutliple_definitions.catala_en:9.3-9.15: └─┐ 9 │ definition w equals 3 │ ‾‾‾‾‾‾‾‾‾‾‾‾ -┌─⯈ tests/test_default/good/mutliple_definitions.catala_en:6.3-6.15: +┌─⯈ tests/default/good/mutliple_definitions.catala_en:6.3-6.15: └─┐ 6 │ definition w equals 3 │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/ambiguous_cases.catala_en b/tests/enum/bad/ambiguous_cases.catala_en similarity index 87% rename from tests/test_enum/bad/ambiguous_cases.catala_en rename to tests/enum/bad/ambiguous_cases.catala_en index 1c7fb1a2..cf91d779 100644 --- a/tests/test_enum/bad/ambiguous_cases.catala_en +++ b/tests/enum/bad/ambiguous_cases.catala_en @@ -19,7 +19,7 @@ $ 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.23-14.28: +┌─⯈ tests/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/enum/bad/ambiguous_wildcard.catala_en similarity index 89% rename from tests/test_enum/bad/ambiguous_wildcard.catala_en rename to tests/enum/bad/ambiguous_wildcard.catala_en index 1b9c2ece..cb89fc44 100644 --- a/tests/test_enum/bad/ambiguous_wildcard.catala_en +++ b/tests/enum/bad/ambiguous_wildcard.catala_en @@ -20,7 +20,7 @@ $ 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.5-15.21: +┌─⯈ tests/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/enum/bad/duplicate_case.catala_en similarity index 82% rename from tests/test_enum/bad/duplicate_case.catala_en rename to tests/enum/bad/duplicate_case.catala_en index 1e31355e..80f6d7fc 100644 --- a/tests/test_enum/bad/duplicate_case.catala_en +++ b/tests/enum/bad/duplicate_case.catala_en @@ -23,13 +23,13 @@ $ catala Interpret -s A [ERROR] The constructor Case3 has been matched twice: -┌─⯈ tests/test_enum/bad/duplicate_case.catala_en:18.16-18.20: +┌─⯈ tests/enum/bad/duplicate_case.catala_en:18.16-18.20: └──┐ 18 │ -- Case3 : true │ ‾‾‾‾ └─ Article -┌─⯈ tests/test_enum/bad/duplicate_case.catala_en:17.16-17.21: +┌─⯈ tests/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/enum/bad/empty.catala_en similarity index 86% rename from tests/test_enum/bad/empty.catala_en rename to tests/enum/bad/empty.catala_en index 94f07b78..2b0cdeef 100644 --- a/tests/test_enum/bad/empty.catala_en +++ b/tests/enum/bad/empty.catala_en @@ -12,7 +12,7 @@ $ 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.25-4.28: +┌─⯈ tests/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/enum/bad/missing_case.catala_en similarity index 88% rename from tests/test_enum/bad/missing_case.catala_en rename to tests/enum/bad/missing_case.catala_en index 301df1d3..df7c50bf 100644 --- a/tests/test_enum/bad/missing_case.catala_en +++ b/tests/enum/bad/missing_case.catala_en @@ -20,7 +20,7 @@ scope A: $ catala Interpret -s A [WARNING] The constructor "Case3" of enumeration "E" is never used; maybe it's unnecessary? -┌─⯈ tests/test_enum/bad/missing_case.catala_en:7.6-7.11: +┌─⯈ tests/enum/bad/missing_case.catala_en:7.6-7.11: └─┐ 7 │ -- Case3 │ ‾‾‾‾‾ @@ -28,7 +28,7 @@ $ catala Interpret -s A [ERROR] The constructor Case3 of enum E is missing from this pattern matching -┌─⯈ tests/test_enum/bad/missing_case.catala_en:14.25-16.22: +┌─⯈ tests/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/enum/bad/not_ending_wildcard.catala_en similarity index 85% rename from tests/test_enum/bad/not_ending_wildcard.catala_en rename to tests/enum/bad/not_ending_wildcard.catala_en index 2289b0d6..beaf72ef 100644 --- a/tests/test_enum/bad/not_ending_wildcard.catala_en +++ b/tests/enum/bad/not_ending_wildcard.catala_en @@ -42,7 +42,7 @@ $ catala Interpret -s First_case Wildcard must be the last match case Not ending wildcard: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:19.5-19.21: +┌─⯈ tests/enum/bad/not_ending_wildcard.catala_en:19.5-19.21: └──┐ 19 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -50,7 +50,7 @@ Not ending wildcard: └─ Wildcard can't be the first case Next reachable case: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:20.5-20.18: +┌─⯈ tests/enum/bad/not_ending_wildcard.catala_en:20.5-20.18: └──┐ 20 │ -- Case2 : 42 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -65,7 +65,7 @@ $ catala Interpret -s Middle_case Wildcard must be the last match case Not ending wildcard: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:19.5-19.21: +┌─⯈ tests/enum/bad/not_ending_wildcard.catala_en:19.5-19.21: └──┐ 19 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -73,7 +73,7 @@ Not ending wildcard: └─ Wildcard can't be the first case Next reachable case: -┌─⯈ tests/test_enum/bad/not_ending_wildcard.catala_en:20.5-20.18: +┌─⯈ tests/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/enum/bad/quick_pattern_2.catala_en similarity index 84% rename from tests/test_enum/bad/quick_pattern_2.catala_en rename to tests/enum/bad/quick_pattern_2.catala_en index ab869924..7dcc5623 100644 --- a/tests/test_enum/bad/quick_pattern_2.catala_en +++ b/tests/enum/bad/quick_pattern_2.catala_en @@ -36,21 +36,21 @@ Error during typechecking, incompatible types: └─⯈ F While typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.23-28.24: +┌─⯈ tests/enum/bad/quick_pattern_2.catala_en:28.23-28.24: └──┐ 28 │ definition y equals x with pattern Case3 │ ‾ └─ Article Type E is coming from: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:17.21-17.22: +┌─⯈ tests/enum/bad/quick_pattern_2.catala_en:17.21-17.22: └──┐ 17 │ context x content E │ ‾ └─ Article Type F is coming from: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.23-28.43: +┌─⯈ tests/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/enum/bad/quick_pattern_3.catala_en similarity index 80% rename from tests/test_enum/bad/quick_pattern_3.catala_en rename to tests/enum/bad/quick_pattern_3.catala_en index faac0369..145539a4 100644 --- a/tests/test_enum/bad/quick_pattern_3.catala_en +++ b/tests/enum/bad/quick_pattern_3.catala_en @@ -26,21 +26,21 @@ Error during typechecking, incompatible types: └─⯈ F While typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.21-18.22: +┌─⯈ tests/enum/bad/quick_pattern_3.catala_en:18.21-18.22: └──┐ 18 │ definition y equals x with pattern Case3 │ ‾ └─ Article Type E is coming from: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:13.19-13.20: +┌─⯈ tests/enum/bad/quick_pattern_3.catala_en:13.19-13.20: └──┐ 13 │ context x content E │ ‾ └─ Article Type F is coming from: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.21-18.41: +┌─⯈ tests/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/enum/bad/quick_pattern_4.catala_en similarity index 80% rename from tests/test_enum/bad/quick_pattern_4.catala_en rename to tests/enum/bad/quick_pattern_4.catala_en index 85c0275a..f834074c 100644 --- a/tests/test_enum/bad/quick_pattern_4.catala_en +++ b/tests/enum/bad/quick_pattern_4.catala_en @@ -25,21 +25,21 @@ Error during typechecking, incompatible types: └─⯈ F While typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.21-17.22: +┌─⯈ tests/enum/bad/quick_pattern_4.catala_en:17.21-17.22: └──┐ 17 │ definition y equals x with pattern Case3 │ ‾ └─ Test Type E is coming from: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:12.19-12.20: +┌─⯈ tests/enum/bad/quick_pattern_4.catala_en:12.19-12.20: └──┐ 12 │ context x content E │ ‾ └─ Test Type F is coming from: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.21-17.41: +┌─⯈ tests/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/enum/bad/quick_pattern_fail.catala_en similarity index 90% rename from tests/test_enum/bad/quick_pattern_fail.catala_en rename to tests/enum/bad/quick_pattern_fail.catala_en index 67f696b2..6518795d 100644 --- a/tests/test_enum/bad/quick_pattern_fail.catala_en +++ b/tests/enum/bad/quick_pattern_fail.catala_en @@ -22,7 +22,7 @@ The name of this constructor has not been defined before (it's probably a typographical error). Here is your code : -┌─⯈ tests/test_enum/bad/quick_pattern_fail.catala_en:15.38-15.43: +┌─⯈ tests/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/enum/bad/too_many_cases.catala_en similarity index 90% rename from tests/test_enum/bad/too_many_cases.catala_en rename to tests/enum/bad/too_many_cases.catala_en index b4ea2ec2..9e71fbd2 100644 --- a/tests/test_enum/bad/too_many_cases.catala_en +++ b/tests/enum/bad/too_many_cases.catala_en @@ -26,7 +26,7 @@ $ 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.8-21.13: +┌─⯈ tests/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/enum/bad/useless_wildcard.catala_en similarity index 90% rename from tests/test_enum/bad/useless_wildcard.catala_en rename to tests/enum/bad/useless_wildcard.catala_en index 97e5ec9f..0ff593f7 100644 --- a/tests/test_enum/bad/useless_wildcard.catala_en +++ b/tests/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.5-17.21: +┌─⯈ tests/enum/bad/useless_wildcard.catala_en:17.5-17.21: └──┐ 17 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/wrong_cons.catala_en b/tests/enum/bad/wrong_cons.catala_en similarity index 88% rename from tests/test_enum/bad/wrong_cons.catala_en rename to tests/enum/bad/wrong_cons.catala_en index 323fc0cf..1835636a 100644 --- a/tests/test_enum/bad/wrong_cons.catala_en +++ b/tests/enum/bad/wrong_cons.catala_en @@ -18,7 +18,7 @@ The name of this constructor has not been defined before (it's probably a typographical error). Here is your code : -┌─⯈ tests/test_enum/bad/wrong_cons.catala_en:11.23-11.28: +┌─⯈ tests/enum/bad/wrong_cons.catala_en:11.23-11.28: └──┐ 11 │ definition e equals Case2 │ ‾‾‾‾‾ diff --git a/tests/test_enum/good/disambiguated_cases.catala_en b/tests/enum/good/disambiguated_cases.catala_en similarity index 100% rename from tests/test_enum/good/disambiguated_cases.catala_en rename to tests/enum/good/disambiguated_cases.catala_en diff --git a/tests/test_enum/good/quick_pattern_check.catala_en b/tests/enum/good/quick_pattern_check.catala_en similarity index 100% rename from tests/test_enum/good/quick_pattern_check.catala_en rename to tests/enum/good/quick_pattern_check.catala_en diff --git a/tests/test_enum/good/simple.catala_en b/tests/enum/good/simple.catala_en similarity index 100% rename from tests/test_enum/good/simple.catala_en rename to tests/enum/good/simple.catala_en diff --git a/tests/test_enum/good/wildcard.catala_en b/tests/enum/good/wildcard.catala_en similarity index 100% rename from tests/test_enum/good/wildcard.catala_en rename to tests/enum/good/wildcard.catala_en diff --git a/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en b/tests/exception/bad/ambiguous_unlabeled_exception.catala_en similarity index 73% rename from tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en rename to tests/exception/bad/ambiguous_unlabeled_exception.catala_en index db33ac1b..83c6d5eb 100644 --- a/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en +++ b/tests/exception/bad/ambiguous_unlabeled_exception.catala_en @@ -19,7 +19,7 @@ $ catala Interpret -s A This exception can refer to several definitions. Try using labels to disambiguate Ambiguous exception -┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:12.3-13.15: +┌─⯈ tests/exception/bad/ambiguous_unlabeled_exception.catala_en:12.3-13.15: └──┐ 12 │ exception │ ‾‾‾‾‾‾‾‾‾ @@ -28,14 +28,14 @@ Ambiguous exception └─ Test Candidate definition -┌─⯈ tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en:10.14-10.15: +┌─⯈ tests/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.14-8.15: +┌─⯈ tests/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/exception/bad/dangling_exception.catala_en similarity index 84% rename from tests/test_exception/bad/dangling_exception.catala_en rename to tests/exception/bad/dangling_exception.catala_en index 1702e1ca..d9c496a0 100644 --- a/tests/test_exception/bad/dangling_exception.catala_en +++ b/tests/exception/bad/dangling_exception.catala_en @@ -18,7 +18,7 @@ $ catala Interpret -s A [ERROR] Unknown label for the scope variable x: "base_y" -┌─⯈ tests/test_exception/bad/dangling_exception.catala_en:12.13-12.19: +┌─⯈ tests/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/exception/bad/exceptions_cycle.catala_en similarity index 86% rename from tests/test_exception/bad/exceptions_cycle.catala_en rename to tests/exception/bad/exceptions_cycle.catala_en index 6fe1f289..0452332b 100644 --- a/tests/test_exception/bad/exceptions_cycle.catala_en +++ b/tests/exception/bad/exceptions_cycle.catala_en @@ -23,7 +23,7 @@ $ catala Interpret -s A [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.3-10.15: +┌─⯈ tests/exception/bad/exceptions_cycle.catala_en:8.3-10.15: └──┐ 8 │ label base_x │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -32,7 +32,7 @@ Exception cycle detected when defining x: each of these 3 exceptions applies ove 10 │ definition x equals 0 │ ‾‾‾‾‾‾‾‾‾‾‾‾ -┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:12.3-14.15: +┌─⯈ tests/exception/bad/exceptions_cycle.catala_en:12.3-14.15: └──┐ 12 │ label exception_x │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -41,7 +41,7 @@ Exception cycle detected when defining x: each of these 3 exceptions applies ove 14 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ -┌─⯈ tests/test_exception/bad/exceptions_cycle.catala_en:16.3-18.15: +┌─⯈ tests/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/exception/bad/missing_unlabeled_definition.catala_en similarity index 82% rename from tests/test_exception/bad/missing_unlabeled_definition.catala_en rename to tests/exception/bad/missing_unlabeled_definition.catala_en index 809417b8..7939dfe7 100644 --- a/tests/test_exception/bad/missing_unlabeled_definition.catala_en +++ b/tests/exception/bad/missing_unlabeled_definition.catala_en @@ -14,7 +14,7 @@ $ catala Interpret -s A [ERROR] This exception does not have a corresponding definition -┌─⯈ tests/test_exception/bad/missing_unlabeled_definition.catala_en:8.3-9.15: +┌─⯈ tests/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/exception/bad/one_ambiguous_exception.catala_en similarity index 76% rename from tests/test_exception/bad/one_ambiguous_exception.catala_en rename to tests/exception/bad/one_ambiguous_exception.catala_en index 26e6b0d7..8ef30058 100644 --- a/tests/test_exception/bad/one_ambiguous_exception.catala_en +++ b/tests/exception/bad/one_ambiguous_exception.catala_en @@ -25,7 +25,7 @@ $ catala Interpret -s A This exception can refer to several definitions. Try using labels to disambiguate Ambiguous exception -┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:18.3-19.15: +┌─⯈ tests/exception/bad/one_ambiguous_exception.catala_en:18.3-19.15: └──┐ 18 │ exception │ ‾‾‾‾‾‾‾‾‾ @@ -34,14 +34,14 @@ Ambiguous exception └─ Test Candidate definition -┌─⯈ tests/test_exception/bad/one_ambiguous_exception.catala_en:16.14-16.15: +┌─⯈ tests/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.14-14.15: +┌─⯈ tests/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/exception/bad/self_exception.catala_en similarity index 83% rename from tests/test_exception/bad/self_exception.catala_en rename to tests/exception/bad/self_exception.catala_en index 4f3237f0..674c590c 100644 --- a/tests/test_exception/bad/self_exception.catala_en +++ b/tests/exception/bad/self_exception.catala_en @@ -15,7 +15,7 @@ $ catala Interpret -s A [ERROR] Cannot define rule as an exception to itself -┌─⯈ tests/test_exception/bad/self_exception.catala_en:9.13-9.19: +┌─⯈ tests/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/exception/bad/two_exceptions.catala_en similarity index 81% rename from tests/test_exception/bad/two_exceptions.catala_en rename to tests/exception/bad/two_exceptions.catala_en index 6ad1a93f..c7cbd40d 100644 --- a/tests/test_exception/bad/two_exceptions.catala_en +++ b/tests/exception/bad/two_exceptions.catala_en @@ -21,14 +21,14 @@ $ catala Interpret -s A 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.23-12.24: +┌─⯈ tests/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.23-15.24: +┌─⯈ tests/exception/bad/two_exceptions.catala_en:15.23-15.24: └──┐ 15 │ definition x equals 2 │ ‾ diff --git a/tests/test_exception/good/context_with_default.catala_en b/tests/exception/good/context_with_default.catala_en similarity index 100% rename from tests/test_exception/good/context_with_default.catala_en rename to tests/exception/good/context_with_default.catala_en diff --git a/tests/test_exception/good/double_definition.catala_en b/tests/exception/good/double_definition.catala_en similarity index 81% rename from tests/test_exception/good/double_definition.catala_en rename to tests/exception/good/double_definition.catala_en index 98e1ae0b..a0c11fd7 100644 --- a/tests/test_exception/good/double_definition.catala_en +++ b/tests/exception/good/double_definition.catala_en @@ -16,13 +16,13 @@ scope Foo: $ catala Typecheck --check-invariants [WARNING] These definitions have identical justifications and consequences; is it a mistake? -┌─⯈ tests/test_exception/good/double_definition.catala_en:9.3-9.15: +┌─⯈ tests/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.3-8.15: +┌─⯈ tests/exception/good/double_definition.catala_en:8.3-8.15: └─┐ 8 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -35,13 +35,13 @@ $ catala Typecheck --check-invariants $ 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.3-9.15: +┌─⯈ tests/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.3-8.15: +┌─⯈ tests/exception/good/double_definition.catala_en:8.3-8.15: └─┐ 8 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -60,13 +60,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.3-9.15: +┌─⯈ tests/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.3-8.15: +┌─⯈ tests/exception/good/double_definition.catala_en:8.3-8.15: └─┐ 8 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/good/duplicate_labels.catala_en b/tests/exception/good/duplicate_labels.catala_en similarity index 100% rename from tests/test_exception/good/duplicate_labels.catala_en rename to tests/exception/good/duplicate_labels.catala_en diff --git a/tests/test_exception/good/exception.catala_en b/tests/exception/good/exception.catala_en similarity index 100% rename from tests/test_exception/good/exception.catala_en rename to tests/exception/good/exception.catala_en diff --git a/tests/test_exception/good/exceptions_squared.catala_en b/tests/exception/good/exceptions_squared.catala_en similarity index 100% rename from tests/test_exception/good/exceptions_squared.catala_en rename to tests/exception/good/exceptions_squared.catala_en diff --git a/tests/test_exception/good/grouped_exceptions.catala_en b/tests/exception/good/grouped_exceptions.catala_en similarity index 100% rename from tests/test_exception/good/grouped_exceptions.catala_en rename to tests/exception/good/grouped_exceptions.catala_en diff --git a/tests/test_exception/good/groups_of_exceptions.catala_en b/tests/exception/good/groups_of_exceptions.catala_en similarity index 87% rename from tests/test_exception/good/groups_of_exceptions.catala_en rename to tests/exception/good/groups_of_exceptions.catala_en index 214269d7..8f5d0870 100644 --- a/tests/test_exception/good/groups_of_exceptions.catala_en +++ b/tests/exception/good/groups_of_exceptions.catala_en @@ -84,36 +84,36 @@ $ catala Exceptions -s Foo -v x Printing the tree of exceptions for the definitions of variable "x" of scope "Foo". [RESULT] Definitions with label "base": -┌─⯈ tests/test_exception/good/groups_of_exceptions.catala_en:9.3-9.26: +┌─⯈ tests/exception/good/groups_of_exceptions.catala_en:9.3-9.26: └─┐ 9 │ label base definition x under condition │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └─ Test -┌─⯈ tests/test_exception/good/groups_of_exceptions.catala_en:13.3-13.26: +┌─⯈ tests/exception/good/groups_of_exceptions.catala_en:13.3-13.26: └──┐ 13 │ label base definition x under condition │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └─ Test [RESULT] Definitions with label "intermediate": -┌─⯈ tests/test_exception/good/groups_of_exceptions.catala_en:17.3-17.49: +┌─⯈ tests/exception/good/groups_of_exceptions.catala_en:17.3-17.49: └──┐ 17 │ label intermediate exception base definition x under condition │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └─ Test -┌─⯈ tests/test_exception/good/groups_of_exceptions.catala_en:21.3-21.49: +┌─⯈ tests/exception/good/groups_of_exceptions.catala_en:21.3-21.49: └──┐ 21 │ label intermediate exception base definition x under condition │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └─ Test [RESULT] Definitions with label "exception_to_intermediate": -┌─⯈ tests/test_exception/good/groups_of_exceptions.catala_en:25.3-25.38: +┌─⯈ tests/exception/good/groups_of_exceptions.catala_en:25.3-25.38: └──┐ 25 │ exception intermediate definition x under condition │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ └─ Test -┌─⯈ tests/test_exception/good/groups_of_exceptions.catala_en:29.3-29.38: +┌─⯈ tests/exception/good/groups_of_exceptions.catala_en:29.3-29.38: └──┐ 29 │ exception intermediate definition x under condition │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/good/same_label_two_variables.catala_en b/tests/exception/good/same_label_two_variables.catala_en similarity index 100% rename from tests/test_exception/good/same_label_two_variables.catala_en rename to tests/exception/good/same_label_two_variables.catala_en diff --git a/tests/test_exception/good/split_unlabeled_exception.catala_en b/tests/exception/good/split_unlabeled_exception.catala_en similarity index 100% rename from tests/test_exception/good/split_unlabeled_exception.catala_en rename to tests/exception/good/split_unlabeled_exception.catala_en diff --git a/tests/test_exception/good/two_exceptions_same_outcome.catala_en b/tests/exception/good/two_exceptions_same_outcome.catala_en similarity index 100% rename from tests/test_exception/good/two_exceptions_same_outcome.catala_en rename to tests/exception/good/two_exceptions_same_outcome.catala_en diff --git a/tests/test_exception/good/two_unlabeled_exceptions.catala_en b/tests/exception/good/two_unlabeled_exceptions.catala_en similarity index 100% rename from tests/test_exception/good/two_unlabeled_exceptions.catala_en rename to tests/exception/good/two_unlabeled_exceptions.catala_en diff --git a/tests/test_exception/good/unlabeled_exception.catala_en b/tests/exception/good/unlabeled_exception.catala_en similarity index 100% rename from tests/test_exception/good/unlabeled_exception.catala_en rename to tests/exception/good/unlabeled_exception.catala_en diff --git a/tests/test_exception/good/unsorted_unlabeled_exceptions.catala_en b/tests/exception/good/unsorted_unlabeled_exceptions.catala_en similarity index 100% rename from tests/test_exception/good/unsorted_unlabeled_exceptions.catala_en rename to tests/exception/good/unsorted_unlabeled_exceptions.catala_en diff --git a/tests/test_func/bad/bad_func.catala_en b/tests/func/bad/bad_func.catala_en similarity index 91% rename from tests/test_func/bad/bad_func.catala_en rename to tests/func/bad/bad_func.catala_en index 8df80939..ba8129eb 100644 --- a/tests/test_func/bad/bad_func.catala_en +++ b/tests/func/bad/bad_func.catala_en @@ -33,14 +33,14 @@ $ catala Interpret -s S 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.65-14.70: +┌─⯈ tests/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.62-15.67: +┌─⯈ tests/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/func/bad/param_inconsistency.catala_en similarity index 84% rename from tests/test_func/bad/param_inconsistency.catala_en rename to tests/func/bad/param_inconsistency.catala_en index 3b30b92c..992f4aa3 100644 --- a/tests/test_func/bad/param_inconsistency.catala_en +++ b/tests/func/bad/param_inconsistency.catala_en @@ -18,13 +18,13 @@ $ catala typecheck Function argument name mismatch between declaration ('x') and definition ('y') Argument declared here: -┌─⯈ tests/test_func/bad/param_inconsistency.catala_en:4.42-4.43: +┌─⯈ tests/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.20-10.21: +┌─⯈ tests/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/func/bad/param_inconsistency2.catala_en similarity index 83% rename from tests/test_func/bad/param_inconsistency2.catala_en rename to tests/func/bad/param_inconsistency2.catala_en index 25b97ff8..32c1b78c 100644 --- a/tests/test_func/bad/param_inconsistency2.catala_en +++ b/tests/func/bad/param_inconsistency2.catala_en @@ -17,13 +17,13 @@ $ catala typecheck Function argument name mismatch between declaration ('x') and definition ('y') Argument declared here: -┌─⯈ tests/test_func/bad/param_inconsistency2.catala_en:4.42-4.43: +┌─⯈ tests/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.30-9.31: +┌─⯈ tests/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/func/bad/param_inconsistency3.catala_en similarity index 83% rename from tests/test_func/bad/param_inconsistency3.catala_en rename to tests/func/bad/param_inconsistency3.catala_en index 4072b062..510740e2 100644 --- a/tests/test_func/bad/param_inconsistency3.catala_en +++ b/tests/func/bad/param_inconsistency3.catala_en @@ -17,13 +17,13 @@ $ catala typecheck Function argument name mismatch between declaration ('x') and definition ('y') Argument declared here: -┌─⯈ tests/test_func/bad/param_inconsistency3.catala_en:4.42-4.43: +┌─⯈ tests/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.30-9.31: +┌─⯈ tests/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/func/bad/recursive.catala_en similarity index 88% rename from tests/test_func/bad/recursive.catala_en rename to tests/func/bad/recursive.catala_en index 8258ae81..9379876c 100644 --- a/tests/test_func/bad/recursive.catala_en +++ b/tests/func/bad/recursive.catala_en @@ -13,7 +13,7 @@ $ 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.28-8.29: +┌─⯈ tests/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/closure_conversion.catala_en b/tests/func/good/closure_conversion.catala_en similarity index 100% rename from tests/test_func/good/closure_conversion.catala_en rename to tests/func/good/closure_conversion.catala_en diff --git a/tests/test_func/good/closure_conversion_reduce.catala_en b/tests/func/good/closure_conversion_reduce.catala_en similarity index 100% rename from tests/test_func/good/closure_conversion_reduce.catala_en rename to tests/func/good/closure_conversion_reduce.catala_en diff --git a/tests/test_func/good/closure_return.catala_en b/tests/func/good/closure_return.catala_en similarity index 100% rename from tests/test_func/good/closure_return.catala_en rename to tests/func/good/closure_return.catala_en diff --git a/tests/test_func/good/closure_through_scope.catala_en b/tests/func/good/closure_through_scope.catala_en similarity index 100% rename from tests/test_func/good/closure_through_scope.catala_en rename to tests/func/good/closure_through_scope.catala_en diff --git a/tests/test_func/good/context_func.catala_en b/tests/func/good/context_func.catala_en similarity index 100% rename from tests/test_func/good/context_func.catala_en rename to tests/func/good/context_func.catala_en diff --git a/tests/test_func/good/func.catala_en b/tests/func/good/func.catala_en similarity index 100% rename from tests/test_func/good/func.catala_en rename to tests/func/good/func.catala_en diff --git a/tests/test_func/good/param_consistency.catala_en b/tests/func/good/param_consistency.catala_en similarity index 100% rename from tests/test_func/good/param_consistency.catala_en rename to tests/func/good/param_consistency.catala_en diff --git a/tests/test_func/good/scope_call_func_struct_closure.catala_en b/tests/func/good/scope_call_func_struct_closure.catala_en similarity index 100% rename from tests/test_func/good/scope_call_func_struct_closure.catala_en rename to tests/func/good/scope_call_func_struct_closure.catala_en diff --git a/tests/test_io/bad/forgot_input.catala_en b/tests/io/bad/forgot_input.catala_en similarity index 81% rename from tests/test_io/bad/forgot_input.catala_en rename to tests/io/bad/forgot_input.catala_en index 75a69a08..565f266c 100644 --- a/tests/test_io/bad/forgot_input.catala_en +++ b/tests/io/bad/forgot_input.catala_en @@ -20,14 +20,14 @@ $ catala Typecheck This subscope variable is a mandatory input but no definition was provided. Incriminated subscope: -┌─⯈ tests/test_io/bad/forgot_input.catala_en:9.3-9.4: +┌─⯈ tests/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.9-6.10: +┌─⯈ tests/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/io/bad/inputing_to_not_input.catala_en similarity index 76% rename from tests/test_io/bad/inputing_to_not_input.catala_en rename to tests/io/bad/inputing_to_not_input.catala_en index f7964339..1fc58859 100644 --- a/tests/test_io/bad/inputing_to_not_input.catala_en +++ b/tests/io/bad/inputing_to_not_input.catala_en @@ -20,21 +20,21 @@ $ catala Typecheck 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.3-8.4: +┌─⯈ tests/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.10-5.11: +┌─⯈ tests/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.3-14.17: +┌─⯈ tests/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/io/bad/redefining_input.catala_en similarity index 78% rename from tests/test_io/bad/redefining_input.catala_en rename to tests/io/bad/redefining_input.catala_en index aa469500..84b6a6b0 100644 --- a/tests/test_io/bad/redefining_input.catala_en +++ b/tests/io/bad/redefining_input.catala_en @@ -13,14 +13,14 @@ $ catala Typecheck 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.16-5.17: +┌─⯈ tests/io/bad/redefining_input.catala_en:5.16-5.17: └─┐ 5 │ input output a content integer │ ‾ └─ Test Incriminated variable definition: -┌─⯈ tests/test_io/bad/redefining_input.catala_en:8.3-8.15: +┌─⯈ tests/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/io/bad/using_non_output.catala_en similarity index 77% rename from tests/test_io/bad/using_non_output.catala_en rename to tests/io/bad/using_non_output.catala_en index f624e436..893002ab 100644 --- a/tests/test_io/bad/using_non_output.catala_en +++ b/tests/io/bad/using_non_output.catala_en @@ -17,7 +17,7 @@ scope B: $ catala Typecheck [WARNING] This variable is dead code; it does not contribute to computing any of scope "A" outputs. Did you forget something? -┌─⯈ tests/test_io/bad/using_non_output.catala_en:5.12-5.13: +┌─⯈ tests/io/bad/using_non_output.catala_en:5.12-5.13: └─┐ 5 │ internal a content integer │ ‾ @@ -26,21 +26,21 @@ $ catala Typecheck 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.13-14.16: +┌─⯈ tests/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.12-5.13: +┌─⯈ tests/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.3-8.4: +┌─⯈ tests/io/bad/using_non_output.catala_en:8.3-8.4: └─┐ 8 │ a scope A │ ‾ diff --git a/tests/test_io/good/all_io.catala_en b/tests/io/good/all_io.catala_en similarity index 100% rename from tests/test_io/good/all_io.catala_en rename to tests/io/good/all_io.catala_en diff --git a/tests/test_io/good/condition_only_input.catala_en b/tests/io/good/condition_only_input.catala_en similarity index 100% rename from tests/test_io/good/condition_only_input.catala_en rename to tests/io/good/condition_only_input.catala_en diff --git a/tests/test_io/good/subscope.catala_en b/tests/io/good/subscope.catala_en similarity index 100% rename from tests/test_io/good/subscope.catala_en rename to tests/io/good/subscope.catala_en diff --git a/tests/test_literate/good/test_grave_char_en.catala_en b/tests/literate/good/test_grave_char_en.catala_en similarity index 100% rename from tests/test_literate/good/test_grave_char_en.catala_en rename to tests/literate/good/test_grave_char_en.catala_en diff --git a/tests/test_literate/good/test_grave_char_fr.catala_fr b/tests/literate/good/test_grave_char_fr.catala_fr similarity index 100% rename from tests/test_literate/good/test_grave_char_fr.catala_fr rename to tests/literate/good/test_grave_char_fr.catala_fr diff --git a/tests/test_literate/good/test_grave_char_pl.catala_pl b/tests/literate/good/test_grave_char_pl.catala_pl similarity index 100% rename from tests/test_literate/good/test_grave_char_pl.catala_pl rename to tests/literate/good/test_grave_char_pl.catala_pl diff --git a/tests/test_metadata/good/test_markup_refactoring.catala_en b/tests/metadata/good/test_markup_refactoring.catala_en similarity index 100% rename from tests/test_metadata/good/test_markup_refactoring.catala_en rename to tests/metadata/good/test_markup_refactoring.catala_en diff --git a/tests/test_modules/bad/mod_bad_include.catala_en b/tests/modules/bad/mod_bad_include.catala_en similarity index 81% rename from tests/test_modules/bad/mod_bad_include.catala_en rename to tests/modules/bad/mod_bad_include.catala_en index 29c33f15..34f8778e 100644 --- a/tests/test_modules/bad/mod_bad_include.catala_en +++ b/tests/modules/bad/mod_bad_include.catala_en @@ -7,13 +7,13 @@ $ catala typecheck A file that declares a module cannot be used through the raw '> Include' directive. You should use it as a module with '> Use This_is_not_the_file_name' instead. File include -┌─⯈ tests/test_modules/bad/mod_bad_include.catala_en:1.3-1.33: +┌─⯈ tests/modules/bad/mod_bad_include.catala_en:1.3-1.33: └─┐ 1 │ > Include: mod_badname.catala_en │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ Module declaration -┌─⯈ tests/test_modules/bad/mod_badname.catala_en:1.10-1.35: +┌─⯈ tests/modules/bad/mod_badname.catala_en:1.10-1.35: └─┐ 1 │ > Module This_is_not_the_file_name │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_modules/bad/mod_badname.catala_en b/tests/modules/bad/mod_badname.catala_en similarity index 63% rename from tests/test_modules/bad/mod_badname.catala_en rename to tests/modules/bad/mod_badname.catala_en index 52546f09..d943729d 100644 --- a/tests/test_modules/bad/mod_badname.catala_en +++ b/tests/modules/bad/mod_badname.catala_en @@ -5,11 +5,11 @@ $ catala typecheck [ERROR] Module declared as This_is_not_the_file_name, which does not match the file -name "tests/test_modules/bad/mod_badname.catala_en". Rename the module to +name "tests/modules/bad/mod_badname.catala_en". Rename the module to Mod_badname or the file to -"tests/test_modules/bad/This_is_not_the_file_name.catala_en". +"tests/modules/bad/This_is_not_the_file_name.catala_en". -┌─⯈ tests/test_modules/bad/mod_badname.catala_en:1.10-1.35: +┌─⯈ tests/modules/bad/mod_badname.catala_en:1.10-1.35: └─┐ 1 │ > Module This_is_not_the_file_name │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_modules/good/external_use.catala_en b/tests/modules/good/external_use.catala_en similarity index 100% rename from tests/test_modules/good/external_use.catala_en rename to tests/modules/good/external_use.catala_en diff --git a/tests/test_modules/good/mod_def.catala_en b/tests/modules/good/mod_def.catala_en similarity index 100% rename from tests/test_modules/good/mod_def.catala_en rename to tests/modules/good/mod_def.catala_en diff --git a/tests/test_modules/good/mod_def_context.catala_en b/tests/modules/good/mod_def_context.catala_en similarity index 100% rename from tests/test_modules/good/mod_def_context.catala_en rename to tests/modules/good/mod_def_context.catala_en diff --git a/tests/test_modules/good/mod_middle.catala_en b/tests/modules/good/mod_middle.catala_en similarity index 100% rename from tests/test_modules/good/mod_middle.catala_en rename to tests/modules/good/mod_middle.catala_en diff --git a/tests/test_modules/good/mod_use.catala_en b/tests/modules/good/mod_use.catala_en similarity index 100% rename from tests/test_modules/good/mod_use.catala_en rename to tests/modules/good/mod_use.catala_en diff --git a/tests/test_modules/good/mod_use2.catala_en b/tests/modules/good/mod_use2.catala_en similarity index 100% rename from tests/test_modules/good/mod_use2.catala_en rename to tests/modules/good/mod_use2.catala_en diff --git a/tests/test_modules/good/mod_use3.catala_en b/tests/modules/good/mod_use3.catala_en similarity index 100% rename from tests/test_modules/good/mod_use3.catala_en rename to tests/modules/good/mod_use3.catala_en diff --git a/tests/test_modules/good/mod_use_context.catala_en b/tests/modules/good/mod_use_context.catala_en similarity index 100% rename from tests/test_modules/good/mod_use_context.catala_en rename to tests/modules/good/mod_use_context.catala_en diff --git a/tests/test_modules/good/output/mod_def.ml b/tests/modules/good/output/mod_def.ml similarity index 77% rename from tests/test_modules/good/output/mod_def.ml rename to tests/modules/good/output/mod_def.ml index 52ca81c9..b1a3b8df 100644 --- a/tests/test_modules/good/output/mod_def.ml +++ b/tests/modules/good/output/mod_def.ml @@ -29,12 +29,12 @@ let s (s_in: S_in.t) : S.t = let sr_: money = try (handle_default - {filename = "tests/test_modules/good/mod_def.catala_en"; - start_line=16; start_column=10; end_line=16; end_column=12; + {filename = "tests/modules/good/mod_def.catala_en"; start_line=16; + start_column=10; end_line=16; end_column=12; law_headings=["Test modules + inclusions 1"]} ([|(fun (_: unit) -> handle_default - {filename = "tests/test_modules/good/mod_def.catala_en"; + {filename = "tests/modules/good/mod_def.catala_en"; start_line=16; start_column=10; end_line=16; end_column=12; law_headings=["Test modules + inclusions 1"]} ([||]) @@ -43,18 +43,18 @@ let s (s_in: S_in.t) : S.t = (fun (_: unit) -> false) (fun (_: unit) -> raise EmptyError)) with EmptyError -> (raise (NoValueProvided - {filename = "tests/test_modules/good/mod_def.catala_en"; start_line=16; + {filename = "tests/modules/good/mod_def.catala_en"; start_line=16; start_column=10; end_line=16; end_column=12; law_headings=["Test modules + inclusions 1"]})) in let e1_: Enum1.t = try (handle_default - {filename = "tests/test_modules/good/mod_def.catala_en"; - start_line=17; start_column=10; end_line=17; end_column=12; + {filename = "tests/modules/good/mod_def.catala_en"; start_line=17; + start_column=10; end_line=17; end_column=12; law_headings=["Test modules + inclusions 1"]} ([|(fun (_: unit) -> handle_default - {filename = "tests/test_modules/good/mod_def.catala_en"; + {filename = "tests/modules/good/mod_def.catala_en"; start_line=17; start_column=10; end_line=17; end_column=12; law_headings=["Test modules + inclusions 1"]} ([||]) @@ -62,7 +62,7 @@ let s (s_in: S_in.t) : S.t = (fun (_: unit) -> false) (fun (_: unit) -> raise EmptyError)) with EmptyError -> (raise (NoValueProvided - {filename = "tests/test_modules/good/mod_def.catala_en"; start_line=17; + {filename = "tests/modules/good/mod_def.catala_en"; start_line=17; start_column=10; end_line=17; end_column=12; law_headings=["Test modules + inclusions 1"]})) in {S.sr = sr_; S.e1 = e1_} diff --git a/tests/test_modules/good/prorata_external.catala_en b/tests/modules/good/prorata_external.catala_en similarity index 100% rename from tests/test_modules/good/prorata_external.catala_en rename to tests/modules/good/prorata_external.catala_en diff --git a/tests/test_modules/good/prorata_external.ml b/tests/modules/good/prorata_external.ml similarity index 100% rename from tests/test_modules/good/prorata_external.ml rename to tests/modules/good/prorata_external.ml diff --git a/tests/test_modules/good/prorata_syntax.catala_en b/tests/modules/good/prorata_syntax.catala_en similarity index 100% rename from tests/test_modules/good/prorata_syntax.catala_en rename to tests/modules/good/prorata_syntax.catala_en diff --git a/tests/test_money/bad/no_mingle.catala_en b/tests/money/bad/no_mingle.catala_en similarity index 80% rename from tests/test_money/bad/no_mingle.catala_en rename to tests/money/bad/no_mingle.catala_en index 0fa32b57..cdab0e9f 100644 --- a/tests/test_money/bad/no_mingle.catala_en +++ b/tests/money/bad/no_mingle.catala_en @@ -18,21 +18,21 @@ $ catala Interpret -s A I don't know how to apply operator * on types money and money -┌─⯈ tests/test_money/bad/no_mingle.catala_en:12.24-12.29: +┌─⯈ tests/money/bad/no_mingle.catala_en:12.24-12.29: └──┐ 12 │ definition z equals (x * y) │ ‾‾‾‾‾ └─ Article Type money coming from expression: -┌─⯈ tests/test_money/bad/no_mingle.catala_en:5.21-5.26: +┌─⯈ tests/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.21-6.26: +┌─⯈ tests/money/bad/no_mingle.catala_en:6.21-6.26: └─┐ 6 │ context y content money │ ‾‾‾‾‾ diff --git a/tests/test_money/good/literal_parsing.catala_en b/tests/money/good/literal_parsing.catala_en similarity index 100% rename from tests/test_money/good/literal_parsing.catala_en rename to tests/money/good/literal_parsing.catala_en diff --git a/tests/test_money/good/simple.catala_en b/tests/money/good/simple.catala_en similarity index 100% rename from tests/test_money/good/simple.catala_en rename to tests/money/good/simple.catala_en diff --git a/tests/test_name_resolution/bad/toplevel_defs.catala_en b/tests/name_resolution/bad/toplevel_defs.catala_en similarity index 86% rename from tests/test_name_resolution/bad/toplevel_defs.catala_en rename to tests/name_resolution/bad/toplevel_defs.catala_en index 0260932e..15fde244 100644 --- a/tests/test_name_resolution/bad/toplevel_defs.catala_en +++ b/tests/name_resolution/bad/toplevel_defs.catala_en @@ -16,7 +16,7 @@ $ catala typecheck [ERROR] Scope calls are not allowed outside of a scope -┌─⯈ tests/test_name_resolution/bad/toplevel_defs.catala_en:11.11-11.23: +┌─⯈ tests/name_resolution/bad/toplevel_defs.catala_en:11.11-11.23: └──┐ 11 │ equals (output of S1).a │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_name_resolution/good/let_in.catala_en b/tests/name_resolution/good/let_in.catala_en similarity index 100% rename from tests/test_name_resolution/good/let_in.catala_en rename to tests/name_resolution/good/let_in.catala_en diff --git a/tests/test_name_resolution/good/let_in2.catala_en b/tests/name_resolution/good/let_in2.catala_en similarity index 86% rename from tests/test_name_resolution/good/let_in2.catala_en rename to tests/name_resolution/good/let_in2.catala_en index c9253372..3cdbbf19 100644 --- a/tests/test_name_resolution/good/let_in2.catala_en +++ b/tests/name_resolution/good/let_in2.catala_en @@ -57,19 +57,19 @@ let s (s_in: S_in.t) : S.t = let a_: bool = try (handle_default - {filename = "tests/test_name_resolution/good/let_in2.catala_en"; + {filename = "tests/name_resolution/good/let_in2.catala_en"; start_line=7; start_column=18; end_line=7; end_column=19; law_headings=["Article"]} ([|(fun (_: unit) -> a_ ())|]) (fun (_: unit) -> true) (fun (_: unit) -> try (handle_default - {filename = "tests/test_name_resolution/good/let_in2.catala_en"; + {filename = "tests/name_resolution/good/let_in2.catala_en"; start_line=7; start_column=18; end_line=7; end_column=19; law_headings=["Article"]} ([|(fun (_: unit) -> handle_default - {filename = "tests/test_name_resolution/good/let_in2.catala_en"; + {filename = "tests/name_resolution/good/let_in2.catala_en"; start_line=7; start_column=18; end_line=7; end_column=19; law_headings=["Article"]} ([||]) @@ -81,12 +81,12 @@ let s (s_in: S_in.t) : S.t = (fun (_: unit) -> raise EmptyError)) with EmptyError -> (raise (NoValueProvided - {filename = "tests/test_name_resolution/good/let_in2.catala_en"; + {filename = "tests/name_resolution/good/let_in2.catala_en"; start_line=7; start_column=18; end_line=7; end_column=19; law_headings=["Article"]})))) with EmptyError -> (raise (NoValueProvided - {filename = "tests/test_name_resolution/good/let_in2.catala_en"; + {filename = "tests/name_resolution/good/let_in2.catala_en"; start_line=7; start_column=18; end_line=7; end_column=19; law_headings=["Article"]})) in {S.a = a_} diff --git a/tests/test_name_resolution/good/out_of_order.catala_en b/tests/name_resolution/good/out_of_order.catala_en similarity index 100% rename from tests/test_name_resolution/good/out_of_order.catala_en rename to tests/name_resolution/good/out_of_order.catala_en diff --git a/tests/test_name_resolution/good/toplevel_defs.catala_en b/tests/name_resolution/good/toplevel_defs.catala_en similarity index 94% rename from tests/test_name_resolution/good/toplevel_defs.catala_en rename to tests/name_resolution/good/toplevel_defs.catala_en index be9a9bb3..ff8a507a 100644 --- a/tests/test_name_resolution/good/toplevel_defs.catala_en +++ b/tests/name_resolution/good/toplevel_defs.catala_en @@ -430,19 +430,19 @@ def s2(s2_in:S2In): decimal_of_string("100.")) def temp_a_4(_:Unit): return True - return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=45, start_column=10, end_line=45, end_column=11, law_headings=["Test toplevel function defs"]), [], temp_a_4, temp_a_3) - temp_a_5 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + temp_a_5 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=45, start_column=10, end_line=45, end_column=11, law_headings=["Test toplevel function defs"]), [temp_a_2], temp_a_1, temp_a) except EmptyError: temp_a_5 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=45, start_column=10, end_line=45, end_column=11, law_headings=["Test toplevel function defs"])) @@ -462,19 +462,19 @@ def s3(s3_in:S3In): decimal_of_string("55."))) def temp_a_10(_:Unit): return True - return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=65, start_column=10, end_line=65, end_column=11, law_headings=["Test function def with two args"]), [], temp_a_10, temp_a_9) - temp_a_11 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + temp_a_11 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=65, start_column=10, end_line=65, end_column=11, law_headings=["Test function def with two args"]), [temp_a_8], temp_a_7, temp_a_6) except EmptyError: temp_a_11 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=65, start_column=10, end_line=65, end_column=11, law_headings=["Test function def with two args"])) @@ -492,19 +492,19 @@ def s4(s4_in:S4In): return (glob5 + decimal_of_string("1.")) def temp_a_16(_:Unit): return True - return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=88, start_column=10, end_line=88, end_column=11, law_headings=["Test inline defs in toplevel defs"]), [], temp_a_16, temp_a_15) - temp_a_17 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + temp_a_17 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=88, start_column=10, end_line=88, end_column=11, law_headings=["Test inline defs in toplevel defs"]), [temp_a_14], temp_a_13, temp_a_12) except EmptyError: temp_a_17 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=88, start_column=10, end_line=88, end_column=11, law_headings=["Test inline defs in toplevel defs"])) @@ -522,19 +522,19 @@ def s(s_in:SIn): return (glob1 * glob1) def temp_a_22(_:Unit): return True - return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=7, start_column=10, end_line=7, end_column=11, law_headings=["Test basic toplevel values defs"]), [], temp_a_22, temp_a_21) - temp_a_23 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + temp_a_23 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=7, start_column=10, end_line=7, end_column=11, law_headings=["Test basic toplevel values defs"]), [temp_a_20], temp_a_19, temp_a_18) except EmptyError: temp_a_23 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=7, start_column=10, end_line=7, end_column=11, law_headings=["Test basic toplevel values defs"])) @@ -549,19 +549,19 @@ def s(s_in:SIn): return glob2 def temp_b_4(_:Unit): return True - return handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + return handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=8, start_column=10, end_line=8, end_column=11, law_headings=["Test basic toplevel values defs"]), [], temp_b_4, temp_b_3) - temp_b_5 = handle_default(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + temp_b_5 = handle_default(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=8, start_column=10, end_line=8, end_column=11, law_headings=["Test basic toplevel values defs"]), [temp_b_2], temp_b_1, temp_b) except EmptyError: temp_b_5 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="tests/name_resolution/good/toplevel_defs.catala_en", start_line=8, start_column=10, end_line=8, end_column=11, law_headings=["Test basic toplevel values defs"])) diff --git a/tests/test_name_resolution/good/toplevel_defs_simple.catala_en b/tests/name_resolution/good/toplevel_defs_simple.catala_en similarity index 100% rename from tests/test_name_resolution/good/toplevel_defs_simple.catala_en rename to tests/name_resolution/good/toplevel_defs_simple.catala_en diff --git a/tests/test_proof/bad/array_length-empty.catala_en b/tests/proof/bad/array_length-empty.catala_en similarity index 87% rename from tests/test_proof/bad/array_length-empty.catala_en rename to tests/proof/bad/array_length-empty.catala_en index e3150b61..4e6e3822 100644 --- a/tests/test_proof/bad/array_length-empty.catala_en +++ b/tests/proof/bad/array_length-empty.catala_en @@ -13,7 +13,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/array_length-empty.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/array_length-empty.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/array_length-overlap.catala_en b/tests/proof/bad/array_length-overlap.catala_en similarity index 88% rename from tests/test_proof/bad/array_length-overlap.catala_en rename to tests/proof/bad/array_length-overlap.catala_en index 79167e0b..7bc295c1 100644 --- a/tests/test_proof/bad/array_length-overlap.catala_en +++ b/tests/proof/bad/array_length-overlap.catala_en @@ -14,7 +14,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/array_length-overlap.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/array_length-overlap.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/assert-empty.catala_en b/tests/proof/bad/assert-empty.catala_en similarity index 92% rename from tests/test_proof/bad/assert-empty.catala_en rename to tests/proof/bad/assert-empty.catala_en index 934000ae..2c7cd5e9 100644 --- a/tests/test_proof/bad/assert-empty.catala_en +++ b/tests/proof/bad/assert-empty.catala_en @@ -25,7 +25,7 @@ scope Foo: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [Foo.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/assert-empty.catala_en:4.11-4.12: +┌─⯈ tests/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/proof/bad/dates_get_year-empty.catala_en similarity index 86% rename from tests/test_proof/bad/dates_get_year-empty.catala_en rename to tests/proof/bad/dates_get_year-empty.catala_en index 0cff133b..9d50589f 100644 --- a/tests/test_proof/bad/dates_get_year-empty.catala_en +++ b/tests/proof/bad/dates_get_year-empty.catala_en @@ -19,14 +19,14 @@ $ catala Proof --disable-counterexamples It is impossible to give a definition to a scope variable tagged as input. Incriminated variable: -┌─⯈ tests/test_proof/bad/dates_get_year-empty.catala_en:5.9-5.10: +┌─⯈ tests/proof/bad/dates_get_year-empty.catala_en:5.9-5.10: └─┐ 5 │ input x content date │ ‾ └─ Test Incriminated variable definition: -┌─⯈ tests/test_proof/bad/dates_get_year-empty.catala_en:9.3-9.15: +┌─⯈ tests/proof/bad/dates_get_year-empty.catala_en:9.3-9.15: └─┐ 9 │ definition x equals |2022-01-16| │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_proof/bad/dates_get_year-overlap.catala_en b/tests/proof/bad/dates_get_year-overlap.catala_en similarity index 91% rename from tests/test_proof/bad/dates_get_year-overlap.catala_en rename to tests/proof/bad/dates_get_year-overlap.catala_en index dac70068..95ca095c 100644 --- a/tests/test_proof/bad/dates_get_year-overlap.catala_en +++ b/tests/proof/bad/dates_get_year-overlap.catala_en @@ -16,7 +16,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/dates_get_year-overlap.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/dates_get_year-overlap.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/dates_simple-empty.catala_en b/tests/proof/bad/dates_simple-empty.catala_en similarity index 90% rename from tests/test_proof/bad/dates_simple-empty.catala_en rename to tests/proof/bad/dates_simple-empty.catala_en index 391530e6..455c282e 100644 --- a/tests/test_proof/bad/dates_simple-empty.catala_en +++ b/tests/proof/bad/dates_simple-empty.catala_en @@ -15,7 +15,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/dates_simple-empty.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/dates_simple-empty.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/dates_simple-overlap.catala_en b/tests/proof/bad/dates_simple-overlap.catala_en similarity index 91% rename from tests/test_proof/bad/dates_simple-overlap.catala_en rename to tests/proof/bad/dates_simple-overlap.catala_en index 1136aa6b..afe4070f 100644 --- a/tests/test_proof/bad/dates_simple-overlap.catala_en +++ b/tests/proof/bad/dates_simple-overlap.catala_en @@ -16,7 +16,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/dates_simple-overlap.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/dates_simple-overlap.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/duration-empty.catala_en b/tests/proof/bad/duration-empty.catala_en similarity index 87% rename from tests/test_proof/bad/duration-empty.catala_en rename to tests/proof/bad/duration-empty.catala_en index af9b11aa..e6360452 100644 --- a/tests/test_proof/bad/duration-empty.catala_en +++ b/tests/proof/bad/duration-empty.catala_en @@ -13,7 +13,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/duration-empty.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/duration-empty.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/duration-overlap.catala_en b/tests/proof/bad/duration-overlap.catala_en similarity index 89% rename from tests/test_proof/bad/duration-overlap.catala_en rename to tests/proof/bad/duration-overlap.catala_en index 39a55693..9cb57903 100644 --- a/tests/test_proof/bad/duration-overlap.catala_en +++ b/tests/proof/bad/duration-overlap.catala_en @@ -14,7 +14,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/duration-overlap.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/duration-overlap.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/enums-empty.catala_en b/tests/proof/bad/enums-empty.catala_en similarity index 88% rename from tests/test_proof/bad/enums-empty.catala_en rename to tests/proof/bad/enums-empty.catala_en index 1097a22b..68ff98f9 100644 --- a/tests/test_proof/bad/enums-empty.catala_en +++ b/tests/proof/bad/enums-empty.catala_en @@ -25,13 +25,13 @@ scope A: $ catala Proof --disable-counterexamples [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-empty.catala_en:7.7-7.8: +┌─⯈ tests/proof/bad/enums-empty.catala_en:7.7-7.8: └─┐ 7 │ -- C content boolean │ ‾ └─ Test [WARNING] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums-empty.catala_en:15.10-15.11: +┌─⯈ tests/proof/bad/enums-empty.catala_en:15.10-15.11: └──┐ 15 │ output x content integer │ ‾ diff --git a/tests/test_proof/bad/enums-nonbool-empty.catala_en b/tests/proof/bad/enums-nonbool-empty.catala_en similarity index 86% rename from tests/test_proof/bad/enums-nonbool-empty.catala_en rename to tests/proof/bad/enums-nonbool-empty.catala_en index 72d06921..54411e1f 100644 --- a/tests/test_proof/bad/enums-nonbool-empty.catala_en +++ b/tests/proof/bad/enums-nonbool-empty.catala_en @@ -23,13 +23,13 @@ scope A: $ catala Proof --disable-counterexamples [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:5.7-5.8: +┌─⯈ tests/proof/bad/enums-nonbool-empty.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ └─ Test [WARNING] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums-nonbool-empty.catala_en:13.10-13.11: +┌─⯈ tests/proof/bad/enums-nonbool-empty.catala_en:13.10-13.11: └──┐ 13 │ output x content integer │ ‾ diff --git a/tests/test_proof/bad/enums-nonbool-overlap.catala_en b/tests/proof/bad/enums-nonbool-overlap.catala_en similarity index 86% rename from tests/test_proof/bad/enums-nonbool-overlap.catala_en rename to tests/proof/bad/enums-nonbool-overlap.catala_en index 3b8123e9..27fde5e2 100644 --- a/tests/test_proof/bad/enums-nonbool-overlap.catala_en +++ b/tests/proof/bad/enums-nonbool-overlap.catala_en @@ -23,13 +23,13 @@ scope A: $ catala Proof --disable-counterexamples [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:5.7-5.8: +┌─⯈ tests/proof/bad/enums-nonbool-overlap.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ └─ Test [WARNING] [A.x] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums-nonbool-overlap.catala_en:13.10-13.11: +┌─⯈ tests/proof/bad/enums-nonbool-overlap.catala_en:13.10-13.11: └──┐ 13 │ output x content integer │ ‾ diff --git a/tests/test_proof/bad/enums-overlap.catala_en b/tests/proof/bad/enums-overlap.catala_en similarity index 88% rename from tests/test_proof/bad/enums-overlap.catala_en rename to tests/proof/bad/enums-overlap.catala_en index 6b4b4e41..db8a6db2 100644 --- a/tests/test_proof/bad/enums-overlap.catala_en +++ b/tests/proof/bad/enums-overlap.catala_en @@ -25,13 +25,13 @@ scope A: $ catala Proof --disable-counterexamples [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:7.7-7.8: +┌─⯈ tests/proof/bad/enums-overlap.catala_en:7.7-7.8: └─┐ 7 │ -- C content boolean │ ‾ └─ Test [WARNING] [A.x] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums-overlap.catala_en:15.10-15.11: +┌─⯈ tests/proof/bad/enums-overlap.catala_en:15.10-15.11: └──┐ 15 │ output x content integer │ ‾ diff --git a/tests/test_proof/bad/enums_inj-empty.catala_en b/tests/proof/bad/enums_inj-empty.catala_en similarity index 82% rename from tests/test_proof/bad/enums_inj-empty.catala_en rename to tests/proof/bad/enums_inj-empty.catala_en index 3c610df7..73099a08 100644 --- a/tests/test_proof/bad/enums_inj-empty.catala_en +++ b/tests/proof/bad/enums_inj-empty.catala_en @@ -18,13 +18,13 @@ scope A: $ catala Proof --disable-counterexamples [WARNING] The constructor "C2" of enumeration "E" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:6.6-6.8: +┌─⯈ tests/proof/bad/enums_inj-empty.catala_en:6.6-6.8: └─┐ 6 │ -- C2 │ ‾‾ └─ Article [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums_inj-empty.catala_en:10.10-10.11: +┌─⯈ tests/proof/bad/enums_inj-empty.catala_en:10.10-10.11: └──┐ 10 │ output y content integer │ ‾ diff --git a/tests/test_proof/bad/enums_inj-overlap.catala_en b/tests/proof/bad/enums_inj-overlap.catala_en similarity index 89% rename from tests/test_proof/bad/enums_inj-overlap.catala_en rename to tests/proof/bad/enums_inj-overlap.catala_en index ff9de42a..cc538e2d 100644 --- a/tests/test_proof/bad/enums_inj-overlap.catala_en +++ b/tests/proof/bad/enums_inj-overlap.catala_en @@ -19,7 +19,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums_inj-overlap.catala_en:10.10-10.11: +┌─⯈ tests/proof/bad/enums_inj-overlap.catala_en:10.10-10.11: └──┐ 10 │ output y content integer │ ‾ diff --git a/tests/test_proof/bad/enums_unit-empty.catala_en b/tests/proof/bad/enums_unit-empty.catala_en similarity index 91% rename from tests/test_proof/bad/enums_unit-empty.catala_en rename to tests/proof/bad/enums_unit-empty.catala_en index d4cd714a..f5efbd49 100644 --- a/tests/test_proof/bad/enums_unit-empty.catala_en +++ b/tests/proof/bad/enums_unit-empty.catala_en @@ -22,7 +22,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/enums_unit-empty.catala_en:10.10-10.11: +┌─⯈ tests/proof/bad/enums_unit-empty.catala_en:10.10-10.11: └──┐ 10 │ output y content integer │ ‾ diff --git a/tests/test_proof/bad/enums_unit-overlap.catala_en b/tests/proof/bad/enums_unit-overlap.catala_en similarity index 90% rename from tests/test_proof/bad/enums_unit-overlap.catala_en rename to tests/proof/bad/enums_unit-overlap.catala_en index d5f649a0..c07048f2 100644 --- a/tests/test_proof/bad/enums_unit-overlap.catala_en +++ b/tests/proof/bad/enums_unit-overlap.catala_en @@ -22,7 +22,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/enums_unit-overlap.catala_en:10.10-10.11: +┌─⯈ tests/proof/bad/enums_unit-overlap.catala_en:10.10-10.11: └──┐ 10 │ output y content integer │ ‾ diff --git a/tests/test_proof/bad/let_in_condition-empty.catala_en b/tests/proof/bad/let_in_condition-empty.catala_en similarity index 85% rename from tests/test_proof/bad/let_in_condition-empty.catala_en rename to tests/proof/bad/let_in_condition-empty.catala_en index ac6dccb4..1d1fd6dd 100644 --- a/tests/test_proof/bad/let_in_condition-empty.catala_en +++ b/tests/proof/bad/let_in_condition-empty.catala_en @@ -14,7 +14,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/let_in_condition-empty.catala_en:5.10-5.11: +┌─⯈ tests/proof/bad/let_in_condition-empty.catala_en:5.10-5.11: └─┐ 5 │ output x content boolean │ ‾ diff --git a/tests/test_proof/bad/money-empty.catala_en b/tests/proof/bad/money-empty.catala_en similarity index 91% rename from tests/test_proof/bad/money-empty.catala_en rename to tests/proof/bad/money-empty.catala_en index f834fe1b..06e1741e 100644 --- a/tests/test_proof/bad/money-empty.catala_en +++ b/tests/proof/bad/money-empty.catala_en @@ -17,7 +17,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/money-empty.catala_en:8.10-8.11: +┌─⯈ tests/proof/bad/money-empty.catala_en:8.10-8.11: └─┐ 8 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/money-overlap.catala_en b/tests/proof/bad/money-overlap.catala_en similarity index 91% rename from tests/test_proof/bad/money-overlap.catala_en rename to tests/proof/bad/money-overlap.catala_en index 3c89f67d..63e3968c 100644 --- a/tests/test_proof/bad/money-overlap.catala_en +++ b/tests/proof/bad/money-overlap.catala_en @@ -18,7 +18,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/money-overlap.catala_en:8.10-8.11: +┌─⯈ tests/proof/bad/money-overlap.catala_en:8.10-8.11: └─┐ 8 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/no_vars-conflict.catala_en b/tests/proof/bad/no_vars-conflict.catala_en similarity index 90% rename from tests/test_proof/bad/no_vars-conflict.catala_en rename to tests/proof/bad/no_vars-conflict.catala_en index 1b254835..e22dd926 100644 --- a/tests/test_proof/bad/no_vars-conflict.catala_en +++ b/tests/proof/bad/no_vars-conflict.catala_en @@ -18,7 +18,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/no_vars-conflict.catala_en:8.10-8.11: +┌─⯈ tests/proof/bad/no_vars-conflict.catala_en:8.10-8.11: └─┐ 8 │ output y content integer │ ‾ diff --git a/tests/test_proof/bad/no_vars-empty.catala_en b/tests/proof/bad/no_vars-empty.catala_en similarity index 90% rename from tests/test_proof/bad/no_vars-empty.catala_en rename to tests/proof/bad/no_vars-empty.catala_en index 232fa9f8..8b2aba98 100644 --- a/tests/test_proof/bad/no_vars-empty.catala_en +++ b/tests/proof/bad/no_vars-empty.catala_en @@ -17,7 +17,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/no_vars-empty.catala_en:7.10-7.11: +┌─⯈ tests/proof/bad/no_vars-empty.catala_en:7.10-7.11: └─┐ 7 │ output y content integer │ ‾ diff --git a/tests/test_proof/bad/prolala_motivating_example.catala_en b/tests/proof/bad/prolala_motivating_example.catala_en similarity index 94% rename from tests/test_proof/bad/prolala_motivating_example.catala_en rename to tests/proof/bad/prolala_motivating_example.catala_en index 1b5205b3..d3b87552 100644 --- a/tests/test_proof/bad/prolala_motivating_example.catala_en +++ b/tests/proof/bad/prolala_motivating_example.catala_en @@ -127,7 +127,7 @@ $ catala Proof --disable-counterexamples It is impossible to give a definition to a subscope variable not tagged as input or context. Incriminated subscope: -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:56.3-56.14: +┌─⯈ tests/proof/bad/prolala_motivating_example.catala_en:56.3-56.14: └──┐ 56 │ eligibility scope Eligibility │ ‾‾‾‾‾‾‾‾‾‾‾ @@ -135,7 +135,7 @@ Incriminated subscope: └─ Amount Incriminated variable: -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:9.12-9.22: +┌─⯈ tests/proof/bad/prolala_motivating_example.catala_en:9.12-9.22: └─┐ 9 │ internal is_student content boolean │ ‾‾‾‾‾‾‾‾‾‾ @@ -143,7 +143,7 @@ Incriminated variable: └─ Eligibility Incriminated subscope variable definition: -┌─⯈ tests/test_proof/bad/prolala_motivating_example.catala_en:64.3-64.36: +┌─⯈ tests/proof/bad/prolala_motivating_example.catala_en:64.3-64.36: └──┐ 64 │ definition eligibility.is_student equals is_student │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_proof/bad/rationals-empty.catala_en b/tests/proof/bad/rationals-empty.catala_en similarity index 87% rename from tests/test_proof/bad/rationals-empty.catala_en rename to tests/proof/bad/rationals-empty.catala_en index 4678ff12..5e23356b 100644 --- a/tests/test_proof/bad/rationals-empty.catala_en +++ b/tests/proof/bad/rationals-empty.catala_en @@ -13,7 +13,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/rationals-empty.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/rationals-empty.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/rationals-overlap.catala_en b/tests/proof/bad/rationals-overlap.catala_en similarity index 88% rename from tests/test_proof/bad/rationals-overlap.catala_en rename to tests/proof/bad/rationals-overlap.catala_en index e1214824..ee582f50 100644 --- a/tests/test_proof/bad/rationals-overlap.catala_en +++ b/tests/proof/bad/rationals-overlap.catala_en @@ -14,7 +14,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.y] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/rationals-overlap.catala_en:6.10-6.11: +┌─⯈ tests/proof/bad/rationals-overlap.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ diff --git a/tests/test_proof/bad/sat_solving.catala_en b/tests/proof/bad/sat_solving.catala_en similarity index 95% rename from tests/test_proof/bad/sat_solving.catala_en rename to tests/proof/bad/sat_solving.catala_en index a173ccf8..7e9565c3 100644 --- a/tests/test_proof/bad/sat_solving.catala_en +++ b/tests/proof/bad/sat_solving.catala_en @@ -41,7 +41,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.x10] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/sat_solving.catala_en:15.10-15.13: +┌─⯈ tests/proof/bad/sat_solving.catala_en:15.10-15.13: └──┐ 15 │ output x10 content boolean │ ‾‾‾ diff --git a/tests/test_proof/bad/structs-empty.catala_en b/tests/proof/bad/structs-empty.catala_en similarity index 91% rename from tests/test_proof/bad/structs-empty.catala_en rename to tests/proof/bad/structs-empty.catala_en index a9044cc9..dee5bf7d 100644 --- a/tests/test_proof/bad/structs-empty.catala_en +++ b/tests/proof/bad/structs-empty.catala_en @@ -22,7 +22,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/structs-empty.catala_en:13.10-13.11: +┌─⯈ tests/proof/bad/structs-empty.catala_en:13.10-13.11: └──┐ 13 │ output x content integer │ ‾ diff --git a/tests/test_proof/bad/structs-overlap.catala_en b/tests/proof/bad/structs-overlap.catala_en similarity index 91% rename from tests/test_proof/bad/structs-overlap.catala_en rename to tests/proof/bad/structs-overlap.catala_en index 8432a43e..faa026d7 100644 --- a/tests/test_proof/bad/structs-overlap.catala_en +++ b/tests/proof/bad/structs-overlap.catala_en @@ -22,7 +22,7 @@ scope A: ```catala-test-inline $ catala Proof --disable-counterexamples [WARNING] [A.x] At least two exceptions overlap for this variable: -┌─⯈ tests/test_proof/bad/structs-overlap.catala_en:13.10-13.11: +┌─⯈ tests/proof/bad/structs-overlap.catala_en:13.10-13.11: └──┐ 13 │ output x content integer │ ‾ diff --git a/tests/test_proof/good/array_length.catala_en b/tests/proof/good/array_length.catala_en similarity index 100% rename from tests/test_proof/good/array_length.catala_en rename to tests/proof/good/array_length.catala_en diff --git a/tests/test_proof/good/assert.catala_en b/tests/proof/good/assert.catala_en similarity index 100% rename from tests/test_proof/good/assert.catala_en rename to tests/proof/good/assert.catala_en diff --git a/tests/test_proof/good/dates_get_year.catala_en b/tests/proof/good/dates_get_year.catala_en similarity index 100% rename from tests/test_proof/good/dates_get_year.catala_en rename to tests/proof/good/dates_get_year.catala_en diff --git a/tests/test_proof/good/dates_simple.catala_en b/tests/proof/good/dates_simple.catala_en similarity index 100% rename from tests/test_proof/good/dates_simple.catala_en rename to tests/proof/good/dates_simple.catala_en diff --git a/tests/test_proof/good/direct_scope_call.catala_en b/tests/proof/good/direct_scope_call.catala_en similarity index 100% rename from tests/test_proof/good/direct_scope_call.catala_en rename to tests/proof/good/direct_scope_call.catala_en diff --git a/tests/test_proof/good/direct_scope_call_with_context.catala_en b/tests/proof/good/direct_scope_call_with_context.catala_en similarity index 100% rename from tests/test_proof/good/direct_scope_call_with_context.catala_en rename to tests/proof/good/direct_scope_call_with_context.catala_en diff --git a/tests/test_proof/good/duration.catala_en b/tests/proof/good/duration.catala_en similarity index 100% rename from tests/test_proof/good/duration.catala_en rename to tests/proof/good/duration.catala_en diff --git a/tests/test_proof/good/enums-arith.catala_en b/tests/proof/good/enums-arith.catala_en similarity index 89% rename from tests/test_proof/good/enums-arith.catala_en rename to tests/proof/good/enums-arith.catala_en index 79967c0e..9019ccf5 100644 --- a/tests/test_proof/good/enums-arith.catala_en +++ b/tests/proof/good/enums-arith.catala_en @@ -25,7 +25,7 @@ scope A: $ catala Typecheck --check-invariants [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-arith.catala_en:5.7-5.8: +┌─⯈ tests/proof/good/enums-arith.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ @@ -38,7 +38,7 @@ $ catala Typecheck --check-invariants $ catala Proof --disable-counterexamples [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-arith.catala_en:5.7-5.8: +┌─⯈ tests/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/proof/good/enums-nonbool.catala_en similarity index 89% rename from tests/test_proof/good/enums-nonbool.catala_en rename to tests/proof/good/enums-nonbool.catala_en index 8109321b..57484ed9 100644 --- a/tests/test_proof/good/enums-nonbool.catala_en +++ b/tests/proof/good/enums-nonbool.catala_en @@ -25,7 +25,7 @@ scope A: $ catala Typecheck --check-invariants [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-nonbool.catala_en:5.7-5.8: +┌─⯈ tests/proof/good/enums-nonbool.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ @@ -38,7 +38,7 @@ $ catala Typecheck --check-invariants $ catala Proof --disable-counterexamples [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums-nonbool.catala_en:5.7-5.8: +┌─⯈ tests/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/proof/good/enums.catala_en similarity index 90% rename from tests/test_proof/good/enums.catala_en rename to tests/proof/good/enums.catala_en index a5bb1cb0..385e3126 100644 --- a/tests/test_proof/good/enums.catala_en +++ b/tests/proof/good/enums.catala_en @@ -24,7 +24,7 @@ scope A: $ catala Typecheck --check-invariants [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums.catala_en:5.7-5.8: +┌─⯈ tests/proof/good/enums.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ @@ -37,7 +37,7 @@ $ catala Typecheck --check-invariants $ catala Proof --disable-counterexamples [WARNING] The constructor "C" of enumeration "T" is never used; maybe it's unnecessary? -┌─⯈ tests/test_proof/good/enums.catala_en:5.7-5.8: +┌─⯈ tests/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/proof/good/enums_inj.catala_en similarity index 100% rename from tests/test_proof/good/enums_inj.catala_en rename to tests/proof/good/enums_inj.catala_en diff --git a/tests/test_proof/good/enums_unit.catala_en b/tests/proof/good/enums_unit.catala_en similarity index 100% rename from tests/test_proof/good/enums_unit.catala_en rename to tests/proof/good/enums_unit.catala_en diff --git a/tests/test_proof/good/functions.catala_en b/tests/proof/good/functions.catala_en similarity index 100% rename from tests/test_proof/good/functions.catala_en rename to tests/proof/good/functions.catala_en diff --git a/tests/test_proof/good/let_in_condition.catala_en b/tests/proof/good/let_in_condition.catala_en similarity index 100% rename from tests/test_proof/good/let_in_condition.catala_en rename to tests/proof/good/let_in_condition.catala_en diff --git a/tests/test_proof/good/money.catala_en b/tests/proof/good/money.catala_en similarity index 100% rename from tests/test_proof/good/money.catala_en rename to tests/proof/good/money.catala_en diff --git a/tests/test_proof/good/no_vars.catala_en b/tests/proof/good/no_vars.catala_en similarity index 100% rename from tests/test_proof/good/no_vars.catala_en rename to tests/proof/good/no_vars.catala_en diff --git a/tests/test_proof/good/rationals.catala_en b/tests/proof/good/rationals.catala_en similarity index 100% rename from tests/test_proof/good/rationals.catala_en rename to tests/proof/good/rationals.catala_en diff --git a/tests/test_proof/good/simple_vars.catala_en b/tests/proof/good/simple_vars.catala_en similarity index 100% rename from tests/test_proof/good/simple_vars.catala_en rename to tests/proof/good/simple_vars.catala_en diff --git a/tests/test_proof/good/structs.catala_en b/tests/proof/good/structs.catala_en similarity index 100% rename from tests/test_proof/good/structs.catala_en rename to tests/proof/good/structs.catala_en diff --git a/tests/test_scope/bad/cycle_in_scope.catala_en b/tests/scope/bad/cycle_in_scope.catala_en similarity index 83% rename from tests/test_scope/bad/cycle_in_scope.catala_en rename to tests/scope/bad/cycle_in_scope.catala_en index 6e5f847a..e1d114c6 100644 --- a/tests/test_scope/bad/cycle_in_scope.catala_en +++ b/tests/scope/bad/cycle_in_scope.catala_en @@ -21,21 +21,21 @@ Cyclic dependency detected between the following variables of scope A: z → x → y → z z is used here in the definition of x: -┌─⯈ tests/test_scope/bad/cycle_in_scope.catala_en:14.23-14.24: +┌─⯈ tests/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.32-11.33: +┌─⯈ tests/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.32-13.33: +┌─⯈ tests/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/scope/bad/cyclic_scope_calls.catala_en similarity index 84% rename from tests/test_scope/bad/cyclic_scope_calls.catala_en rename to tests/scope/bad/cyclic_scope_calls.catala_en index 2d3e1156..81c94de9 100644 --- a/tests/test_scope/bad/cyclic_scope_calls.catala_en +++ b/tests/scope/bad/cyclic_scope_calls.catala_en @@ -33,19 +33,19 @@ Cyclic dependency detected between the following scopes: S4 → S3 → S2 → S4 S4 is used here in the definition of S3: -┌─⯈ tests/test_scope/bad/cyclic_scope_calls.catala_en:21.24-21.36: +┌─⯈ tests/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.43-18.55: +┌─⯈ tests/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.24-24.36: +┌─⯈ tests/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/scope/bad/cyclic_scopes.catala_en similarity index 81% rename from tests/test_scope/bad/cyclic_scopes.catala_en rename to tests/scope/bad/cyclic_scopes.catala_en index 3fb3a1c6..84beb93a 100644 --- a/tests/test_scope/bad/cyclic_scopes.catala_en +++ b/tests/scope/bad/cyclic_scopes.catala_en @@ -22,14 +22,14 @@ $ catala Interpret -s A 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.3-5.4: +┌─⯈ tests/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.3-9.4: +┌─⯈ tests/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/scope/bad/scope.catala_en similarity index 89% rename from tests/test_scope/bad/scope.catala_en rename to tests/scope/bad/scope.catala_en index 61f3dd3f..6018f5a0 100644 --- a/tests/test_scope/bad/scope.catala_en +++ b/tests/scope/bad/scope.catala_en @@ -20,14 +20,14 @@ $ catala Interpret -s A 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.57-13.61: +┌─⯈ tests/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.57-14.58: +┌─⯈ tests/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/scope/bad/scope_call_duplicate.catala_en similarity index 89% rename from tests/test_scope/bad/scope_call_duplicate.catala_en rename to tests/scope/bad/scope_call_duplicate.catala_en index 270020cf..4ec802e6 100644 --- a/tests/test_scope/bad/scope_call_duplicate.catala_en +++ b/tests/scope/bad/scope_call_duplicate.catala_en @@ -19,7 +19,7 @@ $ catala dcalc -s Titi [ERROR] Duplicate definition of scope input variable 'bar' -┌─⯈ tests/test_scope/bad/scope_call_duplicate.catala_en:14.70-14.73: +┌─⯈ tests/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/scope/bad/scope_call_extra.catala_en similarity index 83% rename from tests/test_scope/bad/scope_call_extra.catala_en rename to tests/scope/bad/scope_call_extra.catala_en index fe74038b..41356e9d 100644 --- a/tests/test_scope/bad/scope_call_extra.catala_en +++ b/tests/scope/bad/scope_call_extra.catala_en @@ -19,13 +19,13 @@ $ catala dcalc -s Titi [ERROR] Scope Toto has no input variable biz -┌─⯈ tests/test_scope/bad/scope_call_extra.catala_en:14.49-14.52: +┌─⯈ tests/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.19-2.23: +┌─⯈ tests/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/scope/bad/scope_call_missing.catala_en similarity index 84% rename from tests/test_scope/bad/scope_call_missing.catala_en rename to tests/scope/bad/scope_call_missing.catala_en index 51be91fd..f156962e 100644 --- a/tests/test_scope/bad/scope_call_missing.catala_en +++ b/tests/scope/bad/scope_call_missing.catala_en @@ -19,13 +19,13 @@ $ catala dcalc -s Titi [ERROR] Definition of input variable 'baz' missing in this scope call -┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:14.26-14.57: +┌─⯈ tests/scope/bad/scope_call_missing.catala_en:14.26-14.57: └──┐ 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.16-4.19: +┌─⯈ tests/scope/bad/scope_call_missing.catala_en:4.16-4.19: └─┐ 4 │ input output baz content decimal │ ‾‾‾ diff --git a/tests/test_scope/bad/sub_vars_in_sub_var.catala_en b/tests/scope/bad/sub_vars_in_sub_var.catala_en similarity index 87% rename from tests/test_scope/bad/sub_vars_in_sub_var.catala_en rename to tests/scope/bad/sub_vars_in_sub_var.catala_en index d6493c5f..e726dd72 100644 --- a/tests/test_scope/bad/sub_vars_in_sub_var.catala_en +++ b/tests/scope/bad/sub_vars_in_sub_var.catala_en @@ -18,7 +18,7 @@ $ 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.28-13.31: +┌─⯈ tests/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/scope/good/191_fix_record_name_confusion.catala_en similarity index 100% rename from tests/test_scope/good/191_fix_record_name_confusion.catala_en rename to tests/scope/good/191_fix_record_name_confusion.catala_en diff --git a/tests/test_scope/good/grand_parent_caller.catala_en b/tests/scope/good/grand_parent_caller.catala_en similarity index 100% rename from tests/test_scope/good/grand_parent_caller.catala_en rename to tests/scope/good/grand_parent_caller.catala_en diff --git a/tests/test_scope/good/nothing.catala_en b/tests/scope/good/nothing.catala_en similarity index 86% rename from tests/test_scope/good/nothing.catala_en rename to tests/scope/good/nothing.catala_en index 25534e47..eea35a49 100644 --- a/tests/test_scope/good/nothing.catala_en +++ b/tests/scope/good/nothing.catala_en @@ -11,7 +11,7 @@ declaration scope Foo2: $ catala Typecheck --check-invariants [WARNING] In scope "Foo2", the variable "bar" is declared but never defined; did you forget something? -┌─⯈ tests/test_scope/good/nothing.catala_en:5.10-5.13: +┌─⯈ tests/scope/good/nothing.catala_en:5.10-5.13: └─┐ 5 │ output bar content integer │ ‾‾‾ @@ -24,7 +24,7 @@ $ catala Typecheck --check-invariants $ 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.10-5.13: +┌─⯈ tests/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/scope/good/scope_call.catala_en similarity index 100% rename from tests/test_scope/good/scope_call.catala_en rename to tests/scope/good/scope_call.catala_en diff --git a/tests/test_scope/good/scope_call2.catala_en b/tests/scope/good/scope_call2.catala_en similarity index 100% rename from tests/test_scope/good/scope_call2.catala_en rename to tests/scope/good/scope_call2.catala_en diff --git a/tests/test_scope/good/scope_call3.catala_en b/tests/scope/good/scope_call3.catala_en similarity index 92% rename from tests/test_scope/good/scope_call3.catala_en rename to tests/scope/good/scope_call3.catala_en index 64fabdcf..3176d9ad 100644 --- a/tests/test_scope/good/scope_call3.catala_en +++ b/tests/scope/good/scope_call3.catala_en @@ -28,7 +28,7 @@ $ catala Typecheck --check-invariants $ catala Interpret -t -s HousingComputation --debug [DEBUG] = INIT = [DEBUG] = SURFACE = -[DEBUG] Parsing "tests/test_scope/good/scope_call3.catala_en" +[DEBUG] Parsing "tests/scope/good/scope_call3.catala_en" [DEBUG] = DESUGARED = [DEBUG] Name resolution... [DEBUG] Desugaring... @@ -42,14 +42,14 @@ $ catala Interpret -t -s HousingComputation --debug [DEBUG] Starting interpretation... [LOG] ≔ HousingComputation.f: λ (x_67: integer) → error_empty ⟨ ⟨#{☛ } true ⊢ ⟨(let result_68 : RentComputation = (#{→ RentComputation.direct} (λ (RentComputation_in_69: RentComputation_in) → let g_70 : integer → integer = #{≔ RentComputation.g} (λ (x1_71: integer) → error_empty ⟨ ⟨#{☛ } true ⊢ ⟨x1_71 +! 1⟩⟩ | false ⊢ ∅ ⟩) in let f_72 : integer → integer = #{≔ RentComputation.f} (λ (x1_73: integer) → error_empty ⟨ ⟨#{☛ } true ⊢ ⟨#{← RentComputation.g} #{≔ RentComputation.g.output} (#{→ RentComputation.g} g_70) #{≔ RentComputation.g.input0} (x1_73 +! 1)⟩⟩ | false ⊢ ∅ ⟩) in { RentComputation f = f_72; })) #{≔ RentComputation.direct.input} {RentComputation_in} in let result1_74 : RentComputation = { RentComputation f = λ (param0_75: integer) → #{← RentComputation.f} #{≔ RentComputation.f.output} (#{→ RentComputation.f} result_68.f) #{≔ RentComputation.f.input0} param0_75; } in #{← RentComputation.direct} #{≔ RentComputation.direct.output} if #{☛ RentComputation.direct.output} true then result1_74 else result1_74).f x_67⟩⟩ | false ⊢ ∅ ⟩ [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:8.14-8.20: + ┌─⯈ tests/scope/good/scope_call3.catala_en:8.14-8.20: └─┐ 8 │ definition result equals f of 1 │ ‾‾‾‾‾‾ [LOG] → HousingComputation.f [LOG] ≔ HousingComputation.f.input0: 1 [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:7.14-7.15: + ┌─⯈ tests/scope/good/scope_call3.catala_en:7.14-7.15: └─┐ 7 │ definition f of x equals (output of RentComputation).f of x │ ‾ @@ -58,7 +58,7 @@ $ catala Interpret -t -s HousingComputation --debug [LOG] ≔ RentComputation.g: λ (x_76: integer) → error_empty ⟨ ⟨#{☛ } true ⊢ ⟨x_76 +! 1⟩⟩ | false ⊢ ∅ ⟩ [LOG] ≔ RentComputation.f: λ (x_77: integer) → error_empty ⟨ ⟨#{☛ } true ⊢ ⟨#{← RentComputation.g} #{≔ RentComputation.g.output} (#{→ RentComputation.g} (λ (x1_78: integer) → error_empty ⟨ ⟨#{☛ } true ⊢ ⟨x1_78 +! 1⟩⟩ | false ⊢ ∅ ⟩)) #{≔ RentComputation.g.input0} (x_77 +! 1)⟩⟩ | false ⊢ ∅ ⟩ [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:7.29-7.54: + ┌─⯈ tests/scope/good/scope_call3.catala_en:7.29-7.54: └─┐ 7 │ definition f of x equals (output of RentComputation).f of x │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -67,14 +67,14 @@ $ catala Interpret -t -s HousingComputation --debug [LOG] → RentComputation.f [LOG] ≔ RentComputation.f.input0: 1 [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:16.14-16.15: + ┌─⯈ tests/scope/good/scope_call3.catala_en:16.14-16.15: └──┐ 16 │ definition f of x equals g of (x + 1) │ ‾ [LOG] → RentComputation.g [LOG] ≔ RentComputation.g.input0: 2 [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:15.14-15.15: + ┌─⯈ tests/scope/good/scope_call3.catala_en:15.14-15.15: └──┐ 15 │ definition g of x equals x + 1 │ ‾ diff --git a/tests/test_scope/good/scope_call4.catala_en b/tests/scope/good/scope_call4.catala_en similarity index 95% rename from tests/test_scope/good/scope_call4.catala_en rename to tests/scope/good/scope_call4.catala_en index 24d9ea92..1d66cdbe 100644 --- a/tests/test_scope/good/scope_call4.catala_en +++ b/tests/scope/good/scope_call4.catala_en @@ -34,7 +34,7 @@ $ catala Typecheck --check-invariants $ catala Interpret -s RentComputation --debug [DEBUG] = INIT = [DEBUG] = SURFACE = -[DEBUG] Parsing "tests/test_scope/good/scope_call4.catala_en" +[DEBUG] Parsing "tests/scope/good/scope_call4.catala_en" [DEBUG] = DESUGARED = [DEBUG] Name resolution... [DEBUG] Desugaring... @@ -68,7 +68,7 @@ f2 = λ (x: integer) → $ catala Interpret_Lcalc -s RentComputation --avoid-exceptions --optimize --debug [DEBUG] = INIT = [DEBUG] = SURFACE = -[DEBUG] Parsing "tests/test_scope/good/scope_call4.catala_en" +[DEBUG] Parsing "tests/scope/good/scope_call4.catala_en" [DEBUG] = DESUGARED = [DEBUG] Name resolution... [DEBUG] Desugaring... diff --git a/tests/test_scope/good/scope_struct.catala_en b/tests/scope/good/scope_struct.catala_en similarity index 100% rename from tests/test_scope/good/scope_struct.catala_en rename to tests/scope/good/scope_struct.catala_en diff --git a/tests/test_scope/good/simple.catala_en b/tests/scope/good/simple.catala_en similarity index 100% rename from tests/test_scope/good/simple.catala_en rename to tests/scope/good/simple.catala_en diff --git a/tests/test_scope/good/sub_scope.catala_en b/tests/scope/good/sub_scope.catala_en similarity index 100% rename from tests/test_scope/good/sub_scope.catala_en rename to tests/scope/good/sub_scope.catala_en diff --git a/tests/test_scope/good/sub_sub_scope.catala_en b/tests/scope/good/sub_sub_scope.catala_en similarity index 100% rename from tests/test_scope/good/sub_sub_scope.catala_en rename to tests/scope/good/sub_sub_scope.catala_en diff --git a/tests/test_scope/good/subscope_function_arg_not_defined.catala_en b/tests/scope/good/subscope_function_arg_not_defined.catala_en similarity index 100% rename from tests/test_scope/good/subscope_function_arg_not_defined.catala_en rename to tests/scope/good/subscope_function_arg_not_defined.catala_en diff --git a/tests/test_scope/good/subscope_function_arg_not_defined2.catala_en b/tests/scope/good/subscope_function_arg_not_defined2.catala_en similarity index 100% rename from tests/test_scope/good/subscope_function_arg_not_defined2.catala_en rename to tests/scope/good/subscope_function_arg_not_defined2.catala_en diff --git a/tests/test_struct/bad/bug_107.catala_en b/tests/struct/bad/bug_107.catala_en similarity index 85% rename from tests/test_struct/bad/bug_107.catala_en rename to tests/struct/bad/bug_107.catala_en index dc6ec813..6c8759cb 100644 --- a/tests/test_struct/bad/bug_107.catala_en +++ b/tests/struct/bad/bug_107.catala_en @@ -22,14 +22,14 @@ $ catala Interpret -s A struct name "S" already defined First definition: -┌─⯈ tests/test_struct/bad/bug_107.catala_en:4.23-4.24: +┌─⯈ tests/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.23-8.24: +┌─⯈ tests/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/struct/bad/empty_struct.catala_en similarity index 84% rename from tests/test_struct/bad/empty_struct.catala_en rename to tests/struct/bad/empty_struct.catala_en index fba0bd77..94be9b08 100644 --- a/tests/test_struct/bad/empty_struct.catala_en +++ b/tests/struct/bad/empty_struct.catala_en @@ -12,7 +12,7 @@ $ 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.23-4.26: +┌─⯈ tests/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/struct/bad/nested.catala_en similarity index 83% rename from tests/test_struct/bad/nested.catala_en rename to tests/struct/bad/nested.catala_en index 419e68bc..6674245d 100644 --- a/tests/test_struct/bad/nested.catala_en +++ b/tests/struct/bad/nested.catala_en @@ -16,7 +16,7 @@ scope A: $ catala Interpret -s A [WARNING] The constructor "Rec" of enumeration "E" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/bad/nested.catala_en:6.6-6.9: +┌─⯈ tests/struct/bad/nested.catala_en:6.6-6.9: └─┐ 6 │ -- Rec content E │ ‾‾‾ @@ -24,7 +24,7 @@ $ catala Interpret -s A [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.18-6.19: +┌─⯈ tests/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/struct/bad/nested2.catala_en similarity index 75% rename from tests/test_struct/bad/nested2.catala_en rename to tests/struct/bad/nested2.catala_en index f7b5ac5b..bdd43cb4 100644 --- a/tests/test_struct/bad/nested2.catala_en +++ b/tests/struct/bad/nested2.catala_en @@ -17,21 +17,21 @@ declaration scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is declared but never defined; did you forget something? -┌─⯈ tests/test_struct/bad/nested2.catala_en:13.10-13.11: +┌─⯈ tests/struct/bad/nested2.catala_en:13.10-13.11: └──┐ 13 │ output x content E │ ‾ └─ Article [WARNING] The structure "S" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/bad/nested2.catala_en:4.23-4.24: +┌─⯈ tests/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.25-8.26: +┌─⯈ tests/struct/bad/nested2.catala_en:8.25-8.26: └─┐ 8 │ declaration enumeration E: │ ‾ @@ -40,28 +40,28 @@ $ catala Interpret -s A Cyclic dependency detected between types! Cycle type S, declared: -┌─⯈ tests/test_struct/bad/nested2.catala_en:4.23-4.24: +┌─⯈ tests/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.20-10.21: +┌─⯈ tests/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.25-8.26: +┌─⯈ tests/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.18-5.19: +┌─⯈ tests/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/struct/bad/nonexisting_struct.catala_en similarity index 85% rename from tests/test_struct/bad/nonexisting_struct.catala_en rename to tests/struct/bad/nonexisting_struct.catala_en index f7981c5c..4a948bb5 100644 --- a/tests/test_struct/bad/nonexisting_struct.catala_en +++ b/tests/struct/bad/nonexisting_struct.catala_en @@ -18,7 +18,7 @@ $ catala Interpret -s A [ERROR] No struct named Fo found -┌─⯈ tests/test_struct/bad/nonexisting_struct.catala_en:13.25-13.27: +┌─⯈ tests/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/struct/bad/wrong_qualified_field.catala_en similarity index 87% rename from tests/test_struct/bad/wrong_qualified_field.catala_en rename to tests/struct/bad/wrong_qualified_field.catala_en index 712e6574..bb8faf28 100644 --- a/tests/test_struct/bad/wrong_qualified_field.catala_en +++ b/tests/struct/bad/wrong_qualified_field.catala_en @@ -22,7 +22,7 @@ $ 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.23-17.30: +┌─⯈ tests/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/struct/good/ambiguous_fields.catala_en similarity index 84% rename from tests/test_struct/good/ambiguous_fields.catala_en rename to tests/struct/good/ambiguous_fields.catala_en index 1ed6bfb1..99bd9421 100644 --- a/tests/test_struct/good/ambiguous_fields.catala_en +++ b/tests/struct/good/ambiguous_fields.catala_en @@ -22,7 +22,7 @@ scope A: $ catala Typecheck --check-invariants [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:7.23-7.26: +┌─⯈ tests/struct/good/ambiguous_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ @@ -35,7 +35,7 @@ $ catala Typecheck --check-invariants $ catala Interpret -s A [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:7.23-7.26: +┌─⯈ tests/struct/good/ambiguous_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ @@ -47,7 +47,7 @@ $ catala Interpret -s A $ catala Interpret_Lcalc -s A --avoid-exceptions --optimize [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:7.23-7.26: +┌─⯈ tests/struct/good/ambiguous_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ diff --git a/tests/test_struct/good/nested3.catala_en b/tests/struct/good/nested3.catala_en similarity index 100% rename from tests/test_struct/good/nested3.catala_en rename to tests/struct/good/nested3.catala_en diff --git a/tests/test_struct/good/same_name_fields.catala_en b/tests/struct/good/same_name_fields.catala_en similarity index 85% rename from tests/test_struct/good/same_name_fields.catala_en rename to tests/struct/good/same_name_fields.catala_en index b3776767..98f9980d 100644 --- a/tests/test_struct/good/same_name_fields.catala_en +++ b/tests/struct/good/same_name_fields.catala_en @@ -22,7 +22,7 @@ scope A: $ catala Typecheck --check-invariants [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/same_name_fields.catala_en:7.23-7.26: +┌─⯈ tests/struct/good/same_name_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ @@ -35,7 +35,7 @@ $ catala Typecheck --check-invariants $ 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.23-7.26: +┌─⯈ tests/struct/good/same_name_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ @@ -48,7 +48,7 @@ $ catala Interpret -s A $ catala Interpret_Lcalc -s A --avoid-exceptions --optimize [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/same_name_fields.catala_en:7.23-7.26: +┌─⯈ tests/struct/good/same_name_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ diff --git a/tests/test_struct/good/simple.catala_en b/tests/struct/good/simple.catala_en similarity index 100% rename from tests/test_struct/good/simple.catala_en rename to tests/struct/good/simple.catala_en diff --git a/tests/test_default/bad/conflict.catala_en b/tests/test_default/bad/conflict.catala_en deleted file mode 100644 index 1a827d42..00000000 --- a/tests/test_default/bad/conflict.catala_en +++ /dev/null @@ -1,18 +0,0 @@ -## Article - -```catala -declaration scope A: - output x content integer - -scope A: - definition x under condition true consequence equals 1 - definition x under condition true consequence equals 0 -``` - -```catala-test-inline -$ catala Interpret -s A --message=gnu -tests/test_default/bad/conflict.catala_en:8.56-8.57: [ERROR] There is a conflict between multiple valid consequences for assigning the same variable. -tests/test_default/bad/conflict.catala_en:8.56-8.57: [ERROR] This consequence has a valid justification: -tests/test_default/bad/conflict.catala_en:9.56-9.57: [ERROR] This consequence has a valid justification: -#return code 123# -``` diff --git a/tests/test_tuples/good/tuples.catala_en b/tests/tuples/good/tuples.catala_en similarity index 100% rename from tests/test_tuples/good/tuples.catala_en rename to tests/tuples/good/tuples.catala_en diff --git a/tests/test_tuples/good/tuplists.catala_en b/tests/tuples/good/tuplists.catala_en similarity index 100% rename from tests/test_tuples/good/tuplists.catala_en rename to tests/tuples/good/tuplists.catala_en diff --git a/tests/test_typing/bad/common.catala_en b/tests/typing/bad/common.catala_en similarity index 100% rename from tests/test_typing/bad/common.catala_en rename to tests/typing/bad/common.catala_en diff --git a/tests/test_typing/bad/err1.catala_en b/tests/typing/bad/err1.catala_en similarity index 85% rename from tests/test_typing/bad/err1.catala_en rename to tests/typing/bad/err1.catala_en index 8cc416e7..9514727f 100644 --- a/tests/test_typing/bad/err1.catala_en +++ b/tests/typing/bad/err1.catala_en @@ -18,13 +18,13 @@ Error during typechecking, incompatible types: └─⯈ integer This expression has type decimal: -┌─⯈ tests/test_typing/bad/err1.catala_en:7.23-7.26: +┌─⯈ tests/typing/bad/err1.catala_en:7.23-7.26: └─┐ 7 │ Structure { -- i: 4.1 -- e: y }; │ ‾‾‾ Expected type integer coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:8.18-8.25: +┌─⯈ tests/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/typing/bad/err2.catala_en similarity index 85% rename from tests/test_typing/bad/err2.catala_en rename to tests/typing/bad/err2.catala_en index 7501c02c..ebf67fa3 100644 --- a/tests/test_typing/bad/err2.catala_en +++ b/tests/typing/bad/err2.catala_en @@ -18,13 +18,13 @@ Error during typechecking, incompatible types: └─⯈ list This expression has type decimal: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.39-10.42: +┌─⯈ tests/typing/bad/err2.catala_en:10.39-10.42: └──┐ 10 │ definition a equals number of (z ++ 1.1) / 2 │ ‾‾‾ Expected type list coming from expression: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.36-10.38: +┌─⯈ tests/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/typing/bad/err3.catala_en similarity index 82% rename from tests/test_typing/bad/err3.catala_en rename to tests/typing/bad/err3.catala_en index b7424a6c..e4787707 100644 --- a/tests/test_typing/bad/err3.catala_en +++ b/tests/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.6-4.9: +┌─⯈ tests/typing/bad/common.catala_en:4.6-4.9: └─┐ 4 │ -- Dec content decimal │ ‾‾‾ @@ -24,13 +24,13 @@ Error during typechecking, incompatible types: └─⯈ decimal This expression has type integer: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.23-10.45: +┌─⯈ tests/typing/bad/err3.catala_en:10.23-10.45: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ Expected type decimal coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:15.20-15.27: +┌─⯈ tests/typing/bad/common.catala_en:15.20-15.27: └──┐ 15 │ output a content decimal │ ‾‾‾‾‾‾‾ @@ -43,7 +43,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.6-4.9: +┌─⯈ tests/typing/bad/common.catala_en:4.6-4.9: └─┐ 4 │ -- Dec content decimal │ ‾‾‾ @@ -53,13 +53,13 @@ Error during typechecking, incompatible types: └─⯈ decimal This expression has type integer: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.23-10.45: +┌─⯈ tests/typing/bad/err3.catala_en:10.23-10.45: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ Expected type decimal coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:15.20-15.27: +┌─⯈ tests/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/typing/bad/err4.catala_en similarity index 79% rename from tests/test_typing/bad/err4.catala_en rename to tests/typing/bad/err4.catala_en index d8ed4b4b..17522a6d 100644 --- a/tests/test_typing/bad/err4.catala_en +++ b/tests/typing/bad/err4.catala_en @@ -12,19 +12,19 @@ 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.23-7.32: +┌─⯈ tests/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.6-4.9: +┌─⯈ tests/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.6-5.9: +┌─⯈ tests/typing/bad/common.catala_en:5.6-5.9: └─┐ 5 │ -- Dat content date │ ‾‾‾ @@ -34,13 +34,13 @@ Error during typechecking, incompatible types: └─⯈ Structure This expression has type Enum: -┌─⯈ tests/test_typing/bad/err4.catala_en:5.25-5.38: +┌─⯈ tests/typing/bad/err4.catala_en:5.25-5.38: └─┐ 5 │ definition z equals [ Int content x ] │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ Expected type Structure coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:14.28-14.37: +┌─⯈ tests/typing/bad/common.catala_en:14.28-14.37: └──┐ 14 │ output z content list of Structure │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err5.catala_en b/tests/typing/bad/err5.catala_en similarity index 86% rename from tests/test_typing/bad/err5.catala_en rename to tests/typing/bad/err5.catala_en index f5244811..aad5c3d7 100644 --- a/tests/test_typing/bad/err5.catala_en +++ b/tests/typing/bad/err5.catala_en @@ -18,13 +18,13 @@ Error during typechecking, incompatible types: └─⯈ Structure This expression has type integer: -┌─⯈ tests/test_typing/bad/err5.catala_en:8.5-8.9: +┌─⯈ tests/typing/bad/err5.catala_en:8.5-8.9: └─┐ 8 │ 1040 │ ‾‾‾‾ Expected type Structure coming from expression: -┌─⯈ tests/test_typing/bad/err5.catala_en:6.5-6.46: +┌─⯈ tests/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/typing/bad/err6.catala_en similarity index 90% rename from tests/test_typing/bad/err6.catala_en rename to tests/typing/bad/err6.catala_en index a30a4e4d..db5500ed 100644 --- a/tests/test_typing/bad/err6.catala_en +++ b/tests/typing/bad/err6.catala_en @@ -34,13 +34,13 @@ Error during typechecking, incompatible types: └─⯈ integer This expression has type decimal: -┌─⯈ tests/test_typing/bad/err6.catala_en:20.27-20.30: +┌─⯈ tests/typing/bad/err6.catala_en:20.27-20.30: └──┐ 20 │ definition sub.x equals 44. │ ‾‾‾ Expected type integer coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:12.19-12.26: +┌─⯈ tests/typing/bad/common.catala_en:12.19-12.26: └──┐ 12 │ input x content integer │ ‾‾‾‾‾‾‾ diff --git a/tests/test_typing/good/common.catala_en b/tests/typing/good/common.catala_en similarity index 82% rename from tests/test_typing/good/common.catala_en rename to tests/typing/good/common.catala_en index 9ba88dc4..267c9654 100644 --- a/tests/test_typing/good/common.catala_en +++ b/tests/typing/good/common.catala_en @@ -21,31 +21,31 @@ declaration scope S: $ catala Typecheck --check-invariants [WARNING] In scope "S", the variable "z" is declared but never defined; did you forget something? -┌─⯈ tests/test_typing/good/common.catala_en:14.10-14.11: +┌─⯈ tests/typing/good/common.catala_en:14.10-14.11: └──┐ 14 │ output z content list of Structure │ ‾ [WARNING] In scope "S", the variable "a" is declared but never defined; did you forget something? -┌─⯈ tests/test_typing/good/common.catala_en:15.10-15.11: +┌─⯈ tests/typing/good/common.catala_en:15.10-15.11: └──┐ 15 │ output a content decimal │ ‾ [WARNING] This variable is dead code; it does not contribute to computing any of scope "S" outputs. Did you forget something? -┌─⯈ tests/test_typing/good/common.catala_en:12.9-12.10: +┌─⯈ tests/typing/good/common.catala_en:12.9-12.10: └──┐ 12 │ input x content integer │ ‾ [WARNING] The structure "Structure" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/good/common.catala_en:7.23-7.32: +┌─⯈ tests/typing/good/common.catala_en:7.23-7.32: └─┐ 7 │ declaration structure Structure: │ ‾‾‾‾‾‾‾‾‾ [WARNING] The enumeration "Enum" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/good/common.catala_en:2.25-2.29: +┌─⯈ tests/typing/good/common.catala_en:2.25-2.29: └─┐ 2 │ declaration enumeration Enum: │ ‾‾‾‾ diff --git a/tests/test_typing/good/overload.catala_en b/tests/typing/good/overload.catala_en similarity index 100% rename from tests/test_typing/good/overload.catala_en rename to tests/typing/good/overload.catala_en diff --git a/tests/test_variable_state/bad/def_no_state.catala_en b/tests/variable_state/bad/def_no_state.catala_en similarity index 76% rename from tests/test_variable_state/bad/def_no_state.catala_en rename to tests/variable_state/bad/def_no_state.catala_en index 318e92f0..54645c84 100644 --- a/tests/test_variable_state/bad/def_no_state.catala_en +++ b/tests/variable_state/bad/def_no_state.catala_en @@ -15,14 +15,14 @@ $ 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.14-10.17: +┌─⯈ tests/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.10-5.13: +┌─⯈ tests/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/double_same_state.catala_en b/tests/variable_state/bad/double_same_state.catala_en similarity index 77% rename from tests/test_variable_state/bad/double_same_state.catala_en rename to tests/variable_state/bad/double_same_state.catala_en index e4a4aabf..fea97dd1 100644 --- a/tests/test_variable_state/bad/double_same_state.catala_en +++ b/tests/variable_state/bad/double_same_state.catala_en @@ -16,14 +16,14 @@ $ catala Typecheck There are two states with the same name for the same variable: this is ambiguous. Please change the name of either states. First instance of state "bar": -┌─⯈ tests/test_variable_state/bad/double_same_state.catala_en:6.11-6.14: +┌─⯈ tests/variable_state/bad/double_same_state.catala_en:6.11-6.14: └─┐ 6 │ state bar │ ‾‾‾ └─ Test Second instance of state "bar": -┌─⯈ tests/test_variable_state/bad/double_same_state.catala_en:7.11-7.14: +┌─⯈ tests/variable_state/bad/double_same_state.catala_en:7.11-7.14: └─┐ 7 │ state bar │ ‾‾‾ diff --git a/tests/test_variable_state/bad/no_cross_exceptions.catala_en b/tests/variable_state/bad/no_cross_exceptions.catala_en similarity index 87% rename from tests/test_variable_state/bad/no_cross_exceptions.catala_en rename to tests/variable_state/bad/no_cross_exceptions.catala_en index 3b25e046..abe40793 100644 --- a/tests/test_variable_state/bad/no_cross_exceptions.catala_en +++ b/tests/variable_state/bad/no_cross_exceptions.catala_en @@ -19,7 +19,7 @@ $ catala Typecheck [ERROR] Unknown label for the scope variable foo.baz: "thing" -┌─⯈ tests/test_variable_state/bad/no_cross_exceptions.catala_en:14.13-14.18: +┌─⯈ tests/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/variable_state/bad/self_reference_first_state.catala_en similarity index 84% rename from tests/test_variable_state/bad/self_reference_first_state.catala_en rename to tests/variable_state/bad/self_reference_first_state.catala_en index b00e2a30..d9a99993 100644 --- a/tests/test_variable_state/bad/self_reference_first_state.catala_en +++ b/tests/variable_state/bad/self_reference_first_state.catala_en @@ -17,7 +17,7 @@ $ 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.35-10.38: +┌─⯈ tests/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/variable_state/bad/state_cycle.catala_en similarity index 81% rename from tests/test_variable_state/bad/state_cycle.catala_en rename to tests/variable_state/bad/state_cycle.catala_en index 28546497..10572f16 100644 --- a/tests/test_variable_state/bad/state_cycle.catala_en +++ b/tests/variable_state/bad/state_cycle.catala_en @@ -26,28 +26,28 @@ Cyclic dependency detected between the following variables of scope A: 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.38-19.44: +┌─⯈ tests/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.35-13.41: +┌─⯈ tests/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.35-15.38: +┌─⯈ tests/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.38-17.41: +┌─⯈ tests/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/variable_state/bad/unknown_state.catala_en similarity index 78% rename from tests/test_variable_state/bad/unknown_state.catala_en rename to tests/variable_state/bad/unknown_state.catala_en index d8ded016..4b209b8a 100644 --- a/tests/test_variable_state/bad/unknown_state.catala_en +++ b/tests/variable_state/bad/unknown_state.catala_en @@ -17,14 +17,14 @@ $ catala Typecheck [ERROR] This identifier is not a state declared for variable foo. -┌─⯈ tests/test_variable_state/bad/unknown_state.catala_en:12.24-12.28: +┌─⯈ tests/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.10-5.13: +┌─⯈ tests/variable_state/bad/unknown_state.catala_en:5.10-5.13: └─┐ 5 │ output foo content integer │ ‾‾‾ diff --git a/tests/test_variable_state/good/simple.catala_en b/tests/variable_state/good/simple.catala_en similarity index 100% rename from tests/test_variable_state/good/simple.catala_en rename to tests/variable_state/good/simple.catala_en diff --git a/tests/test_variable_state/good/subscope.catala_en b/tests/variable_state/good/subscope.catala_en similarity index 100% rename from tests/test_variable_state/good/subscope.catala_en rename to tests/variable_state/good/subscope.catala_en