diff --git a/src/Makefile b/src/Makefile index aa559b435bd890973d5889c0958ec4e8e4bb622c..665f19bf4ace8abbea51c141d7e86c7f0c66fdc0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ OCAMLMAKEFILE = ./OCamlMakefile RESULT=lus2lic -LIBS = str +LIBS = str unix OCAMLC=ocamlc ifndef SOURCES diff --git a/src/main.ml b/src/main.ml index ae1903f7e284de0065f325943d4bb7736f82fe2e..887ebc171b1270b2883f4b661be63179f03c9159 100644 --- a/src/main.ml +++ b/src/main.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 05/02/2009 (at 14:56) by Erwan Jahier> *) +(** Time-stamp: <modified the 05/02/2009 (at 15:30) by Erwan Jahier> *) (** Here follows a description of the different modules used by this lus2lic compiler. @@ -248,6 +248,41 @@ let (get_source_list : string list -> SyntaxTree.pack_or_model list) = | Unpacked pack -> [pack] +let dump_entete oc = + let time = Unix.localtime (Unix.time ()) in + let sys_call, _ = Array.fold_left + (fun (acc,i) x -> + if 70 < i + (String.length x) then + acc ^ "\n--\t\t" ^ x, String.length ("\n--\t\t" ^ x) + else + acc ^ " " ^ x , (i+1+(String.length x)) + ) + ("",0) + Sys.argv + and + date = ( + (string_of_int time.Unix.tm_mday) ^ "/" ^ + (string_of_int (time.Unix.tm_mon+1)) ^ "/" ^ + (string_of_int (1900+time.Unix.tm_year)) + ) + and time_str = ( + (string_of_int time.Unix.tm_hour) ^ ":" ^ + (if time.Unix.tm_min < 10 then "0" else "") ^ + (string_of_int time.Unix.tm_min) ^ ":" ^ + (if time.Unix.tm_sec < 10 then "0" else "") ^ + (string_of_int time.Unix.tm_sec) + ) + (* and user = Unix.getlogin () *) + and hostname = Unix.gethostname () + in + output_string oc + ("-- This file was generated by lus2lic version " ^ Version.str ^ + ".\n--\t" ^ sys_call ^ " +-- on " ^ hostname ^ + (* "by "^ user ^ *) + " the " ^ date ^ " at " ^ time_str ^ "\n\n"); + flush oc + let my_exit i = close_out !Global.oc; @@ -272,6 +307,7 @@ let main = ( Some (Ident.idref_of_string !Global.main_node) in if !Global.outfile <> "" then Global.oc := open_out !Global.outfile; + dump_entete !Global.oc; Compile.doit nsl main_node; LicDump.dump_type_alias !Global.oc; close_out !Global.oc diff --git a/src/test/Makefile b/src/test/Makefile index 4107a6eeaefd5ffd8acc6cfcce1bd870a8966c49..a03915f90fd6c3624d27b44e65aa6becaf697918 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -52,9 +52,10 @@ help: version: $(LC0) --version +FILTER= grep -v "file was generated by" | grep -v " on " do_not_exist: - $(LC) do_not_exist.lus >> test_ko.res 2>&1 || true + $(LC) do_not_exist.lus | $(FILTER) >> test_ko.res 2>&1 || true same_file: $(LC) should_work/NONREG/ex.lus should_work/NONREG/ex.lus >> test_ok.res 2>&1 @@ -62,13 +63,13 @@ same_file: test: begin unit help version do_not_exist same_file 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; \ - $(LC) $$d >> test_ko.res 2>&1 ;\ + $(LC) $$d >> test_ko.res 2>&1 ;\ done; \ - rm -f test.res ; cat test_ok.res test_ko.res > test.res ;\ + rm -f test.res ; cat test_ok.res test_ko.res | $(FILTER) > test.res ;\ diff -u test.res.exp test.res > test.diff || \ (cat test.diff ; echo "cf test.diff"; exit 1) utest: diff --git a/src/test/test.res.exp b/src/test/test.res.exp index 9699aaf35c618dbbe37f00b66b381bb73d2f70f9..9be973419c042aaf0a078709f0e2afe36c3d102b 100644 --- a/src/test/test.res.exp +++ b/src/test/test.res.exp @@ -44,6 +44,8 @@ where [options] can be: --help Display this message. Opening file should_work/NONREG/ex.lus +-- ../lus2lic -vl 2 should_work/NONREG/ex.lus 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}; @@ -87,6 +89,8 @@ type A_int_1 = int^1; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/COUNTER.lus Opening file should_work/NONREG/COUNTER.lus +-- ../lus2lic -vl 2 should_work/NONREG/COUNTER.lus + node COUNTER::COUNTER( init:int; @@ -112,6 +116,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/CURRENT.lus Opening file should_work/NONREG/CURRENT.lus +-- ../lus2lic -vl 2 should_work/NONREG/CURRENT.lus + node CURRENT::CURRENT(x:bool; y:bool when x) returns (z:bool when x); let z = y; @@ -121,6 +127,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/EDGE.lus Opening file should_work/NONREG/EDGE.lus +-- ../lus2lic -vl 2 should_work/NONREG/EDGE.lus + node EDGE::EDGE(X:bool) returns (Y:bool); var _v1:bool; @@ -137,6 +145,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/FALLING_EDGE.lus Opening file should_work/NONREG/FALLING_EDGE.lus +-- ../lus2lic -vl 2 should_work/NONREG/FALLING_EDGE.lus + node FALLING_EDGE::EDGE(X:bool) returns (Y:bool); var _v1:bool; @@ -161,6 +171,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/Int.lus Opening file should_work/NONREG/Int.lus +-- ../lus2lic -vl 2 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]; @@ -225,6 +237,8 @@ type A_bool_8 = bool^8; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/PCOND.lus Opening file should_work/NONREG/PCOND.lus +-- ../lus2lic -vl 2 should_work/NONREG/PCOND.lus + node PCOND::PCOND( h0:bool; @@ -281,6 +295,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/PCOND1.lus Opening file should_work/NONREG/PCOND1.lus +-- ../lus2lic -vl 2 should_work/NONREG/PCOND1.lus + node PCOND1::PCOND1( h0:bool; @@ -309,6 +325,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/SOURIS.lus Opening file should_work/NONREG/SOURIS.lus +-- ../lus2lic -vl 2 should_work/NONREG/SOURIS.lus + node SOURIS::SOURIS( B1:bool; @@ -734,6 +752,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/STABLE.lus Opening file should_work/NONREG/STABLE.lus +-- ../lus2lic -vl 2 should_work/NONREG/STABLE.lus + node STABLE::STABLE(set:bool; delay:int) returns (level:bool); var count:int; @@ -756,6 +776,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/SWITCH.lus Opening file should_work/NONREG/SWITCH.lus +-- ../lus2lic -vl 2 should_work/NONREG/SWITCH.lus + node SWITCH::SWITCH( set:bool; @@ -784,6 +806,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/SWITCH1.lus Opening file should_work/NONREG/SWITCH1.lus +-- ../lus2lic -vl 2 should_work/NONREG/SWITCH1.lus + node SWITCH1::SWITCH1( set:bool; @@ -806,6 +830,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/TIME_STABLE.lus Opening file should_work/NONREG/TIME_STABLE.lus +-- ../lus2lic -vl 2 should_work/NONREG/TIME_STABLE.lus + node TIME_STABLE::STABLE(set:bool; delay:int) returns (level:bool); var count:int; @@ -850,6 +876,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/TIME_STABLE1.lus Opening file should_work/NONREG/TIME_STABLE1.lus +-- ../lus2lic -vl 2 should_work/NONREG/TIME_STABLE1.lus + node TIME_STABLE1::TIME1_STABLE1( set:bool; @@ -884,6 +912,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/Watch.lus Opening file should_work/NONREG/Watch.lus +-- ../lus2lic -vl 2 should_work/NONREG/Watch.lus + type _Watch::STATUS_TYPE; type _Watch::ALARM_TIME_TYPE; type _Watch::WATCH_TIME_POSITION; @@ -1643,6 +1673,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/X.lus Opening file should_work/NONREG/X.lus +-- ../lus2lic -vl 2 should_work/NONREG/X.lus + node X::X( c:bool; @@ -1680,6 +1712,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/X1.lus Opening file should_work/NONREG/X1.lus +-- ../lus2lic -vl 2 should_work/NONREG/X1.lus + node X1::X1(b:bool; n:int) returns (m:int); var _v1:int when b; @@ -1692,6 +1726,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/X2.lus Opening file should_work/NONREG/X2.lus +-- ../lus2lic -vl 2 should_work/NONREG/X2.lus + node X2::X2(b:bool; n:int) returns (m:int); var _v1:int when b; @@ -1706,6 +1742,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/X3.lus Opening file should_work/NONREG/X3.lus +-- ../lus2lic -vl 2 should_work/NONREG/X3.lus + node X3::X3(n:int; b:bool) returns (m:int); var c:bool when b; @@ -1736,6 +1774,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/X6.lus Opening file should_work/NONREG/X6.lus +-- ../lus2lic -vl 2 should_work/NONREG/X6.lus + node X6::X6( n:int; @@ -1771,6 +1811,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/_N_uu.lus Opening file should_work/NONREG/_N_uu.lus +-- ../lus2lic -vl 2 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; @@ -1871,6 +1913,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/activation_ec.lus Opening file should_work/NONREG/activation_ec.lus +-- ../lus2lic -vl 2 should_work/NONREG/activation_ec.lus + node activation_ec::activation_ec(evt:bool) returns (scie:int); var V10_go_up:bool; @@ -1911,6 +1955,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/after.lus Opening file should_work/NONREG/after.lus +-- ../lus2lic -vl 2 should_work/NONREG/after.lus + node after::after(x:bool) returns (after:bool); var _v1:bool; @@ -1925,6 +1971,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/alarme.lus Opening file should_work/NONREG/alarme.lus +-- ../lus2lic -vl 2 should_work/NONREG/alarme.lus + const alarme::delai_reprise = 4; const alarme::delai_vigilence = 3; const alarme::delai_alarme = 6; @@ -2116,6 +2164,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/arbitre.lus Opening file should_work/NONREG/arbitre.lus +-- ../lus2lic -vl 2 should_work/NONREG/arbitre.lus + node arbitre::my_switch( set:bool; @@ -2237,6 +2287,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/argos.lus Opening file should_work/NONREG/argos.lus +-- ../lus2lic -vl 2 should_work/NONREG/argos.lus + node argos::argos(a:bool; b:bool) returns (s0:bool; s1:bool; s2:bool); var t0:bool; @@ -2301,6 +2353,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/assertion.lus Opening file should_work/NONREG/assertion.lus +-- ../lus2lic -vl 2 should_work/NONREG/assertion.lus + node assertion::assertion( a:bool; @@ -2321,6 +2375,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/aux.lus Opening file should_work/NONREG/aux.lus +-- ../lus2lic -vl 2 should_work/NONREG/aux.lus + node aux::aux(ck:bool) returns (x:int); var _v1:int; @@ -2333,6 +2389,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/aux1.lus Opening file should_work/NONREG/aux1.lus +-- ../lus2lic -vl 2 should_work/NONREG/aux1.lus + node aux1::aux1(a:int; b:int) returns (c:int; d:int); var _v1:bool; @@ -2358,6 +2416,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/bascule.lus Opening file should_work/NONREG/bascule.lus +-- ../lus2lic -vl 2 should_work/NONREG/bascule.lus + node bascule::bascule(r:bool; s:bool) returns (q:bool; n:bool); var _v1:bool; @@ -2389,6 +2449,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/call.lus Opening file should_work/NONREG/call.lus +-- ../lus2lic -vl 2 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); var @@ -2413,6 +2475,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/ck2.lus Opening file should_work/NONREG/ck2.lus +-- ../lus2lic -vl 2 should_work/NONREG/ck2.lus + node ck2::ck2(c:bool; d:bool when c; e:int when d) returns (n:int); var _v1:bool; @@ -2431,6 +2495,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/ck3.lus Opening file should_work/NONREG/ck3.lus +-- ../lus2lic -vl 2 should_work/NONREG/ck3.lus + node ck3::ck3(a:bool; b:bool when a; c:bool when b) returns (x:bool); var _v1:bool when a; @@ -2443,6 +2509,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/ck4.lus Opening file should_work/NONREG/ck4.lus +-- ../lus2lic -vl 2 should_work/NONREG/ck4.lus + node ck4::ck4(a:int when b; b:bool) returns (c:int); let c = current a; @@ -2452,6 +2520,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/ck5.lus Opening file should_work/NONREG/ck5.lus +-- ../lus2lic -vl 2 should_work/NONREG/ck5.lus + node ck5::edge(x:bool) returns (y:bool); var _v1:bool; @@ -2478,6 +2548,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/ck6.lus Opening file should_work/NONREG/ck6.lus +-- ../lus2lic -vl 2 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 @@ -2508,6 +2580,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/ck7.lus Opening file should_work/NONREG/ck7.lus +-- ../lus2lic -vl 2 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; @@ -2518,6 +2592,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/clock.lus Opening file should_work/NONREG/clock.lus +-- ../lus2lic -vl 2 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); @@ -2581,6 +2657,8 @@ type A_bool_7 = bool^7; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/cminus.lus Opening file should_work/NONREG/cminus.lus +-- ../lus2lic -vl 2 should_work/NONREG/cminus.lus + node cminus::TWO_STATES( set:bool; @@ -2624,7 +2702,6 @@ let state = init -> _v3; _v1 = pre state; _v2 = if off then false else _v1; - _v3 = if on then true else _v2; tel -- end of node cminus::TWO_BUTTONS @@ -2653,6 +2730,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/compteur.lus Opening file should_work/NONREG/compteur.lus +-- ../lus2lic -vl 2 should_work/NONREG/compteur.lus + node compteur::compteur(evt:bool) returns (cpt:int); var _v1:int; @@ -2669,6 +2748,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/count.lus Opening file should_work/NONREG/count.lus +-- ../lus2lic -vl 2 should_work/NONREG/count.lus + node count::count(x:int; y:int) returns (s:int); var _v1:int; @@ -2681,6 +2762,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/cpt.lus Opening file should_work/NONREG/cpt.lus +-- ../lus2lic -vl 2 should_work/NONREG/cpt.lus + node cpt::cpt(evt:bool; reset:bool) returns (cpt:int); var _v1:int; @@ -2699,6 +2782,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/cst.lus Opening file should_work/NONREG/cst.lus +-- ../lus2lic -vl 2 should_work/NONREG/cst.lus + const cst::i:int; const cst::j:int; const cst::k:int; @@ -2722,6 +2807,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/deconne.lus Opening file should_work/NONREG/deconne.lus +-- ../lus2lic -vl 2 should_work/NONREG/deconne.lus + type _deconne::pendule; const deconne::G = 10.0; const deconne::L = 2.0; @@ -2764,6 +2851,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/dep.lus Opening file should_work/NONREG/dep.lus +-- ../lus2lic -vl 2 should_work/NONREG/dep.lus + node dep::dep(x:int) returns (u:int; v:int; y:int); var _v1:int; @@ -2788,6 +2877,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/dependeur.lus Opening file should_work/NONREG/dependeur.lus +-- ../lus2lic -vl 2 should_work/NONREG/dependeur.lus + node dependeur::dependeur( time_in_ms:int) @@ -2812,6 +2903,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/dependeur_struct.lus Opening file should_work/NONREG/dependeur_struct.lus +-- ../lus2lic -vl 2 should_work/NONREG/dependeur_struct.lus + type _dependeur_struct::time = struct {h : int; m : int; s : int; ms : int}; node dependeur_struct::dependeur_struct( @@ -2834,6 +2927,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/drapfab.lus Opening file should_work/NONREG/drapfab.lus +-- ../lus2lic -vl 2 should_work/NONREG/drapfab.lus + node drapfab::drapfab( bleu:bool; @@ -2962,6 +3057,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/enum.lus Opening file should_work/NONREG/enum.lus +-- ../lus2lic -vl 2 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); @@ -2987,12 +3084,16 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/enum0.lus Opening file should_work/NONREG/enum0.lus +-- ../lus2lic -vl 2 should_work/NONREG/enum0.lus + type _enum0::color1 = enum {enum0::blue, enum0::white, enum0::black}; type _enum0::color2 = enum {enum0::green, enum0::orange, enum0::yellow}; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/eq1.lus Opening file should_work/NONREG/eq1.lus +-- ../lus2lic -vl 2 should_work/NONREG/eq1.lus + node eq1::eq1( a:bool; @@ -3030,6 +3131,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/ex.lus Opening file should_work/NONREG/ex.lus +-- ../lus2lic -vl 2 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}; @@ -3073,6 +3176,8 @@ type A_int_1 = int^1; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/exclusion.lus Opening file should_work/NONREG/exclusion.lus +-- ../lus2lic -vl 2 should_work/NONREG/exclusion.lus + node exclusion::exclusion( a:bool; @@ -3102,6 +3207,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/fby.lus Opening file should_work/NONREG/fby.lus +-- ../lus2lic -vl 2 should_work/NONREG/fby.lus + node fby::followed_by(ck:bool) returns (x:int); var _v1:int; @@ -3116,13 +3223,14 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/flo.lus Opening file should_work/NONREG/flo.lus +-- ../lus2lic -vl 2 should_work/NONREG/flo.lus + node flo::SWITCH(init:bool; on:bool; off:bool) returns (state:bool); var _v1:bool; _v2:bool; _v3:bool; let - state = if on then true else _v3; _v1 = pre state; _v2 = init -> _v1; _v3 = if off then false else _v2; @@ -3151,6 +3259,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/hanane.lus Opening file should_work/NONREG/hanane.lus +-- ../lus2lic -vl 2 should_work/NONREG/hanane.lus + type _hanane::t1; const hanane::a = 4; type _hanane::string = int^4; @@ -3229,6 +3339,8 @@ type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/import1.lus Opening file should_work/NONREG/import1.lus +-- ../lus2lic -vl 2 should_work/NONREG/import1.lus + extern node import1::imp(x:int) returns (y:int); node import1::import1(a:int; b:int) returns (c:int); var @@ -3244,6 +3356,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/initial.lus Opening file should_work/NONREG/initial.lus +-- ../lus2lic -vl 2 should_work/NONREG/initial.lus + node initial::initial(justDoIt:bool) returns (oa:bool; ob:int; oc:real); var _v1:bool; @@ -3262,6 +3376,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/integrator.lus Opening file should_work/NONREG/integrator.lus +-- ../lus2lic -vl 2 should_work/NONREG/integrator.lus + node integrator::integrator( F:real; @@ -3290,6 +3406,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/long_et_stupide_nom_de_noeud.lus Opening file should_work/NONREG/long_et_stupide_nom_de_noeud.lus +-- ../lus2lic -vl 2 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) @@ -3313,6 +3431,8 @@ Opening file should_work/NONREG/merge.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax1.lus Opening file should_work/NONREG/minmax1.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax1.lus + node minmax1::minmax1(a:int; b:int) returns (min:int; max:int); var _v1:bool; @@ -3326,6 +3446,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax2.lus Opening file should_work/NONREG/minmax2.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax2.lus + node minmax2::minmax(a:int; b:int) returns (min:int; max:int); var _v1:bool; @@ -3344,6 +3466,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax3.lus Opening file should_work/NONREG/minmax3.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax3.lus + node minmax3::minmax(a:int; b:int) returns (min:int; max:int); var _v1:bool; @@ -3376,6 +3500,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax4.lus Opening file should_work/NONREG/minmax4.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax4.lus + node minmax4::minmax(a:int; b:int) returns (min:int; max:int); var _v1:bool; @@ -3415,6 +3541,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax4_bis.lus Opening file should_work/NONREG/minmax4_bis.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax4_bis.lus + node minmax4_bis::minmax(a:int; b:int) returns (min:int; max:int); var _v1:bool; @@ -3454,6 +3582,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax5.lus Opening file should_work/NONREG/minmax5.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax5.lus + extern function minmax5::minmax(a:int; b:int) returns (min:int; max:int); node minmax5::minmax5( @@ -3485,6 +3615,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax5_random.lus Opening file should_work/NONREG/minmax5_random.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax5_random.lus + extern function minmax5_random::minmax( a:int; @@ -3522,6 +3654,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/minmax6.lus Opening file should_work/NONREG/minmax6.lus +-- ../lus2lic -vl 2 should_work/NONREG/minmax6.lus + node minmax6::minmax(a:int; b:int) returns (min:int; max:int); var _v1:bool; @@ -3578,6 +3712,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mm.lus Opening file should_work/NONREG/mm.lus +-- ../lus2lic -vl 2 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); @@ -3593,6 +3729,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mm1.lus Opening file should_work/NONREG/mm1.lus +-- ../lus2lic -vl 2 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); @@ -3608,6 +3746,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mm22.lus Opening file should_work/NONREG/mm22.lus +-- ../lus2lic -vl 2 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); @@ -3625,6 +3765,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mm3.lus Opening file should_work/NONREG/mm3.lus +-- ../lus2lic -vl 2 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); @@ -3652,6 +3794,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/model.lus Opening file should_work/NONREG/model.lus +-- ../lus2lic -vl 2 should_work/NONREG/model.lus + node u::egal(i1:int; i2:int) returns (o:bool); let o = i1 = i2; @@ -3672,6 +3816,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mouse.lus Opening file should_work/NONREG/mouse.lus +-- ../lus2lic -vl 2 should_work/NONREG/mouse.lus + node mouse::edge(x:bool) returns (e:bool); var _v1:bool; @@ -3758,6 +3904,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mouse1.lus Opening file should_work/NONREG/mouse1.lus +-- ../lus2lic -vl 2 should_work/NONREG/mouse1.lus + node mouse1::mouse1( click:bool; @@ -3828,6 +3976,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mouse2.lus Opening file should_work/NONREG/mouse2.lus +-- ../lus2lic -vl 2 should_work/NONREG/mouse2.lus + node mouse2::edge(x:bool) returns (e:bool); var _v1:bool; @@ -3914,6 +4064,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/mouse3.lus Opening file should_work/NONREG/mouse3.lus +-- ../lus2lic -vl 2 should_work/NONREG/mouse3.lus + node mouse3::mouse3( click:bool; @@ -3960,6 +4112,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/multiclock.lus Opening file should_work/NONREG/multiclock.lus +-- ../lus2lic -vl 2 should_work/NONREG/multiclock.lus + node multiclock::moyenne(x:int; y:int) returns (m:int); var s:int; @@ -4005,6 +4159,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc1.lus Opening file should_work/NONREG/nc1.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc1.lus + node nc1::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -4027,6 +4183,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc10.lus Opening file should_work/NONREG/nc10.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc10.lus + node nc10::n4( n4e1:int; @@ -4088,6 +4246,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc2.lus Opening file should_work/NONREG/nc2.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc2.lus + node nc2::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -4116,6 +4276,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc3.lus Opening file should_work/NONREG/nc3.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc3.lus + node nc3::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -4150,6 +4312,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc4.lus Opening file should_work/NONREG/nc4.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc4.lus + node nc4::n1(n1e1:bool; n1e2:bool) returns (n1s:bool); var n1b1:bool; @@ -4194,6 +4358,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc5.lus Opening file should_work/NONREG/nc5.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc5.lus + node nc5::n4(n4e1:int) returns (n4s:int); let n4s = n4e1 + 1; @@ -4228,6 +4394,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc6.lus Opening file should_work/NONREG/nc6.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc6.lus + node nc6::n4(n4e1:int) returns (n4s:int); let n4s = n4e1 + 1; @@ -4271,6 +4439,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc7.lus Opening file should_work/NONREG/nc7.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc7.lus + node nc7::n4( n4e1:int; @@ -4320,6 +4490,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc8.lus Opening file should_work/NONREG/nc8.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc8.lus + node nc8::n4(n4e1:int; n4e2:int; n4e3:int; n4e4:int) returns (n4s:int); var _v1:int; @@ -4374,6 +4546,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nc9.lus Opening file should_work/NONREG/nc9.lus +-- ../lus2lic -vl 2 should_work/NONREG/nc9.lus + node nc9::n4( n4e1:int; @@ -4431,6 +4605,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/nested.lus Opening file should_work/NONREG/nested.lus +-- ../lus2lic -vl 2 should_work/NONREG/nested.lus + node nested::incr(x:int) returns (y:int); let y = x + 1; @@ -4458,6 +4634,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/node_caller1.lus Opening file should_work/NONREG/node_caller1.lus +-- ../lus2lic -vl 2 should_work/NONREG/node_caller1.lus + node node_caller1::ex5(a:int) returns (b:int); let b = a - 700000; @@ -4504,6 +4682,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/o2l_feux_compl.lus Opening file should_work/NONREG/o2l_feux_compl.lus +-- ../lus2lic -vl 2 should_work/NONREG/o2l_feux_compl.lus + node o2l_feux_compl::o2l_feux_compl( TD:bool; @@ -7404,6 +7584,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/packed_cst.lus Opening file should_work/NONREG/packed_cst.lus +-- ../lus2lic -vl 2 should_work/NONREG/packed_cst.lus + const cst::i = 1; const cst::j = 1; const cst::k = 1; @@ -7427,6 +7609,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/param_node.lus Opening file should_work/NONREG/param_node.lus +-- ../lus2lic -vl 2 should_work/NONREG/param_node.lus + node n_param_node::toto_n_Lustre::iplus_3(a:int) returns (x:A_int_3); var v:int; @@ -7445,6 +7629,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/param_node2.lus Opening file should_work/NONREG/param_node2.lus +-- ../lus2lic -vl 2 should_work/NONREG/param_node2.lus + node n_param_node2::mk_tab_int_0_3(a:int) returns (res:A_int_3); let res = 0^3; @@ -7471,6 +7657,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/param_node3.lus Opening file should_work/NONREG/param_node3.lus +-- ../lus2lic -vl 2 should_work/NONREG/param_node3.lus + node n_param_node3::mk_tab_int_0_3(a:int) returns (res:A_int_3); let res = 0^3; @@ -7491,6 +7679,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/param_node4.lus Opening file should_work/NONREG/param_node4.lus +-- ../lus2lic -vl 2 should_work/NONREG/param_node4.lus + node param_node4::monplus(i1:int; i2:int) returns (o:int); let o = Lustre::iplus(i1, i2); @@ -7518,6 +7708,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/param_struct.lus Opening file should_work/NONREG/param_struct.lus +-- ../lus2lic -vl 2 should_work/NONREG/param_struct.lus + type _param_struct::toto = struct {a : int; b : int}; const param_struct::c = _param_struct::toto{a = 1; b = 1}; @@ -7546,6 +7738,8 @@ type A__param_struct::toto_3 = _param_struct::toto^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/patrick.lus Opening file should_work/NONREG/patrick.lus +-- ../lus2lic -vl 2 should_work/NONREG/patrick.lus + node patrick::patrick(a:int; b:int; c:bool; d:bool) returns (s:int); var _v1:int; @@ -7560,6 +7754,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/poussoir.lus Opening file should_work/NONREG/poussoir.lus +-- ../lus2lic -vl 2 should_work/NONREG/poussoir.lus + node poussoir::TWO_STATES( set:bool; @@ -7612,6 +7808,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/rs.lus Opening file should_work/NONREG/rs.lus +-- ../lus2lic -vl 2 should_work/NONREG/rs.lus + node rs::rs(r:bool; s:bool) returns (q:bool); var n:bool; @@ -7644,6 +7842,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/s.lus Opening file should_work/NONREG/s.lus +-- ../lus2lic -vl 2 should_work/NONREG/s.lus + node s::s(a:int; b:int) returns (t:int); let assert(a = 0); @@ -7654,6 +7854,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/simple.lus Opening file should_work/NONREG/simple.lus +-- ../lus2lic -vl 2 should_work/NONREG/simple.lus + type _simple::S; type _simple::T = int; type _simple::H = struct {x : _simple::S; y : int}; @@ -7683,6 +7885,8 @@ extern function simple::f2(u:int; v:int) returns (s:int; t:bool); ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/sincos.lus Opening file should_work/NONREG/sincos.lus +-- ../lus2lic -vl 2 should_work/NONREG/sincos.lus + node sincos::integrator(F:real; STEP:real; init:real) returns (Y:real); var _v1:real; @@ -7718,6 +7922,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/speedcontrol.lus Opening file should_work/NONREG/speedcontrol.lus +-- ../lus2lic -vl 2 should_work/NONREG/speedcontrol.lus + node speedcontrol::f(x:int) returns (y:int); var _v1:int; @@ -7740,6 +7946,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/stopwatch.lus Opening file should_work/NONREG/stopwatch.lus +-- ../lus2lic -vl 2 should_work/NONREG/stopwatch.lus + node stopwatch::simple_stopwatch( time_unit:bool; @@ -7826,6 +8034,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/testCA.lus Opening file should_work/NONREG/testCA.lus +-- ../lus2lic -vl 2 should_work/NONREG/testCA.lus + node testCA::testCA( time_in_ms:int) @@ -7850,6 +8060,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/test_clash.lus Opening file should_work/NONREG/test_clash.lus +-- ../lus2lic -vl 2 should_work/NONREG/test_clash.lus + type _test::t = bool; const test::c = true; node test::tutu(x:bool) returns (y:bool); @@ -7869,6 +8081,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/test_node_expand.lus Opening file should_work/NONREG/test_node_expand.lus +-- ../lus2lic -vl 2 should_work/NONREG/test_node_expand.lus + node test_node_expand::n(x:int; y:int) returns (a:int; b:int); var v1:int; @@ -7889,6 +8103,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/test_node_expand2.lus Opening file should_work/NONREG/test_node_expand2.lus +-- ../lus2lic -vl 2 should_work/NONREG/test_node_expand2.lus + node test_node_expand2::f(i:int) returns (o:int); let o = i + 1; @@ -7936,6 +8152,8 @@ type A_int_2 = int^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/trivial.lus Opening file should_work/NONREG/trivial.lus +-- ../lus2lic -vl 2 should_work/NONREG/trivial.lus + node trivial::edge(x:bool) returns (e:bool); var _v1:bool; @@ -7957,6 +8175,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/trivial2.lus Opening file should_work/NONREG/trivial2.lus +-- ../lus2lic -vl 2 should_work/NONREG/trivial2.lus + node trivial2::edge(x:bool) returns (e:bool); var _v1:bool; @@ -7981,6 +8201,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/tuple.lus Opening file should_work/NONREG/tuple.lus +-- ../lus2lic -vl 2 should_work/NONREG/tuple.lus + node tuple::toto(x:int) returns (a:int; b:int; c:int); let a = if true then x else x; @@ -7992,6 +8214,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/type_decl.lus Opening file should_work/NONREG/type_decl.lus +-- ../lus2lic -vl 2 should_work/NONREG/type_decl.lus + type _type_decl::alias = int; type _type_decl::pair = struct {a : int; b : int}; type _type_decl::color = enum {type_decl::blue, type_decl::white, type_decl::black}; @@ -7999,6 +8223,8 @@ type _type_decl::color = enum {type_decl::blue, type_decl::white, type_decl::bla ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/uu.lus Opening file should_work/NONREG/uu.lus +-- ../lus2lic -vl 2 should_work/NONREG/uu.lus + node uu::uu(x:bool; y:bool; z:bool) returns (a:bool); var V112_X:bool; @@ -8099,6 +8325,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/NONREG/v1.lus Opening file should_work/NONREG/v1.lus +-- ../lus2lic -vl 2 should_work/NONREG/v1.lus + node v1::v1(m:int; b:bool) returns (n:int); var _v1:int; @@ -8111,6 +8339,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/consensus.lus Opening file should_work/Pascal/consensus.lus +-- ../lus2lic -vl 2 should_work/Pascal/consensus.lus + node n_consensus::consensus_1(T:A_bool_1) returns (a:bool); var _v1:bool; @@ -8274,6 +8504,8 @@ type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/consensus2.lus Opening file should_work/Pascal/consensus2.lus +-- ../lus2lic -vl 2 should_work/Pascal/consensus2.lus + node n_consensus2::consensus_1(T:A_bool_1) returns (a:bool); var _v1:bool; @@ -8397,6 +8629,8 @@ type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/fby.lus Opening file should_work/Pascal/fby.lus +-- ../lus2lic -vl 2 should_work/Pascal/fby.lus + node fby::rising_edge_bis(X:bool) returns (ok:bool); var _v1:bool; @@ -8423,6 +8657,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/func_with_body.lus Opening file should_work/Pascal/func_with_body.lus +-- ../lus2lic -vl 2 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 @@ -8433,6 +8669,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/heater_control.lus Opening file should_work/Pascal/heater_control.lus +-- ../lus2lic -vl 2 should_work/Pascal/heater_control.lus + const heater_control::FAILURE = -999.0; const heater_control::TMIN = 6.0; const heater_control::TMAX = 9.0; @@ -8678,6 +8916,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/left.lus Opening file should_work/Pascal/left.lus +-- ../lus2lic -vl 2 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); var @@ -8701,6 +8941,8 @@ type A_bool_100 = bool^100; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/newpacks.lus Opening file should_work/Pascal/newpacks.lus +-- ../lus2lic -vl 2 should_work/Pascal/newpacks.lus + type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); var @@ -8767,6 +9009,8 @@ const inter::n = -4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/onlyroll.lus Opening file should_work/Pascal/onlyroll.lus +-- ../lus2lic -vl 2 should_work/Pascal/onlyroll.lus + const onlyroll::NRminP = -5.1; const onlyroll::NRminR = -25.3; const onlyroll::NRmaxP = 5.1; @@ -9875,6 +10119,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/p.lus Opening file should_work/Pascal/p.lus +-- ../lus2lic -vl 2 should_work/Pascal/p.lus + type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); var @@ -9941,6 +10187,8 @@ const inter::n = -4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/packs.lus Opening file should_work/Pascal/packs.lus +-- ../lus2lic -vl 2 should_work/Pascal/packs.lus + type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); var @@ -10019,6 +10267,8 @@ Opening file should_work/Pascal/pfs.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/struct.lus Opening file should_work/Pascal/struct.lus +-- ../lus2lic -vl 2 should_work/Pascal/struct.lus + type _struct::complex = struct {re : real = 0.; im : real = 0.}; node struct::plus( @@ -10047,6 +10297,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/struct0.lus Opening file should_work/Pascal/struct0.lus +-- ../lus2lic -vl 2 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 @@ -10057,6 +10309,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/t.lus Opening file should_work/Pascal/t.lus +-- ../lus2lic -vl 2 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); @@ -10078,6 +10332,8 @@ type A_int_2 = int^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/t0.lus Opening file should_work/Pascal/t0.lus +-- ../lus2lic -vl 2 should_work/Pascal/t0.lus + node n_t0::min_n_1(T:A_int_1) returns (mn:int); var _v1:int; @@ -10155,6 +10411,8 @@ type A_int_1 = int^1; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/t1.lus Opening file should_work/Pascal/t1.lus +-- ../lus2lic -vl 2 should_work/Pascal/t1.lus + node n_t1::consensus_1(T:A_bool_1) returns (a:bool); var _v1:bool; @@ -10218,6 +10476,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/t2.lus Opening file should_work/Pascal/t2.lus +-- ../lus2lic -vl 2 should_work/Pascal/t2.lus + node n_t2::fold_left_bool_bool_1_Lustre::and( a:bool; @@ -10348,12 +10608,16 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/test.lus Opening file should_work/Pascal/test.lus +-- ../lus2lic -vl 2 should_work/Pascal/test.lus + const P1::y = 3; type _P1::titi = int^5; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/Pascal/trivial.lus Opening file should_work/Pascal/trivial.lus +-- ../lus2lic -vl 2 should_work/Pascal/trivial.lus + node trivial::trivial(x:int) returns (y:int); let y = 1; @@ -10363,6 +10627,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/bad_call02.lus Opening file should_work/call/bad_call02.lus +-- ../lus2lic -vl 2 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; @@ -10372,6 +10638,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/call01.lus Opening file should_work/call/call01.lus +-- ../lus2lic -vl 2 should_work/call/call01.lus + node call01::toto(i1:bool; i2:bool) returns (o:bool); let o = Lustre::and(i1, i2); @@ -10387,6 +10655,8 @@ extern function call01::momo(x:bool; y:bool) returns (z:bool); ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/call02.lus Opening file should_work/call/call02.lus +-- ../lus2lic -vl 2 should_work/call/call02.lus + node call02::toto(i1:bool; i2:bool) returns (o:bool); let o = Lustre::and(i1, i2); @@ -10406,6 +10676,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/call03.lus Opening file should_work/call/call03.lus +-- ../lus2lic -vl 2 should_work/call/call03.lus + node call03::tutu(i1:A_bool_2; i2:A_bool_2) returns (o:A_bool_2); let o = Lustre::map<<Lustre::or, 2>>(i1, i2); @@ -10422,6 +10694,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/call04.lus Opening file should_work/call/call04.lus +-- ../lus2lic -vl 2 should_work/call/call04.lus + node call04::toto(i1:bool; i2:bool) returns (o:bool); let o = Lustre::and(i1, i2); @@ -10447,6 +10721,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/call05.lus Opening file should_work/call/call05.lus +-- ../lus2lic -vl 2 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 @@ -10457,6 +10733,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/call06.lus Opening file should_work/call/call06.lus +-- ../lus2lic -vl 2 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 @@ -10468,6 +10746,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/call/call07.lus Opening file should_work/call/call07.lus +-- ../lus2lic -vl 2 should_work/call/call07.lus + node call07::call07(x:bool; y:bool; z:bool) returns (t:bool); let t = #(x, y, z); @@ -10477,6 +10757,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/clock/clock.lus Opening file should_work/clock/clock.lus +-- ../lus2lic -vl 2 should_work/clock/clock.lus + type _clock::s = struct {x : A_bool_10; y : bool}; extern node clock::clock3( @@ -10532,6 +10814,8 @@ type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/clock/clock2.lus Opening file should_work/clock/clock2.lus +-- ../lus2lic -vl 2 should_work/clock/clock2.lus + node clock2::clock(a:bool; b:int) returns (c:int when a); var _v1:int when a; @@ -10546,6 +10830,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/clock/clock_ite.lus Opening file should_work/clock/clock_ite.lus +-- ../lus2lic -vl 2 should_work/clock/clock_ite.lus + node clock_ite::clock(a:bool; b:bool) returns (c:bool when a); var _v1:bool when a; @@ -10564,6 +10850,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/clock/when_enum.lus Opening file should_work/clock/when_enum.lus +-- ../lus2lic -vl 2 should_work/clock/when_enum.lus + type _when_enum::t = enum {when_enum::A, when_enum::B, when_enum::C}; extern node when_enum::tutu(u:_when_enum::t) returns (x:bool); extern node when_enum::toto(u:bool; v:bool) returns (x:bool; y:bool); @@ -10590,18 +10878,20 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/clock/when_node.lus Opening file should_work/clock/when_node.lus +-- ../lus2lic -vl 2 should_work/clock/when_node.lus + extern node when_node::tutu(u:bool) returns (x:bool); extern node when_node::toto(u:bool; v:bool) returns (x:bool; y:bool); *** Error in file "should_work/clock/when_node.lus", line 6, col 10 to 10, token '=': *** -*** clock error: The expression has clock ' on a on base', -*** but it is used with clock ' on tutu(a) on base'. ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/clock/when_not.lus Opening file should_work/clock/when_not.lus +-- ../lus2lic -vl 2 should_work/clock/when_not.lus + extern node when_not::clock4( clock4_u:bool; @@ -10611,14 +10901,14 @@ returns ( clock4_y:bool when clock4_x); *** Error in file "should_work/clock/when_not.lus", line 7, col 12 to 17, token 'clock4': *** -*** clock error: The expression has clock ' on a on base', -*** but it is used with clock ' on not a on base'. ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/clock/when_tuple.lus Opening file should_work/clock/when_tuple.lus +-- ../lus2lic -vl 2 should_work/clock/when_tuple.lus + node when_tuple::titi( x:int; @@ -10655,6 +10945,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/Gyroscope2.lus Opening file should_work/demo/Gyroscope2.lus +-- ../lus2lic -vl 2 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}; @@ -11312,6 +11604,8 @@ type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/alias.lus Opening file should_work/demo/alias.lus +-- ../lus2lic -vl 2 should_work/demo/alias.lus + const alias::SIZE = 3; node alias::aliasIterOp(i1:int; i2:A_int_3) returns (o:int); let @@ -11362,6 +11656,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/bred.lus Opening file should_work/demo/bred.lus +-- ../lus2lic -vl 2 should_work/demo/bred.lus + node bred::bred(a:A_bool_2) returns (x:bool); let x = boolred<<0, 1, 2>>(a); @@ -11372,6 +11668,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/bred_lv4.lus Opening file should_work/demo/bred_lv4.lus +-- ../lus2lic -vl 2 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 @@ -11383,6 +11681,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/clock.lus Opening file should_work/demo/clock.lus +-- ../lus2lic -vl 2 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); @@ -11415,6 +11715,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/clock1_2ms.lus Opening file should_work/demo/clock1_2ms.lus +-- ../lus2lic -vl 2 should_work/demo/clock1_2ms.lus + node clock1_2ms::Clock1ms_node(dummy:bool) returns (Clock1ms:bool); var _v1:bool; @@ -11453,6 +11755,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/decl.lus Opening file should_work/demo/decl.lus +-- ../lus2lic -vl 2 should_work/demo/decl.lus + type _decl::t1; type _decl::t2; type _decl::t3; @@ -11497,6 +11801,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/declaration.lus Opening file should_work/demo/declaration.lus +-- ../lus2lic -vl 2 should_work/demo/declaration.lus + type _declaration::t1; type _declaration::t2; type _declaration::t3; @@ -11566,6 +11872,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/def.lus Opening file should_work/demo/def.lus +-- ../lus2lic -vl 2 should_work/demo/def.lus + type _def::t1; const def::a = 4; type _def::string = int^4; @@ -11772,6 +12080,8 @@ type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/filliter.lus Opening file should_work/demo/filliter.lus +-- ../lus2lic -vl 2 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); @@ -11810,6 +12120,8 @@ type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/filter.lus Opening file should_work/demo/filter.lus +-- ../lus2lic -vl 2 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); @@ -11843,6 +12155,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/lustre_test1_ok.lus Opening file should_work/demo/lustre_test1_ok.lus +-- ../lus2lic -vl 2 should_work/demo/lustre_test1_ok.lus + node lustre_test1_ok::rising(in:bool) returns (out:bool); var _v1:bool; @@ -11964,6 +12278,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/map_red_iter.lus Opening file should_work/demo/map_red_iter.lus +-- ../lus2lic -vl 2 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; @@ -12013,6 +12329,8 @@ type A_int_4 = int^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/mapdeRed.lus Opening file should_work/demo/mapdeRed.lus +-- ../lus2lic -vl 2 should_work/demo/mapdeRed.lus + const mapdeRed::m = 3; const mapdeRed::n = 2; const mapdeRed::p = 5; @@ -12056,6 +12374,8 @@ type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/mapinf.lus Opening file should_work/demo/mapinf.lus +-- ../lus2lic -vl 2 should_work/demo/mapinf.lus + node mapinf::mapinf(t1:A_int_10; t2:A_int_10) returns (res:A_bool_10); let res = map<<Lustre::ilt, 10>>(t1, t2); @@ -12067,6 +12387,8 @@ type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/mapiter.lus Opening file should_work/demo/mapiter.lus +-- ../lus2lic -vl 2 should_work/demo/mapiter.lus + node mapiter::incr_tab(a:int) returns (b:int); let b = a + 1; @@ -12088,6 +12410,8 @@ type A_int_7 = int^7; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/mappredef.lus Opening file should_work/demo/mappredef.lus +-- ../lus2lic -vl 2 should_work/demo/mappredef.lus + const mappredef::N = 3; type _mappredef::tab_int = int^3; type _mappredef::tab_bool = bool^3; @@ -12119,6 +12443,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/plus.lus Opening file should_work/demo/plus.lus +-- ../lus2lic -vl 2 should_work/demo/plus.lus + node plus::plus(a:int; b:int) returns (c:int; d:int; e:int; f:int); var _v1:A_bool_2; @@ -12155,6 +12481,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/pre_x.lus Opening file should_work/demo/pre_x.lus +-- ../lus2lic -vl 2 should_work/demo/pre_x.lus + node pre_x::pre_x(a:int; b:int) returns (x:bool); var _v1:int; @@ -12179,6 +12507,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/rediter.lus Opening file should_work/demo/rediter.lus +-- ../lus2lic -vl 2 should_work/demo/rediter.lus + node rediter::max(init:int; a:int) returns (b:int); var _v1:bool; @@ -12203,6 +12533,8 @@ type A_int_5 = int^5; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/redoptest.lus Opening file should_work/demo/redoptest.lus +-- ../lus2lic -vl 2 should_work/demo/redoptest.lus + node redoptest::max(init:int; a:int) returns (b:int); var _v1:bool; @@ -12227,6 +12559,8 @@ type A_A_int_5_3 = A_int_5^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/demo/sample_time_change.lus Opening file should_work/demo/sample_time_change.lus +-- ../lus2lic -vl 2 should_work/demo/sample_time_change.lus + node sample_time_change::make_cl1_4_2(in:bool) returns (out:bool); var cl1:bool; @@ -12371,6 +12705,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/bob.lus Opening file should_work/fab_test/bob.lus +-- ../lus2lic -vl 2 should_work/fab_test/bob.lus + node bob::bob(i:bool) returns (o:bool when i); var _v1:bool; @@ -12394,6 +12730,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/def.lus Opening file should_work/fab_test/def.lus +-- ../lus2lic -vl 2 should_work/fab_test/def.lus + node def::def(i:bool) returns (a:bool; b:bool); let a = true; @@ -12404,6 +12742,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/ex.lus Opening file should_work/fab_test/ex.lus +-- ../lus2lic -vl 2 should_work/fab_test/ex.lus + node ex::id(f:bool; a:bool) returns (g:bool); let g = f or a; @@ -12433,6 +12773,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/iter.lus Opening file should_work/fab_test/iter.lus +-- ../lus2lic -vl 2 should_work/fab_test/iter.lus + const iter::n = 5; node iter::filled(accu_in:int) returns (accu_out:int; elt:int); let @@ -12489,6 +12831,8 @@ type A_int_5 = int^5; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/iterate.lus Opening file should_work/fab_test/iterate.lus +-- ../lus2lic -vl 2 should_work/fab_test/iterate.lus + node iterate::mapped( elt_in1:int; @@ -12574,6 +12918,8 @@ type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/lecteur.lus Opening file should_work/fab_test/lecteur.lus +-- ../lus2lic -vl 2 should_work/fab_test/lecteur.lus + node lecteur::Propriete(vitesse:int) returns (ok:bool); var cpt:int; @@ -12673,6 +13019,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/lucky.lus Opening file should_work/fab_test/lucky.lus +-- ../lus2lic -vl 2 should_work/fab_test/lucky.lus + node lucky::implies(X:bool; Y:bool) returns (XimpliesY:bool); var _v1:bool; @@ -12783,6 +13131,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/morel.lus Opening file should_work/fab_test/morel.lus +-- ../lus2lic -vl 2 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); @@ -12896,6 +13246,8 @@ type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/morel2.lus Opening file should_work/fab_test/morel2.lus +-- ../lus2lic -vl 2 should_work/fab_test/morel2.lus + type _morel2::a2 = int^2; type _morel2::a32 = A_int_2^3; type _morel2::arrayb = bool^3; @@ -12998,6 +13350,8 @@ type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/morel3.lus Opening file should_work/fab_test/morel3.lus +-- ../lus2lic -vl 2 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); @@ -13105,6 +13459,8 @@ type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/morel4.lus Opening file should_work/fab_test/morel4.lus +-- ../lus2lic -vl 2 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; @@ -13231,6 +13587,8 @@ type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/morel5.lus Opening file should_work/fab_test/morel5.lus +-- ../lus2lic -vl 2 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; @@ -13371,6 +13729,8 @@ type A_A_int_2_3 = A_int_2^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/noAlarm.lus Opening file should_work/fab_test/noAlarm.lus +-- ../lus2lic -vl 2 should_work/fab_test/noAlarm.lus + node noAlarm::noAlarm(alarm:bool) returns (ok:bool); let ok = not alarm; @@ -13380,6 +13740,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/notTwo.lus Opening file should_work/fab_test/notTwo.lus +-- ../lus2lic -vl 2 should_work/fab_test/notTwo.lus + node notTwo::notTwo(a:bool; b:bool) returns (o:bool); var _v1:bool; @@ -13392,6 +13754,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/onlyroll.lus Opening file should_work/fab_test/onlyroll.lus +-- ../lus2lic -vl 2 should_work/fab_test/onlyroll.lus + const onlyroll::NRminP = -5.1; const onlyroll::NRminR = -25.3; const onlyroll::NRmaxP = 5.1; @@ -14506,6 +14870,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/onlyroll2.lus Opening file should_work/fab_test/onlyroll2.lus +-- ../lus2lic -vl 2 should_work/fab_test/onlyroll2.lus + const onlyroll2::NRminP = -5.1; const onlyroll2::NRminR = -25.3; const onlyroll2::NRmaxP = 5.1; @@ -15620,6 +15986,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/test.lus Opening file should_work/fab_test/test.lus +-- ../lus2lic -vl 2 should_work/fab_test/test.lus + node test::three_outputs( c1:bool; @@ -15681,6 +16049,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/titi.lus Opening file should_work/fab_test/titi.lus +-- ../lus2lic -vl 2 should_work/fab_test/titi.lus + node titi::titi(a:bool; b:bool) returns (x:bool); var _v1:bool when b; @@ -15693,6 +16063,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/toolate.lus Opening file should_work/fab_test/toolate.lus +-- ../lus2lic -vl 2 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; @@ -15819,6 +16191,8 @@ type A_A_int_5_6 = A_int_5^6; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/fab_test/toto.lus Opening file should_work/fab_test/toto.lus +-- ../lus2lic -vl 2 should_work/fab_test/toto.lus + node toto::toto(a:bool; b:bool) returns (x:bool); var c:bool when b; @@ -15837,6 +16211,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/FillFollowedByRed.lus Opening file should_work/lionel/FillFollowedByRed.lus +-- ../lus2lic -vl 2 should_work/lionel/FillFollowedByRed.lus + node FillFollowedByRed::reduced( acc_in:bool; @@ -15879,6 +16255,8 @@ type A_real_10 = real^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/Gyroscope.lus Opening file should_work/lionel/Gyroscope.lus +-- ../lus2lic -vl 2 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}; @@ -16329,6 +16707,8 @@ type A__Gyroscope::Valid_ChannelT_4 = _Gyroscope::Valid_ChannelT^4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/ProduitBool/produitBool.lus Opening file should_work/lionel/ProduitBool/produitBool.lus +-- ../lus2lic -vl 2 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}; @@ -16520,6 +16900,8 @@ type A_bool_20 = bool^20; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/ProduitBool/shiftFill_ludic.lus Opening file should_work/lionel/ProduitBool/shiftFill_ludic.lus +-- ../lus2lic -vl 2 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}; @@ -16627,6 +17009,8 @@ type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/ProduitBool/shift_ludic.lus Opening file should_work/lionel/ProduitBool/shift_ludic.lus +-- ../lus2lic -vl 2 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}; @@ -16753,6 +17137,8 @@ type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/arrays.lus Opening file should_work/lionel/arrays.lus +-- ../lus2lic -vl 2 should_work/lionel/arrays.lus + const arrays::n = 4; const arrays::m = 3; const arrays::p = 2; @@ -16930,6 +17316,8 @@ type A_A_int_4_3 = A_int_4^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/calculs_max.lus Opening file should_work/lionel/calculs_max.lus +-- ../lus2lic -vl 2 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; @@ -17063,6 +17451,8 @@ type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/deSimone.lus Opening file should_work/lionel/deSimone.lus +-- ../lus2lic -vl 2 should_work/lionel/deSimone.lus + const deSimone::size = 10; type _deSimone::tabType = bool^10; type _deSimone::cell_accu = struct {token : bool; grant : bool}; @@ -17143,6 +17533,8 @@ type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/iterFibo.lus Opening file should_work/lionel/iterFibo.lus +-- ../lus2lic -vl 2 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); var @@ -17178,6 +17570,8 @@ type A_int_2 = int^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/mapiter.lus Opening file should_work/lionel/mapiter.lus +-- ../lus2lic -vl 2 should_work/lionel/mapiter.lus + const mapiter::L = 2; type _mapiter::Reg_L = bool^2; const mapiter::H = 3; @@ -17265,6 +17659,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/matrice.lus Opening file should_work/lionel/matrice.lus +-- ../lus2lic -vl 2 should_work/lionel/matrice.lus + type _matrice::T_fibo = int^2; const matrice::m = 3; const matrice::n = 2; @@ -17324,6 +17720,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/matrice2.lus Opening file should_work/lionel/matrice2.lus +-- ../lus2lic -vl 2 should_work/lionel/matrice2.lus + const matrice2::m = 2; const matrice2::n = 2; node matrice2::n_node_alias(i1:int; i2:A_int_2) returns (o:int); @@ -17347,6 +17745,8 @@ type A_int_2 = int^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/minus.lus Opening file should_work/lionel/minus.lus +-- ../lus2lic -vl 2 should_work/lionel/minus.lus + const minus::m = 2; const minus::n = 3; @@ -17407,6 +17807,8 @@ type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/moyenne.lus Opening file should_work/lionel/moyenne.lus +-- ../lus2lic -vl 2 should_work/lionel/moyenne.lus + type _moyenne::moyenne_accu = struct {sum : real; moyenne : real; rank : real}; const moyenne::size = 10; @@ -17453,6 +17855,8 @@ type A_real_10 = real^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/normal.lus Opening file should_work/lionel/normal.lus +-- ../lus2lic -vl 2 should_work/lionel/normal.lus + const normal::NBC = 20; type _normal::INTNBC = int^20; const normal::NBG = 4; @@ -17833,6 +18237,8 @@ type A_int_20 = int^20; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/pilote-1.0.lus Opening file should_work/lionel/pilote-1.0.lus +-- ../lus2lic -vl 2 should_work/lionel/pilote-1.0.lus + const pilote::periodePilote = 5; const pilote::periodeCapt = 10; const pilote::periodeAppli = 20; @@ -18742,6 +19148,8 @@ type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/pipeline.lus Opening file should_work/lionel/pipeline.lus +-- ../lus2lic -vl 2 should_work/lionel/pipeline.lus + const pipeline::size = 10; node pipeline::oneStep_pipe( @@ -18776,6 +19184,8 @@ type A_bool_10 = bool^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/predefOp.lus Opening file should_work/lionel/predefOp.lus +-- ../lus2lic -vl 2 should_work/lionel/predefOp.lus + const predefOp::L = 2; type _predefOp::Reg_L = bool^2; const predefOp::H = 3; @@ -18950,6 +19360,8 @@ type A_bool_2 = bool^2; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/redIf.lus Opening file should_work/lionel/redIf.lus +-- ../lus2lic -vl 2 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; @@ -18965,6 +19377,8 @@ type A_bool_3 = bool^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/remplissage-1.0.lus Opening file should_work/lionel/remplissage-1.0.lus +-- ../lus2lic -vl 2 should_work/lionel/remplissage-1.0.lus + type _util::accObserver = struct {nbCopy : A_int_10; indice : int}; type _util::accChangeTab = struct {numEvent : int; cpt : int; indice : int}; @@ -19340,6 +19754,8 @@ type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/simpleRed.lus Opening file should_work/lionel/simpleRed.lus +-- ../lus2lic -vl 2 should_work/lionel/simpleRed.lus + const simpleRed::m = 3; const simpleRed::n = 2; node simpleRed::simpleRed(a:int) returns (res:int); @@ -19355,6 +19771,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/testSilus.lus Opening file should_work/lionel/testSilus.lus +-- ../lus2lic -vl 2 should_work/lionel/testSilus.lus + const testSilus::NBC = 20; type _testSilus::INTNBC = int^20; const testSilus::NBG = 4; @@ -19675,6 +20093,8 @@ type A_int_20 = int^20; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/lionel/triSel.lus Opening file should_work/lionel/triSel.lus +-- ../lus2lic -vl 2 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}; @@ -19933,6 +20353,8 @@ type A_int_50 = int^50; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/Condact.lus Opening file should_work/packEnvTest/Condact.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/Condact.lus + node Util::carre(e:int) returns (s:int); let s = e * e; @@ -19966,6 +20388,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/complex.lus Opening file should_work/packEnvTest/complex.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/complex.lus + type _complex::t = struct {re : real; im : real}; const complex::i = _complex::t{re = 0.; im = 1.}; node complex::re(c:_complex::t) returns (re:real); @@ -19977,6 +20401,9 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/contractForElementSelectionInArray/contractForElementSelectionInArray.lus Opening file should_work/packEnvTest/contractForElementSelectionInArray/contractForElementSelectionInArray.lus +-- ../lus2lic -vl 2 +-- should_work/packEnvTest/contractForElementSelectionInArray/contractForElementSelectionInArray.lus + type _contractForElementSelectionInArray::elementType = int; type _contractForElementSelectionInArray::iteratedStruct = struct {currentRank : int; rankToSelect : int; elementSelected : int}; const contractForElementSelectionInArray::size = 10; @@ -20031,6 +20458,9 @@ type A_int_10 = int^10; ====> ../lus2lic -vl 2 should_work/packEnvTest/contractForElementSelectionInArray/main.lus Opening file should_work/packEnvTest/contractForElementSelectionInArray/main.lus Opening file should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus +-- ../lus2lic -vl 2 +-- should_work/packEnvTest/contractForElementSelectionInArray/main.lus + type _intArray::elementType = int; const intArray::size = 10; type _intArray::arrayType = int^10; @@ -20533,6 +20963,9 @@ type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/contractForElementSelectionInArray/noeudsIndependants.lus Opening file should_work/packEnvTest/contractForElementSelectionInArray/noeudsIndependants.lus +-- ../lus2lic -vl 2 +-- should_work/packEnvTest/contractForElementSelectionInArray/noeudsIndependants.lus + node noeudsIndependants::equals(a:int; b:int) returns (r:bool); let r = a = b; @@ -20547,11 +20980,17 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus Opening file should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus +-- ../lus2lic -vl 2 +-- should_work/packEnvTest/contractForElementSelectionInArray/packageTableau.lus + Error. No package has been provided ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/contractForElementSelectionInArray/tri.lus Opening file should_work/packEnvTest/contractForElementSelectionInArray/tri.lus +-- ../lus2lic -vl 2 +-- 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}; @@ -20794,6 +21233,8 @@ type A_int_10 = int^10; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/iter.lus Opening file should_work/packEnvTest/iter.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/iter.lus + type _p::t = int; const p::size = 3; node p::n(i1:int; i2:int) returns (o:int); @@ -20816,6 +21257,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/model.lus Opening file should_work/packEnvTest/model.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/model.lus + type _pint::t = int; node pint::fby1(init:int; fb:int) returns (next:int); var @@ -20829,6 +21272,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/modelInst.lus Opening file should_work/packEnvTest/modelInst.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/modelInst.lus + type _Pint::t = int; node Pint::n(init:int; in:int) returns (ok:int); var @@ -20884,6 +21329,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/packages.lus Opening file should_work/packEnvTest/packages.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/packages.lus + type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); var @@ -20950,6 +21397,8 @@ const inter::n = -4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/packages2.lus Opening file should_work/packEnvTest/packages2.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/packages2.lus + type _preal::t = real; node preal::fby1(init:real; fb:real) returns (next:real); var @@ -21014,6 +21463,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/packEnvTest/polymorphic_pack.lus Opening file should_work/packEnvTest/polymorphic_pack.lus +-- ../lus2lic -vl 2 should_work/packEnvTest/polymorphic_pack.lus + type _p::t = int; const p::size = 3; node p::n(i1:int; i2:int) returns (o:int); @@ -21031,6 +21482,8 @@ type A_int_3 = int^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_work/to_sort_out/asservi.lus Opening file should_work/to_sort_out/asservi.lus +-- ../lus2lic -vl 2 should_work/to_sort_out/asservi.lus + type _asservi::pendule; const asservi::G = 10.0; const asservi::L = 2.0; @@ -21192,21 +21645,22 @@ tel -- end of node asservi::asservi Those tests are supposed to generate errors Opening file do_not_exist.lus -do_not_exist.lus: No such file or directory ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/clock/bad_call02.lus Opening file should_fail/clock/bad_call02.lus +-- ../lus2lic -vl 2 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', -*** but it is used with clock ' on c on base'. ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/clock/bad_id.lus Opening file should_fail/clock/bad_id.lus +-- ../lus2lic -vl 2 should_fail/clock/bad_id.lus + *** Error in file "should_fail/clock/bad_id.lus", line 3, col 6 to 9, token 'toto': *** *** Unknown ident: b @@ -21215,6 +21669,8 @@ Opening file should_fail/clock/bad_id.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/clock/clock.lus Opening file should_fail/clock/clock.lus +-- ../lus2lic -vl 2 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); @@ -21226,14 +21682,14 @@ returns ( y:bool when x); *** Error in file "should_fail/clock/clock.lus", line 23, col 12 to 17, token 'clock4': *** -*** clock error: The expression has clock ' on a on base', -*** but it is used with clock ' on d on c on base'. ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/clock/clock2.lus Opening file should_fail/clock/clock2.lus +-- ../lus2lic -vl 2 should_fail/clock/clock2.lus + *** Error in file "should_fail/clock/clock2.lus", line 6, col 22 to 22, token 'a': *** the type of a clock cannot be int @@ -21241,6 +21697,8 @@ Opening file should_fail/clock/clock2.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/clock/inonout.lus Opening file should_fail/clock/inonout.lus +-- ../lus2lic -vl 2 should_fail/clock/inonout.lus + *** Error in file "should_fail/clock/inonout.lus", line 3, col 46 to 46, token 'c': *** *** 'c': Unknown variable. @@ -21251,19 +21709,21 @@ Opening file should_fail/clock/inonout.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/clock/when_enum.lus Opening file should_fail/clock/when_enum.lus +-- ../lus2lic -vl 2 should_fail/clock/when_enum.lus + type _when_enum::t = enum {when_enum::A, when_enum::B, when_enum::C}; extern node when_enum::tutu(u:_when_enum::t) returns (x:bool); extern node when_enum::toto(u:bool; v:bool) returns (x:bool; y:bool); *** Error in file "should_fail/clock/when_enum.lus", line 10, col 12 to 15, token 'toto': *** -*** clock error: The expression has clock ' on clk on base', -*** but it is used with clock ' on when_enum::A(a) on base'. ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/activation1.lus Opening file should_fail/semantics/activation1.lus +-- ../lus2lic -vl 2 should_fail/semantics/activation1.lus + node activation1::up(in:int) returns (out:int); var _v1:int; @@ -21314,6 +21774,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/activation2.lus Opening file should_fail/semantics/activation2.lus +-- ../lus2lic -vl 2 should_fail/semantics/activation2.lus + node activation2::up(in:int) returns (out:int); var _v1:int; @@ -21366,6 +21828,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/bad_call01.lus Opening file should_fail/semantics/bad_call01.lus +-- ../lus2lic -vl 2 should_fail/semantics/bad_call01.lus + *** Error in file "should_fail/semantics/bad_call01.lus", line 2, col 13 to 16, token 'titi': *** Recursion loop detected in node bad_call01::titi *****node ref in file "should_fail/semantics/bad_call01.lus", line 2, col 13 to 16, token 'titi' @@ -21374,6 +21838,8 @@ Opening file should_fail/semantics/bad_call01.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/bug.lus Opening file should_fail/semantics/bug.lus +-- ../lus2lic -vl 2 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; @@ -21545,6 +22011,8 @@ Opening file should_fail/semantics/const2.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/const3.lus Opening file should_fail/semantics/const3.lus +-- ../lus2lic -vl 2 should_fail/semantics/const3.lus + *** Error in file "should_fail/semantics/const3.lus", line 2, col 17 to 17, token '/': *** *** can't eval constant: reals cannot be evaluated, sorry. @@ -21554,6 +22022,8 @@ const const3::pi = 3.1416; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/cpt_dc.lus Opening file should_fail/semantics/cpt_dc.lus +-- ../lus2lic -vl 2 should_fail/semantics/cpt_dc.lus + node cpt_dc::cpt_dc(evt:bool; reset:bool) returns (cpt:int); var _f3:bool; @@ -21574,6 +22044,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/def.lus Opening file should_fail/semantics/def.lus +-- ../lus2lic -vl 2 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); @@ -21632,6 +22104,8 @@ Opening file should_fail/semantics/not_a_constant.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/piege.lus Opening file should_fail/semantics/piege.lus +-- ../lus2lic -vl 2 should_fail/semantics/piege.lus + node piege::aux2(in1:bool; in2:bool) returns (out1:bool; out2:bool); var _v1:bool; @@ -21666,6 +22140,8 @@ tel ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/tranche.lus Opening file should_fail/semantics/tranche.lus +-- ../lus2lic -vl 2 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': @@ -21678,6 +22154,8 @@ const tranche::n:A_A_bool_3_4; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/semantics/x.lus Opening file should_fail/semantics/x.lus +-- ../lus2lic -vl 2 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' @@ -21710,6 +22188,8 @@ Opening file should_fail/type/Gyro.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/type/bad_call03.lus Opening file should_fail/type/bad_call03.lus +-- ../lus2lic -vl 2 should_fail/type/bad_call03.lus + node bad_call03::titi(c:A_real_3; d:A_real_3) returns (y:A_real_3); let y = bad_call03::toto(c, d); @@ -21735,6 +22215,8 @@ type A_real_3 = real^3; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/type/const2.lus Opening file should_fail/type/const2.lus +-- ../lus2lic -vl 2 should_fail/type/const2.lus + type _const2::t1 = int; const const2::c1 = 2; const const2::M = 3; @@ -21762,6 +22244,8 @@ type _const2::t8 = A_A_A_A_A_A_int_3_7_8_9_3_8^8; ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/type/parametric_node.lus Opening file should_fail/type/parametric_node.lus +-- ../lus2lic -vl 2 should_fail/type/parametric_node.lus + *** Error in file "should_fail/type/parametric_node.lus", line 3, col 60 to 62, token 'int': *** Bad (static) type argument: 'real' and 'int' differs. @@ -21769,6 +22253,8 @@ Opening file should_fail/type/parametric_node.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/type/parametric_node2.lus Opening file should_fail/type/parametric_node2.lus +-- ../lus2lic -vl 2 should_fail/type/parametric_node2.lus + *** Error in file "should_fail/type/parametric_node2.lus", line 12, col 23 to 35, token 'Lustre::iplus': *** Bad (static) node argument: wrong output type profile. @@ -21776,6 +22262,8 @@ Opening file should_fail/type/parametric_node2.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/type/parametric_node3.lus Opening file should_fail/type/parametric_node3.lus +-- ../lus2lic -vl 2 should_fail/type/parametric_node3.lus + *** Error in file "should_fail/type/parametric_node3.lus", line 10, col 18 to 23, token 'toto_n': *** Bad number of (static) arguments: 3 expected, and 2 provided. @@ -21783,6 +22271,8 @@ Opening file should_fail/type/parametric_node3.lus ---------------------------------------------------------------------- ====> ../lus2lic -vl 2 should_fail/type/parametric_node4.lus Opening file should_fail/type/parametric_node4.lus +-- ../lus2lic -vl 2 should_fail/type/parametric_node4.lus + const parametric_node4::x = 3.0; *** Error in file "should_fail/type/parametric_node4.lus", line 3, col 60 to 62, token 'int': *** Bad (static) type argument: 'real' and 'int' differs.