bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed type checking in relation operations.

Browse Source
This commit is contained in:
acqn
2020-08-15 06:27:11 +08:00
committed by Oliver Schmidt
parent 2663561c62
commit 87889df9e9
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/cc65/expr.c
View File

@@ -2303,16 +2303,21 @@ static void hie_compare (const GenDesc* Ops, /* List of generators */
LoadExpr (CF_NONE, &Expr2); LoadExpr (CF_NONE, &Expr2);
} }
/* Check if operands have allowed types for this operation */
if (!IsRelationType (Expr->Type) || !IsRelationType (Expr2.Type)) {
/* Output only one message even if both sides are wrong */
TypeCompatibilityDiagnostic (Expr->Type, Expr2.Type, 1,
"Comparing types '%s' with '%s' is invalid");
/* Avoid further errors */
ED_MakeConstAbsInt (Expr, 0);
ED_MakeConstAbsInt (&Expr2, 0);
}
/* Some operations aren't allowed on function pointers */ /* Some operations aren't allowed on function pointers */
if ((Gen->Flags & GEN_NOFUNC) != 0) { if ((Gen->Flags & GEN_NOFUNC) != 0) {
/* Output only one message even if both sides are wrong */ if ((IsTypeFuncPtr (Expr->Type) || IsTypeFuncPtr (Expr2.Type))) {
if (IsTypeFuncPtr (Expr->Type)) { /* Output only one message even if both sides are wrong */
Error ("Invalid left operand for relational operator"); Error ("Cannot use function pointers in this relation operation");
/* Avoid further errors */
ED_MakeConstAbsInt (Expr, 0);
ED_MakeConstAbsInt (&Expr2, 0);
} else if (IsTypeFuncPtr (Expr2.Type)) {
Error ("Invalid right operand for relational operator");
/* Avoid further errors */ /* Avoid further errors */
ED_MakeConstAbsInt (Expr, 0); ED_MakeConstAbsInt (Expr, 0);
ED_MakeConstAbsInt (&Expr2, 0); ED_MakeConstAbsInt (&Expr2, 0);
@@ -2321,9 +2326,14 @@ static void hie_compare (const GenDesc* Ops, /* List of generators */
/* Make sure, the types are compatible */ /* Make sure, the types are compatible */
if (IsClassInt (Expr->Type)) { if (IsClassInt (Expr->Type)) {
if (!IsClassInt (Expr2.Type) && !(IsClassPtr(Expr2.Type) && ED_IsNullPtr(Expr))) { if (!IsClassInt (Expr2.Type) && !ED_IsNullPtr (Expr)) {
TypeCompatibilityDiagnostic (Expr->Type, Expr2.Type, 1, if (IsClassPtr (Expr2.Type)) {
"Incompatible types comparing '%s' with '%s'"); TypeCompatibilityDiagnostic (Expr->Type, PtrConversion (Expr2.Type), 0,
"Comparing integer '%s' with pointer '%s'");
} else {
TypeCompatibilityDiagnostic (Expr->Type, Expr2.Type, 1,
"Comparing types '%s' with '%s' is invalid");
}
} }
} else if (IsClassPtr (Expr->Type)) { } else if (IsClassPtr (Expr->Type)) {
if (IsClassPtr (Expr2.Type)) { if (IsClassPtr (Expr2.Type)) {
@@ -2334,12 +2344,17 @@ static void hie_compare (const GenDesc* Ops, /* List of generators */
Type* right = Indirect (Expr2.Type); Type* right = Indirect (Expr2.Type);
if (TypeCmp (left, right) < TC_QUAL_DIFF && left->C != T_VOID && right->C != T_VOID) { if (TypeCmp (left, right) < TC_QUAL_DIFF && left->C != T_VOID && right->C != T_VOID) {
/* Incompatible pointers */ /* Incompatible pointers */
TypeCompatibilityDiagnostic (Expr->Type, Expr2.Type, 1, TypeCompatibilityDiagnostic (PtrConversion (Expr->Type), PtrConversion (Expr2.Type), 0,
"Incompatible pointer types comparing '%s' with '%s'"); "Incompatible pointer types comparing '%s' with '%s'");
} }
} else if (!ED_IsNullPtr (&Expr2)) { } else if (!ED_IsNullPtr (&Expr2)) {
TypeCompatibilityDiagnostic (Expr->Type, Expr2.Type, 1, if (IsClassInt (Expr2.Type)) {
"Comparing pointer type '%s' with '%s'"); TypeCompatibilityDiagnostic (PtrConversion (Expr->Type), Expr2.Type, 0,
"Comparing pointer type '%s' with integer type '%s'");
} else {
TypeCompatibilityDiagnostic (Expr->Type, Expr2.Type, 1,
"Comparing types '%s' with '%s' is invalid");
}
} }
} }