tests: fix error messages for engine nitg-s

This follows the iterator error messages from a9986ea596189a1b3743ae0c897f2bdbb8d5e6f0

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/tests/sav/base_iterator3.res b/tests/sav/base_iterator3.res
index e07734d..e7c9557 100644 (file)
--- a/tests/sav/base_iterator3.res
+++ b/tests/sav/base_iterator3.res
@@ -1,5 +1,5 @@
-base_iterator3.nit:35,1--25: Type Error: Expected method 'iterator' to return an Iterator of MapIterator type
-base_iterator3.nit:39,1--25: Type Error: Expected method 'iterator' to return an Iterator or MapIterator type
-base_iterator3.nit:43,1--25: Type Error: Expected method 'iterator' in type Test3
-base_iterator3.nit:46,1--48: Type Error: Expected one variable
-base_iterator3.nit:47,1--47: Type Error: Expected two variables
+base_iterator3.nit:35,1--25: Type Error: 'for' expects method 'iterator' to return an 'Iterator' or 'MapIterator' type'.
+base_iterator3.nit:39,1--25: Type Error: 'for' expects method 'iterator' to return an 'Iterator' or 'MapIterator' type'.
+base_iterator3.nit:43,1--25: Type Error: 'for' expects a type providing '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'.

diff --git a/tests/sav/error_expr_not_ok_alt4.res b/tests/sav/error_expr_not_ok_alt4.res
index 544d47c..83b16ad 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt4.res
+++ b/tests/sav/error_expr_not_ok_alt4.res
@@ -21,7 +21,7 @@ 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,24: Type error: expected A, got Int
-alt/error_expr_not_ok_alt4.nit:69,1--25: Type Error: Expected method 'iterator' in type Int
+alt/error_expr_not_ok_alt4.nit:69,1--25: Type Error: 'for' expects a type providing 'iterator' method, got '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 ead84b9..63b9b3a 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt5.res
+++ b/tests/sav/error_expr_not_ok_alt5.res
@@ -17,7 +17,7 @@ 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,24: Type error: expected A, got Int
-alt/error_expr_not_ok_alt5.nit:69,1--25: Type Error: Expected method 'iterator' in type Int
+alt/error_expr_not_ok_alt5.nit:69,1--25: Type Error: 'for' expects a type providing 'iterator' method, got '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 afbbbd8..69868a4 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt6.res
+++ b/tests/sav/error_expr_not_ok_alt6.res
@@ -21,7 +21,7 @@ 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,24: Type error: expected A, got Int
-alt/error_expr_not_ok_alt6.nit:69,1--25: Type Error: Expected method 'iterator' in type Int
+alt/error_expr_not_ok_alt6.nit:69,1--25: Type Error: 'for' expects a type providing 'iterator' method, got '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 cfcda5e..b3ba3de 100644 (file)
--- a/tests/sav/error_for_coll.res
+++ b/tests/sav/error_for_coll.res
@@ -1 +1 @@
-error_for_coll.nit:17,1--18,3: Type Error: Expected method 'iterator' in type Int
+error_for_coll.nit:17,1--18,3: Type Error: 'for' expects a type providing 'iterator' method, got 'Int'.

diff --git a/tests/sav/error_needed_method_alt2.res b/tests/sav/error_needed_method_alt2.res
index 557ff19..5666466 100644 (file)
--- a/tests/sav/error_needed_method_alt2.res
+++ b/tests/sav/error_needed_method_alt2.res
@@ -1,2 +1,2 @@
 alt/error_needed_method_alt2.nit:47,10--27: Error: Method 'init' doesn't exists in Collection[Int].
-alt/error_needed_method_alt2.nit:47,1--40: Type Error: Expected method 'iterator' in type Collection[Int]
+alt/error_needed_method_alt2.nit:47,1--40: Type Error: 'for' expects a type providing 'iterator' method, got 'Collection[Int]'.

diff --git a/tests/sav/error_needed_types_alt8.res b/tests/sav/error_needed_types_alt8.res
index e0c62db..59a8aed 100644 (file)
--- a/tests/sav/error_needed_types_alt8.res
+++ b/tests/sav/error_needed_types_alt8.res
@@ -1 +1 @@
-alt/error_needed_types_alt8.nit:21,1--22,3: Type Error: Expected method 'iterator' in type L
+alt/error_needed_types_alt8.nit:21,1--22,3: Type Error: 'for' expects a type providing 'iterator' method, got 'L'.