misc: corrects some typos and according tests

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/src/compiling/compiling_writer.nit b/src/compiling/compiling_writer.nit
index d32211a..66ba50e 100644 (file)
--- a/src/compiling/compiling_writer.nit
+++ b/src/compiling/compiling_writer.nit
@@ -97,7 +97,7 @@ class Writer
        # Return true if the string writer is frozen
        readable var _is_frozen: Bool = false
 
-       # Disable funter writer modification: nor add or append are allowed
+       # Disable further writer modification: nor add or append are allowed
        fun freeze
        do
                if is_frozen then return

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 3534938..8312018 100644 (file)
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -462,7 +462,7 @@ redef class AModuledecl
        redef fun accept_class_builder(v)
        do
                if n_id.to_symbol != v.mmmodule.name then
-                       v.error(n_id, "Error: Module name missmatch between {v.mmmodule.name} and {n_id.to_symbol}")
+                       v.error(n_id, "Error: Module name mismatch between {v.mmmodule.name} and {n_id.to_symbol}")
                end
        end
 end
@@ -637,7 +637,7 @@ redef class AStdClassdef
                end
 
                if glob.intro.arity != _local_class.arity then
-                       v.error(self, "Redef error: Formal parameter arity missmatch; got {_local_class.arity}, expected {glob.intro.arity}.")
+                       v.error(self, "Redef error: Formal parameter arity mismatch; got {_local_class.arity}, expected {glob.intro.arity}.")
                end
 
                if 

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index 379c7f0..0d3ac08 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -152,10 +152,10 @@ private class TypingVisitor
                        for p in false_candidates do
                                a.add("{p.full_name}{p.signature.as(not null)}")
                        end
-                       v.error(n, "Error: there is no available compatible constrctor in {c}. Discarded candidates are {a.join(", ")}.")
+                       v.error(n, "Error: there is no available compatible constructor in {c}. Discarded candidates are {a.join(", ")}.")
                        return null
                else
-                       v.error(n, "Error: there is no available compatible constrctor in {c}.")
+                       v.error(n, "Error: there is no available compatible constructor in {c}.")
                        return null
                end
        end
@@ -1231,7 +1231,7 @@ redef class AAbsAbsSendExpr
                var raw_arity: Int
                if raw_args == null then raw_arity = 0 else raw_arity = raw_args.length
                if par_arity > raw_arity or (par_arity != raw_arity and par_vararg == -1) then
-                       v.error(self, "Error: arity missmatch; prototype is '{name}{psig}'.")
+                       v.error(self, "Error: arity mismatch; prototype is '{name}{psig}'.")
                        return false
                end
                var arg_idx = 0

diff --git a/tests/sav/base_closure1_alt2.sav b/tests/sav/base_closure1_alt2.sav
index b5a1d3f..f0b16a5 100644 (file)
--- a/tests/sav/base_closure1_alt2.sav
+++ b/tests/sav/base_closure1_alt2.sav
@@ -1 +1 @@
-alt/base_closure1_alt2.nit:25,3--7: Error: arity missmatch; prototype is 'bar'.
+alt/base_closure1_alt2.nit:25,3--7: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure2_alt2.sav b/tests/sav/base_closure2_alt2.sav
index cdd6e13..6b6842d 100644 (file)
--- a/tests/sav/base_closure2_alt2.sav
+++ b/tests/sav/base_closure2_alt2.sav
@@ -1 +1 @@
-alt/base_closure2_alt2.nit:25,3--5: Error: arity missmatch; prototype is 'bar(Int)'.
+alt/base_closure2_alt2.nit:25,3--5: Error: arity mismatch; prototype is 'bar(Int)'.

