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

* Fix memleak, additional list/indent, patch from Andrey Sobol

Browse Source 
git-svn-id: trunk@48091 -
(cherry picked from commit cccff5826e)
This commit is contained in:
michael 2021-01-06 09:13:33 +00:00 committed by Florian Klämpfl
parent 63cc204ac6
commit 96fe2661fd
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/fpdoc/dw_basemd.pp
View File

@ -21,8 +21,8 @@ uses
Classes, SysUtils, dwriter, DOM, pastree, dglobals; Classes, SysUtils, dwriter, DOM, pastree, dglobals;
Const Const
MaxIndents = 10; MaxIndents = 32;
MaxLists = 10; MaxLists = 32;
Type Type
THeaderLevel = 1..6; THeaderLevel = 1..6;
@ -842,6 +842,7 @@ end;
destructor TBaseMarkdownWriter.Destroy; destructor TBaseMarkdownWriter.Destroy;
begin begin
FreeAndNil(FMarkDown); FreeAndNil(FMarkDown);
FreeAndNil(FMetadata);
inherited Destroy; inherited Destroy;
end; end;

17
utils/fpdoc/dw_markdown.pp
View File

@ -124,7 +124,6 @@ type
procedure WriteDocPage(const aFileName: String; aElement: TPasElement; aSubPageIndex: Integer); override; procedure WriteDocPage(const aFileName: String; aElement: TPasElement; aSubPageIndex: Integer); override;
// Start producing html complete package documentation // Start producing html complete package documentation
function ModuleForElement(AnElement:TPasElement):TPasModule;
Function InterPretOption(Const Cmd,Arg : String) : boolean; override; Function InterPretOption(Const Cmd,Arg : String) : boolean; override;
Procedure WriteDoc; override; Procedure WriteDoc; override;
@ -326,18 +325,6 @@ begin
Result:=FHeaderMarkDown; Result:=FHeaderMarkDown;
end; end;
function TMarkdownWriter.ModuleForElement(AnElement:TPasElement):TPasModule;
begin
result:=TPasModule(AnElement);
while assigned(result) and not (result is TPasModule) do
result:=TPasModule(result.parent);
if not (result is TPasModule) then
result:=nil;
end;
procedure TMarkdownWriter.AppendShortDescr(AContext: TPasElement; DocNode: TDocNode) ; procedure TMarkdownWriter.AppendShortDescr(AContext: TPasElement; DocNode: TDocNode) ;
Var Var
@ -715,7 +702,7 @@ begin
DescrEndTableCell; DescrEndTableCell;
DescrBeginTableCell; DescrBeginTableCell;
DescrEl:=Engine.FindShortDescr(ModuleForElement(AElement),UTF8Encode(aList[i])); DescrEl:=Engine.FindShortDescr(AElement.GetModule(),UTF8Encode(aList[i]));
if Assigned(DescrEl) then if Assigned(DescrEl) then
ConvertShort(AElement, DescrEl) ConvertShort(AElement, DescrEl)
else else
@ -882,7 +869,7 @@ type
PE:=EN.Element; PE:=EN.Element;
DescrBeginListItem; DescrBeginListItem;
AppendHyperLink(PE); AppendHyperLink(PE);
PM:=ModuleForElement(PE); PM:=PE.GetModule();
if (PM<>Nil) then if (PM<>Nil) then
begin begin
AppendText(' ('); AppendText(' (');

2
utils/fpdoc/dwriter.pp
View File

@ -282,7 +282,7 @@ Type
procedure AllocateClassMemberPages(AModule: TPasModule; LinkList: TObjectList); virtual; procedure AllocateClassMemberPages(AModule: TPasModule; LinkList: TObjectList); virtual;
procedure AllocateModulePages(AModule: TPasModule; LinkList: TObjectList); virtual; procedure AllocateModulePages(AModule: TPasModule; LinkList: TObjectList); virtual;
procedure AllocatePackagePages; virtual; procedure AllocatePackagePages; virtual;
// Prefix every filename generated with the eesult of this. // Prefix every filename generated with the result of this.
function GetFileBaseDir(aOutput: String): String; virtual; function GetFileBaseDir(aOutput: String): String; virtual;
function ModuleHasClasses(AModule: TPasModule): Boolean; function ModuleHasClasses(AModule: TPasModule): Boolean;