Skip to content

Commit d6e743d

Browse files
committed
Use __module__
1 parent 7af54db commit d6e743d

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/ModuleInterfaceTools.jl

+4-6
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ function Base.show(io::IO, api::AbstractAPI)
8181
end
8282
end
8383

84-
"""Get current module"""
85-
cur_mod() = @static V6_COMPAT ? current_module() : ccall(:jl_get_current_module, Ref{Module}, ())
86-
8784
function m_eval(mod, expr)
8885
try
8986
Core.eval(mod, expr)
@@ -124,7 +121,7 @@ end
124121
125122
"""
126123
macro api(cmd::Symbol)
127-
mod = cur_mod()
124+
mod = @static V6_COMPAT ? current_module() : __module__
128125
cmd == :list ? _api_list(mod) :
129126
cmd == :freeze ? _api_freeze(mod) :
130127
cmd == :test ? _api_test(mod) :
@@ -171,7 +168,7 @@ end
171168

172169
const _cmduse = (:use, :use!, :test, :extend, :extend!, :export, :list)
173170
const _cmdadd =
174-
(:modules, :public, :develop, :public!, :develop!, :base, :base!)
171+
(:modules, :public, :develop, :public!, :develop!, :base, :base!, :define!, :defdev!)
175172

176173
@static V6_COMPAT ? (const _ff = findfirst) :
177174
(_ff(lst, val) = (ret = findfirst(isequal(val), lst); ret === nothing ? 0 : ret))
@@ -397,7 +394,8 @@ function _do_list(curmod, cpy, cmd, mod, nam, grp, lst)
397394
end
398395

399396
macro api(cmd::Symbol, exprs...)
400-
_api(cur_mod(), cmd, exprs)
397+
mod = @static V6_COMPAT ? current_module() : __module__
398+
_api(mod, cmd, exprs)
401399
end
402400

403401
end # module ModuleInterfaceTools

0 commit comments

Comments
 (0)