diff --git a/src/ast2lic.ml b/src/ast2lic.ml
index 349c6c279713f729c330f318aaa123379a4369d3..3bb4bb02342b85bac9249af9aa5a8ebe3cb8d207 100644
--- a/src/ast2lic.ml
+++ b/src/ast2lic.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 26/02/2015 (at 11:19) by Erwan Jahier> *)
+(* Time-stamp: <modified the 25/06/2015 (at 17:32) by Erwan Jahier> *)
open Lxm
@@ -357,7 +357,7 @@ and (translate_val_exp_check : IdSolver.t -> Lic.clock list -> UnifyClock.subst
let s,vef = translate_val_exp id_solver s ve in
let lxm = AstCore.lxm_of_val_exp ve in
let lxms = List.map (fun _ -> lxm) exp_clks in
- (* let vef, tl = EvalType.f id_solver vef in *)
+ (* let vef, tl = EvalType.f id_solver vef in *)
EvalClock.f id_solver s vef lxms exp_clks
diff --git a/src/evalClock.ml b/src/evalClock.ml
index c916c47f80d5ace9bede4c27bda6e8e4b4de9067..fd65112a9065013e28304b1aef17381ca32bb9f5 100644
--- a/src/evalClock.ml
+++ b/src/evalClock.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 26/02/2015 (at 11:20) by Erwan Jahier> *)
+(* Time-stamp: <modified the 25/06/2015 (at 17:30) by Erwan Jahier> *)
open AstPredef
@@ -224,13 +224,15 @@ let rec (f : IdSolver.t -> subst -> Lic.val_exp -> Lxm.t list -> Lic.clock list
let ve, inf_clks, s = f_aux id_solver s ve in
let s =
if exp_clks = [] then s else (
- assert (List.length exp_clks = List.length inf_clks);
- fold_left3
- (fun s lxm eclk iclk -> UnifyClock.f s lxm eclk iclk)
- s
- lxms
- exp_clks
- (List.map (fun (_,clk) -> clk) inf_clks)
+ if (List.length exp_clks <> List.length inf_clks) then
+ raise (Compile_error(lxm_of_val_exp ve, "Bad arity"))
+ else
+ fold_left3
+ (fun s lxm eclk iclk -> UnifyClock.f s lxm eclk iclk)
+ s
+ lxms
+ exp_clks
+ (List.map (fun (_,clk) -> clk) inf_clks)
)
in
let inf_clks = List.map (fun (id,clk) -> id, apply_subst2 s clk) inf_clks in
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index f8127fda0c2b78fe62e150248630cc03aacb074b..0f87df14ddc1ce2f0b82bd6cbada42a66defa07e 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,6 +1,5 @@
-<<<<<<< Updated upstream
==> lus2lic0.sum <==
-Test Run By jahier on Tue Jun 23 17:05:08
+Test Run By jahier on Thu Jun 25 17:33:53
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic0 tests ===
@@ -38,6 +37,7 @@ XFAIL: Test bad programs (clock): test_lus2lic_no_node should_fail/clock/clock2.
XFAIL: Test bad programs (clock): test_lus2lic_no_node should_fail/clock/inonout.lus
XFAIL: Test bad programs (clock): test_lus2lic_no_node should_fail/clock/when_enum.lus
XFAIL: Test bad programs (semantics): test_lus2lic_no_node should_fail/semantics/X1.lus
+XFAIL: Test bad programs (semantics): test_lus2lic_no_node should_fail/semantics/arity.lus
XFAIL: Test bad programs (semantics): test_lus2lic_no_node should_fail/semantics/aux.lus
XFAIL: Test bad programs (semantics): test_lus2lic_no_node should_fail/semantics/aux1.lus
XFAIL: Test bad programs (semantics): test_lus2lic_no_node should_fail/semantics/bad_call01.lus
@@ -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 Tue Jun 23 17:05:09
+Test Run By jahier on Thu Jun 25 17:33:54
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic1 tests ===
@@ -399,7 +399,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 Jun 23 17:05:24
+Test Run By jahier on Thu Jun 25 17:34:09
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -733,7 +733,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 Jun 23 17:06:08
+Test Run By jahier on Thu Jun 25 17:34:54
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic3 tests ===
@@ -1240,7 +1240,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 Jun 23 17:06:21
+Test Run By jahier on Thu Jun 25 17:35:07
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1712,7 +1712,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
=== lus2lic0 Summary ===
# of expected passes 1
-# of expected failures 51
+# of expected failures 52
==> lus2lic1.sum <==
@@ -1741,18 +1741,3 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# of expected passes 453
# of unexpected failures 4
-===============================
-# Total number of failures: 18
-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 44 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 13 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 46 seconds
-* Ref time:
-0.04user 0.02system 1:59.60elapsed 0%CPU (0avgtext+0avgdata 5064maxresident)k
-96inputs+0outputs (0major+5518minor)pagefaults 0swaps
-* Quick time (-j 4):
-0.03user 0.03system 0:51.33elapsed 0%CPU (0avgtext+0avgdata 5108maxresident)k
-32inputs+0outputs (0major+5566minor)pagefaults 0swaps
-=======
->>>>>>> Stashed changes
diff --git a/test/lus2lic.time b/test/lus2lic.time
index 1f7e54689310be777b9ce71e453b5af6c96b4bab..24e6a1d3aaa012a48dcd73d8104951c1882dd915 100644
--- a/test/lus2lic.time
+++ b/test/lus2lic.time
@@ -1,11 +1,11 @@
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 44 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 14 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 45 seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 13 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 46 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 49 seconds
* Ref time:
-0.04user 0.02system 1:59.60elapsed 0%CPU (0avgtext+0avgdata 5064maxresident)k
-96inputs+0outputs (0major+5518minor)pagefaults 0swaps
+0.05user 0.02system 2:02.40elapsed 0%CPU (0avgtext+0avgdata 5068maxresident)k
+64inputs+0outputs (0major+5545minor)pagefaults 0swaps
* Quick time (-j 4):
-0.03user 0.03system 0:51.33elapsed 0%CPU (0avgtext+0avgdata 5108maxresident)k
-32inputs+0outputs (0major+5566minor)pagefaults 0swaps
+0.04user 0.02system 0:58.63elapsed 0%CPU (0avgtext+0avgdata 5084maxresident)k
+0inputs+0outputs (0major+5570minor)pagefaults 0swaps
diff --git a/test/should_fail/semantics/arity.lus b/test/should_fail/semantics/arity.lus
new file mode 100644
index 0000000000000000000000000000000000000000..5127f5eab7925e0db98f46be37de390b95bd286d
--- /dev/null
+++ b/test/should_fail/semantics/arity.lus
@@ -0,0 +1,9 @@
+node arity(a,b:int) returns (x,y: int);
+let
+ x,y = myplus(a,b); -- bad arity!
+tel
+
+node myplus(a,b:int) returns (x: int);
+let
+ x = a+b;
+tel
diff --git a/test/should_work/poussoir.lus b/test/should_work/poussoir.lus
index e689ade3ad9ded4fe2b55c3d32513ba346b2eaa0..ea4b6ced20c7eb66fa7442a109862eff64778f73 100644
--- a/test/should_work/poussoir.lus
+++ b/test/should_work/poussoir.lus
@@ -1,18 +1,14 @@
node TWO_STATES(set,reset,init:bool) returns (state:bool);
let
- state = init -> if set and not pre(state) then true
- else if reset and pre(state) then false
- else pre(state);
+ state = init -> if set and not pre(state) then true
+ else if reset and pre(state) then false else pre(state);
tel
-
node ONE_BUTTON(change,init: bool) returns (state:bool);
let
- state = init -> if change then not pre(state) else pre(state);
+ state = init -> if change then not pre(state) else pre(state);
tel
-
-
node poussoir (e3,init:bool) returns (s3, s4:bool);
let
- s3 = TWO_STATES(e3,e3,init);
- s4 = ONE_BUTTON(e3,init);
+ s3 = TWO_STATES(e3,e3,init);
+ s4 = ONE_BUTTON(e3,init);
tel
diff --git a/test/site.exp b/test/site.exp
index 658237439bb664b3bd93f7d59ca22aa0f3bb0410..7d6d8fa954b8f0828ec637be5940a6c5d6955038 100644
--- a/test/site.exp
+++ b/test/site.exp
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 03/09/2014 (at 17:09) by Erwan Jahier>
+# Time-stamp: <modified the 01/07/2015 (at 14:24) by Erwan Jahier>
#
# (nonreg-)test harness main file
@@ -49,6 +49,10 @@ proc should_work { test_name command_line args } {
set failed 1
exp_continue
}
+ "kcg name clash" {
+ set failed 0
+ exp_continue
+ }
"ERROR" {
set failed 1
exp_continue