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

packages: fix AVL tree nodes compare. It used wrong CompareText()

Browse Source 
git-svn-id: trunk@35896 -
This commit is contained in:
paul 2012-03-12 06:48:05 +00:00
parent 935d16960a
commit 0baf05589e
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
packager/packagedefs.pas
View File

@ -956,14 +956,14 @@ end;
function PkgFileTypeIdentToType(const s: string): TPkgFileType; function PkgFileTypeIdentToType(const s: string): TPkgFileType;
begin begin
for Result:=Low(TPkgFileType) to High(TPkgFileType) do for Result:=Low(TPkgFileType) to High(TPkgFileType) do
if CompareText(s,PkgFileTypeIdents[Result])=0 then exit; if SysUtils.CompareText(s,PkgFileTypeIdents[Result])=0 then exit;
Result:=pftUnit; Result:=pftUnit;
end; end;
function LazPackageTypeIdentToType(const s: string): TLazPackageType; function LazPackageTypeIdentToType(const s: string): TLazPackageType;
begin begin
for Result:=Low(TLazPackageType) to High(TLazPackageType) do for Result:=Low(TLazPackageType) to High(TLazPackageType) do
if CompareText(s,LazPackageTypeIdents[Result])=0 then exit; if SysUtils.CompareText(s,LazPackageTypeIdents[Result])=0 then exit;
Result:=lptRunTime; Result:=lptRunTime;
end; end;
@ -987,7 +987,7 @@ end;
function NameToAutoUpdatePolicy(const s: string): TPackageUpdatePolicy; function NameToAutoUpdatePolicy(const s: string): TPackageUpdatePolicy;
begin begin
for Result:=Low(TPackageUpdatePolicy) to High(TPackageUpdatePolicy) do for Result:=Low(TPackageUpdatePolicy) to High(TPackageUpdatePolicy) do
if CompareText(AutoUpdateNames[Result],s)=0 then exit; if SysUtils.CompareText(AutoUpdateNames[Result],s)=0 then exit;
Result:=pupAsNeeded; Result:=pupAsNeeded;
end; end;
@ -1193,7 +1193,7 @@ begin
if Key<>nil then begin if Key<>nil then begin
Name:=AnsiString(Key); Name:=AnsiString(Key);
Pkg:=TLazPackageID(Data); Pkg:=TLazPackageID(Data);
Result:=CompareText(Name,Pkg.Name); Result:=SysUtils.CompareText(Name,Pkg.Name);
end else end else
Result:=-1; Result:=-1;
end; end;
@ -1215,7 +1215,7 @@ var
begin begin
Pkg1:=TLazPackageID(Data1); Pkg1:=TLazPackageID(Data1);
Pkg2:=TLazPackageID(Data2); Pkg2:=TLazPackageID(Data2);
Result:=CompareText(Pkg1.Name,Pkg2.Name); Result:=SysUtils.CompareText(Pkg1.Name,Pkg2.Name);
end; end;
function CompareNameWithPkgDependency(Key, Data: Pointer): integer; function CompareNameWithPkgDependency(Key, Data: Pointer): integer;
@ -1225,7 +1225,7 @@ var
begin begin
PkgName:=String(Key); PkgName:=String(Key);
Dependency:=TPkgDependency(Data); Dependency:=TPkgDependency(Data);
Result:=CompareText(PkgName,Dependency.PackageName); Result:=SysUtils.CompareText(PkgName,Dependency.PackageName);
end; end;
function ComparePkgDependencyNames(Data1, Data2: Pointer): integer; function ComparePkgDependencyNames(Data1, Data2: Pointer): integer;
@ -1235,7 +1235,7 @@ var
begin begin
Dependency1:=TPkgDependency(Data1); Dependency1:=TPkgDependency(Data1);
Dependency2:=TPkgDependency(Data2); Dependency2:=TPkgDependency(Data2);
Result:=CompareText(Dependency1.PackageName,Dependency2.PackageName); Result:=SysUtils.CompareText(Dependency1.PackageName,Dependency2.PackageName);
end; end;
function CompareUnitsTree(UnitTree1, UnitTree2: TPkgUnitsTree): integer; function CompareUnitsTree(UnitTree1, UnitTree2: TPkgUnitsTree): integer;
@ -1310,7 +1310,7 @@ function FindDependencyByNameInList(First: TPkgDependency;
begin begin
Result:=First; Result:=First;
while Result<>nil do begin while Result<>nil do begin
if CompareText(Result.PackageName,Name)=0 then exit; if SysUtils.CompareText(Result.PackageName,Name)=0 then exit;
Result:=Result.NextDependency[ListType]; Result:=Result.NextDependency[ListType];
end; end;
end; end;
@ -1352,7 +1352,7 @@ begin
if (Node=nil) or (PackageDependencies=nil) then exit; if (Node=nil) or (PackageDependencies=nil) then exit;
Result:=PackageDependencies.FindSuccessor(Node); Result:=PackageDependencies.FindSuccessor(Node);
if (Result<>nil) if (Result<>nil)
and (CompareText(TPkgDependency(Node.Data).PackageName, and (SysUtils.CompareText(TPkgDependency(Node.Data).PackageName,
TPkgDependency(Result.Data).PackageName)<>0) TPkgDependency(Result.Data).PackageName)<>0)
then then
Result:=nil; Result:=nil;
@ -1593,7 +1593,7 @@ var
begin begin
if FilenameIsPascalUnit(Filename) then begin if FilenameIsPascalUnit(Filename) then begin
NewUnitName:=ExtractFileNameOnly(Filename); NewUnitName:=ExtractFileNameOnly(Filename);
if CompareText(NewUnitName,FUnitName)<>0 then if SysUtils.CompareText(NewUnitName,FUnitName)<>0 then
FUnitName:=NewUnitName; FUnitName:=NewUnitName;
end else end else
FUnitName:=''; FUnitName:='';
@ -1704,7 +1704,7 @@ begin
if FileType in PkgFileUnitTypes then begin if FileType in PkgFileUnitTypes then begin
// make sure the unitname makes sense // make sure the unitname makes sense
CaseInsensitiveUnitName:=ExtractFileNameOnly(Filename); CaseInsensitiveUnitName:=ExtractFileNameOnly(Filename);
if CompareText(fUnitName,CaseInsensitiveUnitName)<>0 then if SysUtils.CompareText(fUnitName,CaseInsensitiveUnitName)<>0 then
fUnitName:=CaseInsensitiveUnitName; fUnitName:=CaseInsensitiveUnitName;
end; end;
FResourceBaseClass:=StrToComponentBaseClass( FResourceBaseClass:=StrToComponentBaseClass(
@ -1948,12 +1948,12 @@ end;
function TPkgDependency.IsCompatible(const PkgName: string; function TPkgDependency.IsCompatible(const PkgName: string;
const Version: TPkgVersion): boolean; const Version: TPkgVersion): boolean;
begin begin
Result:=(CompareText(PkgName,PackageName)=0) and IsCompatible(Version); Result:=(SysUtils.CompareText(PkgName,PackageName)=0) and IsCompatible(Version);
end; end;
function TPkgDependency.Compare(Dependency2: TPkgDependency): integer; function TPkgDependency.Compare(Dependency2: TPkgDependency): integer;
begin begin
Result:=CompareText(PackageName,Dependency2.PackageName); Result:=SysUtils.CompareText(PackageName,Dependency2.PackageName);
if Result<>0 then exit; if Result<>0 then exit;
Result:=MinVersion.Compare(Dependency2.MinVersion); Result:=MinVersion.Compare(Dependency2.MinVersion);
if Result<>0 then exit; if Result<>0 then exit;
@ -2175,7 +2175,7 @@ begin
end; end;
// check local macros // check local macros
if CompareText(MacroName,'PkgOutDir')=0 then begin if SysUtils.CompareText(MacroName,'PkgOutDir')=0 then begin
Handled:=true; Handled:=true;
if Data=CompilerOptionMacroNormal then if Data=CompilerOptionMacroNormal then
s:=CompilerOptions.ParsedOpts.GetParsedValue(pcosOutputDir) s:=CompilerOptions.ParsedOpts.GetParsedValue(pcosOutputDir)
@ -2183,12 +2183,12 @@ begin
s:=CompilerOptions.ParsedOpts.GetParsedPIValue(pcosOutputDir); s:=CompilerOptions.ParsedOpts.GetParsedPIValue(pcosOutputDir);
exit; exit;
end end
else if CompareText(MacroName,'PkgDir')=0 then begin else if SysUtils.CompareText(MacroName,'PkgDir')=0 then begin
Handled:=true; Handled:=true;
s:=FDirectory; s:=FDirectory;
exit; exit;
end end
else if CompareText(MacroName,'PkgName')=0 then begin else if SysUtils.CompareText(MacroName,'PkgName')=0 then begin
Handled:=true; Handled:=true;
s:=Name; s:=Name;
exit; exit;
@ -3157,14 +3157,14 @@ begin
for i:=0 to Cnt-1 do begin for i:=0 to Cnt-1 do begin
Result:=Files[i]; Result:=Files[i];
if IgnorePkgFile=Result then continue; if IgnorePkgFile=Result then continue;
if CompareText(Result.Unit_Name,TheUnitName)=0 then exit; if SysUtils.CompareText(Result.Unit_Name,TheUnitName)=0 then exit;
end; end;
if not IgnoreRemoved then begin if not IgnoreRemoved then begin
Cnt:=RemovedFilesCount; Cnt:=RemovedFilesCount;
for i:=0 to Cnt-1 do begin for i:=0 to Cnt-1 do begin
Result:=RemovedFiles[i]; Result:=RemovedFiles[i];
if IgnorePkgFile=Result then continue; if IgnorePkgFile=Result then continue;
if CompareText(Result.Unit_Name,TheUnitName)=0 then exit; if SysUtils.CompareText(Result.Unit_Name,TheUnitName)=0 then exit;
end; end;
end; end;
Result:=nil; Result:=nil;
@ -3375,7 +3375,7 @@ var
if OnlyExact then exit; if OnlyExact then exit;
// then search for case insensitive match // then search for case insensitive match
Result:=List.Count-1; Result:=List.Count-1;
while (Result>=0) and (CompareText(Filename,List[Result])<>0) do while (Result>=0) and (SysUtils.CompareText(Filename,List[Result])<>0) do
dec(Result); dec(Result);
end; end;
@ -3780,7 +3780,7 @@ var
if siffCaseSensitive in SearchFlags then if siffCaseSensitive in SearchFlags then
Result:=SearchedFilename=TheFilename Result:=SearchedFilename=TheFilename
else else
Result:=CompareText(SearchedFilename,TheFilename)=0; Result:=SysUtils.CompareText(SearchedFilename,TheFilename)=0;
end; end;
begin begin
@ -3810,7 +3810,7 @@ var
if siffCaseSensitive in SearchFlags then if siffCaseSensitive in SearchFlags then
Result:=SearchedFilename=TheFilename Result:=SearchedFilename=TheFilename
else else
Result:=CompareText(SearchedFilename,TheFilename)=0; Result:=SysUtils.CompareText(SearchedFilename,TheFilename)=0;
end; end;
begin begin
@ -3862,7 +3862,7 @@ begin
// compare with RTTI unit name // compare with RTTI unit name
if ComponentClass<>nil then begin if ComponentClass<>nil then begin
TIUnitName:=GetClassUnitName(ComponentClass); TIUnitName:=GetClassUnitName(ComponentClass);
if CompareText(TIUnitName,Result)<>0 then if SysUtils.CompareText(TIUnitName,Result)<>0 then
Result:=TIUnitName; Result:=TIUnitName;
end; end;
end; end;
@ -4621,7 +4621,7 @@ begin
Result:=Root; Result:=Root;
while (Result<>nil) do begin while (Result<>nil) do begin
PkgFile:=TPkgFile(Result.Data); PkgFile:=TPkgFile(Result.Data);
Comp:=CompareText(AUnitName,PkgFile.Unit_Name); Comp:=SysUtils.CompareText(AUnitName,PkgFile.Unit_Name);
if Comp=0 then exit; if Comp=0 then exit;
if Comp<0 then begin if Comp<0 then begin
Result:=Result.Left Result:=Result.Left
@ -4645,7 +4645,7 @@ end;
function ComparePkgFilesUnitname(PkgFile1, PkgFile2: Pointer): integer; function ComparePkgFilesUnitname(PkgFile1, PkgFile2: Pointer): integer;
begin begin
Result := CompareText( Result := SysUtils.CompareText(
TPkgFile(PkgFile1).Unit_Name, TPkgFile(PkgFile1).Unit_Name,
TPkgFile(PkgFile2).Unit_Name); TPkgFile(PkgFile2).Unit_Name);
end; end;