mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-30 14:45:00 +01:00
Jon Ross-Perkins
91f0c23124
Building on #3636 which handles the general import case, add special casing for namespaces. Namespaces can be combined cross-IR, so it's a little more complex. The implementation adds import_id to the Namespace instruction as a reference to find the original using the normal structure. This is achieved by moving the name_id to NameScope to free up space. --- I considered a few alternatives... I considered adding import_id to NameScope, but: 1. It's more consistent with things such as Function or Class that provide name_id on the info object rather than the instruction. 2. I thought it more likely that there would be more NameScope cases that might want a name_id rather than the import_id, since ImportRef will typically be used. I considered putting the import source (cross-ref IR id + inst id) on the NameScope versus a separate ImportRef, which seems like the strongest argument towards the NameScope approach because it removes an instruction. That just felt inconsistent though, and the overhead of instruction-per-imported-namespace should be low (theoretically few namespaces should be used). Plus I feel a bit odd adding two generally-unused ids to NameScope. A specialized Namespace structure could also have been created to store the import_id, but that would add an indirection to the NameScope.
101 lines
4.1 KiB
Plaintext
101 lines
4.1 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
|
|
|
|
class FinalClass {
|
|
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE+6]]:3: ERROR: `abstract` not allowed on `fn` declaration in a non-abstract `class` definition.
|
|
// CHECK:STDERR: abstract fn Abstract[self: Self]();
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE-5]]:1: Containing definition here.
|
|
// CHECK:STDERR: class FinalClass {
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~
|
|
abstract fn Abstract[self: Self]();
|
|
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE+6]]:3: ERROR: `virtual` not allowed on `fn` declaration in a non-abstract non-base `class` definition.
|
|
// CHECK:STDERR: virtual fn Virtual[self: Self]();
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE-13]]:1: Containing definition here.
|
|
// CHECK:STDERR: class FinalClass {
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~
|
|
virtual fn Virtual[self: Self]();
|
|
}
|
|
|
|
abstract class AbstractClass {
|
|
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE+3]]:3: ERROR: `default` not allowed on `fn` declaration outside of an interface.
|
|
// CHECK:STDERR: default fn Default[self: Self]();
|
|
// CHECK:STDERR: ^~~~~~~
|
|
default fn Default[self: Self]();
|
|
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE+3]]:3: ERROR: `final` not allowed on `fn` declaration outside of an interface.
|
|
// CHECK:STDERR: final fn Final[self: Self]();
|
|
// CHECK:STDERR: ^~~~~
|
|
final fn Final[self: Self]();
|
|
}
|
|
|
|
base class BaseClass {
|
|
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE+6]]:3: ERROR: `abstract` not allowed on `fn` declaration in a non-abstract `class` definition.
|
|
// CHECK:STDERR: abstract fn Abstract[self: Self]();
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
// CHECK:STDERR: fail_method_modifiers.carbon:[[@LINE-5]]:1: Containing definition here.
|
|
// CHECK:STDERR: base class BaseClass {
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~
|
|
abstract fn Abstract[self: Self]();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- fail_method_modifiers.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %FinalClass: type = class_type @FinalClass [template]
|
|
// CHECK:STDOUT: %.1: type = struct_type {} [template]
|
|
// CHECK:STDOUT: %AbstractClass: type = class_type @AbstractClass [template]
|
|
// CHECK:STDOUT: %BaseClass: type = class_type @BaseClass [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.FinalClass = %FinalClass.decl, .AbstractClass = %AbstractClass.decl, .BaseClass = %BaseClass.decl} [template]
|
|
// CHECK:STDOUT: %FinalClass.decl = class_decl @FinalClass, ()
|
|
// CHECK:STDOUT: %AbstractClass.decl = class_decl @AbstractClass, ()
|
|
// CHECK:STDOUT: %BaseClass.decl = class_decl @BaseClass, ()
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @FinalClass {
|
|
// CHECK:STDOUT: %Abstract: <function> = fn_decl @Abstract.1 [template]
|
|
// CHECK:STDOUT: %Virtual: <function> = fn_decl @Virtual [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Abstract = %Abstract
|
|
// CHECK:STDOUT: .Virtual = %Virtual
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @AbstractClass {
|
|
// CHECK:STDOUT: %Default: <function> = fn_decl @Default [template]
|
|
// CHECK:STDOUT: %Final: <function> = fn_decl @Final [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Default = %Default
|
|
// CHECK:STDOUT: .Final = %Final
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @BaseClass {
|
|
// CHECK:STDOUT: %Abstract: <function> = fn_decl @Abstract.2 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .Abstract = %Abstract
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Abstract.1[%self: FinalClass]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Virtual[%self: FinalClass]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Default[%self: AbstractClass]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Final[%self: AbstractClass]();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @Abstract.2[%self: BaseClass]();
|
|
// CHECK:STDOUT:
|