mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: error union/set peer resolution switch to "else" form of for loop

Browse Source
This commit is contained in:
Mitchell Hashimoto 2022-02-28 09:41:03 -08:00 committed by Andrew Kelley
parent ea00e50045
commit 0ce2d46ff9
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Sema.zig
View File

@ -17738,23 +17738,17 @@ fn resolvePeerTypes(
// If chosen is superset of candidate, keep it. // If chosen is superset of candidate, keep it.
// If candidate is superset of chosen, switch it. // If candidate is superset of chosen, switch it.
// If neither is a superset, merge errors. // If neither is a superset, merge errors.
var prev_is_superset = true;
for (candidate_ty.errorSetNames()) |name| { for (candidate_ty.errorSetNames()) |name| {
if (!err_set_ty.?.errorSetHasField(name)) { if (!err_set_ty.?.errorSetHasField(name)) {
prev_is_superset = false;
break; break;
} }
} } else continue;
if (prev_is_superset) continue; // use previous
var cand_is_superset = true;
for (err_set_ty.?.errorSetNames()) |name| { for (err_set_ty.?.errorSetNames()) |name| {
if (!candidate_ty.errorSetHasField(name)) { if (!candidate_ty.errorSetHasField(name)) {
cand_is_superset = false;
break; break;
} }
} } else {
if (cand_is_superset) {
// Swap to candidate // Swap to candidate
err_set_ty = candidate_ty; err_set_ty = candidate_ty;
chosen = candidate; chosen = candidate;
@ -17801,14 +17795,11 @@ fn resolvePeerTypes(
} }
// If previous is superset, keep the previous // If previous is superset, keep the previous
var prev_is_superset = true;
for (candidate_ty.errorSetNames()) |name| { for (candidate_ty.errorSetNames()) |name| {
if (!err_set_ty.?.errorSetHasField(name)) { if (!err_set_ty.?.errorSetHasField(name)) {
prev_is_superset = false;
break; break;
} }
} } else continue;
if (prev_is_superset) continue; // use previous
// Merge // Merge
err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, candidate_ty); err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, candidate_ty);
@ -17834,14 +17825,11 @@ fn resolvePeerTypes(
} }
// If candidate is a superset of the error type, then use it. // If candidate is a superset of the error type, then use it.
var cand_is_superset = true;
for (err_set_ty.?.errorSetNames()) |name| { for (err_set_ty.?.errorSetNames()) |name| {
if (!eu_set_ty.errorSetHasField(name)) { if (!eu_set_ty.errorSetHasField(name)) {
cand_is_superset = false;
break; break;
} }
} } else {
if (cand_is_superset) {
// Swap to candidate // Swap to candidate
err_set_ty = eu_set_ty; err_set_ty = eu_set_ty;
chosen = candidate; chosen = candidate;
@ -17901,23 +17889,17 @@ fn resolvePeerTypes(
if (err_set_ty == null) err_set_ty = chosen_set_ty; if (err_set_ty == null) err_set_ty = chosen_set_ty;
// If the previous error set type is a superset, we're done. // If the previous error set type is a superset, we're done.
var prev_is_superset = true;
for (candidate_set_ty.errorSetNames()) |name| { for (candidate_set_ty.errorSetNames()) |name| {
if (!chosen_set_ty.errorSetHasField(name)) { if (!chosen_set_ty.errorSetHasField(name)) {
prev_is_superset = false;
break; break;
} }
} } else continue;
if (prev_is_superset) continue; // use previous
var cand_is_superset = true;
for (chosen_set_ty.errorSetNames()) |name| { for (chosen_set_ty.errorSetNames()) |name| {
if (!candidate_set_ty.errorSetHasField(name)) { if (!candidate_set_ty.errorSetHasField(name)) {
cand_is_superset = false;
break; break;
} }
} } else {
if (cand_is_superset) {
err_set_ty = candidate_ty; err_set_ty = candidate_ty;
continue; continue;
} }