Skip to content

Commit 5b228ce

Browse files
committed
[libSyntax] Adjustments because nodes can have unexpected nodes at the end
1 parent f49bab2 commit 5b228ce

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

lib/Parse/ParseExpr.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,11 +1713,13 @@ ParserResult<Expr> Parser::parseExprPrimary(Diag<> ID, bool isExprBasic) {
17131713
ParsedPatternSyntax PatternNode =
17141714
ParsedSyntaxRecorder::makeIdentifierPattern(
17151715
/*UnexpectedNodes=*/None,
1716-
/*Identifier=*/SyntaxContext->popToken(), *SyntaxContext);
1716+
/*Identifier=*/SyntaxContext->popToken(),
1717+
/*UnexpectedNodes=*/None, *SyntaxContext);
17171718
ParsedExprSyntax ExprNode =
17181719
ParsedSyntaxRecorder::makeUnresolvedPatternExpr(
17191720
/*UnexpectedNodes=*/None,
1720-
/*Pattern=*/std::move(PatternNode), *SyntaxContext);
1721+
/*Pattern=*/std::move(PatternNode),
1722+
/*UnexpectedNodes=*/None, *SyntaxContext);
17211723
SyntaxContext->addSyntax(std::move(ExprNode));
17221724
}
17231725
return makeParserResult(new (Context) UnresolvedPatternExpr(pattern));

lib/Parse/ParseType.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ Parser::parseTypeSimpleOrComposition(Diag<> MessageID, ParseTypeReason reason) {
946946
/*UnexpectedNodes=*/None,
947947
/*Type=*/std::move(*synType),
948948
/*UnexpectedNodes=*/None,
949-
/*Ampersand=*/None, *SyntaxContext);
949+
/*Ampersand=*/None, /*UnexpectedNodes=*/None, *SyntaxContext);
950950
SyntaxContext->addSyntax(std::move(LastNode));
951951
}
952952
}

lib/Parse/ParsedSyntaxRecorder.cpp.gyb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ ParsedSyntaxRecorder::makeTupleTypeElement(ParsedTypeSyntax Type,
189189
/*Initializer=*/None,
190190
/*UnexpectedNodes=*/None,
191191
std::move(TrailingComma),
192+
/*UnexpectedNodes=*/None,
192193
SPCtx
193194
);
194195
}

lib/Syntax/SyntaxFactory.cpp.gyb

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ TupleTypeSyntax SyntaxFactory::makeVoidTupleType() {
249249
/*UnexpectedNodes=*/None,
250250
/*Elements=*/makeBlankTupleTypeElementList(),
251251
/*UnexpectedNodes=*/None,
252-
/*RightParen=*/makeRightParenToken({}, {})
252+
/*RightParen=*/makeRightParenToken({}, {}),
253+
/*UnexpectedNodes=*/None
253254
);
254255
}
255256

@@ -274,7 +275,8 @@ SyntaxFactory::makeTupleTypeElement(llvm::Optional<TokenSyntax> Label,
274275
/*UnexpectedNodes=*/None,
275276
/*Intitializer=*/None,
276277
/*UnexpectedNodes=*/None,
277-
/*TrailingComma=*/TrailingComma
278+
/*TrailingComma=*/TrailingComma,
279+
/*UnexpectedNodes=*/None
278280
);
279281
}
280282

@@ -297,7 +299,8 @@ SyntaxFactory::makeTupleTypeElement(TypeSyntax Type,
297299
/*UnexpectedNodes=*/None,
298300
/*Initializer=*/None,
299301
/*UnexpectedNodes=*/None,
300-
/*TrailingComma=*/TrailingComma
302+
/*TrailingComma=*/TrailingComma,
303+
/*UnexpectedNodes=*/None
301304
);
302305
}
303306

@@ -314,7 +317,8 @@ SyntaxFactory::makeGenericParameter(TokenSyntax Name,
314317
/*UnexpectedNodes=*/None,
315318
/*InheritedType=*/None,
316319
/*UnexpectedNodes=*/None,
317-
/*TrailingComma=*/TrailingComma
320+
/*TrailingComma=*/TrailingComma,
321+
/*UnexpectedNodes=*/None
318322
);
319323
}
320324

@@ -330,7 +334,8 @@ TypeSyntax SyntaxFactory::makeTypeIdentifier(StringRef TypeName,
330334
/*UnexpectedNodes=*/None,
331335
/*Name=*/identifier,
332336
/*UnexpectedNodes=*/None,
333-
/*GenerigArgumentClause=*/None
337+
/*GenerigArgumentClause=*/None,
338+
/*UnexpectedNodes=*/None
334339
);
335340
}
336341

0 commit comments

Comments
 (0)