Browse Source

fcl-passrc: clean up

git-svn-id: trunk@47739 -
(cherry picked from commit 5682783489396616f5b574d08554b0cdde0aa5bd)
Mattias Gaertner 4 years ago
parent
commit
486266a8f7
2 changed files with 4 additions and 10 deletions
  1. 0 5
      packages/fcl-passrc/src/pparser.pp
  2. 4 5
      packages/fcl-passrc/src/pscanner.pp

+ 0 - 5
packages/fcl-passrc/src/pparser.pp

@@ -4945,10 +4945,6 @@ var
   Arg: TPasArgument;
   Access: TArgumentAccess;
   ArgType: TPasType;
-  varargs : boolean;
-
-
-
 begin
   LastHadDefaultValue := false;
   while True do
@@ -4960,7 +4956,6 @@ begin
     NextToken;
     if CurToken = tkDotDotDot then
     begin
-      varargs:=True;
       expectToken(endToken);
       Break;
     end else  if CurToken = tkConst then

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

@@ -1854,7 +1854,6 @@ var
   Code: integer;
   NameStartP: {$ifdef UsePChar}PChar{$else}integer{$endif};
   p, Lvl: integer;
-  NeedBrace : Boolean;
 
 begin
   {$IFDEF VerbosePasDirectiveEval}
@@ -2387,9 +2386,9 @@ constructor TLineReader.Create(const AFilename: string);
 begin
   FFileName:=AFileName;
   if LineEnding=#13 then
-    EOLStyle:=elCR
+    {%H-}EOLStyle:=elCR
   else if LineEnding=#13#10 then
-    EOLStyle:=elCRLF
+    {%H-}EOLStyle:=elCRLF
    else
     EOLStyle:=elLF
 end;
@@ -3648,7 +3647,7 @@ procedure TPascalScanner.HandleIncludeString(Param: String);
 
 var
   NewSourceFile: TLineReader;
-  aString,aLine,aFileName : string;
+  aString,aLine: string;
 
 begin
   Param:=Trim(Param);
@@ -5295,7 +5294,7 @@ begin
   if Sender.MsgType<=mtError then
     begin
     SetCurMsg(Sender.MsgType,Sender.MsgNumber,Sender.MsgPattern,Args);
-    Msg:=Msg+Format('%s(%d,%d) : %s',[FormatPath(FCurFileName),CurRow,CurColumn,FLastMsg]);
+    Msg:=Format('%s(%d,%d) : %s',[FormatPath(FCurFileName),CurRow,CurColumn,FLastMsg]);
     raise EScannerError.Create(Msg);
     end
   else