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

fix parsing for keyword arguments to macros on 0.6 #954

Merged
merged 2 commits into from
Feb 4, 2017
Merged

fix parsing for keyword arguments to macros on 0.6 #954

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70a4f30
fix parsing for keyword arguments to macros
mlubin Jan 31, 2017
90d3933
kw in constraint macro
mlubin Feb 4, 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
16 changes: 9 additions & 7 deletions src/macros.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,9 @@ macro constraint(args...)
else
kwargs = Expr(:parameters)
end
append!(kwargs.args, collect(filter(x -> isexpr(x, :kw), args))) # comma separated
args = collect(filter(x->!isexpr(x, :kw), args))
kwsymbol = VERSION < v"0.6.0-dev" ? :kw : :(=)
append!(kwargs.args, collect(filter(x -> isexpr(x, kwsymbol), args))) # comma separated
args = collect(filter(x->!isexpr(x, kwsymbol), args))

if length(args) < 2
if length(kwargs.args) > 0
Expand Down Expand Up @@ -392,8 +393,8 @@ macro constraint(args...)
newaff, parsecode = parseExprToplevel(lhs, :q)
constraintcall = :($addconstr($m, constructconstraint!($newaff,$(quot(sense)))))
for kw in kwargs.args
@assert isexpr(kw, :kw)
push!(constraintcall.args, esc(kw))
@assert isexpr(kw, kwsymbol)
push!(constraintcall.args, esc(Expr(:kw,kw.args...)))
end
code = quote
q = zero(AffExpr)
Expand Down Expand Up @@ -666,7 +667,7 @@ for (mac,sym) in [(:constraints, Symbol("@constraint")),
end
args_esc = []
for ex in args
if isexpr(ex, :(=))
if isexpr(ex, :(=)) && VERSION < v"0.6.0-dev"
push!(args_esc,Expr(:kw, ex.args[1], esc(ex.args[2])))
else
push!(args_esc, esc(ex))
Expand Down Expand Up @@ -806,8 +807,9 @@ macro variable(args...)

extra = vcat(args[2:end]...)
# separate out keyword arguments
kwargs = filter(ex->isexpr(ex,:kw), extra)
extra = filter(ex->!isexpr(ex,:kw), extra)
kwsymbol = VERSION < v"0.6.0-dev" ? :kw : :(=)
kwargs = filter(ex->isexpr(ex,kwsymbol), extra)
extra = filter(ex->!isexpr(ex,kwsymbol), extra)

# if there is only a single non-keyword argument, this is an anonymous
# variable spec and the one non-kwarg is the model
Expand Down