Remove dead code, increase code coverage (#86)

* fix printing to the correct io

* remove dead code

* more code coverage

Author: KristofferC

src/LineNumbers.jl

@@ -7,7 +7,6 @@ struct SourceFile
     data::Vector{UInt8}
     offsets::Vector{UInt64}
 end
-Base.length(file::SourceFile) = length(file.offsets)
 
 function SourceFile(data::AbstractString)
     offsets = UInt64[0]
@@ -28,53 +27,6 @@ function compute_line(file::SourceFile, offset::Integer)
     ind <= length(file.offsets) && file.offsets[ind] == offset ? ind : ind - 1
 end
 
-function Base.getindex(file::SourceFile, line::Int)
-    if line == length(file.offsets)
-        return file.data[(file.offsets[end]+1):end]
-    else
-        # - 1 to skip the '\n'
-        return file.data[(file.offsets[line]+1):(file.offsets[line+1]-1)]
-    end
-end
-Base.getindex(file::SourceFile, arr::AbstractArray) = [file[x] for x in arr]
 
-# LineBreaking
-
-"""
-Indexing adaptor to map from a flat byte offset to a `[line][offset]` pair.
-Optionally, off may specify a byte offset relative to which the line number and
-offset should be computed
-"""
-struct LineBreaking{T}
-    off::UInt64
-    file::SourceFile
-    obj::T
-end
-
-function indtransform(lb::LineBreaking, x::Int)
-    offline = compute_line(lb.file, lb.off)
-    line = compute_line(lb.file, x)
-    lineoffset = lb.file.offsets[line]
-    off = x - lineoffset + 1
-    if lineoffset < lb.off
-        off -= lb.off - lineoffset
-    end
-    (line - offline + 1), off
-end
-
-function Base.getindex(lb::LineBreaking, x::Int)
-    l, o = indtransform(lb, x)
-    lb.obj[l][o]
-end
-
-function Base.setindex!(lb::LineBreaking, y, x::Int)
-    l, o = indtransform(lb, x)
-    lb.obj[l][o] = y
-end
-function Base.setindex!(lb::LineBreaking, y, x::AbstractArray)
-    for i in x
-        lb[i] = y
-    end
-end
 
 end # module

src/commands.jl

@@ -18,11 +18,17 @@ function show_breakpoint(io::IO, bp::BreakpointRef)
     else
         print(outbuf, "Breaking on error: ")
     end
+    code = bp.framecode
+    if code.scope isa Method
+        scope_str = sprint(locdesc, code)
+    else
+        scope_str = repr(code.scope)
+    end
     if checkbounds(Bool, bp.framecode.breakpoints, bp.stmtidx)
         lineno = linenumber(bp.framecode, bp.stmtidx)
-        print(outbuf, bp.framecode.scope, ", line ", lineno)
+        print(outbuf, scope_str, ", line ", lineno)
     else
-        print(outbuf, bp.framecode.scope, ", %", bp.stmtidx)
+        print(outbuf, scope_str, ", %", bp.stmtidx)
     end
     if bp.err !== nothing
         print(outbuf, ", ", bp.err)

src/locationinfo.jl

@@ -52,22 +52,26 @@ const _print_full_path = Ref(true)
 function locdesc(frame::Frame)
     sprint() do io
         if frame.framecode.scope isa Method
-            meth = frame.framecode.scope
-            argnames = frame.framecode.src.slotnames[2:meth.nargs]
-            spectypes = Any[Any for i=1:length(argnames)]
-            print(io, meth.name,'(')
-            first = true
-            for (argname, argT) in zip(argnames, spectypes)
-                first || print(io, ", ")
-                first = false
-                print(io, argname)
-                !(argT === Any) && print(io, "::", argT)
-            end
-            path = _print_full_path[] ? meth.file : string(basename(String(meth.file)), ":", meth.line)
-            path = CodeTracking.replace_buildbot_stdlibpath(String(path))
-            print(io, ") at ", path)
+            locdesc(io, frame.framecode)
         else
-            println("not yet implemented")
+            println(io, "not yet implemented")
         end
     end
 end
+
+function locdesc(io, framecode::FrameCode)
+    meth = framecode.scope
+    argnames = framecode.src.slotnames[2:meth.nargs]
+    spectypes = Any[Any for i=1:length(argnames)]
+    print(io, meth.name,'(')
+    first = true
+    for (argname, argT) in zip(argnames, spectypes)
+        first || print(io, ", ")
+        first = false
+        print(io, argname)
+        !(argT === Any) && print(io, "::", argT)
+    end
+    path = _print_full_path[] ? meth.file : string(basename(String(meth.file)), ":", meth.line)
+    path = CodeTracking.replace_buildbot_stdlibpath(String(path))
+    print(io, ") at ", path)
+end

src/printing.jl

@@ -5,7 +5,7 @@ end
 Base.show(io::IO, x::Suppressed) = print(io, "<suppressed ", x.item, '>')
 
 function print_var(io::IO, var::JuliaInterpreter.Variable)
-    print("  | ")
+    print(io, "  | ")
     T = typeof(var.value)
     local val
     try

test/ui.jl

@@ -9,6 +9,7 @@ function my_gcd(a::T, b::T) where T<:Union{Int8,UInt8,Int16,UInt16,Int32,UInt32,
     k = min(za, zb)
     u = unsigned(abs(a >> za))
     v = unsigned(abs(b >> zb))
+    Debugger.@bp
     while u != v
         if u > v
             u, v = v, u
@@ -66,7 +67,8 @@ end
         UP_ARROW = "\e[A"
 
         run_terminal_test(@make_frame(my_gcd(10, 20)),
-                          ["n\n","`", "a\n", UP_ARROW, UP_ARROW, CTRL_C, EOT],
+                          ["n\n","`", "my_gc\t\n", "a\n", UP_ARROW, UP_ARROW, UP_ARROW, CTRL_C, 
+                           "bt\n", "st\n", "c\n", "c\n"],
                           "ui/history_gcd.multiout")
 
         if v"1.1">= VERSION < v"1.2"