carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 09:34:42 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add imports of enclosing scopes. (#3575)

Browse Source 
Namespaces are copied, which means also adding their name to the
underlying instruction. It happened not to be done previously; the name
was only in name lookup.

Since the only import supported right now is the default import,
functionality is limited; in the future I'll need to deal with namespace
vs package conflicts.

Tests of namespace imports are under "namespace" -- I figured this would
be best for scaling as more instructions get support.

This also improves some debugging-related output that I was trying to
use while trying to build the support.

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2024-01-10 17:36:50 +00:00
committed by GitHub
co-authored by Richard Smith
parent 848d4d7ec0
commit cad4605dad
309 changed files with 965 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/array/array_in_place.carbon
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ fn G() {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F, .G = %G}
// CHECK:STDOUT: package: <namespace> = namespace package, {.F = %F, .G = %G}
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: %G: <function> = fn_decl @G
// CHECK:STDOUT: }
toolchain/check/testdata/array/assign_return_value.carbon
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ fn Run() {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F, .Run = %Run}
// CHECK:STDOUT: package: <namespace> = namespace package, {.F = %F, .Run = %Run}
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: %Run: <function> = fn_decl @Run
// CHECK:STDOUT: }
toolchain/check/testdata/array/assign_var.carbon
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a = %a, .b = %b}
// CHECK:STDOUT: package: <namespace> = namespace package, {.a = %a, .b = %b}
// CHECK:STDOUT: %.loc7_22.1: (type, type, type) = tuple_literal (i32, i32, i32)
// CHECK:STDOUT: %.loc7_22.2: type = converted %.loc7_22.1, constants.%.loc7_22.2
// CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var a
toolchain/check/testdata/array/base.carbon
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a = %a, .b = %b, .c = %c}
// CHECK:STDOUT: package: <namespace> = namespace package, {.a = %a, .b = %b, .c = %c}
// CHECK:STDOUT: %.loc7_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 1] = var a
toolchain/check/testdata/array/fail_bound_overflow.carbon
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ var a: [1; 39999999999999999993];
// CHECK:STDOUT: --- fail_bound_overflow.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a = %a}
// CHECK:STDOUT: package: <namespace> = namespace package, {.a = %a}
// CHECK:STDOUT: %.loc10_9: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_12: i32 = int_literal 39999999999999999993
// CHECK:STDOUT: %a.var: ref <error> = var a
toolchain/check/testdata/array/fail_incomplete_element.carbon
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ var p: Incomplete* = &a[0];
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.Incomplete = %Incomplete.decl, .a = %a, .p = %p}
// CHECK:STDOUT: package: <namespace> = namespace package, {.Incomplete = %Incomplete.decl, .a = %a, .p = %p}
// CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete, ()
// CHECK:STDOUT: %Incomplete: type = class_type @Incomplete
// CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, %Incomplete
toolchain/check/testdata/array/fail_invalid_type.carbon
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ var a: [1; 1];
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a = %a}
// CHECK:STDOUT: package: <namespace> = namespace package, {.a = %a}
// CHECK:STDOUT: %.loc10_9: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_12: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, <error>
toolchain/check/testdata/array/fail_out_of_bound.carbon
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a = %a}
// CHECK:STDOUT: package: <namespace> = namespace package, {.a = %a}
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 1
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 1] = var a
toolchain/check/testdata/array/fail_type_mismatch.carbon
Vendored
+1 -1
View File
@@ -41,7 +41,7 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a = %a, .t1 = %t1, .b = %b, .c = %c, .t2 = %t2, .d = %d}
// CHECK:STDOUT: package: <namespace> = namespace package, {.a = %a, .t1 = %t1, .b = %b, .c = %c, .t2 = %t2, .d = %d}
// CHECK:STDOUT: %.loc10_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 3] = var a
toolchain/check/testdata/array/function_param.carbon
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ fn G() -> i32 {
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.F = %F, .G = %G}
// CHECK:STDOUT: package: <namespace> = namespace package, {.F = %F, .G = %G}
// CHECK:STDOUT: %F: <function> = fn_decl @F
// CHECK:STDOUT: %G: <function> = fn_decl @G
// CHECK:STDOUT: }
toolchain/check/testdata/array/nine_elements.carbon
Vendored
+1 -1
View File
@@ -14,7 +14,7 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace {.a = %a}
// CHECK:STDOUT: package: <namespace> = namespace package, {.a = %a}
// CHECK:STDOUT: %.loc7_14: i32 = int_literal 9
// CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32
// CHECK:STDOUT: %a.var: ref [i32; 9] = var a