From: Jean Privat Date: Wed, 13 Jan 2010 16:36:05 +0000 (-0500) Subject: tests: remove static dead code X-Git-Tag: v0.4~60 X-Git-Url: http://nitlanguage.org tests: remove static dead code Prepare for the error (currently it is a warning) Signed-off-by: Jean Privat --- diff --git a/tests/base_closure1.nit b/tests/base_closure1.nit index a790261..fc33d3a 100644 --- a/tests/base_closure1.nit +++ b/tests/base_closure1.nit @@ -28,18 +28,22 @@ class A end end +fun maybe: Bool do return true + fun work do var a = new A a.foo !bar do #!alt11# #alt11#a.foo !bar x do 2.output + if maybe then #alt4#break #alt5#break 'x' #alt6#continue #alt7#continue 'x' #alt8#return #alt9#return 'x' + end 3.output end #alt10# a.foo diff --git a/tests/base_closure2.nit b/tests/base_closure2.nit index 2de769a..ac1e651 100644 --- a/tests/base_closure2.nit +++ b/tests/base_closure2.nit @@ -29,18 +29,22 @@ class A end end +fun maybe: Bool do return true + fun work do var a = new A a.foo !bar x do #!alt11# #alt11#a.foo !bar do x.output + if maybe then #alt4#break #alt5#break 'x' #alt6#continue #alt7#continue 'x' #alt8#return #alt9#return 'x' + end (x+1).output end #alt10# a.foo diff --git a/tests/base_closure3.nit b/tests/base_closure3.nit index 80982b3..3910bae 100644 --- a/tests/base_closure3.nit +++ b/tests/base_closure3.nit @@ -27,6 +27,8 @@ class A end end +fun maybe: Bool do return true + var a = new A 0.output a.foo(1,8) !bar x, y, b do #!alt2# @@ -34,12 +36,14 @@ a.foo(1,8) !bar x, y, b do #!alt2# x.output b.foo(x+1, y-1) !bar z, t, c do z.output + if maybe then #alt4#break #alt5#break 'x' #alt6#continue #alt7#continue 'x' #alt8#return #alt9#return 'x' + end t.output end y.output diff --git a/tests/base_closure4.nit b/tests/base_closure4.nit index 2db8de7..489b1e8 100644 --- a/tests/base_closure4.nit +++ b/tests/base_closure4.nit @@ -28,18 +28,22 @@ class A end end +fun maybe: Bool do return true + fun work do var a = new A a.foo !bar do #!alt11# #alt11#a.foo !bar x do 2.output + if maybe then #alt4#break #alt5#break 'x' #alt6#continue #alt7#continue 'x' #alt8#return #alt9#return 'x' + end continue 3 end #alt10# a.foo diff --git a/tests/base_closure5.nit b/tests/base_closure5.nit index 7e4edaf..5b68ff2 100644 --- a/tests/base_closure5.nit +++ b/tests/base_closure5.nit @@ -27,11 +27,14 @@ class A end end +fun maybe: Bool do return true + fun work: Int do var a = new A var i = a.foo !bar do 2.output + if maybe then #alt1#break #alt2#break 'x' #alt3#break 100 @@ -40,6 +43,7 @@ do #alt6#return 200 #alt7#continue #alt8#continue 'x' + end continue 5 #!alt9# end 4.output diff --git a/tests/base_closure6.nit b/tests/base_closure6.nit index 5dd96dd..0d962ec 100644 --- a/tests/base_closure6.nit +++ b/tests/base_closure6.nit @@ -40,6 +40,8 @@ special U special V end +fun maybe: Bool do return true + var a = new A var t: T = new T @@ -55,13 +57,22 @@ y = a.foo !bar do break u y = a.foo !bar do break v y = a.foo !bar do break w y = a.foo !bar do + if maybe then break t + else if maybe then break u + else if maybe then break v + else if maybe then break w + end end y = a.foo !bar do + if maybe then break u + else if maybe then break v + else if maybe then break w + end end diff --git a/tests/base_closure8.nit b/tests/base_closure8.nit index 83441b0..ad72510 100644 --- a/tests/base_closure8.nit +++ b/tests/base_closure8.nit @@ -32,6 +32,8 @@ class A end end +fun maybe: Bool do return true + fun start do var a = new A @@ -40,9 +42,11 @@ do 2.output a.foo(3) !bar do 4.output + if maybe then #alt1#break #alt2#continue #alt3#return + end 5.output end 6.output diff --git a/tests/base_closure_break.nit b/tests/base_closure_break.nit index ebcb0d7..8d8c3f6 100644 --- a/tests/base_closure_break.nit +++ b/tests/base_closure_break.nit @@ -22,25 +22,29 @@ class A #alt12#break !bar: Int do 1.output - bar #!alt1# - #alt2#bar(2) - #alt3#var x = bar + if maybe then bar #!alt1# + #alt2#if maybe then bar(2) + #alt3#if maybe then var x = bar 4.output end end +fun maybe: Bool do return true + fun work do var a = new A a.foo !bar do #!alt11# #alt11#a.foo !bar x do 2.output + if maybe then #alt4#break #alt5#break 'x' #alt6#continue #alt7#continue 'x' #alt8#return #alt9#return 'x' + end 3.output break #!alt13# end diff --git a/tests/base_closure_break2.nit b/tests/base_closure_break2.nit index f11670e..28f0820 100644 --- a/tests/base_closure_break2.nit +++ b/tests/base_closure_break2.nit @@ -22,25 +22,29 @@ class A #alt12#break !bar: Int do 1.output - bar #!alt1# - #alt2#bar(2) - #alt3#var x = bar + if maybe then bar #!alt1# + #alt2#if maybe then bar(2) + #alt3#if maybe then var x = bar return 4 end end +fun maybe: Bool do return true + fun work do var a = new A var r = a.foo !bar do #!alt11# #alt11#var r = a.foo !bar x do 2.output + if maybe then #alt4#break 4 #alt5#break 'x' #alt6#continue #alt7#continue 'x' #alt8#return #alt9#return 'x' + end 3.output break 4 #!alt13# end diff --git a/tests/base_closure_break_default.nit b/tests/base_closure_break_default.nit index 774227a..a0f324d 100644 --- a/tests/base_closure_break_default.nit +++ b/tests/base_closure_break_default.nit @@ -19,6 +19,7 @@ import kernel class A fun foo break !bar do + if maybe then #alt1# return #alt2# return 1 #alt3# abort @@ -26,15 +27,18 @@ class A #alt5# continue 20 #alt6# break #alt7# break 1 + end 20.output end do 1.output - bar + if maybe then bar 3.output end end +fun maybe: Bool do return true + var a = new A 0.output a.foo !bar do 2.output diff --git a/tests/base_closure_break_default2.nit b/tests/base_closure_break_default2.nit index 174cc23..36a3a5f 100644 --- a/tests/base_closure_break_default2.nit +++ b/tests/base_closure_break_default2.nit @@ -19,6 +19,7 @@ import kernel class A fun foo: Int break !bar do + if maybe then #alt1# return #alt2# return 1 #alt3# abort @@ -27,15 +28,19 @@ class A #alt6# break #alt7# break 1 #alt8# break 'x' + end break 20#!alt9# end do 1.output - bar + if maybe then bar 3.output + return 3 end end +fun maybe: Bool do return true + var a = new A 0.output var x = a.foo !bar do break 2 diff --git a/tests/base_closure_default1.nit b/tests/base_closure_default1.nit index 560e2cd..ffe3698 100644 --- a/tests/base_closure_default1.nit +++ b/tests/base_closure_default1.nit @@ -19,6 +19,7 @@ import kernel class A fun foo !bar do + if maybe then #alt1# return #alt2# return 1 #alt3# abort @@ -26,6 +27,7 @@ class A #alt5# continue 20 #alt6# break #alt7# break 1 + end 20.output end do @@ -35,6 +37,8 @@ class A end end +fun maybe: Bool do return true + var a = new A 0.output a.foo !bar do 2.output diff --git a/tests/base_closure_default2.nit b/tests/base_closure_default2.nit index a8d7251..dd43e5d 100644 --- a/tests/base_closure_default2.nit +++ b/tests/base_closure_default2.nit @@ -19,6 +19,7 @@ import kernel class A fun foo !bar(i: Int) do + if maybe then #alt1# return #alt2# return 1 #alt3# abort @@ -26,6 +27,7 @@ class A #alt5# continue 20 #alt7# break #alt8# break 1 + end (i * 10).output end do @@ -36,6 +38,8 @@ class A end end +fun maybe: Bool do return true + var a = new A 0.output a.foo !bar j do j.output diff --git a/tests/base_closure_default3.nit b/tests/base_closure_default3.nit index 44764de..91a4149 100644 --- a/tests/base_closure_default3.nit +++ b/tests/base_closure_default3.nit @@ -19,12 +19,14 @@ import kernel class A fun foo !bar: Int do + if maybe then #alt1# return #alt2# return 1 #alt3# abort #alt4# continue - #alt5# break #alt6# break 1 + end + #alt5# break continue 20 #!alt5# end do @@ -34,6 +36,8 @@ class A end end +fun maybe: Bool do return true + var a = new A 0.output a.foo !bar do continue 2 diff --git a/tests/base_closure_default4.nit b/tests/base_closure_default4.nit index 1209c18..cd4f409 100644 --- a/tests/base_closure_default4.nit +++ b/tests/base_closure_default4.nit @@ -19,12 +19,14 @@ import kernel class A fun foo !bar(i: Int): Int do + if maybe then #alt1# return #alt2# return -1 #alt3# abort #alt4# continue #alt6# break #alt7# break 1 + end continue (i * 10) #!alt5# end do @@ -34,6 +36,8 @@ class A end end +fun maybe: Bool do return true + var a = new A 0.output a.foo !bar j do continue j diff --git a/tests/base_closure_raf.nit b/tests/base_closure_raf.nit index 6be3ce3..325f3ed 100644 --- a/tests/base_closure_raf.nit +++ b/tests/base_closure_raf.nit @@ -39,12 +39,14 @@ do a.foo !bar x do #!alt11# #alt11#a.foo !bar do x.output + if maybe then #alt4#break #alt5#break 'x' #alt6#continue #alt7#continue 'x' #alt8#return #alt9#return 'x' + end (x+1).output end #alt10# a.foo diff --git a/tests/base_control_flow.nit b/tests/base_control_flow.nit index b7684d8..f6fd678 100644 --- a/tests/base_control_flow.nit +++ b/tests/base_control_flow.nit @@ -20,7 +20,7 @@ fun a: Int do a return 0 - a + #alt2#a end fun b: Int @@ -51,5 +51,5 @@ do else return 0 end - a + #alt3#a end diff --git a/tests/base_control_flow2.nit b/tests/base_control_flow2.nit index f8d32ea..54ee76f 100644 --- a/tests/base_control_flow2.nit +++ b/tests/base_control_flow2.nit @@ -21,13 +21,13 @@ fun a do end while true do a break - a + #alt1#a end while false do a continue - a + #alt2#a end while false do @@ -39,7 +39,7 @@ end while true do a if false then continue else break - a + #alt3#a end while true do @@ -47,9 +47,9 @@ while true do while true do a break - a + #alt4#a end a break - a + #alt5#a end diff --git a/tests/base_inline_closure_escape.nit b/tests/base_inline_closure_escape.nit index c912c9f..d996d58 100644 --- a/tests/base_inline_closure_escape.nit +++ b/tests/base_inline_closure_escape.nit @@ -32,15 +32,19 @@ class Inline__ end end +fun maybe: Bool do return true + var a = new Inline__ a.foo1 !f do do a.foo2 !f do + if maybe then #alt1#break label l1 #alt2#break label l2 #alt3#break label l3 #alt4#continue label l1 #alt5#continue label l2 + end 1.output end label l1 3.output diff --git a/tests/base_inline_closure_escape2.nit b/tests/base_inline_closure_escape2.nit index 01bec46..ecf1ee3 100644 --- a/tests/base_inline_closure_escape2.nit +++ b/tests/base_inline_closure_escape2.nit @@ -32,15 +32,19 @@ class Inline__ end end +fun maybe: Bool do return true + var a = new Inline__ var x = a.foo1 !f do do var y = a.foo2 !f do + if maybe then #alt1#break label l1 20 #alt2#break label l2 50 #alt3#break label l3 #alt4#continue label l1 10 #alt5#continue label l2 40 + end continue 1 end label l1 y.output diff --git a/tests/base_inline_closure_escape3.nit b/tests/base_inline_closure_escape3.nit index f1358a6..d441fe3 100644 --- a/tests/base_inline_closure_escape3.nit +++ b/tests/base_inline_closure_escape3.nit @@ -31,15 +31,19 @@ class Inline__ end end +fun maybe: Bool do return true + var a = new Inline__ a.foo !f do do a.foo !f do + if maybe then #alt1#break label l1 #alt2#break label l2 #alt3#break label l3 #alt4#continue label l1 #alt5#continue label l2 + end 1.output end label l1 3.output diff --git a/tests/base_inline_closure_fork2.nit b/tests/base_inline_closure_fork2.nit index 21c109b..f6a4f6e 100644 --- a/tests/base_inline_closure_fork2.nit +++ b/tests/base_inline_closure_fork2.nit @@ -30,6 +30,8 @@ class B redef fun output do _b.output end +fun maybe: Bool do return true + var a = new Inline__ a.foo !f do var x = new B(1) @@ -39,10 +41,12 @@ a.foo !f do y.output x = new B(3) y = 4 + if maybe then #alt1#break label l1 #alt2#break label l2 #alt3#continue label l1 #alt4#continue label l2 + end end label l1 x.output y.output diff --git a/tests/base_label_closure.nit b/tests/base_label_closure.nit index d21b309..f81c010 100644 --- a/tests/base_label_closure.nit +++ b/tests/base_label_closure.nit @@ -22,18 +22,22 @@ do bar !break do 'X'.output end +fun maybe: Bool do return true + 1.output foo !bar do 2.output foo !bar do 3.output foo !bar do end label l3 + if maybe then #alt1#break label l2 #alt2#break label l3 #alt3#break label l4 #alt4#break #alt5#continue label l1 - break label l1 + end + if maybe then break label l1 4.output end label l2#!alt6# #alt6#end label l1 diff --git a/tests/base_label_closure2.nit b/tests/base_label_closure2.nit index de5d350..6969883 100644 --- a/tests/base_label_closure2.nit +++ b/tests/base_label_closure2.nit @@ -23,6 +23,8 @@ do return i * 10 end +fun maybe: Bool do return true + 1.output var i = foo !bar do 2.output @@ -31,13 +33,16 @@ var i = foo !bar do foo !bar do continue 0 end label l3 + if maybe then #alt1#break label l2 10 #alt2#break label l3 10 #alt3#break label l4 10 #alt4#break 10 #alt5#continue label l1 10 - break label l1 10 + end + if maybe then break label l1 10 4.output + break 4 end label l2#!alt6# #alt6#end label l1 j.output diff --git a/tests/base_label_closure3.nit b/tests/base_label_closure3.nit index f7d244b..46877d7 100644 --- a/tests/base_label_closure3.nit +++ b/tests/base_label_closure3.nit @@ -24,18 +24,22 @@ do baz end +fun maybe: Bool do return true + 1.output foo !bar do 2.output foo !bar do 3.output foo !bar do end label l3 + if maybe then #alt1#break label l2 #alt2#break label l3 #alt3#break label l4 #alt4#break #alt5#continue label l1 - break label l1 + end + if maybe then break label l1 4.output !baz do 40.output diff --git a/tests/base_label_do.nit b/tests/base_label_do.nit index efb6c82..138bb70 100644 --- a/tests/base_label_do.nit +++ b/tests/base_label_do.nit @@ -16,18 +16,22 @@ import kernel +fun maybe: Bool do return true + 1.output do 2.output do 3.output do end label l3 + if maybe then #alt1#break label l2 #alt2#break label l3 #alt3#break label l4 #alt4#break #alt5#continue label l1 - break label l1 + end + if maybe then break label l1 4.output end label l2#!alt6# #alt6#end label l1 diff --git a/tests/base_label_for.nit b/tests/base_label_for.nit index 129f463..e7d59b5 100644 --- a/tests/base_label_for.nit +++ b/tests/base_label_for.nit @@ -16,6 +16,8 @@ import abstract_collection +fun maybe: Bool do return true + var a = new Container[Int](1) 1.output for i in a do @@ -23,12 +25,14 @@ for i in a do for j in a do 3.output for k in a do end label l3 + if maybe then #alt1#break label l2 #alt2#break label l3 #alt3#break label l4 #alt4#break #alt5#continue label l1 - break label l1 + end + if maybe then break label l1 4.output end label l2#!alt6# #alt6#end label l1 diff --git a/tests/base_label_loop.nit b/tests/base_label_loop.nit index a2b11ba..a45ae01 100644 --- a/tests/base_label_loop.nit +++ b/tests/base_label_loop.nit @@ -16,6 +16,8 @@ import kernel +fun maybe: Bool do return true + 1.output var exit=false loop @@ -27,12 +29,14 @@ loop loop break end label l3 + if maybe then #alt1#break label l2 #alt2#break label l3 #alt3#break label l4 #alt4#break #alt5#continue label l1 - break label l1 + end + if maybe then break label l1 4.output end label l2#!alt6# #alt6#end label l1 diff --git a/tests/base_label_while.nit b/tests/base_label_while.nit index 164c0f4..69f3793 100644 --- a/tests/base_label_while.nit +++ b/tests/base_label_while.nit @@ -16,6 +16,8 @@ import kernel +fun maybe: Bool do return true + var a = 1 1.output while a == 1 do @@ -25,12 +27,14 @@ while a == 1 do a = 3 3.output while false do end label l3 + if maybe then #alt1#break label l2 #alt2#break label l3 #alt3#break label l4 #alt4#break #alt5#continue label l1 - break label l1 + end + if maybe then break label l1 4.output end label l2#!alt6# #alt6#end label l1 diff --git a/tests/sav/base_closure1_alt10.sav b/tests/sav/base_closure1_alt10.sav index 3bb0e19..c42e09a 100644 --- a/tests/sav/base_closure1_alt10.sav +++ b/tests/sav/base_closure1_alt10.sav @@ -1 +1 @@ -alt/base_closure1_alt10.nit:45,3--7: Error: foo requires 1 blocks. +alt/base_closure1_alt10.nit:49,3--7: Error: foo requires 1 blocks. diff --git a/tests/sav/base_closure1_alt11.sav b/tests/sav/base_closure1_alt11.sav index 6486abd..5c7bcdf 100644 --- a/tests/sav/base_closure1_alt11.sav +++ b/tests/sav/base_closure1_alt11.sav @@ -1 +1 @@ -alt/base_closure1_alt11.nit:34,8--42,10: Error: 0 automatic variable names expected, 1 found. +alt/base_closure1_alt11.nit:36,8--46,10: Error: 0 automatic variable names expected, 1 found. diff --git a/tests/sav/base_closure1_alt12.sav b/tests/sav/base_closure1_alt12.sav index 672b85a..2f22328 100644 --- a/tests/sav/base_closure1_alt12.sav +++ b/tests/sav/base_closure1_alt12.sav @@ -1 +1 @@ -alt/base_closure1_alt12.nit:46,10--12: Error: no closure named '!baz' in foo; only closure is !bar. +alt/base_closure1_alt12.nit:50,10--12: Error: no closure named '!baz' in foo; only closure is !bar. diff --git a/tests/sav/base_closure1_alt5.sav b/tests/sav/base_closure1_alt5.sav index 7403db0..a746bcf 100644 --- a/tests/sav/base_closure1_alt5.sav +++ b/tests/sav/base_closure1_alt5.sav @@ -1 +1 @@ -alt/base_closure1_alt5.nit:38,3--11: Error: break without value required in this block. +alt/base_closure1_alt5.nit:41,3--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure1_alt7.sav b/tests/sav/base_closure1_alt7.sav index 7aa397b..6978677 100644 --- a/tests/sav/base_closure1_alt7.sav +++ b/tests/sav/base_closure1_alt7.sav @@ -1 +1 @@ -alt/base_closure1_alt7.nit:40,3--14: Error: continue without value required in this block. +alt/base_closure1_alt7.nit:43,3--14: Error: continue without value required in this block. diff --git a/tests/sav/base_closure1_alt9.sav b/tests/sav/base_closure1_alt9.sav index a50076e..cbe3605 100644 --- a/tests/sav/base_closure1_alt9.sav +++ b/tests/sav/base_closure1_alt9.sav @@ -1 +1 @@ -alt/base_closure1_alt9.nit:42,3--12: Error: Return with value in a procedure. +alt/base_closure1_alt9.nit:45,3--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure2_alt10.sav b/tests/sav/base_closure2_alt10.sav index 23b9e62..1e4fb03 100644 --- a/tests/sav/base_closure2_alt10.sav +++ b/tests/sav/base_closure2_alt10.sav @@ -1 +1 @@ -alt/base_closure2_alt10.nit:46,3--7: Error: foo requires 1 blocks. +alt/base_closure2_alt10.nit:50,3--7: Error: foo requires 1 blocks. diff --git a/tests/sav/base_closure2_alt11.sav b/tests/sav/base_closure2_alt11.sav index ded6ba6..b44cfcb 100644 --- a/tests/sav/base_closure2_alt11.sav +++ b/tests/sav/base_closure2_alt11.sav @@ -1 +1 @@ -alt/base_closure2_alt11.nit:35,8--43,14: Error: 1 automatic variable names expected, 0 found. +alt/base_closure2_alt11.nit:37,8--47,14: Error: 1 automatic variable names expected, 0 found. diff --git a/tests/sav/base_closure2_alt5.sav b/tests/sav/base_closure2_alt5.sav index 0b29966..c8a3f39 100644 --- a/tests/sav/base_closure2_alt5.sav +++ b/tests/sav/base_closure2_alt5.sav @@ -1 +1 @@ -alt/base_closure2_alt5.nit:39,3--11: Error: break without value required in this block. +alt/base_closure2_alt5.nit:42,3--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure2_alt7.sav b/tests/sav/base_closure2_alt7.sav index c918b2b..cd6b1f3 100644 --- a/tests/sav/base_closure2_alt7.sav +++ b/tests/sav/base_closure2_alt7.sav @@ -1 +1 @@ -alt/base_closure2_alt7.nit:41,3--14: Error: continue without value required in this block. +alt/base_closure2_alt7.nit:44,3--14: Error: continue without value required in this block. diff --git a/tests/sav/base_closure2_alt9.sav b/tests/sav/base_closure2_alt9.sav index 0c48f6c..66fea2b 100644 --- a/tests/sav/base_closure2_alt9.sav +++ b/tests/sav/base_closure2_alt9.sav @@ -1 +1 @@ -alt/base_closure2_alt9.nit:43,3--12: Error: Return with value in a procedure. +alt/base_closure2_alt9.nit:46,3--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure3_alt2.sav b/tests/sav/base_closure3_alt2.sav index ce88f76..acc48d1 100644 --- a/tests/sav/base_closure3_alt2.sav +++ b/tests/sav/base_closure3_alt2.sav @@ -1 +1 @@ -alt/base_closure3_alt2.nit:32,12--44,9: Error: 3 automatic variable names expected, 2 found. +alt/base_closure3_alt2.nit:34,12--48,9: Error: 3 automatic variable names expected, 2 found. diff --git a/tests/sav/base_closure3_alt5.sav b/tests/sav/base_closure3_alt5.sav index 81a2659..e63c04a 100644 --- a/tests/sav/base_closure3_alt5.sav +++ b/tests/sav/base_closure3_alt5.sav @@ -1 +1 @@ -alt/base_closure3_alt5.nit:38,3--11: Error: break without value required in this block. +alt/base_closure3_alt5.nit:41,3--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure3_alt7.sav b/tests/sav/base_closure3_alt7.sav index ef23644..170d367 100644 --- a/tests/sav/base_closure3_alt7.sav +++ b/tests/sav/base_closure3_alt7.sav @@ -1 +1 @@ -alt/base_closure3_alt7.nit:40,3--14: Error: continue without value required in this block. +alt/base_closure3_alt7.nit:43,3--14: Error: continue without value required in this block. diff --git a/tests/sav/base_closure3_alt9.sav b/tests/sav/base_closure3_alt9.sav index 186935c..f57be87 100644 --- a/tests/sav/base_closure3_alt9.sav +++ b/tests/sav/base_closure3_alt9.sav @@ -1 +1 @@ -alt/base_closure3_alt9.nit:42,3--12: Error: Return with value in a procedure. +alt/base_closure3_alt9.nit:45,3--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure4_alt10.sav b/tests/sav/base_closure4_alt10.sav index a906edc..8a2f35d 100644 --- a/tests/sav/base_closure4_alt10.sav +++ b/tests/sav/base_closure4_alt10.sav @@ -1 +1 @@ -alt/base_closure4_alt10.nit:45,3--7: Error: foo requires 1 blocks. +alt/base_closure4_alt10.nit:49,3--7: Error: foo requires 1 blocks. diff --git a/tests/sav/base_closure4_alt11.sav b/tests/sav/base_closure4_alt11.sav index ee8fa19..fb19e4c 100644 --- a/tests/sav/base_closure4_alt11.sav +++ b/tests/sav/base_closure4_alt11.sav @@ -1 +1 @@ -alt/base_closure4_alt11.nit:34,8--42,12: Error: 0 automatic variable names expected, 1 found. +alt/base_closure4_alt11.nit:36,8--46,12: Error: 0 automatic variable names expected, 1 found. diff --git a/tests/sav/base_closure4_alt5.sav b/tests/sav/base_closure4_alt5.sav index f349663..daf573c 100644 --- a/tests/sav/base_closure4_alt5.sav +++ b/tests/sav/base_closure4_alt5.sav @@ -1 +1 @@ -alt/base_closure4_alt5.nit:38,3--11: Error: break without value required in this block. +alt/base_closure4_alt5.nit:41,3--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure4_alt6.sav b/tests/sav/base_closure4_alt6.sav index 6b9bc99..576fece 100644 --- a/tests/sav/base_closure4_alt6.sav +++ b/tests/sav/base_closure4_alt6.sav @@ -1 +1 @@ -alt/base_closure4_alt6.nit:39,3--10: Error: continue with a value required in this block. +alt/base_closure4_alt6.nit:42,3--10: Error: continue with a value required in this block. diff --git a/tests/sav/base_closure4_alt7.sav b/tests/sav/base_closure4_alt7.sav index 905e4f7..c5fec2c 100644 --- a/tests/sav/base_closure4_alt7.sav +++ b/tests/sav/base_closure4_alt7.sav @@ -1 +1 @@ -alt/base_closure4_alt7.nit:40,12--14: Type error: expected Int, got Char +alt/base_closure4_alt7.nit:43,12--14: Type error: expected Int, got Char diff --git a/tests/sav/base_closure4_alt9.sav b/tests/sav/base_closure4_alt9.sav index 7b77ce7..560ce07 100644 --- a/tests/sav/base_closure4_alt9.sav +++ b/tests/sav/base_closure4_alt9.sav @@ -1 +1 @@ -alt/base_closure4_alt9.nit:42,3--12: Error: Return with value in a procedure. +alt/base_closure4_alt9.nit:45,3--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure5_alt1.sav b/tests/sav/base_closure5_alt1.sav index 40e846a..99a9231 100644 --- a/tests/sav/base_closure5_alt1.sav +++ b/tests/sav/base_closure5_alt1.sav @@ -1 +1 @@ -alt/base_closure5_alt1.nit:35,3--7: Error: break with a value required in this block. +alt/base_closure5_alt1.nit:38,3--7: Error: break with a value required in this block. diff --git a/tests/sav/base_closure5_alt2.sav b/tests/sav/base_closure5_alt2.sav index e875438..605c9ee 100644 --- a/tests/sav/base_closure5_alt2.sav +++ b/tests/sav/base_closure5_alt2.sav @@ -1 +1 @@ -alt/base_closure5_alt2.nit:36,9--11: Type error: no most general type. Got Char and Int. +alt/base_closure5_alt2.nit:39,9--11: Type error: no most general type. Got Char and Int. diff --git a/tests/sav/base_closure5_alt4.sav b/tests/sav/base_closure5_alt4.sav index 7608f9f..4fa39ab 100644 --- a/tests/sav/base_closure5_alt4.sav +++ b/tests/sav/base_closure5_alt4.sav @@ -1 +1 @@ -alt/base_closure5_alt4.nit:38,3--8: Error: Return without value in a function. +alt/base_closure5_alt4.nit:41,3--8: Error: Return without value in a function. diff --git a/tests/sav/base_closure5_alt5.sav b/tests/sav/base_closure5_alt5.sav index 4d5320b..3aa9730 100644 --- a/tests/sav/base_closure5_alt5.sav +++ b/tests/sav/base_closure5_alt5.sav @@ -1 +1 @@ -alt/base_closure5_alt5.nit:39,10--12: Type error: expected Int, got Char +alt/base_closure5_alt5.nit:42,10--12: Type error: expected Int, got Char diff --git a/tests/sav/base_closure5_alt7.sav b/tests/sav/base_closure5_alt7.sav index 0dd2acc..1db3b20 100644 --- a/tests/sav/base_closure5_alt7.sav +++ b/tests/sav/base_closure5_alt7.sav @@ -1 +1 @@ -alt/base_closure5_alt7.nit:41,3--10: Error: continue with a value required in this block. +alt/base_closure5_alt7.nit:44,3--10: Error: continue with a value required in this block. diff --git a/tests/sav/base_closure5_alt8.sav b/tests/sav/base_closure5_alt8.sav index 3652075..f7b4e9f 100644 --- a/tests/sav/base_closure5_alt8.sav +++ b/tests/sav/base_closure5_alt8.sav @@ -1 +1 @@ -alt/base_closure5_alt8.nit:42,12--14: Type error: expected Int, got Char +alt/base_closure5_alt8.nit:45,12--14: Type error: expected Int, got Char diff --git a/tests/sav/base_closure5_alt9.sav b/tests/sav/base_closure5_alt9.sav index 2d9e8a4..2881247 100644 --- a/tests/sav/base_closure5_alt9.sav +++ b/tests/sav/base_closure5_alt9.sav @@ -1 +1 @@ -alt/base_closure5_alt9.nit:33,16--34,10: Control error: Reached end of block (a 'continue' with a value was expected). +alt/base_closure5_alt9.nit:35,16--37,10: Control error: Reached end of block (a 'continue' with a value was expected). diff --git a/tests/sav/base_closure6.sav b/tests/sav/base_closure6.sav index 674e569..34e49ab 100644 --- a/tests/sav/base_closure6.sav +++ b/tests/sav/base_closure6.sav @@ -1,2 +1,2 @@ -./base_closure6.nit:55,25: Type error: no most general type. Got V and U. -./base_closure6.nit:65,8: Type error: no most general type. Got V and U at 64,8. +./base_closure6.nit:57,25: Type error: no most general type. Got V and U. +./base_closure6.nit:74,8: Type error: no most general type. Got V and U at 72,8. diff --git a/tests/sav/base_closure6_alt1.sav b/tests/sav/base_closure6_alt1.sav index 9b6b499..5711687 100644 --- a/tests/sav/base_closure6_alt1.sav +++ b/tests/sav/base_closure6_alt1.sav @@ -1,4 +1,4 @@ -alt/base_closure6_alt1.nit:52,5--25: Type error: expected U, got T -alt/base_closure6_alt1.nit:54,25: Type error: no most general type. Got V and U. -alt/base_closure6_alt1.nit:56,5--60,8: Type error: expected U, got T -alt/base_closure6_alt1.nit:64,8: Type error: no most general type. Got V and U at 63,8. +alt/base_closure6_alt1.nit:54,5--25: Type error: expected U, got T +alt/base_closure6_alt1.nit:56,25: Type error: no most general type. Got V and U. +alt/base_closure6_alt1.nit:58,5--66,8: Type error: expected U, got T +alt/base_closure6_alt1.nit:73,8: Type error: no most general type. Got V and U at 71,8. diff --git a/tests/sav/base_closure_break2_alt10.sav b/tests/sav/base_closure_break2_alt10.sav index 3f36375..56ad3fc 100644 --- a/tests/sav/base_closure_break2_alt10.sav +++ b/tests/sav/base_closure_break2_alt10.sav @@ -1 +1 @@ -alt/base_closure_break2_alt10.nit:48,3--7: Error: foo requires 1 blocks. +alt/base_closure_break2_alt10.nit:52,3--7: Error: foo requires 1 blocks. diff --git a/tests/sav/base_closure_break2_alt11.sav b/tests/sav/base_closure_break2_alt11.sav index 082f9c3..4e05ee3 100644 --- a/tests/sav/base_closure_break2_alt11.sav +++ b/tests/sav/base_closure_break2_alt11.sav @@ -1 +1 @@ -alt/base_closure_break2_alt11.nit:35,17--44,9: Error: 0 automatic variable names expected, 1 found. +alt/base_closure_break2_alt11.nit:37,17--48,9: Error: 0 automatic variable names expected, 1 found. diff --git a/tests/sav/base_closure_break2_alt13.sav b/tests/sav/base_closure_break2_alt13.sav index 885f0f7..f75bc05 100644 --- a/tests/sav/base_closure_break2_alt13.sav +++ b/tests/sav/base_closure_break2_alt13.sav @@ -1 +1 @@ -alt/base_closure_break2_alt13.nit:35,16--44,10: Control error: Reached end of break block (a 'break' with a value was expected). +alt/base_closure_break2_alt13.nit:37,16--48,10: Control error: Reached end of break block (a 'break' with a value was expected). diff --git a/tests/sav/base_closure_break2_alt2.sav b/tests/sav/base_closure_break2_alt2.sav index 23d8025..0dd5e58 100644 --- a/tests/sav/base_closure_break2_alt2.sav +++ b/tests/sav/base_closure_break2_alt2.sav @@ -1 +1 @@ -alt/base_closure_break2_alt2.nit:26,3--7: Error: arity missmatch; prototype is 'bar'. +alt/base_closure_break2_alt2.nit:26,17--21: Error: arity missmatch; prototype is 'bar'. diff --git a/tests/sav/base_closure_break2_alt3.sav b/tests/sav/base_closure_break2_alt3.sav index 5e5bf2c..421afe8 100644 --- a/tests/sav/base_closure_break2_alt3.sav +++ b/tests/sav/base_closure_break2_alt3.sav @@ -1 +1 @@ -alt/base_closure_break2_alt3.nit:27,11--13: Type error: expected expression. +alt/base_closure_break2_alt3.nit:27,25--27: Type error: expected expression. diff --git a/tests/sav/base_closure_break2_alt5.sav b/tests/sav/base_closure_break2_alt5.sav index 46671c7..3e8b6b1 100644 --- a/tests/sav/base_closure_break2_alt5.sav +++ b/tests/sav/base_closure_break2_alt5.sav @@ -1 +1 @@ -alt/base_closure_break2_alt5.nit:39,9--11: Type error: no most general type. Got Char and Int at 45,9. +alt/base_closure_break2_alt5.nit:42,9--11: Type error: no most general type. Got Char and Int at 49,9. diff --git a/tests/sav/base_closure_break2_alt6.sav b/tests/sav/base_closure_break2_alt6.sav index 8f4ce59..b22f812 100644 --- a/tests/sav/base_closure_break2_alt6.sav +++ b/tests/sav/base_closure_break2_alt6.sav @@ -1 +1 @@ -alt/base_closure_break2_alt6.nit:40,3--10: Error: cannot 'continue', only 'break'. +alt/base_closure_break2_alt6.nit:43,3--10: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break2_alt7.sav b/tests/sav/base_closure_break2_alt7.sav index 2326d14..6498b87 100644 --- a/tests/sav/base_closure_break2_alt7.sav +++ b/tests/sav/base_closure_break2_alt7.sav @@ -1 +1 @@ -alt/base_closure_break2_alt7.nit:41,3--14: Error: cannot 'continue', only 'break'. +alt/base_closure_break2_alt7.nit:44,3--14: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break2_alt9.sav b/tests/sav/base_closure_break2_alt9.sav index cd9487c..d5f96c2 100644 --- a/tests/sav/base_closure_break2_alt9.sav +++ b/tests/sav/base_closure_break2_alt9.sav @@ -1 +1 @@ -alt/base_closure_break2_alt9.nit:43,3--12: Error: Return with value in a procedure. +alt/base_closure_break2_alt9.nit:46,3--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure_break_alt10.sav b/tests/sav/base_closure_break_alt10.sav index b4535ee..6c93043 100644 --- a/tests/sav/base_closure_break_alt10.sav +++ b/tests/sav/base_closure_break_alt10.sav @@ -1 +1 @@ -alt/base_closure_break_alt10.nit:47,3--7: Error: foo requires 1 blocks. +alt/base_closure_break_alt10.nit:51,3--7: Error: foo requires 1 blocks. diff --git a/tests/sav/base_closure_break_alt11.sav b/tests/sav/base_closure_break_alt11.sav index 0da736c..c18faff 100644 --- a/tests/sav/base_closure_break_alt11.sav +++ b/tests/sav/base_closure_break_alt11.sav @@ -1 +1 @@ -alt/base_closure_break_alt11.nit:35,8--44,7: Error: 0 automatic variable names expected, 1 found. +alt/base_closure_break_alt11.nit:37,8--48,7: Error: 0 automatic variable names expected, 1 found. diff --git a/tests/sav/base_closure_break_alt2.sav b/tests/sav/base_closure_break_alt2.sav index ac4e1c7..39c797e 100644 --- a/tests/sav/base_closure_break_alt2.sav +++ b/tests/sav/base_closure_break_alt2.sav @@ -1 +1 @@ -alt/base_closure_break_alt2.nit:26,3--7: Error: arity missmatch; prototype is 'bar'. +alt/base_closure_break_alt2.nit:26,17--21: Error: arity missmatch; prototype is 'bar'. diff --git a/tests/sav/base_closure_break_alt3.sav b/tests/sav/base_closure_break_alt3.sav index 5d74e3d..e301f69 100644 --- a/tests/sav/base_closure_break_alt3.sav +++ b/tests/sav/base_closure_break_alt3.sav @@ -1 +1 @@ -alt/base_closure_break_alt3.nit:27,11--13: Type error: expected expression. +alt/base_closure_break_alt3.nit:27,25--27: Type error: expected expression. diff --git a/tests/sav/base_closure_break_alt5.sav b/tests/sav/base_closure_break_alt5.sav index 266af4f..dc549ce 100644 --- a/tests/sav/base_closure_break_alt5.sav +++ b/tests/sav/base_closure_break_alt5.sav @@ -1 +1 @@ -alt/base_closure_break_alt5.nit:39,3--11: Error: break without value required in this block. +alt/base_closure_break_alt5.nit:42,3--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure_break_alt6.sav b/tests/sav/base_closure_break_alt6.sav index de5aa6b..6636768 100644 --- a/tests/sav/base_closure_break_alt6.sav +++ b/tests/sav/base_closure_break_alt6.sav @@ -1 +1 @@ -alt/base_closure_break_alt6.nit:40,3--10: Error: cannot 'continue', only 'break'. +alt/base_closure_break_alt6.nit:43,3--10: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break_alt7.sav b/tests/sav/base_closure_break_alt7.sav index 07f91e2..115d566 100644 --- a/tests/sav/base_closure_break_alt7.sav +++ b/tests/sav/base_closure_break_alt7.sav @@ -1 +1 @@ -alt/base_closure_break_alt7.nit:41,3--14: Error: cannot 'continue', only 'break'. +alt/base_closure_break_alt7.nit:44,3--14: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break_alt9.sav b/tests/sav/base_closure_break_alt9.sav index 6b7c8ef..1d6658c 100644 --- a/tests/sav/base_closure_break_alt9.sav +++ b/tests/sav/base_closure_break_alt9.sav @@ -1 +1 @@ -alt/base_closure_break_alt9.nit:43,3--12: Error: Return with value in a procedure. +alt/base_closure_break_alt9.nit:46,3--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure_break_default2_alt1.sav b/tests/sav/base_closure_break_default2_alt1.sav index 1baa661..3e79ff0 100644 --- a/tests/sav/base_closure_break_default2_alt1.sav +++ b/tests/sav/base_closure_break_default2_alt1.sav @@ -1 +1 @@ -alt/base_closure_break_default2_alt1.nit:22,5--10: Error: Return without value in a function. +alt/base_closure_break_default2_alt1.nit:23,5--10: Error: Return without value in a function. diff --git a/tests/sav/base_closure_break_default2_alt3.sav b/tests/sav/base_closure_break_default2_alt3.sav index 639117b..7885e2f 100644 --- a/tests/sav/base_closure_break_default2_alt3.sav +++ b/tests/sav/base_closure_break_default2_alt3.sav @@ -3,4 +3,4 @@ 2 0 1 -Aborted (alt/base_closure_break_default2_alt3.nit:24) +Aborted (alt/base_closure_break_default2_alt3.nit:25) diff --git a/tests/sav/base_closure_break_default2_alt4.sav b/tests/sav/base_closure_break_default2_alt4.sav index 02f50c6..ee1dbbd 100644 --- a/tests/sav/base_closure_break_default2_alt4.sav +++ b/tests/sav/base_closure_break_default2_alt4.sav @@ -1 +1 @@ -alt/base_closure_break_default2_alt4.nit:25,5--12: Error: cannot 'continue', only 'break'. +alt/base_closure_break_default2_alt4.nit:26,5--12: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break_default2_alt5.sav b/tests/sav/base_closure_break_default2_alt5.sav index 96d0659..54998be 100644 --- a/tests/sav/base_closure_break_default2_alt5.sav +++ b/tests/sav/base_closure_break_default2_alt5.sav @@ -1 +1 @@ -alt/base_closure_break_default2_alt5.nit:26,5--15: Error: cannot 'continue', only 'break'. +alt/base_closure_break_default2_alt5.nit:27,5--15: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break_default2_alt6.sav b/tests/sav/base_closure_break_default2_alt6.sav index 6343951..e01e02f 100644 --- a/tests/sav/base_closure_break_default2_alt6.sav +++ b/tests/sav/base_closure_break_default2_alt6.sav @@ -1 +1 @@ -alt/base_closure_break_default2_alt6.nit:27,5--9: Error: break with a value required in this block. +alt/base_closure_break_default2_alt6.nit:28,5--9: Error: break with a value required in this block. diff --git a/tests/sav/base_closure_break_default2_alt8.sav b/tests/sav/base_closure_break_default2_alt8.sav index 1b5b879..ab6435c 100644 --- a/tests/sav/base_closure_break_default2_alt8.sav +++ b/tests/sav/base_closure_break_default2_alt8.sav @@ -1 +1 @@ -alt/base_closure_break_default2_alt8.nit:29,11--13: Type error: expected Int, got Char +alt/base_closure_break_default2_alt8.nit:30,11--13: Type error: expected Int, got Char diff --git a/tests/sav/base_closure_break_default2_alt9.sav b/tests/sav/base_closure_break_default2_alt9.sav index b9f6464..696ad41 100644 --- a/tests/sav/base_closure_break_default2_alt9.sav +++ b/tests/sav/base_closure_break_default2_alt9.sav @@ -1 +1 @@ -alt/base_closure_break_default2_alt9.nit:21,3--12: Control error: Reached end of break block (a 'break' with a value was expected). +alt/base_closure_break_default2_alt9.nit:21,3--22,11: Control error: Reached end of break block (a 'break' with a value was expected). diff --git a/tests/sav/base_closure_break_default_alt2.sav b/tests/sav/base_closure_break_default_alt2.sav index 23e01ac..8ec348b 100644 --- a/tests/sav/base_closure_break_default_alt2.sav +++ b/tests/sav/base_closure_break_default_alt2.sav @@ -1 +1 @@ -alt/base_closure_break_default_alt2.nit:23,5--12: Error: Return with value in a procedure. +alt/base_closure_break_default_alt2.nit:24,5--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure_break_default_alt3.sav b/tests/sav/base_closure_break_default_alt3.sav index 0d0e985..cc73dd3 100644 --- a/tests/sav/base_closure_break_default_alt3.sav +++ b/tests/sav/base_closure_break_default_alt3.sav @@ -3,4 +3,4 @@ 2 0 1 -Aborted (alt/base_closure_break_default_alt3.nit:24) +Aborted (alt/base_closure_break_default_alt3.nit:25) diff --git a/tests/sav/base_closure_break_default_alt4.sav b/tests/sav/base_closure_break_default_alt4.sav index a28c02a..ed8269f 100644 --- a/tests/sav/base_closure_break_default_alt4.sav +++ b/tests/sav/base_closure_break_default_alt4.sav @@ -1 +1 @@ -alt/base_closure_break_default_alt4.nit:25,5--12: Error: cannot 'continue', only 'break'. +alt/base_closure_break_default_alt4.nit:26,5--12: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break_default_alt5.sav b/tests/sav/base_closure_break_default_alt5.sav index 93faf17..850a20a 100644 --- a/tests/sav/base_closure_break_default_alt5.sav +++ b/tests/sav/base_closure_break_default_alt5.sav @@ -1 +1 @@ -alt/base_closure_break_default_alt5.nit:26,5--15: Error: cannot 'continue', only 'break'. +alt/base_closure_break_default_alt5.nit:27,5--15: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_closure_break_default_alt7.sav b/tests/sav/base_closure_break_default_alt7.sav index b04c112..9ad5905 100644 --- a/tests/sav/base_closure_break_default_alt7.sav +++ b/tests/sav/base_closure_break_default_alt7.sav @@ -1 +1 @@ -alt/base_closure_break_default_alt7.nit:28,5--11: Error: break without value required in this block. +alt/base_closure_break_default_alt7.nit:29,5--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure_default1_alt2.sav b/tests/sav/base_closure_default1_alt2.sav index 4f8aa5e..b2d233e 100644 --- a/tests/sav/base_closure_default1_alt2.sav +++ b/tests/sav/base_closure_default1_alt2.sav @@ -1 +1 @@ -alt/base_closure_default1_alt2.nit:23,5--12: Error: Return with value in a procedure. +alt/base_closure_default1_alt2.nit:24,5--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure_default1_alt3.sav b/tests/sav/base_closure_default1_alt3.sav index bf66d77..728e006 100644 --- a/tests/sav/base_closure_default1_alt3.sav +++ b/tests/sav/base_closure_default1_alt3.sav @@ -4,4 +4,4 @@ 3 0 1 -Aborted (alt/base_closure_default1_alt3.nit:24) +Aborted (alt/base_closure_default1_alt3.nit:25) diff --git a/tests/sav/base_closure_default1_alt5.sav b/tests/sav/base_closure_default1_alt5.sav index 04aeae3..05f7a69 100644 --- a/tests/sav/base_closure_default1_alt5.sav +++ b/tests/sav/base_closure_default1_alt5.sav @@ -1 +1 @@ -alt/base_closure_default1_alt5.nit:26,5--15: Error: continue without value required in this block. +alt/base_closure_default1_alt5.nit:27,5--15: Error: continue without value required in this block. diff --git a/tests/sav/base_closure_default1_alt7.sav b/tests/sav/base_closure_default1_alt7.sav index b12ac5d..36bd378 100644 --- a/tests/sav/base_closure_default1_alt7.sav +++ b/tests/sav/base_closure_default1_alt7.sav @@ -1 +1 @@ -alt/base_closure_default1_alt7.nit:28,5--11: Error: break without value required in this block. +alt/base_closure_default1_alt7.nit:29,5--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure_default2_alt2.sav b/tests/sav/base_closure_default2_alt2.sav index c08373d..8b8bbca 100644 --- a/tests/sav/base_closure_default2_alt2.sav +++ b/tests/sav/base_closure_default2_alt2.sav @@ -1 +1 @@ -alt/base_closure_default2_alt2.nit:23,5--12: Error: Return with value in a procedure. +alt/base_closure_default2_alt2.nit:24,5--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure_default2_alt3.sav b/tests/sav/base_closure_default2_alt3.sav index a14b823..59f2fd6 100644 --- a/tests/sav/base_closure_default2_alt3.sav +++ b/tests/sav/base_closure_default2_alt3.sav @@ -4,4 +4,4 @@ 3 0 1 -Aborted (alt/base_closure_default2_alt3.nit:24) +Aborted (alt/base_closure_default2_alt3.nit:25) diff --git a/tests/sav/base_closure_default2_alt5.sav b/tests/sav/base_closure_default2_alt5.sav index ed02170..fb67fe2 100644 --- a/tests/sav/base_closure_default2_alt5.sav +++ b/tests/sav/base_closure_default2_alt5.sav @@ -1 +1 @@ -alt/base_closure_default2_alt5.nit:26,5--15: Error: continue without value required in this block. +alt/base_closure_default2_alt5.nit:27,5--15: Error: continue without value required in this block. diff --git a/tests/sav/base_closure_default2_alt6.sav b/tests/sav/base_closure_default2_alt6.sav index 2ba416d..735d593 100644 --- a/tests/sav/base_closure_default2_alt6.sav +++ b/tests/sav/base_closure_default2_alt6.sav @@ -1 +1 @@ -alt/base_closure_default2_alt6.nit:34,3: Error: Method or variable 'i' unknown in A. +alt/base_closure_default2_alt6.nit:36,3: Error: Method or variable 'i' unknown in A. diff --git a/tests/sav/base_closure_default2_alt8.sav b/tests/sav/base_closure_default2_alt8.sav index 30febd3..6d85720 100644 --- a/tests/sav/base_closure_default2_alt8.sav +++ b/tests/sav/base_closure_default2_alt8.sav @@ -1 +1 @@ -alt/base_closure_default2_alt8.nit:28,5--11: Error: break without value required in this block. +alt/base_closure_default2_alt8.nit:29,5--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure_default3_alt2.sav b/tests/sav/base_closure_default3_alt2.sav index 9ff31f3..4dd646f 100644 --- a/tests/sav/base_closure_default3_alt2.sav +++ b/tests/sav/base_closure_default3_alt2.sav @@ -1 +1 @@ -alt/base_closure_default3_alt2.nit:23,5--12: Error: Return with value in a procedure. +alt/base_closure_default3_alt2.nit:24,5--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure_default3_alt3.sav b/tests/sav/base_closure_default3_alt3.sav index 653b09d..9f2a8d6 100644 --- a/tests/sav/base_closure_default3_alt3.sav +++ b/tests/sav/base_closure_default3_alt3.sav @@ -4,4 +4,4 @@ 3 0 1 -Aborted (alt/base_closure_default3_alt3.nit:24) +Aborted (alt/base_closure_default3_alt3.nit:25) diff --git a/tests/sav/base_closure_default3_alt4.sav b/tests/sav/base_closure_default3_alt4.sav index cb3a932..a67c589 100644 --- a/tests/sav/base_closure_default3_alt4.sav +++ b/tests/sav/base_closure_default3_alt4.sav @@ -1 +1 @@ -alt/base_closure_default3_alt4.nit:25,5--12: Error: continue with a value required in this block. +alt/base_closure_default3_alt4.nit:26,5--12: Error: continue with a value required in this block. diff --git a/tests/sav/base_closure_default4_alt2.sav b/tests/sav/base_closure_default4_alt2.sav index 5eb4ee1..16c6226 100644 --- a/tests/sav/base_closure_default4_alt2.sav +++ b/tests/sav/base_closure_default4_alt2.sav @@ -1 +1 @@ -alt/base_closure_default4_alt2.nit:23,5--13: Error: Return with value in a procedure. +alt/base_closure_default4_alt2.nit:24,5--13: Error: Return with value in a procedure. diff --git a/tests/sav/base_closure_default4_alt3.sav b/tests/sav/base_closure_default4_alt3.sav index 002fcad..d82f46b 100644 --- a/tests/sav/base_closure_default4_alt3.sav +++ b/tests/sav/base_closure_default4_alt3.sav @@ -4,4 +4,4 @@ 3 0 1 -Aborted (alt/base_closure_default4_alt3.nit:24) +Aborted (alt/base_closure_default4_alt3.nit:25) diff --git a/tests/sav/base_closure_default4_alt4.sav b/tests/sav/base_closure_default4_alt4.sav index 05fa2c4..209986c 100644 --- a/tests/sav/base_closure_default4_alt4.sav +++ b/tests/sav/base_closure_default4_alt4.sav @@ -1 +1 @@ -alt/base_closure_default4_alt4.nit:25,5--12: Error: continue with a value required in this block. +alt/base_closure_default4_alt4.nit:26,5--12: Error: continue with a value required in this block. diff --git a/tests/sav/base_closure_default4_alt5.sav b/tests/sav/base_closure_default4_alt5.sav index 75f8387..0657cfe 100644 --- a/tests/sav/base_closure_default4_alt5.sav +++ b/tests/sav/base_closure_default4_alt5.sav @@ -1 +1 @@ -alt/base_closure_default4_alt5.nit:21,3--19: Control error: Reached end of block (a 'continue' with a value was expected). +alt/base_closure_default4_alt5.nit:21,3--22,11: Control error: Reached end of block (a 'continue' with a value was expected). diff --git a/tests/sav/base_closure_default4_alt7.sav b/tests/sav/base_closure_default4_alt7.sav index 05e9908..5551e68 100644 --- a/tests/sav/base_closure_default4_alt7.sav +++ b/tests/sav/base_closure_default4_alt7.sav @@ -1 +1 @@ -alt/base_closure_default4_alt7.nit:27,5--11: Error: break without value required in this block. +alt/base_closure_default4_alt7.nit:28,5--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure_raf_alt10.fail b/tests/sav/base_closure_raf_alt10.fail index 70e905e..f7e6961 100644 --- a/tests/sav/base_closure_raf_alt10.fail +++ b/tests/sav/base_closure_raf_alt10.fail @@ -1 +1 @@ -alt/base_closure_raf_alt10.nit:50,3--7: Error: foo requires 1 blocks. +alt/base_closure_raf_alt10.nit:52,3--7: Error: foo requires 1 blocks. diff --git a/tests/sav/base_closure_raf_alt11.fail b/tests/sav/base_closure_raf_alt11.fail index 8ea336c..8cb1e9d 100644 --- a/tests/sav/base_closure_raf_alt11.fail +++ b/tests/sav/base_closure_raf_alt11.fail @@ -1 +1 @@ -alt/base_closure_raf_alt11.nit:39,8--47,14: Error: 1 automatic variable names expected, 0 found. +alt/base_closure_raf_alt11.nit:39,8--49,14: Error: 1 automatic variable names expected, 0 found. diff --git a/tests/sav/base_closure_raf_alt5.fail b/tests/sav/base_closure_raf_alt5.fail index 34f2509..ce40f14 100644 --- a/tests/sav/base_closure_raf_alt5.fail +++ b/tests/sav/base_closure_raf_alt5.fail @@ -1 +1 @@ -alt/base_closure_raf_alt5.nit:43,3--11: Error: break without value required in this block. +alt/base_closure_raf_alt5.nit:44,3--11: Error: break without value required in this block. diff --git a/tests/sav/base_closure_raf_alt7.fail b/tests/sav/base_closure_raf_alt7.fail index 717a6e6..2fce63d 100644 --- a/tests/sav/base_closure_raf_alt7.fail +++ b/tests/sav/base_closure_raf_alt7.fail @@ -1 +1 @@ -alt/base_closure_raf_alt7.nit:45,3--14: Error: continue without value required in this block. +alt/base_closure_raf_alt7.nit:46,3--14: Error: continue without value required in this block. diff --git a/tests/sav/base_closure_raf_alt9.fail b/tests/sav/base_closure_raf_alt9.fail index 93502f8..c6b65d5 100644 --- a/tests/sav/base_closure_raf_alt9.fail +++ b/tests/sav/base_closure_raf_alt9.fail @@ -1 +1 @@ -alt/base_closure_raf_alt9.nit:47,3--12: Error: Return with value in a procedure. +alt/base_closure_raf_alt9.nit:48,3--12: Error: Return with value in a procedure. diff --git a/tests/sav/base_label_closure2_alt2.sav b/tests/sav/base_label_closure2_alt2.sav index aaf9a05..1025465 100644 --- a/tests/sav/base_label_closure2_alt2.sav +++ b/tests/sav/base_label_closure2_alt2.sav @@ -1 +1 @@ -alt/base_label_closure2_alt2.nit:35,9--16: Syntax error: invalid label l3. +alt/base_label_closure2_alt2.nit:38,9--16: Syntax error: invalid label l3. diff --git a/tests/sav/base_label_closure2_alt3.sav b/tests/sav/base_label_closure2_alt3.sav index 0ae681d..eb35437 100644 --- a/tests/sav/base_label_closure2_alt3.sav +++ b/tests/sav/base_label_closure2_alt3.sav @@ -1 +1 @@ -alt/base_label_closure2_alt3.nit:36,9--16: Syntax error: invalid label l4. +alt/base_label_closure2_alt3.nit:39,9--16: Syntax error: invalid label l4. diff --git a/tests/sav/base_label_closure2_alt6.sav b/tests/sav/base_label_closure2_alt6.sav index 50a7db3..a0b9517 100644 --- a/tests/sav/base_label_closure2_alt6.sav +++ b/tests/sav/base_label_closure2_alt6.sav @@ -1 +1 @@ -alt/base_label_closure2_alt6.nit:41,6--13: Syntax error: label l1 already defined at 45,5--12. +alt/base_label_closure2_alt6.nit:46,6--13: Syntax error: label l1 already defined at 50,5--12. diff --git a/tests/sav/base_label_closure2_alt7.sav b/tests/sav/base_label_closure2_alt7.sav index 3a86a1e..1f3e53b 100644 --- a/tests/sav/base_label_closure2_alt7.sav +++ b/tests/sav/base_label_closure2_alt7.sav @@ -1 +1 @@ -alt/base_label_closure2_alt7.nit:52,5--12: Syntax error: label l1 already defined at 46,5--12. +alt/base_label_closure2_alt7.nit:57,5--12: Syntax error: label l1 already defined at 51,5--12. diff --git a/tests/sav/base_label_closure3_alt2.sav b/tests/sav/base_label_closure3_alt2.sav index f8d8654..35dba57 100644 --- a/tests/sav/base_label_closure3_alt2.sav +++ b/tests/sav/base_label_closure3_alt2.sav @@ -1 +1 @@ -alt/base_label_closure3_alt2.nit:34,9--16: Syntax error: invalid label l3. +alt/base_label_closure3_alt2.nit:37,9--16: Syntax error: invalid label l3. diff --git a/tests/sav/base_label_closure3_alt3.sav b/tests/sav/base_label_closure3_alt3.sav index 0f140ff..cab7fa4 100644 --- a/tests/sav/base_label_closure3_alt3.sav +++ b/tests/sav/base_label_closure3_alt3.sav @@ -1 +1 @@ -alt/base_label_closure3_alt3.nit:35,9--16: Syntax error: invalid label l4. +alt/base_label_closure3_alt3.nit:38,9--16: Syntax error: invalid label l4. diff --git a/tests/sav/base_label_closure3_alt6.sav b/tests/sav/base_label_closure3_alt6.sav index b94eeee..b738a73 100644 --- a/tests/sav/base_label_closure3_alt6.sav +++ b/tests/sav/base_label_closure3_alt6.sav @@ -1,2 +1,2 @@ -alt/base_label_closure3_alt6.nit:42,6--13: Syntax error: label l1 already defined at 46,5--12. -alt/base_label_closure3_alt6.nit:42,6--13: Syntax error: label l1 already defined at 46,5--12. +alt/base_label_closure3_alt6.nit:46,6--13: Syntax error: label l1 already defined at 50,5--12. +alt/base_label_closure3_alt6.nit:46,6--13: Syntax error: label l1 already defined at 50,5--12. diff --git a/tests/sav/base_label_closure3_alt7.sav b/tests/sav/base_label_closure3_alt7.sav index ee5bf63..2662837 100644 --- a/tests/sav/base_label_closure3_alt7.sav +++ b/tests/sav/base_label_closure3_alt7.sav @@ -1 +1 @@ -alt/base_label_closure3_alt7.nit:50,17--24: Syntax error: label l1 already defined at 47,5--12. +alt/base_label_closure3_alt7.nit:54,17--24: Syntax error: label l1 already defined at 51,5--12. diff --git a/tests/sav/base_label_closure_alt2.sav b/tests/sav/base_label_closure_alt2.sav index 764211d..4b5affb 100644 --- a/tests/sav/base_label_closure_alt2.sav +++ b/tests/sav/base_label_closure_alt2.sav @@ -1 +1 @@ -alt/base_label_closure_alt2.nit:32,9--16: Syntax error: invalid label l3. +alt/base_label_closure_alt2.nit:35,9--16: Syntax error: invalid label l3. diff --git a/tests/sav/base_label_closure_alt3.sav b/tests/sav/base_label_closure_alt3.sav index 80a5645..b5c88ac 100644 --- a/tests/sav/base_label_closure_alt3.sav +++ b/tests/sav/base_label_closure_alt3.sav @@ -1 +1 @@ -alt/base_label_closure_alt3.nit:33,9--16: Syntax error: invalid label l4. +alt/base_label_closure_alt3.nit:36,9--16: Syntax error: invalid label l4. diff --git a/tests/sav/base_label_closure_alt6.sav b/tests/sav/base_label_closure_alt6.sav index 48961b5..4c277d0 100644 --- a/tests/sav/base_label_closure_alt6.sav +++ b/tests/sav/base_label_closure_alt6.sav @@ -1 +1 @@ -alt/base_label_closure_alt6.nit:38,6--13: Syntax error: label l1 already defined at 40,5--12. +alt/base_label_closure_alt6.nit:42,6--13: Syntax error: label l1 already defined at 44,5--12. diff --git a/tests/sav/base_label_closure_alt7.sav b/tests/sav/base_label_closure_alt7.sav index 45cb516..1c6a53f 100644 --- a/tests/sav/base_label_closure_alt7.sav +++ b/tests/sav/base_label_closure_alt7.sav @@ -1 +1 @@ -alt/base_label_closure_alt7.nit:44,17--24: Syntax error: label l1 already defined at 41,5--12. +alt/base_label_closure_alt7.nit:48,17--24: Syntax error: label l1 already defined at 45,5--12. diff --git a/tests/sav/base_label_do_alt2.sav b/tests/sav/base_label_do_alt2.sav index 004f21e..4d99931 100644 --- a/tests/sav/base_label_do_alt2.sav +++ b/tests/sav/base_label_do_alt2.sav @@ -1 +1 @@ -alt/base_label_do_alt2.nit:26,9--16: Syntax error: invalid label l3. +alt/base_label_do_alt2.nit:29,9--16: Syntax error: invalid label l3. diff --git a/tests/sav/base_label_do_alt3.sav b/tests/sav/base_label_do_alt3.sav index db31e51..204520e 100644 --- a/tests/sav/base_label_do_alt3.sav +++ b/tests/sav/base_label_do_alt3.sav @@ -1 +1 @@ -alt/base_label_do_alt3.nit:27,9--16: Syntax error: invalid label l4. +alt/base_label_do_alt3.nit:30,9--16: Syntax error: invalid label l4. diff --git a/tests/sav/base_label_do_alt4.sav b/tests/sav/base_label_do_alt4.sav index b93fb21..cf87778 100644 --- a/tests/sav/base_label_do_alt4.sav +++ b/tests/sav/base_label_do_alt4.sav @@ -1 +1 @@ -alt/base_label_do_alt4.nit:28,3--7: Syntax Error: 'break' statment outside block. +alt/base_label_do_alt4.nit:31,3--7: Syntax Error: 'break' statment outside block. diff --git a/tests/sav/base_label_do_alt5.sav b/tests/sav/base_label_do_alt5.sav index f40de95..277c0fa 100644 --- a/tests/sav/base_label_do_alt5.sav +++ b/tests/sav/base_label_do_alt5.sav @@ -1 +1 @@ -alt/base_label_do_alt5.nit:29,3--19: Error: cannot 'continue', only 'break'. +alt/base_label_do_alt5.nit:32,3--19: Error: cannot 'continue', only 'break'. diff --git a/tests/sav/base_label_do_alt6.sav b/tests/sav/base_label_do_alt6.sav index f86d21c..b89244b 100644 --- a/tests/sav/base_label_do_alt6.sav +++ b/tests/sav/base_label_do_alt6.sav @@ -1 +1 @@ -alt/base_label_do_alt6.nit:32,6--13: Syntax error: label l1 already defined at 34,5--12. +alt/base_label_do_alt6.nit:36,6--13: Syntax error: label l1 already defined at 38,5--12. diff --git a/tests/sav/base_label_do_alt7.sav b/tests/sav/base_label_do_alt7.sav index b0b9dbb..e0422b3 100644 --- a/tests/sav/base_label_do_alt7.sav +++ b/tests/sav/base_label_do_alt7.sav @@ -1 +1 @@ -alt/base_label_do_alt7.nit:38,8--15: Syntax error: label l1 already defined at 35,5--12. +alt/base_label_do_alt7.nit:42,8--15: Syntax error: label l1 already defined at 39,5--12. diff --git a/tests/sav/base_label_for_alt2.sav b/tests/sav/base_label_for_alt2.sav index c53076d..45fc0ef 100644 --- a/tests/sav/base_label_for_alt2.sav +++ b/tests/sav/base_label_for_alt2.sav @@ -1 +1 @@ -alt/base_label_for_alt2.nit:27,9--16: Syntax error: invalid label l3. +alt/base_label_for_alt2.nit:30,9--16: Syntax error: invalid label l3. diff --git a/tests/sav/base_label_for_alt3.sav b/tests/sav/base_label_for_alt3.sav index 9f68341..187689e 100644 --- a/tests/sav/base_label_for_alt3.sav +++ b/tests/sav/base_label_for_alt3.sav @@ -1 +1 @@ -alt/base_label_for_alt3.nit:28,9--16: Syntax error: invalid label l4. +alt/base_label_for_alt3.nit:31,9--16: Syntax error: invalid label l4. diff --git a/tests/sav/base_label_for_alt6.sav b/tests/sav/base_label_for_alt6.sav index a9b06dc..cc5b03a 100644 --- a/tests/sav/base_label_for_alt6.sav +++ b/tests/sav/base_label_for_alt6.sav @@ -1 +1 @@ -alt/base_label_for_alt6.nit:33,6--13: Syntax error: label l1 already defined at 35,5--12. +alt/base_label_for_alt6.nit:37,6--13: Syntax error: label l1 already defined at 39,5--12. diff --git a/tests/sav/base_label_for_alt7.sav b/tests/sav/base_label_for_alt7.sav index d4eacf2..6084c84 100644 --- a/tests/sav/base_label_for_alt7.sav +++ b/tests/sav/base_label_for_alt7.sav @@ -1 +1 @@ -alt/base_label_for_alt7.nit:39,19--26: Syntax error: label l1 already defined at 36,5--12. +alt/base_label_for_alt7.nit:43,19--26: Syntax error: label l1 already defined at 40,5--12. diff --git a/tests/sav/base_label_loop_alt2.sav b/tests/sav/base_label_loop_alt2.sav index 25d4e4b..484f2d9 100644 --- a/tests/sav/base_label_loop_alt2.sav +++ b/tests/sav/base_label_loop_alt2.sav @@ -1 +1 @@ -alt/base_label_loop_alt2.nit:31,9--16: Syntax error: invalid label l3. +alt/base_label_loop_alt2.nit:34,9--16: Syntax error: invalid label l3. diff --git a/tests/sav/base_label_loop_alt3.sav b/tests/sav/base_label_loop_alt3.sav index 281f804..6a45e76 100644 --- a/tests/sav/base_label_loop_alt3.sav +++ b/tests/sav/base_label_loop_alt3.sav @@ -1 +1 @@ -alt/base_label_loop_alt3.nit:32,9--16: Syntax error: invalid label l4. +alt/base_label_loop_alt3.nit:35,9--16: Syntax error: invalid label l4. diff --git a/tests/sav/base_label_loop_alt6.sav b/tests/sav/base_label_loop_alt6.sav index 2b9defc..161d5f7 100644 --- a/tests/sav/base_label_loop_alt6.sav +++ b/tests/sav/base_label_loop_alt6.sav @@ -1 +1 @@ -alt/base_label_loop_alt6.nit:37,6--13: Syntax error: label l1 already defined at 39,5--12. +alt/base_label_loop_alt6.nit:41,6--13: Syntax error: label l1 already defined at 43,5--12. diff --git a/tests/sav/base_label_loop_alt7.sav b/tests/sav/base_label_loop_alt7.sav index f5bfcb5..82d1537 100644 --- a/tests/sav/base_label_loop_alt7.sav +++ b/tests/sav/base_label_loop_alt7.sav @@ -1 +1 @@ -alt/base_label_loop_alt7.nit:45,5--12: Syntax error: label l1 already defined at 40,5--12. +alt/base_label_loop_alt7.nit:49,5--12: Syntax error: label l1 already defined at 44,5--12. diff --git a/tests/sav/base_label_while_alt2.sav b/tests/sav/base_label_while_alt2.sav index 1de23c1..0057fe8 100644 --- a/tests/sav/base_label_while_alt2.sav +++ b/tests/sav/base_label_while_alt2.sav @@ -1 +1 @@ -alt/base_label_while_alt2.nit:29,9--16: Syntax error: invalid label l3. +alt/base_label_while_alt2.nit:32,9--16: Syntax error: invalid label l3. diff --git a/tests/sav/base_label_while_alt3.sav b/tests/sav/base_label_while_alt3.sav index 724490f..1b91617 100644 --- a/tests/sav/base_label_while_alt3.sav +++ b/tests/sav/base_label_while_alt3.sav @@ -1 +1 @@ -alt/base_label_while_alt3.nit:30,9--16: Syntax error: invalid label l4. +alt/base_label_while_alt3.nit:33,9--16: Syntax error: invalid label l4. diff --git a/tests/sav/base_label_while_alt6.sav b/tests/sav/base_label_while_alt6.sav index bff5f07..d32f75e 100644 --- a/tests/sav/base_label_while_alt6.sav +++ b/tests/sav/base_label_while_alt6.sav @@ -1 +1 @@ -alt/base_label_while_alt6.nit:35,6--13: Syntax error: label l1 already defined at 37,5--12. +alt/base_label_while_alt6.nit:39,6--13: Syntax error: label l1 already defined at 41,5--12. diff --git a/tests/sav/base_label_while_alt7.sav b/tests/sav/base_label_while_alt7.sav index dea6f91..3527646 100644 --- a/tests/sav/base_label_while_alt7.sav +++ b/tests/sav/base_label_while_alt7.sav @@ -1 +1 @@ -alt/base_label_while_alt7.nit:41,20--27: Syntax error: label l1 already defined at 38,5--12. +alt/base_label_while_alt7.nit:45,20--27: Syntax error: label l1 already defined at 42,5--12. diff --git a/tests/test_refinement.nit b/tests/test_refinement.nit index 17b154c..c5b19f5 100644 --- a/tests/test_refinement.nit +++ b/tests/test_refinement.nit @@ -27,7 +27,7 @@ redef class Int else return (self-1).fact(r*self) end - return 1 + end fun fact2: Int