[libSyntax] Store Range of ParsedRawSyntaxNode in dedicated field #36274
Conversation
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
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test Windows |
rintaro
approved these changes
Mar 4, 2021
| llvm_unreachable("node not deferred"); | ||
| } | ||
| } | ||
| CharSourceRange getRange() const { return Range; } |
There was a problem hiding this comment.
While you are here, please add a comment that this includes trivia ranges.
| unsigned len = leadTriviaLen + DeferredToken.TokLength + trailTriviaLen; | ||
|
|
||
| return CharSourceRange{begin, len}; | ||
| } | ||
| CharSourceRange getDeferredTokenRange() const { |
There was a problem hiding this comment.
As far as I can see, this getDeferredTokenRange()(doesn't include trivia) is used only in ParsedRawSyntaxRecorder and it's just for calculating the range with trivia after all. Can we abolish this method? If you prefer not to remove this, please add a comment to clarify this does not include trivia ranges.
There was a problem hiding this comment.
It’ll be gone in the next PR (here). I know that this splitting between PRs sometimes feels a little bit random. Sorry about that.
Essentially all ParsedRawSyntaxNode types have a range associated with them, so let's just store it in a dedicated field with a common getter. Additionally, this cleans up the recorded storage to just contain an OpaqueSyntaxNode. When deferred nodes are being handled by SyntaxParseActions, we can use this OpaqueNode storage to store either recorded or deferred node data, which is left to be interpreted by the SyntaxParseAction.
ahoppen
force-pushed
the
pr/range-in-parsedrawsyntaxnode
branch
from
69c4f88 to
7be748d
Compare
|
@swift-ci Please smoke test |
rintaro
approved these changes
Mar 5, 2021
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.
Essentially all ParsedRawSyntaxNode types have a range associated with them, so let's just store it in a dedicated field with a common getter.
Additionally, this cleans up the recorded storage to just contain an
OpaqueSyntaxNode. When deferred nodes are being handled by SyntaxParseActions, we can use this OpaqueNode storage to store either recorded or deferred node data, which is left to be interpreted by theSyntaxParseAction.We could also rewrite
TokLocandTokLengthinDeferredTokenNodein terms of the newRangeproperty for now. But since I’ll moveDeferredTokenNodedown toSyntaxParseActionsin the next PR which also needs the range information, it’s easier to keep the information duplicated for now.