From 8246aae1aed25c3e856694d1bf9b27e4f9dc714c Mon Sep 17 00:00:00 2001
From: Mattias Gaertner <nc-gaertnma@netcologne.de>
Date: Sat, 26 Sep 2020 22:27:57 +0000
Subject: [PATCH] fcl-passrc: fixed compile with pas2js
git-svn-id: trunk@46965 -
---
packages/fcl-passrc/src/pscanner.pp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/packages/fcl-passrc/src/pscanner.pp b/packages/fcl-passrc/src/pscanner.pp
index 0bda2df115..999baa829a 100644
--- a/packages/fcl-passrc/src/pscanner.pp
+++ b/packages/fcl-passrc/src/pscanner.pp
@@ -4200,7 +4200,7 @@ var
s: string;
l: integer;
{$endif}
- LE : String[2];
+ LE : String{$ifdef fpc}[2]{$endif};
procedure FetchCurTokenString; inline;
begin
@@ -4327,7 +4327,7 @@ begin
'(':
begin
Inc(FTokenPos);
- if {$ifdef UsePChar}FTokenPos[0] = '.'{$else}(FTokenPos>l) or (s[FTokenPos]<>'.'){$endif} then
+ if {$ifdef UsePChar}FTokenPos[0] = '.'{$else}(FTokenPos<=l) and (s[FTokenPos]='.'){$endif} then
begin
Inc(FTokenPos);
Result := tkSquaredBraceOpen;
@@ -4519,7 +4519,7 @@ begin
Inc(FTokenPos);
until {$ifdef UsePChar}not (FTokenPos[0] in Digits){$else}(FTokenPos>l) or not (s[FTokenPos] in Digits){$endif};
if {$ifdef UsePChar}(FTokenPos[0]='.') and (FTokenPos[1]<>'.') and (FTokenPos[1]<>')'){$else}
- (FTokenPos<=l) and (s[FTokenPos]='.') and ((FTokenPos=l) or (s[FTokenPos+1]<>'.') and ((FTokenPos=l) or (s[FTokenPos+1]<>')')){$endif}then
+ (FTokenPos<=l) and (s[FTokenPos]='.') and ((FTokenPos=l) or ((s[FTokenPos+1]<>'.') and (s[FTokenPos+1]<>')'))){$endif}then
begin
inc(FTokenPos);
while {$ifdef UsePChar}FTokenPos[0] in Digits{$else}(FTokenPos<=l) and (s[FTokenPos] in Digits){$endif} do