tests: update sav with new location on error messages

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/tests/sav/base_formal_subtype.res b/tests/sav/base_formal_subtype.res
index 5ff1d37..5865ea3 100644 (file)
--- a/tests/sav/base_formal_subtype.res
+++ b/tests/sav/base_formal_subtype.res
@@ -9,22 +9,22 @@ base_formal_subtype.nit:58,10--19: Warning: expression is already a `VE` since i
 base_formal_subtype.nit:59,10--18: Warning: expression is already a `E` since it is a `VVE`.
 base_formal_subtype.nit:60,10--23: Warning: expression is already a `Object` since it is a `VVE`.
 base_formal_subtype.nit:62,10--20: Warning: expression is already a `VGE`.
-base_formal_subtype.nit:63,10--20: Warning: expression is already a `G[E]` since it is a `VGE`.
-base_formal_subtype.nit:64,10--25: Warning: expression is already a `G[Object]` since it is a `VGE`.
+base_formal_subtype.nit:63,10--21: Warning: expression is already a `G[E]` since it is a `VGE`.
+base_formal_subtype.nit:64,10--26: Warning: expression is already a `G[Object]` since it is a `VGE`.
 base_formal_subtype.nit:65,10--23: Warning: expression is already a `Object` since it is a `VGE`.
 base_formal_subtype.nit:67,10--22: Warning: expression is already a `VVGE`.
 base_formal_subtype.nit:68,10--21: Warning: expression is already a `VGE` since it is a `VVGE`.
-base_formal_subtype.nit:69,10--21: Warning: expression is already a `G[E]` since it is a `VVGE`.
-base_formal_subtype.nit:70,10--26: Warning: expression is already a `G[Object]` since it is a `VVGE`.
+base_formal_subtype.nit:69,10--22: Warning: expression is already a `G[E]` since it is a `VVGE`.
+base_formal_subtype.nit:70,10--27: Warning: expression is already a `G[Object]` since it is a `VVGE`.
 base_formal_subtype.nit:71,10--24: Warning: expression is already a `Object` since it is a `VVGE`.
 base_formal_subtype.nit:73,10--22: Warning: expression is already a `VGVE`.
-base_formal_subtype.nit:74,10--22: Warning: expression is already a `G[VE]` since it is a `VGVE`.
-base_formal_subtype.nit:75,10--21: Warning: expression is already a `G[E]` since it is a `VGVE`.
-base_formal_subtype.nit:76,10--26: Warning: expression is already a `G[Object]` since it is a `VGVE`.
+base_formal_subtype.nit:74,10--23: Warning: expression is already a `G[VE]` since it is a `VGVE`.
+base_formal_subtype.nit:75,10--22: Warning: expression is already a `G[E]` since it is a `VGVE`.
+base_formal_subtype.nit:76,10--27: Warning: expression is already a `G[Object]` since it is a `VGVE`.
 base_formal_subtype.nit:77,10--24: Warning: expression is already a `Object` since it is a `VGVE`.
 base_formal_subtype.nit:79,10--24: Warning: expression is already a `VGVVE`.
-base_formal_subtype.nit:80,10--24: Warning: expression is already a `G[VVE]` since it is a `VGVVE`.
-base_formal_subtype.nit:81,10--23: Warning: expression is already a `G[VE]` since it is a `VGVVE`.
-base_formal_subtype.nit:82,10--22: Warning: expression is already a `G[E]` since it is a `VGVVE`.
-base_formal_subtype.nit:83,10--27: Warning: expression is already a `G[Object]` since it is a `VGVVE`.
+base_formal_subtype.nit:80,10--25: Warning: expression is already a `G[VVE]` since it is a `VGVVE`.
+base_formal_subtype.nit:81,10--24: Warning: expression is already a `G[VE]` since it is a `VGVVE`.
+base_formal_subtype.nit:82,10--23: Warning: expression is already a `G[E]` since it is a `VGVVE`.
+base_formal_subtype.nit:83,10--28: Warning: expression is already a `G[Object]` since it is a `VGVVE`.
 base_formal_subtype.nit:84,10--25: Warning: expression is already a `Object` since it is a `VGVVE`.

diff --git a/tests/sav/base_gen2_alt1.res b/tests/sav/base_gen2_alt1.res
index ab2b981..1c07e6e 100644 (file)
--- a/tests/sav/base_gen2_alt1.res
+++ b/tests/sav/base_gen2_alt1.res
@@ -1 +1 @@
-alt/base_gen2_alt1.nit:61,13--17: Type Error: `A` is not a generic class.
+alt/base_gen2_alt1.nit:61,13--18: Type Error: `A` is not a generic class.

diff --git a/tests/sav/base_gen2_alt3.res b/tests/sav/base_gen2_alt3.res
index 08000b1..5693f2b 100644 (file)
--- a/tests/sav/base_gen2_alt3.res
+++ b/tests/sav/base_gen2_alt3.res
@@ -1 +1 @@
-alt/base_gen2_alt3.nit:63,13--22: Type Error: expected 1 formal argument(s) for `B[E: nullable Object]`; got 2.
+alt/base_gen2_alt3.nit:63,13--23: Type Error: expected 1 formal argument(s) for `B[E: nullable Object]`; got 2.

diff --git a/tests/sav/base_gen2_alt5.res b/tests/sav/base_gen2_alt5.res
index 77eb2ca..eaad7c9 100644 (file)
--- a/tests/sav/base_gen2_alt5.res
+++ b/tests/sav/base_gen2_alt5.res
@@ -1 +1 @@
-alt/base_gen2_alt5.nit:65,13--17: Type Error: expected 2 formal argument(s) for `C[F: nullable Object, G: nullable Object]`; got 1.
+alt/base_gen2_alt5.nit:65,13--18: Type Error: expected 2 formal argument(s) for `C[F: nullable Object, G: nullable Object]`; got 1.

diff --git a/tests/sav/base_isa_gen1.res b/tests/sav/base_isa_gen1.res
index e8ade92..989bc61 100644 (file)
--- a/tests/sav/base_isa_gen1.res
+++ b/tests/sav/base_isa_gen1.res
@@ -1,4 +1,4 @@
 base_isa_gen1.nit:62,8--14: Warning: expression is already a `A` since it is a `F`.
-base_isa_gen1.nit:65,8--29: Warning: expression is already a `D[Object, Object]` since it is a `G[Object]`.
-base_isa_gen1.nit:66,8--29: Warning: expression is already a `D[Object, Object]` since it is a `E[F]`.
+base_isa_gen1.nit:65,8--30: Warning: expression is already a `D[Object, Object]` since it is a `G[Object]`.
+base_isa_gen1.nit:66,8--30: Warning: expression is already a `D[Object, Object]` since it is a `E[F]`.
 true

diff --git a/tests/sav/base_isa_gen2.res b/tests/sav/base_isa_gen2.res
index 1994474..6dde482 100644 (file)
--- a/tests/sav/base_isa_gen2.res
+++ b/tests/sav/base_isa_gen2.res
@@ -1,5 +1,5 @@
-base_isa_gen2.nit:39,8--21: Warning: expression is already a `A[Object]`.
-base_isa_gen2.nit:41,8--21: Warning: expression is already a `A[Object]` since it is a `B[Object]`.
-base_isa_gen2.nit:44,8--21: Warning: expression is already a `A[Object]` since it is a `C[Object]`.
-base_isa_gen2.nit:48,8--21: Warning: expression is already a `A[Object]` since it is a `D[Object, Object]`.
+base_isa_gen2.nit:39,8--22: Warning: expression is already a `A[Object]`.
+base_isa_gen2.nit:41,8--22: Warning: expression is already a `A[Object]` since it is a `B[Object]`.
+base_isa_gen2.nit:44,8--22: Warning: expression is already a `A[Object]` since it is a `C[Object]`.
+base_isa_gen2.nit:48,8--22: Warning: expression is already a `A[Object]` since it is a `D[Object, Object]`.
 true

