lurette 0.138 Fri, 13 Jun 2003 09:05:17 +0200 by jahier

Parent-Version:      0.137
Version-Log:

AND NOW IT WORKS WITH SCADE !!!
(no array neither struct though)

source/gen_stubs.ml:
source/gen_stubs_common.ml [new file]:
source/gen_stubs_common.mli [new file]:
source/parse_c_scade.ml [new file]:
source/parse_c_scade.mli [new file]:
source/*.ml:
    Add a scade port to lurette.

Project-Description: Lurette

Makefile.common.source

@@ -12,3 +12,27 @@ OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
 
 LURETTE_PATH = $(HOME)/lurette
 
+SOURCES_LURETTE_LIB =  \
+	$(LURETTE_PATH)/source/util.ml \
+	$(LURETTE_PATH)/source/prevar.mli $(LURETTE_PATH)/source/prevar.ml \
+	$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
+	$(LURETTE_PATH)/source/command_line.mli $(LURETTE_PATH)/source/command_line.ml \
+	$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
+	$(LURETTE_PATH)/source/ne.mli $(LURETTE_PATH)/source/ne.ml \
+	$(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
+	$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
+	$(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
+	$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
+	$(LURETTE_PATH)/source/parse_env.mli $(LURETTE_PATH)/source/parse_env.ml \
+	$(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
+	$(LURETTE_PATH)/source/draw.mli $(LURETTE_PATH)/source/draw.ml  \
+	$(LURETTE_PATH)/source/store.mli $(LURETTE_PATH)/source/store.ml  \
+	$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
+	$(LURETTE_PATH)/source/solver.mli $(LURETTE_PATH)/source/solver.ml \
+	$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
+	$(LURETTE_PATH)/source/automata.mli $(LURETTE_PATH)/source/automata.ml  \
+	$(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
+	$(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
+	$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml
+
+ALL_SOURCES = $(SOURCES_LURETTE_LIB) $(SOURCES_OCAML)

OcamlMakefile

@@ -5,7 +5,7 @@
 #                             For updates see:
 #                http://www.oefai.at/~markus/ocaml_sources
 #
-#        $Id: OcamlMakefile 1.50 Mon, 19 May 2003 11:40:43 +0200 jahier $
+#        $Id: OcamlMakefile 1.51 Fri, 13 Jun 2003 09:05:17 +0200 jahier $
 #
 ###########################################################################
 
@@ -14,30 +14,6 @@
 
 -include $(LURETTE_PATH)/Makefile.common.source
 
-SOURCES_LURETTE_LIB =  \
-	$(LURETTE_PATH)/source/util.ml \
-	$(LURETTE_PATH)/source/prevar.mli $(LURETTE_PATH)/source/prevar.ml \
-	$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
-	$(LURETTE_PATH)/source/command_line.mli $(LURETTE_PATH)/source/command_line.ml \
-	$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
-	$(LURETTE_PATH)/source/ne.mli $(LURETTE_PATH)/source/ne.ml \
-	$(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
-	$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
-	$(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
-	$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
-	$(LURETTE_PATH)/source/parse_env.mli $(LURETTE_PATH)/source/parse_env.ml \
-	$(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
-	$(LURETTE_PATH)/source/draw.mli $(LURETTE_PATH)/source/draw.ml  \
-	$(LURETTE_PATH)/source/store.mli $(LURETTE_PATH)/source/store.ml  \
-	$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
-	$(LURETTE_PATH)/source/solver.mli $(LURETTE_PATH)/source/solver.ml \
-	$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
-	$(LURETTE_PATH)/source/automata.mli $(LURETTE_PATH)/source/automata.ml  \
-	$(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
-	$(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
-	$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml
-
-ALL_SOURCES = $(SOURCES_LURETTE_LIB) $(SOURCES_OCAML)
 
 
 

TODO

@@ -13,24 +13,14 @@
 
 (2) Traiter les variables stables (signaux purs)
 
-(2) gen_fake_lutin devrait etre une commande lurettetop et non pas code
-  en dur dans xlurette... 
-  idem pour la sauvegarde des options dans .lurette-rc.
 
 (2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
   a lurettetop et xlurette...)
 
 
-* Si l'execution se termine normalement (ie, a la fin de l'expression
-  reguliere), changer le message d'erreur.
-
 * mettre qques part que j'utilise ocaml, camlidl cuddaux, mlcuddidl,
   polka, gmp,autoconf, make, gcc, emacs, latex, dot, gtk, sim2chro,  ...
 
-? Mettre les .c generes dans share
-
-
-* xlurette: si le nom du repertoire est le meme que le repertoire courant, je pourrais l'omettre ...
 
 * Utiliser l'ordre des parametres plutot que leur noms 
   Quoique, quand on fait le produit de plusieurs automates, 

ihm/xlurette/makefile

@@ -16,7 +16,7 @@ xlurette: dummy
 	mlglade xlurette.glade
 	mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
 	cat xlurette_glade_interface.ml0 \
-	  | sed -e 's/\"pixmaps\//((Unix.getenv \"LURETTE_PATH\") \^ \"\/share\/pixmaps\/\" \^ \"/'  \
+	  | sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^  \"/'  \
 	  | sed -e 's/.xpm\"/.xpm\")/' \
 	  > xlurette_glade_interface.ml
 	ocamlc  -c -I +lablgtk -labels -c xlurette_glade_interface.ml
@@ -40,20 +40,6 @@ opt: dummy
 	   xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
 
 
-try: dummy
-	mlglade xlurette.glade
-	mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
-	cat xlurette_glade_interface.ml0 \
-	  | sed -e 's/\"pixmaps\//\"/'  \
-	  | sed -e 's/.xpm\"/.xpm\"/' \
-	  > xlurette_glade_interface.ml
-	ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
-	ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
-	ocamlopt.opt -c -pp "camlp4o" -I  +lablgtk $(THREAD) -c xlurette_glade_main.ml
-	ocamlopt.opt  -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx  \
-	   xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
-
-
 cyg: dummy
 	mlglade xlurette.glade
 	mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
@@ -67,6 +53,7 @@ cyg: dummy
 	ocamlopt.opt  -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx  \
 	   xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
 
+opt.exe: cyg
 opt_opt: dummy
 	mlglade xlurette.glade
 	mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
@@ -83,7 +70,7 @@ opt_opt: dummy
 
 
 
-all: opt cp
+all: opt$(EXE) cp
 cp: 
 	cp xlurette$(EXE) $(BIN_INSTALL_DIR)
 

ihm/xlurette/xlurette.glade

@@ -20,10 +20,9 @@
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
-  <default_width>700</default_width>
-  <allow_shrink>False</allow_shrink>
+  <allow_shrink>True</allow_shrink>
   <allow_grow>True</allow_grow>
-  <auto_shrink>False</auto_shrink>
+  <auto_shrink>True</auto_shrink>
 
   <widget>
     <class>GtkNotebook</class>
@@ -52,8 +51,8 @@
 	<gutter_size>6</gutter_size>
 	<position>0</position>
 	<child>
-	  <shrink>True</shrink>
-	  <resize>False</resize>
+	  <shrink>False</shrink>
+	  <resize>True</resize>
 	</child>
 
 	<widget>
@@ -739,7 +738,6 @@ scade
 	<widget>
 	  <class>GtkNotebook</class>
 	  <name>notebook2</name>
-	  <height>330</height>
 	  <can_focus>True</can_focus>
 	  <show_tabs>True</show_tabs>
 	  <show_border>True</show_border>
@@ -824,11 +822,12 @@ scade
 	<class>GtkHBox</class>
 	<name>hbox1</name>
 	<border_width>11</border_width>
-	<homogeneous>True</homogeneous>
+	<height>72</height>
+	<homogeneous>False</homogeneous>
 	<spacing>4</spacing>
 	<child>
 	  <shrink>True</shrink>
-	  <resize>True</resize>
+	  <resize>False</resize>
 	</child>
 
 	<widget>
@@ -845,8 +844,8 @@ scade
 	  <tooltips>True</tooltips>
 	  <child>
 	    <padding>5</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
+	    <expand>False</expand>
+	    <fill>False</fill>
 	    <pack>GTK_PACK_END</pack>
 	  </child>
 
@@ -855,8 +854,6 @@ scade
 	    <child_name>Toolbar:button</child_name>
 	    <name>button17</name>
 	    <border_width>4</border_width>
-	    <width>150</width>
-	    <height>100</height>
 	    <tooltip>Start the testing process</tooltip>
 	    <signal>
 	      <name>clicked</name>
@@ -872,8 +869,6 @@ scade
 	    <child_name>Toolbar:button</child_name>
 	    <name>button18</name>
 	    <border_width>4</border_width>
-	    <width>150</width>
-	    <height>100</height>
 	    <tooltip>Display (.rif) data with sim2chro</tooltip>
 	    <signal>
 	      <name>clicked</name>
@@ -889,8 +884,6 @@ scade
 	    <child_name>Toolbar:button</child_name>
 	    <name>gnuplot_rif_button</name>
 	    <border_width>4</border_width>
-	    <width>150</width>
-	    <height>100</height>
 	    <tooltip>Display (.rif) data with gnuplot (3.7 or higher)</tooltip>
 	    <signal>
 	      <name>clicked</name>
@@ -906,8 +899,6 @@ scade
 	    <child_name>Toolbar:button</child_name>
 	    <name>button20</name>
 	    <border_width>4</border_width>
-	    <width>150</width>
-	    <height>100</height>
 	    <tooltip>Stop the current run</tooltip>
 	    <signal>
 	      <name>clicked</name>
@@ -923,8 +914,6 @@ scade
 	    <child_name>Toolbar:button</child_name>
 	    <name>clean_up_button</name>
 	    <border_width>4</border_width>
-	    <width>150</width>
-	    <height>100</height>
 	    <tooltip>Clean-up intermediary files (to try when xlurette seems to be broken)</tooltip>
 	    <signal>
 	      <name>clicked</name>
@@ -940,8 +929,7 @@ scade
 	    <child_name>Toolbar:button</child_name>
 	    <name>quit_button</name>
 	    <border_width>4</border_width>
-	    <width>150</width>
-	    <height>100</height>
+	    <height>38</height>
 	    <tooltip>Quit xlurette</tooltip>
 	    <signal>
 	      <name>clicked</name>
@@ -2331,7 +2319,7 @@ scade
 
  The SUT is the lustre (or scade) program you want to test. Three fields need to be filled in.
 
- (1) The program file name. You can either provide a  ''.c'' [*], a ''.lus'', or a ''.saofd''[**] file. 
+ (1) The program file name. You can either provide a  ''.c'' [*], a ''.lus'', or a ''.saofdm''[**] file. 
 
  (2) The name of the main node.
 

ihm/xlurette/xlurette_glade_interface.ml

@@ -8,9 +8,9 @@ let xlurette = GWindow.window
 ~position:`NONE
 ~kind:`TOPLEVEL
 ~modal:false
-~allow_shrink:false
+~allow_shrink:true
 ~allow_grow:true
-~auto_shrink:false
+~auto_shrink:true
 ~border_width:2
 ()
 in
@@ -469,7 +469,6 @@ let notebook2 = GPack.notebook
 ~show_border:true
 ~scrollable:false
 ~popup:false
-~height:330
 ~packing:(vpaned2#add )
 ()
 in
@@ -525,14 +524,15 @@ let stderr_thumbnail = GMisc.label
 in
 let hbox1 = GPack.hbox
 ~spacing:4
-~homogeneous:true
+~homogeneous:false
+~height:72
 ~packing:(run_panel#add )
 ()
 in
 let toolbar4 = GButton.toolbar
 ~packing:(hbox1#pack ~padding:5
-~fill:true
-~expand:true
+~fill:false
+~expand:false
 )
 ~orientation:`HORIZONTAL
 ~button_relief:`NORMAL
@@ -1753,7 +1753,7 @@ let label32 = GMisc.label
 
  The SUT is the lustre (or scade) program you want to test. Three fields need to be filled in.
 
- (1) The program file name. You can either provide a  ''.c'' [*], a ''.lus'', or a ''.saofd''[**] file. 
+ (1) The program file name. You can either provide a  ''.c'' [*], a ''.lus'', or a ''.saofdm''[**] file. 
 
  (2) The name of the main node.
 

ihm/xlurette/xlurette_glade_main.ml

@@ -99,23 +99,11 @@ let (remove_extension : string -> string) =
       if dir = "." then file else (Filename.concat dir file)
 
 
-let (gen_fake_lutin : (string -> unit) -> string -> unit) =
-  fun display hfile ->  
-    let cmd = 
-      ("gen_fake_lutin " ^ hfile ^ " \n")
-    in
-      display cmd ;
-      if 
-	((Sys.command cmd) <> 0)
-      then 
-	display ("*** gen_fake_lutin failed.\n")
-      else
-	display ("      ... gen_fake_lutin ok.\n")
 
-let (gen_stubs : (string -> unit) -> string -> string -> unit) =
-  fun display file node ->  
+let (gen_stubs : (string -> unit) -> string -> string -> string -> unit) =
+  fun display file node compiler ->  
     let cmd = 
-      ("gen_stubs " ^ (remove_extension file) ^ " " ^ node)
+      ("gen_stubs " ^ (remove_extension file) ^ " " ^ node ^ " " ^ compiler)
     in
       display cmd;
       if 
@@ -144,32 +132,70 @@ let rec (readfile_line : in_channel -> string list -> string list) =
 (** returns the list of nodes of a lustre file *)
 let (lusinfo : string -> string list) =
   fun file -> 
-    let file_info =  Filename.temp_file file "nodes_info" in 
-    let file_lus = 
-      try ((Filename.chop_extension file) ^ ".lus")
-      with Invalid_argument _ -> (file ^ ".lus")
-    in
-    let cmd = ("lusinfo " ^ file_lus ^ " nodes > " ^ file_info) in
-    let _ =
-      if 
-	Sys.file_exists file_lus 
-      then
-	(
-	  if Sys.file_exists file_info then Sys.remove file_info;
-	  if 
-	    ((Sys.command cmd) <> 0)
-	  then 
-	    (
-	      output_string stdout ("*** lusinfo failed.\n" ^ cmd ^ "\n");
-	      flush stdout
-	    )
-	);
-    in
-    let ic = open_in file_info in
-    let nodes = readfile_line ic [] in
-      close_in ic;
-      if Sys.file_exists file_info then Sys.remove file_info;
-      nodes
+    try
+      let file_info =  Filename.temp_file file "nodes_info" in 
+      let file_lus = file in
+	if 
+	  Filename.check_suffix file ".saofdm"
+	then
+	  let cmd = ("getsaonodes " ^ file ^ " > " ^ file_info) in
+	    if 
+	      Sys.file_exists file_lus 
+	    then
+	      (
+		if Sys.file_exists file_info then Sys.remove file_info;
+		if 
+		  ((Sys.command cmd) <> 0)
+		then 
+		  (
+		    output_string stderr ("*** lusinfo failed.\n" ^ cmd ^ "\n");
+		    flush stderr;
+		    []
+		  )
+		else
+		  (
+		    let ic = open_in file_info in
+		    let nodes = readfile_line ic [] in
+		      close_in ic;
+		      if Sys.file_exists file_info then Sys.remove file_info;
+		      nodes
+		  )
+	      )
+	    else 
+	      []
+	else 
+	if 
+	  Filename.check_suffix file ".lus"
+	then
+	  let cmd = ("lusinfo " ^ file_lus ^ " nodes > " ^ file_info) in
+	    if 
+	      Sys.file_exists file_lus 
+	    then
+	      (
+		if Sys.file_exists file_info then Sys.remove file_info;
+		if 
+		  ((Sys.command cmd) <> 0)
+		then 
+		  (
+		    output_string stderr ("*** lusinfo failed.\n" ^ cmd ^ "\n");
+		    flush stderr;
+		    []
+		  )
+		else
+		  (
+		    let ic = open_in file_info in
+		    let nodes = readfile_line ic [] in
+		      close_in ic;
+		      if Sys.file_exists file_info then Sys.remove file_info;
+		      nodes
+		  )
+	      )
+	    else 
+	      []
+	else
+	  []
+    with 
+	_ -> []
 
 (** returns the list of files specified by the filter *)
 let (get_files_list_filtered : string -> string list -> string list) =
@@ -632,7 +658,7 @@ class customized_callbacks = object(self)
 
 
  method read_lustre_files () =
-  let files = (get_files_list_filtered "*.lus" [""]) in
+  let files = (get_files_list_filtered "*.lus *.saofdm" [""]) in
   let sut = self#top_xlurette#sut_name#entry#text
   and oracle = self#top_xlurette#oracle_name#entry#text
   and sut_node = self#top_xlurette#sut_node_entry#entry#text
@@ -686,24 +712,6 @@ class customized_callbacks = object(self)
        self#top_xlurette#oracle_node_entry#entry#set_text ""
 	 
  method run_lurette () = 
-   if 
-     self#top_xlurette#env_name#entry#text = ""
-   then
-     (* Generate an environment for the current sut *)
-     (
-       let sut = self#top_xlurette#sut_name_entry#entry#text in
-       let node = self#top_xlurette#sut_node_entry#entry#text in
-	 self#put "Since no environment is provided, I generate a fake one named\n";
-	 self#put (node ^ "_env.lut, that you can edit and modify.\n\n");
-	 gen_stubs self#put_misc sut node ; 
-	 gen_fake_lutin self#put_misc (node ^ ".h") ;
-	 
-	 (* Fill the combo boxes again, since more files may have been created *)
-	 self#read_lustre_files ();
-	 self#read_env_files ();
-
-	 self#top_xlurette#env_name#entry#set_text (node ^ "_env.lut")
-     );
 
    update_rif_file_name
      self#top_xlurette#rif_file_basename#text
@@ -719,7 +727,19 @@ class customized_callbacks = object(self)
      output_string oc all_cmds ;
      if debug then (output_string stderr all_cmds; flush stderr) ;
      flush oc;
-     self#read_rif_files ()
+      if 
+	self#top_xlurette#env_name#entry#text = ""
+      then
+	(* Generate an environment for the current sut *)
+	(
+	  let node = self#top_xlurette#sut_node_entry#entry#text in
+	    (* a fake env ougth to have been generated by lurettetop *)
+	    self#top_xlurette#env_name#entry#set_text (node ^ "_env.lut");
+	    (* Fill the combo boxes again, since more files may have been created *)
+	    self#read_env_files ()
+	);
+
+      self#read_rif_files ()
 
 
  method save_parameters () =

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette 0 137)
-(Parent-Version lurette 0 136)
+(Project-Version lurette 0 138)
+(Parent-Version lurette 0 137)
 (Version-Log "
-source/gen_stubs:
-   Fix a bug where the var name ok was clashing with user vars
-   in the generated always true oracle. now i use the name
-   weird_name_to_avoid_clash__ok 
-   
-source/lurettetop.ml:
-   Make sure that the .lus files is less recent than the .c file
-   before running.
-
-source/lurettetop.ml:
-source/gen_stubs.ml:
-ihm/xlurette/*.ml:
-   Add support for future handling of the scade compiler.
-   Currently, returns a msg saying it that the scade port is not implemented.
+AND NOW IT WORKS WITH SCADE !!!
+(no array neither struct though)
+
+source/gen_stubs.ml: 
+source/gen_stubs_common.ml [new file]: 
+source/gen_stubs_common.mli [new file]:
+source/parse_c_scade.ml [new file]:
+source/parse_c_scade.mli [new file]: 
+source/*.ml:
+    Add a scade port to lurette.
 
 ")
 (New-Version-Log ""
 )
-(Checkin-Time "Tue, 03 Jun 2003 15:32:29 +0200")
+(Checkin-Time "Fri, 13 Jun 2003 09:05:17 +0200")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -36,7 +32,7 @@ ihm/xlurette/*.ml:
   (source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.2 644))
   (source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.32 644))
 
-  (source/command_line_luc_exe.ml (lurette/b/33_command_li 1.14 644))
+  (source/command_line_luc_exe.ml (lurette/b/33_command_li 1.15 644))
   (source/command_line_luc_exe.mli (lurette/b/34_command_li 1.10 644))
 
 ;; Sources files for lurette only
@@ -53,10 +49,10 @@ ihm/xlurette/*.ml:
   (source/env.mli (lurette/15_env.mli 1.17 644))
   (source/env.ml (lurette/16_env.ml 1.30 644))
 
-  (source/util.ml (lurette/35_util.ml 1.47 644))
+  (source/util.ml (lurette/35_util.ml 1.48 644))
 
   (source/solver.mli (lurette/38_solver.mli 1.14 644))
-  (source/solver.ml (lurette/39_solver.ml 1.47 644))
+  (source/solver.ml (lurette/39_solver.ml 1.48 644))
 
   (source/polyhedron.ml (lurette/d/25_polyhedron 1.5 644))
   (source/polyhedron.mli (lurette/d/26_polyhedron 1.1 644))
@@ -68,7 +64,7 @@ ihm/xlurette/*.ml:
   (source/pnumsolver.mli (lurette/d/24_pnumsolver 1.2 644))
 
   (source/parse_env.mli (lurette/40_parse_env. 1.14 644))
-  (source/parse_env.ml (lurette/41_parse_env. 1.44 644))
+  (source/parse_env.ml (lurette/41_parse_env. 1.45 644))
 
   (source/show_env.mli (lurette/42_show_env.m 1.8 644))
   (source/show_env.ml (lurette/43_show_env.m 1.16 644))
@@ -83,10 +79,10 @@ ihm/xlurette/*.ml:
   (source/eval.ml (lurette/49_eval.ml 1.14 644))
 
   (source/env_state.mli (lurette/50_env_state. 1.30 644))
-  (source/env_state.ml (lurette/51_env_state. 1.43 644))
+  (source/env_state.ml (lurette/51_env_state. 1.44 644))
 
   (source/automata.mli (lurette/b/46_automata.m 1.3 644))
-  (source/automata.ml (lurette/b/47_automata.m 1.8 644))
+  (source/automata.ml (lurette/b/47_automata.m 1.9 644))
 
   (source/sim2chro.mli (lurette/b/23_sim2chro.m 1.7 644))
   (source/sim2chro.ml (lurette/b/24_sim2chro.m 1.18 644))
@@ -94,8 +90,13 @@ ihm/xlurette/*.ml:
   (source/gne.mli (lurette/b/36_gne.mli 1.5 644))
   (source/gne.ml (lurette/b/37_gne.ml 1.5 644))
 
-  (source/lurettetop.ml (lurette/c/1_lurettetop 1.34 644))
-  (source/gen_stubs.ml (lurette/24_generate_l 1.47 644))
+  (source/lurettetop.ml (lurette/c/1_lurettetop 1.35 644))
+
+  (source/gen_stubs.ml (lurette/24_generate_l 1.48 644))
+  (source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.1 644))
+  (source/gen_stubs_common.mli (lurette/e/40_gen_stubs_ 1.1 644))
+  (source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.1 644))
+  (source/parse_c_scade.mli (lurette/e/42_parse_c_sc 1.1 644))
 
   (source/control.mli (lurette/c/3_control.ml 1.3 644))
   (source/control.ml (lurette/c/4_control.ml 1.4 644))
@@ -112,9 +113,9 @@ ihm/xlurette/*.ml:
   (source/prevar.ml (lurette/d/18_prevar.ml 1.3 644))
   (source/prevar.mli (lurette/d/19_prevar.mli 1.3 644))
 
-  (source/parse_poc.ml (lurette/d/15_parse_poc. 1.2 644))
-  (source/parse_poc.mli (lurette/d/29_parse_poc. 1.1 644))
-  (source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.4 644))
+  (source/parse_poc.ml (lurette/d/15_parse_poc. 1.3 644))
+  (source/parse_poc.mli (lurette/d/29_parse_poc. 1.2 644))
+  (source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.5 644))
 
   (source/show_luc.ml (lurette/e/25_show_luc.m 1.3 644))
   (source/ocaml2c.idl (lurette/e/26_ocaml2c.id 1.2 644))
@@ -124,22 +125,22 @@ ihm/xlurette/*.ml:
 
 
 ;; Make files
-  (share/configure.in (lurette/d/11_configure. 1.7 644))
+  (share/configure.in (lurette/d/11_configure. 1.8 644))
   (share/Makefile.common.in (lurette/d/12_Makefile.c 1.5 644))
-  (Makefile.common.source (lurette/e/33_Makefile.c 1.3 644))
-  (OcamlMakefile (lurette/17_OcamlMakef 1.50 644))
-  (share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.23 644))
-  (user-rules (lurette/c/14_myrules 1.35 644))
+  (Makefile.common.source (lurette/e/33_Makefile.c 1.4 644))
+  (OcamlMakefile (lurette/17_OcamlMakef 1.51 644))
+  (share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.24 644))
+  (user-rules (lurette/c/14_myrules 1.36 644))
   (share/Makefile.test (lurette/c/25_user-rules 1.6 644))
   (Makefile (lurette/d/13_Makefile 1.4 644))
 
   (source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.3 644))
-  (source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.2 644))
+  (source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.3 644))
   (source/Makefile.show_luc (lurette/b/40_Makefile.s 1.9 644))
   (source/Makefile.lucky (lurette/b/41_Makefile.i 1.21 644))
-  (source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.6 644))
+  (source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.7 644))
   (source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.20 644))
-  (source/Makefile (lurette/c/20_Makefile 1.17 644))
+  (source/Makefile (lurette/c/20_Makefile 1.18 644))
 
 ;; Documentation
   (doc/Interface_draft (lurette/19_Interface_ 1.1 644))
@@ -153,19 +154,19 @@ ihm/xlurette/*.ml:
   (README (lurette/10_README 1.9 644))  
   (ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
   (TAGS (lurette/21_TAGS 1.6 644))
-  (TODO (lurette/d/22_TODO 1.16 644))
-  (share/lucky_init.csh.in (lurette/e/23_lucky_init 1.5 644))
-  (share/lucky_init.sh.in (lurette/e/24_lucky_init 1.5 644))
+  (TODO (lurette/d/22_TODO 1.17 644))
+  (share/lucky_init.csh.in (lurette/e/23_lucky_init 1.6 644))
+  (share/lucky_init.sh.in (lurette/e/24_lucky_init 1.6 644))
 
   (share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.2 744))
   (share/plot (lurette/e/35_plot 1.2 744))
 
-  (test/time-ossau.exp (lurette/b/48_time.exp 1.42 644))
-  (test/time-ossau.res (lurette/b/49_time.res 1.45 644))
-  (test/time-ecrins.res (lurette/d/20_time-ecrin 1.19 644))
-  (test/time-ecrins.exp (lurette/d/21_time-ecrin 1.19 644))
-  (test/time-moucherotte.exp (lurette/e/37_time-mouch 1.1 644))
-  (test/time-moucherotte.res (lurette/e/38_time-mouch 1.1 644))
+  (test/time-ossau.exp (lurette/b/48_time.exp 1.43 644))
+  (test/time-ossau.res (lurette/b/49_time.res 1.46 644))
+  (test/time-ecrins.res (lurette/d/20_time-ecrin 1.20 644))
+  (test/time-ecrins.exp (lurette/d/21_time-ecrin 1.20 644))
+  (test/time-moucherotte.exp (lurette/e/37_time-mouch 1.2 644))
+  (test/time-moucherotte.res (lurette/e/38_time-mouch 1.2 644))