mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 19:01:05 +01:00
Replace :! binding syntax with phase keywords and contextual defaults (#7479)
Implement the toolchain side of proposal #7254, removing the `:!` binding syntax for generic and template parameters in favor of the keywords `generic`, `template`, and `runtime` plus contextual defaults for phase. For valid programs this is semantics-preserving: each binding resolves to the same phase, and produces the same SemIR, as it did under `:!`/`:`. The parser derives a binding's phase from its syntactic context plus any explicit phase keyword; new diagnostics and error recovery for misused keywords are described below. Implementation details for each component: - Lexer: remove the `:!` (`ColonExclaim`) token, move its virtual parse-node budget onto `:`, and add the `generic` and `runtime` keywords. - Parser: thread a `BindingContext` (`ExplicitParam`, `DeducedParam`, or `CompileTimeEntityParam`) from declaration introducers down through parameter lists to each binding pattern, using a one-token lookahead to distinguish a name-qualifier parameter list from a declaration's own final list. Parameters of a compile-time entity (`class`, `interface`, `constraint`, `choice`, `alias`, `export`, `namespace`) and deduced `[]` parameters default to checked generic; explicit function parameters and local bindings default to runtime. `HandleBindingPattern` resolves the phase from that context plus the keyword: a `generic` keyword needs no node of its own (the phase is carried by the binding's node kind), while a `runtime` keyword is preserved as a `RuntimeBindingName` node so `check` can name it in a diagnostic. A phase keyword that is merely redundant with the contextual default is diagnosed here, without invalidating the parse tree. - Check: a phase keyword that is invalid for its context (for example `runtime` on a checked-generic parameter) is diagnosed here, and recovers by building an error binding that still introduces the name so that later uses of it do not produce cascading errors. The removed `:!` syntax is now rejected as an ordinary parse error. The `form`/`:?`/`->?` ("extended types") portion of proposal #7254 is left for a separate change. Assisted-by: Claude Code
This commit is contained in:
Chandler Carruth
@@ -13,9 +13,9 @@
|
||||
library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
let T:! type;
|
||||
final let I:! i32;
|
||||
default let D:! bool;
|
||||
let T: type;
|
||||
final let I: i32;
|
||||
default let D: bool;
|
||||
}
|
||||
|
||||
// --- initializer.carbon
|
||||
@@ -23,9 +23,9 @@ interface I {
|
||||
library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
let T:! type = (i32, i32);
|
||||
final let I:! i32 = 42;
|
||||
default let D:! bool = false;
|
||||
let T: type = (i32, i32);
|
||||
final let I: i32 = 42;
|
||||
default let D: bool = false;
|
||||
}
|
||||
|
||||
// CHECK:STDOUT: - filename: associated_constants.carbon
|
||||
@@ -40,19 +40,19 @@ interface I {
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantIntroducer', text: 'let'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'T'},
|
||||
// CHECK:STDOUT: {kind: 'TypeTypeLiteral', text: 'type'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':!', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', subtree_size: 5},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantIntroducer', text: 'let'},
|
||||
// CHECK:STDOUT: {kind: 'FinalModifier', text: 'final'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'I'},
|
||||
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':!', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', subtree_size: 6},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantIntroducer', text: 'let'},
|
||||
// CHECK:STDOUT: {kind: 'DefaultModifier', text: 'default'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'D'},
|
||||
// CHECK:STDOUT: {kind: 'BoolTypeLiteral', text: 'bool'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':!', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', subtree_size: 6},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 21},
|
||||
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
||||
@@ -69,7 +69,7 @@ interface I {
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantIntroducer', text: 'let'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'T'},
|
||||
// CHECK:STDOUT: {kind: 'TypeTypeLiteral', text: 'type'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':!', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantInitializer', text: '='},
|
||||
// CHECK:STDOUT: {kind: 'TupleLiteralStart', text: '('},
|
||||
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
|
||||
@@ -81,7 +81,7 @@ interface I {
|
||||
// CHECK:STDOUT: {kind: 'FinalModifier', text: 'final'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'I'},
|
||||
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':!', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantInitializer', text: '='},
|
||||
// CHECK:STDOUT: {kind: 'IntLiteral', text: '42'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', subtree_size: 8},
|
||||
@@ -89,7 +89,7 @@ interface I {
|
||||
// CHECK:STDOUT: {kind: 'DefaultModifier', text: 'default'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'D'},
|
||||
// CHECK:STDOUT: {kind: 'BoolTypeLiteral', text: 'bool'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':!', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantInitializer', text: '='},
|
||||
// CHECK:STDOUT: {kind: 'BoolLiteralFalse', text: 'false'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', subtree_size: 8},
|
||||
|
||||
+68
-17
@@ -14,10 +14,10 @@ library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_tuple_pattern.carbon:[[@LINE+4]]:7: error: expected identifier in associated constant declaration [ExpectedAssociatedConstantIdentifier]
|
||||
// CHECK:STDERR: let (T:! type, U:! type);
|
||||
// CHECK:STDERR: let (T: type, U: type);
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
let (T:! type, U:! type);
|
||||
let (T: type, U: type);
|
||||
}
|
||||
|
||||
// --- fail_tuple_pattern_with_default.carbon
|
||||
@@ -26,10 +26,10 @@ library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_tuple_pattern_with_default.carbon:[[@LINE+4]]:15: error: expected identifier in associated constant declaration [ExpectedAssociatedConstantIdentifier]
|
||||
// CHECK:STDERR: default let (T:! type, U:! type) = ({}, {});
|
||||
// CHECK:STDERR: default let (T: type, U: type) = ({}, {});
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
default let (T:! type, U:! type) = ({}, {});
|
||||
default let (T: type, U: type) = ({}, {});
|
||||
}
|
||||
|
||||
// --- fail_var_pattern.carbon
|
||||
@@ -38,10 +38,10 @@ library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_var_pattern.carbon:[[@LINE+4]]:7: error: expected identifier in associated constant declaration [ExpectedAssociatedConstantIdentifier]
|
||||
// CHECK:STDERR: let var T:! type;
|
||||
// CHECK:STDERR: let var T: type;
|
||||
// CHECK:STDERR: ^~~
|
||||
// CHECK:STDERR:
|
||||
let var T:! type;
|
||||
let var T: type;
|
||||
}
|
||||
|
||||
// --- fail_var_pattern_with_default.carbon
|
||||
@@ -50,10 +50,10 @@ library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_var_pattern_with_default.carbon:[[@LINE+4]]:15: error: expected identifier in associated constant declaration [ExpectedAssociatedConstantIdentifier]
|
||||
// CHECK:STDERR: default let var T:! type = {};
|
||||
// CHECK:STDERR: default let var T: type = {};
|
||||
// CHECK:STDERR: ^~~
|
||||
// CHECK:STDERR:
|
||||
default let var T:! type = {};
|
||||
default let var T: type = {};
|
||||
}
|
||||
|
||||
// --- fail_not_constant.carbon
|
||||
@@ -61,11 +61,11 @@ interface I {
|
||||
library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_not_constant.carbon:[[@LINE+4]]:8: error: found runtime binding pattern in associated constant declaration; expected a `:!` binding [ExpectedAssociatedConstantColonExclaim]
|
||||
// CHECK:STDERR: let a: {.b: ()};
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR: fail_not_constant.carbon:[[@LINE+4]]:7: error: phase keyword is not allowed on an associated constant [PhaseKeywordInAssociatedConstant]
|
||||
// CHECK:STDERR: let runtime a: {.b: ()};
|
||||
// CHECK:STDERR: ^~~~~~~
|
||||
// CHECK:STDERR:
|
||||
let a: {.b: ()};
|
||||
let runtime a: {.b: ()};
|
||||
}
|
||||
|
||||
// --- fail_template.carbon
|
||||
@@ -73,13 +73,24 @@ interface I {
|
||||
library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_template.carbon:[[@LINE+4]]:7: error: expected identifier in associated constant declaration [ExpectedAssociatedConstantIdentifier]
|
||||
// CHECK:STDERR: let template T:! type;
|
||||
// CHECK:STDERR: fail_template.carbon:[[@LINE+4]]:7: error: phase keyword is not allowed on an associated constant [PhaseKeywordInAssociatedConstant]
|
||||
// CHECK:STDERR: let template T: type;
|
||||
// CHECK:STDERR: ^~~~~~~~
|
||||
// CHECK:STDERR:
|
||||
let template T:! type;
|
||||
let template T: type;
|
||||
}
|
||||
|
||||
// --- fail_generic.carbon
|
||||
|
||||
library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_generic.carbon:[[@LINE+4]]:7: error: phase keyword is not allowed on an associated constant [PhaseKeywordInAssociatedConstant]
|
||||
// CHECK:STDERR: let generic a: type;
|
||||
// CHECK:STDERR: ^~~~~~~
|
||||
// CHECK:STDERR:
|
||||
let generic a: type;
|
||||
}
|
||||
|
||||
// --- fail_underscore.carbon
|
||||
|
||||
@@ -87,10 +98,22 @@ library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_underscore.carbon:[[@LINE+4]]:7: error: expected identifier in associated constant declaration [ExpectedAssociatedConstantIdentifier]
|
||||
// CHECK:STDERR: let _:! {};
|
||||
// CHECK:STDERR: let _: {};
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
let _:! {};
|
||||
let _: {};
|
||||
}
|
||||
|
||||
// --- fail_missing_colon.carbon
|
||||
|
||||
library "[[@TEST_NAME]]";
|
||||
|
||||
interface I {
|
||||
// CHECK:STDERR: fail_missing_colon.carbon:[[@LINE+4]]:8: error: expected `:` in associated constant declaration [ExpectedAssociatedConstantColon]
|
||||
// CHECK:STDERR: let a;
|
||||
// CHECK:STDERR: ^
|
||||
// CHECK:STDERR:
|
||||
let a;
|
||||
}
|
||||
|
||||
|
||||
@@ -180,6 +203,20 @@ interface I {
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 6},
|
||||
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: - filename: fail_generic.carbon
|
||||
// CHECK:STDOUT: parse_tree: [
|
||||
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
|
||||
// CHECK:STDOUT: {kind: 'LibraryIntroducer', text: 'library'},
|
||||
// CHECK:STDOUT: {kind: 'LibraryName', text: '"generic"'},
|
||||
// CHECK:STDOUT: {kind: 'LibraryDecl', text: ';', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'I'},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantIntroducer', text: 'let'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', has_error: yes, subtree_size: 2},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 6},
|
||||
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: - filename: fail_underscore.carbon
|
||||
// CHECK:STDOUT: parse_tree: [
|
||||
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
|
||||
@@ -194,3 +231,17 @@ interface I {
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 6},
|
||||
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
||||
// CHECK:STDOUT: ]
|
||||
// CHECK:STDOUT: - filename: fail_missing_colon.carbon
|
||||
// CHECK:STDOUT: parse_tree: [
|
||||
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
|
||||
// CHECK:STDOUT: {kind: 'LibraryIntroducer', text: 'library'},
|
||||
// CHECK:STDOUT: {kind: 'LibraryName', text: '"missing_colon"'},
|
||||
// CHECK:STDOUT: {kind: 'LibraryDecl', text: ';', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'I'},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantIntroducer', text: 'let'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', has_error: yes, subtree_size: 2},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 6},
|
||||
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
||||
// CHECK:STDOUT: ]
|
||||
|
||||
@@ -26,7 +26,7 @@ interface Z {
|
||||
|
||||
// --- impls_where.carbon
|
||||
|
||||
interface Y { let Y1:! type; }
|
||||
interface Y { let Y1: type; }
|
||||
|
||||
interface Z {
|
||||
require impls Y where .Y1 = ();
|
||||
@@ -36,7 +36,7 @@ interface Z {
|
||||
|
||||
interface Y {}
|
||||
|
||||
interface Z(T:! type) {
|
||||
interface Z(T: type) {
|
||||
require T impls Y;
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ interface Z {
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantIntroducer', text: 'let'},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'Y1'},
|
||||
// CHECK:STDOUT: {kind: 'TypeTypeLiteral', text: 'type'},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':!', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantNameAndType', text: ':', subtree_size: 3},
|
||||
// CHECK:STDOUT: {kind: 'AssociatedConstantDecl', text: ';', subtree_size: 5},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 9},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'},
|
||||
@@ -167,9 +167,9 @@ interface Z {
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameMaybeBeforeSignature', text: 'Z'},
|
||||
// CHECK:STDOUT: {kind: 'ExplicitParamListStart', text: '('},
|
||||
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'T'},
|
||||
// CHECK:STDOUT: {kind: 'CompileTimeBindingPatternStart', text: ':!', subtree_size: 2},
|
||||
// CHECK:STDOUT: {kind: 'CompileTimeBindingPatternStart', text: ':', subtree_size: 2},
|
||||
// CHECK:STDOUT: {kind: 'TypeTypeLiteral', text: 'type'},
|
||||
// CHECK:STDOUT: {kind: 'CompileTimeBindingPattern', text: ':!', subtree_size: 4},
|
||||
// CHECK:STDOUT: {kind: 'CompileTimeBindingPattern', text: ':', subtree_size: 4},
|
||||
// CHECK:STDOUT: {kind: 'ExplicitParamList', text: ')', subtree_size: 6},
|
||||
// CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 9},
|
||||
// CHECK:STDOUT: {kind: 'RequireIntroducer', text: 'require'},
|
||||
|
||||
Reference in New Issue
Block a user