diff --git a/tests/sav/base_isa_gen4.res b/tests/sav/base_isa_gen4.res
index 427c827..8725a4a 100644 (file)
--- a/tests/sav/base_isa_gen4.res
+++ b/tests/sav/base_isa_gen4.res
@@ -1,5 +1,5 @@
 base_isa_gen4.nit:34,8--15: Warning: expression is already a `A` since it is a `B[Canard]`.
-base_isa_gen4.nit:36,8--22: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
-base_isa_gen4.nit:40,8--24: Warning: expression is already a `B[B[Canard]]`.
-base_isa_gen4.nit:42,8--24: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
+base_isa_gen4.nit:36,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
+base_isa_gen4.nit:40,8--26: Warning: expression is already a `B[B[Canard]]`.
+base_isa_gen4.nit:42,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
 true

diff --git a/tests/sav/base_isa_gen5.res b/tests/sav/base_isa_gen5.res
index 6e347f5..c391776 100644 (file)
--- a/tests/sav/base_isa_gen5.res
+++ b/tests/sav/base_isa_gen5.res
@@ -1,5 +1,5 @@
 base_isa_gen5.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Canard]`.
-base_isa_gen5.nit:41,8--22: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
-base_isa_gen5.nit:46,8--24: Warning: expression is already a `B[B[Canard]]`.
-base_isa_gen5.nit:48,8--24: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
+base_isa_gen5.nit:41,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
+base_isa_gen5.nit:46,8--26: Warning: expression is already a `B[B[Canard]]`.
+base_isa_gen5.nit:48,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
 true

diff --git a/tests/sav/base_isa_gen8.res b/tests/sav/base_isa_gen8.res
index 1569432..0e4a6ca 100644 (file)
--- a/tests/sav/base_isa_gen8.res
+++ b/tests/sav/base_isa_gen8.res
@@ -1,10 +1,10 @@
-base_isa_gen8.nit:49,8--17: Warning: expression is already a `A[X]`.
-base_isa_gen8.nit:50,8--17: Warning: expression is already a `A[Y]`.
-base_isa_gen8.nit:51,8--17: Warning: expression is already a `A[Z]`.
-base_isa_gen8.nit:53,8--21: Warning: expression is already a `B[Object]` since it is a `B[X]`.
-base_isa_gen8.nit:55,8--21: Warning: expression is already a `C[X, X]`.
-base_isa_gen8.nit:56,8--21: Warning: expression is already a `C[X, Y]`.
-base_isa_gen8.nit:57,8--21: Warning: expression is already a `C[X, Z]`.
-base_isa_gen8.nit:59,8--22: Warning: expression is already a `D[X, Y, Z]`.
-base_isa_gen8.nit:60,8--28: Warning: expression is already a `E[X, Y, Z, Bool]`.
+base_isa_gen8.nit:49,8--18: Warning: expression is already a `A[X]`.
+base_isa_gen8.nit:50,8--18: Warning: expression is already a `A[Y]`.
+base_isa_gen8.nit:51,8--18: Warning: expression is already a `A[Z]`.
+base_isa_gen8.nit:53,8--22: Warning: expression is already a `B[Object]` since it is a `B[X]`.
+base_isa_gen8.nit:55,8--22: Warning: expression is already a `C[X, X]`.
+base_isa_gen8.nit:56,8--22: Warning: expression is already a `C[X, Y]`.
+base_isa_gen8.nit:57,8--22: Warning: expression is already a `C[X, Z]`.
+base_isa_gen8.nit:59,8--23: Warning: expression is already a `D[X, Y, Z]`.
+base_isa_gen8.nit:60,8--29: Warning: expression is already a `E[X, Y, Z, Bool]`.
 true

diff --git a/tests/sav/base_isa_nullable1.res b/tests/sav/base_isa_nullable1.res
index ae76751..2b455c4 100644 (file)
--- a/tests/sav/base_isa_nullable1.res
+++ b/tests/sav/base_isa_nullable1.res
@@ -1,6 +1,6 @@
 base_isa_nullable1.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Integer]`.
-base_isa_nullable1.nit:41,8--24: Warning: expression is already a `B[Discrete]` since it is a `B[Integer]`.
-base_isa_nullable1.nit:46,8--25: Warning: expression is already a `B[B[Integer]]`.
-base_isa_nullable1.nit:48,8--26: Warning: expression is already a `B[B[Discrete]]` since it is a `B[B[Integer]]`.
-base_isa_nullable1.nit:50,8--33: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Discrete]`.
+base_isa_nullable1.nit:41,8--25: Warning: expression is already a `B[Discrete]` since it is a `B[Integer]`.
+base_isa_nullable1.nit:46,8--27: Warning: expression is already a `B[B[Integer]]`.
+base_isa_nullable1.nit:48,8--28: Warning: expression is already a `B[B[Discrete]]` since it is a `B[B[Integer]]`.
+base_isa_nullable1.nit:50,8--34: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Discrete]`.
 true

diff --git a/tests/sav/base_isa_nullable2.res b/tests/sav/base_isa_nullable2.res
index b4b3d25..947e8c1 100644 (file)
--- a/tests/sav/base_isa_nullable2.res
+++ b/tests/sav/base_isa_nullable2.res
@@ -1,5 +1,5 @@
 base_isa_nullable2.nit:27,8--23: Warning: expression is already a `nullable A` since it is a `A`.
-base_isa_nullable2.nit:29,8--30: Warning: expression is already a `nullable B[Object]` since it is a `B[Object]`.
-base_isa_nullable2.nit:30,8--39: Warning: expression is already a `nullable B[nullable Object]` since it is a `nullable B[Object]`.
-base_isa_nullable2.nit:33,8--30: Warning: expression is already a `C[nullable Object]`.
+base_isa_nullable2.nit:29,8--31: Warning: expression is already a `nullable B[Object]` since it is a `B[Object]`.
+base_isa_nullable2.nit:30,8--40: Warning: expression is already a `nullable B[nullable Object]` since it is a `nullable B[Object]`.
+base_isa_nullable2.nit:33,8--31: Warning: expression is already a `C[nullable Object]`.
 true

diff --git a/tests/sav/base_isa_vt_gen1.res b/tests/sav/base_isa_vt_gen1.res
index 3ba9f50..a2b07bc 100644 (file)
--- a/tests/sav/base_isa_vt_gen1.res
+++ b/tests/sav/base_isa_vt_gen1.res
@@ -1,6 +1,6 @@
-base_isa_vt_gen1.nit:30,10--34: Warning: expression is already a `Triple[T, U, V]`.
-base_isa_vt_gen1.nit:54,8--52: Warning: expression is already a `Triple[String, Int, nullable Object]`.
-base_isa_vt_gen1.nit:57,8--46: Warning: expression is already a `Triple[String, String, String]`.
-base_isa_vt_gen1.nit:60,8--48: Warning: expression is already a `Triple[String, String, B[String]]`.
-base_isa_vt_gen1.nit:63,8--46: Warning: expression is already a `Triple[String, String, String]`.
+base_isa_vt_gen1.nit:30,10--35: Warning: expression is already a `Triple[T, U, V]`.
+base_isa_vt_gen1.nit:54,8--53: Warning: expression is already a `Triple[String, Int, nullable Object]`.
+base_isa_vt_gen1.nit:57,8--47: Warning: expression is already a `Triple[String, String, String]`.
+base_isa_vt_gen1.nit:60,8--50: Warning: expression is already a `Triple[String, String, B[String]]`.
+base_isa_vt_gen1.nit:63,8--47: Warning: expression is already a `Triple[String, String, String]`.
 true

diff --git a/tests/sav/error_formal.res b/tests/sav/error_formal.res
index 319de47..bae2431 100644 (file)
--- a/tests/sav/error_formal.res
+++ b/tests/sav/error_formal.res
@@ -1 +1 @@
-error_formal.nit:18,9--13: Type Error: formal type `T` cannot have formal parameters.
+error_formal.nit:18,9--14: Type Error: formal type `T` cannot have formal parameters.

