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

lurette 1.37 Wed, 29 Sep 2004 15:37:07 +0200 by jahier

Parent-Version:      1.36
Version-Log:

source/lurettetop.ml
source/gen_stubs.ml
   Call the automatically generated oracle <node_name>_always_true.lus
   instead of always_true.

user-rules
   Put the tgz for the release in joly to save disk space

ihm/xlurette/xlurette_glade_main.ml
   fix a bug where xlurettte was crashing down when the seed field
   (spin button) was empty.

ihm/xlurette/makefile
ihm/xlurette/xlurette_glade_main.ml
   Put a fake min and max value and transform it with sed at
   the makefile level in order to turn around a bug in glade
   where one cannot put negative values in spin buttons.

Project-Description: Lurette
parent d7a68d0b
......@@ -4,12 +4,12 @@
(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 23925 1093938205 35_util.ml 1.73)
(test/time-asti.res 5298 1093938205 h/40_time-asti. 1.7)
(test/time-asti.res 5647 1096465027 h/40_time-asti. 1.8)
(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 7304 1093938205 d/22_TODO 1.53)
(TODO 7467 1096465027 d/22_TODO 1.54)
(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)
......@@ -26,7 +26,7 @@
(polka/C/internal.c 883 1071844798 e/8_internal.c 1.2)
(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)
(ihm/xlurette/makefile 4019 1096465027 c/16_makefile 1.24)
(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)
......@@ -59,7 +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)
(RELEASE-NOTES 939 1096465027 h/45_RELEASE-NO 1.2)
(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)
......@@ -96,13 +96,13 @@
(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)
(test/time-joly.exp 10146 1090917546 b/48_time.exp 1.68)
(polka/caml/Makefile 6579 1090917546 d/45_Makefile 1.5)
(test/time-joly.exp 10239 1096465027 b/48_time.exp 1.69)
(polka/caml/Makefile 6578 1096465027 d/45_Makefile 1.6)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(ihm/xlurette/xlurette_glade_main.ml 62801 1090917546 c/12_xlurette_g 1.45)
(ihm/xlurette/xlurette_glade_main.ml 62865 1096465027 c/12_xlurette_g 1.46)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 112097 1090330182 c/13_xlurette.g 1.33)
(ihm/xlurette/xlurette.glade 112083 1096465027 c/13_xlurette.g 1.34)
(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)
......@@ -163,12 +163,12 @@
(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 13485 1093938205 24_generate_l 1.60)
(source/gen_stubs.ml 13329 1096465027 24_generate_l 1.61)
(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 25878 1093938205 g/45_lustreExp. 1.10)
(source/lustreExp.ml 25571 1096465027 g/45_lustreExp. 1.11)
(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)
......@@ -220,15 +220,15 @@
(share/pixmaps/stock_save.xpm 3420 1055926783 f/9_stock_save 1.1)
(polka/C/bit.h 1424 1071844798 e/2_bit.h 1.2)
(source/parse_c_scade.mli 664 1078751438 e/42_parse_c_sc 1.4)
(demo-xlurette/chaudiere/chaudiere.luc 442 1076684617 c/11_chaudiere. 1.9)
(demo-xlurette/chaudiere/chaudiere.luc 443 1096465027 c/11_chaudiere. 1.10)
(source/parser.mly 6759 1078751438 h/19_parser.mly 1.1)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(source/run_aut.ml 23378 1088597013 b/47_automata.m 1.28)
(source/run_aut.ml 23577 1096465027 b/47_automata.m 1.29)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(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 67800 1093938205 c/1_lurettetop 1.58)
(source/lurettetop.ml 68031 1096465027 c/1_lurettetop 1.59)
(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)
......@@ -239,13 +239,13 @@
(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 18395 1088597013 g/36_bddd.ml 1.10)
(ihm/xlurette/xlurette_glade_interface.ml 86520 1090330182 c/15_xlurette_g 1.31)
(ihm/xlurette/xlurette_glade_interface.ml 86544 1096465027 c/15_xlurette_g 1.32)
(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 4135 1090504025 c/0_Makefile 1.22)
(user-rules 44282 1093938205 c/14_myrules 1.68)
(user-rules 44528 1096465027 c/14_myrules 1.69)
(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)
......@@ -258,15 +258,15 @@
(mlcuddidl/cudd_caml.h 1178 1071844798 d/2_cudd_caml. 1.2)
(source/show_env.ml 3430 1088597013 43_show_env.m 1.23)
(polka/C/essai.c 1001 1047029868 e/11_essai.c 1.1)
(test/time-asti.exp 5300 1090917546 h/41_time-asti. 1.5)
(test/time-asti.exp 5298 1096465027 h/41_time-asti. 1.6)
(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)
(mlcuddidl/rdd.idl 14806 1034006019 c/42_rdd.idl 1.1)
(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 44747 1090330182 41_parse_env. 1.63)
(source/lustreExp.mli 2026 1096465027 g/46_lustreExp. 1.9)
(source/parse_luc.ml 44593 1096465027 41_parse_env. 1.64)
(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)
......@@ -301,7 +301,7 @@
(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 10239 1093938205 b/49_time.res 1.75)
(test/time-joly.res 10228 1096465027 b/49_time.res 1.76)
(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)
......@@ -314,7 +314,7 @@
(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 3445 1088412276 h/17_heater_con 1.3)
(demo-xlurette/fault-tolerant-heater/heater_control.lus 3446 1096465027 h/17_heater_con 1.4)
(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)
......@@ -356,7 +356,7 @@
(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 440 1083336219 h/30_sut.mli 1.2)
(source/sut.mli 450 1096465027 h/30_sut.mli 1.3)
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(share/set_env_var.in 1744 1090330182 g/23_set_env_va 1.6)
(source/formula_to_bdd.mli 1266 1078751438 g/35_formula_to 1.7)
......
V1.37
* The automatically generated oracle in now named "<sut_node>_always_true.lus"
instead of "always_true.lus".
* fix a bug where xlurettte was crashing down when the seed field
(spin button) was empty.
* Allow negative values to be set in xlurette as a seed.
V1.36
* A better error msg is displayed when one try to write something like
......
......@@ -2,6 +2,8 @@
*********** BUGS
* le ~init est ignoré s'il est mis apres un ~default !!!
* 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.
......@@ -30,7 +32,7 @@ prend 170 secondes pour n=10000
* Je viens d'avoir une erreur en utilisant un dosier dont le nom
* NF : 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
......@@ -40,7 +42,53 @@ prend 170 secondes pour n=10000
*********** A faire
* always_true.lus devrait plotot s'appeller <nom du noeud>_oracle.lus
* XXX attention a l'affichade du .rif quabd lus est syntaxiquement faux
* Au sujet des l'heuristique nbac -> lucky, il faudrait peut-etre verifier
que tous les points sont ergodiques (recurrents).
* Dans le mem ordre d'idée :
Cela pourrait etre relativement utile de connaitre les temps de passage
de chaque noeud (temps au sens, chaine de Markov). En faisant abstraction
de la satisfiabilité des formules, bien sur...
* En fait, il faudrait definir un nouveau format lucky basé sur caml
qque chose qui resemblerait à
let i1 = ("toto", Int, 12, ...)
and i2 = ...
in
let il = [i1; i2; ...] in
let f1 = And(Or(.... (sin x)))
and ...
in
let t1 = (n1, n2, f1, Pre(X))
and t2 = ...
in
let tl = [t1; t2; ...] in
let automata = {
inputs = li,
outputs = lo,
...
transitions = tl
}
in
run automata
AVANTAGES :
(1) La syntaxe du format est tres facile à décrire : c'est du caml !!
(2) L'analyse lex, synt, et de type est faite par caml
(3) Ainsi, les appels de fonctions externes, c'est "finger in the nose"
(4) sans parler des librairies
(5) Pour passer de l'ancien format au nouveau, il me suffit
de faire un pretty print de ma structure de donnée interne...
INCONVÉNIENTS :
(1) ca oblige les gens à avoir un compilo caml chez eux...
* Hashtbl.length existe dans la 3.08 !!
......@@ -66,11 +114,6 @@ prend 170 secondes pour n=10000
> 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 ressayer
plutot que de quitter.
......@@ -118,7 +161,7 @@ apparaissent les monomes. Ca fout les boules...
* 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
* coder les types enumerés avec un boolean au lieu d'un entier
(suggestion BJ)
* Finir le ocaml-lutin (.mluc)
......@@ -146,41 +189,6 @@ Mais ca complique. On verra apres.
-> comment faire depuis un tel interpreteur ????
-> appeler du caml ? du C ?
* En fait, il faudrait definir un nouveau format lucky basé sur caml
qque chose qui resemblerait à
let i1 = ("toto", Int, 12, ...)
and i2 = ...
in
let il = [i1; i2; ...] in
let f1 = And(Or(.... (sin x)))
and ...
in
let t1 = (n1, n2, f1, Pre(X))
and t2 = ...
in
let tl = [t1; t2; ...] in
let automata = {
inputs = li,
outputs = lo,
...
transitions = tl
}
in
run automata
AVANTAGES :
(1) La syntaxe du format est tres facile à décrire : c'est du caml !!
(2) L'analyse lex, synt, et de type est faite par caml
(3) Ainsi, les appels de fonctions externes, c'est "finger in the nose"
(4) sans parler des librairies
(5) Pour passer de l'ancien format au nouveau, il me suffit
de faire un pretty print de ma structure de donné interne...
INCONVÉNIENTS :
(1) ca oblige les gens à avoir un compilo caml chez eux...
* reporter le contenu de la nouvelle section de d1.1-v2 dans les entetes de modules
......
inputs {
Heat_on : bool
Heat_on : bool;
}
outputs {
U:real ~min 1.0 ~max 60.0
......
......@@ -9,8 +9,8 @@
--
-- (2) then, it performs a vote:
-- o If the tree sensors are broken, it does not heat;
-- o If the temperature is bigger than TMAX, it heats;
-- o If the temperature is smaller than TMIN, it does not heat;
-- o If the temperature is bigger than TMAX, it does not heat;
-- o If the temperature is smaller than TMIN, it heats;
-- o Otherwise, it keeps its previous state.
......
......@@ -34,6 +34,8 @@ cat: cmo
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
| sed -e 's/~lower:666./~lower:(float_of_int min_int)/' \
| sed -e 's/~upper:666./~upper:(float_of_int max_int)/' \
> xlurette_glade_interface.ml
do: cat
......@@ -61,6 +63,8 @@ opt: dummy
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
| sed -e 's/~lower:666./~lower:(float_of_int min_int)/' \
| sed -e 's/~upper:666./~upper:(float_of_int max_int)/' \
> xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +$(LABLGTK) -labels -c xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +$(LABLGTK) -labels -c xlurette_glade_callbacks.ml
......
......@@ -3610,9 +3610,9 @@ 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>1.01322e+09</value>
<lower>0</lower>
<upper>1.07374e+09</upper>
<value>666</value>
<lower>666</lower>
<upper>666</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
......
......@@ -2857,9 +2857,9 @@ in
let _ = GtkBase.Widget.set_can_focus radiobutton_user_seed#as_widget true in
let _ = tooltips#set_tip ~text:"Manually initialize the random engine" radiobutton_user_seed#coerce in
let user_seed = GEdit.spin_button
~adjustment:(GData.adjustment~value:1013220000.
~lower:0.
~upper:1073740000.
~adjustment:(GData.adjustment~value:666.
~lower:(float_of_int min_int)
~upper:(float_of_int max_int)
~step_incr:1.
~page_incr:10.
~page_size:10.
......
......@@ -629,7 +629,10 @@ class customized_callbacks = object(self)
method on_user_seed_changed () =
user_seed := int_of_string self#top_set_parameters_window#user_seed#text
user_seed :=
try
int_of_string self#top_set_parameters_window#user_seed#text
with _ -> 1
method on_radiobutton_draw_all_vertices_toggled () =
if self#top_set_parameters_window#radiobutton_draw_all_vertices#active then
......@@ -1500,7 +1503,10 @@ class customized_callbacks = object(self)
method get_test_length () =
int_of_string self#top_set_parameters_window#test_length#text
try
int_of_string self#top_set_parameters_window#test_length#text
with _ ->
1
method set_test_length i =
self#top_set_parameters_window#test_length#set_text (string_of_int i)
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 36)
(Parent-Version lurette 1 35)
(Project-Version lurette 1 37)
(Parent-Version lurette 1 36)
(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.
source/lurettetop.ml
source/gen_stubs.ml
Call the automatically generated oracle <node_name>_always_true.lus
instead of always_true.
* Fix a bug in gen_fake_lucky that was introduced in V1.33
(incorrect environment were generated).
user-rules
Put the tgz for the release in joly to save disk space
ihm/xlurette/xlurette_glade_main.ml
fix a bug where xlurettte was crashing down when the seed field
(spin button) was empty.
ihm/xlurette/makefile
ihm/xlurette/xlurette_glade_main.ml
Put a fake min and max value and transform it with sed at
the makefile level in order to turn around a bug in glade
where one cannot put negative values in spin buttons.
")
(New-Version-Log ""
)
(Checkin-Time "Tue, 31 Aug 2004 09:43:25 +0200")
(Checkin-Time "Wed, 29 Sep 2004 15:37:07 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -65,7 +78,7 @@
(source/store.ml (lurette/b/27_rnumsolver 1.43 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.25 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.63 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.64 644))
(source/show_env.mli (lurette/42_show_env.m 1.14 644))
(source/show_env.ml (lurette/43_show_env.m 1.23 644))
......@@ -77,7 +90,7 @@
(source/env_state.ml (lurette/51_env_state. 1.61 644))
(source/run_aut.mli (lurette/b/46_automata.m 1.12 644))
(source/run_aut.ml (lurette/b/47_automata.m 1.28 644))
(source/run_aut.ml (lurette/b/47_automata.m 1.29 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.12 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.28 644))
......@@ -85,7 +98,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.58 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.59 644))
(source/draw.mli (lurette/f/1_draw.mli 1.4 644))
(source/draw.ml (lurette/f/2_draw.ml 1.6 644))
......@@ -94,7 +107,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.60 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.61 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))
......@@ -149,7 +162,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.68 644))
(user-rules (lurette/c/14_myrules 1.69 644))
(share/Makefile.test.in (lurette/c/25_user-rules 1.13 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
......@@ -173,7 +186,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.53 644))
(TODO (lurette/d/22_TODO 1.54 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))
......@@ -182,8 +195,8 @@
(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.75 644))
(test/time-joly.exp (lurette/b/48_time.exp 1.69 644))
(test/time-joly.res (lurette/b/49_time.res 1.76 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))
......@@ -269,7 +282,7 @@
(demo-xlurette/chaudiere/chaudiere_oracle.lus (lurette/c/8_chaudiere_ 1.1 644))
(demo-xlurette/chaudiere/chaudiere_ctrl.lus (lurette/c/9_chaudiere_ 1.2 644))
(demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus (lurette/c/10_buggy_chau 1.1 644))
(demo-xlurette/chaudiere/chaudiere.luc (lurette/c/11_chaudiere. 1.9 644))
(demo-xlurette/chaudiere/chaudiere.luc (lurette/c/11_chaudiere. 1.10 644))
(test/losange.luc (lurette/d/27_losange.lu 1.2 644))
(test/losange-3d.luc (lurette/d/28_losange-3d 1.5 644))
......@@ -286,10 +299,10 @@
(test/Makefile (lurette/c/0_Makefile 1.22 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.45 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.33 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.31 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.23 644))
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.46 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.34 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.32 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.24 644))
;; cudaux
......@@ -343,7 +356,7 @@
(polka/caml/polka_lexer.mll (lurette/d/42_polka_lexe 1.1 600))
(polka/caml/polkaIO.mli (lurette/d/43_polkaIO.ml 1.1 600))
(polka/caml/polkaIO.ml (lurette/d/44_polkaIO.ml 1.2 600))
(polka/caml/Makefile (lurette/d/45_Makefile 1.5 744))
(polka/caml/Makefile (lurette/d/45_Makefile 1.6 744))
(polka/C/vector.h (lurette/d/47_vector.h 1.2 600))
(polka/C/satmat.h (lurette/d/48_satmat.h 1.1 600))
(polka/C/poly.h (lurette/d/49_poly.h 1.2 600))
......@@ -449,12 +462,12 @@
;; 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.10 644))
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.11 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:41 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.8 644))
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.9 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:47 +0100,
;; to version 1.8(w), by jahier:
......@@ -519,7 +532,7 @@
(demo-xlurette/fault-tolerant-heater/degradable-sensors.luc (lurette/h/15_wearing-se 1.2 644))
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc (lurette/h/16_heater_con 1.1 644))
(demo-xlurette/fault-tolerant-heater/heater_control.lus (lurette/h/17_heater_con 1.3 644))
(demo-xlurette/fault-tolerant-heater/heater_control.lus (lurette/h/17_heater_con 1.4 644))
(demo-xlurette/fault-tolerant-heater/sensors.luc (lurette/h/18_sensors.lu 1.2 644))
;; Files added by populate at Mon, 08 Mar 2004 14:02:46 +0100,
......@@ -564,7 +577,7 @@
;; Files added by populate at Wed, 17 Mar 2004 17:20:34 +0100,
;; to version 1.26(w), by jahier:
(source/sut.mli (lurette/h/30_sut.mli 1.2 644))
(source/sut.mli (lurette/h/30_sut.mli 1.3 644))
;; Files added by populate at Wed, 17 Mar 2004 17:31:35 +0100,
;; to version 1.26(w), by jahier:
......@@ -602,8 +615,8 @@
;; 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.7 644))
(test/time-asti.exp (lurette/h/41_time-asti. 1.5 644))
(test/time-asti.res (lurette/h/40_time-asti. 1.8 644))
(test/time-asti.exp (lurette/h/41_time-asti. 1.6 644))
;; Files added by populate at Mon, 19 Jul 2004 16:17:17 +0200,
;; to version 1.32(w), by jahier:
......@@ -623,7 +636,7 @@
;; 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))
(RELEASE-NOTES (lurette/h/45_RELEASE-NO 1.2 644))
;; Files added by populate at Thu, 26 Aug 2004 14:42:44 +0200,
;; to version 1.35(w), by jahier:
......
......@@ -59,7 +59,7 @@ polkarun%: polka.cma libpolka%_caml.a ../C/libpolka%.a
install: $(CCINC_TO_INSTALL) $(MLLIB_TO_INSTALL)
$(INSTALLd) $(INCDIR)/polka $(LIBDIR) $(BINDIR)
$(INSTALL) $(INCDIR)/polka $(LIBDIR) $(BINDIR)
$(INSTALL) $(CCINC_TO_INSTALL) $(INCDIR)/polka
$(INSTALL) $(MLLIB_TO_INSTALL) ${LIBDIR}
for i in $(CCLIB_TO_INSTALL); do\
......
......@@ -74,19 +74,18 @@ let (gen_a_fake_oracle : string -> string -> string -> compiler -> unit) =
)
vn_ct_l
in
let oc = open_out (Filename.concat user_dir "always_true.lus") in
let oc = open_out (Filename.concat user_dir (sut_node ^ "_always_true.lus")) in
let put s = output_string oc s in
put "-- Automatically generated from ";
put sut_h ;
put " by bin/gen_stubs. \n" ;
put "-- Migth be overrided: rename it if you modify it." ;
put "\n";
put "node always_true(";
put "\n-- Migth be overrided: rename it if you modify it." ;
put "\n\n";
put ("node " ^ sut_node ^ "_always_true(\n\t");
put (format_string_list "; \n\t" vn_lt_str_l) ;
put ") returns (weird_name_to_avoid_clash__ok:bool);\n";
put "let \n weird_name_to_avoid_clash__ok = true ; \ntel\n";
put (") returns (" ^ sut_node ^ "__ok:bool);\n");
put ("let \n " ^ sut_node ^ "__ok = true ; \ntel\n");
put "\n";
close_out oc
......@@ -116,9 +115,6 @@ gen_stubs basically performs the following actions:
nb: gen_stubs is not meant to be used directly by end-users.
"
let compile_lustre_program_if_needed
lustre_prog lustre_node compiler user_dir tmp_dir =
let prog_dir = Filename.dirname lustre_prog in
......@@ -233,12 +229,7 @@ let (sort_vars: string list -> vn_ct list -> vn_ct list) =
(****************************************************************************)
(**
[gen_stubs_file tmp_dir sut sut_compiler oracle oracle_compiler]
generates the stubs files "lurette__sut.c" and "lurette__oracle.c"
where [sut] and [oracle] are the sut and oracle filename without
extension.
*)
(* exported *)
let (gen_stubs_file : string -> string -> compiler -> string -> compiler -> unit) =
fun tmp_dir sut sut_compiler oracle oracle_compiler ->
let sut_m = (Filename.basename sut) in
......@@ -356,18 +347,19 @@ let (main : unit -> 'a) =
(* No oracle is provided *)
(
let sut = Sys.argv.(1)
and sut_node = Sys.argv.(2)
and sut_node = Sys.argv.(2)
and sut_compiler = (string_to_compiler Sys.argv.(3))
and tmp_dir = Sys.argv.(4)
and user_dir = Sys.getcwd ()
in
let user_dir = Filename.dirname sut in
let save_dir = Sys.getcwd () in
let always_true = sut_node ^ "_always_true" in
let old_fake_oracle =
if
Sys.file_exists (Filename.concat user_dir "always_true.lus")
Sys.file_exists (Filename.concat user_dir (always_true ^ ".lus"))
then
Util.readfile (Filename.concat user_dir "always_true.lus")
Util.readfile (Filename.concat user_dir (always_true ^ ".lus"))
else
""
in
...