Unify all CLI arguments to use - rather than _

it's more common on UNIXes and the mix was unpleasant.
2024-11-08 07:51:43 +03:00 · 2023-12-05 12:00:15 +01:00 · 2023-12-05 12:00:15 +01:00 · 3779a249db
commit 3779a249db
parent b50db59f50
161 changed files with 372 additions and 372 deletions
--- a/compiler/catala_utils/cli.ml
+++ b/compiler/catala_utils/cli.ml
@ -204,7 +204,7 @@ module Flags = struct
    let message_format =
      value
      & opt (enum message_format_opt) Human
-      & info ["message_format"]
+      & info ["message-format"]
          ~doc:
            "Selects the format of error and warning messages emitted by the \
             compiler. If set to $(i,human), the messages will be nicely \
@ -241,14 +241,14 @@ module Flags = struct
    let disable_warnings =
      value
      & flag
-      & info ["disable_warnings"]
+      & info ["disable-warnings"]
          ~doc:"Disable all the warnings emitted by the compiler."

    let max_prec_digits =
      value
      & opt int 20
      & info
-          ["p"; "max_digits_printed"]
+          ["p"; "max-digits-printed"]
          ~docv:"NUM"
          ~doc:
            "Maximum number of significant digits printed for decimal results."
@ -340,7 +340,7 @@ module Flags = struct
  let check_invariants =
    value
    & flag
-    & info ["check_invariants"] ~doc:"Check structural invariants on the AST."
+    & info ["check-invariants"] ~doc:"Check structural invariants on the AST."

  let no_typing =
    value
@ -356,7 +356,7 @@ module Flags = struct
  let print_only_law =
    value
    & flag
-    & info ["print_only_law"]
+    & info ["print-only-law"]
        ~doc:
          "In literate programming output, skip all code and metadata sections \
           and print only the text of the law."
@ -392,13 +392,13 @@ module Flags = struct
  let avoid_exceptions =
    value
    & flag
-    & info ["avoid_exceptions"]
+    & info ["avoid-exceptions"]
        ~doc:"Compiles the default calculus without exceptions."

  let closure_conversion =
    value
    & flag
-    & info ["closure_conversion"]
+    & info ["closure-conversion"]
        ~doc:
          "Performs closure conversion on the lambda calculus. Implies \
           $(b,--avoid-exceptions)."
@ -407,7 +407,7 @@ module Flags = struct
    value
    & flag
    & info
-        ["disable_counterexamples"]
+        ["disable-counterexamples"]
        ~doc:
          "Disables the search for counterexamples. Useful when you want a \
           deterministic output from the Catala compiler, since provers can \
--- a/compiler/driver.ml
+++ b/compiler/driver.ml
@ -211,7 +211,7 @@ module Passes = struct
          raise
            (Message.raise_internal_error "Some Dcalc invariants are invalid")
      | _ ->
-        Message.raise_error "--check_invariants cannot be used with --no-typing");
+        Message.raise_error "--check-invariants cannot be used with --no-typing");
    prg, type_ordering

  let lcalc
@ -229,12 +229,12 @@ module Passes = struct
    in
    debug_pass_name "lcalc";
    let avoid_exceptions = avoid_exceptions || closure_conversion in
-    (* --closure_conversion implies --avoid_exceptions *)
+    (* --closure-conversion implies --avoid-exceptions *)
    let prg =
      match avoid_exceptions, options.trace, typed with
      | true, true, _ ->
        Message.raise_error
