Spelling: bloc -> block

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

diff --git a/src/syntax/control_flow.nit b/src/syntax/control_flow.nit
index a4d2dae..d13568e 100644 (file)
--- a/src/syntax/control_flow.nit
+++ b/src/syntax/control_flow.nit
@@ -301,9 +301,9 @@ redef class AClosureDecl
 
                        if v.control_flow_ctx.unreash == false then
                                if variable.closure.signature.return_type != null then
-                                       v.error(self, "Control error: Reached end of bloc (a 'continue' with a value was expected).")
+                                       v.error(self, "Control error: Reached end of block (a 'continue' with a value was expected).")
                                else if variable.closure.is_break then
-                                       v.error(self, "Control error: Reached end of break bloc (an 'abort' was expected).")
+                                       v.error(self, "Control error: Reached end of break block (an 'abort' was expected).")
                                end
                        end
 
@@ -324,9 +324,9 @@ special AControlableBlock
        do
                if v.control_flow_ctx.unreash == false then
                        if closure.signature.return_type != null then
-                               v.error(self, "Control error: Reached end of bloc (a 'continue' with a value was expected).")
+                               v.error(self, "Control error: Reached end of block (a 'continue' with a value was expected).")
                        else if closure.is_break then
-                               v.error(self, "Control error: Reached end of break bloc (a 'break' was expected).")
+                               v.error(self, "Control error: Reached end of break block (a 'break' was expected).")
                        end
                end
        end

diff --git a/src/syntax/mmbuilder.nit b/src/syntax/mmbuilder.nit
index 3a10b5a..b0ad5ff 100644 (file)
--- a/src/syntax/mmbuilder.nit
+++ b/src/syntax/mmbuilder.nit
@@ -1187,7 +1187,7 @@ redef class AClosureDecl
                        sig = new MMSignature(new Array[MMType], null, v.local_class.get_type)
                end
                if sig.return_type != null and n_kwbreak != null then
-                       v.error(self, "Syntax Error: A break bloc cannot have a return value.")
+                       v.error(self, "Syntax Error: A break block cannot have a return value.")
                end
 
                # Add the finalizer to the closure signature

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index 0c099de..b44f62a 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -45,7 +45,7 @@ special AbsSyntaxVisitor
        # Current knowledge about variables names and types
        readable writable attr _variable_ctx: VariableContext
 
-       # Current knowledge about escapable blocs
+       # Current knowledge about escapable blocks
        readable writable attr _escapable_ctx: EscapableContext = new EscapableContext(self)
 
        # The current reciever
@@ -395,9 +395,9 @@ redef class AContinueExpr
 
                var t = esc.continue_stype
                if n_expr == null and t != null then
-                       v.error(self, "Error: continue with a value required in this bloc.")
+                       v.error(self, "Error: continue with a value required in this block.")
                else if n_expr != null and t == null then
-                       v.error(self, "Error: continue without value required in this bloc.")
+                       v.error(self, "Error: continue without value required in this block.")
                else if n_expr != null and t != null then
                        v.check_conform_expr(n_expr, t)
                end
@@ -412,9 +412,9 @@ redef class ABreakExpr
 
                var bl = esc.break_list
                if n_expr == null and bl != null then
-                       v.error(self, "Error: break with a value required in this bloc.")
+                       v.error(self, "Error: break with a value required in this block.")
                else if n_expr != null and bl == null then
-                       v.error(self, "Error: break without value required in this bloc.")
+                       v.error(self, "Error: break without value required in this block.")
                else if n_expr != null and bl != null then
                        # Typing check can only be done later
                        bl.add(n_expr)
@@ -1028,9 +1028,9 @@ special PExpr
                end
                if cd != null then
                        if cs.length == 0 then
-                               v.error(self, "Error: {name} does not require blocs.")
+                               v.error(self, "Error: {name} does not require blocks.")
                        else if cd.length > cs.length or cd.length < min_arity then
-                               v.error(self, "Error: {name} requires {cs.length} blocs, {cd.length} found.")
+                               v.error(self, "Error: {name} requires {cs.length} blocks, {cd.length} found.")
                        else
                                # Initialize the break list if a value is required for breaks (ie. if the method is a function)
                                var break_list: Array[ABreakExpr] = null
@@ -1060,7 +1060,7 @@ special PExpr
                                end
                        end
                else if min_arity != 0 then
-                       v.error(self, "Error: {name} requires {cs.length} blocs.")
+                       v.error(self, "Error: {name} requires {cs.length} blocks.")
                end
                return t
        end

diff --git a/tests/sav/base_closure1_alt10.sav b/tests/sav/base_closure1_alt10.sav
index 36c2332..3bb0e19 100644 (file)
--- a/tests/sav/base_closure1_alt10.sav
+++ b/tests/sav/base_closure1_alt10.sav
@@ -1 +1 @@
-alt/base_closure1_alt10.nit:45,3--7: Error: foo requires 1 blocs.
+alt/base_closure1_alt10.nit:45,3--7: Error: foo requires 1 blocks.

