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

codetools: replaced PAnsiString with AnsiString

Browse Source 
git-svn-id: trunk@34234 -
This commit is contained in:
mattias 2011-12-17 00:52:45 +00:00
parent c9cb54bcab
commit 9b7fc82827
6 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/codetools/codecache.pas
View File

@ -268,7 +268,7 @@ type
function CompareCodeBuffers(NodeData1, NodeData2: pointer): integer;
function CompareAnsistringWithCodeBuffer(AString, ABuffer: pointer): integer;
function CompareIncludedByLink(NodeData1, NodeData2: pointer): integer;
function ComparePAnsiStringWithIncludedByLink(Key, Data: pointer): integer;
function CompareAnsiStringWithIncludedByLink(Key, Data: pointer): integer;
function CodePosition(P: integer; Code: TCodeBuffer): TCodePosition;
function CodeXYPosition(X, Y: integer; Code: TCodeBuffer): TCodeXYPosition;
@ -321,9 +321,9 @@ begin
Result:=CompareFilenames(Link1.IncludeFilename,Link2.IncludeFilename);
end;
function ComparePAnsiStringWithIncludedByLink(Key, Data: pointer): integer;
function CompareAnsiStringWithIncludedByLink(Key, Data: pointer): integer;
begin
Result:=CompareFilenames(PAnsiString(Key)^,
Result:=CompareFilenames(AnsiString(Key),
TIncludedByLink(Data).IncludeFilename);
end;
@ -987,7 +987,7 @@ function TCodeCache.FindIncludeLinkAVLNode(const IncludeFilename: string
): TAVLTreeNode;
begin
Result:=FIncludeLinks.FindKey(@IncludeFilename,
@ComparePAnsiStringWithIncludedByLink);
@CompareAnsiStringWithIncludedByLink);
end;
function TCodeCache.FindIncludeLink(const IncludeFilename: string): string;

22
components/codetools/codeindex.pas
View File

