From ea623d38fc0691bb5d6ddeca5d25a208af3e220a Mon Sep 17 00:00:00 2001
From: Stephen Heumann <stephenheumann@gmail.com>
Date: Tue, 28 Feb 2023 22:36:42 -0600
Subject: [PATCH] Avoid incorrectly setting lastwasconst.

This could happen in some cases where one subexpression of a larger expression was a constant. One effect of this was to cause spurious "lint: implicit conversion changes value of constant" messages in certain cases (when that lint check was enabled). It may also have caused certain errors to be missed in other situations.
---
 Expression.pas | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Expression.pas b/Expression.pas
index 28a5eba..4e5f4b5 100644
--- a/Expression.pas
+++ b/Expression.pas
@@ -2872,6 +2872,7 @@ var
    doingScalar: boolean;                {temp; for assignment operators}
    et: baseTypeEnum;                    {temp storage for a base type}
    i: integer;                          {loop variable}
+   isConst: boolean;                    {is this a constant?}
    isNullPtrConst: boolean;             {is this a null pointer constant?}
    isVolatile: boolean;                 {is this a volatile op?}
    lType: typePtr;                      {type of operands}
@@ -3548,7 +3549,6 @@ var
 	 GenTool(pc_tl1, ftype^.toolNum, long(ftype^.ftype^.size).lsw,
             ftype^.dispatcher);
       expressionType := ftype^.fType;
-      lastWasConst := false;
       CheckForIncompleteStructType;
       end; {else}
    end; {FunctionCall}      
@@ -3674,7 +3674,7 @@ var
 
 
 begin {GenerateCode}
-lastwasconst := false;
+isConst := false;
 isNullPtrConst := false;
 case tree^.token.kind of
 
@@ -3737,7 +3737,7 @@ case tree^.token.kind of
 
    intConst,uintConst,ushortConst,charConst,scharConst,ucharConst: begin
       Gen1t(pc_ldc, tree^.token.ival, cgWord);
-      lastwasconst := true;
+      isConst := true;
       lastconst := tree^.token.ival;
       isNullPtrConst := tree^.token.ival = 0;
       if tree^.token.kind = intConst then
@@ -3760,7 +3760,7 @@ case tree^.token.kind of
          expressionType := longPtr
       else
          expressionType := ulongPtr;
-      lastwasconst := true;
+      isConst := true;
       lastconst := tree^.token.lval;
       isNullPtrConst := tree^.token.lval = 0;
       end; {case longConst}
@@ -3772,7 +3772,7 @@ case tree^.token.kind of
       else
          expressionType := ulonglongPtr;
       if (tree^.token.qval.hi = 0) and (tree^.token.qval.lo >= 0) then begin
-         lastwasconst := true;
+         isConst := true;
          lastconst := tree^.token.qval.lo;
          end; {if}
       isNullPtrConst := (tree^.token.qval.hi = 0) and (tree^.token.qval.lo = 0);
@@ -4814,6 +4814,7 @@ case tree^.token.kind of
 if doDispose then
    dispose(tree);
 lastWasNullPtrConst := isNullPtrConst;
+lastWasConst := isConst;
 end; {GenerateCode}