Merge pull request #145 from JuliaDebug/kc/whereis

fix typo in whereis
JuliaDebug · Mar 14, 2019 · 608aea9 · 608aea9
2 parents dd876a0 + bcda7c1
commit 608aea9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/utils.jl b/src/utils.jl
@@ -168,7 +168,7 @@ function CodeTracking.whereis(framecode::FrameCode, pc)
     codeloc == 0 && return nothing
     lineinfo = framecode.src.linetable[codeloc]
     return isa(framecode.scope, Method) ?
-        whereis(lineinfo, framecode.scope) : getfile(lineinfo), getline(lineinfo)
+        whereis(lineinfo, framecode.scope) : (getfile(lineinfo), getline(lineinfo))
 end
 CodeTracking.whereis(frame::Frame, pc=frame.pc) = whereis(frame.framecode, pc)
 

diff --git a/test/interpret.jl b/test/interpret.jl
@@ -384,3 +384,10 @@ end
     x = Union{Array{UInt8,N},Array{Int8,N}} where N
     @test isa(JuliaInterpreter.prepare_call(varargidentity, [varargidentity, x])[1], JuliaInterpreter.FrameCode)
 end
+
+# Test return value of whereis
+f() = nothing
+fr = JuliaInterpreter.enter_call(f)
+file, line = JuliaInterpreter.whereis(fr)
+@test file == @__FILE__
+@test line == (@__LINE__() - 4)
diff --git a/test/toplevel.jl b/test/toplevel.jl
@@ -55,7 +55,7 @@ end
 module Toplevel end
 
 @testset "toplevel" begin
-    modexs, _ = JuliaInterpreter.split_expressions(Toplevel, read_and_parse("toplevel_script.jl"))
+    modexs, _ = JuliaInterpreter.split_expressions(Toplevel, read_and_parse(joinpath(@__DIR__, "toplevel_script.jl")))
     for modex in modexs
         frame = JuliaInterpreter.prepare_thunk(modex)
         while true