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

+ Fixed inline detection on functions

Browse Source 
git-svn-id: trunk@1801 -
This commit is contained in:
michael 2005-11-22 21:22:12 +00:00
parent d1f1e5adf4
commit 3366ba05ac
1 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
fcl/passrc/pparser.pp
View File

@ -1330,6 +1330,10 @@ end;
// will get the token after the final ";" as next token.
procedure TPasParser.ParseProcedureOrFunctionHeader(Parent: TPasElement;
Element: TPasProcedureType; ProcType: TProcType; OfObjectPossible: Boolean);
Var
Tok : String;
begin
NextToken;
case ProcType of
@ -1407,50 +1411,68 @@ begin
ExpectToken(tkSemicolon);
while True do
begin
begin
NextToken;
if (CurToken = tkIdentifier) and (UpperCase(CurTokenString) = 'CDECL') then
begin
{ El['calling-conv'] := 'cdecl';}
ExpectToken(tkSemicolon);
end else if (CurToken = tkIdentifier) and (UpperCase(CurTokenString) = 'STDCALL') then
begin
{ El['calling-conv'] := 'stdcall';}
ExpectToken(tkSemicolon);
end else if (CurToken = tkIdentifier) and (UpperCase(CurTokenString) = 'COMPILERPROC') then
begin
if (CurToken = tkIdentifier) then
begin
Tok:=UpperCase(CurTokenString);
If (Tok='CDECL') then
begin
{ El['calling-conv'] := 'cdecl';}
ExpectToken(tkSemicolon);
end
else if (Tok='STDCALL') then
begin
{ El['calling-conv'] := 'stdcall';}
ExpectToken(tkSemicolon);
end
else if (Tok='COMPILERPROC') then
begin
{ El['calling-conv'] := 'compilerproc';}
ExpectToken(tkSemicolon);
end else if (CurToken = tkInline) then
begin
ExpectToken(tkSemicolon);
end
else if (tok='DEPRECATED') then
begin
{ El['calling-conv'] := 'deprecated';}
ExpectToken(tkSemicolon);
end
else if (tok='OVERLOAD') then
begin
TPasProcedure(Parent).IsOverload := True;
ExpectToken(tkSemicolon);
end
else if (tok='INLINE') then
begin
ExpectToken(tkSemicolon);
end
else if (UpperCase(CurTokenString) = 'EXTERNAL') then
repeat
NextToken;
until CurToken = tkSemicolon
else
begin
UnGetToken;
Break;
end
end
else if (CurToken = tkInline) then
begin
{ TPasProcedure(Parent).IsInline := True;}
ExpectToken(tkSemicolon);
end else if (CurToken = tkIdentifier) and (UpperCase(CurTokenString) = 'DEPRECATED') then
begin
{ El['calling-conv'] := 'deprecated';}
ExpectToken(tkSemicolon);
end else if (CurToken = tkIdentifier) and (UpperCase(CurTokenString) = 'EXTERNAL') then
begin
repeat
NextToken
until CurToken = tkSemicolon;
end else if (CurToken = tkSquaredBraceOpen) then
begin
end
else if (CurToken = tkSquaredBraceOpen) then
begin
repeat
NextToken
until CurToken = tkSquaredBraceClose;
ExpectToken(tkSemicolon);
end else if Parent.InheritsFrom(TPasProcedure) and
(CurToken = tkIdentifier) and (UpperCase(CurTokenString) = 'OVERLOAD') then
begin
TPasProcedure(Parent).IsOverload := True;
ExpectToken(tkSemicolon);
end else
begin
end
else
begin
UngetToken;
break;
end;
end;
end;
end;