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

* TokenIsCallingConvention and TokenIsProcedureModifier introduced for implementation of custom modifiers and calling conventions

Browse Source 
git-svn-id: trunk@20013 -
This commit is contained in:
michael 2012-01-08 17:49:36 +00:00
parent 5726207d19
commit 8bba65485a
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,6 +154,8 @@ type
UseParentAsResultParent: Boolean): TPasFunctionType;
Function IsCurTokenHint(out AHint : TPasMemberHint) : Boolean; overload;
Function IsCurTokenHint: Boolean; overload;
Function TokenIsCallingConvention(Context : TPasProcedureType; S : String; out CC : TCallingConvention) : Boolean; virtual;
Function TokenIsProcedureModifier(Context : TPasProcedureType; S : String; Out Pm : TProcedureModifier) : Boolean; virtual;
Function CheckHint(Element : TPasElement; ExpectSemiColon : Boolean) : TPasMemberHints;
function ParseParams(AParent : TPasElement;paramskind: TPasExprKind): TParamsExpr;
function ParseExpIdent(AParent : TPasElement): TPasExpr;
@ -302,7 +304,7 @@ Const
= ('virtual', 'dynamic','abstract', 'override',
'exported', 'overload', 'message', 'reintroduce',
'static','inline','assembler','varargs',
'compilerproc','external','extdecl','forward');
'compilerproc','external','forward');
Var
P : TProcedureModifier;
@ -436,7 +438,7 @@ begin
if Filename = '' then
raise Exception.Create(SErrNoSourceGiven);
FileResolver.AddIncludePath(ExtractFilePath(FileName));
Scanner.OpenFile(Filename);
Parser.ParseMain(Result);
finally
@ -629,6 +631,18 @@ begin
Result:=IsCurTokenHint(dummy);
end;
function TPasParser.TokenIsCallingConvention(Context: TPasProcedureType; S: String;
out CC: TCallingConvention): Boolean;
begin
Result:=IsCallingConvention(S,CC);
end;
function TPasParser.TokenIsProcedureModifier(Context: TPasProcedureType;
S: String; out Pm: TProcedureModifier): Boolean;
begin
Result:=IsModifier(S,PM);
end;
Function TPasParser.CheckHint(Element : TPasElement; ExpectSemiColon : Boolean) : TPasMemberHints;
@ -2414,7 +2428,7 @@ begin
ptProcedure,ptConstructor,ptDestructor,ptClassProcedure:
begin
NextToken;
if (CurToken = tkSemicolon)
if (CurToken = tkSemicolon) or IsCurtokenHint
or (OfObjectPossible and (CurToken in [tkOf,tkEqual]))
then
UngetToken
@ -2458,17 +2472,17 @@ begin
end else
UngetToken;
ExpectToken(tkSemicolon);
ConsumeSemi; //ExpectToken(tkSemicolon);
while True do
begin
NextToken;
If isCallingConvention(CurTokenString,cc) then
If TokenisCallingConvention(Element,CurTokenString,cc) then
begin
if parent is TPasProcedure then
TPasProcedure(Parent).CallingConvention:=CC;
if Assigned(Element) then // !!!
Element.CallingConvention:=Cc;
ExpectToken(tkSemicolon);
end
else if IsModifier(CurTokenString,pm) then
else if TokenIsProcedureModifier(Element,CurTokenString,pm) then
begin
if parent is TPasProcedure then
TPasProcedure(Parent).AddModifier(pm);