mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-06 07:54:41 +01:00
Rename template constant -> concrete constant. (#4939)
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:
+10
-10
@@ -28,33 +28,33 @@ fn Test() {
|
||||
// CHECK:STDOUT: --- fail_address_of_error.carbon
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: constants {
|
||||
// CHECK:STDOUT: %Test.type: type = fn_type @Test [template]
|
||||
// CHECK:STDOUT: %Test: %Test.type = struct_value () [template]
|
||||
// CHECK:STDOUT: %Test.type: type = fn_type @Test [concrete]
|
||||
// CHECK:STDOUT: %Test: %Test.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: .Test = %Test.decl
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT: %Core.import = import Core
|
||||
// CHECK:STDOUT: %Test.decl: %Test.type = fn_decl @Test [template = constants.%Test] {} {}
|
||||
// CHECK:STDOUT: %Test.decl: %Test.type = fn_decl @Test [concrete = constants.%Test] {} {}
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
// CHECK:STDOUT: fn @Test() {
|
||||
// CHECK:STDOUT: !entry:
|
||||
// CHECK:STDOUT: %undeclared.ref.loc16: <error> = name_ref undeclared, <error> [template = <error>]
|
||||
// CHECK:STDOUT: %addr.loc16: <error> = addr_of %undeclared.ref.loc16 [template = <error>]
|
||||
// CHECK:STDOUT: %undeclared.ref.loc25: <error> = name_ref undeclared, <error> [template = <error>]
|
||||
// CHECK:STDOUT: %addr.loc25_5: <error> = addr_of %undeclared.ref.loc25 [template = <error>]
|
||||
// CHECK:STDOUT: %addr.loc25_3: <error> = addr_of <error> [template = <error>]
|
||||
// CHECK:STDOUT: %undeclared.ref.loc16: <error> = name_ref undeclared, <error> [concrete = <error>]
|
||||
// CHECK:STDOUT: %addr.loc16: <error> = addr_of %undeclared.ref.loc16 [concrete = <error>]
|
||||
// CHECK:STDOUT: %undeclared.ref.loc25: <error> = name_ref undeclared, <error> [concrete = <error>]
|
||||
// CHECK:STDOUT: %addr.loc25_5: <error> = addr_of %undeclared.ref.loc25 [concrete = <error>]
|
||||
// CHECK:STDOUT: %addr.loc25_3: <error> = addr_of <error> [concrete = <error>]
|
||||
// CHECK:STDOUT: return
|
||||
// CHECK:STDOUT: }
|
||||
// CHECK:STDOUT:
|
||||
|
||||
Reference in New Issue
Block a user