fix evals when the value is a symbols (#128)

* fix evals when the value is a symbols

* Update test/evaling.jl

Co-Authored-By: KristofferC <[email protected]>

* add a test for watches

Author: KristofferC

src/Debugger.jl

@@ -69,6 +69,8 @@ end
 
 @deprecate break_on_error(v::Bool) (v ? break_on(:error) : break_off(:error))
 
+maybe_quote(x) = (isa(x, Expr) || isa(x, Symbol)) ? QuoteNode(x) : x
+
 include("locationinfo.jl")
 include("repl.jl")
 include("commands.jl")

src/printing.jl

@@ -53,7 +53,6 @@ function pattern_match_kw_call(expr)
 end
 
 function print_next_expr(io::IO, frame::Frame)
-    maybe_quote(x) = (isa(x, Expr) || isa(x, Symbol)) ? QuoteNode(x) : x
     expr = pc_expr(frame)
     @assert expr !== nothing
     print(io, "About to run: ")
@@ -96,7 +95,7 @@ function breakpoint_linenumbers(frame::Frame; lowered=false)
         isassigned(framecode.breakpoints, stmtidx) || continue
         bp = framecode.breakpoints[stmtidx]
         line = lowered ? stmtidx : JuliaInterpreter.linenumber(frame, stmtidx)
-        breakpoint_lines[line] = bp 
+        breakpoint_lines[line] = bp
     end
     return breakpoint_lines
 end

src/repl.jl

@@ -179,7 +179,7 @@ function eval_code(frame::Frame, command::AbstractString)
     vars = filter(v -> v.name != Symbol(""), JuliaInterpreter.locals(frame))
     res = gensym()
     eval_expr = Expr(:let,
-        Expr(:block, map(x->Expr(:(=), x...), [(v.name, v.value) for v in vars])...),
+        Expr(:block, map(x->Expr(:(=), x...), [(v.name, maybe_quote(v.value)) for v in vars])...),
         Expr(:block,
             Expr(:(=), res, expr),
             Expr(:tuple, res, Expr(:tuple, [v.name for v in vars]...))

src/watch.jl

@@ -16,7 +16,7 @@ function show_watch_list(io, state::DebuggerState)
     for (i, expr) in enumerate(state.watch_list)
         vars = filter(v -> v.name != Symbol(""), JuliaInterpreter.locals(frame))
         eval_expr = Expr(:let,
-            Expr(:block, map(x->Expr(:(=), x...), [(v.name, v.value) for v in vars])...),
+            Expr(:block, map(x->Expr(:(=), x...), [(v.name, maybe_quote(v.value)) for v in vars])...),
             expr)
         errored = false
         res = try

test/evaling.jl

@@ -33,3 +33,16 @@ evalkw(x; bar=true) = x
 frame = @make_frame evalkw(2)
 res = eval_code(frame, "x")
 @test res == 2
+
+# Evaling with symbols
+evalsym() = (x = :foo)
+frame = @make_frame evalsym()
+res = eval_code(frame, "x")
+@test res == :foo
+
+frame = Debugger.@make_frame evalsym()
+state = dummy_state(frame)
+Debugger.add_watch_entry!(state, "x")
+watch_str = sprint(Debugger.show_watch_list, state)
+@test occursin("1] x: :foo", watch_str)
+Debugger.clear_watch_list!(state)