mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-09-16 14:39:24 +02:00
codetools: rename AUnitName properties to Unit_Name
git-svn-id: trunk@22352 -
This commit is contained in:
paul
parent
85dd7ce13b
commit
5d50a609c0
@ -567,7 +567,7 @@ implementation
|
||||
type
|
||||
TDefTemplUnitNameLink = class
|
||||
public
|
||||
AUnitName: string;
|
||||
Unit_Name: string;
|
||||
Filename: string;
|
||||
MacroCount: integer;
|
||||
UsedMacroCount: integer;
|
||||
@ -732,13 +732,13 @@ var Link1, Link2: TDefTemplUnitNameLink;
|
||||
begin
|
||||
Link1:=TDefTemplUnitNameLink(NodeData1);
|
||||
Link2:=TDefTemplUnitNameLink(NodeData2);
|
||||
Result:=CompareText(Link1.AUnitName,Link2.AUnitName);
|
||||
Result:=CompareText(Link1.Unit_Name,Link2.Unit_Name);
|
||||
end;
|
||||
|
||||
function CompareUnitNameWithUnitLinkNode(AUnitName: Pointer;
|
||||
NodeData: pointer): integer;
|
||||
begin
|
||||
Result:=CompareText(String(AUnitName),TDefTemplUnitNameLink(NodeData).AUnitName);
|
||||
Result:=CompareText(String(AUnitName),TDefTemplUnitNameLink(NodeData).Unit_Name);
|
||||
end;
|
||||
|
||||
function CompareDirectoryDefines(NodeData1, NodeData2: pointer): integer;
|
||||
@ -3254,7 +3254,7 @@ var
|
||||
ANode:=UnitTree.Root;
|
||||
while ANode<>nil do begin
|
||||
Result:=TDefTemplUnitNameLink(ANode.Data);
|
||||
cmp:=CompareText(AnUnitName,Result.AUnitName);
|
||||
cmp:=CompareText(AnUnitName,Result.Unit_Name);
|
||||
if cmp<0 then
|
||||
ANode:=ANode.Left
|
||||
else if cmp>0 then
|
||||
@ -3449,7 +3449,7 @@ var
|
||||
if OldUnitLink=nil then begin
|
||||
// first unit with this name
|
||||
NewUnitLink:=TDefTemplUnitNameLink.Create;
|
||||
NewUnitLink.AUnitName:=AUnitName;
|
||||
NewUnitLink.Unit_Name:=AUnitName;
|
||||
NewUnitLink.FileName:=MacroFileName;
|
||||
NewUnitLink.MacroCount:=MacroCount;
|
||||
NewUnitLink.UsedMacroCount:=UsedMacroCount;
|
||||
|
||||
@ -210,7 +210,7 @@ type
|
||||
|
||||
TUnitNameLink = class
|
||||
public
|
||||
AUnitName: string;
|
||||
Unit_Name: string;
|
||||
Filename: string;
|
||||
function CalcMemSize: PtrUInt;
|
||||
end;
|
||||
@ -404,7 +404,7 @@ begin
|
||||
if UnitLinkEnd>UnitLinkStart then begin
|
||||
Filename:=copy(UnitLinks,UnitLinkStart,UnitLinkEnd-UnitLinkStart);
|
||||
NewNode:=TUnitNameLink.Create;
|
||||
NewNode.AUnitName:=TheUnitName;
|
||||
NewNode.Unit_Name:=TheUnitName;
|
||||
NewNode.Filename:=Filename;
|
||||
UnitLinksTree.Add(NewNode);
|
||||
end;
|
||||
@ -426,13 +426,13 @@ var Link1, Link2: TUnitNameLink;
|
||||
begin
|
||||
Link1:=TUnitNameLink(NodeData1);
|
||||
Link2:=TUnitNameLink(NodeData2);
|
||||
Result:=CompareText(Link1.AUnitName,Link2.AUnitName);
|
||||
Result:=CompareText(Link1.Unit_Name,Link2.Unit_Name);
|
||||
end;
|
||||
|
||||
function CompareUnitNameWithUnitLinkNode(AUnitName: Pointer;
|
||||
NodeData: pointer): integer;
|
||||
begin
|
||||
Result:=CompareText(String(AUnitName),TUnitNameLink(NodeData).AUnitName);
|
||||
Result:=CompareText(String(AUnitName),TUnitNameLink(NodeData).Unit_Name);
|
||||
end;
|
||||
|
||||
{ TCTDirectoryCache }
|
||||
@ -1288,7 +1288,7 @@ end;
|
||||
function TUnitNameLink.CalcMemSize: PtrUInt;
|
||||
begin
|
||||
Result:=PtrUInt(InstanceSize)
|
||||
+MemSizeString(AUnitName)
|
||||
+MemSizeString(Unit_Name)
|
||||
+MemSizeString(Filename);
|
||||
end;
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ type
|
||||
|
||||
TPPUMember = class
|
||||
public
|
||||
AUnitName: string;
|
||||
Unit_Name: string;
|
||||
PPUFilename: string;
|
||||
KeyNode: TCodeTreeNode;
|
||||
InitializationMangledName: string;
|
||||
@ -147,13 +147,13 @@ implementation
|
||||
|
||||
function ComparePPUMembersByUnitName(Member1, Member2: Pointer): integer;
|
||||
begin
|
||||
Result:=CompareIdentifierPtrs(Pointer(TPPUMember(Member1).AUnitName),
|
||||
Pointer(TPPUMember(Member2).AUnitName));
|
||||
Result:=CompareIdentifierPtrs(Pointer(TPPUMember(Member1).Unit_Name),
|
||||
Pointer(TPPUMember(Member2).Unit_Name));
|
||||
end;
|
||||
|
||||
function CompareNameWithPPUMemberName(NamePChar, Member: Pointer): integer;
|
||||
begin
|
||||
Result:=CompareIdentifierPtrs(NamePChar,Pointer(TPPUMember(Member).AUnitName));
|
||||
Result:=CompareIdentifierPtrs(NamePChar,Pointer(TPPUMember(Member).Unit_Name));
|
||||
end;
|
||||
|
||||
function ComparePPUGroupsByName(Group1, Group2: Pointer): integer;
|
||||
@ -170,7 +170,7 @@ end;
|
||||
function PPUGroupObjectAsString(Obj: TObject): string;
|
||||
begin
|
||||
if Obj is TPPUMember then
|
||||
Result:='unit '+TPPUMember(Obj).AUnitName
|
||||
Result:='unit '+TPPUMember(Obj).Unit_Name
|
||||
else if Obj is TPPUGroup then
|
||||
Result:='group '+TPPUGroup(Obj).Name
|
||||
else
|
||||
@ -209,7 +209,7 @@ begin
|
||||
if PPU=nil then PPU:=TPPU.Create;
|
||||
PPU.LoadFromFile(PPUFilename);
|
||||
debugln('================================================================');
|
||||
DebugLn(['TPPUMember.UpdatePPU Group=',Group.Name,' AUnitName=',AUnitName,' Filename=',PPUFilename]);
|
||||
DebugLn(['TPPUMember.UpdatePPU Group=',Group.Name,' AUnitName=',Unit_Name,' Filename=',PPUFilename]);
|
||||
//PPU.Dump('');
|
||||
PPU.GetMainUsesSectionNames(MainUses);
|
||||
if MainUses.Count>0 then
|
||||
@ -312,7 +312,7 @@ begin
|
||||
Result:=FindMemberWithUnitName(NewUnitName);
|
||||
if Result<>nil then exit;
|
||||
Result:=TPPUMember.Create;
|
||||
Result.AUnitName:=NewUnitName;
|
||||
Result.Unit_Name:=NewUnitName;
|
||||
FMembers.Add(Result);
|
||||
Result.Group:=Self;
|
||||
Groups.FMembers.Add(Result);
|
||||
@ -353,7 +353,7 @@ function TPPUGroup.UpdateDependencies: boolean;
|
||||
begin
|
||||
UsedMember:=Groups.FindMemberWithUnitName(UsedUnit);
|
||||
if UsedMember=nil then begin
|
||||
DebugLn(['AddUnitDependency ',Member.AUnitName,' misses an unit: ',UsedUnit]);
|
||||
DebugLn(['AddUnitDependency ',Member.Unit_Name,' misses an unit: ',UsedUnit]);
|
||||
exit;
|
||||
end;
|
||||
// add to 'global' unit graph
|
||||
@ -361,14 +361,14 @@ function TPPUGroup.UpdateDependencies: boolean;
|
||||
if not Graph.PathExists(UsedMember.KeyNode,Member.KeyNode) then
|
||||
Graph.AddEdge(Member.KeyNode,UsedMember.KeyNode)
|
||||
else
|
||||
DebugLn(['AddUnitDependency Unit circle found: ',Member.AUnitName,' to ',UsedMember.AUnitName]);
|
||||
DebugLn(['AddUnitDependency Unit circle found: ',Member.Unit_Name,' to ',UsedMember.Unit_Name]);
|
||||
if Member.Group=UsedMember.Group then begin
|
||||
// add to unit graph of group
|
||||
Graph:=Member.Group.UnitGraph;
|
||||
if not Graph.PathExists(UsedMember.KeyNode,Member.KeyNode) then
|
||||
Graph.AddEdge(Member.KeyNode,UsedMember.KeyNode)
|
||||
else
|
||||
DebugLn(['AddUnitDependency Unit circle found: ',Member.AUnitName,' to ',UsedMember.AUnitName]);
|
||||
DebugLn(['AddUnitDependency Unit circle found: ',Member.Unit_Name,' to ',UsedMember.Unit_Name]);
|
||||
end else begin
|
||||
// add to 'global' package graph
|
||||
if not Groups.GroupGraph.PathExists(UsedMember.Group.KeyNode,Member.Group.KeyNode) then
|
||||
@ -821,7 +821,7 @@ begin
|
||||
List.Clear;
|
||||
Member.GetMissingUnits(TStrings(List));
|
||||
if List.Count>0 then begin
|
||||
DebugLn(['TPPUGroups.AutoDisableUnitsWithBrokenDependencies auto disabling unit ',Member.AUnitName,' due to missing units: ',List.DelimitedText]);
|
||||
DebugLn(['TPPUGroups.AutoDisableUnitsWithBrokenDependencies auto disabling unit ',Member.Unit_Name,' due to missing units: ',List.DelimitedText]);
|
||||
AutoDisableMember(Member);
|
||||
end;
|
||||
end;
|
||||
@ -846,7 +846,7 @@ begin
|
||||
GraphEdge:=TCodeGraphEdge(AVLNode.Data);
|
||||
DependingMember:=TPPUMember(GraphEdge.FromNode.Data);
|
||||
if not (pmfAutoDisabled in DependingMember.Flags) then begin
|
||||
DebugLn(['TPPUGroups.AutoDisableMember auto disabling unit ',DependingMember.AUnitName,' because it uses auto disabled unit ',Member.AUnitName]);
|
||||
DebugLn(['TPPUGroups.AutoDisableMember auto disabling unit ',DependingMember.Unit_Name,' because it uses auto disabled unit ',Member.Unit_Name]);
|
||||
AutoDisableMember(DependingMember);
|
||||
end;
|
||||
AVLNode:=GraphNode.InTree.FindSuccessor(AVLNode);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user