Cleanup

Author: Keno

src/DebuggerFramework.jl

@@ -1,8 +1,8 @@
 __precompile__()
 module DebuggerFramework
     using TerminalUI
-    
-    abstract StackFrame
+
+    abstract type StackFrame end
 
     function print_var(io::IO, name, val::Nullable, undef_callback)
         print("  | ")
@@ -28,13 +28,13 @@ module DebuggerFramework
         print_locdesc(io, frame)
         print_locals(io, frame)
     end
-    
+
     function print_backtrace(state)
         for (num, frame) in enumerate(state.stack)
             print_frame(state, Base.pipe_writer(state.terminal), num, frame)
         end
     end
-        
+
     print_backtrace(state, _::Void) = nothing
 
     function execute_command(state, frame, ::Val{:bt}, cmd)
@@ -67,14 +67,14 @@ module DebuggerFramework
     """
     function debug
     end
-    
-    type DebuggerState
+
+    mutable struct DebuggerState
         stack
         level
         main_mode
         terminal
     end
-    
+
     function print_status_synthtic(io, state, frame, lines_before, total_lines)
         return 0
     end
@@ -104,8 +104,8 @@ module DebuggerFramework
         end
         print(io, String(take!(outbuf)))
     end
-    
-    immutable AbstractDiagnostic; end
+
+    struct AbstractDiagnostic; end
 
     function execute_command
     end

test/brainstack.jl

@@ -15,10 +15,10 @@ reload("DebuggerFramework")
 
 module BrainStack
     using DebuggerFramework
-    immutable BrainStackAST
+    struct BrainStackAST
         stmts::Vector{Vector{Int}}
     end
-  
+
     function Base.parse(::Type{BrainStackAST}, data)
         BrainStackAST(map(enumerate(split(data, '\n', keep=false))) do args
             lineno, line = args
@@ -27,15 +27,15 @@ module BrainStack
             map(x->parse(Int,x), parts[2:end])
         end)
     end
-  
-    type BrainStackInterpreterState
+
+    mutable struct BrainStackInterpreterState
         ast::BrainStackAST
         stack::Vector{Tuple{Int, Int}}
         idx::Int
         pos::Int
         ncalls::Int
     end
-  
+
     # Helpfully split up the interpreter to be re-usable from the debugger below
     enter(ast::BrainStackAST) = BrainStackInterpreterState(ast, [(0,0)], 1, 1, 0)
     function step_one!(state::BrainStackInterpreterState)
@@ -58,20 +58,20 @@ module BrainStack
         while step_one!(state); end
         state.ncalls
     end
-  
-  
+
+
     # Debugger support
-    immutable BrainStackStackRef <: DebuggerFramework.StackFrame
+    struct BrainStackStackRef <: DebuggerFramework.StackFrame
         state::BrainStackInterpreterState
         idx::Int
     end
-  
+
     function DebuggerFramework.debug(ast::BrainStackAST, args...)
         state = enter(ast)
         stack = [BrainStackStackRef(state, 0)]
         DebuggerFramework.RunDebugger(stack, args...)
     end
-    
+
     function idxpos(frame)
         if frame.idx == 0
             idx, pos = frame.state.idx, frame.state.pos
@@ -80,7 +80,7 @@ module BrainStack
         end
         idx, pos
     end
-    
+
     function DebuggerFramework.print_status_synthtic(io::IO, state, frame::BrainStackStackRef, lines_before, total_lines)
         ast = frame.state.ast
         idx, pos = idxpos(frame)
@@ -93,17 +93,18 @@ module BrainStack
             end
             (opno != length(ast.stmts[idx])) && print(io, ' ')
        end
+       return 1
     end
-    
+
     DebuggerFramework.locdesc(frame::BrainStackStackRef) = "statement $(idxpos(frame)[1])"
-    
+
     function update_stack!(ds, state, stack)
         ds.stack = [BrainStackStackRef(state, i) for i = 0:length(stack)-1]
         if ds.level > length(ds.stack)
             ds.level = length(ds.stack)
         end
     end
-    
+
     function DebuggerFramework.execute_command(state, frame::BrainStackStackRef, cmd::Val{:si}, command)
         step_one!(frame.state)
         update_stack!(state, frame.state, frame.state.stack)

test/llvmir.jl

@@ -15,7 +15,7 @@ module LLVMIRDebugger
   #include "llvm/IRReader/IRReader.h"
   #include "llvm/Support/MemoryBuffer.h"
   #include "llvm/IR/ModuleSlotTracker.h"
-  
+
   // This is a private LLVM header at the moment
   #include "lib/ExecutionEngine/Interpreter/Interpreter.h"
 
@@ -55,7 +55,7 @@ module LLVMIRDebugger
   function Base.parse(::Type{pcpp"llvm::Module"}, data)
       mod = icxx"""
       llvm::SMDiagnostic Err;
-      auto mod = 
+      auto mod =
         llvm::parseIR($(convert(vcpp"llvm::MemoryBufferRef", data)),
                       Err, jl_LLVMContext);
       if (!mod) {
@@ -145,12 +145,12 @@ module LLVMIRDebugger
       BB = icxx"$(frame.state.Interp)->ECStack[$(frame.idx)].CurBB;"
       "function $(getName(F)), BB $(getName(BB))"
   end
-  
+
   immutable AggregateValue
       values::Vector{Any}
   end
   Base.print(io::IO, val::AggregateValue) = print(io, val.values)
-  
+
   function fromGenericValue(typ::pcpp"llvm::Type", val::vcpp"llvm::GenericValue")
       if icxx"$typ->isVoidTy();"
           return nothing
@@ -164,7 +164,7 @@ module LLVMIRDebugger
       elseif icxx"$typ->isPointerTy();"
           return icxx"$val.PointerVal;"
       elseif icxx"$typ->isAggregateType();"
-          return AggregateValue(Any[fromGenericValue(x...) for x in 
+          return AggregateValue(Any[fromGenericValue(x...) for x in
             zip(icxx"$typ->subtypes();", icxx"$val.AggregateVal;")])
       elseif icxx"$typ->isIntegerTy();"
           # Good enough for now
@@ -173,7 +173,7 @@ module LLVMIRDebugger
           error("Unsupported type")
       end
   end
-  
+
   function DebuggerFramework.print_locals(io::IO, frame::LLVMIRFrame)
       MST = icxx"new llvm::ModuleSlotTracker{$(frame.state.M), true};"
       icxx"$MST->incorporateFunction(*$(CurFunction(frame)));"
@@ -187,15 +187,15 @@ module LLVMIRDebugger
       end
       icxx"delete $MST;"
   end
-  
+
   function update_stack!(ds, state)
       stacksize = Int(icxx"$(state.Interp)->ECStack.size();"-1)
       ds.stack = [LLVMIRFrame(state, i) for i = stacksize:-1:0]
       if ds.level > length(ds.stack)
           ds.level = length(ds.stack)
       end
   end
-    
+
   function DebuggerFramework.execute_command(state, frame::LLVMIRFrame, cmd::Val{:si}, command)
       step_one!(frame.state)
       update_stack!(state, frame.state)

test/runtests.jl

@@ -1,5 +1,4 @@
 using DebuggerFramework
 using Base.Test
 
-# write your own tests here
-@test 1 == 2
+include("brainstack.jl")