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

Fix conversion of untyped integers to pointers

Browse Source
This commit is contained in:
Ginger Bill
2017-01-17 20:27:14 +00:00
parent cb59c1cf08
commit 367d307dc4
7 changed files with 129 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.c
+47 -3
View File
@@ -1398,7 +1398,8 @@ bool check_representable_as_constant(Checker *c, ExactValue in_value, Type *type
return true;
}
if (in_value.kind == ExactValue_Integer) {
return true;
return false;
// return true;
}
if (out_value) *out_value = in_value;
}
@@ -1727,6 +1728,7 @@ bool check_is_castable_to(Checker *c, Operand *operand, Type *y) {
return true;
}
if (dst->kind == Type_Array && src->kind == Type_Array) {
if (are_types_identical(dst->Array.elem, src->Array.elem)) {
return dst->Array.count == src->Array.count;
@@ -1868,6 +1870,8 @@ void check_conversion(Checker *c, Operand *x, Type *type) {
if (bt->kind == Type_Basic) {
if (check_representable_as_constant(c, x->value, bt, &x->value)) {
can_convert = true;
} else if (is_type_pointer(type) && check_is_castable_to(c, x, type)) {
can_convert = true;
}
}
} else if (check_is_castable_to(c, x, type)) {
@@ -2478,8 +2482,10 @@ Entity *check_selector(Checker *c, Operand *operand, AstNode *node, Type *type_h
goto error;
}
if (ast_node_expect(selector, AstNode_Ident)) {
// if (selector->kind != AstNode_Ident && selector->kind != AstNode_BasicLit) {
if (selector->kind != AstNode_Ident) {
error_node(selector, "Illegal selector kind: `%.*s`", LIT(ast_node_strings[selector->kind]));
goto error;
}
if (op_expr->kind == AstNode_Ident) {
@@ -2577,6 +2583,7 @@ Entity *check_selector(Checker *c, Operand *operand, AstNode *node, Type *type_h
}
}
}
if (check_op_expr) {
check_expr_base(c, operand, op_expr, NULL);
if (operand->mode == Addressing_Invalid) {
@@ -2589,6 +2596,43 @@ Entity *check_selector(Checker *c, Operand *operand, AstNode *node, Type *type_h
sel = lookup_field(c->allocator, operand->type, selector->Ident.string, operand->mode == Addressing_Type);
entity = sel.entity;
}
if (entity == NULL && selector->kind == AstNode_BasicLit) {
if (is_type_struct(operand->type) || is_type_tuple(operand->type)) {
Type *type = base_type(operand->type);
Operand o = {0};
check_expr(c, &o, selector);
if (o.mode != Addressing_Constant ||
!is_type_integer(o.type)) {
error_node(op_expr, "Indexed based selectors must be a constant integer %s");
goto error;
}
i64 index = o.value.value_integer;
if (index < 0) {
error_node(o.expr, "Index %lld cannot be a negative value", index);
goto error;
}
i64 max_count = 0;
switch (type->kind) {
case Type_Record: max_count = type->Record.field_count; break;
case Type_Tuple: max_count = type->Tuple.variable_count; break;
}
if (index >= max_count) {
error_node(o.expr, "Index %lld is out of bounds range 0..<%lld", index, max_count);
goto error;
}
sel = lookup_field_from_index(heap_allocator(), type, index);
entity = sel.entity;
GB_ASSERT(entity != NULL);
} else {
error_node(op_expr, "Indexed based selectors may only be used on structs or tuples");
goto error;
}
}
if (entity == NULL) {
gbString op_str = expr_to_string(op_expr);
gbString type_str = type_to_string(operand->type);