tests: other update related to adaptive typing messages

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

diff --git a/tests/sav/base_adaptive_loop3_alt1.res b/tests/sav/base_adaptive_loop3_alt1.res
index f599e28..04e144a 100644 (file)
--- a/tests/sav/base_adaptive_loop3_alt1.res
+++ b/tests/sav/base_adaptive_loop3_alt1.res
@@ -1 +1,2 @@
+alt/base_adaptive_loop3_alt1.nit:25,8--9: Warning: expression is always `null`.
 10

diff --git a/tests/sav/base_as_notnull_alt7.res b/tests/sav/base_as_notnull_alt7.res
index 416f28e..ebb59be 100644 (file)
--- a/tests/sav/base_as_notnull_alt7.res
+++ b/tests/sav/base_as_notnull_alt7.res
@@ -2,4 +2,5 @@ alt/base_as_notnull_alt7.nit:41,6: Warning: expression is not null, since it is
 alt/base_as_notnull_alt7.nit:42,6--7: Warning: expression is not null, since it is a `A`.
 alt/base_as_notnull_alt7.nit:43,6: Warning: expression is not null, since it is a `B`.
 alt/base_as_notnull_alt7.nit:52,6: Warning: expression is not null, since it is a `B`.
+alt/base_as_notnull_alt7.nit:61,1--4: Warning: expression is always `null`.
 alt/base_as_notnull_alt7.nit:61,1--17: Type Error: `as(not null)` on `null`.

diff --git a/tests/sav/base_dead_code.res b/tests/sav/base_dead_code.res
index 0d66ea1..f080c04 100644 (file)
--- a/tests/sav/base_dead_code.res
+++ b/tests/sav/base_dead_code.res
@@ -1,2 +1,6 @@
+base_dead_code.nit:22,3--14: Warning: expression is already a `String`.
+base_dead_code.nit:23,3: Warning: expression is not null, since it is a `String`.
+base_dead_code.nit:33,7--18: Warning: expression is already a `String`.
+base_dead_code.nit:34,10--21: Warning: expression is already a `String`.
 0
 1

