diff --git a/REQUIRE b/REQUIRE index 7911ddf256b..f5bc1ea65f3 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,3 +1,3 @@ julia 0.5 -Compat 0.17 +Compat 0.25 DocStringExtensions 0.2 diff --git a/src/DocSystem.jl b/src/DocSystem.jl index e3b89c3fbcd..31f94ede758 100644 --- a/src/DocSystem.jl +++ b/src/DocSystem.jl @@ -88,7 +88,7 @@ binding(m::Module, λ::Any) = binding(λ) function signature(x, str::AbstractString) ts = Base.Docs.signature(x) - (Meta.isexpr(x, :macrocall, 1) && !endswith(strip(str), "()")) ? :(Union{}) : ts + (Meta.isexpr(x, :macrocall, 1 + Compat.macros_have_sourceloc) && !endswith(strip(str), "()")) ? :(Union{}) : ts end if VERSION < v"0.5.0-dev" Base.Docs.signature(::Any) = :(Union{}) diff --git a/src/Utilities/Utilities.jl b/src/Utilities/Utilities.jl index c4ce0a28b9c..5efddf29ebf 100644 --- a/src/Utilities/Utilities.jl +++ b/src/Utilities/Utilities.jl @@ -238,7 +238,7 @@ Returns a expression that, when evaluated, returns an [`Object`](@ref) represent function object(ex::Union{Symbol, Expr}, str::AbstractString) binding = Expr(:call, Binding, splitexpr(Docs.namify(ex))...) signature = Base.Docs.signature(ex) - isexpr(ex, :macrocall, 1) && !endswith(str, "()") && (signature = :(Union{})) + isexpr(ex, :macrocall, 1 + Compat.macros_have_sourceloc) && !endswith(str, "()") && (signature = :(Union{})) Expr(:call, Object, binding, signature) end @@ -275,7 +275,7 @@ if VERSION < v"0.5-" end else function docs(ex::Union{Symbol, Expr}, str::AbstractString) - isexpr(ex, :macrocall, 1) && !endswith(rstrip(str), "()") && (ex = quot(ex)) + isexpr(ex, :macrocall, 1 + Compat.macros_have_sourceloc) && !endswith(rstrip(str), "()") && (ex = quot(ex)) :(Base.Docs.@doc $ex) end end