From 484496ce62c34b69b9e5208549af32e80e713980 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Fri, 11 Jan 2013 17:08:40 +0100
Subject: [PATCH] The entete was included twice in generated files.

---
 Makefile             |  10 ++-
 src/licPrg.ml        |   6 +-
 src/lxm.ml           |   5 +-
 src/main.ml          |  41 +-----------
 src/mainArgs.ml      |   8 +--
 test/lus2lic.log.ref | 150 +++++++++++++++++++++----------------------
 test/lus2lic.sum     |   2 +-
 7 files changed, 91 insertions(+), 131 deletions(-)

diff --git a/Makefile b/Makefile
index 7db39d60..117ae86b 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ lus2lic:
 
 
 # TEST, NON REGR. ETC...
-TESTDIR=./tests
+TESTDIR=./test
 
 .PHONY: diff test log
 
@@ -184,9 +184,9 @@ Clean:
 	rm -rf $(OBJDIR)
 
 test: 
-	pushd $(TESTDIR)
+	cd $(TESTDIR)
 	make
-	popd
+	cd ..
 
 
 ci: $(OBJDIR)/version.ml
@@ -200,8 +200,6 @@ amend:
 	git commit -a -F log --amend  && rm -f $(OBJDIR)/version.ml
 
 push:
-	git push git+ssh://jahier@scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/lustre/lustre.git
+	git push git+ssh://jahier@scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/lustre/lus2lic.git
 
-xxx:
-remote  add --track master origin  git+ssh://jahier@scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/git/lustre/lustre.git
 
diff --git a/src/licPrg.ml b/src/licPrg.ml
index 306b9c52..a6546b6f 100644
--- a/src/licPrg.ml
+++ b/src/licPrg.ml
@@ -116,10 +116,10 @@ let dump_entete oc =
     ("",0) 
     Sys.argv
    and
-      date = Printf.sprintf "%d/%02d/%02d"
-         (1900+time.Unix.tm_year)
-         (time.Unix.tm_mon+1)
+      date = Printf.sprintf "%02d/%02d/%d"
          (time.Unix.tm_mday)
+         (time.Unix.tm_mon+1)
+         (1900+time.Unix.tm_year)
    and
       time_str = Printf.sprintf "%02d:%02d:%02d"
          (time.Unix.tm_hour)
diff --git a/src/lxm.ml b/src/lxm.ml
index 30af47ea..ea97f138 100644
--- a/src/lxm.ml
+++ b/src/lxm.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 11/12/2012 (at 15:30) by Erwan Jahier> *)
+(* Time-stamp: <modified the 11/01/2013 (at 16:51) by Erwan Jahier> *)
 
 (** Common to lus2lic and lic2loc  *)
 
@@ -32,7 +32,8 @@ let pragma x = x._pragma
 (* affichage standard: *)
 let details lxm = (
   let file = if !Global.nonreg_test then 
-    (* during non-regression test, having absolute paths printed complicate the perusal. *)
+    (* during non-regression test, having absolute paths printed
+       complicate the perusal (because of the diff output). *)
     Filename.basename lxm._file 
   else 
     lxm._file 
diff --git a/src/main.ml b/src/main.ml
index 36d4553f..d81e9203 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 10/01/2013 (at 15:09) by Erwan Jahier> *)
+(* Time-stamp: <modified the 11/01/2013 (at 17:02) by Erwan Jahier> *)
 
 
 
@@ -140,44 +140,6 @@ let (get_source_list : string list -> AstV6.pack_or_model list) =
         p::packed_list
 
 
-
-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;
   if Sys.file_exists !Global.outfile then Sys.remove !Global.outfile;
@@ -206,7 +168,6 @@ let main = (
     in
     if !Global.outfile <> "" then Global.oc := open_out !Global.outfile;
     let lic_prg = Compile.doit nsl main_node in
-    dump_entete !Global.oc;
     LicPrg.to_file !Global.oc lic_prg;
     Verbose.exe ~level:3 (fun () ->
       Gc.print_stat stdout
diff --git a/src/mainArgs.ml b/src/mainArgs.ml
index eab1f16b..c7a7889b 100644
--- a/src/mainArgs.ml
+++ b/src/mainArgs.ml
@@ -62,8 +62,8 @@ let help opt ()= (
 )
 let full_usage os opt = (
 	Printf.fprintf os "%s\n" usage_msg;
-	let l = List.rev opt._user_man in
-	List.iter (pspec os opt) l;
+(* 	let l = List.rev opt._user_man in *)
+(* 	List.iter (pspec os opt) l; *)
 	let l = List.rev (opt._hidden_man) in
 	List.iter (pspec os opt) l
 )
@@ -225,12 +225,12 @@ let mkoptab (opt:t) : unit = (
     mkopt opt ~hide:true
       ["-unit"]
       (Arg.Set Global.run_unit_test)
-      ["Run some (internal) unit tests"]
+      ["Run embedded unit tests"]
     ;
     mkopt opt ~hide:true
       ["--nonreg-test"]
       (Arg.Set Global.nonreg_test)
-      ["(internal)"]
+      ["Avoid printing full path error msgs to ease non-reg test decision"]
     ;
     (* misc debug flag *)
     mkopt opt ~hide:true
diff --git a/test/lus2lic.log.ref b/test/lus2lic.log.ref
index 4b401391..3f31d13e 100644
--- a/test/lus2lic.log.ref
+++ b/test/lus2lic.log.ref
@@ -1,4 +1,4 @@
-Test Run By jahier on Fri Jan 11 16:07:46 2013
+Test Run By jahier on Fri Jan 11 17:02:48 2013
 Native configuration is i686-pc-linux-gnu
 
 		=== lus2lic tests ===
@@ -220,7 +220,7 @@ PASS: ./lus2lic {-o /tmp/redIf.lic should_work/redIf.lus}
 spawn ./lus2lic -ec -o /tmp/redIf.ec should_work/redIf.lus
 PASS: ./lus2lic {-ec -o /tmp/redIf.ec should_work/redIf.lus}
 spawn ec2c -o /tmp/redIf.c /tmp/redIf.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/redIf.c /tmp/redIf.ec}
 spawn ./lus2lic -o /tmp/t0.lic should_work/t0.lus
@@ -228,7 +228,7 @@ PASS: ./lus2lic {-o /tmp/t0.lic should_work/t0.lus}
 spawn ./lus2lic -ec -o /tmp/t0.ec should_work/t0.lus
 PASS: ./lus2lic {-ec -o /tmp/t0.ec should_work/t0.lus}
 spawn ec2c -o /tmp/t0.c /tmp/t0.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/t0.c /tmp/t0.ec}
 spawn ./lus2lic -o /tmp/lucky.lic should_work/lucky.lus
@@ -251,7 +251,7 @@ PASS: ./lus2lic {-o /tmp/titi.lic should_work/titi.lus}
 spawn ./lus2lic -ec -o /tmp/titi.ec should_work/titi.lus
 PASS: ./lus2lic {-ec -o /tmp/titi.ec should_work/titi.lus}
 spawn ec2c -o /tmp/titi.c /tmp/titi.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/titi.c /tmp/titi.ec}
 spawn ./lus2lic -o /tmp/cminus.lic should_work/cminus.lus
