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

* Append end to correct location in class

Browse Source 
git-svn-id: trunk@36606 -
This commit is contained in:
michael 2017-06-27 06:59:59 +00:00
parent 02ed753fab
commit 54a8a73ca7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
utils/fpdoc/dw_html.pp
View File

@ -219,7 +219,7 @@ type
procedure AppendProcDecl(CodeEl, TableEl: TDOMElement; Element: TPasProcedureBase); procedure AppendProcDecl(CodeEl, TableEl: TDOMElement; Element: TPasProcedureBase);
procedure AppendProcArgsSection(Parent: TDOMNode; Element: TPasProcedureType; SkipResult : Boolean = False); procedure AppendProcArgsSection(Parent: TDOMNode; Element: TPasProcedureType; SkipResult : Boolean = False);
function AppendRecordType(CodeEl, TableEl: TDOMElement; Element: TPasRecordType; NestingLevel: Integer): TDOMElement; function AppendRecordType(CodeEl, TableEl: TDOMElement; Element: TPasRecordType; NestingLevel: Integer): TDOMElement;
procedure CreateMemberDeclarations(AParent: TPasElement; Members: TFPList; TableEl : TDOmelement); procedure CreateMemberDeclarations(AParent: TPasElement; Members: TFPList; TableEl: TDOmelement; AddEnd: Boolean);
procedure AppendTitle(const AText: DOMString; Hints : TPasMemberHints = []); procedure AppendTitle(const AText: DOMString; Hints : TPasMemberHints = []);
procedure AppendMenuBar(ASubpageIndex: Integer); procedure AppendMenuBar(ASubpageIndex: Integer);
@ -1959,7 +1959,7 @@ begin
Inc(i); Inc(i);
end; end;
if isExtended then if isExtended then
CreateMemberDeclarations(Element,Element.Members,TableEl) CreateMemberDeclarations(Element,Element.Members,TableEl,False)
else else
for i := 0 to Element.Members.Count - 1 do for i := 0 to Element.Members.Count - 1 do
begin begin
@ -3154,11 +3154,10 @@ begin
(Copy(AMember.Name, 1, 2) = 'On'); (Copy(AMember.Name, 1, 2) = 'On');
end; end;
procedure THTMLWriter.CreateMemberDeclarations(AParent : TPasElement; Members : TFPList; TableEl : TDOmelement); procedure THTMLWriter.CreateMemberDeclarations(AParent : TPasElement; Members : TFPList; TableEl : TDOmelement; AddEnd : Boolean);
var var
TREl, TDEl, CodeEl: TDOMElement; TREl, CodeEl: TDOMElement;
DocNode: TDocNode;
Member: TPasElement; Member: TPasElement;
MVisibility, MVisibility,
CurVisibility: TPasMemberVisibility; CurVisibility: TPasMemberVisibility;
@ -3291,6 +3290,12 @@ begin
end; end;
CodeEl := CreateCode(CreatePara(CreateTD(CreateTR(TableEl)))); CodeEl := CreateCode(CreatePara(CreateTD(CreateTR(TableEl))));
end; end;
AppendText(CodeEl, ' '); // !!!: Dirty trick, necessary for current XML writer
If AddEnd then
begin
AppendKw(CodeEl, 'end');
AppendSym(CodeEl, ';');
end;
end; end;
procedure THTMLWriter.CreateClassPageBody(AClass: TPasClassType; procedure THTMLWriter.CreateClassPageBody(AClass: TPasClassType;
@ -3405,12 +3410,8 @@ var
AppendSym(CodeEl, ')'); AppendSym(CodeEl, ')');
end; end;
end; end;
CreateMemberDeclarations(AClass, AClass.Members,TableEl); CreateMemberDeclarations(AClass, AClass.Members,TableEl, not AClass.IsShortDefinition);
AppendText(CodeEl, ' '); // !!!: Dirty trick, necessary for current XML writer
if not AClass.IsShortDefinition then
AppendKw(CodeEl, 'end');
AppendSym(CodeEl, ';');
AppendText(CreateH2(BodyElement), SDocInheritance); AppendText(CreateH2(BodyElement), SDocInheritance);