mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-02 22:02:51 +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.
53 lines
2.4 KiB
Plaintext
53 lines
2.4 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+3]]:1: ERROR: `protected` not allowed on `var` declaration at file scope, `protected` is only allowed on class members.
|
|
// CHECK:STDERR: protected var b: i32;
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
protected var b: i32;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+9]]:1: ERROR: Semantics TODO: `access modifier`.
|
|
// CHECK:STDERR: private protected var c: i32;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:9: ERROR: `protected` not allowed on declaration with `private`.
|
|
// CHECK:STDERR: private protected var c: i32;
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: `private` previously appeared here.
|
|
// CHECK:STDERR: private protected var c: i32;
|
|
// CHECK:STDERR: ^~~~~~~
|
|
private protected var c: i32;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+9]]:1: ERROR: `protected` not allowed on `var` declaration at file scope, `protected` is only allowed on class members.
|
|
// CHECK:STDERR: protected protected var d: i32;
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:11: ERROR: `protected` repeated on declaration.
|
|
// CHECK:STDERR: protected protected var d: i32;
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: `protected` previously appeared here.
|
|
// CHECK:STDERR: protected protected var d: i32;
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
protected protected var d: i32;
|
|
|
|
// CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:1: ERROR: `abstract` not allowed on `var` declaration.
|
|
// CHECK:STDERR: abstract var e: i32;
|
|
// CHECK:STDERR: ^~~~~~~~
|
|
abstract var e: i32;
|
|
|
|
// CHECK:STDOUT: --- fail_modifiers.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: file {
|
|
// CHECK:STDOUT: package: <namespace> = namespace {.b = %b, .c = %c, .d = %d, .e = %e} [template]
|
|
// CHECK:STDOUT: %b.var: ref i32 = var b
|
|
// CHECK:STDOUT: %b: ref i32 = bind_name b, %b.var
|
|
// CHECK:STDOUT: %c.var: ref i32 = var c
|
|
// CHECK:STDOUT: %c: ref i32 = bind_name c, %c.var
|
|
// CHECK:STDOUT: %d.var: ref i32 = var d
|
|
// CHECK:STDOUT: %d: ref i32 = bind_name d, %d.var
|
|
// CHECK:STDOUT: %e.var: ref i32 = var e
|
|
// CHECK:STDOUT: %e: ref i32 = bind_name e, %e.var
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|