@@ -272,7 +272,7 @@ PASS: ./lus2lic {-o /tmp/access.lic should_work/access.lus}
 spawn ./lus2lic -ec -o /tmp/access.ec should_work/access.lus
 PASS: ./lus2lic {-ec -o /tmp/access.ec should_work/access.lus}
 spawn ec2c -o /tmp/access.c /tmp/access.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/access.c /tmp/access.ec}
 spawn ./lus2lic -o /tmp/aux.lic should_work/aux.lus
@@ -286,7 +286,7 @@ PASS: ./lus2lic {-o /tmp/consensus2.lic should_work/consensus2.lus}
 spawn ./lus2lic -ec -o /tmp/consensus2.ec should_work/consensus2.lus
 PASS: ./lus2lic {-ec -o /tmp/consensus2.ec should_work/consensus2.lus}
 spawn ec2c -o /tmp/consensus2.c /tmp/consensus2.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/consensus2.c /tmp/consensus2.ec}
 spawn ./lus2lic -o /tmp/dependeur.lic should_work/dependeur.lus
@@ -300,7 +300,7 @@ PASS: ./lus2lic {-o /tmp/mappredef.lic should_work/mappredef.lus}
 spawn ./lus2lic -ec -o /tmp/mappredef.ec should_work/mappredef.lus
 PASS: ./lus2lic {-ec -o /tmp/mappredef.ec should_work/mappredef.lus}
 spawn ec2c -o /tmp/mappredef.c /tmp/mappredef.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mappredef.c /tmp/mappredef.ec}
 spawn ./lus2lic -o /tmp/call06.lic should_work/call06.lus
@@ -601,7 +601,7 @@ PASS: ./lus2lic {-o /tmp/bug2.lic should_work/bug2.lus}
 spawn ./lus2lic -ec -o /tmp/bug2.ec should_work/bug2.lus
 PASS: ./lus2lic {-ec -o /tmp/bug2.ec should_work/bug2.lus}
 spawn ec2c -o /tmp/bug2.c /tmp/bug2.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/bug2.c /tmp/bug2.ec}
 spawn ./lus2lic -o /tmp/mm.lic should_work/mm.lus
@@ -609,7 +609,7 @@ PASS: ./lus2lic {-o /tmp/mm.lic should_work/mm.lus}
 spawn ./lus2lic -ec -o /tmp/mm.ec should_work/mm.lus
 PASS: ./lus2lic {-ec -o /tmp/mm.ec should_work/mm.lus}
 spawn ec2c -o /tmp/mm.c /tmp/mm.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mm.c /tmp/mm.ec}
 spawn ./lus2lic -o /tmp/yyy.lic should_work/yyy.lus
@@ -617,7 +617,7 @@ PASS: ./lus2lic {-o /tmp/yyy.lic should_work/yyy.lus}
 spawn ./lus2lic -ec -o /tmp/yyy.ec should_work/yyy.lus
 PASS: ./lus2lic {-ec -o /tmp/yyy.ec should_work/yyy.lus}
 spawn ec2c -o /tmp/yyy.c /tmp/yyy.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/yyy.c /tmp/yyy.ec}
 spawn ./lus2lic -o /tmp/testCapt.lic should_work/testCapt.lus
@@ -886,7 +886,7 @@ PASS: ./lus2lic {-o /tmp/t1.lic should_work/t1.lus}
 spawn ./lus2lic -ec -o /tmp/t1.ec should_work/t1.lus
 PASS: ./lus2lic {-ec -o /tmp/t1.ec should_work/t1.lus}
 spawn ec2c -o /tmp/t1.c /tmp/t1.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/t1.c /tmp/t1.ec}
 spawn ./lus2lic -o /tmp/nc9.lic should_work/nc9.lus
@@ -901,7 +901,7 @@ PASS: ./lus2lic {-o /tmp/car-V2.lic should_work/car-V2.lus}
 spawn ./lus2lic -ec -o /tmp/car-V2.ec should_work/car-V2.lus
 PASS: ./lus2lic {-ec -o /tmp/car-V2.ec should_work/car-V2.lus}
 spawn ec2c -o /tmp/car-V2.c /tmp/car-V2.ec
-syntax error     - at line 9
+syntax error     - at line 5
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/car-V2.c /tmp/car-V2.ec}
 spawn ./lus2lic -o /tmp/nc8.lic should_work/nc8.lus
@@ -922,7 +922,7 @@ PASS: ./lus2lic {-o /tmp/mm1.lic should_work/mm1.lus}
 spawn ./lus2lic -ec -o /tmp/mm1.ec should_work/mm1.lus
 PASS: ./lus2lic {-ec -o /tmp/mm1.ec should_work/mm1.lus}
 spawn ec2c -o /tmp/mm1.c /tmp/mm1.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mm1.c /tmp/mm1.ec}
 spawn ./lus2lic -o /tmp/predef03.lic should_work/predef03.lus
