From 6aae381e83dddf8808feefe4a5a2470320f27342 Mon Sep 17 00:00:00 2001
From: gingerBill <bill@gingerbill.org>
Date: Sun, 27 May 2018 11:03:46 +0100
Subject: Move ODIN_* platform constants to `core:os`

---
 src/entity.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/entity.cpp')

diff --git a/src/entity.cpp b/src/entity.cpp
index d7f7dc2df..31081e5ce 100644
--- a/src/entity.cpp
+++ b/src/entity.cpp
@@ -6,7 +6,6 @@ struct DeclInfo;
 
 #define ENTITY_KINDS \
 	ENTITY_KIND(Invalid) \
-	ENTITY_KIND(Package) \
 	ENTITY_KIND(Constant) \
 	ENTITY_KIND(Variable) \
 	ENTITY_KIND(TypeName) \
@@ -77,6 +76,7 @@ struct Entity {
 	AstNode *   identifier; // Can be nullptr
 	DeclInfo *  decl_info;
 	DeclInfo *  parent_proc_decl; // nullptr if in file/global scope
+	AstPackage *package;
 
 	// TODO(bill): Cleanup how `using` works for entities
 	Entity *    using_parent;
@@ -86,12 +86,6 @@ struct Entity {
 	String      deprecated_message;
 
 	union {
-		struct {
-			String fullpath;
-			String name;
-			Scope *scope;
-			// Array<Entity *> imports; // Entity_Package
-		} Package;
 		struct {
 			ExactValue value;
 		} Constant;
@@ -196,15 +190,6 @@ Entity *alloc_entity(EntityKind kind, Scope *scope, Token token, Type *type) {
 	return entity;
 }
 
-Entity *alloc_entity_package(Scope *scope, Type *type, String fullpath, String name) {
-	Token token = empty_token;
-	token.string = name;
-	Entity *entity = alloc_entity(Entity_Package, scope, token, type);
-	entity->Package.fullpath = fullpath;
-	entity->Package.name     = name;
-	return entity;
-}
-
 Entity *alloc_entity_variable(Scope *scope, Token token, Type *type, bool is_immutable, EntityState state = EntityState_Unresolved) {
 	Entity *entity = alloc_entity(Entity_Variable, scope, token, type);
 	entity->Variable.is_immutable = is_immutable;
-- 
cgit v1.2.3