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

* Fix compilation after class tree changes

Browse Source 
git-svn-id: trunk@47540 -
This commit is contained in:
michael 2020-11-23 12:26:53 +00:00
parent f1aca7f877
commit 0323f0b07d
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
utils/fpdoc/fpclasschart.pp
View File

@ -509,7 +509,47 @@ begin
else
Writeln(StdErr,Format(SSkipMerge,[S.NodeName,D.NodeName]));
end;
Function MergeTrees (Dest : TXMLDocument; aRootNode : TPasElementNode) : Integer;
Var
aSrc : TXMLDocument;
Procedure AppendChildClasses(aParent : TDomElement; aNode : TPasElementNode);
Var
El : TDomElement;
aChild : TPasElementNode;
I : Integer;
M : TPasModule;
begin
If (ANode=Nil) or (aNode.ChildCount=0) then exit;
for I:=0 to aNode.ChildCount-1 do
begin
aChild:=aNode.Children[I];
El:=aSrc.CreateElement(UTF8Decode(aChild.Element.Name));
M:=aChild.Element.GetModule;
If M<>Nil then
EL['unit']:=UTF8Decode(M.Name);
aParent.AppendChild(El);
AppendChildClasses(El,aChild);
end;
end;
begin
aSrc:=TXMLDocument.Create();
try
aSrc.AppendChild(aSrc.CreateElement('TObject'));
AppendChildClasses(aSrc.DocumentElement,aRootNode);
MergeTrees(Dest,aSrc);
finally
aSrc.Free;
end;
end;
Function AnalyseFiles(Const AOutputName : String; InputFiles,MergeFiles : TStrings; AObjectKind : TPasObjKind) : String;
@ -542,7 +582,7 @@ begin
Try
ParseSource(Engine,InputFiles[I],OSTarget,CPUTarget);
Engine.Ftree.BuildTree(Engine.FObjects);
ACount:=ACount+MergeTrees(XML,Engine.FTree.ClassTree);
ACount:=ACount+MergeTrees(XML,Engine.FTree.RootNode);
Finally
FreeAndNil(Engine);
end;