@@ -930,7 +930,7 @@ PASS: ./lus2lic {-o /tmp/predef03.lic should_work/predef03.lus}
 spawn ./lus2lic -ec -o /tmp/predef03.ec should_work/predef03.lus
 PASS: ./lus2lic {-ec -o /tmp/predef03.ec should_work/predef03.lus}
 spawn ec2c -o /tmp/predef03.c /tmp/predef03.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/predef03.c /tmp/predef03.ec}
 spawn ./lus2lic -o /tmp/iter.lic should_work/iter.lus
@@ -938,7 +938,7 @@ PASS: ./lus2lic {-o /tmp/iter.lic should_work/iter.lus}
 spawn ./lus2lic -ec -o /tmp/iter.ec should_work/iter.lus
 PASS: ./lus2lic {-ec -o /tmp/iter.ec should_work/iter.lus}
 spawn ec2c -o /tmp/iter.c /tmp/iter.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/iter.c /tmp/iter.ec}
 spawn ./lus2lic -o /tmp/piege.lic should_work/piege.lus
@@ -984,7 +984,7 @@ PASS: ./lus2lic {-o /tmp/test_node_expand2.lic should_work/test_node_expand2.lus
 spawn ./lus2lic -ec -o /tmp/test_node_expand2.ec should_work/test_node_expand2.lus
 PASS: ./lus2lic {-ec -o /tmp/test_node_expand2.ec should_work/test_node_expand2.lus}
 spawn ec2c -o /tmp/test_node_expand2.c /tmp/test_node_expand2.ec
-syntax error     - at line 10
+syntax error     - at line 5
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/test_node_expand2.c /tmp/test_node_expand2.ec}
 spawn ./lus2lic -o /tmp/test.lic should_work/test.lus
@@ -1022,7 +1022,7 @@ PASS: ./lus2lic {-o /tmp/matrice2.lic should_work/matrice2.lus}
 spawn ./lus2lic -ec -o /tmp/matrice2.ec should_work/matrice2.lus
 PASS: ./lus2lic {-ec -o /tmp/matrice2.ec should_work/matrice2.lus}
 spawn ec2c -o /tmp/matrice2.c /tmp/matrice2.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/matrice2.c /tmp/matrice2.ec}
 spawn ./lus2lic -o /tmp/v1.lic should_work/v1.lus
@@ -1083,7 +1083,7 @@ PASS: ./lus2lic {-o /tmp/mm22.lic should_work/mm22.lus}
 spawn ./lus2lic -ec -o /tmp/mm22.ec should_work/mm22.lus
 PASS: ./lus2lic {-ec -o /tmp/mm22.ec should_work/mm22.lus}
 spawn ec2c -o /tmp/mm22.c /tmp/mm22.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mm22.c /tmp/mm22.ec}
 spawn ./lus2lic -o /tmp/X1.lic should_work/X1.lus
@@ -1097,7 +1097,7 @@ PASS: ./lus2lic {-o /tmp/alarme.lic should_work/alarme.lus}
 spawn ./lus2lic -ec -o /tmp/alarme.ec should_work/alarme.lus
 PASS: ./lus2lic {-ec -o /tmp/alarme.ec should_work/alarme.lus}
 spawn ec2c -o /tmp/alarme.c /tmp/alarme.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/alarme.c /tmp/alarme.ec}
 spawn ./lus2lic -o /tmp/onlyroll2.lic should_work/onlyroll2.lus
@@ -1119,7 +1119,7 @@ PASS: ./lus2lic {-o /tmp/zzz2.lic should_work/zzz2.lus}
 spawn ./lus2lic -ec -o /tmp/zzz2.ec should_work/zzz2.lus
 PASS: ./lus2lic {-ec -o /tmp/zzz2.ec should_work/zzz2.lus}
 spawn ec2c -o /tmp/zzz2.c /tmp/zzz2.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/zzz2.c /tmp/zzz2.ec}
 spawn ./lus2lic -o /tmp/COUNTER.lic should_work/COUNTER.lus
@@ -1146,7 +1146,7 @@ PASS: ./lus2lic {-o /tmp/filter.lic should_work/filter.lus}
 spawn ./lus2lic -ec -o /tmp/filter.ec should_work/filter.lus
 PASS: ./lus2lic {-ec -o /tmp/filter.ec should_work/filter.lus}
 spawn ec2c -o /tmp/filter.c /tmp/filter.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/filter.c /tmp/filter.ec}
 spawn ./lus2lic -o /tmp/ec.lic should_work/ec.lus
@@ -1232,7 +1232,7 @@ PASS: ./lus2lic {-o /tmp/ply03.lic should_work/ply03.lus}
 spawn ./lus2lic -ec -o /tmp/ply03.ec should_work/ply03.lus
 PASS: ./lus2lic {-ec -o /tmp/ply03.ec should_work/ply03.lus}
 spawn ec2c -o /tmp/ply03.c /tmp/ply03.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/ply03.c /tmp/ply03.ec}
 spawn ./lus2lic -o /tmp/param_struct.lic should_work/param_struct.lus
@@ -1240,7 +1240,7 @@ PASS: ./lus2lic {-o /tmp/param_struct.lic should_work/param_struct.lus}
 spawn ./lus2lic -ec -o /tmp/param_struct.ec should_work/param_struct.lus
 PASS: ./lus2lic {-ec -o /tmp/param_struct.ec should_work/param_struct.lus}
 spawn ec2c -o /tmp/param_struct.c /tmp/param_struct.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/param_struct.c /tmp/param_struct.ec}
 spawn ./lus2lic -o /tmp/minmax2.lic should_work/minmax2.lus
