paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-31 10:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fixed TIdentifierList.FindIdentifier searching identifier that is not a proc

Browse Source 
git-svn-id: trunk@41261 -
This commit is contained in:
mattias 2013-05-18 21:18:44 +00:00
parent 4491daff55
commit 62f6dfef9d
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
components/codetools/identcompletiontool.pas
View File

@ -716,20 +716,37 @@ end;
function TIdentifierList.FindIdentifier(Identifier: PChar): TIdentifierListItem;
var
AVLNode: TAVLTreeNode;
StartNode: TAVLTreeNode;
begin
Result:=nil;
FIdentSearchItem.Identifier:=Identifier;
// ignore ParamList (for checking function overloading)
AVLNode:=FIdentView.FindLeftMostKey(FIdentSearchItem,
@CompareIdentListSearchWithItemsWithoutParams);
while (AVLNode<>nil)
and not (TIdentifierListItem(AVLNode.Data).GetDesc in [ctnProcedure,ctnProcedureHead])
and (CompareIdentifiers(Identifier,PChar(TIdentifierListItem(AVLNode.Data).Identifier))=0)
do
StartNode:=FIdentView.FindKey(FIdentSearchItem,@CompareIdentListSearchWithItemsWithoutParams);
if StartNode=nil then exit;
if not (TIdentifierListItem(StartNode.Data).GetDesc in [ctnProcedure,ctnProcedureHead])
then
exit(TIdentifierListItem(StartNode.Data));
// identifier is a proc, find the same identifier that is not a proc
AVLNode:=StartNode;
repeat
AVLNode:=FIdentView.FindSuccessor(AVLNode);
if AVLNode<>nil then
Result:=TIdentifierListItem(AVLNode.Data)
else
Result:=nil;
if (AVLNode=nil)
or (CompareIdentifiers(Identifier,PChar(TIdentifierListItem(AVLNode.Data).Identifier))<>0)
then break;
if not (TIdentifierListItem(AVLNode.Data).GetDesc in [ctnProcedure,ctnProcedureHead])
then
exit(TIdentifierListItem(AVLNode.Data));
until false;
AVLNode:=StartNode;
repeat
AVLNode:=FIdentView.FindPrecessor(AVLNode);
if (AVLNode=nil)
or (CompareIdentifiers(Identifier,PChar(TIdentifierListItem(AVLNode.Data).Identifier))<>0)
then break;
if not (TIdentifierListItem(AVLNode.Data).GetDesc in [ctnProcedure,ctnProcedureHead])
then
exit(TIdentifierListItem(AVLNode.Data));
until false;
end;
function TIdentifierList.FindCreatedIdentifier(const Ident: string): integer;