diff --git a/tests/sav/base_closure3_alt1.sav b/tests/sav/base_closure3_alt1.sav
index 7dce49a..4be4f2a 100644 (file)
--- a/tests/sav/base_closure3_alt1.sav
+++ b/tests/sav/base_closure3_alt1.sav
@@ -1 +1 @@
-alt/base_closure3_alt1.nit:25,3--14: Error: arity missmatch; prototype is 'bar(Int,Int,A)'.
+alt/base_closure3_alt1.nit:25,3--14: Error: arity mismatch; prototype is 'bar(Int,Int,A)'.

diff --git a/tests/sav/base_closure4_alt2.sav b/tests/sav/base_closure4_alt2.sav
index 94170d4..80b595c 100644 (file)
--- a/tests/sav/base_closure4_alt2.sav
+++ b/tests/sav/base_closure4_alt2.sav
@@ -1 +1 @@
-alt/base_closure4_alt2.nit:25,3--7: Error: arity missmatch; prototype is 'bar: Int'.
+alt/base_closure4_alt2.nit:25,3--7: Error: arity mismatch; prototype is 'bar: Int'.

diff --git a/tests/sav/base_closure_break2_alt2.sav b/tests/sav/base_closure_break2_alt2.sav
index 0dd5e58..61e93cd 100644 (file)
--- 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,17--21: Error: arity missmatch; prototype is 'bar'.
+alt/base_closure_break2_alt2.nit:26,17--21: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure_break_alt2.sav b/tests/sav/base_closure_break_alt2.sav
index 39c797e..e941919 100644 (file)
--- 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,17--21: Error: arity missmatch; prototype is 'bar'.
+alt/base_closure_break_alt2.nit:26,17--21: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure_raf_alt13.fail b/tests/sav/base_closure_raf_alt13.fail
index 26c4634..7347132 100644 (file)
--- a/tests/sav/base_closure_raf_alt13.fail
+++ b/tests/sav/base_closure_raf_alt13.fail
@@ -1 +1 @@
-alt/base_closure_raf_alt13.nit:27,3--8: Error: arity missmatch; prototype is 'bar'.
+alt/base_closure_raf_alt13.nit:27,3--8: Error: arity mismatch; prototype is 'bar'.

diff --git a/tests/sav/base_closure_raf_alt2.fail b/tests/sav/base_closure_raf_alt2.fail
index 035b956..2a2c314 100644 (file)
--- a/tests/sav/base_closure_raf_alt2.fail
+++ b/tests/sav/base_closure_raf_alt2.fail
@@ -1 +1 @@
-alt/base_closure_raf_alt2.nit:29,3--5: Error: arity missmatch; prototype is 'bar(Int)'.
+alt/base_closure_raf_alt2.nit:29,3--5: Error: arity mismatch; prototype is 'bar(Int)'.

diff --git a/tests/sav/base_init_linext2_alt2.sav b/tests/sav/base_init_linext2_alt2.sav
index ce93357..66f86c6 100644 (file)
--- a/tests/sav/base_init_linext2_alt2.sav
+++ b/tests/sav/base_init_linext2_alt2.sav
@@ -1 +1 @@
-alt/base_init_linext2_alt2.nit:99,2--112,12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(Char).
+alt/base_init_linext2_alt2.nit:99,2--112,12: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt2::B::initb, base_init_linext2_alt2::B::init_par, base_init_linext2_alt2::B::init_par2(Char).

diff --git a/tests/sav/base_init_linext2_alt4.sav b/tests/sav/base_init_linext2_alt4.sav
index 3be440e..71438c3 100644 (file)
--- a/tests/sav/base_init_linext2_alt4.sav
+++ b/tests/sav/base_init_linext2_alt4.sav
@@ -1,2 +1,2 @@
 alt/base_init_linext2_alt4.nit:105,3--7: Error: Constructor of B must be invoked before constructor of C
-alt/base_init_linext2_alt4.nit:99,2--113,12: Error: there is no available compatible constrctor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(Char).
+alt/base_init_linext2_alt4.nit:99,2--113,12: Error: there is no available compatible constructor in B. Discarded candidates are base_init_linext2_alt4::B::initb, base_init_linext2_alt4::B::init_par, base_init_linext2_alt4::B::init_par2(Char).

