From 280f67e84663ef0f3a643e7537992c69c1a0b958 Mon Sep 17 00:00:00 2001
From: Stephen Heumann <stephenheumann@gmail.com>
Date: Tue, 20 Dec 2016 22:40:24 -0600
Subject: [PATCH] Make || and && operators in constant expressions yield
 results of type int.

Previously the result type was based on the operand types (using the arithmetic conversions), which is incorrect. The following program illustrates the issue:

#include <stdio.h>
int main(void)
{
    /* should print "1 0 2 2" */
    printf("%i %i %lu %lu\n", 0L || 2, 0.0 && 2,
           sizeof(1L || 5), sizeof(1.0 && 2.5));
}
---
 Expression.pas | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/Expression.pas b/Expression.pas
index 683b742..25401dd 100644
--- a/Expression.pas
+++ b/Expression.pas
@@ -1039,10 +1039,14 @@ var
                dispose(op^.left);
                op^.left := nil;
                case op^.token.kind of
-                  barbarop    :                                         {||}
-                     op1 := ord((op1 <> 0) or (op2 <> 0));
-                  andandop    :                                         {&&}
-                     op1 := ord((op1 <> 0) and (op2 <> 0));
+                  barbarop    : begin                                   {||}
+                                op1 := ord((op1 <> 0) or (op2 <> 0));
+                                ekind := intconst;
+                                end;
+                  andandop    : begin                                   {&&}
+                                op1 := ord((op1 <> 0) and (op2 <> 0));
+                                ekind := intconst;
+                                end;
                   carotch     : op1 := op1 ! op2;                       {^}
                   barch       : op1 := op1 | op2;                       {|}
                   andch       : op1 := op1 & op2;                       {&}
@@ -1147,10 +1151,14 @@ var
                dispose(op^.left);
                op^.left := nil;
                case op^.token.kind of
-                  barbarop    :                                         {||}
-                     rop1 := ord((rop1 <> 0.0) or (rop2 <> 0.0));
-                  andandop    :                                         {&&}
-                     rop1 := ord((rop1 <> 0.0) and (rop2 <> 0.0));
+                  barbarop    : begin                                   {||}
+                                op1 := ord((rop1 <> 0.0) or (rop2 <> 0.0));
+                                ekind := intconst;
+                                end;
+                  andandop    : begin                                   {&&}
+                                op1 := ord((rop1 <> 0.0) and (rop2 <> 0.0));
+                                ekind := intconst;
+                                end;
                   eqeqop      : begin                                   {==}
                                 op1 := ord(rop1 = rop2);
                                 ekind := intconst;