Skip to content

Commit 608aea9

Browse files
authored
Merge pull request #145 from JuliaDebug/kc/whereis
fix typo in whereis
2 parents dd876a0 + bcda7c1 commit 608aea9

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

src/utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ function CodeTracking.whereis(framecode::FrameCode, pc)
168168
codeloc == 0 && return nothing
169169
lineinfo = framecode.src.linetable[codeloc]
170170
return isa(framecode.scope, Method) ?
171-
whereis(lineinfo, framecode.scope) : getfile(lineinfo), getline(lineinfo)
171+
whereis(lineinfo, framecode.scope) : (getfile(lineinfo), getline(lineinfo))
172172
end
173173
CodeTracking.whereis(frame::Frame, pc=frame.pc) = whereis(frame.framecode, pc)
174174

test/interpret.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,3 +384,10 @@ end
384384
x = Union{Array{UInt8,N},Array{Int8,N}} where N
385385
@test isa(JuliaInterpreter.prepare_call(varargidentity, [varargidentity, x])[1], JuliaInterpreter.FrameCode)
386386
end
387+
388+
# Test return value of whereis
389+
f() = nothing
390+
fr = JuliaInterpreter.enter_call(f)
391+
file, line = JuliaInterpreter.whereis(fr)
392+
@test file == @__FILE__
393+
@test line == (@__LINE__() - 4)

test/toplevel.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ end
5555
module Toplevel end
5656

5757
@testset "toplevel" begin
58-
modexs, _ = JuliaInterpreter.split_expressions(Toplevel, read_and_parse("toplevel_script.jl"))
58+
modexs, _ = JuliaInterpreter.split_expressions(Toplevel, read_and_parse(joinpath(@__DIR__, "toplevel_script.jl")))
5959
for modex in modexs
6060
frame = JuliaInterpreter.prepare_thunk(modex)
6161
while true

0 commit comments

Comments
 (0)