[SyntaxParse] Parse PoundAssertStmt #27460
Closed
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
Also added parseExpressionSyntax as an intermediate syntax parser until expression parsing is completely implemented.
|
@swift-ci please test |
rintaro
reviewed
Oct 1, 2019
| if (!hasExpr(CondLoc)) | ||
| return nullptr; | ||
|
|
||
| Expr *CondExpr = getExpr(CondLoc); |
There was a problem hiding this comment.
Once we have generate(ExprSyntax), this block should be like
auto CondExpr = generate(Stmt.getCondition(), Loc);
if (! CondExpr)
// Don't form a PoundAssertStmt without a condition.
return nullptr;| @@ -98,6 +98,12 @@ llvm::Optional<Syntax> Syntax::getChild(const size_t N) const { | |||
| return Syntax {Root, ChildData.get()}; | |||
| } | |||
|
|
|||
| Optional<Syntax> Syntax::getPreviousNode() const { | |||
| if (auto prev = getData().getPreviousNode()) | |||
| return TokenSyntax(Root, prev.get()); | |||
There was a problem hiding this comment.
I believe this should be Syntax instead of TokenSyntax.
| @@ -34,6 +34,18 @@ | |||
| using namespace swift; | |||
| using namespace swift::syntax; | |||
|
|
|||
| ParsedSyntaxResult<ParsedExprSyntax> Parser::parseExpressionSyntax(Diag<> ID) { | |||
| SourceLoc ExprLoc = Tok.getLoc(); | |||
| SyntaxParsingContext ExprParsingContext(SyntaxContext, SyntaxContextKind::Expr); | |||
| if (!Tok.isFollowingLParen()) { | ||
| diagnose(Tok.getLoc(), diag::pound_assert_expected_lparen); | ||
| status.setIsParseError(); | ||
| builder.useCondition(ParsedSyntaxRecorder::makeUnknownExpr({}, *SyntaxContext)); |
| auto conditionExprResult = parseExpr(diag::pound_assert_expected_expression); | ||
| if (conditionExprResult.isParseError()) | ||
| return ParserStatus(conditionExprResult); | ||
| auto conditionExprResult = parseExpressionSyntax(diag::pound_assert_expected_expression); |
| auto MessageLoc = Tok.getLoc(); | ||
| // FIXME: Support extended escaping string literal. | ||
| if (Tok.getCustomDelimiterLen()) { | ||
| diagnose(MessageLoc, diag::forbidden_extended_escaping_string, "'#assert' message"); |
| L->getStringLiteralSegments(Tok, Segments); | ||
| if (Segments.size() != 1 || | ||
| Segments.front().Kind == Lexer::StringSegment::Expr) { | ||
| diagnose(MessageLoc, diag::forbidden_interpolated_string, "'#assert' message"); |
|
Build failed |
This was referenced Oct 3, 2019
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.
Also added parseExpressionSyntax as an intermediate syntax parser until
expression parsing is completely implemented.