diff --git a/tests/sav/error_needed_method_alt2.res b/tests/sav/error_needed_method_alt2.res
index 623beb3..3687868 100644 (file)
--- a/tests/sav/error_needed_method_alt2.res
+++ b/tests/sav/error_needed_method_alt2.res
@@ -1 +1 @@
-alt/error_needed_method_alt2.nit:47,10--27: Type Error: cannot instantiate interface `Collection[Int]`.
+alt/error_needed_method_alt2.nit:47,10--28: Type Error: cannot instantiate interface `Collection[Int]`.

diff --git a/tests/sav/error_operators.res b/tests/sav/error_operators.res
index 1949e18..69708db 100644 (file)
--- a/tests/sav/error_operators.res
+++ b/tests/sav/error_operators.res
@@ -23,7 +23,7 @@ error_operators.nit:46,10: Syntax Error: binary operator `>=` requires exactly o
 error_operators.nit:47,11: Syntax Error: binary operator `<=>` requires exactly one parameter; got 0.
 error_operators.nit:48,10: Syntax Error: binary operator `<<` requires exactly one parameter; got 0.
 error_operators.nit:49,10: Syntax Error: binary operator `>>` requires exactly one parameter; got 0.
-error_operators.nit:50,14: Syntax Error: `foo=` requires at least 1 parameter(s); got 0.
+error_operators.nit:50,11: Syntax Error: `foo=` requires at least 1 parameter(s); got 0.
 error_operators.nit:51,10: Syntax Error: `[]` requires at least 1 parameter(s); got 0.
 error_operators.nit:52,9--14: Syntax Error: `[]=` requires at least 2 parameter(s); got 1.
 error_operators.nit:57,7--18: Syntax Error: binary operator `+` requires exactly one parameter; got 3.

diff --git a/tests/sav/error_redef_1alt2_alt1.res b/tests/sav/error_redef_1alt2_alt1.res
index e00f31a..8c231e7 100644 (file)
--- a/tests/sav/error_redef_1alt2_alt1.res
+++ b/tests/sav/error_redef_1alt2_alt1.res
@@ -1 +1 @@
-alt/error_redef_1alt2_alt1.nit:26,18: Redef Error: expected 1 parameter(s) for `f1(i: Int)`; got 0. See introduction at `error_redef_1alt2_alt1::A::f1`.
+alt/error_redef_1alt2_alt1.nit:26,15: Redef Error: expected 1 parameter(s) for `f1(i: Int)`; got 0. See introduction at `error_redef_1alt2_alt1::A::f1`.

diff --git a/tests/sav/error_redef_1alt2_alt4.res b/tests/sav/error_redef_1alt2_alt4.res
index 618b516..8c19f5a 100644 (file)
--- a/tests/sav/error_redef_1alt2_alt4.res
+++ b/tests/sav/error_redef_1alt2_alt4.res
@@ -1 +1 @@
-alt/error_redef_1alt2_alt4.nit:29,18: Redef Error: expected 1 parameter(s) for `f1(i: Int)`; got 0. See introduction at `error_redef_1alt2_alt4::A::f1`.
+alt/error_redef_1alt2_alt4.nit:29,15: Redef Error: expected 1 parameter(s) for `f1(i: Int)`; got 0. See introduction at `error_redef_1alt2_alt4::A::f1`.

diff --git a/tests/sav/error_redef_1alt4_alt1.res b/tests/sav/error_redef_1alt4_alt1.res
index b835f2c..8af74ef 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt1.res
+++ b/tests/sav/error_redef_1alt4_alt1.res
@@ -1 +1 @@
-alt/error_redef_1alt4_alt1.nit:26,18: Redef Error: expected 1 parameter(s) for `f1(i: Int): Int`; got 0. See introduction at `error_redef_1alt4_alt1::A::f1`.
+alt/error_redef_1alt4_alt1.nit:26,15: Redef Error: expected 1 parameter(s) for `f1(i: Int): Int`; got 0. See introduction at `error_redef_1alt4_alt1::A::f1`.

diff --git a/tests/sav/error_redef_1alt4_alt4.res b/tests/sav/error_redef_1alt4_alt4.res
index f957017..4391f63 100644 (file)
--- a/tests/sav/error_redef_1alt4_alt4.res
+++ b/tests/sav/error_redef_1alt4_alt4.res
@@ -1 +1 @@
-alt/error_redef_1alt4_alt4.nit:29,18: Redef Error: expected 1 parameter(s) for `f1(i: Int): Int`; got 0. See introduction at `error_redef_1alt4_alt4::A::f1`.
+alt/error_redef_1alt4_alt4.nit:29,15: Redef Error: expected 1 parameter(s) for `f1(i: Int): Int`; got 0. See introduction at `error_redef_1alt4_alt4::A::f1`.

diff --git a/tests/sav/error_type_unk_alt2.res b/tests/sav/error_type_unk_alt2.res
index d970d0e..ab9e44c 100644 (file)
--- a/tests/sav/error_type_unk_alt2.res
+++ b/tests/sav/error_type_unk_alt2.res
@@ -1,2 +1,2 @@
 alt/error_type_unk_alt2.nit:9,8--11: Error: class `Fail` not found in module `error_type_unk_alt2`.
-alt/error_type_unk_alt2.nit:11,8--13: Error: class `Fail` not found in module `error_type_unk_alt2`.
+alt/error_type_unk_alt2.nit:11,8--14: Error: class `Fail` not found in module `error_type_unk_alt2`.

diff --git a/tests/sav/error_virtual_type2.res b/tests/sav/error_virtual_type2.res
index ab1b279..92b9dfd 100644 (file)
--- a/tests/sav/error_virtual_type2.res
+++ b/tests/sav/error_virtual_type2.res
@@ -1 +1 @@
-error_virtual_type2.nit:40,17--26: Redef Error: expected `G[T]` bound type; got `G[Discrete]`.
+error_virtual_type2.nit:40,17--27: Redef Error: expected `G[T]` bound type; got `G[Discrete]`.

diff --git a/tests/sav/error_virtual_type2_alt1.res b/tests/sav/error_virtual_type2_alt1.res
index cbecfd2..102039e 100644 (file)
--- a/tests/sav/error_virtual_type2_alt1.res
+++ b/tests/sav/error_virtual_type2_alt1.res
@@ -1,5 +1,5 @@
-alt/error_virtual_type2_alt1.nit:22,2--24,13: Error: circularity of virtual type definition: GT -> T <-> T.
+alt/error_virtual_type2_alt1.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> T <-> T.
 alt/error_virtual_type2_alt1.nit:25,2--10: Error: circularity of virtual type definition: T <-> T.
 alt/error_virtual_type2_alt1.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt1.nit:40,17--26: Redef Error: expected `null` bound type; got `G[Discrete]`.
+alt/error_virtual_type2_alt1.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
 alt/error_virtual_type2_alt1.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt2.res b/tests/sav/error_virtual_type2_alt2.res
index 64d40fb..a591422 100644 (file)
--- a/tests/sav/error_virtual_type2_alt2.res
+++ b/tests/sav/error_virtual_type2_alt2.res
@@ -1,5 +1,5 @@
-alt/error_virtual_type2_alt2.nit:22,2--24,13: Error: circularity of virtual type definition: GT -> T <-> nullable T.
+alt/error_virtual_type2_alt2.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> T <-> nullable T.
 alt/error_virtual_type2_alt2.nit:25,2--26,19: Error: circularity of virtual type definition: T <-> nullable T.
 alt/error_virtual_type2_alt2.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt2.nit:40,17--26: Redef Error: expected `null` bound type; got `G[Discrete]`.
+alt/error_virtual_type2_alt2.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
 alt/error_virtual_type2_alt2.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt3.res b/tests/sav/error_virtual_type2_alt3.res
