mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-15 13:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: improve compile error for tuple coercion mismatch

Browse Source
This commit is contained in:
Veikka Tuominen 2022-11-22 17:56:14 +02:00
parent 8eea73fb92
commit 9f055e2eb0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Sema.zig
View File

@ -24206,7 +24206,10 @@ fn coerceExtra(
inst_ty.childType().isAnonStruct() and
sema.checkPtrAttributes(dest_ty, inst_ty, &in_memory_result))
{
return sema.coerceAnonStructToStructPtrs(block, dest_ty, dest_ty_src, inst, inst_src);
return sema.coerceAnonStructToStructPtrs(block, dest_ty, dest_ty_src, inst, inst_src) catch |err| switch (err) {
error.NotCoercible => break :pointer,
else => |e| return e,
};
}
},
.Array => {
@ -24519,12 +24522,15 @@ fn coerceExtra(
},
else => {},
},
.Struct => {
.Struct => blk: {
if (inst == .empty_struct) {
return sema.structInitEmpty(block, dest_ty, dest_ty_src, inst_src);
}
if (inst_ty.isTupleOrAnonStruct()) {
return sema.coerceTupleToStruct(block, dest_ty, inst, inst_src);
return sema.coerceTupleToStruct(block, dest_ty, inst, inst_src) catch |err| switch (err) {
error.NotCoercible => break :blk,
else => |e| return e,
};
}
},
else => {},
@ -27215,6 +27221,8 @@ fn coerceTupleToTuple(
const inst_ty = sema.typeOf(inst);
const inst_field_count = inst_ty.structFieldCount();
if (inst_field_count > dest_field_count) return error.NotCoercible;
var runtime_src: ?LazySrcLoc = null;
var field_i: u32 = 0;
while (field_i < inst_field_count) : (field_i += 1) {

2
test/cases/compile_errors/type_mismatch_with_tuple_concatenation.zig
View File

@ -7,4 +7,4 @@ export fn entry() void {
// backend=stage2
// target=native
//
// :3:11: error: index '0' out of bounds of tuple '@TypeOf(.{})'
// :3:11: error: expected type '@TypeOf(.{})', found 'tuple{comptime comptime_int = 1, comptime comptime_int = 2, comptime comptime_int = 3}'