Commit c3ab83b6 authored by Erwan Jahier's avatar Erwan Jahier

lurette 1.12 Tue, 09 Dec 2003 15:44:28 +0100 by jahier

Parent-Version:      1.11
Version-Log:

Various fixes in the C scade parsing.

Project-Description: Lurette
parent b3c5c602
......@@ -3,12 +3,12 @@
(Created-By-Prcs-Version 1 3 3)
(cuddaux/cuddauxGenCof.c 12011 1034006019 c/29_cuddauxGen 1.1)
(source/show_env.mli 1160 1069150632 42_show_env.m 1.11)
(source/util.ml 23004 1069833150 35_util.ml 1.59)
(source/util.ml 23037 1070981068 35_util.ml 1.60)
(test/cygwin-scade/lib_pilot.vsp 1433 1055926783 f/47_lib_pilot. 1.1)
(source/constraint.mli 1706 1069150632 c/18_constraint 1.8)
(test/ControleurPorte.lus 3219 1032940601 c/17_Controleur 1.1)
(mlcuddidl/Changes 64 1034006019 d/10_Changes 1.1)
(TODO 5674 1069833150 d/22_TODO 1.30)
(TODO 5795 1070981068 d/22_TODO 1.31)
(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 20626 1069833150 g/38_fair_bddd. 1.5)
......@@ -23,7 +23,7 @@
(source/parse_luc.mli 2741 1069833150 40_parse_env. 1.18)
(polka/C/internal.c 699 1047029868 e/8_internal.c 1.1)
(source/solver.ml 7687 1069833150 39_solver.ml 1.59)
(ihm/xlurette/makefile 1853 1063786164 c/16_makefile 1.17)
(ihm/xlurette/makefile 1836 1070981068 c/16_makefile 1.18)
(share/gen_fake_lucky.sh.in 115 1063786164 g/31_gen_fake_l 1.1)
(test/test_losange-10d.lus 108 1065787303 g/41_test_losan 1.1)
(polka/C/internal.h 958 1047029868 e/0_internal.h 1.1)
......@@ -32,13 +32,13 @@
(test/sparc-scade/libpwlinear.saofdm 1379 1055487917 e/43_libpwlinea 1.1)
(test/cygwin-scade/ConfAnnot.aty 13661 1055926783 g/4_ConfAnnot. 1.1)
(test/ControleurPorte.c 9407 1012914629 b/19_Controleur 1.1)
(source/bddd.mli 1081 1069833150 g/37_bddd.mli 1.6)
(source/bddd.mli 1120 1070981068 g/37_bddd.mli 1.7)
(share/lucky_init.sh.in 1061 1063786164 e/24_lucky_init 1.11)
(test/heater.lus 176 1063786164 g/33_heater.lus 1.1)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
(test/test10.rif.exp 3827 1065787303 g/16_test10.rif 1.3)
(test/test-scade-cygwin.res 0 1055926783 f/28_test-scade 1.1)
(source/gen_stubs_common.ml 6381 1055487917 e/39_gen_stubs_ 1.1)
(source/gen_stubs_common.ml 6104 1070981068 e/39_gen_stubs_ 1.2)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(test/cygwin-scade/Pilot_cst.saofd 788 1055926783 f/38_Pilot_cst. 1.1)
(test/cygwin-scade/lib_pilot.etp 1173 1055926783 f/48_lib_pilot. 1.1)
......@@ -51,7 +51,7 @@
(test/test9.rif.exp 2322 1064411282 g/17_test9.rif. 1.2)
(source/exp.ml 5974 1069150632 g/47_exp.ml 1.1)
(cuddaux/cuddauxMisc.c 13842 1034006019 c/27_cuddauxMis 1.1)
(source/polyhedron.ml 12963 1069150632 d/25_polyhedron 1.11)
(source/polyhedron.ml 12967 1070981068 d/25_polyhedron 1.12)
(source/Makefile.gen_fake_lucky 528 1063786164 g/9_Makefile.g 1.2)
(polka/C/poly.c 48492 1047029868 e/5_poly.c 1.1)
(source/luc_exe.mli 449 1069150632 b/31_ima_exe.ml 1.3)
......@@ -64,7 +64,7 @@
(polka/caml/polka_caml.c 6499 1047029868 d/37_polka_caml 1.1)
(source/gen_stubs_poc.mli 636 1055926783 f/4_gen_stubs_ 1.1)
(test/losange-3d.luc 514 1063786164 d/28_losange-3d 1.4)
(test/time-moucherotte.res 4862 1069833150 e/38_time-mouch 1.12)
(test/time-moucherotte.res 6291 1070981068 e/38_time-mouch 1.13)
(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)
......@@ -81,9 +81,9 @@
(test/sparc-scade/libdigital.saofdm 1256 1055487917 e/47_libdigital 1.1)
(test/temp_int.luc 517 1063786164 b/50_temp_int.e 1.7)
(source/print.mli 1135 1069150632 46_print.mli 1.14)
(polka/caml/Makefile 6879 1069150632 d/45_Makefile 1.2)
(polka/caml/Makefile 6886 1070981068 d/45_Makefile 1.3)
(test/cygwin-scade/det_mvt_mode.saofd 4184 1055926783 f/51_det_mvt_mo 1.1)
(ihm/xlurette/xlurette_glade_main.ml 46439 1065787303 c/12_xlurette_g 1.29)
(ihm/xlurette/xlurette_glade_main.ml 46690 1070981068 c/12_xlurette_g 1.30)
(TAGS 9825 1007379917 21_TAGS 1.6)
(polka/C/main.tex 1961 1047029868 e/14_main.tex 1.1)
(ihm/xlurette/xlurette.glade 103402 1069833150 c/13_xlurette.g 1.25)
......@@ -92,18 +92,18 @@
(test/cygwin-scade/lib_pilot.err 119 1055926783 f/49_lib_pilot. 1.1)
(test/losange.luc 410 1046768487 d/27_losange.lu 1.2)
(test/gyro.rif.exp 10964 1069150632 e/36_gyro.rif.e 1.7)
(test/time-ecrins.exp 9333 1069833150 d/21_time-ecrin 1.32)
(test/time-ecrins.exp 9332 1070981068 d/21_time-ecrin 1.33)
(source/value.ml 2539 1063786164 c/23_value.ml 1.6)
(source/gne.ml 3467 1063029729 b/37_gne.ml 1.6)
(test/cygwin-scade/Pilot.vsp 2075 1055926783 f/40_Pilot.vsp 1.1)
(source/parse_c_scade.ml 5984 1055926783 e/41_parse_c_sc 1.2)
(source/parse_c_scade.ml 6943 1070981068 e/41_parse_c_sc 1.3)
(share/lurettetop.sh.in 111 1063786164 g/25_lurettetop 1.1)
(test/cygwin-scade/position_validation.saofd 10188 1055926783 f/36_position_v 1.1)
(test/sparc-scade/exo1.saofdm 320 1055487917 e/50_exo1.saofd 1.1)
(share/pixmaps/plus.xpm 473 1055926783 f/15_plus.xpm 1.1)
(polka/C/Makefile 3528 1047029868 e/15_Makefile 1.1)
(source/Makefile.gen_fake_lutin 528 1063786164 d/17_Makefile.g 1.4)
(Makefile.common.source 2450 1069150632 e/33_Makefile.c 1.7)
(Makefile.common.source 548 1070981068 e/33_Makefile.c 1.8)
(test/giro/giro.luc 2755 1033738731 c/6_giro.ima 1.4)
(source/control.ml 4586 1065787303 c/4_control.ml 1.5)
(test/cygwin-scade/.lurette_rc~ 505 1055926783 f/30_.lurette_r 1.1)
......@@ -112,7 +112,7 @@
(share/xlurettetop.bat.in 613 1063786164 g/19_xluretteto 1.1)
(source/env_state.ml 12582 1069833150 51_env_state. 1.52)
(test/test8.rif.exp 341 1065787303 g/18_test8.rif. 1.2)
(polka/caml/matrix.idl 5301 1047029868 d/34_matrix.idl 1.1)
(polka/caml/matrix.idl 5291 1070981068 d/34_matrix.idl 1.2)
(source/fair_bddd.mli 2482 1069833150 g/39_fair_bddd. 1.5)
(cuddaux/cuddauxAddIte.c 12812 1034006019 c/32_cuddauxAdd 1.1)
(source/gen_stubs_scade.mli 641 1055926783 f/6_gen_stubs_ 1.1)
......@@ -136,24 +136,24 @@
(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 13933 1063029729 24_generate_l 1.50)
(polka/caml/vector.idl 8669 1047029868 d/35_vector.idl 1.1)
(source/gen_stubs.ml 14205 1070981068 24_generate_l 1.51)
(polka/caml/vector.idl 8669 1070981068 d/35_vector.idl 1.2)
(mlcuddidl/README 1574 1034006019 d/8_README 1.1)
(source/sim2chro.mli 1549 1069833150 b/23_sim2chro.m 1.10)
(share/lucky_init.csh.in 150 1063786164 e/23_lucky_init 1.8)
(source/lustreExp.ml 21223 1069150632 g/45_lustreExp. 1.1)
(source/gen_fake_lucky.ml 4631 1063786164 g/8_gen_fake_l 1.2)
(source/gen_fake_lucky.ml 4626 1070981068 g/8_gen_fake_l 1.3)
(polka/C/vector.h 2103 1047029868 d/47_vector.h 1.1)
(ID_EN_VRAC 2184 1002196285 0_ID_EN_VRAC 1.1)
(share/pixmaps/stock_exec.xpm 3788 1055926783 f/10_stock_exec 1.1)
(share/gen_stubs.sh.in 110 1063786164 g/29_gen_stubs. 1.1)
(polka/C/satmat.c 6254 1047029868 e/4_satmat.c 1.1)
(mlcuddidl/manager.ml 8017 1034006019 c/47_manager.ml 1.1)
(share/plot 11416 1069150632 e/35_plot 1.5)
(share/plot 11416 1070981068 e/35_plot 1.6)
(share/pixmaps/save.xpm 867 1055926783 f/12_save.xpm 1.1)
(source/solver.mli 1201 1069833150 38_solver.mli 1.21)
(test/passerelle.luc 963 1063786164 b/17_passerelle 1.12)
(source/store.ml 35267 1069833150 b/27_rnumsolver 1.31)
(source/store.ml 35266 1070981068 b/27_rnumsolver 1.32)
(mlcuddidl/mtbdd.mli 4395 1034006019 c/43_mtbdd.mli 1.1)
(test/sparc-scade/exo1.vsp 2089 1055487917 e/49_exo1.vsp 1.1)
(polka/C/satmat.h 1254 1047029868 d/48_satmat.h 1.1)
......@@ -164,11 +164,11 @@
(source/thickness.ml 1194 1069833150 g/51_thickness. 1.1)
(mlcuddidl/session.ml 603 1034006019 c/37_session.ml 1.1)
(demo-xlurette/chaudiere/chaudiere_oracle.lus 107 1031732392 c/8_chaudiere_ 1.1)
(share/Makefile.lurette.in 4414 1063029729 b/38_Makefile.l 1.27)
(share/Makefile.lurette.in 4494 1070981068 b/38_Makefile.l 1.28)
(source/lucky.ml 9042 1069833150 16_env.ml 1.36)
(source/graph.mli 2339 1069150632 13_graph.mli 1.12)
(source/store.mli 3288 1069833150 b/26_rnumsolver 1.23)
(test/time-ossau.res 9334 1069833150 b/49_time.res 1.57)
(test/time-ossau.res 9336 1070981068 b/49_time.res 1.58)
(test/sparc-scade/libmath.saofdm 1378 1055487917 e/45_libmath.sa 1.1)
(Makefile 68 1051024737 d/13_Makefile 1.4)
(share/Makefile.test.in 2712 1064329011 c/25_user-rules 1.10)
......@@ -176,33 +176,33 @@
(test/sparc-scade/libmathadvanced.saofdm 3267 1055487917 e/44_libmathadv 1.1)
(test/sparc-scade/exo1.vsw 400 1055487917 e/48_exo1.vsw 1.1)
(test/heater_float.rif.exp 1057 1065787303 b/30_heater_flo 1.18)
(cuddaux/Makefile 3326 1053337243 c/35_Makefile 1.7)
(cuddaux/Makefile 3326 1070981068 c/35_Makefile 1.8)
(polka/C/bit.c 3026 1047029868 e/10_bit.c 1.1)
(source/draw.mli 452 1065787303 f/1_draw.mli 1.2)
(test/time-ossau.exp 9334 1069319394 b/48_time.exp 1.53)
(test/time-ossau.exp 9334 1070981068 b/48_time.exp 1.54)
(polka/caml/polkaIO.ml 1652 1047029868 d/44_polkaIO.ml 1.1)
(mlcuddidl/macros.m4 11290 1034006019 c/49_macros.m4 1.1)
(source/print.ml 5904 1069150632 47_print.ml 1.25)
(test/heater_int.rif.exp 824 1065787303 b/28_heater_int 1.16)
(test/sparc-scade/scade.rif.exp 1164 1065787303 f/0_scade.rif. 1.4)
(source/parse_poc.ml 4417 1055926783 d/15_parse_poc. 1.4)
(source/parse_poc.ml 4443 1070981068 d/15_parse_poc. 1.5)
(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)
(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)
(source/parse_c_scade.mli 651 1070981068 e/42_parse_c_sc 1.2)
(demo-xlurette/chaudiere/chaudiere.luc 681 1064329011 c/11_chaudiere. 1.8)
(test/giro/allocator.lus 1087 1031732392 c/5_allocator. 1.1)
(source/run_aut.ml 21927 1069833150 b/47_automata.m 1.18)
(cuddaux/README 1427 1034006019 c/34_README 1.1)
(mlcuddidl/bdd.ml 10889 1034006019 d/6_bdd.ml 1.1)
(source/lurettetop.ml 47330 1069319394 c/1_lurettetop 1.43)
(source/lurettetop.ml 47197 1070981068 c/1_lurettetop 1.44)
(source/constraint.ml 3180 1069150632 c/19_constraint 1.10)
(test/structured_type.luc 2224 1063786164 g/32_structured 1.1)
(source/formula_to_bdd.ml 17608 1069833150 g/34_formula_to 1.4)
(test/cygwin-scade/counter.saofd 587 1055926783 g/2_counter.sa 1.1)
(test/test7.rif.exp 269 1063786164 g/12_test7.rif. 1.1)
(polka/caml/Makefile.depend 744 1063029729 d/32_Makefile.d 1.3)
(source/bddd.ml 17589 1069833150 g/36_bddd.ml 1.6)
(polka/caml/Makefile.depend 744 1070981068 d/32_Makefile.d 1.4)
(source/bddd.ml 18277 1070981068 g/36_bddd.ml 1.7)
(doc/archi.fig 3693 1003928781 20_archi.fig 1.1)
(ihm/xlurette/xlurette_glade_interface.ml 76318 1069833150 c/15_xlurette_g 1.23)
(INSTALL 101 1056616700 f/26_INSTALL 1.2)
......@@ -270,16 +270,16 @@
(polka/C/polka.h 1478 1047029868 d/50_polka.h 1.1)
(share/pixmaps/ediff-quit.xpm 494 1055926783 f/20_ediff-quit 1.1)
(test/cygwin-scade/Pilot.saofd 3645 1055926783 f/42_Pilot.saof 1.1)
(test/time-moucherotte.exp 4857 1069319394 e/37_time-mouch 1.11)
(test/time-moucherotte.exp 4862 1070981068 e/37_time-mouch 1.12)
(source/command_line_luc_exe.ml 3804 1069833150 b/33_command_li 1.21)
(source/lurette_exe.c 220 1050421093 e/27_lurette_ex 1.2)
(share/pixmaps/close.xpm 803 1055926783 f/21_close.xpm 1.1)
(test/time-CHAILLOL.res 8235 1063029729 g/11_time-CHAIL 1.1)
(test/time-ecrins.res 9332 1069833150 d/20_time-ecrin 1.33)
(test/time-ecrins.res 9334 1070981068 d/20_time-ecrin 1.34)
(source/value.mli 1172 1069150632 c/24_value.mli 1.5)
(polka/Makefile.config 1683 1053337243 e/20_Makefile.c 1.5)
(test/vrai_tram.lus 564 1027066799 b/6_vrai_tram. 1.2)
(source/Makefile 9476 1069319394 c/20_Makefile 1.26)
(source/Makefile 9457 1070981068 c/20_Makefile 1.27)
(source/graph.ml 3494 1069150632 14_graph.ml 1.10)
(test/cudd_gc_problem.luc 208372 1063029729 e/29_cudd_gc_pr 1.2)
(test/time-CHAILLOL.exp 8235 1063029729 g/10_time-CHAIL 1.1)
......@@ -292,7 +292,7 @@
(source/luc_exe.ml 13991 1069833150 b/32_ima_exe.ml 1.41)
(source/gne.mli 1853 1063029729 b/36_gne.mli 1.6)
(test/cygwin-scade/Direction_D1.saofd 1298 1055926783 f/50_Direction_ 1.1)
(source/lurette.ml 18687 1069833150 12_lurette.ml 1.79)
(source/lurette.ml 18675 1070981068 12_lurette.ml 1.80)
(polka/C/Makefile.depend 1081 1047029868 d/46_Makefile.d 1.1)
(share/lucky.bat.in 584 1063786164 g/28_lucky.bat. 1.1)
(share/lucky.sh.in 106 1063786164 g/27_lucky.sh.i 1.1)
......@@ -312,5 +312,5 @@
(test/cygwin-scade/scade.rif.exp 1380 1063029729 g/7_scade.rif. 1.2)
(share/gnuplot-rif 1427 1064329011 e/34_gnuplot-ri 1.5)
(test/cygwin-scade/Pilot_type.saofd 962 1055926783 f/37_Pilot_type 1.1)
(mlcuddidl/Makefile 7385 1069150632 d/9_Makefile 1.8)
(mlcuddidl/Makefile 7387 1070981068 d/9_Makefile 1.9)
(source/Makefile.show_luc 1344 1069150632 b/40_Makefile.s 1.12)
......@@ -8,42 +8,15 @@
INCDIRS = $(HOME)/$(HOST_TYPE)/lib
LIBDIRS = $(HOME)/$(HOST_TYPE)/lib
# INCDIRS = $(HOME)/$(HOST_TYPE)/lib $(SCADE_INSTALL_DIR)/lib \
# $(SCADE_INSTALL_DIR)/SimulinkGateway/include \
# $(SCADE_INSTALL_DIR)/include
# LIBDIRS = $(HOME)/$(HOST_TYPE)/lib $(SCADE_INSTALL_DIR)/lib
OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
LURETTE_PATH = $(HOME)/lurette
# SOURCES_LURETTE_LIB = $(LURETTE_PATH)/source/util.ml \
# $(LURETTE_PATH)/source/genlex.mli $(LURETTE_PATH)/source/genlex.ml \
# $(LURETTE_PATH)/source/lexeme.mli $(LURETTE_PATH)/source/lexeme.ml \
# $(LURETTE_PATH)/source/prevar.mli $(LURETTE_PATH)/source/prevar.ml \
# $(LURETTE_PATH)/source/graph.mli $(LURETTE_PATH)/source/graph.ml \
# $(LURETTE_PATH)/source/polyDraw.mli \
# $(LURETTE_PATH)/source/polyDraw.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/lustreExp.mli $(LURETTE_PATH)/source/lustreExp.ml \
# $(LURETTE_PATH)/source/parser.mly $(LURETTE_PATH)/source/lexer.mll \
# $(LURETTE_PATH)/source/gne.mli $(LURETTE_PATH)/source/gne.ml \
# $(LURETTE_PATH)/source/parse_luc.mli $(LURETTE_PATH)/source/parse_luc.ml \
# $(LURETTE_PATH)/source/polyhedron.mli $(LURETTE_PATH)/source/polyhedron.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/formula_to_bdd.mli \
# $(LURETTE_PATH)/source/formula_to_bdd.ml \
# $(LURETTE_PATH)/source/bddd.mli \
# $(LURETTE_PATH)/source/bddd.ml \
# $(LURETTE_PATH)/source/fair_bddd.mli \
# $(LURETTE_PATH)/source/fair_bddd.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 \
# $(LURETTE_PATH)/source/lurette.ml
ALL_SOURCES = $(SOURCES) $(SOURCES_OCAML)
......
......@@ -17,6 +17,9 @@ par les poids sont un peu contre-intuitives.
****** Documentation
* Rajouter dans lurettetop les options qui permette d'acceder au step mode
(ie, le mode du tirage pour faire un step)
* le retour au source lutin est sans doute cassé (à voir quand le nouveau compilo
lutin sera la)
......
......@@ -46,10 +46,10 @@ ICFLAGS = \
# XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# sparc-sun
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
# Windows95/98/NT with Cygwin tools
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864
# XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864
CFLAGS = $(ICFLAGS) $(XCFLAGS) -O3 -DNDEBUG
......
......@@ -16,7 +16,6 @@ THREAD=
# THREAD=-thread threads.cma
xlurette_exe: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
......@@ -38,10 +37,10 @@ opt: dummy
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> 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
ocamlopt.opt -verbose -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -verbose -I +lablgtk -I +str -labels -o xlurette_exe$(EXE) str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx \
ocamlopt -verbose -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt -verbose -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt -verbose -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt -verbose -I +lablgtk -I +str -labels -o xlurette_exe$(EXE) str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
......
......@@ -168,6 +168,7 @@ let (update_rif_file_name : string -> string -> string -> string -> unit) =
(**************************************************************************)
let pre_sut_node = ref ""
let pre_oracle_node = ref ""
let (remove_extension : string -> string) =
fun str ->
......@@ -511,7 +512,9 @@ class customized_callbacks = object(self)
self#top_fileselection_env#fileselection_env#misc#hide ()
method ok_add_env_clicked () =
let env_file = self#top_fileselection_add_env#fileselection_add_env#get_filename in
let env_file =
self#top_fileselection_add_env#fileselection_add_env#get_filename
in
self#top_xlurette#env_name#entry#set_text
(self#top_xlurette#env_name#entry#text ^ " " ^ env_file) ;
self#top_fileselection_add_env#fileselection_add_env#misc#hide ()
......@@ -599,24 +602,18 @@ class customized_callbacks = object(self)
(* to quit xlurette *)
method quit () =
output_string oc "\nquit\n"; (* to kill lurettetop *)
output_string oc "\n\nquit\nquit\n"; (* to kill lurettetop *)
flush oc;
prerr_endline "bye bye! " ;
prerr_endline "xlurette: bye! " ;
(* let's make sure everyone is dead *)
(* (try Unix.kill (!gp_pid) Sys.sigkill with _ -> () ); *)
(try Unix.kill (!lpid) Sys.sigkill with _ -> () );
(try Unix.kill (!pid) Sys.sigkill with _ -> () );
exit 0
if !lpid <> 0 then (try Unix.kill (!lpid) Sys.sigkill with _ -> () );
if !pid <> 0 then (try Unix.kill (!pid) Sys.sigkill with _ -> () );
exit 0
method on_quit_xlurette_button_clicked () =
self#top_quit_window#quit_window#show ()
method on_quit_yes_clicked () =
output_string oc "\n \n q\n" ;
flush oc;
(* (try Unix.kill (!gp_pid) Sys.sigkill with _ -> () ); *)
(try Unix.kill (!lpid) Sys.sigkill with _ -> () );
(try Unix.kill (!pid) Sys.sigkill with _ -> () );
self#quit ()
method on_quit_no_clicked () =
......@@ -908,10 +905,31 @@ class customized_callbacks = object(self)
self#top_xlurette#env_name_entry#entry#set_text "" ;
self#top_xlurette#oracle_name_entry#entry#set_text "" ;
self#top_xlurette#oracle_node_entry#entry#set_text "" ;
pre_sut_node := sut_node
pre_sut_node := sut_node;
output_string oc ("clean \n");
flush oc
)
method on_oracle_node_changed () =
let oracle_node = self#top_xlurette#oracle_node_entry#entry#text in
if
oracle_node <> !pre_oracle_node
then
(
pre_oracle_node := oracle_node;
output_string oc ("clean \n");
flush oc
)
method on_oracle_name_changed () =
let oracle = self#top_xlurette#oracle_name#entry#text in
if oracle <> "" then
let nodes = (lusinfo oracle) in
if nodes <> [] then self#top_xlurette#oracle_node#set_popdown_strings nodes;
else
self#top_xlurette#oracle_node_entry#entry#set_text ""
......@@ -961,16 +979,10 @@ class customized_callbacks = object(self)
(* ) *)
method on_oracle_name_changed () =
let oracle = self#top_xlurette#oracle_name#entry#text in
if oracle <> "" then
let nodes = (lusinfo oracle) in
if nodes <> [] then self#top_xlurette#oracle_node#set_popdown_strings nodes;
else
self#top_xlurette#oracle_node_entry#entry#set_text ""
method run_lurette () =
self#top_xlurette#progressbar#set_percentage 0.0;
update_rif_file_name
self#top_xlurette#rif_file_basename#text
(remove_extension self#top_xlurette#sut_name_entry#entry#text)
......@@ -1003,7 +1015,10 @@ class customized_callbacks = object(self)
(
let node = self#top_xlurette#sut_node_entry#entry#text in
(* a fake env ougth to have been generated by lurettetop *)
self#top_xlurette#env_name#entry#set_text (node ^ "_env.luc");
if
Sys.file_exists (node ^ "_env.luc")
then
self#top_xlurette#env_name#entry#set_text (node ^ "_env.luc");
(* Fill the combo boxes again, since more files may have been created *)
self#read_env_files ()
);
......@@ -1166,6 +1181,7 @@ class customized_callbacks = object(self)
self#set_sut_node node
| [< 'Genlex.Ident "set_oracle" ; str = parse_ident_or_string ; node = parse_node >] ->
pre_oracle_node := node;
self#set_oracle str;
self#set_oracle_node node
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 11)
(Parent-Version lurette 1 10)
(Project-Version lurette 1 12)
(Parent-Version lurette 1 11)
(Version-Log "
No more side effects are done via the Env_state module.
Various fixes in the C scade parsing.
")
(New-Version-Log ""
)
(Checkin-Time "Wed, 26 Nov 2003 08:52:30 +0100")
(Checkin-Time "Tue, 09 Dec 2003 15:44:28 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -30,7 +28,7 @@ No more side effects are done via the Env_state module.
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.14 644))
(source/lurette.ml (lurette/12_lurette.ml 1.79 644))
(source/lurette.ml (lurette/12_lurette.ml 1.80 644))
(source/command_line.ml (lurette/b/20_command_li 1.17 644))
(source/command_line.mli (lurette/b/21_command_li 1.14 644))
......@@ -42,24 +40,24 @@ No more side effects are done via the Env_state module.
(source/lucky.mli (lurette/15_env.mli 1.22 644))
(source/lucky.ml (lurette/16_env.ml 1.36 644))
(source/util.ml (lurette/35_util.ml 1.59 644))
(source/util.ml (lurette/35_util.ml 1.60 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.4 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.5 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.5 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.5 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.6 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.6 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.7 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.7 644))
(source/solver.mli (lurette/38_solver.mli 1.21 644))
(source/solver.ml (lurette/39_solver.ml 1.59 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.11 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.12 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.6 644))
(source/store.mli (lurette/b/26_rnumsolver 1.23 644))
(source/store.ml (lurette/b/27_rnumsolver 1.31 644))
(source/store.ml (lurette/b/27_rnumsolver 1.32 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.18 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.50 644))
......@@ -82,7 +80,7 @@ No more side effects are done via the Env_state module.
(source/gne.mli (lurette/b/36_gne.mli 1.6 644))
(source/gne.ml (lurette/b/37_gne.ml 1.6 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.43 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.44 644))
(source/draw.mli (lurette/f/1_draw.mli 1.2 644))
(source/draw.ml (lurette/f/2_draw.ml 1.3 644))
......@@ -91,11 +89,11 @@ No more side effects are done via the Env_state module.
(source/gen_stubs_poc.mli (lurette/f/4_gen_stubs_ 1.1 644))
(source/gen_stubs_scade.ml (lurette/f/5_gen_stubs_ 1.1 644))
(source/gen_stubs_scade.mli (lurette/f/6_gen_stubs_ 1.1 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.50 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.1 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.51 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.2 644))
(source/gen_stubs_common.mli (lurette/e/40_gen_stubs_ 1.1 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.2 644))
(source/parse_c_scade.mli (lurette/e/42_parse_c_sc 1.1 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.3 644))
(source/parse_c_scade.mli (lurette/e/42_parse_c_sc 1.2 644))
(source/control.mli (lurette/c/3_control.ml 1.3 644))
(source/control.ml (lurette/c/4_control.ml 1.5 644))
......@@ -112,7 +110,7 @@ No more side effects are done via the Env_state module.
(source/prevar.ml (lurette/d/18_prevar.ml 1.4 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.5 644))
(source/parse_poc.ml (lurette/d/15_parse_poc. 1.4 644))
(source/parse_poc.ml (lurette/d/15_parse_poc. 1.5 644))
(source/parse_poc.mli (lurette/d/29_parse_poc. 1.2 644))
(source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.5 644))
......@@ -144,9 +142,9 @@ No more side effects are done via the Env_state module.
(share/pixmaps/button-close.xpm (lurette/f/24_button-clo 1.1 644))
(share/config.guess (lurette/f/25_config.gue 1.1 755))
(share/configure.in (lurette/d/11_configure. 1.14 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.7 644))
(Makefile.common.source (lurette/e/33_Makefile.c 1.8 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.51 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.27 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.28 644))
(user-rules (lurette/c/14_myrules 1.49 644))
(share/Makefile.test.in (lurette/c/25_user-rules 1.10 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
......@@ -157,7 +155,7 @@ No more side effects are done via the Env_state module.
(source/Makefile.lucky (lurette/b/41_Makefile.i 1.28 644))
(source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.8 644))
(source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.26 644))
(source/Makefile (lurette/c/20_Makefile 1.26 644))
(source/Makefile (lurette/c/20_Makefile 1.27 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -172,19 +170,19 @@ No more side effects are done via the Env_state module.
(ID_EN_VRAC (lurette/0_ID_EN_VRAC 1.1 644))
(INSTALL (lurette/f/26_INSTALL 1.2 744))
(TAGS (lurette/21_TAGS 1.6 644))
(TODO (lurette/d/22_TODO 1.30 644))
(TODO (lurette/d/22_TODO 1.31 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.11 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.5 744))
(share/plot (lurette/e/35_plot 1.5 744))
(share/plot (lurette/e/35_plot 1.6 744))
(test/time-ossau.exp (lurette/b/48_time.exp 1.53 644))
(test/time-ossau.res (lurette/b/49_time.res 1.57 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.33 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.32 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.11 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.12 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.54 644))
(test/time-ossau.res (lurette/b/49_time.res 1.58 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.34 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.33 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.12 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.13 644))
;; Various files used for testing purposes
(test/cudd_gc_problem.luc (lurette/e/29_cudd_gc_pr 1.2 644))
......@@ -283,10 +281,10 @@ No more side effects are done via the Env_state module.
(test/Makefile (lurette/c/0_Makefile 1.14 644))
;; xlurette
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.29 644))
(ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.30 644))
(ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.25 644))
(ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.23 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.17 644))
(ihm/xlurette/makefile (lurette/c/16_makefile 1.18 644))
;; cudaux
......@@ -299,7 +297,7 @@ No more side effects are done via the Env_state module.
(cuddaux/cuddauxAddIte.c (lurette/c/32_cuddauxAdd 1.1 644))
(cuddaux/cuddaux.h (lurette/c/33_cuddaux.h 1.1 644))
(cuddaux/README (lurette/c/34_README 1.1 644))
(cuddaux/Makefile (lurette/c/35_Makefile 1.7 644))
(cuddaux/Makefile (lurette/c/35_Makefile 1.8 644))
(cuddaux/Changes (lurette/c/36_Changes 1.1 644))
......@@ -324,17 +322,17 @@ No more side effects are done via the Env_state module.
(mlcuddidl/bdd.ml (lurette/d/6_bdd.ml 1.1 640))
(mlcuddidl/bdd.idl (lurette/d/7_bdd.idl 1.1 644))
(mlcuddidl/README (lurette/d/8_README 1.1 644))
(mlcuddidl/Makefile (lurette/d/9_Makefile 1.8 644))
(mlcuddidl/Makefile (lurette/d/9_Makefile 1.9 644))
(mlcuddidl/Changes (lurette/d/10_Changes 1.1 644))
;; polka
(polka/Makefile.depend (lurette/d/30_Makefile.d 1.1 644))
(polka/tmp () :directory)
(polka/sedscript (lurette/d/31_sedscript 1.1 644))
(polka/caml/Makefile.depend (lurette/d/32_Makefile.d 1.3 644))
(polka/caml/Makefile.depend (lurette/d/32_Makefile.d 1.4 644))
(polka/caml/poly.idl (lurette/d/33_poly.idl 1.1 644))
(polka/caml/matrix.idl (lurette/d/34_matrix.idl 1.1 644))
(polka/caml/vector.idl (lurette/d/35_vector.idl 1.1 644))
(polka/caml/matrix.idl (lurette/d/34_matrix.idl 1.2 644))
(polka/caml/vector.idl (lurette/d/35_vector.idl 1.2 644))
(polka/caml/polka_caml.h (lurette/d/36_polka_caml 1.1 644))
(polka/caml/polka_caml.c (lurette/d/37_polka_caml 1.1 644))
(polka/caml/polka.mli (lurette/d/38_polka.mli 1.1 644))
......@@ -344,7 +342,7 @@ No more side effects are done via the Env_state module.
(polka/caml/polka_lexer.mll (lurette/d/42_polka_lexe 1.1 644))
(polka/caml/polkaIO.mli (lurette/d/43_polkaIO.ml 1.1 644))
(polka/caml/polkaIO.ml (lurette/d/44_polkaIO.ml 1.1 644))
(polka/caml/Makefile (lurette/d/45_Makefile 1.2 644))
(polka/caml/Makefile (lurette/d/45_Makefile 1.3 644))
(polka/C/Makefile.depend (lurette/d/46_Makefile.d 1.1 644))
(polka/C/vector.h (lurette/d/47_vector.h 1.1 644))
(polka/C/satmat.h (lurette/d/48_satmat.h 1.1 644))
......@@ -385,7 +383,7 @@ No more side effects are done via the Env_state module.
;; 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.2 644))
(source/gen_fake_lucky.ml (lurette/g/8_gen_fake_l 1.3 644))
;; Files added by populate at Tue, 26 Aug 2003 15:46:03 +0200,
;; to version 0.143(w), by jahier:
......
......@@ -74,13 +74,13 @@ ICFLAGS = \
# XCFLAGS should be the same than the flags with which CUDD has been compiled
# i386-linux
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
# sparc-sun
# XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100
# Windows95/98/NT with Cygwin tools
XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864
# XCFLAGS = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=67108864
CFLAGS = $(ICFLAGS) $(XCFLAGS) -O3 -DNDEBUG
CFLAGS_DEBUG = $(ICFLAGS) $(XCFLAGS) -O0 -g
......
......@@ -172,7 +172,7 @@ polka_parser.ml polka_parser.mli: polka_parser.mly
%_caml.c %.ml %.mli: %.idl sedscript
mkdir -p tmp
cp $*.idl tmp
$(CAMLIDL) -I ${SRCDIR} tmp/$*.idl
$(CAMLIDL) -nocpp -I ${SRCDIR} tmp/$*.idl
cp tmp/$*_stubs.c $*_caml.c
sed -f sedscript tmp/$*.ml >$*.ml
sed -f sedscript tmp/$*.mli >$*.mli
......
......@@ -3,7 +3,7 @@ poly.cmi: matrix.cmi vector.cmi
polka.cmo: polka.cmi
polka.cmx: polka.cmi
vector.cmo: polka.cmi polka_lexer.cmi polka_parser.cmi vector.cmi
vector.cmx: polka.cmx polka_lexer.cmi polka_parser.cmx vector.cmi
vector.cmx: polka.cmx polka_lexer.cmx polka_parser.cmx vector.cmi
matrix.cmo: polka.cmi vector.cmi matrix.cmi
matrix.cmx: polka.cmx vector.cmx matrix.cmi
poly.cmo: matrix.cmi vector.cmi poly.cmi
......