Cleanup

Author: ScottPJones

src/APITools.jl

@@ -73,10 +73,9 @@ cur_mod() = ccall(:jl_get_current_module, Ref{Module}, ())
 """
 @api <cmd> [<symbols>...]
 
- * @api init             # set up module/package for adding names
- * @api freeze           # use at end of module, to "freeze" API
+ * @api freeze              # use at end of module, to "freeze" API
 
- * @api list   <modules>... # list API(s) of given modules
+ * @api list   <modules>... # list API(s) of given modules (or current if none given)
 
  * @api use    <modules>... # use for normal use
  * @api test   <modules>... # using api and dev, for testing purposes
@@ -92,13 +91,6 @@ cur_mod() = ccall(:jl_get_current_module, Ref{Module}, ())
 """
 macro api(cmd::Symbol)
     mod = @static V6_COMPAT ? current_module() : __module__
-    #=
-    @static if V6_COMPAT
-        println("api($mod, $cmd)")
-    else
-        println("api($__source__, $mod, $cmd)")
-    end
-    =#
     cmd == :list   ? _api_list(mod) :
     cmd == :init   ? _api_init(mod) :
     cmd == :freeze ? _api_freeze(mod) :
@@ -203,7 +195,6 @@ function _make_modules(curmod, cmd, exprs)
 end
 
 function _api(curmod::Module, cmd::Symbol, exprs)
-    #println("api($curmod, $cmd, $exprs)")
     ind = _ff(_cmdadd, cmd)
     ind == 0 || return _add_symbols(curmod, cmd, exprs)
 

test/APITest.jl

@@ -1,33 +1,10 @@
 module APITest
 using APITools
 
-_printapi(C) = (print(C) ; isdefined(APITest, :__tmp_api__) ? (show(__tmp_api__) ; println()) : println("Not defined"))
-macro printapi() ; _printapi("C: ") ; :( _printapi("R: ") ) ; end
-_printsym(C) = println(C, names(APITest, true, true))
-macro printsym() ; _printsym("C: ") ; :( _printsym("R: ") ) ; end
-
-#@printsym
-
-#@printapi
-
-#println(macroexpand( :( @api init ) ))
-
-@api init
-
-#@printapi
-
-#println(macroexpand( :( @api base nextind, getindex, setindex! ) ) )
-
 @api base nextind, getindex, setindex!
 
-#@printapi
-
-#println(macroexpand( :( @api public myfunc ) ) )
-
 @api public myfunc
 
-#println(macroexpand( :( @api define_public Foo )))
-
 @api define_public Foo
 
 struct Foo end
@@ -36,12 +13,6 @@ function myfunc end
 myfunc(::Integer) = 1
 myfunc(::String)  = 2
 
-#@printapi()
-
-#println(macroexpand( :( @api freeze ) ))
-
 @api freeze
 
-#@printsym
-
 end # module APITest

test/runtests.jl

@@ -17,8 +17,6 @@ end
 # Pick up APITest from the test directory
 push!(LOAD_PATH, @__DIR__)
 
-@api init
-
 @api extend APITest
 
 @api list