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

diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 0ec406c..6c86223 100644
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -61,7 +61,7 @@ class NaiveInterpreter
 	var modelbuilder: ModelBuilder
 
 	# The main module of the program (used to lookup method)
-	var mainmodule: MModule
+	var mainmodule: MModule is writable
 
 	# The command line arguments of the interpreted program
 	# arguments.first is the program name
@@ -119,7 +119,10 @@ class NaiveInterpreter
 	var escapemark: nullable EscapeMark = null
 
 	# The count of `catch` blocs that have been encountered and can catch an abort
-	var catch_count = 0
+	var catch_count = 0 is writable
+
+	# The last error thrown on abort/runtime error where catch_count > 0
+	var last_error: nullable FatalError = null
 
 	# Is a return or a break or a continue executed?
 	# Use this function to know if you must skip the evaluation of statements
@@ -685,15 +688,25 @@ class NaiveInterpreter
 	var error_instance = new MutableInstance(modelbuilder.model.null_type) is lazy
 end
 
+# A runtime error
+class FatalError
+	# The error message
+	var message: String
+
+	# The problematic node, if any
+	var node: nullable ANode
+end
+
 # An instance represents a value of the executed program.
 abstract class Instance
 	# The dynamic type of the instance
 	# ASSERT: not self.mtype.is_anchored
 	var mtype: MType
 
-	# return true if the instance is the true value.
-	# return false if the instance is the true value.
-	# else aborts
+	# Return `true` if the instance is the `true` value.
+	#
+	# Return `false` if the instance is the `false` value.
+	# Abort if the instance is not a boolean value.
 	fun is_true: Bool do abort
 
 	# Return true if `self` IS `o` (using the Nit semantic of is)
@@ -812,7 +825,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
@@ -820,7 +833,13 @@ redef class ANode
 	# `v` is used to know if a colored message is displayed or not
 	fun fatal(v: NaiveInterpreter, message: String)
 	do
-		if v.modelbuilder.toolcontext.opt_no_color.value == true then
+		# Abort if there is a `catch` block
+		if v.catch_count > 0 then
+			v.last_error = new FatalError(message, self)
+			abort
+		end
+
+		if v.modelbuilder.toolcontext.opt_no_color.value then
 			sys.stderr.write("Runtime error: {message} ({location.file.filename}:{location.line_start})\n")
 		else
 			sys.stderr.write("{location}: Runtime error: {message}\n{location.colored_line("0;31")}\n")
@@ -855,7 +874,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)
 
@@ -1680,6 +1702,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
@@ -1688,13 +1712,8 @@ end
 redef class AAbortExpr
 	redef fun stmt(v)
 	do
-		# Abort as asked if there is no `catch` bloc
-		if v.catch_count <= 0 then
-			fatal(v, "Aborted")
-			exit(1)
-		else
-			abort
-		end
+		fatal(v, "Aborted")
+		exit(1)
 	end
 end