mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 22:02:52 +01:00
Richard Smith
67d5446b03
Rather than just adding `Self` to the lexical scope, add it to the class's name scope so that it is visible in later lexical scopes for the same class -- in particular, for out-of-line definitions of members. Also switch some tests in `check/testdata/class` over to making idiomatic use of `Self` both inside a class and out-of-line, now that it works more consistently. Note that this does not permit using `Class.Self`, but only because we don't yet support keyword names after `.` at all. If that changed, one could use `Class.Self` to redundantly refer to `Class`. Whether we allow that is left to a future decision.
70 lines
3.2 KiB
Plaintext
70 lines
3.2 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
|
|
//
|
|
// AUTOUPDATE
|
|
|
|
// CHECK:STDERR: fail_todo_generic_method.carbon:[[@LINE+3]]:1: ERROR: Semantics TODO: `generic class`.
|
|
// CHECK:STDERR: class Class(T:! type) {
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~
|
|
class Class(T:! type) {
|
|
var a: T;
|
|
fn F[self: Self](n: T);
|
|
}
|
|
|
|
// CHECK:STDERR: fail_todo_generic_method.carbon:[[@LINE+9]]:1: ERROR: Duplicate name being declared in the same scope.
|
|
// CHECK:STDERR: fn Class(T:! type).F[self: Self](n: T) {}
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR: fail_todo_generic_method.carbon:[[@LINE-8]]:1: Name is previously declared here.
|
|
// CHECK:STDERR: class Class(T:! type) {
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR: fail_todo_generic_method.carbon:[[@LINE+3]]:19: ERROR: `fn` declarations must either end with a `;` or have a `{ ... }` block for a definition.
|
|
// CHECK:STDERR: fn Class(T:! type).F[self: Self](n: T) {}
|
|
// CHECK:STDERR: ^
|
|
fn Class(T:! type).F[self: Self](n: T) {}
|
|
|
|
// CHECK:STDOUT: --- fail_todo_generic_method.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Class: type = class_type @Class [template]
|
|
// CHECK:STDOUT: %.1: type = unbound_element_type Class, T [symbolic]
|
|
// CHECK:STDOUT: %.2: type = struct_type {.a: T} [symbolic]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {
|
|
// CHECK:STDOUT: .Class = %Class.decl
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT: %Class.decl = class_decl @Class {
|
|
// CHECK:STDOUT: %T.loc10_13.1: type = param T
|
|
// CHECK:STDOUT: %T.loc10_13.2: type = bind_symbolic_name T, %T.loc10_13.1 [symbolic]
|
|
// CHECK:STDOUT: } [template = constants.%Class]
|
|
// CHECK:STDOUT: %.loc24: <function> = fn_decl @.1 {
|
|
// CHECK:STDOUT: %T.loc24_10.1: type = param T
|
|
// CHECK:STDOUT: @.1.%T: type = bind_symbolic_name T, %T.loc24_10.1 [symbolic]
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Class {
|
|
// CHECK:STDOUT: %T.ref.loc11: type = name_ref T, file.%T.loc10_13.2 [symbolic = file.%T.loc10_13.2]
|
|
// CHECK:STDOUT: %.loc11: <unbound element of class Class> = field_decl a, element0 [template]
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F {
|
|
// CHECK:STDOUT: %Self.ref: type = name_ref Self, constants.%Class [template = constants.%Class]
|
|
// CHECK:STDOUT: %self.loc12_8.1: Class = param self
|
|
// CHECK:STDOUT: %self.loc12_8.2: Class = bind_name self, %self.loc12_8.1
|
|
// CHECK:STDOUT: %T.ref.loc12: type = name_ref T, file.%T.loc10_13.2 [symbolic = file.%T.loc10_13.2]
|
|
// CHECK:STDOUT: %n.loc12_20.1: T = param n
|
|
// CHECK:STDOUT: %n.loc12_20.2: T = bind_name n, %n.loc12_20.1
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%Class
|
|
// CHECK:STDOUT: .a = %.loc11
|
|
// CHECK:STDOUT: .F = %F
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F[@Class.%self.loc12_8.2: Class](@Class.%n.loc12_20.2: T);
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @.1(%T: type);
|
|
// CHECK:STDOUT:
|