Fixed bug in __gc
This commit is contained in:
Bruce Hill
parent
b014887266
commit
3ad160a0a0
45
cursed.lua
45
cursed.lua
@ -21,7 +21,7 @@ callstack_range = function()
|
||||
for i = min, 999 do
|
||||
local info = debug.getinfo(i, 'f')
|
||||
if not info or info.func == guard then
|
||||
max = i - 3
|
||||
max = i - 0
|
||||
break
|
||||
end
|
||||
end
|
||||
@ -113,8 +113,8 @@ do
|
||||
return self._frame:refresh()
|
||||
end,
|
||||
__gc = function(self)
|
||||
self._frame:cancel()
|
||||
return self._pad:cancel()
|
||||
self._frame:close()
|
||||
return self._pad:close()
|
||||
end
|
||||
}
|
||||
_base_0.__index = _base_0
|
||||
@ -210,6 +210,7 @@ local line_tables = setmetatable({ }, {
|
||||
end
|
||||
})
|
||||
run_debugger = function(err_msg)
|
||||
log:write(err_msg .. "\n\n")
|
||||
stdscr = C.initscr()
|
||||
SCREEN_H, SCREEN_W = stdscr:getmaxyx()
|
||||
C.cbreak()
|
||||
@ -240,6 +241,19 @@ run_debugger = function(err_msg)
|
||||
highlight = COLORS.WHITE_BG,
|
||||
active = COLORS.YELLOW_BG
|
||||
}
|
||||
do
|
||||
stdscr:wbkgd(COLORS.RED_BG)
|
||||
stdscr:clear()
|
||||
stdscr:refresh()
|
||||
local lines = wrap_text("ERROR!\n \n " .. err_msg .. "\n \npress any key...", math.floor(SCREEN_W / 2))
|
||||
for i, line in ipairs(lines) do
|
||||
stdscr:mvaddstr(math.floor(SCREEN_H / 2 - #lines / 2) + i, math.floor((SCREEN_W - #line) / 2), line)
|
||||
end
|
||||
stdscr:refresh()
|
||||
C.doupdate()
|
||||
stdscr:getch()
|
||||
end
|
||||
stdscr:wbkgd(COLORS.REGULAR)
|
||||
stdscr:clear()
|
||||
stdscr:refresh()
|
||||
local pads = { }
|
||||
@ -257,9 +271,9 @@ run_debugger = function(err_msg)
|
||||
inactive_frame = COLORS.RED | C.A_DIM
|
||||
})
|
||||
end
|
||||
local stack_locations = { }
|
||||
do
|
||||
local stack_names = { }
|
||||
local stack_locations = { }
|
||||
local max_filename = 0
|
||||
local stack_min, stack_max = callstack_range()
|
||||
for i = stack_min, stack_max do
|
||||
@ -328,7 +342,7 @@ run_debugger = function(err_msg)
|
||||
end
|
||||
pads.src = Pad(pads.err.height, pads.stack.x + pads.stack.width, pads.stack.height, SCREEN_W - pads.stack.x - pads.stack.width - 0, src_lines, "(S)ource Code", {
|
||||
line_colors = setmetatable({
|
||||
[err_line] = COLORS.RED_BG
|
||||
[err_line or -1] = COLORS.RED_BG
|
||||
}, {
|
||||
__index = function(self, i)
|
||||
return (i % 2 == 0) and INVERTED or REGULAR
|
||||
@ -372,6 +386,8 @@ run_debugger = function(err_msg)
|
||||
else
|
||||
pads.values = Pad(var_y, value_x, pads.vars.height, value_w, values, "Values")
|
||||
end
|
||||
collectgarbage()
|
||||
return collectgarbage()
|
||||
end
|
||||
return pads.vars:select(1)
|
||||
end
|
||||
@ -423,9 +439,24 @@ run_debugger = function(err_msg)
|
||||
elseif ('o'):byte() == _exp_0 then
|
||||
local file = stack_locations[pads.stack.selected]
|
||||
local filename, line_no = file:match("([^:]*):(.*)")
|
||||
C.endwin()
|
||||
os.execute((os.getenv("EDITOR") or "nano") .. " +" .. line_no .. " " .. filename)
|
||||
stdscr = C.initscr()
|
||||
C.cbreak()
|
||||
C.echo(false)
|
||||
C.nl(false)
|
||||
C.curs_set(0)
|
||||
C.start_color()
|
||||
C.use_default_colors()
|
||||
stdscr:clear()
|
||||
stdscr:refresh()
|
||||
for _, pad in pairs(pads) do
|
||||
pad:refresh()
|
||||
end
|
||||
elseif ('q'):byte() == _exp_0 or ("Q"):byte() == _exp_0 then
|
||||
break
|
||||
pads = { }
|
||||
C.endwin()
|
||||
return
|
||||
end
|
||||
end
|
||||
return C.endwin()
|
||||
@ -433,6 +464,7 @@ end
|
||||
guard = function(fn, ...)
|
||||
local err_hand
|
||||
err_hand = function(err)
|
||||
log:write(err .. "\n\n\n")
|
||||
C.endwin()
|
||||
print("Caught an error:")
|
||||
print(debug.traceback(err, 2))
|
||||
@ -446,6 +478,7 @@ local breakpoint
|
||||
breakpoint = function()
|
||||
local err_hand
|
||||
err_hand = function(err)
|
||||
log:write(err .. "\n\n\n")
|
||||
C.endwin()
|
||||
print("Caught an error:")
|
||||
print(debug.traceback(err, 2))
|
||||
|
||||
45
cursed.moon
45
cursed.moon
@ -19,7 +19,7 @@ callstack_range = ->
|
||||
for i=min,999
|
||||
info = debug.getinfo(i, 'f')
|
||||
if not info or info.func == guard
|
||||
max = i-3
|
||||
max = i-0
|
||||
break
|
||||
return min, max
|
||||
|
||||
@ -131,8 +131,8 @@ class Pad
|
||||
@_frame\refresh!
|
||||
|
||||
__gc: =>
|
||||
@_frame\cancel!
|
||||
@_pad\cancel!
|
||||
@_frame\close!
|
||||
@_pad\close!
|
||||
|
||||
ok, to_lua = pcall -> require('moonscript.base').to_lua
|
||||
if not ok then to_lua = -> nil
|
||||
@ -154,6 +154,7 @@ line_tables = setmetatable({}, {__index:(filename)=>
|
||||
})
|
||||
|
||||
run_debugger = (err_msg)->
|
||||
log\write(err_msg.."\n\n")
|
||||
export stdscr, SCREEN_H, SCREEN_W
|
||||
stdscr = C.initscr!
|
||||
SCREEN_H, SCREEN_W = stdscr\getmaxyx!
|
||||
@ -184,6 +185,18 @@ run_debugger = (err_msg)->
|
||||
active: COLORS.YELLOW_BG,
|
||||
}
|
||||
|
||||
do -- Fullscreen flash
|
||||
stdscr\wbkgd(COLORS.RED_BG)
|
||||
stdscr\clear!
|
||||
stdscr\refresh!
|
||||
lines = wrap_text("ERROR!\n \n "..err_msg.."\n \npress any key...", math.floor(SCREEN_W/2))
|
||||
for i, line in ipairs(lines)
|
||||
stdscr\mvaddstr(math.floor(SCREEN_H/2 - #lines/2)+i, math.floor((SCREEN_W-#line)/2), line)
|
||||
stdscr\refresh!
|
||||
C.doupdate!
|
||||
stdscr\getch!
|
||||
|
||||
stdscr\wbkgd(COLORS.REGULAR)
|
||||
stdscr\clear!
|
||||
stdscr\refresh!
|
||||
|
||||
@ -198,9 +211,9 @@ run_debugger = (err_msg)->
|
||||
inactive_frame: COLORS.RED | C.A_DIM
|
||||
})
|
||||
|
||||
stack_locations = {}
|
||||
do -- Stack pad
|
||||
stack_names = {}
|
||||
stack_locations = {}
|
||||
max_filename = 0
|
||||
stack_min, stack_max = callstack_range!
|
||||
for i=stack_min,stack_max
|
||||
@ -252,7 +265,7 @@ run_debugger = (err_msg)->
|
||||
pads.src\erase!
|
||||
pads.src = Pad(pads.err.height,pads.stack.x+pads.stack.width,
|
||||
pads.stack.height,SCREEN_W-pads.stack.x-pads.stack.width-0, src_lines, "(S)ource Code", {
|
||||
line_colors:setmetatable({[err_line]:COLORS.RED_BG}, {__index:(i)=> (i % 2 == 0) and INVERTED or REGULAR})
|
||||
line_colors:setmetatable({[err_line or -1]:COLORS.RED_BG}, {__index:(i)=> (i % 2 == 0) and INVERTED or REGULAR})
|
||||
})
|
||||
pads.src\select(err_line)
|
||||
|
||||
@ -286,6 +299,8 @@ run_debugger = (err_msg)->
|
||||
pads.values = Pad(var_y,value_x,pads.vars.height,value_w,wrap_text(values[var_index], value_w-2), "Values")
|
||||
else
|
||||
pads.values = Pad(var_y,value_x,pads.vars.height,value_w,values, "Values")
|
||||
collectgarbage()
|
||||
collectgarbage()
|
||||
|
||||
pads.vars\select(1)
|
||||
|
||||
@ -344,19 +359,30 @@ run_debugger = (err_msg)->
|
||||
file = stack_locations[pads.stack.selected]
|
||||
filename,line_no = file\match("([^:]*):(.*)")
|
||||
-- Launch system editor and then redraw everything
|
||||
--C.endwin!
|
||||
-- Uh.... this is only mildly broken.
|
||||
C.endwin!
|
||||
os.execute((os.getenv("EDITOR") or "nano").." +"..line_no.." "..filename)
|
||||
--return main_loop(err_msg,pads.stack.selected,var_index)
|
||||
stdscr = C.initscr!
|
||||
C.cbreak!
|
||||
C.echo(false)
|
||||
C.nl(false)
|
||||
C.curs_set(0)
|
||||
C.start_color!
|
||||
C.use_default_colors!
|
||||
stdscr\clear!
|
||||
stdscr\refresh!
|
||||
for _,pad in pairs(pads) do pad\refresh!
|
||||
|
||||
when ('q')\byte!, ("Q")\byte!
|
||||
break
|
||||
pads = {}
|
||||
C.endwin!
|
||||
return
|
||||
|
||||
C.endwin!
|
||||
|
||||
|
||||
guard = (fn, ...)->
|
||||
err_hand = (err)->
|
||||
log\write(err.."\n\n\n")
|
||||
C.endwin!
|
||||
print "Caught an error:"
|
||||
print(debug.traceback(err, 2))
|
||||
@ -366,6 +392,7 @@ guard = (fn, ...)->
|
||||
|
||||
breakpoint = ->
|
||||
err_hand = (err)->
|
||||
log\write(err.."\n\n\n")
|
||||
C.endwin!
|
||||
print "Caught an error:"
|
||||
print(debug.traceback(err, 2))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user