mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 13:40:11 +01:00
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
139 lines
3.4 KiB
Plaintext
139 lines
3.4 KiB
Plaintext
// 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
|
|
|
|
package Core library "prelude/operators/arithmetic";
|
|
|
|
import library "prelude/types/char_literal";
|
|
import library "prelude/types/int_literal";
|
|
|
|
// TODO: Per the design, the associated type `Result` in each of these
|
|
// interfaces should have a default value of `Self`:
|
|
//
|
|
// default let Result: type = Self;
|
|
|
|
// TODO: Per the design, for each *With interface there should also be a
|
|
// non-With named constraint, such as:
|
|
//
|
|
// constraint Add {
|
|
// extend require impls AddWith(Self) where .Result = Self;
|
|
// }
|
|
|
|
// Addition: `a + b`.
|
|
interface AddWith(Other: type) {
|
|
let Result: type;
|
|
fn Op(self, other: Other) -> Result;
|
|
}
|
|
|
|
// Addition with assignment: `a += b`.
|
|
interface AddAssignWith(Other: type) {
|
|
fn Op(ref self, other: Other);
|
|
}
|
|
|
|
// Increment: `++a`.
|
|
interface Inc {
|
|
fn Op(ref self);
|
|
}
|
|
|
|
// Negation: `-a`.
|
|
interface Negate {
|
|
let Result: type;
|
|
fn Op(self) -> Result;
|
|
}
|
|
|
|
// Subtraction: `a - b`.
|
|
interface SubWith(Other: type) {
|
|
let Result: type;
|
|
fn Op(self, other: Other) -> Result;
|
|
}
|
|
|
|
// Subtraction with assignment: `a -= b`.
|
|
interface SubAssignWith(Other: type) {
|
|
fn Op(ref self, other: Other);
|
|
}
|
|
|
|
// Decrement: `--a`.
|
|
interface Dec {
|
|
fn Op(ref self);
|
|
}
|
|
|
|
// Multiplication: `a * b`.
|
|
interface MulWith(Other: type) {
|
|
let Result: type;
|
|
fn Op(self, other: Other) -> Result;
|
|
}
|
|
|
|
// Multiplication with assignment: `a *= b`.
|
|
interface MulAssignWith(Other: type) {
|
|
fn Op(ref self, other: Other);
|
|
}
|
|
|
|
// Division: `a / b`.
|
|
interface DivWith(Other: type) {
|
|
let Result: type;
|
|
fn Op(self, other: Other) -> Result;
|
|
}
|
|
|
|
// Division with assignment: `a /= b`.
|
|
interface DivAssignWith(Other: type) {
|
|
fn Op(ref self, other: Other);
|
|
}
|
|
|
|
// Modulo: `a % b`.
|
|
interface ModWith(Other: type) {
|
|
let Result: type;
|
|
fn Op(self, other: Other) -> Result;
|
|
}
|
|
|
|
// Modulo with assignment: `a %= b`.
|
|
interface ModAssignWith(Other: type) {
|
|
fn Op(ref self, other: Other);
|
|
}
|
|
|
|
|
|
// Operations for IntLiteral. These need to be here because IntLiteral has no
|
|
// associated library of its own.
|
|
impl IntLiteral as AddWith(Self) where .Result = Self {
|
|
fn Op(self, other: Self) -> Self = "int.sadd";
|
|
}
|
|
|
|
impl IntLiteral as DivWith(Self) where .Result = Self {
|
|
fn Op(self, other: Self) -> Self = "int.sdiv";
|
|
}
|
|
|
|
impl IntLiteral as ModWith(Self) where .Result = Self {
|
|
fn Op(self, other: Self) -> Self = "int.smod";
|
|
}
|
|
|
|
impl IntLiteral as MulWith(Self) where .Result = Self {
|
|
fn Op(self, other: Self) -> Self = "int.smul";
|
|
}
|
|
|
|
impl IntLiteral as Negate where .Result = Self {
|
|
fn Op(self) -> Self = "int.snegate";
|
|
}
|
|
|
|
impl IntLiteral as SubWith(Self) where .Result = Self {
|
|
fn Op(self, other: Self) -> Self = "int.ssub";
|
|
}
|
|
|
|
|
|
// Operations for CharLiteral. These need to be here because CharLiteral has no
|
|
// associated library of its own.
|
|
|
|
impl CharLiteral as AddWith(IntLiteral) where .Result = CharLiteral {
|
|
fn Op(self, other: IntLiteral) -> CharLiteral = "char_literal.add";
|
|
}
|
|
|
|
impl IntLiteral as AddWith(CharLiteral) where .Result = CharLiteral {
|
|
fn Op(self, other: CharLiteral) -> CharLiteral = "int.add_char_literal";
|
|
}
|
|
|
|
impl CharLiteral as SubWith(IntLiteral) where .Result = CharLiteral {
|
|
fn Op(self, other: IntLiteral) -> CharLiteral = "char_literal.sub_int";
|
|
}
|
|
|
|
impl CharLiteral as SubWith(Self) where .Result = IntLiteral {
|
|
fn Op(self, other: Self) -> IntLiteral = "char_literal.sub_char";
|
|
}
|