diff --git a/tests/sav/base_vararg_alt1.sav b/tests/sav/base_vararg_alt1.sav
index cd16023..dfd0f04 100644 (file)
--- a/tests/sav/base_vararg_alt1.sav
+++ b/tests/sav/base_vararg_alt1.sav
@@ -1 +1 @@
-alt/base_vararg_alt1.nit:51,1--3: Error: arity missmatch; prototype is 'foo(Char)'.
+alt/base_vararg_alt1.nit:51,1--3: Error: arity mismatch; prototype is 'foo(Char)'.

diff --git a/tests/sav/base_vararg_alt2.sav b/tests/sav/base_vararg_alt2.sav
index e5b6952..f925a78 100644 (file)
--- a/tests/sav/base_vararg_alt2.sav
+++ b/tests/sav/base_vararg_alt2.sav
@@ -1 +1 @@
-alt/base_vararg_alt2.nit:54,1--3: Error: arity missmatch; prototype is 'bar(Char,Char)'.
+alt/base_vararg_alt2.nit:54,1--3: Error: arity mismatch; prototype is 'bar(Char,Char)'.

diff --git a/tests/sav/base_vararg_alt3.sav b/tests/sav/base_vararg_alt3.sav
index 847f95b..e904ab4 100644 (file)
--- a/tests/sav/base_vararg_alt3.sav
+++ b/tests/sav/base_vararg_alt3.sav
@@ -1 +1 @@
-alt/base_vararg_alt3.nit:55,1--7: Error: arity missmatch; prototype is 'bar(Char,Char)'.
+alt/base_vararg_alt3.nit:55,1--7: Error: arity mismatch; prototype is 'bar(Char,Char)'.

diff --git a/tests/sav/base_vararg_alt4.sav b/tests/sav/base_vararg_alt4.sav
index 19ae490..e06aea1 100644 (file)
--- a/tests/sav/base_vararg_alt4.sav
+++ b/tests/sav/base_vararg_alt4.sav
@@ -1 +1 @@
-alt/base_vararg_alt4.nit:58,1--3: Error: arity missmatch; prototype is 'baz(Char,Char)'.
+alt/base_vararg_alt4.nit:58,1--3: Error: arity mismatch; prototype is 'baz(Char,Char)'.

diff --git a/tests/sav/base_vararg_alt5.sav b/tests/sav/base_vararg_alt5.sav
index ad539b9..b21e311 100644 (file)
--- a/tests/sav/base_vararg_alt5.sav
+++ b/tests/sav/base_vararg_alt5.sav
@@ -1 +1 @@
-alt/base_vararg_alt5.nit:59,1--7: Error: arity missmatch; prototype is 'baz(Char,Char)'.
+alt/base_vararg_alt5.nit:59,1--7: Error: arity mismatch; prototype is 'baz(Char,Char)'.

diff --git a/tests/sav/base_vararg_alt6.sav b/tests/sav/base_vararg_alt6.sav
index 7df8f14..78323c9 100644 (file)
--- a/tests/sav/base_vararg_alt6.sav
+++ b/tests/sav/base_vararg_alt6.sav
@@ -1 +1 @@
-alt/base_vararg_alt6.nit:62,1--6: Error: arity missmatch; prototype is 'foobar(Char,Char,Char)'.
+alt/base_vararg_alt6.nit:62,1--6: Error: arity mismatch; prototype is 'foobar(Char,Char,Char)'.

diff --git a/tests/sav/base_vararg_alt7.sav b/tests/sav/base_vararg_alt7.sav
index dd247e2..85c090b 100644 (file)
--- a/tests/sav/base_vararg_alt7.sav
+++ b/tests/sav/base_vararg_alt7.sav
@@ -1 +1 @@
-alt/base_vararg_alt7.nit:63,1--10: Error: arity missmatch; prototype is 'foobar(Char,Char,Char)'.
+alt/base_vararg_alt7.nit:63,1--10: Error: arity mismatch; prototype is 'foobar(Char,Char,Char)'.

