empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preparation for constness-correction.

Browse source
This commit is contained in:
acqn 2021-03-30 16:47:57 +08:00 • committed by Oliver Schmidt
parent a982f6a668
commit bfb7c936aa
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cc65/expr.c
View file

@ -4094,7 +4094,7 @@ static void hieQuest (ExprDesc* Expr)
/* Get common type */ /* Get common type */
ResultType = ArithmeticConvert (Expr2.Type, Expr3.Type); ResultType = TypeDup (ArithmeticConvert (Expr2.Type, Expr3.Type));
/* Convert the third expression to this type if needed */ /* Convert the third expression to this type if needed */
TypeConversion (&Expr3, ResultType); TypeConversion (&Expr3, ResultType);
@ -4138,22 +4138,22 @@ static void hieQuest (ExprDesc* Expr)
} }
} else if (IsClassPtr (Expr2.Type) && Expr3IsNULL) { } else if (IsClassPtr (Expr2.Type) && Expr3IsNULL) {
/* Result type is pointer, no cast needed */ /* Result type is pointer, no cast needed */
ResultType = Expr2.Type; ResultType = TypeDup (Expr2.Type);
} else if (Expr2IsNULL && IsClassPtr (Expr3.Type)) { } else if (Expr2IsNULL && IsClassPtr (Expr3.Type)) {
/* Result type is pointer, no cast needed */ /* Result type is pointer, no cast needed */
ResultType = Expr3.Type; ResultType = TypeDup (Expr3.Type);
} else if (IsTypeVoid (Expr2.Type) && IsTypeVoid (Expr3.Type)) { } else if (IsTypeVoid (Expr2.Type) && IsTypeVoid (Expr3.Type)) {
/* Result type is void */ /* Result type is void */
ResultType = type_void; ResultType = TypeDup (type_void);
} else { } else {
if (IsClassStruct (Expr2.Type) && IsClassStruct (Expr3.Type) && if (IsClassStruct (Expr2.Type) && IsClassStruct (Expr3.Type) &&
TypeCmp (Expr2.Type, Expr3.Type).C == TC_IDENTICAL) { TypeCmp (Expr2.Type, Expr3.Type).C == TC_IDENTICAL) {
/* Result type is struct/union */ /* Result type is struct/union */
ResultType = Expr2.Type; ResultType = TypeDup (Expr2.Type);
} else { } else {
TypeCompatibilityDiagnostic (Expr2.Type, Expr3.Type, 1, TypeCompatibilityDiagnostic (Expr2.Type, Expr3.Type, 1,
"Incompatible types in ternary '%s' with '%s'"); "Incompatible types in ternary '%s' with '%s'");
ResultType = Expr2.Type; /* Doesn't matter here */ ResultType = TypeDup (Expr2.Type); /* Doesn't matter here */
} }
} }