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

Implement #4864: Core is a keyword (#4909)

Browse Source 
Change representation of package names from `IdentifierId` to
`PackageNameId`, and add a special value `PackageNameId::Core` for the
Core package. Add a `Core` expression to name the Core package, and
support for parsing the `Core` keyword in `package` and `import`
declarations.

For now, I've made no changes to instruction fingerprinting or name
mangling. This means that fingerprints and mangled names will collide
between names in the `Core` package and names in a `r#Core` package. See
#4908.

---------

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Richard Smith
2025-02-11 21:33:57 +00:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent 50b3c825e4
commit 8eb4e24cb6
62 changed files with 935 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parse/handle_expr.cpp
+5
View File
@@ -165,6 +165,11 @@ auto HandleExprInPostfix(Context& context) -> void {
context.PushState(state);
break;
}
case Lex::TokenKind::Core: {
context.AddLeafNode(NodeKind::CoreNameExpr, context.Consume());
context.PushState(state);
break;
}
case Lex::TokenKind::SelfValueIdentifier: {
context.AddLeafNode(NodeKind::SelfValueNameExpr, context.Consume());
context.PushState(state);
toolchain/parse/handle_import_and_package.cpp
+28 -15
View File
@@ -42,32 +42,45 @@ static auto HandleDeclContent(Context& context, Context::StateStackEntry state,
Tree::PackagingNames names{
.node_id = ImportDeclId(NodeId(state.subtree_start)),
.is_export = is_export};
if (declaration != NodeKind::LibraryDecl) {
if (auto package_name_token =
context.ConsumeIf(Lex::TokenKind::Identifier)) {
if (names.is_export) {
names.is_export = false;
state.has_error = true;
CARBON_DIAGNOSTIC(ExportImportPackage, Error,
"`export` cannot be used when importing a package");
context.emitter().Emit(*package_name_token, ExportImportPackage);
}
names.package_id = context.tokens().GetIdentifier(*package_name_token);
context.AddLeafNode(NodeKind::PackageName, *package_name_token);
} else if (declaration == NodeKind::PackageDecl ||
!context.PositionIs(Lex::TokenKind::Library)) {
// Parse the package name.
if (declaration == NodeKind::LibraryDecl ||
(declaration == NodeKind::ImportDecl &&
context.PositionIs(Lex::TokenKind::Library))) {
// This is either `library ...` or `import library ...`, so no package name
// is expected.
} else {
// We require a package name. This is either an identifier or the `Core`
// keyword.
auto package_name_position = *context.position();
if (auto ident = context.ConsumeIf(Lex::TokenKind::Identifier)) {
names.package_id =
PackageNameId::ForIdentifier(context.tokens().GetIdentifier(*ident));
context.AddLeafNode(NodeKind::IdentifierPackageName, *ident);
} else if (auto core = context.ConsumeIf(Lex::TokenKind::Core)) {
names.package_id = PackageNameId::Core;
context.AddLeafNode(NodeKind::CorePackageName, *core);
} else {
CARBON_DIAGNOSTIC(ExpectedIdentifierAfterPackage, Error,
"expected identifier after `package`");
CARBON_DIAGNOSTIC(ExpectedIdentifierAfterImport, Error,
"expected identifier or `library` after `import`");
context.emitter().Emit(*context.position(),
context.emitter().Emit(package_name_position,
declaration == NodeKind::PackageDecl
? ExpectedIdentifierAfterPackage
: ExpectedIdentifierAfterImport);
on_parse_error();
return;
}
if (names.is_export) {
names.is_export = false;
state.has_error = true;
CARBON_DIAGNOSTIC(ExportImportPackage, Error,
"`export` cannot be used when importing a package");
context.emitter().Emit(package_name_position, ExportImportPackage);
}
}
// Parse the optional library keyword.
toolchain/parse/node_ids.h
+1
View File
@@ -81,6 +81,7 @@ using AnyStatementId =
using AnyRequirementId = NodeIdInCategory<NodeCategory::Requirement>;
using AnyNonExprIdentifierNameId =
NodeIdInCategory<NodeCategory::NonExprIdentifierName>;
using AnyPackageNameId = NodeIdInCategory<NodeCategory::PackageName>;
// NodeId with kind that matches one of the `T::Kind`s.
template <typename... T>
toolchain/parse/node_kind.def
+3 -1
View File
@@ -105,7 +105,9 @@ CARBON_PARSE_NODE_KIND(SelfTypeNameExpr)
CARBON_PARSE_NODE_KIND(BaseName)
CARBON_PARSE_NODE_KIND(PackageExpr)
CARBON_PARSE_NODE_KIND(PackageName)
CARBON_PARSE_NODE_KIND(CoreNameExpr)
CARBON_PARSE_NODE_KIND(IdentifierPackageName)
CARBON_PARSE_NODE_KIND(CorePackageName)
CARBON_PARSE_NODE_KIND(LibraryName)
CARBON_PARSE_NODE_KIND(PackageIntroducer)
toolchain/parse/node_kind.h
+2 -1
View File
@@ -36,9 +36,10 @@ class NodeCategory : public Printable<NodeCategory> {
IntConst = 1 << 8,
Requirement = 1 << 9,
NonExprIdentifierName = 1 << 10,
PackageName = 1 << 11,
None = 0,
LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/NonExprIdentifierName)
LLVM_MARK_AS_BITMASK_ENUM(/*LargestValue=*/PackageName)
};
// Support implicit conversion so that the difference with the member enum is
toolchain/parse/testdata/package_expr/core.carbon
Vendored
+29
View File
@@ -0,0 +1,29 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// AUTOUPDATE
// TIP: To test this file alone, run:
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/package_expr/core.carbon
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/package_expr/core.carbon
var x: Core.Foo = Core.Bar;
// CHECK:STDOUT: - filename: core.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'x'},
// CHECK:STDOUT: {kind: 'CoreNameExpr', text: 'Core'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Foo'},
// CHECK:STDOUT: {kind: 'MemberAccessExpr', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 5},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 6},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'CoreNameExpr', text: 'Core'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Bar'},
// CHECK:STDOUT: {kind: 'MemberAccessExpr', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 12},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/export.carbon
Vendored
+12 -12
View File
@@ -147,7 +147,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Foo'},
@@ -158,7 +158,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Foo'},
@@ -171,7 +171,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'InvalidParse', text: '(', has_error: yes},
@@ -182,7 +182,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'InvalidParse', text: 'package', has_error: yes},
@@ -193,7 +193,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'InvalidParse', text: '', has_error: yes},
@@ -204,7 +204,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'InvalidParse', text: ';', has_error: yes},
@@ -215,7 +215,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Foo'},
@@ -226,7 +226,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Foo'},
@@ -239,7 +239,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'InvalidParse', text: '.', has_error: yes},
@@ -250,7 +250,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'C'},
@@ -264,7 +264,7 @@ export Foo;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Foo'},
@@ -286,7 +286,7 @@ export Foo;
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'ImplModifier', text: 'impl'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ExportIntroducer', text: 'export'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeParams', text: 'Foo'},
toolchain/parse/testdata/packages/import/after_import.carbon
Vendored
+2 -2
View File
@@ -15,10 +15,10 @@ import B;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/after_package.carbon
Vendored
+2 -2
View File
@@ -16,10 +16,10 @@ import B;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/basic.carbon
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ import Geometry;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/core.carbon
Vendored
+27
View File
@@ -0,0 +1,27 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// AUTOUPDATE
// TIP: To test this file alone, run:
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/packages/import/core.carbon
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/packages/import/core.carbon
import Core;
import Core library "prelude";
// CHECK:STDOUT: - filename: core.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'CorePackageName', text: 'Core'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'CorePackageName', text: 'Core'},
// CHECK:STDOUT: {kind: 'LibraryName', text: '"prelude"'},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/export.carbon
Vendored
+6 -6
View File
@@ -69,11 +69,11 @@ export import library "lib";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'ExportModifier', text: 'export'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Bar'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Bar'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', has_error: yes, subtree_size: 4},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
@@ -81,7 +81,7 @@ export import library "lib";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'ExportModifier', text: 'export'},
@@ -94,7 +94,7 @@ export import library "lib";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'ExportModifier', text: 'export'},
@@ -107,7 +107,7 @@ export import library "lib";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'ExportModifier', text: 'export'},
@@ -137,7 +137,7 @@ export import library "lib";
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'ImplModifier', text: 'impl'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Pkg'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'ExportModifier', text: 'export'},
toolchain/parse/testdata/packages/import/fail_extra_string.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ import Foo library "bar" "baz";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Foo'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Foo'},
// CHECK:STDOUT: {kind: 'LibraryName', text: '"bar"'},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', has_error: yes, subtree_size: 5},
toolchain/parse/testdata/packages/import/fail_library_is_identifier.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ import Geometry library Shapes;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'LibraryName', text: 'Shapes', has_error: yes},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', has_error: yes, subtree_size: 5},
toolchain/parse/testdata/packages/import/fail_no_semi.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ import Geometry
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: 'Geometry', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/fail_omit_library_keyword.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ import Geometry "Shapes";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/fail_type.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ import Geometry api;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/library.carbon
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ import Geometry library "Shapes";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'LibraryName', text: '"Shapes"'},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 5},
toolchain/parse/testdata/packages/import/ordering.carbon
Vendored
+5 -5
View File
@@ -29,10 +29,10 @@ import B;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
@@ -43,7 +43,7 @@ import B;
// CHECK:STDOUT: {kind: 'LibraryName', text: '"after_library"'},
// CHECK:STDOUT: {kind: 'LibraryDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
@@ -51,10 +51,10 @@ import B;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'B'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/import/semi_before.carbon
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ import Bar;
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 4},
// CHECK:STDOUT: {kind: 'EmptyDecl', text: ';'},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Bar'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Bar'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'EmptyDecl', text: ';'},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
toolchain/parse/testdata/packages/library/fail_too_late.carbon
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ library "[[@TEST_NAME]]";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'LibraryIntroducer', text: 'library'},
// CHECK:STDOUT: {kind: 'LibraryDecl', text: ';', has_error: yes, subtree_size: 2},
toolchain/parse/testdata/packages/package/api.carbon
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ package Geometry;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/package/api_library.carbon
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ package Geometry library "[[@TEST_NAME]]";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'LibraryName', text: '"api_library"'},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 5},
toolchain/parse/testdata/packages/package/core.carbon
Vendored
+36
View File
@@ -0,0 +1,36 @@
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
// Exceptions. See /LICENSE for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
// AUTOUPDATE
// TIP: To test this file alone, run:
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/packages/package/core.carbon
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/packages/package/core.carbon
// --- core.carbon
package Core;
// --- core_with_library.carbon
package Core library "prelude";
// CHECK:STDOUT: - filename: core.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'CorePackageName', text: 'Core'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: core_with_library.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'CorePackageName', text: 'Core'},
// CHECK:STDOUT: {kind: 'LibraryName', text: '"prelude"'},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/package/fail_after_import.carbon
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ package B;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'ImportDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', has_error: yes, subtree_size: 2},
toolchain/parse/testdata/packages/package/fail_after_package.carbon
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ package B;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'A'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 3},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', has_error: yes, subtree_size: 2},
toolchain/parse/testdata/packages/package/fail_extra_string.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ package Foo library "bar" "baz";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Foo'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Foo'},
// CHECK:STDOUT: {kind: 'LibraryName', text: '"bar"'},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', has_error: yes, subtree_size: 5},
toolchain/parse/testdata/packages/package/fail_library_is_identifier.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ package Geometry library Shapes;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'LibraryName', text: 'Shapes', has_error: yes},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', has_error: yes, subtree_size: 5},
toolchain/parse/testdata/packages/package/fail_no_semi.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ package Geometry
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: 'Geometry', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/package/fail_omit_library_keyword.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ package Geometry "Shapes";
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/package/fail_trailing_impl.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ package Geometry impl;
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/testdata/packages/package/impl.carbon
Vendored
+3 -3
View File
@@ -29,7 +29,7 @@ impl package.Name as package.Interface {}
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'ImplModifier', text: 'impl'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 4},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
@@ -38,7 +38,7 @@ impl package.Name as package.Interface {}
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'ImplModifier', text: 'impl'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'DisambiguateImpl'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'DisambiguateImpl'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ImplIntroducer', text: 'impl'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
@@ -53,7 +53,7 @@ impl package.Name as package.Interface {}
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'ImplModifier', text: 'impl'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'DisambiguateImplPackage'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'DisambiguateImplPackage'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ImplIntroducer', text: 'impl'},
// CHECK:STDOUT: {kind: 'PackageExpr', text: 'package'},
toolchain/parse/testdata/packages/package/impl_library.carbon
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ impl package Geometry library "[[@TEST_NAME]]";
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'},
// CHECK:STDOUT: {kind: 'ImplModifier', text: 'impl'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'LibraryName', text: '"impl_library"'},
// CHECK:STDOUT: {kind: 'LibrarySpecifier', text: 'library', subtree_size: 2},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 6},
toolchain/parse/testdata/packages/package/modifiers.carbon
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ extend virtual base package Geometry;
// CHECK:STDOUT: {kind: 'ExtendModifier', text: 'extend'},
// CHECK:STDOUT: {kind: 'VirtualModifier', text: 'virtual'},
// CHECK:STDOUT: {kind: 'BaseModifier', text: 'base'},
// CHECK:STDOUT: {kind: 'PackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'IdentifierPackageName', text: 'Geometry'},
// CHECK:STDOUT: {kind: 'PackageDecl', text: ';', subtree_size: 6},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parse/tree.h
+2 -1
View File
@@ -84,7 +84,8 @@ class Tree : public Printable<Tree> {
// to the node for diagnostics.
struct PackagingNames {
ImportDeclId node_id;
IdentifierId package_id = IdentifierId::None;
PackageNameId package_id = PackageNameId::None;
// TODO: Move LibraryNameId to Base and use it here.
StringLiteralValueId library_id = StringLiteralValueId::None;
// Whether an import is exported. This is on the file's packaging
// declaration even though it doesn't apply, for consistency in structure.
toolchain/parse/typed_nodes.h
+11 -3
View File
@@ -200,8 +200,16 @@ struct DeclName {
using PackageExpr =
LeafNode<NodeKind::PackageExpr, Lex::PackageTokenIndex, NodeCategory::Expr>;
// The `Core` keyword in an expression.
using CoreNameExpr =
LeafNode<NodeKind::CoreNameExpr, Lex::CoreTokenIndex, NodeCategory::Expr>;
// The name of a package or library for `package`, `import`, and `library`.
using PackageName = LeafNode<NodeKind::PackageName, Lex::IdentifierTokenIndex>;
using IdentifierPackageName =
LeafNode<NodeKind::IdentifierPackageName, Lex::IdentifierTokenIndex,
NodeCategory::PackageName>;
using CorePackageName = LeafNode<NodeKind::CorePackageName, Lex::CoreTokenIndex,
NodeCategory::PackageName>;
using LibraryName =
LeafNode<NodeKind::LibraryName, Lex::StringLiteralTokenIndex>;
using DefaultLibrary =
@@ -228,7 +236,7 @@ struct PackageDecl {
PackageIntroducerId introducer;
llvm::SmallVector<AnyModifierId> modifiers;
std::optional<PackageNameId> name;
std::optional<AnyPackageNameId> name;
std::optional<LibrarySpecifierId> library;
Lex::SemiTokenIndex token;
};
@@ -242,7 +250,7 @@ struct ImportDecl {
ImportIntroducerId introducer;
llvm::SmallVector<AnyModifierId> modifiers;
std::optional<PackageNameId> name;
std::optional<AnyPackageNameId> name;
std::optional<LibrarySpecifierId> library;
Lex::SemiTokenIndex token;
};