index d0f163d..0a01c3d 100644 (file)
--- a/tests/sav/error_virtual_type2_alt3.res
+++ b/tests/sav/error_virtual_type2_alt3.res
@@ -1,5 +1,5 @@
-alt/error_virtual_type2_alt3.nit:22,2--24,13: Error: circularity of virtual type definition: GT -> G[T] <-> T.
-alt/error_virtual_type2_alt3.nit:25,2--27,12: Error: circularity of virtual type definition: T <-> G[T].
+alt/error_virtual_type2_alt3.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> G[T] <-> T.
+alt/error_virtual_type2_alt3.nit:25,2--27,13: Error: circularity of virtual type definition: T <-> G[T].
 alt/error_virtual_type2_alt3.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt3.nit:40,17--26: Redef Error: expected `null` bound type; got `G[Discrete]`.
+alt/error_virtual_type2_alt3.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
 alt/error_virtual_type2_alt3.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt4.res b/tests/sav/error_virtual_type2_alt4.res
index 521bd6a..4d60ab3 100644 (file)
--- a/tests/sav/error_virtual_type2_alt4.res
+++ b/tests/sav/error_virtual_type2_alt4.res
@@ -1,4 +1,4 @@
 alt/error_virtual_type2_alt4.nit:29,10--13: Error: class `FAIL` not found in module `error_virtual_type2_alt4`.
 alt/error_virtual_type2_alt4.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt4.nit:40,17--26: Redef Error: expected `null` bound type; got `G[Discrete]`.
+alt/error_virtual_type2_alt4.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
 alt/error_virtual_type2_alt4.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt5.res b/tests/sav/error_virtual_type2_alt5.res
index 5d3086a..62974d7 100644 (file)
--- a/tests/sav/error_virtual_type2_alt5.res
+++ b/tests/sav/error_virtual_type2_alt5.res
@@ -1,5 +1,5 @@
-alt/error_virtual_type2_alt5.nit:22,2--24,13: Error: circularity of virtual type definition: GT -> T <-> U.
+alt/error_virtual_type2_alt5.nit:22,2--24,14: Error: circularity of virtual type definition: GT -> T <-> U.
 alt/error_virtual_type2_alt5.nit:25,2--30,10: Error: circularity of virtual type definition: T <-> U.
 alt/error_virtual_type2_alt5.nit:38,23: Redef Error: expected `Comparable` for return type; got `T`.
-alt/error_virtual_type2_alt5.nit:40,17--26: Redef Error: expected `null` bound type; got `G[Discrete]`.
+alt/error_virtual_type2_alt5.nit:40,17--27: Redef Error: expected `null` bound type; got `G[Discrete]`.
 alt/error_virtual_type2_alt5.nit:42,23: Redef Error: expected `Comparable` for return type; got `T`.

diff --git a/tests/sav/error_virtual_type2_alt6.res b/tests/sav/error_virtual_type2_alt6.res
index 964af31..48dc700 100644 (file)
--- a/tests/sav/error_virtual_type2_alt6.res
+++ b/tests/sav/error_virtual_type2_alt6.res
@@ -1,2 +1,2 @@
-alt/error_virtual_type2_alt6.nit:40,17--26: Redef Error: expected `G[T]` bound type; got `G[Discrete]`.
-alt/error_virtual_type2_alt6.nit:41,2--22: Error: a property `GT` is already defined in class `B` at line 39.
+alt/error_virtual_type2_alt6.nit:40,17--27: Redef Error: expected `G[T]` bound type; got `G[Discrete]`.
+alt/error_virtual_type2_alt6.nit:41,2--23: Error: a property `GT` is already defined in class `B` at line 39.

diff --git a/tests/sav/error_virtual_type_alt3.res b/tests/sav/error_virtual_type_alt3.res
index 359a845..7514f5f 100644 (file)
--- a/tests/sav/error_virtual_type_alt3.res
+++ b/tests/sav/error_virtual_type_alt3.res
@@ -1,2 +1,2 @@
 alt/error_virtual_type_alt3.nit:25,12: Type Error: expected `Object`, got `T`.
-alt/error_virtual_type_alt3.nit:22,2--25,12: Error: circularity of virtual type definition: T <-> G[T].
+alt/error_virtual_type_alt3.nit:22,2--25,13: Error: circularity of virtual type definition: T <-> G[T].

diff --git a/tests/sav/nitg-e/base_isa_gen1.res b/tests/sav/nitg-e/base_isa_gen1.res
index b929fb0..4000211 100644 (file)
--- a/tests/sav/nitg-e/base_isa_gen1.res
+++ b/tests/sav/nitg-e/base_isa_gen1.res
@@ -1,4 +1,4 @@
 base_isa_gen1.nit:62,8--14: Warning: expression is already a `A` since it is a `F`.
-base_isa_gen1.nit:65,8--29: Warning: expression is already a `D[Object, Object]` since it is a `G[Object]`.
-base_isa_gen1.nit:66,8--29: Warning: expression is already a `D[Object, Object]` since it is a `E[F]`.
+base_isa_gen1.nit:65,8--30: Warning: expression is already a `D[Object, Object]` since it is a `G[Object]`.
+base_isa_gen1.nit:66,8--30: Warning: expression is already a `D[Object, Object]` since it is a `E[F]`.
 Runtime error: Assert failed (base_isa_gen1.nit:68)

diff --git a/tests/sav/nitg-e/base_isa_gen4.res b/tests/sav/nitg-e/base_isa_gen4.res
index 47f5a1a..203c263 100644 (file)
--- a/tests/sav/nitg-e/base_isa_gen4.res
+++ b/tests/sav/nitg-e/base_isa_gen4.res
@@ -1,5 +1,5 @@
 base_isa_gen4.nit:34,8--15: Warning: expression is already a `A` since it is a `B[Canard]`.
-base_isa_gen4.nit:36,8--22: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
-base_isa_gen4.nit:40,8--24: Warning: expression is already a `B[B[Canard]]`.
-base_isa_gen4.nit:42,8--24: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
+base_isa_gen4.nit:36,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
+base_isa_gen4.nit:40,8--26: Warning: expression is already a `B[B[Canard]]`.
+base_isa_gen4.nit:42,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
 Runtime error: Assert failed (base_isa_gen4.nit:37)

diff --git a/tests/sav/nitg-e/base_isa_gen5.res b/tests/sav/nitg-e/base_isa_gen5.res
index 74ee1c6..26754cf 100644 (file)
--- a/tests/sav/nitg-e/base_isa_gen5.res
+++ b/tests/sav/nitg-e/base_isa_gen5.res
@@ -1,5 +1,5 @@
 base_isa_gen5.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Canard]`.
-base_isa_gen5.nit:41,8--22: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
-base_isa_gen5.nit:46,8--24: Warning: expression is already a `B[B[Canard]]`.
-base_isa_gen5.nit:48,8--24: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
+base_isa_gen5.nit:41,8--23: Warning: expression is already a `B[Animal]` since it is a `B[Canard]`.
+base_isa_gen5.nit:46,8--26: Warning: expression is already a `B[B[Canard]]`.
+base_isa_gen5.nit:48,8--26: Warning: expression is already a `B[B[Animal]]` since it is a `B[B[Canard]]`.
 Runtime error: Assert failed (base_isa_gen5.nit:42)

diff --git a/tests/sav/nitg-e/base_isa_nullable1.res b/tests/sav/nitg-e/base_isa_nullable1.res
index 1b28872..ff43ba5 100644 (file)
--- a/tests/sav/nitg-e/base_isa_nullable1.res
+++ b/tests/sav/nitg-e/base_isa_nullable1.res
@@ -1,6 +1,6 @@
 base_isa_nullable1.nit:39,8--15: Warning: expression is already a `A` since it is a `B[Integer]`.
-base_isa_nullable1.nit:41,8--24: Warning: expression is already a `B[Discrete]` since it is a `B[Integer]`.
-base_isa_nullable1.nit:46,8--25: Warning: expression is already a `B[B[Integer]]`.
-base_isa_nullable1.nit:48,8--26: Warning: expression is already a `B[B[Discrete]]` since it is a `B[B[Integer]]`.
-base_isa_nullable1.nit:50,8--33: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Discrete]`.
+base_isa_nullable1.nit:41,8--25: Warning: expression is already a `B[Discrete]` since it is a `B[Integer]`.
+base_isa_nullable1.nit:46,8--27: Warning: expression is already a `B[B[Integer]]`.
+base_isa_nullable1.nit:48,8--28: Warning: expression is already a `B[B[Discrete]]` since it is a `B[B[Integer]]`.
+base_isa_nullable1.nit:50,8--34: Warning: expression is already a `B[nullable Discrete]` since it is a `B[Discrete]`.
 Runtime error: Assert failed (base_isa_nullable1.nit:42)