@@ -1255,7 +1255,7 @@ PASS: ./lus2lic {-o /tmp/plus.lic should_work/plus.lus}
 spawn ./lus2lic -ec -o /tmp/plus.ec should_work/plus.lus
 PASS: ./lus2lic {-ec -o /tmp/plus.ec should_work/plus.lus}
 spawn ec2c -o /tmp/plus.c /tmp/plus.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/plus.c /tmp/plus.ec}
 spawn ./lus2lic -o /tmp/xx.lic should_work/xx.lus
@@ -1263,7 +1263,7 @@ PASS: ./lus2lic {-o /tmp/xx.lic should_work/xx.lus}
 spawn ./lus2lic -ec -o /tmp/xx.ec should_work/xx.lus
 PASS: ./lus2lic {-ec -o /tmp/xx.ec should_work/xx.lus}
 spawn ec2c -o /tmp/xx.c /tmp/xx.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/xx.c /tmp/xx.ec}
 spawn ./lus2lic -o /tmp/call07.lic should_work/call07.lus
@@ -1277,7 +1277,7 @@ PASS: ./lus2lic {-o /tmp/shift_ludic.lic should_work/shift_ludic.lus}
 spawn ./lus2lic -ec -o /tmp/shift_ludic.ec should_work/shift_ludic.lus
 PASS: ./lus2lic {-ec -o /tmp/shift_ludic.ec should_work/shift_ludic.lus}
 spawn ec2c -o /tmp/shift_ludic.c /tmp/shift_ludic.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/shift_ludic.c /tmp/shift_ludic.ec}
 spawn ./lus2lic -o /tmp/pilote-1.0.lic should_work/pilote-1.0.lus
@@ -5338,7 +5338,7 @@ PASS: ./lus2lic {-o /tmp/morel5.lic should_work/morel5.lus}
 spawn ./lus2lic -ec -o /tmp/morel5.ec should_work/morel5.lus
 PASS: ./lus2lic {-ec -o /tmp/morel5.ec should_work/morel5.lus}
 spawn ec2c -o /tmp/morel5.c /tmp/morel5.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/morel5.c /tmp/morel5.ec}
 spawn ./lus2lic -o /tmp/bred.lic should_work/bred.lus
@@ -5346,7 +5346,7 @@ PASS: ./lus2lic {-o /tmp/bred.lic should_work/bred.lus}
 spawn ./lus2lic -ec -o /tmp/bred.ec should_work/bred.lus
 PASS: ./lus2lic {-ec -o /tmp/bred.ec should_work/bred.lus}
 spawn ec2c -o /tmp/bred.c /tmp/bred.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/bred.c /tmp/bred.ec}
 spawn ./lus2lic -o /tmp/tri.lic should_work/tri.lus
@@ -14544,7 +14544,7 @@ PASS: ./lus2lic {-o /tmp/calculs_max.lic should_work/calculs_max.lus}
 spawn ./lus2lic -ec -o /tmp/calculs_max.ec should_work/calculs_max.lus
 PASS: ./lus2lic {-ec -o /tmp/calculs_max.ec should_work/calculs_max.lus}
 spawn ec2c -o /tmp/calculs_max.c /tmp/calculs_max.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/calculs_max.c /tmp/calculs_max.ec}
 spawn ./lus2lic -o /tmp/testCA.lic should_work/testCA.lus
@@ -14558,7 +14558,7 @@ PASS: ./lus2lic {-o /tmp/deconne.lic should_work/deconne.lus}
 spawn ./lus2lic -ec -o /tmp/deconne.ec should_work/deconne.lus
 PASS: ./lus2lic {-ec -o /tmp/deconne.ec should_work/deconne.lus}
 spawn ec2c -o /tmp/deconne.c /tmp/deconne.ec
-syntax error     - at line 9
+syntax error     - at line 5
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/deconne.c /tmp/deconne.ec}
 spawn ./lus2lic -o /tmp/noAlarm.lic should_work/noAlarm.lus
@@ -14661,7 +14661,7 @@ PASS: ./lus2lic {-o /tmp/param_node4.lic should_work/param_node4.lus}
 spawn ./lus2lic -ec -o /tmp/param_node4.ec should_work/param_node4.lus
 PASS: ./lus2lic {-ec -o /tmp/param_node4.ec should_work/param_node4.lus}
 spawn ec2c -o /tmp/param_node4.c /tmp/param_node4.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/param_node4.c /tmp/param_node4.ec}
 spawn ./lus2lic -o /tmp/onlyroll.lic should_work/onlyroll.lus
@@ -14699,7 +14699,7 @@ PASS: ./lus2lic {-o /tmp/param_node3.lic should_work/param_node3.lus}
 spawn ./lus2lic -ec -o /tmp/param_node3.ec should_work/param_node3.lus
 PASS: ./lus2lic {-ec -o /tmp/param_node3.ec should_work/param_node3.lus}
 spawn ec2c -o /tmp/param_node3.c /tmp/param_node3.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/param_node3.c /tmp/param_node3.ec}
 spawn ./lus2lic -o /tmp/pipeline.lic should_work/pipeline.lus
@@ -14707,7 +14707,7 @@ PASS: ./lus2lic {-o /tmp/pipeline.lic should_work/pipeline.lus}
 spawn ./lus2lic -ec -o /tmp/pipeline.ec should_work/pipeline.lus
 PASS: ./lus2lic {-ec -o /tmp/pipeline.ec should_work/pipeline.lus}
 spawn ec2c -o /tmp/pipeline.c /tmp/pipeline.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/pipeline.c /tmp/pipeline.ec}
 spawn ./lus2lic -o /tmp/mapinf.lic should_work/mapinf.lus
@@ -14715,7 +14715,7 @@ PASS: ./lus2lic {-o /tmp/mapinf.lic should_work/mapinf.lus}
 spawn ./lus2lic -ec -o /tmp/mapinf.ec should_work/mapinf.lus
 PASS: ./lus2lic {-ec -o /tmp/mapinf.ec should_work/mapinf.lus}
 spawn ec2c -o /tmp/mapinf.c /tmp/mapinf.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mapinf.c /tmp/mapinf.ec}
 spawn ./lus2lic -o /tmp/integrator.lic should_work/integrator.lus
