ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-20 04:35:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup for builtin scope/pkg

Browse Source
This commit is contained in:
gingerBill
2018-06-17 22:07:27 +01:00
parent a99cc2fd70
commit a4e3201113
6 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
-1
View File
@@ -108,7 +108,6 @@ void error_operand_no_value(Operand *o) {
void check_scope_decls(CheckerContext *c, Array<Ast *> const &nodes, isize reserve_size) {
Scope *s = c->scope;
GB_ASSERT(s->package == nullptr);
check_collect_entities(c, nodes);
src/check_stmt.cpp
+2 -2
View File
@@ -1483,7 +1483,7 @@ void check_stmt_internal(CheckerContext *ctx, Ast *node, u32 flags) {
}
if (entity == nullptr) {
entity = alloc_entity_dummy_variable(universal_scope, ast_token(name));
entity = alloc_entity_dummy_variable(builtin_scope, ast_token(name));
}
entities[entity_count++] = entity;
@@ -1669,7 +1669,7 @@ void check_stmt_internal(CheckerContext *ctx, Ast *node, u32 flags) {
}
}
if (entity == nullptr) {
entity = alloc_entity_dummy_variable(universal_scope, ast_token(name));
entity = alloc_entity_dummy_variable(builtin_scope, ast_token(name));
}
entity->parent_proc_decl = ctx->curr_proc_decl;
entities[entity_count++] = entity;
src/check_type.cpp
+2 -2
View File
@@ -1642,7 +1642,7 @@ void init_map_entry_type(Type *type) {
}
*/
Ast *dummy_node = alloc_ast_node(nullptr, Ast_Invalid);
Scope *s = create_scope(universal_scope, a);
Scope *s = create_scope(builtin_scope, a);
auto fields = array_make<Entity *>(a, 0, 3);
array_add(&fields, alloc_entity_field(s, make_token_ident(str_lit("key")), t_map_key, false, 0, EntityState_Resolved));
@@ -1677,7 +1677,7 @@ void init_map_internal_types(Type *type) {
*/
gbAllocator a = heap_allocator();
Ast *dummy_node = alloc_ast_node(nullptr, Ast_Invalid);
Scope *s = create_scope(universal_scope, a);
Scope *s = create_scope(builtin_scope, a);
Type *hashes_type = alloc_type_dynamic_array(t_int);
Type *entries_type = alloc_type_dynamic_array(type->Map.entry_type);
src/checker.cpp
+37 -40
View File
@@ -22,11 +22,6 @@ bool is_operand_undef(Operand o) {
return o.mode == Addressing_Value && o.type == t_untyped_undef;
}
gb_global Scope *universal_scope = nullptr;
gb_global AstPackage *builtin_package = nullptr;
void scope_reset(Scope *scope) {
if (scope == nullptr) return;
@@ -226,7 +221,7 @@ Scope *create_scope(Scope *parent, gbAllocator allocator, isize init_elements_ca
s->delayed_imports.allocator = heap_allocator();
s->delayed_directives.allocator = heap_allocator();
if (parent != nullptr && parent != universal_scope) {
if (parent != nullptr && parent != builtin_pkg->scope) {
DLIST_APPEND(parent->first_child, parent->last_child, s);
}
return s;
@@ -249,27 +244,27 @@ Scope *create_scope_from_file(CheckerContext *c, AstFile *f) {
return s;
}
Scope *create_scope_from_package(CheckerContext *c, AstPackage *p) {
GB_ASSERT(p != nullptr);
Scope *create_scope_from_package(CheckerContext *c, AstPackage *pkg) {
GB_ASSERT(pkg != nullptr);
isize decl_count = 0;
for_array(i, p->files) {
decl_count += p->files[i]->decls.count;
for_array(i, pkg->files) {
decl_count += pkg->files[i]->decls.count;
}
isize init_elements_capacity = 2*decl_count;
Scope *s = create_scope(universal_scope, c->allocator, init_elements_capacity);
Scope *s = create_scope(builtin_scope, c->allocator, init_elements_capacity);
s->is_package = true;
s->package = p;
p->scope = s;
s->is_pkg = true;
s->pkg = pkg;
pkg->scope = s;
if (p->fullpath == c->checker->parser->init_fullpath) {
if (pkg->fullpath == c->checker->parser->init_fullpath) {
s->is_init = true;
} else {
s->is_init = p->kind == Package_Init;
s->is_init = pkg->kind == Package_Init;
}
if (p->kind == Package_Runtime) {
if (pkg->kind == Package_Runtime) {
s->is_global = true;
}
@@ -375,7 +370,7 @@ void scope_lookup_parent(Scope *scope, String name, Scope **scope_, Entity **ent
if (s->is_proc) {
gone_thru_proc = true;
}
if (s->is_package) {
if (s->is_pkg) {
gone_thru_package = true;
}
}
@@ -504,7 +499,7 @@ Entity *add_global_entity(Entity *entity) {
if (gb_memchr(name.text, ' ', name.len)) {
return entity; // NOTE(bill): 'untyped thing'
}
if (scope_insert(universal_scope, entity)) {
if (scope_insert(builtin_scope, entity)) {
compiler_error("double declaration");
}
entity->state = EntityState_Resolved;
@@ -533,15 +528,16 @@ void init_universal(void) {
BuildContext *bc = &build_context;
// NOTE(bill): No need to free these
gbAllocator a = heap_allocator();
universal_scope = create_scope(nullptr, a);
universal_scope->is_package = true;
builtin_pkg = gb_alloc_item(a, AstPackage);
builtin_pkg->name = str_lit("builtin");
builtin_pkg->kind = Package_Normal;
builtin_scope = create_scope(nullptr, a);
builtin_scope->is_pkg = true;
builtin_scope->pkg = builtin_pkg;
builtin_pkg->scope = builtin_scope;
builtin_package = gb_alloc_item(a, AstPackage);
builtin_package->name = str_lit("builtin");
builtin_package->kind = Package_Normal;
builtin_package->scope = universal_scope;
universal_scope->package = builtin_package;
@@ -621,7 +617,8 @@ CheckerContext make_checker_context(Checker *c) {
ctx.checker = c;
ctx.info = &c->info;
ctx.allocator = c->allocator;
ctx.scope = universal_scope;
ctx.scope = builtin_pkg->scope;
ctx.pkg = builtin_pkg;
ctx.type_path = new_checker_type_path();
ctx.type_level = 0;
@@ -1351,7 +1348,7 @@ void generate_minimum_dependency_set(Checker *c, Entity *start) {
for_array(i, c->info.definitions) {
Entity *e = c->info.definitions[i];
// if (e->scope->is_global && !is_type_poly_proc(e->type)) { // TODO(bill): is the check enough?
if (e->scope == universal_scope) { // TODO(bill): is the check enough?
if (e->scope == builtin_pkg->scope) { // TODO(bill): is the check enough?
if (e->type == nullptr) {
add_dependency_to_set(c, e);
}
@@ -1976,8 +1973,8 @@ void check_builtin_attributes(CheckerContext *ctx, Entity *e, Array<Ast *> *attr
}
if (name == "builtin") {
add_entity(ctx->checker, universal_scope, nullptr, e);
GB_ASSERT(scope_lookup(universal_scope, e->token.string) != nullptr);
add_entity(ctx->checker, builtin_scope, nullptr, e);
GB_ASSERT(scope_lookup(builtin_scope, e->token.string) != nullptr);
if (value != nullptr) {
error(value, "'builtin' cannot have a field value");
}
@@ -2532,7 +2529,7 @@ void check_add_import_decl(CheckerContext *ctx, Ast *decl) {
Scope *scope = nullptr;
if (id->fullpath == "builtin") {
scope = universal_scope;
scope = builtin_pkg->scope;
} else {
HashKey key = hash_string(id->fullpath);
AstPackage **found = map_get(pkgs, key);
@@ -2549,7 +2546,7 @@ void check_add_import_decl(CheckerContext *ctx, Ast *decl) {
scope = pkg->scope;
}
}
GB_ASSERT(scope->is_package);
GB_ASSERT(scope->is_pkg);
if (ptr_set_exists(&parent_scope->imported, scope)) {
@@ -2561,7 +2558,7 @@ void check_add_import_decl(CheckerContext *ctx, Ast *decl) {
String import_name = id->import_name.string;
if (import_name.len == 0) {
import_name = scope->package->name;
import_name = scope->pkg->name;
}
if (is_blank_ident(import_name)) {
if (id->is_using) {
@@ -2896,8 +2893,8 @@ void check_import_entities(Checker *c) {
bool new_files = false;
for_array(i, package_order) {
ImportGraphNode *node = package_order[i];
GB_ASSERT(node->scope->is_package);
AstPackage *pkg = node->scope->package;
GB_ASSERT(node->scope->is_pkg);
AstPackage *pkg = node->scope->pkg;
if (!ptr_set_exists(&c->checked_packages, pkg)) {
continue;
}
@@ -2946,8 +2943,8 @@ void check_import_entities(Checker *c) {
for_array(i, package_order) {
ImportGraphNode *node = package_order[i];
GB_ASSERT(node->scope->is_package);
AstPackage *pkg = node->scope->package;
GB_ASSERT(node->scope->is_pkg);
AstPackage *pkg = node->scope->pkg;
for_array(i, pkg->files) {
AstFile *f = pkg->files[i];
@@ -3276,11 +3273,11 @@ void check_parsed_files(Checker *c) {
Entity *e = scope_lookup_current(s, str_lit("main"));
if (e == nullptr) {
Token token = {};
token.pos.file = s->package->fullpath;
token.pos.file = s->pkg->fullpath;
token.pos.line = 1;
token.pos.column = 1;
if (s->package->files.count > 0) {
AstFile *f = s->package->files[0];
if (s->pkg->files.count > 0) {
AstFile *f = s->pkg->files[0];
if (f->tokens.count > 0) {
token = f->tokens[0];
}
src/checker.hpp
+9 -2
View File
@@ -224,14 +224,14 @@ struct Scope {
PtrSet<Scope *> imported;
bool is_proc;
bool is_global;
bool is_package;
bool is_pkg;
bool is_file;
bool is_init;
bool is_struct;
bool has_been_imported; // This is only applicable to file scopes
union {
AstPackage *package;
AstPackage *pkg;
AstFile * file;
};
};
@@ -347,6 +347,13 @@ struct Checker {
gb_global AstPackage *builtin_pkg = nullptr;
gb_global Scope * builtin_scope = nullptr;
HashKey hash_node (Ast *node) { return hash_pointer(node); }
HashKey hash_ast_file (AstFile *file) { return hash_pointer(file); }
HashKey hash_entity (Entity *e) { return hash_pointer(e); }
src/ir.cpp
+1 -1
View File
@@ -8405,7 +8405,7 @@ void ir_gen_tree(irGen *s) {
}
Scope *package_scope = scope->parent;
GB_ASSERT(package_scope->is_package);
GB_ASSERT(package_scope->is_pkg);
switch (e->kind) {
case Entity_Variable: