Fix scoping issues with macros and includes. #667
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
|
@oyyd I'd welcome your review on this, if you have time. |
carljm
changed the title
| @@ -831,7 +831,8 @@ var Compiler = Object.extend({ | |||
| '[' + argNames.join(', ') + '], ', | |||
| '[' + kwargNames.join(', ') + '], ', | |||
| 'function (' + realNames.join(', ') + ') {', | |||
| 'frame = frame.push(true);', | |||
| 'callerFrame = frame;', | |||
There was a problem hiding this comment.
Should this be var callerFrame = frame;? Global variables may cause potential bugs.
There was a problem hiding this comment.
Yes, good catch! That was just an oversight on my part. Will fix.
|
Hi @carljm. Everything looks good except the line of my comment. Good job 👍 |
|
Thanks for the review; corrected the accidental global variable. Merging. |
carljm
added a commit
that referenced
this pull request
Feb 5, 2016
Fix scoping issues with macros and includes.
carljm
added a commit
that referenced
this pull request
Feb 5, 2016
carljm
added a commit
that referenced
this pull request
Feb 5, 2016
carljm
added a commit
that referenced
this pull request
Mar 10, 2016
* 2.x: (43 commits) Bump versions for dev. Update maintenance docs. Revert accidental changes to mocha.js. Bump version to 2.4.0. Update changelog. Merge pull request #694 from mariusbuescher/master Add note about include and blocks; update wrapping of templating docs. Merge pull request #688 from pra85/patch-1 Rename all test templates to use .j2 extension. Update changelog. Revert "make include statements trigger async conversion inside if/for statements (fixes #372)" Merge pull request #672 from TrySound/yargs Update changelog. Split backported and non-backported portions of #667 in changelog. More acks in changelog. Merge pull request #668 from oyyd/cn-doc Don't allow included templates to write to the including scope. Update changelog for opts.dev fix. Split include tests. Fix references to env dev opt. ...
This was referenced Nov 13, 2016
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.
This improves the fix for #577 and #561, expanding the fix for the latter to also cover includes, as well as macros.
The previous fix for #577 (PR #653) didn't take into account nested scopes within macros, which would happily bypass the
isolateproperty of their parent frame and go right up into the calling frame.A better fix for that is to make the macro frame actually completely isolated from the calling frame, breaking the parent relationship. This also fixes #666.
For includes (#561) we want included templates to see variables in the including scope, but we don't ever want to write to the including scope. So we still need an
isolateWritesattr on the frame, but it's specific to writes only, and (unlike in #653) it is respected not only at the originating level of the write, but also if a write from a child frame tries to go through it to its parent.