diff --git a/Project.toml b/Project.toml index aaf8aee..b269d45 100644 --- a/Project.toml +++ b/Project.toml @@ -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] diff --git a/src/Debugger.jl b/src/Debugger.jl index 428b330..9cb0ee4 100644 --- a/src/Debugger.jl +++ b/src/Debugger.jl @@ -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, diff --git a/src/printing.jl b/src/printing.jl index 8c3a5c8..17365d7 100644 --- a/src/printing.jl +++ b/src/printing.jl @@ -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 @@ -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] @@ -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 diff --git a/test/misc.jl b/test/misc.jl index fe201ee..be62658 100644 --- a/test/misc.jl +++ b/test/misc.jl @@ -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) diff --git a/test/runtests.jl b/test/runtests.jl index bf4484a..70a7951 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -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