Browse Source

fcl-passrc: fixed compile pas2js

mattias 3 years ago
parent
commit
172803b2f7
1 changed files with 7 additions and 5 deletions
  1. 7 5
      packages/fcl-passrc/src/pscanner.pp

+ 7 - 5
packages/fcl-passrc/src/pscanner.pp

@@ -2625,7 +2625,7 @@ begin
           Log(mtError,nErrInvalidCharacter,SErrInvalidCharacter,['#0'])
           Log(mtError,nErrInvalidCharacter,SErrInvalidCharacter,['#0'])
         else if Src[p]=c then
         else if Src[p]=c then
           break
           break
-        else (c='''') and (Src[p] in [#10,#13]) then
+        else if (c='''') and (Src[p] in [#10,#13]) then
           Log(mtError,nErrInvalidCharacter,SErrInvalidCharacter,['#'+IntToStr(ord(Src[p]))])
           Log(mtError,nErrInvalidCharacter,SErrInvalidCharacter,['#'+IntToStr(ord(Src[p]))])
         else
         else
           inc(p);
           inc(p);
@@ -3773,9 +3773,11 @@ function TPascalScanner.DoFetchMultilineTextToken:TToken;
 // works similar to DoFetchTextToken, except changes indentation
 // works similar to DoFetchTextToken, except changes indentation
 
 
 var
 var
-  StartPos,OldLength     : Integer;
-  TokenStart    : {$ifdef UsePChar}PChar{$else}integer{$endif};
-  {$ifndef UsePChar}
+  StartPos: Integer;
+  TokenStart: {$ifdef UsePChar}PChar{$else}integer{$endif};
+  {$ifdef UsePChar}
+  OldLength: integer;
+  {$else}
   s: String;
   s: String;
   l: integer;
   l: integer;
   {$endif}
   {$endif}
@@ -3848,13 +3850,13 @@ var
 
 
 begin
 begin
   Result:=tkEOF;
   Result:=tkEOF;
-  OldLength:=0;
   FCurTokenString := '';
   FCurTokenString := '';
   {$ifndef UsePChar}
   {$ifndef UsePChar}
   s:=FCurLine;
   s:=FCurLine;
   l:=length(s);
   l:=length(s);
   StartPos:=FTokenPos;
   StartPos:=FTokenPos;
   {$ELSE}
   {$ELSE}
+  OldLength:=0;
   StartPos:=FTokenPos-PChar(FCurLine);
   StartPos:=FTokenPos-PChar(FCurLine);
   {$endif}
   {$endif}
   Apostroph:='''';
   Apostroph:='''';