Intégration des domaines de règles dans le langage M

src/mlang/backend_compilers/bir_to_dgfip_c.ml

@@ -425,7 +425,6 @@ let generate_mpp_functions_signatures (oc : Format.formatter)
 
 let generate_rovs_files (dgfip_flags : Dgfip_options.flags) (program : program)
     (folder : string) (vm : Dgfip_varid.var_id_map) =
-  let module StringMap = Map.Make (String) in
   let default_file = "default" in
   let filemap =
     ROVMap.fold
@@ -438,14 +437,12 @@ let generate_rovs_files (dgfip_flags : Dgfip_options.flags) (program : program)
             ^ ".c"
         in
         let filerovs =
-          match StringMap.find_opt file filemap with
-          | None -> []
-          | Some fr -> fr
+          match StrMap.find_opt file filemap with None -> [] | Some fr -> fr
         in
-        StringMap.add file (rov :: filerovs) filemap)
-      program.rules_and_verifs StringMap.empty
+        StrMap.add file (rov :: filerovs) filemap)
+      program.rules_and_verifs StrMap.empty
   in
-  StringMap.fold
+  StrMap.fold
     (fun file rovs orphan ->
       if String.equal file default_file then rovs @ orphan
       else

src/mlang/backend_compilers/dgfip_gen_files.ml

@@ -14,9 +14,6 @@
    You should have received a copy of the GNU General Public License along with
    this program. If not, see <https://www.gnu.org/licenses/>. *)
 
-module StringSet = Set.Make (String)
-module StringMap = Map.Make (String)
-
 let ascii_to_ebcdic =
   [|
     0;   1;   2;   3;   55;  45;  46;  47;  22;  5;   37;  11;  12;  13;  14;  15;
@@ -863,7 +860,7 @@ let get_rules_verif_etc prog =
                     ( Pos.unmark r.rule_number :: rules,
                       match r.rule_chaining with
                       | None -> chainings
-                      | Some cn -> StringSet.add (Pos.unmark cn) chainings )
+                      | Some cn -> StrSet.add (Pos.unmark cn) chainings )
                   else (rules, chainings)
                 in
                 (rules, verifs, errors, chainings)
@@ -884,8 +881,7 @@ let get_rules_verif_etc prog =
             | _ -> (rules, verifs, errors, chainings))
           (rules, verifs, errors, chainings)
           file)
-      ([], [], [], StringSet.empty)
-      prog
+      ([], [], [], StrSet.empty) prog
   in
 
   let rules = List.fast_sort compare rules in
@@ -920,12 +916,10 @@ let gen_table_call fmt flags vars_debug rules chainings errors =
     Format.fprintf fmt "};\n\n"
   end;
 
-  StringSet.iter
-    (fun cn -> Format.fprintf fmt "extern void %s();\n" cn)
-    chainings;
+  StrSet.iter (fun cn -> Format.fprintf fmt "extern void %s();\n" cn) chainings;
 
   Format.fprintf fmt "T_desc_ench desc_ench[NB_ENCH + 1] = {\n";
-  StringSet.iter
+  StrSet.iter
     (fun cn -> Format.fprintf fmt "    { \"%s\", %s },\n" cn cn)
     chainings;
   Format.fprintf fmt "};\n"
@@ -982,7 +976,7 @@ let gen_var_h fmt flags vars vars_debug rules verifs chainings errors =
   let nb_variation = count vars (Input (Some Variation)) in
   let nb_penalite = count vars (Input (Some Penality)) in
   let nb_restituee = count vars Output in
-  let nb_ench = StringSet.cardinal chainings in
+  let nb_ench = StrSet.cardinal chainings in
   let nb_err = List.length errors in
   let nb_debug = List.map List.length vars_debug in
   let nb_call = List.length rules in
@@ -1165,11 +1159,11 @@ let extract_var_ids (cprog : Bir.program) vars =
   let pvars = cprog.mir_program.program_vars in
   let add vn v vm =
     let vs =
-      match StringMap.find_opt vn vm with
+      match StrMap.find_opt vn vm with
       | None -> VariableSet.empty
       | Some vs -> vs
     in
-    StringMap.add (Pos.unmark v.Variable.name) (VariableSet.add v vs) vm
+    StrMap.add (Pos.unmark v.Variable.name) (VariableSet.add v vs) vm
   in
   (* Build a map from variable names to all their definitions (with different
      ids) *)
