Merge pull request #169 from JuliaDebug/teh/macro_return

Fix the return value of atsign-interpret (fixes #168)

Author: timholy

src/construct.jl

@@ -630,15 +630,15 @@ macro interpret(arg)
         return :(throw($e))
     end
     quote
-        theargs = $(esc(args))
-        frame = JuliaInterpreter.enter_call_expr(Expr(:call, theargs...))
+        local theargs = $(esc(args))
+        local frame = JuliaInterpreter.enter_call_expr(Expr(:call, theargs...))
         if frame === nothing
-            return eval(Expr(:call, map(QuoteNode, theargs)...))
-        end
-        if shouldbreak(frame, 1)
-            return frame, BreakpointRef(frame.framecode, 1)
+            eval(Expr(:call, map(QuoteNode, theargs)...))
+        elseif shouldbreak(frame, 1)
+            frame, BreakpointRef(frame.framecode, 1)
+        else
+            local ret = finish_and_return!(frame)
+            isa(ret, BreakpointRef) ? (frame, ret) : ret
         end
-        ret = finish_and_return!(frame)
-        isa(ret, BreakpointRef) ? (frame, ret) : ret
     end
 end

test/breakpoints.jl

@@ -81,6 +81,13 @@ end
     disable(bp)
     @test JuliaInterpreter.finish_stack!(frame) == loop_radius2(10)
 
+    # Return value with breakpoints
+    @breakpoint sum([1,2]) any(x->x>4, a)
+    val = @interpret sum([1,2,3])
+    @test val == 6
+    frame, bp = @interpret sum([1,2,5])
+    @test isa(frame, Frame) && isa(bp, JuliaInterpreter.BreakpointRef)
+
     # Next line with breakpoints
     function outer(x)
         inner(x)