diff --git a/tests/sav/nitg-e/base_isa_nullable2.res b/tests/sav/nitg-e/base_isa_nullable2.res
index 5255183..84216d5 100644 (file)
--- a/tests/sav/nitg-e/base_isa_nullable2.res
+++ b/tests/sav/nitg-e/base_isa_nullable2.res
@@ -1,5 +1,5 @@
 base_isa_nullable2.nit:27,8--23: Warning: expression is already a `nullable A` since it is a `A`.
-base_isa_nullable2.nit:29,8--30: Warning: expression is already a `nullable B[Object]` since it is a `B[Object]`.
-base_isa_nullable2.nit:30,8--39: Warning: expression is already a `nullable B[nullable Object]` since it is a `nullable B[Object]`.
-base_isa_nullable2.nit:33,8--30: Warning: expression is already a `C[nullable Object]`.
+base_isa_nullable2.nit:29,8--31: Warning: expression is already a `nullable B[Object]` since it is a `B[Object]`.
+base_isa_nullable2.nit:30,8--40: Warning: expression is already a `nullable B[nullable Object]` since it is a `nullable B[Object]`.
+base_isa_nullable2.nit:33,8--31: Warning: expression is already a `C[nullable Object]`.
 Runtime error: Assert failed (base_isa_nullable2.nit:32)

diff --git a/tests/sav/nitmetrics_args1.res b/tests/sav/nitmetrics_args1.res
index 73ce784..c3c9801 100644 (file)
--- a/tests/sav/nitmetrics_args1.res
+++ b/tests/sav/nitmetrics_args1.res
@@ -402,41 +402,41 @@ Distribution of direct smallers
   <=8: sub-population=1 (14.28%); cumulated value=6 (100.00%)
 --- AST Metrics ---
 ## All nodes of the AST
- population: 48
+ population: 50
  minimum value: 1
  maximum value: 40
- total value: 261
- average value: 5.43
+ total value: 270
+ average value: 5.40
  distribution:
-  <=1: sub-population=15 (31.25%); cumulated value=15 (5.74%)
-  <=2: sub-population=5 (10.41%); cumulated value=10 (3.83%)
-  <=4: sub-population=10 (20.83%); cumulated value=32 (12.26%)
-  <=8: sub-population=10 (20.83%); cumulated value=64 (24.52%)
-  <=16: sub-population=4 (8.33%); cumulated value=44 (16.85%)
-  <=32: sub-population=3 (6.25%); cumulated value=56 (21.45%)
-  <=64: sub-population=1 (2.08%); cumulated value=40 (15.32%)
+  <=1: sub-population=16 (32.00%); cumulated value=16 (5.92%)
+  <=2: sub-population=5 (10.00%); cumulated value=10 (3.70%)
+  <=4: sub-population=9 (18.00%); cumulated value=28 (10.37%)
+  <=8: sub-population=12 (24.00%); cumulated value=76 (28.14%)
+  <=16: sub-population=4 (8.00%); cumulated value=44 (16.29%)
+  <=32: sub-population=3 (6.00%); cumulated value=56 (20.74%)
+  <=64: sub-population=1 (2.00%); cumulated value=40 (14.81%)
  list:
-  TId: 40 (15.32%)
-  APublicVisibility: 19 (7.27%)
-  AListExprs: 19 (7.27%)
-  ACallExpr: 18 (6.89%)
-  TClassid: 15 (5.74%)
-  TNumber: 10 (3.83%)
-  ADecIntExpr: 10 (3.83%)
-  AType: 9 (3.44%)
-  TKwend: 8 (3.06%)
-  ASignature: 8 (3.06%)
+  TId: 40 (14.81%)
+  APublicVisibility: 19 (7.03%)
+  AListExprs: 19 (7.03%)
+  ACallExpr: 18 (6.66%)
+  TClassid: 15 (5.55%)
+  TNumber: 10 (3.70%)
+  ADecIntExpr: 10 (3.70%)
+  AType: 9 (3.33%)
+  TKwend: 8 (2.96%)
+  ASignature: 8 (2.96%)
   ...
-  ACallAssignExpr: 1 (0.38%)
-  AAnnotations: 1 (0.38%)
-  AReturnExpr: 1 (0.38%)
-  TKwreturn: 1 (0.38%)
-  AInterfaceClasskind: 1 (0.38%)
-  TKwinterface: 1 (0.38%)
-  ANoImport: 1 (0.38%)
-  AMainMethPropdef: 1 (0.38%)
-  AMainClassdef: 1 (0.38%)
-  TKwimport: 1 (0.38%)
+  ASelfExpr: 1 (0.37%)
+  AAnnotations: 1 (0.37%)
+  ACallAssignExpr: 1 (0.37%)
+  TKwreturn: 1 (0.37%)
+  AInterfaceClasskind: 1 (0.37%)
+  TKwinterface: 1 (0.37%)
+  ANoImport: 1 (0.37%)
+  AMainMethPropdef: 1 (0.37%)
+  AMainClassdef: 1 (0.37%)
+  TKwimport: 1 (0.37%)
 ## All identifiers of the AST
  population: 20
  minimum value: 1

diff --git a/tests/sav/nitpretty_args21.res b/tests/sav/nitpretty_args21.res
index 7a8fe04..b63845a 100644 (file)
--- a/tests/sav/nitpretty_args21.res
+++ b/tests/sav/nitpretty_args21.res
@@ -34,9 +34,8 @@ fun errno: Int is extern `{
        return errno;
 `}
 
-fun errnoooooooooooooooooooooooooooooooooooooooooooooooooooooooooo: Int is extern `{
-        return errno;
-`}
+fun errnoooooooooooooooooooooooooooooooooooooooooooooooooooooooooo: Int is
+       extern `{ return errno; `}
 
 private class A
        var my_attr = 1234

diff --git a/tests/sav/test_attr_easy.res b/tests/sav/test_attr_easy.res
index 67755e7..9357190 100644 (file)
--- a/tests/sav/test_attr_easy.res
+++ b/tests/sav/test_attr_easy.res
@@ -4,7 +4,7 @@ test_attr_easy.nit:19,31--39: Warning: expression is already a `Int`.
 test_attr_easy.nit:19,43--53: Warning: expression is already a `Float`.
 test_attr_easy.nit:20,5--16: Warning: expression is already a `String`.
 test_attr_easy.nit:20,20--26: Warning: expression is already a `B`.
-test_attr_easy.nit:20,44--62: Warning: expression is already a `HashMap[Int, B]`.
+test_attr_easy.nit:20,44--63: Warning: expression is already a `HashMap[Int, B]`.
 true false 12345 1.235 asdf true
 an instance of B
 true true true true

diff --git a/tests/sav/test_parser_args1.res b/tests/sav/test_parser_args1.res
index 1f99f54..9172e4f 100644 (file)
--- a/tests/sav/test_parser_args1.res
+++ b/tests/sav/test_parser_args1.res
@@ -41,6 +41,7 @@ Start ../src/test_parser.nit:17,1--156,1
         TId "rank" ../src/test_parser.nit:27,14--17
         AType ../src/test_parser.nit:27,20--22
           TClassid "Int" ../src/test_parser.nit:27,20--22
+        TAssign "=" ../src/test_parser.nit:27,24
         ADecIntExpr ../src/test_parser.nit:27,26
           TNumber "0" ../src/test_parser.nit:27,26
       AMethPropdef ../src/test_parser.nit:28,2--38,4
@@ -54,6 +55,7 @@ Start ../src/test_parser.nit:17,1--156,1
           AParam ../src/test_parser.nit:28,18
             TId "n" ../src/test_parser.nit:28,18
           TCpar ")" ../src/test_parser.nit:28,19
