authorgravatar for mason@gamesbymason.comMason Remaley <mason@gamesbymason.com> 2026-07-20 17:07:30-07:00
committergravatar for mason@gamesbymason.comMason Remaley <mason@gamesbymason.com> 2026-09-26 12:35:38-07:00
logb3bb6d923fef98b0b0da8f0848e235b06a9e473f
treeb70c54257e2a0daadbebde1d375a3603028da27f
parente3a0e02ef28c96b9fe02fe564a18d44f767036b9

Update calls to Zoir API

2 files changed, 27 insertions(+), 27 deletions(-)

src/Sema/LowerZon.zig+26-26
......@@ -71,7 +71,7 @@ fn lowerExprAnonResTy(self: *LowerZon, node: Zoir.Node.Index) CompileError!Inter
7171 const gpa = comp.gpa;
7272 const io = comp.io;
7373 const ip = &pt.zcu.intern_pool;
74 switch (node.get(self.file.zoir.?)) {
74 switch (node.get(&self.file.zoir.?)) {
7575 .true => return .bool_true,
7676 .false => return .bool_false,
7777 .null => return .null_value,
......@@ -101,7 +101,7 @@ fn lowerExprAnonResTy(self: *LowerZon, node: Zoir.Node.Index) CompileError!Inter
101101 gpa,
102102 io,
103103 pt.tid,
104 val.get(self.file.zoir.?),
104 val.get(&self.file.zoir.?),
105105 .no_embedded_nulls,
106106 ),
107107 }),
......@@ -174,7 +174,7 @@ fn lowerExprAnonResTy(self: *LowerZon, node: Zoir.Node.Index) CompileError!Inter
174174 gpa,
175175 io,
176176 pt.tid,
177 zoir_name.get(self.file.zoir.?),
177 zoir_name.get(&self.file.zoir.?),
178178 .no_embedded_nulls,
179179 );
180180 field_ty.* = ip.typeOf(field_val);
......@@ -312,7 +312,7 @@ fn checkTypeInner(
312312fn nodeSrc(self: *LowerZon, node: Zoir.Node.Index) LazySrcLoc {
313313 return .{
314314 .base_node_inst = self.base_node_inst,
315 .offset = .{ .node_abs = node.getAstNode(self.file.zoir.?) },
315 .offset = .{ .node_abs = node.getAstNode(&self.file.zoir.?) },
316316 };
317317}
318318
......@@ -363,7 +363,7 @@ fn lowerExprKnownResTyInner(
363363 .optional => return pt.intern(.{
364364 .opt = .{
365365 .ty = res_ty.toIntern(),
366 .val = if (node.get(self.file.zoir.?) == .null) b: {
366 .val = if (node.get(&self.file.zoir.?) == .null) b: {
367367 break :b .none;
368368 } else b: {
369369 const child_type = res_ty.optionalChild(pt.zcu);
......@@ -418,7 +418,7 @@ fn lowerExprKnownResTyInner(
418418}
419419
420420fn lowerBool(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index {
421 return switch (node.get(self.file.zoir.?)) {
421 return switch (node.get(&self.file.zoir.?)) {
422422 .true => .bool_true,
423423 .false => .bool_false,
424424 else => return error.WrongType,
......@@ -431,7 +431,7 @@ fn lowerInt(
431431 res_ty: Type,
432432) !InternPool.Index {
433433 @setFloatMode(.strict);
434 return switch (node.get(self.file.zoir.?)) {
434 return switch (node.get(&self.file.zoir.?)) {
435435 .int_literal => |int| switch (int) {
436436 .small => |val| {
437437 const rhs: i32 = val;
......@@ -555,7 +555,7 @@ fn lowerFloat(
555555 res_ty: Type,
556556) !InternPool.Index {
557557 @setFloatMode(.strict);
558 const value = switch (node.get(self.file.zoir.?)) {
558 const value = switch (node.get(&self.file.zoir.?)) {
559559 .int_literal => |int| switch (int) {
560560 .small => |val| try self.sema.pt.floatValue(res_ty, @as(f128, @floatFromInt(val))),
561561 .big => |val| try self.sema.pt.floatValue(res_ty, val.toFloat(f128, .nearest_even)[0]),
......@@ -592,7 +592,7 @@ fn lowerFloat(
592592}
593593
594594fn lowerNull(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index {
595 switch (node.get(self.file.zoir.?)) {
595 switch (node.get(&self.file.zoir.?)) {
596596 .null => return .null_value,
597597 else => return error.WrongType,
598598 }
......@@ -600,7 +600,7 @@ fn lowerNull(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index {
600600
601601fn lowerArray(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.Index {
602602 const array_info = res_ty.arrayInfo(self.sema.pt.zcu);
603 const nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) {
603 const nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) {
604604 .array_literal => |nodes| nodes,
605605 .empty_literal => .{ .start = node, .len = 0 },
606606 else => return error.WrongType,
......@@ -633,13 +633,13 @@ fn lowerEnum(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.I
633633 const io = comp.io;
634634 const ip = &pt.zcu.intern_pool;
635635 try self.sema.ensureLayoutResolved(res_ty, self.import_loc, .init);
636 switch (node.get(self.file.zoir.?)) {
636 switch (node.get(&self.file.zoir.?)) {
637637 .enum_literal => |field_name| {
638638 const field_name_interned = try ip.getOrPutString(
639639 gpa,
640640 io,
641641 self.sema.pt.tid,
642 field_name.get(self.file.zoir.?),
642 field_name.get(&self.file.zoir.?),
643643 .no_embedded_nulls,
644644 );
645645 const field_index = res_ty.enumFieldIndex(field_name_interned, self.sema.pt.zcu) orelse {
......@@ -648,7 +648,7 @@ fn lowerEnum(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.I
648648 "enum {f} has no member named '{f}'",
649649 .{
650650 res_ty.fmt(self.sema.pt),
651 std.zig.fmtId(field_name.get(self.file.zoir.?)),
651 std.zig.fmtId(field_name.get(&self.file.zoir.?)),
652652 },
653653 );
654654 };
......@@ -667,13 +667,13 @@ fn lowerEnumLiteral(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index {
667667 const gpa = comp.gpa;
668668 const io = comp.io;
669669 const ip = &pt.zcu.intern_pool;
670 switch (node.get(self.file.zoir.?)) {
670 switch (node.get(&self.file.zoir.?)) {
671671 .enum_literal => |field_name| {
672672 const field_name_interned = try ip.getOrPutString(
673673 gpa,
674674 io,
675675 self.sema.pt.tid,
676 field_name.get(self.file.zoir.?),
676 field_name.get(&self.file.zoir.?),
677677 .no_embedded_nulls,
678678 );
679679 return self.sema.pt.intern(.{ .enum_literal = field_name_interned });
......@@ -696,7 +696,7 @@ fn lowerTuple(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.
696696
697697 const tuple_info = ip.indexToKey(res_ty.toIntern()).tuple_type;
698698
699 const elem_nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) {
699 const elem_nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) {
700700 .array_literal => |nodes| nodes,
701701 .empty_literal => .{ .start = node, .len = 0 },
702702 else => return error.WrongType,
......@@ -720,7 +720,7 @@ fn lowerTuple(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.
720720 "index {} outside tuple of length {}",
721721 .{
722722 elems.len,
723 elem_nodes.at(@intCast(i)).getAstNode(self.file.zoir.?),
723 elem_nodes.at(@intCast(i)).getAstNode(&self.file.zoir.?),
724724 },
725725 );
726726 }
......@@ -760,7 +760,7 @@ fn lowerStruct(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool
760760 try self.sema.ensureStructDefaultsResolved(res_ty, self.import_loc);
761761 const struct_info = self.sema.pt.zcu.typeToStruct(res_ty).?;
762762
763 const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(self.file.zoir.?)) {
763 const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(&self.file.zoir.?)) {
764764 .struct_literal => |fields| fields,
765765 .empty_literal => .{ .names = &.{}, .vals = .{ .start = node, .len = 0 } },
766766 else => return error.WrongType,
......@@ -780,7 +780,7 @@ fn lowerStruct(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool
780780 gpa,
781781 io,
782782 self.sema.pt.tid,
783 fields.names[i].get(self.file.zoir.?),
783 fields.names[i].get(&self.file.zoir.?),
784784 .no_embedded_nulls,
785785 );
786786 const field_node = fields.vals.at(@intCast(i));
......@@ -844,7 +844,7 @@ fn lowerSlice(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.
844844 const string_alignment = ptr_info.flags.alignment == .none or ptr_info.flags.alignment == .@"1";
845845 const string_sentinel = ptr_info.sentinel == .none or ptr_info.sentinel == .zero_u8;
846846 if (string_alignment and ptr_info.child == .u8_type and string_sentinel) {
847 switch (node.get(self.file.zoir.?)) {
847 switch (node.get(&self.file.zoir.?)) {
848848 .string_literal => |val| {
849849 const ip_str = try ip.getOrPutString(gpa, io, self.sema.pt.tid, val, .maybe_embedded_nulls);
850850 const str_ref = try self.sema.addStrLit(ip_str, val.len);
......@@ -860,7 +860,7 @@ fn lowerSlice(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.
860860 }
861861
862862 // Slice literals
863 const elem_nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) {
863 const elem_nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) {
864864 .array_literal => |nodes| nodes,
865865 .empty_literal => .{ .start = node, .len = 0 },
866866 else => return error.WrongType,
......@@ -927,19 +927,19 @@ fn lowerUnion(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.
927927 const union_info = pt.zcu.typeToUnion(res_ty).?;
928928 const enum_tag_info = ip.loadEnumType(union_info.enum_tag_type);
929929
930 const field_name, const maybe_field_node = switch (node.get(self.file.zoir.?)) {
930 const field_name, const maybe_field_node = switch (node.get(&self.file.zoir.?)) {
931931 .enum_literal => |name| b: {
932932 const field_name = try ip.getOrPutString(
933933 gpa,
934934 io,
935935 self.sema.pt.tid,
936 name.get(self.file.zoir.?),
936 name.get(&self.file.zoir.?),
937937 .no_embedded_nulls,
938938 );
939939 break :b .{ field_name, null };
940940 },
941941 .struct_literal => b: {
942 const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(self.file.zoir.?)) {
942 const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(&self.file.zoir.?)) {
943943 .struct_literal => |fields| fields,
944944 else => return self.fail(node, "expected type '{f}'", .{res_ty.fmt(self.sema.pt)}),
945945 };
......@@ -950,7 +950,7 @@ fn lowerUnion(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.
950950 gpa,
951951 io,
952952 self.sema.pt.tid,
953 fields.names[0].get(self.file.zoir.?),
953 fields.names[0].get(&self.file.zoir.?),
954954 .no_embedded_nulls,
955955 );
956956 break :b .{ field_name, fields.vals.at(0) };
......@@ -986,7 +986,7 @@ fn lowerVector(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool
986986
987987 const vector_info = ip.indexToKey(res_ty.toIntern()).vector_type;
988988
989 const elem_nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) {
989 const elem_nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) {
990990 .array_literal => |nodes| nodes,
991991 .empty_literal => .{ .start = node, .len = 0 },
992992 else => return error.WrongType,
src/print_zoir.zig+1-1
......@@ -54,7 +54,7 @@ const PrintZon = struct {
5454 }
5555
5656 fn renderNode(pz: *PrintZon, node: Zoir.Node.Index) Error!void {
57 const zoir = pz.zoir;
57 const zoir = &pz.zoir;
5858 try pz.w.print("%{d} = ", .{@backingInt(node)});
5959 switch (node.get(zoir)) {
6060 .true => try pz.w.writeAll("true"),