paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-25 11:17:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converter: Make sure the same unit will not be added again after AddUnitImmediately.

Browse Source 
git-svn-id: trunk@41799 -
This commit is contained in:
juha 2013-06-22 13:30:48 +00:00
parent ae92b35e79
commit e48de26440
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
converter/usedunits.pas
View File

@ -692,17 +692,32 @@ end;
function TUsedUnitsTool.AddUnitImmediately(aUnitName: string): Boolean;
// Add a unit to uses section and apply the change at once.
// Returns True if the unit was actually added (did not exist yet).
procedure RemoveFromAdded(aUnitList: TStrings);
var
i: Integer;
begin
i:=aUnitList.IndexOf(aUnitName);
if (i > -1) then
aUnitList.Delete(i);
end;
var
x: Integer;
begin
Result:=not ( fMainUsedUnits.fExistingUnits.Find(aUnitName, x)
or fImplUsedUnits.fExistingUnits.Find(aUnitName, x) );
if Result then begin
Result:=fCTLink.CodeTool.AddUnitToSpecificUsesSection(
fMainUsedUnits.fUsesSection, aUnitName, '', fCTLink.SrcCache);
if Result then
Result:=fCTLink.SrcCache.Apply;
end;
if not Result then Exit;
Result:=fCTLink.CodeTool.AddUnitToSpecificUsesSection(
fMainUsedUnits.fUsesSection, aUnitName, '', fCTLink.SrcCache);
if not Result then Exit;
Result:=fCTLink.SrcCache.Apply;
if not Result then Exit;
// Make sure the same unit will not be added again later.
RemoveFromAdded(fMainUsedUnits.fUnitsToAdd);
RemoveFromAdded(fImplUsedUnits.fUnitsToAdd);
RemoveFromAdded(fMainUsedUnits.fUnitsToAddForLCL);
RemoveFromAdded(fImplUsedUnits.fUnitsToAddForLCL);
end;
procedure TUsedUnitsTool.AddUnitIfNeeded(aUnitName: string);