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

diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 616977a..ac7b970 100644
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -23,6 +23,7 @@ private import parser::tables
 import mixin
 import primitive_types
 private import model::serialize_model
+private import frontend::explain_assert_api
 
 redef class ToolContext
 	# --discover-call-trace
@@ -825,7 +826,7 @@ class InterpreterFrame
 	super Frame
 
 	# Mapping between a variable and the current value
-	private var map: Map[Variable, Instance] = new HashMap[Variable, Instance]
+	var map: Map[Variable, Instance] = new HashMap[Variable, Instance]
 end
 
 redef class ANode
@@ -874,7 +875,10 @@ redef class AMethPropdef
 		return res
 	end
 
-	private fun call_commons(v: NaiveInterpreter, mpropdef: MMethodDef, arguments: Array[Instance], f: Frame): nullable Instance
+	# Execution of the body of the method
+	#
+	# It handle the common special cases: super, intern, extern
+	fun call_commons(v: NaiveInterpreter, mpropdef: MMethodDef, arguments: Array[Instance], f: Frame): nullable Instance
 	do
 		v.frames.unshift(f)
 
@@ -1699,6 +1703,8 @@ redef class AEscapeExpr
 			var i = v.expr(ne)
 			if i == null then return
 			v.escapevalue = i
+		else
+			v.escapevalue = null
 		end
 		v.escapemark = self.escapemark
 	end
@@ -1875,6 +1881,22 @@ redef class AAssertExpr
 		if not cond.is_true then
 			v.stmt(self.n_else)
 			if v.is_escaping then return
+
+			# Explain assert if it fails
+			var explain_assert_str = explain_assert_str
+			if explain_assert_str != null then
+				var i = v.expr(explain_assert_str)
+				if i isa MutableInstance then
+					var res = v.send(v.force_get_primitive_method("to_cstring", i.mtype), [i])
+					if res != null then
+						var val = res.val
+						if val != null then
+							print_error "Runtime assert: {val.to_s}"
+						end
+					end
+				end
+			end
+
 			var nid = self.n_id
 			if nid != null then
 				fatal(v, "Assert '{nid.text}' failed")