From a44a1e3ee4f9fad5e46a0e72b34bb803c8d87c82 Mon Sep 17 00:00:00 2001 From: Erwan Jahier <jahier@imag.fr> Date: Fri, 18 Jul 2008 14:35:25 +0200 Subject: [PATCH] Do not print the full path of the opened file (verbose level >= 1) as it breaks non-reg tests when executed in the original directory. --- src/global.ml | 5 +- src/test/Makefile | 2 +- src/test/test.res.exp | 424 +++++++++++++++++++++--------------------- 3 files changed, 216 insertions(+), 215 deletions(-) diff --git a/src/global.ml b/src/global.ml index 473d31a2..2706a942 100644 --- a/src/global.ml +++ b/src/global.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 09/06/2008 (at 11:05) by Erwan Jahier> *) +(** Time-stamp: <modified the 18/07/2008 (at 14:32) by Erwan Jahier> *) (** Some global variables. @@ -29,7 +29,8 @@ let add_infile file_name = let lexbuf_of_file_name file = let inchannel = Verbose.print_string ~level:1 - ("Opening file " ^ (Filename.concat (Sys.getcwd ()) file) ^ "\n"); +(* ("Opening file " ^ (Filename.concat (Sys.getcwd ()) file) ^ "\n"); *) + ("Opening file " ^ (file) ^ "\n"); open_in file in line_num := 1; diff --git a/src/test/Makefile b/src/test/Makefile index 097c6587..c7b343a4 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -46,7 +46,7 @@ test: unit echo "Those tests are supposed to generate errors" > test_ko.res for d in ${OK_LUS}; do \ echo -e "\n$(NL)====> $(LC) $$d" >> test_ok.res; \ - $(LC) $$d >> test_ok.res 2>&1 ;\ + $(LC) $$d >> test_ok.res 2>&1 ;\ done; \ for d in ${KO_LUS}; do \ echo -e "\n$(NL)====> $(LC) $$d" >> test_ko.res; \ diff --git a/src/test/test.res.exp b/src/test/test.res.exp index 98371e01..1b01f115 100644 --- a/src/test/test.res.exp +++ b/src/test/test.res.exp @@ -2,7 +2,7 @@ Non-regression tests ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/CURRENT.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/CURRENT.lus +Opening file should_work/NONREG/CURRENT.lus node CURRENT::CURRENT(x:bool; y:bool when x) returns (z:bool when x); let z = y; @@ -11,7 +11,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/Int.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/Int.lus +Opening file should_work/NONREG/Int.lus const Int8::n = 8; type _Int8::Int = bool^8; const Int8::zero = [false, false, false, false, false, false, false, false]; @@ -52,7 +52,7 @@ tel type A_bool_8 = bool^8; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/PCOND.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/PCOND.lus +Opening file should_work/NONREG/PCOND.lus node PCOND::PCOND( h0:bool; @@ -77,7 +77,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/PCOND1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/PCOND1.lus +Opening file should_work/NONREG/PCOND1.lus node PCOND1::PCOND1( h0:bool; @@ -98,7 +98,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/SOURIS.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/SOURIS.lus +Opening file should_work/NONREG/SOURIS.lus node SOURIS::SOURIS( B1:bool; @@ -171,7 +171,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/Watch.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/Watch.lus +Opening file should_work/NONREG/Watch.lus type _Watch::STATUS_TYPE; type _Watch::ALARM_TIME_TYPE; type _Watch::WATCH_TIME_POSITION; @@ -632,7 +632,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/X.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/X.lus +Opening file should_work/NONREG/X.lus node X::X( c:bool; @@ -650,7 +650,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/X1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/X1.lus +Opening file should_work/NONREG/X1.lus node X1::X1(b:bool; n:int) returns (m:int); let m = (current (n when b)); @@ -659,7 +659,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/X2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/X2.lus +Opening file should_work/NONREG/X2.lus node X2::X2(b:bool; n:int) returns (m:int); let m = (0 -> (current (n when b))); @@ -668,7 +668,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/X3.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/X3.lus +Opening file should_work/NONREG/X3.lus node X3::X3(n:int; b:bool) returns (m:int); var c:bool when b; @@ -690,7 +690,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/X6.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/X6.lus +Opening file should_work/NONREG/X6.lus node X6::X6( n:int; @@ -716,7 +716,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/_N_uu.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/_N_uu.lus +Opening file should_work/NONREG/_N_uu.lus node _N_uu::_N_uu(I_x:bool; I_y:bool; I_z:bool) returns (O_a:bool); var V_V135_A_forbiden:bool; @@ -750,7 +750,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/activation_ec.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/activation_ec.lus +Opening file should_work/NONREG/activation_ec.lus node activation_ec::activation_ec(evt:bool) returns (scie:int); var V10_go_up:bool; @@ -764,7 +764,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/after.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/after.lus +Opening file should_work/NONREG/after.lus node after::after(x:bool) returns (after:bool); let after = (x or (false -> (pre after))); @@ -773,7 +773,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/alarme.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/alarme.lus +Opening file should_work/NONREG/alarme.lus const alarme::delai_reprise = 4; const alarme::delai_vigilence = 3; const alarme::delai_alarme = 6; @@ -847,7 +847,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/arbitre.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/arbitre.lus +Opening file should_work/NONREG/arbitre.lus node arbitre::my_switch( set:bool; @@ -927,7 +927,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/argos.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/argos.lus +Opening file should_work/NONREG/argos.lus node argos::argos(a:bool; b:bool) returns (s0:bool; s1:bool; s2:bool); var t0:bool; @@ -947,7 +947,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/assertion.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/assertion.lus +Opening file should_work/NONREG/assertion.lus node assertion::assertion( a:bool; @@ -967,7 +967,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/aux.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/aux.lus +Opening file should_work/NONREG/aux.lus node aux::aux(ck:bool) returns (x:int); let x = ((pre x) + 1); @@ -976,7 +976,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/aux1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/aux1.lus +Opening file should_work/NONREG/aux1.lus node aux1::aux1(a:int; b:int) returns (c:int; d:int); let (c, d) = ( if (a > 0) then (pre (a, b)) else (((pre a) + 1), ((pre b) + @@ -986,7 +986,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/bascule.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/bascule.lus +Opening file should_work/NONREG/bascule.lus node bascule::bascule(r:bool; s:bool) returns (q:bool; n:bool); let q = (true -> ((not (pre r)) and (not (pre n)))); @@ -996,7 +996,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/call.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/call.lus +Opening file should_work/NONREG/call.lus extern function call::f(a:int) returns (b:int); node call::n(a:int; b:bool) returns (x:int; y:int); let @@ -1016,7 +1016,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 +Opening file should_work/NONREG/ck2.lus 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))); @@ -1025,7 +1025,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 +Opening file should_work/NONREG/ck3.lus node ck3::ck3(a:bool; b:bool when a; c:bool when b) returns (x:bool); let x = (current (current c)); @@ -1034,7 +1034,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/ck4.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/ck4.lus +Opening file should_work/NONREG/ck4.lus node ck4::ck4(a:int when b; b:bool) returns (c:int); let c = (current a); @@ -1043,7 +1043,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/ck5.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/ck5.lus +Opening file should_work/NONREG/ck5.lus node ck5::edge(x:bool) returns (y:bool); let y = (false -> (x and (not (pre x)))); @@ -1057,7 +1057,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/ck6.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/ck6.lus +Opening file should_work/NONREG/ck6.lus extern function ck6::p(d:int) returns (e:int; f:int); node ck6::N(a:bool; m:int; n:int) returns (q:int; r:int when a); let @@ -1083,7 +1083,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/ck7.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/ck7.lus +Opening file should_work/NONREG/ck7.lus node ck7::ck7(a:bool; m:int; n:int) returns (q:int; r:int when a); let q = (m + n); @@ -1093,7 +1093,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/clock.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/clock.lus +Opening file should_work/NONREG/clock.lus extern node clock::outOnIn(a:bool; b:bool) returns (c:bool when b); extern node clock::inOnIn(a:bool; b:bool when a) returns (c:bool); @@ -1132,7 +1132,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/cminus.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/cminus.lus +Opening file should_work/NONREG/cminus.lus node cminus::TWO_STATES( set:bool; @@ -1178,7 +1178,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/compteur.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/compteur.lus +Opening file should_work/NONREG/compteur.lus node compteur::compteur(evt:bool) returns (cpt:int); let cpt = ((0 -> (pre cpt)) + ( if evt then 1 else 0)); @@ -1187,7 +1187,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/cpt.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/cpt.lus +Opening file should_work/NONREG/cpt.lus node cpt::cpt(evt:bool; reset:bool) returns (cpt:int); let cpt = ( if reset then 0 else ((0 -> (pre cpt)) + ( if evt then 1 else @@ -1197,7 +1197,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/cst.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/cst.lus +Opening file should_work/NONREG/cst.lus const cst::i:int; const cst::j:int; const cst::k:int; @@ -1214,7 +1214,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/deconne.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/deconne.lus +Opening file should_work/NONREG/deconne.lus type _deconne::pendule; const deconne::G = 10.000000; const deconne::L = 2.000000; @@ -1248,7 +1248,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/dep.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/dep.lus +Opening file should_work/NONREG/dep.lus node dep::dep(x:int) returns (u:int; v:int; y:int); let u = (x -> (x + (pre x))); @@ -1259,7 +1259,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/dependeur.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/dependeur.lus +Opening file should_work/NONREG/dependeur.lus node dependeur::dependeur( time_in_ms:int) @@ -1283,7 +1283,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/dependeur_struct.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/dependeur_struct.lus +Opening file should_work/NONREG/dependeur_struct.lus type _dependeur_struct::time = struct {h : int; m : int; s : int; ms : int}; node dependeur_struct::dependeur_struct( @@ -1305,7 +1305,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/drapfab.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/drapfab.lus +Opening file should_work/NONREG/drapfab.lus node drapfab::drapfab( bleu:bool; @@ -1335,7 +1335,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/enum.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/enum.lus +Opening file should_work/NONREG/enum.lus type _enum::couleur = enum {enum::bleu, enum::blanc, enum::rouge}; type _enum::color = enum {enum::blue, enum::white, enum::redd}; node enum::boo(e:int) returns (c:_enum::couleur; c2:_enum::color); @@ -1347,7 +1347,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/eq1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/eq1.lus +Opening file should_work/NONREG/eq1.lus node eq1::eq1( a:bool; @@ -1371,7 +1371,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/ex.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/ex.lus +Opening file should_work/NONREG/ex.lus type _ex::t = A_A_A_int_1_2_3^4; type _ex::t1 = A_A_A_A_int_1_2_3_4^4; type _ex::t2 = struct {a : int; b : A_A_bool_11_22}; @@ -1391,7 +1391,7 @@ type A_A_int_1_2 = A_int_1^2; type A_int_1 = int^1; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/exclusion.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/exclusion.lus +Opening file should_work/NONREG/exclusion.lus node exclusion::exclusion( a:bool; @@ -1415,7 +1415,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/fby.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/fby.lus +Opening file should_work/NONREG/fby.lus node fby::followed_by(ck:bool) returns (x:int); let x = (0 -> ((pre x) + 1)); @@ -1424,7 +1424,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/flo.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/flo.lus +Opening file should_work/NONREG/flo.lus node flo::SWITCH(init:bool; on:bool; off:bool) returns (state:bool); let state = ( if on then true else ( if off then false else (init -> (pre @@ -1448,7 +1448,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/hanane.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/hanane.lus +Opening file should_work/NONREG/hanane.lus type _hanane::t1; const hanane::a = 4; type _hanane::string = int^4; @@ -1490,7 +1490,7 @@ type A__hanane::structT_2 = _hanane::structT^2; type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/import1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/import1.lus +Opening file should_work/NONREG/import1.lus extern node import1::imp(x:int) returns (y:int); node import1::import1(a:int; b:int) returns (c:int); let @@ -1500,7 +1500,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/initial.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/initial.lus +Opening file should_work/NONREG/initial.lus node initial::initial(justDoIt:bool) returns (oa:bool; ob:int; oc:real); let oa = (false -> (pre oa)); @@ -1511,7 +1511,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/long_et_stupide_nom_de_noeud.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/long_et_stupide_nom_de_noeud.lus +Opening file should_work/NONREG/long_et_stupide_nom_de_noeud.lus node long_et_stupide_nom_de_noeud::long_et_stupide_nom_de_noeud( long_parametre:int) @@ -1524,7 +1524,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax1.lus +Opening file should_work/NONREG/minmax1.lus node minmax1::minmax1(a:int; b:int) returns (min:int; max:int); let (min, max) = ( if (a < b) then (a, b) else (b, a)); @@ -1533,7 +1533,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax2.lus +Opening file should_work/NONREG/minmax2.lus node minmax2::minmax(a:int; b:int) returns (min:int; max:int); let (min, max) = ( if (a < b) then (a, b) else (b, a)); @@ -1547,7 +1547,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax3.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax3.lus +Opening file should_work/NONREG/minmax3.lus node minmax3::minmax(a:int; b:int) returns (min:int; max:int); let (min, max) = ( if (a <= b) then (a, b) else (b, a)); @@ -1575,7 +1575,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax4.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax4.lus +Opening file should_work/NONREG/minmax4.lus node minmax4::minmax(a:int; b:int) returns (min:int; max:int); let (min, max) = ( if (a <= b) then (a, b) else (b, a)); @@ -1610,7 +1610,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax4_bis.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax4_bis.lus +Opening file should_work/NONREG/minmax4_bis.lus node minmax4_bis::minmax(a:int; b:int) returns (min:int; max:int); let (min, max) = ( if (a <= b) then (a, b) else (b, a)); @@ -1645,7 +1645,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax5.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax5.lus +Opening file should_work/NONREG/minmax5.lus extern function minmax5::minmax(a:int; b:int) returns (min:int; max:int); node minmax5::minmax5( @@ -1676,7 +1676,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax5_random.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax5_random.lus +Opening file should_work/NONREG/minmax5_random.lus extern function minmax5_random::minmax( a:int; @@ -1713,7 +1713,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/minmax6.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/minmax6.lus +Opening file should_work/NONREG/minmax6.lus node minmax6::minmax(a:int; b:int) returns (min:int; max:int); let (min, max) = ( if (a <= b) then (a, b) else (b, a)); @@ -1765,7 +1765,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mm.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mm.lus +Opening file should_work/NONREG/mm.lus type _mm::pair = struct {a : int; b : int}; type _mm::pairpair = struct {a : _mm::pair; b : _mm::pair}; node mm::mm(a:int; b:int) returns (min:int; max:int); @@ -1776,7 +1776,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mm1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mm1.lus +Opening file should_work/NONREG/mm1.lus type _mm1::pair = struct {a : int; b : int}; type _mm1::pairpair = struct {a : _mm1::pair; b : _mm1::pair}; node mm1::mm1(a:int; b:int) returns (y:_mm1::pair); @@ -1787,7 +1787,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mm22.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mm22.lus +Opening file should_work/NONREG/mm22.lus type _mm22::pair = struct {a : int; b : int}; type _mm22::pairpair = struct {a : _mm22::pair; b : _mm22::pair}; node mm22::mm22(a:int; b:int) returns (y:_mm22::pair); @@ -1799,7 +1799,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mm3.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mm3.lus +Opening file should_work/NONREG/mm3.lus type _mm3::pair = struct {a : int; b : int}; type _mm3::pairpair = struct {a : _mm3::pair; b : _mm3::pair}; node mm3::mm3(a:_mm3::pair) returns (y:_mm3::pair); @@ -1810,7 +1810,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mouse.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mouse.lus +Opening file should_work/NONREG/mouse.lus node mouse::edge(x:bool) returns (e:bool); let e = (false -> (x and (not (pre x)))); @@ -1844,7 +1844,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mouse1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mouse1.lus +Opening file should_work/NONREG/mouse1.lus node mouse1::mouse1( click:bool; @@ -1872,7 +1872,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mouse2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mouse2.lus +Opening file should_work/NONREG/mouse2.lus node mouse2::edge(x:bool) returns (e:bool); let e = (false -> (x and (not (pre x)))); @@ -1906,7 +1906,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/mouse3.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/mouse3.lus +Opening file should_work/NONREG/mouse3.lus node mouse3::mouse3( click:bool; @@ -1927,7 +1927,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/multiclock.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/multiclock.lus +Opening file should_work/NONREG/multiclock.lus node multiclock::moyenne(x:int; y:int) returns (m:int); var s:int; @@ -1956,7 +1956,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc1.lus +Opening file should_work/NONREG/nc1.lus node nc1::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -1978,7 +1978,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc10.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc10.lus +Opening file should_work/NONREG/nc10.lus node nc10::n4( n4e1:int; @@ -2023,7 +2023,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc2.lus +Opening file should_work/NONREG/nc2.lus node nc2::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -2045,7 +2045,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc3.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc3.lus +Opening file should_work/NONREG/nc3.lus node nc3::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -2069,7 +2069,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc4.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc4.lus +Opening file should_work/NONREG/nc4.lus node nc4::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -2103,7 +2103,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc5.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc5.lus +Opening file should_work/NONREG/nc5.lus node nc5::n4(n4e1:int) returns (n4s:int); let n4s = (n4e1 + 1); @@ -2135,7 +2135,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc6.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc6.lus +Opening file should_work/NONREG/nc6.lus node nc6::n4(n4e1:int) returns (n4s:int); let n4s = (n4e1 + 1); @@ -2167,7 +2167,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc7.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc7.lus +Opening file should_work/NONREG/nc7.lus node nc7::n4( n4e1:int; @@ -2207,7 +2207,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc8.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc8.lus +Opening file should_work/NONREG/nc8.lus node nc8::n4(n4e1:int; n4e2:int; n4e3:int; n4e4:int) returns (n4s:int); let n4s = (((n4e1 + n4e2) + n4e3) + n4e4); @@ -2240,7 +2240,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/nc9.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/nc9.lus +Opening file should_work/NONREG/nc9.lus node nc9::n4( n4e1:int; @@ -2285,7 +2285,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/node_caller1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/node_caller1.lus +Opening file should_work/NONREG/node_caller1.lus node node_caller1::ex5(a:int) returns (b:int); let b = (a - 700000); @@ -2319,7 +2319,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/o2l_feux_compl.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/o2l_feux_compl.lus +Opening file should_work/NONREG/o2l_feux_compl.lus node o2l_feux_compl::o2l_feux_compl( TD:bool; @@ -2588,7 +2588,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/patrick.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/patrick.lus +Opening file should_work/NONREG/patrick.lus node patrick::patrick(a:int; b:int; c:bool; d:bool) returns (s:int); let s = ( if c then a else (1 + ( if d then b else 4))); @@ -2597,7 +2597,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/poussoir.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/poussoir.lus +Opening file should_work/NONREG/poussoir.lus node poussoir::TWO_STATES( set:bool; @@ -2624,7 +2624,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/rs.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/rs.lus +Opening file should_work/NONREG/rs.lus node rs::rs(r:bool; s:bool) returns (q:bool); var n:bool; @@ -2636,7 +2636,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/s.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/s.lus +Opening file should_work/NONREG/s.lus node s::s(a:int; b:int) returns (t:int); let assert((a = 0)); @@ -2646,7 +2646,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/simple.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/simple.lus +Opening file should_work/NONREG/simple.lus type _simple::S; type _simple::T = int; type _simple::H = struct {x : _simple::S; y : int}; @@ -2672,7 +2672,7 @@ extern function simple::f2(u:int; v:int) returns (s:int; t:bool); ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/stopwatch.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/stopwatch.lus +Opening file should_work/NONREG/stopwatch.lus node stopwatch::simple_stopwatch( time_unit:bool; @@ -2715,7 +2715,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/testCA.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/testCA.lus +Opening file should_work/NONREG/testCA.lus node testCA::testCA( time_in_ms:int) @@ -2739,7 +2739,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/trivial.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/trivial.lus +Opening file should_work/NONREG/trivial.lus node trivial::edge(x:bool) returns (e:bool); let e = (false -> (x and (not (pre x)))); @@ -2753,7 +2753,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/trivial2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/trivial2.lus +Opening file should_work/NONREG/trivial2.lus node trivial2::edge(x:bool) returns (e:bool); let e = (false -> (x and (not (pre x)))); @@ -2767,7 +2767,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/uu.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/uu.lus +Opening file should_work/NONREG/uu.lus node uu::uu(x:bool; y:bool; z:bool) returns (a:bool); var V112_X:bool; @@ -2801,7 +2801,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/NONREG/v1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/NONREG/v1.lus +Opening file should_work/NONREG/v1.lus node v1::v1(m:int; b:bool) returns (n:int); let n = ( if b then m else (m - 1)); @@ -2810,7 +2810,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/consensus.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/consensus.lus +Opening file should_work/Pascal/consensus.lus node consensus::consensus_1(T:A_bool_1) returns (a:bool); let a = (T[0]); @@ -2889,7 +2889,7 @@ type A_bool_10 = bool^10; type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/fby.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/fby.lus +Opening file should_work/Pascal/fby.lus node fby::rising_edge_bis(X:bool) returns (ok:bool); let ok = ((false fby ((not X) fby X)) and X); @@ -2903,7 +2903,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/func_with_body.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/func_with_body.lus +Opening file should_work/Pascal/func_with_body.lus extern node func_with_body::ext(x:int) returns (y:int); function func_with_body::trivial(x:int) returns (y:int); let @@ -2913,7 +2913,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/heater_control.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/heater_control.lus +Opening file should_work/Pascal/heater_control.lus const heater_control::FAILURE = -999.000000; const heater_control::TMIN = 6.000000; const heater_control::TMAX = 9.000000; @@ -3036,7 +3036,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/left.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/left.lus +Opening file should_work/Pascal/left.lus type _left::truc = struct {a : A_bool_100; b : int}; node left::toto(x:bool) returns (t:A__left::truc_3); let @@ -3054,7 +3054,7 @@ type A__left::truc_3 = _left::truc^3; type A_bool_100 = bool^100; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/newpacks.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/newpacks.lus +Opening file should_work/Pascal/newpacks.lus type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); let @@ -3098,7 +3098,7 @@ const inter::n = -4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/onlyroll.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/onlyroll.lus +Opening file should_work/Pascal/onlyroll.lus const onlyroll::NRminP = -5.100000; const onlyroll::NRminR = -25.300000; const onlyroll::NRmaxP = 5.100000; @@ -3583,7 +3583,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/p.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/p.lus +Opening file should_work/Pascal/p.lus type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); let @@ -3627,7 +3627,7 @@ const inter::n = -4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/packs.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/packs.lus +Opening file should_work/Pascal/packs.lus type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); let @@ -3676,14 +3676,14 @@ type _inter::toto = enum {inter::X, inter::Y}; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/pfs.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/pfs.lus +Opening file should_work/Pascal/pfs.lus *** Error in file "should_work/Pascal/pfs.lus", line 43, col 22 to 22, token '[': *** syntax error ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/struct0.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/struct0.lus +Opening file should_work/Pascal/struct0.lus type _struct0::Toto = struct {x : int = 1; y : int = 2}; node struct0::bibi(dummy:int) returns (z:_struct0::Toto); let @@ -3693,7 +3693,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/t.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/t.lus +Opening file should_work/Pascal/t.lus const t::A = [[1, 1], [1, 1], [1, 1]]; const t::B = [2, 2]; node t::toto(x:bool) returns (a:A_A_int_2_3; b:A_int_2); @@ -3707,7 +3707,7 @@ type A_A_int_2_3 = A_int_2^3; type A_int_2 = int^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/t0.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/t0.lus +Opening file should_work/Pascal/t0.lus node t0::min_n_1(T:A_int_1) returns (mn:int); let mn = (T[0]); @@ -3751,7 +3751,7 @@ type A_int_4 = int^4; type A_int_1 = int^1; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/t1.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/t1.lus +Opening file should_work/Pascal/t1.lus node t1::consensus_1(T:A_bool_1) returns (a:bool); let a = (T[0]); @@ -3784,20 +3784,20 @@ type A_bool_1 = bool^1; type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/t2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/t2.lus +Opening file should_work/Pascal/t2.lus *** Error in file "should_work/Pascal/t2.lus", line 34, col 5 to 9, token 'treat': *** unknown node (treat) ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/test.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/test.lus +Opening file should_work/Pascal/test.lus const P1::y = 3; type _P1::titi = int^5; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/Pascal/trivial.lus -Opening file /home/jahier/lus2lic/src/test/should_work/Pascal/trivial.lus +Opening file should_work/Pascal/trivial.lus node trivial::trivial(x:int) returns (y:int); let y = 1; @@ -3806,7 +3806,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/bad_call02.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/bad_call02.lus +Opening file should_work/call/bad_call02.lus node bad_call02::bad_call02(a:int; c:bool) returns (x:int when c); let x = (a when c); @@ -3815,7 +3815,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/bad_call03.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/bad_call03.lus +Opening file should_work/call/bad_call03.lus function bad_call03::toto(i1:A_o_3; i2:A_o_3) returns (o:A_o_3); let o = (Lustre::map<<Lustre::plus, 3>>(i1, i2)); @@ -3846,7 +3846,7 @@ type A_o_3 = o^3; type A_real_3 = real^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/call01.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/call01.lus +Opening file should_work/call/call01.lus function call01::toto(i1:bool; i2:bool) returns (o:bool); let o = (Lustre::and(i1, i2)); @@ -3861,7 +3861,7 @@ extern function call01::momo(x:bool; y:bool) returns (z:bool); ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/call02.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/call02.lus +Opening file should_work/call/call02.lus function call02::toto(i1:bool; i2:bool) returns (o:bool); let o = (Lustre::and(i1, i2)); @@ -3880,7 +3880,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/call03.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/call03.lus +Opening file should_work/call/call03.lus function call03::tutu(i1:A_bool_2; i2:A_bool_2) returns (o:A_bool_2); let o = (Lustre::map<<Lustre::or, 2>>(i1, i2)); @@ -3896,7 +3896,7 @@ extern function call03::momo(x:bool; y:bool) returns (z:bool); type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/call04.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/call04.lus +Opening file should_work/call/call04.lus function call04::toto(i1:bool; i2:bool) returns (o:bool); let o = (Lustre::and(i1, i2)); @@ -3921,7 +3921,7 @@ tel type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/call05.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/call05.lus +Opening file should_work/call/call05.lus extern function call05::momo(x:bool; y:bool) returns (z:bool); node call05::call05(x:bool; y:bool) returns (z:bool); let @@ -3931,7 +3931,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/call06.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/call06.lus +Opening file should_work/call/call06.lus extern function call06::bip(x:bool; y:bool) returns (z:bool; t:bool); node call06::call06(x:bool; y:bool) returns (z:bool; t:bool); let @@ -3942,7 +3942,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/call/call07.lus -Opening file /home/jahier/lus2lic/src/test/should_work/call/call07.lus +Opening file should_work/call/call07.lus node call07::call07(x:bool; y:bool; z:bool) returns (t:bool); let t = (#(x, y, z)); @@ -3951,7 +3951,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/clock/clock.lus -Opening file /home/jahier/lus2lic/src/test/should_work/clock/clock.lus +Opening file should_work/clock/clock.lus type _clock::s = struct {x : A_bool_10; y : bool}; extern node clock::clock3( @@ -3996,7 +3996,7 @@ returns ( type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/clock/when_enum.lus -Opening file /home/jahier/lus2lic/src/test/should_work/clock/when_enum.lus +Opening file should_work/clock/when_enum.lus type _when_enum::t = enum {when_enum::A, when_enum::B, when_enum::C}; *** Error in file "should_work/clock/when_enum.lus", line 9, col 19 to 22, token 'when': *** syntax error: clock expr expected @@ -4005,7 +4005,7 @@ extern node when_enum::tutu(u:bool) returns (x:bool); ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/clock/when_node.lus -Opening file /home/jahier/lus2lic/src/test/should_work/clock/when_node.lus +Opening file should_work/clock/when_node.lus *** Error in file "should_work/clock/when_node.lus", line 6, col 19 to 22, token 'when': *** syntax error: clock expr expected @@ -4013,7 +4013,7 @@ extern node when_node::tutu(u:bool) returns (x:bool); ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/clock/when_not.lus -Opening file /home/jahier/lus2lic/src/test/should_work/clock/when_not.lus +Opening file should_work/clock/when_not.lus extern node when_not::clock4( clock4_u:bool; @@ -4027,7 +4027,7 @@ returns ( ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/clock/when_tuple.lus -Opening file /home/jahier/lus2lic/src/test/should_work/clock/when_tuple.lus +Opening file should_work/clock/when_tuple.lus extern node when_tuple::toto(u:bool; v:bool) returns (x:bool; y:bool); *** Error in file "should_work/clock/when_tuple.lus", line 6, col 24 to 27, token 'when': *** when on tuples not yet supported. @@ -4035,7 +4035,7 @@ extern node when_tuple::toto(u:bool; v:bool) returns (x:bool; y:bool); ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/Gyroscope2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/Gyroscope2.lus +Opening file should_work/demo/Gyroscope2.lus type _Gyroscope2::Valid_ChannelT = struct {local_failure : bool; local_value : real}; type _Gyroscope2::CFF_Eltstruct = struct {indx : int; indx_toChange : int; value : _Gyroscope2::Valid_ChannelT}; type _Gyroscope2::Faulty_ChannelT = struct {valuea : real; valueb : real}; @@ -4438,7 +4438,7 @@ type A_A__Gyroscope2::Faulty_ChannelT_4_3 = A__Gyroscope2::Faulty_ChannelT_4^3; type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/alias.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/alias.lus +Opening file should_work/demo/alias.lus const alias::SIZE = 3; function alias::aliasIterOp(i1:int; i2:A_int_3) returns (o:int); let @@ -4480,7 +4480,7 @@ type A_bool_2 = bool^2; type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/bred.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/bred.lus +Opening file should_work/demo/bred.lus node bred::bred(a:A_bool_2) returns (x:bool); let x = (boolred<<0, 1, 2>>(a)); @@ -4490,7 +4490,7 @@ tel type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/bred_lv4.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/bred_lv4.lus +Opening file should_work/demo/bred_lv4.lus type _bred_lv4::T1_ARRAY = bool^2; node bred_lv4::bred(i_a:A_bool_2) returns (o_x:bool); let @@ -4501,7 +4501,7 @@ tel type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/clock.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/clock.lus +Opening file should_work/demo/clock.lus extern node clock::clock2(u:bool; v:bool when u) returns (y:bool); extern node clock::clock3(u:bool) returns (x:bool; y:bool when x); @@ -4525,7 +4525,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/clock1_2ms.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/clock1_2ms.lus +Opening file should_work/demo/clock1_2ms.lus node clock1_2ms::Clock1ms_node(dummy:bool) returns (Clock1ms:bool); let Clock1ms = (true -> (not (pre Clock1ms))); @@ -4550,7 +4550,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/decl.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/decl.lus +Opening file should_work/demo/decl.lus type _decl::t1; type _decl::t2; type _decl::t3; @@ -4594,7 +4594,7 @@ type A__decl::t1_8 = _decl::t1^8; type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/declaration.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/declaration.lus +Opening file should_work/demo/declaration.lus type _declaration::t1; type _declaration::t2; type _declaration::t3; @@ -4659,7 +4659,7 @@ type A__declaration::t1_8 = _declaration::t1^8; type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/def.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/def.lus +Opening file should_work/demo/def.lus type _def::t1; const def::a = 4; type _def::string = int^4; @@ -4725,7 +4725,7 @@ type A__def::structT_2 = _def::structT^2; type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/filliter.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/filliter.lus +Opening file should_work/demo/filliter.lus type _filliter::t = int^5; const filliter::NBC = 3; node filliter::copie(acc_in:int) returns (acc_out:int; elt:int); @@ -4763,7 +4763,7 @@ type A_int_3 = int^3; type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/filter.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/filter.lus +Opening file should_work/demo/filter.lus type _filter::complexe = struct {x : real; y : real}; type _filter::cdouble = struct {x : _filter::complexe; y : _filter::complexe}; node filter::filter(a:real; b:real) returns (ok:bool); @@ -4782,7 +4782,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/lustre_test1_ok.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/lustre_test1_ok.lus +Opening file should_work/demo/lustre_test1_ok.lus node lustre_test1_ok::rising(in:bool) returns (out:bool); let out = (false -> (in and (not (pre in)))); @@ -4849,7 +4849,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/map_red_iter.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/map_red_iter.lus +Opening file should_work/demo/map_red_iter.lus const map_red_iter::NBC = 20; type _map_red_iter::INTNBC = int^20; const map_red_iter::NBG = 4; @@ -4896,7 +4896,7 @@ type A_bool_20 = bool^20; type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/mapdeRed.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/mapdeRed.lus +Opening file should_work/demo/mapdeRed.lus const mapdeRed::m = 3; const mapdeRed::n = 2; const mapdeRed::p = 5; @@ -4924,7 +4924,7 @@ type A_A_int_2_3 = A_int_2^3; type A_int_2 = int^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/mapiter.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/mapiter.lus +Opening file should_work/demo/mapiter.lus node mapiter::incr_tab(a:int) returns (b:int); let b = (a + 1); @@ -4940,7 +4940,7 @@ type A_A_int_7_3 = A_int_7^3; type A_int_7 = int^7; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/mappredef.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/mappredef.lus +Opening file should_work/demo/mappredef.lus const mappredef::N = 3; type _mappredef::tab_int = int^3; type _mappredef::tab_bool = bool^3; @@ -4965,7 +4965,7 @@ type A_bool_3 = bool^3; type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/plus.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/plus.lus +Opening file should_work/demo/plus.lus node plus::plus(a:int; b:int) returns (c:int; d:int; e:int; f:int); let c = (a + b); @@ -4978,7 +4978,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/pre_x.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/pre_x.lus +Opening file should_work/demo/pre_x.lus node pre_x::pre_x(a:int; b:int) returns (x:bool); let x = (false -> ( if ((pre a) = (pre b)) then (not (pre x)) else (pre x))); @@ -4987,7 +4987,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/rediter.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/rediter.lus +Opening file should_work/demo/rediter.lus node rediter::max(init:int; a:int) returns (b:int); let b = ( if (init > a) then init else a); @@ -5003,7 +5003,7 @@ type A_A_int_5_3 = A_int_5^3; type A_int_5 = int^5; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/redoptest.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/redoptest.lus +Opening file should_work/demo/redoptest.lus node redoptest::max(init:int; a:int) returns (b:int); let b = ( if (init > a) then init else a); @@ -5019,7 +5019,7 @@ type A_A_int_5_3 = A_int_5^3; type A_int_5 = int^5; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/demo/sample_time_change.lus -Opening file /home/jahier/lus2lic/src/test/should_work/demo/sample_time_change.lus +Opening file should_work/demo/sample_time_change.lus node sample_time_change::make_cl1_4_2(in:bool) returns (out:bool); var cl1:bool; @@ -5106,7 +5106,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/bob.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/bob.lus +Opening file should_work/fab_test/bob.lus node bob::bob(i:bool) returns (o:bool when i); let assert((true -> (i <> (pre i)))); @@ -5116,7 +5116,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/def.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/def.lus +Opening file should_work/fab_test/def.lus node def::def(i:bool) returns (a:bool; b:bool); let a = true; @@ -5126,7 +5126,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/ex.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/ex.lus +Opening file should_work/fab_test/ex.lus node ex::id(f:bool; a:bool) returns (g:bool); let g = (f or a); @@ -5145,7 +5145,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/iter.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/iter.lus +Opening file should_work/fab_test/iter.lus const iter::n = 5; node iter::filled(accu_in:int) returns (accu_out:int; elt:int); let @@ -5197,7 +5197,7 @@ tel type A_int_5 = int^5; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/iterate.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/iterate.lus +Opening file should_work/fab_test/iterate.lus node iterate::mapped( elt_in1:int; @@ -5279,7 +5279,7 @@ tel type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/lecteur.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/lecteur.lus +Opening file should_work/fab_test/lecteur.lus node lecteur::Propriete(vitesse:int) returns (ok:bool); var cpt:int; @@ -5332,7 +5332,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/lucky.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/lucky.lus +Opening file should_work/fab_test/lucky.lus node lucky::implies(X:bool; Y:bool) returns (XimpliesY:bool); let XimpliesY = ((not X) or Y); @@ -5376,7 +5376,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/morel.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/morel.lus +Opening file should_work/fab_test/morel.lus type _morel::arrayb = bool^3; type _morel::arrayi = A_int_2^3; node morel::mcmorel(i:int) returns (t:A_int_2); @@ -5429,7 +5429,7 @@ type A_int_2 = int^2; type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/morel2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/morel2.lus +Opening file should_work/fab_test/morel2.lus type _morel2::a2 = int^2; type _morel2::a32 = A_int_2^3; type _morel2::arrayb = bool^3; @@ -5471,7 +5471,7 @@ type A_int_2 = int^2; type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/morel3.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/morel3.lus +Opening file should_work/fab_test/morel3.lus type _morel3::arrayb = bool^3; type _morel3::arrayi = A_int_2^3; node morel3::mcmorel(i:int) returns (t:A_int_2); @@ -5524,7 +5524,7 @@ type A_int_2 = int^2; type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/morel4.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/morel4.lus +Opening file should_work/fab_test/morel4.lus type _morel4::tube = struct {in : int; out : int}; type _morel4::toto = struct {titi : _morel4::tube; tutu : bool}; type _morel4::arrayb = bool^3; @@ -5583,7 +5583,7 @@ type A_int_2 = int^2; type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/morel5.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/morel5.lus +Opening file should_work/fab_test/morel5.lus type _morel5::tube = struct {in : int; out : int}; type _morel5::toto = struct {titi : _morel5::tube; tutu : bool}; type _morel5::arrayb = bool^3; @@ -5639,7 +5639,7 @@ type A_int_2 = int^2; type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/noAlarm.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/noAlarm.lus +Opening file should_work/fab_test/noAlarm.lus node noAlarm::noAlarm(alarm:bool) returns (ok:bool); let ok = (not alarm); @@ -5648,7 +5648,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/notTwo.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/notTwo.lus +Opening file should_work/fab_test/notTwo.lus node notTwo::notTwo(a:bool; b:bool) returns (o:bool); let o = (not (a and b)); @@ -5657,7 +5657,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/onlyroll.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/onlyroll.lus +Opening file should_work/fab_test/onlyroll.lus const onlyroll::NRminP = -5.100000; const onlyroll::NRminR = -25.300000; const onlyroll::NRmaxP = 5.100000; @@ -6141,7 +6141,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/onlyroll2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/onlyroll2.lus +Opening file should_work/fab_test/onlyroll2.lus const onlyroll2::NRminP = -5.100000; const onlyroll2::NRminR = -25.300000; const onlyroll2::NRmaxP = 5.100000; @@ -6626,7 +6626,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/test.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/test.lus +Opening file should_work/fab_test/test.lus node test::three_outputs( c1:bool; @@ -6664,7 +6664,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/titi.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/titi.lus +Opening file should_work/fab_test/titi.lus node titi::titi(a:bool; b:bool) returns (x:bool); let x = (current (a when b)); @@ -6673,7 +6673,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/toolate.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/toolate.lus +Opening file should_work/fab_test/toolate.lus type _toolate::tab1 = int^2; type _toolate::tab2 = A_int_3^4; type _toolate::tab3 = A_A_int_5_6^7; @@ -6741,7 +6741,7 @@ type A_int_3 = int^3; type A_A_int_5_6 = A_int_5^6; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/fab_test/toto.lus -Opening file /home/jahier/lus2lic/src/test/should_work/fab_test/toto.lus +Opening file should_work/fab_test/toto.lus node toto::toto(a:bool; b:bool) returns (x:bool); var c:bool when b; @@ -6753,7 +6753,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/FillFollowedByRed.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/FillFollowedByRed.lus +Opening file should_work/lionel/FillFollowedByRed.lus node FillFollowedByRed::reduced( acc_in:bool; @@ -6792,7 +6792,7 @@ tel type A_real_10 = real^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/Gyroscope.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/Gyroscope.lus +Opening file should_work/lionel/Gyroscope.lus type _Gyroscope::Faulty_ChannelT = struct {valuea : real; valueb : real}; type _Gyroscope::Faulty_Array = A__Gyroscope::Faulty_ChannelT_4^3; type _Gyroscope::Valid_ChannelT = struct {local_failure : bool; local_value : real}; @@ -7113,7 +7113,7 @@ type A_real_3 = real^3; type A__Gyroscope::Valid_ChannelT_4 = _Gyroscope::Valid_ChannelT^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/ProduitBool/produitBool.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/ProduitBool/produitBool.lus +Opening file should_work/lionel/ProduitBool/produitBool.lus const produitBool::size = 10; type _produitBool::Tacc_in = struct {multiplieur : A_bool_10; rank : int}; type _produitBool::T_isElementOf_ = struct {eltToSearch : bool; iselementof : bool}; @@ -7231,7 +7231,7 @@ type A_bool_10 = bool^10; type A_bool_20 = bool^20; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/ProduitBool/shiftFill_ludic.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/ProduitBool/shiftFill_ludic.lus +Opening file should_work/lionel/ProduitBool/shiftFill_ludic.lus type _shiftFill_ludic::T1_ARRAY = bool^10; type _shiftFill_ludic::T4_STRUCT = struct {multiplieur : A_bool_10; rank : int}; type _shiftFill_ludic::T6_STRUCT = struct {eltToSearch : bool; iselementof : bool}; @@ -7292,7 +7292,7 @@ tel type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/ProduitBool/shift_ludic.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/ProduitBool/shift_ludic.lus +Opening file should_work/lionel/ProduitBool/shift_ludic.lus type _shift_ludic::T1_ARRAY = bool^10; type _shift_ludic::T4_STRUCT = struct {currentRank : int; rankToSelect : int; elementSelected : bool}; type _shift_ludic::T5_STRUCT = struct {multiplieur : A_bool_10; rank : int}; @@ -7367,7 +7367,7 @@ type A_bool_20 = bool^20; type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/arrays.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/arrays.lus +Opening file should_work/lionel/arrays.lus const arrays::n = 4; const arrays::m = 3; const arrays::p = 2; @@ -7464,7 +7464,7 @@ type A_A_A_bool_4_3_2 = A_A_bool_4_3^2; type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/calculs_max.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/calculs_max.lus +Opening file should_work/lionel/calculs_max.lus const calculs_max::taille = 10; type _calculs_max::bool_arrays = bool^10; type _calculs_max::int_arrays = int^10; @@ -7515,7 +7515,7 @@ type A_int_10 = int^10; type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/deSimone.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/deSimone.lus +Opening file should_work/lionel/deSimone.lus const deSimone::size = 10; type _deSimone::tabType = bool^10; type _deSimone::cell_accu = struct {token : bool; grant : bool}; @@ -7570,7 +7570,7 @@ tel type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/iterFibo.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/iterFibo.lus +Opening file should_work/lionel/iterFibo.lus type _iterFibo::T_fibo = int^2; node iterFibo::fibo(accu_in:A_int_2) returns (accu_out:A_int_2; elt:int); let @@ -7590,7 +7590,7 @@ type A_int_10 = int^10; type A_int_2 = int^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/mapiter.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/mapiter.lus +Opening file should_work/lionel/mapiter.lus const mapiter::L = 2; type _mapiter::Reg_L = bool^2; const mapiter::H = 3; @@ -7661,7 +7661,7 @@ type A_a_2 = a^2; type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/matrice.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/matrice.lus +Opening file should_work/lionel/matrice.lus type _matrice::T_fibo = int^2; const matrice::m = 3; const matrice::n = 2; @@ -7689,7 +7689,7 @@ type A_A_int_3_2 = A_int_3^2; type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/matrice2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/matrice2.lus +Opening file should_work/lionel/matrice2.lus const matrice2::m = 2; const matrice2::n = 2; node matrice2::matrice2(a:int) returns (res:int); @@ -7700,7 +7700,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/minus.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/minus.lus +Opening file should_work/lionel/minus.lus const minus::m = 2; const minus::n = 3; node minus::bitalt(a:bool) returns (out:bool; b:bool); @@ -7731,7 +7731,7 @@ type A_A_bool_3_2 = A_bool_3^2; type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/moyenne.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/moyenne.lus +Opening file should_work/lionel/moyenne.lus type _moyenne::moyenne_accu = struct {sum : real; moyenne : real; rank : real}; const moyenne::size = 10; @@ -7758,7 +7758,7 @@ tel type A_real_10 = real^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/normal.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/normal.lus +Opening file should_work/lionel/normal.lus const normal::NBC = 20; type _normal::INTNBC = int^20; const normal::NBG = 4; @@ -8098,7 +8098,7 @@ type A_A_int_20_4 = A_int_20^4; type A_int_20 = int^20; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/pipeline.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/pipeline.lus +Opening file should_work/lionel/pipeline.lus const pipeline::size = 10; node pipeline::oneStep_pipe( @@ -8124,7 +8124,7 @@ tel type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/predefOp.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/predefOp.lus +Opening file should_work/lionel/predefOp.lus const predefOp::L = 2; type _predefOp::Reg_L = bool^2; const predefOp::H = 3; @@ -8239,7 +8239,7 @@ type A_A_int_2_3 = A_int_2^3; type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/redIf.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/redIf.lus +Opening file should_work/lionel/redIf.lus node redIf::monIf(a:bool; b:bool; c:bool) returns (r:bool); let r = ( if a then b else c); @@ -8254,7 +8254,7 @@ tel type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/simpleRed.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/simpleRed.lus +Opening file should_work/lionel/simpleRed.lus const simpleRed::m = 3; const simpleRed::n = 2; node simpleRed::simpleRed(a:int) returns (res:int); @@ -8265,7 +8265,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/testSilus.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/testSilus.lus +Opening file should_work/lionel/testSilus.lus const testSilus::NBC = 20; type _testSilus::INTNBC = int^20; const testSilus::NBG = 4; @@ -8555,7 +8555,7 @@ type A_A_int_20_4 = A_int_20^4; type A_int_20 = int^20; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/lionel/triSel.lus -Opening file /home/jahier/lus2lic/src/test/should_work/lionel/triSel.lus +Opening file should_work/lionel/triSel.lus const triSel::size = 50; type _triSel::tabSize = int^50; type _triSel::Sort_accu = struct {CurrentRank : int; Tab : A_int_50}; @@ -8668,7 +8668,7 @@ tel type A_int_50 = int^50; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/Condact.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/Condact.lus +Opening file should_work/packEnvTest/Condact.lus node Util::carre(e:int) returns (s:int); let s = (e * e); @@ -8694,7 +8694,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/contractForElementSelectionInArray/contractForElementSelectionInArray.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/contractForElementSelectionInArray/contractForElementSelectionInArray.lus +Opening file should_work/packEnvTest/contractForElementSelectionInArray/contractForElementSelectionInArray.lus type _contractForElementSelectionInArray::elementType = int; type _contractForElementSelectionInArray::iteratedStruct = struct {currentRank : int; rankToSelect : int; elementSelected : int}; const contractForElementSelectionInArray::size = 10; @@ -8731,8 +8731,8 @@ tel type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/contractForElementSelectionInArray/main.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/contractForElementSelectionInArray/main.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus +Opening file should_work/packEnvTest/contractForElementSelectionInArray/main.lus +Opening file should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus type _intArray::elementType = int; const intArray::size = 10; type _intArray::arrayType = int^10; @@ -9028,7 +9028,7 @@ tel type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/contractForElementSelectionInArray/noeudsIndependants.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/contractForElementSelectionInArray/noeudsIndependants.lus +Opening file should_work/packEnvTest/contractForElementSelectionInArray/noeudsIndependants.lus node noeudsIndependants::equals(a:int; b:int) returns (r:bool); let r = (a = b); @@ -9042,12 +9042,12 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus +Opening file should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus Error. No package has been provided ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/contractForElementSelectionInArray/tri.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/contractForElementSelectionInArray/tri.lus +Opening file should_work/packEnvTest/contractForElementSelectionInArray/tri.lus const tri::size = 10; type _tri::INTSIZE = int^10; type _tri::Sort_accu = struct {CurrentRank : int; Tab : A_int_10}; @@ -9159,7 +9159,7 @@ tel type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/modelInst.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/modelInst.lus +Opening file should_work/packEnvTest/modelInst.lus type _Pint::t = int; node Pint::n(init:int; in:int) returns (ok:int); let @@ -9196,7 +9196,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/packages.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/packages.lus +Opening file should_work/packEnvTest/packages.lus type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); let @@ -9240,7 +9240,7 @@ const inter::n = -4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/packEnvTest/packages2.lus -Opening file /home/jahier/lus2lic/src/test/should_work/packEnvTest/packages2.lus +Opening file should_work/packEnvTest/packages2.lus type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); let @@ -9282,7 +9282,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_work/to_sort_out/asservi.lus -Opening file /home/jahier/lus2lic/src/test/should_work/to_sort_out/asservi.lus +Opening file should_work/to_sort_out/asservi.lus type _asservi::pendule; const asservi::G = 10.000000; const asservi::L = 2.000000; @@ -9364,7 +9364,7 @@ Those tests are supposed to generate errors ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/clock/bad_call02.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/clock/bad_call02.lus +Opening file should_fail/clock/bad_call02.lus *** Error in file "should_fail/clock/bad_call02.lus", line 6, col 4 to 4, token '=': *** *** clock error: The expression has clock ' on base', @@ -9374,7 +9374,7 @@ Opening file /home/jahier/lus2lic/src/test/should_fail/clock/bad_call02.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/clock/clock.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/clock/clock.lus +Opening file should_fail/clock/clock.lus extern node clock::clock2(u:bool; v:bool when u) returns (y:bool); extern node clock::clock3(u:bool) returns (x:bool; y:bool when x); @@ -9393,7 +9393,7 @@ returns ( ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/clock/inonout.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/clock/inonout.lus +Opening file should_fail/clock/inonout.lus *** Error in file "should_fail/clock/inonout.lus", line 3, col 46 to 46, token 'c': *** *** 'c': Unknown variable. @@ -9403,7 +9403,7 @@ Opening file /home/jahier/lus2lic/src/test/should_fail/clock/inonout.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/activation1.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/activation1.lus +Opening file should_fail/semantics/activation1.lus node activation1::up(in:int) returns (out:int); let out = ((pre in) + 1); @@ -9427,7 +9427,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/activation2.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/activation2.lus +Opening file should_fail/semantics/activation2.lus node activation2::up(in:int) returns (out:int); let out = ((pre in) + 1); @@ -9451,7 +9451,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/bad_call01.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/bad_call01.lus +Opening file should_fail/semantics/bad_call01.lus *** Error in file "should_fail/semantics/bad_call01.lus", line 0, col 0 to 0, token '': *** recursion loop detected: > node ref in file "should_fail/semantics/bad_call01.lus", line 2, col 13 to 16, token 'titi' @@ -9459,7 +9459,7 @@ Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/bad_call01.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/bug.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/bug.lus +Opening file should_fail/semantics/bug.lus type _bug::tab1 = int^2; type _bug::tab2 = A_int_3^4; type _bug::tab3 = A_A_int_5_6^7; @@ -9542,14 +9542,14 @@ type A_int_3 = int^3; type A_A_int_5_6 = A_int_5^6; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/const.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/const.lus +Opening file should_fail/semantics/const.lus *** Error in file "should_fail/semantics/const.lus", line 19, col 42 to 43, token 'c4': *** bad field declaration, ident already linked at line:19, col:10 to 11 ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/const2.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/const2.lus +Opening file should_fail/semantics/const2.lus type _const2::t1 = int; const const2::M = 3; type _const2::t2 = int^3; @@ -9570,7 +9570,7 @@ type _const2::t8 = A_A_A_A_A_A_int_3_6_3_2_12_3^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/cpt_dc.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/cpt_dc.lus +Opening file should_fail/semantics/cpt_dc.lus node cpt_dc::cpt_dc(evt:bool; reset:bool) returns (cpt:int); var _f3:bool; @@ -9585,7 +9585,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/def.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/def.lus +Opening file should_fail/semantics/def.lus type _def::int4 = int^4; type _def::st = struct {x : A_int_4}; node def::def(a:bool) returns (b:_def::st); @@ -9606,28 +9606,28 @@ tel type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/import2.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/import2.lus +Opening file should_fail/semantics/import2.lus *** Error in file "should_fail/semantics/import2.lus", line 2, col 1 to 4, token 'node': *** syntax error ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/m.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/m.lus +Opening file should_fail/semantics/m.lus *** Error in file "should_fail/semantics/m.lus", line 3, col 23 to 23, token ',': *** syntax error ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/not_a_constant.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/not_a_constant.lus +Opening file should_fail/semantics/not_a_constant.lus *** Error in file "should_fail/semantics/not_a_constant.lus", line 10, col 23 to 24, token '--': *** syntax error ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/piege.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/piege.lus +Opening file should_fail/semantics/piege.lus node piege::aux2(in1:bool; in2:bool) returns (out1:bool; out2:bool); let out1 = (true -> (pre in1)); @@ -9647,7 +9647,7 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/tranche.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/tranche.lus +Opening file should_fail/semantics/tranche.lus type _tranche::t2 = A_A_A_bool_7_8_9^10; type _tranche::t = A_bool_3^4; *** Error in file "should_fail/semantics/tranche.lus", line 7, col 6 to 6, token 'n': @@ -9659,7 +9659,7 @@ const tranche::n:A_A_bool_3_4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/semantics/x.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/x.lus +Opening file should_fail/semantics/x.lus *** Error in file "should_fail/semantics/x.lus", line 4, col 7 to 7, token 'm': *** recursion loop detected: > const ref in file "should_fail/semantics/x.lus", line 4, col 11 to 11, token 'x' @@ -9670,21 +9670,21 @@ Opening file /home/jahier/lus2lic/src/test/should_fail/semantics/x.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/syntax/record.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/syntax/record.lus +Opening file should_fail/syntax/record.lus *** Error in file "should_fail/syntax/record.lus", line 7, col 29 to 29, token '{': *** syntax error ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/type/Gyro.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/type/Gyro.lus +Opening file should_fail/type/Gyro.lus *** Error in file "should_fail/type/Gyro.lus", line 11, col 42 to 42, token ',': *** syntax error ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 --compile-all-items should_fail/type/const2.lus -Opening file /home/jahier/lus2lic/src/test/should_fail/type/const2.lus +Opening file should_fail/type/const2.lus type _const2::t1 = int; const const2::c1 = 2; const const2::M = 3; -- GitLab