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

* $IFDEF also handles macros

Browse Source 
git-svn-id: trunk@19997 -
This commit is contained in:
michael 2012-01-07 20:36:22 +00:00
parent 1c85102924
commit eb2b836b06
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1158,7 +1158,6 @@ Var
ML : TMacroReader;
begin
// Writeln('Handling macro ',FMacros[AIndex]);
PushStackItem;
M:=FMacros.Objects[AIndex] as TMacroDef;
ML:=TMacroReader.Create(FCurFileName,M.Value);
@ -1617,6 +1616,8 @@ begin
begin
Param := UpperCase(Param);
Index := Defines.IndexOf(Param);
if Index < 0 then
Index := Macros.IndexOf(Param);
if Index < 0 then
begin
PPSkipMode := ppSkipIfBranch;

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

@ -184,6 +184,7 @@ type
Procedure TestInclude2;
Procedure TestMacro1;
procedure TestMacro2;
procedure TestMacro3;
end;
implementation
@ -1281,6 +1282,13 @@ begin
TestTokens([tkbegin,tkend,tkDot],'{$DEFINE MM:=begin end}'#13#10'MM .',True,False);
end;
procedure TTestScanner.TestMacro3;
begin
FScanner.SkipComments:=True;
FScanner.SkipWhiteSpace:=True;
TestTokens([tkof],'{$DEFINE MM:=begin end}'#13#10'{$IFDEF MM} of {$ELSE} in {$ENDIF}');
end;