archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 01:04:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compiler: handle switch rewrite review feedback

Browse source
This commit is contained in:
Matthew Lugg 2026-01-11 14:27:00 +00:00
parent 3a4a7d2ca3
commit 01546e68cd
No known key found for this signature in database
GPG key ID: 3F5B7DCCBF4AF02E
11 changed files with 128 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/behavior/for.zig
View file

@ -525,7 +525,7 @@ test "for loop 0 length range" {
}
}
test "labeled break from else prong" {
test "labeled break from else" {
const S = struct {
fn doTheTest(x: u32) !void {
var y: u32 = 0;

113
test/behavior/switch.zig
View file

@ -1128,20 +1128,17 @@ test "decl literals as switch cases" {
const foo: @This() = @enumFromInt(0xa);
fn doTheTest() !void {
var e: @This() = .foo;
_ = &e;
const ok = switch (e) {
.bar => false,
.foo => true,
else => false,
};
try expect(ok);
fn doTheTest(e: @This()) !void {
switch (e) {
.bar => return error.TestFailed,
.foo => {},
else => return error.TestFailed,
}
}
};
try E.doTheTest();
try comptime E.doTheTest();
try E.doTheTest(.foo);
try comptime E.doTheTest(.foo);
}
// TODO audit after #15909 and/or #19855 are decided/implemented
@ -1152,32 +1149,30 @@ test "switch with uninstantiable union fields" {
b: noreturn,
c: error{},
fn doTheTest() !void {
var u: @This() = .ok;
_ = &u;
try expect(switch (u) {
.ok => true,
fn doTheTest(u: @This()) void {
switch (u) {
.ok => {},
.a => comptime unreachable,
.b => comptime unreachable,
.c => comptime unreachable,
});
try expect(switch (u) {
.ok => true,
}
switch (u) {
.ok => {},
.a, .b, .c => comptime unreachable,
});
try expect(switch (u) {
.ok => true,
}
switch (u) {
.ok => {},
else => comptime unreachable,
});
try expect(switch (u) {
}
switch (u) {
.a => comptime unreachable,
.ok, .b, .c => true,
});
.ok, .b, .c => {},
}
}
};
try U.doTheTest();
try comptime U.doTheTest();
U.doTheTest(.ok);
comptime U.doTheTest(.ok);
}
test "switch with tag capture" {
@ -1196,8 +1191,8 @@ test "switch with tag capture" {
fn doTheSwitch(u: @This()) !void {
switch (u) {
.a => |nothing, tag| {
try expect(nothing == {});
try expect(tag == .a);
comptime assert(nothing == {});
comptime assert(tag == .a);
try expect(@intFromEnum(tag) == @intFromEnum(@This().a));
},
.b, .d => |_, tag| {
@ -1216,13 +1211,13 @@ test "switch with tag capture" {
}
switch (u) {
inline .a, .b, .c => |payload, tag| {
if (@TypeOf(payload) == void) try expect(tag == .a);
if (@TypeOf(payload) == i32) try expect(tag == .b);
if (@TypeOf(payload) == u8) try expect(tag == .c);
if (@TypeOf(payload) == void) comptime assert(tag == .a);
if (@TypeOf(payload) == i32) comptime assert(tag == .b);
if (@TypeOf(payload) == u8) comptime assert(tag == .c);
},
inline else => |payload, tag| {
if (@TypeOf(payload) == i32) try expect(tag == .d);
try expect(tag != .e);
if (@TypeOf(payload) == i32) comptime assert(tag == .d);
comptime assert(tag != .e);
},
}
}
@ -1232,7 +1227,7 @@ test "switch with tag capture" {
try comptime U.doTheTest();
}
test "switch with advanced prong items" {
test "switch with complex item expressions" {
const S = struct {
fn doTheTest() !void {
try doTheSwitch(2000, 20);
@ -1278,19 +1273,11 @@ test "switch with advanced prong items" {
}
test "switch evaluation order" {
const eval = comptime eval: {
var eval = false;
const eu: anyerror!u32 = 0;
_ = eu catch |err| switch (err) {
blk: {
eval = true;
break :blk error.MyError;
} => {},
else => unreachable,
};
break :eval eval;
const eu: anyerror!u32 = 0;
_ = eu catch |err| switch (err) {
if (true) @compileError("unreachable") => unreachable,
else => unreachable,
};
try comptime expect(!eval);
}
test "switch resolves lazy values correctly" {
@ -1298,13 +1285,25 @@ test "switch resolves lazy values correctly" {
a: u16,
b: i16,
};
const ok1 = switch (@sizeOf(S)) {
4 => true,
else => false,
};
const ok2 = switch (@sizeOf(S)) {
4 => true,
else => false,
};
try comptime expect(ok1 == ok2);
switch (@sizeOf(S)) {
4 => {},
else => comptime unreachable,
}
}
test "single-item prong in switch on enum has comptime-known capture" {
const E = enum {
a,
b,
c,
fn doTheTest(e: @This()) !void {
switch (e) {
.a => |tag| comptime assert(tag == .a),
.b => return error.TestFailed,
.c => return error.TestFailed,
}
}
};
try E.doTheTest(.a);
try comptime E.doTheTest(.a);
}

17
test/behavior/switch_loop.zig
View file

@ -1,5 +1,6 @@
const builtin = @import("builtin");
const std = @import("std");
const assert = std.debug.assert;
const expect = std.testing.expect;
test "simple switch loop" {
@ -340,7 +341,7 @@ test "switch loop with single catch-all prong" {
continue :label .{ .b = 456 };
},
};
try expect(ok);
comptime assert(ok);
}
};
try S.doTheTest();
@ -411,8 +412,8 @@ test "switch loop with tag capture" {
fn doTheSwitch(u: @This()) !void {
const ok1 = label: switch (u) {
.a => |nothing, tag| {
try expect(nothing == {});
try expect(tag == .a);
comptime assert(nothing == {});
comptime assert(tag == .a);
try expect(@intFromEnum(tag) == @intFromEnum(@This().a));
continue :label .{ .d = 456 };
},
@ -438,21 +439,21 @@ test "switch loop with tag capture" {
const ok2 = label: switch (u) {
inline .a, .b, .c => |payload, tag| {
if (@TypeOf(payload) == void) {
try expect(tag == .a);
comptime assert(tag == .a);
continue :label .{ .b = 456 };
}
if (@TypeOf(payload) == i32) {
try expect(tag == .b);
comptime assert(tag == .b);
continue :label .{ .d = payload };
}
if (@TypeOf(payload) == u8) {
try expect(tag == .c);
comptime assert(tag == .c);
continue :label .{ .d = payload };
}
},
inline else => |payload, tag| {
if (@TypeOf(payload) == i32) try expect(tag == .d);
try expect(tag != .e);
if (@TypeOf(payload) == i32) comptime assert(tag == .d);
comptime assert(tag != .e);
if (payload == 0) break :label false;
break :label true;
},

7
test/behavior/switch_on_captured_error.zig
View file

@ -17,7 +17,9 @@ test "switch on error union catch capture" {
try testElse();
try testCapture();
try testInline();
try testEmptyErrSet();
try testUnreachableElseProng();
try testErrNotInSet();
try testAddressOf();
}
@ -384,8 +386,11 @@ test "switch on error union if else capture" {
try testCapturePtr();
try testInline();
try testInlinePtr();
try testEmptyErrSet();
try testEmptyErrSetPtr();
try testUnreachableElseProng();
try testUnreachableElseProngPtr();
try testErrNotInSet();
try testAddressOf();
}
@ -835,7 +840,7 @@ test "switch on error union if else capture" {
var a: error{}!u64 = 0;
_ = &a;
const b = if (a) |*x| x.* else |err| switch (err) {
error.undefined => @compileError("unreachable"),
undefined => @compileError("unreachable"),
};
try expectEqual(@as(u64, 0), b);
}

8
test/behavior/while.zig
View file

@ -400,12 +400,12 @@ test "breaking from a loop in an if statement" {
_ = opt;
}
test "labeled break from else prong" {
test "labeled break from else" {
const S = struct {
fn doTheTest(x: u32) !void {
var y: u32 = 0;
const ok = label: while (y < x) : (y += 1) {
if (y == 10) break :label false;
const arr: []const u32 = &.{ 1, 3, 10 };
const ok = label: for (arr) |y| {
if (y == x) break :label false;
} else {
break :label true;
};