merge conflicts caused by a stupid commit+push+amend+push sequence.

src/socPredef2c.ml

-(* Time-stamp: <modified the 13/06/2014 (at 15:34) by Erwan Jahier> *)
+(* Time-stamp: <modified the 13/06/2014 (at 15:49) by Erwan Jahier> *)
 
 open Data
 open Soc

test/lus2lic.sum

@@ -568,10 +568,17 @@ PASS: ./myec2c {-o /tmp/morel4.c /tmp/morel4.ec}
 PASS: ../utils/test_lus2lic_no_node should_work/morel4.lus
 PASS: ./lus2lic {-2c should_work/morel4.lus -n morel4}
 FAIL: Check that the generated C code compiles  : gcc morel4_morel4.c morel4_morel4_loop.c 
+<<<<<<< HEAD
 PASS: ./lus2lic {-o /tmp/trivial_array.lic should_work/trivial_array.lus}
 FAIL: Generate ec code  : ./lus2lic {-ec -o /tmp/trivial_array.ec should_work/trivial_array.lus}
 FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/trivial_array.lus
 PASS: ./lus2lic {-2c should_work/trivial_array.lus -n trivial_array}
+=======
+FAIL: without any option: ./lus2lic {-o /tmp/trivial_array.lic should_work/trivial_array.lus}
+FAIL: Generate ec code  : ./lus2lic {-ec -o /tmp/trivial_array.ec should_work/trivial_array.lus}
+FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/trivial_array.lus
+FAIL: Generate c code  : ./lus2lic {-2c should_work/trivial_array.lus -n trivial_array}
+>>>>>>> ede35c39b81d4bd20674ac6aaf4962417a1adf6f
 PASS: gcc trivial_array_trivial_array.c trivial_array_trivial_array_loop.c 
 PASS: ./lus2lic {-o /tmp/param_node4.lic should_work/param_node4.lus}
 PASS: ./lus2lic {-ec -o /tmp/param_node4.ec should_work/param_node4.lus}
@@ -1479,9 +1486,9 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman
 
 		=== lus2lic Summary ===
 
-# of expected passes		1173
-# of unexpected failures	236
+# of expected passes		1171
+# of unexpected failures	238
 # of unexpected successes	21
 # of expected failures		37
-testcase ./lus2lic.tests/non-reg.exp completed in 118 seconds
-testcase ./lus2lic.tests/progression.exp completed in 1 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 116 seconds
+testcase ./lus2lic.tests/progression.exp completed in 0 seconds