carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-27 13:20:10 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

[toolchain][parser] Parse for statement. (#2180)

Browse Source 
Summary:

Add support for parsing `for` loops.

Co-authored-by: ergawy <kareem.ergawy@guardsquare.com>
Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Kareem Ergawy
2022-10-03 08:36:19 -07:00
committed by GitHub
co-authored by ergawy Richard Smith
parent 11a138b467
commit 8d5d48a4a7
6 changed files with 283 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parser/parse_tree_test.cpp
+184
View File
@@ -1356,5 +1356,189 @@ TEST_F(ParseTreeTest, PackageErrors) {
}
}
TEST_F(ParseTreeTest, ForSimple) {
TokenizedBuffer tokens = GetTokenizedBuffer(R"(
fn foo() {
for (var x : i32 in y) {
Print(x);
}
}
)");
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_THAT(
tree,
MatchParseTreeNodes(
{MatchFunctionDeclaration(
MatchDeclaredName("foo"), MatchParameters(),
MatchCodeBlock(
MatchForStatement(
MatchForHeader(
MatchVariableDeclaration(MatchPatternBinding(
MatchDeclaredName("x"), MatchLiteral("i32"))),
MatchForIn(), MatchNameReference("y"),
MatchForHeaderEnd()),
MatchCodeBlock(
MatchExpressionStatement(
MatchCallExpression(MatchNameReference("Print"),
MatchNameReference("x"),
MatchCallExpressionEnd())),
MatchCodeBlockEnd())),
MatchCodeBlockEnd())),
MatchFileEnd()}));
}
TEST_F(ParseTreeTest, ForNested) {
TokenizedBuffer tokens = GetTokenizedBuffer(R"(
fn foo() {
for (var y : i32 in x) {
for (var z : i32 in y) {
Print(z);
}
}
}
)");
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_THAT(
tree,
MatchParseTreeNodes(
{MatchFunctionDeclaration(
MatchDeclaredName("foo"), MatchParameters(),
MatchCodeBlock(
MatchForStatement(
MatchForHeader(
MatchVariableDeclaration(MatchPatternBinding(
MatchDeclaredName("y"), MatchLiteral("i32"))),
MatchForIn(), MatchNameReference("x"),
MatchForHeaderEnd()),
MatchCodeBlock(
MatchForStatement(
MatchForHeader(
MatchVariableDeclaration(MatchPatternBinding(
MatchDeclaredName("z"),
MatchLiteral("i32"))),
MatchForIn(), MatchNameReference("y"),
MatchForHeaderEnd()),
MatchCodeBlock(
MatchExpressionStatement(MatchCallExpression(
MatchNameReference("Print"),
MatchNameReference("z"),
MatchCallExpressionEnd())),
MatchCodeBlockEnd())),
MatchCodeBlockEnd())),
MatchCodeBlockEnd())),
MatchFileEnd()}));
}
TEST_F(ParseTreeTest, ForIterVarError) {
TokenizedBuffer tokens = GetTokenizedBuffer(R"(
fn foo() {
for (x : i32 in y) {
Print(x);
}
}
)");
Testing::MockDiagnosticConsumer consumer;
EXPECT_CALL(
consumer,
HandleDiagnostic(IsDiagnosticMessage("Expected `var` declaration.")));
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_THAT(tree,
MatchParseTreeNodes(
{MatchFunctionDeclaration(
MatchDeclaredName("foo"), MatchParameters(),
MatchCodeBlock(
MatchForStatement(
MatchForHeader(HasError, MatchForIn(),
MatchNameReference("y"),
MatchForHeaderEnd()),
MatchCodeBlock(
MatchExpressionStatement(MatchCallExpression(
MatchNameReference("Print"),
MatchNameReference("x"),
MatchCallExpressionEnd())),
MatchCodeBlockEnd())),
MatchCodeBlockEnd())),
MatchFileEnd()}));
}
TEST_F(ParseTreeTest, ForColonInsteafOfIn) {
TokenizedBuffer tokens = GetTokenizedBuffer(R"(
fn foo() {
for (var x : i32 : y) {
Print(x);
}
}
)");
Testing::MockDiagnosticConsumer consumer;
EXPECT_CALL(
consumer,
HandleDiagnostic(IsDiagnosticMessage("`:` should be replaced by `in`.")));
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_THAT(
tree,
MatchParseTreeNodes(
{MatchFunctionDeclaration(
MatchDeclaredName("foo"), MatchParameters(),
MatchCodeBlock(
MatchForStatement(
MatchForHeader(
HasError,
MatchVariableDeclaration(MatchPatternBinding(
MatchDeclaredName("x"), MatchLiteral("i32"))),
MatchNameReference("y"), MatchForHeaderEnd()),
MatchCodeBlock(
MatchExpressionStatement(
MatchCallExpression(MatchNameReference("Print"),
MatchNameReference("x"),
MatchCallExpressionEnd())),
MatchCodeBlockEnd())),
MatchCodeBlockEnd())),
MatchFileEnd()}));
}
TEST_F(ParseTreeTest, ForMissingIn) {
TokenizedBuffer tokens = GetTokenizedBuffer(R"(
fn foo() {
for (var x : i32 y) {
Print(x);
}
}
)");
Testing::MockDiagnosticConsumer consumer;
EXPECT_CALL(consumer, HandleDiagnostic(IsDiagnosticMessage(
"Expected `in` after loop `var` declaration.")));
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_THAT(
tree,
MatchParseTreeNodes(
{MatchFunctionDeclaration(
MatchDeclaredName("foo"), MatchParameters(),
MatchCodeBlock(
MatchForStatement(
MatchForHeader(
HasError,
MatchVariableDeclaration(MatchPatternBinding(
MatchDeclaredName("x"), MatchLiteral("i32"))),
MatchForHeaderEnd()),
MatchCodeBlock(
MatchExpressionStatement(
MatchCallExpression(MatchNameReference("Print"),
MatchNameReference("x"),
MatchCallExpressionEnd())),
MatchCodeBlockEnd())),
MatchCodeBlockEnd())),
MatchFileEnd()}));
}
} // namespace
} // namespace Carbon::Testing