diff --git a/tests/sav/base_dead_code_alt2.res b/tests/sav/base_dead_code_alt2.res
index 1537f14..605cab2 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: Error: method `iterator` does not exists in `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:34,10--21: Warning: expression is already a `String`.

diff --git a/tests/sav/base_notnull_1alt1_alt3.res b/tests/sav/base_notnull_1alt1_alt3.res
index 3d05a54..8e1c2c9 100644 (file)
--- a/tests/sav/base_notnull_1alt1_alt3.res
+++ b/tests/sav/base_notnull_1alt1_alt3.res
@@ -1,14 +1,16 @@
 alt/base_notnull_1alt1_alt3.nit:23,7: Type Error: expected `Object`, got `null`.
 alt/base_notnull_1alt1_alt3.nit:24,7: Type Error: expected `Object`, got `null`.
+alt/base_notnull_1alt1_alt3.nit:25,6: Warning: expression is always `null`.
 alt/base_notnull_1alt1_alt3.nit:27,12: Type Error: expected `Object`, got `null`.
+alt/base_notnull_1alt1_alt3.nit:28,6: Warning: expression is always `null`.
 alt/base_notnull_1alt1_alt3.nit:30,12: Type Error: expected `Object`, got `null`.
+alt/base_notnull_1alt1_alt3.nit:31,7: Warning: expression is always `null`.
 alt/base_notnull_1alt1_alt3.nit:31,7--20: Type Error: `as(not null)` on `null`.
+alt/base_notnull_1alt1_alt3.nit:32,7: Warning: expression is always `null`.
 alt/base_notnull_1alt1_alt3.nit:32,7--20: Type Error: `as(not null)` on `null`.
-alt/base_notnull_1alt1_alt3.nit:33,7: Type Error: `or else` on `null`.
-alt/base_notnull_1alt1_alt3.nit:33,7--17: Type Error: expected `Object`, got `nullable Int`.
-alt/base_notnull_1alt1_alt3.nit:34,7: Type Error: `or else` on `null`.
-alt/base_notnull_1alt1_alt3.nit:34,7--17: Type Error: expected `Object`, got `nullable Int`.
-alt/base_notnull_1alt1_alt3.nit:35,7: Type Error: `or else` on `null`.
+alt/base_notnull_1alt1_alt3.nit:33,7: Warning: expression is always `null`.
+alt/base_notnull_1alt1_alt3.nit:34,7: Warning: expression is always `null`.
+alt/base_notnull_1alt1_alt3.nit:35,7: Warning: expression is always `null`.
 alt/base_notnull_1alt1_alt3.nit:35,7--17: Type Error: expected `Object`, got `null`.
-alt/base_notnull_1alt1_alt3.nit:36,7: Type Error: `or else` on `null`.
+alt/base_notnull_1alt1_alt3.nit:36,7: Warning: expression is always `null`.
 alt/base_notnull_1alt1_alt3.nit:36,7--17: Type Error: expected `Object`, got `null`.

diff --git a/tests/sav/base_notnull_alt3.res b/tests/sav/base_notnull_alt3.res
index 5ce5c18..f67d2e7 100644 (file)
--- a/tests/sav/base_notnull_alt3.res
+++ b/tests/sav/base_notnull_alt3.res
@@ -1,14 +1,16 @@
 alt/base_notnull_alt3.nit:23,7: Type Error: expected `Object`, got `null`.
 alt/base_notnull_alt3.nit:24,7: Type Error: expected `Object`, got `null`.
+alt/base_notnull_alt3.nit:25,6: Warning: expression is always `null`.
 alt/base_notnull_alt3.nit:27,12: Type Error: expected `Object`, got `null`.
+alt/base_notnull_alt3.nit:28,6: Warning: expression is always `null`.
 alt/base_notnull_alt3.nit:30,12: Type Error: expected `Object`, got `null`.
+alt/base_notnull_alt3.nit:31,7: Warning: expression is always `null`.
 alt/base_notnull_alt3.nit:31,7--20: Type Error: `as(not null)` on `null`.
+alt/base_notnull_alt3.nit:32,7: Warning: expression is always `null`.
 alt/base_notnull_alt3.nit:32,7--20: Type Error: `as(not null)` on `null`.
-alt/base_notnull_alt3.nit:33,7: Type Error: `or else` on `null`.
-alt/base_notnull_alt3.nit:33,7--17: Type Error: expected `Object`, got `nullable Int`.
-alt/base_notnull_alt3.nit:34,7: Type Error: `or else` on `null`.
-alt/base_notnull_alt3.nit:34,7--17: Type Error: expected `Object`, got `nullable Int`.
-alt/base_notnull_alt3.nit:35,7: Type Error: `or else` on `null`.
+alt/base_notnull_alt3.nit:33,7: Warning: expression is always `null`.
+alt/base_notnull_alt3.nit:34,7: Warning: expression is always `null`.
+alt/base_notnull_alt3.nit:35,7: Warning: expression is always `null`.
 alt/base_notnull_alt3.nit:35,7--17: Type Error: expected `Object`, got `null`.
-alt/base_notnull_alt3.nit:36,7: Type Error: `or else` on `null`.
+alt/base_notnull_alt3.nit:36,7: Warning: expression is always `null`.
 alt/base_notnull_alt3.nit:36,7--17: Type Error: expected `Object`, got `null`.

diff --git a/tests/sav/base_null.res b/tests/sav/base_null.res
index 814a7ef..babc02d 100644 (file)
--- a/tests/sav/base_null.res
+++ b/tests/sav/base_null.res
@@ -1,3 +1,5 @@
+base_null.nit:28,2--5: Warning: expression is always `null`.
+base_null.nit:42,2--5: Warning: expression is always `null`.
 false
 false
 true

diff --git a/tests/sav/error_expr_not_ok.res b/tests/sav/error_expr_not_ok.res
index 5a1d0b4..4b827a6 100644 (file)
--- a/tests/sav/error_expr_not_ok.res
+++ b/tests/sav/error_expr_not_ok.res
@@ -131,6 +131,7 @@ error_expr_not_ok.nit:147,8--11: Error: method or variable `fail` unknown in `Sy
 error_expr_not_ok.nit:149,14--17: Error: method or variable `fail` unknown in `Sys`.
 error_expr_not_ok.nit:149,7--24: Type Error: expected `A`, got `String`.
 error_expr_not_ok.nit:150,7--10: Error: method or variable `fail` unknown in `Sys`.
