mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-06-25 08:38:40 +02:00
* duplicate names fixed
git-svn-id: trunk@2437 -
This commit is contained in:
parent
c3d89885c2
commit
f7d546ed5f
@ -595,24 +595,24 @@ var
|
|||||||
var
|
var
|
||||||
DotPos, DotPos2, i: Integer;
|
DotPos, DotPos2, i: Integer;
|
||||||
s: String;
|
s: String;
|
||||||
Package: TPasPackage;
|
HPackage: TPasPackage;
|
||||||
Module: TPasModule;
|
Module: TPasModule;
|
||||||
begin
|
begin
|
||||||
// Find or create package
|
// Find or create package
|
||||||
DotPos := Pos('.', AName);
|
DotPos := Pos('.', AName);
|
||||||
s := Copy(AName, 1, DotPos - 1);
|
s := Copy(AName, 1, DotPos - 1);
|
||||||
Package := nil;
|
HPackage := nil;
|
||||||
for i := 0 to FPackages.Count - 1 do
|
for i := 0 to FPackages.Count - 1 do
|
||||||
if CompareText(TPasPackage(FPackages[i]).Name, s) = 0 then
|
if CompareText(TPasPackage(FPackages[i]).Name, s) = 0 then
|
||||||
begin
|
begin
|
||||||
Package := TPasPackage(FPackages[i]);
|
HPackage := TPasPackage(FPackages[i]);
|
||||||
break;
|
break;
|
||||||
end;
|
end;
|
||||||
if not Assigned(Package) then
|
if not Assigned(HPackage) then
|
||||||
begin
|
begin
|
||||||
Package := TPasPackage(inherited CreateElement(TPasPackage, s, nil,
|
HPackage := TPasPackage(inherited CreateElement(TPasPackage, s, nil,
|
||||||
'', 0));
|
'', 0));
|
||||||
FPackages.Add(Package);
|
FPackages.Add(HPackage);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
// Find or create module
|
// Find or create module
|
||||||
@ -622,17 +622,17 @@ var
|
|||||||
until AName[DotPos2] = '.';
|
until AName[DotPos2] = '.';
|
||||||
s := Copy(AName, DotPos + 1, DotPos2 - DotPos - 1);
|
s := Copy(AName, DotPos + 1, DotPos2 - DotPos - 1);
|
||||||
Module := nil;
|
Module := nil;
|
||||||
for i := 0 to Package.Modules.Count - 1 do
|
for i := 0 to HPackage.Modules.Count - 1 do
|
||||||
if CompareText(TPasModule(Package.Modules[i]).Name, s) = 0 then
|
if CompareText(TPasModule(HPackage.Modules[i]).Name, s) = 0 then
|
||||||
begin
|
begin
|
||||||
Module := TPasModule(Package.Modules[i]);
|
Module := TPasModule(HPackage.Modules[i]);
|
||||||
break;
|
break;
|
||||||
end;
|
end;
|
||||||
if not Assigned(Module) then
|
if not Assigned(Module) then
|
||||||
begin
|
begin
|
||||||
Module := TPasModule.Create(s, Package);
|
Module := TPasModule.Create(s, HPackage);
|
||||||
Module.InterfaceSection := TPasSection.Create('', Module);
|
Module.InterfaceSection := TPasSection.Create('', Module);
|
||||||
Package.Modules.Add(Module);
|
HPackage.Modules.Add(Module);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
// Create node for class
|
// Create node for class
|
||||||
|
Loading…
Reference in New Issue
Block a user