From f64805fd1bc330c02ddc9b5bb6a1f7b40c1cf9e3 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Thu, 6 Jun 2013 14:32:33 +0200
Subject: [PATCH] Fix the handling of condact in the -exec mode.
ps : the new test pass because the -ei is also buggy (cf a forthcoming change).
---
src/lic2soc.ml | 3 ++-
src/socExec.ml | 4 ++--
src/socExecEvalPredef.ml | 3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lic2soc.ml b/src/lic2soc.ml
index 28164589..6896b1f1 100644
--- a/src/lic2soc.ml
+++ b/src/lic2soc.ml
@@ -1,4 +1,4 @@
-(** Time-stamp: <modified the 05/06/2013 (at 10:57) by Erwan Jahier> *)
+(** Time-stamp: <modified the 06/06/2013 (at 10:13) by Erwan Jahier> *)
open Lxm
open Lic
@@ -822,6 +822,7 @@ let rec f: (LicPrg.t -> Lic.node_key -> Soc.key * Soc.tbl) =
Soc.have_mem = None;
Soc.precedences = [];
}
+
in
Some(ctx, soc, soc_tbl)
)
diff --git a/src/socExec.ml b/src/socExec.ml
index bf5cb0e3..a23257ab 100644
--- a/src/socExec.ml
+++ b/src/socExec.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 04/06/2013 (at 08:55) by Erwan Jahier> *)
+(* Time-stamp: <modified the 06/06/2013 (at 10:29) by Erwan Jahier> *)
open Soc
open Data
@@ -72,8 +72,8 @@ let rec (soc_step : Soc.step_method -> Soc.tbl -> Soc.t -> SocExecValue.ctx
let ctx =
if clk = B true then
let node_step = match node_soc.step with [step] -> step | _ -> assert false in
- let ctx = { ctx with s = sadd ctx.s ("$first_step"::ctx.cpath) (B false) } in
let ctx = do_step inst_name node_step ctx soc_tbl node_soc vel_in vel_out in
+ let ctx = { ctx with s = sadd ctx.s ("$first_step"::ctx.cpath) (B false) } in
{ ctx with cpath=path_saved }
else
let first_step = Var ("$first_step",Bool) in
diff --git a/src/socExecEvalPredef.ml b/src/socExecEvalPredef.ml
index 0e6c814a..5b5652ea 100644
--- a/src/socExecEvalPredef.ml
+++ b/src/socExecEvalPredef.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 04/06/2013 (at 17:50) by Erwan Jahier> *)
+(* Time-stamp: <modified the 05/06/2013 (at 11:07) by Erwan Jahier> *)
open SocExecValue
open Data
@@ -289,7 +289,6 @@ let lustre_arrow ctx =
in
{ ctx with s = sadd ctx.s vn vv }
-
let lustre_hat tl ctx =
let i = match tl with
| [_;Data.Array(_,i)] -> i
--
GitLab