+error_expr_not_ok.nit:150,7--18: Type Error: expected `A`, got `Int`.
 error_expr_not_ok.nit:151,7--10: Error: method or variable `fail` unknown in `Sys`.
 error_expr_not_ok.nit:152,7--10: Error: method or variable `fail` unknown in `Sys`.
 error_expr_not_ok.nit:152,7--18: Type Error: expected `A`, got `Bool`.

diff --git a/tests/sav/error_expr_not_ok_alt2.res b/tests/sav/error_expr_not_ok_alt2.res
index 61eb11d..0b2ed1f 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt2.res
+++ b/tests/sav/error_expr_not_ok_alt2.res
@@ -36,4 +36,5 @@ alt/error_expr_not_ok_alt2.nit:123,5--9: Error: attribute `_fail` does not exist
 alt/error_expr_not_ok_alt2.nit:124,5--9: Error: attribute `_fail` does not exist in `String`.
 alt/error_expr_not_ok_alt2.nit:131,7--15: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt2.nit:149,7--24: Type Error: expected `A`, got `String`.
+alt/error_expr_not_ok_alt2.nit:150,7--18: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt2.nit:152,7--18: Type Error: expected `A`, got `Bool`.

diff --git a/tests/sav/error_expr_not_ok_alt3.res b/tests/sav/error_expr_not_ok_alt3.res
index c5ab3c8..b8efbce 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt3.res
+++ b/tests/sav/error_expr_not_ok_alt3.res
@@ -36,4 +36,5 @@ alt/error_expr_not_ok_alt3.nit:123,5--9: Error: attribute `_fail` does not exist
 alt/error_expr_not_ok_alt3.nit:124,5--9: Error: attribute `_fail` does not exist in `String`.
 alt/error_expr_not_ok_alt3.nit:131,7--15: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt3.nit:149,7--24: Type Error: expected `A`, got `String`.
+alt/error_expr_not_ok_alt3.nit:150,7--18: Type Error: expected `A`, got `Int`.
 alt/error_expr_not_ok_alt3.nit:152,7--18: Type Error: expected `A`, got `Bool`.

