Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
CodeTracking = "0.5.7, 1"
Crayons = "4.1"
Highlights = "0.4.3, 0.5"
JuliaInterpreter = "0.9"
JuliaInterpreter = "0.9.46"
julia = "1.6"

[extras]
Expand Down
2 changes: 1 addition & 1 deletion src/Debugger.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ using REPL.LineEdit
using REPL.REPLCompletions

using CodeTracking
using JuliaInterpreter: JuliaInterpreter, Frame, @lookup, FrameCode, BreakpointRef, debug_command, leaf, root, BreakpointState,
using JuliaInterpreter: JuliaInterpreter, Frame, lookup, FrameCode, BreakpointRef, debug_command, leaf, root, BreakpointState,
finish_and_return!, Compiled

using JuliaInterpreter: pc_expr, moduleof, linenumber, extract_args, locals,
Expand Down
6 changes: 3 additions & 3 deletions src/printing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function pattern_match_apply_call(expr, frame)
if !(isexpr(expr, :call) && expr.args[1] == Core._apply)
return expr
end
args = [@lookup(frame, expr.args[i+2]) for i in 1:(length(expr.args)-2)]
args = Any[lookup(frame, expr.args[i+2]) for i in 1:(length(expr.args)-2)]
new_expr = Expr(:call, expr.args[2])
argsflat = append_any(args...)
for x in argsflat
Expand Down Expand Up @@ -105,7 +105,7 @@ function print_next_expr(io::IO, frame::Frame)
if isexpr(expr, :call) || isexpr(expr, :return)
for i in 1:length(expr.args)
val = try
@lookup(frame, expr.args[i])
lookup(frame, expr.args[i])
catch err
err isa UndefVarError || rethrow(err)
expr.args[i]
Expand All @@ -116,7 +116,7 @@ function print_next_expr(io::IO, frame::Frame)
if isdefined(Core, :ReturnNode)
if expr isa Core.ReturnNode
val = try
@lookup(frame, expr.val)
lookup(frame, expr.val)
catch err
err isa UndefVarError || rethrow(err)
expr.val
Expand Down
3 changes: 2 additions & 1 deletion test/misc.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Issue #14

using Debugger: _iscall
using JuliaInterpreter: JuliaInterpreter, pc_expr, evaluate_call!, finish_and_return!, @lookup, enter_call_expr, breakpoints
using JuliaInterpreter
using JuliaInterpreter: pc_expr, evaluate_call!, finish_and_return!, enter_call_expr
runframe(frame::Frame, pc=frame.pc[]) = Some{Any}(finish_and_return!(Compiled(), frame))

frame = @make_frame map(x->2x, 1:10)
Expand Down
3 changes: 2 additions & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Debugger: Debugger, @enter, execute_command, RunDebugger, @make_frame
import JuliaInterpreter: JuliaInterpreter, Frame, @lookup, Compiled, pc_expr
using JuliaInterpreter
import JuliaInterpreter: pc_expr
import CodeTracking
using InteractiveUtils

Expand Down
Loading