jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fix: Switch state to dbgSkipCurrent for Eval, Local & Global commands.

Browse source 
This avoids stepping into the endb code if previous command was single step.

Other two changes are trailing spaces removed.
This commit is contained in:
JamesP 2015-09-03 09:21:25 +10:00
commit a3cc519ea9
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/system/endb.nim
View file

@ -396,7 +396,13 @@ proc commandPrompt() =
again = false again = false
quit(1) # BUGFIX: quit with error code > 0 quit(1) # BUGFIX: quit with error code > 0
elif ?"e" or ?"eval": elif ?"e" or ?"eval":
var
prevState = dbgState
prevSkipFrame = dbgSkipToFrame
dbgState = dbSkipCurrent
dbgEvaluate(stdout, dbgUser.data, i, dbgFramePtr) dbgEvaluate(stdout, dbgUser.data, i, dbgFramePtr)
dbgState = prevState
dbgSkipToFrame = prevSkipFrame
elif ?"o" or ?"out": elif ?"o" or ?"out":
dbgOut(dbgUser.data, i, dbgFramePtr) dbgOut(dbgUser.data, i, dbgFramePtr)
elif ?"stackframe": elif ?"stackframe":
@ -404,9 +410,21 @@ proc commandPrompt() =
elif ?"w" or ?"where": elif ?"w" or ?"where":
dbgShowExecutionPoint() dbgShowExecutionPoint()
elif ?"l" or ?"locals": elif ?"l" or ?"locals":
var
prevState = dbgState
prevSkipFrame = dbgSkipToFrame
dbgState = dbSkipCurrent
listLocals(stdout, dbgFramePtr) listLocals(stdout, dbgFramePtr)
dbgState = prevState
dbgSkipToFrame = prevSkipFrame
elif ?"g" or ?"globals": elif ?"g" or ?"globals":
var
prevState = dbgState
prevSkipFrame = dbgSkipToFrame
dbgState = dbSkipCurrent
listGlobals(stdout) listGlobals(stdout)
dbgState = prevState
dbgSkipToFrame = prevSkipFrame
elif ?"u" or ?"up": elif ?"u" or ?"up":
if dbgDown <= 0: if dbgDown <= 0:
debugOut("[Warning] cannot go up any further ") debugOut("[Warning] cannot go up any further ")