@@ -14736,7 +14736,7 @@ PASS: ./lus2lic {-o /tmp/mm3.lic should_work/mm3.lus}
 spawn ./lus2lic -ec -o /tmp/mm3.ec should_work/mm3.lus
 PASS: ./lus2lic {-ec -o /tmp/mm3.ec should_work/mm3.lus}
 spawn ec2c -o /tmp/mm3.c /tmp/mm3.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mm3.c /tmp/mm3.ec}
 spawn ./lus2lic -o /tmp/over2.lic should_work/over2.lus
@@ -14744,7 +14744,7 @@ PASS: ./lus2lic {-o /tmp/over2.lic should_work/over2.lus}
 spawn ./lus2lic -ec -o /tmp/over2.ec should_work/over2.lus
 PASS: ./lus2lic {-ec -o /tmp/over2.ec should_work/over2.lus}
 spawn ec2c -o /tmp/over2.c /tmp/over2.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/over2.c /tmp/over2.ec}
 spawn ./lus2lic -o /tmp/complex.lic should_work/complex.lus
@@ -14752,7 +14752,7 @@ PASS: ./lus2lic {-o /tmp/complex.lic should_work/complex.lus}
 spawn ./lus2lic -ec -o /tmp/complex.ec should_work/complex.lus
 PASS: ./lus2lic {-ec -o /tmp/complex.ec should_work/complex.lus}
 spawn ec2c -o /tmp/complex.c /tmp/complex.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/complex.c /tmp/complex.ec}
 spawn ./lus2lic -o /tmp/initial.lic should_work/initial.lus
@@ -14766,7 +14766,7 @@ PASS: ./lus2lic {-o /tmp/declaration.lic should_work/declaration.lus}
 spawn ./lus2lic -ec -o /tmp/declaration.ec should_work/declaration.lus
 PASS: ./lus2lic {-ec -o /tmp/declaration.ec should_work/declaration.lus}
 spawn ec2c -o /tmp/declaration.c /tmp/declaration.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/declaration.c /tmp/declaration.ec}
 spawn ./lus2lic -o /tmp/PCOND1.lic should_work/PCOND1.lus
@@ -14999,7 +14999,7 @@ PASS: ./lus2lic {-o /tmp/t2.lic should_work/t2.lus}
 spawn ./lus2lic -ec -o /tmp/t2.ec should_work/t2.lus
 PASS: ./lus2lic {-ec -o /tmp/t2.ec should_work/t2.lus}
 spawn ec2c -o /tmp/t2.c /tmp/t2.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/t2.c /tmp/t2.ec}
 spawn ./lus2lic -o /tmp/arbitre.lic should_work/arbitre.lus
@@ -15014,7 +15014,7 @@ PASS: ./lus2lic {-o /tmp/test_const.lic should_work/test_const.lus}
 spawn ./lus2lic -ec -o /tmp/test_const.ec should_work/test_const.lus
 PASS: ./lus2lic {-ec -o /tmp/test_const.ec should_work/test_const.lus}
 spawn ec2c -o /tmp/test_const.c /tmp/test_const.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/test_const.c /tmp/test_const.ec}
 spawn ./lus2lic -o /tmp/when_tuple.lic should_work/when_tuple.lus
@@ -15029,7 +15029,7 @@ PASS: ./lus2lic {-o /tmp/FillFollowedByRed.lic should_work/FillFollowedByRed.lus
 spawn ./lus2lic -ec -o /tmp/FillFollowedByRed.ec should_work/FillFollowedByRed.lus
 PASS: ./lus2lic {-ec -o /tmp/FillFollowedByRed.ec should_work/FillFollowedByRed.lus}
 spawn ec2c -o /tmp/FillFollowedByRed.c /tmp/FillFollowedByRed.ec
-syntax error     - at line 10
+syntax error     - at line 5
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/FillFollowedByRed.c /tmp/FillFollowedByRed.ec}
 spawn ./lus2lic -o /tmp/sample_time_change.lic should_work/sample_time_change.lus
@@ -15044,7 +15044,7 @@ PASS: ./lus2lic {-o /tmp/predef01.lic should_work/predef01.lus}
 spawn ./lus2lic -ec -o /tmp/predef01.ec should_work/predef01.lus
 PASS: ./lus2lic {-ec -o /tmp/predef01.ec should_work/predef01.lus}
 spawn ec2c -o /tmp/predef01.c /tmp/predef01.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/predef01.c /tmp/predef01.ec}
 spawn ./lus2lic -o /tmp/long_et_stupide_nom_de_noeud.lic should_work/long_et_stupide_nom_de_noeud.lus
@@ -15064,7 +15064,7 @@ PASS: ./lus2lic {-o /tmp/left.lic should_work/left.lus}
 spawn ./lus2lic -ec -o /tmp/left.ec should_work/left.lus
 PASS: ./lus2lic {-ec -o /tmp/left.ec should_work/left.lus}
 spawn ec2c -o /tmp/left.c /tmp/left.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/left.c /tmp/left.ec}
 spawn ./lus2lic -o /tmp/ts04.lic should_work/ts04.lus
@@ -15167,7 +15167,7 @@ PASS: ./lus2lic {-o /tmp/param_node2.lic should_work/param_node2.lus}
 spawn ./lus2lic -ec -o /tmp/param_node2.ec should_work/param_node2.lus
 PASS: ./lus2lic {-ec -o /tmp/param_node2.ec should_work/param_node2.lus}
 spawn ec2c -o /tmp/param_node2.c /tmp/param_node2.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/param_node2.c /tmp/param_node2.ec}
 spawn ./lus2lic -o /tmp/o2l_feux_compl.lic should_work/o2l_feux_compl.lus
