From 52226f33cc3debc361298daf88e0e3290b888e92 Mon Sep 17 00:00:00 2001
From: Mamadou Ndiaye <ndiaye@malaval.imag.fr>
Date: Wed, 1 Jul 2015 11:14:53 +0200
Subject: [PATCH] kcg key word list

---
 README.org                 |   2 +-
 src/astV6Dump.ml           |   1 -
 src/compile.ml             |   5 +-
 src/l2lCheckKcgKeyWord.ml  |  69 +++++++++++
 src/l2lCheckMemSafe.ml     |   2 +-
 src/lic.ml                 |   4 +-
 src/licDump.ml             |  24 ++--
 src/lv6Id.mli              |   2 +-
 test/lus2lic-kcg.sum       | 242 ++++++++++++++++++-------------------
 test/lus2lic.sum           |   3 +
 test/should_work/pplus.lus |   2 +-
 11 files changed, 220 insertions(+), 136 deletions(-)
 create mode 100644 src/l2lCheckKcgKeyWord.ml

diff --git a/README.org b/README.org
index dc1d7af3..5f8b6cf1 100644
--- a/README.org
+++ b/README.org
@@ -75,7 +75,7 @@ lv6parserUtils.ml
 astCore.ml
 astV6.ml
 astPredef.ml
-ident.{ml|mli}
+Lv6Id.{ml|mli}
 
 ** and put input tables performing some checks along the way (references)
 
diff --git a/src/astV6Dump.ml b/src/astV6Dump.ml
index c0336359..dc0eae9c 100644
--- a/src/astV6Dump.ml
+++ b/src/astV6Dump.ml
@@ -6,7 +6,6 @@ open AstPredef
 open AstV6
 open AstCore
 open Format
-
 (***********************************************************************************)
 (* exported *)
 
