mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-22 15:22: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.
58 lines
2.3 KiB
Plaintext
58 lines
2.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 Class {
|
|
|
|
// CHECK:STDERR: fail_field_modifiers.carbon:[[@LINE+3]]:3: ERROR: `default` not allowed on `var` declaration.
|
|
// CHECK:STDERR: default var j: i32;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
default var j: i32;
|
|
|
|
// CHECK:STDERR: fail_field_modifiers.carbon:[[@LINE+3]]:3: ERROR: `final` not allowed on `var` declaration.
|
|
// CHECK:STDERR: final var k: i32;
|
|
// CHECK:STDERR: ^~~~~
|
|
final var k: i32;
|
|
|
|
// CHECK:STDERR: fail_field_modifiers.carbon:[[@LINE+3]]:3: ERROR: `default` not allowed on `let` declaration outside of an interface.
|
|
// CHECK:STDERR: default let l: i32 = 0;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
default let l: i32 = 0;
|
|
|
|
// CHECK:STDERR: fail_field_modifiers.carbon:[[@LINE+3]]:3: ERROR: `final` not allowed on `let` declaration outside of an interface.
|
|
// CHECK:STDERR: final let m: i32 = 1;
|
|
// CHECK:STDERR: ^~~~~
|
|
final let m: i32 = 1;
|
|
}
|
|
|
|
// CHECK:STDOUT: --- fail_field_modifiers.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %Class: type = class_type @Class [template]
|
|
// CHECK:STDOUT: %.1: type = unbound_element_type Class, i32 [template]
|
|
// CHECK:STDOUT: %.2: i32 = int_literal 0 [template]
|
|
// CHECK:STDOUT: %.3: i32 = int_literal 1 [template]
|
|
// CHECK:STDOUT: %.4: type = struct_type {.j: i32, .k: i32} [template]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.Class = %Class.decl} [template]
|
|
// CHECK:STDOUT: %Class.decl = class_decl @Class, ()
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: class @Class {
|
|
// CHECK:STDOUT: %.loc12: <unbound element of class Class> = field_decl j, element0 [template]
|
|
// CHECK:STDOUT: %.loc17: <unbound element of class Class> = field_decl k, element1 [template]
|
|
// CHECK:STDOUT: %.loc22: i32 = int_literal 0 [template = constants.%.2]
|
|
// CHECK:STDOUT: %l: i32 = bind_name l, %.loc22
|
|
// CHECK:STDOUT: %.loc27: i32 = int_literal 1 [template = constants.%.3]
|
|
// CHECK:STDOUT: %m: i32 = bind_name m, %.loc27
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !members:
|
|
// CHECK:STDOUT: .j = %.loc12
|
|
// CHECK:STDOUT: .k = %.loc17
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|