nitc/niti: unify returnmark and escapemark
[nit.git] / src / interpreter / debugger.nit
index cf4e815..25ca6c2 100644 (file)
@@ -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