From da978932bf52d2933207549ed84f9051d0d2f75e Mon Sep 17 00:00:00 2001
From: Stephen Heumann <stephenheumann@gmail.com>
Date: Sun, 20 Feb 2022 15:35:49 -0600
Subject: [PATCH] Save string representation of macros defined on command line.

This is necessary for correct operation of the # and ## preprocessor operators on the tokens from such macros.

Integers with a sign character still have the non-standard property of being treated as a single token, so they cannot be used with ##, but in most cases such uses will now give an error.
---
 Scanner.pas | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/Scanner.pas b/Scanner.pas
index 29fbedb..c88b71d 100644
--- a/Scanner.pas
+++ b/Scanner.pas
@@ -4316,17 +4316,26 @@ repeat
          new(mp);                       {form the macro table entry}
          mp^.name := GetWord;
          mp^.parameters := -1;
-         mp^.tokens := nil;
          mp^.readOnly := false;
          mp^.saved := true;
          bp := pointer(ord4(macros) + hash(mp^.name));
          mp^.next := bp^;
          bp^ := mp;
+         new(mp^.tokens);
+         with mp^.tokens^ do begin
+            next := nil;
+            tokenString := @'';
+            expandEnabled := true;
+            end; {with}
          token.kind := intconst;        {create the default value}
-         token.numString := nil;
+         token.numString := @oneStr;
          token.class := intConstant;
          token.ival := 1;
+         oneStr := '1';
+         mp^.tokens^.tokenStart := @oneStr[1];
+         mp^.tokens^.tokenEnd := pointer(ord4(@oneStr[1])+1);
          if lch = '=' then begin
+            mp^.tokens^.tokenStart := cp;
             NextCh;                     {record the value}
             token.numString := nil;
             if charKinds[ord(lch)] = letter then begin
@@ -4341,6 +4350,7 @@ repeat
                if lch in ['.','0'..'9'] then begin
                   token.name := GetWord;
                   DoNumber(true);
+                  token.numString := @'?';
                   if negative then
                      case token.class of
                         intConstant   : token.ival := -token.ival;
@@ -4361,22 +4371,17 @@ repeat
                end {else if}
             else if lch in ['.','0'..'9'] then begin
                token.name := GetWord;
+               saveNumber := true;
                DoNumber(true);
+               saveNumber := false;
                end {else if}
             else if lch = '"' then 
                GetString
             else
                FlagErrorAndSkip;
+            mp^.tokens^.tokenEnd := ptr(ord4(cp)-1);
             end; {if}
-         new(mp^.tokens);               {add the value to the definition}
-         with mp^.tokens^ do begin
-            next := nil;
-            tokenString := @'';
-            expandEnabled := true;
-            tokenStart := nil;
-            tokenEnd := nil;
-            end; {with}
-         mp^.tokens^.token := token;
+         mp^.tokens^.token := token;    {add the value to the definition}
          end {if}
       else if lch in ['i','I'] then begin
          NextCh;                        {get the pathname}