From 81bc4d9fece065d2946722463680b744eb55ba28 Mon Sep 17 00:00:00 2001 From: michael <michael@freepascal.org> Date: Thu, 24 Sep 2020 10:09:04 +0000 Subject: [PATCH] * Fix compilation on non-windows git-svn-id: trunk@46941 - --- packages/fcl-passrc/src/pscanner.pp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/fcl-passrc/src/pscanner.pp b/packages/fcl-passrc/src/pscanner.pp index 5b09468852..0bda2df115 100644 --- a/packages/fcl-passrc/src/pscanner.pp +++ b/packages/fcl-passrc/src/pscanner.pp @@ -4188,6 +4188,7 @@ begin end; function TPascalScanner.DoFetchToken: TToken; + var TokenStart: {$ifdef UsePChar}PChar{$else}integer{$endif}; i: TToken; @@ -4199,6 +4200,7 @@ var s: string; l: integer; {$endif} + LE : String[2]; procedure FetchCurTokenString; inline; begin @@ -4334,6 +4336,7 @@ begin Result := tkBraceOpen else begin + LE:=LineEnding; // Old-style multi-line comment Inc(FTokenPos); TokenStart := FTokenPos; @@ -4353,7 +4356,7 @@ begin // Corrected JC: Append the correct lineending Inc(OldLength, SectionLength); - for Ch in LineEnding do + for Ch in LE do begin Inc(OldLength); FCurTokenString[OldLength] := Ch; @@ -4651,6 +4654,7 @@ begin end; '{': // Multi-line comment begin + LE:=LineEnding; Inc(FTokenPos); TokenStart := FTokenPos; FCurTokenString := ''; @@ -4669,7 +4673,7 @@ begin // Corrected JC: Append the correct lineending Inc(OldLength, SectionLength); - for Ch in LineEnding do + for Ch in LE do begin Inc(OldLength); FCurTokenString[OldLength] := Ch;