+        TKwdo "do" ../src/test_parser.nit:29,2--3
         ABlockExpr ../src/test_parser.nit:30,3--38,4
           AIfExpr ../src/test_parser.nit:30,3--34,5
             TKwif "if" ../src/test_parser.nit:30,3--4
@@ -65,6 +67,7 @@ Start ../src/test_parser.nit:17,1--156,1
               TKwisa "isa" ../src/test_parser.nit:30,8--10
               AType ../src/test_parser.nit:30,12--16
                 TClassid "Token" ../src/test_parser.nit:30,12--16
+            TKwthen "then" ../src/test_parser.nit:30,18--21
             ABlockExpr ../src/test_parser.nit:31,4--88
               ACallExpr ../src/test_parser.nit:31,4--88
                 AImplicitSelfExpr ../src/test_parser.nit:31,4
@@ -110,6 +113,7 @@ Start ../src/test_parser.nit:17,1--156,1
                   AStringExpr ../src/test_parser.nit:31,84--87
                     TString "\"\\n\"" ../src/test_parser.nit:31,84--87
                   TCpar ")" ../src/test_parser.nit:31,88
+            TKwelse "else" ../src/test_parser.nit:32,3--6
             ABlockExpr ../src/test_parser.nit:33,4--34,5
               ACallExpr ../src/test_parser.nit:33,4--59
                 AImplicitSelfExpr ../src/test_parser.nit:33,4
@@ -267,6 +271,7 @@ Start ../src/test_parser.nit:17,1--156,1
                   TEq "==" ../src/test_parser.nit:49,16--17
                   AStringExpr ../src/test_parser.nit:49,19--22
                     TString "\"-n\"" ../src/test_parser.nit:49,19--22
+                TKwthen "then" ../src/test_parser.nit:49,24--27
                 ABlockExpr ../src/test_parser.nit:50,3--17
                   ACallAssignExpr ../src/test_parser.nit:50,3--17
                     AImplicitSelfExpr ../src/test_parser.nit:50,3
@@ -275,6 +280,7 @@ Start ../src/test_parser.nit:17,1--156,1
                     TAssign "=" ../src/test_parser.nit:50,12
                     ATrueExpr ../src/test_parser.nit:50,14--17
                       TKwtrue "true" ../src/test_parser.nit:50,14--17
+                TKwelse "else" ../src/test_parser.nit:51,2--5
                 AIfExpr ../src/test_parser.nit:51,7--66,4
                   TKwif "if" ../src/test_parser.nit:51,7--8
                   AEqExpr ../src/test_parser.nit:51,10--27
@@ -288,6 +294,7 @@ Start ../src/test_parser.nit:17,1--156,1
                     TEq "==" ../src/test_parser.nit:51,21--22
                     AStringExpr ../src/test_parser.nit:51,24--27
                       TString "\"-l\"" ../src/test_parser.nit:51,24--27
+                  TKwthen "then" ../src/test_parser.nit:51,29--32
                   ABlockExpr ../src/test_parser.nit:52,3--19
                     ACallAssignExpr ../src/test_parser.nit:52,3--19
                       AImplicitSelfExpr ../src/test_parser.nit:52,3
@@ -296,6 +303,7 @@ Start ../src/test_parser.nit:17,1--156,1
                       TAssign "=" ../src/test_parser.nit:52,14
                       ATrueExpr ../src/test_parser.nit:52,16--19
                         TKwtrue "true" ../src/test_parser.nit:52,16--19
+                  TKwelse "else" ../src/test_parser.nit:53,2--5
                   AIfExpr ../src/test_parser.nit:53,7--66,4
                     TKwif "if" ../src/test_parser.nit:53,7--8
                     AEqExpr ../src/test_parser.nit:53,10--27
@@ -309,6 +317,7 @@ Start ../src/test_parser.nit:17,1--156,1
                       TEq "==" ../src/test_parser.nit:53,21--22
                       AStringExpr ../src/test_parser.nit:53,24--27
                         TString "\"-p\"" ../src/test_parser.nit:53,24--27
+                    TKwthen "then" ../src/test_parser.nit:53,29--32
                     ABlockExpr ../src/test_parser.nit:54,3--20
                       ACallAssignExpr ../src/test_parser.nit:54,3--20
                         AImplicitSelfExpr ../src/test_parser.nit:54,3
@@ -317,6 +326,7 @@ Start ../src/test_parser.nit:17,1--156,1
                         TAssign "=" ../src/test_parser.nit:54,14
                         AFalseExpr ../src/test_parser.nit:54,16--20
                           TKwfalse "false" ../src/test_parser.nit:54,16--20
+                    TKwelse "else" ../src/test_parser.nit:55,2--5
                     AIfExpr ../src/test_parser.nit:55,7--66,4
                       TKwif "if" ../src/test_parser.nit:55,7--8
                       AEqExpr ../src/test_parser.nit:55,10--27
@@ -330,6 +340,7 @@ Start ../src/test_parser.nit:17,1--156,1
                         TEq "==" ../src/test_parser.nit:55,21--22
                         AStringExpr ../src/test_parser.nit:55,24--27
                           TString "\"-x\"" ../src/test_parser.nit:55,24--27
+                      TKwthen "then" ../src/test_parser.nit:55,29--32
                       ABlockExpr ../src/test_parser.nit:56,3--12
                         ACallAssignExpr ../src/test_parser.nit:56,3--12
                           AImplicitSelfExpr ../src/test_parser.nit:56,3
@@ -338,6 +349,7 @@ Start ../src/test_parser.nit:17,1--156,1
                           TAssign "=" ../src/test_parser.nit:56,7
                           ATrueExpr ../src/test_parser.nit:56,9--12
                             TKwtrue "true" ../src/test_parser.nit:56,9--12
+                      TKwelse "else" ../src/test_parser.nit:57,2--5
                       AIfExpr ../src/test_parser.nit:57,7--66,4
                         TKwif "if" ../src/test_parser.nit:57,7--8
                         AEqExpr ../src/test_parser.nit:57,10--27
@@ -351,6 +363,7 @@ Start ../src/test_parser.nit:17,1--156,1
                           TEq "==" ../src/test_parser.nit:57,21--22
                           AStringExpr ../src/test_parser.nit:57,24--27
                             TString "\"-e\"" ../src/test_parser.nit:57,24--27
+                        TKwthen "then" ../src/test_parser.nit:57,29--32
                         ABlockExpr ../src/test_parser.nit:58,3--16
                           ACallAssignExpr ../src/test_parser.nit:58,3--16
                             AImplicitSelfExpr ../src/test_parser.nit:58,3
@@ -359,6 +372,7 @@ Start ../src/test_parser.nit:17,1--156,1
                             TAssign "=" ../src/test_parser.nit:58,11
                             ATrueExpr ../src/test_parser.nit:58,13--16
                               TKwtrue "true" ../src/test_parser.nit:58,13--16
+                        TKwelse "else" ../src/test_parser.nit:59,2--5
                         AIfExpr ../src/test_parser.nit:59,7--66,4
                           TKwif "if" ../src/test_parser.nit:59,7--8
                           AEqExpr ../src/test_parser.nit:59,10--27
@@ -372,6 +386,7 @@ Start ../src/test_parser.nit:17,1--156,1
                             TEq "==" ../src/test_parser.nit:59,21--22
                             AStringExpr ../src/test_parser.nit:59,24--27
                               TString "\"-i\"" ../src/test_parser.nit:59,24--27
+                          TKwthen "then" ../src/test_parser.nit:59,29--32
                           ABlockExpr ../src/test_parser.nit:60,3--20
                             ACallAssignExpr ../src/test_parser.nit:60,3--20
                               AImplicitSelfExpr ../src/test_parser.nit:60,3
@@ -380,6 +395,7 @@ Start ../src/test_parser.nit:17,1--156,1
                               TAssign "=" ../src/test_parser.nit:60,15
                               ATrueExpr ../src/test_parser.nit:60,17--20
                                 TKwtrue "true" ../src/test_parser.nit:60,17--20
