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

codetools: linkscannr: updateneeded if StoreDirectives changed to true

Browse Source 
git-svn-id: trunk@41124 -
This commit is contained in:
mattias 2013-05-11 08:21:06 +00:00
parent 48d579b7f0
commit 495e85b016
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/codetools/linkscanner.pas
View File

@ -387,6 +387,7 @@ type
FDirectivesCapacity: integer; FDirectivesCapacity: integer;
FDirectivesSorted: PPLSDirective; // array of PLSDirective to items of FDirectives FDirectivesSorted: PPLSDirective; // array of PLSDirective to items of FDirectives
FDirectiveName: shortstring; FDirectiveName: shortstring;
FDirectivesStored: boolean;
FMacrosOn: boolean; FMacrosOn: boolean;
FMissingIncludeFiles: TMissingIncludeFiles; FMissingIncludeFiles: TMissingIncludeFiles;
FIncludeStack: TFPList; // list of TSourceLink FIncludeStack: TFPList; // list of TSourceLink
@ -512,7 +513,8 @@ type
property DirectivesSorted[Index: integer]: PLSDirective read GetDirectivesSorted; // sorted for Code and SrcPos property DirectivesSorted[Index: integer]: PLSDirective read GetDirectivesSorted; // sorted for Code and SrcPos
property DirectiveCount: integer read FDirectivesCount; property DirectiveCount: integer read FDirectivesCount;
procedure ClearDirectives(FreeMemory: boolean); procedure ClearDirectives(FreeMemory: boolean);
property StoreDirectives: boolean read FStoreDirectives write SetStoreDirectives; property StoreDirectives: boolean read FStoreDirectives write SetStoreDirectives; // store directives on next Scan
property DirectivesStored: boolean read FDirectivesStored; // directives were stored on last scan
function FindDirective(aCode: Pointer; aSrcPos: integer; function FindDirective(aCode: Pointer; aSrcPos: integer;
out FirstSortedIndex, LastSortedIndex: integer): boolean; out FirstSortedIndex, LastSortedIndex: integer): boolean;
@ -1647,6 +1649,7 @@ begin
FNestedComments:=cmsNested_comment in DefaultCompilerModeSwitches[CompilerMode]; FNestedComments:=cmsNested_comment in DefaultCompilerModeSwitches[CompilerMode];
IfLevel:=0; IfLevel:=0;
FSkippingDirectives:=lssdNone; FSkippingDirectives:=lssdNone;
FDirectivesStored:=StoreDirectives;
//DebugLn('TLinkScanner.Scan D --------'); //DebugLn('TLinkScanner.Scan D --------');
// initialize Defines // initialize Defines
@ -2096,6 +2099,9 @@ begin
if CheckFilesOnDisk then FGlobalSourcesChangeStep:=CurFilesChangeStep; if CheckFilesOnDisk then FGlobalSourcesChangeStep:=CurFilesChangeStep;
end; end;
// check options
if StoreDirectives and (not DirectivesStored) then exit;
// check initvalues // check initvalues
if Assigned(FOnGetInitValues) then begin if Assigned(FOnGetInitValues) then begin
NewInitValues:=FOnGetInitValues(Code,NewInitValuesChangeStep); NewInitValues:=FOnGetInitValues(Code,NewInitValuesChangeStep);