mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-06 08:14:43 +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:
Vendored
+13
-13
@@ -353,7 +353,7 @@ class RE2 {
|
||||
fn FindAndConsumeN(input: StringPiece*, re: RE2,
|
||||
args: Array(const Arg*), n: i32) -> bool;
|
||||
|
||||
private fn Apply[template F:! type, SP:! type](f: F, sp: SP, re: Self) {
|
||||
private fn Apply[template F: type, SP: type](f: F, sp: SP, re: Self) {
|
||||
return f(sp, re, nullptr, 0);
|
||||
}
|
||||
|
||||
@@ -671,7 +671,7 @@ class RE2 {
|
||||
|
||||
// For now, make the default budget something close to Code Search.
|
||||
// TODO: How to define a class-scope constant?
|
||||
let kDefaultMaxMem:! i32 = 8 << 20;
|
||||
let generic kDefaultMaxMem: i32 = 8 << 20;
|
||||
|
||||
enum Encoding {
|
||||
EncodingUTF8 = 1,
|
||||
@@ -762,9 +762,9 @@ class RE2 {
|
||||
// Argument converters; see below.
|
||||
// TODO: Should these be package members not class members in Carbon
|
||||
// so you use `RE2.Hex` not `RE2.RE2.Hex`?
|
||||
fn CRadix[T:! Parse4ary](ptr: T*) -> Self.Arg;
|
||||
fn Hex[T:! Parse4ary](ptr: T*) -> Self.Arg;
|
||||
fn Octal[T:! Parse4ary](ptr: T*) -> Self.Arg;
|
||||
fn CRadix[T: Parse4ary](ptr: T*) -> Self.Arg;
|
||||
fn Hex[T: Parse4ary](ptr: T*) -> Self.Arg;
|
||||
fn Octal[T: Parse4ary](ptr: T*) -> Self.Arg;
|
||||
|
||||
private fn Init(addr self: Self, pattern: StringPiece, options: Options);
|
||||
|
||||
@@ -856,17 +856,17 @@ class RE2.Arg {
|
||||
fn Parse(ref self, str: StringView, n: i64) -> bool;
|
||||
}
|
||||
match_first {
|
||||
impl [T:! Parse3ary] T as Parseable {
|
||||
impl [T: Parse3ary] T as Parseable {
|
||||
fn Parse(ref self, str: StringView, n: i64) -> bool {
|
||||
return T.Parse(str, n, self);
|
||||
}
|
||||
}
|
||||
impl [T:! Parse4ary] T as Parseable {
|
||||
impl [T: Parse4ary] T as Parseable {
|
||||
fn Parse(ref self, str: StringView, n: i64) -> bool {
|
||||
return T.Parse(str, n, self, 10);
|
||||
}
|
||||
}
|
||||
impl [T:! ParseFrom] T as Parseable {
|
||||
impl [T: ParseFrom] T as Parseable {
|
||||
fn Parse(ref self, str: StringView, n: i64) -> bool {
|
||||
if (self == nullptr) { return true; }
|
||||
return T.Parse(str, n, self);
|
||||
@@ -881,7 +881,7 @@ class RE2.Arg {
|
||||
}
|
||||
}
|
||||
|
||||
fn Make[T:! Parseable](ptr: T*) {
|
||||
fn Make[T: Parseable](ptr: T*) {
|
||||
return {.type_ = T, .arg_ = ptr};
|
||||
}
|
||||
|
||||
@@ -894,7 +894,7 @@ class RE2.Arg {
|
||||
private var arg_: Nullable(type_*);
|
||||
}
|
||||
|
||||
private adapter ParseAsBase(T:! Parse4ary, base: i32) for T {
|
||||
private adapter ParseAsBase(T: Parse4ary, base: i32) for T {
|
||||
impl as Self.Arg.Parseable {
|
||||
fn Parse(ref self, str: StringView, n: i64) -> bool {
|
||||
return T.Parse(str, n, self, base);
|
||||
@@ -902,15 +902,15 @@ private adapter ParseAsBase(T:! Parse4ary, base: i32) for T {
|
||||
}
|
||||
}
|
||||
|
||||
fn RE2.CRadix[T:! Parse4ary](ptr: T*) -> Self.Arg {
|
||||
fn RE2.CRadix[T: Parse4ary](ptr: T*) -> Self.Arg {
|
||||
return Self.Arg.Make(ptr as ParseAsBase(T, 0)*);
|
||||
}
|
||||
|
||||
fn RE2.Hex[T:! Parse4ary](ptr: T*) -> Self.Arg {
|
||||
fn RE2.Hex[T: Parse4ary](ptr: T*) -> Self.Arg {
|
||||
return Self.Arg.Make(ptr as ParseAsBase(T, 16)*);
|
||||
}
|
||||
|
||||
fn RE2.Octal[T:! Parse4ary](ptr: T*) -> Self.Arg {
|
||||
fn RE2.Octal[T: Parse4ary](ptr: T*) -> Self.Arg {
|
||||
return Self.Arg.Make(ptr as ParseAsBase(T, 8)*);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user