Commit 9714d85a authored by erwan's avatar erwan

Fix: revert a change done in sha:ccb8b62b that breaks things

parent 21b82a82
Pipeline #27001 passed with stages
in 8 minutes and 51 seconds
......@@ -80,7 +80,7 @@ Executable lurette
Path: lurette-nocaml/src
MainIs: lurette.ml
BuildDepends: str,unix,num,dynlink,extlib,camlp4,lutils (>= 1.9),lutin-utils,ezdl,gbddml,polka,camlp4,camlidl,gmp,rdbg-plugin (>= 1.177),lustre-v6,lutin
NativeOpt: rdbg4lurette.cmxa # for some reasons not recogniezd as a package
NativeOpt: rdbg4lurette.cmxa # for some reasons not recognized as a package
Install:true
CompiledObject: native
Install: true
......
(* Time-stamp: <modified the 22/05/2019 (at 09:50) by Erwan Jahier> *)
(* Time-stamp: <modified the 11/07/2019 (at 14:56) by Erwan Jahier> *)
(* Mimick the behavior of 'rdbg -lurette', but without the dependency
on ocaml *)
open Event
......@@ -65,6 +65,8 @@ let (gen_reactive_program : string -> RdbgArg.reactive_program) =
else
Lv6Run.make (Array.of_list (args@["--expand-io-type"]))
| "ocaml" -> OcamlRun.make (List.nth args 1)
(* | "sasa" -> *)
(* Sasalib.SasaRun.make (Array.of_list (args@["-rif"])) *)
| _ -> StdioRun.make str
in
Ocaml(plugin)
......
......@@ -369,7 +369,7 @@ let (split : t -> split_res) =
let divide c1 c2 =
match (c1,c2) with
| I i1, I i2 -> Num.eq_num (Num.mod_num i2 i1) (Num.Int 0)
| _, _ -> assert false (* used to be "true" instead, but it looked weird! *)
| _, _ -> true
in
let cl = (StringMap.fold (fun v c acc -> (c,v)::acc) ne []) in
let res =
......
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