@ -140,11 +140,11 @@ type
end;
function CompareUnitListOwners(Data1, Data2: Pointer): integer;
function ComparePAnsiStringWithUnitListOwner(Data1, Data2: Pointer): integer;
function CompareAnsiStringWithUnitListOwner(Data1, Data2: Pointer): integer;
function CompareUnitFilenames(Data1, Data2: Pointer): integer;
function ComparePAnsiStringWithUnitFilename(Data1, Data2: Pointer): integer;
function CompareAnsiStringWithUnitFilename(Data1, Data2: Pointer): integer;
function CompareNodeIdentifiers(Data1, Data2: Pointer): integer;
function ComparePAnsiStringWithNodeIdentifier(Data1, Data2: Pointer): integer;
function CompareAnsiStringWithNodeIdentifier(Data1, Data2: Pointer): integer;
implementation
@ -154,9 +154,9 @@ begin
TCodeBrowserUnitList(Data2).Owner);
end;
function ComparePAnsiStringWithUnitListOwner(Data1, Data2: Pointer): integer;
function CompareAnsiStringWithUnitListOwner(Data1, Data2: Pointer): integer;
begin
Result:=SysUtils.CompareText(PAnsiString(Data1)^,
Result:=SysUtils.CompareText(AnsiString(Data1),
TCodeBrowserUnitList(Data2).Owner);
end;
@ -166,9 +166,9 @@ begin
TCodeBrowserUnit(Data2).Filename);
end;
function ComparePAnsiStringWithUnitFilename(Data1, Data2: Pointer): integer;
function CompareAnsiStringWithUnitFilename(Data1, Data2: Pointer): integer;
begin
Result:=CompareFilenames(PAnsiString(Data1)^,
Result:=CompareFilenames(AnsiString(Data1),
TCodeBrowserUnit(Data2).Filename);
end;
@ -178,9 +178,9 @@ begin
TCodeBrowserNode(Data2).Identifier);
end;
function ComparePAnsiStringWithNodeIdentifier(Data1, Data2: Pointer): integer;
function CompareAnsiStringWithNodeIdentifier(Data1, Data2: Pointer): integer;
begin
Result:=SysUtils.CompareText(PAnsiString(Data1)^,
Result:=SysUtils.CompareText(AnsiString(Data1),
TCodeBrowserNode(Data2).Identifier);
end;
@ -380,7 +380,7 @@ begin
Result:=nil;
if Filename='' then exit;
if FUnits=nil then exit;
Node:=FUnits.FindKey(@Filename,@ComparePAnsiStringWithUnitFilename);
Node:=FUnits.FindKey(@Filename,@CompareAnsiStringWithUnitFilename);
if Node=nil then exit;
Result:=TCodeBrowserUnit(Node.Data);
end;
@ -393,7 +393,7 @@ begin
Result:=nil;
if FUnitLists=nil then exit;
if OwnerName='' then exit;
Node:=FUnitLists.FindKey(@OwnerName,@ComparePAnsiStringWithUnitListOwner);
Node:=FUnitLists.FindKey(@OwnerName,@CompareAnsiStringWithUnitListOwner);
if Node=nil then exit;
Result:=TCodeBrowserUnitList(Node.Data);
end;

58
components/codetools/codetoolsstructs.pas
View File

@ -125,7 +125,7 @@ type
property Tree: TAVLTree read FTree; // tree of PStringMapItem
function FindNode(const s: string): TAVLTreeNode;
function Equals(OtherTree: TStringMap): boolean; reintroduce;
procedure Assign(Source: TStringMap); virtual; abstract;
procedure Assign(Source: TStringMap); virtual;
procedure WriteDebugReport; virtual;
function CalcMemSize: PtrUint; virtual;
property CompareItemsFunc: TListSortCompare read GetCompareItemsFunc;
@ -158,9 +158,9 @@ type
function GetStrings(const s: string): string;
procedure SetStrings(const s: string; const AValue: string);
protected
procedure DisposeItem(p: PStringMapItem); virtual;
function ItemsAreEqual(p1, p2: PStringMapItem): boolean; virtual;
function CreateCopy(Src: PStringMapItem): PStringMapItem; virtual;
procedure DisposeItem(p: PStringMapItem); override;
function ItemsAreEqual(p1, p2: PStringMapItem): boolean; override;
function CreateCopy(Src: PStringMapItem): PStringMapItem; override;
public
function GetString(const Name: string; out Value: string): boolean;
procedure Add(const Name, Value: string); virtual;
@ -532,10 +532,12 @@ end;
function TStringToPointerTree.CreateCopy(Src: PStringMapItem): PStringMapItem;
var
SrcItem: PStringToPointerTreeItem absolute Src;
NewItem: PStringToPointerTreeItem;
begin
New(Result);
Result^.Name:=SrcItem^.Name;
Result^.Value:=SrcItem^.Value;
New(NewItem);
NewItem^.Name:=SrcItem^.Name;
NewItem^.Value:=SrcItem^.Value;
Result:=PStringMapItem(NewItem);
end;
function TStringToPointerTree.GetItem(const Name: string; out Value: Pointer
@ -732,6 +734,22 @@ begin
Result:=true;
end;
procedure TStringMap.Assign(Source: TStringMap);
var
SrcNode: TAVLTreeNode;
SrcItem: PStringMapItem;
begin
if (Source=nil) or (Source.ClassType<>ClassType) then
raise Exception.Create('invalid class');
Clear;
SrcNode:=Source.Tree.FindLowest;
while SrcNode<>nil do begin
SrcItem:=PStringMapItem(SrcNode.Data);
Tree.Add(CreateCopy(SrcItem));
SrcNode:=Source.Tree.FindSuccessor(SrcNode);
end;
end;
procedure TStringMap.WriteDebugReport;
var
Node: TAVLTreeNode;
@ -844,10 +862,14 @@ begin
end;
function TStringToStringTree.CreateCopy(Src: PStringMapItem): PStringMapItem;
var
SrcItem: PStringToStringTreeItem absolute Src;
NewItem: PStringToStringTreeItem;
begin
New(Result);
Result^.Name:=Src^.Name;
Result^.Value:=Src^.Value;
New(NewItem);
NewItem^.Name:=SrcItem^.Name;
NewItem^.Value:=SrcItem^.Value;
Result:=PStringMapItem(NewItem);
end;
function TStringToStringTree.GetString(const Name: string; out Value: string
@ -883,22 +905,6 @@ begin
end;
end;
procedure TStringToStringTree.Assign(Source: TStringMap);
var
Node: TAVLTreeNode;
Item: PStringToStringTreeItem;
begin
if (Source=nil) or (Source.ClassType<>ClassType) then
raise Exception.Create('invalid class');
Clear;
Node:=Source.Tree.FindLowest;
while Node<>nil do begin
Item:=PStringToStringTreeItem(Node.Data);
Strings[Item^.Name]:=Item^.Value;
Node:=Source.Tree.FindSuccessor(Node);
end;
end;
procedure TStringToStringTree.WriteDebugReport;
var
Node: TAVLTreeNode;

2
components/codetools/codetree.pas
View File

@ -509,7 +509,7 @@ var
s: String;
NodeExt: TCodeTreeNodeExtension absolute NodeData;
begin
s:=PAnsistring(p)^;
s:=Ansistring(p);
Result:=CompareTextIgnoringSpace(s,NodeExt.Txt,false);
//debugln('CompareTxtWithCodeTreeNodeExt ',NodeExt.Txt,' ',s,' ',dbgs(Result));
end;

8
components/codetools/directorycacher.pas
View File

@ -269,7 +269,7 @@ type
end;
function CompareCTDirectoryCaches(Data1, Data2: Pointer): integer;
function ComparePAnsiStringAndDirectoryCache(Dir, Cache: Pointer): integer;
function CompareAnsiStringAndDirectoryCache(Dir, Cache: Pointer): integer;
function ComparePCharFirstCaseInsThenCase(Data1, Data2: Pointer): integer;
function ComparePCharCaseInsensitive(Data1, Data2: Pointer): integer;
@ -310,9 +310,9 @@ begin
TCTDirectoryCache(Data2).FDirectory);
end;
function ComparePAnsiStringAndDirectoryCache(Dir, Cache: Pointer): integer;
function CompareAnsiStringAndDirectoryCache(Dir, Cache: Pointer): integer;
begin
Result:=CompareFilenames(PAnsiString(Dir)^,TCTDirectoryCache(Cache).FDirectory);
Result:=CompareFilenames(AnsiString(Dir),TCTDirectoryCache(Cache).FDirectory);
end;
function ComparePCharFirstCaseInsThenCase(Data1, Data2: Pointer): integer;
@ -1398,7 +1398,7 @@ var
Dir: String;
begin
Dir:=AppendPathDelim(TrimFilename(Directory));
Node:=FDirectories.FindKey(@Dir,@ComparePAnsiStringAndDirectoryCache);
Node:=FDirectories.FindKey(@Dir,@CompareAnsiStringAndDirectoryCache);
if Node<>nil then begin
Result:=TCTDirectoryCache(Node.Data);
if DoReference then

20
components/lazutils/avglvltree.pas
View File

@ -358,9 +358,9 @@ type
end;
function CompareStringToStringItems(Data1, Data2: Pointer): integer;
function ComparePAnsiStringWithStrToStrItem(Key, Data: Pointer): Integer;
function CompareAnsiStringWithStrToStrItem(Key, Data: Pointer): Integer;
function CompareStringToStringItemsI(Data1, Data2: Pointer): integer;
function ComparePAnsiStringWithStrToStrItemI(Key, Data: Pointer): Integer;
function CompareAnsiStringWithStrToStrItemI(Key, Data: Pointer): Integer;
implementation
@ -396,14 +396,14 @@ begin
PStringMapItem(Data2)^.Name);
end;
function ComparePAnsiStringWithStrToStrItem(Key, Data: Pointer): Integer;
function CompareAnsiStringWithStrToStrItem(Key, Data: Pointer): Integer;
begin
Result:=CompareStr(PAnsiString(Key)^,PStringMapItem(Data)^.Name);
Result:=CompareStr(AnsiString(Key),PStringMapItem(Data)^.Name);
end;
function ComparePAnsiStringWithStrToStrItemI(Key, Data: Pointer): Integer;
function CompareAnsiStringWithStrToStrItemI(Key, Data: Pointer): Integer;
begin
Result:=CompareText(PAnsiString(Key)^,PStringMapItem(Data)^.Name);
Result:=CompareText(AnsiString(Key),PStringMapItem(Data)^.Name);
end;
function TStringToPointerTree.GetValues(const s: string): Pointer;
@ -1862,9 +1862,9 @@ end;
constructor TStringToStringTree.Create(CaseSensitive: boolean);
begin
if CaseSensitive then
Create(@CompareStringToStringItems,@ComparePAnsiStringWithStrToStrItem)
Create(@CompareStringToStringItems,@CompareAnsiStringWithStrToStrItem)
else
Create(@CompareStringToStringItemsI,@ComparePAnsiStringWithStrToStrItemI);
Create(@CompareStringToStringItemsI,@CompareAnsiStringWithStrToStrItemI);
end;
constructor TStringToStringTree.Create(const ACompareItems,
@ -2172,9 +2172,9 @@ end;
constructor TCustomStringMap.Create(TheCaseSensitive: boolean);
begin
if TheCaseSensitive then
Create(@CompareStringToStringItems,@ComparePAnsiStringWithStrToStrItem,true)
Create(@CompareStringToStringItems,@CompareAnsiStringWithStrToStrItem,true)
else
Create(@CompareStringToStringItemsI,@ComparePAnsiStringWithStrToStrItemI,false);
Create(@CompareStringToStringItemsI,@CompareAnsiStringWithStrToStrItemI,false);
end;
constructor TCustomStringMap.Create(const ACompareItems,