diff --git a/tests/sav/base_closure1_alt5.sav b/tests/sav/base_closure1_alt5.sav
index 9d3f3c2..7403db0 100644 (file)
--- a/tests/sav/base_closure1_alt5.sav
+++ b/tests/sav/base_closure1_alt5.sav
@@ -1 +1 @@
-alt/base_closure1_alt5.nit:38,3--11: Error: break without value required in this bloc.
+alt/base_closure1_alt5.nit:38,3--11: Error: break without value required in this block.

diff --git a/tests/sav/base_closure1_alt7.sav b/tests/sav/base_closure1_alt7.sav
index dbf1a0f..7aa397b 100644 (file)
--- a/tests/sav/base_closure1_alt7.sav
+++ b/tests/sav/base_closure1_alt7.sav
@@ -1 +1 @@
-alt/base_closure1_alt7.nit:40,3--14: Error: continue without value required in this bloc.
+alt/base_closure1_alt7.nit:40,3--14: Error: continue without value required in this block.

diff --git a/tests/sav/base_closure2_alt10.sav b/tests/sav/base_closure2_alt10.sav
index 4002cf1..23b9e62 100644 (file)
--- a/tests/sav/base_closure2_alt10.sav
+++ b/tests/sav/base_closure2_alt10.sav
@@ -1 +1 @@
-alt/base_closure2_alt10.nit:46,3--7: Error: foo requires 1 blocs.
+alt/base_closure2_alt10.nit:46,3--7: Error: foo requires 1 blocks.

diff --git a/tests/sav/base_closure2_alt5.sav b/tests/sav/base_closure2_alt5.sav
index 4302ddf..0b29966 100644 (file)
--- a/tests/sav/base_closure2_alt5.sav
+++ b/tests/sav/base_closure2_alt5.sav
@@ -1 +1 @@
-alt/base_closure2_alt5.nit:39,3--11: Error: break without value required in this bloc.
+alt/base_closure2_alt5.nit:39,3--11: Error: break without value required in this block.

diff --git a/tests/sav/base_closure2_alt7.sav b/tests/sav/base_closure2_alt7.sav
index 9dc0723..c918b2b 100644 (file)
--- a/tests/sav/base_closure2_alt7.sav
+++ b/tests/sav/base_closure2_alt7.sav
@@ -1 +1 @@
-alt/base_closure2_alt7.nit:41,3--14: Error: continue without value required in this bloc.
+alt/base_closure2_alt7.nit:41,3--14: Error: continue without value required in this block.

diff --git a/tests/sav/base_closure3_alt5.sav b/tests/sav/base_closure3_alt5.sav
index 198cd4c..81a2659 100644 (file)
--- a/tests/sav/base_closure3_alt5.sav
+++ b/tests/sav/base_closure3_alt5.sav
@@ -1 +1 @@
-alt/base_closure3_alt5.nit:38,3--11: Error: break without value required in this bloc.
+alt/base_closure3_alt5.nit:38,3--11: Error: break without value required in this block.

diff --git a/tests/sav/base_closure3_alt7.sav b/tests/sav/base_closure3_alt7.sav
index a295c1b..ef23644 100644 (file)
--- a/tests/sav/base_closure3_alt7.sav
+++ b/tests/sav/base_closure3_alt7.sav
@@ -1 +1 @@
-alt/base_closure3_alt7.nit:40,3--14: Error: continue without value required in this bloc.
+alt/base_closure3_alt7.nit:40,3--14: Error: continue without value required in this block.

diff --git a/tests/sav/base_closure4_alt10.sav b/tests/sav/base_closure4_alt10.sav
index 450544f..a906edc 100644 (file)
--- a/tests/sav/base_closure4_alt10.sav
+++ b/tests/sav/base_closure4_alt10.sav
@@ -1 +1 @@
-alt/base_closure4_alt10.nit:45,3--7: Error: foo requires 1 blocs.
+alt/base_closure4_alt10.nit:45,3--7: Error: foo requires 1 blocks.

diff --git a/tests/sav/base_closure4_alt5.sav b/tests/sav/base_closure4_alt5.sav
index cdc377e..f349663 100644 (file)
--- a/tests/sav/base_closure4_alt5.sav
+++ b/tests/sav/base_closure4_alt5.sav
@@ -1 +1 @@
-alt/base_closure4_alt5.nit:38,3--11: Error: break without value required in this bloc.
+alt/base_closure4_alt5.nit:38,3--11: Error: break without value required in this block.

