Merge conflict solved

TODO.org

 * TODO refactoring + doc
-- separate lustre types from machine types in different files
-- split basic libs into backend specific files
-- define mli for core steps: normalization and machine code
+- DONE separate lustre types from machine types in different files
+- DONE split basic libs into backend specific files
+- DONE define mli for core steps: normalization and machine code
 - define mli for lustre_type and machine_type (Garion)
 
 * TODO

src/machine_code.mli

-val translate_prog: Lustre_types.program -> Scheduling.schedule_report Utils.IMap.t  -> Machine_code_types.machine_t list
+val translate_prog: Lustre_types.program_t -> Scheduling.schedule_report Utils.IMap.t  -> Machine_code_types.machine_t list

src/main_lustre_verifier.ml

@@ -14,7 +14,7 @@ open Log
 open Compiler_common
 
 open Utils
-open LustreSpec
+open Lustre_types
  
 
 let usage = "Usage: lustrev [options] \x1b[4msource file\x1b[0m"
@@ -74,7 +74,7 @@ let rec verify dirname basename extension =
   in
 
   Log.report ~level:1 (fun fmt -> fprintf fmt "@]@ ");
-  Log.report ~level:3 (fun fmt -> fprintf fmt ".. Generated machines:@ %a@ "Machine_code.pp_machines machine_code);
+  Log.report ~level:3 (fun fmt -> fprintf fmt ".. Generated machines:@ %a@ "Machine_code_common.pp_machines machine_code);
 
   if Scopes.Plugin.show_scopes () then
     begin

src/normalization.mli

+type param_t =
+  {
+    unfold_arrow_active: bool;
+    force_alias_ite: bool;
+    force_alias_internal_fun: bool;
+  }
+
+
 val mk_expr_alias_opt: bool -> Lustre_types.node_desc -> (Lustre_types.eq list * Lustre_types.var_decl list)-> Lustre_types.expr -> (Lustre_types.eq list * Lustre_types.var_decl list) * Lustre_types.expr
-val normalize_prog: ?backend:string -> Lustre_types.program -> Lustre_types.program
+val normalize_prog: param_t -> Lustre_types.program_t -> Lustre_types.program_t

src/verifierType.ml

@@ -5,7 +5,7 @@ sig
   val is_active: unit -> bool
   val options: (string * Arg.spec * string) list
   val get_normalization_params: unit -> Normalization.param_t
-  val run: string -> LustreSpec.program_t -> Machine_code.machine_t list -> unit 
+  val run: string -> Lustre_types.program_t -> Machine_code_types.machine_t list -> unit 
 end
 
 module Default =

src/verifiers.ml

-open LustreSpec
+open Lustre_types
 
 open VerifierList