Skip to content

Commit

Permalink
prepare for macrocall having a source location argument
Browse files Browse the repository at this point in the history
  • Loading branch information
vtjnash committed May 10, 2017
1 parent a4506e8 commit 234528d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
julia 0.5
Compat 0.17
Compat 0.25
DocStringExtensions 0.2
2 changes: 1 addition & 1 deletion src/DocSystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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{})
Expand Down
4 changes: 2 additions & 2 deletions src/Utilities/Utilities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 234528d

Please sign in to comment.