Skip to content
Snippets Groups Projects
Commit 0a88fa3c authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Fix test cases that were failing for stupid reasons (typically, bad node name)

nb : #FAILS=128->90
parent 09992e22
No related branches found
No related tags found
No related merge requests found
Showing
with 93 additions and 89 deletions
This diff is collapsed.
testcase ./lus2lic.tests/non-reg.exp completed in 223 seconds testcase ./lus2lic.tests/non-reg.exp completed in 333 seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds testcase ./lus2lic.tests/progression.exp completed in 0 seconds
node TIME1_STABLE1(set,second:bool; delay:int) returns (level:bool);
node TIME_STABLE1(set,second:bool; delay:int) returns (level:bool);
var count: int; var count: int;
let let
level = (count > 0); level = (count > 0);
......
...@@ -8,7 +8,7 @@ let ...@@ -8,7 +8,7 @@ let
_acc1 = Lustre::plus(i1, i2_0); _acc1 = Lustre::plus(i1, i2_0);
tel tel
-- end of node n_node_alias -- end of node n_node_alias
node matrice2(a:int) returns (res:int); node aa(a:int) returns (res:int);
var var
_acc1:int; _acc1:int;
_v1_0:int; _v1_0:int;
......
...@@ -15,7 +15,7 @@ type T1_ARRAY = bool^2; ...@@ -15,7 +15,7 @@ type T1_ARRAY = bool^2;
-------------------------------------------- --------------------------------------------
-- operator definition -- operator definition
-------------------------------------------- --------------------------------------------
node bred( node bred_lv4(
i_a : T1_ARRAY; i_a : T1_ARRAY;
) returns ( ) returns (
o_x : bool; o_x : bool;
......
...@@ -9,7 +9,7 @@ let ...@@ -9,7 +9,7 @@ let
o = x^3; o = x^3;
tel tel
node simple2(x:s) returns (o: s^3^2; i: int); node bug(x:s) returns (o: s^3^2; i: int);
let let
o[0] = simple(x); o[0] = simple(x);
o[1] = simple(x); o[1] = simple(x);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
type s = { f1: int ; f2: int^2 }; type s = { f1: int ; f2: int^2 };
node simple(x:s) returns (i: s^2); node bug2(x:s) returns (i: s^2);
let let
i = s { f1 = 42; f2 = [5, 6] } ^ 2; i = s { f1 = 42; f2 = [5, 6] } ^ 2;
......
node clock(a: bool; b: bool) returns (c: bool when a); node clock_ite(a: bool; b: bool) returns (c: bool when a);
-- var -- var
-- z: bool; -- z: bool;
......
node main(c: bool; x,y:int) returns (o: int); node cond01(c: bool; x,y:int) returns (o: int);
let let
o = condact<<+,0>>(c,x,y); o = condact<<+,0>>(c,x,y);
tel tel
...@@ -17,13 +17,14 @@ let ...@@ -17,13 +17,14 @@ let
a = T[0] and consensus<<n-1>>(T[1..n-1]); a = T[0] and consensus<<n-1>>(T[1..n-1]);
tel tel
*) *)
node consensus<<const n : int>>(T: bool^n) returns (a: bool); node consensus_gen<<const n : int>>(T: bool^n) returns (a: bool);
let let
a = with (n = 1) a = with (n = 1)
then T[0] then T[0]
else T[0] and consensus << n-1 >> (T[1 .. n-1]); else T[0] and consensus_gen << n-1 >> (T[1 .. n-1]);
tel tel
node consensus = consensus_gen<<8>>
(* (*
node consensus(T: bool list) returns (a: bool); node consensus(T: bool list) returns (a: bool);
let let
...@@ -32,7 +33,7 @@ let ...@@ -32,7 +33,7 @@ let
tel tel
*) *)
node c8 = consensus<<8>>; node c8 = consensus_gen<<8>>;
...@@ -40,7 +41,7 @@ node c8 = consensus<<8>>; ...@@ -40,7 +41,7 @@ node c8 = consensus<<8>>;
node main (T : bool^4) returns (c : bool); node main (T : bool^4) returns (c : bool);
let let
c = consensus<<4>>(T); c = consensus_gen<<4>>(T);
tel tel
node main2 = consensus<<10>>; node main2 = consensus_gen<<10>>;
...@@ -33,3 +33,5 @@ let ...@@ -33,3 +33,5 @@ let
else acc_in.elementSelected else acc_in.elementSelected
}; };
tel tel
node contractForElementSelectionInArray = selectOneStage
\ No newline at end of file
const i, j, k: int; const i=3;
const j=3;
const k=3;
node cst(x:int) returns (y:int); node cst(x:int) returns (y:int);
var z,t: int; var z,t: int;
......
node left__toto( node ec(
x:bool) x:bool)
returns ( returns (
t_0_a_0:bool; t_0_a_0:bool;
......
...@@ -9,8 +9,7 @@ let ...@@ -9,8 +9,7 @@ let
n1s = (n1b1 or n1b2); n1s = (n1b1 or n1b2);
tel tel
node fresh_name (b:bool) returns (res:bool);
node fn (b:bool) returns (res:bool);
var _n1e1_1:bool; var _n1e1_1:bool;
let let
_n1e1_1 = not b; _n1e1_1 = not b;
......
-- an intern function -- an intern function
function trivial(x : int) returns (y : int); function func_with_body(x : int) returns (y : int);
let let
y = 1; y = 1;
tel tel
...@@ -8,5 +8,3 @@ tel ...@@ -8,5 +8,3 @@ tel
-- and an extern node -- and an extern node
extern node ext(x : int) returns (y : int); extern node ext(x : int) returns (y : int);
node test_impl_prio(x: int) returns (ok: bool)
node impl_priority(x: int) returns (ok: bool)
let let
ok = x=1 => true; ok = x=1 => true;
tel tel
...@@ -88,4 +88,6 @@ let ...@@ -88,4 +88,6 @@ let
tel tel
node maxr=max<<real>>; node maxr=max<<real>>;
node minr=min<<real>>; node minr=min<<real>>;
\ No newline at end of file
node is_stable = is_d_stable<<5, 0.1>>
\ No newline at end of file
...@@ -5,7 +5,7 @@ type truc = struct { ...@@ -5,7 +5,7 @@ type truc = struct {
}; };
node toto(x : bool) returns (t : truc^3); node left(x : bool) returns (t : truc^3);
let let
t[0].a[0..98 step 2][48..0 step -2] = true^25; t[0].a[0..98 step 2][48..0 step -2] = true^25;
-- t[0].a[0..98 step 2][0..48 step 2] = true^25; -- t[0].a[0..98 step 2][0..48 step 2] = true^25;
......
...@@ -12,7 +12,7 @@ let ...@@ -12,7 +12,7 @@ let
(* o = titi<<int>>(x,y); *) (* o = titi<<int>>(x,y); *)
tel tel
node tutu(x,y: real^4) returns (o: real^4); node map(x,y: real^4) returns (o: real^4);
let let
o = titi<<real>>(x,y); o = titi<<real>>(x,y);
tel tel
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
node gup(x: int) returns (y:int); node gup(x: int) returns (y:int);
let let
y = 2 * sil<< lis_bok >>(x); y = 2 * sil<< multipar >>(x);
tel tel
node bok(x:int)returns(y:int); node bok(x:int)returns(y:int);
...@@ -22,6 +22,4 @@ let ...@@ -22,6 +22,4 @@ let
y = x * g(x); y = x * g(x);
tel tel
node lis_bok = lis <<bok>>; node multipar = lis <<bok>>;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment