diff --git a/build_system/clerk_runtest.ml b/build_system/clerk_runtest.ml index fba2996f..103d4e0c 100644 --- a/build_system/clerk_runtest.ml +++ b/build_system/clerk_runtest.ml @@ -98,7 +98,8 @@ let rec has_inline_tests ?(parents = []) (file : string) : bool = let has_inline_tests file = has_inline_tests file (* hide optional parameter *) -let [@ocamlformat "disable"] rec scan_for_inline_tests ?(parents=[]) (file : string) +let [@ocamlformat "disable"] rec scan_for_inline_tests + ?(parents=[]) (file : string) : file_tests list = let parents, file = checkfile parents file in let read_file ic = @@ -138,7 +139,8 @@ let [@ocamlformat "disable"] rec scan_for_inline_tests ?(parents=[]) (file : str 1 (String.sub file_str 0 pos) in - Message.raise_error "Bad inline-test format at %s line %d" file line + Message.raise_error "Bad inline-test format at %s line %d" + file line in let params = List.filter (( <> ) "") @@ -179,12 +181,14 @@ let run_inline_tests (file : string) (catala_exe : string) (catala_opts : string list) = + let _, file = checkfile [] file in match scan_for_inline_tests file with | [] -> Message.emit_warning "No inline tests found in %s" file | file_tests -> Message.emit_debug "@[Running tests:@ %a@]" - (Format.pp_print_list (fun ppf t -> Format.fprintf ppf "- @[%s:@ %d tests@]" - t.filename (List.length t.tests))) + (Format.pp_print_list + (fun ppf t -> Format.fprintf ppf "- @[%s:@ %d tests@]" + t.filename (List.length t.tests))) file_tests; let run test oc = List.iter @@ -192,6 +196,8 @@ let run_inline_tests output_string oc test.text_before; let cmd_out_rd, cmd_out_wr = Unix.pipe () in let ic = Unix.in_channel_of_descr cmd_out_rd in + let file_dir, file = Filename.dirname file, Filename.basename file in + let catala_exe = Unix.realpath catala_exe in let cmd = Array.of_list ((catala_exe :: catala_opts) @ test.params @ [file]) in @@ -206,6 +212,9 @@ let run_inline_tests |> Array.of_seq in let pid = + let cwd = Unix.getcwd () in + Unix.chdir file_dir; + Fun.protect ~finally:(fun () -> Unix.chdir cwd) @@ fun () -> Unix.create_process_env catala_exe cmd env Unix.stdin cmd_out_wr cmd_out_wr in @@ -237,7 +246,8 @@ let run_inline_tests in List.iter (fun test -> - if reset then ( + if test.filename <> file then () + else if reset then ( let out = test.filename ^ ".out" in (try File.with_out_channel out (run test) with e -> diff --git a/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en b/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en index dc2c2c27..d44968ed 100644 --- a/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en +++ b/examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en @@ -35,13 +35,13 @@ You could have written : "condition", or "content" Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: +┌─⯈ test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: +┌─⯈ test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ @@ -79,13 +79,13 @@ You could have written : "condition", or "content" Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: +┌─⯈ test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: +┌─⯈ test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ @@ -123,13 +123,13 @@ You could have written : "condition", or "content" Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: +┌─⯈ test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: +┌─⯈ test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ @@ -169,13 +169,13 @@ You could have written : "condition", or "content" Error token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.21-11.26: +┌─⯈ test_nsw_social_housie.catala_en:11.21-11.26: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾ Last good token: -┌─⯈ examples/NSW_community_gaming/tests/test_nsw_social_housie.catala_en:11.11-11.20: +┌─⯈ test_nsw_social_housie.catala_en:11.11-11.20: └──┐ 11 │ context my_gaming scope GamingAuthorized │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_arithmetic/bad/division_by_zero.catala_en b/tests/test_arithmetic/bad/division_by_zero.catala_en index c0c7352b..3acd5f90 100644 --- a/tests/test_arithmetic/bad/division_by_zero.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ division_by_zero.catala_en:30.31-30.35: └──┐ 30 │ definition i equals $10.0 / $0.0 │ ‾‾‾‾ diff --git a/tests/test_arithmetic/bad/logical_prio.catala_en b/tests/test_arithmetic/bad/logical_prio.catala_en index 0eed46b8..555b3f04 100644 --- a/tests/test_arithmetic/bad/logical_prio.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ logical_prio.catala_en:6.58-6.60: └─┐ 6 │ definition o equals true and (false and true and true) or false │ ‾‾ diff --git a/tests/test_array/bad/fold_error.catala_en b/tests/test_array/bad/fold_error.catala_en index c20c2aaf..fb5fda6f 100644 --- a/tests/test_array/bad/fold_error.catala_en +++ b/tests/test_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.50-10.52: +┌─⯈ fold_error.catala_en:10.50-10.52: └──┐ 10 │ definition list_high_count equals number of (m >= $7) for m among list │ ‾‾ └─ Article Type integer coming from expression: -┌─⯈ tests/test_array/bad/fold_error.catala_en:5.35-5.42: +┌─⯈ fold_error.catala_en:5.35-5.42: └─┐ 5 │ context list content collection integer │ ‾‾‾‾‾‾‾ └─ Article Type money coming from expression: -┌─⯈ tests/test_array/bad/fold_error.catala_en:10.53-10.55: +┌─⯈ fold_error.catala_en:10.53-10.55: └──┐ 10 │ definition list_high_count equals number of (m >= $7) for m among list │ ‾‾ diff --git a/tests/test_bool/bad/bad_assert.catala_en b/tests/test_bool/bad/bad_assert.catala_en index 0aa92dbf..2751445e 100644 --- a/tests/test_bool/bad/bad_assert.catala_en +++ b/tests/test_bool/bad/bad_assert.catala_en @@ -18,21 +18,21 @@ Error during typechecking, incompatible types: └─⯈ bool Error coming from typechecking the following expression: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.13-9.14: +┌─⯈ bad_assert.catala_en:9.13-9.14: └─┐ 9 │ assertion x │ ‾ └─ Test Type integer coming from expression: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:5.20-5.27: +┌─⯈ bad_assert.catala_en:5.20-5.27: └─┐ 5 │ output x content integer │ ‾‾‾‾‾‾‾ └─ Test Type bool coming from expression: -┌─⯈ tests/test_bool/bad/bad_assert.catala_en:9.13-9.14: +┌─⯈ bad_assert.catala_en:9.13-9.14: └─┐ 9 │ assertion x │ ‾ diff --git a/tests/test_bool/bad/test_xor_with_int.catala_en b/tests/test_bool/bad/test_xor_with_int.catala_en index 2c516657..7787d24b 100644 --- a/tests/test_bool/bad/test_xor_with_int.catala_en +++ b/tests/test_bool/bad/test_xor_with_int.catala_en @@ -16,21 +16,21 @@ Error during typechecking, incompatible types: └─⯈ bool Error coming from typechecking the following expression: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.30-8.32: +┌─⯈ test_xor_with_int.catala_en:8.30-8.32: └─┐ 8 │ definition test_var equals 10 xor 20 │ ‾‾ └─ 'xor' should be a boolean operator Type integer coming from expression: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.30-8.32: +┌─⯈ test_xor_with_int.catala_en:8.30-8.32: └─┐ 8 │ definition test_var equals 10 xor 20 │ ‾‾ └─ 'xor' should be a boolean operator Type bool coming from expression: -┌─⯈ tests/test_bool/bad/test_xor_with_int.catala_en:8.33-8.36: +┌─⯈ test_xor_with_int.catala_en:8.33-8.36: └─┐ 8 │ definition test_var equals 10 xor 20 │ ‾‾‾ diff --git a/tests/test_date/bad/rounding_option_conflict.catala_en b/tests/test_date/bad/rounding_option_conflict.catala_en index 2fc1d085..f7f5e068 100644 --- a/tests/test_date/bad/rounding_option_conflict.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ rounding_option_conflict.catala_en:12.14-12.24: └──┐ 12 │ date round increasing │ ‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_date/bad/uncomparable_duration.catala_en b/tests/test_date/bad/uncomparable_duration.catala_en index 4fbed2e8..d7b10a3b 100644 --- a/tests/test_date/bad/uncomparable_duration.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ uncomparable_duration.catala_en:10.33-10.38: └──┐ 10 │ definition d equals 1 month < 2 day │ ‾‾‾‾‾ diff --git a/tests/test_default/bad/conflict.catala_en b/tests/test_default/bad/conflict.catala_en index 1a827d42..aebea13a 100644 --- a/tests/test_default/bad/conflict.catala_en +++ b/tests/test_default/bad/conflict.catala_en @@ -11,8 +11,8 @@ scope A: ```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: +conflict.catala_en:8.56-8.57: [ERROR] There is a conflict between multiple valid consequences for assigning the same variable. +conflict.catala_en:8.56-8.57: [ERROR] This consequence has a valid justification: +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/test_default/bad/empty.catala_en index f25e7747..0a5181f7 100644 --- a/tests/test_default/bad/empty.catala_en +++ b/tests/test_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: +┌─⯈ empty.catala_en:6.10-6.11: └─┐ 6 │ output y content boolean │ ‾ @@ -21,7 +21,7 @@ $ catala Interpret -s A [ERROR] This variable evaluated to an empty term (no rule that defined it applied in this situation) -┌─⯈ tests/test_default/bad/empty.catala_en:6.10-6.11: +┌─⯈ 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/test_default/bad/empty_with_rules.catala_en index f8271e06..d4c682a4 100644 --- a/tests/test_default/bad/empty_with_rules.catala_en +++ b/tests/test_default/bad/empty_with_rules.catala_en @@ -17,7 +17,7 @@ $ catala Interpret -s A [ERROR] This variable evaluated to an empty term (no rule that defined it applied in this situation) -┌─⯈ tests/test_default/bad/empty_with_rules.catala_en:5.10-5.11: +┌─⯈ 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/test_default/bad/typing_or_logical_error.catala_en index b22a00ea..cc9e84ec 100644 --- a/tests/test_default/bad/typing_or_logical_error.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_default/good/mutliple_definitions.catala_en index 23da3b31..d02122cc 100644 --- a/tests/test_default/good/mutliple_definitions.catala_en +++ b/tests/test_default/good/mutliple_definitions.catala_en @@ -13,12 +13,12 @@ scope A: $ 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: +┌─⯈ 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: +┌─⯈ 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/test_enum/bad/ambiguous_cases.catala_en index 1c7fb1a2..42b3efbb 100644 --- a/tests/test_enum/bad/ambiguous_cases.catala_en +++ b/tests/test_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: +┌─⯈ ambiguous_cases.catala_en:14.23-14.28: └──┐ 14 │ definition e equals Case1 │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/ambiguous_wildcard.catala_en b/tests/test_enum/bad/ambiguous_wildcard.catala_en index 1b9c2ece..76a5b2da 100644 --- a/tests/test_enum/bad/ambiguous_wildcard.catala_en +++ b/tests/test_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: +┌─⯈ ambiguous_wildcard.catala_en:15.5-15.21: └──┐ 15 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/duplicate_case.catala_en b/tests/test_enum/bad/duplicate_case.catala_en index 1e31355e..f846fe56 100644 --- a/tests/test_enum/bad/duplicate_case.catala_en +++ b/tests/test_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: +┌─⯈ duplicate_case.catala_en:18.16-18.20: └──┐ 18 │ -- Case3 : true │ ‾‾‾‾ └─ Article -┌─⯈ tests/test_enum/bad/duplicate_case.catala_en:17.16-17.21: +┌─⯈ duplicate_case.catala_en:17.16-17.21: └──┐ 17 │ -- Case3 : false │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/empty.catala_en b/tests/test_enum/bad/empty.catala_en index 94f07b78..7cb7841f 100644 --- a/tests/test_enum/bad/empty.catala_en +++ b/tests/test_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: +┌─⯈ empty.catala_en:4.25-4.28: └─┐ 4 │ declaration enumeration Foo: │ ‾‾‾ diff --git a/tests/test_enum/bad/missing_case.catala_en b/tests/test_enum/bad/missing_case.catala_en index 301df1d3..9be61c2d 100644 --- a/tests/test_enum/bad/missing_case.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ missing_case.catala_en:14.25-16.22: └──┐ 14 │ definition out equals match e with pattern │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/not_ending_wildcard.catala_en b/tests/test_enum/bad/not_ending_wildcard.catala_en index 2289b0d6..d0f233f6 100644 --- a/tests/test_enum/bad/not_ending_wildcard.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ not_ending_wildcard.catala_en:20.5-20.18: └──┐ 20 │ -- Case2 : 42 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_2.catala_en b/tests/test_enum/bad/quick_pattern_2.catala_en index 737a6184..712b826b 100644 --- a/tests/test_enum/bad/quick_pattern_2.catala_en +++ b/tests/test_enum/bad/quick_pattern_2.catala_en @@ -36,21 +36,21 @@ Error during typechecking, incompatible types: └─⯈ F Error coming from typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.23-28.24: +┌─⯈ quick_pattern_2.catala_en:28.23-28.24: └──┐ 28 │ definition y equals x with pattern Case3 │ ‾ └─ Article Type E coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:17.21-17.22: +┌─⯈ quick_pattern_2.catala_en:17.21-17.22: └──┐ 17 │ context x content E │ ‾ └─ Article Type F coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_2.catala_en:28.23-28.43: +┌─⯈ quick_pattern_2.catala_en:28.23-28.43: └──┐ 28 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_3.catala_en b/tests/test_enum/bad/quick_pattern_3.catala_en index d7589c9b..d0910ca9 100644 --- a/tests/test_enum/bad/quick_pattern_3.catala_en +++ b/tests/test_enum/bad/quick_pattern_3.catala_en @@ -26,21 +26,21 @@ Error during typechecking, incompatible types: └─⯈ F Error coming from typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.21-18.22: +┌─⯈ quick_pattern_3.catala_en:18.21-18.22: └──┐ 18 │ definition y equals x with pattern Case3 │ ‾ └─ Article Type E coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:13.19-13.20: +┌─⯈ quick_pattern_3.catala_en:13.19-13.20: └──┐ 13 │ context x content E │ ‾ └─ Article Type F coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_3.catala_en:18.21-18.41: +┌─⯈ quick_pattern_3.catala_en:18.21-18.41: └──┐ 18 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_4.catala_en b/tests/test_enum/bad/quick_pattern_4.catala_en index 9f4d3a1e..7df87aa8 100644 --- a/tests/test_enum/bad/quick_pattern_4.catala_en +++ b/tests/test_enum/bad/quick_pattern_4.catala_en @@ -25,21 +25,21 @@ Error during typechecking, incompatible types: └─⯈ F Error coming from typechecking the following expression: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.21-17.22: +┌─⯈ quick_pattern_4.catala_en:17.21-17.22: └──┐ 17 │ definition y equals x with pattern Case3 │ ‾ └─ Test Type E coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:12.19-12.20: +┌─⯈ quick_pattern_4.catala_en:12.19-12.20: └──┐ 12 │ context x content E │ ‾ └─ Test Type F coming from expression: -┌─⯈ tests/test_enum/bad/quick_pattern_4.catala_en:17.21-17.41: +┌─⯈ quick_pattern_4.catala_en:17.21-17.41: └──┐ 17 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/quick_pattern_fail.catala_en b/tests/test_enum/bad/quick_pattern_fail.catala_en index 67f696b2..e02baf60 100644 --- a/tests/test_enum/bad/quick_pattern_fail.catala_en +++ b/tests/test_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: +┌─⯈ quick_pattern_fail.catala_en:15.38-15.43: └──┐ 15 │ definition y equals x with pattern Case3 │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/too_many_cases.catala_en b/tests/test_enum/bad/too_many_cases.catala_en index b4ea2ec2..62b2372d 100644 --- a/tests/test_enum/bad/too_many_cases.catala_en +++ b/tests/test_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: +┌─⯈ too_many_cases.catala_en:21.8-21.13: └──┐ 21 │ -- Case4 : true │ ‾‾‾‾‾ diff --git a/tests/test_enum/bad/useless_wildcard.catala_en b/tests/test_enum/bad/useless_wildcard.catala_en index 97e5ec9f..5c93be6f 100644 --- a/tests/test_enum/bad/useless_wildcard.catala_en +++ b/tests/test_enum/bad/useless_wildcard.catala_en @@ -21,7 +21,7 @@ scope A: $ catala Interpret -s A [WARNING] Unreachable match case, all constructors of the enumeration E are already specified -┌─⯈ tests/test_enum/bad/useless_wildcard.catala_en:17.5-17.21: +┌─⯈ useless_wildcard.catala_en:17.5-17.21: └──┐ 17 │ -- anything : 31 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_enum/bad/wrong_cons.catala_en b/tests/test_enum/bad/wrong_cons.catala_en index 323fc0cf..c46febfb 100644 --- a/tests/test_enum/bad/wrong_cons.catala_en +++ b/tests/test_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: +┌─⯈ wrong_cons.catala_en:11.23-11.28: └──┐ 11 │ definition e equals Case2 │ ‾‾‾‾‾ diff --git a/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en b/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en index db33ac1b..8d9e884d 100644 --- a/tests/test_exception/bad/ambiguous_unlabeled_exception.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ ambiguous_unlabeled_exception.catala_en:8.14-8.15: └─┐ 8 │ definition x equals 0 │ ‾ diff --git a/tests/test_exception/bad/dangling_exception.catala_en b/tests/test_exception/bad/dangling_exception.catala_en index 1702e1ca..5a8cdd40 100644 --- a/tests/test_exception/bad/dangling_exception.catala_en +++ b/tests/test_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: +┌─⯈ dangling_exception.catala_en:12.13-12.19: └──┐ 12 │ exception base_y │ ‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/exceptions_cycle.catala_en b/tests/test_exception/bad/exceptions_cycle.catala_en index 6fe1f289..c6e2a6ea 100644 --- a/tests/test_exception/bad/exceptions_cycle.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ exceptions_cycle.catala_en:16.3-18.15: └──┐ 16 │ label exception_exception_x │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/missing_unlabeled_definition.catala_en b/tests/test_exception/bad/missing_unlabeled_definition.catala_en index 809417b8..a491d56d 100644 --- a/tests/test_exception/bad/missing_unlabeled_definition.catala_en +++ b/tests/test_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: +┌─⯈ missing_unlabeled_definition.catala_en:8.3-9.15: └─┐ 8 │ exception │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/one_ambiguous_exception.catala_en b/tests/test_exception/bad/one_ambiguous_exception.catala_en index 26e6b0d7..c9b0045f 100644 --- a/tests/test_exception/bad/one_ambiguous_exception.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ one_ambiguous_exception.catala_en:14.14-14.15: └──┐ 14 │ definition y equals 2 │ ‾ diff --git a/tests/test_exception/bad/self_exception.catala_en b/tests/test_exception/bad/self_exception.catala_en index 4f3237f0..d3bd9a58 100644 --- a/tests/test_exception/bad/self_exception.catala_en +++ b/tests/test_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: +┌─⯈ self_exception.catala_en:9.13-9.19: └─┐ 9 │ exception base_y │ ‾‾‾‾‾‾ diff --git a/tests/test_exception/bad/two_exceptions.catala_en b/tests/test_exception/bad/two_exceptions.catala_en index 6ad1a93f..8efceda5 100644 --- a/tests/test_exception/bad/two_exceptions.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ two_exceptions.catala_en:15.23-15.24: └──┐ 15 │ definition x equals 2 │ ‾ diff --git a/tests/test_exception/good/double_definition.catala_en b/tests/test_exception/good/double_definition.catala_en index e59c5016..f1f8ad35 100644 --- a/tests/test_exception/good/double_definition.catala_en +++ b/tests/test_exception/good/double_definition.catala_en @@ -14,13 +14,13 @@ scope Foo: $ catala Scopelang -s Foo [WARNING] These definitions have identical justifications and consequences; is it a mistake? -┌─⯈ tests/test_exception/good/double_definition.catala_en:9.3-9.15: +┌─⯈ 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: +┌─⯈ double_definition.catala_en:8.3-8.15: └─┐ 8 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ @@ -39,13 +39,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: +┌─⯈ 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: +┌─⯈ double_definition.catala_en:8.3-8.15: └─┐ 8 │ definition x equals 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_exception/good/groups_of_exceptions.catala_en b/tests/test_exception/good/groups_of_exceptions.catala_en index 6084643e..323b2606 100644 --- a/tests/test_exception/good/groups_of_exceptions.catala_en +++ b/tests/test_exception/good/groups_of_exceptions.catala_en @@ -50,36 +50,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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ groups_of_exceptions.catala_en:29.3-29.38: └──┐ 29 │ exception intermediate definition x under condition │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_func/bad/bad_func.catala_en b/tests/test_func/bad/bad_func.catala_en index 8df80939..669bc7b8 100644 --- a/tests/test_func/bad/bad_func.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ bad_func.catala_en:15.62-15.67: └──┐ 15 │ definition f of x under condition not b consequence equals x * x │ ‾‾‾‾‾ diff --git a/tests/test_func/bad/param_inconsistency.catala_en b/tests/test_func/bad/param_inconsistency.catala_en index 3b30b92c..eaa08329 100644 --- a/tests/test_func/bad/param_inconsistency.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ param_inconsistency.catala_en:10.20-10.21: └──┐ 10 │ definition f1 of y under condition not cond │ ‾ diff --git a/tests/test_func/bad/param_inconsistency2.catala_en b/tests/test_func/bad/param_inconsistency2.catala_en index 25b97ff8..de42fd26 100644 --- a/tests/test_func/bad/param_inconsistency2.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ param_inconsistency2.catala_en:9.30-9.31: └─┐ 9 │ exception definition f1 of y under condition not cond │ ‾ diff --git a/tests/test_func/bad/param_inconsistency3.catala_en b/tests/test_func/bad/param_inconsistency3.catala_en index 4072b062..be09466f 100644 --- a/tests/test_func/bad/param_inconsistency3.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ param_inconsistency3.catala_en:9.30-9.31: └─┐ 9 │ exception definition f1 of y under condition not cond │ ‾ diff --git a/tests/test_func/bad/recursive.catala_en b/tests/test_func/bad/recursive.catala_en index 8258ae81..54c0a5e0 100644 --- a/tests/test_func/bad/recursive.catala_en +++ b/tests/test_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: +┌─⯈ recursive.catala_en:8.28-8.29: └─┐ 8 │ definition f of x equals f of x + 1 │ ‾ diff --git a/tests/test_func/good/context_func.catala_en b/tests/test_func/good/context_func.catala_en index 467b95b5..9461537a 100644 --- a/tests/test_func/good/context_func.catala_en +++ b/tests/test_func/good/context_func.catala_en @@ -21,21 +21,21 @@ $ catala Scopelang -s B It is impossible to give a definition to a subscope variable not tagged as input or context. Incriminated subscope: -┌─⯈ tests/test_func/good/context_func.catala_en:9.3-9.4: +┌─⯈ context_func.catala_en:9.3-9.4: └─┐ 9 │ a scope A │ ‾ └─ Test Incriminated variable: -┌─⯈ tests/test_func/good/context_func.catala_en:5.10-5.11: +┌─⯈ context_func.catala_en:5.10-5.11: └─┐ 5 │ output f content integer depends on x content integer │ ‾ └─ Test Incriminated subscope variable definition: -┌─⯈ tests/test_func/good/context_func.catala_en:15.3-15.17: +┌─⯈ context_func.catala_en:15.3-15.17: └──┐ 15 │ definition a.f of x under condition b and x > 0 consequence equals x - 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -48,21 +48,21 @@ $ catala Dcalc -s A It is impossible to give a definition to a subscope variable not tagged as input or context. Incriminated subscope: -┌─⯈ tests/test_func/good/context_func.catala_en:9.3-9.4: +┌─⯈ context_func.catala_en:9.3-9.4: └─┐ 9 │ a scope A │ ‾ └─ Test Incriminated variable: -┌─⯈ tests/test_func/good/context_func.catala_en:5.10-5.11: +┌─⯈ context_func.catala_en:5.10-5.11: └─┐ 5 │ output f content integer depends on x content integer │ ‾ └─ Test Incriminated subscope variable definition: -┌─⯈ tests/test_func/good/context_func.catala_en:15.3-15.17: +┌─⯈ context_func.catala_en:15.3-15.17: └──┐ 15 │ definition a.f of x under condition b and x > 0 consequence equals x - 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -75,21 +75,21 @@ $ catala Dcalc -s B It is impossible to give a definition to a subscope variable not tagged as input or context. Incriminated subscope: -┌─⯈ tests/test_func/good/context_func.catala_en:9.3-9.4: +┌─⯈ context_func.catala_en:9.3-9.4: └─┐ 9 │ a scope A │ ‾ └─ Test Incriminated variable: -┌─⯈ tests/test_func/good/context_func.catala_en:5.10-5.11: +┌─⯈ context_func.catala_en:5.10-5.11: └─┐ 5 │ output f content integer depends on x content integer │ ‾ └─ Test Incriminated subscope variable definition: -┌─⯈ tests/test_func/good/context_func.catala_en:15.3-15.17: +┌─⯈ context_func.catala_en:15.3-15.17: └──┐ 15 │ definition a.f of x under condition b and x > 0 consequence equals x - 1 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_io/bad/forgot_input.catala_en b/tests/test_io/bad/forgot_input.catala_en index 75a69a08..6923bf0f 100644 --- a/tests/test_io/bad/forgot_input.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ forgot_input.catala_en:6.9-6.10: └─┐ 6 │ input x content integer │ ‾ diff --git a/tests/test_io/bad/inputing_to_not_input.catala_en b/tests/test_io/bad/inputing_to_not_input.catala_en index f7964339..392aaca4 100644 --- a/tests/test_io/bad/inputing_to_not_input.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ inputing_to_not_input.catala_en:14.3-14.17: └──┐ 14 │ definition a.a equals 0 │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_io/bad/redefining_input.catala_en b/tests/test_io/bad/redefining_input.catala_en index aa469500..6faf8a76 100644 --- a/tests/test_io/bad/redefining_input.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ redefining_input.catala_en:8.3-8.15: └─┐ 8 │ definition a equals 0 │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_io/bad/using_non_output.catala_en b/tests/test_io/bad/using_non_output.catala_en index f624e436..2fb0f916 100644 --- a/tests/test_io/bad/using_non_output.catala_en +++ b/tests/test_io/bad/using_non_output.catala_en @@ -17,7 +17,7 @@ scope B: $ catala Typecheck [WARNING] 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ using_non_output.catala_en:8.3-8.4: └─┐ 8 │ a scope A │ ‾ diff --git a/tests/test_money/bad/no_mingle.catala_en b/tests/test_money/bad/no_mingle.catala_en index f3b5760e..f5eb1af3 100644 --- a/tests/test_money/bad/no_mingle.catala_en +++ b/tests/test_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.26-12.27: +┌─⯈ no_mingle.catala_en:12.26-12.27: └──┐ 12 │ definition z equals (x * y) │ ‾ └─ Article Type money coming from expression: -┌─⯈ tests/test_money/bad/no_mingle.catala_en:5.21-5.26: +┌─⯈ 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: +┌─⯈ no_mingle.catala_en:6.21-6.26: └─┐ 6 │ context y content money │ ‾‾‾‾‾ diff --git a/tests/test_name_resolution/bad/toplevel_defs.catala_en b/tests/test_name_resolution/bad/toplevel_defs.catala_en index 0260932e..a5213d30 100644 --- a/tests/test_name_resolution/bad/toplevel_defs.catala_en +++ b/tests/test_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: +┌─⯈ toplevel_defs.catala_en:11.11-11.23: └──┐ 11 │ equals (output of S1).a │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_name_resolution/good/let_in2.catala_en b/tests/test_name_resolution/good/let_in2.catala_en index 75025f8e..d938bfac 100644 --- a/tests/test_name_resolution/good/let_in2.catala_en +++ b/tests/test_name_resolution/good/let_in2.catala_en @@ -62,9 +62,8 @@ let s (s_in: SIn.t) : S.t = a_))))) with EmptyError -> (raise (NoValueProvided - {filename = "tests/test_name_resolution/good/let_in2.catala_en"; - start_line=5; start_column=18; end_line=5; end_column=19; - law_headings=["Article"]})) in + {filename = "let_in2.catala_en"; start_line=5; start_column=18; + end_line=5; end_column=19; law_headings=["Article"]})) in {S.a = a_} let () = Runtime_ocaml.Runtime.register_module "Let_in2" diff --git a/tests/test_name_resolution/good/toplevel_defs.catala_en b/tests/test_name_resolution/good/toplevel_defs.catala_en index 12ce43f7..31a81ae3 100644 --- a/tests/test_name_resolution/good/toplevel_defs.catala_en +++ b/tests/test_name_resolution/good/toplevel_defs.catala_en @@ -384,7 +384,7 @@ def s2(s2_in:S2In): law_headings=[]), [], temp_a_1, temp_a) except EmptyError: temp_a_2 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="toplevel_defs.catala_en", start_line=37, start_column=10, end_line=37, end_column=11, law_headings=["Test toplevel function defs"])) @@ -404,7 +404,7 @@ def s3(s3_in:S3In): law_headings=[]), [], temp_a_4, temp_a_3) except EmptyError: temp_a_5 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="toplevel_defs.catala_en", start_line=57, start_column=10, end_line=57, end_column=11, law_headings=["Test function def with two args"])) @@ -422,7 +422,7 @@ def s4(s4_in:S4In): law_headings=[]), [], temp_a_7, temp_a_6) except EmptyError: temp_a_8 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="toplevel_defs.catala_en", start_line=80, start_column=10, end_line=80, end_column=11, law_headings=["Test inline defs in toplevel defs"])) @@ -440,7 +440,7 @@ def s(s_in:SIn): law_headings=[]), [], temp_a_10, temp_a_9) except EmptyError: temp_a_11 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="toplevel_defs.catala_en", start_line=7, start_column=10, end_line=7, end_column=11, law_headings=["Test basic toplevel values defs"])) @@ -455,7 +455,7 @@ def s(s_in:SIn): law_headings=[]), [], temp_b_1, temp_b) except EmptyError: temp_b_2 = dead_value - raise NoValueProvided(SourcePosition(filename="tests/test_name_resolution/good/toplevel_defs.catala_en", + raise NoValueProvided(SourcePosition(filename="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_proof/bad/array_length-empty.catala_en b/tests/test_proof/bad/array_length-empty.catala_en index 72066f25..736efca6 100644 --- a/tests/test_proof/bad/array_length-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/array_length-overlap.catala_en index 981b663e..c49a4a56 100644 --- a/tests/test_proof/bad/array_length-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/assert-empty.catala_en index 2fe7b4d9..1460b8c8 100644 --- a/tests/test_proof/bad/assert-empty.catala_en +++ b/tests/test_proof/bad/assert-empty.catala_en @@ -25,7 +25,7 @@ scope Foo: ```catala-test-inline $ catala Proof --disable_counterexamples [WARNING] [Foo.x] This variable might return an empty error: -┌─⯈ tests/test_proof/bad/assert-empty.catala_en:4.11-4.12: +┌─⯈ assert-empty.catala_en:4.11-4.12: └─┐ 4 │ output x content integer │ ‾ diff --git a/tests/test_proof/bad/dates_get_year-empty.catala_en b/tests/test_proof/bad/dates_get_year-empty.catala_en index df86f265..2f94bddd 100644 --- a/tests/test_proof/bad/dates_get_year-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_proof/bad/dates_get_year-overlap.catala_en index dca3c26a..65c84cb9 100644 --- a/tests/test_proof/bad/dates_get_year-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/dates_simple-empty.catala_en index 21c8ee2e..4d7aecc3 100644 --- a/tests/test_proof/bad/dates_simple-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/dates_simple-overlap.catala_en index ad495241..0603ca9d 100644 --- a/tests/test_proof/bad/dates_simple-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/duration-empty.catala_en index ac710b8a..70d9985c 100644 --- a/tests/test_proof/bad/duration-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/duration-overlap.catala_en index e3bad00d..4a84581a 100644 --- a/tests/test_proof/bad/duration-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/enums-empty.catala_en index 81d1ca84..9d522c92 100644 --- a/tests/test_proof/bad/enums-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_proof/bad/enums-nonbool-empty.catala_en index 5e19edb3..b35d1872 100644 --- a/tests/test_proof/bad/enums-nonbool-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_proof/bad/enums-nonbool-overlap.catala_en index abf9f561..e196fcd1 100644 --- a/tests/test_proof/bad/enums-nonbool-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_proof/bad/enums-overlap.catala_en index 89e3ef2f..39090bc1 100644 --- a/tests/test_proof/bad/enums-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_proof/bad/enums_inj-empty.catala_en index b6b2d602..4bd7c2c1 100644 --- a/tests/test_proof/bad/enums_inj-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_proof/bad/enums_inj-overlap.catala_en index 1f6bf5ae..d17db509 100644 --- a/tests/test_proof/bad/enums_inj-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/enums_unit-empty.catala_en index 6a28690c..ad02b33d 100644 --- a/tests/test_proof/bad/enums_unit-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/enums_unit-overlap.catala_en index 6e60e55b..e35dd758 100644 --- a/tests/test_proof/bad/enums_unit-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/let_in_condition-empty.catala_en index 341e041e..b3fe4534 100644 --- a/tests/test_proof/bad/let_in_condition-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/money-empty.catala_en index 5de7fe03..167e0c69 100644 --- a/tests/test_proof/bad/money-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/money-overlap.catala_en index aa60442b..78ca8891 100644 --- a/tests/test_proof/bad/money-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/no_vars-conflict.catala_en index 178a790c..099732da 100644 --- a/tests/test_proof/bad/no_vars-conflict.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/no_vars-empty.catala_en index 6de8f150..c0767b33 100644 --- a/tests/test_proof/bad/no_vars-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/prolala_motivating_example.catala_en index 5ecac7b9..058550fe 100644 --- a/tests/test_proof/bad/prolala_motivating_example.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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/test_proof/bad/rationals-empty.catala_en index 528f013f..3ceba02c 100644 --- a/tests/test_proof/bad/rationals-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/rationals-overlap.catala_en index 3f7a92ec..230c0bca 100644 --- a/tests/test_proof/bad/rationals-overlap.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/sat_solving.catala_en index 7b5ce646..dad43c26 100644 --- a/tests/test_proof/bad/sat_solving.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/structs-empty.catala_en index 4f2b1cc0..2bc98ff6 100644 --- a/tests/test_proof/bad/structs-empty.catala_en +++ b/tests/test_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: +┌─⯈ 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/test_proof/bad/structs-overlap.catala_en index 5bd9d0c4..ef032fea 100644 --- a/tests/test_proof/bad/structs-overlap.catala_en +++ b/tests/test_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: +┌─⯈ structs-overlap.catala_en:13.10-13.11: └──┐ 13 │ output x content integer │ ‾ diff --git a/tests/test_proof/good/enums-arith.catala_en b/tests/test_proof/good/enums-arith.catala_en index 4fe972ee..1641f6b8 100644 --- a/tests/test_proof/good/enums-arith.catala_en +++ b/tests/test_proof/good/enums-arith.catala_en @@ -23,7 +23,7 @@ scope A: $ 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: +┌─⯈ enums-arith.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ diff --git a/tests/test_proof/good/enums-nonbool.catala_en b/tests/test_proof/good/enums-nonbool.catala_en index 227d7d4e..94a00baf 100644 --- a/tests/test_proof/good/enums-nonbool.catala_en +++ b/tests/test_proof/good/enums-nonbool.catala_en @@ -23,7 +23,7 @@ scope A: $ 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: +┌─⯈ enums-nonbool.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ diff --git a/tests/test_proof/good/enums.catala_en b/tests/test_proof/good/enums.catala_en index dbd08291..243cf17d 100644 --- a/tests/test_proof/good/enums.catala_en +++ b/tests/test_proof/good/enums.catala_en @@ -22,7 +22,7 @@ scope A: $ 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: +┌─⯈ enums.catala_en:5.7-5.8: └─┐ 5 │ -- C content boolean │ ‾ diff --git a/tests/test_scope/bad/cycle_in_scope.catala_en b/tests/test_scope/bad/cycle_in_scope.catala_en index 6e5f847a..f8a5aa0c 100644 --- a/tests/test_scope/bad/cycle_in_scope.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ cycle_in_scope.catala_en:13.32-13.33: └──┐ 13 │ definition z under condition y < 1 consequence equals y │ ‾ diff --git a/tests/test_scope/bad/cyclic_scope_calls.catala_en b/tests/test_scope/bad/cyclic_scope_calls.catala_en index 2d3e1156..e750e574 100644 --- a/tests/test_scope/bad/cyclic_scope_calls.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ cyclic_scope_calls.catala_en:24.24-24.36: └──┐ 24 │ definition o equals (output of S2).o │ ‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_scope/bad/cyclic_scopes.catala_en b/tests/test_scope/bad/cyclic_scopes.catala_en index 3fb3a1c6..08d245b2 100644 --- a/tests/test_scope/bad/cyclic_scopes.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ cyclic_scopes.catala_en:9.3-9.4: └─┐ 9 │ a scope A │ ‾ diff --git a/tests/test_scope/bad/scope.catala_en b/tests/test_scope/bad/scope.catala_en index 61f3dd3f..66f215ca 100644 --- a/tests/test_scope/bad/scope.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ scope.catala_en:14.57-14.58: └──┐ 14 │ definition b under condition not c consequence equals 0 │ ‾ diff --git a/tests/test_scope/bad/scope_call_duplicate.catala_en b/tests/test_scope/bad/scope_call_duplicate.catala_en index 270020cf..9888d931 100644 --- a/tests/test_scope/bad/scope_call_duplicate.catala_en +++ b/tests/test_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: +┌─⯈ scope_call_duplicate.catala_en:14.70-14.73: └──┐ 14 │ definition fizz equals output of Toto with {--bar: 1 --baz: 2.1 -- bar: 3} │ ‾‾‾ diff --git a/tests/test_scope/bad/scope_call_extra.catala_en b/tests/test_scope/bad/scope_call_extra.catala_en index 83417173..de8c7b21 100644 --- a/tests/test_scope/bad/scope_call_extra.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ scope_call_extra.catala_en:2.19-2.23: └─┐ 2 │ declaration scope Toto: │ ‾‾‾‾ diff --git a/tests/test_scope/bad/scope_call_missing.catala_en b/tests/test_scope/bad/scope_call_missing.catala_en index e4d66847..45ecf0f1 100644 --- a/tests/test_scope/bad/scope_call_missing.catala_en +++ b/tests/test_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.56: +┌─⯈ scope_call_missing.catala_en:14.26-14.56: └──┐ 14 │ definition fizz equals output of Toto with {--bar: 1} │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ Declaration of the missing input variable -┌─⯈ tests/test_scope/bad/scope_call_missing.catala_en:4.16-4.19: +┌─⯈ 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/test_scope/bad/sub_vars_in_sub_var.catala_en index d6493c5f..d7fba088 100644 --- a/tests/test_scope/bad/sub_vars_in_sub_var.catala_en +++ b/tests/test_scope/bad/sub_vars_in_sub_var.catala_en @@ -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: +┌─⯈ sub_vars_in_sub_var.catala_en:13.28-13.31: └──┐ 13 │ definition a.y equals if a.x then 0 else 1 │ ‾‾‾ diff --git a/tests/test_scope/good/191_fix_record_name_confusion.catala_en b/tests/test_scope/good/191_fix_record_name_confusion.catala_en index 5f364ed6..01b13f5a 100644 --- a/tests/test_scope/good/191_fix_record_name_confusion.catala_en +++ b/tests/test_scope/good/191_fix_record_name_confusion.catala_en @@ -46,9 +46,8 @@ end let scope_a (scope_a_in: ScopeAIn.t) : ScopeA.t = let a_: bool = try true with EmptyError -> (raise (NoValueProvided - {filename = "tests/test_scope/good/191_fix_record_name_confusion.catala_en"; - start_line=5; start_column=10; end_line=5; end_column=11; - law_headings=["Article"]})) in + {filename = "191_fix_record_name_confusion.catala_en"; start_line=5; + start_column=10; end_line=5; end_column=11; law_headings=["Article"]})) in {ScopeA.a = a_} let scope_b (scope_b_in: ScopeBIn.t) : ScopeB.t = @@ -56,9 +55,8 @@ let scope_b (scope_b_in: ScopeBIn.t) : ScopeB.t = let scope_a_dot_a_: bool = result_.ScopeA.a in let a_: bool = try scope_a_dot_a_ with EmptyError -> (raise (NoValueProvided - {filename = "tests/test_scope/good/191_fix_record_name_confusion.catala_en"; - start_line=8; start_column=10; end_line=8; end_column=11; - law_headings=["Article"]})) in + {filename = "191_fix_record_name_confusion.catala_en"; start_line=8; + start_column=10; end_line=8; end_column=11; law_headings=["Article"]})) in {ScopeB.a = a_} let () = Runtime_ocaml.Runtime.register_module "191_fix_record_name_confusion" diff --git a/tests/test_scope/good/nothing.catala_en b/tests/test_scope/good/nothing.catala_en index 5ab14826..994bfabb 100644 --- a/tests/test_scope/good/nothing.catala_en +++ b/tests/test_scope/good/nothing.catala_en @@ -9,7 +9,7 @@ declaration scope Foo2: $ catala Scalc -s Foo2 -O -t [WARNING] In scope "Foo2", the variable "bar" is declared but never defined; did you forget something? -┌─⯈ tests/test_scope/good/nothing.catala_en:5.10-5.13: +┌─⯈ nothing.catala_en:5.10-5.13: └─┐ 5 │ output bar content integer │ ‾‾‾ diff --git a/tests/test_scope/good/scope_call3.catala_en b/tests/test_scope/good/scope_call3.catala_en index 54dbe234..b0fea5d7 100644 --- a/tests/test_scope/good/scope_call3.catala_en +++ b/tests/test_scope/good/scope_call3.catala_en @@ -20,7 +20,7 @@ scope RentComputation: $ catala Interpret -t -s HousingComputation --debug [DEBUG] Collecting rules... [DEBUG] Reading files... -[DEBUG] Parsing tests/test_scope/good/scope_call3.catala_en +[DEBUG] Parsing scope_call3.catala_en [DEBUG] Name resolution... [DEBUG] Desugaring... [DEBUG] Disambiguating... @@ -31,14 +31,14 @@ $ catala Interpret -t -s HousingComputation --debug [DEBUG] Starting interpretation... [LOG] ≔ HousingComputation.f: [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:8.14-8.20: + ┌─⯈ 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: + ┌─⯈ scope_call3.catala_en:7.14-7.15: └─┐ 7 │ definition f of x equals (output of RentComputation).f of x │ ‾ @@ -47,7 +47,7 @@ $ catala Interpret -t -s HousingComputation --debug [LOG] ≔ RentComputation.g: [LOG] ≔ RentComputation.f: [LOG] ☛ Definition applied: - ┌─⯈ tests/test_scope/good/scope_call3.catala_en:7.29-7.54: + ┌─⯈ scope_call3.catala_en:7.29-7.54: └─┐ 7 │ definition f of x equals (output of RentComputation).f of x │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -56,14 +56,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: + ┌─⯈ 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: + ┌─⯈ 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/test_scope/good/scope_call4.catala_en index 64e11950..54cb6d2e 100644 --- a/tests/test_scope/good/scope_call4.catala_en +++ b/tests/test_scope/good/scope_call4.catala_en @@ -26,7 +26,7 @@ scope RentComputation: $ catala Interpret -s RentComputation --debug [DEBUG] Collecting rules... [DEBUG] Reading files... -[DEBUG] Parsing tests/test_scope/good/scope_call4.catala_en +[DEBUG] Parsing scope_call4.catala_en [DEBUG] Name resolution... [DEBUG] Desugaring... [DEBUG] Disambiguating... @@ -51,7 +51,7 @@ f2 = λ (x: integer) → $ catala Interpret_Lcalc -s RentComputation --avoid_exceptions --optimize --debug [DEBUG] Collecting rules... [DEBUG] Reading files... -[DEBUG] Parsing tests/test_scope/good/scope_call4.catala_en +[DEBUG] Parsing scope_call4.catala_en [DEBUG] Name resolution... [DEBUG] Desugaring... [DEBUG] Disambiguating... diff --git a/tests/test_struct/bad/bug_107.catala_en b/tests/test_struct/bad/bug_107.catala_en index dc6ec813..859ca68a 100644 --- a/tests/test_struct/bad/bug_107.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ bug_107.catala_en:8.23-8.24: └─┐ 8 │ declaration structure S: │ ‾ diff --git a/tests/test_struct/bad/empty_struct.catala_en b/tests/test_struct/bad/empty_struct.catala_en index fba0bd77..9d43f581 100644 --- a/tests/test_struct/bad/empty_struct.catala_en +++ b/tests/test_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: +┌─⯈ empty_struct.catala_en:4.23-4.26: └─┐ 4 │ declaration structure Foo: │ ‾‾‾ diff --git a/tests/test_struct/bad/nested.catala_en b/tests/test_struct/bad/nested.catala_en index 419e68bc..659b5012 100644 --- a/tests/test_struct/bad/nested.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ nested.catala_en:6.18-6.19: └─┐ 6 │ -- Rec content E │ ‾ diff --git a/tests/test_struct/bad/nested2.catala_en b/tests/test_struct/bad/nested2.catala_en index f7b5ac5b..4273e84d 100644 --- a/tests/test_struct/bad/nested2.catala_en +++ b/tests/test_struct/bad/nested2.catala_en @@ -17,21 +17,21 @@ declaration scope A: $ catala Interpret -s A [WARNING] In scope "A", the variable "x" is declared but never defined; did you forget something? -┌─⯈ tests/test_struct/bad/nested2.catala_en:13.10-13.11: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ nested2.catala_en:5.18-5.19: └─┐ 5 │ data x content E │ ‾ diff --git a/tests/test_struct/bad/nonexisting_struct.catala_en b/tests/test_struct/bad/nonexisting_struct.catala_en index f7981c5c..17ddde2a 100644 --- a/tests/test_struct/bad/nonexisting_struct.catala_en +++ b/tests/test_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: +┌─⯈ nonexisting_struct.catala_en:13.25-13.27: └──┐ 13 │ definition y equals x.Fo.f │ ‾‾ diff --git a/tests/test_struct/bad/wrong_qualified_field.catala_en b/tests/test_struct/bad/wrong_qualified_field.catala_en index 712e6574..c51523fa 100644 --- a/tests/test_struct/bad/wrong_qualified_field.catala_en +++ b/tests/test_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: +┌─⯈ wrong_qualified_field.catala_en:17.23-17.30: └──┐ 17 │ definition y equals x.Foo.g │ ‾‾‾‾‾‾‾ diff --git a/tests/test_struct/good/ambiguous_fields.catala_en b/tests/test_struct/good/ambiguous_fields.catala_en index d73190c0..c16207b2 100644 --- a/tests/test_struct/good/ambiguous_fields.catala_en +++ b/tests/test_struct/good/ambiguous_fields.catala_en @@ -20,7 +20,7 @@ scope A: $ catala Interpret -s A [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/ambiguous_fields.catala_en:7.23-7.26: +┌─⯈ ambiguous_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ @@ -32,7 +32,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: +┌─⯈ ambiguous_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ diff --git a/tests/test_struct/good/same_name_fields.catala_en b/tests/test_struct/good/same_name_fields.catala_en index e13a53bc..ff615959 100644 --- a/tests/test_struct/good/same_name_fields.catala_en +++ b/tests/test_struct/good/same_name_fields.catala_en @@ -20,7 +20,7 @@ scope A: $ catala Interpret -s A [WARNING] The structure "Bar" is never used; maybe it's unnecessary? -┌─⯈ tests/test_struct/good/same_name_fields.catala_en:7.23-7.26: +┌─⯈ same_name_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ @@ -33,7 +33,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: +┌─⯈ same_name_fields.catala_en:7.23-7.26: └─┐ 7 │ declaration structure Bar: │ ‾‾‾ diff --git a/tests/test_typing/bad/err1.catala_en b/tests/test_typing/bad/err1.catala_en index 6abf5eaa..45fad72b 100644 --- a/tests/test_typing/bad/err1.catala_en +++ b/tests/test_typing/bad/err1.catala_en @@ -18,19 +18,19 @@ Error during typechecking, incompatible types: └─⯈ integer Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err1.catala_en:7.23-7.26: +┌─⯈ err1.catala_en:7.23-7.26: └─┐ 7 │ Structure { -- i: 4.1 -- e: y }; │ ‾‾‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/err1.catala_en:7.23-7.26: +┌─⯈ err1.catala_en:7.23-7.26: └─┐ 7 │ Structure { -- i: 4.1 -- e: y }; │ ‾‾‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:8.18-8.25: +┌─⯈ ./common.catala_en:8.18-8.25: └─┐ 8 │ data i content integer │ ‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err2.catala_en b/tests/test_typing/bad/err2.catala_en index 0a7d26c1..70f5abf2 100644 --- a/tests/test_typing/bad/err2.catala_en +++ b/tests/test_typing/bad/err2.catala_en @@ -18,19 +18,19 @@ Error during typechecking, incompatible types: └─⯈ collection Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.39-10.42: +┌─⯈ err2.catala_en:10.39-10.42: └──┐ 10 │ definition a equals number of (z ++ 1.1) / 2 │ ‾‾‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.39-10.42: +┌─⯈ err2.catala_en:10.39-10.42: └──┐ 10 │ definition a equals number of (z ++ 1.1) / 2 │ ‾‾‾ Type collection coming from expression: -┌─⯈ tests/test_typing/bad/err2.catala_en:10.36-10.38: +┌─⯈ err2.catala_en:10.36-10.38: └──┐ 10 │ definition a equals number of (z ++ 1.1) / 2 │ ‾‾ diff --git a/tests/test_typing/bad/err3.catala_en b/tests/test_typing/bad/err3.catala_en index da62711e..95a26ef9 100644 --- a/tests/test_typing/bad/err3.catala_en +++ b/tests/test_typing/bad/err3.catala_en @@ -14,7 +14,7 @@ scope S: $ catala Typecheck [WARNING] The constructor "Dec" of enumeration "Enum" is never used; maybe it's unnecessary? -┌─⯈ tests/test_typing/bad/common.catala_en:4.6-4.9: +┌─⯈ ./common.catala_en:4.6-4.9: └─┐ 4 │ -- Dec content decimal │ ‾‾‾ @@ -24,19 +24,19 @@ Error during typechecking, incompatible types: └─⯈ decimal Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: +┌─⯈ err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: +┌─⯈ err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:15.20-15.27: +┌─⯈ ./common.catala_en:15.20-15.27: └──┐ 15 │ output a content decimal │ ‾‾‾‾‾‾‾ @@ -49,7 +49,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: +┌─⯈ ./common.catala_en:4.6-4.9: └─┐ 4 │ -- Dec content decimal │ ‾‾‾ @@ -59,19 +59,19 @@ Error during typechecking, incompatible types: └─⯈ decimal Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: +┌─⯈ err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/err3.catala_en:10.42-10.43: +┌─⯈ err3.catala_en:10.42-10.43: └──┐ 10 │ definition a equals number of (z ++ z) * 2 │ ‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:15.20-15.27: +┌─⯈ ./common.catala_en:15.20-15.27: └──┐ 15 │ output a content decimal │ ‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err4.catala_en b/tests/test_typing/bad/err4.catala_en index 8d64d655..87d4f5a0 100644 --- a/tests/test_typing/bad/err4.catala_en +++ b/tests/test_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: +┌─⯈ ./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: +┌─⯈ ./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: +┌─⯈ ./common.catala_en:5.6-5.9: └─┐ 5 │ -- Dat content date │ ‾‾‾ @@ -34,19 +34,19 @@ Error during typechecking, incompatible types: └─⯈ Structure Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err4.catala_en:5.25-5.38: +┌─⯈ err4.catala_en:5.25-5.38: └─┐ 5 │ definition z equals [ Int content x ] │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ Type Enum coming from expression: -┌─⯈ tests/test_typing/bad/err4.catala_en:5.25-5.38: +┌─⯈ err4.catala_en:5.25-5.38: └─┐ 5 │ definition z equals [ Int content x ] │ ‾‾‾‾‾‾‾‾‾‾‾‾‾ Type Structure coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:14.31-14.40: +┌─⯈ ./common.catala_en:14.31-14.40: └──┐ 14 │ output z content collection Structure │ ‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err5.catala_en b/tests/test_typing/bad/err5.catala_en index c5812a94..6fdacddd 100644 --- a/tests/test_typing/bad/err5.catala_en +++ b/tests/test_typing/bad/err5.catala_en @@ -18,19 +18,19 @@ Error during typechecking, incompatible types: └─⯈ Structure Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err5.catala_en:8.5-8.9: +┌─⯈ err5.catala_en:8.5-8.9: └─┐ 8 │ 1040 │ ‾‾‾‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/err5.catala_en:8.5-8.9: +┌─⯈ err5.catala_en:8.5-8.9: └─┐ 8 │ 1040 │ ‾‾‾‾ Type Structure coming from expression: -┌─⯈ tests/test_typing/bad/err5.catala_en:6.5-6.46: +┌─⯈ err5.catala_en:6.5-6.46: └─┐ 6 │ Structure { -- i: 3 -- e: Int content x }; │ ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ diff --git a/tests/test_typing/bad/err6.catala_en b/tests/test_typing/bad/err6.catala_en index ea82cb4c..2338f121 100644 --- a/tests/test_typing/bad/err6.catala_en +++ b/tests/test_typing/bad/err6.catala_en @@ -34,19 +34,19 @@ Error during typechecking, incompatible types: └─⯈ integer Error coming from typechecking the following expression: -┌─⯈ tests/test_typing/bad/err6.catala_en:20.27-20.30: +┌─⯈ err6.catala_en:20.27-20.30: └──┐ 20 │ definition sub.x equals 44. │ ‾‾‾ Type decimal coming from expression: -┌─⯈ tests/test_typing/bad/err6.catala_en:20.27-20.30: +┌─⯈ err6.catala_en:20.27-20.30: └──┐ 20 │ definition sub.x equals 44. │ ‾‾‾ Type integer coming from expression: -┌─⯈ tests/test_typing/bad/common.catala_en:12.19-12.26: +┌─⯈ ./common.catala_en:12.19-12.26: └──┐ 12 │ input x content integer │ ‾‾‾‾‾‾‾ diff --git a/tests/test_variable_state/bad/def_no_state.catala_en b/tests/test_variable_state/bad/def_no_state.catala_en index 318e92f0..b196adac 100644 --- a/tests/test_variable_state/bad/def_no_state.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_variable_state/bad/double_same_state.catala_en index e4a4aabf..1abb6a71 100644 --- a/tests/test_variable_state/bad/double_same_state.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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/test_variable_state/bad/no_cross_exceptions.catala_en index 3b25e046..c1fb510a 100644 --- a/tests/test_variable_state/bad/no_cross_exceptions.catala_en +++ b/tests/test_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: +┌─⯈ no_cross_exceptions.catala_en:14.13-14.18: └──┐ 14 │ exception thing definition foo state baz under condition true consequence equals 3 │ ‾‾‾‾‾ diff --git a/tests/test_variable_state/bad/self_reference_first_state.catala_en b/tests/test_variable_state/bad/self_reference_first_state.catala_en index b00e2a30..f337277c 100644 --- a/tests/test_variable_state/bad/self_reference_first_state.catala_en +++ b/tests/test_variable_state/bad/self_reference_first_state.catala_en @@ -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: +┌─⯈ self_reference_first_state.catala_en:10.35-10.38: └──┐ 10 │ definition foo state bar equals foo + 1 │ ‾‾‾ diff --git a/tests/test_variable_state/bad/state_cycle.catala_en b/tests/test_variable_state/bad/state_cycle.catala_en index 28546497..bd593e29 100644 --- a/tests/test_variable_state/bad/state_cycle.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ 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: +┌─⯈ state_cycle.catala_en:17.38-17.41: └──┐ 17 │ definition foofoo state bar equals foo │ ‾‾‾ diff --git a/tests/test_variable_state/bad/unknown_state.catala_en b/tests/test_variable_state/bad/unknown_state.catala_en index d8ded016..a7597dcc 100644 --- a/tests/test_variable_state/bad/unknown_state.catala_en +++ b/tests/test_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: +┌─⯈ 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: +┌─⯈ unknown_state.catala_en:5.10-5.13: └─┐ 5 │ output foo content integer │ ‾‾‾