mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-30 18:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let -vet ignore intentional declaration shadowing #637

Browse Source
This commit is contained in:
gingerBill
2020-05-12 10:31:49 +01:00
parent d49ecd9009
commit fcdfcfce19
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/checker.cpp
View File

@@ -506,15 +506,30 @@ bool check_vet_shadowing(Checker *c, Entity *e, VettedEntity *ve) {
return false;
}
// NOTE(bill): If the types differ, don't complain
if (are_types_identical(e->type, shadowed->type)) {
gb_zero_item(ve);
ve->kind = VettedEntity_Shadowed;
ve->entity = e;
ve->other = shadowed;
return true;
if (!are_types_identical(e->type, shadowed->type)) {
return false;
}
return false;
// NOTE(bill): Ignore intentional redeclaration
// x := x;
// Suggested in issue #637 (2020-05-11)
if ((e->flags & EntityFlag_Using) == 0 && e->kind == Entity_Variable) {
Ast *init = unparen_expr(e->Variable.init_expr);
if (init != nullptr && init->kind == Ast_Ident) {
// TODO(bill): Which logic is better? Same name or same entity
// bool ignore = init->Ident.token.string == name;
bool ignore = init->Ident.entity == shadowed;
if (ignore) {
return false;
}
}
}
gb_zero_item(ve);
ve->kind = VettedEntity_Shadowed;
ve->entity = e;
ve->other = shadowed;
return true;
}
bool check_vet_unused(Checker *c, Entity *e, VettedEntity *ve) {