@@ -15218,7 +15218,7 @@ PASS: ./lus2lic {-o /tmp/def.lic should_work/def.lus}
 spawn ./lus2lic -ec -o /tmp/def.ec should_work/def.lus
 PASS: ./lus2lic {-ec -o /tmp/def.ec should_work/def.lus}
 spawn ec2c -o /tmp/def.c /tmp/def.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/def.c /tmp/def.ec}
 spawn ./lus2lic -o /tmp/consensus.lic should_work/consensus.lus
@@ -15226,7 +15226,7 @@ PASS: ./lus2lic {-o /tmp/consensus.lic should_work/consensus.lus}
 spawn ./lus2lic -ec -o /tmp/consensus.ec should_work/consensus.lus
 PASS: ./lus2lic {-ec -o /tmp/consensus.ec should_work/consensus.lus}
 spawn ec2c -o /tmp/consensus.c /tmp/consensus.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/consensus.c /tmp/consensus.ec}
 spawn ./lus2lic -o /tmp/activation2.lic should_work/activation2.lus
@@ -15247,7 +15247,7 @@ PASS: ./lus2lic {-o /tmp/pack1.lic should_work/pack1.lus}
 spawn ./lus2lic -ec -o /tmp/pack1.ec should_work/pack1.lus
 PASS: ./lus2lic {-ec -o /tmp/pack1.ec should_work/pack1.lus}
 spawn ec2c -o /tmp/pack1.c /tmp/pack1.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/pack1.c /tmp/pack1.ec}
 spawn ./lus2lic -o /tmp/bob.lic should_work/bob.lus
@@ -15267,7 +15267,7 @@ PASS: ./lus2lic {-o /tmp/struct.lic should_work/struct.lus}
 spawn ./lus2lic -ec -o /tmp/struct.ec should_work/struct.lus
 PASS: ./lus2lic {-ec -o /tmp/struct.ec should_work/struct.lus}
 spawn ec2c -o /tmp/struct.c /tmp/struct.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/struct.c /tmp/struct.ec}
 spawn ./lus2lic -o /tmp/stopwatch.lic should_work/stopwatch.lus
@@ -15368,7 +15368,7 @@ PASS: ./lus2lic {-o /tmp/aa.lic should_work/aa.lus}
 spawn ./lus2lic -ec -o /tmp/aa.ec should_work/aa.lus
 PASS: ./lus2lic {-ec -o /tmp/aa.ec should_work/aa.lus}
 spawn ec2c -o /tmp/aa.c /tmp/aa.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/aa.c /tmp/aa.ec}
 spawn ./lus2lic -o /tmp/mouse3.lic should_work/mouse3.lus
@@ -15389,7 +15389,7 @@ PASS: ./lus2lic {-o /tmp/xxx.lic should_work/xxx.lus}
 spawn ./lus2lic -ec -o /tmp/xxx.ec should_work/xxx.lus
 PASS: ./lus2lic {-ec -o /tmp/xxx.ec should_work/xxx.lus}
 spawn ec2c -o /tmp/xxx.c /tmp/xxx.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/xxx.c /tmp/xxx.ec}
 spawn ./lus2lic -o /tmp/aux1.lic should_work/aux1.lus
@@ -15403,7 +15403,7 @@ PASS: ./lus2lic {-o /tmp/moyenne.lic should_work/moyenne.lus}
 spawn ./lus2lic -ec -o /tmp/moyenne.ec should_work/moyenne.lus
 PASS: ./lus2lic {-ec -o /tmp/moyenne.ec should_work/moyenne.lus}
 spawn ec2c -o /tmp/moyenne.c /tmp/moyenne.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/moyenne.c /tmp/moyenne.ec}
 spawn ./lus2lic -o /tmp/activation1.lic should_work/activation1.lus
@@ -15479,7 +15479,7 @@ PASS: ./lus2lic {-o /tmp/struct0.lic should_work/struct0.lus}
 spawn ./lus2lic -ec -o /tmp/struct0.ec should_work/struct0.lus
 PASS: ./lus2lic {-ec -o /tmp/struct0.ec should_work/struct0.lus}
 spawn ec2c -o /tmp/struct0.c /tmp/struct0.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/struct0.c /tmp/struct0.ec}
 spawn ./lus2lic -o /tmp/filliter.lic should_work/filliter.lus
@@ -15487,7 +15487,7 @@ PASS: ./lus2lic {-o /tmp/filliter.lic should_work/filliter.lus}
 spawn ./lus2lic -ec -o /tmp/filliter.ec should_work/filliter.lus
 PASS: ./lus2lic {-ec -o /tmp/filliter.ec should_work/filliter.lus}
 spawn ec2c -o /tmp/filliter.c /tmp/filliter.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/filliter.c /tmp/filliter.ec}
 spawn ./lus2lic -o /tmp/minmax4.lic should_work/minmax4.lus
@@ -15502,7 +15502,7 @@ PASS: ./lus2lic {-o /tmp/nested.lic should_work/nested.lus}
 spawn ./lus2lic -ec -o /tmp/nested.ec should_work/nested.lus
 PASS: ./lus2lic {-ec -o /tmp/nested.ec should_work/nested.lus}
 spawn ec2c -o /tmp/nested.c /tmp/nested.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/nested.c /tmp/nested.ec}
 spawn ./lus2lic -o /tmp/Gyroscope.lic should_work/Gyroscope.lus
@@ -15878,7 +15878,7 @@ PASS: ./lus2lic {-o /tmp/asservi.lic should_work/asservi.lus}
 spawn ./lus2lic -ec -o /tmp/asservi.ec should_work/asservi.lus
 PASS: ./lus2lic {-ec -o /tmp/asservi.ec should_work/asservi.lus}
 spawn ec2c -o /tmp/asservi.c /tmp/asservi.ec
-syntax error     - at line 9
+syntax error     - at line 5
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/asservi.c /tmp/asservi.ec}
 spawn ./lus2lic -o /tmp/rediter.lic should_work/rediter.lus
