From 7ac3fe642491452395d765cbe61fb9e0071cd0ad Mon Sep 17 00:00:00 2001
From: Stephen Heumann <stephenheumann@gmail.com>
Date: Fri, 12 Nov 2021 21:14:15 -0600
Subject: [PATCH] Allow string constants in initializers for arrays of char*.

For example, declarations like the following should be accepted:

char *p[] = {"abc", "def"};

This previously worked, but it was broken by commit 5871820e0c.
---
 Parser.pas | 100 +++++++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 53 deletions(-)

diff --git a/Parser.pas b/Parser.pas
index 0021691..4b471ab 100644
--- a/Parser.pas
+++ b/Parser.pas
@@ -2491,64 +2491,58 @@ var
       kind := ktp^.kind;
 
       {handle string constants}
-      if token.kind = stringConst then begin
+      if token.kind = stringConst then
          stringElementType := StringType(token.prefix)^.aType;
-         if (kind = scalarType) and 
-            (((ktp^.baseType in [cgByte,cgUByte])
-               and (stringElementType = charPtr))
-            or CompTypes(ktp,stringElementType)) then begin
-            stringLength := token.sval^.length div ord(stringElementType^.size);
-            if tp^.elements = 0 then begin
-               tp^.elements := stringLength;
-               RecomputeSizes(variable^.itype);
-               end {if}
-            else if tp^.elements < stringLength-1 then begin
-               Error(44);
-               errorFound := true;
-               end; {else if}
-            with ktp^ do begin
-               iPtr := pointer(Malloc(sizeof(initializerRecord)));
-               iPtr^.next := variable^.iPtr;
-               variable^.iPtr := iPtr;
-               iPtr^.count := 1;
-               iPtr^.bitdisp := 0;
-               iPtr^.bitsize := 0;
-               iPtr^.isStructOrUnion := false;
-               if (variable^.storage in [external,global,private]) then begin
-                  iPtr^.isConstant := true;
-                  iPtr^.itype := cgString;
-                  iPtr^.sval := token.sval;
-                  count := tp^.elements - stringLength;
-                  if count > 0 then
-                     Fill(count, stringElementType)
-                  else if count = -1 then begin
-                     iPtr^.sval := pointer(GMalloc(token.sval^.length+2));
-                     CopyLongString(iPtr^.sval, token.sval);
-                     iPtr^.sval^.length :=
-                        iPtr^.sval^.length - ord(stringElementType^.size);
-                     end; {else if}
-                  end {if}
-               else begin
-                  iPtr^.isConstant := false;
-                  new(ep);
-                  iPtr^.iTree := ep;
-                  ep^.next := nil;
-                  ep^.left := nil;
-                  ep^.middle := nil;
-                  ep^.right := nil;
-                  ep^.token := token;
-                  end; {else}
-               end; {with}
-            NextToken;
+      if (token.kind = stringConst) and (kind = scalarType) and 
+         (((ktp^.baseType in [cgByte,cgUByte])
+            and (stringElementType = charPtr))
+         or CompTypes(ktp,stringElementType)) then begin
+         stringLength := token.sval^.length div ord(stringElementType^.size);
+         if tp^.elements = 0 then begin
+            tp^.elements := stringLength;
+            RecomputeSizes(variable^.itype);
             end {if}
-         else begin
-            Error(47);
+         else if tp^.elements < stringLength-1 then begin
+            Error(44);
             errorFound := true;
-            NextToken;
-            end; {else}
+            end; {else if}
+         with ktp^ do begin
+            iPtr := pointer(Malloc(sizeof(initializerRecord)));
+            iPtr^.next := variable^.iPtr;
+            variable^.iPtr := iPtr;
+            iPtr^.count := 1;
+            iPtr^.bitdisp := 0;
+            iPtr^.bitsize := 0;
+            iPtr^.isStructOrUnion := false;
+            if (variable^.storage in [external,global,private]) then begin
+               iPtr^.isConstant := true;
+               iPtr^.itype := cgString;
+               iPtr^.sval := token.sval;
+               count := tp^.elements - stringLength;
+               if count > 0 then
+                  Fill(count, stringElementType)
+               else if count = -1 then begin
+                  iPtr^.sval := pointer(GMalloc(token.sval^.length+2));
+                  CopyLongString(iPtr^.sval, token.sval);
+                  iPtr^.sval^.length :=
+                     iPtr^.sval^.length - ord(stringElementType^.size);
+                  end; {else if}
+               end {if}
+            else begin
+               iPtr^.isConstant := false;
+               new(ep);
+               iPtr^.iTree := ep;
+               ep^.next := nil;
+               ep^.left := nil;
+               ep^.middle := nil;
+               ep^.right := nil;
+               ep^.token := token;
+               end; {else}
+            end; {with}
+         NextToken;
          end {if}
 
-      {handle arrays of non-strings}
+      {handle arrays not initialized with a string constant}
       else if kind in
          [scalarType,pointerType,enumType,arrayType,structType,unionType] then
          begin