-          "Option --avoid_exceptions is not compatible with option --trace"
+          "Option --avoid-exceptions is not compatible with option --trace"
      | true, _, Untyped _ ->
        Program.untype
          (Lcalc.Compile_without_exceptions.translate_program
--- a/examples/aides_logement/tests/tests_calcul_al_accession_propriete.catala_fr
+++ b/examples/aides_logement/tests/tests_calcul_al_accession_propriete.catala_fr
@ -73,7 +73,7 @@ champ d'application Exemple2:
 ```

 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [29344/29344]
@ -102,7 +102,7 @@ $ catala Interpret -s Exemple1
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 96,48 €
 ```
@ -114,7 +114,7 @@ $ catala Interpret -s Exemple2
 ```

 ```catala-test-inline
-$ catala Interpret_lcalc -s Exemple2 --avoid_exceptions
+$ catala Interpret_lcalc -s Exemple2 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 85,00 €
 ```
--- a/examples/aides_logement/tests/tests_calcul_al_locatif.catala_fr
+++ b/examples/aides_logement/tests/tests_calcul_al_locatif.catala_fr
@ -126,7 +126,7 @@ champ d'application Exemple4 :
 ```

 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [29687/29687]
@ -149,49 +149,49 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple1 --disable_warnings
+$ catala Interpret -s Exemple1 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 345,73 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple2 --disable_warnings
+$ catala Interpret -s Exemple2 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 352,77 €
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 345,73 €
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple2 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 352,77 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple3 --disable_warnings
+$ catala Interpret -s Exemple3 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 339,70 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple4 --disable_warnings
+$ catala Interpret -s Exemple4 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 230,63 €
 ```

 ```catala-test-inline
-$ catala Interpret_lcalc -s Exemple3 --disable_warnings --avoid_exceptions
+$ catala Interpret_lcalc -s Exemple3 --disable-warnings --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 339,70 €
 ```

 ```catala-test-inline
-$ catala Interpret_lcalc -s Exemple4 --disable_warnings --avoid_exceptions
+$ catala Interpret_lcalc -s Exemple4 --disable-warnings --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 230,63 €
 ```
--- a/examples/aides_logement/tests/tests_calcul_al_logement_foyer.catala_fr
+++ b/examples/aides_logement/tests/tests_calcul_al_logement_foyer.catala_fr
@ -32,7 +32,7 @@ champ d'application CasTest1:
 ```

 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [29117/29117]
@ -55,12 +55,12 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala Interpret -s CasTest1 --disable_warnings
+$ catala Interpret -s CasTest1 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 76,38 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s CasTest1 --avoid_exceptions
+$ catala Interpret_Lcalc -s CasTest1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 76,38 €
 ```
--- a/examples/aides_logement/tests/tests_calcul_apl_accession_propriete.catala_fr
+++ b/examples/aides_logement/tests/tests_calcul_apl_accession_propriete.catala_fr
@ -148,46 +148,46 @@ champ d'application Exemple4:
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple1 --disable_warnings
+$ catala Interpret -s Exemple1 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 181,91 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple2 --disable_warnings
+$ catala Interpret -s Exemple2 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 67,34 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple3 --disable_warnings
+$ catala Interpret -s Exemple3 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 181,91 €
 ```


 ```catala-test-inline
-$ catala Interpret -s Exemple4 --disable_warnings
+$ catala Interpret -s Exemple4 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 118,59 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 181,91 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple2 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 67,34 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple3 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple3 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 181,91 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple4 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple4 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 118,59 €
 ```
--- a/examples/aides_logement/tests/tests_calcul_apl_locatif.catala_fr
+++ b/examples/aides_logement/tests/tests_calcul_apl_locatif.catala_fr
@ -279,100 +279,100 @@ champ d'application Exemple9:
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple1 --disable_warnings
+$ catala Interpret -s Exemple1 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 0,00 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple2 --disable_warnings
+$ catala Interpret -s Exemple2 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 352,77 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple3 --disable_warnings
+$ catala Interpret -s Exemple3 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 321,61 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple4 --disable_warnings
+$ catala Interpret -s Exemple4 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 0,00 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple5 --disable_warnings
+$ catala Interpret -s Exemple5 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 311,56 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple6 --disable_warnings
+$ catala Interpret -s Exemple6 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 0,00 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple7 --disable_warnings
+$ catala Interpret -s Exemple7 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 153,77 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple8 --disable_warnings
+$ catala Interpret -s Exemple8 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 11,06 €
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple9 --disable_warnings
+$ catala Interpret -s Exemple9 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 210,06 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 0,00 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple2 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 352,77 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple3 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple3 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 321,61 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple4 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple4 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 0,00 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple5 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple5 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 311,56 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple6 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple6 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 0,00 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple7 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple7 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 153,77 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple8 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple8 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 11,06 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple9 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple9 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 210,06 €
 ```
--- a/examples/aides_logement/tests/tests_calcul_apl_logement_foyer.catala_fr
+++ b/examples/aides_logement/tests/tests_calcul_apl_logement_foyer.catala_fr
@ -137,56 +137,56 @@ champ d'application CasTest5:
 ```

 ```catala-test-inline
-$ catala Interpret -s CasTest1 --disable_warnings
+$ catala Interpret -s CasTest1 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 12,06 €
 ```

 ```catala-test-inline
-$ catala Interpret -s CasTest2 --disable_warnings
+$ catala Interpret -s CasTest2 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 23,12 €
 ```

 ```catala-test-inline
-$ catala Interpret -s CasTest3 --disable_warnings
+$ catala Interpret -s CasTest3 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 154,78 €
 ```

 ```catala-test-inline
-$ catala Interpret -s CasTest4 --disable_warnings
+$ catala Interpret -s CasTest4 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 154,78 €
 ```

 ```catala-test-inline
-$ catala Interpret -s CasTest5 --disable_warnings
+$ catala Interpret -s CasTest5 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] montant = 129,65 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s CasTest1 --avoid_exceptions
+$ catala Interpret_Lcalc -s CasTest1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 12,06 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s CasTest2 --avoid_exceptions
+$ catala Interpret_Lcalc -s CasTest2 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 23,12 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s CasTest3 --avoid_exceptions
+$ catala Interpret_Lcalc -s CasTest3 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 154,78 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s CasTest4 --avoid_exceptions
+$ catala Interpret_Lcalc -s CasTest4 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 154,78 €
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s CasTest5 --avoid_exceptions
+$ catala Interpret_Lcalc -s CasTest5 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant = 129,65 €
 ```
--- a/examples/aides_logement/tests/tests_calculette_globale.catala_fr
+++ b/examples/aides_logement/tests/tests_calculette_globale.catala_fr
@ -162,14 +162,14 @@ $ catala Interpret -s Exemple1
 [RESULT] éligibilité = vrai
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant_versé = 246,23 €
 [RESULT] éligibilité = vrai
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions -O --closure_conversion
+$ catala Interpret_Lcalc -s Exemple1 --avoid-exceptions -O --closure-conversion
 [RESULT] Computation successful! Results:
 [RESULT] montant_versé = 246,23 €
 [RESULT] éligibilité = vrai
@ -183,14 +183,14 @@ $ catala Interpret -s Exemple2
 ```

 ```catala-test-inline
-$ catala Interpret_lcalc -s Exemple2 --avoid_exceptions
+$ catala Interpret_lcalc -s Exemple2 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] montant_versé = 230,63 €
 [RESULT] éligibilité = vrai
 ```

 ```catala-test-inline
-$ catala Interpret_lcalc -s Exemple2 -O --avoid_exceptions --closure_conversion
+$ catala Interpret_lcalc -s Exemple2 -O --avoid-exceptions --closure-conversion
 [RESULT] Computation successful! Results:
 [RESULT] montant_versé = 230,63 €
 [RESULT] éligibilité = vrai
--- a/examples/aides_logement/tests/tests_eligibilite_apl.catala_fr
+++ b/examples/aides_logement/tests/tests_eligibilite_apl.catala_fr
@ -213,39 +213,39 @@ champ d'application Exemple3 :
 ```

 ```catala-test-inline
-$ catala Interpret -s Exemple1 --disable_warnings
+$ catala Interpret -s Exemple1 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] éligible = vrai
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple1 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] éligible = vrai
 ```


 ```catala-test-inline
-$ catala Interpret -s Exemple2 --disable_warnings
+$ catala Interpret -s Exemple2 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] éligible = AllocationLogementFamiliale ()
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple2 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple2 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] éligible = AllocationLogementFamiliale ()
 ```


 ```catala-test-inline