diff --git a/tests/sav/error_expr_not_ok_alt4.res b/tests/sav/error_expr_not_ok_alt4.res
index dbfac07..30d06ac 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt4.res
+++ b/tests/sav/error_expr_not_ok_alt4.res
@@ -103,9 +103,9 @@ alt/error_expr_not_ok_alt4.nit:145,7--15: Type Error: expected `A`, got `Array[I
 alt/error_expr_not_ok_alt4.nit:146,7--15: Type Error: expected `A`, got `Array[Int]`.
 alt/error_expr_not_ok_alt4.nit:147,7--18: Type Error: expected `A`, got `Array[Int]`.
 alt/error_expr_not_ok_alt4.nit:149,7--24: Type Error: expected `A`, got `String`.
-alt/error_expr_not_ok_alt4.nit:150,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt4.nit:150,7--18: Type Error: expected `A`, got `Int`.
+alt/error_expr_not_ok_alt4.nit:150,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt4.nit:151,7--10: Warning: expression is not null, since it is a `Int`.
 alt/error_expr_not_ok_alt4.nit:151,7--23: Type Error: expected `A`, got `Int`.
-alt/error_expr_not_ok_alt4.nit:152,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt4.nit:152,7--18: Type Error: expected `A`, got `Bool`.
+alt/error_expr_not_ok_alt4.nit:152,7--18: Warning: expression is already a `Int`.

diff --git a/tests/sav/error_expr_not_ok_alt5.res b/tests/sav/error_expr_not_ok_alt5.res
index a585085..3e5f13d 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt5.res
+++ b/tests/sav/error_expr_not_ok_alt5.res
@@ -99,9 +99,9 @@ alt/error_expr_not_ok_alt5.nit:145,7--15: Type Error: expected `A`, got `Array[I
 alt/error_expr_not_ok_alt5.nit:146,7--15: Type Error: expected `A`, got `Array[Int]`.
 alt/error_expr_not_ok_alt5.nit:147,7--18: Type Error: expected `A`, got `Array[Int]`.
 alt/error_expr_not_ok_alt5.nit:149,7--24: Type Error: expected `A`, got `String`.
-alt/error_expr_not_ok_alt5.nit:150,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt5.nit:150,7--18: Type Error: expected `A`, got `Int`.
+alt/error_expr_not_ok_alt5.nit:150,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt5.nit:151,7--10: Warning: expression is not null, since it is a `Int`.
 alt/error_expr_not_ok_alt5.nit:151,7--23: Type Error: expected `A`, got `Int`.
-alt/error_expr_not_ok_alt5.nit:152,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt5.nit:152,7--18: Type Error: expected `A`, got `Bool`.
+alt/error_expr_not_ok_alt5.nit:152,7--18: Warning: expression is already a `Int`.

diff --git a/tests/sav/error_expr_not_ok_alt6.res b/tests/sav/error_expr_not_ok_alt6.res
index bd0a8fc..08009fa 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt6.res
+++ b/tests/sav/error_expr_not_ok_alt6.res
@@ -103,9 +103,9 @@ alt/error_expr_not_ok_alt6.nit:145,7--15: Type Error: expected `A`, got `Array[I
 alt/error_expr_not_ok_alt6.nit:146,7--15: Type Error: expected `A`, got `Array[Int]`.
 alt/error_expr_not_ok_alt6.nit:147,7--18: Type Error: expected `A`, got `Array[Int]`.
 alt/error_expr_not_ok_alt6.nit:149,7--24: Type Error: expected `A`, got `String`.
-alt/error_expr_not_ok_alt6.nit:150,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt6.nit:150,7--18: Type Error: expected `A`, got `Int`.
+alt/error_expr_not_ok_alt6.nit:150,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt6.nit:151,7--10: Warning: expression is not null, since it is a `Int`.
 alt/error_expr_not_ok_alt6.nit:151,7--23: Type Error: expected `A`, got `Int`.
-alt/error_expr_not_ok_alt6.nit:152,7--18: Warning: expression is already a `Int`.
 alt/error_expr_not_ok_alt6.nit:152,7--18: Type Error: expected `A`, got `Bool`.
+alt/error_expr_not_ok_alt6.nit:152,7--18: Warning: expression is already a `Int`.

diff --git a/tests/sav/error_type_unk.res b/tests/sav/error_type_unk.res
index 31aed66..015006c 100644 (file)
--- a/tests/sav/error_type_unk.res
+++ b/tests/sav/error_type_unk.res
@@ -1,2 +1,3 @@
 error_type_unk.nit:22,17--20: Error: class `Fail` not found in module `error_type_unk`.
 error_type_unk.nit:23,9: Error: method `+` does not exists in `Bool`.
+error_type_unk.nit:24,16--19: Error: class `Fail` not found in module `error_type_unk`.

diff --git a/tests/sav/error_type_unk_alt6.res b/tests/sav/error_type_unk_alt6.res
index 3fd4f66..2c224f8 100644 (file)
--- a/tests/sav/error_type_unk_alt6.res
+++ b/tests/sav/error_type_unk_alt6.res
@@ -1,3 +1,4 @@
 alt/error_type_unk_alt6.nit:19,10--13: Error: class `Fail` not found in module `error_type_unk_alt6`.
 alt/error_type_unk_alt6.nit:22,17--20: Error: class `Fail` not found in module `error_type_unk_alt6`.
 alt/error_type_unk_alt6.nit:23,9: Error: method `+` does not exists in `Bool`.
+alt/error_type_unk_alt6.nit:24,16--19: Error: class `Fail` not found in module `error_type_unk_alt6`.

diff --git a/tests/sav/error_type_unk_alt7.res b/tests/sav/error_type_unk_alt7.res
index bac52d6..ef5d5d7 100644 (file)
--- a/tests/sav/error_type_unk_alt7.res
+++ b/tests/sav/error_type_unk_alt7.res
@@ -1,3 +1,4 @@
 alt/error_type_unk_alt7.nit:20,15--18: Error: class `Fail` not found in module `error_type_unk_alt7`.
 alt/error_type_unk_alt7.nit:22,17--20: Error: class `Fail` not found in module `error_type_unk_alt7`.
 alt/error_type_unk_alt7.nit:23,9: Error: method `+` does not exists in `Bool`.
+alt/error_type_unk_alt7.nit:24,16--19: Error: class `Fail` not found in module `error_type_unk_alt7`.