pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

chelper: fix defines handling

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1293 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2010-08-18 08:14:42 +00:00
parent 9955c92eb0
commit bc54e2acb4
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/chelper/cparsertypes.pas
View File

@ -837,14 +837,17 @@ begin
try try
while (not Result) and (index <= length(Buf)) do begin while (not Result) and (index <= length(Buf)) do begin
ScanWhile(Buf, index, spaces); ScanWhile(Buf, index, spaces);
if isMultiline then begin if isMultiline then begin
ScanTo(Buf, index, EoLnChars); ScanTo(Buf, index, EoLnChars);
SkipSingleEoLnChars; SkipSingleEoLnChars;
end else begin end else begin
if (IsSubStr(TokenTable.Precompile, Buf, Index) and HandlePrecomiler) then if (IsSubStr(TokenTable.Precompile, Buf, Index) and HandlePrecomiler) then begin
Token:='';
TokenType:=tt_Ident;
// 1. check is Preprocessor directive is found // 1. check is Preprocessor directive is found
else if (Buf[index] in TokenTable.Symbols) then begin // 2. symbol has been found, so it's not an ident end else if (Buf[index] in TokenTable.Symbols) then begin // 2. symbol has been found, so it's not an ident
if (not (Buf[index] in blck)) or (not SkipComments) then begin // 2.1 check if comment is found (comment prefixes match to the symbols) if (not (Buf[index] in blck)) or (not SkipComments) then begin // 2.1 check if comment is found (comment prefixes match to the symbols)
Result := true; // 2.2 check if symbol is found Result := true; // 2.2 check if symbol is found
if (Buf[index] = '.') and (index < length(Buf)) and (Buf[index+1] in ['0'..'9']) then begin if (Buf[index] = '.') and (index < length(Buf)) and (Buf[index+1] in ['0'..'9']) then begin
@ -1129,7 +1132,6 @@ begin
Result := tt = tt_Ident; Result := tt = tt_Ident;
if not Result then Exit; if not Result then Exit;
if (AParser.Index<=length(AParser.Buf)) and (AParser.Buf[AParser.Index]='(') then begin if (AParser.Index<=length(AParser.Buf)) and (AParser.Buf[AParser.Index]='(') then begin
AParser.NextToken; // skipping "(" AParser.NextToken; // skipping "("
AParser.NextToken; // the first ident AParser.NextToken; // the first ident
@ -1155,9 +1157,9 @@ begin
AParser.FindNextToken(prs, tt); AParser.FindNextToken(prs, tt);
end; end;
RemoveMacroSlash(SubsText); RemoveMacroSlash(SubsText);
if prs <> '' then if prs <> '' then AParser.Index := AParser.TokenPos;
AParser.Index := AParser.TokenPos;
finally finally
ScanWhile(AParser.Buf, AParser.Index, [#10,#13]);
AParser.TokenTable.SpaceChars := SpaceChars; AParser.TokenTable.SpaceChars := SpaceChars;
AParser.TokenTable.Symbols := SymChars; AParser.TokenTable.Symbols := SymChars;
end; end;