diff --git a/src/compile.ml b/src/compile.ml
index f28f9f6f..bb6cde9e 100644
--- a/src/compile.ml
+++ b/src/compile.ml
@@ -42,7 +42,10 @@ let (doit : Lv6MainArgs.t -> AstV6.pack_or_model list -> Lv6Id.idref option -> L
     info "Converting to lic_prg...\n";
     let zelic = LicTab.to_lic_prg lic_tab in
     info "Check safety and memory declarations...\n";
-    L2lCheckMemSafe.doit zelic;
+    if  Lv6MainArgs.global_opt.Lv6MainArgs.kcg then 
+    L2lCheckKcgKeyWord.doit zelic
+ else
+  L2lCheckMemSafe.doit zelic;
     let zelic = 
       if not opt.Lv6MainArgs.optim_ite then zelic else ( 
         info "Optimizing if/then/else...\n";
diff --git a/src/l2lCheckKcgKeyWord.ml b/src/l2lCheckKcgKeyWord.ml
new file mode 100644
index 00000000..7a098000
--- /dev/null
+++ b/src/l2lCheckKcgKeyWord.ml
@@ -0,0 +1,69 @@
+
+open Lxm
+open Lic
+open AstPredef
+ 
+let dbg =  (Verbose.get_flag "kcg")
+
+(********************************************************************************)
+
+
+  
+module StringSet = 
+  Set.Make(struct
+             type t = string
+             let compare = compare
+           end)
+
+let kcg_kw_list = ["state";"clock";"initial"]
+let kcg_kw = StringSet.of_list kcg_kw_list
+
+let (check_var_info : Lic.var_info-> unit) =
+  fun v -> 
+    
+    (match v with
+    |var_name_eff->  
+      if StringSet.mem v.var_name_eff kcg_kw then 
+	 assert false;
+    |_ -> ()
+    )
+
+
+let (check_type :Lic.type_ -> unit) =
+  fun  typ ->
+    (*  (match typ.Named_type_exp with
+	|id_pack -> ()
+	|id_id ->) *)
+    ()
+(*    List.iter check_var_info typ.named_type_exp.id_id
+*)  
+let (check_const : Lic.const -> unit) =
+  fun  const ->
+  (*  List.iter check_var_info const.CallByName.STRUCT_n.id_id
+  *)
+()	 
+ (*   (match const.CallByName.STRUCT_n with 
+    |id_pack -> ()
+    |id_id -> 
+      List.iter Check_var_info id_id
+    )
+ *)
+(*  | CallByName of (by_name_op srcflagged  * (Lv6Id.t srcflagged * val_exp) list) *)
+
+let (check_node : Lic.node_exp -> unit) =
+  fun  node -> 
+    List.iter check_var_info  node.inlist_eff;
+    List.iter check_var_info  node.outlist_eff;
+    (match node.loclist_eff with
+    | None -> () 
+    | Some l ->   List.iter check_var_info l)  
+
+(********************************************************************************)
+
+(* exported *)
+
+let (doit :  LicPrg.t -> unit) =
+  fun inprg -> 
+    LicPrg.iter_nodes (fun _ n -> check_node n) inprg;
+    LicPrg.iter_types  (fun _ t -> check_type t) inprg;
+    LicPrg.iter_consts (fun _ c -> check_const c) inprg;
diff --git a/src/l2lCheckMemSafe.ml b/src/l2lCheckMemSafe.ml
index a4f85072..ba675a83 100644
--- a/src/l2lCheckMemSafe.ml
+++ b/src/l2lCheckMemSafe.ml
@@ -141,5 +141,5 @@ let (doit :  LicPrg.t -> unit) =
     let rec (do_node : Lic.node_key -> Lic.node_exp -> unit) = 
       fun _nk ne -> check_node inprg ne
     in
-    LicPrg.iter_nodes do_node inprg 
+    LicPrg.iter_nodes do_node inprg
     
diff --git a/src/lic.ml b/src/lic.ml
index d93d9d8e..386bcb02 100644
--- a/src/lic.ml
+++ b/src/lic.ml
@@ -50,6 +50,7 @@
         - eq_info :
         version compilée de eq_info 
 
+
         - node_exp :
         dénotation d'opération,
         peut être  predef ou utilisateur,
@@ -79,7 +80,6 @@ open Printf
 open Lxm
 open AstV6
 (* open AstCore *)
-
 let dbg = (Verbose.get_flag "lazyc")
 
 (*---------------------------------------------------------------------
@@ -215,6 +215,8 @@ and by_pos_op =
   ----------------------------------------------------------------------*)
 and const =
     (* type predef *)
+
+
     Bool_const_eff of bool
   | Int_const_eff of string
   | Real_const_eff of string
diff --git a/src/licDump.ml b/src/licDump.ml
index 15391be7..ec0e7473 100644
--- a/src/licDump.ml
+++ b/src/licDump.ml
@@ -349,7 +349,10 @@ and (string_of_leff : Lic.left -> string) =
     | LeftSliceLic(leff,si,_) -> (string_of_leff leff) ^ (string_of_slice_info_eff si)
 
 and (string_of_leff_list : Lic.left list -> string) =
-  fun l -> 
+  fun l -> if global_opt.kcg then
+      String.concat ", " (List.map string_of_leff l) 
+
+      else
     (if List.length l = 1 then "" else "(") ^ 
       (String.concat ", " (List.map string_of_leff l)) ^ 
       (if List.length l = 1 then "" else ")") 
@@ -446,6 +449,7 @@ and (string_of_by_pos_op_eff: Lic.by_pos_op srcflagged -> Lic.val_exp list -> st
             ^ " -> pre " ^ 
               (if is_a_tuple ve1 then tuple_par [ve2] else string_of_val_exp_eff ve2)
           else
+
 	         if global_opt.kcg then (
 	           "fby(" ^
                 (if is_a_tuple ve2 then tuple_par [ve2] else string_of_val_exp_eff ve2)
@@ -458,10 +462,13 @@ and (string_of_by_pos_op_eff: Lic.by_pos_op srcflagged -> Lic.val_exp list -> st
               ^ " fby " ^ 
                 (if is_a_tuple ve1 then tuple_par [ve2] else string_of_val_exp_eff ve2)
 	         )
+
         | WHEN clk, vel -> (tuple vel) ^ (string_of_clock clk)
 
-        | CURRENT Some _,_ -> "current " ^ tuple_par (if global_opt.ec then List.tl vel else vel)
-        | CURRENT None,_ -> "current " ^ tuple_par vel
+        | CURRENT Some _,_ -> (*if global_opt.kcg then "merge " ^ tuple_par vel  ^ " (true -> " ^
+          (tuple_par vel) ^ ") (false -> pre " ^ (tuple_par vel)  ^")"
+	  else *)"current " ^ tuple_par (if global_opt.ec then List.tl vel else vel)
+        | CURRENT None,_ -> (*if global_opt.kcg then else *) "current " ^ tuple_par vel
         | TUPLE,_ -> (tuple vel)
         | CONCAT, [ve1; ve2] ->  
           (string_of_val_exp_eff ve1) ^ " | " ^ (string_of_val_exp_eff ve2)
@@ -589,8 +596,8 @@ and string_of_eq_info_eff (leff_list, vee) =
 and (string_of_assert : Lic.val_exp srcflagged -> string ) =
   fun eq_eff -> 
     wrap_long_line (
-      (*if global_opt.kcg then "guarantee ID :"^ string_of_val_exp_eff eq_eff.it ^ ";"
-      else*)
+      if global_opt.kcg then "assume ID : " ^ string_of_val_exp_eff eq_eff.it ^ ";"
+      else
       "assert(" ^ string_of_val_exp_eff eq_eff.it ^ ");")
 
 and (string_of_eq : Lic.eq_info srcflagged -> string) =
@@ -691,18 +698,19 @@ and node_of_node_exp_eff (neff: Lic.node_exp): string =
         )
        )^(if global_opt.kcg then
 	   if neff.def_eff = ExternLic then "imported " else ""
-	 else ""
+	 else "")
 	   ^(if global_opt.kcg then 
                string_of_node_key_rec (not global_opt.no_prefix) neff.node_key_eff
 	     else
 	       string_of_node_key_rec  global_opt.no_prefix neff.node_key_eff
        )^(
         profile_of_node_exp_eff neff
-       )
-       )^
+	   )
+       ^
 	(match neff.def_eff with
         | ExternLic ->  ";\n"
         | MetaOpLic -> (
+
             (* on écrit juste un alias *)
           " = " ^(string_of_node_key_def neff.node_key_eff)^ ";\n"
          )
diff --git a/src/lv6Id.mli b/src/lv6Id.mli
index fed0c373..2712b9fe 100644
--- a/src/lv6Id.mli
+++ b/src/lv6Id.mli
@@ -2,7 +2,7 @@
 
 (**  *)
 
-type t = string
+type t = string (* exported for the debugger *) 
 type long = t * t
 type pack_name = t
 
diff --git a/test/lus2lic-kcg.sum b/test/lus2lic-kcg.sum
index 86ddec08..e17d88f7 100644
--- a/test/lus2lic-kcg.sum
+++ b/test/lus2lic-kcg.sum
@@ -1,4 +1,4 @@
-Test Run By ndiaye on Wed Jun 24 16:42:46 2015
+Test Run By ndiaye on Thu Jun 25 09:41:30 2015
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic-kcg tests ===
@@ -9,16 +9,16 @@ Schedule of variations:
 Running target unix
 Running ./lus2lic.tests/kcg.exp ...
 PASS: ./lus2lic  {-kcg -o COUNTER_scade.lus COUNTER.lus -n COUNTER}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  COUNTER_scade.lus  -node COUNTER 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  COUNTER_scade.lus  -node COUNTER 
 PASS: ./lus2lic  {-kcg -o CURRENT_scade.lus CURRENT.lus -n CURRENT}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  CURRENT_scade.lus  -node CURRENT 
 PASS: ./lus2lic  {-kcg -o Condact_scade.lus Condact.lus -n Condact}
 PASS: ./lus2lic  {-kcg -o EDGE_scade.lus EDGE.lus -n EDGE}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  EDGE_scade.lus  -node EDGE 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  EDGE_scade.lus  -node EDGE 
 PASS: ./lus2lic  {-kcg -o ELMU_scade.lus ELMU.lus -n ELMU}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ELMU_scade.lus  -node ELMU 
 PASS: ./lus2lic  {-kcg -o FALLING_EDGE_scade.lus FALLING_EDGE.lus -n FALLING_EDGE}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  FALLING_EDGE_scade.lus  -node FALLING_EDGE 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  FALLING_EDGE_scade.lus  -node FALLING_EDGE 
 PASS: ./lus2lic  {-kcg -o FillFollowedByRed_scade.lus FillFollowedByRed.lus -n FillFollowedByRed}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  FillFollowedByRed_scade.lus  -node FillFollowedByRed 
 PASS: ./lus2lic  {-kcg -o Gyroscope_scade.lus Gyroscope.lus -n Gyroscope}
@@ -31,7 +31,7 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o PCOND1_scade.lus PCOND1.lus -n PCOND1}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  PCOND1_scade.lus  -node PCOND1 
 PASS: ./lus2lic  {-kcg -o SOURIS_scade.lus SOURIS.lus -n SOURIS}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  SOURIS_scade.lus  -node SOURIS 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  SOURIS_scade.lus  -node SOURIS 
 PASS: ./lus2lic  {-kcg -o STABLE_scade.lus STABLE.lus -n STABLE}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  STABLE_scade.lus  -node STABLE 
 PASS: ./lus2lic  {-kcg -o SWITCH_scade.lus SWITCH.lus -n SWITCH}
