Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/analysis.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,7 @@ const FindBreaks = struct {
try context.break_operands.append(context.allocator, operand.unwrap() orelse return);
} else if (context.label) |label| {
if (opt_label_token.unwrap()) |label_token| {
if (std.mem.eql(u8, label, tree.tokenSlice(label_token))) {
if (std.mem.eql(u8, label, offsets.identifierTokenToNameSlice(tree, label_token))) {
try context.break_operands.append(context.allocator, operand.unwrap() orelse return);
}
}
Expand Down Expand Up @@ -2497,6 +2497,25 @@ fn resolveTypeOfNodeUncached(analyser: *Analyser, options: ResolveOptions) error
const switch_node = tree.switchFull(node);

var either: std.ArrayList(Type.TypeWithDescriptor) = .empty;

if (switch_node.label_token) |label_token| {
var context: FindBreaks = .{
.label = offsets.identifierTokenToNameSlice(tree, label_token),
.allow_unlabeled = false,
.allocator = analyser.gpa,
};
defer context.deinit();
try context.findBreakOperands(tree, node);
for (context.break_operands.items) |operand| {
if (try analyser.resolveTypeOfNodeInternal(.of(operand, handle))) |operand_type| {
try either.append(analyser.arena, .{
.type = operand_type,
.descriptor = "break",
});
}
}
}

for (switch_node.ast.cases) |case| {
const switch_case = tree.fullSwitchCase(case).?;
var descriptor: std.ArrayList(u8) = .empty;
Expand Down Expand Up @@ -2547,7 +2566,7 @@ fn resolveTypeOfNodeUncached(analyser: *Analyser, options: ResolveOptions) error
return else_type;

var context: FindBreaks = .{
.label = if (loop.label_token) |token| tree.tokenSlice(token) else null,
.label = if (loop.label_token) |token| offsets.identifierTokenToNameSlice(tree, token) else null,
.allow_unlabeled = true,
.allocator = analyser.gpa,
};
Expand Down
24 changes: 24 additions & 0 deletions tests/analysis/switch.zig
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
const A = struct {
alpha: u32,
};

const B = struct {
beta: u32,
};

const Enum = enum {
foo,
bar,
Expand Down Expand Up @@ -115,3 +123,19 @@ const switch_null_inline = switch (null) {
// ^ (@TypeOf(null))() TODO this should be `unknown`
// ^ (unknown)()
};

// zig fmt: off
const labeled_switch = blk: switch (some_u8) {
// ^^^^^^^^^^^^^^ (u8)()
'x' => |a| break :blk a,
'y' => |a| break :blk a,
else => |a| break :blk a,
};

const labeled_switch_2 = blk: switch (undefined) {
// ^^^^^^^^^^^^^^^^ (either type)()
1 => break :blk A{},
2 => B{},
else => unreachable,
};
// zig fmt: on