mirror of
https://github.com/CatalaLang/catala.git
synced 2024-09-19 16:28:12 +03:00
Merge branch 'master' into altgr_allmarks
This commit is contained in:
Denis Merigoux
commit
e5963e5381
@ -95,7 +95,6 @@ let rec beta_expr (_ : unit) (e : 'm expr) : 'm expr Bindlib.box =
|
||||
and+ args = List.map (beta_expr ()) args |> Bindlib.box_list in
|
||||
match Marked.unmark e1 with
|
||||
| EAbs (binder, _ts) ->
|
||||
let (_ : (_, _) Bindlib.mbinder) = binder in
|
||||
Bindlib.msubst binder (List.map fst args |> Array.of_list)
|
||||
| _ -> default_mark @@ EApp (e1, args))
|
||||
| _ -> visitor_map beta_expr () e
|
||||
|
||||
685
french_law/ocaml/law_source/aides_logement.ml
generated
685
french_law/ocaml/law_source/aides_logement.ml
generated
File diff suppressed because it is too large
Load Diff
127
french_law/ocaml/law_source/allocations_familiales.ml
generated
127
french_law/ocaml/law_source/allocations_familiales.ml
generated
@ -3375,39 +3375,7 @@ let allocations_familiales (allocations_familiales_in: AllocationsFamilialesIn.t
|
||||
end_line=134; end_column=31;
|
||||
law_headings=["Allocations familiales";
|
||||
"Champs d'applications";
|
||||
"Prologue"]}
|
||||
([|(fun (_: _) ->
|
||||
handle_default
|
||||
{filename = "examples/allocations_familiales/prologue.catala_fr";
|
||||
start_line=134; start_column=11;
|
||||
end_line=134; end_column=31;
|
||||
law_headings=["Allocations familiales";
|
||||
"Champs d'applications";
|
||||
"Prologue"]} (
|
||||
[||])
|
||||
(fun (_: _) -> (log_decision_taken
|
||||
{filename = "examples/allocations_familiales/securite_sociale_D.catala_fr";
|
||||
start_line=173; start_column=5;
|
||||
end_line=174; end_column=68;
|
||||
law_headings=["Article D521-1";
|
||||
"Chapitre 1er : Allocations familiales";
|
||||
"Titre 2 : Prestations générales d'entretien";
|
||||
"Livre 5 : Prestations familiales et prestations assimilées";
|
||||
"Partie réglementaire - Décrets simples";
|
||||
"Code de la sécurité sociale"]}
|
||||
((ressources_menage_ >$
|
||||
plafond__i_i_d521_3_) &&
|
||||
(ressources_menage_ <=$
|
||||
(plafond__i_i_d521_3_ +$
|
||||
(param_ *$
|
||||
(decimal_of_string "12.")))))))
|
||||
(fun (_: _) ->
|
||||
((plafond__i_i_d521_3_ +$
|
||||
(param_ *$
|
||||
(decimal_of_string "12.")))
|
||||
-$ ressources_menage_) *$
|
||||
((decimal_of_string "1.") /&
|
||||
(decimal_of_string "12."))))|])
|
||||
"Prologue"]} ([||])
|
||||
(fun (_: _) -> (log_decision_taken
|
||||
{filename = "examples/allocations_familiales/securite_sociale_D.catala_fr";
|
||||
start_line=165; start_column=5;
|
||||
@ -3428,6 +3396,36 @@ let allocations_familiales (allocations_familiales_in: AllocationsFamilialesIn.t
|
||||
((plafond__i_d521_3_ +$
|
||||
(param_ *$ (decimal_of_string "12.")))
|
||||
-$ ressources_menage_) *$
|
||||
((decimal_of_string "1.") /&
|
||||
(decimal_of_string "12."))));
|
||||
(fun (_: _) ->
|
||||
handle_default
|
||||
{filename = "examples/allocations_familiales/prologue.catala_fr";
|
||||
start_line=134; start_column=11;
|
||||
end_line=134; end_column=31;
|
||||
law_headings=["Allocations familiales";
|
||||
"Champs d'applications";
|
||||
"Prologue"]} ([||])
|
||||
(fun (_: _) -> (log_decision_taken
|
||||
{filename = "examples/allocations_familiales/securite_sociale_D.catala_fr";
|
||||
start_line=173; start_column=5;
|
||||
end_line=174; end_column=68;
|
||||
law_headings=["Article D521-1";
|
||||
"Chapitre 1er : Allocations familiales";
|
||||
"Titre 2 : Prestations générales d'entretien";
|
||||
"Livre 5 : Prestations familiales et prestations assimilées";
|
||||
"Partie réglementaire - Décrets simples";
|
||||
"Code de la sécurité sociale"]}
|
||||
((ressources_menage_ >$ plafond__i_i_d521_3_)
|
||||
&&
|
||||
(ressources_menage_ <=$
|
||||
(plafond__i_i_d521_3_ +$
|
||||
(param_ *$
|
||||
(decimal_of_string "12.")))))))
|
||||
(fun (_: _) ->
|
||||
((plafond__i_i_d521_3_ +$
|
||||
(param_ *$ (decimal_of_string "12.")))
|
||||
-$ ressources_menage_) *$
|
||||
((decimal_of_string "1.") /&
|
||||
(decimal_of_string "12."))))|])
|
||||
(fun (_: _) -> false) (fun (_: _) -> raise EmptyError))|])
|
||||
@ -4554,38 +4552,7 @@ let allocations_familiales (allocations_familiales_in: AllocationsFamilialesIn.t
|
||||
end_line=136; end_column=52;
|
||||
law_headings=["Allocations familiales";
|
||||
"Champs d'applications";
|
||||
"Prologue"]}
|
||||
([|(fun (_: _) ->
|
||||
handle_default
|
||||
{filename = "examples/allocations_familiales/prologue.catala_fr";
|
||||
start_line=136; start_column=11;
|
||||
end_line=136; end_column=52;
|
||||
law_headings=["Allocations familiales";
|
||||
"Champs d'applications";
|
||||
"Prologue"]} ([||])
|
||||
(fun (_: _) -> (log_decision_taken
|
||||
{filename = "examples/allocations_familiales/securite_sociale_D.catala_fr";
|
||||
start_line=275; start_column=5;
|
||||
end_line=277; end_column=41;
|
||||
law_headings=["Article D521-2";
|
||||
"Chapitre 1er : Allocations familiales";
|
||||
"Titre 2 : Prestations générales d'entretien";
|
||||
"Livre 5 : Prestations familiales et prestations assimilées";
|
||||
"Partie réglementaire - Décrets simples";
|
||||
"Code de la sécurité sociale"]}
|
||||
((ressources_menage_ >$
|
||||
plafond__i_i_d521_3_) &&
|
||||
(ressources_menage_ <=$
|
||||
(plafond__i_i_d521_3_ +$
|
||||
(montant_verse_forfaitaire_ *$
|
||||
(decimal_of_string "12.")))))))
|
||||
(fun (_: _) ->
|
||||
((plafond__i_i_d521_3_ +$
|
||||
(montant_verse_forfaitaire_ *$
|
||||
(decimal_of_string "12."))) -$
|
||||
ressources_menage_) *$
|
||||
((decimal_of_string "1.") /&
|
||||
(decimal_of_string "12."))))|])
|
||||
"Prologue"]} ([||])
|
||||
(fun (_: _) -> (log_decision_taken
|
||||
{filename = "examples/allocations_familiales/securite_sociale_D.catala_fr";
|
||||
start_line=265; start_column=5;
|
||||
@ -4606,6 +4573,36 @@ let allocations_familiales (allocations_familiales_in: AllocationsFamilialesIn.t
|
||||
(montant_verse_forfaitaire_ *$
|
||||
(decimal_of_string "12."))) -$
|
||||
ressources_menage_) *$
|
||||
((decimal_of_string "1.") /&
|
||||
(decimal_of_string "12."))));
|
||||
(fun (_: _) ->
|
||||
handle_default
|
||||
{filename = "examples/allocations_familiales/prologue.catala_fr";
|
||||
start_line=136; start_column=11;
|
||||
end_line=136; end_column=52;
|
||||
law_headings=["Allocations familiales";
|
||||
"Champs d'applications";
|
||||
"Prologue"]} ([||])
|
||||
(fun (_: _) -> (log_decision_taken
|
||||
{filename = "examples/allocations_familiales/securite_sociale_D.catala_fr";
|
||||
start_line=275; start_column=5;
|
||||
end_line=277; end_column=41;
|
||||
law_headings=["Article D521-2";
|
||||
"Chapitre 1er : Allocations familiales";
|
||||
"Titre 2 : Prestations générales d'entretien";
|
||||
"Livre 5 : Prestations familiales et prestations assimilées";
|
||||
"Partie réglementaire - Décrets simples";
|
||||
"Code de la sécurité sociale"]}
|
||||
((ressources_menage_ >$ plafond__i_i_d521_3_) &&
|
||||
(ressources_menage_ <=$
|
||||
(plafond__i_i_d521_3_ +$
|
||||
(montant_verse_forfaitaire_ *$
|
||||
(decimal_of_string "12.")))))))
|
||||
(fun (_: _) ->
|
||||
((plafond__i_i_d521_3_ +$
|
||||
(montant_verse_forfaitaire_ *$
|
||||
(decimal_of_string "12."))) -$
|
||||
ressources_menage_) *$
|
||||
((decimal_of_string "1.") /&
|
||||
(decimal_of_string "12."))))|])
|
||||
(fun (_: _) -> false) (fun (_: _) -> raise EmptyError))|])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user