diff --git a/INSTALL.txt b/INSTALL.txt
index 7e89bcd18b9f04e2ef5c59c5918f2eb3feb9be06..07b6e23cdb9b338b9791ccbbc2cc6bfc15d5b407 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 6b0599c23ec549baedde0761ea2d132f) *)
+(* DO NOT EDIT (digest: af71e2019672639541389061f5ec02d3) *)
This is the INSTALL file for the lus2lic distribution.
@@ -13,8 +13,9 @@ In order to compile this package, you will need:
* ocaml
* findlib
-* rdbg-plugin
+* lutils for executable lus2lic, executable lus2lic.dbg
* extlib for executable lus2lic, executable lus2lic.dbg
+* rdbg-plugin for library lustre-v6
Installing
==========
diff --git a/_oasis b/_oasis
index 646a13bfe510234322e9a7da38aa921565f28d3a..d100585dcd1f6926efba8bfd5cc50bf82a932c90 100644
--- a/_oasis
+++ b/_oasis
@@ -15,7 +15,7 @@ Executable lus2lic
Path: src/
MainIs: main.ml
BuildTools: ocamlbuild
- BuildDepends: str,unix,num,rdbg-plugin,extlib
+ BuildDepends: str,unix,num,lutils,extlib
Build:true
CompiledObject: native
@@ -25,7 +25,7 @@ Executable "lus2lic.dbg"
Path: src/
MainIs: main.ml
BuildTools: ocamlbuild
- BuildDepends: str,unix,num,rdbg-plugin,extlib
+ BuildDepends: str,unix,num,lutils,extlib
Build:true
CompiledObject: byte
@@ -39,7 +39,7 @@ Executable "lus2lic.dbg"
Library "lustre-v6"
- XMETADescription: an API to call the Lustre v6 interpreter from ocaml
+ XMETADescription: an API to call the Lustre v6 interpreter from rdbg (and ocaml as a side effect)
Modules: Lus2licRun
Path: src/
BuildTools: ocamlbuild
diff --git a/_tags b/_tags
index 86c3294432ff829a5a1a0109038b669d9a4fdf9a..8f8d2bc48d6cc76ded825e7f54601041c214d725 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: aed28a64bf4a66417d4448eefeb6964c)
+# DO NOT EDIT (digest: e35f677129dfaa6939ecc5e1d46852fd)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -16,17 +16,18 @@ true: annot, bin_annot
"_darcs": not_hygienic
# Executable lus2lic
"src/main.native": pkg_extlib
+"src/main.native": pkg_lutils
"src/main.native": pkg_num
-"src/main.native": pkg_rdbg-plugin
"src/main.native": pkg_str
"src/main.native": pkg_unix
# Executable lus2lic.dbg
"src/main.byte": pkg_extlib
+"src/main.byte": pkg_lutils
"src/main.byte": pkg_num
-"src/main.byte": pkg_rdbg-plugin
"src/main.byte": pkg_str
"src/main.byte": pkg_unix
<src/*.ml{,i,y}>: pkg_extlib
+<src/*.ml{,i,y}>: pkg_lutils
# Library lustre-v6
"src/lustre-v6.cmxs": use_lustre-v6
<src/*.ml{,i,y}>: pkg_num
diff --git a/src/lus2licRun.ml b/src/lus2licRun.ml
index 0b9a4af7b1f94934b79e82dca296961e886f7484..70e106df660c8de00134b9e1de53c9b3cad7aae5 100644
--- a/src/lus2licRun.ml
+++ b/src/lus2licRun.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 25/01/2016 (at 11:14) by Erwan Jahier> *)
+(* Time-stamp: <modified the 27/01/2016 (at 15:56) by Erwan Jahier> *)
(*-----------------------------------------------------------------------
** Copyright (C) - Verimag.
*)
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index aac775b13e504f1abc8f610f412c6363e8db7974..1a9a4ebef4ea10377d6bd4ce06b989fc921d39ee 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test Run By jahier on Wed Jan 27 10:55:24
+Test Run By jahier on Wed Jan 27 15:20:40
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 Wed Jan 27 10:55:25
+Test Run By jahier on Wed Jan 27 15:20:41
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic1 tests ===
@@ -163,29 +163,29 @@ PASS: ./lus2lic {-2c call.lus -n call}
PASS: ./lus2lic {-2c call01.lus -n call01}
PASS: ./lus2lic {-2c call02.lus -n call02}
PASS: gcc -o call02.exec call02_call02.c call02_call02_loop.c
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call02.lus {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call02.lus {}
PASS: ./lus2lic {-2c call03.lus -n call03}
PASS: ./lus2lic {-2c call04.lus -n call04}
PASS: gcc -o call04.exec call04_call04.c call04_call04_loop.c
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call04.lus {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call04.lus {}
PASS: ./lus2lic {-2c call05.lus -n call05}
PASS: ./lus2lic {-2c call06.lus -n call06}
PASS: ./lus2lic {-2c call07.lus -n call07}
PASS: gcc -o call07.exec call07_call07.c call07_call07_loop.c
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call07.lus {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c call07.lus {}
PASS: ./lus2lic {-2c carV2.lus -n carV2}
PASS: gcc -o carV2.exec carV2_carV2.c carV2_carV2_loop.c
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c carV2.lus {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c carV2.lus {}
FAIL: Generate c code : ./lus2lic {-2c carligths.lus -n carligths}
PASS: ./lus2lic {-2c ck2.lus -n ck2}
PASS: gcc -o ck2.exec ck2_ck2.c ck2_ck2_loop.c
FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck2.lus {}
PASS: ./lus2lic {-2c ck3.lus -n ck3}
PASS: gcc -o ck3.exec ck3_ck3.c ck3_ck3_loop.c
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck3.lus {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck3.lus {}
PASS: ./lus2lic {-2c ck4.lus -n ck4}
PASS: gcc -o ck4.exec ck4_ck4.c ck4_ck4_loop.c
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck4.lus {}
+FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck4.lus {}
PASS: ./lus2lic {-2c ck5.lus -n ck5}
PASS: gcc -o ck5.exec ck5_ck5.c ck5_ck5_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c ck5.lus {}
@@ -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 Wed Jan 27 10:55:41
+Test Run By jahier on Wed Jan 27 15:20:57
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -411,7 +411,7 @@ PASS: gcc -o PCOND.exec PCOND_PCOND.c PCOND_PCOND_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND.lus {}
PASS: ./lus2lic {-2c PCOND1.lus -n PCOND1}
PASS: gcc -o PCOND1.exec PCOND1_PCOND1.c PCOND1_PCOND1_loop.c
-FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND1.lus {}
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND1.lus {}
PASS: ./lus2lic {-2c SOURIS.lus -n SOURIS}
PASS: gcc -o SOURIS.exec SOURIS_SOURIS.c SOURIS_SOURIS_loop.c
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c SOURIS.lus {}
@@ -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 Wed Jan 27 10:56:28
+Test Run By jahier on Wed Jan 27 15:21:43
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 Wed Jan 27 10:56:42
+Test Run By jahier on Wed Jan 27 15:21:57
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1260,7 +1260,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND.lus {}
PASS: ./lus2lic {-o PCOND1.lic PCOND1.lus}
PASS: ./lus2lic {-ec -o PCOND1.ec PCOND1.lus}
PASS: ./myec2c {-o PCOND1.c PCOND1.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND1.lus {}
+PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND1.lus {}
PASS: ./lus2lic {-o SOURIS.lic SOURIS.lus}
PASS: ./lus2lic {-ec -o SOURIS.ec SOURIS.lus}
PASS: ./myec2c {-o SOURIS.c SOURIS.ec}
@@ -1388,7 +1388,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll.lus {}
PASS: ./lus2lic {-o onlyroll2.lic onlyroll2.lus}
PASS: ./lus2lic {-ec -o onlyroll2.ec onlyroll2.lus}
PASS: ./myec2c {-o onlyroll2.c onlyroll2.ec}
-PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll2.lus {}
+FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll2.lus {}
PASS: ./lus2lic {-o over2.lic over2.lus}
PASS: ./lus2lic {-ec -o over2.ec over2.lus}
PASS: ./myec2c {-o over2.c over2.ec}
@@ -1739,15 +1739,15 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
=== lus2lic1 Summary ===
-# of expected passes 314
-# of unexpected failures 6
+# of expected passes 308
+# of unexpected failures 12
==> lus2lic2.sum <==
=== lus2lic2 Summary ===
-# of expected passes 329
-# of unexpected failures 4
+# of expected passes 330
+# of unexpected failures 3
==> lus2lic3.sum <==
@@ -1763,15 +1763,15 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# of expected passes 470
# of unexpected failures 5
===============================
-# Total number of failures: 26
+# Total number of failures: 31
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 15 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 47 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 16 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 46 seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 14 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 49 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 48 seconds
* Ref time:
-0.03user 0.04system 2:06.80elapsed 0%CPU (0avgtext+0avgdata 5116maxresident)k
-0inputs+0outputs (0major+5554minor)pagefaults 0swaps
+0.06user 0.01system 2:04.62elapsed 0%CPU (0avgtext+0avgdata 5092maxresident)k
+32inputs+0outputs (0major+5555minor)pagefaults 0swaps
* Quick time (-j 4):
-0.02user 0.03system 0:56.25elapsed 0%CPU (0avgtext+0avgdata 5104maxresident)k
-0inputs+0outputs (0major+5601minor)pagefaults 0swaps
+0.04user 0.02system 1:02.71elapsed 0%CPU (0avgtext+0avgdata 5096maxresident)k
+32inputs+0outputs (0major+5589minor)pagefaults 0swaps