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

Rename {Tuple,Struct}Value -> {Tuple,Struct}Literal. (#3213)

Browse Source 
This better reflects the purpose of these semantics nodes, and prepares
for adding TupleValue and TupleInit nodes to represent forming values
and initializers from literals.
This commit is contained in:
Richard Smith
2023-09-12 21:48:15 +00:00
committed by GitHub
parent 7dc1d627d7
commit 7d0f7b5e8f
63 changed files with 148 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/array/assign_return_value.carbon
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ fn Run() {
// CHECK:STDOUT: !entry:
// CHECK:STDOUT: %.loc7_28.1: i32 = int_literal 0
// CHECK:STDOUT: %.loc7_28.2: i32 = stub_reference %.loc7_28.1
// CHECK:STDOUT: %.loc7_30: (i32,) = tuple_value (%.loc7_28.2)
// CHECK:STDOUT: %.loc7_30: (i32,) = tuple_literal (%.loc7_28.2)
// CHECK:STDOUT: return %.loc7_30
// CHECK:STDOUT: }
// CHECK:STDOUT:
toolchain/check/testdata/array/assign_var.carbon
Vendored
+2 -2
View File
@@ -12,7 +12,7 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %.loc7_14: type = stub_reference i32
// CHECK:STDOUT: %.loc7_19: type = stub_reference i32
// CHECK:STDOUT: %.loc7_22.1: type = tuple_type (type, type, type)
// CHECK:STDOUT: %.loc7_22.2: (type, type, type) = tuple_value (%.loc7_9, %.loc7_14, %.loc7_19)
// CHECK:STDOUT: %.loc7_22.2: (type, type, type) = tuple_literal (%.loc7_9, %.loc7_14, %.loc7_19)
// CHECK:STDOUT: %.loc7_22.3: type = tuple_type (i32, i32, i32)
// CHECK:STDOUT: %a: ref (i32, i32, i32) = var "a"
// CHECK:STDOUT: %.loc7_27.1: i32 = int_literal 1
@@ -21,7 +21,7 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %.loc7_30.2: i32 = stub_reference %.loc7_30.1
// CHECK:STDOUT: %.loc7_33.1: i32 = int_literal 3
// CHECK:STDOUT: %.loc7_33.2: i32 = stub_reference %.loc7_33.1
// CHECK:STDOUT: %.loc7_34: (i32, i32, i32) = tuple_value (%.loc7_27.2, %.loc7_30.2, %.loc7_33.2)
// CHECK:STDOUT: %.loc7_34: (i32, i32, i32) = tuple_literal (%.loc7_27.2, %.loc7_30.2, %.loc7_33.2)
// CHECK:STDOUT: assign %a, %.loc7_34
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc8_15: type = array_type %.loc8_14, i32
toolchain/check/testdata/array/base.carbon
Vendored
+9 -9
View File
@@ -15,7 +15,7 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc7_20.1: i32 = int_literal 1
// CHECK:STDOUT: %.loc7_20.2: i32 = stub_reference %.loc7_20.1
// CHECK:STDOUT: %.loc7_22.1: type = tuple_type (i32)
// CHECK:STDOUT: %.loc7_22.2: (i32,) = tuple_value (%.loc7_20.2)
// CHECK:STDOUT: %.loc7_22.2: (i32,) = tuple_literal (%.loc7_20.2)
// CHECK:STDOUT: %.loc7_22.3: [i32; 1] = array_value %.loc7_22.2
// CHECK:STDOUT: assign %a, %.loc7_22.3
// CHECK:STDOUT: %.loc8_14: i32 = int_literal 2
@@ -26,26 +26,26 @@ var c: [(); 5] = ((), (), (), (), (),);
// CHECK:STDOUT: %.loc8_26.1: f64 = real_literal 22e-1
// CHECK:STDOUT: %.loc8_26.2: f64 = stub_reference %.loc8_26.1
// CHECK:STDOUT: %.loc8_30.1: type = tuple_type (f64, f64)
// CHECK:STDOUT: %.loc8_30.2: (f64, f64) = tuple_value (%.loc8_20.2, %.loc8_26.2)
// CHECK:STDOUT: %.loc8_30.2: (f64, f64) = tuple_literal (%.loc8_20.2, %.loc8_26.2)
// CHECK:STDOUT: %.loc8_30.3: [f64; 2] = array_value %.loc8_30.2
// CHECK:STDOUT: assign %b, %.loc8_30.3
// CHECK:STDOUT: %.loc9_10.1: type = tuple_type ()
// CHECK:STDOUT: %.loc9_10.2: () = tuple_value ()
// CHECK:STDOUT: %.loc9_10.2: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_13: i32 = int_literal 5
// CHECK:STDOUT: %.loc9_14: type = array_type %.loc9_13, ()
// CHECK:STDOUT: %c: ref [(); 5] = var "c"
// CHECK:STDOUT: %.loc9_20.1: () = tuple_value ()
// CHECK:STDOUT: %.loc9_20.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_20.2: () = stub_reference %.loc9_20.1
// CHECK:STDOUT: %.loc9_24.1: () = tuple_value ()
// CHECK:STDOUT: %.loc9_24.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_24.2: () = stub_reference %.loc9_24.1
// CHECK:STDOUT: %.loc9_28.1: () = tuple_value ()
// CHECK:STDOUT: %.loc9_28.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_28.2: () = stub_reference %.loc9_28.1
// CHECK:STDOUT: %.loc9_32.1: () = tuple_value ()
// CHECK:STDOUT: %.loc9_32.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_32.2: () = stub_reference %.loc9_32.1
// CHECK:STDOUT: %.loc9_36.1: () = tuple_value ()
// CHECK:STDOUT: %.loc9_36.1: () = tuple_literal ()
// CHECK:STDOUT: %.loc9_36.2: () = stub_reference %.loc9_36.1
// CHECK:STDOUT: %.loc9_38.1: type = tuple_type ((), (), (), (), ())
// CHECK:STDOUT: %.loc9_38.2: ((), (), (), (), ()) = tuple_value (%.loc9_20.2, %.loc9_24.2, %.loc9_28.2, %.loc9_32.2, %.loc9_36.2)
// CHECK:STDOUT: %.loc9_38.2: ((), (), (), (), ()) = tuple_literal (%.loc9_20.2, %.loc9_24.2, %.loc9_28.2, %.loc9_32.2, %.loc9_36.2)
// CHECK:STDOUT: %.loc9_38.3: [(); 5] = array_value %.loc9_38.2
// CHECK:STDOUT: assign %c, %.loc9_38.3
// CHECK:STDOUT: }
toolchain/check/testdata/array/fail_out_of_bound.carbon
Vendored
+1 -1
View File
@@ -20,6 +20,6 @@ var a: [i32; 1] = (1, 2, 3);
// CHECK:STDOUT: %.loc10_26.1: i32 = int_literal 3
// CHECK:STDOUT: %.loc10_26.2: i32 = stub_reference %.loc10_26.1
// CHECK:STDOUT: %.loc10_27.1: type = tuple_type (i32, i32, i32)
// CHECK:STDOUT: %.loc10_27.2: (i32, i32, i32) = tuple_value (%.loc10_20.2, %.loc10_23.2, %.loc10_26.2)
// CHECK:STDOUT: %.loc10_27.2: (i32, i32, i32) = tuple_literal (%.loc10_20.2, %.loc10_23.2, %.loc10_26.2)
// CHECK:STDOUT: assign %a, <error>
// CHECK:STDOUT: }
toolchain/check/testdata/array/fail_type_mismatch.carbon
Vendored
+1 -1
View File
@@ -18,6 +18,6 @@ var a: [i32; 2] = (1, 2.5);
// CHECK:STDOUT: %.loc10_23.1: f64 = real_literal 25e-1
// CHECK:STDOUT: %.loc10_23.2: f64 = stub_reference %.loc10_23.1
// CHECK:STDOUT: %.loc10_26.1: type = tuple_type (i32, f64)
// CHECK:STDOUT: %.loc10_26.2: (i32, f64) = tuple_value (%.loc10_20.2, %.loc10_23.2)
// CHECK:STDOUT: %.loc10_26.2: (i32, f64) = tuple_literal (%.loc10_20.2, %.loc10_23.2)
// CHECK:STDOUT: assign %a, <error>
// CHECK:STDOUT: }
toolchain/check/testdata/array/nine_elements.carbon
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9);
// CHECK:STDOUT: %.loc7_44.1: i32 = int_literal 9
// CHECK:STDOUT: %.loc7_44.2: i32 = stub_reference %.loc7_44.1
// CHECK:STDOUT: %.loc7_45.1: type = tuple_type (i32, i32, i32, i32, i32, i32, i32, i32, i32)
// CHECK:STDOUT: %.loc7_45.2: (i32, i32, i32, i32, i32, i32, i32, i32, i32) = tuple_value (%.loc7_20.2, %.loc7_23.2, %.loc7_26.2, %.loc7_29.2, %.loc7_32.2, %.loc7_35.2, %.loc7_38.2, %.loc7_41.2, %.loc7_44.2)
// CHECK:STDOUT: %.loc7_45.2: (i32, i32, i32, i32, i32, i32, i32, i32, i32) = tuple_literal (%.loc7_20.2, %.loc7_23.2, %.loc7_26.2, %.loc7_29.2, %.loc7_32.2, %.loc7_35.2, %.loc7_38.2, %.loc7_41.2, %.loc7_44.2)
// CHECK:STDOUT: %.loc7_45.3: [i32; 9] = array_value %.loc7_45.2
// CHECK:STDOUT: assign %a, %.loc7_45.3
// CHECK:STDOUT: }