Merge pull request #56 from tkf/do

Support do blocks

Author: timholy

src/debug.jl

@@ -354,6 +354,12 @@ function prepare_caller_capture!(io)  # for testing, needs to work on a normal I
         callexpr = callexpr.args[1]
     elseif callexpr.head == :...
         callexpr = callexpr.args[1]
+    elseif callexpr.head == :do
+        callexpr = Expr(
+            :call,
+            callexpr.args[1].args[1],         # function name
+            callexpr.args[2],                 # do block (anonymous function)
+            callexpr.args[1].args[2:end]...)  # other arguments
     end
     # Must be a call or broadcast
     ((callexpr.head == :call) | (callexpr.head == :.)) || throw(Meta.ParseError("point must be at a call expression, got $callexpr"))

test/runtests.jl

@@ -289,6 +289,30 @@ Base.show(io::IO, ::ErrorsOnShow) = throw(ArgumentError("no show"))
             end"""
             @test Rebugger.getstored(string(uuid)) == (max, ([1,5], [2,-3]), typeof(max))
             Core.eval(Main, Meta.parse(cmd)) == [2,5]
+
+            # Step in to a do block
+            str = "RebuggerTesting.calldo()"
+            uuidref, cmd = run_stepin(str, str)
+            uuid1 = uuidextractor(cmd)
+            @test uuid1 == uuidref
+            @test cmd == """
+            @eval Main.RebuggerTesting let () = Main.Rebugger.getstored("$uuid1")
+            begin
+                apply(2, 3, 4) do x, y, z
+                    snoop3(x, y, z)
+                end
+            end
+            end"""
+            uuidref, cmd = run_stepin(cmd, "apply")
+            uuid1 = uuidextractor(cmd)
+            @test uuid1 == uuidref
+            @test cmd == """
+            @eval Main.RebuggerTesting let (f, args) = Main.Rebugger.getstored("$uuid1")
+            begin
+                kwvarargs(f)
+                f(args...)
+            end
+            end"""
         end
 
         @testset "Capture stacktrace" begin

test/testmodule.jl

@@ -27,6 +27,15 @@ const hv_test = HasValue(11.1)
 @noinline kwfuncmiddle(x::T, y::Integer=1; kw1="hello", kwargs...) where T = kwfuncerr(y)
 @inline kwfunctop(x; kwargs...) = kwfuncmiddle(x, 2; kwargs...)
 
+function apply(f, args...)
+    kwvarargs(f)
+    f(args...)
+end
+
+calldo() = apply(2, 3, 4) do x, y, z
+    snoop3(x, y, z)
+end
+
 end
 
 module RBT2