tests: update error message because of new iterators AST

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

diff --git a/tests/sav/base_dead_code_alt2.res b/tests/sav/base_dead_code_alt2.res
index 605cab2..dc4797f 100644 (file)
--- a/tests/sav/base_dead_code_alt2.res
+++ b/tests/sav/base_dead_code_alt2.res
@@ -1,5 +1,5 @@
 alt/base_dead_code_alt2.nit:21,5--9: Error: method `first` does not exists in `Int`.
 alt/base_dead_code_alt2.nit:23,3: Warning: expression is not null, since it is a `Int`.
-alt/base_dead_code_alt2.nit:32,3--24: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
-alt/base_dead_code_alt2.nit:32,3--24: Error: method `iterator` does not exists in `Int`.
+alt/base_dead_code_alt2.nit:32,7--12: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
+alt/base_dead_code_alt2.nit:32,7--12: Error: method `iterator` does not exists in `Int`.
 alt/base_dead_code_alt2.nit:34,10--21: Warning: expression is already a `String`.

diff --git a/tests/sav/base_for_nullable_alt2.res b/tests/sav/base_for_nullable_alt2.res
index 0958991..72bed13 100644 (file)
--- a/tests/sav/base_for_nullable_alt2.res
+++ b/tests/sav/base_for_nullable_alt2.res
@@ -1 +1 @@
-alt/base_for_nullable_alt2.nit:21,1--25: Type Error: `for` cannot iterate over `null`.
+alt/base_for_nullable_alt2.nit:21,5--13: Type Error: `for` cannot iterate over `null`.

diff --git a/tests/sav/base_iterator3.res b/tests/sav/base_iterator3.res
index 018aa9f..61f817d 100644 (file)
--- a/tests/sav/base_iterator3.res
+++ b/tests/sav/base_iterator3.res
@@ -1,6 +1,6 @@
-base_iterator3.nit:35,1--25: Type Error: `for` expects the method `iterator` to return an `Iterator` or `MapIterator` type.
-base_iterator3.nit:39,1--25: Type Error: `for` expects the method `iterator` to return an `Iterator` or `MapIterator` type.
-base_iterator3.nit:43,1--25: Error: method `iterator` does not exists in `Test3`.
-base_iterator3.nit:43,1--25: Type Error: `for` expects a type providing an `iterator` method, got `Test3`.
-base_iterator3.nit:46,1--48: Type Error: `for` expects only one variable when using `Iterator`.
-base_iterator3.nit:47,1--47: Type Error: `for` expects two variables when using `MapIterator`.
+base_iterator3.nit:35,5--14: Type Error: `for` expects the method `iterator` to return an `Iterator` or `MapIterator` type.
+base_iterator3.nit:39,5--14: Type Error: `for` expects the method `iterator` to return an `Iterator` or `MapIterator` type.
+base_iterator3.nit:43,5--14: Error: method `iterator` does not exists in `Test3`.
+base_iterator3.nit:43,5--14: Type Error: `for` expects a type providing an `iterator` method, got `Test3`.
+base_iterator3.nit:46,5--29: Type Error: `for` expects only one variable when using `Iterator`.
+base_iterator3.nit:47,5--36: Type Error: `for` expects two variables when using `MapIterator`.

diff --git a/tests/sav/error_expr_not_ok_alt4.res b/tests/sav/error_expr_not_ok_alt4.res
index 30d06ac..f4b7441 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt4.res
+++ b/tests/sav/error_expr_not_ok_alt4.res
@@ -20,9 +20,9 @@ alt/error_expr_not_ok_alt4.nit:64,7--33: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt4.nit:66,7--10: Type Error: expected `Bool`, got `Int`.
 alt/error_expr_not_ok_alt4.nit:66,21: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt4.nit:67,1--18: Warning: use `loop` instead of `while true do`.
+alt/error_expr_not_ok_alt4.nit:69,5--13: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
+alt/error_expr_not_ok_alt4.nit:69,5--13: Error: method `iterator` does not exists in `Int`.
 alt/error_expr_not_ok_alt4.nit:69,24: Type Error: expected `A`, got `Int`.
-alt/error_expr_not_ok_alt4.nit:69,1--25: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
-alt/error_expr_not_ok_alt4.nit:69,1--25: Error: method `iterator` does not exists in `Int`.
 alt/error_expr_not_ok_alt4.nit:71,8--11: Type Error: expected `Bool`, got `Int`.
 alt/error_expr_not_ok_alt4.nit:72,7--15: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt4.nit:73,7--10: Type Error: expected `Bool`, got `Int`.

