mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-12 16:29:21 +02:00
* Various small changes. LCL compiles again, but is 10% smaller.
tree inheritance still not fully linked. git-svn-id: trunk@24276 -
This commit is contained in:
parent
dfc89a35a7
commit
b2f861420c
@ -1066,6 +1066,8 @@ begin
|
|||||||
for i := 0 to Package.Modules.Count - 1 do
|
for i := 0 to Package.Modules.Count - 1 do
|
||||||
begin
|
begin
|
||||||
Module := TPasModule(Package.Modules[i]);
|
Module := TPasModule(Package.Modules[i]);
|
||||||
|
if not assigned(Module.InterfaceSection) then
|
||||||
|
continue;
|
||||||
for j := 0 to Module.InterfaceSection.Classes.Count - 1 do
|
for j := 0 to Module.InterfaceSection.Classes.Count - 1 do
|
||||||
begin
|
begin
|
||||||
ClassDecl := TPasClassType(Module.InterfaceSection.Classes[j]);
|
ClassDecl := TPasClassType(Module.InterfaceSection.Classes[j]);
|
||||||
@ -1520,7 +1522,7 @@ begin
|
|||||||
break;
|
break;
|
||||||
CurPackage := CurPackage.NextSibling;
|
CurPackage := CurPackage.NextSibling;
|
||||||
end;
|
end;
|
||||||
if not Assigned(Result) then
|
if not Assigned(Result) and assigned(CurModule.InterfaceSection) then
|
||||||
begin
|
begin
|
||||||
{ Okay, then we have to try all imported units of the current module }
|
{ Okay, then we have to try all imported units of the current module }
|
||||||
UnitList := CurModule.InterfaceSection.UsesList;
|
UnitList := CurModule.InterfaceSection.UsesList;
|
||||||
|
@ -552,6 +552,8 @@ constructor THTMLWriter.Create(APackage: TPasPackage; AEngine: TFPDocEngine);
|
|||||||
ALink : DOMString;
|
ALink : DOMString;
|
||||||
DidAutolink: Boolean;
|
DidAutolink: Boolean;
|
||||||
begin
|
begin
|
||||||
|
if not assigned(Amodule.Interfacesection) then
|
||||||
|
exit;
|
||||||
AddPage(AModule, 0);
|
AddPage(AModule, 0);
|
||||||
AddPage(AModule,IndexSubIndex);
|
AddPage(AModule,IndexSubIndex);
|
||||||
AddTopicPages(AModule);
|
AddTopicPages(AModule);
|
||||||
@ -2454,7 +2456,7 @@ begin
|
|||||||
For I:=0 to Package.Modules.Count-1 do
|
For I:=0 to Package.Modules.Count-1 do
|
||||||
begin
|
begin
|
||||||
M:=TPasModule(Package.Modules[i]);
|
M:=TPasModule(Package.Modules[i]);
|
||||||
if Not (M is TPasExternalModule) then
|
if Not (M is TPasExternalModule) and assigned(M.InterfaceSection) then
|
||||||
Self.AddElementsFromList(L,M.InterfaceSection.Classes,True)
|
Self.AddElementsFromList(L,M.InterfaceSection.Classes,True)
|
||||||
end;
|
end;
|
||||||
AppendMenuBar(ClassHierarchySubIndex);
|
AppendMenuBar(ClassHierarchySubIndex);
|
||||||
@ -2632,12 +2634,15 @@ end;
|
|||||||
procedure THTMLWriter.AddModuleIdentifiers(AModule : TPasModule; L : TStrings);
|
procedure THTMLWriter.AddModuleIdentifiers(AModule : TPasModule; L : TStrings);
|
||||||
|
|
||||||
begin
|
begin
|
||||||
AddElementsFromList(L,AModule.InterfaceSection.Consts);
|
if assigned(AModule.InterfaceSection) Then
|
||||||
AddElementsFromList(L,AModule.InterfaceSection.Types);
|
begin
|
||||||
AddElementsFromList(L,AModule.InterfaceSection.Functions);
|
AddElementsFromList(L,AModule.InterfaceSection.Consts);
|
||||||
AddElementsFromList(L,AModule.InterfaceSection.Classes);
|
AddElementsFromList(L,AModule.InterfaceSection.Types);
|
||||||
AddElementsFromList(L,AModule.InterfaceSection.Variables);
|
AddElementsFromList(L,AModule.InterfaceSection.Functions);
|
||||||
AddElementsFromList(L,AModule.InterfaceSection.ResStrings);
|
AddElementsFromList(L,AModule.InterfaceSection.Classes);
|
||||||
|
AddElementsFromList(L,AModule.InterfaceSection.Variables);
|
||||||
|
AddElementsFromList(L,AModule.InterfaceSection.ResStrings);
|
||||||
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
@ -3146,6 +3151,8 @@ var
|
|||||||
ThisInterface,
|
ThisInterface,
|
||||||
ThisClass: TPasClassType;
|
ThisClass: TPasClassType;
|
||||||
HaveSeenTObject: Boolean;
|
HaveSeenTObject: Boolean;
|
||||||
|
LName : String;
|
||||||
|
ThisNode : TPasUnresolvedTypeRef;
|
||||||
begin
|
begin
|
||||||
AppendMenuBar(-1);
|
AppendMenuBar(-1);
|
||||||
AppendTitle(AClass.Name);
|
AppendTitle(AClass.Name);
|
||||||
@ -3321,15 +3328,24 @@ var
|
|||||||
AppendText(CreateH2(BodyElement), SDocInheritance);
|
AppendText(CreateH2(BodyElement), SDocInheritance);
|
||||||
TableEl := CreateTable(BodyElement);
|
TableEl := CreateTable(BodyElement);
|
||||||
HaveSeenTObject := AClass.ObjKind <> okClass;
|
HaveSeenTObject := AClass.ObjKind <> okClass;
|
||||||
ThisClass := AClass;
|
// we try to track classes. But imported classes
|
||||||
|
// are TLinkNode's not the TPasClassType generated by the parser.
|
||||||
|
ThisClass := AClass; ThisNode := Nil;
|
||||||
while True do
|
while True do
|
||||||
begin
|
begin
|
||||||
TREl := CreateTR(TableEl);
|
TREl := CreateTR(TableEl);
|
||||||
TDEl := CreateTD_vtop(TREl);
|
TDEl := CreateTD_vtop(TREl);
|
||||||
TDEl['align'] := 'center';
|
TDEl['align'] := 'center';
|
||||||
CodeEl := CreateCode(CreatePara(TDEl));
|
CodeEl := CreateCode(CreatePara(TDEl));
|
||||||
AppendHyperlink(CodeEl, ThisClass);
|
if Assigned(ThisClass) then
|
||||||
if ThisClass.Interfaces.count>0 then
|
LName:=ThisClass.Name
|
||||||
|
Else
|
||||||
|
LName:=ThisNode.Name;
|
||||||
|
if Assigned(ThisClass) Then
|
||||||
|
AppendHyperlink(CodeEl, ThisClass)
|
||||||
|
else
|
||||||
|
AppendHyperlink(CodeEl, ThisNode);
|
||||||
|
if Assigned(ThisClass) and (ThisClass.Interfaces.count>0) then
|
||||||
begin
|
begin
|
||||||
for i:=0 to ThisClass.interfaces.count-1 do
|
for i:=0 to ThisClass.interfaces.count-1 do
|
||||||
begin
|
begin
|
||||||
@ -3339,7 +3355,7 @@ var
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
AppendShortDescrCell(TREl, ThisClass);
|
AppendShortDescrCell(TREl, ThisClass);
|
||||||
if HaveSeenTObject or (CompareText(ThisClass.Name, 'TObject') = 0) then
|
if HaveSeenTObject or (CompareText(LName, 'TObject') = 0) then
|
||||||
HaveSeenTObject := True
|
HaveSeenTObject := True
|
||||||
else
|
else
|
||||||
begin
|
begin
|
||||||
|
@ -175,6 +175,8 @@ begin
|
|||||||
for i := 0 to Package.Modules.Count - 1 do
|
for i := 0 to Package.Modules.Count - 1 do
|
||||||
begin
|
begin
|
||||||
AModule := TPasModule(Package.Modules[i]);
|
AModule := TPasModule(Package.Modules[i]);
|
||||||
|
If not assigned(AModule.InterfaceSection) Then
|
||||||
|
Continue;
|
||||||
ObjUnitItem := ObjByUnitItem.Children.NewItem;
|
ObjUnitItem := ObjByUnitItem.Children.NewItem;
|
||||||
ObjUnitItem.Text := AModule.Name;
|
ObjUnitItem.Text := AModule.Name;
|
||||||
RoutinesUnitItem := RoutinesByUnitItem.Children.NewItem;
|
RoutinesUnitItem := RoutinesByUnitItem.Children.NewItem;
|
||||||
@ -292,6 +294,8 @@ begin
|
|||||||
for i := 0 to Package.Modules.Count - 1 do
|
for i := 0 to Package.Modules.Count - 1 do
|
||||||
begin
|
begin
|
||||||
AModule := TPasModule(Package.Modules[i]);
|
AModule := TPasModule(Package.Modules[i]);
|
||||||
|
if not assigned(AModule.InterfaceSection) then
|
||||||
|
continue;
|
||||||
ParentItem := Index.Items.NewItem;
|
ParentItem := Index.Items.NewItem;
|
||||||
ParentItem.Text := AModule.Name;
|
ParentItem.Text := AModule.Name;
|
||||||
ParentItem.Local := FixHTMLpath(Allocator.GetFilename(AModule, 0));
|
ParentItem.Local := FixHTMLpath(Allocator.GetFilename(AModule, 0));
|
||||||
|
Loading…
Reference in New Issue
Block a user