Commit ceac869e authored by Erwan Jahier's avatar Erwan Jahier

lurette 1.22 Mon, 08 Mar 2004 13:46:15 +0100 by jahier

Parent-Version:      1.21
Version-Log:

Add a couple of scade files in the distrib so that it is easier
to test scade programs under linux using the generated c files.

source/value.ml
   use T and F instead of t and f for booleans (more visible under xlurette).

share/Makefile.lurette.in:
   Reorganize (clean-up) the file

xlurette/xlurette_glade_main.ml:
share/plot:
   Fix the gnuplot problems (+ <<set mouse>> in share/plot).

source/util.ml:
source/lurettetop.ml:
   Move the gnuplot stuff into lurettetop.

Project-Description: Lurette
parent d115d326
......@@ -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 1160 1069150632 42_show_env.m 1.11)
(source/util.ml 24267 1076684617 35_util.ml 1.64)
(source/util.ml 21856 1078749975 35_util.ml 1.65)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 1.1)
(source/constraint.mli 1706 1069150632 c/18_constraint 1.8)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 129 1071844798 d/10_Changes 1.2)
(TODO 3318 1076684617 d/22_TODO 1.38)
(TODO 4676 1078749975 d/22_TODO 1.39)
(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 20532 1073321175 g/38_fair_bddd. 1.6)
......@@ -25,7 +25,7 @@
(polka/C/internal.c 883 1071844798 e/8_internal.c 1.2)
(source/solver.ml 7714 1071235286 39_solver.ml 1.60)
(test/tram/passager.luc 268 1073401581 h/5_passager.l 1.1)
(ihm/xlurette/makefile 2646 1076684617 c/16_makefile 1.20)
(ihm/xlurette/makefile 2754 1078749975 c/16_makefile 1.21)
(share/gen_fake_lucky.sh.in 115 1063786164 g/31_gen_fake_l 1.1)
(demo-xlurette/fault-tolerant-heater/sensors.luc 610 1076684617 h/18_sensors.lu 1.1)
(test/test_losange-10d.lus 108 1065787303 g/41_test_losan 1.1)
......@@ -47,14 +47,14 @@
(test/cygwin-scade/Pilot_cst.saofd 788 1055926783 f/38_Pilot_cst. 1.1)
(test/cygwin-scade/lib_pilot.etp 1173 1055926783 f/48_lib_pilot. 1.1)
(source/command_line.mli 1707 1076693156 b/21_command_li 1.15)
(source/Makefile.lucky 5165 1076684617 b/41_Makefile.i 1.31)
(source/Makefile.lucky 5084 1078749975 b/41_Makefile.i 1.32)
(polka/README 1437 1047029868 e/19_README 1.1)
(README 2875 1076684617 10_README 1.12)
(README 3111 1078749975 10_README 1.13)
(source/gen_stubs_scade.ml 9749 1074519403 f/5_gen_stubs_ 1.3)
(test/test9.rif.exp 2406 1074519403 g/17_test9.rif. 1.4)
(source/exp.ml 5912 1076684617 g/47_exp.ml 1.5)
(test/test9.rif.exp 2407 1078749975 g/17_test9.rif. 1.5)
(source/exp.ml 5948 1078749975 g/47_exp.ml 1.6)
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
(source/polyhedron.ml 14061 1076684617 d/25_polyhedron 1.16)
(source/polyhedron.ml 14056 1078749975 d/25_polyhedron 1.17)
(source/Makefile.gen_fake_lucky 699 1076684617 g/9_Makefile.g 1.4)
(polka/C/poly.c 53392 1071844798 e/5_poly.c 1.2)
(source/luc_exe.mli 449 1069150632 b/31_ima_exe.ml 1.3)
......@@ -67,7 +67,7 @@
(polka/caml/polka_caml.c 8119 1071844798 d/37_polka_caml 1.2)
(source/gen_stubs_poc.mli 652 1074519403 f/4_gen_stubs_ 1.2)
(test/losange-3d.luc 552 1076684617 d/28_losange-3d 1.5)
(test/time-moucherotte.res 3690 1076684617 e/38_time-mouch 1.19)
(test/time-moucherotte.res 4690 1078749975 e/38_time-mouch 1.20)
(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)
......@@ -75,7 +75,7 @@
(mlcuddidl/mtbdd.ml 10185 1034006019 c/44_mtbdd.ml 1.1)
(source/draw.ml 2942 1069150632 f/2_draw.ml 1.3)
(source/prevar.ml 3085 1071844798 d/18_prevar.ml 1.5)
(source/var.mli 3355 1074519403 g/50_var.mli 1.6)
(source/var.mli 3330 1078749975 g/50_var.mli 1.7)
(mlcuddidl/idd.ml 7061 1034006019 d/0_idd.ml 1.1)
(test/cygwin-scade/C_SQRT.saofd 214 1055926783 g/1_C_SQRT.sao 1.1)
(test/giro/onlyroll.lus 18298 1031732392 c/7_onlyroll.l 1.1)
......@@ -87,17 +87,17 @@
(source/print.mli 1135 1069150632 46_print.mli 1.14)
(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 50217 1076693156 c/12_xlurette_g 1.35)
(ihm/xlurette/xlurette_glade_main.ml 51392 1078749975 c/12_xlurette_g 1.36)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 104738 1076693156 c/13_xlurette.g 1.27)
(ihm/xlurette/xlurette.glade 105228 1078749975 c/13_xlurette.g 1.28)
(test/cygwin-scade/MODULE.saofd 3026 1055926783 f/45_MODULE.sao 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 11065 1076684617 e/36_gyro.rif.e 1.10)
(test/time-ecrins.exp 9314 1076693156 d/21_time-ecrin 1.42)
(source/value.ml 2534 1071235286 c/23_value.ml 1.7)
(source/value.ml 2706 1078749975 c/23_value.ml 1.8)
(source/gne.ml 3468 1076684617 b/37_gne.ml 1.7)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
(source/parse_c_scade.ml 6985 1074519403 e/41_parse_c_sc 1.4)
......@@ -116,8 +116,8 @@
(test/cygwin-scade/Pilot.vsw 431 1055926783 f/39_Pilot.vsw 1.1)
(share/pixmaps/open_plus.xpm 787 1055926783 f/16_open_plus. 1.1)
(share/xlurettetop.bat.in 613 1063786164 g/19_xluretteto 1.1)
(source/env_state.ml 16152 1074519403 51_env_state. 1.55)
(test/test8.rif.exp 343 1074519403 g/18_test8.rif. 1.4)
(source/env_state.ml 16251 1078749975 51_env_state. 1.56)
(test/test8.rif.exp 344 1078749975 g/18_test8.rif. 1.5)
(polka/caml/matrix.idl 6467 1076684617 d/34_matrix.idl 1.4)
(source/fair_bddd.mli 2482 1069833150 g/39_fair_bddd. 1.5)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
......@@ -125,7 +125,7 @@
(share/pixmaps/clean-up.xpm 1565 1055926783 f/22_clean-up.x 1.1)
(source/Makefile.lurettetop 546 1076684617 d/14_Makefile.l 1.6)
(test/cygwin-scade/Control.saofd 6690 1055926783 g/3_Control.sa 1.1)
(source/exp.mli 2131 1071235286 g/48_exp.mli 1.2)
(source/exp.mli 2203 1078749975 g/48_exp.mli 1.3)
(test/cygwin-scade/telemetry_validation.saofd 4738 1055926783 f/34_telemetry_ 1.1)
(test/test12.rif.exp 2682 1076684617 h/10_test12.rif 1.3)
(share/lurettetop_sh.in 781 1063786164 g/24_lurettetop 1.1)
......@@ -136,31 +136,31 @@
(source/call_lurette_main.c 322 1050421093 e/28_call_luret 1.1)
(polka/C/vector.c 17843 1071844798 e/3_vector.c 1.2)
(test/sparc-scade/Direction_D1.saofd 1335 1074519403 e/51_Direction_ 1.2)
(source/Makefile.lurette_lib 3631 1076684617 c/2_Makefile.l 1.29)
(source/Makefile.lurette_lib 3608 1078749975 c/2_Makefile.l 1.30)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(mlcuddidl/bdd.idl 18355 1071844798 d/7_bdd.idl 1.2)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(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 13043 1074519403 24_generate_l 1.53)
(source/gen_stubs.ml 12920 1078749975 24_generate_l 1.54)
(polka/caml/vector.idl 10381 1076684617 d/35_vector.idl 1.4)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1544 1076684617 b/23_sim2chro.m 1.11)
(share/lucky_init.csh.in 150 1063786164 e/23_lucky_init 1.8)
(source/lustreExp.ml 22239 1076684617 g/45_lustreExp. 1.4)
(source/gen_fake_lucky.ml 3893 1074519403 g/8_gen_fake_l 1.5)
(source/lustreExp.ml 22236 1078749975 g/45_lustreExp. 1.5)
(source/gen_fake_lucky.ml 4012 1078749975 g/8_gen_fake_l 1.6)
(polka/C/vector.h 2367 1071844798 d/47_vector.h 1.2)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(share/pixmaps/stock_exec.xpm 3788 1055926783 f/10_stock_exec 1.1)
(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 11471 1076684617 e/35_plot 1.8)
(share/plot 11486 1078749975 e/35_plot 1.9)
(share/pixmaps/save.xpm 867 1055926783 f/12_save.xpm 1.1)
(source/solver.mli 1793 1071844798 38_solver.mli 1.23)
(test/passerelle.luc 963 1063786164 b/17_passerelle 1.12)
(source/store.ml 36345 1076684617 b/27_rnumsolver 1.37)
(source/store.ml 36343 1078749975 b/27_rnumsolver 1.38)
(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)
......@@ -172,11 +172,11 @@
(test/tram/tramway.lus 4279 1073574172 h/1_tramway.lu 1.2)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(share/Makefile.lurette.in 4525 1076684617 b/38_Makefile.l 1.31)
(share/Makefile.lurette.in 4289 1078749975 b/38_Makefile.l 1.32)
(source/lucky.ml 8946 1076684617 16_env.ml 1.41)
(source/graph.mli 2370 1071844798 13_graph.mli 1.13)
(source/store.mli 3823 1071844798 b/26_rnumsolver 1.25)
(test/time-ossau.res 9306 1076684617 b/49_time.res 1.61)
(test/time-ossau.res 9445 1078749975 b/49_time.res 1.62)
(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 3891 1073401581 c/25_user-rules 1.12)
......@@ -184,7 +184,7 @@
(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 1083 1076684617 b/30_heater_flo 1.20)
(cuddaux/Makefile 3327 1076684617 c/35_Makefile 1.9)
(cuddaux/Makefile 3375 1078749975 c/35_Makefile 1.10)
(polka/C/bit.c 3301 1071844798 e/10_bit.c 1.2)
(source/draw.mli 452 1065787303 f/1_draw.mli 1.2)
(test/time-ossau.exp 9306 1076693156 b/48_time.exp 1.58)
......@@ -200,24 +200,24 @@
(source/parse_c_scade.mli 666 1074519403 e/42_parse_c_sc 1.3)
(demo-xlurette/chaudiere/chaudiere.luc 442 1076684617 c/11_chaudiere. 1.9)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(source/run_aut.ml 23239 1076684617 b/47_automata.m 1.23)
(source/run_aut.ml 23264 1078749975 b/47_automata.m 1.24)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(mlcuddidl/bdd.ml 11038 1071844798 d/6_bdd.ml 1.2)
(source/lurettetop.ml 49660 1076693156 c/1_lurettetop 1.50)
(source/lurettetop.ml 52168 1078749975 c/1_lurettetop 1.51)
(test/tram/tramway.luc 1015 1073401581 h/2_tramway.lu 1.1)
(source/constraint.ml 3180 1069150632 c/19_constraint 1.10)
(test/structured_type.luc 2308 1076684617 g/32_structured 1.2)
(source/formula_to_bdd.ml 17806 1074519403 g/34_formula_to 1.6)
(test/cygwin-scade/counter.saofd 587 1055926783 g/2_counter.sa 1.1)
(test/test7.rif.exp 381 1076684617 g/12_test7.rif. 1.5)
(test/test7.rif.exp 394 1078749975 g/12_test7.rif. 1.6)
(test/poly-int/poly.lus 72 1073401581 h/7_poly.lus 1.1)
(source/bddd.ml 18278 1076684617 g/36_bddd.ml 1.8)
(ihm/xlurette/xlurette_glade_interface.ml 80843 1076693156 c/15_xlurette_g 1.25)
(ihm/xlurette/xlurette_glade_interface.ml 81681 1078749975 c/15_xlurette_g 1.26)
(INSTALL 101 1056616700 f/26_INSTALL 1.2)
(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 3935 1076684617 c/0_Makefile 1.16)
(user-rules 36645 1076693156 c/14_myrules 1.55)
(test/Makefile 3880 1078749975 c/0_Makefile 1.17)
(user-rules 38323 1078749975 c/14_myrules 1.56)
(test/infinite_weight.luc 1113 1076684617 g/13_infinite_w 1.2)
(mlcuddidl/cudd_caml.c 23483 1071844798 d/3_cudd_caml. 1.2)
(polka/C/config.h 78 1071844798 e/13_config.h 1.2)
......@@ -234,16 +234,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 1952 1076684617 g/46_lustreExp. 1.4)
(source/parse_luc.ml 37622 1076684617 41_parse_env. 1.54)
(OcamlMakefile 21310 1055487917 17_OcamlMakef 1.51)
(source/parse_luc.ml 38402 1078749975 41_parse_env. 1.55)
(OcamlMakefile 21318 1078749975 17_OcamlMakef 1.52)
(polka/caml/polka.ml 5602 1071844798 d/39_polka.ml 1.2)
(source/lurette.mli 756 1071844798 11_lurette.ml 1.16)
(test/time-rey.res 9336 1076684617 h/14_time-rey.r 1.1)
(test/time-rey.res 9441 1078749975 h/14_time-rey.r 1.2)
(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 8498 1076684617 d/11_configure. 1.16)
(share/configure.in 8551 1078749975 d/11_configure. 1.17)
(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)
......@@ -283,26 +283,26 @@
(share/pixmaps/ediff-quit.xpm 494 1055926783 f/20_ediff-quit 1.1)
(test/cygwin-scade/Pilot.saofd 3645 1055926783 f/42_Pilot.saof 1.1)
(test/time-moucherotte.exp 3690 1076693156 e/37_time-mouch 1.19)
(source/command_line_luc_exe.ml 3790 1076684617 b/33_command_li 1.22)
(source/command_line_luc_exe.ml 3773 1078749975 b/33_command_li 1.23)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(share/pixmaps/close.xpm 803 1055926783 f/21_close.xpm 1.1)
(test/time-CHAILLOL.res 8235 1063029729 g/11_time-CHAIL 1.1)
(test/time-ecrins.res 9314 1076684617 d/20_time-ecrin 1.42)
(source/value.mli 1181 1071235286 c/24_value.mli 1.6)
(test/time-ecrins.res 9443 1078749975 d/20_time-ecrin 1.43)
(source/value.mli 1182 1078749975 c/24_value.mli 1.7)
(polka/Makefile.config 1803 1071844798 e/20_Makefile.c 1.6)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 10287 1076684617 c/20_Makefile 1.31)
(source/Makefile 10354 1078749975 c/20_Makefile 1.32)
(source/graph.ml 3696 1071844798 14_graph.ml 1.11)
(test/cudd_gc_problem.luc 208372 1063029729 e/29_cudd_gc_pr 1.2)
(test/time-CHAILLOL.exp 8235 1063029729 g/10_time-CHAIL 1.1)
(demo-xlurette/chaudiere/chaudiere_ctrl.lus 178 1063786164 c/9_chaudiere_ 1.2)
(test/losange-3d.rif.exp 27451 1074519403 e/31_losange-3d 1.7)
(test/losange-3d.rif.exp 27452 1078749975 e/31_losange-3d 1.8)
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 3176 1076684617 b/24_sim2chro.m 1.25)
(source/type.ml 2878 1074519403 h/12_type.ml 1.1)
(source/poly_draw.ml 22013 1071235286 g/43_polyDraw.m 1.3)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 13900 1076684617 b/32_ima_exe.ml 1.46)
(source/luc_exe.ml 14041 1078749975 b/32_ima_exe.ml 1.47)
(source/gne.mli 1853 1063029729 b/36_gne.mli 1.6)
(test/cygwin-scade/Direction_D1.saofd 1298 1055926783 f/50_Direction_ 1.1)
(source/lurette.ml 20566 1076693156 12_lurette.ml 1.88)
......@@ -314,17 +314,17 @@
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(source/gen_fake_lutin.ml 4628 1074519403 d/16_gen_fake_l 1.7)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(share/set_env_var.in 983 1074519403 g/23_set_env_va 1.2)
(share/set_env_var.in 1071 1078749975 g/23_set_env_va 1.3)
(source/formula_to_bdd.mli 1270 1071235286 g/35_formula_to 1.6)
(polka/Makefile 1646 1076684617 e/21_Makefile 1.2)
(test/dynamic_weight.luc 686 1076684617 g/14_dynamic_we 1.2)
(test/dynamic_weight.luc 731 1078749975 g/14_dynamic_we 1.3)
(test/poly-int/poly.luc 337 1073401581 h/8_poly.luc 1.1)
(source/var.ml 5054 1074519403 g/49_var.ml 1.6)
(source/var.ml 5055 1078749975 g/49_var.ml 1.7)
(test/porte.luc 1014 1063786164 b/16_porte.env 1.12)
(source/gen_stubs_common.mli 1519 1074519403 e/40_gen_stubs_ 1.2)
(test/cygwin-scade/scade.rif.exp 1380 1063029729 g/7_scade.rif. 1.2)
(share/gnuplot-rif 1865 1076684617 e/34_gnuplot-ri 1.7)
(share/gnuplot-rif 1920 1078749975 e/34_gnuplot-ri 1.8)
(test/cygwin-scade/Pilot_type.saofd 962 1055926783 f/37_Pilot_type 1.1)
(mlcuddidl/Makefile 7435 1076684617 d/9_Makefile 1.11)
(mlcuddidl/Makefile 7482 1078749975 d/9_Makefile 1.12)
(source/Makefile.show_luc 1506 1076684617 b/40_Makefile.s 1.14)
(test/time-rey.exp 9336 1076693156 h/13_time-rey.e 1.2)
......@@ -5,7 +5,7 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.51 Fri, 13 Jun 2003 09:05:17 +0200 jahier $
# $Id: OcamlMakefile 1.52 Mon, 08 Mar 2004 13:46:15 +0100 jahier $
#
###########################################################################
......@@ -178,7 +178,7 @@ endif
export OCAMLDEP
ifndef OCAMLLEX
OCAMLLEX := ocamllex
OCAMLLEX := ocamllex.opt
endif
export OCAMLLEX
......@@ -190,7 +190,7 @@ endif
export OCAMLYACC
ifndef CAMLIDL
CAMLIDL := camlidl
CAMLIDL := camlidl.opt
endif
export CAMLIDL
......
......@@ -18,7 +18,7 @@ xlurette:
probably your best entry point if you want to test your lustre
programs.
Cf doc/lurette-tut.ps and/or check the tool-tip displayed when
Cf doc/lurette-man.pdf and/or check the tool-tip displayed when
mouse pointing at the different buttons of the GUI.
lurettetop:
......@@ -36,11 +36,11 @@ lutin:
There are also tools which are used by the ones above that one might
want to use (you probably need to source the $HOSTTYPE/lucky_init.sh
or $HOSTTYPE/lucky_init.csh to use them directly).
want to use.
gen_fake_lucky:
gen_fake_lutin:
generates a fake lutin file (from C files generated by the
generates a fake lucky/lutin file (from C files generated by the
lustre compiler). It is automatically called from xlurette,
whenever you try to test a program without providing an
environment for it; hence you should not need to use it directly.
......@@ -55,6 +55,15 @@ lucky:
simulate/executes lutin programs outside xlurette can sometimes
be convenient.
sim2chro:
A timing diagram visualiser (.rif files) by Yann Rémond.
gnuplot-rif:
An sh-script that uses gnuplot to visualise timing diagrams
(.rif files). Requires plot (by M. Sternberg) that is provided.
nb : plot requires gawk (gnu awk) that is not provided.
Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/
......@@ -89,5 +98,5 @@ Also confere the tool section at the url http://www-verimag.imag.fr/~synchron/
o Cudd, a BDD library by the University of Colorado
o polka, cuddaux and mlcuddidl by B. Jeannet, IRISA
o sim2chro by Y. Rémond - Verimag
o autoconf, make, emacs, latex, dot, gtk, gnuplot, plot...
o autoconf, make, emacs, latex, dot, gtk, gnuplot...
o plot, by Michael Sternberg (requires gnu-awk)
****** A faire vite *******
* inclure la libc en statique
? Les alias doivent ils etre dans le .rif ??
* Rajouter le step mode dans lurettetop et xlurette
ie, il faut rajouter dans lurette une option --step-inside --step-edges
--step-vertices (et renommer --draw-inside par --try-inside ??)
sed 's/[ ^t]*$//' file
+ Rajouter dans lurettetop les options qui permette d'acceder au step mode
(ie, le mode du tirage pour faire un step)
*********** BUGS
* le parseur est trop lent sur les exemples generes par nbac
* Bug dans le repertoire HS si dans Makefile.lurette on
positionne CFLAGS à -Oi pour i >= 1. Le bug ne se produit
que sur les machines linux possedant gcc 3.
* meme avec x < 20000, il prend en compte la valeur max par defaut (10000)
(via ~max, ca marche en revanche)
* le parseur est trop lent (cf les exemples generes par nbac).
......@@ -32,13 +34,61 @@ et je ne suis plus oblig
*********** A faire
* parse_lucky.ml:
XXX parse_lustre_expression : attention au tilde (virer le hack et ragarder ce que ca change)
+ verifier que 2 vars ne sont définies 2 fois dans le meme fichiers
* Ajouter la possibilité de pouvoir rejouer un séquence et de la continuer
(? redondant avec la graine ?)
* Faire de la pub dans les forum et autres mailing list !
* inclure la libc en statique (comme pascal)
ou mettre tous les .so dans un repertoire (comme matlab) ???
* Mettre Les alias doivent ils etre dans le .rif au meme titre
que les autres variables locales
* plot a besion de gnu-awk ... Je devrais ecrire moi-meme
le programme qui genere le bon format pour gnuplot...
* sim2chro
- le recompiler en statique avec gcc3 et sous solaris
(pour ce faire recompiler librif.a).
* Finir le ocaml-lutin (.mluc)
* Faire une section <<Testing programs that are not lustre or scade programs>>
-> faire un autre mode d'interfacage : le mode stdin/stdout, qui fonctionnerait
grosso-modo ainsi :
<sut write on stout>
var1 (input|output) (bool|int|float)
....
varn (input|output) (bool|int|float)
#go
<sut reads on stdin>
val_1 ... val_ki
-> <stdout> : out_1 ... out_ko
or
#restore
or
#end
* Mettre des iterateurs de tableaux
-> nécessite d'avoir une notion de noeud ou de fonction dans lucky
* Rajouter les fonctions, et notamment les fonctions externes
-> comment faire depuis un tel interpreteur ????
* reporter le contenu de la nouvelle section de d1.1-v2 dans les entetes de modules
* autoriser plusieurs automates dans le meme fichier
* rajouter une option --reactive ou lucky rend ses valeurs precedentes
* rajouter une option --reactive dans lucky où il rend ses valeurs precedentes
si aucune formule n'est satisfiable (ainsi que --reactive-no-warning)
* il faudrait au moins pouvoir avoir des pre sur des var de types structurés
......
......@@ -43,7 +43,8 @@ ICFLAGS = \
#
# i386-linux
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# XCFLAGS = -DHAVE_IEEE_754 -DBSD # -mcpu=pentiumpro -malign-double
XCFLAGS = -mcpu=i386 -DHAVE_IEEE_754 -DBSD
# sparc-sun
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
......
......@@ -23,10 +23,10 @@ xlurette_exe: dummy
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlc.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlc.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlc.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlc.opt $(THREAD) \
ocamlc.opt -c -I +lablgtk -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_interface.ml
ocamlc.opt -c -I +lablgtk -I $(HOME)/$(HOSTTYPE)/lib -labels -c xlurette_glade_callbacks.ml
ocamlc.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib -c xlurette_glade_main.ml
ocamlc.opt $(THREAD) -I $(HOME)/$(HOSTTYPE)/lib \
-I +lablgtk -I +str -o xlurette_exe$(EXE) str.cma unix.cma lablgtk.cma gtkInit.cmo \
xlurette_glade_callbacks.cmo xlurette_glade_interface.cmo xlurette_glade_main.cmo
......
......@@ -28,11 +28,6 @@
<class>GtkNotebook</class>
<name>notebook1</name>
<can_focus>True</can_focus>
<accelerator>
<modifiers>GDK_CONTROL_MASK</modifiers>
<key>GDK_Tab</key>
<signal>switch_page</signal>
</accelerator>
<show_tabs>True</show_tabs>
<show_border>True</show_border>
<tab_pos>GTK_POS_TOP</tab_pos>
......@@ -1078,7 +1073,12 @@ scade
<child_name>Toolbar:button</child_name>
<name>button125</name>
<border_width>4</border_width>
<tooltip>Call sim2chro with the selected file</tooltip>
<tooltip>Call sim2chro with the selected file (c)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_c</key>
<signal>clicked</signal>
</accelerator>
<signal>
<name>clicked</name>
<handler>tdm_sim2chro</handler>
......@@ -1095,7 +1095,12 @@ scade
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Call gnuplot with the selected file (3.7 or higher)</tooltip>
<tooltip>Call gnuplot with the selected file (g)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_g</key>
<signal>clicked</signal>
</accelerator>
<signal>
<name>clicked</name>
<handler>tdm_gnuplot</handler>
......@@ -1125,7 +1130,12 @@ scade
<child_name>Toolbar:button</child_name>
<name>button128</name>
<border_width>4</border_width>
<tooltip> Edit the file -- via the $EDITOR shell variable</tooltip>
<tooltip> Edit the file -- via the $EDITOR shell variable (e)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_e</key>
<signal>clicked</signal>
</accelerator>
<signal>
<name>clicked</name>
<handler>tdm_edit</handler>
......@@ -1140,7 +1150,12 @@ scade
<child_name>Toolbar:button</child_name>
<name>button129</name>
<border_width>4</border_width>
<tooltip>Delete the selected file</tooltip>
<tooltip>Delete the selected file (d)</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_d</key>
<signal>clicked</signal>
</accelerator>
<signal>
<name>clicked</name>
<handler>tdm_delete</handler>
......@@ -1239,7 +1254,7 @@ scade
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>timing_diagram_label</name>
<label> Timing Diagrams Manager </label>
<label> Timing diagrams manager </label>
<justify>GTK_JUSTIFY_LEFT</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -1299,7 +1314,7 @@ scade
<name>fileselection_oracle</name>
<border_width>10</border_width>
<title>Select File</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -1343,7 +1358,7 @@ scade
<name>fileselection_env</name>
<border_width>10</border_width>
<title>Select a new environement file</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -1386,7 +1401,7 @@ scade
<class>GtkWindow</class>
<name>step_by_step_window</name>
<title>Step by step...</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position>
<modal>False</modal>
<default_width>200</default_width>
......@@ -1817,7 +1832,7 @@ Setting such an oracle is not mandatory however.</label>
<class>GtkWindow</class>
<name>quit_window</name>
<title>Quit xlurette -- save parameters </title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -1931,7 +1946,7 @@ Do you really want to quit xlurette?
<name>extra_env_var_window</name>
<border_width>10</border_width>
<title>Setting environment variables</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -2418,7 +2433,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_cfiles</name>
<border_width>10</border_width>
<title>Select extra C File</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -2462,7 +2477,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_libs</name>
<border_width>10</border_width>
<title>Select external lib (.a)</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -2506,7 +2521,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_libdirs</name>
<border_width>10</border_width>
<title>Select a directory to search librairies in</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -2550,7 +2565,7 @@ Do you really want to quit xlurette?
<name>fileselection_extra_includedirs</name>
<border_width>10</border_width>
<title>Select a directory to search header files in</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -2593,7 +2608,7 @@ Do you really want to quit xlurette?
<class>GtkWindow</class>
<name>test_thickness_help_window</name>
<title>Help about Test Thickness parameters</title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -2704,8 +2719,9 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<widget>
<class>GtkWindow</class>
<name>set_parameters_window</name>
<border_width>3</border_width>
<title> Setting parameters </title>
<type>GTK_WINDOW_TOPLEVEL</type>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<allow_shrink>False</allow_shrink>
......@@ -2924,7 +2940,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<tooltip>Try one formula</tooltip>
<can_focus>True</can_focus>
<label>One </label>
<active>False</active>
<active>True</active>
<draw_indicator>True</draw_indicator>
<child>
<padding>0</padding>
......@@ -2939,7 +2955,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<tooltip>Try all the formula (reachable from the current state) </tooltip>
<can_focus>True</can_focus>
<label>All</label>
<active>True</active>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>radiobutton_draw_one_formula</group>
<child>
......@@ -3082,7 +3098,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>10</value>
<value>0</value>
<lower>0</lower>
<upper>100000</upper>
<step>1</step>
......@@ -3155,7 +3171,7 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>10</value>
<value>0</value>
<lower>0</lower>
<upper>100000</upper>
<step>1</step>
......@@ -3954,6 +3970,11 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
<name>close_parameters_window</name>
<border_width>4</border_width>
<tooltip> close this window </tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_q</key>