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

codetools: use namespaces only for pas2js and fpc>30101

Browse Source 
git-svn-id: trunk@54769 -
This commit is contained in:
mattias 2017-04-28 22:39:47 +00:00
parent 08bd7d6206
commit f915aac0c7
1 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
components/codetools/codetoolmanager.pas
View File

@ -1669,55 +1669,24 @@ procedure TCodeToolManager.GetFPCVersionForDirectory(const Directory: string;
out FPCVersion, FPCRelease, FPCPatch: integer); out FPCVersion, FPCRelease, FPCPatch: integer);
var var
Evaluator: TExpressionEvaluator; Evaluator: TExpressionEvaluator;
i: Integer; FPCFullVersion: LongInt;
VarName: String;
p: Integer;
function ReadInt(var AnInteger: integer): boolean;
var
StartPos: Integer;
begin
StartPos:=p;
AnInteger:=0;
while (p<=length(VarName)) and (VarName[p] in ['0'..'9']) do begin
AnInteger:=AnInteger*10+(ord(VarName[p])-ord('0'));
if AnInteger>=100 then begin
Result:=false;
exit;
end;
inc(p);
end;
Result:=StartPos<p;
end;
begin begin
FPCVersion:=0; FPCVersion:=0;
FPCRelease:=0; FPCRelease:=0;
FPCPatch:=0; FPCPatch:=0;
Evaluator:=DefineTree.GetDefinesForDirectory(Directory,true); Evaluator:=DefineTree.GetDefinesForDirectory(Directory,true);
if Evaluator=nil then exit; if Evaluator=nil then exit;
for i:=0 to Evaluator.Count-1 do begin FPCFullVersion:=StrToIntDef(Evaluator['FPC_FULLVERSION'],0);
VarName:=Evaluator.Names(i); FPCVersion:=FPCFullVersion div 10000;
if (length(VarName)>3) and (VarName[1] in ['V','v']) FPCRelease:=(FPCFullVersion div 100) mod 100;
and (VarName[2] in ['E','e']) and (VarName[3] in ['R','r']) FPCPatch:=FPCFullVersion mod 100;
and (VarName[4] in ['0'..'9']) then begin
p:=4;
if not ReadInt(FPCVersion) then continue;
if (p>=length(VarName)) or (VarName[p]<>'_') then continue;
inc(p);
if not ReadInt(FPCRelease) then continue;
if (p>=length(VarName)) or (VarName[p]<>'_') then continue;
inc(p);
if not ReadInt(FPCPatch) then continue;
exit;
end;
end;
end; end;
function TCodeToolManager.GetNamespacesForDirectory(const Directory: string; function TCodeToolManager.GetNamespacesForDirectory(const Directory: string;
UseCache: boolean): string; UseCache: boolean): string;
var var
Evaluator: TExpressionEvaluator; Evaluator: TExpressionEvaluator;
FPCFullVersion: LongInt;
begin begin
if UseCache then begin if UseCache then begin
Result:=DirectoryCachePool.GetString(Directory,ctdcsNamespaces,true) Result:=DirectoryCachePool.GetString(Directory,ctdcsNamespaces,true)
@ -1725,7 +1694,13 @@ begin
Result:=''; Result:='';
Evaluator:=DefineTree.GetDefinesForDirectory(Directory,true); Evaluator:=DefineTree.GetDefinesForDirectory(Directory,true);
if Evaluator=nil then exit; if Evaluator=nil then exit;
Result:=Evaluator[NamespacesMacroName]; if Evaluator.IsDefined('PAS2JS') then
Result:=Evaluator[NamespacesMacroName]
else begin
FPCFullVersion:=StrToIntDef(Evaluator['FPC_FULLVERSION'],0);
if FPCFullVersion>30101 then
Result:=Evaluator[NamespacesMacroName];
end;
end; end;
end; end;