RFC: updates for changes to Julia

src/AST.jl

@@ -4,7 +4,6 @@
 # Extensions to the julia AST format shared by decorate, instrument, and graft
 
 module AST
-using Base
 import Base.has, Base.show, Base.isequal, Base.promote_rule
 
 export Env, LocalEnv, NoEnv, child

src/Analysis.jl

@@ -4,7 +4,7 @@
 # Scoping analysis used to support instrument and graft
 
 module Analysis
-using Base, AST, Meta
+using AST, Meta
 
 export analyze
 

src/Debug.jl

@@ -1,16 +1,15 @@
 
 module Debug
-using Base
 export @debug, @instrument, @bp, debug_eval, Scope, Node, isblocknode, BPNode
 
-include(Pkg.dir("Debug","src","AST.jl"))
-include(Pkg.dir("Debug","src","Meta.jl"))
-include(Pkg.dir("Debug","src","Analysis.jl"))
-include(Pkg.dir("Debug","src","Runtime.jl"))
-include(Pkg.dir("Debug","src","Graft.jl"))
-include(Pkg.dir("Debug","src","Eval.jl"))
-include(Pkg.dir("Debug","src","Flow.jl"))
-include(Pkg.dir("Debug","src","UI.jl"))
+require(Base.find_in_path("Debug/src/AST.jl"))
+require(Base.find_in_path("Debug/src/Meta.jl"))
+require(Base.find_in_path("Debug/src/Analysis.jl"))
+require(Base.find_in_path("Debug/src/Runtime.jl"))
+require(Base.find_in_path("Debug/src/Graft.jl"))
+require(Base.find_in_path("Debug/src/Eval.jl"))
+require(Base.find_in_path("Debug/src/Flow.jl"))
+require(Base.find_in_path("Debug/src/UI.jl"))
 using AST, Meta, Analysis, Graft, Eval, Flow, UI
 
 is_trap(::Event)    = false

src/Eval.jl

@@ -4,7 +4,7 @@
 # eval in debug scope
 
 module Eval
-using Base, AST, Runtime, Graft
+using AST, Runtime, Graft
 export debug_eval, Scope
 
 debug_eval(scope::ModuleScope, ex) = scope.eval(ex)

src/Flow.jl

@@ -4,7 +4,7 @@
 # Flow control for interactive debug trap
 
 module Flow
-using Base, Meta, AST, Runtime, Graft, Eval
+using Meta, AST, Runtime, Graft, Eval
 import AST.is_emittable, Base.isequal
 export @bp, BPNode, DBState
 export continue!, singlestep!, stepover!, stepout!

src/Graft.jl

@@ -5,7 +5,7 @@
 # were evaluated inside such code (grafting)
 
 module Graft
-using Base, AST, Meta, Analysis, Runtime
+using AST, Meta, Analysis, Runtime
 export instrument, graft
 
 

src/Meta.jl

@@ -4,7 +4,7 @@
 # Metaprogramming tools used throughout the Debug package
 
 module Meta
-using Base, AST
+using AST
 export Ex, quot, is_expr
 export isblocknode, is_function, is_scope_node, is_in_type, introduces_scope
 export dict_comprehension, typed_comprehension, typed_dict_comprehension

src/Runtime.jl

@@ -4,7 +4,7 @@
 # Scope data type used at runtime
 
 module Runtime
-using Base, AST, Meta
+using AST, Meta
 import Base.ref, Base.assign, Base.has, Base.isequal
 export Scope, ModuleScope, LocalScope, getter, setter, get_eval
 export Frame, parent_frame, enclosing_scope_frame, scope_frameof

src/UI.jl

@@ -4,7 +4,7 @@
 # Interactive debug trap
 
 module Session
-using Base, Debug
+using Debug
 import Flow.DBState
 
 const st   = DBState()
@@ -16,7 +16,7 @@ end # module
 
 
 module UI
-using Base, Meta, AST, Eval, Flow
+using Meta, AST, Eval, Flow
 import Session
 export trap