syntax: track exits context in do blocks

[nit.git] / src / syntax / typing.nit

diff --git a/src/syntax/typing.nit b/src/syntax/typing.nit
index 618ace9..980eba8 100644 (file)
--- a/src/syntax/typing.nit
+++ b/src/syntax/typing.nit
@@ -478,9 +478,20 @@ redef class ADoExpr
                var escapable = new BreakOnlyEscapableBlock(self)
                _escapable = escapable
                v.escapable_ctx.push(escapable, n_label)
+               var old_var_ctx = v.variable_ctx
 
                super
 
+               # Add the end of the block as an exit context
+               if not v.variable_ctx.unreash then
+                       escapable.break_variable_contexts.add(v.variable_ctx)
+               end
+
+               # Merge all exit contexts
+               if not escapable.break_variable_contexts.is_empty then
+                       v.variable_ctx = old_var_ctx.merge(self, escapable.break_variable_contexts, v.base_variable_ctx)
+               end
+
                v.escapable_ctx.pop
                _is_typed = true
        end