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

codetools: find declaration of dotted program name

Browse Source 
git-svn-id: branches/fixes_1_8@55852 -
This commit is contained in:
mattias 2017-09-13 18:06:19 +00:00
parent d1fa8908c2
commit 820a9b860c
5 changed files with 77 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/codetree.pas
View File

@ -58,7 +58,7 @@ const
// CodeTreeNodeDescriptors
ctnNone = 0;
ctnProgram = 1;
ctnProgram = 1; // children are ctnInterface, each namespace and sourcename
ctnPackage = 2;
ctnLibrary = 3;
ctnUnit = 4;

67
components/codetools/finddeclarationtool.pas
View File

@ -8951,8 +8951,10 @@ var
function ResolveUseUnit(StartUseUnitNode: TCodeTreeNode): TCodeTreeNode;
// IsStart=true, NextAtomType=vatPoint,
// StartUseUnitNameNode.Desc=ctnUseUnit
// -> Find the longest namespaced used unit, that fits the start of the
// -> Find the longest namespaced used unit (ctnUseUnitNamespace,ctnUseUnitClearName)
// or the source name (ctnIdentifier), that fits the start of the
// current identifier a.b.c...
//
function GetPrevUseUnit(UseUnitNode: TCodeTreeNode): TCodeTreeNode;
begin
@ -9012,7 +9014,7 @@ var
until CurPos.Flag<>cafPoint;
//debugln(['ResolveUsenit DottedIdentifier="',DottedIdentifier,'"']);
// find longest dotted unit name in uses
// find longest dotted unit name in uses and source name
UseUnitNode:=StartUseUnitNode;
BestNode:=nil;
BestLevel:=0;
@ -9022,13 +9024,13 @@ var
if (Node<>nil)
and CompareSrcIdentifiers(CurAtom.StartPos,Node.StartPos) then begin
// found candidate
//debugln(['ResolveUsenit Candidate=',ExtractNode(Node,[])]);
//debugln(['ResolveUseUnit Candidate=',ExtractNode(Node,[])]);
Level:=1;
p:=PChar(DottedIdentifier);
repeat
inc(p,GetIdentLen(p));
if p^='.' then inc(p);
//writeln('ResolveUsenit p=',p,' NextBrother=',Node.NextBrother<>nil);
//writeln('ResolveUseUnit p=',p,' NextBrother=',Node.NextBrother<>nil);
if Node.NextBrother=nil then begin
// fits
if Level>BestLevel then begin
@ -9041,7 +9043,7 @@ var
break;
end else begin
Node:=Node.NextBrother;
//writeln('ResolveUsenit p=',p,' node=',GetIdentifier(@Src[Node.StartPos]));
//writeln('ResolveUseUnit p=',p,' node=',GetIdentifier(@Src[Node.StartPos]));
if not CompareSrcIdentifiers(Node.StartPos,p) then
break;
inc(Level);
@ -9049,10 +9051,61 @@ var
until false;
end;
until UseUnitNode=nil;
//debugln(['ResolveUsenit collected candidates Best=',ExtractNode(BestNode,[])]);
//debugln(['ResolveUseUnit collected candidates Best=',ExtractNode(BestNode,[])]);
Result:=BestNode.FirstChild;
//debugln(['ResolveUseUnit Src=',Tree.Root.DescAsString,' Name=',GetSourceName(false),' DottedIdentifier="',DottedIdentifier,'"']);
// check source name
if (Tree.Root.Desc in AllSourceTypes)
and (Tree.Root.FirstChild<>nil)
and CompareSrcIdentifiers(Tree.Root.FirstChild.StartPos,PChar(DottedIdentifier))
then begin
// found candidate
Level:=1;
Node:=Tree.Root.FirstChild;
//debugln(['ResolveUseUnit Candidate SrcName']);
p:=PChar(DottedIdentifier);
repeat
//debugln('ResolveUseUnit SrcName p=',p,' Node=',ExtractNode(Node,[]));
if (Node.NextBrother=nil) or (Node.NextBrother.Desc<>ctnIdentifier) then begin
// fits
//debugln(['ResolveUseUnit FITS Level=',Level,' Best=',BestLevel]);
if Level>BestLevel then begin
// source name fits best
Result:=Tree.Root.FirstChild;
// move cursor forward
while (Result.NextBrother<>nil)
and (NextAtom.EndPos<EndPos) do begin
if (Result.NextBrother.Desc<>ctnIdentifier) then
exit(Tree.Root);
ReadNextExpressionAtom; // read point
ReadNextExpressionAtom; // read namespace/unitname
//debugln(['ResolveUseUnit Next ',GetAtom(CurAtom)]);
Result:=Result.NextBrother;
end;
exit;
//debugln(['ResolveUseUnit SrcName fits better']);
end;
break;
end else if p^=#0 then begin
// source name too long
break;
end else begin
Node:=Node.NextBrother;
inc(p,GetIdentLen(p));
if p^='.' then inc(p);
//debugln('ResolveUseUnit SrcName NEXT p=',p,' Node=',ExtractNode(Node,[]));
if not CompareSrcIdentifiers(Node.StartPos,p) then
break;
inc(Level);
end;
until false;
end;
Result:=BestNode;
if Result=nil then exit;
// Result is now a ctnUseUnit
Result:=Result.FirstChild;
// move cursor forward
while (Result.NextBrother<>nil) and (NextAtom.EndPos<EndPos) do begin
ReadNextExpressionAtom; // read point

10
components/codetools/linkscanner.pas
View File

@ -1254,10 +1254,12 @@ begin
exit(false);
repeat
// read unit name
ReadNextToken;
if (TokenType<>lsttWord)
or WordIsKeyWord.DoItCaseInsensitive(@Src[SrcPos]) then exit(false);
ReadNextToken;
repeat
ReadNextToken;
if (TokenType<>lsttWord)
or WordIsKeyWord.DoItCaseInsensitive(@Src[SrcPos]) then exit(false);
ReadNextToken;
until TokenType<>lsttPoint;
if TokenIs('in') then begin
// read "in" filename
ReadNextToken;

10
components/codetools/pascalparsertool.pas
View File

@ -690,6 +690,10 @@ begin
if (CurPos.Flag<>cafWord)
or (CurSection in [ctnUnit,ctnPackage]) then
AtomIsIdentifierSaveE;
CreateChildNode;
CurNode.Desc:=ctnIdentifier;
CurNode.EndPos:=CurPos.EndPos;
EndChildNode;
aName:=GetAtom;
ReadNextAtom; // read ';' (or 'platform;' or 'unimplemented;')
if CurPos.Flag=cafPoint then begin
@ -2093,8 +2097,10 @@ begin
EndChildNode;
if CurPos.Flag=cafSemicolon then break;
if CurPos.Flag<>cafComma then
if ExceptionOnError then
SaveRaiseCharExpectedButAtomFound(20170421195538,';')
if ExceptionOnError then begin
CTDumpStack;
SaveRaiseCharExpectedButAtomFound(20170421195538,';');
end
else exit;
until (CurPos.StartPos>SrcLen);
CurNode.EndPos:=CurPos.EndPos;

2
components/codetools/tests/laztests/unitdots.dot.pas
View File

@ -4,6 +4,8 @@ unit unitdots.dot;
interface
type
TColor = longint;
var
test: integer;
foo: integer;