@@ -1178,7 +1172,7 @@ let extract_var_ids (cprog : Bir.program) vars =
       (fun v vm ->
         let vm = add (Pos.unmark v.Variable.name) v vm in
         match v.Variable.alias with Some a -> add a v vm | None -> vm)
-      pvars StringMap.empty
+      pvars StrMap.empty
   in
   let process_var ~alias
       ( tvar,
@@ -1209,7 +1203,7 @@ let extract_var_ids (cprog : Bir.program) vars =
     (fun vm vd ->
       let name, vid = process_var ~alias:false vd in
       let vs =
-        try StringMap.find name vars_map
+        try StrMap.find name vars_map
         with Not_found ->
           Errors.raise_error (Format.asprintf "Variable %s is undeclared" name)
       in

src/mlang/backend_ir/bir.ml

@@ -31,19 +31,19 @@ let compare_variable v1 v2 =
     let c = Stdlib.compare v1.offset v2.offset in
     if c <> 0 then c else Mir.Variable.compare v1.mir_var v2.mir_var
 
-module VariableMap = Map.Make (struct
+module VariableMap = MapExt.Make (struct
   type t = variable
 
   let compare = compare_variable
 end)
 
-module VariableSet = Set.Make (struct
+module VariableSet = SetExt.Make (struct
   type t = variable
 
   let compare = compare_variable
 end)
 
-module NameMap = Map.Make (String)
+module NameMap = StrMap
 
 type offset_alloc = { mutable name_map : int NameMap.t; mutable size : int }
 
@@ -115,7 +115,7 @@ let rule_or_verif_as_statements (rov : rule_or_verif) : stmt list =
 
 type mpp_function = { mppf_stmts : stmt list; mppf_is_verif : bool }
 
-module FunctionMap = Map.Make (struct
+module FunctionMap = MapExt.Make (struct
   type t = function_name
 
   let compare = String.compare

src/mlang/backend_ir/bir.mli

@@ -22,9 +22,9 @@ type tgv_id = string
 
 type variable = { on_tgv : tgv_id; offset : int; mir_var : Mir.Variable.t }
 
-module VariableMap : Map.S with type key = variable
+module VariableMap : MapExt.T with type key = variable
 
-module VariableSet : Set.S with type elt = variable
+module VariableSet : SetExt.T with type elt = variable
 
 type expression = variable Mir.expression_
 
@@ -53,7 +53,7 @@ and stmt_kind =
 
 type mpp_function = { mppf_stmts : stmt list; mppf_is_verif : bool }
 
-module FunctionMap : Map.S with type key = function_name
+module FunctionMap : MapExt.T with type key = function_name
 
 type program_context = {
   constant_inputs_init_stmts : stmt list;

src/mlang/backend_ir/bir_instrumentation.ml

@@ -14,7 +14,7 @@
    You should have received a copy of the GNU General Public License along with
    this program. If not, see <https://www.gnu.org/licenses/>. *)
 
-module CodeLocationMap = Map.Make (struct
+module CodeLocationMap = MapExt.Make (struct
   type t = Bir_interpreter.code_location
 
   let compare x y = compare x y
@@ -46,7 +46,7 @@ let code_coverage_init () : unit =
 
 let code_coverage_result () : code_coverage_result = !code_coverage_acc
 
-module VarLiteralSet = Set.Make (struct
+module VarLiteralSet = SetExt.Make (struct
   type t = Bir_interpreter.var_literal
 
   let compare x y =

src/mlang/backend_ir/bir_instrumentation.mli

@@ -18,7 +18,7 @@
 
 (** {1 Code coverage for a single run}*)
 
-module CodeLocationMap : Map.S with type key = Bir_interpreter.code_location
+module CodeLocationMap : MapExt.T with type key = Bir_interpreter.code_location
 
 type code_coverage_result =
   Bir_interpreter.var_literal CodeLocationMap.t Bir.VariableMap.t
@@ -40,7 +40,7 @@ val code_coverage_result : unit -> code_coverage_result
 (** Code coverage is best measured for multiple runs of the interpreter on a set
     of test files. *)
 
-module VarLiteralSet : Set.S with type elt = Bir_interpreter.var_literal
+module VarLiteralSet : SetExt.T with type elt = Bir_interpreter.var_literal
 
 type code_coverage_map_value = VarLiteralSet.t