paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 00:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: parse generic function

Browse Source 
git-svn-id: branches/fixes_1_8@55486 -
This commit is contained in:
mattias 2017-07-10 18:27:35 +00:00
parent 3b529ee86e
commit 4cb398e648
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/codetools/pascalparsertool.pas
View File

@ -385,6 +385,7 @@ begin
Add('LABEL',@KeyWordFuncLabel); Add('LABEL',@KeyWordFuncLabel);
Add('PROPERTY',@KeyWordFuncProperty); Add('PROPERTY',@KeyWordFuncProperty);
Add('GENERIC',@KeyWordFuncProc);
Add('PROCEDURE',@KeyWordFuncProc); Add('PROCEDURE',@KeyWordFuncProc);
Add('FUNCTION',@KeyWordFuncProc); Add('FUNCTION',@KeyWordFuncProc);
Add('CONSTRUCTOR',@KeyWordFuncProc); Add('CONSTRUCTOR',@KeyWordFuncProc);
@ -1665,6 +1666,7 @@ function TPascalParserTool.ReadTilProcedureHeadEnd(
procedure MacProcName(c: char; ...); external; procedure MacProcName(c: char; ...); external;
operator + (dp1: TPoint; dp2: TPoint) dps: TPoint; operator + (dp1: TPoint; dp2: TPoint) dps: TPoint;
Add('Inc(Rec: TRec1): TRec1; Add('Inc(Rec: TRec1): TRec1;
generic function RandomFrom<T>(const AValues:array of T):T;
Delphi mode: Delphi mode:
Function TPOSControler.Logout; // missing function type Function TPOSControler.Logout; // missing function type
@ -2669,11 +2671,20 @@ end;
function TPascalParserTool.KeyWordFuncProc: boolean; function TPascalParserTool.KeyWordFuncProc: boolean;
// procedure, function, constructor, destructor, operator // procedure, function, constructor, destructor, operator
var ChildCreated: boolean; // class function/procedure
IsFunction, HasForwardModifier, IsClassProc, IsOperator, IsMethod: boolean; // generic function/procedure
var
ChildCreated: boolean;
IsFunction, HasForwardModifier, IsClassProc, IsOperator, IsMethod,
IsGeneric: boolean;
ProcNode: TCodeTreeNode; ProcNode: TCodeTreeNode;
ParseAttr: TParseProcHeadAttributes; ParseAttr: TParseProcHeadAttributes;
begin begin
if UpAtomIs('GENERIC') then begin
IsGeneric:=true;
ReadNextAtom;
end else
IsGeneric:=false;
if UpAtomIs('CLASS') then begin if UpAtomIs('CLASS') then begin
if not (CurSection in [ctnImplementation]+AllSourceTypes) then if not (CurSection in [ctnImplementation]+AllSourceTypes) then
SaveRaiseStringExpectedButAtomFound(20170421195603,ctsIdentifier); SaveRaiseStringExpectedButAtomFound(20170421195603,ctsIdentifier);
@ -2710,19 +2721,6 @@ begin
end; end;
ReadNextAtom; ReadNextAtom;
if (CurSection<>ctnInterface) then begin if (CurSection<>ctnInterface) then begin
if (Scanner.CompilerMode = cmDELPHI) and AtomIsChar('<') then
begin
repeat
ReadNextAtom;
if CurPos.Flag <> cafWord then
RaiseExceptionFmt(20170421195034,ctsIdentExpectedButAtomFound, [GetAtom]);
ReadNextAtom;
if AtomIsChar('>') then Break;
if CurPos.Flag <> cafComma then
SaveRaiseCharExpectedButAtomFound(20170421195608,',');
until False;
ReadNextAtom;
end;
while (CurPos.Flag=cafPoint) do begin while (CurPos.Flag=cafPoint) do begin
// read procedure name of a class method (the name after the . ) // read procedure name of a class method (the name after the . )
IsMethod:=True; IsMethod:=True;
@ -2731,6 +2729,13 @@ begin
ReadNextAtom; ReadNextAtom;
end; end;
end; end;
if (Scanner.CompilerMode = cmDELPHI) and AtomIsChar('<') then
ReadGenericParamList
else if IsGeneric then begin
if not AtomIsChar('<') then
SaveRaiseCharExpectedButAtomFound(20170710202211,'<');
ReadGenericParamList;
end;
// read rest of procedure head // read rest of procedure head
HasForwardModifier:=false; HasForwardModifier:=false;
ParseAttr:=[]; ParseAttr:=[];