-$ catala Interpret -s Exemple3 --disable_warnings
+$ catala Interpret -s Exemple3 --disable-warnings
 [RESULT] Computation successful! Results:
 [RESULT] éligible = AllocationLogementFamiliale ()
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Exemple3 --avoid_exceptions
+$ catala Interpret_Lcalc -s Exemple3 --avoid-exceptions
 [RESULT] Computation successful! Results:
 [RESULT] éligible = AllocationLogementFamiliale ()
 ```
--- a/examples/aides_logement/tests/tests_invariants.catala_fr
+++ b/examples/aides_logement/tests/tests_invariants.catala_fr
@ -4,7 +4,7 @@
 # Ce fichier est uniquement là pour vérifier que les invariants structurels sont bien garanties par les differences phases de compilation.

 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [28966/28966]
--- a/examples/allocations_familiales/tests/test_invariants.catala_fr
+++ b/examples/allocations_familiales/tests/test_invariants.catala_fr
@ -4,7 +4,7 @@
 # Ce fichier est uniquement là pour vérifier que les invariants structurels sont bien garanties par les differences phases de compilation.

 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [3971/3971]
--- a/examples/allocations_familiales/tests/tests_allocations_familiales.catala_fr
+++ b/examples/allocations_familiales/tests/tests_allocations_familiales.catala_fr
@ -354,127 +354,127 @@ $ catala Typecheck
 ```

 ```catala-test-inline
-$ catala Interpret -s Test1 --disable_warnings
+$ catala Interpret -s Test1 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test2 --disable_warnings
+$ catala Interpret -s Test2 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test3 --disable_warnings
+$ catala Interpret -s Test3 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test4 --disable_warnings
+$ catala Interpret -s Test4 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test5 --disable_warnings
+$ catala Interpret -s Test5 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test6 --disable_warnings
+$ catala Interpret -s Test6 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test7 --disable_warnings
+$ catala Interpret -s Test7 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test8 --disable_warnings
+$ catala Interpret -s Test8 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test9 --disable_warnings
+$ catala Interpret -s Test9 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test10 --disable_warnings
+$ catala Interpret -s Test10 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test11 --disable_warnings
+$ catala Interpret -s Test11 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test12 --disable_warnings
+$ catala Interpret -s Test12 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test13 --disable_warnings
+$ catala Interpret -s Test13 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test13 --disable_warnings
+$ catala Interpret -s Test13 --disable-warnings
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test1 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test2 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test2 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test3 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test3 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test4 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test4 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test5 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test5 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test6 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test6 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test7 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test7 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test8 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test8 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test9 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test9 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test10 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test10 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test11 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test11 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test12 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test12 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test13 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test13 --avoid-exceptions
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test13 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test13 --avoid-exceptions
 [RESULT] Computation successful!
 ```
--- a/examples/allocations_familiales/tests/tests_ouverture_droits.catala_fr
+++ b/examples/allocations_familiales/tests/tests_ouverture_droits.catala_fr
@ -61,10 +61,10 @@ champ d'application Test1:
 ```

 ```catala-test-inline
-$ catala Interpret -s Test1 --disable_warnings
+$ catala Interpret -s Test1 --disable-warnings
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test1 --avoid_exceptions
+$ catala Interpret_Lcalc -s Test1 --avoid-exceptions
 [RESULT] Computation successful!
 ```
--- a/examples/polish_taxes/tests/test_a7_u1_p1.catala_pl
+++ b/examples/polish_taxes/tests/test_a7_u1_p1.catala_pl
@ -23,11 +23,11 @@ zakres Test_A7_U1_P1_PPb:
 ```

 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P1_PPa --disable_warnings
+$ catala Interpret -s Test_A7_U1_P1_PPa --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P1_PPb --disable_warnings
+$ catala Interpret -s Test_A7_U1_P1_PPb --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/polish_taxes/tests/test_a7_u1_p2.catala_pl
+++ b/examples/polish_taxes/tests/test_a7_u1_p2.catala_pl
@ -23,11 +23,11 @@ zakres Test_A7_U1_P2_PPb:
 ```

 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P2_PPa --disable_warnings
+$ catala Interpret -s Test_A7_U1_P2_PPa --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P2_PPb --disable_warnings
+$ catala Interpret -s Test_A7_U1_P2_PPb --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/polish_taxes/tests/test_a7_u1_p3.catala_pl
+++ b/examples/polish_taxes/tests/test_a7_u1_p3.catala_pl
@ -12,6 +12,6 @@ zakres Test_A7_U1_P3:
  asercja sprzedaż.podatek = 1 PLN
 ```
 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P3 --disable_warnings
+$ catala Interpret -s Test_A7_U1_P3 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/polish_taxes/tests/test_a7_u1_p4.catala_pl
+++ b/examples/polish_taxes/tests/test_a7_u1_p4.catala_pl
@ -12,6 +12,6 @@ zakres Test_A7_U1_P4:
  asercja sprzedaż.podatek = 1 PLN
 ```
 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P4 --disable_warnings
+$ catala Interpret -s Test_A7_U1_P4 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/polish_taxes/tests/test_a7_u1_p7.catala_pl
+++ b/examples/polish_taxes/tests/test_a7_u1_p7.catala_pl
@ -12,6 +12,6 @@ zakres Test_A7_U1_P7:
  asercja sprzedaż.podatek = 1 PLN
 ```
 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P7 --disable_warnings
+$ catala Interpret -s Test_A7_U1_P7 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/polish_taxes/tests/test_a7_u1_p9.catala_pl
+++ b/examples/polish_taxes/tests/test_a7_u1_p9.catala_pl
@ -12,6 +12,6 @@ zakres Test_A7_U1_P9:
  asercja sprzedaż.podatek = 5 PLN
 ```
 ```catala-test-inline
-$ catala Interpret -s Test_A7_U1_P9 --disable_warnings
+$ catala Interpret -s Test_A7_U1_P9 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/prestations_familiales/tests/tests_ouverture_droits.catala_fr
+++ b/examples/prestations_familiales/tests/tests_ouverture_droits.catala_fr
@ -53,6 +53,6 @@ champ d'application Test1:
 ```

 ```catala-test-inline
