Update Mlang according to upstream changes (compir, inter) (#225)

MLanguage · Nov 7, 2023 · 4c12d21 · 4c12d21
2 parents 854a5b6 + bef36bb
commit 4c12d21
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 1 deletion.
diff --git a/examples/dgfip_c/ml_primitif/2020.expected/fuzzer_812.m_test.tgv b/examples/dgfip_c/ml_primitif/2020.expected/fuzzer_812.m_test.tgv
diff --git a/examples/dgfip_c/ml_primitif/ml_driver/m.ml b/examples/dgfip_c/ml_primitif/ml_driver/m.ml
@@ -17,6 +17,7 @@ let calcul_primitif_isf tgv = exec_ench "calcul_primitif_isf" tgv
 let calcul_primitif_taux tgv = exec_ench "calcul_primitif_taux" tgv
 let calcul_correctif tgv = exec_ench "calcul_correctif" tgv
 
+let sauve_base_primitive_penalisee tgv = exec_ench "sauve_base_primitive_penalisee" tgv
 let sauve_base_initial tgv = exec_ench "sauve_base_initial" tgv
 let sauve_base_1728 tgv = exec_ench "sauve_base_1728" tgv
 let sauve_base_anterieure_cor tgv = exec_ench "sauve_base_anterieure_cor" tgv

diff --git a/examples/dgfip_c/ml_primitif/ml_driver/stubs.c b/examples/dgfip_c/ml_primitif/ml_driver/stubs.c
@@ -76,6 +76,7 @@ static ench_t enchaineurs[] = {
   { "calcul_primitif_taux", calcul_primitif_taux },
   { "calcul_correctif", calcul_correctif },
 
+  { "sauve_base_primitive_penalisee", sauve_base_primitive_penalisee },
   { "sauve_base_initial", sauve_base_initial },
   { "sauve_base_1728", sauve_base_1728 },
   { "sauve_base_anterieure_cor", sauve_base_anterieure_cor },

diff --git a/examples/dgfip_c/ml_primitif/static/const.h b/examples/dgfip_c/ml_primitif/static/const.h
@@ -56,6 +56,8 @@ struct S_irdata
 
 #endif /* FLG_COMPACT */
 
+#define MAX_ANO  4
+
 #define RESTITUEE    5
 #define RESTITUEE_P  6
 #define RESTITUEE_C  7

diff --git a/examples/dgfip_c/ml_primitif/static/enchain_static.c.inc b/examples/dgfip_c/ml_primitif/static/enchain_static.c.inc
@@ -96,6 +96,7 @@ void free_erreur()
 static T_discord *discords = 0;
 static T_discord *tas_discord = 0;
 static T_discord **p_discord = &discords;
+static short nb_bloquantes;
 static jmp_buf jmp_bloq;
 
 static void init_erreur(void)
@@ -104,6 +105,7 @@ static void init_erreur(void)
   tas_discord = discords;
   discords = 0;
   p_discord = &discords;
+  nb_bloquantes = 0;
 }
 
 void add_erreur(T_erreur *erreur, char *code)
@@ -125,7 +127,7 @@ void add_erreur(T_erreur *erreur, char *code)
   p_discord = &new_discord->suivant;
 
   if (strcmp(erreur->isisf, "O")) {
-    if (erreur->type == ANOMALIE) {
+    if ((erreur->type == ANOMALIE) && (++nb_bloquantes >= MAX_ANO)) {
       longjmp(jmp_bloq, 1);
     }
   }

diff --git a/mpp_specs/dgfip_base.mpp b/mpp_specs/dgfip_base.mpp
@@ -15,6 +15,9 @@ sauve_base_1728():
   X = X
 #  outputs <- call_m_rules(base_1728 corrective)
 
+sauve_base_primitive_penalisee():
+  outputs <- call_m_rules(base_primitive_penalisee corrective)
+
 sauve_base_premier():
   outputs <- call_m_rules(base_premier corrective)
 

diff --git a/src/mlang/dgfip_m.ml b/src/mlang/dgfip_m.ml
@@ -91,6 +91,9 @@ domaine regle taux
 
 domaine regle modul;
 
+domaine regle corrective base_primitive_penalisee
+: calculable;
+
 domaine regle corrective base_anterieure_cor
 : calculable;