From d5d9635cd9fbdfdcf22c86c5a6b0a1d43cd6b9aa Mon Sep 17 00:00:00 2001 From: Mattias Gaertner Date: Sat, 26 Sep 2020 22:36:45 +0000 Subject: [PATCH] fcl-passrc: clean up git-svn-id: trunk@46967 - --- packages/fcl-passrc/src/pscanner.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/fcl-passrc/src/pscanner.pp b/packages/fcl-passrc/src/pscanner.pp index 999baa829a..069c83ded5 100644 --- a/packages/fcl-passrc/src/pscanner.pp +++ b/packages/fcl-passrc/src/pscanner.pp @@ -4196,11 +4196,11 @@ var {$ifdef UsePChar} OldLength: integer; Ch: Char; + LE: string[2]; {$else} s: string; l: integer; {$endif} - LE : String{$ifdef fpc}[2]{$endif}; procedure FetchCurTokenString; inline; begin @@ -4336,7 +4336,9 @@ begin Result := tkBraceOpen else begin + {$ifdef UsePChar} LE:=LineEnding; + {$endif} // Old-style multi-line comment Inc(FTokenPos); TokenStart := FTokenPos; @@ -4353,13 +4355,11 @@ begin SetLength(FCurTokenString, OldLength + SectionLength + length(LineEnding)); // Corrected JC if SectionLength > 0 then Move(TokenStart^, FCurTokenString[OldLength + 1],SectionLength); - - // Corrected JC: Append the correct lineending Inc(OldLength, SectionLength); for Ch in LE do begin - Inc(OldLength); - FCurTokenString[OldLength] := Ch; + Inc(OldLength); + FCurTokenString[OldLength] := Ch; end; {$else} FCurTokenString:=FCurTokenString+copy(FCurLine,TokenStart,SectionLength)+LineEnding; // Corrected JC @@ -4654,11 +4654,11 @@ begin end; '{': // Multi-line comment begin - LE:=LineEnding; Inc(FTokenPos); TokenStart := FTokenPos; FCurTokenString := ''; {$ifdef UsePChar} + LE:=LineEnding; OldLength := 0; {$endif} NestingLevel := 0;