-$ catala Interpret -s Test1 --disable_warnings
+$ catala Interpret -s Test1 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/tutorial_en/tests/test_tutorial.catala_en
+++ b/examples/tutorial_en/tests/test_tutorial.catala_en
@ -29,11 +29,11 @@ scope UnitTest2:
 ```

 ```catala-test-inline
-$ catala Interpret -s UnitTest1 --disable_warnings
+$ catala Interpret -s UnitTest1 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s UnitTest2 --disable_warnings
+$ catala Interpret -s UnitTest2 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/tutoriel_fr/tests/test_tutoriel.catala_fr
+++ b/examples/tutoriel_fr/tests/test_tutoriel.catala_fr
@ -29,11 +29,11 @@ champ d'application TestUnitaire2:
 ```

 ```catala-test-inline
-$ catala Interpret -s TestUnitaire1 --disable_warnings
+$ catala Interpret -s TestUnitaire1 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s TestUnitaire2 --disable_warnings
+$ catala Interpret -s TestUnitaire2 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/examples/us_tax_code/tests/test_section_121.catala_en
+++ b/examples/us_tax_code/tests/test_section_121.catala_en
@ -146,31 +146,31 @@ scope Test6:
 ```

 ```catala-test-inline
-$ catala Interpret -s Test1 --disable_warnings
+$ catala Interpret -s Test1 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test2 --disable_warnings
+$ catala Interpret -s Test2 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test3 --disable_warnings
+$ catala Interpret -s Test3 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test4 --disable_warnings
+$ catala Interpret -s Test4 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test5 --disable_warnings
+$ catala Interpret -s Test5 --disable-warnings
 [RESULT] Computation successful!
 ```

 ```catala-test-inline
-$ catala Interpret -s Test6 --disable_warnings
+$ catala Interpret -s Test6 --disable-warnings
 [RESULT] Computation successful!
 ```
--- a/tests/test_arithmetic/good/priorities.catala_en
+++ b/tests/test_arithmetic/good/priorities.catala_en
@ -15,7 +15,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [75/75]
@ -46,7 +46,7 @@ $ catala Interpret -s A
 [RESULT] z = 390.0
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] w = 0
 [RESULT] x = 4
--- a/tests/test_arithmetic/good/trivial.catala_en
+++ b/tests/test_arithmetic/good/trivial.catala_en
@ -9,7 +9,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [16/16]
--- a/tests/test_array/good/aggregation.catala_en
+++ b/tests/test_array/good/aggregation.catala_en
@ -26,7 +26,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [121/121]
@ -63,12 +63,12 @@ $ catala Interpret -s B
 [RESULT] z = 1
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = [$0.00; $9.00; $5.20]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] max = $18.00
 [RESULT] min = $5.00
--- a/tests/test_array/good/aggregation_2.catala_en
+++ b/tests/test_array/good/aggregation_2.catala_en
@ -32,7 +32,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [115/115]
@ -72,7 +72,7 @@ $ catala Interpret -s B
 [RESULT] argmin = S { -- id: 0 -- income: $0.00 }
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT]
 x =
@ -82,7 +82,7 @@ x =
  ]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] argmax = S { -- id: 1 -- income: $9.00 }
 [RESULT] argmin = S { -- id: 0 -- income: $0.00 }
--- a/tests/test_array/good/aggregation_3.catala_en
+++ b/tests/test_array/good/aggregation_3.catala_en
@ -34,7 +34,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [225/225]
--- a/tests/test_array/good/concatenation.catala_en
+++ b/tests/test_array/good/concatenation.catala_en
@ -13,7 +13,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [39/39]
@ -42,7 +42,7 @@ $ catala Interpret -s A
 [RESULT] y = [0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = [0; 1; 2; 3; 4; 5; 6]
 [RESULT] y = [0; 1; 2; 3; 4; 5; 6; 7; 8; 9; 10]
--- a/tests/test_array/good/filter.catala_en
+++ b/tests/test_array/good/filter.catala_en
@ -19,7 +19,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [41/41]
@ -48,7 +48,7 @@ $ catala Interpret -s A
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = [$0.00; $9.00; $5.20]
 ```
@ -62,7 +62,7 @@ $ catala Interpret -s B
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] y = [$9.00; $5.20]
 ```
--- a/tests/test_array/good/filter_map.catala_en
+++ b/tests/test_array/good/filter_map.catala_en
@ -20,7 +20,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [57/57]
@ -55,12 +55,12 @@ $ catala Interpret -s B
 [RESULT] z = [false; true; true]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = [$0.00; $9.00; $5.20]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] y = [$9.00; $5.20]
 [RESULT] z = [false; true; true]
--- a/tests/test_array/good/fold.catala_en
+++ b/tests/test_array/good/fold.catala_en
@ -32,7 +32,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [115/115]
@ -72,7 +72,7 @@ $ catala Interpret -s B
 [RESULT] argmin = S { -- id: 0 -- income: $0.00 }
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT]
 x =
@ -82,7 +82,7 @@ x =
  ]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] argmax = S { -- id: 1 -- income: $9.00 }
 [RESULT] argmin = S { -- id: 0 -- income: $0.00 }
--- a/tests/test_array/good/map.catala_en
+++ b/tests/test_array/good/map.catala_en
@ -13,7 +13,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [28/28]
@ -43,7 +43,7 @@ $ catala Interpret -s B
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = [$4.00; $8.00]
 [RESULT] z = [false; true]
--- a/tests/test_array/good/simple.catala_en
+++ b/tests/test_array/good/simple.catala_en
@ -24,7 +24,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [96/96]
@ -61,12 +61,12 @@ $ catala Interpret -s B
 [RESULT] z = false
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = [0; 9; 64]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] v = 3
 [RESULT] w = true
--- a/tests/test_array/good/simpler.catala_en
+++ b/tests/test_array/good/simpler.catala_en
@ -13,7 +13,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [39/39]
@ -43,7 +43,7 @@ $ catala Interpret -s A
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] w = false
 [RESULT] x = [0; 9; 64]
--- a/tests/test_array/good/simplest.catala_en
+++ b/tests/test_array/good/simplest.catala_en
@ -11,7 +11,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [13/13]
@ -40,7 +40,7 @@ $ catala Interpret -s A
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = [0; 4; 8]
 ```
