mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +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.
123 lines
6.0 KiB
Plaintext
123 lines
6.0 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
|
|
|
|
abstract class Abstract {
|
|
var a: i32;
|
|
}
|
|
|
|
class Derived {
|
|
extend base: Abstract;
|
|
|
|
var d: i32;
|
|
}
|
|
|
|
fn Make() -> Derived {
|
|
// TODO: This should be valid, and should construct an instance of `partial Abstract` as the base.
|
|
// CHECK:STDERR: fail_abstract.carbon:[[@LINE+3]]:19: ERROR: Cannot construct instance of abstract class. Consider using `partial Abstract` instead.
|
|
// CHECK:STDERR: return {.base = {.a = 1}, .d = 7};
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
return {.base = {.a = 1}, .d = 7};
|
|
}
|
|
|
|
fn Access(d: Derived) -> (i32, i32) {
|
|
return (d.d, d.base.a);
|
|
}
|
|
|
|
// CHECK:STDOUT: --- fail_abstract.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Abstract: type = class_type @Abstract [template]
|
|
// CHECK:STDOUT: %.1: type = unbound_element_type Abstract, i32 [template]
|
|
// CHECK:STDOUT: %.2: type = struct_type {.a: i32} [template]
|
|
// CHECK:STDOUT: %Derived: type = class_type @Derived [template]
|
|
// CHECK:STDOUT: %.3: type = ptr_type {.a: i32} [template]
|
|
// CHECK:STDOUT: %.4: type = unbound_element_type Derived, Abstract [template]
|
|
// CHECK:STDOUT: %.5: type = unbound_element_type Derived, i32 [template]
|
|
// CHECK:STDOUT: %.6: type = struct_type {.base: Abstract, .d: i32} [template]
|
|
// CHECK:STDOUT: %.7: type = struct_type {.base: {.a: i32}*, .d: i32} [template]
|
|
// CHECK:STDOUT: %.8: type = ptr_type {.base: {.a: i32}*, .d: i32} [template]
|
|
// CHECK:STDOUT: %.9: type = ptr_type {.base: Abstract, .d: i32} [template]
|
|
// CHECK:STDOUT: %.10: i32 = int_literal 1 [template]
|
|
// CHECK:STDOUT: %.11: i32 = int_literal 7 [template]
|
|
// CHECK:STDOUT: %.12: type = struct_type {.base: {.a: i32}, .d: i32} [template]
|
|
// CHECK:STDOUT: %.13: type = tuple_type (type, type) [template]
|
|
// CHECK:STDOUT: %.14: type = tuple_type (i32, i32) [template]
|
|
// CHECK:STDOUT: %.15: type = ptr_type (i32, i32) [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {
|
|
// CHECK:STDOUT: .Abstract = %Abstract.decl
|
|
// CHECK:STDOUT: .Derived = %Derived.decl
|
|
// CHECK:STDOUT: .Make = %Make
|
|
// CHECK:STDOUT: .Access = %Access
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT: %Abstract.decl = class_decl @Abstract {} [template = constants.%Abstract]
|
|
// CHECK:STDOUT: %Derived.decl = class_decl @Derived {} [template = constants.%Derived]
|
|
// CHECK:STDOUT: %Make: <function> = fn_decl @Make {
|
|
// CHECK:STDOUT: %Derived.ref.loc17: type = name_ref Derived, %Derived.decl [template = constants.%Derived]
|
|
// CHECK:STDOUT: @Make.%return: ref Derived = var <return slot>
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT: %Access: <function> = fn_decl @Access {
|
|
// CHECK:STDOUT: %Derived.ref.loc25: type = name_ref Derived, %Derived.decl [template = constants.%Derived]
|
|
// CHECK:STDOUT: %d.loc25_11.1: Derived = param d
|
|
// CHECK:STDOUT: @Access.%d: Derived = bind_name d, %d.loc25_11.1
|
|
// CHECK:STDOUT: %.loc25_35.1: (type, type) = tuple_literal (i32, i32)
|
|
// CHECK:STDOUT: %.loc25_35.2: type = converted %.loc25_35.1, constants.%.14 [template = constants.%.14]
|
|
// CHECK:STDOUT: @Access.%return: ref (i32, i32) = var <return slot>
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Abstract {
|
|
// CHECK:STDOUT: %.loc8: <unbound element of class Abstract> = field_decl a, element0 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%Abstract
|
|
// CHECK:STDOUT: .a = %.loc8
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Derived {
|
|
// CHECK:STDOUT: %Abstract.ref: type = name_ref Abstract, file.%Abstract.decl [template = constants.%Abstract]
|
|
// CHECK:STDOUT: %.loc12: <unbound element of class Derived> = base_decl Abstract, element0 [template]
|
|
// CHECK:STDOUT: %.loc14: <unbound element of class Derived> = field_decl d, element1 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%Derived
|
|
// CHECK:STDOUT: .base = %.loc12
|
|
// CHECK:STDOUT: .d = %.loc14
|
|
// CHECK:STDOUT: extend name_scope1
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Make() -> %return: Derived {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %.loc22_25: i32 = int_literal 1 [template = constants.%.10]
|
|
// CHECK:STDOUT: %.loc22_26: {.a: i32} = struct_literal (%.loc22_25)
|
|
// CHECK:STDOUT: %.loc22_34: i32 = int_literal 7 [template = constants.%.11]
|
|
// CHECK:STDOUT: %.loc22_35: {.base: {.a: i32}, .d: i32} = struct_literal (%.loc22_26, %.loc22_34)
|
|
// CHECK:STDOUT: return <error>
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Access(%d: Derived) -> %return: (i32, i32) {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %d.ref.loc26_11: Derived = name_ref d, %d
|
|
// CHECK:STDOUT: %.loc26_12.1: ref i32 = class_element_access %d.ref.loc26_11, element1
|
|
// CHECK:STDOUT: %.loc26_12.2: i32 = bind_value %.loc26_12.1
|
|
// CHECK:STDOUT: %d.ref.loc26_16: Derived = name_ref d, %d
|
|
// CHECK:STDOUT: %.loc26_17.1: ref Abstract = class_element_access %d.ref.loc26_16, element0
|
|
// CHECK:STDOUT: %.loc26_17.2: Abstract = bind_value %.loc26_17.1
|
|
// CHECK:STDOUT: %.loc26_22.1: ref i32 = class_element_access %.loc26_17.2, element0
|
|
// CHECK:STDOUT: %.loc26_22.2: i32 = bind_value %.loc26_22.1
|
|
// CHECK:STDOUT: %.loc26_24.1: (i32, i32) = tuple_literal (%.loc26_12.2, %.loc26_22.2)
|
|
// CHECK:STDOUT: %.loc26_24.2: ref i32 = tuple_access %return, element0
|
|
// CHECK:STDOUT: %.loc26_24.3: init i32 = initialize_from %.loc26_12.2 to %.loc26_24.2
|
|
// CHECK:STDOUT: %.loc26_24.4: ref i32 = tuple_access %return, element1
|
|
// CHECK:STDOUT: %.loc26_24.5: init i32 = initialize_from %.loc26_22.2 to %.loc26_24.4
|
|
// CHECK:STDOUT: %.loc26_24.6: init (i32, i32) = tuple_init (%.loc26_24.3, %.loc26_24.5) to %return
|
|
// CHECK:STDOUT: %.loc26_24.7: init (i32, i32) = converted %.loc26_24.1, %.loc26_24.6
|
|
// CHECK:STDOUT: return %.loc26_24.7
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|