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

codetools: extract generic type reference, from Pascal Riekenberg

Browse Source 
git-svn-id: trunk@63148 -
This commit is contained in:
mattias 2020-05-14 08:17:17 +00:00
parent b4415f3aa4
commit 9aa25f1ba7
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
components/codetools/pascalparsertool.pas
View File

@ -176,7 +176,8 @@ type
procedure ReadGenericParamList(Must, AllowConstraints: boolean);
procedure ReadAttribute;
procedure FixLastAttributes;
procedure ReadTypeReference(CreateNodes: boolean);
procedure ReadTypeReference(CreateNodes: boolean; Extract: boolean = false;
Copying: boolean = false; const Attr: TProcHeadAttributes = []);
procedure ReadClassInterfaceContent;
function KeyWordFuncTypeClass: boolean;
function KeyWordFuncTypeClassInterface(IntfDesc: TCodeTreeNodeDesc): boolean;
@ -249,7 +250,8 @@ type
Copying: boolean = false; const Attr: TProcHeadAttributes = []);
procedure ReadSpecializeParams(CreateChildNodes: boolean; Extract: boolean = false;
Copying: boolean = false; const Attr: TProcHeadAttributes = []);
procedure ReadAnsiStringParams;
procedure ReadAnsiStringParams(Extract: boolean = false;
Copying: boolean = false; const Attr: TProcHeadAttributes = []);
function ReadClosure(ExceptionOnError, CreateNodes: boolean): boolean;
function SkipTypeReference(ExceptionOnError: boolean): boolean;
function SkipSpecializeParams(ExceptionOnError: boolean): boolean;
@ -4388,7 +4390,8 @@ begin
until Attr=nil;
end;
procedure TPascalParserTool.ReadTypeReference(CreateNodes: boolean);
procedure TPascalParserTool.ReadTypeReference(CreateNodes: boolean; Extract: boolean;
Copying: boolean; const Attr: TProcHeadAttributes);
{ After reading CurPos is on atom behind the identifier
Examples:
@ -4399,23 +4402,32 @@ procedure TPascalParserTool.ReadTypeReference(CreateNodes: boolean);
specialize TGenericClass<TypeRef,TypeRef>
atype<char>.subtype
}
procedure Next; inline;
begin
if not Extract then
ReadNextAtom
else
ExtractNextAtom(Copying,Attr);
end;
var
Cnt: Integer;
begin
if (Scanner.CompilerMode=cmOBJFPC) and UpAtomIs('SPECIALIZE') then begin
ReadSpecialize(CreateNodes);
ReadSpecialize(CreateNodes,Extract,Copying,Attr);
exit;
end;
if CreateNodes then begin
CreateChildNode;
CurNode.Desc:=ctnIdentifier;
end;
ReadNextAtom;
Next;
Cnt:=1;
while CurPos.Flag=cafPoint do begin
ReadNextAtom;
Next;
AtomIsIdentifierSaveE(20180411194207);
ReadNextAtom;
Next;
inc(Cnt,2);
end;
if AtomIsChar('<') then begin
@ -4423,8 +4435,8 @@ begin
or ((Cnt=3) and LastUpAtomIs(3,'SYSTEM') and LastUpAtomIs(1,'STRING'))
then begin
// e.g. string<codepage>
ReadAnsiStringParams;
ReadNextAtom;
ReadAnsiStringParams(Extract,Copying,Attr);
Next;
end
else if (Scanner.CompilerMode in [cmDELPHI,cmDELPHIUNICODE]) then begin
// e.g. atype<params>
@ -4436,13 +4448,13 @@ begin
CurNode.EndPos:=CurPos.StartPos;
EndChildNode;
end;
ReadSpecializeParams(CreateNodes);
ReadNextAtom;
ReadSpecializeParams(CreateNodes,Extract,Copying,Attr);
Next;
while CurPos.Flag=cafPoint do begin
// e.g. atype<params>.subtype
ReadNextAtom;
Next;
AtomIsIdentifierSaveE(20180411194209);
ReadNextAtom;
Next;
end;
end;
end;
@ -6068,23 +6080,7 @@ begin
repeat
// read identifier (a parameter of the generic type)
Next;
AtomIsIdentifierSaveE(20180411194303);
if CreateChildNodes then begin
CreateChildNode;
CurNode.Desc:=ctnSpecializeParam;
CurNode.EndPos:=CurPos.EndPos;
end;
Next;
while Curpos.Flag=cafPoint do begin
// first identifier was unitname, now read the type
Next;
AtomIsIdentifierSaveE(20180411194305);
if CreateChildNodes then
CurNode.EndPos:=CurPos.EndPos;
Next;
end;
if CreateChildNodes then
EndChildNode; // close ctnSpecializeParam
ReadTypeReference(CreateChildNodes,Extract,Copying,Attr);
if AtomIsChar('>') then
break
else if CurPos.Flag=cafComma then begin
@ -6099,11 +6095,14 @@ begin
end;
end;
procedure TPascalParserTool.ReadAnsiStringParams;
procedure TPascalParserTool.ReadAnsiStringParams(Extract: boolean; Copying: boolean; const Attr: TProcHeadAttributes);
begin
// string<codepage>
repeat
ReadNextAtom;
if not Extract then
ReadNextAtom
else
ExtractNextAtom(Copying,Attr);
if AtomIsChar('>') then break;
case CurPos.Flag of
cafRoundBracketOpen,cafEdgedBracketOpen: ReadTilBracketClose(true);