--- a/tests/test_bool/good/test_bool.catala_en
+++ b/tests/test_bool/good/test_bool.catala_en
@ -14,7 +14,7 @@ scope TestBool:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [47/47]
@ -80,7 +80,7 @@ let scope TestBool (foo: ⟨bool⟩|context|output) (bar: ⟨integer⟩|context|
    error_empty ⟨ ⟨bar >= 0 ⊢ ⟨true⟩⟩, ⟨bar < 0 ⊢ ⟨false⟩⟩ | false ⊢ ∅ ⟩
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s TestBool --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s TestBool --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] bar = 1
 [RESULT] foo = true
--- a/tests/test_bool/good/test_precedence.catala_en
+++ b/tests/test_bool/good/test_precedence.catala_en
@ -11,7 +11,7 @@ scope TestBool:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [30/30]
@ -39,7 +39,7 @@ $ catala Interpret -s TestBool
 [RESULT] foo = true
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s TestBool --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s TestBool --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] foo = true
 ```
--- a/tests/test_bool/good/test_xor.catala_en
+++ b/tests/test_bool/good/test_xor.catala_en
@ -17,7 +17,7 @@ scope TestXor:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [85/85]
@ -48,7 +48,7 @@ $ catala Interpret -s TestXor
 [RESULT] t_xor_t = false
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s TestXor --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s TestXor --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] f_xor_f = false
 [RESULT] f_xor_t = true
--- a/tests/test_date/good/durations.catala_en
+++ b/tests/test_date/good/durations.catala_en
@ -26,7 +26,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [85/85]
@ -60,7 +60,7 @@ $ catala Interpret -s A
 [RESULT] z3 = [5937 days]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] m = [11874 days]
 [RESULT] m2 = [6 months]
--- a/tests/test_date/good/rounding_option_en.catala_en
+++ b/tests/test_date/good/rounding_option_en.catala_en
@ -25,7 +25,7 @@ scope Test:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [51/51]
@ -54,7 +54,7 @@ $ catala Interpret -s Test
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s Test --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] r = true
 ```
--- a/tests/test_date/good/rounding_option_fr.catala_fr
+++ b/tests/test_date/good/rounding_option_fr.catala_fr
@ -25,7 +25,7 @@ champ d'application Test:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [51/51]
@ -53,7 +53,7 @@ $ catala Interpret -s Test
 [RESULT] r = vrai
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Test --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s Test --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] r = vrai
 ```
--- a/tests/test_date/good/simple.catala_en
+++ b/tests/test_date/good/simple.catala_en
@ -15,7 +15,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [58/58]
@ -45,7 +45,7 @@ $ catala Interpret -s A
 [RESULT] z = [5937 days]
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 2019-01-01
 [RESULT] y = 2002-09-30
--- a/tests/test_dec/good/infinite_precision.catala_en
+++ b/tests/test_dec/good/infinite_precision.catala_en
@ -17,7 +17,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [96/96]
@ -50,7 +50,7 @@ a =
 [RESULT] z = 654,265,429,805,103,220,650,980,650.5…
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT]
 a =
--- a/tests/test_dec/good/rounding.catala_en
+++ b/tests/test_dec/good/rounding.catala_en
@ -17,7 +17,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [41/41]
@ -48,7 +48,7 @@ $ catala Interpret -s A
 [RESULT] y1 = 4.0
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 84.648,665
 [RESULT] x1 = 85.0
--- a/tests/test_dec/good/simple.catala_en
+++ b/tests/test_dec/good/simple.catala_en
@ -17,7 +17,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [70/70]
@ -48,7 +48,7 @@ $ catala Interpret -s A
 [RESULT] z = 19.377,955,528,206,987,757…
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] k = 0.333,333,333,333,333,333,33…
 [RESULT] x = 84.648,665
--- a/tests/test_dec/good/zero_after_comma.catala_en
+++ b/tests/test_dec/good/zero_after_comma.catala_en
@ -14,7 +14,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [48/48]
@ -43,7 +43,7 @@ $ catala Interpret -s A
 [RESULT] y = 1.04
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 4.0
 [RESULT] y = 1.04
--- a/tests/test_default/good/mutliple_definitions.catala_en
+++ b/tests/test_default/good/mutliple_definitions.catala_en
@ -12,7 +12,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [WARNING] These definitions have identical justifications and consequences; is it a mistake?

 ┌─⯈ tests/test_default/good/mutliple_definitions.catala_en:9.3-9.15:
--- a/tests/test_enum/good/disambiguated_cases.catala_en
+++ b/tests/test_enum/good/disambiguated_cases.catala_en
@ -24,7 +24,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [62/62]
@ -54,7 +54,7 @@ $ catala Interpret -s A
 [RESULT] x = 2
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] e = Case1 ()
 [RESULT] f = Case1 2
--- a/tests/test_enum/good/quick_pattern_check.catala_en
+++ b/tests/test_enum/good/quick_pattern_check.catala_en
@ -19,7 +19,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [66/66]
@ -49,7 +49,7 @@ $ catala Interpret -s A
 [RESULT] z = false
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = Case1 2
 [RESULT] y = true
--- a/tests/test_enum/good/simple.catala_en
+++ b/tests/test_enum/good/simple.catala_en
@ -19,7 +19,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [43/43]
@ -48,7 +48,7 @@ $ catala Interpret -s A
 [RESULT] y = 42
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = Case1 2
 [RESULT] y = 42
--- a/tests/test_enum/good/wildcard.catala_en
+++ b/tests/test_enum/good/wildcard.catala_en
@ -39,7 +39,7 @@ scope Simple_case_2:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [90/90]
@ -75,13 +75,13 @@ $ catala Interpret -s Simple_case
 [RESULT] y = 31
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Simple_case_2 --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s Simple_case_2 --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = Case3 ()
 [RESULT] y = 31
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Simple_case --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s Simple_case --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = Case1 2
 [RESULT] y = 31
--- a/tests/test_exception/good/context_with_default.catala_en
+++ b/tests/test_exception/good/context_with_default.catala_en
@ -18,7 +18,7 @@ scope Bar:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [48/48]
@ -45,6 +45,6 @@ $ catala Interpret -s Bar
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Bar --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s Bar --avoid-exceptions --optimize
 [RESULT] Computation successful!
 ```
