started cleaning up for system

1 files changed, 3 insertions, 19 deletions

diff --git a/identifiers.c b/identifiers.c
index b5e3f46..bb30e36 100644
--- a/identifiers.c
+++ b/identifiers.c
@@ -211,27 +211,11 @@ static int ident_index_in_decl(Identifier i, Declaration *d) {
 	return -1;
 }
 
-static Location ident_decl_location(File *file, Identifier i) {
-	switch (i->decl_kind) {
-	case IDECL_DECL:
-		return i->decl->where;
-	case IDECL_FOR:
-		if (i == i->decl_for->index) {
-			return token_location(file, i->decl_for->index_token);
-		} else {
-			assert(i == i->decl_for->value);	
-			return token_location(file, i->decl_for->value_token);
-		}
-		break;
-	case IDECL_NONE:
-		break;
-	}
-	assert(0);
-	Location l = {0};
-	return l;
+static Location ident_decl_location(Identifier i) {
+	return i->decl->where;
 }
 
 static bool ident_is_declared(Identifier i) {
-	return i && i->decl_kind != IDECL_NONE;
+	return i && i->decl;
 }