carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add support for 'package' in expressions. (#3445)

Browse Source 
This creates a namespace for `package` scope.

It looks like names of class_decls in namespaces lead to an unexpected
instref. This is already true, as best as I can tell. I'm not sure if
there's a preferred approach to address that, so I've left a TODO for
now.
This commit is contained in:
Jon Ross-Perkins
2023-12-04 21:05:41 +00:00
committed by GitHub
parent 1c4a35c76b
commit 30155dbb72
262 changed files with 721 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/package_expr/fail_not_found.carbon
Vendored
+30
View File
@@ -0,0 +1,30 @@
// 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
fn Main() {
// CHECK:STDERR: fail_not_found.carbon:[[@LINE+3]]:23: ERROR: Name `x` not found.
// CHECK:STDERR: var y: i32 = package.x;
// CHECK:STDERR: ^
var y: i32 = package.x;
}
// CHECK:STDOUT: --- fail_not_found.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Main = %Main}
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Main() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %y.var: ref i32 = var y
// CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var
// CHECK:STDOUT: %package.ref: <namespace> = name_ref package, package
// CHECK:STDOUT: %x.ref: <error> = name_ref x, <error>
// CHECK:STDOUT: assign %y.var, <error>
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/package_expr/syntax.carbon
Vendored
+133
View File
@@ -0,0 +1,133 @@
// 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
// --- global.carbon
package Global api;
var x: i32 = 0;
fn Main() {
var x: i32 = 1;
var y: i32 = package.x;
}
// --- inside_fn.carbon
package InsideFn api;
var x: i32 = 0;
fn Main() {
var x: i32 = 1;
var y: i32 = package.x;
}
// --- namespace.carbon
package Namespace api;
namespace NS;
class NS.C {
fn Foo() {}
};
fn Main() {
package.NS.C.Foo();
}
// CHECK:STDOUT: --- global.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.x = %x, .Main = %Main}
// CHECK:STDOUT: %x.var: ref i32 = var x
// CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var
// CHECK:STDOUT: %.loc4: i32 = int_literal 0
// CHECK:STDOUT: assign %x.var, %.loc4
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Main() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %x.var: ref i32 = var x
// CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var
// CHECK:STDOUT: %.loc7: i32 = int_literal 1
// CHECK:STDOUT: assign %x.var, %.loc7
// CHECK:STDOUT: %y.var: ref i32 = var y
// CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var
// CHECK:STDOUT: %package.ref: <namespace> = name_ref package, package
// CHECK:STDOUT: %x.ref: ref i32 = name_ref x, file.%x
// CHECK:STDOUT: %.loc9: i32 = bind_value %x.ref
// CHECK:STDOUT: assign %y.var, %.loc9
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: --- inside_fn.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.x = %x, .Main = %Main}
// CHECK:STDOUT: %x.var: ref i32 = var x
// CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var
// CHECK:STDOUT: %.loc4: i32 = int_literal 0
// CHECK:STDOUT: assign %x.var, %.loc4
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Main() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %x.var: ref i32 = var x
// CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var
// CHECK:STDOUT: %.loc7: i32 = int_literal 1
// CHECK:STDOUT: assign %x.var, %.loc7
// CHECK:STDOUT: %y.var: ref i32 = var y
// CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var
// CHECK:STDOUT: %package.ref: <namespace> = name_ref package, package
// CHECK:STDOUT: %x.ref: ref i32 = name_ref x, file.%x
// CHECK:STDOUT: %.loc9: i32 = bind_value %x.ref
// CHECK:STDOUT: assign %y.var, %.loc9
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: --- namespace.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %.loc8: type = struct_type {}
// CHECK:STDOUT: %.loc11: type = tuple_type ()
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.NS = %.loc4, .Main = %Main}
// CHECK:STDOUT: %.loc4: <namespace> = namespace {.C = %C.decl}
// CHECK:STDOUT: %C.decl = class_decl @C, ()
// CHECK:STDOUT: %C: type = class_type @C
// CHECK:STDOUT: %Main: <function> = fn_decl @Main
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: class @C {
// CHECK:STDOUT: %Foo: <function> = fn_decl @Foo
// CHECK:STDOUT:
// CHECK:STDOUT: !members:
// CHECK:STDOUT: .Foo = %Foo
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Foo() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Main() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %package.ref: <namespace> = name_ref package, package
// CHECK:STDOUT: %NS.ref: <namespace> = name_ref NS, file.%.loc4
// CHECK:STDOUT: %C.ref: type = name_ref C, file.%C
// CHECK:STDOUT: %Foo.ref: <function> = name_ref Foo, @C.%Foo
// CHECK:STDOUT: %.loc11: init () = call %Foo.ref()
// CHECK:STDOUT: return
// CHECK:STDOUT: }
// CHECK:STDOUT: