Commit 30692c60 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 0.138 Fri, 13 Jun 2003 09:05:17 +0200 by jahier

Parent-Version:      0.137
Version-Log:

AND NOW IT WORKS WITH SCADE !!!
(no array neither struct though)

source/gen_stubs.ml:
source/gen_stubs_common.ml [new file]:
source/gen_stubs_common.mli [new file]:
source/parse_c_scade.ml [new file]:
source/parse_c_scade.mli [new file]:
source/*.ml:
    Add a scade port to lurette.

Project-Description: Lurette
parent 5a9bb52c
......@@ -2,32 +2,35 @@
;; 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 19130 1054647149 35_util.ml 1.47)
(source/util.ml 21891 1055487917 35_util.ml 1.48)
(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 6148 1054647149 d/22_TODO 1.16)
(TODO 5741 1055487917 d/22_TODO 1.17)
(mlcuddidl/rdd.mli 7174 1034006019 c/40_rdd.mli 1.1)
(source/ne.mli 2138 1050421093 c/22_ne.mli 1.6)
(test/scade/libpwlinear.saofdm 1379 1055487917 e/43_libpwlinea 1.1)
(polka/documentation/polka.texi 109061 1047029868 e/17_polka.texi 1.1)
(source/ocaml2c.idl 1484 1050578564 e/26_ocaml2c.id 1.2)
(cuddaux/Changes 42 1034006019 c/36_Changes 1.1)
(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 3759 1054647149 c/16_makefile 1.13)
(source/solver.ml 30978 1055487917 39_solver.ml 1.48)
(ihm/xlurette/makefile 3121 1055487917 c/16_makefile 1.14)
(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 467 1054647149 e/24_lucky_init 1.5)
(share/lucky_init.sh.in 731 1055487917 e/24_lucky_init 1.6)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(source/gen_stubs_common.ml 6381 1055487917 e/39_gen_stubs_ 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 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)
(test/scade/Direction_D1.saofd 1335 1055487917 e/51_Direction_ 1.1)
(polka/Makefile.depend 136 1047029868 d/30_Makefile.d 1.1)
(README 2266 1052229068 10_README 1.9)
(source/pnumsolver.ml 9273 1045489850 d/23_pnumsolver 1.2)
(source/polyhedron.ml 7661 1049961831 d/25_polyhedron 1.5)
......@@ -42,7 +45,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)
(test/time-moucherotte.res 4407 1055487917 e/38_time-mouch 1.2)
(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)
......@@ -57,23 +60,25 @@
(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 34286 1054647149 c/12_xlurette_g 1.21)
(ihm/xlurette/xlurette_glade_main.ml 34402 1055487917 c/12_xlurette_g 1.22)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 73084 1054647149 c/13_xlurette.g 1.16)
(ihm/xlurette/xlurette.glade 72772 1055487917 c/13_xlurette.g 1.17)
(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 8228 1054647149 d/21_time-ecrin 1.19)
(test/time-ecrins.exp 8252 1055487917 d/21_time-ecrin 1.20)
(source/value.ml 2358 1049961831 c/23_value.ml 1.4)
(source/gne.ml 2774 1046682069 b/37_gne.ml 1.5)
(source/parse_c_scade.ml 5803 1055487917 e/41_parse_c_sc 1.1)
(source/formula.ml 6028 1053337243 45_formula.ml 1.29)
(source/Makefile.gen_fake_lutin 255 1050578564 d/17_Makefile.g 1.2)
(Makefile.common.source 222 1053337243 e/33_Makefile.c 1.3)
(polka/C/Makefile 3528 1047029868 e/15_Makefile 1.1)
(source/Makefile.gen_fake_lutin 524 1055487917 d/17_Makefile.g 1.3)
(Makefile.common.source 1761 1055487917 e/33_Makefile.c 1.4)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/control.ml 4445 1036675177 c/4_control.ml 1.4)
(test/scade/exo1.saofdm 320 1055487917 e/50_exo1.saofd 1.1)
(source/parse_env.mli 1196 1050421093 40_parse_env. 1.14)
(source/env_state.ml 23648 1053337243 51_env_state. 1.43)
(source/env_state.ml 23766 1055487917 51_env_state. 1.44)
(polka/caml/matrix.idl 5301 1047029868 d/34_matrix.idl 1.1)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
(source/Makefile.lurettetop 375 1050578564 d/14_Makefile.l 1.3)
......@@ -87,12 +92,12 @@
(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 22355 1054647149 24_generate_l 1.47)
(polka/C/pkint.h 6036 1047029868 e/12_pkint.h 1.1)
(source/gen_stubs.ml 13818 1055487917 24_generate_l 1.48)
(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 466 1054647149 e/23_lucky_init 1.5)
(share/lucky_init.csh.in 729 1055487917 e/23_lucky_init 1.6)
(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)
......@@ -100,64 +105,69 @@
(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)
(test/scade/libmath.saofdm 1378 1055487917 e/45_libmath.sa 1.1)
(source/store.ml 31409 1050421093 b/27_rnumsolver 1.24)
(mlcuddidl/mtbdd.mli 4395 1034006019 c/43_mtbdd.mli 1.1)
(polka/C/satmat.h 1254 1047029868 d/48_satmat.h 1.1)
(source/ne.ml 9591 1053337243 c/21_ne.ml 1.8)
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(source/parse_env.ml 42920 1053337243 41_parse_env. 1.44)
(share/Makefile.lurette.in 777 1053337243 b/38_Makefile.l 1.23)
(source/parse_env.ml 43028 1055487917 41_parse_env. 1.45)
(share/Makefile.lurette.in 4394 1055487917 b/38_Makefile.l 1.24)
(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 8230 1054647149 b/49_time.res 1.45)
(source/automata.ml 19521 1053337243 b/47_automata.m 1.8)
(test/time-ossau.res 8238 1055487917 b/49_time.res 1.46)
(source/automata.ml 19517 1055487917 b/47_automata.m 1.9)
(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 8230 1054647149 b/48_time.exp 1.42)
(test/time-ossau.exp 8238 1055487917 b/48_time.exp 1.43)
(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)
(test/heater_int.rif.exp 812 1053337243 b/28_heater_int 1.13)
(source/parse_poc.ml 6265 1047029868 d/15_parse_poc. 1.2)
(source/parse_poc.ml 4190 1055487917 d/15_parse_poc. 1.3)
(polka/C/bit.h 1380 1047029868 e/2_bit.h 1.1)
(source/parse_c_scade.mli 656 1055487917 e/42_parse_c_sc 1.1)
(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 38414 1054647149 c/1_lurettetop 1.34)
(source/lurettetop.ml 41141 1055487917 c/1_lurettetop 1.35)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(source/constraint.ml 2762 1050421093 c/19_constraint 1.7)
(test/scade/libdigital.saofdm 1256 1055487917 e/47_libdigital 1.1)
(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 51446 1054647149 c/15_xlurette_g 1.15)
(ihm/xlurette/xlurette_glade_interface.ml 51447 1055487917 c/15_xlurette_g 1.16)
(test/losange-3d2.luc 368 1050421093 e/32_losange-3d 1.1)
(test/Makefile 26 1051024737 c/0_Makefile 1.12)
(user-rules 21081 1054647149 c/14_myrules 1.35)
(user-rules 23386 1055487917 c/14_myrules 1.36)
(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)
(test/usager.luc 508 1046682069 b/14_usager.env 1.11)
(mlcuddidl/manager.idl 11024 1034006019 c/48_manager.id 1.1)
(mlcuddidl/cudd_caml.h 1210 1034006019 d/2_cudd_caml. 1.1)
(source/show_env.ml 3642 1037192189 43_show_env.m 1.16)
(test/scade/liblinear.saofdm 1301 1055487917 e/46_liblinear. 1.1)
(polka/C/essai.c 1001 1047029868 e/11_essai.c 1.1)
(doc/Interface_draft 5232 1003928781 19_Interface_ 1.1)
(mlcuddidl/rdd.idl 14806 1034006019 c/42_rdd.idl 1.1)
(polka/sedscript 261 1047029868 d/31_sedscript 1.1)
(OcamlMakefile 22849 1053337243 17_OcamlMakef 1.50)
(OcamlMakefile 21310 1055487917 17_OcamlMakef 1.51)
(source/lurette.mli 456 1049961831 11_lurette.ml 1.13)
(polka/caml/polka.ml 5485 1047029868 d/39_polka.ml 1.1)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(share/configure.in 2738 1053337243 d/11_configure. 1.7)
(polka/C/matrix.c 19090 1047029868 e/7_matrix.c 1.1)
(mlcuddidl/rdd.ml 8746 1034006019 c/41_rdd.ml 1.1)
(share/configure.in 6859 1055487917 d/11_configure. 1.8)
(test/tram.luc 1092 1046682069 b/15_tram.env 1.10)
(share/Makefile.common.in 189 1052229068 d/12_Makefile.c 1.5)
(demo-xlurette/chaudiere/buggy_chaudiere_ctrl.lus 219 1031732392 c/10_buggy_chau 1.1)
(cuddaux/cuddaux.h 2381 1034006019 c/33_cuddaux.h 1.1)
(polka/C/matrix.h 3461 1047029868 d/51_matrix.h 1.1)
(source/pnumsolver.mli 2322 1045489850 d/24_pnumsolver 1.2)
(test/scade/scade.rif.exp 1158 1055487917 f/0_scade.rif. 1.1)
(mlcuddidl/sedscript 203 1034006019 c/38_sedscript 1.1)
(source/env_state.mli 7269 1053337243 50_env_state. 1.30)
(test/ControleurPorte.rif.exp 4676 1053337243 b/29_Controleur 1.15)
......@@ -169,27 +179,30 @@
(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)
(source/parse_poc.mli 1821 1047029868 d/29_parse_poc. 1.1)
(source/Makefile.gen_stubs 219 1050578564 b/42_Makefile.g 1.6)
(source/parse_poc.mli 1188 1055487917 d/29_parse_poc. 1.2)
(source/Makefile.gen_stubs 737 1055487917 b/42_Makefile.g 1.7)
(test/temp_float.luc 731 1053337243 b/51_temp_float 1.8)
(polka/C/polka.c 4969 1047029868 e/6_polka.c 1.1)
(source/polyhedron.mli 940 1045489850 d/26_polyhedron 1.1)
(mlcuddidl/bdd.mli 8573 1034006019 d/5_bdd.mli 1.1)
(test/scade/libmathadvanced.saofdm 3267 1055487917 e/44_libmathadv 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)
(test/time-moucherotte.exp 4407 1055487917 e/37_time-mouch 1.2)
(source/command_line_luc_exe.ml 3558 1055487917 b/33_command_li 1.15)
(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 8228 1054647149 d/20_time-ecrin 1.19)
(test/time-ecrins.res 8252 1055487917 d/20_time-ecrin 1.20)
(test/scade/exo1.vsp 2089 1055487917 e/49_exo1.vsp 1.1)
(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 6969 1054647149 c/20_Makefile 1.17)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 6951 1055487917 c/20_Makefile 1.18)
(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)
(test/scade/exo1.vsw 400 1055487917 e/48_exo1.vsw 1.1)
(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)
......@@ -198,10 +211,11 @@
(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)
(source/gen_fake_lutin.ml 3973 1052229068 d/16_gen_fake_l 1.4)
(source/gen_fake_lutin.ml 4709 1055487917 d/16_gen_fake_l 1.5)
(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)
(source/gen_stubs_common.mli 1772 1055487917 e/40_gen_stubs_ 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)
......
......@@ -12,3 +12,27 @@ OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
LURETTE_PATH = $(HOME)/lurette
SOURCES_LURETTE_LIB = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/prevar.mli $(LURETTE_PATH)/source/prevar.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/command_line.mli $(LURETTE_PATH)/source/command_line.ml \
$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
$(LURETTE_PATH)/source/ne.mli $(LURETTE_PATH)/source/ne.ml \
$(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
$(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
$(LURETTE_PATH)/source/parse_env.mli $(LURETTE_PATH)/source/parse_env.ml \
$(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
$(LURETTE_PATH)/source/draw.mli $(LURETTE_PATH)/source/draw.ml \
$(LURETTE_PATH)/source/store.mli $(LURETTE_PATH)/source/store.ml \
$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/solver.mli $(LURETTE_PATH)/source/solver.ml \
$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/automata.mli $(LURETTE_PATH)/source/automata.ml \
$(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
$(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml
ALL_SOURCES = $(SOURCES_LURETTE_LIB) $(SOURCES_OCAML)
......@@ -5,7 +5,7 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.50 Mon, 19 May 2003 11:40:43 +0200 jahier $
# $Id: OcamlMakefile 1.51 Fri, 13 Jun 2003 09:05:17 +0200 jahier $
#
###########################################################################
......@@ -14,30 +14,6 @@
-include $(LURETTE_PATH)/Makefile.common.source
SOURCES_LURETTE_LIB = \
$(LURETTE_PATH)/source/util.ml \
$(LURETTE_PATH)/source/prevar.mli $(LURETTE_PATH)/source/prevar.ml \
$(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
$(LURETTE_PATH)/source/command_line.mli $(LURETTE_PATH)/source/command_line.ml \
$(LURETTE_PATH)/source/value.mli $(LURETTE_PATH)/source/value.ml \
$(LURETTE_PATH)/source/ne.mli $(LURETTE_PATH)/source/ne.ml \
$(LURETTE_PATH)/source/constraint.mli $(LURETTE_PATH)/source/constraint.ml \
$(LURETTE_PATH)/source/formula.mli $(LURETTE_PATH)/source/formula.ml \
$(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
$(LURETTE_PATH)/source/control.mli $(LURETTE_PATH)/source/control.ml \
$(LURETTE_PATH)/source/parse_env.mli $(LURETTE_PATH)/source/parse_env.ml \
$(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.ml \
$(LURETTE_PATH)/source/draw.mli $(LURETTE_PATH)/source/draw.ml \
$(LURETTE_PATH)/source/store.mli $(LURETTE_PATH)/source/store.ml \
$(LURETTE_PATH)/source/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/solver.mli $(LURETTE_PATH)/source/solver.ml \
$(LURETTE_PATH)/source/show_env.mli $(LURETTE_PATH)/source/show_env.ml \
$(LURETTE_PATH)/source/automata.mli $(LURETTE_PATH)/source/automata.ml \
$(LURETTE_PATH)/source/print.mli $(LURETTE_PATH)/source/print.ml \
$(LURETTE_PATH)/source/sim2chro.mli $(LURETTE_PATH)/source/sim2chro.ml \
$(LURETTE_PATH)/source/env.mli $(LURETTE_PATH)/source/env.ml
ALL_SOURCES = $(SOURCES_LURETTE_LIB) $(SOURCES_OCAML)
......
......@@ -13,24 +13,14 @@
(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.
* 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
* xlurette: si le nom du repertoire est le meme que le repertoire courant, je pourrais l'omettre ...
* Utiliser l'ordre des parametres plutot que leur noms
Quoique, quand on fait le produit de plusieurs automates,
......
......@@ -16,7 +16,7 @@ xlurette: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"LURETTE_PATH\") \^ \"\/share\/pixmaps\/\" \^ \"/' \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlc -c -I +lablgtk -labels -c xlurette_glade_interface.ml
......@@ -40,20 +40,6 @@ opt: dummy
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
try: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//\"/' \
| sed -e 's/.xpm\"/.xpm\"/' \
> xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
cyg: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
......@@ -67,6 +53,7 @@ cyg: dummy
ocamlopt.opt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
opt.exe: cyg
opt_opt: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
......@@ -83,7 +70,7 @@ opt_opt: dummy
all: opt cp
all: opt$(EXE) cp
cp:
cp xlurette$(EXE) $(BIN_INSTALL_DIR)
......
......@@ -20,10 +20,9 @@
<type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position>
<modal>False</modal>
<default_width>700</default_width>
<allow_shrink>False</allow_shrink>
<allow_shrink>True</allow_shrink>
<allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink>
<auto_shrink>True</auto_shrink>
<widget>
<class>GtkNotebook</class>
......@@ -52,8 +51,8 @@
<gutter_size>6</gutter_size>
<position>0</position>
<child>
<shrink>True</shrink>
<resize>False</resize>
<shrink>False</shrink>
<resize>True</resize>
</child>
<widget>
......@@ -739,7 +738,6 @@ scade
<widget>
<class>GtkNotebook</class>
<name>notebook2</name>
<height>330</height>
<can_focus>True</can_focus>
<show_tabs>True</show_tabs>
<show_border>True</show_border>
......@@ -824,11 +822,12 @@ scade
<class>GtkHBox</class>
<name>hbox1</name>
<border_width>11</border_width>
<homogeneous>True</homogeneous>
<height>72</height>
<homogeneous>False</homogeneous>
<spacing>4</spacing>
<child>
<shrink>True</shrink>
<resize>True</resize>
<resize>False</resize>
</child>
<widget>
......@@ -845,8 +844,8 @@ scade
<tooltips>True</tooltips>
<child>
<padding>5</padding>
<expand>True</expand>
<fill>True</fill>
<expand>False</expand>
<fill>False</fill>
<pack>GTK_PACK_END</pack>
</child>
......@@ -855,8 +854,6 @@ scade
<child_name>Toolbar:button</child_name>
<name>button17</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Start the testing process</tooltip>
<signal>
<name>clicked</name>
......@@ -872,8 +869,6 @@ scade
<child_name>Toolbar:button</child_name>
<name>button18</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Display (.rif) data with sim2chro</tooltip>
<signal>
<name>clicked</name>
......@@ -889,8 +884,6 @@ scade
<child_name>Toolbar:button</child_name>
<name>gnuplot_rif_button</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Display (.rif) data with gnuplot (3.7 or higher)</tooltip>
<signal>
<name>clicked</name>
......@@ -906,8 +899,6 @@ scade
<child_name>Toolbar:button</child_name>
<name>button20</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Stop the current run</tooltip>
<signal>
<name>clicked</name>
......@@ -923,8 +914,6 @@ scade
<child_name>Toolbar:button</child_name>
<name>clean_up_button</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Clean-up intermediary files (to try when xlurette seems to be broken)</tooltip>
<signal>
<name>clicked</name>
......@@ -940,8 +929,7 @@ scade
<child_name>Toolbar:button</child_name>
<name>quit_button</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<height>38</height>
<tooltip>Quit xlurette</tooltip>
<signal>
<name>clicked</name>
......@@ -2331,7 +2319,7 @@ scade
The SUT is the lustre (or scade) program you want to test. Three fields need to be filled in.
(1) The program file name. You can either provide a ''.c'' [*], a ''.lus'', or a ''.saofd''[**] file.
(1) The program file name. You can either provide a ''.c'' [*], a ''.lus'', or a ''.saofdm''[**] file.
(2) The name of the main node.
......
......@@ -8,9 +8,9 @@ let xlurette = GWindow.window
~position:`NONE
~kind:`TOPLEVEL
~modal:false
~allow_shrink:false
~allow_shrink:true
~allow_grow:true
~auto_shrink:false
~auto_shrink:true
~border_width:2
()
in
......@@ -469,7 +469,6 @@ let notebook2 = GPack.notebook
~show_border:true
~scrollable:false
~popup:false
~height:330
~packing:(vpaned2#add )
()
in
......@@ -525,14 +524,15 @@ let stderr_thumbnail = GMisc.label
in
let hbox1 = GPack.hbox
~spacing:4
~homogeneous:true
~homogeneous:false
~height:72
~packing:(run_panel#add )
()
in
let toolbar4 = GButton.toolbar
~packing:(hbox1#pack ~padding:5
~fill:true
~expand:true
~fill:false
~expand:false
)
~orientation:`HORIZONTAL
~button_relief:`NORMAL
......@@ -1753,7 +1753,7 @@ let label32 = GMisc.label
The SUT is the lustre (or scade) program you want to test. Three fields need to be filled in.
(1) The program file name. You can either provide a ''.c'' [*], a ''.lus'', or a ''.saofd''[**] file.
(1) The program file name. You can either provide a ''.c'' [*], a ''.lus'', or a ''.saofdm''[**] file.
(2) The name of the main node.
......
......@@ -99,23 +99,11 @@ let (remove_extension : string -> string) =
if dir = "." then file else (Filename.concat dir file)
let (gen_fake_lutin : (string -> unit) -> string -> unit) =
fun display hfile ->
let cmd =
("gen_fake_lutin " ^ hfile ^ " \n")
in
display cmd ;
if
((Sys.command cmd) <> 0)
then
display ("*** gen_fake_lutin failed.\n")
else
display (" ... gen_fake_lutin ok.\n")
let (gen_stubs : (string -> unit) -> string -> string -> unit) =
fun display file node ->
let (gen_stubs : (string -> unit) -> string -> string -> string -> unit) =
fun display file node compiler ->
let cmd =
("gen_stubs " ^ (remove_extension file) ^ " " ^ node)
("gen_stubs " ^ (remove_extension file) ^ " " ^ node ^ " " ^ compiler)
in
display cmd;
if
......@@ -144,32 +132,70 @@ let rec (readfile_line : in_channel -> string list -> string list) =
(** returns the list of nodes of a lustre file *)
let (lusinfo : string -> string list) =
fun file ->
let file_info = Filename.temp_file file "nodes_info" in
let file_lus =
try ((Filename.chop_extension file) ^ ".lus")
with Invalid_argument _ -> (file ^ ".lus")
in
let cmd = ("lusinfo " ^ file_lus ^ " nodes > " ^ file_info) in
let _ =
if
Sys.file_exists file_lus
then
(
if Sys.file_exists file_info then Sys.remove file_info;
if
((Sys.command cmd) <> 0)
then
(
output_string stdout ("*** lusinfo failed.\n" ^ cmd ^ "\n");
flush stdout
)
);
in
let ic = open_in file_info in
let nodes = readfile_line ic [] in
close_in ic;
if Sys.file_exists file_info then Sys.remove file_info;
nodes
try
let file_info = Filename.temp_file file "nodes_info" in
let file_lus = file in
if
Filename.check_suffix file ".saofdm"
then
let cmd = ("getsaonodes " ^ file ^ " > " ^ file_info) in
if
Sys.file_exists file_lus
then
(
if Sys.file_exists file_info then Sys.remove file_info;
if
((Sys.command cmd) <> 0)
then
(
output_string stderr ("*** lusinfo failed.\n" ^ cmd ^ "\n");
flush stderr;
[]
)
else
(
let ic = open_in file_info in
let nodes = readfile_line ic [] in
close_in ic;
if Sys.file_exists file_info then Sys.remove file_info;
nodes
)
)
else
[]
else
if
Filename.check_suffix file ".lus"
then
let cmd = ("lusinfo " ^ file_lus ^ " nodes > " ^ file_info) in
if
Sys.file_exists file_lus
then
(
if Sys.file_exists file_info then Sys.remove file_info;
if
((Sys.command cmd) <> 0)
then
(
output_string stderr ("*** lusinfo failed.\n" ^ cmd ^ "\n");
flush stderr;
[]
)