diff --git a/src/filenameExtras.ml b/src/filenameExtras.ml
index 0ee9a5103091d9b52083d27543e2993bfe2dcb93..c04585f099e0f30efcf815239d76a57c9f60bd85 100644
--- a/src/filenameExtras.ml
+++ b/src/filenameExtras.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 26/02/2015 (at 09:49) by Erwan Jahier> *)
+(* Time-stamp: <modified the 26/02/2015 (at 09:53) by Erwan Jahier> *)
let (to_list : string -> string list) =
@@ -55,7 +55,7 @@ let (simplify : string -> string) =
(* A few unit tests *)
-let _ = if os_type <> "Win32" then ( (* fails on win32 because of path *)
+let _ = if Sys.os_type <> "Win32" then ( (* fails on win32 because of path *)
assert(simplify "/home/name/dir/file" = "/home/name/dir/file");
assert(simplify "/home/name/dir/../file" = "/home/name/file");
assert(simplify "/home/name/dir/../../file" = "/home/file");
diff --git a/src/lv6MainArgs.ml b/src/lv6MainArgs.ml
index 021c7742f84a0175476062f51704c396ea058bf7..5a303841fdbd84ccb90bb0c94b4af3c0d8740ad2 100644
--- a/src/lv6MainArgs.ml
+++ b/src/lv6MainArgs.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 24/02/2015 (at 08:34) by Erwan Jahier> *)
+(* Time-stamp: <modified the 26/02/2015 (at 09:52) by Erwan Jahier> *)
(*
Le manager d'argument adapté de celui de lutin, plus joli
N.B. solution un peu batarde : les options sont stockées, comme avant, dans Global,
diff --git a/src/socPredef2cHeap.ml b/src/socPredef2cHeap.ml
index bab2ee50153e29841c0b5c5f9e0cc5f5b4bbfdbf..2e58fd830fc4b766145f0891728ddcd0d548084b 100644
--- a/src/socPredef2cHeap.ml
+++ b/src/socPredef2cHeap.ml
@@ -1,5 +1,4 @@
-
-(* Time-stamp: <modified the 24/02/2015 (at 09:18) by Erwan Jahier> *)
+(* Time-stamp: <modified the 26/02/2015 (at 09:52) by Erwan Jahier> *)
open Data
open Soc
diff --git a/src/socPredef2cStack.ml b/src/socPredef2cStack.ml
index 2c5721fa32d9cf4230cafcdfe8294daba56f0dd0..f24ca1c1732ca3e6e70321cb4f56c1740ad687b0 100644
--- a/src/socPredef2cStack.ml
+++ b/src/socPredef2cStack.ml
@@ -1,5 +1,4 @@
-
-(* Time-stamp: <modified the 24/02/2015 (at 14:56) by Erwan Jahier> *)
+(* Time-stamp: <modified the 26/02/2015 (at 09:52) by Erwan Jahier> *)
open Data
open Soc
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 69d3a85a034cacb457c2391e18096da8b9f0c242..0c334309a306f3737ce02d70ee2ab2a32ca79086 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test Run By jahier on Tue Feb 24 14:51:25
+Test Run By jahier on Thu Feb 26 09:56:45
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic0 tests ===
@@ -63,7 +63,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 Tue Feb 24 14:51:33
+Test Run By jahier on Thu Feb 26 09:56:50
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 Tue Feb 24 14:52:23
+Test Run By jahier on Thu Feb 26 09:57:27
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -727,7 +727,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 Tue Feb 24 14:53:40
+Test Run By jahier on Thu Feb 26 09:58:37
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic3 tests ===
@@ -1230,7 +1230,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 Tue Feb 24 14:54:25
+Test Run By jahier on Thu Feb 26 09:59:20
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1726,14 +1726,14 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# of unexpected failures 3
===============================
# Total number of failures: 14
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 8 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 49 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 76 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 44 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 73 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 4 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 37 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 70 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 42 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 70 seconds
* Ref time:
-0.05user 0.04system 4:13.75elapsed 0%CPU (0avgtext+0avgdata 5112maxresident)k
-160inputs+0outputs (0major+5492minor)pagefaults 0swaps
+0.05user 0.03system 3:45.39elapsed 0%CPU (0avgtext+0avgdata 5120maxresident)k
+160inputs+0outputs (0major+5522minor)pagefaults 0swaps
* Quick time (-j 4):
-0.06user 0.01system 1:28.75elapsed 0%CPU (0avgtext+0avgdata 5124maxresident)k
-160inputs+0outputs (0major+5556minor)pagefaults 0swaps
+0.04user 0.02system 1:21.11elapsed 0%CPU (0avgtext+0avgdata 5076maxresident)k
+160inputs+0outputs (0major+5559minor)pagefaults 0swaps
diff --git a/test/lus2lic.time b/test/lus2lic.time
index d107410e9ec67cc77e5fa85e46934950aafd0a6b..49af92113a2dd726ecb3d353bb1d9640290567ac 100644
--- a/test/lus2lic.time
+++ b/test/lus2lic.time
@@ -1,11 +1,11 @@
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 8 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 49 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 76 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 44 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 73 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 4 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 37 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 70 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 42 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 70 seconds
* Ref time:
-0.05user 0.04system 4:13.75elapsed 0%CPU (0avgtext+0avgdata 5112maxresident)k
-160inputs+0outputs (0major+5492minor)pagefaults 0swaps
+0.05user 0.03system 3:45.39elapsed 0%CPU (0avgtext+0avgdata 5120maxresident)k
+160inputs+0outputs (0major+5522minor)pagefaults 0swaps
* Quick time (-j 4):
-0.06user 0.01system 1:28.75elapsed 0%CPU (0avgtext+0avgdata 5124maxresident)k
-160inputs+0outputs (0major+5556minor)pagefaults 0swaps
+0.04user 0.02system 1:21.11elapsed 0%CPU (0avgtext+0avgdata 5076maxresident)k
+160inputs+0outputs (0major+5559minor)pagefaults 0swaps