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

codetools: changed TDefinePool.ChangeStep to integer

Browse Source 
git-svn-id: trunk@29800 -
This commit is contained in:
mattias 2011-03-11 22:44:22 +00:00
parent feef4913b3
commit 160a97f228
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/codetools/codetoolmanager.pas
View File

@ -147,8 +147,8 @@ type
Code: TCodeBuffer; GoToMainCode: boolean): TFindDeclarationTool; Code: TCodeBuffer; GoToMainCode: boolean): TFindDeclarationTool;
function OnGetDirectoryCache(const ADirectory: string): TCTDirectoryCache; function OnGetDirectoryCache(const ADirectory: string): TCTDirectoryCache;
procedure OnToolSetWriteLock(Lock: boolean); procedure OnToolSetWriteLock(Lock: boolean);
procedure OnToolGetChangeSteps(out SourcesChangeStep, FilesChangeStep, procedure OnToolGetChangeSteps(out SourcesChangeStep, FilesChangeStep: int64;
InitValuesChangeStep: int64); out InitValuesChangeStep: integer);
function OnParserProgress(Tool: TCustomCodeTool): boolean; function OnParserProgress(Tool: TCustomCodeTool): boolean;
procedure OnToolTreeChange(Tool: TCustomCodeTool; NodesDeleting: boolean); procedure OnToolTreeChange(Tool: TCustomCodeTool; NodesDeleting: boolean);
function OnScannerProgress(Sender: TLinkScanner): boolean; function OnScannerProgress(Sender: TLinkScanner): boolean;
@ -5324,7 +5324,7 @@ begin
end; end;
procedure TCodeToolManager.OnToolGetChangeSteps(out SourcesChangeStep, procedure TCodeToolManager.OnToolGetChangeSteps(out SourcesChangeStep,
FilesChangeStep, InitValuesChangeStep: int64); FilesChangeStep: int64; out InitValuesChangeStep: integer);
begin begin
SourcesChangeStep:=SourceCache.ChangeStamp; SourcesChangeStep:=SourceCache.ChangeStamp;
FilesChangeStep:=FileStateCache.TimeStamp; FilesChangeStep:=FileStateCache.TimeStamp;

8
components/codetools/definetemplates.pas
View File

@ -377,7 +377,7 @@ type
FFirstDefineTemplate: TDefineTemplate; FFirstDefineTemplate: TDefineTemplate;
FCache: TAVLTree; // tree of TDirectoryDefines FCache: TAVLTree; // tree of TDirectoryDefines
FDefineStrings: TStringTree; FDefineStrings: TStringTree;
FChangeStep: int64; FChangeStep: integer;
FErrorDescription: string; FErrorDescription: string;
FErrorTemplate: TDefineTemplate; FErrorTemplate: TDefineTemplate;
FMacroFunctions: TKeyWordFunctionList; FMacroFunctions: TKeyWordFunctionList;
@ -406,7 +406,7 @@ type
public public
property RootTemplate: TDefineTemplate property RootTemplate: TDefineTemplate
read FFirstDefineTemplate write FFirstDefineTemplate; read FFirstDefineTemplate write FFirstDefineTemplate;
property ChangeStep: int64 read FChangeStep; property ChangeStep: integer read FChangeStep;
property ErrorTemplate: TDefineTemplate read FErrorTemplate; property ErrorTemplate: TDefineTemplate read FErrorTemplate;
property ErrorDescription: string read FErrorDescription; property ErrorDescription: string read FErrorDescription;
property OnGetVirtualDirectoryAlias: TOnGetVirtualDirectoryAlias property OnGetVirtualDirectoryAlias: TOnGetVirtualDirectoryAlias
@ -3710,7 +3710,7 @@ end;
constructor TDefineTree.Create; constructor TDefineTree.Create;
begin begin
inherited Create; inherited Create;
FChangeStep:=CTInvalidChangeStamp64; FChangeStep:=CTInvalidChangeStamp;
FFirstDefineTemplate:=nil; FFirstDefineTemplate:=nil;
FCache:=TAVLTree.Create(@CompareDirectoryDefines); FCache:=TAVLTree.Create(@CompareDirectoryDefines);
FDefineStrings:=TStringTree.Create; FDefineStrings:=TStringTree.Create;
@ -4425,7 +4425,7 @@ end;
procedure TDefineTree.IncreaseChangeStep; procedure TDefineTree.IncreaseChangeStep;
begin begin
CTIncreaseChangeStamp64(FChangeStep); CTIncreaseChangeStamp(FChangeStep);
if DirectoryCachePool<>nil then DirectoryCachePool.IncreaseConfigTimeStamp; if DirectoryCachePool<>nil then DirectoryCachePool.IncreaseConfigTimeStamp;
end; end;