@@ -15886,7 +15886,7 @@ PASS: ./lus2lic {-o /tmp/rediter.lic should_work/rediter.lus}
 spawn ./lus2lic -ec -o /tmp/rediter.ec should_work/rediter.lus
 PASS: ./lus2lic {-ec -o /tmp/rediter.ec should_work/rediter.lus}
 spawn ec2c -o /tmp/rediter.c /tmp/rediter.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/rediter.c /tmp/rediter.ec}
 spawn ./lus2lic -o /tmp/mapdeRed.lic should_work/mapdeRed.lus
@@ -15894,7 +15894,7 @@ PASS: ./lus2lic {-o /tmp/mapdeRed.lic should_work/mapdeRed.lus}
 spawn ./lus2lic -ec -o /tmp/mapdeRed.ec should_work/mapdeRed.lus
 PASS: ./lus2lic {-ec -o /tmp/mapdeRed.ec should_work/mapdeRed.lus}
 spawn ec2c -o /tmp/mapdeRed.c /tmp/mapdeRed.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mapdeRed.c /tmp/mapdeRed.ec}
 spawn ./lus2lic -o /tmp/dependeur_struct.lic should_work/dependeur_struct.lus
@@ -15902,7 +15902,7 @@ PASS: ./lus2lic {-o /tmp/dependeur_struct.lic should_work/dependeur_struct.lus}
 spawn ./lus2lic -ec -o /tmp/dependeur_struct.ec should_work/dependeur_struct.lus
 PASS: ./lus2lic {-ec -o /tmp/dependeur_struct.ec should_work/dependeur_struct.lus}
 spawn ec2c -o /tmp/dependeur_struct.c /tmp/dependeur_struct.ec
-syntax error     - at line 10
+syntax error     - at line 5
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/dependeur_struct.c /tmp/dependeur_struct.ec}
 spawn ./lus2lic -o /tmp/minmax4_bis.lic should_work/minmax4_bis.lus
@@ -15923,7 +15923,7 @@ PASS: ./lus2lic {-o /tmp/simpleRed.lic should_work/simpleRed.lus}
 spawn ./lus2lic -ec -o /tmp/simpleRed.ec should_work/simpleRed.lus
 PASS: ./lus2lic {-ec -o /tmp/simpleRed.ec should_work/simpleRed.lus}
 spawn ec2c -o /tmp/simpleRed.c /tmp/simpleRed.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/simpleRed.c /tmp/simpleRed.ec}
 spawn ./lus2lic -o /tmp/map.lic should_work/map.lus
@@ -15931,7 +15931,7 @@ PASS: ./lus2lic {-o /tmp/map.lic should_work/map.lus}
 spawn ./lus2lic -ec -o /tmp/map.ec should_work/map.lus
 PASS: ./lus2lic {-ec -o /tmp/map.ec should_work/map.lus}
 spawn ec2c -o /tmp/map.c /tmp/map.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/map.c /tmp/map.ec}
 spawn ./lus2lic -o /tmp/drapfab.lic should_work/drapfab.lus
@@ -15970,7 +15970,7 @@ PASS: ./lus2lic {-o /tmp/alias.lic should_work/alias.lus}
 spawn ./lus2lic -ec -o /tmp/alias.ec should_work/alias.lus
 PASS: ./lus2lic {-ec -o /tmp/alias.ec should_work/alias.lus}
 spawn ec2c -o /tmp/alias.c /tmp/alias.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/alias.c /tmp/alias.ec}
 spawn ./lus2lic -o /tmp/hanane.lic should_work/hanane.lus
@@ -15978,7 +15978,7 @@ PASS: ./lus2lic {-o /tmp/hanane.lic should_work/hanane.lus}
 spawn ./lus2lic -ec -o /tmp/hanane.ec should_work/hanane.lus
 PASS: ./lus2lic {-ec -o /tmp/hanane.ec should_work/hanane.lus}
 spawn ec2c -o /tmp/hanane.c /tmp/hanane.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/hanane.c /tmp/hanane.ec}
 spawn ./lus2lic -o /tmp/packed_cst.lic should_work/packed_cst.lus
@@ -15986,7 +15986,7 @@ PASS: ./lus2lic {-o /tmp/packed_cst.lic should_work/packed_cst.lus}
 spawn ./lus2lic -ec -o /tmp/packed_cst.ec should_work/packed_cst.lus
 PASS: ./lus2lic {-ec -o /tmp/packed_cst.ec should_work/packed_cst.lus}
 spawn ec2c -o /tmp/packed_cst.c /tmp/packed_cst.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/packed_cst.c /tmp/packed_cst.ec}
 spawn ./lus2lic -o /tmp/predef02.lic should_work/predef02.lus
@@ -15994,7 +15994,7 @@ PASS: ./lus2lic {-o /tmp/predef02.lic should_work/predef02.lus}
 spawn ./lus2lic -ec -o /tmp/predef02.ec should_work/predef02.lus
 PASS: ./lus2lic {-ec -o /tmp/predef02.ec should_work/predef02.lus}
 spawn ec2c -o /tmp/predef02.c /tmp/predef02.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/predef02.c /tmp/predef02.ec}
 spawn ./lus2lic -o /tmp/toto.lic should_work/toto.lus
@@ -16069,7 +16069,7 @@ PASS: ./lus2lic {-o /tmp/zzz.lic should_work/zzz.lus}
 spawn ./lus2lic -ec -o /tmp/zzz.ec should_work/zzz.lus
 PASS: ./lus2lic {-ec -o /tmp/zzz.ec should_work/zzz.lus}
 spawn ec2c -o /tmp/zzz.c /tmp/zzz.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/zzz.c /tmp/zzz.ec}
 spawn ./lus2lic -o /tmp/STABLE.lic should_work/STABLE.lus
@@ -16083,7 +16083,7 @@ PASS: ./lus2lic {-o /tmp/mapiter.lic should_work/mapiter.lus}
 spawn ./lus2lic -ec -o /tmp/mapiter.ec should_work/mapiter.lus
 PASS: ./lus2lic {-ec -o /tmp/mapiter.ec should_work/mapiter.lus}
 spawn ec2c -o /tmp/mapiter.c /tmp/mapiter.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/mapiter.c /tmp/mapiter.ec}
 spawn ./lus2lic -o /tmp/tuple.lic should_work/tuple.lus