diff --git a/tests/sav/base_vararg_alt8.sav b/tests/sav/base_vararg_alt8.sav
index b10307c..b9856cc 100644 (file)
--- a/tests/sav/base_vararg_alt8.sav
+++ b/tests/sav/base_vararg_alt8.sav
@@ -1 +1 @@
-alt/base_vararg_alt8.nit:64,1--14: Error: arity missmatch; prototype is 'foobar(Char,Char,Char)'.
+alt/base_vararg_alt8.nit:64,1--14: Error: arity mismatch; prototype is 'foobar(Char,Char,Char)'.

diff --git a/tests/sav/error_expr_not_ok_alt4.sav b/tests/sav/error_expr_not_ok_alt4.sav
index aa1ab6a..fa0caf6 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt4.sav
+++ b/tests/sav/error_expr_not_ok_alt4.sav
@@ -10,7 +10,7 @@ alt/error_expr_not_ok_alt4.nit:43,1--8: Error: Method 'fail' doesn't exists in I
 alt/error_expr_not_ok_alt4.nit:45,7--10: Type error: expected A, got Object
 alt/error_expr_not_ok_alt4.nit:46,1--9: Error: Method 'fail' doesn't exists in Object.
 alt/error_expr_not_ok_alt4.nit:49,7--10: Type error: expected A, got Object
-alt/error_expr_not_ok_alt4.nit:50,1--10: Error: arity missmatch; prototype is 'trash(A)'.
+alt/error_expr_not_ok_alt4.nit:50,1--10: Error: arity mismatch; prototype is 'trash(A)'.
 alt/error_expr_not_ok_alt4.nit:60,4--7: Type error: expected Bool, got Int
 alt/error_expr_not_ok_alt4.nit:60,20: Type error: expected A, got Int
 alt/error_expr_not_ok_alt4.nit:62,10--13: Type error: expected Bool, got Int

diff --git a/tests/sav/error_expr_not_ok_alt5.sav b/tests/sav/error_expr_not_ok_alt5.sav
index 12b1d7e..6ba1a15 100644 (file)
--- a/tests/sav/error_expr_not_ok_alt5.sav
+++ b/tests/sav/error_expr_not_ok_alt5.sav
@@ -11,7 +11,7 @@ alt/error_expr_not_ok_alt5.nit:43,1--8: Error: Method 'fail' doesn't exists in I
 alt/error_expr_not_ok_alt5.nit:45,7--10: Type error: expected A, got Object
 alt/error_expr_not_ok_alt5.nit:46,1--9: Error: Method 'fail' doesn't exists in Object.
 alt/error_expr_not_ok_alt5.nit:49,7--10: Type error: expected A, got Object
-alt/error_expr_not_ok_alt5.nit:50,1--10: Error: arity missmatch; prototype is 'trash(A)'.
+alt/error_expr_not_ok_alt5.nit:50,1--10: Error: arity mismatch; prototype is 'trash(A)'.
 alt/error_expr_not_ok_alt5.nit:60,4--7: Type error: expected Bool, got Int
 alt/error_expr_not_ok_alt5.nit:60,20: Type error: expected A, got Int
 alt/error_expr_not_ok_alt5.nit:62,10--13: Type error: expected Bool, got Int

