mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-08-14 01:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

switch ordering

Browse Source
This commit is contained in:
kalsprite
2026-08-07 16:14:12 -07:00
parent 391a862e4f
commit 42bd26cb72
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/checker.cpp
View File

@@ -2050,26 +2050,26 @@ gb_internal bool redeclaration_error(String name, Entity *prev, Entity *found) {
// NOTE(bill): Error should have been handled already
return false;
}
// NOTE: the insertion order is a race between the files of a package, so anchor on the
// lower position to keep the diagnostic stable
TokenPos lo = prev->token.pos;
TokenPos hi = pos;
if (hi < lo) {
lo = pos;
hi = prev->token.pos;
// NOTE: the insertion order is a race between the files of a package, so order the pair by
// position; the later declaration stays the anchor, as it is the one being reported
TokenPos first = prev->token.pos;
TokenPos second = pos;
if (second < first) {
first = pos;
second = prev->token.pos;
}
if (found->flags & EntityFlag_Result) {
error(lo,
error(second,
"Direct shadowing of the named return value '%.*s' in this scope\n"
"\tat %s",
LIT(name),
token_pos_to_string(hi));
token_pos_to_string(first));
} else {
error(lo,
error(second,
"Redeclaration of '%.*s' in this scope\n"
"\tat %s",
LIT(name),
token_pos_to_string(hi));
token_pos_to_string(first));
}
}
return false;