-2c: bad _assign_ macros were generated for extern constant

_oasis

 OASISFormat: 0.4
 Name:        lustre-v6
-Version:     1.662
+Version:     1.663
 Synopsis:    The Lustre V6 Verimag compiler
 Description: This package contains:
    (1) lus2lic: the (current) name of the compiler (and interpreter via -exec).

src/lv6MainArgs.ml

-(* Time-stamp: <modified the 05/09/2016 (at 11:02) by Erwan Jahier> *)
+(* Time-stamp: <modified the 09/09/2016 (at 15:01) by Erwan Jahier> *)
 (*
 Le manager d'argument adapt de celui de lutin, plus joli
 N.B. solution un peu batarde : les options sont stockes, comme avant, dans Global,
@@ -11,7 +11,7 @@ open Arg
 let tool_name = Lv6version.tool
 let usage_msg =  "usage: "^tool_name^" [options] <file> | "^tool_name^" -help"
 
-type enum_mode = AsInt | AsBool | AsConst | AsEnum 
+type enum_mode = AsInt | AsBool (* finishme *) | AsConst | AsEnum 
 type io_transmit_mode = Stack | Heap | HeapStack
 type schedul_mode = Simple | Sort | Reorder
 

src/lv6MainArgs.mli

 
 type enum_mode = 
     AsInt  (* translate enums into int (for rif-friendlyness *)
-  | AsBool (* translate enums into bool arrays (for lesar-friendlyness *)
+  | AsBool (* translate enums into bool arrays; not working yet *)
   | AsConst  (* translate enums into abstract const *)
   | AsEnum (* do nothing *)
 

src/lv6version.ml

 (** Automatically generated from Makefile *) 
 let tool = "lus2lic"
 let branch = "master"
-let commit = "662"
-let sha_1 = "dc44269befd884f2e80129d89556aad0f66ad829"
+let commit = "663"
+let sha_1 = "337a20a9ee8c99cc5711c3f137ab79c8256104df"
 let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
 let maintainer = "jahier@imag.fr"

src/soc2cHeap.ml

-(* Time-stamp: <modified the 10/04/2015 (at 15:14) by Erwan Jahier> *)
+(* Time-stamp: <modified the 09/09/2016 (at 11:56) by Erwan Jahier> *)
 
 open Soc2cUtil
 open Soc2cIdent
@@ -43,7 +43,7 @@ let rec (gen_assign : Data.t  -> string -> string -> string) =
         Printf.sprintf "  _assign_%s(%s, %s, sizeof(%s));\n" t_str_short vi vo t_str
 
       | Data.Extern (id) -> 
-        Printf.sprintf "  _assign_%s(&%s, &%s, sizeof(%s));\n" (id2s id) vi vo t_str
+        Printf.sprintf "  _assign_%s(%s, %s, sizeof(%s));\n" (id2s id) vi vo t_str
 
 let (gen_assign_var_expr : Soc.t -> Soc.var_expr -> Soc.var_expr -> string) =
 fun soc vi vo -> 

src/soc2cStack.ml

-(* Time-stamp: <modified the 10/04/2015 (at 11:23) by Erwan Jahier> *)
+(* Time-stamp: <modified the 09/09/2016 (at 11:47) by Erwan Jahier> *)
 
 open Soc2cUtil
 open Soc2cIdent
@@ -73,7 +73,7 @@ let rec (gen_assign : Data.t  -> string -> string -> string) =
         Printf.sprintf "  _assign_%s(%s, %s, sizeof(%s));\n" t_str_short vi vo t_str
 
       | Data.Extern (id) -> 
-        Printf.sprintf "  _assign_%s(&%s, &%s, sizeof(%s));\n" (id2s id) vi vo t_str
+        Printf.sprintf "  _assign_%s(%s, %s, sizeof(%s));\n" (id2s id) vi vo t_str
       
 
 let (gen_assign_var_expr : Soc.t -> Soc.var_expr -> Soc.var_expr -> string) =

test/lus2lic.sum

 ==> lus2lic0.sum <==
-Test Run By jahier on Fri Sep  9 10:20:20 
+Test Run By jahier on Fri Sep  9 11:56:59 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic0 tests ===
@@ -64,7 +64,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
 XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
 
 ==> lus2lic1.sum <==
-Test Run By jahier on Fri Sep  9 10:20:21 
+Test Run By jahier on Fri Sep  9 11:57:06 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic1 tests ===
@@ -397,7 +397,7 @@ PASS: gcc -o multipar.exec multipar_multipar.c multipar_multipar_loop.c
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus  {}
 
 ==> lus2lic2.sum <==
-Test Run By jahier on Fri Sep  9 10:20:42 
+Test Run By jahier on Fri Sep  9 11:58:44 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic2 tests ===
@@ -743,7 +743,7 @@ PASS: gcc -o zzz2.exec zzz2_zzz2.c zzz2_zzz2_loop.c
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus  {}
 
 ==> lus2lic3.sum <==
-Test Run By jahier on Fri Sep  9 10:21:25 
+Test Run By jahier on Fri Sep  9 12:00:51 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic3 tests ===
@@ -1249,7 +1249,7 @@ PASS: ./myec2c {-o multipar.c multipar.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
 
 ==> lus2lic4.sum <==
-Test Run By jahier on Fri Sep  9 10:21:39 
+Test Run By jahier on Fri Sep  9 12:01:28 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic4 tests ===
@@ -1773,14 +1773,14 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 # of unexpected failures	4
 ===============================
 # Total number of failures: 26
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 21 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 43 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 13 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 34 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 7 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 97 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 126 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 37 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 35 seconds
 * Ref time: 
-0.04user 0.02system 1:53.24elapsed 0%CPU (0avgtext+0avgdata 5660maxresident)k
-0inputs+0outputs (0major+6112minor)pagefaults 0swaps
+0.04user 0.03system 5:04.40elapsed 0%CPU (0avgtext+0avgdata 5664maxresident)k
+32inputs+0outputs (0major+6105minor)pagefaults 0swaps
 * Quick time (-j 4):
-0.04user 0.02system 1:15.54elapsed 0%CPU (0avgtext+0avgdata 5640maxresident)k
-0inputs+0outputs (0major+6117minor)pagefaults 0swaps
+0.06user 0.01system 2:14.11elapsed 0%CPU (0avgtext+0avgdata 5644maxresident)k
+32inputs+0outputs (0major+6134minor)pagefaults 0swaps