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

Fix issues #95 and #96

Browse Source
This commit is contained in:
Ginger Bill
2017-09-13 22:20:27 +01:00
parent cbcf4b6071
commit 333db4dc94
4 changed files with 63 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/checker.cpp
View File

@@ -1074,11 +1074,11 @@ bool add_entity(Checker *c, Scope *scope, AstNode *identifier, Entity *entity) {
String name = entity->token.string;
if (!is_blank_ident(name)) {
Entity *ie = scope_insert_entity(scope, entity);
if (ie) {
if (ie != nullptr) {
TokenPos pos = ie->token.pos;
Entity *up = ie->using_parent;
if (up != nullptr) {
if (token_pos_eq(pos, up->token.pos)) {
if (pos == up->token.pos) {
// NOTE(bill): Error should have been handled already
return false;
}
@@ -1089,7 +1089,7 @@ bool add_entity(Checker *c, Scope *scope, AstNode *identifier, Entity *entity) {
LIT(up->token.pos.file), up->token.pos.line, up->token.pos.column);
return false;
} else {
if (token_pos_eq(pos, entity->token.pos)) {
if (pos == entity->token.pos) {
// NOTE(bill): Error should have been handled already
return false;
}