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

* Allow function result to be omitted for implementation of declared function, in Delphi mode

Browse Source 
git-svn-id: trunk@34689 -
This commit is contained in:
michael 2016-10-09 09:24:04 +00:00
parent 6d88302745
commit c826d34429
2 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1072,11 +1072,6 @@ begin
K:=stkRange;
UnGetToken;
end
else if (CurToken = tkLessThan) then // A = B<t>;
begin
K:=stkSpecialize;
UnGetToken;
end
else
begin
UnGetToken;
@ -3359,6 +3354,7 @@ Var
PM : TProcedureModifier;
Done: Boolean;
ResultEl: TPasResultElement;
I : Integer;
begin
// Element must be non-nil. Removed all checks for not-nil.
@ -3367,9 +3363,36 @@ begin
case ProcType of
ptFunction,ptClassFunction:
begin
ExpectToken(tkColon);
ResultEl:=TPasFunctionType(Element).ResultEl;
ResultEl.ResultType := ParseType(ResultEl,Scanner.CurSourcePos);
NextToken;
if CurToken = tkColon then
begin
ResultEl:=TPasFunctionType(Element).ResultEl;
ResultEl.ResultType := ParseType(ResultEl,Scanner.CurSourcePos);
end
// In Delphi mode, the implementation in the implementation section can be without result as it was declared
// We actually check if the function exists in the interface section.
else if (po_delphi in Options) and Assigned(CurModule.ImplementationSection) then
begin
I:=-1;
if Assigned(CurModule.InterfaceSection) then
begin
I:=CurModule.InterfaceSection.Functions.Count-1;
While (I>=0) and (CompareText(TPasElement(CurModule.InterfaceSection.Functions[i]).Name,Parent.Name)<>0) do
Dec(I);
end;
if (I=-1) then
CheckToken(tkColon)
else
begin
CheckToken(tkSemiColon);
UngetToken;
end;
end
else
begin
// Raise error
CheckToken(tkColon);
end;
end;
ptOperator,ptClassOperator:
begin

16
packages/fcl-passrc/tests/tcprocfunc.pas
View File

@ -161,6 +161,7 @@ type
Procedure TestFunctionCdeclExternalName;
Procedure TestOperatorTokens;
procedure TestOperatorNames;
Procedure TestFunctionNoResult;
end;
implementation
@ -1206,6 +1207,21 @@ begin
end;
end;
procedure TTestProcedureFunction.TestFunctionNoResult;
begin
Add('unit afile;');
Add('{$mode delphi}');
Add('interface');
Add('function TestDelphiModeFuncs(d:double):string;');
Add('implementation');
Add('function TestDelphiModeFuncs;');
Add('begin');
Add('end;');
EndSource;
Parser.Options:=[po_delphi];
ParseModule;
end;
procedure TTestProcedureFunction.SetUp;
begin
Inherited;