--- a/tests/test_exception/good/double_definition.catala_en
+++ b/tests/test_exception/good/double_definition.catala_en
@ -13,7 +13,7 @@ scope Foo:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [WARNING] These definitions have identical justifications and consequences; is it a mistake?

 ┌─⯈ tests/test_exception/good/double_definition.catala_en:9.3-9.15:
--- a/tests/test_exception/good/duplicate_labels.catala_en
+++ b/tests/test_exception/good/duplicate_labels.catala_en
@ -21,7 +21,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [59/59]
@ -50,7 +50,7 @@ $ catala Interpret -s A
 [RESULT] y = 0
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 0
 [RESULT] y = 0
--- a/tests/test_exception/good/exception.catala_en
+++ b/tests/test_exception/good/exception.catala_en
@ -15,7 +15,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [28/28]
@ -43,7 +43,7 @@ $ catala Interpret -s A
 [RESULT] x = 1
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 1
 ```
--- a/tests/test_exception/good/exceptions_squared.catala_en
+++ b/tests/test_exception/good/exceptions_squared.catala_en
@ -19,7 +19,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [37/37]
@ -47,7 +47,7 @@ $ catala Interpret -s A
 [RESULT] x = 2
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 2
 ```
--- a/tests/test_exception/good/grouped_exceptions.catala_en
+++ b/tests/test_exception/good/grouped_exceptions.catala_en
@ -49,7 +49,7 @@ scope Benefit:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [61/61]
@ -78,7 +78,7 @@ $ catala Interpret -s Benefit
 [RESULT] person = Person { -- age: 26 -- disabled: true }
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s Benefit --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s Benefit --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] benefit = $2,000.00
 [RESULT] person = Person { -- age: 26 -- disabled: true }
--- a/tests/test_exception/good/groups_of_exceptions.catala_en
+++ b/tests/test_exception/good/groups_of_exceptions.catala_en
@ -43,7 +43,7 @@ scope Test:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [84/84]
--- a/tests/test_exception/good/same_label_two_variables.catala_en
+++ b/tests/test_exception/good/same_label_two_variables.catala_en
@ -22,7 +22,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [67/67]
@ -52,7 +52,7 @@ $ catala Interpret -s A
 [RESULT] z = 0
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 0
 [RESULT] y = 1
--- a/tests/test_exception/good/split_unlabeled_exception.catala_en
+++ b/tests/test_exception/good/split_unlabeled_exception.catala_en
@ -17,7 +17,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [28/28]
@ -45,7 +45,7 @@ $ catala Interpret -s A
 [RESULT] x = 1
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 1
 ```
--- a/tests/test_exception/good/two_exceptions_same_outcome.catala_en
+++ b/tests/test_exception/good/two_exceptions_same_outcome.catala_en
@ -23,7 +23,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [45/45]
@ -51,7 +51,7 @@ $ catala Interpret -s A
 [RESULT] x = 0
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 0
 ```
--- a/tests/test_exception/good/two_unlabeled_exceptions.catala_en
+++ b/tests/test_exception/good/two_unlabeled_exceptions.catala_en
@ -20,7 +20,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [55/55]
@ -49,7 +49,7 @@ $ catala Interpret -s A
 [RESULT] y = 3
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 1
 [RESULT] y = 3
--- a/tests/test_exception/good/unlabeled_exception.catala_en
+++ b/tests/test_exception/good/unlabeled_exception.catala_en
@ -14,7 +14,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [28/28]
@ -42,7 +42,7 @@ $ catala Interpret -s A
 [RESULT] x = 1
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 1
 ```
--- a/tests/test_exception/good/unsorted_unlabeled_exceptions.catala_en
+++ b/tests/test_exception/good/unsorted_unlabeled_exceptions.catala_en
@ -20,7 +20,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [55/55]
@ -49,7 +49,7 @@ $ catala Interpret -s A
 [RESULT] y = 2
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = 1
 [RESULT] y = 2
--- a/tests/test_func/good/closure_conversion.catala_en
+++ b/tests/test_func/good/closure_conversion.catala_en
@ -14,7 +14,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [28/28]
@ -37,7 +37,7 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala Lcalc --avoid_exceptions -O --closure_conversion
+$ catala Lcalc --avoid-exceptions -O --closure-conversion


 type S_in = { x_in: bool; }
--- a/tests/test_func/good/closure_conversion_reduce.catala_en
+++ b/tests/test_func/good/closure_conversion_reduce.catala_en
@ -14,7 +14,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [29/29]
@ -37,7 +37,7 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala Lcalc -s S --avoid_exceptions -O --closure_conversion
+$ catala Lcalc -s S --avoid-exceptions -O --closure-conversion
 let scope S (S_in: S_in {x_in: collection integer}): S {y: integer} =
  let get x : collection integer = S_in.x_in in
  let set y : integer =
@ -61,17 +61,17 @@ let scope S (S_in: S_in {x_in: collection integer}): S {y: integer} =
 ```

 The next test of closure conversion should give the same results, it checks that
-`--avoid_exceptions` and `-O` are correctly implied by `--closure_conversion`
+`--avoid-exceptions` and `-O` are correctly implied by `--closure-conversion`
 The detection of closures that should not be converted because they are arguments
 to reduce or other special operators relies on pattern matching the special
 operator and its EAbs argument. However without exceptions on, because the