+                          TKwelse "else" ../src/test_parser.nit:61,2--5
                           AIfExpr ../src/test_parser.nit:61,7--66,4
                             TKwif "if" ../src/test_parser.nit:61,7--8
                             AOrExpr ../src/test_parser.nit:61,10--49
@@ -406,6 +422,7 @@ Start ../src/test_parser.nit:17,1--156,1
                                 TEq "==" ../src/test_parser.nit:61,43--44
                                 AStringExpr ../src/test_parser.nit:61,46--49
                                   TString "\"-?\"" ../src/test_parser.nit:61,46--49
+                            TKwthen "then" ../src/test_parser.nit:61,51--54
                             ABlockExpr ../src/test_parser.nit:62,3--18
                               ACallAssignExpr ../src/test_parser.nit:62,3--18
                                 AImplicitSelfExpr ../src/test_parser.nit:62,3
@@ -414,6 +431,7 @@ Start ../src/test_parser.nit:17,1--156,1
                                 TAssign "=" ../src/test_parser.nit:62,13
                                 ATrueExpr ../src/test_parser.nit:62,15--18
                                   TKwtrue "true" ../src/test_parser.nit:62,15--18
+                            TKwelse "else" ../src/test_parser.nit:63,2--5
                             ABlockExpr ../src/test_parser.nit:64,3--66,4
                               ACallExpr ../src/test_parser.nit:64,3--48
                                 ACallExpr ../src/test_parser.nit:64,3--8
@@ -479,6 +497,7 @@ Start ../src/test_parser.nit:17,1--156,1
                 AImplicitSelfExpr ../src/test_parser.nit:70,43
                 TId "need_help" ../src/test_parser.nit:70,43--51
                 AListExprs ../src/test_parser.nit:70,51
+            TKwthen "then" ../src/test_parser.nit:70,53--56
             ABlockExpr ../src/test_parser.nit:71,2--82,30
               ACallExpr ../src/test_parser.nit:71,2--16
                 AImplicitSelfExpr ../src/test_parser.nit:71,2
@@ -576,12 +595,14 @@ Start ../src/test_parser.nit:17,1--156,1
                   AStringExpr ../src/test_parser.nit:82,8--29
                     TString "\"  -h\tprint this help\"" ../src/test_parser.nit:82,8--29
                   TCpar ")" ../src/test_parser.nit:82,30
+            TKwelse "else" ../src/test_parser.nit:83,1--4
             AIfExpr ../src/test_parser.nit:83,6--155,3
               TKwif "if" ../src/test_parser.nit:83,6--7
               ACallExpr ../src/test_parser.nit:83,9--19
                 AImplicitSelfExpr ../src/test_parser.nit:83,9
                 TId "interactive" ../src/test_parser.nit:83,9--19
                 AListExprs ../src/test_parser.nit:83,19
+              TKwthen "then" ../src/test_parser.nit:83,21--24
               ABlockExpr ../src/test_parser.nit:84,2--117,4
                 AIfExpr ../src/test_parser.nit:84,2--93,4
                   TKwif "if" ../src/test_parser.nit:84,2--3
@@ -589,6 +610,7 @@ Start ../src/test_parser.nit:17,1--156,1
                     AImplicitSelfExpr ../src/test_parser.nit:84,5
                     TId "only_lexer" ../src/test_parser.nit:84,5--14
                     AListExprs ../src/test_parser.nit:84,14
+                  TKwthen "then" ../src/test_parser.nit:84,16--19
                   ABlockExpr ../src/test_parser.nit:85,3--86,8
                     ACallExpr ../src/test_parser.nit:85,3--43
                       AImplicitSelfExpr ../src/test_parser.nit:85,3
@@ -602,12 +624,14 @@ Start ../src/test_parser.nit:17,1--156,1
                       AListExprs ../src/test_parser.nit:86,8
                         ADecIntExpr ../src/test_parser.nit:86,8
                           TNumber "1" ../src/test_parser.nit:86,8
+                  TKwelse "else" ../src/test_parser.nit:87,2--5
                   AIfExpr ../src/test_parser.nit:87,7--93,4
                     TKwif "if" ../src/test_parser.nit:87,7--8
                     ACallExpr ../src/test_parser.nit:87,10--16
                       AImplicitSelfExpr ../src/test_parser.nit:87,10
                       TId "no_file" ../src/test_parser.nit:87,10--16
                       AListExprs ../src/test_parser.nit:87,16
+                    TKwthen "then" ../src/test_parser.nit:87,18--21
                     ABlockExpr ../src/test_parser.nit:88,3--89,8
                       ACallExpr ../src/test_parser.nit:88,3--43
                         AImplicitSelfExpr ../src/test_parser.nit:88,3
@@ -621,6 +645,7 @@ Start ../src/test_parser.nit:17,1--156,1
                         AListExprs ../src/test_parser.nit:89,8
                           ADecIntExpr ../src/test_parser.nit:89,8
                             TNumber "1" ../src/test_parser.nit:89,8
+                    TKwelse "else" ../src/test_parser.nit:90,2--5
                     AIfExpr ../src/test_parser.nit:90,7--93,4
                       TKwif "if" ../src/test_parser.nit:90,7--8
                       ANotExpr ../src/test_parser.nit:90,10--26
@@ -632,6 +657,7 @@ Start ../src/test_parser.nit:17,1--156,1
                             AListExprs ../src/test_parser.nit:90,17
                           TId "is_empty" ../src/test_parser.nit:90,19--26
                           AListExprs ../src/test_parser.nit:90,26
+                      TKwthen "then" ../src/test_parser.nit:90,28--31
                       ABlockExpr ../src/test_parser.nit:91,3--92,8
                         ACallExpr ../src/test_parser.nit:91,3--43
                           AImplicitSelfExpr ../src/test_parser.nit:91,3
@@ -684,6 +710,7 @@ Start ../src/test_parser.nit:17,1--156,1
                         TKwisa "isa" ../src/test_parser.nit:99,8--10
                         AType ../src/test_parser.nit:99,12--18
                           TClassid "TString" ../src/test_parser.nit:99,12--18
+                      TKwthen "then" ../src/test_parser.nit:99,20--23
                       ABlockExpr ../src/test_parser.nit:100,4--106,11
                         AVardeclExpr ../src/test_parser.nit:100,4--17
                           TKwvar "var" ../src/test_parser.nit:100,4--6
@@ -706,9 +733,11 @@ Start ../src/test_parser.nit:17,1--156,1
                             TEq "==" ../src/test_parser.nit:101,9--10
                             AStringExpr ../src/test_parser.nit:101,12--15
                               TString "\":q\"" ../src/test_parser.nit:101,12--15
+                          TKwthen "then" ../src/test_parser.nit:101,17--20
                           ABlockExpr ../src/test_parser.nit:102,5--9
                             ABreakExpr ../src/test_parser.nit:102,5--9
                               TKwbreak "break" ../src/test_parser.nit:102,5--9
+                          TKwelse "else" ../src/test_parser.nit:103,4--7
                           ABlockExpr ../src/test_parser.nit:104,5--105,6
                             ACallExpr ../src/test_parser.nit:104,5--24
                               AImplicitSelfExpr ../src/test_parser.nit:104,5
@@ -731,6 +760,7 @@ Start ../src/test_parser.nit:17,1--156,1
                         TKwisa "isa" ../src/test_parser.nit:109,8--10
                         AType ../src/test_parser.nit:109,12--17
                           TClassid "AError" ../src/test_parser.nit:109,12--17
+                      TKwthen "then" ../src/test_parser.nit:109,19--22
                       ABlockExpr ../src/test_parser.nit:110,4--111,11
                         ACallExpr ../src/test_parser.nit:110,4--57
                           AImplicitSelfExpr ../src/test_parser.nit:110,4
@@ -776,6 +806,7 @@ Start ../src/test_parser.nit:17,1--156,1
                           AImplicitSelfExpr ../src/test_parser.nit:114,10
                           TId "no_print" ../src/test_parser.nit:114,10--17
                           AListExprs ../src/test_parser.nit:114,17
