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

lurette 1.36 Tue, 31 Aug 2004 09:43:25 +0200 by jahier

Parent-Version:      1.35
Version-Log:

* A better error msg is displayed when one try to write something like
  <<x : int ^ 3 ~default pre x ^ 3>>, which is currently not supported.

* Fix a bug in gen_fake_lucky that was introduced in V1.33
 (incorrect environment were generated).

Project-Description: Lurette
parent a7a16d1b
......@@ -3,13 +3,13 @@
(Created-By-Prcs-Version 1 3 3)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(source/show_env.mli 1198 1088597013 42_show_env.m 1.14)
(source/util.ml 22956 1090917546 35_util.ml 1.72)
(test/time-asti.res 5300 1090917546 h/40_time-asti. 1.6)
(source/util.ml 23925 1093938205 35_util.ml 1.73)
(test/time-asti.res 5298 1093938205 h/40_time-asti. 1.7)
(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 8853 1090917546 d/22_TODO 1.52)
(TODO 7304 1093938205 d/22_TODO 1.53)
(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 21501 1090330182 g/38_fair_bddd. 1.9)
......@@ -27,6 +27,7 @@
(source/solver.ml 7659 1088432998 39_solver.ml 1.62)
(test/tram/passager.luc 390 1080290901 h/5_passager.l 1.2)
(ihm/xlurette/makefile 3775 1090917546 c/16_makefile 1.23)
(test/losange-3d.rif.exp-ocaml7 33426 1093938205 i/1_losange-3d 1.1)
(share/gen_fake_lucky.sh.in 115 1063786164 g/31_gen_fake_l 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)
......@@ -58,6 +59,7 @@
(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 722 1090917546 g/9_Makefile.g 1.6)
(RELEASE-NOTES 666 1093938205 h/45_RELEASE-NO 1.1)
(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)
......@@ -75,6 +77,7 @@
(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)
(test/Sildex/sut_sildex_io.c 0 1093938205 i/6_sut_sildex 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 2894 1090330182 f/2_draw.ml 1.6)
......@@ -89,6 +92,7 @@
(share/show_luc.sh 168 1090917546 h/42_show_luc.s 1.3)
(test/losange-10d.luc 1499 1076684617 g/42_losange-10 1.4)
(test/sparc-scade/libdigital.saofdm 1256 1055487917 e/47_libdigital 1.1)
(test/test13.rif.exp-ocaml7 594 1093938205 h/49_test13.rif 1.1)
(share/lucky.vim 1861 1090330182 h/44_lucky.vim 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)
......@@ -113,7 +117,7 @@
(source/gen_stubs_sildex.mli 648 1090504025 h/37_gen_stubs_ 1.2)
(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)
(test/sparc-scade/exo1.saofdm 321 1093938205 e/50_exo1.saofd 1.3)
(share/pixmaps/plus.xpm 473 1055926783 f/15_plus.xpm 1.1)
(polka/C/Makefile 7704 1071844798 e/15_Makefile 1.2)
(source/Makefile.gen_fake_lutin 612 1076684617 d/17_Makefile.g 1.5)
......@@ -125,12 +129,16 @@
(test/cygwin-scade/.lurette_rc~ 505 1055926783 f/30_.lurette_r 1.1)
(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)
(test/ControleurPorte.rif.exp-ocaml7 5436 1093938205 i/5_Controleur 1.1)
(share/xlurettetop.bat.in 613 1063786164 g/19_xluretteto 1.1)
(source/env_state.ml 16403 1088432998 51_env_state. 1.61)
(test/test8.rif.exp 470 1082533083 g/18_test8.rif. 1.7)
(polka/caml/matrix.idl 6467 1076684617 d/34_matrix.idl 1.4)
(source/fair_bddd.mli 2479 1088597013 g/39_fair_bddd. 1.7)
(test/Sildex/sildex.rif.exp 1047172 1093938205 i/9_sildex.rif 1.1)
(test/test12.rif.exp-ocaml7 3382 1093938205 h/50_test12.rif 1.1)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
(test/test8.rif.exp-ocaml7 467 1093938205 h/47_test8.rif. 1.1)
(source/gen_stubs_scade.mli 653 1078751438 f/6_gen_stubs_ 1.3)
(share/pixmaps/clean-up.xpm 1565 1055926783 f/22_clean-up.x 1.1)
(source/Makefile.lurettetop 530 1090917546 d/14_Makefile.l 1.7)
......@@ -148,22 +156,25 @@
(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 2879 1090917546 c/2_Makefile.l 1.32)
(test/test11.rif.exp-ocaml7 4771 1093938205 h/51_test11.rif 1.1)
(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 13518 1090917546 24_generate_l 1.59)
(source/gen_stubs.ml 13485 1093938205 24_generate_l 1.60)
(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 4148 1090330182 g/8_gen_fake_l 1.9)
(source/lustreExp.ml 25878 1093938205 g/45_lustreExp. 1.10)
(source/gen_fake_lucky.ml 4204 1093938205 g/8_gen_fake_l 1.10)
(polka/C/vector.h 2367 1071844798 d/47_vector.h 1.2)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(test/heater_int.rif.exp-ocaml7 1078 1093938205 i/2_heater_int 1.1)
(source/oracle.mli 412 1088412276 h/32_oracle.mli 1.2)
(test/gyro.rif.exp-ocaml7 11489 1093938205 i/4_gyro.rif.e 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)
......@@ -203,7 +214,7 @@
(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 1083336219 b/28_heater_int 1.21)
(test/sparc-scade/scade.rif.exp 1536 1083336219 f/0_scade.rif. 1.6)
(test/sparc-scade/scade.rif.exp 1537 1093938205 f/0_scade.rif. 1.7)
(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)
......@@ -214,9 +225,11 @@
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(source/run_aut.ml 23378 1088597013 b/47_automata.m 1.28)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(source/gen_stubs_sildex.ml 9661 1090917546 h/38_gen_stubs_ 1.3)
(test/heater_float.rif.exp-ocaml7 1304 1093938205 i/3_heater_flo 1.1)
(source/gen_stubs_sildex.ml 9746 1093938205 h/38_gen_stubs_ 1.4)
(mlcuddidl/bdd.ml 11038 1071844798 d/6_bdd.ml 1.2)
(source/lurettetop.ml 67109 1090504025 c/1_lurettetop 1.57)
(source/lurettetop.ml 67800 1093938205 c/1_lurettetop 1.58)
(test/Sildex/oracle_sildex_io.c 0 1093938205 i/10_oracle_sil 1.1)
(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 3143 1088597013 c/19_constraint 1.12)
......@@ -232,8 +245,9 @@
(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 4135 1090504025 c/0_Makefile 1.22)
(user-rules 43604 1090917546 c/14_myrules 1.67)
(user-rules 44282 1093938205 c/14_myrules 1.68)
(test/infinite_weight.luc 1116 1090330182 g/13_infinite_w 1.5)
(test/sildex.res.exp 0 1093938205 i/14_sildex.res 1.1)
(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)
......@@ -276,6 +290,7 @@
(test/ControleurPorte.rif.exp 5436 1083336219 b/29_Controleur 1.26)
(source/show_luc.ml 4509 1088597013 e/25_show_luc.m 1.11)
(share/pixmaps/quit.xpm 494 1055926783 f/14_quit.xpm 1.1)
(test/Sildex/oracle_sildex.c 11793 1093938205 i/12_oracle_sil 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)
......@@ -284,8 +299,9 @@
(source/parse_sildex.ml 7778 1090504025 h/36_parse_sild 1.2)
(polka/caml/polka_lexer.mll 786 1047029868 d/42_polka_lexe 1.1)
(cuddaux/cuddauxInt.h 2058 1034006019 c/28_cuddauxInt 1.1)
(test/Sildex/oracle_sildex.h 1516 1093938205 i/11_oracle_sil 1.1)
(polka/caml/polkaIO.mli 1517 1047029868 d/43_polkaIO.ml 1.1)
(test/time-joly.res 10146 1090917546 b/49_time.res 1.74)
(test/time-joly.res 10239 1093938205 b/49_time.res 1.75)
(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)
......@@ -293,6 +309,7 @@
(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/test9.rif.exp-ocaml7 2241 1093938205 h/46_test9.rif. 1.1)
(test/test_losange.lus 88 1055926783 f/27_test_losan 1.1)
(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)
......@@ -309,20 +326,24 @@
(test/time-CHAILLOL.res 8235 1063029729 g/11_time-CHAIL 1.1)
(test/time-ecrins.res 10233 1079444474 d/20_time-ecrin 1.46)
(source/value.mli 1180 1078751438 c/24_value.mli 1.8)
(test/test10.rif.exp-ocaml7 4572 1093938205 i/0_test10.rif 1.1)
(polka/Makefile.config 1915 1090917546 e/20_Makefile.c 1.7)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 10964 1090917546 c/20_Makefile 1.38)
(source/graph.ml 3780 1088432998 14_graph.ml 1.13)
(test/cudd_gc_problem.luc 208372 1063029729 e/29_cudd_gc_pr 1.2)
(test/Sildex/env.luc 1154 1093938205 i/13_env.luc 1.1)
(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 33458 1082533083 e/31_losange-3d 1.10)
(test/Sildex/sut_sildex.c 10531 1093938205 i/8_sut_sildex 1.1)
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 3155 1083336219 b/24_sim2chro.m 1.28)
(source/type.ml 2853 1078751438 h/12_type.ml 1.2)
(test/Sildex/sut_sildex.h 1434 1093938205 i/7_sut_sildex 1.1)
(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 10671 1090917546 b/32_ima_exe.ml 1.54)
(source/luc_exe.ml 10766 1093938205 b/32_ima_exe.ml 1.55)
(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)
......@@ -344,6 +365,7 @@
(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 1035 1090330182 b/16_porte.env 1.13)
(test/test7.rif.exp-ocaml7 470 1093938205 h/48_test7.rif. 1.1)
(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 2019 1088412276 e/34_gnuplot-ri 1.11)
......
V1.36
* A better error msg is displayed when one try to write something like
"x : int ^ 3 ~default pre x ^ 3", which is currently not supported.
* Fix a bug in gen_fake_lucky that was introduced in V1.33
(incorrect environment were generated).
V1.35
* The file <node>_io.c generated by sildex is now automatically deleted
(it is included by <node>.c, and causes compile errors even if lurette
does not use its content, which is only meant for the sildex simulator).
* Fix a bug in the step by step mode where the graph was not always
refreshed when the step was not 1.
V1.34
* Sildex is now supported
* The RELEASE-NOTES file was created, still...
\ No newline at end of file
......@@ -27,74 +27,35 @@ time lucky -l 10 six_lines.luc
prend 170 secondes pour n=10000
!!!
* BUG Nicolas 1
> en définissant ChgmtVit comme :
> * ChgmtVit: real ^ 6 ~default pre ChgmtVit;
> lucky produit l'erreur suivante :
> ----------------------------------------------------------------------
> bash-2.04$ lucky bug_array.luc
> # This is Lucky Version
>
> cat bug_array.luc | sed -e 's/--/\/\//g' -e 's/(\*/\/\*/g' -e 's/\*)/\*\//g' | cpp | sed -e 's/# /-- #line /g$
>
> *** Syntax error around line 27, column 43 , token `pre'
> (File "/home/jahier/lurette/source/lustreExp.ml", line 0, characters 6353-6365: Assertion failed)
> *** An error occurred in file bug_array.pp_luc
* Bug Nicolas 2
> * ChgmtVit: real ^ 6;
> puis en utilisant le tableau dans invariant_acceleration
> (en décommentant la ligne and ChgmtVit[1] = 0.0):
> ----------------------------------------------------------------------
> bash-2.04$ lucky bug_array.luc
> # This is Lucky Version
>
> cat bug_array.luc | sed -e 's/--/\/\//g' -e 's/(\*/\/\*/g' -e 's/\*)/\*\//g' | cpp | sed -e 's/# /-- #line /g$
>
> *** Type error at token '[' line 40 col 16: ChgmtVit[1] is used undeclared.
> *** The list of currently declared variables is:
> Base_Brake_Brake_Request of type float
> Estimated_Engine_Brake of type float
> Estimated_Perturbation of type float
> Estimated_Resist_Force of type float
> Estimated_Slope of type float
> Full_Estimated_Perturbation of type float
> P_OEM_Pedal_Travel of type float
> Pedale_accel of type float
> Pedale_embrayage of type float
> Rapport_boite of type int
> Slope_Estimated_Perturbation of type float
> Speed_Sensor of type float
> bug_array__ChgmtVit of type float^6
> bug_array__PPF of type float
> bug_array__Vmax of type float
> bug_array__Vmin of type float
> bug_array__invariant_acceleration of type bool
> ----------------------------------------------------------------------
* Bug Nicolas 3
> * après avoir modifié un fichier C, je quitte Lurette pour que ce
> fichier soit recompilé et linké dans lurette. Y a-t-il un autre
> moyen ?
* utiliser la meme version de caml pour gcc2 et gcc3 car sinon
on ne peut pas reproduire les tests a partir de la graine !!!
* en mode pas à pas, le graph n'est mis à jour que s'il y a eu un
changement d'état au dernier pas. Par exemple, si il y a un
changement d'état au pas 5, mais que j'exécute 6 pas, l'état n'est
pas mis à jour dans le graphe.
* lorsqu'on clique sur "start", la commande
"/tmp/lurette1/lurette ..." est affichée deux fois de suite
dans la fenêtre des messages.
* Je viens d'avoir une erreur en utilisant un dosier dont le nom
contient un espace (erreur de gen_stubs). Ceci doit pouvoir être
éviter en mettant entre guillemets chaques arguments. Ca ne vaut
peut être pas le coup de corriger cela (modification du script
appelant gen_stubs_exe, puis de toutes les commande exécutées par
gen_stubs_exe (appels de cp par exemple)). Une petite note dans la
doc peut être suffisante.
*********** A faire
* always_true.lus devrait plotot s'appeller <nom du noeud>_oracle.lus
* Hashtbl.length existe dans la 3.08 !!
* utiliser la meme version de caml pour gcc2 et gcc3 car sinon
on ne peut pas reproduire les tests a partir de la graine !!!
* cygwin
- xlurette
installer lablgtk
http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist
-lucky
//PAVE/jahier/cygwin/lib/libcudd_caml.a(cudd_caml.o)(.text+0x1c0e):cudd_caml.c: undefined reference to `_gc_full_major'
- gen_stubs
File /tmp/lurette1/modele_vehicule.h could not be opened.
- sim2chro
* le nom du repertoire share est particulierement mal choisi...
......@@ -105,16 +66,19 @@ pas mis
> concerver ces fichiers ? Sinon, pourraient-ils être générés dans
> le répertoire temporaire ?
* "En fait je ne mettais rien dans le deuxième champ de la ligne
SUT (et tout marchait bien). Je met maintenant le nom de mon modèle,
et je n'ai plus de souci avec le batch."
-> faire en sorte que ca marche encore pour le batch quand les gens font comme ca.
* dans lucky, lors d'une erreur de type, demander aux gens de ressaye
* dans lucky, lors d'une erreur de type, demander aux gens de ressayer
plutot que de quitter.
Rajouter une option "--stop-at-type-error-for-inputs" (cf fichier
rif.ml, faire un search sur la chaine "parse error"
* tuer la fenetre de parametres plus proprement.
* compiler pour cygwin/mingwin/windows ??
* rajouter une option --verbose <int> pour avoir plusieurs niveau de verbosité.
Ameliorer aussi les messages correspondant
......@@ -237,7 +201,6 @@ INCONV
* Chercher a detecter des egalites lors de l'ajout d'une inegalité.
pour les contraintes de dimension > 1 (cf code commenté dans store.ml)
* compiler sim2chrogtk sous cygwin
* giro :
-> Il faudrait rajouter la possibilité de faire, par ex, des
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 35)
(Parent-Version lurette 1 34)
(Version-Log "")
(Project-Version lurette 1 36)
(Parent-Version lurette 1 35)
(Version-Log "
* A better error msg is displayed when one try to write something like
<<x : int ^ 3 ~default pre x ^ 3>>, which is currently not supported.
* Fix a bug in gen_fake_lucky that was introduced in V1.33
(incorrect environment were generated).
")
(New-Version-Log ""
)
(Checkin-Time "Tue, 27 Jul 2004 10:39:06 +0200")
(Checkin-Time "Tue, 31 Aug 2004 09:43:25 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -18,7 +26,7 @@
;; Sources files for luc_exe
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.5 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.54 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.55 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.28 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.18 644))
......@@ -37,7 +45,7 @@
(source/lucky.mli (lurette/15_env.mli 1.25 644))
(source/lucky.ml (lurette/16_env.ml 1.44 644))
(source/util.ml (lurette/35_util.ml 1.72 644))
(source/util.ml (lurette/35_util.ml 1.73 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.10 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.7 644))
......@@ -77,7 +85,7 @@
(source/gne.mli (lurette/b/36_gne.mli 1.8 644))
(source/gne.ml (lurette/b/37_gne.ml 1.9 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.57 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.58 644))
(source/draw.mli (lurette/f/1_draw.mli 1.4 644))
(source/draw.ml (lurette/f/2_draw.ml 1.6 644))
......@@ -86,7 +94,7 @@
(source/gen_stubs_poc.mli (lurette/f/4_gen_stubs_ 1.4 644))
(source/gen_stubs_scade.ml (lurette/f/5_gen_stubs_ 1.6 644))
(source/gen_stubs_scade.mli (lurette/f/6_gen_stubs_ 1.3 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.59 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.60 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.6 644))
(source/gen_stubs_common.mli (lurette/e/40_gen_stubs_ 1.4 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.5 644))
......@@ -141,7 +149,7 @@
(Makefile.common.source (lurette/e/33_Makefile.c 1.12 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.52 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.35 644))
(user-rules (lurette/c/14_myrules 1.67 644))
(user-rules (lurette/c/14_myrules 1.68 644))
(share/Makefile.test.in (lurette/c/25_user-rules 1.13 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
......@@ -165,7 +173,7 @@
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.3 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.52 644))
(TODO (lurette/d/22_TODO 1.53 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.8 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.12 644))
......@@ -175,7 +183,7 @@
(test/time-rey.exp (lurette/h/13_time-rey.e 1.10 644))
(test/time-rey.res (lurette/h/14_time-rey.r 1.11 644))
(test/time-joly.exp (lurette/b/48_time.exp 1.68 644))
(test/time-joly.res (lurette/b/49_time.res 1.74 644))
(test/time-joly.res (lurette/b/49_time.res 1.75 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.46 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.45 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.23 644))
......@@ -222,9 +230,9 @@
(test/sparc-scade/libdigital.saofdm (lurette/e/47_libdigital 1.1 644))
(test/sparc-scade/exo1.vsw (lurette/e/48_exo1.vsw 1.1 644))
(test/sparc-scade/exo1.vsp (lurette/e/49_exo1.vsp 1.2 644))
(test/sparc-scade/exo1.saofdm (lurette/e/50_exo1.saofd 1.2 644))
(test/sparc-scade/exo1.saofdm (lurette/e/50_exo1.saofd 1.3 644))
(test/sparc-scade/Direction_D1.saofd (lurette/e/51_Direction_ 1.2 644))
(test/sparc-scade/scade.rif.exp (lurette/f/0_scade.rif. 1.6 644))
(test/sparc-scade/scade.rif.exp (lurette/f/0_scade.rif. 1.7 644))
(test/test-scade-cygwin.res (lurette/f/28_test-scade 1.1 644))
(test/cygwin-scade/.lurette_rc (lurette/f/29_.lurette_r 1.2 644))
......@@ -375,7 +383,7 @@
;; Files added by populate at Tue, 26 Aug 2003 15:45:55 +0200,
;; to version 0.143(w), by jahier:
(source/gen_fake_lucky.ml (lurette/g/8_gen_fake_l 1.9 644))
(source/gen_fake_lucky.ml (lurette/g/8_gen_fake_l 1.10 644))
;; Files added by populate at Tue, 26 Aug 2003 15:46:03 +0200,
;; to version 0.143(w), by jahier:
......@@ -441,7 +449,7 @@
;; Files added by populate at Thu, 13 Nov 2003 16:59:39 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.9 644))
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.10 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:41 +0100,
;; to version 1.8(w), by jahier:
......@@ -584,7 +592,7 @@
(source/parse_sildex.mli (lurette/h/35_parse_sild 1.2 644))
(source/parse_sildex.ml (lurette/h/36_parse_sild 1.2 644))
(source/gen_stubs_sildex.mli (lurette/h/37_gen_stubs_ 1.2 644))
(source/gen_stubs_sildex.ml (lurette/h/38_gen_stubs_ 1.3 644))
(source/gen_stubs_sildex.ml (lurette/h/38_gen_stubs_ 1.4 644))
;; Files added by populate at Fri, 25 Jun 2004 10:42:17 +0200,
;; to version 1.29(w), by jahier:
......@@ -594,7 +602,7 @@
;; Files added by populate at Mon, 28 Jun 2004 10:29:06 +0200,
;; to version 1.29(w), by jahier:
(test/time-asti.res (lurette/h/40_time-asti. 1.6 644))
(test/time-asti.res (lurette/h/40_time-asti. 1.7 644))
(test/time-asti.exp (lurette/h/41_time-asti. 1.5 644))
;; Files added by populate at Mon, 19 Jul 2004 16:17:17 +0200,
......@@ -611,6 +619,40 @@
;; to version 1.32(w), by jahier:
(share/lucky.vim (lurette/h/44_lucky.vim 1.1 640))
;; Files added by populate at Tue, 27 Jul 2004 12:24:20 +0200,
;; to version 1.35(w), by jahier:
(RELEASE-NOTES (lurette/h/45_RELEASE-NO 1.1 644))
;; Files added by populate at Thu, 26 Aug 2004 14:42:44 +0200,
;; to version 1.35(w), by jahier:
(test/test9.rif.exp-ocaml7 (lurette/h/46_test9.rif. 1.1 644))
(test/test8.rif.exp-ocaml7 (lurette/h/47_test8.rif. 1.1 644))
(test/test7.rif.exp-ocaml7 (lurette/h/48_test7.rif. 1.1 644))
(test/test13.rif.exp-ocaml7 (lurette/h/49_test13.rif 1.1 644))
(test/test12.rif.exp-ocaml7 (lurette/h/50_test12.rif 1.1 644))
(test/test11.rif.exp-ocaml7 (lurette/h/51_test11.rif 1.1 644))
(test/test10.rif.exp-ocaml7 (lurette/i/0_test10.rif 1.1 644))
(test/losange-3d.rif.exp-ocaml7 (lurette/i/1_losange-3d 1.1 644))
(test/heater_int.rif.exp-ocaml7 (lurette/i/2_heater_int 1.1 644))
(test/heater_float.rif.exp-ocaml7 (lurette/i/3_heater_flo 1.1 644))
(test/gyro.rif.exp-ocaml7 (lurette/i/4_gyro.rif.e 1.1 644))
(test/ControleurPorte.rif.exp-ocaml7 (lurette/i/5_Controleur 1.1 644))
;; Files added by populate at Mon, 30 Aug 2004 13:14:38 +0200,
;; to version 1.35(w), by jahier:
(test/Sildex/sut_sildex_io.c (lurette/i/6_sut_sildex 1.1 644))
(test/Sildex/sut_sildex.h (lurette/i/7_sut_sildex 1.1 644))
(test/Sildex/sut_sildex.c (lurette/i/8_sut_sildex 1.1 644))
(test/Sildex/sildex.rif.exp (lurette/i/9_sildex.rif 1.1 644))
(test/Sildex/oracle_sildex_io.c (lurette/i/10_oracle_sil 1.1 644))
(test/Sildex/oracle_sildex.h (lurette/i/11_oracle_sil 1.1 644))
(test/Sildex/oracle_sildex.c (lurette/i/12_oracle_sil 1.1 644))
(test/Sildex/env.luc (lurette/i/13_env.luc 1.1 644))
(test/sildex.res.exp (lurette/i/14_sildex.res 1.1 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -28,8 +28,6 @@ open Type
open Gen_stubs_common
let (generate_lucky: string -> string -> typedef list ->
Gen_stubs_common.vn_ct list -> Gen_stubs_common.vn_ct list -> string ->
unit) =
......@@ -50,18 +48,22 @@ let (generate_lucky: string -> string -> typedef list ->
("\t" ^ vn ^ " : " ^ (Type.to_string2 (c_type_to_lucky_type tdl ct)))
in
let first = ref true in
let rec put_fake_constraints (vn, ct) =
put_fake_constraints_aux (vn, c_type_to_lucky_type tdl ct)
and put_fake_constraints_aux (vn, lt) =
match lt with
| IntT ->
put ( " (0 < " ^ vn ^ ") and (" ^ vn ^ " < 5) \n\t\t")
if !first then (first := false; put " ~cond ") else put " and ";
put (" (0 < " ^ vn ^ ") and (" ^ vn ^ " < 5) \n\t\t")
| FloatT ->
if !first then first := false else put " and ";
put (" (0.0 < " ^ vn ^ ") and (" ^ vn ^ " < 1.0)\n\t\t")
| BoolT -> () (* put no contraints on Boolean vars *)
| UT(EnumT el) -> () (* Ditto for enums *)
| UT(ArrayT (s, t)) ->
if !first then first := false else put " and ";
for i = 0 to (s-1) do
put_fake_constraints_aux (vn ^ "[" ^ (string_of_int i) ^ "]", t)
done
......@@ -87,13 +89,10 @@ let (generate_lucky: string -> string -> typedef list ->
put "start_state { 0 } \n";
put " \n";
put "transitions {\n";
put " 0 -> 0 ~cond ";
put " 0 -> 0 ";
if vo = [] then put "true" else
(
put_fake_constraints (List.hd vo);
List.iter (fun v -> put " and " ; put_fake_constraints v) (List.tl vo)
);
List.iter (put_fake_constraints) vo ;
put ";\n";
put " }\n";
......
......@@ -405,7 +405,6 @@ let (main : unit -> 'a) =
and oracle_node = Sys.argv.(5)
and oracle_compiler = (string_to_compiler Sys.argv.(6))
and tmp_dir = Sys.argv.(7)
and user_dir = Sys.getcwd ()
in
let user_dir = Filename.dirname sut in
let _ =
......@@ -421,6 +420,7 @@ let (main : unit -> 'a) =
compile_lustre_program_if_needed oracle oracle_node
oracle_compiler user_dir tmp_dir
in
gen_stubs_file tmp_dir
(Filename.concat user_dir sut_node) sut_compiler
(Filename.concat user_dir oracle_node) oracle_compiler
......
......@@ -409,7 +409,9 @@ let (go: module_name -> string -> typedef list -> vn_ct list ->
in
put "}\n\n" ;
close_out oc
close_out oc;
if Sys.file_exists (mod_name ^ "_io.c") then
Sys.remove (mod_name ^ "_io.c")
......
......@@ -55,7 +55,10 @@ let _ =
let arg_nb = (Array.length Sys.argv)
external random_seed: unit -> int = "caml_sys_random_seed";;
(* Pour la version 3.08 .... *)
(* external random_seed: unit -> int = "caml_sys_random_seed";; *)
external random_seed: unit -> int = "sys_random_seed";;
let string_of_node n = n
......
......@@ -531,16 +531,45 @@ let host =
print_string "You must use the lurettetop script, not lurettetop_exe.\n";
exit 1
let chop_ext file =
try Filename.chop_extension file
with _ -> file
let (gen_stubs : string -> string -> string -> string -> unit) =
fun sut sut_node oracle oracle_node ->
(* XXX use Unix.create_process *)
let gen_stubs_cmd =
("gen_stubs " ^
sut ^" "^ sut_node ^" "^ (compiler_to_string flag.sut_compiler) ^" "^
oracle ^" "^ oracle_node ^" "^
("gen_stubs \"" ^
sut ^ "\" \""^ sut_node ^"\" \""^ (compiler_to_string flag.sut_compiler) ^"\" \""^
oracle ^"\" \""^ oracle_node ^"\" "^
(if oracle = "" then "" else (compiler_to_string flag.oracle_compiler)) ^
" " ^ flag.tmp_dir ^ "\n")
" \"" ^ flag.tmp_dir ^ "\"\n")
in
if
Sys.file_exists ((chop_ext sut) ^ "_io.c") &&
flag.sut_compiler = Sildex
then
(
output_string stderr ("Delete " ^ (chop_ext sut) ^ "_io.c\n");
flush stderr;
Sys.remove ((chop_ext sut) ^ "_io.c");
let _ = Sys.command ("touch " ^ (chop_ext sut) ^ "_io.c") in ()
)
else
();
if
Sys.file_exists ((chop_ext oracle) ^ "_io.c") &&
flag.oracle_compiler = Sildex
then
(
output_string stderr ("Delete " ^ (chop_ext oracle) ^ "_io.c\n");
flush stderr;
Sys.remove ((chop_ext oracle) ^ "_io.c");
let _ = Sys.command ("touch " ^ (chop_ext oracle) ^ "_io.c") in ()
)
else
();
output_string stderr gen_stubs_cmd;
flush stderr ;
if
...