carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 22:02:52 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

[Toolchain][Parser] Add support for package directive. (#2144)

Browse Source 
Summary:

Adds parsing support for the `package` directive as specified by the
`Code and name organization` design doc.

Co-authored-by: ergawy <kareem.ergawy@guardsquare.com>
This commit is contained in:
Kareem Ergawy
2022-09-07 10:54:27 +03:00
committed by GitHub
co-authored by ergawy
parent 84f5fb62e5
commit d44cde3c15
5 changed files with 166 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parser/parse_tree_test.cpp
+63
View File
@@ -1293,5 +1293,68 @@ TEST_F(ParseTreeTest, ParsePostfixExpressionRegression) {
}
}
TEST_F(ParseTreeTest, Package) {
TokenizedBuffer tokens = GetTokenizedBuffer(R"(
package Geometry api;
package Geometry impl;
package Geometry library "Shapes" api;
package Geometry library "Shapes" impl;
)");
ParseTree tree = ParseTree::Parse(tokens, consumer);
EXPECT_THAT(tree,
MatchParseTreeNodes(
{MatchPackageDirective(MatchDeclaredName("Geometry"),
MatchPackageApi(), MatchPackageEnd()),
MatchPackageDirective(MatchDeclaredName("Geometry"),
MatchPackageImpl(), MatchPackageEnd()),
MatchPackageDirective(
MatchDeclaredName("Geometry"),
MatchPackageLibrary(MatchLiteral("\"Shapes\"")),
MatchPackageApi(), MatchPackageEnd()),
MatchPackageDirective(
MatchDeclaredName("Geometry"),
MatchPackageLibrary(MatchLiteral("\"Shapes\"")),
MatchPackageImpl(), MatchPackageEnd()),
MatchFileEnd()}));
}
TEST_F(ParseTreeTest, PackageErrors) {
struct TestCase {
llvm::StringLiteral input;
::testing::Matcher<const Diagnostic&> diag_matcher;
};
TestCase testcases[] = {
{"package;", IsDiagnosticMessage("Expected identifier after `package`.")},
{"package fn;",
IsDiagnosticMessage("Expected identifier after `package`.")},
{"package library \"Shapes\" api;",
IsDiagnosticMessage("Expected identifier after `package`.")},
{"package Geometry library Shapes api;",
IsDiagnosticMessage(
"Expected a string literal to specify the library name.")},
{"package Geometry \"Shapes\" api;",
IsDiagnosticMessage("Missing `library` keyword.")},
{"package Geometry api",
IsDiagnosticMessage("Expected `;` to end package directive.")},
{"package Geometry;", IsDiagnosticMessage("Expected a `api` or `impl`.")},
{R"(package Foo library "bar" "baz";)",
IsDiagnosticMessage("Expected a `api` or `impl`.")}};
for (const 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.has_errors());
}
}
} // namespace
} // namespace Carbon::Testing