carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +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/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: ]