paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-07 21:06:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Small patch from Graeme to fix ordering (bug ID 14917)

Browse Source 
git-svn-id: trunk@13965 -
This commit is contained in:
michael 2009-10-29 15:48:14 +00:00
parent 643cbaf3b6
commit 383fe39d35
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/fpdoc/dwlinear.pp
View File

@ -30,10 +30,10 @@ Type
procedure SortElementList(List : TList); procedure SortElementList(List : TList);
procedure StartListing(Frames: Boolean); procedure StartListing(Frames: Boolean);
Function ShowMember(M : TPasElement) : boolean; Function ShowMember(M : TPasElement) : boolean;
procedure StartChapter(ChapterName : String; ChapterLabel : String); procedure StartChapter(ChapterName : String; ChapterLabel : String); virtual;
procedure StartSection(SectionName : String; SectionLabel : String); procedure StartSection(SectionName : String; SectionLabel : String); virtual;
procedure StartSubSection(SubSectionName : String; SubSectionLabel : String); procedure StartSubSection(SubSectionName : String; SubSectionLabel : String); virtual;
procedure StartSubSubSection(SubSubSectionName : String; SubSubSectionLabel : String); procedure StartSubSubSection(SubSubSectionName : String; SubSubSectionLabel : String); virtual;
Function GetDescrString(AContext: TPasElement; DescrNode: TDOMElement) : String; Function GetDescrString(AContext: TPasElement; DescrNode: TDOMElement) : String;
function ConstValue(ConstDecl: TPasConst): String; virtual; function ConstValue(ConstDecl: TPasConst): String; virtual;
procedure ProcessSection(ASection: TPasSection); virtual; procedure ProcessSection(ASection: TPasSection); virtual;
@ -442,7 +442,6 @@ procedure TLinearWriter.WriteDoc;
var var
i : Integer; i : Integer;
DocNode : TDocNode;
L : TstringList; L : TstringList;
begin begin
@ -467,9 +466,7 @@ begin
WriteCommentLine; WriteCommentLine;
StartChapter(Format(SDocUnitTitle, [Module.Name])); StartChapter(Format(SDocUnitTitle, [Module.Name]));
WriteLabel(Module); WriteLabel(Module);
DocNode:=Engine.FindDocNode(Module); // extra Topics now get processed in ProcessSection()
If Assigned(DocNode) then
ProcessTopics(DocNode,1);
ProcessSection(Module.InterfaceSection); ProcessSection(Module.InterfaceSection);
end; end;
Finally Finally
@ -482,7 +479,8 @@ begin
end; end;
procedure TLinearWriter.ProcessSection(ASection: TPasSection); procedure TLinearWriter.ProcessSection(ASection: TPasSection);
var
DocNode: TDocNode;
begin begin
With ASection do With ASection do
begin begin
@ -496,6 +494,12 @@ begin
SortElementList(Variables); SortElementList(Variables);
end; end;
WriteUnitOverView(ASection); WriteUnitOverView(ASection);
// Now process unit (extra) Topics
DocNode:=Engine.FindDocNode(Module);
If Assigned(DocNode) then
ProcessTopics(DocNode,1);
WriteVarsConstsTypes(ASection); WriteVarsConstsTypes(ASection);
WriteFunctionsAndProcedures(ASection); WriteFunctionsAndProcedures(ASection);
WriteClasses(ASection); WriteClasses(ASection);