Wrap indices used in macros in let/local #584
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -130,6 +137,26 @@ end | |||
|
|
|||
| getloopedcode(c, code, condition, idxvars, idxsets, idxpairs, sym) = code | |||
|
|
|||
| localvar(x::Expr) = Expr(:block, _localvar(x)...) | |||
| _localvar(x::Symbol) = :(local $(esc(x))) | |||
| function _localvar(x::Expr) | |||
There was a problem hiding this comment.
Handles this gross case from the tests:
@defVar(m, tri_3[(i,j)=[(i,i+2) for i in 1:5],k=i:j])and gives you
local i
local j
for (i,j) = [(i,i + 2) for i = 1:5]
...
end
|
Not seeing any performance regressions. On master: and this PR: |
|
Could you compare with 0.3 just for sanity check? Also need lots of new tests here. |
| end | ||
| cnt = 4 | ||
| for i in 5:8 | ||
| @defVar(m, y[i=2:4,j=1:3] ≤ i) |
joehuchette
force-pushed
the
localvars
branch
from
f825be7 to
108b133
Compare
surrounding scope (#582)
joehuchette
force-pushed
the
localvars
branch
from
108b133 to
f35e9d4
Compare
| if t.head == :tuple | ||
| append!(args, map(_localvar, t.args)) | ||
| else | ||
| error("Internal error; please file an issue") |
There was a problem hiding this comment.
Will add that separately.
joehuchette
added a commit
that referenced
this pull request
Sep 13, 2015
Wrap indices used in macros in let/local
|
I'm a bit worried that this will subtly break something. I think it needs a bit of time to settle in. Not sure if it should go into 0.10.2. |
|
Agreed, since this is technically breaking. |
|
Should maybe get a NEWS entry then |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref #582, this seems like a reasonable change in that it makes JuMP behave more like a DSL. Haven't added v0.3 support yet, nor done perf testing to see if this slows things down.