Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

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

lurette 1.30 Mon, 28 Jun 2004 10:44:36 +0200 by jahier

Parent-Version:      1.29
Version-Log:

Begin to add an interfacing code for sildex. It seems tp parse
sildex-C header files ok, but the C code generator is simply
a copy of the poc version....

Begin to move from the use of reg expr to Stream base
parser in order to parce header file to get var names
and types.

source/luc_exe.ml:
source/lurettetop.ml:
source/command_line_exe.ml:
source/command_line_exe.mli:
source/command_line_luc_exe.ml:
source/command_line_luc_exe.mli:
source/util.ml:
source/parse_luc.ml:
    Call a pre-processor on Lucky files before doing anything else
    via the -pp option

Project-Description: Lurette
parent 1c8385d0
......@@ -2,13 +2,14 @@
;; REALLY bad things.
(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 21908 1083336219 35_util.ml 1.68)
(source/show_env.mli 1148 1088412276 42_show_env.m 1.13)
(source/util.ml 22751 1088412276 35_util.ml 1.69)
(test/time-asti.res 4158 1088412276 h/40_time-asti. 1.1)
(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 5194 1083336219 d/22_TODO 1.46)
(TODO 5255 1088412276 d/22_TODO 1.47)
(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)
......@@ -21,19 +22,20 @@
(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)
(share/pixmaps/open.xpm 782 1055926783 f/17_open.xpm 1.1)
(source/parse_luc.mli 2792 1079084640 40_parse_env. 1.24)
(source/parse_luc.mli 2817 1088412276 40_parse_env. 1.25)
(polka/C/internal.c 883 1071844798 e/8_internal.c 1.2)
(source/solver.ml 7618 1078751438 39_solver.ml 1.61)
(test/tram/passager.luc 390 1080290901 h/5_passager.l 1.2)
(ihm/xlurette/makefile 3544 1080290901 c/16_makefile 1.22)
(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)
(demo-xlurette/fault-tolerant-heater/sensors.luc 639 1088412276 h/18_sensors.lu 1.2)
(test/test_losange-10d.lus 108 1065787303 g/41_test_losan 1.1)
(polka/C/internal.h 916 1071844798 e/0_internal.h 1.2)
(source/command_line.ml 5176 1080290901 b/20_command_li 1.21)
(source/command_line.ml 5327 1088412276 b/20_command_li 1.22)
(test/cudd_gc_problem.rif.exp 7882 1053337243 e/30_cudd_gc_pr 1.2)
(test/sparc-scade/libpwlinear.saofdm 1379 1055487917 e/43_libpwlinea 1.1)
(test/cygwin-scade/ConfAnnot.aty 13661 1055926783 g/4_ConfAnnot. 1.1)
(share/lucky_cpp 230 1088412276 h/39_lucky_cpp 1.1)
(test/tram/passerelle.luc 641 1080290901 h/4_passerelle 1.2)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(source/bddd.mli 1344 1078751438 g/37_bddd.mli 1.10)
......@@ -42,40 +44,41 @@
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(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)
(source/gen_stubs_common.ml 14899 1088412276 e/39_gen_stubs_ 1.5)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(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 1733 1080290901 b/21_command_li 1.17)
(source/command_line.mli 1769 1088412276 b/21_command_li 1.18)
(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 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)
(source/exp.ml 8906 1088412276 g/47_exp.ml 1.10)
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
(source/polyhedron.ml 13885 1078751438 d/25_polyhedron 1.18)
(source/Makefile.gen_fake_lucky 699 1076684617 g/9_Makefile.g 1.4)
(source/Makefile.gen_fake_lucky 894 1088412276 g/9_Makefile.g 1.5)
(polka/C/poly.c 53392 1071844798 e/5_poly.c 1.2)
(source/luc_exe.mli 436 1080290901 b/31_ima_exe.ml 1.5)
(doc/ocamldoc.sty 1720 1071235286 b/12_ocamldoc.s 1.3)
(source/lexer.mll 7175 1078751438 h/20_lexer.mll 1.1)
(polka/C/cherni.c 30605 1076684617 e/9_cherni.c 1.4)
(source/command_line_luc_exe.mli 1330 1080290901 b/34_command_li 1.16)
(source/command_line_luc_exe.mli 1366 1088412276 b/34_command_li 1.17)
(polka/C/poly.h 4839 1071844798 d/49_poly.h 1.2)
(polka/C/cherni.h 2458 1071844798 e/1_cherni.h 1.2)
(share/pixmaps/chrono.xpm 703 1055926783 f/23_chrono.xpm 1.1)
(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)
(source/gen_stubs_poc.mli 643 1088412276 f/4_gen_stubs_ 1.4)
(test/losange-3d.luc 552 1076684617 d/28_losange-3d 1.5)
(test/time-moucherotte.res 4182 1083336219 e/38_time-mouch 1.23)
(test/time-moucherotte.res 4158 1088412276 e/38_time-mouch 1.24)
(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)
(polka/caml/polka_caml.h 1648 1071844798 d/36_polka_caml 1.2)
(mlcuddidl/mtbdd.ml 10185 1034006019 c/44_mtbdd.ml 1.1)
(source/draw.ml 2898 1078751438 f/2_draw.ml 1.4)
(source/draw.ml 2893 1088412276 f/2_draw.ml 1.5)
(source/prevar.ml 3063 1079444474 d/18_prevar.ml 1.7)
(doc/lucky-man/lucky-man.tex 38114 1088412276 h/34_lucky-man. 1.1)
(source/var.mli 3477 1080290901 g/50_var.mli 1.11)
(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)
......@@ -86,13 +89,13 @@
(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 10230 1083336219 b/48_time.exp 1.63)
(test/time-joly.exp 10279 1088412276 b/48_time.exp 1.64)
(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 60405 1083336219 c/12_xlurette_g 1.40)
(ihm/xlurette/xlurette_glade_main.ml 61719 1088412276 c/12_xlurette_g 1.41)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 106083 1083336219 c/13_xlurette.g 1.30)
(ihm/xlurette/xlurette.glade 109616 1088412276 c/13_xlurette.g 1.31)
(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)
......@@ -104,6 +107,7 @@
(source/gne.ml 3426 1082533083 b/37_gne.ml 1.9)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
(source/parse_c_scade.ml 6921 1078751438 e/41_parse_c_sc 1.5)
(source/gen_stubs_sildex.mli 646 1088412276 h/37_gen_stubs_ 1.1)
(share/lurettetop.sh.in 164 1080290901 g/25_lurettetop 1.3)
(test/cygwin-scade/position_validation.saofd 10188 1055926783 f/36_position_v 1.1)
(test/sparc-scade/exo1.saofdm 332 1074519403 e/50_exo1.saofd 1.2)
......@@ -128,7 +132,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 3096 1079444474 g/48_exp.mli 1.6)
(source/exp.mli 3140 1088412276 g/48_exp.mli 1.7)
(test/cygwin-scade/telemetry_validation.saofd 4738 1055926783 f/34_telemetry_ 1.1)
(test/test12.rif.exp 3382 1083336219 h/10_test12.rif 1.5)
(share/lurettetop_sh.in 781 1063786164 g/24_lurettetop 1.1)
......@@ -147,21 +151,21 @@
(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 12567 1083336219 24_generate_l 1.56)
(source/gen_stubs.ml 13356 1088412276 24_generate_l 1.57)
(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)
(share/lucky_init.csh.in 150 1063786164 e/23_lucky_init 1.8)
(source/lustreExp.ml 25814 1079444474 g/45_lustreExp. 1.9)
(source/gen_fake_lucky.ml 3968 1078751438 g/8_gen_fake_l 1.7)
(source/gen_fake_lucky.ml 4028 1088412276 g/8_gen_fake_l 1.8)
(polka/C/vector.h 2367 1071844798 d/47_vector.h 1.2)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(source/oracle.mli 412 1080290901 h/32_oracle.mli 1.1)
(source/oracle.mli 412 1088412276 h/32_oracle.mli 1.2)
(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 11519 1083336219 e/35_plot 1.11)
(share/plot 11519 1088412276 e/35_plot 1.12)
(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)
......@@ -190,8 +194,9 @@
(test/sparc-scade/exo1.vsw 400 1055487917 e/48_exo1.vsw 1.1)
(test/heater_float.rif.exp 1305 1083336219 b/30_heater_flo 1.23)
(cuddaux/Makefile 3375 1078749975 c/35_Makefile 1.10)
(doc/lurette-man/lurette-man.tex 38450 1088412276 h/33_lurette-ma 1.1)
(polka/C/bit.c 3301 1071844798 e/10_bit.c 1.2)
(source/draw.mli 451 1078751438 f/1_draw.mli 1.3)
(source/draw.mli 446 1088412276 f/1_draw.mli 1.4)
(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)
......@@ -207,34 +212,37 @@
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(source/run_aut.ml 23022 1079444474 b/47_automata.m 1.26)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(source/gen_stubs_sildex.ml 8922 1088412276 h/38_gen_stubs_ 1.1)
(mlcuddidl/bdd.ml 11038 1071844798 d/6_bdd.ml 1.2)
(source/lurettetop.ml 61764 1080290901 c/1_lurettetop 1.53)
(source/lurettetop.ml 66216 1088412276 c/1_lurettetop 1.54)
(source/lexeme.mli 382 1078751438 h/21_lexeme.mli 1.1)
(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 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 473 1083336219 g/12_test7.rif. 1.9)
(test/test7.rif.exp 470 1088412276 g/12_test7.rif. 1.10)
(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 82346 1083336219 c/15_xlurette_g 1.28)
(source/oracle.ml 2749 1083336219 h/31_oracle.ml 1.2)
(ihm/xlurette/xlurette_glade_interface.ml 85095 1088412276 c/15_xlurette_g 1.29)
(source/oracle.ml 2807 1088412276 h/31_oracle.ml 1.3)
(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 4080 1083336219 c/0_Makefile 1.19)
(user-rules 39196 1083336219 c/14_myrules 1.61)
(test/Makefile 4069 1088412276 c/0_Makefile 1.20)
(user-rules 41934 1088412276 c/14_myrules 1.62)
(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)
(share/xlurette.bat.in 670 1063786164 g/22_xlurette.b 1.1)
(source/parse_sildex.mli 818 1088412276 h/35_parse_sild 1.1)
(mlcuddidl/manager.idl 11064 1071844798 c/48_manager.id 1.2)
(source/rif.ml 7405 1082533083 h/27_rif.ml 1.2)
(source/rif.ml 7410 1088412276 h/27_rif.ml 1.3)
(mlcuddidl/cudd_caml.h 1178 1071844798 d/2_cudd_caml. 1.2)
(source/show_env.ml 3437 1078751438 43_show_env.m 1.21)
(source/show_env.ml 3432 1088412276 43_show_env.m 1.22)
(polka/C/essai.c 1001 1047029868 e/11_essai.c 1.1)
(test/time-asti.exp 4158 1088412276 h/41_time-asti. 1.1)
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc 382 1076684617 h/16_heater_con 1.1)
(share/pixmaps/button-close.xpm 746 1055926783 f/24_button-clo 1.1)
(test/cygwin-scade/regulation.saofd 15074 1055926783 f/35_regulation 1.1)
......@@ -242,44 +250,44 @@
(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 43680 1083336219 41_parse_env. 1.61)
(source/parse_luc.ml 43816 1088412276 41_parse_env. 1.62)
(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 10248 1083336219 h/14_time-rey.r 1.7)
(test/time-rey.res 10279 1088412276 h/14_time-rey.r 1.8)
(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 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)
(share/configure.in 8865 1088412276 d/11_configure. 1.20)
(test/tram.luc 1324 1088412276 b/15_tram.env 1.13)
(demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(source/run_aut.mli 4472 1078751438 b/46_automata.m 1.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 14256 1083336219 f/7_lucky.el 1.8)
(share/lucky.el 14255 1088412276 f/7_lucky.el 1.9)
(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 1083336219 b/29_Controleur 1.26)
(source/show_luc.ml 4265 1078751438 e/25_show_luc.m 1.9)
(source/show_luc.ml 4490 1088412276 e/25_show_luc.m 1.10)
(share/pixmaps/quit.xpm 494 1055926783 f/14_quit.xpm 1.1)
(share/xlurette.sh.in 115 1080290901 g/21_xlurette.s 1.2)
(polka/caml/polka_lexer.mli 200 1047029868 d/41_polka_lexe 1.1)
(polka/caml/polka.mli 856 1071844798 d/38_polka.mli 1.2)
(doc/automata_format 0 1007379917 b/3_automata_f 1.1)
(source/control.mli 3187 1078751438 c/3_control.ml 1.4)
(source/parse_sildex.ml 4857 1088412276 h/36_parse_sild 1.1)
(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 10235 1083336219 b/49_time.res 1.68)
(test/time-joly.res 10279 1088412276 b/49_time.res 1.69)
(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)
(source/Makefile.gen_stubs 1242 1088412276 b/42_Makefile.g 1.11)
(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)
......@@ -287,13 +295,13 @@
(mlcuddidl/bdd.mli 8638 1071844798 d/5_bdd.mli 1.2)
(test/cygwin-scade/compute_path.saofd 1662 1055926783 g/5_compute_pa 1.1)
(source/lucky.mli 1509 1078751438 15_env.mli 1.25)
(demo-xlurette/fault-tolerant-heater/heater_control.lus 3419 1080290901 h/17_heater_con 1.2)
(demo-xlurette/fault-tolerant-heater/heater_control.lus 3445 1088412276 h/17_heater_con 1.3)
(test/tram/utiles.lus 411 1073401581 h/0_utiles.lus 1.1)
(polka/C/polka.h 1791 1071844798 d/50_polka.h 1.2)
(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 4746 1080290901 e/37_time-mouch 1.22)
(source/command_line_luc_exe.ml 3930 1080290901 b/33_command_li 1.25)
(test/time-moucherotte.exp 4182 1088412276 e/37_time-mouch 1.23)
(source/command_line_luc_exe.ml 4081 1088412276 b/33_command_li 1.26)
(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)
......@@ -301,7 +309,7 @@
(source/value.mli 1180 1078751438 c/24_value.mli 1.8)
(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 10430 1080290901 c/20_Makefile 1.34)
(source/Makefile 10568 1088412276 c/20_Makefile 1.35)
(source/graph.ml 3677 1078751438 14_graph.ml 1.12)
(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)
......@@ -312,11 +320,12 @@
(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)
(source/luc_exe.ml 10435 1082533083 b/32_ima_exe.ml 1.50)
(source/luc_exe.ml 10562 1088412276 b/32_ima_exe.ml 1.51)
(source/gne.mli 1845 1082533083 b/36_gne.mli 1.8)
(test/test13.rif.exp 594 1082533083 h/26_test13.rif 1.3)
(demo-xlurette/fault-tolerant-heater/degradable-sensors.luc 1366 1088412276 h/15_wearing-se 1.2)
(test/cygwin-scade/Direction_D1.saofd 1298 1055926783 f/50_Direction_ 1.1)
(source/lurette.ml 17984 1083336219 12_lurette.ml 1.91)
(source/lurette.ml 18114 1088412276 12_lurette.ml 1.92)
(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)
......@@ -326,19 +335,19 @@
(source/gen_fake_lutin.ml 4559 1078751438 d/16_gen_fake_l 1.8)
(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 1739 1083336219 g/23_set_env_va 1.4)
(share/set_env_var.in 1814 1088412276 g/23_set_env_va 1.5)
(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)
(test/poly-int/poly.luc 337 1073401581 h/8_poly.luc 1.1)
(source/var.ml 6179 1082533083 g/49_var.ml 1.12)
(test/porte.luc 1014 1063786164 b/16_porte.env 1.12)
(source/gen_stubs_common.mli 1511 1078751438 e/40_gen_stubs_ 1.3)
(source/gen_stubs_common.mli 1967 1088412276 e/40_gen_stubs_ 1.4)
(test/cygwin-scade/scade.rif.exp 1380 1063029729 g/7_scade.rif. 1.2)
(share/gnuplot-rif 2018 1083336219 e/34_gnuplot-ri 1.10)
(share/gnuplot-rif 2019 1088412276 e/34_gnuplot-ri 1.11)
(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)
(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 10235 1082533083 h/13_time-rey.e 1.6)
(test/time-rey.exp 10279 1088412276 h/13_time-rey.e 1.7)
......@@ -20,7 +20,18 @@ et je ne suis plus oblig
*********** A faire
* quand un saofdm est selectionné, passer en mode scade
* Portage Sildex
* Un TP de Lurette pour le 2 juillet pour les partenaire de Safeair.
* Rajouter l'option -pp dans lurettetop et xlurette ? (elle deja dans
lucky et liblurette.a)
* autoriser plusieurs automates dans le meme fichier
* Finir lucky2lus
* Préciser dans le manuel le role des 2 fenetres + mettre
un message dans chaque fenetres du style
......@@ -28,40 +39,30 @@ 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.
??? y'a deja les tooptips...
* rajouter une option --reactive dans lucky où il rend ses valeurs precedentes
si aucune formule n'est satisfiable (ainsi que --reactive-no-warning)
* 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>>
Faire une section <<The RIF conventions>> (en annexe ???)
* Finir le compilo lutin de Yvan
* Mettre Les alias doivent ils etre dans le .rif au meme titre
* Les alias doivent ils etre dans le .rif au meme titre
que les autres variables locales -> ajouter une option !
* 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) ???
* coder les types enumerer avec un boolean au lieu d'un entier
(suggestion BJ)
* Finir le ocaml-lutin (.mluc)
......@@ -70,6 +71,20 @@ depuis la fenetre principale.
* Mettre des iterateurs de tableaux
-> nécessite d'avoir une notion de noeud ou de fonction dans lucky
macros {
-- une fonction/macro peut-etre dépliée telle quelle
(up_down : bool -> int -> int -> real) =
macro c i j ->
if c then i+j else i-j;
}
une telle macro pourrait aussi
o etre recursive ( -> fonction caml)
o avoir sa propre mémoire ( -> noeud lustre)
Mais ca complique. On verra apres.
* Rajouter les fonctions, et notamment les fonctions externes
-> comment faire depuis un tel interpreteur ????
-> appeler du caml ? du C ?
......@@ -112,10 +127,7 @@ INCONV
* 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 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
......@@ -129,8 +141,6 @@ INCONV
* Portage Reluc
* Rajouter un mode ecexe dans lurette
* Chercher a detecter des egalites lors de l'ajout d'une inegalité.
pour les contraintes de dimension > 1 (cf code commenté dans store.ml)
......
--
-- sensors that wears out
inputs { Heat_on : bool }
outputs {
T : float ~min 0.0 ~max 50.0;
T1 : real; T2 : real; T3 : real
}
locals {
eps : float ~min 0.0 ~max 0.2;
eps1 : float ~min -0.1 ~max 0.1;
......@@ -44,9 +42,9 @@ transitions {
s2 -> t3 ~weight pre cpt;
-- Two sensors are broken
t3 -> s3 ~cond invariant and new_T1 and T2 = pre T2 and T3 = pre T3;
t3 -> s3 ~cond invariant and new_T1 and T2 = pre T2 and T3 = pre T3 ;
s3 -> t3 ~weight 1000 ;
s3 -> t4 ~weight pre cpt;
s3 -> t4 ~weight pre cpt ;
-- Tree sensors are broken
t4 -> s4 ~cond invariant and T1 = pre T1 and T2 = pre T2 and T3 = pre T3;
......
......@@ -18,7 +18,10 @@ const FAILURE = - 999.0; -- a fake temperature given when all sensors are broken
const TMIN = 6.0;
const TMAX = 9.0;
const DELTA = 0.5;
-- const DELTA : real;
-----------------------------------------------------------------------
-----------------------------------------------------------------------
node heater_control(T, T1, T2, T3 : real) returns (Heat_on:bool);
......
-- Simulate perfect sensors that never get worn
inputs {
Heat_on : bool
}
-- Simulate perfect sensors that never get worn
inputs { Heat_on : bool }
outputs {
T : float ~min 0.0 ~max 50.0;
T1 : real;
T2 : real;
T3 : real
T1 : real;
T2 : real;
T3 : real
}
locals {
eps1 : real ~min -0.1 ~max 0.1;
eps2 : real ~min -0.1 ~max 0.1;
eps3 : real ~min -0.1 ~max 0.1;
eps1 : real ~min -0.1 ~max 0.1;
eps2 : real ~min -0.1 ~max 0.1;
eps3 : real ~min -0.1 ~max 0.1;
}
nodes { 0 : stable }
start_node { 0 }
start_node { 0 }
transitions {
0 -> 1 ~cond T = 7.0
and T1 = T + eps1
......
This diff is collapsed.
This diff is collapsed.
......@@ -207,7 +207,7 @@
<name>button90</name>
<width>30</width>
<height>30</height>
<tooltip>Browse for an environment file (.lut or .luc)</tooltip>
<tooltip>Browse for an environment file (.lut or .luc) that is not in the current directory.</tooltip>
<signal>
<name>clicked</name>
<handler>browse_env_clicked</handler>
......@@ -223,7 +223,7 @@
<name>button91</name>
<width>30</width>
<height>30</height>
<tooltip>Browse to add an environment to the curent one(s) (.lut or .luc)</tooltip>
<tooltip>Browse to add an environment to the curent one(s) (.lut or .luc) that is not in the current direstory.</tooltip>
<signal>
<name>clicked</name>
<handler>add_env_clicked</handler>
......@@ -265,7 +265,7 @@
<name>button92</name>
<width>30</width>
<height>30</height>
<tooltip>Browse for a reactive program file to test (.lus or .c)</tooltip>
<tooltip>Browse for a reactive program file to test (.saofdm, .lus or .c) that is not in the current directory. Note that the current directory of Lurette will become the one of the sut if it changes.</tooltip>
<signal>
<name>clicked</name>
<handler>browse_sut_clicked</handler>
......@@ -306,7 +306,7 @@
<name>button93</name>
<width>30</width>
<height>30</height>
<tooltip>Browse for an oracle (.lus or .c)</tooltip>
<tooltip>Browse for an oracle (.saofdm, .lus or .c) that is not in the current directory.</tooltip>
<signal>
<name>clicked</name>
<handler>browse_oracle_clicked</handler>
......@@ -415,6 +415,7 @@
<use_arrows>True</use_arrows>
<use_arrows_always>False</use_arrows_always>
<items>scade
sildex
verimag
</items>
<child>
......@@ -432,7 +433,7 @@ verimag
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text>verimag</text>
<text>scade</text>
</widget>
</widget>
</widget>
......@@ -656,6 +657,7 @@ verimag
<use_arrows_always>False</use_arrows_always>
<items>stdin/stdout
scade
sildex
verimag
</items>
<child>
......@@ -678,7 +680,7 @@ verimag
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text>verimag</text>
<text>stdin/stdout</text>
</widget>
</widget>
</widget>
......@@ -848,9 +850,8 @@ verimag
<tooltips>True</tooltips>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>False</fill>
<pack>GTK_PACK_END</pack>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
......@@ -858,6 +859,8 @@ verimag
<child_name>Toolbar:button</child_name>
<name>set_parameters</name>
<border_width>4</border_width>
<width>100</width>
<height>60</height>
<tooltip> Launch the parameter window (p)</tooltip>
<accelerator>
<modifiers>0</modifiers>
......@@ -963,12 +966,26 @@ verimag
<icon>clean-up.xpm</icon>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>help_button</name>
<border_width>4</border_width>
<tooltip>Launch the Lurette User Guide</tooltip>
<signal>
<name>clicked</name>
<handler>on_help_button_clicked</handler>
<last_modification_time>Tue, 11 May 2004 07:46:47 GMT</last_modification_time>
</signal>
<label> </label>
<icon>help.xpm</icon>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>button105</name>
<border_width>4</border_width>
<height>38</height>
<tooltip>Quit xlurette (q)</tooltip>
<accelerator>
<modifiers>0</modifiers>
......@@ -1734,6 +1751,21 @@ More information about the lutin langage is available in the doc directory of th
<label> </label>
<icon>close.xpm</icon>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>button131</name>
<border_width>4</border_width>
<tooltip>Launch the Lucky language Reference manual</tooltip>
<signal>
<name>clicked</name>
<handler>on_lucky_help_button_clicked</handler>
<last_modification_time>Tue, 11 May 2004 08:10:46 GMT</last_modification_time>
</signal>
<label> </label>
<icon>help.xpm</icon>
</widget>
</widget>
</widget>
</widget>
......@@ -3804,6 +3836,68 @@ Note that if one of the Draw All Formula (via DF) or Draw All Vertices (via DV)
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<name>hbox46</name>