Bruce/tomo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Add ({...;}) around conditionals

Browse Source
This commit is contained in:
Bruce Hill 2025-03-28 16:13:54 -04:00
parent 046bc18151
commit 4538cbe1b4
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/compile.c
View File

@ -701,37 +701,39 @@ CORD optional_into_nonnone(type_t *t, CORD value)
CORD check_none(type_t *t, CORD value) CORD check_none(type_t *t, CORD value)
{ {
t = Match(t, OptionalType)->type; t = Match(t, OptionalType)->type;
// NOTE: these use statement expressions ({...;}) because some compilers
// complain about excessive parens around equality comparisons
if (t->tag == PointerType || t->tag == FunctionType || t->tag == CStringType if (t->tag == PointerType || t->tag == FunctionType || t->tag == CStringType
|| t == THREAD_TYPE) || t == THREAD_TYPE)
return CORD_all("(", value, " == NULL)"); return CORD_all("({", value, " == NULL;})");
else if (t == MATCH_TYPE) else if (t == MATCH_TYPE)
return CORD_all("((", value, ").index.small == 0)"); return CORD_all("({(", value, ").index.small == 0;})");
else if (t == PATH_TYPE) else if (t == PATH_TYPE)
return CORD_all("((", value, ").type.$tag == PATH_NONE)"); return CORD_all("({(", value, ").type.$tag == PATH_NONE;})");
else if (t == PATH_TYPE_TYPE) else if (t == PATH_TYPE_TYPE)
return CORD_all("((", value, ").$tag == PATH_NONE)"); return CORD_all("({(", value, ").$tag == PATH_NONE;})");
else if (t->tag == BigIntType) else if (t->tag == BigIntType)
return CORD_all("((", value, ").small == 0)"); return CORD_all("({(", value, ").small == 0;})");
else if (t->tag == ClosureType) else if (t->tag == ClosureType)
return CORD_all("((", value, ").fn == NULL)"); return CORD_all("({(", value, ").fn == NULL;})");
else if (t->tag == NumType) else if (t->tag == NumType)
return CORD_all("isnan(", value, ")"); return CORD_all("isnan(", value, ")");
else if (t->tag == ArrayType) else if (t->tag == ArrayType)
return CORD_all("((", value, ").length < 0)"); return CORD_all("({(", value, ").length < 0;})");
else if (t->tag == TableType || t->tag == SetType) else if (t->tag == TableType || t->tag == SetType)
return CORD_all("((", value, ").entries.length < 0)"); return CORD_all("({(", value, ").entries.length < 0;})");
else if (t->tag == BoolType) else if (t->tag == BoolType)
return CORD_all("((", value, ") == NONE_BOOL)"); return CORD_all("({(", value, ") == NONE_BOOL;})");
else if (t->tag == TextType) else if (t->tag == TextType)
return CORD_all("((", value, ").length < 0)"); return CORD_all("({(", value, ").length < 0;})");
else if (t->tag == IntType || t->tag == ByteType || t->tag == StructType) else if (t->tag == IntType || t->tag == ByteType || t->tag == StructType)
return CORD_all("(", value, ").is_none"); return CORD_all("(", value, ").is_none");
else if (t->tag == EnumType) else if (t->tag == EnumType)
return CORD_all("((", value, ").$tag == 0)"); return CORD_all("({(", value, ").$tag == 0;})");
else if (t->tag == MomentType) else if (t->tag == MomentType)
return CORD_all("((", value, ").tv_usec < 0)"); return CORD_all("({(", value, ").tv_usec < 0;})");
else if (t->tag == MutexedType) else if (t->tag == MutexedType)
return CORD_all("(", value, " == NULL)"); return CORD_all("({", value, " == NULL;})");
print_err("Optional check not implemented for: ", type_to_str(t)); print_err("Optional check not implemented for: ", type_to_str(t));
} }