Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[toolchain] Parsing support for struct literals, following #653. #699

Merged
merged 9 commits into from
Aug 28, 2021
Merged

[toolchain] Parsing support for struct literals, following #653. #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b05de1d
[toolchain] Parsing support for struct literals, following #653.
zygoloid Aug 3, 2021
531f9ba
Rename some parse tree nodes for clarity and add test coverage.
zygoloid Aug 3, 2021
a25d922
clang-format.
zygoloid Aug 3, 2021
a3bbb53
Split enum type out of variable declaration.
zygoloid Aug 6, 2021
e493b8f
Switch from `{name: type}` to `{.name: type}` for struct types.
zygoloid Aug 7, 2021
fbafcff
Add testing for struct literal parse diagnostics.
zygoloid Aug 12, 2021
69ecf10
Allow trailing commas in struct types and literals to match #561.
zygoloid Aug 12, 2021
51c1a3a
clang-format.
zygoloid Aug 12, 2021
830a78c
Add testing for junk at the end of a struct literal.
zygoloid Aug 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions toolchain/parser/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ cc_test(
":parse_tree",
"//toolchain/common:yaml_test_helpers",
"//toolchain/diagnostics:diagnostic_emitter",
"//toolchain/diagnostics:mocks",
"//toolchain/lexer:tokenized_buffer",
"@llvm-project//llvm:Support",
"@llvm-project//llvm:gmock",
Expand Down
9 changes: 9 additions & 0 deletions toolchain/parser/parse_node_kind.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,13 @@ CARBON_PARSE_NODE_KIND(PrefixOperator)
CARBON_PARSE_NODE_KIND(InfixOperator)
CARBON_PARSE_NODE_KIND(PostfixOperator)

// Struct literals.
CARBON_PARSE_NODE_KIND(StructLiteral)
CARBON_PARSE_NODE_KIND(StructTypeLiteral)
CARBON_PARSE_NODE_KIND(StructFieldDesignator)
CARBON_PARSE_NODE_KIND(StructFieldValue)
CARBON_PARSE_NODE_KIND(StructFieldType)
CARBON_PARSE_NODE_KIND(StructComma)
CARBON_PARSE_NODE_KIND(StructEnd)

#undef CARBON_PARSE_NODE_KIND
112 changes: 110 additions & 2 deletions toolchain/parser/parse_tree_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,21 @@
#include "llvm/Support/SourceMgr.h"
#include "toolchain/common/yaml_test_helpers.h"
#include "toolchain/diagnostics/diagnostic_emitter.h"
#include "toolchain/diagnostics/mocks.h"
#include "toolchain/lexer/tokenized_buffer.h"
#include "toolchain/parser/parse_node_kind.h"
#include "toolchain/parser/parse_test_helpers.h"

namespace Carbon {
namespace {

using Carbon::Testing::DiagnosticMessage;
using Carbon::Testing::ExpectedNode;
using Carbon::Testing::MatchParseTreeNodes;
using namespace Carbon::Testing::NodeMatchers;
using ::testing::ElementsAre;
using ::testing::Eq;
using ::testing::HasSubstr;
using ::testing::Ne;
using ::testing::NotNull;
using ::testing::StrEq;
Expand Down Expand Up @@ -405,10 +408,11 @@ TEST_F(ParseTreeTest, InvalidDesignators) {
MatchExpressionStatement(
MatchDesignatorExpression(
MatchNameReference("a"), ".", HasError),
";"),
HasError, ";"),
MatchExpressionStatement(
MatchDesignatorExpression(
MatchNameReference("a"), ".", HasError),
MatchNameReference("a"), ".",
MatchDesignatedName("fn", HasError)),
";"),
MatchExpressionStatement(
MatchDesignatorExpression(
Expand Down Expand Up @@ -970,6 +974,110 @@ TEST_F(ParseTreeTest, Tuples) {
MatchFileEnd()}));
}

TEST_F(ParseTreeTest, Structs) {
TokenizedBuffer tokens = GetTokenizedBuffer(R"(
var x: {.a: i32, .b: i32} = {.a = 1, .b = 2};
var y: {} = {};
var z: {.n: i32,} = {.n = 4,};
)");
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_FALSE(tree.HasErrors());

EXPECT_THAT(
tree,
MatchParseTreeNodes(
{MatchVariableDeclaration(
MatchPatternBinding(
MatchDeclaredName("x"), ":",
MatchStructTypeLiteral(
MatchStructFieldType(MatchStructFieldDesignator(
".", MatchDesignatedName("a")),
":", MatchLiteral("i32")),
MatchStructComma(),
MatchStructFieldType(MatchStructFieldDesignator(
".", MatchDesignatedName("b")),
":", MatchLiteral("i32")),
MatchStructEnd())),
MatchVariableInitializer(MatchStructLiteral(
MatchStructFieldValue(MatchStructFieldDesignator(
".", MatchDesignatedName("a")),
"=", MatchLiteral("1")),
MatchStructComma(),
MatchStructFieldValue(MatchStructFieldDesignator(
".", MatchDesignatedName("b")),
"=", MatchLiteral("2")),
MatchStructEnd())),
MatchDeclarationEnd()),
MatchVariableDeclaration(
MatchPatternBinding(MatchDeclaredName("y"), ":",
MatchStructLiteral(MatchStructEnd())),
MatchVariableInitializer(MatchStructLiteral(MatchStructEnd())),
MatchDeclarationEnd()),
MatchVariableDeclaration(
MatchPatternBinding(
MatchDeclaredName("z"), ":",
MatchStructTypeLiteral(
MatchStructFieldType(MatchStructFieldDesignator(
".", MatchDesignatedName("n")),
":", MatchLiteral("i32")),
MatchStructComma(), MatchStructEnd())),
MatchVariableInitializer(MatchStructLiteral(
MatchStructFieldValue(MatchStructFieldDesignator(
".", MatchDesignatedName("n")),
"=", MatchLiteral("4")),
MatchStructComma(), MatchStructEnd())),
MatchDeclarationEnd()),
MatchFileEnd()}));
}

TEST_F(ParseTreeTest, StructErrors) {
struct Testcase {
llvm::StringLiteral input;
::testing::Matcher<const Diagnostic&> diag_matcher;
};
Testcase testcases[] = {
{"var x: {i32} = {};",
DiagnosticMessage("Expected `.field: type` or `.field = value`.")},
{"var x: {a} = {};",
DiagnosticMessage("Expected `.field: type` or `.field = value`.")},
{"var x: {a:} = {};",
DiagnosticMessage("Expected `.field: type` or `.field = value`.")},
{"var x: {a=} = {};",
DiagnosticMessage("Expected `.field: type` or `.field = value`.")},
{"var x: {.} = {};", DiagnosticMessage("Expected identifier after `.`.")},
{"var x: {.\"hello\" = 0, .y = 4} = {};",
DiagnosticMessage("Expected identifier after `.`.")},
{"var x: {.\"hello\": i32, .y: i32} = {};",
DiagnosticMessage("Expected identifier after `.`.")},
{"var x: {.a} = {};",
DiagnosticMessage("Expected `.field: type` or `.field = value`.")},
{"var x: {.a:} = {};", DiagnosticMessage("Expected expression.")},
{"var x: {.a=} = {};", DiagnosticMessage("Expected expression.")},
{"var x: {.a: i32, .b = 0} = {};",
DiagnosticMessage("Expected `.field: type`.")},
{"var x: {.a = 0, b: i32} = {};",
DiagnosticMessage("Expected `.field = value`.")},
{"var x: {,} = {};",
DiagnosticMessage("Expected `.field: type` or `.field = value`.")},
{"var x: {.a: i32,,} = {};",
DiagnosticMessage("Expected `.field: type`.")},
{"var x: {.a = 0,,} = {};",
DiagnosticMessage("Expected `.field = value`.")},
{"var x: {.a: i32 banana} = {.a = 0};",
DiagnosticMessage("Expected `,` or `}`.")},
{"var x: {.a: i32} = {.a = 0 banana};",
DiagnosticMessage("Expected `,` or `}`.")},
};

for (Testcase testcase : testcases) {
TokenizedBuffer tokens = GetTokenizedBuffer(testcase.input);
Testing::MockDiagnosticConsumer consumer;
EXPECT_CALL(consumer, HandleDiagnostic(testcase.diag_matcher));
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_TRUE(tree.HasErrors());
}
}

auto GetAndDropLine(llvm::StringRef& s) -> std::string {
auto newline_offset = s.find_first_of('\n');
llvm::StringRef line = s.slice(0, newline_offset);
Expand Down
Loading