Commit 6c036c82 authored by erwan's avatar erwan
Browse files

Fix: a bug (behavior of =red= in interpreted mode) introduced in sha:6437ec67

parent 76142b94
Pipeline #29504 passed with stages
in 2 minutes and 35 seconds
......@@ -3,7 +3,7 @@
(public_name lustre-v6)
(libraries num rdbg)
(wrapped false)
(library_flags (-linkall))
; (library_flags (-linkall))
; (modules
; )
......
(* Time-stamp: <modified the 29/08/2019 (at 16:40) by Erwan Jahier> *)
(* Time-stamp: <modified the 18/09/2019 (at 11:19) by Erwan Jahier> *)
open Soc
open Data
......@@ -47,8 +47,8 @@ let rec (soc_step : Soc.step_method -> Soc.tbl -> Soc.t -> SocExecValue.ctx
let ctx = SocExecEvalPredef.get soc.key ctx in
ctx
with Not_found -> (* Not a predef op *) print_string (
"*** internal error in "^soc_name^". Is it defined in SocExecEvalPredef?\n");
flush stdout; assert false
"*** internal error in "^soc_name^". Is it defined in SocExecEvalPredef?\n");
flush stdout; assert false
)
| Gaol(_vl,gaol) -> List.fold_left (do_gao step.lxm soc_tbl) ctx gaol
| Boolred(i,j,k) -> (
......@@ -125,12 +125,11 @@ let rec (soc_step : Soc.step_method -> Soc.tbl -> Soc.t -> SocExecValue.ctx
| "fold" | "red" | "fill"
| "fillred" ->
let a_in = Var (List.hd iter_inputs) in
let a_out = Var (List.hd iter_outputs) in
(
assert(iter_inputs <> []);
assert(iter_outputs <> []);
a_in::(List.map (array_index i) (List.tl iter_inputs)),
a_out::(List.map (array_index i) (List.tl iter_outputs)))
a_in::(List.map (array_index i) (List.tl iter_outputs)))
| _ -> assert false (* should not occur *)
in
let ctx = { ctx with cpath = inst_name.(i)::ctx.cpath } in
......
......@@ -10,7 +10,8 @@ maintainer: "erwan.jahier@univ-grenoble-alpes.fr"
authors: "Erwan Jahier and Pascal Raymond"
license: "CeCILL"
homepage: "http://www-verimag.imag.fr/lustre-v6.html"
bug-reports: "http://www-verimag.imag.fr/lustre-v6.html"
dev-repo: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lustre-v6"
bug-reports: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lustre-v6/issues"
depends: [
"ocaml" {>= "4.05"}
"base-unix"
......
This diff is collapsed.
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