paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-11 10:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-passrc: clean up

Browse Source 
git-svn-id: trunk@47739 -
This commit is contained in:
Mattias Gaertner 2020-12-09 20:51:20 +00:00
parent 7540f10aa6
commit 5682783489
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/fcl-passrc/src/pparser.pp
View File

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

9
packages/fcl-passrc/src/pscanner.pp
View File

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