From f59c754fabfc6dbb08bc8d74c6d53bbbe0f86f70 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Mon, 10 Jul 2017 10:37:47 +0200
Subject: [PATCH] Remove an assertion in EvalClock that was forbidding
expression without output clock.
But actually, it is possible to have node without output, so expression
without output clock is perfrectly possible, as in the following example :
node h(x : bool) returns ();
var h : bool;
let
h = false fby (not x);
tel
node f(x : bool) returns (y: bool);
var
u:bool;
let
y,u = (false, h(true), true) fby (true, x, h(false));
tel
---
_oasis | 2 +-
src/evalClock.ml | 6 +++---
src/lv6version.ml | 4 ++--
test/lus2lic.sum | 26 +++++++++++++-------------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/_oasis b/_oasis
index 8fae8c30..15bea368 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lustre-v6
-Version: 1.703
+Version: 1.704
Synopsis: The Lustre V6 Verimag compiler
Description: This package contains:
(1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
diff --git a/src/evalClock.ml b/src/evalClock.ml
index 560bf9d1..29d0a6b1 100644
--- a/src/evalClock.ml
+++ b/src/evalClock.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 03/05/2017 (at 10:57) by Erwan Jahier> *)
+(* Time-stamp: <modified the 05/07/2017 (at 17:23) by Erwan Jahier> *)
open AstPredef
@@ -335,7 +335,7 @@ and (f_aux : IdSolver.t -> subst -> Lic.val_exp ->
ve
| _ -> { ve with ve_core = CallByPosLic ({it=posop; src=lxm}, args)}
in
- List.iter (fun arg -> assert (arg.ve_clk <> [])) args;
+ (* List.iter (fun arg -> assert (arg.ve_clk <> [])) args; *)
ve, cel, s, lxm
)
| CallByNameLic ({it=nmop; src=lxm}, nmargs) -> (
@@ -399,7 +399,7 @@ and (f_list : IdSolver.t -> subst -> Lic.val_exp list ->
let args = List.rev args in
let cil = List.rev cil in
let cil = List.map (List.map(fun (id,clk) -> id, apply_subst2 s clk)) cil in
- List.iter (fun arg -> assert (arg.ve_clk <> [])) args;
+ (* List.iter (fun arg -> if arg.ve_clk <> [] then assert false else ()) args; *)
args, cil, s
and (eval_by_pos_clock : IdSolver.t -> Lic.by_pos_op -> Lxm.t -> Lic.val_exp list ->
diff --git a/src/lv6version.ml b/src/lv6version.ml
index b27e6a99..55a930f3 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
(** Automatically generated from Makefile *)
let tool = "lus2lic"
let branch = "master"
-let commit = "703"
-let sha_1 = "6f975e9bc4d6dfff63fcf0ab056956d1bbb018ad"
+let commit = "704"
+let sha_1 = "14a42a038250886e940a43df00b4d9b213d922fb"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "jahier@imag.fr"
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 3c91f570..60ffc9f3 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test Run By jahier on Wed Jul 5 15:35:50
+Test Run By jahier on Mon Jul 10 10:30:14
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic0 tests ===
@@ -64,7 +64,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
==> lus2lic1.sum <==
-Test Run By jahier on Wed Jul 5 15:35:51
+Test Run By jahier on Mon Jul 10 10:30:14
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic1 tests ===
@@ -403,7 +403,7 @@ PASS: sh multipar.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
==> lus2lic2.sum <==
-Test Run By jahier on Wed Jul 5 15:36:46
+Test Run By jahier on Mon Jul 10 10:31:11
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -743,7 +743,7 @@ PASS: sh zzz2.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {}
==> lus2lic3.sum <==
-Test Run By jahier on Wed Jul 5 15:38:02
+Test Run By jahier on Mon Jul 10 10:32:26
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic3 tests ===
@@ -1253,7 +1253,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
-Test Run By jahier on Wed Jul 5 15:40:21
+Test Run By jahier on Mon Jul 10 10:34:46
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1770,14 +1770,14 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# of unexpected failures 6
===============================
# Total number of failures: 22
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 55 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 57 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 75 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 139 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 67 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 140 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 69 seconds
* Ref time:
-0.04user 0.03system 5:38.60elapsed 0%CPU (0avgtext+0avgdata 5684maxresident)k
-64inputs+0outputs (0major+6208minor)pagefaults 0swaps
+0.06user 0.02system 5:41.41elapsed 0%CPU (0avgtext+0avgdata 5508maxresident)k
+32inputs+0outputs (0major+6128minor)pagefaults 0swaps
* Quick time (-j 4):
-0.04user 0.03system 2:43.10elapsed 0%CPU (0avgtext+0avgdata 5564maxresident)k
-64inputs+0outputs (0major+6185minor)pagefaults 0swaps
+0.06user 0.01system 2:27.59elapsed 0%CPU (0avgtext+0avgdata 5692maxresident)k
+64inputs+0outputs (0major+6148minor)pagefaults 0swaps
--
GitLab