Commit 18e59b0d authored by Erwan Jahier's avatar Erwan Jahier
Browse files

lurette 1.23 Mon, 08 Mar 2004 14:10:38 +0100 by jahier

Parent-Version:      1.22
Version-Log:

source/*.ml*:
   perform a sed 's/[ ]*$//' on all files to remove
   trailing space.

Project-Description: Lurette
parent ceac869e
This diff is collapsed.
......@@ -34,9 +34,6 @@ et je ne suis plus oblig
*********** A faire
* parse_lucky.ml:
XXX parse_lustre_expression : attention au tilde (virer le hack et ragarder ce que ca change)
+ verifier que 2 vars ne sont définies 2 fois dans le meme fichiers
* Ajouter la possibilité de pouvoir rejouer un séquence et de la continuer
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Lurette")
(Project-Version lurette 1 22)
(Parent-Version lurette 1 21)
(Project-Version lurette 1 23)
(Parent-Version lurette 1 22)
(Version-Log "
Add a couple of scade files in the distrib so that it is easier
to test scade programs under linux using the generated c files.
source/value.ml
use T and F instead of t and f for booleans (more visible under xlurette).
source/*.ml*:
perform a sed 's/[ ]*$//' on all files to remove
trailing space.
share/Makefile.lurette.in:
Reorganize (clean-up) the file
xlurette/xlurette_glade_main.ml:
share/plot:
Fix the gnuplot problems (+ <<set mouse>> in share/plot).
source/util.ml:
source/lurettetop.ml:
Move the gnuplot stuff into lurettetop.
")
(New-Version-Log ""
)
(Checkin-Time "Mon, 08 Mar 2004 13:46:15 +0100")
(Checkin-Time "Mon, 08 Mar 2004 14:10:38 +0100")
(Checkin-Login jahier)
(Populate-Ignore ())
(Project-Keywords)
......@@ -36,101 +23,101 @@ source/lurettetop.ml:
;; Sources files for luc_exe
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.3 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.47 644))
(source/luc_exe.mli (lurette/b/31_ima_exe.ml 1.4 644))
(source/luc_exe.ml (lurette/b/32_ima_exe.ml 1.48 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.23 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.14 644))
(source/command_line_luc_exe.ml (lurette/b/33_command_li 1.24 644))
(source/command_line_luc_exe.mli (lurette/b/34_command_li 1.15 644))
;; Sources files for lurette only
(source/lurette.mli (lurette/11_lurette.ml 1.16 644))
(source/lurette.ml (lurette/12_lurette.ml 1.88 644))
(source/lurette.mli (lurette/11_lurette.ml 1.17 644))
(source/lurette.ml (lurette/12_lurette.ml 1.89 644))
(source/command_line.ml (lurette/b/20_command_li 1.19 644))
(source/command_line.mli (lurette/b/21_command_li 1.15 644))
(source/command_line.ml (lurette/b/20_command_li 1.20 644))
(source/command_line.mli (lurette/b/21_command_li 1.16 644))
;; Sources files common to lurette and luc_exe
(source/graph.mli (lurette/13_graph.mli 1.13 644))
(source/graph.ml (lurette/14_graph.ml 1.11 644))
(source/graph.mli (lurette/13_graph.mli 1.14 644))
(source/graph.ml (lurette/14_graph.ml 1.12 644))
(source/lucky.mli (lurette/15_env.mli 1.24 644))
(source/lucky.ml (lurette/16_env.ml 1.41 644))
(source/lucky.mli (lurette/15_env.mli 1.25 644))
(source/lucky.ml (lurette/16_env.ml 1.42 644))
(source/util.ml (lurette/35_util.ml 1.65 644))
(source/util.ml (lurette/35_util.ml 1.66 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.6 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.6 644))
(source/formula_to_bdd.ml (lurette/g/34_formula_to 1.7 644))
(source/formula_to_bdd.mli (lurette/g/35_formula_to 1.7 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.6 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.5 644))
(source/fair_bddd.ml (lurette/g/38_fair_bddd. 1.7 644))
(source/fair_bddd.mli (lurette/g/39_fair_bddd. 1.6 644))
(source/bddd.ml (lurette/g/36_bddd.ml 1.8 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.9 644))
(source/bddd.mli (lurette/g/37_bddd.mli 1.10 644))
(source/solver.mli (lurette/38_solver.mli 1.23 644))
(source/solver.ml (lurette/39_solver.ml 1.60 644))
(source/solver.mli (lurette/38_solver.mli 1.24 644))
(source/solver.ml (lurette/39_solver.ml 1.61 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.17 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.9 644))
(source/polyhedron.ml (lurette/d/25_polyhedron 1.18 644))
(source/polyhedron.mli (lurette/d/26_polyhedron 1.10 644))
(source/store.mli (lurette/b/26_rnumsolver 1.25 644))
(source/store.ml (lurette/b/27_rnumsolver 1.38 644))
(source/store.mli (lurette/b/26_rnumsolver 1.26 644))
(source/store.ml (lurette/b/27_rnumsolver 1.39 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.21 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.55 644))
(source/parse_luc.mli (lurette/40_parse_env. 1.22 644))
(source/parse_luc.ml (lurette/41_parse_env. 1.56 644))
(source/show_env.mli (lurette/42_show_env.m 1.11 644))
(source/show_env.ml (lurette/43_show_env.m 1.20 644))
(source/show_env.mli (lurette/42_show_env.m 1.12 644))
(source/show_env.ml (lurette/43_show_env.m 1.21 644))
(source/print.mli (lurette/46_print.mli 1.14 644))
(source/print.ml (lurette/47_print.ml 1.26 644))
(source/print.mli (lurette/46_print.mli 1.15 644))
(source/print.ml (lurette/47_print.ml 1.27 644))
(source/env_state.mli (lurette/50_env_state. 1.39 644))
(source/env_state.ml (lurette/51_env_state. 1.56 644))
(source/env_state.mli (lurette/50_env_state. 1.40 644))
(source/env_state.ml (lurette/51_env_state. 1.57 644))
(source/run_aut.mli (lurette/b/46_automata.m 1.11 644))
(source/run_aut.ml (lurette/b/47_automata.m 1.24 644))
(source/run_aut.mli (lurette/b/46_automata.m 1.12 644))
(source/run_aut.ml (lurette/b/47_automata.m 1.25 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.11 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.25 644))
(source/sim2chro.mli (lurette/b/23_sim2chro.m 1.12 644))
(source/sim2chro.ml (lurette/b/24_sim2chro.m 1.26 644))
(source/gne.mli (lurette/b/36_gne.mli 1.6 644))
(source/gne.ml (lurette/b/37_gne.ml 1.7 644))
(source/gne.mli (lurette/b/36_gne.mli 1.7 644))
(source/gne.ml (lurette/b/37_gne.ml 1.8 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.51 644))
(source/lurettetop.ml (lurette/c/1_lurettetop 1.52 644))
(source/draw.mli (lurette/f/1_draw.mli 1.2 644))
(source/draw.ml (lurette/f/2_draw.ml 1.3 644))
(source/draw.mli (lurette/f/1_draw.mli 1.3 644))
(source/draw.ml (lurette/f/2_draw.ml 1.4 644))
(source/gen_stubs_poc.ml (lurette/f/3_gen_stubs_ 1.2 644))
(source/gen_stubs_poc.mli (lurette/f/4_gen_stubs_ 1.2 644))
(source/gen_stubs_scade.ml (lurette/f/5_gen_stubs_ 1.3 644))
(source/gen_stubs_scade.mli (lurette/f/6_gen_stubs_ 1.2 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.54 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.3 644))
(source/gen_stubs_common.mli (lurette/e/40_gen_stubs_ 1.2 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.4 644))
(source/parse_c_scade.mli (lurette/e/42_parse_c_sc 1.3 644))
(source/gen_stubs_poc.ml (lurette/f/3_gen_stubs_ 1.3 644))
(source/gen_stubs_poc.mli (lurette/f/4_gen_stubs_ 1.3 644))
(source/gen_stubs_scade.ml (lurette/f/5_gen_stubs_ 1.4 644))
(source/gen_stubs_scade.mli (lurette/f/6_gen_stubs_ 1.3 644))
(source/gen_stubs.ml (lurette/24_generate_l 1.55 644))
(source/gen_stubs_common.ml (lurette/e/39_gen_stubs_ 1.4 644))
(source/gen_stubs_common.mli (lurette/e/40_gen_stubs_ 1.3 644))
(source/parse_c_scade.ml (lurette/e/41_parse_c_sc 1.5 644))
(source/parse_c_scade.mli (lurette/e/42_parse_c_sc 1.4 644))
(source/control.mli (lurette/c/3_control.ml 1.3 644))
(source/control.ml (lurette/c/4_control.ml 1.5 644))
(source/control.mli (lurette/c/3_control.ml 1.4 644))
(source/control.ml (lurette/c/4_control.ml 1.6 644))
(source/constraint.mli (lurette/c/18_constraint 1.8 644))
(source/constraint.ml (lurette/c/19_constraint 1.10 644))
(source/constraint.mli (lurette/c/18_constraint 1.9 644))
(source/constraint.ml (lurette/c/19_constraint 1.11 644))
(source/ne.ml (lurette/c/21_ne.ml 1.11 644))
(source/ne.mli (lurette/c/22_ne.mli 1.9 644))
(source/ne.ml (lurette/c/21_ne.ml 1.12 644))
(source/ne.mli (lurette/c/22_ne.mli 1.10 644))
(source/value.ml (lurette/c/23_value.ml 1.8 644))
(source/value.mli (lurette/c/24_value.mli 1.7 644))
(source/value.ml (lurette/c/23_value.ml 1.9 644))
(source/value.mli (lurette/c/24_value.mli 1.8 644))
(source/prevar.ml (lurette/d/18_prevar.ml 1.5 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.5 644))
(source/prevar.ml (lurette/d/18_prevar.ml 1.6 644))
(source/prevar.mli (lurette/d/19_prevar.mli 1.6 644))
(source/parse_poc.ml (lurette/d/15_parse_poc. 1.7 644))
(source/parse_poc.mli (lurette/d/29_parse_poc. 1.4 644))
(source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.7 644))
(source/parse_poc.ml (lurette/d/15_parse_poc. 1.8 644))
(source/parse_poc.mli (lurette/d/29_parse_poc. 1.5 644))
(source/gen_fake_lutin.ml (lurette/d/16_gen_fake_l 1.8 644))
(source/show_luc.ml (lurette/e/25_show_luc.m 1.8 644))
(source/show_luc.ml (lurette/e/25_show_luc.m 1.9 644))
(source/ocaml2c.idl (lurette/e/26_ocaml2c.id 1.2 644))
(source/lurette_exe.c (lurette/e/27_lurette_ex 1.2 644))
(source/call_lurette_main.c (lurette/e/28_call_luret 1.1 644))
......@@ -161,7 +148,7 @@ source/lurettetop.ml:
(Makefile.common.source (lurette/e/33_Makefile.c 1.11 644))
(OcamlMakefile (lurette/17_OcamlMakef 1.52 644))
(share/Makefile.lurette.in (lurette/b/38_Makefile.l 1.32 644))
(user-rules (lurette/c/14_myrules 1.56 644))
(user-rules (lurette/c/14_myrules 1.57 644))
(share/Makefile.test.in (lurette/c/25_user-rules 1.12 644))
(Makefile (lurette/d/13_Makefile 1.4 644))
......@@ -185,20 +172,20 @@ source/lurettetop.ml:
(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.39 644))
(TODO (lurette/d/22_TODO 1.40 644))
(share/lucky_init.csh.in (lurette/e/23_lucky_init 1.8 644))
(share/lucky_init.sh.in (lurette/e/24_lucky_init 1.12 644))
(share/gnuplot-rif (lurette/e/34_gnuplot-ri 1.8 744))
(share/plot (lurette/e/35_plot 1.9 744))
(test/time-rey.exp (lurette/h/13_time-rey.e 1.2 644))
(test/time-rey.exp (lurette/h/13_time-rey.e 1.3 644))
(test/time-rey.res (lurette/h/14_time-rey.r 1.2 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.58 644))
(test/time-ossau.exp (lurette/b/48_time.exp 1.59 644))
(test/time-ossau.res (lurette/b/49_time.res 1.62 644))
(test/time-ecrins.res (lurette/d/20_time-ecrin 1.43 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.42 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.19 644))
(test/time-ecrins.exp (lurette/d/21_time-ecrin 1.43 644))
(test/time-moucherotte.exp (lurette/e/37_time-mouch 1.20 644))
(test/time-moucherotte.res (lurette/e/38_time-mouch 1.20 644))
;; Various files used for testing purposes
......@@ -395,7 +382,7 @@ source/lurettetop.ml:
;; 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.6 644))
(source/gen_fake_lucky.ml (lurette/g/8_gen_fake_l 1.7 644))
;; Files added by populate at Tue, 26 Aug 2003 15:46:03 +0200,
;; to version 0.143(w), by jahier:
......@@ -450,48 +437,48 @@ source/lurettetop.ml:
;; Files added by populate at Fri, 17 Oct 2003 12:22:17 +0200,
;; to version 1.7(w), by jahier:
(source/poly_draw.ml (lurette/g/43_polyDraw.m 1.3 644))
(source/poly_draw.ml (lurette/g/43_polyDraw.m 1.4 644))
;; Files added by populate at Fri, 17 Oct 2003 12:22:20 +0200,
;; to version 1.7(w), by jahier:
(source/poly_draw.mli (lurette/g/44_polyDraw.m 1.3 644))
(source/poly_draw.mli (lurette/g/44_polyDraw.m 1.4 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:39 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.5 644))
(source/lustreExp.ml (lurette/g/45_lustreExp. 1.6 644))
;; Files added by populate at Thu, 13 Nov 2003 16:59:41 +0100,
;; to version 1.8(w), by jahier:
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.4 644))
(source/lustreExp.mli (lurette/g/46_lustreExp. 1.5 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:47 +0100,
;; to version 1.8(w), by jahier:
(source/exp.ml (lurette/g/47_exp.ml 1.6 644))
(source/exp.ml (lurette/g/47_exp.ml 1.7 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:49 +0100,
;; to version 1.8(w), by jahier:
(source/exp.mli (lurette/g/48_exp.mli 1.3 644))
(source/exp.mli (lurette/g/48_exp.mli 1.4 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:53 +0100,
;; to version 1.8(w), by jahier:
(source/var.ml (lurette/g/49_var.ml 1.7 644))
(source/var.ml (lurette/g/49_var.ml 1.8 644))
;; Files added by populate at Fri, 14 Nov 2003 14:32:55 +0100,
;; to version 1.8(w), by jahier:
(source/var.mli (lurette/g/50_var.mli 1.7 644))
(source/var.mli (lurette/g/50_var.mli 1.8 644))
;; Files added by populate at Wed, 26 Nov 2003 08:47:27 +0100,
;; to version 1.10(w), by jahier:
(source/thickness.ml (lurette/g/51_thickness. 1.3 644))
(source/thickness.ml (lurette/g/51_thickness. 1.4 644))
;; Files added by populate at Tue, 06 Jan 2004 14:47:37 +0100,
;; to version 1.15(w), by jahier:
......@@ -523,8 +510,8 @@ source/lurettetop.ml:
;; Files added by populate at Fri, 09 Jan 2004 09:50:40 +0100,
;; to version 1.18(w), by jahier:
(source/type.mli (lurette/h/11_type.mli 1.1 644))
(source/type.ml (lurette/h/12_type.ml 1.1 644))
(source/type.mli (lurette/h/11_type.mli 1.2 644))
(source/type.ml (lurette/h/12_type.ml 1.2 644))
;; Files added by populate at Wed, 04 Feb 2004 17:09:41 +0100,
;; to version 1.19(w), by jahier:
......@@ -533,6 +520,28 @@ source/lurettetop.ml:
(demo-xlurette/fault-tolerant-heater/heater_control_env.luc (lurette/h/16_heater_con 1.1 644))
(demo-xlurette/fault-tolerant-heater/heater_control.lus (lurette/h/17_heater_con 1.1 644))
(demo-xlurette/fault-tolerant-heater/sensors.luc (lurette/h/18_sensors.lu 1.1 644))
;; Files added by populate at Mon, 08 Mar 2004 14:02:46 +0100,
;; to version 1.22(w), by jahier:
(source/parser.mly (lurette/h/19_parser.mly 1.1 644))
;; Files added by populate at Mon, 08 Mar 2004 14:03:00 +0100,
;; to version 1.22(w), by jahier:
(source/lexer.mll (lurette/h/20_lexer.mll 1.1 644))
;; Files added by populate at Mon, 08 Mar 2004 14:04:19 +0100,
;; to version 1.22(w), by jahier:
(source/lexeme.mli (lurette/h/21_lexeme.mli 1.1 644))
(source/lexeme.ml (lurette/h/22_lexeme.ml 1.1 644))
;; Files added by populate at Mon, 08 Mar 2004 14:05:02 +0100,
;; to version 1.22(w), by jahier:
(source/genlex.mli (lurette/h/23_genlex.mli 1.1 644))
(source/genlex.ml (lurette/h/24_genlex.ml 1.1 644))
)
(Merge-Parents)
(New-Merge-Parents)
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
** Public License
**-----------------------------------------------------------------------
**
** File: bddd.mli
......
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
** Public License
**-----------------------------------------------------------------------
**
** File: command_line.ml
......@@ -27,13 +27,13 @@ type optionsT = {
mutable oracle : bool
}
type cmd_line_optionT =
type cmd_line_optionT =
Step | NoStep | Help
| DisplayLocalVar | NoDisplayLocalVar
| Sim2chro | NoSim2chro
| DisplayLocalVar | NoDisplayLocalVar
| Sim2chro | NoSim2chro
| AllVertices | AllFormula
(* | CuddHeapInit *)
| Seed | Precision | NoOracle | Verbose | ShowStep | Output
| Seed | Precision | NoOracle | Verbose | ShowStep | Output
| ComputeVolume | StepInside | StepEdges | StepVertices
(* Names of the command line options to override the defaults. *)
......@@ -78,14 +78,14 @@ let (string_to_option: (string * cmd_line_optionT) list) = [
("--step-inside", StepInside);
("--step-edges", StepEdges);
("--step-vertices", StepVertices);
(* ("--init-cudd-heap", CuddHeapInit) *)
]
let (option_to_usage: cmd_line_optionT -> string) =
fun opt ->
fun opt ->
match opt with
Step -> "Run lurette step by step.\n"
| NoStep -> "Do not run lurette step by step (Default).\n"
......@@ -110,14 +110,14 @@ let (option_to_usage: cmd_line_optionT -> string) =
| StepEdges -> "Step at edges\n"
| StepVertices -> "Step at vertices\n"
let (group_common_options: (string * cmd_line_optionT) list ->
let (group_common_options: (string * cmd_line_optionT) list ->
(string * cmd_line_optionT) list) =
fun list ->
fun list ->
List.fold_left
(fun acc (str, opt) ->
(fun acc (str, opt) ->
match acc with
(str2, opt2)::tail ->
if
(str2, opt2)::tail ->
if
(opt = opt2)
then
(((str2 ^ "\n\t\t" ^ str), opt)::tail)
......@@ -129,7 +129,7 @@ let (group_common_options: (string * cmd_line_optionT) list ->
list
let usage_options =
List.fold_left
(fun acc (str, opt) ->
(fun acc (str, opt) ->
acc ^ "\n\t\t" ^ str ^ "\n\t\t\t" ^ (option_to_usage opt))
""
(List.rev (group_common_options string_to_option))
......@@ -151,13 +151,13 @@ let usage =
let cmd_line_string_to_int str errmsg =
try
(int_of_string str)
try
(int_of_string str)
with Failure ("int_of_string")
->
->
print_string usage ;
print_string errmsg ;
flush stdout ;
failwith "\n *** Error when calling lurette.\n"
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
** Public License
**-----------------------------------------------------------------------
**
** File: command_line.mli
......@@ -9,7 +9,7 @@
*)
(** Handles everything that is related to command line lurette calls:
printing lurette usage message, handling command line options, etc.
printing lurette usage message, handling command line options, etc.
*)
open Lucky
......@@ -40,16 +40,16 @@ val cmd_line_string_to_int : string -> string -> int
the convertion failed.
*)
type cmd_line_optionT =
type cmd_line_optionT =
Step | NoStep | Help
| DisplayLocalVar | NoDisplayLocalVar
| Sim2chro | NoSim2chro
| DisplayLocalVar | NoDisplayLocalVar
| Sim2chro | NoSim2chro
(* | CuddHeapInit *)
| AllVertices | AllFormula
| Seed | Precision | NoOracle | Verbose | ShowStep | Output
| Seed | Precision | NoOracle | Verbose | ShowStep | Output
| ComputeVolume | StepInside | StepEdges | StepVertices
val string_to_option: (string * cmd_line_optionT) list
(** Mapping from options string (e.g., "--no-step") to the cmd_line_optionT
(** Mapping from options string (e.g., "--no-step") to the cmd_line_optionT
type. *)
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
** Public License
**-----------------------------------------------------------------------
**
** File: command_line_luc_exe.ml
......@@ -21,8 +21,8 @@ type optionsT = {
mutable verb : bool
}
type cmd_line_optionT =
StepNb | Seed | Precision | Boot | ShowAut | NoShowAut | Verbose | Locals
type cmd_line_optionT =
StepNb | Seed | Precision | Boot | ShowAut | NoShowAut | Verbose | Locals
| Help | Inside | Edges | Vertices | ComputeVolume
(* Names of the command line options to override the defaults. *)
......@@ -67,7 +67,7 @@ let (string_to_option: (string * cmd_line_optionT) list) = [
]
let (option_to_usage: cmd_line_optionT -> string) =
fun opt ->
fun opt ->
match opt with
Boot -> "The Lucky machine starts generating values.\n"
| ShowAut -> "Run lucky showing the lucky automata.\n"
......@@ -85,14 +85,14 @@ let (option_to_usage: cmd_line_optionT -> string) =
"Compute the polyhedra volume before drawing: more fair, " ^
"but more expensive.\n")
let (group_common_options: (string * cmd_line_optionT) list ->
let (group_common_options: (string * cmd_line_optionT) list ->
(string * cmd_line_optionT) list) =
fun list ->
fun list ->
List.fold_left
(fun acc (str, opt) ->
(fun acc (str, opt) ->
match acc with
(str2, opt2)::tail ->
if
(str2, opt2)::tail ->
if
(opt = opt2)
then
(((str2 ^ ", " ^ str), opt)::tail)
......@@ -102,13 +102,13 @@ let (group_common_options: (string * cmd_line_optionT) list ->
)
[]
list
let usage_options =
List.fold_left
let usage_options =
List.fold_left
(fun acc (str, opt) -> acc ^ "\n " ^ str ^ "\n\t" ^ (option_to_usage opt))
""
(List.rev (group_common_options string_to_option))
let usage =
let usage =
("usage: lucky [options]* (<file.luc>)+ " ^
"\n where `<file.luc> contains a Lucky program. Automata " ^
"\n that share output variables are executed as if they were " ^
......@@ -120,13 +120,13 @@ let usage =
let cmd_line_string_to_int str errmsg =
try
(int_of_string str)
with Failure("int_of_string")
->
try
(int_of_string str)
with Failure("int_of_string")
->
print_string usage ;
print_string errmsg ;
flush stdout ;
failwith "\n *** Error when calling lucky.\n"
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
** Public License
**-----------------------------------------------------------------------
**
** File: command_line_luc_exe.mli
** Main author: jahier@imag.fr
*)
(** Handles everything that is related to command line calls.
(** Handles everything that is related to command line calls.
*)
......@@ -32,11 +32,11 @@ val cmd_line_string_to_int : string -> string -> int
the convertion failed.
*)
type cmd_line_optionT =
StepNb | Seed | Precision | Boot | ShowAut | NoShowAut | Verbose
type cmd_line_optionT =
StepNb | Seed | Precision | Boot | ShowAut | NoShowAut | Verbose
| Locals | Help | Inside | Edges | Vertices | ComputeVolume
val string_to_option: (string * cmd_line_optionT) list
(** Mapping from options string (e.g., "--with_seed") to the cmd_line_optionT
(** Mapping from options string (e.g., "--with_seed") to the cmd_line_optionT
type. *)
(*-----------------------------------------------------------------------
** Copyright (C) 2002, 2003 - Verimag.
** This file may only be copied under the terms of the GNU Library General
** Public License
** Public License
**-----------------------------------------------------------------------
**
** File: constraint.ml
......@@ -10,50 +10,50 @@
(* exported *)
type ineq =
type ineq =
| GZ of Ne.t (** expr > 0 *)
| GeqZ of Ne.t (** expr >= 0 *)
(* exported *)
type t =
type t =
| Bv of Exp.var (** Booleans *)
| EqZ of Ne.t (** expr = 0 *)
| Ineq of ineq (** > or >= *)
(* exported *)
let (ineq_to_string : ineq -> string) =
fun f ->
fun f ->
match f with
| GZ(ne) -> ((Ne.to_string ne) ^ " > 0 ")
| GeqZ(ne) -> ((Ne.to_string ne) ^ " >= 0 ")
(* exported *)
let (to_string : t -> string) =
fun f ->