paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 18:29:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* more inheritsfrom fixes. This time for the inheritance pages.

Browse Source 
(    [properties (by name)] etc )

git-svn-id: trunk@24278 -
This commit is contained in:
marco 2013-04-20 22:27:06 +00:00
parent 3acd49ddbc
commit 183d9ebfe1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
utils/fpdoc/dw_html.pp
View File

@ -607,7 +607,7 @@ constructor THTMLWriter.Create(APackage: TPasPackage; AEngine: TFPDocEngine);
begin begin
DidAutolink := False; DidAutolink := False;
if Assigned(ClassEl.AncestorType) and if Assigned(ClassEl.AncestorType) and
(ClassEl.AncestorType.ClassType = TPasClassType) then (ClassEl.AncestorType.ClassType.inheritsfrom(TPasClassType)) then
begin begin
for k := 0 to TPasClassType(ClassEl.AncestorType).Members.Count - 1 do for k := 0 to TPasClassType(ClassEl.AncestorType).Members.Count - 1 do
begin begin
@ -2482,7 +2482,6 @@ begin
Dec(i); Dec(i);
CurDirectory := Copy(CurDirectory, 1, i); CurDirectory := Copy(CurDirectory, 1, i);
BaseDirectory := Allocator.GetRelativePathToTop(AElement); BaseDirectory := Allocator.GetRelativePathToTop(AElement);
if AElement.ClassType = TPasPackage then if AElement.ClassType = TPasPackage then
begin begin
Module:=Nil; Module:=Nil;
@ -2496,11 +2495,11 @@ begin
else else
begin begin
Element := AElement; Element := AElement;
while (Element<>Nil) and (Element.ClassType<>TPasModule) do while (Element<>Nil) and (not (Element.ClassType.inheritsfrom(TPasModule))) do
Element := Element.Parent; Element := Element.Parent;
Module := TPasModule(Element); Module := TPasModule(Element);
if AElement.ClassType = TPasModule then if AElement.ClassType.inheritsfrom(TPasModule) then
CreateModulePageBody(TPasModule(AElement), ASubpageIndex) CreateModulePageBody(TPasModule(AElement), ASubpageIndex)
else if AElement.Parent.InheritsFrom(TPasClassType) then else if AElement.Parent.InheritsFrom(TPasClassType) then
CreateClassMemberPageBody(AElement) CreateClassMemberPageBody(AElement)
@ -2516,6 +2515,8 @@ begin
CreateProcPageBody(TPasProcedureBase(AElement)) CreateProcPageBody(TPasProcedureBase(AElement))
else if AElement.ClassType = TTopicELement then else if AElement.ClassType = TTopicELement then
CreateTopicPageBody(TTopicElement(AElement)) CreateTopicPageBody(TTopicElement(AElement))
else
writeln('Unknown classtype: ',AElement.classtype.classname);
end; end;
end; end;
@ -3370,6 +3371,8 @@ var
ThisClass := TPasClassType(ThisClass.AncestorType) ThisClass := TPasClassType(ThisClass.AncestorType)
else else
begin begin
if thisclass.ancestortype is TPasUnresolvedTypeRef then
thisnode:=TPasUnresolvedTypeRef(ThisClass.ancestortype);
TDEl := CreateTD(CreateTR(TableEl)); TDEl := CreateTD(CreateTR(TableEl));
TDEl['align'] := 'center'; TDEl['align'] := 'center';
AppendText(CreateCode(CreatePara(TDEl)), ThisClass.AncestorType.Name); AppendText(CreateCode(CreatePara(TDEl)), ThisClass.AncestorType.Name);
@ -3449,7 +3452,7 @@ var
'''; return false;'; '''; return false;';
end; end;
if (not Assigned(ThisClass.AncestorType)) or if (not Assigned(ThisClass.AncestorType)) or
(not (ThisClass.AncestorType.ClassType = TPasClassType)) then (not (ThisClass.AncestorType.ClassType.inheritsfrom(TPasClassType))) then
break; break;
ThisClass := TPasClassType(ThisClass.AncestorType); ThisClass := TPasClassType(ThisClass.AncestorType);
AppendNbSp(CreatePara(CreateTD(CreateTR(TableEl))), 1); AppendNbSp(CreatePara(CreateTD(CreateTR(TableEl))), 1);
@ -3484,7 +3487,7 @@ var
end; end;
end; end;
if (not Assigned(ThisClass.AncestorType)) or if (not Assigned(ThisClass.AncestorType)) or
(not (ThisClass.AncestorType.ClassType = TPasClassType)) then (not (ThisClass.AncestorType.ClassType.inheritsfrom(TPasClassType))) then
break; break;
ThisClass := TPasClassType(ThisClass.AncestorType); ThisClass := TPasClassType(ThisClass.AncestorType);
end; end;