ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32 test

Browse Source
This commit is contained in:
gingerBill
2016-08-15 21:22:44 +01:00
parent dcbb2fcfbd
commit 50fd9548b9
13 changed files with 803 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/checker/checker.cpp
+7 -2
View File
@@ -452,7 +452,8 @@ void add_type_and_value(CheckerInfo *i, AstNode *expression, AddressingMode mode
if (mode == Addressing_Constant) {
GB_ASSERT(value.kind != ExactValue_Invalid);
GB_ASSERT(type == t_invalid || is_type_constant_type(type));
GB_ASSERT_MSG(type != t_invalid || is_type_constant_type(type),
"type: %s", type_to_string(type));
}
TypeAndValue tv = {};
@@ -473,7 +474,11 @@ void add_entity(Checker *c, Scope *scope, AstNode *identifier, Entity *entity) {
if (!are_strings_equal(entity->token.string, make_string("_"))) {
Entity *insert_entity = scope_insert_entity(scope, entity);
if (insert_entity) {
error(&c->error_collector, entity->token, "Redeclared entity in this scope: %.*s", LIT(entity->token.string));
error(&c->error_collector, entity->token,
"Redeclararation of `%.*s` in this scope\n"
"\tat %.*s(%td:%td)",
LIT(entity->token.string),
LIT(entity->token.pos.file), entity->token.pos.line, entity->token.pos.column);
return;
}
}
src/checker/expr.cpp
+9 -9
View File
@@ -1807,7 +1807,7 @@ ExpressionKind check__expr_base(Checker *c, Operand *o, AstNode *node, Type *typ
case Token_Float: t = t_untyped_float; break;
case Token_String: t = t_untyped_string; break;
case Token_Rune: t = t_untyped_rune; break;
default: GB_PANIC("Unknown literal"); break;
default: GB_PANIC("Unknown literal"); break;
}
o->mode = Addressing_Constant;
o->type = t;
@@ -1815,16 +1815,16 @@ ExpressionKind check__expr_base(Checker *c, Operand *o, AstNode *node, Type *typ
case_end;
case_ast_node(pl, ProcLit, node);
auto curr_context = c->context;
c->context.scope = c->global_scope;
check_open_scope(c, pl->type);
c->context.decl = make_declaration_info(c->allocator, c->context.scope);
defer ({
check_close_scope(c);
c->context = curr_context;
});
Type *proc_type = check_type(c, pl->type);
if (proc_type != NULL) {
auto context = c->context;
c->context.scope = c->global_scope;
check_open_scope(c, pl->type);
c->context.decl = make_declaration_info(c->allocator, c->context.scope);
defer ({
c->context = context;
check_close_scope(c);
});
check_proc_body(c, empty_token, c->context.decl, proc_type, pl->body);
o->mode = Addressing_Value;
o->type = proc_type;