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

* Reverted r15728 since it didn't work in all cases.

Browse Source 
git-svn-id: trunk@15734 -
This commit is contained in:
marco 2010-08-06 20:22:16 +00:00
parent 7830be5365
commit 81e400bc20
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ type
AParent: TPasElement; AVisibility: TPasMemberVisibility): TPasElement;overload; AParent: TPasElement; AVisibility: TPasMemberVisibility): TPasElement;overload;
Function IsCurTokenHint(out AHint : TPasMemberHint) : Boolean; overload; Function IsCurTokenHint(out AHint : TPasMemberHint) : Boolean; overload;
Function IsCurTokenHint: Boolean; overload; Function IsCurTokenHint: Boolean; overload;
Function CheckHint(Element : TPasElement; ExpectSemiColon : Boolean;SkipSemi : Boolean=False) : TPasMemberHints; Function CheckHint(Element : TPasElement; ExpectSemiColon : Boolean) : TPasMemberHints;
function ParseParams(paramskind: TPasExprKind): TParamsExpr; function ParseParams(paramskind: TPasExprKind): TParamsExpr;
function ParseExpIdent: TPasExpr; function ParseExpIdent: TPasExpr;
@ -373,7 +373,7 @@ begin
end; end;
Function TPasParser.CheckHint(Element : TPasElement; ExpectSemiColon : Boolean;SkipSemi : Boolean=False) : TPasMemberHints; Function TPasParser.CheckHint(Element : TPasElement; ExpectSemiColon : Boolean) : TPasMemberHints;
Var Var
Found : Boolean; Found : Boolean;
@ -383,8 +383,6 @@ begin
Result:=[]; Result:=[];
Repeat Repeat
NextToken; NextToken;
if (curtoken=tksemicolon) and skipsemi then
NextToken;
Found:=IsCurTokenHint(h); Found:=IsCurTokenHint(h);
If Found then If Found then
Include(Result,h) Include(Result,h)
@ -2545,7 +2543,30 @@ begin
NextToken; NextToken;
end; end;
checkhint(Element,False,true); if (CurToken = tkIdentifier) and (UpperCase(CurTokenText) = 'DEPRECATED') then begin
// nothing to do on DEPRECATED - just to accept
// NextToken;
end else
UngetToken;;
//!! else
// not DEFAULT prop accessor will be recheck for another token
//!! UngetToken;
{
if CurToken = tkSemicolon then begin
// read semicolon
NextToken;
end;
if (CurToken = tkIdentifier) and (UpperCase(CurTokenText) = 'DEPRECATED') then begin
// nothing to do - just to process
NextToken;
end;
if CurToken = tkSemicolon then begin
// read semicolon
NextToken;
end;
}
end; end;
// Starts after the "begin" token // Starts after the "begin" token