fix: properly traverse nested blocks within class bodies#222
Merged
alangpierce merged 1 commit intodecaffeinate:masterfrom Jun 10, 2017
Merged
Conversation
Rather than just looking at top-level class statements, we need to traverse all nested code within classes to distinguish object literals from class proto assign ops, and we also need to collect all bound methods that we see and the constructor. Since this happens at different levels of the AST, I needed to make traversal stateful by adding some state to the context.
alangpierce
added a commit
to alangpierce/decaffeinate
that referenced
this pull request
Jun 10, 2017
One change from decaffeinate/decaffeinate-parser#222 is that inline class blocks are now properly marked as inline. This caused decaffeinate to go through a different code path that didn't change comma to semicolon as necessary. Fixed by normalizing in that case as well.
alangpierce
added a commit
to decaffeinate/decaffeinate
that referenced
this pull request
Jun 11, 2017
One change from decaffeinate/decaffeinate-parser#222 is that inline class blocks are now properly marked as inline. This caused decaffeinate to go through a different code path that didn't change comma to semicolon as necessary. Fixed by normalizing in that case as well.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Rather than just looking at top-level class statements, we need to traverse all
nested code within classes to distinguish object literals from class proto
assign ops, and we also need to collect all bound methods that we see and the
constructor. Since this happens at different levels of the AST, I needed to make
traversal stateful by adding some state to the context.