Add an option to control whether or not structured type should be expanded.

src/lus2licRun.ml

-(* Time-stamp: <modified the 15/01/2015 (at 13:43) by Erwan Jahier> *)
+(* Time-stamp: <modified the 27/02/2015 (at 09:50) by Erwan Jahier> *)
 (*-----------------------------------------------------------------------
 ** Copyright (C) - Verimag.
 *)
@@ -42,12 +42,18 @@ let make argv =
     )
   in
   let soc = try Soc.SocMap.find sk soc_tbl with Not_found -> assert false in
-  let soc_outputs = (SocVar.expand_profile true false (snd soc.profile)) in
-  let (vntl_i:Data.vntl) = (fst soc.profile) in
-  let (vntl_o:Data.vntl) = (snd soc.profile) in
-  (*    Lv6util.dump_entete oc;  *)
-  (*    RifIO.write_interface oc vntl_i vntl_o None None;  *)
-  (*    RifIO.flush oc;  *)
+  let soc_inputs,soc_outputs = soc.profile in
+  let soc_inputs,soc_outputs = if opt.Lv6MainArgs.expand_io_type then
+      (SocVar.expand_profile true false (fst soc.profile)),
+      (SocVar.expand_profile true false (snd soc.profile)) 
+    else
+      soc_inputs,soc_outputs
+  in
+  let (vntl_i:Data.vntl) =  soc_inputs in
+  let (vntl_o:Data.vntl) =  soc_outputs in
+(*   Lv6util.dump_entete oc; *)
+(*   RifIO.write_interface oc vntl_i vntl_o None None; *)
+(*   RifIO.flush oc; *)
 
   let (to_soc_subst : SocExecValue.ctx -> Soc.var list -> Data.subst list) =
     fun ctx vl ->

src/lv6MainArgs.ml

-(* Time-stamp: <modified the 26/02/2015 (at 09:52) by Erwan Jahier> *)
+(* Time-stamp: <modified the 27/02/2015 (at 09:19) by Erwan Jahier> *)
 (*
 Le manager d'argument adapt de celui de lutin, plus joli
 N.B. solution un peu batarde : les options sont stockes, comme avant, dans Global,
@@ -30,6 +30,7 @@ type t = {
   mutable expand_nodes :  bool;
   mutable expand_node_call :  string list;
   mutable expand_arrays :  bool;
+  mutable expand_io_type :  bool;
   mutable optim_ite : bool;
   mutable gen_autotest :  bool;
   mutable oc :  Pervasives.out_channel;
@@ -91,6 +92,7 @@ let (make_opt : unit -> t) =
       expand_nodes =  false;
       expand_node_call =  [];
       expand_arrays =  false;
+      expand_io_type = false;
       optim_ite = false;
       gen_autotest =  false;
       (** the output channel *)
@@ -284,6 +286,11 @@ let mkoptab (opt:t) : unit = (
       (Arg.Unit (fun _ -> opt.expand_nodes <- true))
       ["Expand all node calls in the main node."]
     ;
+    mkopt opt
+      ["-en"; "--expand-io-type"]
+      (Arg.Unit (fun _ -> opt.expand_io_type <- true))
+      ["Expand structured types of the main node (impact the simulation only)."]
+    ;
     mkopt opt
       ["-enc"; "---expand-node-call"]
       ~arg:" <string> "

src/lv6MainArgs.mli

@@ -31,6 +31,7 @@ type t = {
   mutable expand_nodes :  bool;
   mutable expand_node_call :  string list;
   mutable expand_arrays :  bool;
+  mutable expand_io_type :  bool;
   mutable optim_ite : bool;
   mutable gen_autotest :  bool;
   mutable oc :  Pervasives.out_channel;