Merge pull request #29 from pfitzseb/sp/betterlinenumbers

slightly better line numbers
JuliaLang · Feb 15, 2019 · 0c9a08a · 0c9a08a
2 parents e2f5344 + db01ee8
commit 0c9a08a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/interpret.jl b/src/interpret.jl
@@ -566,8 +566,10 @@ isgotonode(node) = isa(node, GotoNode) || isexpr(node, :gotoifnot)
 
 location(frame) = location(frame, frame.pc[])
 function location(frame, pc)
-    ln = frame.code.code.codelocs[pc.next_stmt]
-    return frame.code.scope isa Method ? ln + frame.code.scope.line - 1 : ln
+    codeloc = frame.code.code.codelocs[pc.next_stmt]
+    return frame.code.scope isa Method ?
+        frame.code.code.linetable[codeloc].line :
+        codeloc
 end
 function next_line!(stack, frame, dbstack = nothing)
     initial = location(frame)

diff --git a/test/interpret.jl b/test/interpret.jl
@@ -196,3 +196,18 @@ JuliaInterpreter.finish_and_return!(JuliaStackFrame[], frame, true)
 val = @interpret(BigInt())
 @test isa(val, BigInt) && val == 0
 @test isa(@interpret(Base.GMP.version()), VersionNumber)
+
+# "correct" line numbers
+defline = @__LINE__() + 1
+function f(x)
+    x = 2x
+    # comment
+    # comment
+    x = 2x
+    # comment
+    return x*x
+end
+frame = JuliaInterpreter.enter_call(f, 3)
+@test JuliaInterpreter.location(frame, JuliaInterpreter.JuliaProgramCounter(1)) == defline + 1
+@test JuliaInterpreter.location(frame, JuliaInterpreter.JuliaProgramCounter(3)) == defline + 4
+@test JuliaInterpreter.location(frame, JuliaInterpreter.JuliaProgramCounter(5)) == defline + 6