Do not translate enums into int by default (only in -exec and -2c mode).

Rationale: the << normal mode >> (i.e., not translating enums) was
not even accessible!

_oasis

 OASISFormat: 0.4
 Name:        lustre-v6
-Version:     1.649
+Version:     1.650
 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 18/03/2016 (at 11:13) by Erwan Jahier> *)
+(* Time-stamp: <modified the 30/05/2016 (at 17:16) 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,
@@ -78,7 +78,7 @@ let (global_opt:global_opt) =
     line_num =  1;
     line_start_pos = 0;
     current_file =  "";
-    expand_enums =  AsInt;
+    expand_enums =  AsEnum;
     soc2c_no_switch = false;
     soc2c_inline_loops = false;
     soc2c_global_ctx = false;
@@ -256,12 +256,17 @@ let mkoptab (opt:t) : unit = (
     mkopt opt
       ["-exec"]
       (Arg.Unit (fun _ ->
-        opt.exec <- true))
-      ["interpret the program using RIF conventions for I/O"]
+        opt.exec <- true;
+        global_opt.expand_enums <- AsInt;
+      ))
+      ["interpret the program using RIF conventions for I/O (forces -eei)"]
     ;
     mkopt opt
       ["-2c";"--to-c"]
-      (Arg.Unit (fun _ -> opt.gen_c <- true))
+      (Arg.Unit (fun _ -> 
+                 opt.gen_c <- true;
+                 global_opt.expand_enums <- AsInt;
+      ))
       ["generate C code"]
     ;
     mkopt opt ~doc_level:Basic

src/lv6version.ml

 (** Automatically generated from Makefile *) 
 let tool = "lus2lic"
 let branch = "master"
-let commit = "649"
-let sha_1 = "c803b44e75834ebd66d7bef1f4979f11be3f661c"
+let commit = "650"
+let sha_1 = "61be1e6730e95ae2c3e8b5c83252cfd999ec10a1"
 let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
 let maintainer = "jahier@imag.fr"

test/lus2lic.sum

 ==> lus2lic0.sum <==
-Test Run By jahier on Fri May 27 15:58:52 
+Test Run By jahier on Mon May 30 17:25:11 
 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 May 27 15:58:53 
+Test Run By jahier on Mon May 30 17:25:11 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic1 tests ===
@@ -396,7 +396,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 May 27 15:59:08 
+Test Run By jahier on Mon May 30 17:25:27 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic2 tests ===
@@ -741,7 +741,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 May 27 15:59:46 
+Test Run By jahier on Mon May 30 17:26:03 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic3 tests ===
@@ -1243,7 +1243,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 May 27 15:59:59 
+Test Run By jahier on Mon May 30 17:26:15 
 Native configuration is x86_64-unknown-linux-gnu
 
 		=== lus2lic4 tests ===
@@ -1764,14 +1764,14 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 # of unexpected failures	4
 ===============================
 # Total number of failures: 23
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
 lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 15 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 38 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 13 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 40 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 36 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 12 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 38 seconds
 * Ref time: 
-0.02user 0.05system 1:46.74elapsed 0%CPU (0avgtext+0avgdata 5120maxresident)k
-32inputs+0outputs (0major+5584minor)pagefaults 0swaps
+0.04user 0.02system 1:42.99elapsed 0%CPU (0avgtext+0avgdata 5180maxresident)k
+32inputs+0outputs (0major+5581minor)pagefaults 0swaps
 * Quick time (-j 4):
-0.02user 0.03system 0:44.48elapsed 0%CPU (0avgtext+0avgdata 5260maxresident)k
-32inputs+0outputs (0major+5615minor)pagefaults 0swaps
+0.03user 0.02system 0:47.98elapsed 0%CPU (0avgtext+0avgdata 5184maxresident)k
+32inputs+0outputs (0major+5638minor)pagefaults 0swaps