[SyntaxParse] Parse collection expression #27565
Merged
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
rintaro
force-pushed
the
syntaxparse-exprcollection
branch
4 times, most recently
from
2fbce85 to
888fabc
Compare
rintaro
changed the title
|
@swift-ci Please test |
nathawes
approved these changes
Oct 8, 2019
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
Optimize for libSyntax parsing. The new 'parseListSyntax()' receives a vector storage, passes element builder to the callback for populating the elements, then automatically parses trailing commas. Also, it performs automatic recovery if the element has an error (e.g. Skip until ',' or ')').
(Implemented by Nathan Hawes @nathawes)
(implemented by Nathan Hawes @nathawes) Advance \p Loc to the last non-missing token of the specified or, if it doesn't contain any, the last non-missing token preceding it in the tree.
For non-migrated expression / decl attributes. Clean-up the slot after the use. Assert there's no existing element at the location.
In AST token range, string literal token must be treated as a single token.
rintaro
force-pushed
the
syntaxparse-exprcollection
branch
from
888fabc to
fa991ba
Compare
rintaro
commented
Oct 9, 2019
Comment on lines
+1454
to
+1469
| void ASTGen::addExpr(Expr *E, const SourceLoc Loc) { | ||
| assert(!hasExpr(Loc)); | ||
| Exprs[Loc] = E; | ||
| } | ||
|
|
||
| bool ASTGen::hasExpr(const SourceLoc Loc) const { | ||
| return Exprs.find(Loc) != Exprs.end(); | ||
| } | ||
|
|
||
| Expr *ASTGen::takeExpr(const SourceLoc Loc) { | ||
| auto I = Exprs.find(Loc); | ||
| assert(I != Exprs.end()); | ||
| auto expr = I->second; | ||
| Exprs.erase(I); | ||
| return expr; | ||
| } |
There was a problem hiding this comment.
@nathawes To deal with backtracking, I modified this to erase the slot in the map after the use.
Comment on lines
-246
to
+247
| CharSourceRange getDeferredLayoutRange(bool includeTrivia) const { | ||
| CharSourceRange getDeferredLayoutRange() const { | ||
| assert(DK == DataKind::DeferredLayout); | ||
| auto HasValidRange = [includeTrivia](const ParsedRawSyntaxNode &Child) { | ||
| return !Child.isNull() && !Child.isMissing() && | ||
| Child.getDeferredRange(includeTrivia).isValid(); | ||
| }; | ||
| auto first = llvm::find_if(getDeferredChildren(), HasValidRange); | ||
| if (first == getDeferredChildren().end()) | ||
| return CharSourceRange(); | ||
| auto last = llvm::find_if(llvm::reverse(getDeferredChildren()), | ||
| HasValidRange); | ||
| auto firstRange = first->getDeferredRange(includeTrivia); | ||
| firstRange.widen(last->getDeferredRange(includeTrivia)); | ||
| return firstRange; | ||
| return DeferredLayout.Range; |
There was a problem hiding this comment.
This function used to be exponential.
| if (!Node.isMissing()) { | ||
| // NOTE: We cannot use 'getLastToken()' because it doesn't take string | ||
| // literal expressions into account. | ||
| if (Node.isToken() || Node.is<StringLiteralExprSyntax>()) |
There was a problem hiding this comment.
Since StringLiteralExprSyntax is like { quote (literal-segment | interpolation-segment)* quote },
This used to return the location of the end quote. In this case, we have to return the location of the start quote instead.
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
rintaro
added a commit
to rintaro/swift
that referenced
this pull request
Oct 14, 2019
…xparse-exprcollection"" This reverts commit 2f40f24.
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.
superexpressionparseListSyntax()and updateparseTypeTupleBody()for thatParser::parseExpressionSyntax()ASTGen::advanceLocEnd()ArrayExpr/DictionaryExpr