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

fcl-passrc: fixed parsing comment in $IFDEF, $IFNDEF, issue #34711

Browse Source 
git-svn-id: trunk@40582 -
This commit is contained in:
Mattias Gaertner 2018-12-17 08:40:35 +00:00
parent eee0074eb4
commit 65fdc04dc3
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -749,6 +749,7 @@ type
procedure SetReadOnlyModeSwitches(const AValue: TModeSwitches);
procedure SetReadOnlyValueSwitches(const AValue: TValueSwitches);
protected
function ReadIdentifier(const AParam: string): string;
function FetchLine: boolean;
procedure AddFile(aFilename: string); virtual;
function GetMacroName(const Param: String): String;
@ -3457,13 +3458,16 @@ begin
end;
procedure TPascalScanner.HandleIFDEF(const AParam: String);
var
aName: String;
begin
PushSkipMode;
if PPIsSkipping then
PPSkipMode := ppSkipAll
else
begin
if IsDefined(AParam) then
aName:=ReadIdentifier(AParam);
if IsDefined(aName) then
PPSkipMode := ppSkipElseBranch
else
begin
@ -3472,20 +3476,23 @@ begin
end;
If LogEvent(sleConditionals) then
if PPSkipMode=ppSkipElseBranch then
DoLog(mtInfo,nLogIFDefAccepted,sLogIFDefAccepted,[AParam])
DoLog(mtInfo,nLogIFDefAccepted,sLogIFDefAccepted,[aName])
else
DoLog(mtInfo,nLogIFDefRejected,sLogIFDefRejected,[AParam]);
DoLog(mtInfo,nLogIFDefRejected,sLogIFDefRejected,[aName]);
end;
end;
procedure TPascalScanner.HandleIFNDEF(const AParam: String);
var
aName: String;
begin
PushSkipMode;
if PPIsSkipping then
PPSkipMode := ppSkipAll
else
begin
if IsDefined(AParam) then
aName:=ReadIdentifier(AParam);
if IsDefined(aName) then
begin
PPSkipMode := ppSkipIfBranch;
PPIsSkipping := true;
@ -3494,9 +3501,9 @@ begin
PPSkipMode := ppSkipElseBranch;
If LogEvent(sleConditionals) then
if PPSkipMode=ppSkipElseBranch then
DoLog(mtInfo,nLogIFNDefAccepted,sLogIFNDefAccepted,[AParam])
DoLog(mtInfo,nLogIFNDefAccepted,sLogIFNDefAccepted,[aName])
else
DoLog(mtInfo,nLogIFNDefRejected,sLogIFNDefRejected,[AParam]);
DoLog(mtInfo,nLogIFNDefRejected,sLogIFNDefRejected,[aName]);
end;
end;
@ -4682,6 +4689,16 @@ begin
FReadOnlyValueSwitches:=AValue;
end;
function TPascalScanner.ReadIdentifier(const AParam: string): string;
var
p, l: Integer;
begin
p:=1;
l:=length(AParam);
while (p<=l) and (AParam[p] in IdentChars) do inc(p);
Result:=LeftStr(AParam,p-1);
end;
function TPascalScanner.FetchLine: boolean;
begin
if CurSourceFile.IsEOF then

2
packages/fcl-passrc/tests/tcscanner.pas
View File

@ -1404,7 +1404,7 @@ procedure TTestScanner.TestDefine2;
begin
FSCanner.Defines.Add('ALWAYS');
TestTokens([tkComment,tkWhitespace,tkOf,tkWhitespace,tkcomment],'{$IFDEF ALWAYS} of {$ENDIF}');
TestTokens([tkComment,tkWhitespace,tkOf,tkWhitespace,tkcomment],'{$IFDEF ALWAYS comment} of {$ENDIF}');
end;
procedure TTestScanner.TestDefine21;