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

codetools: TStandardCodeTool.FindMissingUnits: dotted names

Browse Source 
git-svn-id: trunk@32118 -
This commit is contained in:
mattias 2011-08-30 16:09:21 +00:00
parent 5190b83a71
commit 8bdf7647bb
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/codetools/codetree.pas
View File

@ -80,7 +80,7 @@ const
ctnVarDefinition = 21;
ctnConstDefinition = 22;
ctnGlobalProperty = 23;
ctnUseUnit = 24;
ctnUseUnit = 24; // StartPos=unitname, EndPos=unitname+inFilename
ctnVarArgs = 25;
ctnClass = 30;

2
components/codetools/pascalparsertool.pas
View File

@ -1864,8 +1864,8 @@ begin
AtomIsIdentifier(true);
CreateChildNode;
CurNode.Desc:=ctnUseUnit;
CurNode.EndPos:=CurPos.EndPos;
repeat
CurNode.EndPos:=CurPos.EndPos;
ReadNextAtom;
if CurPos.Flag<>cafPoint then break;
ReadNextAtom;

33
components/codetools/stdcodetools.pas
View File

@ -129,7 +129,7 @@ type
function UsesSectionToUnitnames(UsesNode: TCodeTreeNode): TStrings;
function FindMissingUnits(var MissingUnits: TStrings; FixCase: boolean;
SearchImplementation: boolean;
SourceChangeCache: TSourceChangeCache): boolean; // ToDo: dotted
SourceChangeCache: TSourceChangeCache): boolean;
function CommentUnitsInUsesSections(MissingUnits: TStrings;
SourceChangeCache: TSourceChangeCache): boolean; // ToDo: dotted
function FindUnusedUnits(Units: TStrings): boolean; // ToDo: dotted
@ -1444,7 +1444,6 @@ function TStandardCodeTool.FindMissingUnits(var MissingUnits: TStrings;
function CheckUsesSection(UsesNode: TCodeTreeNode): boolean;
var
InAtom, UnitNameAtom: TAtomPosition;
OldUnitName: String;
OldInFilename: String;
AFilename: String;
@ -1453,20 +1452,15 @@ function TStandardCodeTool.FindMissingUnits(var MissingUnits: TStrings;
NewInFilename: String;
FromPos: LongInt;
ToPos: LongInt;
Node: TCodeTreeNode;
begin
if UsesNode=nil then exit(true);
if not CheckDirectoryCache then exit(false);
MoveCursorToUsesStart(UsesNode);
repeat
Node:=UsesNode.FirstChild;
while Node<>nil do begin
// read next unit name
ReadNextUsedUnit(UnitNameAtom, InAtom);
OldUnitName:=GetAtom(UnitNameAtom);
if InAtom.StartPos>0 then
OldInFilename:=copy(Src,InAtom.StartPos+1,
InAtom.EndPos-InAtom.StartPos-2)
else
OldInFilename:='';
OldUnitName:=ExtractUsedUnitName(Node,@OldInFilename);
// find unit file
NewUnitName:=OldUnitName;
NewInFilename:=OldInFilename;
@ -1481,11 +1475,8 @@ function TStandardCodeTool.FindMissingUnits(var MissingUnits: TStrings;
and ((NewUnitName<>OldUnitName) or (NewInFilename<>OldInFilename)) then
begin
// fix case
FromPos:=UnitNameAtom.StartPos;
if InAtom.StartPos>0 then
ToPos:=InAtom.EndPos
else
ToPos:=UnitNameAtom.EndPos;
FromPos:=Node.StartPos;
ToPos:=Node.EndPos;
SourceChangeCache.Replace(gtNone,gtNone,FromPos,ToPos,s);
DebugLn('CheckUsesSection fix case Unit Name(',OldUnitName,'->',NewUnitName,') InFile(',OldInFilename,'->',NewInFilename,')');
end;
@ -1494,14 +1485,8 @@ function TStandardCodeTool.FindMissingUnits(var MissingUnits: TStrings;
if MissingUnits=nil then MissingUnits:=TStringList.Create;
MissingUnits.Add(s);
end;
if CurPos.Flag=cafComma then begin
// read next unit name
ReadNextAtom;
end else if CurPos.Flag=cafSemicolon then begin
break;
end else
RaiseExceptionFmt(ctsStrExpectedButAtomFound,[';',GetAtom]);
until false;
Node:=Node.NextBrother;
end;
Result:=true;
end;