Commit 18320fb4 authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Fix a bug (probably introduced in 0b0203fe)...

Fix a bug (probably introduced in 0b0203fe) where the path of the env file was not explicit which prevent Makefile.lurette to find it. \n ps : it is no more possible to use a list of file in the env slot ; but who cares now that Lutin is usable from Lurette?
parent c5c819a9
......@@ -620,8 +620,8 @@ let (read : (unit -> string) -> bool) =
args.step_mode <- step_mode; true
(* | MakeOpt(str) -> *)
(* args.make_opt <- str; true *)
| Env(llist) ->
args.env <- llist; true
| Env(str) ->
args.env <- LtopArg.explicit_the_file str; true
| StepNb(i) ->
args.step_nb <- i; true
| DrawNb(i) ->
......
......@@ -474,3 +474,10 @@ let rec speclist =
"-h", Arg.Unit (fun _ -> (Arg.usage speclist usage ; exit 0)),
""
]
let (explicit_the_file : string -> string) =
fun s ->
if Filename.is_implicit s
then (Filename.concat args.sut_dir s)
else s
......@@ -42,7 +42,7 @@ let (draw_values : Var.env_in -> Prog.state -> int -> Thickness.numeric ->
let vl = state.d.verbose in
let ra, f, cs = ra.FGen.choose_one_formula () in
match
Solver.solve_formula input state.d.memory vl ctx_msg state.s.output_var_names p
Solver.solve_formula input state.d.memory vl ctx_msg state.s.output_var_names p
num_thickness bool_to_gen_f num_to_gen f
with
| [] -> (* The constraint is unsatisfiable because of the numerics *)
......@@ -61,12 +61,6 @@ let (draw_values : Var.env_in -> Prog.state -> int -> Thickness.numeric ->
let (merge_sol : (sl * sl) list -> sl * sl) =
fun sol_l -> (* Merge solutions coming from the fl: in other terms, we
interpret the formula list as a conjunction. *)
(* OBSOLETE
List.fold_left
(fun (acc1, acc2) (sl1,sl2) -> rev_append sl1 acc1, rev_append sl2 acc2)
([],[])
sol_l
*)
List.fold_left
(fun (acc1, acc2) (sl1,sl2) -> (Value.OfIdent.union sl1 acc1, Value.OfIdent.union sl2 acc2))
(Value.OfIdent.empty,Value.OfIdent.empty)
......
Supports Markdown
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