@@ -16123,7 +16123,7 @@ PASS: ./lus2lic {-o /tmp/redoptest.lic should_work/redoptest.lus}
 spawn ./lus2lic -ec -o /tmp/redoptest.ec should_work/redoptest.lus
 PASS: ./lus2lic {-ec -o /tmp/redoptest.ec should_work/redoptest.lus}
 spawn ec2c -o /tmp/redoptest.c /tmp/redoptest.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/redoptest.c /tmp/redoptest.ec}
 spawn ./lus2lic -o /tmp/flo.lic should_work/flo.lus
@@ -16138,7 +16138,7 @@ PASS: ./lus2lic {-o /tmp/shiftFill_ludic.lic should_work/shiftFill_ludic.lus}
 spawn ./lus2lic -ec -o /tmp/shiftFill_ludic.ec should_work/shiftFill_ludic.lus
 PASS: ./lus2lic {-ec -o /tmp/shiftFill_ludic.ec should_work/shiftFill_ludic.lus}
 spawn ec2c -o /tmp/shiftFill_ludic.c /tmp/shiftFill_ludic.ec
-syntax error     - at line 10
+syntax error     - at line 5
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/shiftFill_ludic.c /tmp/shiftFill_ludic.ec}
 spawn ./lus2lic -o /tmp/after.lic should_work/after.lus
@@ -17396,7 +17396,7 @@ PASS: ./lus2lic {-o /tmp/iterate.lic should_work/iterate.lus}
 spawn ./lus2lic -ec -o /tmp/iterate.ec should_work/iterate.lus
 PASS: ./lus2lic {-ec -o /tmp/iterate.ec should_work/iterate.lus}
 spawn ec2c -o /tmp/iterate.c /tmp/iterate.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/iterate.c /tmp/iterate.ec}
 spawn ./lus2lic -o /tmp/PCOND.lic should_work/PCOND.lus
@@ -17478,7 +17478,7 @@ PASS: ./lus2lic {-o /tmp/bred_lv4.lic should_work/bred_lv4.lus}
 spawn ./lus2lic -ec -o /tmp/bred_lv4.ec should_work/bred_lv4.lus
 PASS: ./lus2lic {-ec -o /tmp/bred_lv4.ec should_work/bred_lv4.lus}
 spawn ec2c -o /tmp/bred_lv4.c /tmp/bred_lv4.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/bred_lv4.c /tmp/bred_lv4.ec}
 spawn ./lus2lic -o /tmp/trivial2.lic should_work/trivial2.lus
@@ -17493,7 +17493,7 @@ PASS: ./lus2lic {-o /tmp/param_node.lic should_work/param_node.lus}
 spawn ./lus2lic -ec -o /tmp/param_node.ec should_work/param_node.lus
 PASS: ./lus2lic {-ec -o /tmp/param_node.ec should_work/param_node.lus}
 spawn ec2c -o /tmp/param_node.c /tmp/param_node.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/param_node.c /tmp/param_node.ec}
 spawn ./lus2lic -o /tmp/func_with_body.lic should_work/func_with_body.lus
@@ -17507,7 +17507,7 @@ PASS: ./lus2lic {-o /tmp/minus.lic should_work/minus.lus}
 spawn ./lus2lic -ec -o /tmp/minus.ec should_work/minus.lus
 PASS: ./lus2lic {-ec -o /tmp/minus.ec should_work/minus.lus}
 spawn ec2c -o /tmp/minus.c /tmp/minus.ec
-syntax error     - at line 8
+syntax error     - at line 4
 syntax errors...
 FAIL: Try ec2c on the result: ec2c {-o /tmp/minus.c /tmp/minus.ec}
 spawn ./lus2lic -o /tmp/remplissage-1.0.lic should_work/remplissage-1.0.lus
@@ -21505,7 +21505,7 @@ spawn ./lus2lic -o /tmp/m.lic should_fail/semantics/m.lus
 *** syntax error
 
 XFAIL: Test bad programs (semantics): lus2lic {-o /tmp/m.lic should_fail/semantics/m.lus}
-testcase ./lus2lic.tests/non-reg.exp completed in 88 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 90 seconds
 Running ./lus2lic.tests/progression.exp ...
 spawn ./lus2lic -o /tmp/when_enum.out should_work/broken/when_enum.lus
 *** Error in file "/home/jahier/lus2lic/test/should_work/broken/when_enum.lus", line 10, col 12 to 15, token 'toto':
@@ -22166,7 +22166,7 @@ spawn ./lus2lic -o /tmp/activation1.lic should_fail/semantics/broken/activation1
 XPASS: Test bad programs (semantics): lus2lic {-o /tmp/activation1.lic should_fail/semantics/broken/activation1.lus}
 spawn ./lus2lic -o /tmp/bug.lic should_fail/semantics/broken/bug.lus
 XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/semantics/broken/bug.lus}
-testcase ./lus2lic.tests/progression.exp completed in 14 seconds
+testcase ./lus2lic.tests/progression.exp completed in 13 seconds
 
 		=== lus2lic Summary ===
 
@@ -22175,4 +22175,4 @@ testcase ./lus2lic.tests/progression.exp completed in 14 seconds
 # of unexpected successes	8
 # of expected failures		26
 # of unresolved testcases	5
-runtest completed at Fri Jan 11 16:09:28 2013
+runtest completed at Fri Jan 11 17:04:31 2013
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 1ab3312b..bf6b549c 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,4 +1,4 @@
-Test Run By jahier on Fri Jan 11 16:13:34 2013
+Test Run By jahier on Fri Jan 11 17:02:48 2013
 Native configuration is i686-pc-linux-gnu
 
 		=== lus2lic tests ===
-- 
GitLab