Formatting

git-svn-id: trunk@52529 -
This commit is contained in:
juha 2016-06-20 08:51:12 +00:00
parent f34ea1f4c7
commit d5346b5108
2 changed files with 10 additions and 20 deletions

View File

@ -2945,8 +2945,7 @@ begin
CurPos.StartPos:=-1; CurPos.StartPos:=-1;
end else begin end else begin
CurPos.StartPos:=-1; CurPos.StartPos:=-1;
ErrMsg:=Format(ctsNeededByMode, [CompilerModeNames[Scanner.CompilerMode]] ErrMsg:=Format(ctsNeededByMode, [CompilerModeNames[Scanner.CompilerMode]]);
);
end; end;
if CompiledFilename<>'' then begin if CompiledFilename<>'' then begin
// there is a compiled unit, only the source was not found // there is a compiled unit, only the source was not found

View File

@ -579,8 +579,7 @@ type
procedure ClearMissingIncludeFiles; procedure ClearMissingIncludeFiles;
// code macros // code macros
procedure AddMacroValue(MacroName: PChar; procedure AddMacroValue(MacroName: PChar; ValueStart, ValueEnd: integer);
ValueStart, ValueEnd: integer);
procedure ClearMacros; procedure ClearMacros;
function IndexOfMacro(MacroName: PChar; InsertPos: boolean): integer; function IndexOfMacro(MacroName: PChar; InsertPos: boolean): integer;
procedure AddMacroSource(MacroID: integer); procedure AddMacroSource(MacroID: integer);
@ -701,33 +700,26 @@ type
// properties // properties
property OnGetSource: TOnGetSource read FOnGetSource write FOnGetSource; property OnGetSource: TOnGetSource read FOnGetSource write FOnGetSource;
property OnLoadSource: TOnLoadSource read FOnLoadSource write FOnLoadSource; property OnLoadSource: TOnLoadSource read FOnLoadSource write FOnLoadSource;
property OnDeleteSource: TOnDeleteSource property OnDeleteSource: TOnDeleteSource read FOnDeleteSource write FOnDeleteSource;
read FOnDeleteSource write FOnDeleteSource;
property OnGetSourceStatus: TOnGetSourceStatus property OnGetSourceStatus: TOnGetSourceStatus
read FOnGetSourceStatus write FOnGetSourceStatus; read FOnGetSourceStatus write FOnGetSourceStatus;
property OnGetFileName: TOnGetFileName property OnGetFileName: TOnGetFileName read FOnGetFileName write FOnGetFileName;
read FOnGetFileName write FOnGetFileName;
property OnCheckFileOnDisk: TOnCheckFileOnDisk property OnCheckFileOnDisk: TOnCheckFileOnDisk
read FOnCheckFileOnDisk write FOnCheckFileOnDisk; read FOnCheckFileOnDisk write FOnCheckFileOnDisk;
property OnGetInitValues: TOnGetInitValues property OnGetInitValues: TOnGetInitValues
read FOnGetInitValues write FOnGetInitValues; read FOnGetInitValues write FOnGetInitValues;
property OnIncludeCode: TOnIncludeCode property OnIncludeCode: TOnIncludeCode read FOnIncludeCode write FOnIncludeCode;
read FOnIncludeCode write FOnIncludeCode; property OnProgress: TLinkScannerProgress read FOnProgress write FOnProgress;
property OnProgress: TLinkScannerProgress
read FOnProgress write FOnProgress;
property IgnoreMissingIncludeFiles: boolean read GetIgnoreMissingIncludeFiles property IgnoreMissingIncludeFiles: boolean read GetIgnoreMissingIncludeFiles
write SetIgnoreMissingIncludeFiles; write SetIgnoreMissingIncludeFiles;
property InitialValues: TExpressionEvaluator property InitialValues: TExpressionEvaluator read FInitValues write FInitValues;
read FInitValues write FInitValues;
property MainCode: pointer read FMainCode write SetMainCode; property MainCode: pointer read FMainCode write SetMainCode;
property IncludeFileIsMissing: boolean read GetIncludeFileIsMissing; property IncludeFileIsMissing: boolean read GetIncludeFileIsMissing;
property NestedComments: boolean read FNestedComments; property NestedComments: boolean read FNestedComments;
property CompilerMode: TCompilerMode property CompilerMode: TCompilerMode read FCompilerMode write SetCompilerMode;
read FCompilerMode write SetCompilerMode;
property CompilerModeSwitches: TCompilerModeSwitches property CompilerModeSwitches: TCompilerModeSwitches
read FCompilerModeSwitches write FCompilerModeSwitches; read FCompilerModeSwitches write FCompilerModeSwitches;
property PascalCompiler: TPascalCompiler property PascalCompiler: TPascalCompiler read FPascalCompiler write FPascalCompiler;
read FPascalCompiler write FPascalCompiler;
property ScanTill: TLinkScannerRange read FScanTill write SetScanTill; property ScanTill: TLinkScannerRange read FScanTill write SetScanTill;
procedure Clear; procedure Clear;
@ -4200,8 +4192,7 @@ begin
FreeAndNil(FMissingIncludeFiles); FreeAndNil(FMissingIncludeFiles);
end; end;
procedure TLinkScanner.AddMacroValue(MacroName: PChar; ValueStart, procedure TLinkScanner.AddMacroValue(MacroName: PChar; ValueStart, ValueEnd: integer);
ValueEnd: integer);
var var
i: LongInt; i: LongInt;
Macro: PSourceLinkMacro; Macro: PSourceLinkMacro;