8
components/codetools/finddeclarationtool.pas
View File

@ -579,7 +579,8 @@ type
FDependsOnCodeTools: TAVLTree;// the codetools, that this codetool depends on FDependsOnCodeTools: TAVLTree;// the codetools, that this codetool depends on
FClearingDependentNodeCaches: boolean; FClearingDependentNodeCaches: boolean;
FCheckingNodeCacheDependencies: boolean; FCheckingNodeCacheDependencies: boolean;
FSourcesChangeStep, FFilesChangeStep, FInitValuesChangeStep: int64; FSourcesChangeStep, FFilesChangeStep: int64;
FInitValuesChangeStep: integer;
{$IFDEF DebugPrefix} {$IFDEF DebugPrefix}
DebugPrefix: string; DebugPrefix: string;
procedure IncPrefix; procedure IncPrefix;
@ -8802,7 +8803,7 @@ begin
inherited Create; inherited Create;
FSourcesChangeStep:=CTInvalidChangeStamp64; FSourcesChangeStep:=CTInvalidChangeStamp64;
FFilesChangeStep:=CTInvalidChangeStamp64; FFilesChangeStep:=CTInvalidChangeStamp64;
FInitValuesChangeStep:=CTInvalidChangeStamp64; FInitValuesChangeStep:=CTInvalidChangeStamp;
end; end;
procedure TFindDeclarationTool.DoDeleteNodes(StartNode: TCodeTreeNode); procedure TFindDeclarationTool.DoDeleteNodes(StartNode: TCodeTreeNode);
@ -8821,7 +8822,8 @@ var
ANode: TAVLTreeNode; ANode: TAVLTreeNode;
ATool: TFindDeclarationTool; ATool: TFindDeclarationTool;
FreeCheckedTools: Boolean; FreeCheckedTools: Boolean;
SourcesChangeStep, FilesChangeStep, InitValuesChangeStep: int64; SourcesChangeStep, FilesChangeStep: int64;
InitValuesChangeStep: integer;
begin begin
Result:=false; Result:=false;
//debugln(['TFindDeclarationTool.CheckDependsOnNodeCaches ',MainFilename,' FDependsOnCodeTools=',FDependsOnCodeTools]); //debugln(['TFindDeclarationTool.CheckDependsOnNodeCaches ',MainFilename,' FDependsOnCodeTools=',FDependsOnCodeTools]);

9
components/codetools/linkscanner.pas
View File

@ -82,8 +82,8 @@ type
out ChangeStep: integer): TExpressionEvaluator of object; out ChangeStep: integer): TExpressionEvaluator of object;
TOnIncludeCode = procedure(ParentCode, IncludeCode: Pointer) of object; TOnIncludeCode = procedure(ParentCode, IncludeCode: Pointer) of object;
TOnSetWriteLock = procedure(Lock: boolean) of object; TOnSetWriteLock = procedure(Lock: boolean) of object;
TLSOnGetGlobalChangeSteps = procedure(out SourcesChangeStep, FilesChangeStep, TLSOnGetGlobalChangeSteps = procedure(out SourcesChangeStep, FilesChangeStep: int64;
InitValuesChangeStep: int64) of object; out InitValuesChangeStep: integer) of object;
{ TSourceLink is used to map between the codefiles and the cleaned source } { TSourceLink is used to map between the codefiles and the cleaned source }
PSourceLink = ^TSourceLink; PSourceLink = ^TSourceLink;
@ -268,7 +268,7 @@ type
FOnSetGlobalWriteLock: TOnSetWriteLock; FOnSetGlobalWriteLock: TOnSetWriteLock;
FGlobalSourcesChangeStep: int64; FGlobalSourcesChangeStep: int64;
FGlobalFilesChangeStep: int64; FGlobalFilesChangeStep: int64;
FGlobalInitValuesChangeStep: int64; FGlobalInitValuesChangeStep: integer;
function GetLinks(Index: integer): TSourceLink; function GetLinks(Index: integer): TSourceLink;
procedure SetLinks(Index: integer; const Value: TSourceLink); procedure SetLinks(Index: integer; const Value: TSourceLink);
procedure SetSource(ACode: Pointer); // set current source procedure SetSource(ACode: Pointer); // set current source
@ -1639,7 +1639,8 @@ var i: integer;
NewInitValues: TExpressionEvaluator; NewInitValues: TExpressionEvaluator;
NewInitValuesChangeStep: integer; NewInitValuesChangeStep: integer;
SrcChange: PSourceChangeStep; SrcChange: PSourceChangeStep;
CurSourcesChangeStep, CurFilesChangeStep, CurInitValuesChangeStep: int64; CurSourcesChangeStep, CurFilesChangeStep: int64;
CurInitValuesChangeStep: integer;
begin begin
Result:=true; Result:=true;