mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-22 15:52:38 +00:00
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.
126 lines
4.3 KiB
Plaintext
126 lines
4.3 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 Access {
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `access modifier`.
|
|
// CHECK:STDERR: private fn F();
|
|
// CHECK:STDERR: ^~~~~~~
|
|
private fn F();
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `access modifier`.
|
|
// CHECK:STDERR: protected fn G();
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
protected fn G();
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `access modifier`.
|
|
// CHECK:STDERR: private var k: i32;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
private var k: i32;
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `access modifier`.
|
|
// CHECK:STDERR: protected var l: i32;
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
protected var l: i32;
|
|
}
|
|
|
|
base class Base {
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `method modifier`.
|
|
// CHECK:STDERR: virtual fn H();
|
|
// CHECK:STDERR: ^~~~~~~
|
|
virtual fn H();
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `method modifier`.
|
|
// CHECK:STDERR: impl fn I();
|
|
// CHECK:STDERR: ^~~~
|
|
impl fn I();
|
|
}
|
|
|
|
abstract class Abstract {
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `method modifier`.
|
|
// CHECK:STDERR: abstract fn J();
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
abstract fn J();
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `method modifier`.
|
|
// CHECK:STDERR: virtual fn K();
|
|
// CHECK:STDERR: ^~~~~~~
|
|
virtual fn K();
|
|
|
|
// CHECK:STDERR: fail_todo_modifiers.carbon:[[@LINE+3]]:3: ERROR: Semantics TODO: `method modifier`.
|
|
// CHECK:STDERR: impl fn L();
|
|
// CHECK:STDERR: ^~~~
|
|
impl fn L();
|
|
}
|
|
|
|
// CHECK:STDOUT: --- fail_todo_modifiers.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Access: type = class_type @Access [template]
|
|
// CHECK:STDOUT: %.1: type = unbound_element_type Access, i32 [template]
|
|
// CHECK:STDOUT: %.2: type = struct_type {.k: i32, .l: i32} [template]
|
|
// CHECK:STDOUT: %Base: type = class_type @Base [template]
|
|
// CHECK:STDOUT: %.3: type = struct_type {} [template]
|
|
// CHECK:STDOUT: %Abstract: type = class_type @Abstract [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.Access = %Access.decl, .Base = %Base.decl, .Abstract = %Abstract.decl} [template]
|
|
// CHECK:STDOUT: %Access.decl = class_decl @Access, ()
|
|
// CHECK:STDOUT: %Base.decl = class_decl @Base, ()
|
|
// CHECK:STDOUT: %Abstract.decl = class_decl @Abstract, ()
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Access {
|
|
// CHECK:STDOUT: %F: <function> = fn_decl @F [template]
|
|
// CHECK:STDOUT: %G: <function> = fn_decl @G [template]
|
|
// CHECK:STDOUT: %.loc22: <unbound element of class Access> = field_decl k, element0 [template]
|
|
// CHECK:STDOUT: %.loc27: <unbound element of class Access> = field_decl l, element1 [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .F = %F
|
|
// CHECK:STDOUT: .G = %G
|
|
// CHECK:STDOUT: .k = %.loc22
|
|
// CHECK:STDOUT: .l = %.loc27
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Base {
|
|
// CHECK:STDOUT: %H: <function> = fn_decl @H [template]
|
|
// CHECK:STDOUT: %I: <function> = fn_decl @I [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .H = %H
|
|
// CHECK:STDOUT: .I = %I
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Abstract {
|
|
// CHECK:STDOUT: %J: <function> = fn_decl @J [template]
|
|
// CHECK:STDOUT: %K: <function> = fn_decl @K [template]
|
|
// CHECK:STDOUT: %L: <function> = fn_decl @L [template]
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .J = %J
|
|
// CHECK:STDOUT: .K = %K
|
|
// CHECK:STDOUT: .L = %L
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @F();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @G();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @H();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @I();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @J();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @K();
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @L();
|
|
// CHECK:STDOUT:
|