diff --git a/src/compiledDataDump.ml b/src/compiledDataDump.ml index 4c8301d296fe3cf7c1022fe16abc95c6f86418a2..cbc50972ab3ef56aa531d8d8c8427f295b51a9d9 100644 --- a/src/compiledDataDump.ml +++ b/src/compiledDataDump.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 08/07/2008 (at 14:58) by Erwan Jahier> *) +(** Time-stamp: <modified the 08/07/2008 (at 15:38) by Erwan Jahier> *) (* Call it LicDump? *) @@ -188,7 +188,7 @@ and (string_of_type_decl_list : var_info_eff list -> string -> string) = and string_of_slice_info_eff si_eff = - "[" ^ (string_of_int si_eff.se_first) ^ ".." ^ (string_of_int si_eff.se_last) ^ + "[" ^ (string_of_int si_eff.se_first) ^ " .. " ^ (string_of_int si_eff.se_last) ^ (if si_eff.se_step = 1 then "" else " step " ^ (string_of_int si_eff.se_step)) ^ "]" diff --git a/src/syntaxTreeCore.ml b/src/syntaxTreeCore.ml index cf1afc6dca97d724686b0f05f50525f3ffc2eb71..72866349cfe2904ef6d77ba6740473e19bc7d7e6 100644 --- a/src/syntaxTreeCore.ml +++ b/src/syntaxTreeCore.ml @@ -1,4 +1,4 @@ -(** Time-stamp: <modified the 01/07/2008 (at 13:59) by Erwan Jahier> *) +(** Time-stamp: <modified the 08/07/2008 (at 15:09) by Erwan Jahier> *) (** (Raw) Abstract syntax tree of source programs. *) diff --git a/src/test/test.res.exp b/src/test/test.res.exp index 2d6912b9eb1b3f096169d67d777eee70788a05e0..7c15f4502cab14e85b98a532651640ea69c8f96f 100644 --- a/src/test/test.res.exp +++ b/src/test/test.res.exp @@ -2824,17 +2824,17 @@ tel -- end of node consensus::consensus_1 node consensus::consensus_2(T:A_bool_2) returns (a:bool); let - a = ((T[0] and (consensus::consensus_1((T[1..1]))))); + a = ((T[0] and (consensus::consensus_1((T[1 .. 1]))))); tel -- end of node consensus::consensus_2 node consensus::consensus_3(T:A_bool_3) returns (a:bool); let - a = ((T[0] and (consensus::consensus_2((T[1..2]))))); + a = ((T[0] and (consensus::consensus_2((T[1 .. 2]))))); tel -- end of node consensus::consensus_3 node consensus::consensus_4(T:A_bool_4) returns (a:bool); let - a = ((T[0] and (consensus::consensus_3((T[1..3]))))); + a = ((T[0] and (consensus::consensus_3((T[1 .. 3]))))); tel -- end of node consensus::consensus_4 node consensus::main(T:A_bool_4) returns (c:bool); @@ -2844,32 +2844,32 @@ tel -- end of node consensus::main node consensus::consensus_5(T:A_bool_5) returns (a:bool); let - a = ((T[0] and (consensus::consensus_4((T[1..4]))))); + a = ((T[0] and (consensus::consensus_4((T[1 .. 4]))))); tel -- end of node consensus::consensus_5 node consensus::consensus_6(T:A_bool_6) returns (a:bool); let - a = ((T[0] and (consensus::consensus_5((T[1..5]))))); + a = ((T[0] and (consensus::consensus_5((T[1 .. 5]))))); tel -- end of node consensus::consensus_6 node consensus::consensus_7(T:A_bool_7) returns (a:bool); let - a = ((T[0] and (consensus::consensus_6((T[1..6]))))); + a = ((T[0] and (consensus::consensus_6((T[1 .. 6]))))); tel -- end of node consensus::consensus_7 node consensus::consensus_8(T:A_bool_8) returns (a:bool); let - a = ((T[0] and (consensus::consensus_7((T[1..7]))))); + a = ((T[0] and (consensus::consensus_7((T[1 .. 7]))))); tel -- end of node consensus::consensus_8 node consensus::consensus_9(T:A_bool_9) returns (a:bool); let - a = ((T[0] and (consensus::consensus_8((T[1..8]))))); + a = ((T[0] and (consensus::consensus_8((T[1 .. 8]))))); tel -- end of node consensus::consensus_9 node consensus::consensus_10(T:A_bool_10) returns (a:bool); let - a = ((T[0] and (consensus::consensus_9((T[1..9]))))); + a = ((T[0] and (consensus::consensus_9((T[1 .. 9]))))); tel -- end of node consensus::consensus_10 node consensus::main2(T:A_bool_10) returns (a:bool); @@ -3046,13 +3046,13 @@ Opening file /home/jahier/lus2lic/src/test/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 - t[0].a[0..98 step 2][48..0 step -2] = (true^25); - t[0].a[0..98 step 2][1..49 step 2] = (false^25); - t[0].a[1..99 step 2][0] = true; - t[0].a[1..99 step 2][1] = true; - t[0].a[5..99 step 2] = (false^48); + t[0].a[0 .. 98 step 2][48 .. 0 step -2] = (true^25); + t[0].a[0 .. 98 step 2][1 .. 49 step 2] = (false^25); + t[0].a[1 .. 99 step 2][0] = true; + t[0].a[1 .. 99 step 2][1] = true; + t[0].a[5 .. 99 step 2] = (false^48); t[0].b = 42; - t[1..2] = (truc{a=(true^100);b=0}^2); + t[1 .. 2] = (truc{a=(true^100);b=0}^2); tel -- end of node left::toto -- automatically defined aliases: @@ -3731,17 +3731,17 @@ tel -- end of node t0::min node t0::min_n_2(T:A_int_2) returns (mn:int); let - mn = ((t0::min(T[0], (t0::min_n_1((T[1..1])))))); + mn = ((t0::min(T[0], (t0::min_n_1((T[1 .. 1])))))); tel -- end of node t0::min_n_2 node t0::min_n_3(T:A_int_3) returns (mn:int); let - mn = ((t0::min(T[0], (t0::min_n_2((T[1..2])))))); + mn = ((t0::min(T[0], (t0::min_n_2((T[1 .. 2])))))); tel -- end of node t0::min_n_3 node t0::min_n_4(T:A_int_4) returns (mn:int); let - mn = ((t0::min(T[0], (t0::min_n_3((T[1..3])))))); + mn = ((t0::min(T[0], (t0::min_n_3((T[1 .. 3])))))); tel -- end of node t0::min_n_4 node t0::min_4(T:A_int_4) returns (mn:int); @@ -4746,7 +4746,7 @@ var bid1:int when c; bid2:int when c; let - s1 = (x[0..2]); + s1 = (x[0 .. 2]); (bid1, x) = (fill<<filliter::copie, 4>>(i1)); (bid2, s2) = (fill<<filliter::incr_acc, 3>>(i2)); tel @@ -5396,9 +5396,9 @@ let (i1, i2, i3) = ((tabi[0][0] + tabi[0][1]), (tabi[1][0] + tabi[1][1]), (tabi[2][0] + tabi[2][1])); tabb[0] = b; - tabb[1..2] = ([true, false]); + tabb[1 .. 2] = ([true, false]); tabi[2] = (morel::mcmorel(i)); - tabi[0..1] = ([([10, 100]), ([1000, 10000])]); + tabi[0 .. 1] = ([([10, 100]), ([1000, 10000])]); tel -- end of node morel::tab @@ -5452,9 +5452,9 @@ let (i1, i2, i3) = ((tabi[0][0] + tabi[0][1]), (tabi[1][0] + tabi[1][1]), (tabi[2][0] + tabi[2][1])); tabb[0] = b; - tabb[1..2] = ([true, false]); + tabb[1 .. 2] = ([true, false]); toto[2] = (morel2::mcmorel(i)); - toto[0..1] = ([([10, 100]), ([1000, 10000])]); + toto[0 .. 1] = ([([10, 100]), ([1000, 10000])]); tabi = toto; tel -- end of node morel2::morel2 @@ -5491,9 +5491,9 @@ let (i1, i2, i3) = ((tabi[0][0] + tabi[0][1]), (tabi[1][0] + tabi[1][1]), (tabi[2][0] + tabi[2][1])); tabb[0] = b; - tabb[1..2] = ([true, false]); + tabb[1 .. 2] = ([true, false]); tabi[2] = (morel3::mcmorel(i)); - tabi[0..1] = ([([10, 100]), ([1000, 10000])]); + tabi[0 .. 1] = ([([10, 100]), ([1000, 10000])]); tel -- end of node morel3::tab @@ -5550,9 +5550,9 @@ let (i1, i2, i3) = ((tabi[0][0] + tabi[0][1]), (tabi[1][0] + tabi[1][1]), (tabi[2][0] + tabi[2][1])); tabb[0] = b; - tabb[1..2] = ([true, false]); + tabb[1 .. 2] = ([true, false]); tabi[2] = (morel4::mcmorel(i)); - tabi[0..1] = ([([10, 100]), ([1000, 10000])]); + tabi[0 .. 1] = ([([10, 100]), ([1000, 10000])]); tel -- end of node morel4::tab