diff --git a/tests/sav/error_expr_not_ok_alt5.res b/tests/sav/error_expr_not_ok_alt5.res
index 3e5f13d..2447012 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt5.res
+++ b/tests/sav/error_expr_not_ok_alt5.res
@@ -16,9 +16,9 @@ alt/error_expr_not_ok_alt5.nit:64,7--33: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt5.nit:66,7--10: Type Error: expected `Bool`, got `Int`.
 alt/error_expr_not_ok_alt5.nit:66,21: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt5.nit:67,1--18: Warning: use `loop` instead of `while true do`.
+alt/error_expr_not_ok_alt5.nit:69,5--13: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
+alt/error_expr_not_ok_alt5.nit:69,5--13: Error: method `iterator` does not exists in `Int`.
 alt/error_expr_not_ok_alt5.nit:69,24: Type Error: expected `A`, got `Int`.
-alt/error_expr_not_ok_alt5.nit:69,1--25: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
-alt/error_expr_not_ok_alt5.nit:69,1--25: Error: method `iterator` does not exists in `Int`.
 alt/error_expr_not_ok_alt5.nit:71,8--11: Type Error: expected `Bool`, got `Int`.
 alt/error_expr_not_ok_alt5.nit:72,7--15: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt5.nit:73,7--10: Type Error: expected `Bool`, got `Int`.

diff --git a/tests/sav/error_expr_not_ok_alt6.res b/tests/sav/error_expr_not_ok_alt6.res
index 08009fa..8d18ffe 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt6.res
+++ b/tests/sav/error_expr_not_ok_alt6.res
@@ -20,9 +20,9 @@ alt/error_expr_not_ok_alt6.nit:64,7--33: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt6.nit:66,7--10: Type Error: expected `Bool`, got `Int`.
 alt/error_expr_not_ok_alt6.nit:66,21: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt6.nit:67,1--18: Warning: use `loop` instead of `while true do`.
+alt/error_expr_not_ok_alt6.nit:69,5--13: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
+alt/error_expr_not_ok_alt6.nit:69,5--13: Error: method `iterator` does not exists in `Int`.
 alt/error_expr_not_ok_alt6.nit:69,24: Type Error: expected `A`, got `Int`.
-alt/error_expr_not_ok_alt6.nit:69,1--25: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
-alt/error_expr_not_ok_alt6.nit:69,1--25: Error: method `iterator` does not exists in `Int`.
 alt/error_expr_not_ok_alt6.nit:71,8--11: Type Error: expected `Bool`, got `Int`.
 alt/error_expr_not_ok_alt6.nit:72,7--15: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt6.nit:73,7--10: Type Error: expected `Bool`, got `Int`.

diff --git a/tests/sav/error_for_coll.res b/tests/sav/error_for_coll.res
index 0cebf2e..6e070aa 100644 (file)
--- a/tests/sav/error_for_coll.res
+++ b/tests/sav/error_for_coll.res
@@ -1,2 +1,2 @@
-error_for_coll.nit:17,1--18,3: Error: method `iterator` does not exists in `Int`.
-error_for_coll.nit:17,1--18,3: Type Error: `for` expects a type providing an `iterator` method, got `Int`.
+error_for_coll.nit:17,5--10: Error: method `iterator` does not exists in `Int`.
+error_for_coll.nit:17,5--10: Type Error: `for` expects a type providing an `iterator` method, got `Int`.

diff --git a/tests/sav/error_needed_types_alt8.res b/tests/sav/error_needed_types_alt8.res
index c6f77cf..82e7f0e 100644 (file)
--- a/tests/sav/error_needed_types_alt8.res
+++ b/tests/sav/error_needed_types_alt8.res
@@ -1,2 +1,2 @@
-alt/error_needed_types_alt8.nit:21,1--22,3: Error: method `iterator` does not exists in `L`.
-alt/error_needed_types_alt8.nit:21,1--22,3: Type Error: `for` expects a type providing an `iterator` method, got `L`.
+alt/error_needed_types_alt8.nit:21,5--14: Error: method `iterator` does not exists in `L`.
+alt/error_needed_types_alt8.nit:21,5--14: Type Error: `for` expects a type providing an `iterator` method, got `L`.