From a71bfc89456f5faad26ea6f5f691abdd37aeb3d3 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Thu, 19 Jun 2014 15:29:02 +0200
Subject: [PATCH] SocExec: The previous change broke the handling of arrow in
SocExec. Now it seems to work.
---
src/socExecEvalPredef.ml | 4 ++--
test/lus2lic.sum | 4 ++--
test/lus2lic.time | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/socExecEvalPredef.ml b/src/socExecEvalPredef.ml
index 38325b3c..aa012dd6 100644
--- a/src/socExecEvalPredef.ml
+++ b/src/socExecEvalPredef.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 19/06/2014 (at 14:16) by Erwan Jahier> *)
+(* Time-stamp: <modified the 19/06/2014 (at 15:02) by Erwan Jahier> *)
open SocExecValue
open Data
@@ -318,7 +318,7 @@ let lustre_current ctx =
let lustre_arrow ctx =
let (vn,vv) =
match ([get_val "x" ctx; get_val "y" ctx;
- get_val "_memory" { ctx with cpath=List.tl ctx.cpath}])
+ get_val "_memory" { ctx with cpath=ctx.cpath}])
with
| [v1;v2; fs] -> "z"::ctx.cpath, if fs=B false then v2 else v1
| _ -> assert false
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index e102c3d0..816ded5e 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,4 +1,4 @@
-Test Run By jahier on Thu Jun 19 14:32:33 2014
+Test Run By jahier on Thu Jun 19 15:25:21 2014
Native configuration is i686-pc-linux-gnu
=== lus2lic tests ===
@@ -1483,5 +1483,5 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman
# of unexpected failures 149
# of unexpected successes 21
# of expected failures 37
-testcase ./lus2lic.tests/non-reg.exp completed in 130 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 137 seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds
diff --git a/test/lus2lic.time b/test/lus2lic.time
index 6879740d..484c0604 100644
--- a/test/lus2lic.time
+++ b/test/lus2lic.time
@@ -1,2 +1,2 @@
-testcase ./lus2lic.tests/non-reg.exp completed in 130 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 137 seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds
--
GitLab