diff --git a/tests/sav/base_closure4_alt6.sav b/tests/sav/base_closure4_alt6.sav
index 53edc8e..6b9bc99 100644 (file)
--- a/tests/sav/base_closure4_alt6.sav
+++ b/tests/sav/base_closure4_alt6.sav
@@ -1 +1 @@
-alt/base_closure4_alt6.nit:39,3--10: Error: continue with a value required in this bloc.
+alt/base_closure4_alt6.nit:39,3--10: Error: continue with a value required in this block.

diff --git a/tests/sav/base_closure5_alt1.sav b/tests/sav/base_closure5_alt1.sav
index 98622b2..40e846a 100644 (file)
--- a/tests/sav/base_closure5_alt1.sav
+++ b/tests/sav/base_closure5_alt1.sav
@@ -1 +1 @@
-alt/base_closure5_alt1.nit:35,3--7: Error: break with a value required in this bloc.
+alt/base_closure5_alt1.nit:35,3--7: Error: break with a value required in this block.

diff --git a/tests/sav/base_closure5_alt7.sav b/tests/sav/base_closure5_alt7.sav
index 206cc02..0dd2acc 100644 (file)
--- a/tests/sav/base_closure5_alt7.sav
+++ b/tests/sav/base_closure5_alt7.sav
@@ -1 +1 @@
-alt/base_closure5_alt7.nit:41,3--10: Error: continue with a value required in this bloc.
+alt/base_closure5_alt7.nit:41,3--10: Error: continue with a value required in this block.

diff --git a/tests/sav/base_closure5_alt9.sav b/tests/sav/base_closure5_alt9.sav
index f8180a9..6a3b6d1 100644 (file)
--- a/tests/sav/base_closure5_alt9.sav
+++ b/tests/sav/base_closure5_alt9.sav
@@ -1 +1 @@
-alt/base_closure5_alt9.nit:33,16--34:10: Control error: Reached end of bloc (a 'continue' with a value was expected).
+alt/base_closure5_alt9.nit:33,16--34:10: Control error: Reached end of block (a 'continue' with a value was expected).

diff --git a/tests/sav/base_closure_break_alt10.sav b/tests/sav/base_closure_break_alt10.sav
index 75580db..b4535ee 100644 (file)
--- a/tests/sav/base_closure_break_alt10.sav
+++ b/tests/sav/base_closure_break_alt10.sav
@@ -1 +1 @@
-alt/base_closure_break_alt10.nit:47,3--7: Error: foo requires 1 blocs.
+alt/base_closure_break_alt10.nit:47,3--7: Error: foo requires 1 blocks.

diff --git a/tests/sav/base_closure_break_alt12.sav b/tests/sav/base_closure_break_alt12.sav
index a05024b..4f4a7c1 100644 (file)
--- a/tests/sav/base_closure_break_alt12.sav
+++ b/tests/sav/base_closure_break_alt12.sav
@@ -1 +1 @@
-alt/base_closure_break_alt12.nit:21,3--21: Syntax Error: A break bloc cannot have a return value.
+alt/base_closure_break_alt12.nit:21,3--21: Syntax Error: A break block cannot have a return value.

diff --git a/tests/sav/base_closure_break_alt13.sav b/tests/sav/base_closure_break_alt13.sav
index 4bfc47b..fc12a48 100644 (file)
--- a/tests/sav/base_closure_break_alt13.sav
+++ b/tests/sav/base_closure_break_alt13.sav
@@ -1 +1 @@
-alt/base_closure_break_alt13.nit:35,8--44:10: Control error: Reached end of break bloc (a 'break' was expected).
+alt/base_closure_break_alt13.nit:35,8--44:10: Control error: Reached end of break block (a 'break' was expected).

diff --git a/tests/sav/base_closure_break_alt5.sav b/tests/sav/base_closure_break_alt5.sav
index 68c0573..266af4f 100644 (file)
--- a/tests/sav/base_closure_break_alt5.sav
+++ b/tests/sav/base_closure_break_alt5.sav
@@ -1 +1 @@
-alt/base_closure_break_alt5.nit:39,3--11: Error: break without value required in this bloc.
+alt/base_closure_break_alt5.nit:39,3--11: Error: break without value required in this block.

diff --git a/tests/sav/base_closure_default1_alt5.sav b/tests/sav/base_closure_default1_alt5.sav
index eef04b1..04aeae3 100644 (file)
--- a/tests/sav/base_closure_default1_alt5.sav
+++ b/tests/sav/base_closure_default1_alt5.sav
@@ -1 +1 @@
-alt/base_closure_default1_alt5.nit:26,5--15: Error: continue without value required in this bloc.
+alt/base_closure_default1_alt5.nit:26,5--15: Error: continue without value required in this block.

