Skip to content

GitLab

Commit a02a6397 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.90 Fri, 20 Sep 2002 16:17:27 +0200 by jahier 

Parent-Version:      0.89
Version-Log:

source/parse_env.ml:
    Allow arbitrary expression in the lhs of boolean
    compararison operators (<,>,=,>=,<=).

Project-Description: Lurette
parent 35a7ac64
Hide whitespace changes
Inline Side-by-side
.lurette.prcs_aux
View file @ a02a6397
......@@ -28,20 +28,20 @@
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(source/parse_env.mli 1025 1027066799 40_parse_env. 1.9)
(source/sim2chro.mli 1455 1027943375 b/23_sim2chro.m 1.5)
(ihm/xlurette/xlurette_glade_interface.ml 28276 1032510467 c/15_xlurette_g 1.2)
(ihm/xlurette/xlurette_glade_interface.ml 28245 1032531447 c/15_xlurette_g 1.3)
(test/passerelle.ima 972 1027066799 b/17_passerelle 1.7)
(source/ima_exe.ml 12101 1032355637 b/32_ima_exe.ml 1.18)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/control.ml 4416 1030975996 c/4_control.ml 1.3)
(source/eval.ml 7755 1027066799 49_eval.ml 1.13)
(source/gen_stubs.ml 34392 1032355637 24_generate_l 1.34)
(source/parse_env.ml 22518 1032362091 41_parse_env. 1.24)
(source/parse_env.ml 22623 1032531447 41_parse_env. 1.25)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(source/automata.mli 3397 1027349504 b/46_automata.m 1.2)
(source/sim2chro.ml 2716 1032355637 b/24_sim2chro.m 1.12)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/formula.mli 3665 1032510467 44_formula.ml 1.15)
(demo/chaudiere/chaudiere.ima 447 1032510467 c/11_chaudiere. 1.2)
(demo/chaudiere/chaudiere.ima 452 1032531447 c/11_chaudiere. 1.3)
(demo/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(test/time.res 5577 1030614411 b/49_time.res 1.6)
......@@ -63,7 +63,7 @@
(source/show_env.ml 3603 1030532285 43_show_env.m 1.12)
(source/gne.mli 1079 1027066799 b/36_gne.mli 1.2)
(source/automata.ml 15818 1032355637 b/47_automata.m 1.4)
(ihm/xlurette/xlurette_glade_main.ml 16335 1032510467 c/12_xlurette_g 1.4)
(ihm/xlurette/xlurette_glade_main.ml 16664 1032531447 c/12_xlurette_g 1.5)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(bin/Makefile.lurette_lib 1768 1031732392 c/2_Makefile.l 1.2)
(bin/Makefile.gen_stubs 472 1030532285 b/42_Makefile.g 1.2)
......@@ -74,14 +74,14 @@
(test/temp_int.ima 647 1027066799 b/50_temp_int.e 1.1)
(source/gne.ml 8173 1027066799 b/37_gne.ml 1.2)
(test/tram_simple.h 1746 1013519411 b/25_tram_simpl 1.1)
(test/temp_float.ima 719 1027066799 b/51_temp_float 1.1)
(test/temp_float.ima 729 1032531447 b/51_temp_float 1.2)
(test/tram.ima 1038 1027066799 b/15_tram.env 1.7)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(test/heater_float.lus 175 1020068208 b/44_heater_flo 1.1)
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(source/print.mli 773 1027066799 46_print.mli 1.10)
(source/lurettetop.ml 24867 1032510467 c/1_lurettetop 1.10)
(ihm/xlurette/xlurette.glade 44810 1032510467 c/13_xlurette.g 1.3)
(ihm/xlurette/xlurette.glade 43485 1032531447 c/13_xlurette.g 1.4)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(source/graph.mli 2218 1027066799 13_graph.mli 1.9)
(test/heater_int.rif.exp 860 1028297733 b/28_heater_int 1.6)
......
demo/chaudiere/chaudiere.ima
View file @ a02a6397
......@@ -12,7 +12,7 @@ arcs =
1:
((U = pre(1,U) + pre(1, Dudt))
&&
( Dudt + 1. > (IfThenElseNum Heat_on 0. -5.))
( 2. * Dudt + 1. > (IfThenElseNum Heat_on 0. -5.))
&&
( Dudt < (IfThenElseNum Heat_on 2. 0.))) .
......
ihm/xlurette/xlurette.glade
View file @ a02a6397
......@@ -41,8 +41,9 @@
<class>GtkVPaned</class>
<name>run_panel</name>
<border_width>3</border_width>
<handle_size>18</handle_size>
<handle_size>10</handle_size>
<gutter_size>6</gutter_size>
<position>0</position>
<widget>
<class>GtkVPaned</class>
......@@ -101,7 +102,7 @@
<widget>
<class>GtkEntry</class>
<name>env_name</name>
<tooltip>Enterthe enviroment file names (eventually separated by `x' in you want to perform the automata product) e.g., tram.ima x door.ima user.ima</tooltip>
<tooltip>Enter the enviroment file names (eventually separated by `x' in you want to perform the automata product) e.g., tram.ima x door.ima user.ima</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
......@@ -126,7 +127,7 @@
<widget>
<class>GtkEntry</class>
<name>oracle_name</name>
<tooltip>Enter the name of the oracle file name</tooltip>
<tooltip>Enter the name of the oracle file</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
......@@ -441,8 +442,9 @@
<widget>
<class>GtkText</class>
<name>output_window</name>
<width>166</width>
<height>500</height>
<height>300</height>
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<editable>False</editable>
<text></text>
......@@ -454,6 +456,7 @@
<class>GtkHBox</class>
<name>hbox1</name>
<border_width>2</border_width>
<height>106</height>
<homogeneous>False</homogeneous>
<spacing>4</spacing>
<child>
......@@ -468,7 +471,7 @@
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
<type>GTK_TOOLBAR_TEXT</type>
<type>GTK_TOOLBAR_ICONS</type>
<space_size>3</space_size>
<space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
<relief>GTK_RELIEF_HALF</relief>
......@@ -493,7 +496,7 @@
<last_modification_time>Thu, 19 Sep 2002 08:54:11 GMT</last_modification_time>
</signal>
<label>Run</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_EXEC</stock_pixmap>
<icon>run.xpm</icon>
</widget>
<widget>
......@@ -527,7 +530,7 @@
<last_modification_time>Thu, 19 Sep 2002 08:53:36 GMT</last_modification_time>
</signal>
<label>Save session</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_SAVE</stock_pixmap>
<icon>save.xpm</icon>
</widget>
<widget>
......@@ -544,7 +547,7 @@
<last_modification_time>Thu, 19 Sep 2002 08:53:53 GMT</last_modification_time>
</signal>
<label>Quit</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_CLOSE</stock_pixmap>
<icon>close.xpm</icon>
</widget>
</widget>
</widget>
......@@ -823,34 +826,6 @@
</child>
</widget>
<widget>
<class>GtkButton</class>
<name>display_rif_file</name>
<border_width>4</border_width>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>display_rif_file_clicked</handler>
<last_modification_time>Wed, 11 Sep 2002 13:16:00 GMT</last_modification_time>
</signal>
<label> Show it </label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>save_session_label</name>
......@@ -1161,7 +1136,7 @@
<name>radiobutton_verteces</name>
<tooltip>Draw among the verteces of the polyhedra of solutions</tooltip>
<can_focus>True</can_focus>
<label>Verteces</label>
<label>Vertices</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>radiobutton_inside</group>
......@@ -1358,7 +1333,7 @@
<can_focus>True</can_focus>
<has_focus>True</has_focus>
<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
<type>GTK_TOOLBAR_TEXT</type>
<type>GTK_TOOLBAR_ICONS</type>
<space_size>3</space_size>
<space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
<relief>GTK_RELIEF_HALF</relief>
......@@ -1383,7 +1358,7 @@
<last_modification_time>Thu, 19 Sep 2002 08:54:11 GMT</last_modification_time>
</signal>
<label>Run</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_EXEC</stock_pixmap>
<icon>run.xpm</icon>
</widget>
<widget>
......@@ -1417,7 +1392,7 @@
<last_modification_time>Thu, 19 Sep 2002 08:53:36 GMT</last_modification_time>
</signal>
<label>Save session</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_SAVE</stock_pixmap>
<icon>save.xpm</icon>
</widget>
<widget>
......@@ -1434,7 +1409,7 @@
<last_modification_time>Thu, 19 Sep 2002 08:53:53 GMT</last_modification_time>
</signal>
<label>Quit</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_CLOSE</stock_pixmap>
<icon>close.xpm</icon>
</widget>
</widget>
</widget>
......@@ -1612,7 +1587,7 @@
<name>toolbar2</name>
<border_width>3</border_width>
<orientation>GTK_ORIENTATION_VERTICAL</orientation>
<type>GTK_TOOLBAR_BOTH</type>
<type>GTK_TOOLBAR_ICONS</type>
<space_size>5</space_size>
<space_style>GTK_TOOLBAR_SPACE_EMPTY</space_style>
<relief>GTK_RELIEF_NORMAL</relief>
......@@ -1630,13 +1605,14 @@
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Run one step</tooltip>
<signal>
<name>clicked</name>
<handler>step</handler>
<last_modification_time>Thu, 19 Sep 2002 09:19:18 GMT</last_modification_time>
</signal>
<label>Step</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_FORWARD</stock_pixmap>
<icon>step.xpm</icon>
</widget>
<widget>
......@@ -1646,29 +1622,14 @@
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Stop the current execution and close the window</tooltip>
<signal>
<name>clicked</name>
<handler>stop</handler>
<last_modification_time>Thu, 19 Sep 2002 09:21:39 GMT</last_modification_time>
</signal>
<label>Stop</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_STOP</stock_pixmap>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>button11</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<signal>
<name>clicked</name>
<handler>close_step_button_clicked</handler>
<last_modification_time>Thu, 19 Sep 2002 09:21:28 GMT</last_modification_time>
</signal>
<label>Close</label>
<stock_pixmap>GNOME_STOCK_PIXMAP_CLOSE</stock_pixmap>
<icon>close.xpm</icon>
</widget>
</widget>
</widget>
......
ihm/xlurette/xlurette_glade_interface.ml
View file @ a02a6397
......@@ -27,7 +27,7 @@ let notebook1 = GPack.notebook
in
let _ = GtkBase.Widget.set_can_focus notebook1#as_widget true in
let run_panel = GPack.paned
`VERTICAL~handle_size:18
`VERTICAL~handle_size:10
~border_width:3
()
in
......@@ -86,7 +86,7 @@ let env_name = GEdit.entry
()
in
let _ = GtkBase.Widget.set_can_focus env_name#as_widget true in
let _ = tooltips#set_tip ~text:"Enterthe enviroment file names (eventually separated by `x' in you want to perform the automata product) e.g., tram.ima x door.ima user.ima" env_name#coerce in
let _ = tooltips#set_tip ~text:"Enter the enviroment file names (eventually separated by `x' in you want to perform the automata product) e.g., tram.ima x door.ima user.ima" env_name#coerce in
let oracle_name = GEdit.entry
~packing:(table2#attach ~left:1
~top:2
......@@ -104,7 +104,7 @@ let oracle_name = GEdit.entry
()
in
let _ = GtkBase.Widget.set_can_focus oracle_name#as_widget true in
let _ = tooltips#set_tip ~text:"Enter the name of the oracle file name" oracle_name#coerce in
let _ = tooltips#set_tip ~text:"Enter the name of the oracle file" oracle_name#coerce in
let browse_ima = GButton.button
~packing:(table2#attach ~left:2
~top:1
......@@ -299,17 +299,19 @@ let scrolledwindow2 = GBin.scrolled_window
in
let output_window = GEdit.text
~packing:scrolledwindow2#add
~height:500
~width:166
~height:300
~editable:false
()
in
let _ = output_window#insert_text ~pos:0 "" in
let _ = GtkBase.Widget.set_can_focus output_window#as_widget true in
let _ = GtkBase.Widget.set_can_default output_window#as_widget true in
let _ = GtkBase.Widget.grab_default output_window#as_widget in
let hbox1 = GPack.hbox
~spacing:4
~homogeneous:false
~height:106
~packing:(run_panel#add )
()
in
......@@ -328,39 +330,27 @@ let toolbar4 = GButton.toolbar
in
let _ = GtkBase.Widget.set_can_focus toolbar4#as_widget true in
let _ = GtkBase.Widget.grab_focus toolbar4#as_widget in
let button17 = GButton.button
~packing:toolbar4#add
~label: "Run"
~border_width:4
~height:100
~width:150
let button17 = toolbar4#insert_button
~text: "Run"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/run.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Start the testing process" button17#coerce in
let button18 = GButton.button
~packing:toolbar4#add
~label: "Sim2chro"
~border_width:4
~height:100
~width:150
let button18 = toolbar4#insert_button
~text: "Sim2chro"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/chrono.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Call sim2chro with the lastly generated data" button18#coerce in
let button19 = GButton.button
~packing:toolbar4#add
~label: "Save session"
~border_width:4
~height:100
~width:150
let button19 = toolbar4#insert_button
~text: "Save session"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/save.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Save session" button19#coerce in
let button20 = GButton.button
~packing:toolbar4#add
~label: "Quit"
~border_width:4
~height:100
~width:150
let button20 = toolbar4#insert_button
~text: "Quit"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/close.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Quit xlurette" button20#coerce in
......@@ -579,22 +569,6 @@ let rif_file = GEdit.entry
in
let _ = GtkBase.Widget.set_can_focus rif_file#as_widget true in
let _ = tooltips#set_tip ~text:"Name of file the test results is put in" rif_file#coerce in
let display_rif_file = GButton.button
~packing:(table6#attach ~left:2
~top:3
~right:3
~bottom:4
~xpadding:0
~ypadding:0
~expand:`NONE
~shrink:`NONE
~fill:`X
)
~label: " Show it "
~border_width:4
()
in
let _ = GtkBase.Widget.set_can_focus display_rif_file#as_widget true in
let save_session_label = GMisc.label
~text: "saved session "
~packing:(table6#attach ~left:0
......@@ -835,7 +809,7 @@ let radiobutton_verteces = GButton.radio_button
~fill:false
~expand:false
)
~label: "Verteces"
~label: "Vertices"
~draw_indicator:true
~active:false
()
......@@ -992,39 +966,27 @@ let toolbar3 = GButton.toolbar
in
let _ = GtkBase.Widget.set_can_focus toolbar3#as_widget true in
let _ = GtkBase.Widget.grab_focus toolbar3#as_widget in
let button13 = GButton.button
~packing:toolbar3#add
~label: "Run"
~border_width:4
~height:100
~width:150
let button13 = toolbar3#insert_button
~text: "Run"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/run.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Start the testing process" button13#coerce in
let button14 = GButton.button
~packing:toolbar3#add
~label: "Sim2chro"
~border_width:4
~height:100
~width:150
let button14 = toolbar3#insert_button
~text: "Sim2chro"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/chrono.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Call sim2chro with the lastly generated data" button14#coerce in
let button15 = GButton.button
~packing:toolbar3#add
~label: "Save session"
~border_width:4
~height:100
~width:150
let button15 = toolbar3#insert_button
~text: "Save session"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/save.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Save session" button15#coerce in
let button16 = GButton.button
~packing:toolbar3#add
~label: "Quit"
~border_width:4
~height:100
~width:150
let button16 = toolbar3#insert_button
~text: "Quit"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/close.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Quit xlurette" button16#coerce in
......@@ -1047,8 +1009,6 @@ let _ = button13#connect#clicked
~callback:callbacks#run_lurette in
let _ = button2#connect#clicked
~callback:callbacks#save_session in
let _ = display_rif_file#connect#clicked
~callback:callbacks#display_rif_file_clicked in
let _ = button20#connect#clicked
~callback:callbacks#quit in
let _ = button19#connect#clicked
......@@ -1107,7 +1067,6 @@ method rif_file_label = rif_file_label
method formula_nb = formula_nb
method draw_nb = draw_nb
method rif_file = rif_file
method display_rif_file = display_rif_file
method save_session_label = save_session_label
method saved_session_file = saved_session_file
method button2 = button2
......@@ -1286,32 +1245,18 @@ let toolbar2 = GButton.toolbar
~space_style:`EMPTY
()
in
let button9 = GButton.button
~packing:toolbar2#add
~label: "Step"
~border_width:4
~height:100
~width:150
()
in
let button10 = GButton.button
~packing:toolbar2#add
~label: "Stop"
~border_width:4
~height:100
~width:150
let button9 = toolbar2#insert_button
~text: "Step"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/step.xpm" ()) ())#coerce
()
in
let button11 = GButton.button
~packing:toolbar2#add
~label: "Close"
~border_width:4
~height:100
~width:150
let _ = tooltips#set_tip ~text:"Run one step" button9#coerce in
let button10 = toolbar2#insert_button
~text: "Stop"
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/close.xpm" ()) ())#coerce
()
in
let _ = button11#connect#clicked
~callback:callbacks#close_step_button_clicked in
let _ = tooltips#set_tip ~text:"Stop the current execution and close the window" button10#coerce in
let _ = button10#connect#clicked
~callback:callbacks#stop in
let _ = button9#connect#clicked
......@@ -1324,6 +1269,5 @@ method vbox12 = vbox12
method toolbar2 = toolbar2
method button9 = button9
method button10 = button10
method button11 = button11
initializer callbacks#set_step_by_step_window self;
end
ihm/xlurette/xlurette_glade_main.ml
View file @ a02a6397
......@@ -184,7 +184,8 @@ class customized_callbacks = object(self)
let cmd_stop = (" \n") in
if debug then (output_string stderr cmd_stop; flush stderr);
output_string oc cmd_stop;
flush oc;
flush oc;
self#top_step_by_step_window#step_by_step_window#misc#hide ();
self#read_until_promt ()
)
else
......@@ -521,9 +522,18 @@ let icon file_name =
let main () =
(* To turn around a bug in mlglade which searches the pixmaps dir
in the current dir instead of the xlurette one. *)
let _ =
Unix.symlink
(Filename.concat (Unix.getenv "LURETTE_PATH") "ihm/xlurette/pixmaps")
"pixmaps"
in
let callbacks = new customized_callbacks in
let xlurette = new Xlurette_glade_interface.top_xlurette callbacks in
let step_by_step =
new Xlurette_glade_interface.top_step_by_step_window callbacks
in
......@@ -546,7 +556,9 @@ let main () =
(* let res_file_oc = Unix.out_channel_of_descr in *)
let args = (Array.make 2 "") in
if !restore
then (* Does not work. why ??? *)
(
......
lurette.prj
View file @ a02a6397
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 89)
(Parent-Version lurette 0 88)
(Project-Version lurette 0 90)
(Parent-Version lurette 0 89)
(Version-Log "
Chech that automata run concurenty do not share any variables.
source/parse_env.ml:
Allow arbitrary expression in the lhs of boolean
compararison operators (<,>,=,>=,<=).
")
(New-Version-Log ""
)
(Checkin-Time "Fri, 20 Sep 2002 10:27:47 +0200")
(Checkin-Time "Fri, 20 Sep 2002 16:17:27 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -49,7 +50,7 @@ Chech that automata run concurenty do not share any variables.
(source/rnumsolver.ml (lurette/b/27_rnumsolver 1.7 644))
(source/parse_env.mli (lurette/40_parse_env. 1.9 644))
(source/parse_env.ml (lurette/41_parse_env. 1.24 644))
(source/parse_env.ml (lurette/41_parse_env. 1.25 644))
(source/show_env.mli (lurette/42_show_env.m 1.7 644))
(source/show_env.ml (lurette/43_show_env.m 1.12 644))
......@@ -117,7 +118,7 @@ Chech that automata run concurenty do not share any variables.
(test/porte.ima (lurette/b/16_porte.env 1.7 644))
(test/passerelle.ima (lurette/b/17_passerelle 1.7 644))
(test/temp_int.ima (lurette/b/50_temp_int.e 1.1 644))
(test/temp_float.ima (lurette/b/51_temp_float 1.1 644))
(test/temp_float.ima (lurette/b/51_temp_float 1.2 644))
(test/ControleurPorte.h (lurette/b/18_Controleur 1.1 644))
(test/ControleurPorte.c (lurette/b/19_Controleur 1.1 644))
......@@ -137,9 +138,9 @@ Chech that automata run concurenty do not share any variables.
(test/Makefile (lurette/c/0_Makefile 1.4 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.4 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.3 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.2 644))
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.5 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.4 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.3 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.1 644))
......@@ -156,7 +157,7 @@ Chech that automata run concurenty do not share any variables.
(demo/chaudiere/chaudiere_oracle.lus (lurette/c/8_chaudiere_ 1.1 644))
(demo/chaudiere/chaudiere_ctrl.lus (lurette/c/9_chaudiere_ 1.1 644))
(demo/chaudiere/buggy_chaudiere_ctrl.lus (lurette/c/10_buggy_chau 1.1 644))
(demo/chaudiere/chaudiere.ima (lurette/c/11_chaudiere. 1.2 644))
(demo/chaudiere/chaudiere.ima (lurette/c/11_chaudiere. 1.3 644))
......
source/parse_env.ml
View file @ a02a6397
......@@ -521,34 +521,65 @@ and (parse_formula: vnt list -> aut_token -> formula) =
[< 'Genlex.Kwd "!"; pl = parse_pragma_list ;
f1 = parse_formula vars;
f = parse_more_formula (Not(f1)) vars
>] -> f
| [< 'Genlex.Kwd "IfThenElse"; pl = parse_pragma_list ;
>] -> f