mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +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.
117 lines
5.8 KiB
Plaintext
117 lines
5.8 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_modifiers.carbon:[[@LINE+9]]:1: ERROR: Semantics TODO: `access modifier`.
|
|
// CHECK:STDERR: private abstract private class DuplicatePrivate;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:18: ERROR: `private` repeated on declaration.
|
|
// CHECK:STDERR: private abstract private class DuplicatePrivate;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: `private` previously appeared here.
|
|
// CHECK:STDERR: private abstract private class DuplicatePrivate;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
private abstract private class DuplicatePrivate;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+9]]:1: ERROR: Semantics TODO: `access modifier`.
|
|
// CHECK:STDERR: private base protected class TwoAccess {}
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:14: ERROR: `protected` not allowed on declaration with `private`.
|
|
// CHECK:STDERR: private base protected class TwoAccess {}
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: `private` previously appeared here.
|
|
// CHECK:STDERR: private base protected class TwoAccess {}
|
|
// CHECK:STDERR: ^~~~~~~
|
|
private base protected class TwoAccess {}
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:10: ERROR: `abstract` repeated on declaration.
|
|
// CHECK:STDERR: abstract abstract class TwoAbstract;
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: `abstract` previously appeared here.
|
|
// CHECK:STDERR: abstract abstract class TwoAbstract;
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
abstract abstract class TwoAbstract;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+12]]:1: ERROR: `protected` not allowed on `class` declaration at file scope, `protected` is only allowed on class members.
|
|
// CHECK:STDERR: protected virtual base class Virtual {}
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+9]]:11: ERROR: `virtual` not allowed on `class` declaration.
|
|
// CHECK:STDERR: protected virtual base class Virtual {}
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:19: ERROR: `base` not allowed on declaration with `virtual`.
|
|
// CHECK:STDERR: protected virtual base class Virtual {}
|
|
// CHECK:STDERR: ^~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:11: `virtual` previously appeared here.
|
|
// CHECK:STDERR: protected virtual base class Virtual {}
|
|
// CHECK:STDERR: ^~~~~~~
|
|
protected virtual base class Virtual {}
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:10: ERROR: `protected` must appear before `abstract`.
|
|
// CHECK:STDERR: abstract protected class WrongOrder;
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: `abstract` previously appeared here.
|
|
// CHECK:STDERR: abstract protected class WrongOrder;
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
abstract protected class WrongOrder;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:10: ERROR: `base` not allowed on declaration with `abstract`.
|
|
// CHECK:STDERR: abstract base class AbstractAndBase {}
|
|
// CHECK:STDERR: ^~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: `abstract` previously appeared here.
|
|
// CHECK:STDERR: abstract base class AbstractAndBase {}
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
abstract base class AbstractAndBase {}
|
|
|
|
// CHECK:STDOUT: --- fail_modifiers.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %DuplicatePrivate: type = class_type @DuplicatePrivate [template]
|
|
// CHECK:STDOUT: %TwoAccess: type = class_type @TwoAccess [template]
|
|
// CHECK:STDOUT: %.1: type = struct_type {} [template]
|
|
// CHECK:STDOUT: %TwoAbstract: type = class_type @TwoAbstract [template]
|
|
// CHECK:STDOUT: %Virtual: type = class_type @Virtual [template]
|
|
// CHECK:STDOUT: %WrongOrder: type = class_type @WrongOrder [template]
|
|
// CHECK:STDOUT: %AbstractAndBase: type = class_type @AbstractAndBase [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {
|
|
// CHECK:STDOUT: .DuplicatePrivate = %DuplicatePrivate.decl
|
|
// CHECK:STDOUT: .TwoAccess = %TwoAccess.decl
|
|
// CHECK:STDOUT: .TwoAbstract = %TwoAbstract.decl
|
|
// CHECK:STDOUT: .Virtual = %Virtual.decl
|
|
// CHECK:STDOUT: .WrongOrder = %WrongOrder.decl
|
|
// CHECK:STDOUT: .AbstractAndBase = %AbstractAndBase.decl
|
|
// CHECK:STDOUT: } [template]
|
|
// CHECK:STDOUT: %DuplicatePrivate.decl = class_decl @DuplicatePrivate {} [template = constants.%DuplicatePrivate]
|
|
// CHECK:STDOUT: %TwoAccess.decl = class_decl @TwoAccess {} [template = constants.%TwoAccess]
|
|
// CHECK:STDOUT: %TwoAbstract.decl = class_decl @TwoAbstract {} [template = constants.%TwoAbstract]
|
|
// CHECK:STDOUT: %Virtual.decl = class_decl @Virtual {} [template = constants.%Virtual]
|
|
// CHECK:STDOUT: %WrongOrder.decl = class_decl @WrongOrder {} [template = constants.%WrongOrder]
|
|
// CHECK:STDOUT: %AbstractAndBase.decl = class_decl @AbstractAndBase {} [template = constants.%AbstractAndBase]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @DuplicatePrivate;
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @TwoAccess {
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%TwoAccess
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @TwoAbstract;
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Virtual {
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%Virtual
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @WrongOrder;
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @AbstractAndBase {
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Self = constants.%AbstractAndBase
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|