Merge pull request cc65#2521 from kugelfuhr/kugelfuhr/fix-2520

Fix wrong evaluation of ternary expressions in the preprocessor
polluks · Sep 15, 2024 · 16258d8 · 16258d8
2 parents 7dc09fd + 175ec65
commit 16258d8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/cc65/ppexpr.c b/src/cc65/ppexpr.c
@@ -726,7 +726,7 @@ static void PPhieQuest (PPExpr* Expr)
         PPhieQuest (&Expr3);
 
         /* Set the result */
-        Expr->IVal = Expr->IVal ? Expr2.IVal != 0 : Expr3.IVal != 0;
+        Expr->IVal = Expr->IVal ? Expr2.IVal : Expr3.IVal;
 
         /* Restore evaluation as before */
         PPEvaluationEnabled = PPEvaluationEnabledPrev;

diff --git a/test/val/bug2520.c b/test/val/bug2520.c
@@ -0,0 +1,4 @@
+#if (1 ? 2 : 0) != 2
+#error
+#endif
+int main() { return 0; }