diff --git a/tests/sav/base_closure_default2_alt5.sav b/tests/sav/base_closure_default2_alt5.sav
index 42e9672..ed02170 100644 (file)
--- a/tests/sav/base_closure_default2_alt5.sav
+++ b/tests/sav/base_closure_default2_alt5.sav
@@ -1 +1 @@
-alt/base_closure_default2_alt5.nit:26,5--15: Error: continue without value required in this bloc.
+alt/base_closure_default2_alt5.nit:26,5--15: Error: continue without value required in this block.

diff --git a/tests/sav/base_closure_default3_alt4.sav b/tests/sav/base_closure_default3_alt4.sav
index dddc0da..cb3a932 100644 (file)
--- a/tests/sav/base_closure_default3_alt4.sav
+++ b/tests/sav/base_closure_default3_alt4.sav
@@ -1 +1 @@
-alt/base_closure_default3_alt4.nit:25,5--12: Error: continue with a value required in this bloc.
+alt/base_closure_default3_alt4.nit:25,5--12: Error: continue with a value required in this block.

diff --git a/tests/sav/base_closure_default3_alt5.sav b/tests/sav/base_closure_default3_alt5.sav
index 39912c2..4d24d24 100644 (file)
--- a/tests/sav/base_closure_default3_alt5.sav
+++ b/tests/sav/base_closure_default3_alt5.sav
@@ -1 +1 @@
-alt/base_closure_default3_alt5.nit:21,3--15: Control error: Reached end of bloc (a 'continue' with a value was expected).
+alt/base_closure_default3_alt5.nit:21,3--15: Control error: Reached end of block (a 'continue' with a value was expected).

diff --git a/tests/sav/base_closure_default4_alt4.sav b/tests/sav/base_closure_default4_alt4.sav
index ff126c2..05fa2c4 100644 (file)
--- a/tests/sav/base_closure_default4_alt4.sav
+++ b/tests/sav/base_closure_default4_alt4.sav
@@ -1 +1 @@
-alt/base_closure_default4_alt4.nit:25,5--12: Error: continue with a value required in this bloc.
+alt/base_closure_default4_alt4.nit:25,5--12: Error: continue with a value required in this block.

diff --git a/tests/sav/base_closure_default4_alt5.sav b/tests/sav/base_closure_default4_alt5.sav
index 5359278..45d92c2 100644 (file)
--- a/tests/sav/base_closure_default4_alt5.sav
+++ b/tests/sav/base_closure_default4_alt5.sav
@@ -1 +1 @@
-alt/base_closure_default4_alt5.nit:21,3--23: Control error: Reached end of bloc (a 'continue' with a value was expected).
+alt/base_closure_default4_alt5.nit:21,3--23: Control error: Reached end of block (a 'continue' with a value was expected).

diff --git a/tests/sav/base_closure_multi_alt1.sav b/tests/sav/base_closure_multi_alt1.sav
index 45f9eca..1136ee9 100644 (file)
--- a/tests/sav/base_closure_multi_alt1.sav
+++ b/tests/sav/base_closure_multi_alt1.sav
@@ -1 +1 @@
-alt/base_closure_multi_alt1.nit:52,1--61:9: Error: a requires 1 blocs, 2 found.
+alt/base_closure_multi_alt1.nit:52,1--61:9: Error: a requires 1 blocks, 2 found.

diff --git a/tests/sav/base_closure_multi_alt2.sav b/tests/sav/base_closure_multi_alt2.sav
index a025b0b..1a2032d 100644 (file)
--- a/tests/sav/base_closure_multi_alt2.sav
+++ b/tests/sav/base_closure_multi_alt2.sav
@@ -1 +1 @@
-alt/base_closure_multi_alt2.nit:54,1--63:9: Error: a requires 3 blocs, 2 found.
+alt/base_closure_multi_alt2.nit:54,1--63:9: Error: a requires 3 blocks, 2 found.

diff --git a/tests/sav/base_closure_multi_alt3.sav b/tests/sav/base_closure_multi_alt3.sav
index c2794e6..4e39c20 100644 (file)
--- a/tests/sav/base_closure_multi_alt3.sav
+++ b/tests/sav/base_closure_multi_alt3.sav
@@ -1 +1 @@
-alt/base_closure_multi_alt3.nit:55,2--56:10: Error: b requires 2 blocs, 1 found.
+alt/base_closure_multi_alt3.nit:55,2--56:10: Error: b requires 2 blocks, 1 found.

diff --git a/tests/sav/base_closure_multi_alt4.sav b/tests/sav/base_closure_multi_alt4.sav
index 818cc53..d15a655 100644 (file)
--- a/tests/sav/base_closure_multi_alt4.sav
+++ b/tests/sav/base_closure_multi_alt4.sav
@@ -1 +1 @@
-alt/base_closure_multi_alt4.nit:55,2--60:11: Error: b requires 2 blocs, 3 found.
+alt/base_closure_multi_alt4.nit:55,2--60:11: Error: b requires 2 blocks, 3 found.