@@ -51,35 +51,35 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o X6_scade.lus X6.lus -n X6}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  X6_scade.lus  -node X6 
 PASS: ./lus2lic  {-kcg -o aa_scade.lus aa.lus -n aa}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  aa_scade.lus  -node aa 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  aa_scade.lus  -node aa 
 PASS: ./lus2lic  {-kcg -o access_scade.lus access.lus -n access}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  access_scade.lus  -node access 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  access_scade.lus  -node access 
 PASS: ./lus2lic  --expand-nodes {-kcg -o activation1_scade.lus activation1.lus -n activation1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  activation1_scade.lus  -node activation1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  activation1_scade.lus  -node activation1 
 PASS: ./lus2lic  --expand-nodes {-kcg -o activation2_scade.lus activation2.lus -n activation2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  activation2_scade.lus  -node activation2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  activation2_scade.lus  -node activation2 
 PASS: ./lus2lic  {-kcg -o activation_ec_scade.lus activation_ec.lus -n activation_ec}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  activation_ec_scade.lus  -node activation_ec 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  activation_ec_scade.lus  -node activation_ec 
 PASS: ./lus2lic  {-kcg -o after_scade.lus after.lus -n after}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  after_scade.lus  -node after 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  after_scade.lus  -node after 
 PASS: ./lus2lic  {-kcg -o alias_scade.lus alias.lus -n alias}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  alias_scade.lus  -node alias 
 PASS: ./lus2lic  {-kcg -o arbitre_scade.lus arbitre.lus -n arbitre}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  arbitre_scade.lus  -node arbitre 
 PASS: ./lus2lic  {-kcg -o argos_scade.lus argos.lus -n argos}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  argos_scade.lus  -node argos 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  argos_scade.lus  -node argos 
 PASS: ./lus2lic  {-kcg -o array_concat_scade.lus array_concat.lus -n array_concat}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  array_concat_scade.lus  -node array_concat 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  array_concat_scade.lus  -node array_concat 
 PASS: ./lus2lic  {-kcg -o array_concat2_scade.lus array_concat2.lus -n array_concat2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  array_concat2_scade.lus  -node array_concat2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  array_concat2_scade.lus  -node array_concat2 
 PASS: ./lus2lic  {-kcg -o arrays_scade.lus arrays.lus -n arrays}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  arrays_scade.lus  -node arrays 
 PASS: ./lus2lic  --expand-nodes {-kcg -o asservi_scade.lus asservi.lus -n asservi}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  asservi_scade.lus  -node asservi 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  asservi_scade.lus  -node asservi 
 PASS: ./lus2lic  {-kcg -o bad_call03_scade.lus bad_call03.lus -n bad_call03}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bad_call03_scade.lus  -node bad_call03 
 PASS: ./lus2lic  {-kcg -o bascule_scade.lus bascule.lus -n bascule}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bascule_scade.lus  -node bascule 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bascule_scade.lus  -node bascule 
 PASS: ./lus2lic  {-kcg -o bob_scade.lus bob.lus -n bob}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bob_scade.lus  -node bob 
 PASS: ./lus2lic  {-kcg -o bred_scade.lus bred.lus -n bred}
@@ -87,30 +87,30 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o bred_lv4_scade.lus bred_lv4.lus -n bred_lv4}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bred_lv4_scade.lus  -node bred_lv4 
 PASS: ./lus2lic  {-kcg -o bug_scade.lus bug.lus -n bug}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bug_scade.lus  -node bug 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bug_scade.lus  -node bug 
 PASS: ./lus2lic  {-kcg -o bug2_scade.lus bug2.lus -n bug2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bug2_scade.lus  -node bug2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  bug2_scade.lus  -node bug2 
 FAIL: Test -kcg  : ./lus2lic  {-kcg -o bug_map_fby_scade.lus bug_map_fby.lus -n bug_map_fby}
 PASS: ./lus2lic  {-kcg -o calculs_max_scade.lus calculs_max.lus -n calculs_max}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  calculs_max_scade.lus  -node calculs_max 
 PASS: ./lus2lic  {-kcg -o call_scade.lus call.lus -n call}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call_scade.lus  -node call 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call_scade.lus  -node call 
 PASS: ./lus2lic  {-kcg -o call01_scade.lus call01.lus -n call01}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call01_scade.lus  -node call01 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call01_scade.lus  -node call01 
 PASS: ./lus2lic  {-kcg -o call02_scade.lus call02.lus -n call02}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call02_scade.lus  -node call02 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call02_scade.lus  -node call02 
 PASS: ./lus2lic  {-kcg -o call03_scade.lus call03.lus -n call03}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call03_scade.lus  -node call03 
 PASS: ./lus2lic  {-kcg -o call04_scade.lus call04.lus -n call04}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call04_scade.lus  -node call04 
 PASS: ./lus2lic  {-kcg -o call05_scade.lus call05.lus -n call05}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call05_scade.lus  -node call05 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call05_scade.lus  -node call05 
 PASS: ./lus2lic  {-kcg -o call06_scade.lus call06.lus -n call06}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call06_scade.lus  -node call06 
 PASS: ./lus2lic  {-kcg -o call07_scade.lus call07.lus -n call07}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call07_scade.lus  -node call07 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  call07_scade.lus  -node call07 
 PASS: ./lus2lic  {-kcg -o carV2_scade.lus carV2.lus -n carV2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  carV2_scade.lus  -node carV2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  carV2_scade.lus  -node carV2 
 FAIL: Test -kcg  : ./lus2lic  {-kcg -o carligths_scade.lus carligths.lus -n carligths}
 PASS: ./lus2lic  {-kcg -o ck2_scade.lus ck2.lus -n ck2}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ck2_scade.lus  -node ck2 
@@ -131,71 +131,71 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o cminus_scade.lus cminus.lus -n cminus}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  cminus_scade.lus  -node cminus 
 PASS: ./lus2lic  {-kcg -o complex_scade.lus complex.lus -n complex}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  complex_scade.lus  -node complex 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  complex_scade.lus  -node complex 
 PASS: ./lus2lic  {-kcg -o compteur_scade.lus compteur.lus -n compteur}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  compteur_scade.lus  -node compteur 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  compteur_scade.lus  -node compteur 
 PASS: ./lus2lic  {-kcg -o cond01_scade.lus cond01.lus -n cond01}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  cond01_scade.lus  -node cond01 
 PASS: ./lus2lic  {-kcg -o consensus_scade.lus consensus.lus -n consensus}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  consensus_scade.lus  -node consensus 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  consensus_scade.lus  -node consensus 
 PASS: ./lus2lic  {-kcg -o consensus2_scade.lus consensus2.lus -n consensus2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  consensus2_scade.lus  -node consensus2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  consensus2_scade.lus  -node consensus2 
 PASS: ./lus2lic  {-kcg -o contractForElementSelectionInArray_scade.lus contractForElementSelectionInArray.lus -n contractForElementSelectionInArray}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  contractForElementSelectionInArray_scade.lus  -node contractForElementSelectionInArray 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  contractForElementSelectionInArray_scade.lus  -node contractForElementSelectionInArray 
 PASS: ./lus2lic  {-kcg -o count_scade.lus count.lus -n count}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  count_scade.lus  -node count 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  count_scade.lus  -node count 
 PASS: ./lus2lic  {-kcg -o cpt_scade.lus cpt.lus -n cpt}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  cpt_scade.lus  -node cpt 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  cpt_scade.lus  -node cpt 
 PASS: ./lus2lic  {-kcg -o cst_scade.lus cst.lus -n cst}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  cst_scade.lus  -node cst 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  cst_scade.lus  -node cst 
 PASS: ./lus2lic  {-kcg -o deSimone_scade.lus deSimone.lus -n deSimone}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  deSimone_scade.lus  -node deSimone 
 PASS: ./lus2lic  {-kcg -o decl_scade.lus decl.lus -n decl}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  decl_scade.lus  -node decl 
 PASS: ./lus2lic  {-kcg -o declaration_scade.lus declaration.lus -n declaration}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  declaration_scade.lus  -node declaration 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  declaration_scade.lus  -node declaration 
 PASS: ./lus2lic  {-kcg -o deconne_scade.lus deconne.lus -n deconne}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  deconne_scade.lus  -node deconne 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  deconne_scade.lus  -node deconne 
 PASS: ./lus2lic  {-kcg -o dep_scade.lus dep.lus -n dep}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  dep_scade.lus  -node dep 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  dep_scade.lus  -node dep 
 PASS: ./lus2lic  {-kcg -o dependeur_scade.lus dependeur.lus -n dependeur}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  dependeur_scade.lus  -node dependeur 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  dependeur_scade.lus  -node dependeur 
 PASS: ./lus2lic  {-kcg -o dependeur_struct_scade.lus dependeur_struct.lus -n dependeur_struct}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  dependeur_struct_scade.lus  -node dependeur_struct 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  dependeur_struct_scade.lus  -node dependeur_struct 
 PASS: ./lus2lic  {-kcg -o double_delay_scade.lus double_delay.lus -n double_delay}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  double_delay_scade.lus  -node double_delay 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  double_delay_scade.lus  -node double_delay 
 PASS: ./lus2lic  {-kcg -o ec_scade.lus ec.lus -n ec}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ec_scade.lus  -node ec 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ec_scade.lus  -node ec 
 PASS: ./lus2lic  {-kcg -o enum0_scade.lus enum0.lus -n enum0}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  enum0_scade.lus  -node enum0 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  enum0_scade.lus  -node enum0 
 PASS: ./lus2lic  {-kcg -o ex_scade.lus ex.lus -n ex}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ex_scade.lus  -node ex 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ex_scade.lus  -node ex 
 PASS: ./lus2lic  {-kcg -o exclusion_scade.lus exclusion.lus -n exclusion}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  exclusion_scade.lus  -node exclusion 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  exclusion_scade.lus  -node exclusion 
 PASS: ./lus2lic  {-kcg -o filliter_scade.lus filliter.lus -n filliter}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  filliter_scade.lus  -node filliter 
 PASS: ./lus2lic  {-kcg -o filter_scade.lus filter.lus -n filter}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  filter_scade.lus  -node filter 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  filter_scade.lus  -node filter 
 PASS: ./lus2lic  {-kcg -o flo_scade.lus flo.lus -n flo}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  flo_scade.lus  -node flo 
 PASS: ./lus2lic  {-kcg -o followed_by_scade.lus followed_by.lus -n followed_by}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  followed_by_scade.lus  -node followed_by 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  followed_by_scade.lus  -node followed_by 
 PASS: ./lus2lic  {-kcg -o fresh_name_scade.lus fresh_name.lus -n fresh_name}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  fresh_name_scade.lus  -node fresh_name 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  fresh_name_scade.lus  -node fresh_name 
 PASS: ./lus2lic  {-kcg -o func_with_body_scade.lus func_with_body.lus -n func_with_body}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  func_with_body_scade.lus  -node func_with_body 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  func_with_body_scade.lus  -node func_with_body 
 PASS: ./lus2lic  {-kcg -o hanane_scade.lus hanane.lus -n hanane}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  hanane_scade.lus  -node hanane 
 PASS: ./lus2lic  {-kcg -o heater_control_scade.lus heater_control.lus -n heater_control}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  heater_control_scade.lus  -node heater_control 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  heater_control_scade.lus  -node heater_control 
 PASS: ./lus2lic  {-kcg -o impl_priority_scade.lus impl_priority.lus -n impl_priority}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  impl_priority_scade.lus  -node impl_priority 
 PASS: ./lus2lic  {-kcg -o import1_scade.lus import1.lus -n import1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  import1_scade.lus  -node import1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  import1_scade.lus  -node import1 
 PASS: ./lus2lic  {-kcg -o initial_scade.lus initial.lus -n initial}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  initial_scade.lus  -node initial 
 PASS: ./lus2lic  {-kcg -o integrator_scade.lus integrator.lus -n integrator}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  integrator_scade.lus  -node integrator 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  integrator_scade.lus  -node integrator 
 PASS: ./lus2lic  {-kcg -o is_stable_scade.lus is_stable.lus -n is_stable}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  is_stable_scade.lus  -node is_stable 
 PASS: ./lus2lic  {-kcg -o iter_scade.lus iter.lus -n iter}
@@ -205,11 +205,11 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o iterate_scade.lus iterate.lus -n iterate}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  iterate_scade.lus  -node iterate 
 PASS: ./lus2lic  {-kcg -o left_scade.lus left.lus -n left}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  left_scade.lus  -node left 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  left_scade.lus  -node left 
 PASS: ./lus2lic  {-kcg -o long_et_stupide_nom_de_noeud_scade.lus long_et_stupide_nom_de_noeud.lus -n long_et_stupide_nom_de_noeud}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  long_et_stupide_nom_de_noeud_scade.lus  -node long_et_stupide_nom_de_noeud 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  long_et_stupide_nom_de_noeud_scade.lus  -node long_et_stupide_nom_de_noeud 
 PASS: ./lus2lic  {-kcg -o lucky_scade.lus lucky.lus -n lucky}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  lucky_scade.lus  -node lucky 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  lucky_scade.lus  -node lucky 
 PASS: ./lus2lic  {-kcg -o lustre_scade.lus lustre.lus -n lustre}
 PASS: ./lus2lic  {-kcg -o lustre_test1_ok_scade.lus lustre_test1_ok.lus -n lustre_test1_ok}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  lustre_test1_ok_scade.lus  -node lustre_test1_ok 
@@ -230,31 +230,31 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o matrice2_scade.lus matrice2.lus -n matrice2}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  matrice2_scade.lus  -node matrice2 
 PASS: ./lus2lic  {-kcg -o minmax1_scade.lus minmax1.lus -n minmax1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax1_scade.lus  -node minmax1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax1_scade.lus  -node minmax1 
 PASS: ./lus2lic  {-kcg -o minmax2_scade.lus minmax2.lus -n minmax2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax2_scade.lus  -node minmax2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax2_scade.lus  -node minmax2 
 PASS: ./lus2lic  {-kcg -o minmax3_scade.lus minmax3.lus -n minmax3}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax3_scade.lus  -node minmax3 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax3_scade.lus  -node minmax3 
 PASS: ./lus2lic  {-kcg -o minmax4_scade.lus minmax4.lus -n minmax4}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax4_scade.lus  -node minmax4 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax4_scade.lus  -node minmax4 
 PASS: ./lus2lic  {-kcg -o minmax4_bis_scade.lus minmax4_bis.lus -n minmax4_bis}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax4_bis_scade.lus  -node minmax4_bis 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax4_bis_scade.lus  -node minmax4_bis 
 PASS: ./lus2lic  {-kcg -o minmax5_scade.lus minmax5.lus -n minmax5}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax5_scade.lus  -node minmax5 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax5_scade.lus  -node minmax5 
 PASS: ./lus2lic  {-kcg -o minmax5_random_scade.lus minmax5_random.lus -n minmax5_random}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax5_random_scade.lus  -node minmax5_random 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax5_random_scade.lus  -node minmax5_random 
 PASS: ./lus2lic  {-kcg -o minmax6_scade.lus minmax6.lus -n minmax6}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax6_scade.lus  -node minmax6 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minmax6_scade.lus  -node minmax6 
 PASS: ./lus2lic  {-kcg -o minus_scade.lus minus.lus -n minus}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  minus_scade.lus  -node minus 
 PASS: ./lus2lic  {-kcg -o mm_scade.lus mm.lus -n mm}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm_scade.lus  -node mm 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm_scade.lus  -node mm 
 PASS: ./lus2lic  {-kcg -o mm1_scade.lus mm1.lus -n mm1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm1_scade.lus  -node mm1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm1_scade.lus  -node mm1 
 PASS: ./lus2lic  {-kcg -o mm22_scade.lus mm22.lus -n mm22}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm22_scade.lus  -node mm22 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm22_scade.lus  -node mm22 
 PASS: ./lus2lic  {-kcg -o mm3_scade.lus mm3.lus -n mm3}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm3_scade.lus  -node mm3 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mm3_scade.lus  -node mm3 
 PASS: ./lus2lic  {-kcg -o model_scade.lus model.lus -n model}
 PASS: ./lus2lic  {-kcg -o model2_scade.lus model2.lus -n model2}
 PASS: ./lus2lic  {-kcg -o modelInst_scade.lus modelInst.lus -n modelInst}
@@ -265,15 +265,15 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o modes3x2_v4_scade.lus modes3x2_v4.lus -n modes3x2_v4}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  modes3x2_v4_scade.lus  -node modes3x2_v4 
 PASS: ./lus2lic  {-kcg -o morel_scade.lus morel.lus -n morel}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel_scade.lus  -node morel 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel_scade.lus  -node morel 
 PASS: ./lus2lic  {-kcg -o morel2_scade.lus morel2.lus -n morel2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel2_scade.lus  -node morel2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel2_scade.lus  -node morel2 
 PASS: ./lus2lic  {-kcg -o morel3_scade.lus morel3.lus -n morel3}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel3_scade.lus  -node morel3 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel3_scade.lus  -node morel3 
 PASS: ./lus2lic  {-kcg -o morel4_scade.lus morel4.lus -n morel4}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel4_scade.lus  -node morel4 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel4_scade.lus  -node morel4 
 PASS: ./lus2lic  {-kcg -o morel5_scade.lus morel5.lus -n morel5}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel5_scade.lus  -node morel5 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  morel5_scade.lus  -node morel5 
 PASS: ./lus2lic  {-kcg -o mouse_scade.lus mouse.lus -n mouse}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  mouse_scade.lus  -node mouse 
 PASS: ./lus2lic  {-kcg -o mouse1_scade.lus mouse1.lus -n mouse1}
@@ -289,44 +289,44 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o multipar_scade.lus multipar.lus -n multipar}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  multipar_scade.lus  -node multipar 
 PASS: ./lus2lic  {-kcg -o nc1_scade.lus nc1.lus -n nc1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc1_scade.lus  -node nc1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc1_scade.lus  -node nc1 
 PASS: ./lus2lic  {-kcg -o nc10_scade.lus nc10.lus -n nc10}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc10_scade.lus  -node nc10 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc10_scade.lus  -node nc10 
 PASS: ./lus2lic  {-kcg -o nc2_scade.lus nc2.lus -n nc2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc2_scade.lus  -node nc2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc2_scade.lus  -node nc2 
 PASS: ./lus2lic  {-kcg -o nc3_scade.lus nc3.lus -n nc3}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc3_scade.lus  -node nc3 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc3_scade.lus  -node nc3 
 PASS: ./lus2lic  {-kcg -o nc4_scade.lus nc4.lus -n nc4}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc4_scade.lus  -node nc4 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc4_scade.lus  -node nc4 
 PASS: ./lus2lic  {-kcg -o nc5_scade.lus nc5.lus -n nc5}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc5_scade.lus  -node nc5 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc5_scade.lus  -node nc5 
 PASS: ./lus2lic  {-kcg -o nc6_scade.lus nc6.lus -n nc6}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc6_scade.lus  -node nc6 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc6_scade.lus  -node nc6 
 PASS: ./lus2lic  {-kcg -o nc7_scade.lus nc7.lus -n nc7}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc7_scade.lus  -node nc7 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc7_scade.lus  -node nc7 
 PASS: ./lus2lic  {-kcg -o nc8_scade.lus nc8.lus -n nc8}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc8_scade.lus  -node nc8 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc8_scade.lus  -node nc8 
 PASS: ./lus2lic  {-kcg -o nc9_scade.lus nc9.lus -n nc9}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc9_scade.lus  -node nc9 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nc9_scade.lus  -node nc9 
 PASS: ./lus2lic  {-kcg -o nested_scade.lus nested.lus -n nested}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nested_scade.lus  -node nested 
 PASS: ./lus2lic  {-kcg -o newpacks_scade.lus newpacks.lus -n newpacks}
 PASS: ./lus2lic  {-kcg -o noAlarm_scade.lus noAlarm.lus -n noAlarm}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  noAlarm_scade.lus  -node noAlarm 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  noAlarm_scade.lus  -node noAlarm 
 PASS: ./lus2lic  {-kcg -o node_caller1_scade.lus node_caller1.lus -n node_caller1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  node_caller1_scade.lus  -node node_caller1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  node_caller1_scade.lus  -node node_caller1 
 PASS: ./lus2lic  {-kcg -o nodeparam_scade.lus nodeparam.lus -n nodeparam}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nodeparam_scade.lus  -node nodeparam 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  nodeparam_scade.lus  -node nodeparam 
 PASS: ./lus2lic  {-kcg -o noeudsIndependants_scade.lus noeudsIndependants.lus -n noeudsIndependants}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  noeudsIndependants_scade.lus  -node noeudsIndependants 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  noeudsIndependants_scade.lus  -node noeudsIndependants 
 PASS: ./lus2lic  {-kcg -o normal_scade.lus normal.lus -n normal}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  normal_scade.lus  -node normal 
 PASS: ./lus2lic  {-kcg -o notTwo_scade.lus notTwo.lus -n notTwo}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  notTwo_scade.lus  -node notTwo 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  notTwo_scade.lus  -node notTwo 
 PASS: ./lus2lic  {-kcg -o o2l_feux_compl_scade.lus o2l_feux_compl.lus -n o2l_feux_compl}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  o2l_feux_compl_scade.lus  -node o2l_feux_compl 
 PASS: ./lus2lic  {-kcg -o oneq_scade.lus oneq.lus -n oneq}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  oneq_scade.lus  -node oneq 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  oneq_scade.lus  -node oneq 
 PASS: ./lus2lic  {-kcg -o onlyroll_scade.lus onlyroll.lus -n onlyroll}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  onlyroll_scade.lus  -node onlyroll 
 PASS: ./lus2lic  {-kcg -o onlyroll2_scade.lus onlyroll2.lus -n onlyroll2}
@@ -344,13 +344,13 @@ PASS: ./lus2lic  {-kcg -o packageTableau_scade.lus packageTableau.lus -n package
 PASS: ./lus2lic  {-kcg -o packed_cst_scade.lus packed_cst.lus -n packed_cst}
 PASS: ./lus2lic  {-kcg -o packs_scade.lus packs.lus -n packs}
 PASS: ./lus2lic  {-kcg -o param_node_scade.lus param_node.lus -n param_node}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node_scade.lus  -node param_node 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node_scade.lus  -node param_node 
 PASS: ./lus2lic  {-kcg -o param_node2_scade.lus param_node2.lus -n param_node2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node2_scade.lus  -node param_node2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node2_scade.lus  -node param_node2 
 PASS: ./lus2lic  {-kcg -o param_node3_scade.lus param_node3.lus -n param_node3}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node3_scade.lus  -node param_node3 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node3_scade.lus  -node param_node3 
 PASS: ./lus2lic  {-kcg -o param_node4_scade.lus param_node4.lus -n param_node4}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node4_scade.lus  -node param_node4 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_node4_scade.lus  -node param_node4 
 PASS: ./lus2lic  {-kcg -o param_struct_scade.lus param_struct.lus -n param_struct}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  param_struct_scade.lus  -node param_struct 
 PASS: ./lus2lic  {-kcg -o pilote-1.0_scade.lus pilote-1.0.lus -n pilote-1.0}
@@ -369,7 +369,7 @@ PASS: ./lus2lic  {-kcg -o poussoir_scade.lus poussoir.lus -n poussoir}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  poussoir_scade.lus  -node poussoir 
 FAIL: Test -kcg  : ./lus2lic  {-kcg -o pplus_scade.lus pplus.lus -n pplus}
 PASS: ./lus2lic  {-kcg -o pre_x_scade.lus pre_x.lus -n pre_x}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  pre_x_scade.lus  -node pre_x 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  pre_x_scade.lus  -node pre_x 
 PASS: ./lus2lic  {-kcg -o predef01_scade.lus predef01.lus -n predef01}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  predef01_scade.lus  -node predef01 
 PASS: ./lus2lic  {-kcg -o predef02_scade.lus predef02.lus -n predef02}
@@ -379,7 +379,7 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o predefOp_scade.lus predefOp.lus -n predefOp}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  predefOp_scade.lus  -node predefOp 
 PASS: ./lus2lic  {-kcg -o produitBool_scade.lus produitBool.lus -n produitBool}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  produitBool_scade.lus  -node produitBool 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  produitBool_scade.lus  -node produitBool 
 PASS: ./lus2lic  {-kcg -o redIf_scade.lus redIf.lus -n redIf}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  redIf_scade.lus  -node redIf 
 PASS: ./lus2lic  {-kcg -o rediter_scade.lus rediter.lus -n rediter}
@@ -388,7 +388,7 @@ PASS: ./lus2lic  {-kcg -o redoptest_scade.lus redoptest.lus -n redoptest}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  redoptest_scade.lus  -node redoptest 
 PASS: ./lus2lic  {-kcg -o remplissage-1.0_scade.lus remplissage-1.0.lus -n remplissage-1.0}
 PASS: ./lus2lic  {-kcg -o rs_scade.lus rs.lus -n rs}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  rs_scade.lus  -node rs 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  rs_scade.lus  -node rs 
 PASS: ./lus2lic  {-kcg -o sample_time_change_scade.lus sample_time_change.lus -n sample_time_change}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  sample_time_change_scade.lus  -node sample_time_change 
 PASS: ./lus2lic  {-kcg -o sample_time_change_MainNode_scade.lus sample_time_change_MainNode.lus -n sample_time_change_MainNode}
@@ -398,13 +398,13 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o shift_ludic_scade.lus shift_ludic.lus -n shift_ludic}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  shift_ludic_scade.lus  -node shift_ludic 
 PASS: ./lus2lic  {-kcg -o simple_scade.lus simple.lus -n simple}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  simple_scade.lus  -node simple 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  simple_scade.lus  -node simple 
 PASS: ./lus2lic  {-kcg -o simpleRed_scade.lus simpleRed.lus -n simpleRed}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  simpleRed_scade.lus  -node simpleRed 
 PASS: ./lus2lic  {-kcg -o sincos_scade.lus sincos.lus -n sincos}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  sincos_scade.lus  -node sincos 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  sincos_scade.lus  -node sincos 
 PASS: ./lus2lic  --expand-nodes {-kcg -o speedcontrol_scade.lus speedcontrol.lus -n speedcontrol}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  speedcontrol_scade.lus  -node speedcontrol 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  speedcontrol_scade.lus  -node speedcontrol 
 PASS: ./lus2lic  {-kcg -o stopwatch_scade.lus stopwatch.lus -n stopwatch}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  stopwatch_scade.lus  -node stopwatch 
 PASS: ./lus2lic  {-kcg -o struct0_scade.lus struct0.lus -n struct0}
@@ -412,22 +412,22 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o struct_with_scade.lus struct_with.lus -n struct_with}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  struct_with_scade.lus  -node struct_with 
 PASS: ./lus2lic  {-kcg -o t0_scade.lus t0.lus -n t0}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  t0_scade.lus  -node t0 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  t0_scade.lus  -node t0 
 PASS: ./lus2lic  {-kcg -o t1_scade.lus t1.lus -n t1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  t1_scade.lus  -node t1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  t1_scade.lus  -node t1 
 PASS: ./lus2lic  {-kcg -o t2_scade.lus t2.lus -n t2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  t2_scade.lus  -node t2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  t2_scade.lus  -node t2 
 PASS: ./lus2lic  {-kcg -o test_scade.lus test.lus -n test}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_scade.lus  -node test 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_scade.lus  -node test 
 PASS: ./lus2lic  {-kcg -o testBoite_scade.lus testBoite.lus -n testBoite}
 PASS: ./lus2lic  {-kcg -o testCA_scade.lus testCA.lus -n testCA}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  testCA_scade.lus  -node testCA 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  testCA_scade.lus  -node testCA 
 PASS: ./lus2lic  {-kcg -o testCapt_scade.lus testCapt.lus -n testCapt}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  testCapt_scade.lus  -node testCapt 
 PASS: ./lus2lic  {-kcg -o testPilote_scade.lus testPilote.lus -n testPilote}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  testPilote_scade.lus  -node testPilote 
 PASS: ./lus2lic  {-kcg -o test_arrow_scade.lus test_arrow.lus -n test_arrow}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_arrow_scade.lus  -node test_arrow 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_arrow_scade.lus  -node test_arrow 
 PASS: ./lus2lic  {-kcg -o test_boolred_scade.lus test_boolred.lus -n test_boolred}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_boolred_scade.lus  -node test_boolred 
 PASS: ./lus2lic  {-kcg -o test_clash_scade.lus test_clash.lus -n test_clash}
@@ -436,17 +436,17 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o test_const_scade.lus test_const.lus -n test_const}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_const_scade.lus  -node test_const 
 PASS: ./lus2lic  {-kcg -o test_diese_scade.lus test_diese.lus -n test_diese}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_diese_scade.lus  -node test_diese 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_diese_scade.lus  -node test_diese 
 PASS: ./lus2lic  {-kcg -o test_enum_scade.lus test_enum.lus -n test_enum}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_enum_scade.lus  -node test_enum 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_enum_scade.lus  -node test_enum 
 PASS: ./lus2lic  {-kcg -o test_extern_scade.lus test_extern.lus -n test_extern}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_extern_scade.lus  -node test_extern 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_extern_scade.lus  -node test_extern 
 PASS: ./lus2lic  {-kcg -o test_map_scade.lus test_map.lus -n test_map}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_map_scade.lus  -node test_map 
 PASS: ./lus2lic  {-kcg -o test_merge_scade.lus test_merge.lus -n test_merge}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_merge_scade.lus  -node test_merge 
 PASS: ./lus2lic  {-kcg -o test_node_expand_scade.lus test_node_expand.lus -n test_node_expand}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_node_expand_scade.lus  -node test_node_expand 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_node_expand_scade.lus  -node test_node_expand 
 PASS: ./lus2lic  {-kcg -o test_node_expand2_scade.lus test_node_expand2.lus -n test_node_expand2}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_node_expand2_scade.lus  -node test_node_expand2 
 PASS: ./lus2lic  {-kcg -o test_poly_scade.lus test_poly.lus -n test_poly}
@@ -454,35 +454,35 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o test_struct_scade.lus test_struct.lus -n test_struct}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  test_struct_scade.lus  -node test_struct 
 PASS: ./lus2lic  {-kcg -o titi_scade.lus titi.lus -n titi}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  titi_scade.lus  -node titi 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  titi_scade.lus  -node titi 
 PASS: ./lus2lic  {-kcg -o toolate_scade.lus toolate.lus -n toolate}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  toolate_scade.lus  -node toolate 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  toolate_scade.lus  -node toolate 
 PASS: ./lus2lic  {-kcg -o toto_scade.lus toto.lus -n toto}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  toto_scade.lus  -node toto 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  toto_scade.lus  -node toto 
 PASS: ./lus2lic  {-kcg -o tranche_scade.lus tranche.lus -n tranche}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  tranche_scade.lus  -node tranche 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  tranche_scade.lus  -node tranche 
 PASS: ./lus2lic  {-kcg -o tri_scade.lus tri.lus -n tri}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  tri_scade.lus  -node tri 
 PASS: ./lus2lic  {-kcg -o triSel_scade.lus triSel.lus -n triSel}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  triSel_scade.lus  -node triSel 
 PASS: ./lus2lic  {-kcg -o trivial_scade.lus trivial.lus -n trivial}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  trivial_scade.lus  -node trivial 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  trivial_scade.lus  -node trivial 
 PASS: ./lus2lic  {-kcg -o trivial2_scade.lus trivial2.lus -n trivial2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  trivial2_scade.lus  -node trivial2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  trivial2_scade.lus  -node trivial2 
 PASS: ./lus2lic  {-kcg -o trivial_array_scade.lus trivial_array.lus -n trivial_array}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  trivial_array_scade.lus  -node trivial_array 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  trivial_array_scade.lus  -node trivial_array 
 PASS: ./lus2lic  {-kcg -o ts01_scade.lus ts01.lus -n ts01}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ts01_scade.lus  -node ts01 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ts01_scade.lus  -node ts01 
 PASS: ./lus2lic  {-kcg -o ts04_scade.lus ts04.lus -n ts04}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ts04_scade.lus  -node ts04 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  ts04_scade.lus  -node ts04 
 PASS: ./lus2lic  {-kcg -o tuple_scade.lus tuple.lus -n tuple}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  tuple_scade.lus  -node tuple 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  tuple_scade.lus  -node tuple 
 PASS: ./lus2lic  {-kcg -o type_decl_scade.lus type_decl.lus -n type_decl}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  type_decl_scade.lus  -node type_decl 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  type_decl_scade.lus  -node type_decl 
 PASS: ./lus2lic  {-kcg -o uu_scade.lus uu.lus -n uu}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  uu_scade.lus  -node uu 
 PASS: ./lus2lic  {-kcg -o v1_scade.lus v1.lus -n v1}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  v1_scade.lus  -node v1 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  v1_scade.lus  -node v1 
 PASS: ./lus2lic  {-kcg -o when_tuple_scade.lus when_tuple.lus -n when_tuple}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  when_tuple_scade.lus  -node when_tuple 
 PASS: ./lus2lic  {-kcg -o xx_scade.lus xx.lus -n xx}
@@ -492,11 +492,11 @@ FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/mi
 PASS: ./lus2lic  {-kcg -o yyy_scade.lus yyy.lus -n yyy}
 FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  yyy_scade.lus  -node yyy 
 PASS: ./lus2lic  {-kcg -o zzz_scade.lus zzz.lus -n zzz}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  zzz_scade.lus  -node zzz 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  zzz_scade.lus  -node zzz 
 PASS: ./lus2lic  {-kcg -o zzz2_scade.lus zzz2.lus -n zzz2}
-FAIL: Check that the generated scade code compiles  : /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  zzz2_scade.lus  -node zzz2 
+PASS: /usr/local/tools/lustre/misc/scade-win32/621/bin/s2c  zzz2_scade.lus  -node zzz2 
 
 		=== lus2lic-kcg Summary ===
 
-# of expected passes		250
-# of unexpected failures	237
+# of expected passes		368
+# of unexpected failures	119
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index bc072a05..f8127fda 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 ==> lus2lic0.sum <==
 Test Run By jahier on Tue Jun 23 17:05:08 
 Native configuration is x86_64-unknown-linux-gnu
@@ -1753,3 +1754,5 @@ lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 46 seconds
 * Quick time (-j 4):
 0.03user 0.03system 0:51.33elapsed 0%CPU (0avgtext+0avgdata 5108maxresident)k
 32inputs+0outputs (0major+5566minor)pagefaults 0swaps
+=======
+>>>>>>> Stashed changes
diff --git a/test/should_work/pplus.lus b/test/should_work/pplus.lus
index bcc89f9b..55772a8e 100644
--- a/test/should_work/pplus.lus
+++ b/test/should_work/pplus.lus
@@ -1,4 +1,4 @@
-node plus(a: int ; b: int) returns (d: int);
+node pplus(a: int ; b: int) returns (d: int);
 let
   d = a + b;
 tel
-- 
GitLab