Commit 5a9bb52c authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.137 Tue, 03 Jun 2003 15:32:29 +0200 by jahier

Parent-Version:      0.136
Version-Log:

source/gen_stubs:
   Fix a bug where the var name ok was clashing with user vars
   in the generated always true oracle. now i use the name
   weird_name_to_avoid_clash__ok

source/lurettetop.ml:
   Make sure that the .lus files is less recent than the .c file
   before running.

source/lurettetop.ml:
source/gen_stubs.ml:
ihm/xlurette/*.ml:
   Add support for future handling of the scade compiler.
   Currently, returns a msg saying it that the scade port is not implemented.

Project-Description: Lurette
parent fe6d609c
......@@ -2,12 +2,12 @@
;; REALLY bad things.
(Created-By-Prcs-Version 1 3 3)
(source/show_env.mli 1091 1033738731 42_show_env.m 1.8)
(source/util.ml 19131 1053337243 35_util.ml 1.46)
(source/util.ml 19130 1054647149 35_util.ml 1.47)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(source/constraint.mli 1601 1045489850 c/18_constraint 1.5)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(TODO 6322 1053337243 d/22_TODO 1.15)
(TODO 6148 1054647149 d/22_TODO 1.16)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/ne.mli 2138 1050421093 c/22_ne.mli 1.6)
(polka/documentation/polka.texi 109061 1047029868 e/17_polka.texi 1.1)
......@@ -16,16 +16,16 @@
(mlcuddidl/idd.idl 10595 1034006019 d/1_idd.idl 1.1)
(polka/C/internal.c 699 1047029868 e/8_internal.c 1.1)
(source/solver.ml 31036 1050421093 39_solver.ml 1.47)
(ihm/xlurette/makefile 3737 1053337243 c/16_makefile 1.12)
(ihm/xlurette/makefile 3759 1054647149 c/16_makefile 1.13)
(polka/C/internal.h 958 1047029868 e/0_internal.h 1.1)
(source/command_line.ml 5079 1050578564 b/20_command_li 1.13)
(test/cudd_gc_problem.rif.exp 7882 1053337243 e/30_cudd_gc_pr 1.2)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(share/lucky_init.sh.in 419 1053337243 e/24_lucky_init 1.4)
(share/lucky_init.sh.in 467 1054647149 e/24_lucky_init 1.5)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(source/command_line.mli 1503 1046074449 b/21_command_li 1.11)
(source/Makefile.lucky 2694 1053337243 b/41_Makefile.i 1.20)
(source/Makefile.lucky 2699 1054647149 b/41_Makefile.i 1.21)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
(polka/README 1437 1047029868 e/19_README 1.1)
(README 2266 1052229068 10_README 1.9)
......@@ -42,6 +42,7 @@
(polka/C/cherni.h 2217 1047029868 e/1_cherni.h 1.1)
(polka/caml/polka_caml.c 6499 1047029868 d/37_polka_caml 1.1)
(test/losange-3d.luc 555 1046768487 d/28_losange-3d 1.2)
(test/time-moucherotte.res 2738 1054647149 e/38_time-mouch 1.1)
(polka/caml/poly.idl 8449 1047029868 d/33_poly.idl 1.1)
(polka/documentation/texinfo.tex 200195 1047029868 e/16_texinfo.te 1.1)
(polka/caml/polka_caml.h 1922 1047029868 d/36_polka_caml 1.1)
......@@ -56,13 +57,13 @@
(source/automata.mli 3396 1033738731 b/46_automata.m 1.3)
(source/print.mli 1136 1045558187 46_print.mli 1.13)
(polka/caml/Makefile 6559 1047029868 d/45_Makefile 1.1)
(ihm/xlurette/xlurette_glade_main.ml 31329 1053337243 c/12_xlurette_g 1.20)
(ihm/xlurette/xlurette_glade_main.ml 34286 1054647149 c/12_xlurette_g 1.21)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 56573 1053337243 c/13_xlurette.g 1.15)
(ihm/xlurette/xlurette.glade 73084 1054647149 c/13_xlurette.g 1.16)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(test/gyro.rif.exp 10946 1053337243 e/36_gyro.rif.e 1.2)
(test/time-ecrins.exp 8227 1053337243 d/21_time-ecrin 1.18)
(test/time-ecrins.exp 8228 1054647149 d/21_time-ecrin 1.19)
(source/value.ml 2358 1049961831 c/23_value.ml 1.4)
(source/gne.ml 2774 1046682069 b/37_gne.ml 1.5)
(source/formula.ml 6028 1053337243 45_formula.ml 1.29)
......@@ -86,16 +87,16 @@
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(mlcuddidl/bdd.idl 18233 1034006019 d/7_bdd.idl 1.1)
(polka/caml/polka_parser.mly 1729 1047029868 d/40_polka_pars 1.1)
(source/gen_stubs.ml 21586 1052229068 24_generate_l 1.46)
(source/gen_stubs.ml 22355 1054647149 24_generate_l 1.47)
(polka/C/pkint.h 6036 1047029868 e/12_pkint.h 1.1)
(polka/caml/vector.idl 8669 1047029868 d/35_vector.idl 1.1)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1545 1052229068 b/23_sim2chro.m 1.7)
(share/lucky_init.csh.in 419 1053337243 e/23_lucky_init 1.4)
(share/lucky_init.csh.in 466 1054647149 e/23_lucky_init 1.5)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(polka/C/vector.h 2103 1047029868 d/47_vector.h 1.1)
(polka/C/satmat.c 6254 1047029868 e/4_satmat.c 1.1)
(share/plot 11384 1052229068 e/35_plot 1.1)
(share/plot 11423 1054647149 e/35_plot 1.2)
(source/solver.mli 1003 1046682069 38_solver.mli 1.14)
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(test/passerelle.luc 995 1046682069 b/17_passerelle 1.10)
......@@ -109,14 +110,14 @@
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(source/graph.mli 2185 1037625990 13_graph.mli 1.10)
(source/store.mli 2891 1046074449 b/26_rnumsolver 1.16)
(test/time-ossau.res 8239 1053337243 b/49_time.res 1.44)
(test/time-ossau.res 8230 1054647149 b/49_time.res 1.45)
(source/automata.ml 19521 1053337243 b/47_automata.m 1.8)
(Makefile 68 1051024737 d/13_Makefile 1.4)
(cuddaux/cuddauxBridge.c 6099 1034006019 c/31_cuddauxBri 1.1)
(test/heater_float.rif.exp 1040 1053337243 b/30_heater_flo 1.15)
(cuddaux/Makefile 3326 1053337243 c/35_Makefile 1.7)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(test/time-ossau.exp 8239 1053337243 b/48_time.exp 1.41)
(test/time-ossau.exp 8230 1054647149 b/48_time.exp 1.42)
(source/print.ml 5794 1053337243 47_print.ml 1.23)
(mlcuddidl/macros.m4 11290 1034006019 c/49_macros.m4 1.1)
(polka/caml/polkaIO.ml 1652 1047029868 d/44_polkaIO.ml 1.1)
......@@ -126,15 +127,15 @@
(demo-xlurette/chaudiere/chaudiere.luc 446 1032789516 c/11_chaudiere. 1.5)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(source/lurettetop.ml 33530 1053337243 c/1_lurettetop 1.33)
(source/lurettetop.ml 38414 1054647149 c/1_lurettetop 1.34)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(source/constraint.ml 2762 1050421093 c/19_constraint 1.7)
(polka/caml/Makefile.depend 0 1053337243 d/32_Makefile.d 1.2)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 38030 1053337243 c/15_xlurette_g 1.14)
(ihm/xlurette/xlurette_glade_interface.ml 51446 1054647149 c/15_xlurette_g 1.15)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 21186 1053337243 c/14_myrules 1.34)
(user-rules 21081 1054647149 c/14_myrules 1.35)
(mlcuddidl/cudd_caml.c 22890 1034006019 d/3_cudd_caml. 1.1)
(test/usager.luc 508 1046682069 b/14_usager.env 1.11)
(polka/C/config.h 77 1047029868 e/13_config.h 1.1)
......@@ -175,24 +176,25 @@
(source/polyhedron.mli 940 1045489850 d/26_polyhedron 1.1)
(mlcuddidl/bdd.mli 8573 1034006019 d/5_bdd.mli 1.1)
(polka/C/polka.h 1478 1047029868 d/50_polka.h 1.1)
(test/time-moucherotte.exp 2738 1054647149 e/37_time-mouch 1.1)
(source/command_line_luc_exe.ml 3533 1050578564 b/33_command_li 1.14)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(source/env.ml 7849 1050421093 16_env.ml 1.30)
(test/time-ecrins.res 8227 1053337243 d/20_time-ecrin 1.18)
(test/time-ecrins.res 8228 1054647149 d/20_time-ecrin 1.19)
(source/value.mli 1100 1049961831 c/24_value.mli 1.2)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(polka/Makefile.config 1683 1053337243 e/20_Makefile.c 1.5)
(source/Makefile 7037 1053337243 c/20_Makefile 1.16)
(source/Makefile 6969 1054647149 c/20_Makefile 1.17)
(source/graph.ml 2339 1037625990 14_graph.ml 1.8)
(test/cudd_gc_problem.luc 227680 1050421093 e/29_cudd_gc_pr 1.1)
(demo-xlurette/chaudiere/chaudiere_ctrl.lus 177 1031732392 c/9_chaudiere_ 1.1)
(test/losange-3d.rif.exp 2676 1053337243 e/31_losange-3d 1.2)
(polka/documentation/Makefile 476 1047029868 e/18_Makefile 1.1)
(source/sim2chro.ml 2949 1053337243 b/24_sim2chro.m 1.17)
(source/sim2chro.ml 3029 1054647149 b/24_sim2chro.m 1.18)
(cuddaux/cuddauxTDGenCof.c 15712 1034006019 c/26_cuddauxTDG 1.1)
(source/luc_exe.ml 14073 1053337243 b/32_ima_exe.ml 1.32)
(source/gne.mli 1557 1046682069 b/36_gne.mli 1.5)
(source/lurette.ml 18378 1053337243 12_lurette.ml 1.69)
(source/lurette.ml 18378 1054647149 12_lurette.ml 1.70)
(polka/C/Makefile.depend 1081 1047029868 d/46_Makefile.d 1.1)
(doc/ocamldoc.hva 313 1008328137 b/13_ocamldoc.h 1.1)
(cuddaux/cuddauxCompose.c 13638 1034006019 c/30_cuddauxCom 1.1)
......@@ -200,7 +202,7 @@
(test/heater_float.lus 177 1034351455 b/44_heater_flo 1.2)
(polka/Makefile 1636 1047029868 e/21_Makefile 1.1)
(test/porte.luc 996 1049961831 b/16_porte.env 1.10)
(share/gnuplot-rif 974 1052229068 e/34_gnuplot-ri 1.1)
(share/gnuplot-rif 1138 1054647149 e/34_gnuplot-ri 1.2)
(source/eval.mli 1265 1050421093 48_eval.mli 1.11)
(source/Makefile.show_luc 1033 1050578564 b/40_Makefile.s 1.9)
(mlcuddidl/Makefile 7387 1053337243 d/9_Makefile 1.7)
*********** BUGS
* Attention, les gens ne peuvent pas appeler leur variables ok !!!
* gnuplot-rif sous cygwin ne marche pas.
* Quand on modifie le .lus, je ne recompile pas tout ce qu'il semble t'il ??
*********** A faire maintenant
(1) Portage pour scade, esterel ...
-> structure, tableau, types structures, etc.
*********** A faire maintenant
* compiler sim2chrogtk sous cygwin
(2) Traiter les variables stables (signaux purs)
(2) gen_fake_lutin devrait etre une commande lurettetop et non pas code
en dur dans xlurette...
idem pour la sauvegarde des options dans .lurette-rc.
(2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
a lurettetop et xlurette...)
* Si l'execution se termine normalement (ie, a la fin de l'expression
reguliere), changer le message d'erreur.
reguliere), changer le message d'erreur.
* mettre qques part que j'utilise ocaml, camlidl cuddaux, mlcuddidl,
polka, gmp,autoconf, make, gcc, emacs, latex, dot, gtk, sim2chro, ...
* Mettre les .c generes dans share
? Mettre les .c generes dans share
* lurettetop :utilise Filename.temp_file pour creer un repertoire temporaire
pour lurette.
* xlurette: si le nom du repertoire est le meme que le repertoire courant, je pourrais l'omettre ...
......@@ -34,18 +42,6 @@ reguliere), changer le message d'erreur.
* Repasser a une notation infixée pour le format lucky. Ne pas faire
la verif de type en meme temps que le parsing ->
(1) Portage pour scade et esterel windows ...
-> structure, tableau, types structures, etc.
(2) Traiter les variables stables (signaux purs)
(2) gen_fake_lutin devrait etre une commande lurettetop et non pas code
en dur dans xlurette...
idem pour la sauvegarde des options dans .lurette-rc.
(2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
a lurettetop et xlurette...)
* le losange ne passe pas avec polkai et passe avec polkag.
......@@ -66,9 +62,6 @@ la verif de type en meme temps que le parsing ->
* Mettre a jour le parseur wrt les modifs que j'ai faite a la syntax
(noeuds transiants/stationnaires + formula = ...)
* Faire un gestionnaire de sessions comme le propose Pascal
* Si jamais on a à faire a des polyedres trop gros, on pourrait
......
......@@ -83,12 +83,13 @@ opt_opt: dummy
install: opt
cp xlurette $(BIN_INSTALL_DIR)
all: opt cp
cp:
cp xlurette$(EXE) $(BIN_INSTALL_DIR)
clean:
rm -f *.cm* *.o a.out xlurette xlurette.opt
rm -f *.cm* *.o a.out xlurette$(EXE) xlurette.opt$(EXE)
dummy:
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 136)
(Parent-Version lurette 0 135)
(Project-Version lurette 0 137)
(Parent-Version lurette 0 136)
(Version-Log "
source/parse_env.ml:
source/formula.ml:
source/formula.mli:
source/env_state.ml:
source/env_state.mli:
source/automata.ml:
Change the format of pragma to stick with how they are defined
in the DC ref man.
Also take into account programs that were added by yvan that
let one know which control point in the source lutin program
each lucky node correspond to.
source/lurette.ml:
Display a better error msg when the sut and env vars do not match.
source/sim2chro.ml:
Variables were not display in the same order as in their declaration
(bug introduced in the previous change).
source/gen_stubs:
Fix a bug where the var name ok was clashing with user vars
in the generated always true oracle. now i use the name
weird_name_to_avoid_clash__ok
source/lurettetop.ml:
The clean command does not remove everything in the tmp dir but only
the generated files.
Make sure that the .lus files is less recent than the .c file
before running.
ihm/xlurette/xlurette_*.ml:
The naming of rif files was not working properly.
Add a clean-up button.
user-rules:
<various other makefiles>:
Abstract away a few hard-code env var so that its works on cygwin
source/lurettetop.ml:
source/gen_stubs.ml:
ihm/xlurette/*.ml:
Add support for future handling of the scade compiler.
Currently, returns a msg saying it that the scade port is not implemented.
")
(New-Version-Log ""
)
(Checkin-Time "Mon, 19 May 2003 11:40:43 +0200")
(Checkin-Time "Tue, 03 Jun 2003 15:32:29 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -60,7 +41,7 @@ user-rules:
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.13 644))
(source/lurette.ml (lurette/12_lurette.ml 1.69 644))
(source/lurette.ml (lurette/12_lurette.ml 1.70 644))
(source/command_line.ml (lurette/b/20_command_li 1.13 644))
(source/command_line.mli (lurette/b/21_command_li 1.11 644))
......@@ -72,7 +53,7 @@ user-rules:
(source/env.mli (lurette/15_env.mli 1.17 644))
(source/env.ml (lurette/16_env.ml 1.30 644))
(source/util.ml (lurette/35_util.ml 1.46 644))
(source/util.ml (lurette/35_util.ml 1.47 644))
(source/solver.mli (lurette/38_solver.mli 1.14 644))
(source/solver.ml (lurette/39_solver.ml 1.47 644))
......@@ -108,13 +89,13 @@ user-rules:
(source/automata.ml (lurette/b/47_automata.m 1.8 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.7 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.17 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.18 644))
(source/gne.mli (lurette/b/36_gne.mli 1.5 644))
(source/gne.ml (lurette/b/37_gne.ml 1.5 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.33 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.46 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.34 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.47 644))
(source/control.mli (lurette/c/3_control.ml 1.3 644))
(source/control.ml (lurette/c/4_control.ml 1.4 644))
......@@ -148,17 +129,17 @@ user-rules:
(Makefile.common.source (lurette/e/33_Makefile.c 1.3 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.50 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.23 644))
(user-rules (lurette/c/14_myrules 1.34 644))
(user-rules (lurette/c/14_myrules 1.35 644))
(share/Makefile.test (lurette/c/25_user-rules 1.6 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
(source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.3 644))
(source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.2 644))
(source/Makefile.show_luc (lurette/b/40_Makefile.s 1.9 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.20 644))
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.21 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.6 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.20 644))
(source/Makefile (lurette/c/20_Makefile 1.16 644))
(source/Makefile (lurette/c/20_Makefile 1.17 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -172,17 +153,19 @@ user-rules:
(README (lurette/10_README 1.9 644))
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.15 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.4 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.4 644))
(TODO (lurette/d/22_TODO 1.16 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.5 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.5 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.1 744))
(share/plot (lurette/e/35_plot 1.1 744))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.2 744))
(share/plot (lurette/e/35_plot 1.2 744))
(test/time-ossau.exp (lurette/b/48_time.exp 1.41 644))
(test/time-ossau.res (lurette/b/49_time.res 1.44 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.18 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.18 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.42 644))
(test/time-ossau.res (lurette/b/49_time.res 1.45 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.19 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.19 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.1 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.1 644))
;; Various files used for testing purposes
(test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.1 644))
......@@ -230,10 +213,10 @@ user-rules:
(test/Makefile (lurette/c/0_Makefile 1.12 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.20 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.15 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.14 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.12 644))
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.21 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.16 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.15 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.13 644))
;; cudaux
......@@ -325,7 +308,6 @@ user-rules:
)
(Merge-Parents)
(New-Merge-Parents)
#!/bin/sh
#
# a little sed script that let one visualizes rif files generated by lurette
# with gnuplot.
# with gnuplot 3.7 and higher.
#
# XXX verifier que le .rif n'est pas vide.
rm -f $1.gp $1.plot
FILE=$1
echo "#@set data style steps" > $FILE.gp
echo "#@t=1" >> $FILE.gp
echo "#@f=0" >> $FILE.gp
cat $FILE.rif \
| sed -e 's/:bool/ | /g' \
| sed -e 's/:int/ | /g' \
| sed -e 's/:real/ | /g' \
| sed -e 's/#step/#/g' \
| sed -e 's/# step/#/g' \
| sed -e 's/@#//g' \
| sed -e 's/#program/#@program/' \
| sed -e 's/#inputs/#@ columns : steps | /' \
| sed -e 's/#@inputs/#@ columns : steps | /' \
| sed -e 's/#@outputs//' \
| sed -e 's/#@locals//' \
| sed -e 's/#outs/ /' \
| sed -e 's/bye!//' \
| tr '\n' ' '\
| sed -e s/' t '/' 1 '/g \
| sed -e s/' f '/' 0 '/g \
| sed -e s/' t '/' 1 '/g \
| sed -e s/' f '/' 0 '/g \
| tr '#' '\n' \
| tr '@' '#' \
>> $FILE.gp
if test $# -lt 1
then
echo "usage: gnuplot-rif <rif file> "
exit 1
fi;
FILE=$1
cat $FILE.gp | plot $2
if test -f $FILE ;
then
rm -f $FILE.gp $FILE.plot
echo "#@set data style steps" > $FILE.gp
echo "#@t=1" >> $FILE.gp
echo "#@f=0" >> $FILE.gp
sed -e 's/:bool/ | /g' $FILE \
| sed -e 's/:int/ | /g' \
| sed -e 's/:real/ | /g' \
| sed -e 's/#step/#/g' \
| sed -e 's/# step/#/g' \
| sed -e 's/@#//g' \
| sed -e 's/#program/#@program/' \
| sed -e 's/#inputs/#@ columns : steps | /' \
| sed -e 's/#@inputs/#@ columns : steps | /' \
| sed -e 's/#@outputs//' \
| sed -e 's/#@locals//' \
| sed -e 's/#outs/ /' \
| sed -e 's/bye!//' \
| tr '\n' ' '\
| sed -e s/' t '/' 1 '/g \
| sed -e s/' f '/' 0 '/g \
| sed -e s/' t '/' 1 '/g \
| sed -e s/' f '/' 0 '/g \
| tr '#' '\n' \
| tr '@' '#' \
>> $FILE.gp
# cat $FILE.gp | plot
cat $FILE.gp | plot -dump > $FILE.plot
rm $FILE.gp
gnuplot $FILE.plot
else
echo " File $1 does not exist"
fi
# gnuplot $FILE.gp
\ No newline at end of file
......@@ -7,6 +7,7 @@ setenv LURETTE_PATH @LURETTEPATH@
setenv PIXMAP_DIR @LURETTEPATH@/share/pixmaps/
set path=(@LURETTEPATH@/@HOST_TYPE@/bin $path)
set PATH=(@LURETTEPATH@/@HOST_TYPE@/bin $PATH)
setenv PS_VIEWER @GV@
setenv DOT @LURETTEPATH@/@HOST_TYPE@/bin/dot
......
......@@ -7,6 +7,7 @@ export LURETTE_PATH=@LURETTEPATH@
export PIXMAP_DIR=@LURETTEPATH@/share/pixmaps/
export path=@LURETTEPATH@/@HOST_TYPE@/bin $path
export PATH=@LURETTEPATH@/@HOST_TYPE@/bin $PATH
export PS_VIEWER=@GV@
export DOT=@LURETTEPATH@/@HOST_TYPE@/bin/dot
......
#!/bin/sh
# $Id: plot 1.1 Tue, 06 May 2003 15:51:08 +0200 jahier $
# $Id: plot 1.2 Tue, 03 Jun 2003 15:32:29 +0200 jahier $
#
# pl: general wrapper script for plotting with gnuplot from shell cmdline
#
......@@ -78,8 +78,8 @@ EOT
case "$DISPLAY" in
*:*) # X11 - let gnuplot auto-recognise term
;;
"") # even if DISPLAY is not set, "x11" is default term - bug?
SETTERM="set term dumb $COLUMNS $LINES" ;;
"") # even if DISPLAY is not set, "windows" is default term - bug?
SETTERM="set terminal windows $COLUMNS $LINES" ;;
esac
# process args
......@@ -245,8 +245,8 @@ EOT
# if tty is default [X11], wait for <enter> after plotting
case "$SETTERM" in
"") PAUSE="pause -1" ;;
*) PAUSE="# pause -1" ;;
"") PAUSE="pause -1 " ;;
*) PAUSE="pause -1 " ;;
esac
# allow stdin
......@@ -374,6 +374,8 @@ do
cat >> $CODE << EOT
$PLOTSTR
$PAUSE
$PAUSE
$PAUSE
EOT
PLOTSTR="plot
\"
......@@ -393,6 +395,8 @@ case "$SEQUENTIAL" in
cat >> $CODE << EOT
$PLOTSTR
$PAUSE
$PAUSE
$PAUSE
EOT
;;
esac
......
......@@ -214,14 +214,12 @@ clean:
cp:
cp gen_stubs $(BIN_INSTALL_DIR) ; \
cp gen_fake_lutin $(BIN_INSTALL_DIR) ; \
cp lucky $(BIN_INSTALL_DIR) ; \
cp show_luc $(BIN_INSTALL_DIR) ; \
cp lurettetop $(BIN_INSTALL_DIR) ; \
cp liblurette_lib_dc.a $(LIB_INSTALL_DIR) ;\
cp gen_stubs$(EXE) $(BIN_INSTALL_DIR) ; \
cp gen_fake_lutin$(EXE) $(BIN_INSTALL_DIR) ; \
cp lucky$(EXE) $(BIN_INSTALL_DIR) ; \
cp show_luc$(EXE) $(BIN_INSTALL_DIR) ; \
cp lurettetop$(EXE) $(BIN_INSTALL_DIR) ; \
cp liblurette_lib_nc.a $(LIB_INSTALL_DIR) ;\
cp liblurette_lib_bc.a $(LIB_INSTALL_DIR) ;\
cp ocaml2c.h $(INC_INSTALL_DIR)
install: all cp
......
......@@ -21,7 +21,7 @@ POLKA_CLIB =
# POLKA_CLIB = polkag_caml polkag gmp
#POLKA_CLIB = polkag_caml david_polkag_print parme gmpxx
LIBS = str nums polka cudd
LIBS = unix str nums polka cudd
CLIBS = cudd_caml cuddaux cudd $(POLKA_CLIB) camlidl mtr st epd util
USE_CAMLP4 = yes
......
......@@ -638,8 +638,8 @@ let (gen_a_fake_oracle : string -> string -> unit) =
put "node always_true(";
put (format_string_list "; \n\t" vn_lt_str_l) ;
put ") returns (ok:bool);\n";
put "let \n ok = true ; \ntel\n";
put ") returns (weird_name_to_avoid_clash__ok:bool);\n";
put "let \n weird_name_to_avoid_clash__ok = true ; \ntel\n";
put "\n";
close_out oc
......@@ -658,23 +658,46 @@ let usage = ("\n\nusage: gen_stub <sut> <sut_node> [<oracle> <oracle_node>] " ^
let compile_lustre_program_if_needed lustre_prog lustre_node =
let compile_lustre_program_if_needed sut lustre_node compiler =
(* if no .h or .c exists, we try to generate them with lustre... *)
let prog_dir = Filename.dirname lustre_prog in
let prog_dir = Filename.dirname sut in
let save_dir = Sys.getcwd () in
Sys.chdir prog_dir;
if
(
not (Sys.file_exists (lustre_node ^ ".c")) ||
if
(Filename.check_suffix sut ".c")
then
(*
if users provide a C file, we still need to switch on the compiler
name in order to know which convention are used
*)
()
else if
(Filename.check_suffix sut ".saofd")
then
output_string stdout "XXX scade port not yet implemented."
else if
(
not (Sys.file_exists (lustre_node ^ ".c"))
||
not (Sys.file_exists (lustre_node ^ ".h"))
)
then
(
output_string stdout ("No " ^ lustre_node ^ ".c or no " ^ lustre_node ^
".h exist(s), so I try to compile " ^ lustre_prog ^
".lus with node " ^ lustre_node ^ " with the lus2ec and ec2c...\n");
Util.lus2ec lustre_prog lustre_node ;
Util.ec2c lustre_node
match compiler with
"verimag" ->
output_string stdout (
"No " ^ lustre_node ^ ".c or no " ^ lustre_node ^
".h exist(s), so I try to compile " ^ sut ^
".lus with node " ^ lustre_node ^
" with the lus2ec and ec2c...\n");
Util.lus2ec sut lustre_node ;
Util.ec2c lustre_node
| "scade" ->
output_string stdout "scade compiler not yet supported, sorry.\n"
| any ->
output_string stdout (any ^ " compiler not yet supported, sorry.\n")
);
Sys.chdir save_dir
......@@ -684,29 +707,35 @@ let (main : unit -> 'a) =
fun _ ->
let arg_nb = (Array.length Sys.argv) - 1 in
if
(arg_nb >= 1 && ((Sys.argv.(1) = "--help") || (Sys.argv.(1) = "-help") || (Sys.argv.(1) = "-h") ))
||
arg_nb = 0
(
arg_nb >= 1
&&
((Sys.argv.(1) = "--help") || (Sys.argv.(1) = "-help") ||