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

Rename template constant -> concrete constant. (#4939)

Browse Source 
This implements a direction decided in a
[recent
discussion](https://docs.google.com/document/d/1Iut5f2TQBrtBNIduF4vJYOKfw7MbS8xH_J01_Q4e6Rk/edit?resourcekey=0-mc_vh5UzrzXfU4kO-3tOjA&tab=t.0#heading=h.mas1g68xx9ct)
to switch away from "template constant" when naming a constant that
doesn't depend on any generic parameters, because that creates confusion
with template-dependent constant values that depend on a template
parameter.
This commit is contained in:
Richard Smith
2025-02-12 21:24:51 +00:00
committed by GitHub
parent 188821ba1a
commit c6d35e1c4a
674 changed files with 35160 additions and 35160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/namespace/function.carbon
Vendored
+15 -15
View File
@@ -24,36 +24,36 @@ fn Bar() {
// CHECK:STDOUT: --- function.carbon
// CHECK:STDOUT:
// CHECK:STDOUT: constants {
// CHECK:STDOUT: %Baz.type.03f: type = fn_type @Baz.1 [template]
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [template]
// CHECK:STDOUT: %Baz.5ea: %Baz.type.03f = struct_value () [template]
// CHECK:STDOUT: %Baz.type.898: type = fn_type @Baz.2 [template]
// CHECK:STDOUT: %Baz.eb4: %Baz.type.898 = struct_value () [template]
// CHECK:STDOUT: %Bar.type: type = fn_type @Bar [template]
// CHECK:STDOUT: %Bar: %Bar.type = struct_value () [template]
// CHECK:STDOUT: %Baz.type.03f: type = fn_type @Baz.1 [concrete]
// CHECK:STDOUT: %empty_tuple.type: type = tuple_type () [concrete]
// CHECK:STDOUT: %Baz.5ea: %Baz.type.03f = struct_value () [concrete]
// CHECK:STDOUT: %Baz.type.898: type = fn_type @Baz.2 [concrete]
// CHECK:STDOUT: %Baz.eb4: %Baz.type.898 = struct_value () [concrete]
// CHECK:STDOUT: %Bar.type: type = fn_type @Bar [concrete]
// CHECK:STDOUT: %Bar: %Bar.type = struct_value () [concrete]
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: imports {
// CHECK:STDOUT: %Core: <namespace> = namespace file.%Core.import, [template] {
// CHECK:STDOUT: %Core: <namespace> = namespace file.%Core.import, [concrete] {
// CHECK:STDOUT: import Core//prelude
// CHECK:STDOUT: import Core//prelude/...
// CHECK:STDOUT: }
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: file {
// CHECK:STDOUT: package: <namespace> = namespace [template] {
// CHECK:STDOUT: package: <namespace> = namespace [concrete] {
// CHECK:STDOUT: .Core = imports.%Core
// CHECK:STDOUT: .Foo = %Foo
// CHECK:STDOUT: .Baz = %Baz.decl.loc14
// CHECK:STDOUT: .Bar = %Bar.decl
// CHECK:STDOUT: }
// CHECK:STDOUT: %Core.import = import Core
// CHECK:STDOUT: %Foo: <namespace> = namespace [template] {
// CHECK:STDOUT: %Foo: <namespace> = namespace [concrete] {
// CHECK:STDOUT: .Baz = %Baz.decl.loc17
// CHECK:STDOUT: }
// CHECK:STDOUT: %Baz.decl.loc14: %Baz.type.03f = fn_decl @Baz.1 [template = constants.%Baz.5ea] {} {}
// CHECK:STDOUT: %Baz.decl.loc17: %Baz.type.898 = fn_decl @Baz.2 [template = constants.%Baz.eb4] {} {}
// CHECK:STDOUT: %Bar.decl: %Bar.type = fn_decl @Bar [template = constants.%Bar] {} {}
// CHECK:STDOUT: %Baz.decl.loc14: %Baz.type.03f = fn_decl @Baz.1 [concrete = constants.%Baz.5ea] {} {}
// CHECK:STDOUT: %Baz.decl.loc17: %Baz.type.898 = fn_decl @Baz.2 [concrete = constants.%Baz.eb4] {} {}
// CHECK:STDOUT: %Bar.decl: %Bar.type = fn_decl @Bar [concrete = constants.%Bar] {} {}
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Baz.1() {
@@ -68,8 +68,8 @@ fn Bar() {
// CHECK:STDOUT:
// CHECK:STDOUT: fn @Bar() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %Foo.ref: <namespace> = name_ref Foo, file.%Foo [template = file.%Foo]
// CHECK:STDOUT: %Baz.ref: %Baz.type.898 = name_ref Baz, file.%Baz.decl.loc17 [template = constants.%Baz.eb4]
// CHECK:STDOUT: %Foo.ref: <namespace> = name_ref Foo, file.%Foo [concrete = file.%Foo]
// CHECK:STDOUT: %Baz.ref: %Baz.type.898 = name_ref Baz, file.%Baz.decl.loc17 [concrete = constants.%Baz.eb4]
// CHECK:STDOUT: %Baz.call: init %empty_tuple.type = call %Baz.ref()
// CHECK:STDOUT: return
// CHECK:STDOUT: }