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

lurette 0.75 Wed, 28 Aug 2002 11:13:06 +0200 by jahier

Parent-Version:      0.74
Version-Log:

makefile.lurette:
bin/makefile.lurette_lib:
    put all files that do not depend on lurette_stubs into a lib.

source/lurettetop.ml:
    Add a few new options (show, step, ...)

Project-Description: Lurette
parent 105a7f85
......@@ -11,7 +11,7 @@
(source/solver.ml 24274 1027436332 39_solver.ml 1.25)
(test/test_gen_stubs.h 1818 1020068208 b/45_test_gen_s 1.1)
(source/command_line.ml 4388 1019207707 b/20_command_li 1.7)
(source/lurette.ml 12220 1028297733 12_lurette.ml 1.44)
(source/lurette.ml 12268 1030525986 12_lurette.ml 1.45)
(source/solver.mli 1003 1027092697 38_solver.mli 1.13)
(source/env.mli 2028 1027349504 15_env.mli 1.15)
(test/heater_float.rif.exp 1453 1028297733 b/30_heater_flo 1.5)
......@@ -50,10 +50,11 @@
(OcamlMakefile 24994 1028297733 17_OcamlMakef 1.34)
(source/command_line_ima_exe.ml 2792 1021651153 b/33_command_li 1.4)
(test/ControleurPorte.rif.exp 4756 1028297733 b/29_Controleur 1.8)
(Makefile.lurette 1846 1028297733 b/38_Makefile.l 1.6)
(Makefile.lurette 551 1030525986 b/38_Makefile.l 1.7)
(source/show_env.ml 3653 1027349504 43_show_env.m 1.11)
(source/gne.mli 1079 1027066799 b/36_gne.mli 1.2)
(source/automata.ml 15708 1027349504 b/47_automata.m 1.2)
(bin/Makefile.lurette_lib 1765 1030525986 c/2_Makefile.l 1.1)
(bin/Makefile.gen_stubs 467 1020068208 b/42_Makefile.g 1.1)
(doc/synthese 2556 1007379917 b/2_synthese 1.1)
(test/ControleurPorte.h 2306 1012914629 b/18_Controleur 1.1)
......@@ -67,7 +68,7 @@
(test/heater_float.lus 175 1020068208 b/44_heater_flo 1.1)
(test/vrai_tram.c 3060 1027066799 b/8_vrai_tram. 1.3)
(source/print.mli 773 1027066799 46_print.mli 1.10)
(source/lurettetop.ml 15228 1028297733 c/1_lurettetop 1.1)
(source/lurettetop.ml 15695 1030525986 c/1_lurettetop 1.2)
(test/heater_int.lus 170 1020068208 b/43_heater_int 1.1)
(source/graph.mli 2218 1027066799 13_graph.mli 1.9)
(test/heater_int.rif.exp 860 1028297733 b/28_heater_int 1.6)
......
......@@ -10,42 +10,18 @@ ifndef OCAMLFLAGS
OCAMLFLAGS := -noassert -unsafe
endif
# Requires cudd and mldd to be installed!
LIBS = str nums # mlpoly
CLIBS = cudd_caml cuddaux cudd mtr st epd util # libppl libpolyi
USE_CAMLP4 = yes
LIBS = str lurette_lib # mlpoly
SOURCES_C = $(SUT) sut_stub.c sut_idl_stub.idl \
$(ORACLE) oracle_stub.c oracle_idl_stub.idl
# $(LURETTE_PATH)/source/pnumsolver.mli $(LURETTE_PATH)/source/pnumsolver.ml
SOURCES_OCAML_COMMON = \
$(LURETTE_PATH)/source/util.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/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/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/rnumsolver.mli $(LURETTE_PATH)/source/rnumsolver.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
SOURCES_OCAML = \
$(PWD)/lurette_stub.ml \
$(LURETTE_PATH)/source/lurette.mli $(LURETTE_PATH)/source/lurette.ml
SOURCES = $(SOURCES_C) \
$(SOURCES_OCAML_COMMON) $(SOURCES_OCAML)
SOURCES = $(SOURCES_C) $(SOURCES_OCAML)
RESULT = lurette
......
#
# Makefile for lurette based on OcamlMakefile
#
LURETTE_PATH = ..
export LURETTE_PATH
######################################################################
# Ougth to be generated by autoconf!
INCDIRS = /home/jahier/include
LIBDIRS = /home/jahier/lib
OCAMLMAKEFILE = $(LURETTE_PATH)/OcamlMakefile
OCAMLNCFLAGS = -inline 10 -noassert -unsafe
ifndef OCAMLFLAGS
OCAMLFLAGS := -noassert -unsafe
endif
# Requires cudd and mldd to be installed!
LIBS = str nums # mlpoly
CLIBS = cudd_caml cuddaux cudd mtr st epd util # libppl libpolyi
USE_CAMLP4 = yes
# $(LURETTE_PATH)/source/pnumsolver.mli $(LURETTE_PATH)/source/pnumsolver.ml
SOURCES = \
$(LURETTE_PATH)/source/util.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/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/env_state.mli $(LURETTE_PATH)/source/env_state.ml \
$(LURETTE_PATH)/source/rnumsolver.mli $(LURETTE_PATH)/source/rnumsolver.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
RESULT = lurette_lib
all: ncl
-include $(OCAMLMAKEFILE)
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 0 74)
(Parent-Version lurette 0 73)
(Project-Version lurette 0 75)
(Parent-Version lurette 0 74)
(Version-Log "
source/lurettetop.ml: [new file]
A top level loop for using lurette.
also remame all .env files using .ima instead of .env as extension.
makefile.lurette:
bin/makefile.lurette_lib:
put all files that do not depend on lurette_stubs into a lib.
source/lurettetop.ml:
Add a few new options (show, step, ...)
")
(New-Version-Log "")
(Checkin-Time "Fri, 02 Aug 2002 16:15:33 +0200")
(Checkin-Time "Wed, 28 Aug 2002 11:13:06 +0200")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -30,7 +32,7 @@ also remame all .env files using .ima instead of .env as extension.
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.12 644))
(source/lurette.ml (lurette/12_lurette.ml 1.44 644))
(source/lurette.ml (lurette/12_lurette.ml 1.45 644))
(source/command_line.ml (lurette/b/20_command_li 1.7 644))
(source/command_line.mli (lurette/b/21_command_li 1.6 644))
......@@ -77,7 +79,7 @@ also remame all .env files using .ima instead of .env as extension.
(source/gne.mli (lurette/b/36_gne.mli 1.2 644))
(source/gne.ml (lurette/b/37_gne.ml 1.2 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.1 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.2 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.28 644))
; little script that sets env vars and starts the lurette build
......@@ -85,11 +87,12 @@ also remame all .env files using .ima instead of .env as extension.
;; Make files
(OcamlMakefile (lurette/17_OcamlMakef 1.34 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.6 644))
(Makefile.lurette (lurette/b/38_Makefile.l 1.7 644))
(bin/Makefile.show_ima (lurette/b/40_Makefile.s 1.4 644))
(bin/Makefile.ima_exe (lurette/b/41_Makefile.i 1.3 644))
(bin/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.1 644))
(bin/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.1 644))
;; Documentation
(doc/Interface_draft (lurette/19_Interface_ 1.1 644))
......@@ -135,6 +138,7 @@ also remame all .env files using .ima instead of .env as extension.
(test/Makefile (lurette/c/0_Makefile 1.2 644))
)
(Merge-Parents)
(New-Merge-Parents)
......@@ -178,6 +178,8 @@ and
(* Initialisation of `Env_state.env_state' *)
let env_llist = (get_env_from_args 4 []) in
let () = Env_state.read_env_state env_llist in
(* XXX use unix lib primitive instead *)
let _ = Sys.command ("touch " ^ options.output ^ "; rm " ^ options.output) in
let rif = open_out options.output in
let local_var_name_and_type_list_unsorted0 = Env_state.loc_env_unsorted () in
......
......@@ -224,6 +224,7 @@ type cmd =
| DrawNb of int
| Step of bool
| DisplayLocalVar of bool
| StepByStep of bool
| Seed of int
| Verbose of bool
| Output of string
......@@ -233,6 +234,7 @@ type cmd =
| Quit
| Help
| Man
| Show
| HelpSimple
| Error of string
......@@ -245,6 +247,8 @@ let rec
fun tok ->
match tok with parser
| [< 'Genlex.Ident "run" >] -> Run
| [< 'Genlex.Ident "r" >] -> Run
| [< 'Genlex.Ident "show" >] -> Show
| [< 'Genlex.Ident "build" >] -> Build
| [< 'Genlex.Ident "clean" >] -> Clean
| [< 'Genlex.Ident "set_sut" ; 'Genlex.Ident str >] -> Sut(str)
......@@ -256,6 +260,11 @@ let rec
| [< 'Genlex.Ident "set_draw_nb" ; 'Genlex.Int i >] -> DrawNb(i)
| [< 'Genlex.Ident "set_seed" ; 'Genlex.Int i >] -> Seed(i)
| [< 'Genlex.Ident "set_step_by_step" ; 'Genlex.Ident str >] ->
if List.mem str ["t";"true"]
then StepByStep(true)
else StepByStep(false)
| [< 'Genlex.Ident "set_display_local_var" ; 'Genlex.Ident str >] ->
if List.mem str ["t";"true"]
then DisplayLocalVar(true)
......@@ -326,11 +335,11 @@ let (display_cmd : unit -> unit) =
fun _ ->
let msg = "The commands are:
run
run, r
to start the testing process. Note that the sut and the environment
fields (described below) should be set.
quit q, or bye
quit q, bye
to quit the lurette top level
......@@ -343,6 +352,10 @@ man
clean
run a make clean (you can try it if <<run>> failed)
show
show of post-script version of the current environment
set_env <env ([x] env)*> (env=<file name without extension>)
to set the environment field (.ima files). Automata of
environments separated by \"x\" are multiplied.
......@@ -445,6 +458,8 @@ let rec (main_loop : unit -> unit) =
flag.step_by_step := b; true
| DisplayLocalVar(b) ->
flag.display_local_var := b; true
| StepByStep(b) ->
flag.step_by_step := b; true
| Seed(i) ->
flag.seed <- Some i; true
| Verbose(b) ->
......@@ -476,6 +491,7 @@ let rec (main_loop : unit -> unit) =
print_string "\n*** Cannot build lurette_exe, sorry.\n";
true
| Show -> let _ = Sys.command ("show_ima " ^ flag.env) in true
| Quit -> false
| HelpSimple -> print_string cmd_usage; true
| Help -> display_cmd (); true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment