From aa03558b46eb060f24cc53603b27795240743f4a Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Fri, 8 Apr 2016 11:49:23 -0400
Subject: [PATCH] nitc/niti: unify returnmark and escapemark

Signed-off-by: Jean Privat <jean@pryen.org>
---
 src/interpreter/debugger.nit          |    4 +---
 src/interpreter/naive_interpreter.nit |   30 +++++-------------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/interpreter/debugger.nit b/src/interpreter/debugger.nit
index cf4e815..25ca6c2 100644
--- a/src/interpreter/debugger.nit
+++ b/src/interpreter/debugger.nit
@@ -1418,10 +1418,8 @@ redef class AMethPropdef
 				curr_instances[i] = currFra.map[i]
 			end
 		end
-		if v.returnmark == f then
-			v.returnmark = null
+		if v.is_escape(self.return_mark) then
 			var res = v.escapevalue
-			v.escapevalue = null
 			return res
 		end
 		return null
diff --git a/src/interpreter/naive_interpreter.nit b/src/interpreter/naive_interpreter.nit
index 9236d99..7fc2355 100644
--- a/src/interpreter/naive_interpreter.nit
+++ b/src/interpreter/naive_interpreter.nit
@@ -113,17 +113,13 @@ class NaiveInterpreter
 		return self.modelbuilder.force_get_primitive_method(current_node, name, recv.mclass, self.mainmodule)
 	end
 
-	# Is a return executed?
-	# Set this mark to skip the evaluation until the end of the specified method frame
-	var returnmark: nullable FRAME = null
-
-	# Is a break or a continue executed?
+	# Is a return, a break or a continue executed?
 	# Set this mark to skip the evaluation until a labeled statement catch it with `is_escape`
 	var escapemark: nullable EscapeMark = null
 
 	# Is a return or a break or a continue executed?
 	# Use this function to know if you must skip the evaluation of statements
-	fun is_escaping: Bool do return returnmark != null or escapemark != null
+	fun is_escaping: Bool do return escapemark != null
 
 	# The value associated with the current return/break/continue, if any.
 	# Set the value when you set a escapemark.
@@ -848,10 +844,8 @@ redef class AMethPropdef
 		var f = v.new_frame(self, mpropdef, args)
 		var res = call_commons(v, mpropdef, args, f)
 		v.frames.shift
-		if v.returnmark == f then
-			v.returnmark = null
+		if v.is_escape(self.return_mark) then
 			res = v.escapevalue
-			v.escapevalue = null
 			return res
 		end
 		return res
@@ -1545,10 +1539,9 @@ redef class AAttrPropdef
 			val = v.expr(nexpr)
 		else if nblock != null then
 			v.stmt(nblock)
-			assert v.returnmark == f
+			assert v.escapemark == return_mark
 			val = v.escapevalue
-			v.returnmark = null
-			v.escapevalue = null
+			v.escapemark = null
 		else
 			abort
 		end
@@ -1693,19 +1686,6 @@ redef class AEscapeExpr
 	end
 end
 
-redef class AReturnExpr
-	redef fun stmt(v)
-	do
-		var ne = self.n_expr
-		if ne != null then
-			var i = v.expr(ne)
-			if i == null then return
-			v.escapevalue = i
-		end
-		v.returnmark = v.frame
-	end
-end
-
 redef class AAbortExpr
 	redef fun stmt(v)
 	do
-- 
1.7.9.5