Adding watch expressions and usability/robustness improvements.
This commit is contained in:
Bruce Hill
parent
257a611e75
commit
106ed244c8
104
ldt.lua
104
ldt.lua
@ -1013,14 +1013,21 @@ ldb = {
|
||||
for i, line in ipairs(err_msg_lines) do
|
||||
err_msg_lines[i] = (" "):rep(2) .. line
|
||||
end
|
||||
local height = math.min(#err_msg_lines, 7)
|
||||
local height = math.min(#err_msg_lines + 2, 7)
|
||||
pads.err = Pad("(E)rror Message", 0, 0, height, SCREEN_W, err_msg_lines, function(self, i)
|
||||
return Color("red bold")
|
||||
end)
|
||||
end
|
||||
local err_lines = { }
|
||||
local stack_sources = { }
|
||||
local stack_locations = { }
|
||||
local err_lines = { }
|
||||
local watch_exprs = setmetatable({ }, {
|
||||
__index = function(self, k)
|
||||
local t = { }
|
||||
self[k] = t
|
||||
return t
|
||||
end
|
||||
})
|
||||
do
|
||||
local stack_names = { }
|
||||
local max_filename, max_fn_name = 0, 0
|
||||
@ -1145,8 +1152,8 @@ ldb = {
|
||||
if pads.vars then
|
||||
pads.vars:erase()
|
||||
end
|
||||
if pads.values then
|
||||
pads.values:erase()
|
||||
if pads.data then
|
||||
pads.data:erase()
|
||||
end
|
||||
local callstack_min, _ = callstack_range()
|
||||
local var_names, values = { }, { }
|
||||
@ -1181,21 +1188,44 @@ ldb = {
|
||||
break
|
||||
end
|
||||
end
|
||||
local _list_0 = watch_exprs[stack_index]
|
||||
for _index_0 = 1, #_list_0 do
|
||||
local _continue_0 = false
|
||||
repeat
|
||||
local watch = _list_0[_index_0]
|
||||
if stack_env[watch.expr] ~= nil then
|
||||
_continue_0 = true
|
||||
break
|
||||
end
|
||||
table.insert(var_names, watch.expr)
|
||||
table.insert(values, watch.value)
|
||||
stack_env[watch.expr] = watch.value
|
||||
_continue_0 = true
|
||||
until true
|
||||
if not _continue_0 then
|
||||
break
|
||||
end
|
||||
end
|
||||
local var_y = pads.stack.y + pads.stack.height
|
||||
local var_x = 0
|
||||
local height = SCREEN_H - (pads.err.height + pads.stack.height)
|
||||
pads.vars = Pad("(V)ars", var_y, var_x, height, AUTO, var_names, function(self, i)
|
||||
if i == self.selected then
|
||||
return Color('reverse')
|
||||
elseif i <= num_locals then
|
||||
return Color()
|
||||
local color
|
||||
if i <= num_locals then
|
||||
color = Color()
|
||||
elseif i <= num_locals + info.nups - 1 then
|
||||
color = Color("blue")
|
||||
else
|
||||
return Color("black bold")
|
||||
color = Color("green")
|
||||
end
|
||||
if i == self.selected then
|
||||
color = color + C.A_REVERSE
|
||||
end
|
||||
return color
|
||||
end)
|
||||
pads.vars.keypress = function(self, key)
|
||||
if key == ('l'):byte() then
|
||||
return select_pad(pads.values)
|
||||
if key == ('l'):byte() or key == C.KEY_RIGHT then
|
||||
return select_pad(pads.data)
|
||||
else
|
||||
return Pad.keypress(self, key)
|
||||
end
|
||||
@ -1208,9 +1238,9 @@ ldb = {
|
||||
local value_w = SCREEN_W - (value_x)
|
||||
local value = stack_env[var_names[var_index]]
|
||||
local type_str = tostring(type(value))
|
||||
pads.values = DataViewer(value, "(D)ata [" .. tostring(type_str) .. "]", var_y, value_x, pads.vars.height, value_w)
|
||||
pads.values.keypress = function(self, key)
|
||||
if key == ('h'):byte() and self.selected == 1 then
|
||||
pads.data = DataViewer(value, "(D)ata [" .. tostring(type_str) .. "]", var_y, value_x, pads.vars.height, value_w)
|
||||
pads.data.keypress = function(self, key)
|
||||
if (key == ('h'):byte() or key == C.KEY_LEFT) and self.selected == 1 then
|
||||
return select_pad(pads.vars)
|
||||
else
|
||||
return DataViewer.keypress(self, key)
|
||||
@ -1252,11 +1282,13 @@ ldb = {
|
||||
if (':'):byte() == _exp_0 or ('>'):byte() == _exp_0 or ('?'):byte() == _exp_0 then
|
||||
C.echo(true)
|
||||
local print_nil = false
|
||||
local user_input
|
||||
local code = ''
|
||||
if c == ('?'):byte() then
|
||||
stdscr:mvaddstr(SCREEN_H - 1, 0, "? " .. (' '):rep(SCREEN_W - 1))
|
||||
stdscr:move(SCREEN_H - 1, 2)
|
||||
code = 'return ' .. stdscr:getstr()
|
||||
user_input = stdscr:getstr()
|
||||
code = 'return ' .. user_input
|
||||
print_nil = true
|
||||
elseif c == (':'):byte() or c == ('>'):byte() then
|
||||
local numlines = 1
|
||||
@ -1343,6 +1375,33 @@ ldb = {
|
||||
end
|
||||
stdscr:attrset(Color())
|
||||
stdscr:mvaddstr(y, x, (' '):rep(SCREEN_W - x))
|
||||
if c == ("?"):byte() and ret ~= nil then
|
||||
local replacing = false
|
||||
local watch_index = nil
|
||||
local watches = watch_exprs[pads.stack.selected]
|
||||
for i, w in ipairs(watches) do
|
||||
if w.expr == user_input then
|
||||
w.value = ret
|
||||
watch_index = i
|
||||
break
|
||||
end
|
||||
end
|
||||
if not (watch_index) then
|
||||
table.insert(watches, {
|
||||
expr = user_input,
|
||||
value = ret
|
||||
})
|
||||
watch_index = #watches
|
||||
end
|
||||
show_vars(pads.stack.selected)
|
||||
for i, s in ipairs(pads.vars.columns[1]) do
|
||||
if s == user_input then
|
||||
pads.vars:select(i)
|
||||
break
|
||||
end
|
||||
end
|
||||
select_pad(pads.data)
|
||||
end
|
||||
else
|
||||
local numlines = 0
|
||||
for nl in output:gmatch('\n') do
|
||||
@ -1388,9 +1447,22 @@ ldb = {
|
||||
elseif ('v'):byte() == _exp_0 then
|
||||
select_pad(pads.vars)
|
||||
elseif ('d'):byte() == _exp_0 then
|
||||
select_pad(pads.values)
|
||||
select_pad(pads.data)
|
||||
elseif ('e'):byte() == _exp_0 then
|
||||
select_pad(pads.err)
|
||||
elseif C.KEY_DC == _exp_0 or C.KEY_DL == _exp_0 or C.KEY_BACKSPACE == _exp_0 then
|
||||
if selected_pad == pads.vars then
|
||||
local watches = watch_exprs[pads.stack.selected]
|
||||
local expr = pads.vars.columns[1][pads.vars.selected]
|
||||
for i, w in ipairs(watches) do
|
||||
if w.expr == expr then
|
||||
table.remove(watches, i)
|
||||
show_vars(pads.stack.selected)
|
||||
select_pad(pads.vars)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
selected_pad:keypress(c)
|
||||
end
|
||||
|
||||
76
ldt.moon
76
ldt.moon
@ -6,6 +6,7 @@ AUTO = {} -- Singleton
|
||||
PARENT = {} -- Singleton
|
||||
|
||||
-- TODO: add support for stepping debugger
|
||||
-- TODO: add vim-style search functionality via "/"
|
||||
|
||||
_error = error
|
||||
_assert = assert
|
||||
@ -653,12 +654,18 @@ ldb = {
|
||||
err_msg_lines = wrap_text(err_msg, SCREEN_W - 4)
|
||||
for i,line in ipairs(err_msg_lines)
|
||||
err_msg_lines[i] = (" ")\rep(2)..line
|
||||
height = math.min(#err_msg_lines, 7)
|
||||
height = math.min(#err_msg_lines+2, 7)
|
||||
pads.err = Pad("(E)rror Message", 0,0,height,SCREEN_W, err_msg_lines, (i)=> Color("red bold"))
|
||||
|
||||
err_lines = {}
|
||||
stack_sources = {}
|
||||
stack_locations = {}
|
||||
err_lines = {}
|
||||
-- Map from stack index -> expr -> value
|
||||
watch_exprs = setmetatable({}, {__index:(k)=>
|
||||
t = {}
|
||||
self[k] = t
|
||||
return t
|
||||
})
|
||||
do -- Stack pad
|
||||
stack_names = {}
|
||||
max_filename, max_fn_name = 0, 0
|
||||
@ -742,8 +749,8 @@ ldb = {
|
||||
show_vars = (stack_index)->
|
||||
if pads.vars
|
||||
pads.vars\erase!
|
||||
if pads.values
|
||||
pads.values\erase!
|
||||
if pads.data
|
||||
pads.data\erase!
|
||||
callstack_min, _ = callstack_range!
|
||||
var_names, values = {}, {}
|
||||
stack_env = setmetatable({}, {__index:_G})
|
||||
@ -761,18 +768,26 @@ ldb = {
|
||||
table.insert(var_names, tostring(name))
|
||||
table.insert(values, value)
|
||||
stack_env[name] = value
|
||||
for watch in *watch_exprs[stack_index]
|
||||
continue if stack_env[watch.expr] != nil
|
||||
table.insert(var_names, watch.expr)
|
||||
table.insert(values, watch.value)
|
||||
stack_env[watch.expr] = watch.value
|
||||
|
||||
var_y = pads.stack.y + pads.stack.height
|
||||
var_x = 0
|
||||
--height = math.min(2+#var_names, SCREEN_H-pads.err.height-pads.stack.height)
|
||||
height = SCREEN_H-(pads.err.height+pads.stack.height)
|
||||
pads.vars = Pad "(V)ars", var_y,var_x,height,AUTO,var_names, (i)=>
|
||||
if i == @selected then Color('reverse')
|
||||
elseif i <= num_locals then Color()
|
||||
else Color("black bold")
|
||||
color = if i <= num_locals then Color()
|
||||
elseif i <= num_locals + info.nups - 1 then Color("blue")
|
||||
else Color("green")
|
||||
if i == @selected then color += C.A_REVERSE
|
||||
return color
|
||||
|
||||
pads.vars.keypress = (key)=>
|
||||
if key == ('l')\byte!
|
||||
select_pad(pads.values)
|
||||
if key == ('l')\byte! or key == C.KEY_RIGHT
|
||||
select_pad(pads.data)
|
||||
else Pad.keypress(self, key)
|
||||
|
||||
pads.vars.on_select = (var_index)=>
|
||||
@ -782,9 +797,9 @@ ldb = {
|
||||
value = stack_env[var_names[var_index]]--values[var_index]
|
||||
type_str = tostring(type(value))
|
||||
-- Show single value:
|
||||
pads.values = DataViewer value, "(D)ata [#{type_str}]", var_y,value_x,pads.vars.height,value_w
|
||||
pads.values.keypress = (key)=>
|
||||
if key == ('h')\byte! and @selected == 1
|
||||
pads.data = DataViewer value, "(D)ata [#{type_str}]", var_y,value_x,pads.vars.height,value_w
|
||||
pads.data.keypress = (key)=>
|
||||
if (key == ('h')\byte! or key == C.KEY_LEFT) and @selected == 1
|
||||
select_pad(pads.vars)
|
||||
else DataViewer.keypress(self, key)
|
||||
collectgarbage()
|
||||
@ -824,11 +839,13 @@ ldb = {
|
||||
when (':')\byte!, ('>')\byte!, ('?')\byte!
|
||||
C.echo(true)
|
||||
print_nil = false
|
||||
local user_input
|
||||
code = ''
|
||||
if c == ('?')\byte!
|
||||
stdscr\mvaddstr(SCREEN_H-1, 0, "? "..(' ')\rep(SCREEN_W-1))
|
||||
stdscr\move(SCREEN_H-1, 2)
|
||||
code = 'return '..stdscr\getstr!
|
||||
user_input = stdscr\getstr!
|
||||
code = 'return '..user_input
|
||||
print_nil = true
|
||||
elseif c == (':')\byte! or c == ('>')\byte!
|
||||
numlines = 1
|
||||
@ -889,6 +906,26 @@ ldb = {
|
||||
stdscr\mvaddstr(y, x, line)
|
||||
stdscr\attrset(Color!)
|
||||
stdscr\mvaddstr(y,x,(' ')\rep(SCREEN_W-x))
|
||||
|
||||
if c == ("?")\byte! and ret != nil
|
||||
replacing = false
|
||||
watch_index = nil
|
||||
watches = watch_exprs[pads.stack.selected]
|
||||
for i,w in ipairs watches
|
||||
if w.expr == user_input
|
||||
w.value = ret
|
||||
watch_index = i
|
||||
break
|
||||
unless watch_index
|
||||
table.insert watches, {expr:user_input, value:ret}
|
||||
watch_index = #watches
|
||||
show_vars(pads.stack.selected)
|
||||
--pads.vars\select(#pads.vars.columns[1] - #watches + watch_index)
|
||||
for i,s in ipairs(pads.vars.columns[1])
|
||||
if s == user_input
|
||||
pads.vars\select(i)
|
||||
break
|
||||
select_pad(pads.data)
|
||||
else
|
||||
numlines = 0
|
||||
for nl in output\gmatch('\n') do numlines += 1
|
||||
@ -935,11 +972,22 @@ ldb = {
|
||||
select_pad(pads.vars) -- (V)ars
|
||||
|
||||
when ('d')\byte!
|
||||
select_pad(pads.values) -- (D)ata
|
||||
select_pad(pads.data) -- (D)ata
|
||||
|
||||
when ('e')\byte!
|
||||
select_pad(pads.err) -- (E)rror
|
||||
|
||||
when C.KEY_DC, C.KEY_DL, C.KEY_BACKSPACE
|
||||
if selected_pad == pads.vars
|
||||
watches = watch_exprs[pads.stack.selected]
|
||||
expr = pads.vars.columns[1][pads.vars.selected]
|
||||
for i,w in ipairs watches
|
||||
if w.expr == expr
|
||||
table.remove(watches, i)
|
||||
show_vars(pads.stack.selected)
|
||||
select_pad(pads.vars)
|
||||
break
|
||||
|
||||
else
|
||||
selected_pad\keypress(c)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user