Mostly rewrite the open_scope and close_scope functions #29
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
These still could use some work, but they are (hopefully) more clear now what is going on. Previously, the location and index internal to the token generator was not being updated quite correctly. In debugging it I cleaned up the logic a bit + added a test to demonstrate that this case works now.
akov
approved these changes
Feb 8, 2018
pasta/base/token_generator.py
Outdated
| # Eat whitespace or '(' tokens one at a time | ||
| for tok in self.takewhile( | ||
| lambda t: t.type in FORMATTING_TOKENS or t.src == '('): | ||
| # Stores all the code up and including this token |
| @@ -34,6 +34,8 @@ | |||
| # Alias for extracting token names | |||
| TOKENS = tokenize | |||
| Token = collections.namedtuple('Token', ('type', 'src', 'start', 'end', 'line')) | |||
| FORMATTING_TOKENS = (TOKENS.INDENT, TOKENS.DEDENT, TOKENS.NL, TOKENS.NEWLINE, | |||
| TOKENS.COMMENT) | |||
|
|
|||
|
|
|||
| class TokenGenerator(object): | |||
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.
These still could use some work, but they are (hopefully) more clear now
what is going on. Previously, the location and index internal to the
token generator was not being updated quite correctly. In debugging it I
cleaned up the logic a bit + added a test to demonstrate that this case
works now.