--avoid_exceptions pass is not optimized and produces more options than needed,
+--avoid-exceptions pass is not optimized and produces more options than needed,
 the closures that are arguments to special operators are let-binded with an
 option. This let-binding is reduced by partial evaluation, which is why the test
 with optimizations on passes.

 ```catala-test-inline
-$ catala Lcalc -s S --closure_conversion
+$ catala Lcalc -s S --closure-conversion
 let scope S (S_in: S_in {x_in: collection integer}): S {y: integer} =
  let get x : collection integer = S_in.x_in in
  let set y : integer =
--- a/tests/test_func/good/closure_return.catala_en
+++ b/tests/test_func/good/closure_return.catala_en
@ -12,7 +12,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [18/18]
@ -35,7 +35,7 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala Lcalc --avoid_exceptions -O --closure_conversion
+$ catala Lcalc --avoid-exceptions -O --closure-conversion


 type S_in = { x_in: bool; }
--- a/tests/test_func/good/closure_through_scope.catala_en
+++ b/tests/test_func/good/closure_through_scope.catala_en
@ -20,7 +20,7 @@ scope T:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [44/44]
@ -43,7 +43,7 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala Lcalc -s T --avoid_exceptions -O --closure_conversion
+$ catala Lcalc -s T --avoid-exceptions -O --closure-conversion
 let scope T (T_in: T_in): T {y: integer} =
  let sub_set s.x : bool =
    match
@ -79,7 +79,7 @@ let scope T (T_in: T_in): T {y: integer} =
 ```

 ```catala-test-inline
-$ catala Interpret_lcalc -s T --avoid_exceptions -O --closure_conversion
+$ catala Interpret_lcalc -s T --avoid-exceptions -O --closure-conversion
 [RESULT] Computation successful! Results:
 [RESULT] y = -2
 ```
--- a/tests/test_func/good/context_func.catala_en
+++ b/tests/test_func/good/context_func.catala_en
@ -18,7 +18,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [49/49]
--- a/tests/test_func/good/func.catala_en
+++ b/tests/test_func/good/func.catala_en
@ -24,7 +24,7 @@ scope R:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [116/116]
@ -52,7 +52,7 @@ $ catala Interpret -s R
 [RESULT] r = 30
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s R --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s R --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] r = 30
 ```
--- a/tests/test_func/good/param_consistency.catala_en
+++ b/tests/test_func/good/param_consistency.catala_en
@ -15,7 +15,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [37/37]
--- a/tests/test_func/good/scope_call_func_struct_closure.catala_en
+++ b/tests/test_func/good/scope_call_func_struct_closure.catala_en
@ -43,7 +43,7 @@ two closures in Foo.r are different even with optimizations enabled.


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [133/133]
@ -66,7 +66,7 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala Lcalc --avoid_exceptions -O --closure_conversion 
+$ catala Lcalc --avoid-exceptions -O --closure-conversion 


 type Result = {
@ -233,7 +233,7 @@ let scope Foo
 ```

 ```catala-test-inline
-$ catala Interpret_lcalc -s Foo --avoid_exceptions -O --closure_conversion
+$ catala Interpret_lcalc -s Foo --avoid-exceptions -O --closure-conversion
 [RESULT] Computation successful! Results:
 [RESULT] z = 11
 ```
--- a/tests/test_io/good/all_io.catala_en
+++ b/tests/test_io/good/all_io.catala_en
@ -20,7 +20,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [73/73]
--- a/tests/test_io/good/condition_only_input.catala_en
+++ b/tests/test_io/good/condition_only_input.catala_en
@ -17,7 +17,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [35/35]
@ -54,6 +54,6 @@ $ catala Interpret -s B
 [RESULT] Computation successful!
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s B --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s B --avoid-exceptions --optimize
 [RESULT] Computation successful!
 ```
--- a/tests/test_io/good/subscope.catala_en
+++ b/tests/test_io/good/subscope.catala_en
@ -23,7 +23,7 @@ scope B:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [66/66]
--- a/tests/test_literate/good/test_grave_char_en.catala_en
+++ b/tests/test_literate/good/test_grave_char_en.catala_en
@ -30,7 +30,7 @@ int main(void) { return 0; }


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [19/19]
@ -70,17 +70,17 @@ $ catala Interpret -s A
 [RESULT] literate_parsing_is_ok = true
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] literate_parsing_is_ok = true
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] literate_parsing_is_ok = true
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] literate_parsing_is_ok = true
 ```
--- a/tests/test_literate/good/test_grave_char_fr.catala_fr
+++ b/tests/test_literate/good/test_grave_char_fr.catala_fr
@ -30,7 +30,7 @@ int main(void) { return 0; }


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [19/19]
--- a/tests/test_metadata/good/test_markup_refactoring.catala_en
+++ b/tests/test_metadata/good/test_markup_refactoring.catala_en
@ -31,7 +31,7 @@ scope S2:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [40/40]
@ -65,12 +65,12 @@ $ catala Interpret -s S
 [RESULT] a = A ()
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S2 --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S2 --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] b = B ()
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = A ()
 ```
--- a/tests/test_modules/good/mod_def.catala_en
+++ b/tests/test_modules/good/mod_def.catala_en
@ -30,7 +30,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [25/25]
@ -53,10 +53,10 @@ Invariant Dcalc__Invariants.invariant_default_no_arrow
 ```

 ```catala-test-inline
-$ catala typecheck --disable_warnings
+$ catala typecheck --disable-warnings
 [RESULT] Typechecking successful!
 ```

 ```catala-test { id="ml" }
-$ catala ocaml --disable_warnings -o -
+$ catala ocaml --disable-warnings -o -
 ```