+                      TKwthen "then" ../src/test_parser.nit:114,19--22
                       ABlockExpr ../src/test_parser.nit:115,4--40
                         ACallExpr ../src/test_parser.nit:115,4--40
                           AParExpr ../src/test_parser.nit:115,4--25
@@ -797,10 +828,12 @@ Start ../src/test_parser.nit:17,1--156,1
                       ABlockExpr ../src/test_parser.nit:116,3--5
                         TKwend "end" ../src/test_parser.nit:116,3--5
                     TKwend "end" ../src/test_parser.nit:117,2--4
+              TKwelse "else" ../src/test_parser.nit:118,1--4
               ABlockExpr ../src/test_parser.nit:119,2--155,3
                 AForExpr ../src/test_parser.nit:119,2--154,4
                   TKwfor "for" ../src/test_parser.nit:119,2--4
                   TId "a" ../src/test_parser.nit:119,6
+                  TKwin "in" ../src/test_parser.nit:119,8--9
                   ACallExpr ../src/test_parser.nit:119,11--14
                     AImplicitSelfExpr ../src/test_parser.nit:119,11
                     TId "args" ../src/test_parser.nit:119,11--14
@@ -816,6 +849,7 @@ Start ../src/test_parser.nit:17,1--156,1
                         AImplicitSelfExpr ../src/test_parser.nit:121,6
                         TId "no_file" ../src/test_parser.nit:121,6--12
                         AListExprs ../src/test_parser.nit:121,12
+                      TKwthen "then" ../src/test_parser.nit:121,14--17
                       ABlockExpr ../src/test_parser.nit:122,4--45
                         ACallAssignExpr ../src/test_parser.nit:122,4--45
                           AImplicitSelfExpr ../src/test_parser.nit:122,4
@@ -836,6 +870,7 @@ Start ../src/test_parser.nit:17,1--156,1
                                 TId "a" ../src/test_parser.nit:122,44
                                 AListExprs ../src/test_parser.nit:122,44
                               TCpar ")" ../src/test_parser.nit:122,45
+                      TKwelse "else" ../src/test_parser.nit:123,3--6
                       ABlockExpr ../src/test_parser.nit:124,4--127,5
                         AVardeclExpr ../src/test_parser.nit:124,4--33
                           TKwvar "var" ../src/test_parser.nit:124,4--6
@@ -902,6 +937,7 @@ Start ../src/test_parser.nit:17,1--156,1
                         AImplicitSelfExpr ../src/test_parser.nit:129,6
                         TId "only_lexer" ../src/test_parser.nit:129,6--15
                         AListExprs ../src/test_parser.nit:129,15
+                      TKwthen "then" ../src/test_parser.nit:129,17--20
                       ABlockExpr ../src/test_parser.nit:130,4--136,6
                         AVardeclExpr ../src/test_parser.nit:130,4--25
                           TKwvar "var" ../src/test_parser.nit:130,4--6
@@ -936,6 +972,7 @@ Start ../src/test_parser.nit:17,1--156,1
                                   AImplicitSelfExpr ../src/test_parser.nit:132,12
                                   TId "no_print" ../src/test_parser.nit:132,12--19
                                   AListExprs ../src/test_parser.nit:132,19
+                              TKwthen "then" ../src/test_parser.nit:132,21--24
                               ABlockExpr ../src/test_parser.nit:133,6--64
                                 ACallExpr ../src/test_parser.nit:133,6--64
                                   AImplicitSelfExpr ../src/test_parser.nit:133,6
@@ -979,6 +1016,7 @@ Start ../src/test_parser.nit:17,1--156,1
                                 TId "next" ../src/test_parser.nit:135,19--22
                                 AListExprs ../src/test_parser.nit:135,22
                             TKwend "end" ../src/test_parser.nit:136,4--6
+                      TKwelse "else" ../src/test_parser.nit:137,3--6
                       ABlockExpr ../src/test_parser.nit:138,4--153,5
                         AVardeclExpr ../src/test_parser.nit:138,4--33
                           TKwvar "var" ../src/test_parser.nit:138,4--6
@@ -1027,6 +1065,7 @@ Start ../src/test_parser.nit:17,1--156,1
                             TKwisa "isa" ../src/test_parser.nit:142,13--15
                             AType ../src/test_parser.nit:142,17--22
                               TClassid "AError" ../src/test_parser.nit:142,17--22
+                          TKwthen "then" ../src/test_parser.nit:142,24--27
                           ABlockExpr ../src/test_parser.nit:143,5--144,10
                             ACallExpr ../src/test_parser.nit:143,5--58
                               AImplicitSelfExpr ../src/test_parser.nit:143,5
@@ -1065,6 +1104,7 @@ Start ../src/test_parser.nit:17,1--156,1
                             AImplicitSelfExpr ../src/test_parser.nit:147,7
                             TId "xml" ../src/test_parser.nit:147,7--9
                             AListExprs ../src/test_parser.nit:147,9
+                          TKwthen "then" ../src/test_parser.nit:147,11--14
                           ABlockExpr ../src/test_parser.nit:148,5--149,32
                             ACallExpr ../src/test_parser.nit:148,5--25
                               ACallExpr ../src/test_parser.nit:148,5--8
@@ -1089,6 +1129,7 @@ Start ../src/test_parser.nit:17,1--156,1
                                   TId "stdout" ../src/test_parser.nit:149,26--31
                                   AListExprs ../src/test_parser.nit:149,31
                                 TCpar ")" ../src/test_parser.nit:149,32
+                          TKwelse "else" ../src/test_parser.nit:150,4--7
                           AIfExpr ../src/test_parser.nit:150,9--152,6
                             TKwif "if" ../src/test_parser.nit:150,9--10
                             ANotExpr ../src/test_parser.nit:150,12--23
@@ -1097,6 +1138,7 @@ Start ../src/test_parser.nit:17,1--156,1
                                 AImplicitSelfExpr ../src/test_parser.nit:150,16
                                 TId "no_print" ../src/test_parser.nit:150,16--23
                                 AListExprs ../src/test_parser.nit:150,23
+                            TKwthen "then" ../src/test_parser.nit:150,25--28
                             ABlockExpr ../src/test_parser.nit:151,5--44
                               ACallExpr ../src/test_parser.nit:151,5--44
                                 AParExpr ../src/test_parser.nit:151,5--26

diff --git a/tests/sav/test_parser_args7.res b/tests/sav/test_parser_args7.res
index 34ceaf4..36683fa 100644 (file)
--- a/tests/sav/test_parser_args7.res
+++ b/tests/sav/test_parser_args7.res
@@ -14,6 +14,7 @@
 --> AForExpr 1,1--15
   TKwfor "for" 1,1--3
   TId "i" 1,5
+  TKwin "in" 1,7--8
   ACallExpr 1,10
     AImplicitSelfExpr 1,10
     TId "x" 1,10
@@ -30,7 +31,8 @@
       TKwmeth "fun" 1,1--3
       AIdMethid 1,5--7
         TId "foo" 1,5--7
-      ASignature 1,12
+      ASignature 1,9
+      TKwdo "do" 1,9--10
       ACallExpr 1,12
         AImplicitSelfExpr 1,12
         TId "z" 1,12
@@ -38,6 +40,7 @@
 --> ... ... AForExpr 1,1--3,3
   TKwfor "for" 1,1--3
   TId "i" 1,5
+  TKwin "in" 1,7--8
   ACallExpr 1,10
     AImplicitSelfExpr 1,10
     TId "x" 1,10
@@ -56,11 +59,13 @@
       TKwmeth "fun" 1,1--3
       AIdMethid 1,5--7
         TId "foo" 1,5--7
-      ASignature 2,1
+      ASignature 1,9
+      TKwdo "do" 1,9--10
       ABlockExpr 2,1--5,3
         AForExpr 2,1--4,3
           TKwfor "for" 2,1--3
           TId "i" 2,5
+          TKwin "in" 2,7--8
           ACallExpr 2,10
             AImplicitSelfExpr 2,10
             TId "x" 2,10