diff --git a/src/compiledDataDump.ml b/src/compiledDataDump.ml
index 55bb79b08b22cbda44bd940ef0f397786c942eaa..0422381206be7e863646aaf39f7d594a2d6cdff3 100644
--- a/src/compiledDataDump.ml
+++ b/src/compiledDataDump.ml
@@ -322,8 +322,7 @@ and string_of_clock2 (ck : clock_eff) =
and string_of_clock (ck : clock_eff) =
match ck with
| BaseEff -> ""
- | On veff ->" when " ^ (Ident.to_string veff.var_name_eff) ^
- (string_of_clock veff.var_clock_eff)
+ | On veff ->" when " ^ (Ident.to_string veff.var_name_eff)
and string_of_clock_list cl =
diff --git a/src/getEff.ml b/src/getEff.ml
index c12aebf2eb015050035ad582f77531a51d09e4f2..965583f1195d5350b4750c405c63a8ccb401394c 100644
--- a/src/getEff.ml
+++ b/src/getEff.ml
@@ -1,4 +1,4 @@
-(** Time-stamp: <modified the 12/06/2008 (at 11:12) by Erwan Jahier> *)
+(** Time-stamp: <modified the 12/06/2008 (at 16:29) by Erwan Jahier> *)
open Lxm
diff --git a/src/test/should_work/fab_test/morel4.lus b/src/test/should_work/fab_test/morel4.lus
index 4bba5cbf490482df377820f37b6ad341f73fd2e8..66c16347d214139d0dad7c9aa61fa2958deffc8e 100644
--- a/src/test/should_work/fab_test/morel4.lus
+++ b/src/test/should_work/fab_test/morel4.lus
@@ -30,7 +30,7 @@ node mcmorel(i:int) returns (t:int^2);
var
yo : toto;
let
- yo.titi = tube {in=i, out=i+1} ;
+ yo.titi = tube {in=i; out=i+1} ;
yo.tutu = true ;
t = [yo.titi.in, yo.titi.out] -> [pre(t[0])+1,pre(t[1])] ;
--t = [ 2, 3 ] ;
diff --git a/src/test/test.res.exp b/src/test/test.res.exp
index 6ae23879ce813551fb0c50e5fbdb2051448d0b82..4d102cda173474a8d8f6fca6fe2605fd686dc5c0 100644
--- a/src/test/test.res.exp
+++ b/src/test/test.res.exp
@@ -58,14 +58,14 @@ node PCOND__PCOND(
hA:bool when h0;
hB:bool when h0;
hC:bool when h0;
- A:int when hA when h0;
- B:int when hB when h0;
- C:bool when hC when h0;
- hD:bool when hC when h0;
- D:bool when hD when hC when h0)
+ A:int when hA;
+ B:int when hB;
+ C:bool when hC;
+ hD:bool when hC;
+ D:bool when hD)
returns (
hX:bool when h0;
- X:int when hX when h0);
+ X:int when hX);
let
hX = ((hC and current (hD)) and ((hA and current (current (D))) or (hB and
not(current (current (D))))));
@@ -83,11 +83,11 @@ node PCOND1__PCOND1(
hA:bool when h0;
hB:bool when h0;
hC:bool when h0;
- A:int when hA when h0;
- B:int when hB when h0;
- C:bool when hC when h0;
- hD:bool when hC when h0;
- D:bool when hD when hC when h0)
+ A:int when hA;
+ B:int when hB;
+ C:bool when hC;
+ hD:bool when hC;
+ D:bool when hD)
returns (
hX:bool when h0);
let
@@ -671,11 +671,11 @@ Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/X3.lus
node X3__X3(n:int; b:bool) returns (m:int);
var
c:bool when b;
- d:bool when c when b;
+ d:bool when c;
p:int when b;
u:int when b;
- q:int when c when b;
- r:int when c when b;
+ q:int when c;
+ r:int when c;
let
c = (p >= 0 when b);
p = n when b;
@@ -697,11 +697,11 @@ node X6__X6(
returns (
m:int;
c:bool when b;
- d:bool when c when b;
+ d:bool when c;
p:int when b;
u:int when b;
- q:int when c when b;
- r:int when c when b);
+ q:int when c;
+ r:int when c);
let
c = (p >= 0 when b);
p = n when b;
@@ -1015,13 +1015,7 @@ tel
----------------------------------------------------------------------
====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/ck2.lus
Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/ck2.lus
-
-node ck2__ck2(
- c:bool;
- d:bool when c;
- e:int when d when c)
-returns (
- n:int);
+node ck2__ck2(c:bool; d:bool when c; e:int when d) returns (n:int);
let
n = if ((c and current (d))) then (0) else (current (current (e)));
tel
@@ -1030,13 +1024,7 @@ tel
----------------------------------------------------------------------
====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/ck3.lus
Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/ck3.lus
-
-node ck3__ck3(
- a:bool;
- b:bool when a;
- c:bool when b when a)
-returns (
- x:bool);
+node ck3__ck3(a:bool; b:bool when a; c:bool when b) returns (x:bool);
let
x = current (current (c));
tel
@@ -1081,7 +1069,7 @@ var
v:int when b;
w:int when b;
cc:bool when b;
- x:int when cc when b;
+ x:int when cc;
let
(u, v) = ck6__p(n when b);
(w, x) = ck6__N(cc, u, v);
@@ -1118,8 +1106,8 @@ extern node clock__all(
a:bool;
b:bool when a)
returns (
- c:bool when b when a;
- d:bool when c when b when a);
+ c:bool when b;
+ d:bool when c);
node clock__clock(in:bool) returns (ok:bool);
var
v1:bool;
@@ -1127,8 +1115,8 @@ var
v2:bool when v4;
v3:bool when v1;
v5:bool when v4;
- v6:bool when v5 when v4;
- v7:bool when v6 when v5 when v4;
+ v6:bool when v5;
+ v7:bool when v6;
let
v1 = clock__inOnIn(in, true when in);
v2 = in when v4;
@@ -1975,7 +1963,7 @@ returns (
s:int when c);
var
h:bool when c;
- u:int when h when c;
+ u:int when h;
let
h = true when c -> ((x + y) when c < z);
u = z when h -> multiclock__moyenne(z when h, pre(u));
@@ -3850,14 +3838,14 @@ returns (
extern node clock__clock5(
x:bool;
y:bool when x;
- z:bool when y when x)
+ z:bool when y)
returns (
a:bool);
node clock__clock(a:bool; b:bool) returns (c:bool; d:bool when c);
var
z:bool;
x:bool when z;
- y:bool when x when z;
+ y:bool when x;
e:bool when b;
let
(z, x) = clock__clock3(z);
@@ -4388,7 +4376,7 @@ node clock__clock(a:bool; b:bool) returns (c:bool; d:bool when c);
var
z:bool;
x:bool when z;
- y:bool when x when z;
+ y:bool when x;
let
y = clock__clock2(a, b when a) when x;
(z, x) = clock__clock3(pre(z));
@@ -4689,7 +4677,7 @@ var
Sum:real;
Unit_Delay1:real;
zoh1:real when cl1_4;
- zoh2:real when cl2_6 when cl1_2;
+ zoh2:real when cl2_6;
subsys1_Trigger:bool when cl1_4;
subsys1_s1:real when cl1_4;
subsys1_s2:real when cl1_4;
@@ -5425,8 +5413,6 @@ let
(b1, b2, b3, i1, i2, i3) = morel4__tab(b, i);
tel
-- end of node morel4__morel4
-Warning. in file "should_work/fab_test/morel4.lus", line 33, col 22 to 22, token ',':
----> separator mismatch, ';' expected
----------------------------------------------------------------------
====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/morel5.lus
@@ -9341,7 +9327,7 @@ node clock__clock(a:bool; b:bool) returns (c:bool; d:bool when c);
var
z:bool;
x:bool when z;
- y:bool when x when z;
+ y:bool when x;
let
y = clock__clock2(a, b when a) when x;
(z, x) = clock__clock3(z);