Skip to content
GitLab
Commit 4fe98e62 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.110 Tue, 29 Oct 2002 11:00:06 +0100 by jahier 

Parent-Version:      0.109
Version-Log:

source/util.ml:
source/lurettetop.ml:
source/gen_stubs.ml:
ihm/xlurette/xlurette_glade_main.ml:
ihm/xlurette/xlurette.glade:

Add the possibility to specify te sut and the oracle main node
(to feed the lustre compiler).

Project-Description: Lurette
parent 3c9e4e59
Hide whitespace changes
Inline Side-by-side
.lurette.prcs_aux
View file @ 4fe98e62
......@@ -42,15 +42,15 @@
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(test/Makefile 32 1035531408 c/0_Makefile 1.8)
(source/parse_env.ml 24584 1033723811 41_parse_env. 1.29)
(ihm/xlurette/xlurette_glade_main.ml 21723 1035560881 c/12_xlurette_g 1.12)
(ihm/xlurette/xlurette_glade_main.ml 23237 1035885606 c/12_xlurette_g 1.13)
(demo/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(source/solver.ml 31802 1033732198 39_solver.ml 1.32)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(source/lurette.ml 14068 1035560881 12_lurette.ml 1.58)
(source/Makefile 1114 1035531408 c/20_Makefile 1.7)
(source/util.ml 19000 1035557853 35_util.ml 1.31)
(source/util.ml 19125 1035885606 35_util.ml 1.32)
(mlcuddidl/manager.mli 7912 1034006019 c/46_manager.ml 1.1)
(test/time.res 6325 1035557853 b/49_time.res 1.17)
(test/time.res 6326 1035885606 b/49_time.res 1.18)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/sim2chro.mli 1455 1027943375 b/23_sim2chro.m 1.5)
(source/command_line_luc_exe.mli 1082 1034006019 b/34_command_li 1.5)
......@@ -60,7 +60,7 @@
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(source/Makefile.lurette_lib 1741 1035531408 c/2_Makefile.l 1.8)
(source/parse_env.mli 1025 1033738731 40_parse_env. 1.10)
(source/gen_stubs.ml 33599 1034351455 24_generate_l 1.38)
(source/gen_stubs.ml 33986 1035885606 24_generate_l 1.39)
(OcamlMakefile 22626 1034951022 17_OcamlMakef 1.45)
(source/command_line.ml 4914 1035557853 b/20_command_li 1.10)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
......@@ -69,8 +69,8 @@
(test/porte.luc 1050 1032789516 b/16_porte.env 1.8)
(make_lurette 1306 1034006019 27_make_luret 1.17)
(source/control.ml 4416 1030975996 c/4_control.ml 1.3)
(ihm/xlurette/xlurette_glade_interface.ml 31699 1035535912 c/15_xlurette_g 1.7)
(source/lurettetop.ml 28340 1035560881 c/1_lurettetop 1.19)
(ihm/xlurette/xlurette_glade_interface.ml 32774 1035885606 c/15_xlurette_g 1.8)
(source/lurettetop.ml 29440 1035885606 c/1_lurettetop 1.20)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/Makefile.lurettetop 300 1035531408 d/14_Makefile.l 1.1)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
......@@ -83,7 +83,7 @@
(source/env.mli 2027 1033738731 15_env.mli 1.16)
(mlcuddidl/rdd_caml.c 41613 1034006019 c/39_rdd_caml.c 1.1)
(Makefile.common.in 528 1034951022 d/12_Makefile.c 1.2)
(user-rules 13894 1035557853 c/14_myrules 1.15)
(user-rules 14031 1035885606 c/14_myrules 1.16)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(source/lurette.mli 448 1016027474 11_lurette.ml 1.12)
(source/gne.mli 1552 1033397911 b/36_gne.mli 1.4)
......@@ -98,7 +98,7 @@
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(Makefile 941 1035531408 d/13_Makefile 1.1)
(source/command_line.mli 1491 1035557853 b/21_command_li 1.9)
(ihm/xlurette/xlurette.glade 47917 1035535912 c/13_xlurette.g 1.8)
(ihm/xlurette/xlurette.glade 49433 1035885606 c/13_xlurette.g 1.9)
(demo/chaudiere/chaudiere.luc 446 1032789516 c/11_chaudiere. 1.5)
(source/graph.mli 2218 1027066799 13_graph.mli 1.9)
(mlcuddidl/bdd_caml.c 57199 1034006019 d/4_bdd_caml.c 1.1)
......@@ -136,7 +136,7 @@
(source/command_line_luc_exe.ml 2786 1034006019 b/33_command_li 1.7)
(mlcuddidl/cudd_caml.h 1210 1034006019 d/2_cudd_caml. 1.1)
(source/value.ml 2355 1033723811 c/23_value.ml 1.1)
(test/time.exp 6325 1035557853 b/48_time.exp 1.14)
(test/time.exp 6326 1035885606 b/48_time.exp 1.15)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(lurette.depfull.dot 49 1007651448 b/5_lurette.de 1.2)
(mlcuddidl/idd.mli 5470 1034006019 c/51_idd.mli 1.1)
......
ihm/xlurette/xlurette.glade
View file @ 4fe98e62
......@@ -74,31 +74,6 @@
<row_spacing>0</row_spacing>
<column_spacing>0</column_spacing>
<widget>
<class>GtkEntry</class>
<name>sut_name</name>
<tooltip>Enter the name of the file of the system under test</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>env_name</name>
......@@ -124,31 +99,6 @@
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>oracle_name</name>
<tooltip>Enter the name of the oracle file</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkButton</class>
<name>show_env_button</name>
......@@ -480,6 +430,122 @@
<icon>open.xpm</icon>
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<name>hbox13</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>0</top_attach>
<bottom_attach>1</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<widget>
<class>GtkEntry</class>
<name>sut_name</name>
<tooltip>Name of the file of the system under test (MANDATORY)</tooltip>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>on_sut_name_changed</handler>
<last_modification_time>Fri, 25 Oct 2002 16:04:33 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>sut_node</name>
<tooltip>Main node name</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<name>hbox14</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>True</yfill>
</child>
<widget>
<class>GtkEntry</class>
<name>oracle_name</name>
<tooltip>Name of the oracle file (MANDATORY)</tooltip>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>on_oracle_name_changed</handler>
<last_modification_time>Tue, 29 Oct 2002 07:45:49 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>oracle_node</name>
<tooltip>Oracle main node name</tooltip>
<can_focus>True</can_focus>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
</widget>
</widget>
</widget>
......@@ -1744,7 +1810,7 @@
<last_modification_time>Thu, 19 Sep 2002 09:21:39 GMT</last_modification_time>
</signal>
<label>Stop</label>
<icon>close.xpm</icon>
<icon>halt.xpm</icon>
</widget>
</widget>
</widget>
......
ihm/xlurette/xlurette_glade_interface.ml
View file @ 4fe98e62
......@@ -51,24 +51,6 @@ let table2 = GPack.table
~packing:frame1#add
()
in
let sut_name = GEdit.entry
~packing:(table2#attach ~left:1
~top:0
~right:2
~bottom:1
~xpadding:0
~ypadding:0
~expand:`X
~shrink:`NONE
~fill:`X
)
~max_length:0
~visibility:true
~editable:true
()
in
let _ = GtkBase.Widget.set_can_focus sut_name#as_widget true in
let _ = tooltips#set_tip ~text:"Enter the name of the file of the system under test" sut_name#coerce in
let env_name = GEdit.entry
~packing:(table2#attach ~left:1
~top:1
......@@ -87,24 +69,6 @@ let env_name = GEdit.entry
in
let _ = GtkBase.Widget.set_can_focus env_name#as_widget true 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
~right:2
~bottom:3
~xpadding:0
~ypadding:0
~expand:`X
~shrink:`NONE
~fill:`X
)
~max_length:0
~visibility:true
~editable:true
()
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" oracle_name#coerce in
let show_env_button = GButton.button
~packing:(table2#attach ~left:0
~top:1
......@@ -323,6 +287,84 @@ let button33 = toolbar7#insert_button
()
in
let _ = tooltips#set_tip ~text:"Browse for an oracle" button33#coerce in
let hbox13 = GPack.hbox
~spacing:0
~homogeneous:false
~packing:(table2#attach ~left:1
~top:0
~right:2
~bottom:1
~xpadding:0
~ypadding:0
~expand:`NONE
~shrink:`NONE
~fill:`BOTH
)
()
in
let sut_name = GEdit.entry
~packing:(hbox13#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
()
in
let _ = GtkBase.Widget.set_can_focus sut_name#as_widget true in
let _ = tooltips#set_tip ~text:"Name of the file of the system under test (MANDATORY)" sut_name#coerce in
let sut_node = GEdit.entry
~packing:(hbox13#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
()
in
let _ = GtkBase.Widget.set_can_focus sut_node#as_widget true in
let _ = tooltips#set_tip ~text:"Main node name" sut_node#coerce in
let hbox14 = GPack.hbox
~spacing:0
~homogeneous:false
~packing:(table2#attach ~left:1
~top:2
~right:2
~bottom:3
~xpadding:0
~ypadding:0
~expand:`NONE
~shrink:`NONE
~fill:`BOTH
)
()
in
let oracle_name = GEdit.entry
~packing:(hbox14#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
()
in
let _ = GtkBase.Widget.set_can_focus oracle_name#as_widget true in
let _ = tooltips#set_tip ~text:"Name of the oracle file (MANDATORY)" oracle_name#coerce in
let oracle_node = GEdit.entry
~packing:(hbox14#pack ~padding:0
~fill:true
~expand:true
)
~max_length:0
~visibility:true
~editable:true
()
in
let _ = GtkBase.Widget.set_can_focus oracle_node#as_widget true in
let _ = tooltips#set_tip ~text:"Oracle main node name" oracle_node#coerce in
let scrolledwindow2 = GBin.scrolled_window
~hpolicy:`AUTOMATIC
~vpolicy:`AUTOMATIC
......@@ -1094,6 +1136,10 @@ let _ = button18#connect#clicked
~callback:callbacks#call_sim2chro_clicked in
let _ = button17#connect#clicked
~callback:callbacks#run_lurette in
let _ = oracle_name#connect#changed
~callback:callbacks#on_oracle_name_changed in
let _ = sut_name#connect#changed
~callback:callbacks#on_sut_name_changed in
let _ = button33#connect#clicked
~callback:callbacks#browse_oracle_clicked in
let _ = button32#connect#clicked
......@@ -1113,9 +1159,7 @@ method run_panel = run_panel
method vpaned2 = vpaned2
method frame1 = frame1
method table2 = table2
method sut_name = sut_name
method env_name = env_name
method oracle_name = oracle_name
method show_env_button = show_env_button
method oracle_label = oracle_label
method sut_label = sut_label
......@@ -1131,6 +1175,12 @@ method toolbar6 = toolbar6
method button32 = button32
method toolbar7 = toolbar7
method button33 = button33
method hbox13 = hbox13
method sut_name = sut_name
method sut_node = sut_node
method hbox14 = hbox14
method oracle_name = oracle_name
method oracle_node = oracle_node
method scrolledwindow2 = scrolledwindow2
method output_window = output_window
method hbox1 = hbox1
......@@ -1341,7 +1391,7 @@ in
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
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:"pixmaps/halt.xpm" ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Stop the current execution and close the window" button10#coerce in
......
ihm/xlurette/xlurette_glade_main.ml
View file @ 4fe98e62
......@@ -257,15 +257,17 @@ class customized_callbacks = object(self)
method get_all_cmds () =
let sut = self#top_xlurette#sut_name#text in
let cmd_sut = ("set_sut \"" ^ sut ^ "\"\n") in
let sut = self#top_xlurette#sut_name#text
and sut_node = self#top_xlurette#sut_node#text in
let cmd_sut = ("set_sut \"" ^ sut ^ "\" \"" ^ sut_node ^ "\"\n") in
let env = self#top_xlurette#env_name#text in
let cmd_env = ("set_env \"" ^ env ^ "\"\n") in
let oracle = self#top_xlurette#oracle_name#text in
let oracle = self#top_xlurette#oracle_name#text
and oracle_node = self#top_xlurette#oracle_node#text in
let cmd_oracle =
("set_oracle \"" ^ oracle ^ "\"\n") in
("set_oracle \"" ^ oracle ^ "\" \"" ^ oracle_node ^ "\"\n") in
let test_length = self#top_xlurette#test_length#text in
let cmd_test_length = ("set_test_length " ^ test_length ^ "\n") in
......@@ -329,6 +331,26 @@ class customized_callbacks = object(self)
^ cmd_verbose ^ cmd_show_step
method on_sut_name_changed () =
if self#top_xlurette#sut_node#text = "" then
let str = self#top_xlurette#sut_name#text in
let base = Filename.basename str in
let node =
try Filename.chop_extension base
with _ -> base
in
self#top_xlurette#sut_node#set_text node
method on_oracle_name_changed () =
if self#top_xlurette#oracle_node#text = "" then
let str = self#top_xlurette#oracle_name#text in
let base = Filename.basename str in
let node =
try Filename.chop_extension base
with _ -> base
in
self#top_xlurette#oracle_node#set_text node
method run_lurette () =
let all_cmds = (self#get_all_cmds ()) ^ "run\n" in
......@@ -368,11 +390,22 @@ class customized_callbacks = object(self)
method set_sut str =
self#top_xlurette#sut_name#set_text str
method get_sut_node () =
self#top_xlurette#sut_node#text
method set_sut_node str =
self#top_xlurette#sut_node#set_text str
method get_oracle () =
self#top_xlurette#oracle_name#text
method set_oracle str =
self#top_xlurette#oracle_name#set_text str
method get_oracle_node () =
self#top_xlurette#oracle_node#text
method set_oracle_node str =
self#top_xlurette#oracle_node#set_text str
method get_test_length () =
int_of_string self#top_xlurette#test_length#text
method set_test_length i =
......@@ -419,7 +452,7 @@ class customized_callbacks = object(self)
let file_ext = Filename.basename str
and dir = Filename.dirname str in
let file = try Filename.chop_extension file_ext with _ -> file_ext in
(Filename.concat dir file)
if dir = "." then file else (Filename.concat dir file)
in
let (parse_file_name : tok -> string) =
......@@ -455,7 +488,7 @@ class customized_callbacks = object(self)
""
in
let read_cmd tok =
let rec read_cmd tok =
(* : 'a -> tok -> unit) = *)
( match tok with parser
......@@ -470,11 +503,13 @@ class customized_callbacks = object(self)
| [< 'Genlex.Ident "set_env" ; 'Genlex.String str >] ->
self#set_env str
| [< 'Genlex.Ident "set_sut" ; str = parse_file_name >] ->
self#set_sut str
| [< 'Genlex.Ident "set_sut" ; str = parse_file_name ; node = parse_node>] ->
self#set_sut str;
self#set_sut_node node
| [< 'Genlex.Ident "set_oracle" ; str = parse_file_name >] ->
self#set_oracle str
| [< 'Genlex.Ident "set_oracle" ; str = parse_file_name ; node = parse_node >] ->
self#set_oracle str;
self#set_oracle_node node
| [< 'Genlex.Ident "set_test_length" ; 'Genlex.Int i >] ->
self#set_test_length i
......@@ -521,8 +556,23 @@ class customized_callbacks = object(self)
| [< _ >] -> ()
)
and
(parse_node : tok -> string) =
fun tok ->
let str =
try
match tok with parser
| [< 'Genlex.String id >] -> id
| [< 'Genlex.Ident id >] -> id
| [< >] -> ""
with _ ->
""
in
let base = Filename.basename str in
try Filename.chop_extension base
with _ -> base
in
read_cmd (lexer (Stream.of_string line))
......
lurette.prj
View file @ 4fe98e62
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 109)
(Parent-Version lurette 0 108)
(Project-Version lurette 0 110)
(Parent-Version lurette 0 109)
(Version-Log "
ihm/xlurette/xlurette_glade_main.ml:
source/util.ml:
source/lurettetop.ml:
Retreive and print the pid of lurette to be able in xlurette
to kill the current run.
source/gen_stubs.ml:
ihm/xlurette/xlurette_glade_main.ml:
ihm/xlurette/xlurette.glade:
Add the possibility to specify te sut and the oracle main node
(to feed the lustre compiler).
")
(New-Version-Log ""
)
(Checkin-Time "Fri, 25 Oct 2002 17:48:01 +0200")
(Checkin-Time "Tue, 29 Oct 2002 11:00:06 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -43,7 +48,7 @@ source/lurettetop.ml:
(source/env.mli (lurette/15_env.mli 1.16 644))
(source/env.ml (lurette/16_env.ml 1.29 644))
(source/util.ml (lurette/35_util.ml 1.31 444))
(source/util.ml (lurette/35_util.ml 1.32 444))
(source/solver.mli (lurette/38_solver.mli 1.13 644))
(source/solver.ml (lurette/39_solver.ml 1.32 644))
......@@ -78,8 +83,8 @@ source/lurettetop.ml:
(source/gne.mli (lurette/b/36_gne.mli 1.4 644))
(source/gne.ml (lurette/b/37_gne.ml 1.4 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.19 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.38 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.20 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.39 644))
(source/control.mli (lurette/c/3_control.ml 1.2 644))
(source/control.ml (lurette/c/4_control.ml 1.3 644))
......@@ -101,7 +106,7 @@ source/lurettetop.ml:
(Makefile.common.in (lurette/d/12_Makefile.c 1.2 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.45 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.14 644))
(user-rules (lurette/c/14_myrules 1.15 644))
(user-rules (lurette/c/14_myrules 1.16 644))
(user-rules.skel (lurette/c/25_user-rules 1.1 644))