diff --git a/tests/sav/error_init_auto.sav b/tests/sav/error_init_auto.sav
index 20f98a5..7efd1c0 100644 (file)
--- a/tests/sav/error_init_auto.sav
+++ b/tests/sav/error_init_auto.sav
@@ -1,4 +1,4 @@
-./error_init_auto.nit:34,5--9: Error: arity missmatch; prototype is 'init(Int)'.
-./error_init_auto.nit:36,5--14: Error: arity missmatch; prototype is 'init(Int)'.
-./error_init_auto.nit:37,5--17: Error: arity missmatch; prototype is 'init(Int)'.
+./error_init_auto.nit:34,5--9: Error: arity mismatch; prototype is 'init(Int)'.
+./error_init_auto.nit:36,5--14: Error: arity mismatch; prototype is 'init(Int)'.
+./error_init_auto.nit:37,5--17: Error: arity mismatch; prototype is 'init(Int)'.
 ./error_init_auto.nit:38,5--15: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/error_init_auto_alt1.sav b/tests/sav/error_init_auto_alt1.sav
index fda8cc8..8c3f211 100644 (file)
--- a/tests/sav/error_init_auto_alt1.sav
+++ b/tests/sav/error_init_auto_alt1.sav
@@ -1,4 +1,4 @@
-alt/error_init_auto_alt1.nit:34,5--11: Error: arity missmatch; prototype is 'init'.
-alt/error_init_auto_alt1.nit:35,5--14: Error: arity missmatch; prototype is 'init'.
-alt/error_init_auto_alt1.nit:36,5--17: Error: arity missmatch; prototype is 'init'.
+alt/error_init_auto_alt1.nit:34,5--11: Error: arity mismatch; prototype is 'init'.
+alt/error_init_auto_alt1.nit:35,5--14: Error: arity mismatch; prototype is 'init'.
+alt/error_init_auto_alt1.nit:36,5--17: Error: arity mismatch; prototype is 'init'.
 alt/error_init_auto_alt1.nit:37,5--15: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/error_init_auto_alt2.sav b/tests/sav/error_init_auto_alt2.sav
index 9a24c04..9a2fd2f 100644 (file)
--- a/tests/sav/error_init_auto_alt2.sav
+++ b/tests/sav/error_init_auto_alt2.sav
@@ -1,4 +1,4 @@
-alt/error_init_auto_alt2.nit:33,5--9: Error: arity missmatch; prototype is 'init(Int,Int)'.
-alt/error_init_auto_alt2.nit:34,5--11: Error: arity missmatch; prototype is 'init(Int,Int)'.
-alt/error_init_auto_alt2.nit:36,5--17: Error: arity missmatch; prototype is 'init(Int,Int)'.
+alt/error_init_auto_alt2.nit:33,5--9: Error: arity mismatch; prototype is 'init(Int,Int)'.
+alt/error_init_auto_alt2.nit:34,5--11: Error: arity mismatch; prototype is 'init(Int,Int)'.
+alt/error_init_auto_alt2.nit:36,5--17: Error: arity mismatch; prototype is 'init(Int,Int)'.
 alt/error_init_auto_alt2.nit:37,5--15: Error: Method 'foo' doesn't exists in A.

diff --git a/tests/sav/error_init_auto_alt3.sav b/tests/sav/error_init_auto_alt3.sav
index d5defda..e6e49ac 100644 (file)
--- a/tests/sav/error_init_auto_alt3.sav
+++ b/tests/sav/error_init_auto_alt3.sav
@@ -1,4 +1,4 @@
-alt/error_init_auto_alt3.nit:34,5--9: Error: arity missmatch; prototype is 'init(Int)'.
-alt/error_init_auto_alt3.nit:36,5--14: Error: arity missmatch; prototype is 'init(Int)'.
-alt/error_init_auto_alt3.nit:37,5--17: Error: arity missmatch; prototype is 'init(Int)'.
+alt/error_init_auto_alt3.nit:34,5--9: Error: arity mismatch; prototype is 'init(Int)'.
+alt/error_init_auto_alt3.nit:36,5--14: Error: arity mismatch; prototype is 'init(Int)'.
+alt/error_init_auto_alt3.nit:37,5--17: Error: arity mismatch; prototype is 'init(Int)'.
 alt/error_init_auto_alt3.nit:38,5--15: Error: Method 'foo' doesn't exists in A.