diff --git a/src/lic2soc.ml b/src/lic2soc.ml index 281645890d598d10d2954bbf41b9c99c4d7c225c..6896b1f10e5f1c30e8bf5a334721c860cfd63ddc 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 bf5cb0e3c7461d1ef408daef9a26cf5e420b9a0e..a23257ab1dcf93313f676898a1281227408dea0f 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 0e6c814a7fff2755cb9295f96d61d04194c8045d..5b5652eafecc12305f6028725e1efa81dfdf44eb 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