X-Git-Url: http://nitlanguage.org

diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 8818874..272219f 100644
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -1273,14 +1273,16 @@ redef class ABlockExpr
 end
 
 redef class AVardeclExpr
-	redef fun stmt(v)
+	redef fun expr(v)
 	do
 		var ne = self.n_expr
 		if ne != null then
 			var i = v.expr(ne)
-			if i == null then return
+			if i == null then return null
 			v.write_variable(self.variable.as(not null), i)
+			return i
 		end
+		return null
 	end
 end
 
@@ -1465,6 +1467,19 @@ redef class AForExpr
 	end
 end
 
+redef class AWithExpr
+	redef fun stmt(v)
+	do
+		var expr = v.expr(self.n_expr)
+		if expr == null then return
+
+		v.callsite(method_start, [expr])
+		v.stmt(self.n_block)
+		v.is_escape(self.break_mark) # Clear the break
+		v.callsite(method_finish, [expr])
+	end
+end
+
 redef class AAssertExpr
 	redef fun stmt(v)
 	do