Commit 1c8385d0 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 1.29 Fri, 30 Apr 2004 16:43:39 +0200 by jahier

Parent-Version:      1.28
Version-Log:

source/ocaml2c.idl:
source/lurette.ml:
source/gen_stubs_poc.ml:
source/gen_stubs_scade.ml:
  Fix a bug where the step and the tries in the sut were completely
  wrong.

source/store.ml
  Fix a bug where, if only the ~min or the ~max options were used,
  they were ignored ...

source/parse_luc.ml:
  Make sure that ~min and ~max are fed with values, not complex expressions.

  pre-process lucky files with cpp.

source/sim2chro.ml:
  put the locals after the outputs because it is the order into
  which their values appear.

source/gen_stubs.ml:
  Do not change the oracle compiler if it is provided.

Project-Description: Lurette
parent 6de2c0e9
......@@ -3,12 +3,12 @@
(Created-By-Prcs-Version 1 3 3)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(source/show_env.mli 1153 1078751438 42_show_env.m 1.12)
(source/util.ml 21592 1080290901 35_util.ml 1.67)
(source/util.ml 21908 1083336219 35_util.ml 1.68)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 1.1)
(source/constraint.mli 1697 1082533083 c/18_constraint 1.10)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 129 1071844798 d/10_Changes 1.2)
(TODO 4779 1082533083 d/22_TODO 1.45)
(TODO 5194 1083336219 d/22_TODO 1.46)
(share/gen_fake_lutin.sh.in 115 1063786164 g/30_gen_fake_l 1.1)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/fair_bddd.ml 20312 1078751438 g/38_fair_bddd. 1.7)
......@@ -16,7 +16,7 @@
(source/ne.mli 2258 1078751438 c/22_ne.mli 1.10)
(share/config.guess 39153 1055926783 f/25_config.gue 1.1)
(polka/documentation/polka.texi 119837 1071844798 e/17_polka.texi 1.2)
(source/ocaml2c.idl 1484 1050578564 e/26_ocaml2c.id 1.2)
(source/ocaml2c.idl 1569 1083336219 e/26_ocaml2c.id 1.3)
(cuddaux/Changes 42 1034006019 c/36_Changes 1.1)
(test/cygwin-scade/lib_pilot.vsw 435 1055926783 f/46_lib_pilot. 1.1)
(mlcuddidl/idd.idl 10595 1034006019 d/1_idd.idl 1.1)
......@@ -40,7 +40,7 @@
(share/lucky_init.sh.in 142 1071844798 e/24_lucky_init 1.12)
(test/heater.lus 176 1063786164 g/33_heater.lus 1.1)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(test/test10.rif.exp 4572 1082533083 g/16_test10.rif 1.7)
(test/test10.rif.exp 4572 1083336219 g/16_test10.rif 1.8)
(test/test-scade-cygwin.res 0 1055926783 f/28_test-scade 1.1)
(source/gen_stubs_common.ml 8776 1078751438 e/39_gen_stubs_ 1.4)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
......@@ -50,7 +50,7 @@
(source/Makefile.lucky 5211 1080290901 b/41_Makefile.i 1.33)
(polka/README 1437 1047029868 e/19_README 1.1)
(README 3594 1082533083 10_README 1.15)
(source/gen_stubs_scade.ml 9609 1078751438 f/5_gen_stubs_ 1.4)
(source/gen_stubs_scade.ml 9678 1083336219 f/5_gen_stubs_ 1.5)
(test/test9.rif.exp 2473 1082533083 g/17_test9.rif. 1.7)
(source/exp.ml 7569 1079444474 g/47_exp.ml 1.9)
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
......@@ -68,7 +68,7 @@
(polka/caml/polka_caml.c 8119 1071844798 d/37_polka_caml 1.2)
(source/gen_stubs_poc.mli 648 1078751438 f/4_gen_stubs_ 1.3)
(test/losange-3d.luc 552 1076684617 d/28_losange-3d 1.5)
(test/time-moucherotte.res 4746 1079444474 e/38_time-mouch 1.22)
(test/time-moucherotte.res 4182 1083336219 e/38_time-mouch 1.23)
(polka/caml/poly.idl 10352 1076684617 d/33_poly.idl 1.3)
(test/tram/controleur_env.luc 433 1073401581 h/6_controleur 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 1.1)
......@@ -86,19 +86,19 @@
(test/sparc-scade/libdigital.saofdm 1256 1055487917 e/47_libdigital 1.1)
(test/temp_int.luc 517 1063786164 b/50_temp_int.e 1.7)
(source/print.mli 1130 1078751438 46_print.mli 1.15)
(test/time-joly.exp 10237 1082533083 b/48_time.exp 1.62)
(test/time-joly.exp 10230 1083336219 b/48_time.exp 1.63)
(polka/caml/Makefile 6586 1071844798 d/45_Makefile 1.4)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(ihm/xlurette/xlurette_glade_main.ml 59930 1082533083 c/12_xlurette_g 1.39)
(ihm/xlurette/xlurette_glade_main.ml 60405 1083336219 c/12_xlurette_g 1.40)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 106082 1080290901 c/13_xlurette.g 1.29)
(ihm/xlurette/xlurette.glade 106083 1083336219 c/13_xlurette.g 1.30)
(test/cygwin-scade/MODULE.saofd 3026 1055926783 f/45_MODULE.sao 1.1)
(source/lexeme.ml 1632 1078751438 h/22_lexeme.ml 1.1)
(test/cygwin-scade/Command.saofd 4147 1055926783 g/6_Command.sa 1.1)
(test/cygwin-scade/lib_pilot.err 119 1055926783 f/49_lib_pilot. 1.1)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(test/gyro.rif.exp 11475 1082533083 e/36_gyro.rif.e 1.12)
(test/gyro.rif.exp 11475 1083336219 e/36_gyro.rif.e 1.13)
(test/time-ecrins.exp 10233 1080290901 d/21_time-ecrin 1.45)
(source/value.ml 2681 1078751438 c/23_value.ml 1.9)
(source/gne.ml 3426 1082533083 b/37_gne.ml 1.9)
......@@ -111,7 +111,7 @@
(polka/C/Makefile 7704 1071844798 e/15_Makefile 1.2)
(source/Makefile.gen_fake_lutin 612 1076684617 d/17_Makefile.g 1.5)
(Makefile.common.source 455 1076684617 e/33_Makefile.c 1.11)
(test/test11.rif.exp 4771 1082533083 h/9_test11.rif 1.6)
(test/test11.rif.exp 4771 1083336219 h/9_test11.rif 1.7)
(test/tram/porte.luc 651 1080290901 h/3_porte.luc 1.2)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/control.ml 4549 1078751438 c/4_control.ml 1.6)
......@@ -130,7 +130,7 @@
(test/cygwin-scade/Control.saofd 6690 1055926783 g/3_Control.sa 1.1)
(source/exp.mli 3096 1079444474 g/48_exp.mli 1.6)
(test/cygwin-scade/telemetry_validation.saofd 4738 1055926783 f/34_telemetry_ 1.1)
(test/test12.rif.exp 3382 1082533083 h/10_test12.rif 1.4)
(test/test12.rif.exp 3382 1083336219 h/10_test12.rif 1.5)
(share/lurettetop_sh.in 781 1063786164 g/24_lurettetop 1.1)
(mlcuddidl/manager.mli 7912 1034006019 c/46_manager.ml 1.1)
(share/pixmaps/run.xpm 369 1055926783 f/13_run.xpm 1.1)
......@@ -147,7 +147,7 @@
(test/cygwin-scade/Pilot.etp 2175 1055926783 f/43_Pilot.etp 1.1)
(polka/C/pkint.h 6036 1047029868 e/12_pkint.h 1.1)
(share/pixmaps/gnuplot-rif.xpm 645 1055926783 f/19_gnuplot-ri 1.1)
(source/gen_stubs.ml 12760 1078751438 24_generate_l 1.55)
(source/gen_stubs.ml 12567 1083336219 24_generate_l 1.56)
(polka/caml/vector.idl 10381 1076684617 d/35_vector.idl 1.4)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1532 1078751438 b/23_sim2chro.m 1.12)
......@@ -161,18 +161,18 @@
(share/gen_stubs.sh.in 110 1063786164 g/29_gen_stubs. 1.1)
(polka/C/satmat.c 6254 1047029868 e/4_satmat.c 1.1)
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(share/plot 11479 1082533083 e/35_plot 1.10)
(share/plot 11519 1083336219 e/35_plot 1.11)
(share/pixmaps/save.xpm 867 1055926783 f/12_save.xpm 1.1)
(source/solver.mli 1790 1078751438 38_solver.mli 1.24)
(test/passerelle.luc 963 1063786164 b/17_passerelle 1.12)
(source/store.ml 36284 1082533083 b/27_rnumsolver 1.41)
(source/store.ml 36616 1083336219 b/27_rnumsolver 1.42)
(mlcuddidl/mtbdd.mli 4395 1034006019 c/43_mtbdd.mli 1.1)
(test/sparc-scade/exo1.vsp 2123 1074519403 e/49_exo1.vsp 1.2)
(polka/C/satmat.h 1254 1047029868 d/48_satmat.h 1.1)
(share/pixmaps/stop.xpm 6385 1055926783 f/8_stop.xpm 1.1)
(test/window.luc 4336 1063786164 g/15_window.luc 1.1)
(source/ne.ml 10554 1082533083 c/21_ne.ml 1.13)
(source/gen_stubs_poc.ml 8883 1078751438 f/3_gen_stubs_ 1.3)
(source/gen_stubs_poc.ml 8757 1083336219 f/3_gen_stubs_ 1.4)
(source/thickness.ml 1386 1078751438 g/51_thickness. 1.4)
(test/tram/tramway.lus 4353 1080290901 h/1_tramway.lu 1.3)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
......@@ -184,19 +184,19 @@
(test/sparc-scade/libmath.saofdm 1378 1055487917 e/45_libmath.sa 1.1)
(Makefile 68 1051024737 d/13_Makefile 1.4)
(share/Makefile.test.in 4029 1080290901 c/25_user-rules 1.13)
(source/sut.ml 2241 1080290901 h/29_sut.ml 1.1)
(source/sut.ml 2317 1083336219 h/29_sut.ml 1.2)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
(test/sparc-scade/libmathadvanced.saofdm 3267 1055487917 e/44_libmathadv 1.1)
(test/sparc-scade/exo1.vsw 400 1055487917 e/48_exo1.vsw 1.1)
(test/heater_float.rif.exp 1305 1082533083 b/30_heater_flo 1.22)
(test/heater_float.rif.exp 1305 1083336219 b/30_heater_flo 1.23)
(cuddaux/Makefile 3375 1078749975 c/35_Makefile 1.10)
(polka/C/bit.c 3301 1071844798 e/10_bit.c 1.2)
(source/draw.mli 451 1078751438 f/1_draw.mli 1.3)
(polka/caml/polkaIO.ml 1651 1071844798 d/44_polkaIO.ml 1.2)
(mlcuddidl/macros.m4 11392 1071844798 c/49_macros.m4 1.2)
(source/print.ml 5822 1078751438 47_print.ml 1.27)
(test/heater_int.rif.exp 1082 1082533083 b/28_heater_int 1.20)
(test/sparc-scade/scade.rif.exp 1186 1076684617 f/0_scade.rif. 1.5)
(test/heater_int.rif.exp 1082 1083336219 b/28_heater_int 1.21)
(test/sparc-scade/scade.rif.exp 1536 1083336219 f/0_scade.rif. 1.6)
(source/parse_poc.ml 3988 1078751438 d/15_parse_poc. 1.8)
(test/cygwin-scade/det_center.saofd 4993 1055926783 g/0_det_center 1.1)
(share/pixmaps/stock_save.xpm 3420 1055926783 f/9_stock_save 1.1)
......@@ -213,19 +213,19 @@
(test/tram/tramway.luc 1138 1080290901 h/2_tramway.lu 1.2)
(source/constraint.ml 3154 1078751438 c/19_constraint 1.11)
(test/structured_type.luc 2346 1079084640 g/32_structured 1.4)
(source/formula_to_bdd.ml 17825 1082533083 g/34_formula_to 1.9)
(source/formula_to_bdd.ml 17977 1083336219 g/34_formula_to 1.10)
(test/cygwin-scade/counter.saofd 587 1055926783 g/2_counter.sa 1.1)
(test/test7.rif.exp 470 1082533083 g/12_test7.rif. 1.8)
(test/test7.rif.exp 473 1083336219 g/12_test7.rif. 1.9)
(test/poly-int/poly.lus 72 1073401581 h/7_poly.lus 1.1)
(source/bddd.ml 18371 1079014759 g/36_bddd.ml 1.9)
(ihm/xlurette/xlurette_glade_interface.ml 82345 1080290901 c/15_xlurette_g 1.27)
(source/oracle.ml 2736 1080290901 h/31_oracle.ml 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 82346 1083336219 c/15_xlurette_g 1.28)
(source/oracle.ml 2749 1083336219 h/31_oracle.ml 1.2)
(INSTALL 479 1082533083 f/26_INSTALL 1.3)
(test/cygwin-scade/MyConsts.saofd 153 1055926783 f/44_MyConsts.s 1.1)
(test/losange-3d2.luc 355 1076684617 e/32_losange-3d 1.6)
(test/Makefile 4007 1082533083 c/0_Makefile 1.18)
(user-rules 39159 1082533083 c/14_myrules 1.60)
(test/infinite_weight.luc 1113 1076684617 g/13_infinite_w 1.2)
(test/Makefile 4080 1083336219 c/0_Makefile 1.19)
(user-rules 39196 1083336219 c/14_myrules 1.61)
(test/infinite_weight.luc 1114 1083336219 g/13_infinite_w 1.3)
(mlcuddidl/cudd_caml.c 23483 1071844798 d/3_cudd_caml. 1.2)
(polka/C/config.h 78 1071844798 e/13_config.h 1.2)
(test/usager.luc 454 1063786164 b/14_usager.env 1.13)
......@@ -242,16 +242,16 @@
(test/cygwin-scade/det_mvt_mode_env.luc 283 1063029729 f/31_det_mvt_mo 1.2)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(source/lustreExp.mli 2025 1079444474 g/46_lustreExp. 1.8)
(source/parse_luc.ml 41755 1080290901 41_parse_env. 1.60)
(source/parse_luc.ml 43680 1083336219 41_parse_env. 1.61)
(OcamlMakefile 21318 1078749975 17_OcamlMakef 1.52)
(polka/caml/polka.ml 5602 1071844798 d/39_polka.ml 1.2)
(source/lurette.mli 752 1078751438 11_lurette.ml 1.17)
(test/time-rey.res 10235 1080290901 h/14_time-rey.r 1.6)
(test/time-rey.res 10248 1083336219 h/14_time-rey.r 1.7)
(share/pixmaps/halt.xpm 511 1055926783 f/18_halt.xpm 1.1)
(share/xlurette_sh.in 779 1063786164 g/20_xlurette_s 1.1)
(polka/C/matrix.c 26957 1071844798 e/7_matrix.c 1.2)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(share/configure.in 8555 1082533083 d/11_configure. 1.18)
(share/configure.in 8555 1083336219 d/11_configure. 1.19)
(test/tram.luc 1325 1063786164 b/15_tram.env 1.12)
(demo-xlurette/fault-tolerant-heater/wearing-sensors.luc 1343 1076684617 h/15_wearing-se 1.1)
(demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
......@@ -259,12 +259,12 @@
(polka/C/matrix.h 3846 1071844798 d/51_matrix.h 1.2)
(cuddaux/cuddaux.h 2380 1076684617 c/33_cuddaux.h 1.2)
(share/lurettetop.bat.in 672 1063786164 g/26_lurettetop 1.1)
(share/lucky.el 14167 1082533083 f/7_lucky.el 1.7)
(share/lucky.el 14256 1083336219 f/7_lucky.el 1.8)
(source/genlex.mli 3134 1078751438 h/23_genlex.mli 1.1)
(mlcuddidl/sedscript 203 1034006019 c/38_sedscript 1.1)
(test/cygwin-scade/.lurette_rc 551 1063029729 f/29_.lurette_r 1.2)
(source/env_state.mli 1750 1082533083 50_env_state. 1.41)
(test/ControleurPorte.rif.exp 5436 1082533083 b/29_Controleur 1.25)
(test/ControleurPorte.rif.exp 5436 1083336219 b/29_Controleur 1.26)
(source/show_luc.ml 4265 1078751438 e/25_show_luc.m 1.9)
(share/pixmaps/quit.xpm 494 1055926783 f/14_quit.xpm 1.1)
(share/xlurette.sh.in 115 1080290901 g/21_xlurette.s 1.2)
......@@ -275,12 +275,12 @@
(polka/caml/polka_lexer.mll 786 1047029868 d/42_polka_lexe 1.1)
(cuddaux/cuddauxInt.h 2058 1034006019 c/28_cuddauxInt 1.1)
(polka/caml/polkaIO.mli 1517 1047029868 d/43_polkaIO.ml 1.1)
(test/time-joly.res 10230 1082533083 b/49_time.res 1.67)
(test/time-joly.res 10235 1083336219 b/49_time.res 1.68)
(test/cygwin-scade/det_mvt_mode_cstext.c 703 1055926783 f/33_det_mvt_mo 1.1)
(test/cygwin-scade/pilot.saofdm 394 1055926783 f/41_pilot.saof 1.1)
(source/parse_poc.mli 1131 1078751438 d/29_parse_poc. 1.5)
(source/Makefile.gen_stubs 914 1076684617 b/42_Makefile.g 1.10)
(test/temp_float.luc 680 1063786164 b/51_temp_float 1.10)
(test/temp_float.luc 682 1083336219 b/51_temp_float 1.11)
(polka/C/polka.c 5608 1071844798 e/6_polka.c 1.2)
(source/polyhedron.mli 1772 1078751438 d/26_polyhedron 1.10)
(test/test_losange.lus 88 1055926783 f/27_test_losan 1.1)
......@@ -308,7 +308,7 @@
(demo-xlurette/chaudiere/chaudiere_ctrl.lus 178 1063786164 c/9_chaudiere_ 1.2)
(test/losange-3d.rif.exp 33458 1082533083 e/31_losange-3d 1.10)
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 3156 1082533083 b/24_sim2chro.m 1.27)
(source/sim2chro.ml 3155 1083336219 b/24_sim2chro.m 1.28)
(source/type.ml 2853 1078751438 h/12_type.ml 1.2)
(source/poly_draw.ml 21804 1078751438 g/43_polyDraw.m 1.4)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
......@@ -316,7 +316,7 @@
(source/gne.mli 1845 1082533083 b/36_gne.mli 1.8)
(test/test13.rif.exp 594 1082533083 h/26_test13.rif 1.3)
(test/cygwin-scade/Direction_D1.saofd 1298 1055926783 f/50_Direction_ 1.1)
(source/lurette.ml 17917 1080290901 12_lurette.ml 1.90)
(source/lurette.ml 17984 1083336219 12_lurette.ml 1.91)
(share/lucky.bat.in 584 1063786164 g/28_lucky.bat. 1.1)
(share/lucky.sh.in 111 1080290901 g/27_lucky.sh.i 1.2)
(test/sparc-scade/liblinear.saofdm 1301 1055487917 e/46_liblinear. 1.1)
......@@ -324,9 +324,9 @@
(cuddaux/cuddauxCompose.c 13638 1034006019 c/30_cuddauxCom 1.1)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(source/gen_fake_lutin.ml 4559 1078751438 d/16_gen_fake_l 1.8)
(source/sut.mli 434 1080290901 h/30_sut.mli 1.1)
(source/sut.mli 440 1083336219 h/30_sut.mli 1.2)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(share/set_env_var.in 1071 1078749975 g/23_set_env_va 1.3)
(share/set_env_var.in 1739 1083336219 g/23_set_env_va 1.4)
(source/formula_to_bdd.mli 1266 1078751438 g/35_formula_to 1.7)
(polka/Makefile 1646 1076684617 e/21_Makefile 1.2)
(test/dynamic_weight.luc 709 1079444474 g/14_dynamic_we 1.6)
......@@ -335,7 +335,7 @@
(test/porte.luc 1014 1063786164 b/16_porte.env 1.12)
(source/gen_stubs_common.mli 1511 1078751438 e/40_gen_stubs_ 1.3)
(test/cygwin-scade/scade.rif.exp 1380 1063029729 g/7_scade.rif. 1.2)
(share/gnuplot-rif 1980 1082533083 e/34_gnuplot-ri 1.9)
(share/gnuplot-rif 2018 1083336219 e/34_gnuplot-ri 1.10)
(source/genlex.ml 9500 1078751438 h/24_genlex.ml 1.1)
(test/cygwin-scade/Pilot_type.saofd 962 1055926783 f/37_Pilot_type 1.1)
(source/rif.mli 719 1080290901 h/28_rif.mli 1.1)
......
......@@ -18,10 +18,28 @@ et je ne suis plus oblig
ne sont pas mis a jour) -> le retester
* PB ne trouve pas ec2c, etc...
*********** A faire
* quand un saofdm est selectionné, passer en mode scade
* Préciser dans le manuel le role des 2 fenetres + mettre
un message dans chaque fenetres du style
"This is the standard output window"
"This is the standard error window"
???
* Rajouter une section "Add Environement variables "
+ faire une passe sur toutes les parametres que l'on peut positionné
depuis la fenetre principale.
* plot a besion de gnu-awk ... Je devrais ecrire moi-meme en caml
le programme qui genere le bon format pour gnuplot...
En plus, Pour les gros fichier, ca rame à donf !
* Faire une section <<Testing programs that are not lustre or scade programs>>
que je pourrais appeler aussi <<Compiling versus interpreting>>
voire <<compiled modes and pipeline mode>>
......@@ -43,8 +61,6 @@ et je ne suis plus oblig
ou mettre tous les .so dans un repertoire (comme matlab) ???
* plot a besion de gnu-awk ... Je devrais ecrire moi-meme en caml
le programme qui genere le bon format pour gnuplot...
* Finir le ocaml-lutin (.mluc)
......
......@@ -534,7 +534,7 @@ verimag
<handler>on_extra_var_button_clicked</handler>
<last_modification_time>Mon, 16 Jun 2003 11:56:14 GMT</last_modification_time>
</signal>
<label> Extra Environment Varibles </label>
<label> Extra Environment Variables </label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<left_attach>1</left_attach>
......
......@@ -347,7 +347,7 @@ let button97 = GButton.button
~shrink:`NONE
~fill:`X
)
~label: " Extra Environment Varibles "
~label: " Extra Environment Variables "
()
in
let _ = GtkBase.Widget.set_can_focus button97#as_widget true in
......
......@@ -63,6 +63,7 @@ let user_seed_present = ref true
let vertices_nb_present = ref true
let user_seed = ref 0
(**************************************************************************)
......@@ -198,74 +199,6 @@ let rec (readfile_line : in_channel -> string list -> string list) =
else (readfile_line ic (line::acc))
(** returns the list of nodes of a lustre or saofdm file *)
let (nodes_info : string -> string list) =
fun file ->
let file_info = Filename.temp_file (Filename.basename file) "nodes_info" in
let file_lus = file in
let files =
try
if
Filename.check_suffix file ".saofdm"
then
let cmd = ("getsaonodes " ^ file ^ " > " ^ file_info) in
if
Sys.file_exists file_lus
then
(
if
((Sys.command cmd) <> 0)
then
(
output_string stderr cmd ;
output_string stderr
("\n*** getsaonodes failed.\n" ^ cmd ^ "\n");
flush stderr;
[]
)
else
(
let ic = open_in file_info in
let nodes = readfile_line ic [] in
close_in ic;
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.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;
nodes
)
)
else
[]
else
[]
with
_ -> []
in
if Sys.file_exists file_info then Sys.remove file_info;
files
(** returns the list of files specified by the filter *)
let (get_files_list_filtered : string -> string list -> string list) =
......@@ -312,6 +245,77 @@ class customized_callbacks = object(self)
self#top_xlurette#error_window#insert str;
self#top_xlurette#tdm_error_window#insert str
(** returns the list of nodes of a lustre or saofdm file *)
method nodes_info file =
(* (nodes_info : string -> string list) = *)
let file_info = Filename.temp_file (Filename.basename file) "nodes_info" in
let files =
try
if
Filename.check_suffix file ".saofdm"
then
let cmd = ("getsaonodes " ^ file ^ " > " ^ file_info) in
if
Sys.file_exists file
then
(
if
((Sys.command cmd) <> 0)
then
(
output_string stderr cmd ;
output_string stderr
("\n*** getsaonodes failed.\n" ^ cmd ^ "\n");
flush stderr;
[]
)
else
(
let ic = open_in file_info in
let nodes = readfile_line ic [] in
close_in ic;
nodes
)
)
else
[]
else if
Filename.check_suffix file ".lus"
then
let cmd = ("lusinfo " ^ file ^ " nodes > " ^ file_info) in
if
Sys.file_exists file
then
(
if
((Sys.command cmd) <> 0)
then
(
self#put_misc
("Warning: lusinfo failed.\n " ^ cmd ^ "\n" ^
" Probably this lustre file is not an academic " ^
"lustre file, but a lustre file generated by scade.\n");
flush stderr;
[]
)
else
(
let ic = open_in file_info in
let nodes = readfile_line ic [] in
close_in ic;
nodes
)
)
else
[]
else
[]
with
_ -> []
in
if Sys.file_exists file_info then Sys.remove file_info;
files
method read_ltop_stdout () =
let length =
try
......@@ -378,7 +382,7 @@ class customized_callbacks = object(self)
let lurette_pid = String.sub str 22 ((String.length str) - 22) in
lpid := int_of_string lurette_pid;
()
else if
String.length str > 22
&& String.sub str 0 22 = "The Pid of lucky is "
......@@ -450,7 +454,7 @@ class customized_callbacks = object(self)
self#top_step_by_step_window#step_by_step_window#show ()
(**************************************************************************)
(**************************************************************************)
method add_sut_node () =
if not !sut_node_present then
(
......@@ -529,7 +533,7 @@ class customized_callbacks = object(self)
vertices_nb_present := false
)
(**************************************************************************)
(**************************************************************************)
method set_pipe_mode () =
......@@ -599,7 +603,7 @@ class customized_callbacks = object(self)
and env_name = self#get_env ()
in
running_mode :=
Compile(sut_name, sut_node, oracle_name, oracle_node, env_name);
Compile(sut_name, sut_node, oracle_name, oracle_node, env_name);
self#top_xlurette#sut_hbox#remove self#top_xlurette#sut_compiler#coerce;
self#add_sut_node ();
......@@ -607,16 +611,16 @@ class customized_callbacks = object(self)
self#add_oracle_node ();
self#add_oracle_compiler ();
self#update_sut_and_oracle_combo ()
method on_sut_compiler_entry_changed () =
if (self#get_sut_compiler ()) = "stdin/stdout" then
self#set_pipe_mode ()
else
self#set_compiler_mode ()
method on_user_seed_changed () =
user_seed := int_of_string self#top_set_parameters_window#user_seed#text
......@@ -834,16 +838,20 @@ class customized_callbacks = object(self)
(* to quit xlurette *)
method quit () =
output_string oc "\n\nquit\n"; (* to kill lurettetop *)
output_string oc " quit\n"; (* to kill lurettetop *)
flush oc;
prerr_endline "xlurette: bye! " ;
(* let's make sure everyone is dead *)
if !luc_pid <> 0 then (try Unix.kill (!luc_pid) Sys.sigkill with _ -> () );
if !spid <> 0 then (try Unix.kill (!spid) Sys.sigkill with _ -> () );
if !lpid <> 0 then (try Unix.kill (!lpid) Sys.sigkill with _ -> () );
if !opid <> 0 then (try Unix.kill (!opid) Sys.sigkill with _ -> () );
if !pid <> 0 then (try Unix.kill (!pid) Sys.sigkill with _ -> () );
exit 0
flush stdout;
let (pid',_) = (Unix.waitpid [Unix.WUNTRACED] !pid) in
if pid' <> 0 then (try Unix.kill (!pid) Sys.sigkill with _ -> () );
(* let's make sure everyone is dead *)
if !luc_pid <> 0 then (try Unix.kill (!luc_pid) Sys.sigkill with _ -> () );
if !spid <> 0 then (try Unix.kill (!spid) Sys.sigkill with _ -> () );
if !lpid <> 0 then (try Unix.kill (!lpid) Sys.sigkill with _ -> () );
if !opid <> 0 then (try Unix.kill (!opid) Sys.sigkill with _ -> () );
exit 0
method on_quit_xlurette_button_clicked () =
self#top_quit_window#quit_window#show ()
......@@ -879,7 +887,7 @@ class customized_callbacks = object(self)
("Killing process " ^ string_of_int !opid ^ "\n");
try
Unix.kill (!opid) Sys.sigint
(* Unix.kill (!opid) Sys.sigkill *)
(* Unix.kill (!opid) Sys.sigkill *)
with _ -> ()
);
......@@ -897,7 +905,7 @@ class customized_callbacks = object(self)
("Killing process " ^ string_of_int !luc_pid ^ "\n");
try
Unix.kill (!luc_pid) Sys.sigint
(* Unix.kill (!luc_pid) Sys.sigkill *)
(* Unix.kill (!luc_pid) Sys.sigkill *)
with _ -> ()
);
if !spid <> 0 then
......@@ -1175,7 +1183,6 @@ class customized_callbacks = object(self)
self#update_lucky_files_combo ();
self#update_sut_and_oracle_combo ()
method on_sut_name_changed () =
(* Update the sut node Combo list *)
let sut = self#top_xlurette#sut_name#entry#text in
......@@ -1187,12 +1194,13 @@ class customized_callbacks = object(self)
then
self#set_sut_node ""
else
let nodes = (nodes_info sut) in
if nodes <> [] then
self#top_xlurette#sut_node#set_popdown_strings nodes;
self#set_sut_node "";
self#set_oracle_node ""
let nodes = (self#nodes_info sut) in
if nodes <> [] then
(
self#top_xlurette#sut_node#set_popdown_strings nodes;
)
)
method on_sut_node_changed () =
let sut_node = self#get_sut_node () in
......@@ -1200,25 +1208,22 @@ class customized_callbacks = object(self)
sut_node <> !pre_sut_node && !pre_sut_node <> ""
then
(
self#top_xlurette#env_name_entry#entry#set_text "" ;
self#top_xlurette#oracle_name_entry#entry#set_text "" ;
self#set_oracle_node "" ;
pre_sut_node := sut_node
)
method on_oracle_name_changed () =
let oracle = self#top_xlurette#oracle_name#entry#text in
if !oracle_node_present && oracle <> !pre_oracle_name then
(
pre_oracle_name := oracle;
if oracle = "" then
self#set_oracle_node ""
else
let nodes = (nodes_info oracle) in
if nodes <> [] then
let oracle = self#top_xlurette#oracle_name#entry#text in
if !oracle_node_present && oracle <> !pre_oracle_name then
(
pre_oracle_name := oracle;
if oracle = "" then
self#set_oracle_node ""
else
let nodes = (self#nodes_info oracle) in
if nodes <> [] then
self#