paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-26 20:23:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: parse project default namespace

Browse Source 
git-svn-id: trunk@54767 -
This commit is contained in:
mattias 2017-04-28 22:27:06 +00:00
parent 0401160d0d
commit 08bd7d6206
3 changed files with 147 additions and 17 deletions

118
components/codetools/basiccodetools.pas
View File

@ -287,7 +287,13 @@ var
// source type
function FindSourceType(const Source: string;
var SrcNameStart, SrcNameEnd: integer): string;
var SrcNameStart, SrcNameEnd: integer; NestedComments: boolean = false): string;
// identifier
function ReadDottedIdentifier(const Source: string; var Position: integer;
NestedComments: boolean = false): string;
function ReadDottedIdentifier(var Position: PChar; SrcEnd: PChar;
NestedComments: boolean = false): string;
// program name
function RenameProgramInSource(Source:TSourceLog;
@ -298,7 +304,10 @@ function FindProgramNameInSource(const Source:string;
// unit name
function RenameUnitInSource(Source:TSourceLog;const NewUnitName:string):boolean;
function FindUnitNameInSource(const Source:string;
var UnitNameStart,UnitNameEnd:integer):string;
out UnitNameStart,UnitNameEnd: integer; NestedComments: boolean = false):string;
function FindModuleNameInSource(const Source:string;
out ModuleType: string; out NameStart,NameEnd: integer;
NestedComments: boolean = false):string;
// uses sections
function UnitIsUsedInSource(const Source,SrcUnitName:string):boolean;
@ -495,15 +504,38 @@ begin
Result:=false;
end;
function FindSourceType(const Source: string;
var SrcNameStart, SrcNameEnd: integer): string;
function FindSourceType(const Source: string; var SrcNameStart,
SrcNameEnd: integer; NestedComments: boolean): string;
var
u: String;
p, AtomStart: Integer;
begin
// read first atom for type
SrcNameEnd:=1;
Result:=ReadNextPascalAtom(Source,SrcNameEnd,SrcNameStart);
// read second atom for name
if Result<>'' then
ReadNextPascalAtom(Source,SrcNameEnd,SrcNameStart);
SrcNameStart:=0;
SrcNameEnd:=0;
p:=1;
Result:=ReadNextPascalAtom(Source,p,AtomStart,NestedComments);
u:=Uppercase(Result);
if (u='UNIT') or (u='PROGRAM') or (u='LIBRARY') or (u='PACKAGE') then begin
// read name
ReadNextPascalAtom(Source,p,AtomStart,NestedComments);
if p<=AtomStart then exit;
if not IsIdentStartChar[Source[AtomStart]] then exit;
SrcNameStart:=AtomStart;
SrcNameEnd:=p;
repeat
ReadRawNextPascalAtom(Source,p,AtomStart,NestedComments);
if (AtomStart=p+1) and (Source[AtomStart]='.') then begin
ReadRawNextPascalAtom(Source,p,AtomStart,NestedComments);
if p<=AtomStart then exit;
if not IsIdentStartChar[Source[AtomStart]] then exit;
SrcNameEnd:=p;
end else
break;
until false;
end else begin
Result:='';
end;
end;
function RenameUnitInSource(Source:TSourceLog;const NewUnitName:string):boolean;
@ -516,15 +548,73 @@ begin
Source.Replace(UnitNameStart,UnitNameEnd-UnitNameStart,NewUnitName);
end;
function FindUnitNameInSource(const Source:string;
var UnitNameStart,UnitNameEnd:integer):string;
function FindUnitNameInSource(const Source: string; out UnitNameStart,
UnitNameEnd: integer; NestedComments: boolean): string;
var
ModuleType: string;
begin
if uppercasestr(FindSourceType(Source,UnitNameStart,UnitNameEnd))='UNIT' then
Result:=copy(Source,UnitNameStart,UnitNameEnd-UnitNameStart)
else
Result:=FindModuleNameInSource(Source,ModuleType,UnitNameStart,UnitNameEnd,NestedComments);
if CompareText(ModuleType,'UNIT')<>0 then
Result:='';
end;
function FindModuleNameInSource(const Source: string; out ModuleType: string;
out NameStart, NameEnd: integer; NestedComments: boolean): string;
var
u: String;
p, AtomStart: Integer;
begin
// read first atom for type
Result:='';
NameStart:=0;
NameEnd:=0;
p:=1;
ModuleType:=ReadNextPascalAtom(Source,p,AtomStart,NestedComments);
u:=UpperCase(ModuleType);
if (u='UNIT') or (u='PROGRAM') or (u='LIBRARY') or (u='PACKAGE') then begin
// read name
ReadNextPascalAtom(Source,p,AtomStart,NestedComments);
if p<=AtomStart then exit;
if not IsIdentStartChar[Source[AtomStart]] then exit;
NameStart:=AtomStart;
NameEnd:=AtomStart;
Result:=ReadDottedIdentifier(Source,NameEnd,NestedComments);
end else
ModuleType:='';
end;
function ReadDottedIdentifier(const Source: string; var Position: integer;
NestedComments: boolean): string;
var
p: PChar;
begin
if (Position<1) or (Position>length(Source)) then exit('');
p:=@Source[Position];
Result:=ReadDottedIdentifier(p,PChar(Source)+length(Source),NestedComments);
Position:=p-PChar(Source)+1;
end;
function ReadDottedIdentifier(var Position: PChar; SrcEnd: PChar;
NestedComments: boolean): string;
var
AtomStart, p: PChar;
begin
Result:='';
p:=Position;
ReadRawNextPascalAtom(p,AtomStart,SrcEnd,NestedComments);
Position:=AtomStart;
if (AtomStart>=p) or not IsIdentStartChar[AtomStart^] then exit;
Result:=GetIdentifier(AtomStart);
repeat
ReadRawNextPascalAtom(p,AtomStart,SrcEnd,NestedComments);
if (AtomStart+1<>p) or (AtomStart^<>'.') then exit;
ReadRawNextPascalAtom(p,AtomStart,SrcEnd,NestedComments);
if (AtomStart>=p) or not IsIdentStartChar[AtomStart^] then exit;
Position:=AtomStart;
Result:=Result+'.'+GetIdentifier(AtomStart);
until false;
end;
function RenameProgramInSource(Source: TSourceLog;
const NewProgramName:string):boolean;
var ProgramNameStart,ProgramNameEnd:integer;

2
components/lazutils/lazutilities.pas
View File

@ -152,7 +152,7 @@ begin
if b<>'' then
Result:=a+Delimiter+b
else
Result:=b;
Result:=a;
end else
Result:=b;
end;

44
ide/buildmanager.pas
View File

@ -43,6 +43,7 @@ uses
FileProcs, CodeToolsCfgScript,
// LazUtils
LConvEncoding, FileUtil, LazFileUtils, LazFileCache, LazUTF8, Laz2_XMLCfg,
LazUtilities,
// IDEIntf
IDEOptionsIntf, ProjectIntf, MacroIntf, IDEDialogs, IDEExternToolIntf,
CompOptsIntf, LazIDEIntf, MacroDefIntf, IDEMsgIntf,
@ -64,6 +65,9 @@ type
fBuildLazExtraOptions: string; // last build lazarus extra options
FUnitSetChangeStamp: integer;
FFPCSrcScans: TFPCSrcScans;
FProjectNameSpace: string;
FProjectNameSpaceCode: TCodeBuffer;
FProjectNameSpaceCodeChgStep: integer;
// Macro FPCVer
FFPCVer: string;
FFPC_FULLVERSION: integer;
@ -155,6 +159,7 @@ type
function CTMacroFuncProjectSrcPath(Data: Pointer): boolean;
procedure OnProjectDestroy(Sender: TObject);
procedure SetUnitSetCache(const AValue: TFPCUnitSetCache);
function GetProjectDefaultNamespace: string; // read .lpr file
protected
// command line overrides
OverrideTargetOS: string;
@ -2223,7 +2228,10 @@ function TBuildManager.MacroFuncProjNamespaces(const Param: string;
const Data: PtrInt; var Abort: boolean): string;
begin
if Project1<>nil then
Result:=Project1.CompilerOptions.GetNamespacesParsed()
begin
Result:=MergeWithDelimiter(GetProjectDefaultNamespace,
Project1.CompilerOptions.GetNamespacesParsed,';');
end
else
Result:='';
end;
@ -2285,7 +2293,8 @@ begin
FuncData:=PReadFunctionData(Data);
Result:=false;
if Project1<>nil then begin
FuncData^.Result:=Project1.CompilerOptions.GetNamespacesParsed();
FuncData^.Result:=MergeWithDelimiter(GetProjectDefaultNamespace,
Project1.CompilerOptions.GetNamespacesParsed(),';');
Result:=true;
end;
end;
@ -2337,6 +2346,37 @@ begin
end;
end;
function TBuildManager.GetProjectDefaultNamespace: string;
// called by codetools *before* parsing
// Important: use only basiccodetools
var
AnUnitInfo: TUnitInfo;
NameStart, NameEnd: Integer;
Code: TCodeBuffer;
ModuleType, ModuleName: string;
NestedComments: boolean;
begin
Result:='';
if Project1=nil then exit;
if not (pfMainUnitIsPascalSource in Project1.Flags) then exit;
AnUnitInfo:=Project1.MainUnitInfo;
if AnUnitInfo=nil then exit;
Code:=AnUnitInfo.Source;
if Code=nil then exit;
if (Code<>FProjectNameSpaceCode) or (Code.ChangeStep<>FProjectNameSpaceCodeChgStep) then
begin
// read namespace
FProjectNameSpace:='';
FProjectNameSpaceCode:=Code;
FProjectNameSpaceCodeChgStep:=Code.ChangeStep;
NestedComments:=CompareText(Project1.CompilerOptions.SyntaxMode,'delphi')<>0;
ModuleName:=FindModuleNameInSource(Code.Source,ModuleType,NameStart,
NameEnd,NestedComments);
FProjectNameSpace:=ChompDottedIdentifier(ModuleName);
end;
Result:=FProjectNameSpace;
end;
procedure TBuildManager.Notification(AComponent: TComponent;
Operation: TOperation);
begin