mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-08-23 21:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7297 from kalsprite/constant_guards

Browse Source 
intrinsics: fix guards combining two required conditions with &&
This commit is contained in:
gingerBill
2026-08-12 13:20:51 +02:00
committed by GitHub
parent eb9c7d471a 419050f82a
commit dcbd6b6a3d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/check_builtin.cpp
View File

@@ -2682,7 +2682,7 @@ gb_internal bool check_builtin_procedure_directive(CheckerContext *c, Operand *o
error(call, "'#panic' expects 1 argument, got %td", ce->args.count);
return false;
}
if (!is_type_string(operand->type) && operand->mode != Addressing_Constant) {
if (!is_type_string(operand->type) || operand->mode != Addressing_Constant) {
gbString str = expr_to_string(ce->args[0]);
error(call, "'%s' is not a constant string", str);
gb_string_free(str);
@@ -4943,7 +4943,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
return false;
}
if (!is_type_array(x.type) && !is_type_array(y.type)) {
if (!is_type_array(x.type) || !is_type_array(y.type)) {
gbString s1 = type_to_string(x.type);
gbString s2 = type_to_string(y.type);
error(call, "'%.*s' expects only arrays, got %s and %s", LIT(builtin_name), s1, s2);
@@ -5073,7 +5073,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
case BuiltinProc_is_package_imported: {
bool value = false;
if (!is_type_string(operand->type) && (operand->mode != Addressing_Constant)) {
if (!is_type_string(operand->type) || operand->mode != Addressing_Constant) {
error(ce->args[0], "Expected a constant string for '%.*s'", LIT(builtin_name));
} else if (operand->value.kind == ExactValue_String) {
String pkg_name = operand->value.value_string;
@@ -5131,7 +5131,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
Operand o = {};
check_expr(c, &o, ce->args[0]);
if (!is_type_integer(o.type) && (o.mode != Addressing_Constant)) {
if (!is_type_integer(o.type) || o.mode != Addressing_Constant) {
error(ce->args[0], "Expected a constant integer for '%.*s'", LIT(builtin_name));
return false;
}
@@ -5152,7 +5152,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
Operand o = {};
check_expr(c, &o, ce->args[0]);
if (!is_type_integer_or_float(o.type) && (o.mode != Addressing_Constant)) {
if (!is_type_integer_or_float(o.type) || o.mode != Addressing_Constant) {
error(ce->args[0], "Expected a constant number for '%.*s'", LIT(builtin_name));
return false;
}
@@ -6749,7 +6749,7 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
if (x.mode == Addressing_Invalid) {
return false;
}
if (y.mode != Addressing_Constant && is_type_integer(y.type)) {
if (y.mode != Addressing_Constant || !is_type_integer(y.type)) {
error(y.expr, "Second argument to '%.*s' representing the locality must be an integer in the range 0..=3", LIT(builtin_name));
return false;
}