Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove incorrect usage of generate function #39

Closed
wants to merge 3 commits into from
Closed

remove incorrect usage of generate function #39

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
06242b6
remove incorrect usage of generate function
vtjnash Apr 12, 2017
08f90d5
Update SimpleTraits.jl
vtjnash Apr 12, 2017
2df4bea
Update SimpleTraits.jl
vtjnash Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions src/SimpleTraits.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ false. This can be done with:
```julia
@traitimpl IsFast{T} <- isfast(T)
```
where `isfast` is that check-function. This generates a `@generated`
function under the hood.
where `isfast` is that check-function.

Note that traits implemented with the former of above methods will
override an implementation with the latter method. Thus it can be
Expand Down Expand Up @@ -152,13 +151,13 @@ macro traitimpl(tr)
if !negated
return quote
$fnhead = $trname{$(paras...)}
$isfnhead = true # Add the istrait definition as otherwise
VERSION < v"0.6-" && ($isfnhead = true) # Add the istrait definition as otherwise
# method-caching can be an issue.
end
else
return quote
$fnhead = Not{$trname{$(paras...)}}
$isfnhead = false# Add the istrait definition as otherwise
VERSION < v"0.6-" && ($isfnhead = false) # Add the istrait definition as otherwise
# method-caching can be an issue.
end
end
Expand All @@ -169,24 +168,13 @@ macro traitimpl(tr)
Tr_{P1__} <- fn_(P2__) => (false, Tr, P1, fn, P2)
end
if negated
return esc(
quote
@generated function SimpleTraits.trait{$(P1...)}(::Type{$Tr{$(P1...)}})
Tr = $Tr
P1 = $P1
return $fn($(P2...)) ? :(Not{$Tr{$(P1...)}}) : :($Tr{$(P1...)})
end
end)
else
return esc(
quote
@generated function SimpleTraits.trait{$(P1...)}(::Type{$Tr{$(P1...)}})
Tr = $Tr
P1 = $P1
return $fn($(P2...)) ? :($Tr{$(P1...)}) : :(Not{$Tr{$(P1...)}})
end
end)
fn = Expr(:call, GlobalRef(SimpleTraits, :!), fn)
end
return esc(quote
function SimpleTraits.trait{$(P1...)}(::Type{$Tr{$(P1...)}})
return $fn($(P2...)) ? $Tr{$(P1...)} : Not{$Tr{$(P1...)}}
end
end)
else
error("Cannot parse $tr")
end
Expand Down