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 MemberIndex -> ElementIndex, ClassFieldAccess -> ClassElementAccess, UnboundFieldType -> UnboundElementType. (#3446)

Browse Source 
In preparation for base class support, where these types will be used
for bases as well as fields.

As discussed [on
discord](https://discord.com/channels/655572317891461132/963846118964350976/1180267686316478575).
This commit is contained in:
Richard Smith
2023-12-02 00:29:48 +00:00
committed by GitHub
parent 9c46d15f78
commit ca53c18ddc
64 changed files with 280 additions and 280 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
@@ -42,7 +42,7 @@ fn Run() {
// CHECK:STDOUT: %.loc10_22.1: init (i32,) = call %F.ref()
// CHECK:STDOUT: %.loc10_22.2: ref (i32,) = temporary_storage
// CHECK:STDOUT: %.loc10_22.3: ref (i32,) = temporary %.loc10_22.2, %.loc10_22.1
// CHECK:STDOUT: %.loc10_22.4: ref i32 = tuple_access %.loc10_22.3, member0
// CHECK:STDOUT: %.loc10_22.4: ref i32 = tuple_access %.loc10_22.3, element0
// CHECK:STDOUT: %.loc10_22.5: i32 = bind_value %.loc10_22.4
// CHECK:STDOUT: %.loc10_22.6: i32 = int_literal 0
// CHECK:STDOUT: %.loc10_22.7: ref i32 = array_index %t.var, %.loc10_22.6
toolchain/check/testdata/array/assign_var.carbon
Vendored
+6 -6
View File
@@ -25,11 +25,11 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %.loc7_30: i32 = int_literal 2
// CHECK:STDOUT: %.loc7_33: i32 = int_literal 3
// CHECK:STDOUT: %.loc7_34.1: (i32, i32, i32) = tuple_literal (%.loc7_27, %.loc7_30, %.loc7_33)
// CHECK:STDOUT: %.loc7_34.2: ref i32 = tuple_access %a.var, member0
// CHECK:STDOUT: %.loc7_34.2: ref i32 = tuple_access %a.var, element0
// CHECK:STDOUT: %.loc7_34.3: init i32 = initialize_from %.loc7_27 to %.loc7_34.2
// CHECK:STDOUT: %.loc7_34.4: ref i32 = tuple_access %a.var, member1
// CHECK:STDOUT: %.loc7_34.4: ref i32 = tuple_access %a.var, element1
// CHECK:STDOUT: %.loc7_34.5: init i32 = initialize_from %.loc7_30 to %.loc7_34.4
// CHECK:STDOUT: %.loc7_34.6: ref i32 = tuple_access %a.var, member2
// CHECK:STDOUT: %.loc7_34.6: ref i32 = tuple_access %a.var, element2
// CHECK:STDOUT: %.loc7_34.7: init i32 = initialize_from %.loc7_33 to %.loc7_34.6
// CHECK:STDOUT: %.loc7_34.8: init (i32, i32, i32) = tuple_init (%.loc7_34.3, %.loc7_34.5, %.loc7_34.7) to %a.var
// CHECK:STDOUT: %.loc7_34.9: init (i32, i32, i32) = converted %.loc7_34.1, %.loc7_34.8
@@ -39,17 +39,17 @@ var b: [i32; 3] = a;
// CHECK:STDOUT: %b.var: ref [i32; 3] = var b
// CHECK:STDOUT: %b: ref [i32; 3] = bind_name b, %b.var
// CHECK:STDOUT: %a.ref: ref (i32, i32, i32) = name_ref a, %a
// CHECK:STDOUT: %.loc8_19.1: ref i32 = tuple_access %a.ref, member0
// CHECK:STDOUT: %.loc8_19.1: ref i32 = tuple_access %a.ref, element0
// CHECK:STDOUT: %.loc8_19.2: i32 = bind_value %.loc8_19.1
// CHECK:STDOUT: %.loc8_19.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc8_19.4: ref i32 = array_index %b.var, %.loc8_19.3
// CHECK:STDOUT: %.loc8_19.5: init i32 = initialize_from %.loc8_19.2 to %.loc8_19.4
// CHECK:STDOUT: %.loc8_19.6: ref i32 = tuple_access %a.ref, member1
// CHECK:STDOUT: %.loc8_19.6: ref i32 = tuple_access %a.ref, element1
// CHECK:STDOUT: %.loc8_19.7: i32 = bind_value %.loc8_19.6
// CHECK:STDOUT: %.loc8_19.8: i32 = int_literal 1
// CHECK:STDOUT: %.loc8_19.9: ref i32 = array_index %b.var, %.loc8_19.8
// CHECK:STDOUT: %.loc8_19.10: init i32 = initialize_from %.loc8_19.7 to %.loc8_19.9
// CHECK:STDOUT: %.loc8_19.11: ref i32 = tuple_access %a.ref, member2
// CHECK:STDOUT: %.loc8_19.11: ref i32 = tuple_access %a.ref, element2
// CHECK:STDOUT: %.loc8_19.12: i32 = bind_value %.loc8_19.11
// CHECK:STDOUT: %.loc8_19.13: i32 = int_literal 2
// CHECK:STDOUT: %.loc8_19.14: ref i32 = array_index %b.var, %.loc8_19.13
toolchain/check/testdata/array/fail_type_mismatch.carbon
Vendored
+2 -2
View File
@@ -62,12 +62,12 @@ var d: [i32; 3] = t2;
// CHECK:STDOUT: %b.var: ref [i32; 3] = var b
// CHECK:STDOUT: %b: ref [i32; 3] = bind_name b, %b.var
// CHECK:STDOUT: %t1.ref: ref (i32, String, String) = name_ref t1, %t1
// CHECK:STDOUT: %.loc16_19.1: ref i32 = tuple_access %t1.ref, member0
// CHECK:STDOUT: %.loc16_19.1: ref i32 = tuple_access %t1.ref, element0
// CHECK:STDOUT: %.loc16_19.2: i32 = bind_value %.loc16_19.1
// CHECK:STDOUT: %.loc16_19.3: i32 = int_literal 0
// CHECK:STDOUT: %.loc16_19.4: ref i32 = array_index %b.var, %.loc16_19.3
// CHECK:STDOUT: %.loc16_19.5: init i32 = initialize_from %.loc16_19.2 to %.loc16_19.4
// CHECK:STDOUT: %.loc16_19.6: ref String = tuple_access %t1.ref, member1
// CHECK:STDOUT: %.loc16_19.6: ref String = tuple_access %t1.ref, element1
// CHECK:STDOUT: assign %b.var, <error>
// CHECK:STDOUT: %.loc21_14: i32 = int_literal 3
// CHECK:STDOUT: %.loc21_15: type = array_type %.loc21_14, i32