--- a/tests/test_modules/good/mod_def_context.catala_en
+++ b/tests/test_modules/good/mod_def_context.catala_en
@ -59,7 +59,7 @@ scope Stest:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [210/210]
--- a/tests/test_modules/good/mod_middle.catala_en
+++ b/tests/test_modules/good/mod_middle.catala_en
@ -20,7 +20,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [70/70]
--- a/tests/test_modules/good/mod_use.catala_en
+++ b/tests/test_modules/good/mod_use.catala_en
@ -26,7 +26,7 @@ scope T2:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [79/79]
--- a/tests/test_modules/good/mod_use2.catala_en
+++ b/tests/test_modules/good/mod_use2.catala_en
@ -18,7 +18,7 @@ scope T:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [49/49]
--- a/tests/test_modules/good/mod_use3.catala_en
+++ b/tests/test_modules/good/mod_use3.catala_en
@ -22,7 +22,7 @@ scope T:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [49/49]
--- a/tests/test_modules/good/mod_use_context.catala_en
+++ b/tests/test_modules/good/mod_use_context.catala_en
@ -43,7 +43,7 @@ scope TestCall:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [148/148]
--- a/tests/test_money/good/literal_parsing.catala_en
+++ b/tests/test_money/good/literal_parsing.catala_en
@ -14,7 +14,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [27/27]
@ -43,7 +43,7 @@ $ catala Interpret -s A
 [RESULT] y = $0.30
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = $0.30
 [RESULT] y = $0.30
--- a/tests/test_money/good/simple.catala_en
+++ b/tests/test_money/good/simple.catala_en
@ -15,7 +15,7 @@ scope A:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [64/64]
@ -45,7 +45,7 @@ $ catala Interpret -s A
 [RESULT] z = $7.23
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s A --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s A --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] x = $123.54
 [RESULT] y = $8,548,650.96
--- a/tests/test_name_resolution/good/let_in.catala_en
+++ b/tests/test_name_resolution/good/let_in.catala_en
@ -28,7 +28,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [64/64]
@ -76,13 +76,13 @@ $ catala Interpret -s S2
 [RESULT] y = 1
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = A { -- x: -2.0 -- y: B { -- y: false -- z: -1.0 } }
 [RESULT] b = B { -- y: true -- z: 42.0 }
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S2 --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S2 --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] y = 1
 ```
--- a/tests/test_name_resolution/good/let_in2.catala_en
+++ b/tests/test_name_resolution/good/let_in2.catala_en
@ -16,7 +16,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [28/28]
@ -45,7 +45,7 @@ $ catala Interpret -s S
 ```

 ```catala-test-inline
-$ catala Interpret_Lcalc -s S --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = true
 ```
--- a/tests/test_name_resolution/good/out_of_order.catala_en
+++ b/tests/test_name_resolution/good/out_of_order.catala_en
@ -21,7 +21,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [41/41]
@ -50,7 +50,7 @@ $ catala Interpret -s S
 [RESULT] b = B { -- y: true -- z: 0.0 }
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = A { -- x: 0 -- y: B { -- y: true -- z: 0.0 } }
 [RESULT] b = B { -- y: true -- z: 0.0 }
--- a/tests/test_name_resolution/good/toplevel_defs.catala_en
+++ b/tests/test_name_resolution/good/toplevel_defs.catala_en
@ -22,7 +22,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [32/32]
@ -578,23 +578,23 @@ def s(s_in:SIn):
    return S(a = a_3, b = b)
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = 1,946.574,4
 [RESULT] b = A { -- y: true -- z: 2,091.0 }
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S2 --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S2 --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = 154.0
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S3 --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S3 --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = 2,480.0
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S4 --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S4 --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = 6,001.0
 ```
--- a/tests/test_name_resolution/good/toplevel_defs_simple.catala_en
+++ b/tests/test_name_resolution/good/toplevel_defs_simple.catala_en
@ -13,7 +13,7 @@ scope S:


 ```catala-test-inline
-$ catala Typecheck --check_invariants
+$ catala Typecheck --check-invariants
 [RESULT]
 Invariant Dcalc__Invariants.invariant_typing_defaults
   checked. result: [14/14]
@ -41,7 +41,7 @@ $ catala Interpret -s S
 [RESULT] a = true
 ```
 ```catala-test-inline
-$ catala Interpret_Lcalc -s S --avoid_exceptions --optimize
+$ catala Interpret_Lcalc -s S --avoid-exceptions --optimize
 [RESULT] Computation successful! Results:
 [RESULT] a = true
 ```
--- a/tests/test_proof/bad/array_length-empty.catala_en
+++ b/tests/test_proof/bad/array_length-empty.catala_en
@ -11,7 +11,7 @@ scope A:
 ```

 ```catala-test-inline
-$ catala Proof --disable_counterexamples 
+$ 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:
 └─┐
--- a/tests/test_proof/bad/array_length-overlap.catala_en
+++ b/tests/test_proof/bad/array_length-overlap.catala_en
@ -12,7 +12,7 @@ scope A:
 ```

 ```catala-test-inline
-$ catala Proof --disable_counterexamples 
+$ 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:
 └─┐
--- a/tests/test_proof/bad/assert-empty.catala_en
+++ b/tests/test_proof/bad/assert-empty.catala_en
@ -23,7 +23,7 @@ scope Foo:
 ```

 ```catala-test-inline
-$ catala Proof --disable_counterexamples
+$ 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:
 └─┐
--- a/tests/test_proof/bad/dates_get_year-empty.catala_en
+++ b/tests/test_proof/bad/dates_get_year-empty.catala_en
@ -14,7 +14,7 @@ scope A:
 ```

 ```catala-test-inline
-$ catala Proof --disable_counterexamples 
+$ catala Proof --disable-counterexamples 
 [ERROR]
 It is impossible to give a definition to a scope variable tagged as input.

--- a/tests/test_proof/bad/dates_get_year-overlap.catala_en
+++ b/tests/test_proof/bad/dates_get_year-overlap.catala_en
@ -14,7 +14,7 @@ scope A:
 ```

 ```catala-test-inline
-$ catala Proof --disable_counterexamples 
+$ 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:
 └─┐
--- a/tests/test_proof/bad/dates_simple-empty.catala_en
+++ b/tests/test_proof/bad/dates_simple-empty.catala_en
@ -13,7 +13,7 @@ scope A:
 ```

 ```catala-test-inline
-$ catala Proof --disable_counterexamples 
+$ 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:
 └─┐
--- a/Show More
+++ b/Show More