ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with for in statements and pointer intervals

Browse Source
This commit is contained in:
gingerBill
2023-02-21 16:31:22 +00:00
parent ee4ed126e1
commit a2f02b8b32
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_expr.cpp
+14 -6
View File
@@ -7040,7 +7040,7 @@ gb_internal bool ternary_compare_types(Type *x, Type *y) {
} }
gb_internal bool check_range(CheckerContext *c, Ast *node, Operand *x, Operand *y, ExactValue *inline_for_depth_, Type *type_hint=nullptr) { gb_internal bool check_range(CheckerContext *c, Ast *node, bool is_for_loop, Operand *x, Operand *y, ExactValue *inline_for_depth_, Type *type_hint=nullptr) {
if (!is_ast_range(node)) { if (!is_ast_range(node)) {
return false; return false;
} }
@@ -7089,9 +7089,17 @@ gb_internal bool check_range(CheckerContext *c, Ast *node, Operand *x, Operand *
} }
Type *type = x->type; Type *type = x->type;
if (!is_type_integer(type) && !is_type_float(type) && !is_type_pointer(type) && !is_type_enum(type)) {
error(ie->op, "Only numerical and pointer types are allowed within interval expressions"); if (is_for_loop) {
return false; if (!is_type_integer(type) && !is_type_float(type) && !is_type_enum(type)) {
error(ie->op, "Only numerical types are allowed within interval expressions");
return false;
}
} else {
if (!is_type_integer(type) && !is_type_float(type) && !is_type_pointer(type) && !is_type_enum(type)) {
error(ie->op, "Only numerical and pointer types are allowed within interval expressions");
return false;
}
} }
if (x->mode == Addressing_Constant && if (x->mode == Addressing_Constant &&
@@ -8104,7 +8112,7 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
Operand x = {}; Operand x = {};
Operand y = {}; Operand y = {};
bool ok = check_range(c, fv->field, &x, &y, nullptr); bool ok = check_range(c, fv->field, false, &x, &y, nullptr);
if (!ok) { if (!ok) {
continue; continue;
} }
@@ -8320,7 +8328,7 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
Operand x = {}; Operand x = {};
Operand y = {}; Operand y = {};
bool ok = check_range(c, fv->field, &x, &y, nullptr, index_type); bool ok = check_range(c, fv->field, false, &x, &y, nullptr, index_type);
if (!ok) { if (!ok) {
continue; continue;
} }
src/check_stmt.cpp
+2 -2
View File
@@ -725,7 +725,7 @@ gb_internal void check_inline_range_stmt(CheckerContext *ctx, Ast *node, u32 mod
Operand x = {}; Operand x = {};
Operand y = {}; Operand y = {};
bool ok = check_range(ctx, expr, &x, &y, &inline_for_depth); bool ok = check_range(ctx, expr, true, &x, &y, &inline_for_depth);
if (!ok) { if (!ok) {
goto skip_expr; goto skip_expr;
} }
@@ -1439,7 +1439,7 @@ gb_internal void check_range_stmt(CheckerContext *ctx, Ast *node, u32 mod_flags)
Operand x = {}; Operand x = {};
Operand y = {}; Operand y = {};
bool ok = check_range(ctx, expr, &x, &y, nullptr); bool ok = check_range(ctx, expr, true, &x, &y, nullptr);
if (!ok) { if (!ok) {
goto skip_expr_range_stmt; goto skip_expr_range_stmt;
} }