mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 19:50:14 +01:00
Implements proposal #7016: `self` moves from the deduced implicit list (`fn F[self: Self]()`) to the front of the explicit list. Its type may be written explicitly (`fn F(self: Self)`) or omitted, in which case it defaults to `Self` (`fn F(self)`, `fn F(ref self)`); `self` in the implicit list is rejected. Throughout checking, `self` is modeled as the first explicit parameter. Because a method is just a function whose first parameter is `self`, it can also be called as an ordinary function with the receiver passed explicitly (`Type.M(obj, ...)`), not only as `obj.M(...)`. A new `SemIR::CallArgParamPatterns` helper chooses the parameters matched against the explicit arguments, excluding a leading `self` only when it is supplied as a method-call receiver; arity checking, conversion, and generic deduction use it. The resulting SemIR and lowering are unchanged: `self` is still `call_param0`, and witnesses, thunks, and vtables are unaffected. An omitted `self` type is parsed as a `SelfBindingPattern` node with no type expression; checking synthesizes the `Self` type so it behaves exactly like `self: Self`. However, the exact spelling used must match between a forward declaration and a definition, following #3763's rules around declaration matching. Generated functions, thunks, and C++ interop import/export build `self` as the first explicit parameter, and the `self`-type override (e.g. Derived->Base for a virtual override) applies to the explicit `self`. Placement is validated by new diagnostics: `SelfInImplicitParamList`, `SelfNotFirstParam`, and `SelfOutsideParamList`. The benchmark source generator and the documentation adopt the `(self)` shorthand; the prelude, the examples, and the test data are migrated in the following commits. Assisted-by: Claude Code with Claude Opus 4.7 --------- Co-authored-by: josh11b <15258583+josh11b@users.noreply.github.com>
184 lines
4.4 KiB
Plaintext
184 lines
4.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
|
|
|
|
library "io_utils";
|
|
|
|
import Core library "io";
|
|
import Core library "range";
|
|
|
|
class EOFType {}
|
|
|
|
class CharOrEOF {
|
|
adapt i32;
|
|
|
|
fn EOF() -> Self;
|
|
}
|
|
|
|
impl CharOrEOF as Core.Copy {
|
|
fn Op(self) -> Self {
|
|
return (self as i32).(Core.Copy.Op)() as Self;
|
|
}
|
|
}
|
|
|
|
fn CharOrEOF.EOF() -> Self {
|
|
// Ordering between `CharOrEOF` and `char` treats EOF as less than all `char`
|
|
// values.
|
|
return (-1 as i32) as CharOrEOF;
|
|
}
|
|
|
|
impl forall [U:! Core.ImplicitAs(char)] U as Core.ImplicitAs(CharOrEOF) {
|
|
fn Convert(self: char) -> CharOrEOF {
|
|
return ((self as u8) as i32) as CharOrEOF;
|
|
}
|
|
}
|
|
|
|
impl forall [U:! Core.ImplicitAs(CharOrEOF)]
|
|
CharOrEOF as Core.EqWith(U) {
|
|
fn Equal(self, other: CharOrEOF) -> bool {
|
|
return (self as i32) == (other as i32);
|
|
}
|
|
fn NotEqual(self, other: CharOrEOF) -> bool {
|
|
return (self as i32) != (other as i32);
|
|
}
|
|
}
|
|
|
|
impl forall [U:! Core.ImplicitAs(CharOrEOF)]
|
|
CharOrEOF as Core.OrderedWith(U) {
|
|
fn Less(self, other: CharOrEOF) -> bool {
|
|
return (self as i32) < (other as i32);
|
|
}
|
|
fn LessOrEquivalent(self, other: CharOrEOF) -> bool {
|
|
return (self as i32) <= (other as i32);
|
|
}
|
|
fn Greater(self, other: CharOrEOF) -> bool {
|
|
return (self as i32) > (other as i32);
|
|
}
|
|
fn GreaterOrEquivalent(self, other: CharOrEOF) -> bool {
|
|
return (self as i32) >= (other as i32);
|
|
}
|
|
}
|
|
|
|
impl forall [U:! Core.ImplicitAs(char)]
|
|
CharOrEOF as Core.SubWith(U) where .Result = i32 {
|
|
fn Op(self, other: char) -> i32 {
|
|
return (self as i32) - ((other as u8) as i32);
|
|
}
|
|
}
|
|
|
|
var unread_char: Core.Optional(CharOrEOF)
|
|
= Core.Optional(CharOrEOF).None();
|
|
|
|
fn ReadChar() -> CharOrEOF {
|
|
if (unread_char.HasValue()) {
|
|
var result: CharOrEOF = unread_char.Get();
|
|
unread_char = Core.Optional(CharOrEOF).None();
|
|
return result;
|
|
}
|
|
|
|
var value: i32 = Core.ReadChar();
|
|
if (value == Core.EOF()) {
|
|
return CharOrEOF.EOF();
|
|
} else {
|
|
return value as CharOrEOF;
|
|
}
|
|
}
|
|
|
|
fn UnreadChar(c: CharOrEOF) {
|
|
// TODO: assert(unread_char == 0);
|
|
// TODO: unread_char = c;
|
|
unread_char = Core.Optional(CharOrEOF).Some(c);
|
|
}
|
|
|
|
fn PeekChar() -> CharOrEOF {
|
|
var next: CharOrEOF = ReadChar();
|
|
UnreadChar(next);
|
|
return next;
|
|
}
|
|
|
|
fn ConsumeChar(c: char) -> bool {
|
|
var next: CharOrEOF = ReadChar();
|
|
if (next != c) {
|
|
UnreadChar(next);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
fn ReadInt[N:! Core.IntLiteral](ref p: Core.Int(N)) -> bool {
|
|
var read_any_digits: bool = false;
|
|
let negative: bool = ConsumeChar('-');
|
|
// TODO: `p = 0;` crashes the toolchain, see
|
|
// https://github.com/carbon-language/carbon-lang/issues/6500.
|
|
p = (0 as i32) as Core.Int(N);
|
|
|
|
while (true) {
|
|
var c: CharOrEOF = ReadChar();
|
|
if (c < '0' or c > '9') {
|
|
UnreadChar(c);
|
|
break;
|
|
}
|
|
// TODO: Check for overflow.
|
|
// TODO: p *= 10; crashes the toolchain.
|
|
p *= (10 as i32) as Core.Int(N);
|
|
p += (c - '0') as Core.Int(N);
|
|
read_any_digits = true;
|
|
}
|
|
if (negative) {
|
|
p = -p;
|
|
if (not read_any_digits) {
|
|
UnreadChar('-');
|
|
}
|
|
}
|
|
return read_any_digits;
|
|
}
|
|
|
|
fn PrintIntNoNewline[N:! Core.IntLiteral](n_val: Core.Int(N)) {
|
|
// TODO: var pow10: Core.Int(N) = 1; crashes the toolchain.
|
|
var pow10: Core.Int(N) = (1 as i32) as Core.Int(N);
|
|
var n: Core.Int(N) = n_val;
|
|
// TODO: let ten: Core.Int(N) = 10;
|
|
let ten: Core.Int(N) = (10 as i32) as Core.Int(N);
|
|
while (n / ten >= pow10) {
|
|
pow10 = pow10 * ten;
|
|
}
|
|
// TODO: while (pow10 != 0) {
|
|
while (pow10 != ((0 as i32) as Core.Int(N))) {
|
|
let d: Core.Int(N) = n / pow10;
|
|
// TODO: Core.PrintChar('0' + d);
|
|
Core.PrintChar(((d as u8) + (('0' as char) as u8)) as char);
|
|
n = n % pow10;
|
|
pow10 = pow10 / ten;
|
|
}
|
|
}
|
|
|
|
fn PrintInt[N:! Core.IntLiteral](n_val: Core.Int(N)) {
|
|
PrintIntNoNewline(n_val);
|
|
Core.PrintChar('\n');
|
|
}
|
|
|
|
fn SkipSpaces() -> bool {
|
|
var skipped_any_spaces: bool = false;
|
|
while (ConsumeChar(' ')) {
|
|
skipped_any_spaces = true;
|
|
}
|
|
return skipped_any_spaces;
|
|
}
|
|
|
|
fn SkipNewline() -> bool {
|
|
// Optional carriage return.
|
|
ConsumeChar('\r');
|
|
// Newline.
|
|
// TODO: Unread the CR if it was present?
|
|
return ConsumeChar('\n');
|
|
}
|
|
|
|
fn SkipNChars(n: i32) -> bool {
|
|
for (_: i32 in Core.Range(n)) {
|
|
if (ReadChar() == CharOrEOF.EOF()) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|