Skip to content

Commit fe25eb7

Browse files
committed
Fixes for v1.0
1 parent 834ade6 commit fe25eb7

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/ModuleInterfaceTools.jl

+11-3
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ function _api_use(curmod, modules, cpy::Bool)
282282
mod = m_eval(curmod, nam)
283283
if has_api(mod)
284284
api = get_api(mod)
285-
_do_list(curmod, cpy, :using, mod, nam, :public, api)
286-
_do_list(curmod, cpy, :using, mod, nam, :public!, api)
285+
_do_list(curmod, cpy, :using, mod, nam, :public, api)
286+
_do_list(curmod, cpy, :using, mod, nam, :public!, api)
287287
else
288288
_do_list(curmod, cpy, :using, mod, nam, :public!, names(mod))
289289
end
@@ -376,7 +376,15 @@ function _api(curmod::Module, cmd::Symbol, exprs)
376376
: _api_extend(curmod, modules, cpy))
377377
end
378378

379-
makecmd(cmd, nam, sym) = @static V6_COMPAT ? Expr(cmd, nam, sym) : Expr(cmd, Expr(:., nam, sym))
379+
function makecmd(cmd, nam, sym)
380+
@static if V6_COMPAT
381+
Expr(cmd, nam, sym)
382+
else
383+
(cmd == :using
384+
? Expr(cmd, Expr(:(:), Expr(:., nam), Expr(:., sym)))
385+
: Expr(cmd, Expr(:., nam, sym)))
386+
end
387+
end
380388

381389
_do_list(curmod, cpy, cmd, mod, nam, grp, api::API) =
382390
_do_list(curmod, cpy, cmd, mod, nam, grp, getfield(api, grp))

0 commit comments

Comments
 (0)