nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: interpreter use the catch from the compiler
[nit.git]
/
src
/
interpreter
/
debugger.nit
diff --git
a/src/interpreter/debugger.nit
b/src/interpreter/debugger.nit
index
1765d9e
..
25ca6c2
100644
(file)
--- a/
src/interpreter/debugger.nit
+++ b/
src/interpreter/debugger.nit
@@
-18,7
+18,6
@@
module debugger
intrude import naive_interpreter
module debugger
intrude import naive_interpreter
-import nitx
intrude import semantize::local_var_init
intrude import semantize::scope
intrude import toolcontext
intrude import semantize::local_var_init
intrude import semantize::scope
intrude import toolcontext
@@
-470,10
+469,6
@@
class Debugger
else if command == "help" then
help
return true
else if command == "help" then
help
return true
- # Opens a new NitIndex prompt on current model
- else if command == "nitx" then
- new NitIndex.with_infos(modelbuilder, self.mainmodule).prompt
- return true
else if command == "bt" or command == "backtrack" then
print stack_trace
return true
else if command == "bt" or command == "backtrack" then
print stack_trace
return true
@@
-1423,10
+1418,8
@@
redef class AMethPropdef
curr_instances[i] = currFra.map[i]
end
end
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
var res = v.escapevalue
- v.escapevalue = null
return res
end
return null
return res
end
return null