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

Rename TDBGEvaluateFlag to TWatcheEvaluateFlag

Browse Source
This commit is contained in:
Martin 2022-01-07 21:25:08 +01:00
parent 2424ed2612
commit 7f9e1893d2
17 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
components/debuggerintf/dbgintfdebuggerbase.pp
View File

@ -177,14 +177,14 @@ const
'Error');
type
TDBGEvaluateFlag =
(defNoTypeInfo, // No Typeinfo object will be returned
TWatcheEvaluateFlag =
(defNoTypeInfo, // No Typeinfo object will be returned // for structures that means a printed value will be returned
defSimpleTypeInfo, // Returns: Kind (skSimple, skClass, ..); TypeName (but does make no attempt to avoid an alias)
defFullTypeInfo, // Get all typeinfo, resolve all anchestors
defClassAutoCast, // Find real class of instance, and use, instead of declared class of variable
defAllowFunctionCall
);
TDBGEvaluateFlags = set of TDBGEvaluateFlag;
TWatcheEvaluateFlags = set of TWatcheEvaluateFlag;
{ TRunningProcessInfo
Used to enumerate running processes.
@ -660,7 +660,7 @@ type
function GetWatch: TWatch;
protected
FDisplayFormat: TWatchDisplayFormat;
FEvaluateFlags: TDBGEvaluateFlags;
FEvaluateFlags: TWatcheEvaluateFlags;
FRepeatCount: Integer;
FStackFrame: Integer;
FThreadId: Integer;
@ -674,7 +674,7 @@ type
destructor Destroy; override;
procedure Assign(AnOther: TWatchValue); virtual;
property DisplayFormat: TWatchDisplayFormat read FDisplayFormat;
property EvaluateFlags: TDBGEvaluateFlags read FEvaluateFlags;
property EvaluateFlags: TWatcheEvaluateFlags read FEvaluateFlags;
property RepeatCount: Integer read FRepeatCount;
property ThreadId: Integer read FThreadId;
property StackFrame: Integer read FStackFrame;
@ -717,13 +717,13 @@ type
procedure SetDisplayFormat(AValue: TWatchDisplayFormat);
procedure SetEnabled(AValue: Boolean);
procedure SetEvaluateFlags(AValue: TDBGEvaluateFlags);
procedure SetEvaluateFlags(AValue: TWatcheEvaluateFlags);
procedure SetExpression(AValue: String);
procedure SetRepeatCount(AValue: Integer);
function GetValue(const AThreadId: Integer; const AStackFrame: Integer): TWatchValue;
protected
FEnabled: Boolean;
FEvaluateFlags: TDBGEvaluateFlags;
FEvaluateFlags: TWatcheEvaluateFlags;
FExpression: String;
FDisplayFormat: TWatchDisplayFormat;
FRepeatCount: Integer;
@ -743,7 +743,7 @@ type
property Enabled: Boolean read FEnabled write SetEnabled;
property Expression: String read FExpression write SetExpression;
property DisplayFormat: TWatchDisplayFormat read FDisplayFormat write SetDisplayFormat;
property EvaluateFlags: TDBGEvaluateFlags read FEvaluateFlags write SetEvaluateFlags;
property EvaluateFlags: TWatcheEvaluateFlags read FEvaluateFlags write SetEvaluateFlags;
property RepeatCount: Integer read FRepeatCount write SetRepeatCount;
property Values[const AThreadId: Integer; const AStackFrame: Integer]: TWatchValue
read GetValue;
@ -1963,7 +1963,7 @@ type
procedure Detach;
procedure SendConsoleInput(AText: String);
function Evaluate(const AExpression: String; ACallback: TDBGEvaluateResultCallback;
EvalFlags: TDBGEvaluateFlags = []): Boolean; // Evaluates the given expression, returns true if valid
EvalFlags: TWatcheEvaluateFlags = []): Boolean; // Evaluates the given expression, returns true if valid
function GetProcessList({%H-}AList: TRunningProcessInfoList): boolean; virtual;
function Modify(const AExpression, AValue: String): Boolean; // Modifies the given expression, returns true if valid
function Disassemble(AAddr: TDbgPtr; ABackward: Boolean; out ANextAddr: TDbgPtr;
@ -2069,8 +2069,8 @@ function dbgs(AnAttributes: TDBGSymbolAttributes): String; overload;
function dbgs(ADisassRange: TDBGDisassemblerEntryRange): String; overload;
function dbgs(const AnAddr: TDisassemblerAddress): string; overload;
function dbgs(ACategory: TDBGEventCategory): String; overload;
function dbgs(AFlag: TDBGEvaluateFlag): String; overload;
function dbgs(AFlags: TDBGEvaluateFlags): String; overload;
function dbgs(AFlag: TWatcheEvaluateFlag): String; overload;
function dbgs(AFlags: TWatcheEvaluateFlags): String; overload;
function dbgs(AName: TDBGCommand): String; overload;
var
@ -2171,18 +2171,18 @@ begin
writestr(Result{%H-}, ACategory);
end;
function dbgs(AFlag: TDBGEvaluateFlag): String;
function dbgs(AFlag: TWatcheEvaluateFlag): String;
begin
Result := '';
WriteStr(Result, AFlag);
end;
function dbgs(AFlags: TDBGEvaluateFlags): String;
function dbgs(AFlags: TWatcheEvaluateFlags): String;
var
i: TDBGEvaluateFlag;
i: TWatcheEvaluateFlag;
begin
Result:='';
for i := low(TDBGEvaluateFlags) to high(TDBGEvaluateFlags) do
for i := low(TWatcheEvaluateFlag) to high(TWatcheEvaluateFlag) do
if i in AFlags then begin
if Result <> '' then Result := Result + ', ';
Result := Result + dbgs(i);
@ -2881,7 +2881,7 @@ begin
end;
end;
procedure TWatch.SetEvaluateFlags(AValue: TDBGEvaluateFlags);
procedure TWatch.SetEvaluateFlags(AValue: TWatcheEvaluateFlags);
begin
if FEvaluateFlags = AValue then Exit;
FEvaluateFlags := AValue;
@ -6173,7 +6173,7 @@ begin
end;
function TDebuggerIntf.Evaluate(const AExpression: String;
ACallback: TDBGEvaluateResultCallback; EvalFlags: TDBGEvaluateFlags): Boolean;
ACallback: TDBGEvaluateResultCallback; EvalFlags: TWatcheEvaluateFlags): Boolean;
begin
Result := ReqCmd(dcEvaluate, [AExpression, Integer(EvalFlags)], TMethod(ACallback));
end;

12
components/lazdebuggergdbmi/gdbmidebugger.pp
View File

@ -953,7 +953,7 @@ type
procedure DoPseudoTerminalRead(Sender: TObject);
// Implementation of external functions
function GDBEnvironment(const AVariable: String; const ASet: Boolean): Boolean;
function GDBEvaluate(const AExpression: String; EvalFlags: TDBGEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
function GDBEvaluate(const AExpression: String; EvalFlags: TWatcheEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
procedure GDBEvaluateCommandCancelled(Sender: TObject);
procedure GDBEvaluateCommandExecuted(Sender: TObject);
function GDBModify(const AExpression, ANewValue: String): Boolean;
@ -1468,7 +1468,7 @@ type
TGDBMIDebuggerCommandEvaluate = class(TGDBMIDebuggerCommand)
private
FCallback: TDBGEvaluateResultCallback;
FEvalFlags: TDBGEvaluateFlags;
FEvalFlags: TWatcheEvaluateFlags;
FExpression: String;
FDisplayFormat: TWatchDisplayFormat;
FWatchValue: TWatchValue;
@ -1493,7 +1493,7 @@ type
destructor Destroy; override;
function DebugText: String; override;
property Expression: String read FExpression;
property EvalFlags: TDBGEvaluateFlags read FEvalFlags write FEvalFlags;
property EvalFlags: TWatcheEvaluateFlags read FEvalFlags write FEvalFlags;
property DisplayFormat: TWatchDisplayFormat read FDisplayFormat;
property TextValue: String read FTextValue;
property TypeInfo: TGDBType read GetTypeInfo;
@ -9563,7 +9563,7 @@ begin
end;
function TGDBMIDebuggerBase.GDBEvaluate(const AExpression: String;
EvalFlags: TDBGEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
EvalFlags: TWatcheEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
var
CommandObj: TGDBMIDebuggerCommandEvaluate;
begin
@ -10111,7 +10111,7 @@ end;
function TGDBMIDebuggerBase.RequestCommand(const ACommand: TDBGCommand;
const AParams: array of const; const ACallback: TMethod): Boolean;
var
EvalFlags: TDBGEvaluateFlags;
EvalFlags: TWatcheEvaluateFlags;
begin
LockRelease;
try
@ -10130,7 +10130,7 @@ begin
dcEvaluate: begin
EvalFlags := [];
if high(AParams) >= 1 then
EvalFlags := TDBGEvaluateFlags(AParams[1].VInteger);
EvalFlags := TWatcheEvaluateFlags(AParams[1].VInteger);
Result := GDBEvaluate(String(AParams[0].VAnsiString),
EvalFlags, TDBGEvaluateResultCallback(ACallback));
end;

4
components/lazdebuggergdbmi/test/gdbmitestutils/testbase.pas
View File

@ -93,7 +93,7 @@ type
ResultText: String; ResultDBGType: TDBGType);
public
function EvaluateWait(const AExpression: String; var ARes: String;
var AResType: TDBGType; EvalFlags: TDBGEvaluateFlags = []; ATimeOut: Integer = -1): Boolean;
var AResType: TDBGType; EvalFlags: TWatcheEvaluateFlags = []; ATimeOut: Integer = -1): Boolean;
end;
@ -191,7 +191,7 @@ begin
end;
function TGDBMIDebuggerForTest.EvaluateWait(const AExpression: String;
var ARes: String; var AResType: TDBGType; EvalFlags: TDBGEvaluateFlags;
var ARes: String; var AResType: TDBGType; EvalFlags: TWatcheEvaluateFlags;
ATimeOut: Integer): Boolean;
var
t: QWord;

10
components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas
View File

@ -112,7 +112,7 @@ type
Expression: string;
DspFormat: TWatchDisplayFormat;
RepeatCount: Integer;
EvaluateFlags: TDBGEvaluateFlags;
EvaluateFlags: TWatcheEvaluateFlags;
StackFrame: Integer;
Result: Array [TSymbolType] of TWatchExpectationResult;
@ -146,7 +146,7 @@ function AddWatchExp(var ExpArray: TWatchExpectationArray;
AMinGdb: Integer = 0; AMinFpc: Integer = 0
): PWatchExpectation;
function AddWatchExp(var ExpArray: TWatchExpectationArray;
AnExpr: string; AFmt: TWatchDisplayFormat; AEvaluateFlags: TDBGEvaluateFlags;
AnExpr: string; AFmt: TWatchDisplayFormat; AEvaluateFlags: TWatcheEvaluateFlags;
AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AFlgs: TWatchExpectationFlags = [];
AStackFrame: Integer = 0;
@ -160,7 +160,7 @@ function AddWatchExp(var ExpArray: TWatchExpectationArray; ATestName: String;
AMinGdb: Integer = 0; AMinFpc: Integer = 0
): PWatchExpectation;
function AddWatchExp(var ExpArray: TWatchExpectationArray; ATestName: String;
AnExpr: string; AFmt: TWatchDisplayFormat; AEvaluateFlags: TDBGEvaluateFlags;
AnExpr: string; AFmt: TWatchDisplayFormat; AEvaluateFlags: TWatcheEvaluateFlags;
AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AFlgs: TWatchExpectationFlags = [];
AStackFrame: Integer = 0;
@ -210,7 +210,7 @@ begin
end;
function AddWatchExp(var ExpArray: TWatchExpectationArray; AnExpr: string;
AFmt: TWatchDisplayFormat; AEvaluateFlags: TDBGEvaluateFlags; AMtch: string;
AFmt: TWatchDisplayFormat; AEvaluateFlags: TWatcheEvaluateFlags; AMtch: string;
AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags; AStackFrame: Integer;
AMinGdb: Integer; AMinFpc: Integer): PWatchExpectation;
begin
@ -229,7 +229,7 @@ begin
end;
function AddWatchExp(var ExpArray: TWatchExpectationArray; ATestName: String;
AnExpr: string; AFmt: TWatchDisplayFormat; AEvaluateFlags: TDBGEvaluateFlags; AMtch: string;
AnExpr: string; AFmt: TWatchDisplayFormat; AEvaluateFlags: TWatcheEvaluateFlags; AMtch: string;
AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags; AStackFrame: Integer;
AMinGdb: Integer; AMinFpc: Integer): PWatchExpectation;
var

8
components/lazdebuggergdbmi/test/testwatches.pas
View File

@ -57,10 +57,10 @@ type
// using FCurrentExpArray
function Add(AnExpr: string; AFmt: TWatchDisplayFormat; AMtch: string;
AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags): PWatchExpectation;
function Add(AnExpr: string; AFmt: TWatchDisplayFormat; AEvalFlags: TDBGEvaluateFlags; AMtch: string;
function Add(AnExpr: string; AFmt: TWatchDisplayFormat; AEvalFlags: TWatcheEvaluateFlags; AMtch: string;
AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags): PWatchExpectation;
function AddFmtDef (AnExpr, AMtch: string; AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
function AddFmtDef (AnExpr: String; AEvalFlags: TDBGEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
function AddFmtDef (AnExpr: String; AEvalFlags: TWatcheEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
function AddStringFmtDef (AnExpr, AMtch, ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
function AddShortStrFmtDef(AnExpr, AMtch: string; ATpNm: string = 'ShortString'; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
function AddCharFmtDef (AnExpr, AMtch: string; ATpNm: string = 'Char'; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
@ -161,7 +161,7 @@ begin
end;
function TTestWatches.Add(AnExpr: string; AFmt: TWatchDisplayFormat;
AEvalFlags: TDBGEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AEvalFlags: TWatcheEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AFlgs: TWatchExpectationFlags): PWatchExpectation;
begin
Result := AddWatchExp(FCurrentExpArray^, AnExpr, AFmt, AEvalFlags, AMtch, AKind, ATpNm, AFlgs );
@ -173,7 +173,7 @@ begin
Result := Add(AnExpr, wdfDefault, AMtch, AKind, ATpNm, AFlgs );
end;
function TTestWatches.AddFmtDef(AnExpr: String; AEvalFlags: TDBGEvaluateFlags; AMtch: string;
function TTestWatches.AddFmtDef(AnExpr: String; AEvalFlags: TWatcheEvaluateFlags; AMtch: string;
AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags): PWatchExpectation;
begin
Result := Add(AnExpr, wdfDefault, AEvalFlags, AMtch, AKind, ATpNm, AFlgs );

4
components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
View File

@ -3568,7 +3568,7 @@ end;
function TFpDebugDebugger.RequestCommand(const ACommand: TDBGCommand;
const AParams: array of const; const ACallback: TMethod): Boolean;
var
EvalFlags: TDBGEvaluateFlags;
EvalFlags: TWatcheEvaluateFlags;
AConsoleTty, ResText: string;
addr: TDBGPtrArray;
Cmd: TDBGCommand;
@ -3730,7 +3730,7 @@ begin
end;
dcEvaluate:
begin
EvalFlags := TDBGEvaluateFlags(AParams[1].VInteger);
EvalFlags := TWatcheEvaluateFlags(AParams[1].VInteger);
GetCurrentThreadAndStackFrame(AThreadId, AStackFrame);
if FEvalWorkItem <> nil then begin
EvalWorkItem := FEvalWorkItem;

14
components/lazdebuggers/lazdebuggerfp/fpdebugdebuggerworkthreads.pas
View File

@ -244,7 +244,7 @@ type
AStackFrame, AThreadId: Integer;
ADispFormat: TWatchDisplayFormat;
ARepeatCnt: Integer;
AnEvalFlags: TDBGEvaluateFlags;
AnEvalFlags: TWatcheEvaluateFlags;
out AResText: String;
out ATypeInfo: TDBGType
): Boolean;
@ -259,7 +259,7 @@ type
FStackFrame, FThreadId: Integer;
FDispFormat: TWatchDisplayFormat;
FRepeatCnt: Integer;
FEvalFlags: TDBGEvaluateFlags;
FEvalFlags: TWatcheEvaluateFlags;
protected
FRes: Boolean;
FResText: String;
@ -272,7 +272,7 @@ type
AStackFrame, AThreadId: Integer;
ADispFormat: TWatchDisplayFormat;
ARepeatCnt: Integer;
AnEvalFlags: TDBGEvaluateFlags
AnEvalFlags: TWatcheEvaluateFlags
);
function DebugText: String; override;
end;
@ -289,7 +289,7 @@ type
APriority: TFpThreadWorkerPriority;
const AnExpression: String;
AStackFrame, AThreadId: Integer;
AnEvalFlags: TDBGEvaluateFlags;
AnEvalFlags: TWatcheEvaluateFlags;
ACallback: TDBGEvaluateResultCallback
);
destructor Destroy; override;
@ -942,7 +942,7 @@ end;
function TFpThreadWorkerEvaluate.EvaluateExpression(const AnExpression: String;
AStackFrame, AThreadId: Integer; ADispFormat: TWatchDisplayFormat;
ARepeatCnt: Integer; AnEvalFlags: TDBGEvaluateFlags; out AResText: String;
ARepeatCnt: Integer; AnEvalFlags: TWatcheEvaluateFlags; out AResText: String;
out ATypeInfo: TDBGType): Boolean;
var
APasExpr, PasExpr2: TFpPascalExpression;
@ -1044,7 +1044,7 @@ end;
constructor TFpThreadWorkerEvaluateExpr.Create(ADebugger: TFpDebugDebuggerBase;
APriority: TFpThreadWorkerPriority; const AnExpression: String; AStackFrame,
AThreadId: Integer; ADispFormat: TWatchDisplayFormat; ARepeatCnt: Integer;
AnEvalFlags: TDBGEvaluateFlags);
AnEvalFlags: TWatcheEvaluateFlags);
begin
inherited Create(ADebugger, APriority);
FExpression := AnExpression;
@ -1113,7 +1113,7 @@ end;
constructor TFpThreadWorkerCmdEval.Create(ADebugger: TFpDebugDebuggerBase;
APriority: TFpThreadWorkerPriority; const AnExpression: String; AStackFrame,
AThreadId: Integer; AnEvalFlags: TDBGEvaluateFlags;
AThreadId: Integer; AnEvalFlags: TWatcheEvaluateFlags;
ACallback: TDBGEvaluateResultCallback);
begin
inherited Create(ADebugger, APriority, AnExpression, AStackFrame, AThreadId, wdfDefault, 0,

8
components/lazdebuggers/lazdebuggerfpgdbmi/fpgdbmidebugger.pp
View File

@ -106,7 +106,7 @@ type
AExpression: String;
out AResText: String;
out ATypeInfo: TDBGType;
EvalFlags: TDBGEvaluateFlags = []): Boolean;
EvalFlags: TWatcheEvaluateFlags = []): Boolean;
property CurrentThreadId;
property CurrentStackFrame;
public
@ -818,13 +818,13 @@ end;
function TFpGDBMIDebugger.RequestCommand(const ACommand: TDBGCommand;
const AParams: array of const; const ACallback: TMethod): Boolean;
var
EvalFlags: TDBGEvaluateFlags;
EvalFlags: TWatcheEvaluateFlags;
ResText: String;
ResType: TDBGType;
begin
if (ACommand = dcEvaluate) then begin
EvalFlags := [];
EvalFlags := TDBGEvaluateFlags(AParams[1].VInteger);
EvalFlags := TWatcheEvaluateFlags(AParams[1].VInteger);
Result := False;
if (HasDwarf) and (not UseGDB) then begin
Result := EvaluateExpression(nil, String(AParams[0].VAnsiString),
@ -1007,7 +1007,7 @@ begin
end;
function TFpGDBMIDebugger.EvaluateExpression(AWatchValue: TWatchValue; AExpression: String;
out AResText: String; out ATypeInfo: TDBGType; EvalFlags: TDBGEvaluateFlags): Boolean;
out AResText: String; out ATypeInfo: TDBGType; EvalFlags: TWatcheEvaluateFlags): Boolean;
var
Ctx: TFpDbgSymbolScope;
PasExpr, PasExpr2: TFpPascalExpression;

12
components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas
View File

@ -70,16 +70,16 @@ type
// Add to FLastAddedExp
function Add(AnExpr: string; AFmt: TWatchDisplayFormat; AMtch: string;
AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags): PWatchExpectation;
function Add(AnExpr: string; AFmt: TWatchDisplayFormat; AEvalFlags: TDBGEvaluateFlags; AMtch: string;
function Add(AnExpr: string; AFmt: TWatchDisplayFormat; AEvalFlags: TWatcheEvaluateFlags; AMtch: string;
AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags): PWatchExpectation;
//
function AddFmtDef (AnExpr: string;
AMtch: string; AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
function AddFmtDef (AnExpr: string; AnFormatParam: array of const;
AMtch: string; AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
//function AddFmtDef (AnExpr: String; AEvalFlags: TDBGEvaluateFlags;
//function AddFmtDef (AnExpr: String; AEvalFlags: TWatcheEvaluateFlags;
// AMtch: string; AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
function AddFmtDef (AnExpr: String; AnFormatParam: array of const; AEvalFlags: TDBGEvaluateFlags;
function AddFmtDef (AnExpr: String; AnFormatParam: array of const; AEvalFlags: TWatcheEvaluateFlags;
AMtch: string; AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags=[]): PWatchExpectation;
procedure JoinExpectsForHexReplace; // Join the lat 2 additions
@ -249,7 +249,7 @@ begin
end;
function TTestWatches.Add(AnExpr: string; AFmt: TWatchDisplayFormat;
AEvalFlags: TDBGEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AEvalFlags: TWatcheEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AFlgs: TWatchExpectationFlags): PWatchExpectation;
begin
Result := AddWatchExp(FCurrentExpect^, AnExpr, AFmt, AEvalFlags, AMtch, AKind, ATpNm, AFlgs );
@ -268,14 +268,14 @@ begin
Result := AddFmtDef(Format(AnExpr, AnFormatParam), AMtch, AKind, ATpNm, AFlgs);
end;
//function TTestWatches.AddFmtDef(AnExpr: String; AEvalFlags: TDBGEvaluateFlags; AMtch: string;
//function TTestWatches.AddFmtDef(AnExpr: String; AEvalFlags: TWatcheEvaluateFlags; AMtch: string;
// AKind: TDBGSymbolKind; ATpNm: string; AFlgs: TWatchExpectationFlags): PWatchExpectation;
//begin
// Result := Add(AnExpr, wdfDefault, AEvalFlags, AMtch, AKind, ATpNm, AFlgs );
//end;
function TTestWatches.AddFmtDef(AnExpr: String; AnFormatParam: array of const;
AEvalFlags: TDBGEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AEvalFlags: TWatcheEvaluateFlags; AMtch: string; AKind: TDBGSymbolKind; ATpNm: string;
AFlgs: TWatchExpectationFlags): PWatchExpectation;
begin
Result := Add(Format(AnExpr, AnFormatParam), wdfDefault, AEvalFlags, AMtch, AKind, ATpNm, AFlgs );

8
components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas
View File

@ -167,7 +167,7 @@ type
AExpression: String;
out AResText: String;
out ATypeInfo: TDBGType;
EvalFlags: TDBGEvaluateFlags = []): Boolean;
EvalFlags: TWatcheEvaluateFlags = []): Boolean;
property CurrentThreadId;
property CurrentStackFrame;
property CommandQueue;
@ -1268,13 +1268,13 @@ end;
function TFpLldbDebugger.RequestCommand(const ACommand: TDBGCommand;
const AParams: array of const; const ACallback: TMethod): Boolean;
var
EvalFlags: TDBGEvaluateFlags;
EvalFlags: TWatcheEvaluateFlags;
ResText: String;
ResType: TDBGType;
begin
if (ACommand = dcEvaluate) then begin
EvalFlags := [];
EvalFlags := TDBGEvaluateFlags(AParams[1].VInteger);
EvalFlags := TWatcheEvaluateFlags(AParams[1].VInteger);
Result := False;
if (HasDwarf) then begin
Threads.CurrentThreads.Count; // trigger threads, in case
@ -1458,7 +1458,7 @@ begin
end;
function TFpLldbDebugger.EvaluateExpression(AWatchValue: TWatchValue; AExpression: String;
out AResText: String; out ATypeInfo: TDBGType; EvalFlags: TDBGEvaluateFlags): Boolean;
out AResText: String; out ATypeInfo: TDBGType; EvalFlags: TWatcheEvaluateFlags): Boolean;
var
Ctx: TFpDbgSymbolScope;
PasExpr, PasExpr2: TFpPascalExpression;

14
components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas
View File

@ -216,7 +216,7 @@ type
FInstr: TLldbInstructionExpression;
FWatchValue: TWatchValue;
FExpr: String;
FFlags: TDBGEvaluateFlags;
FFlags: TWatcheEvaluateFlags;
FCallback: TDBGEvaluateResultCallback;
procedure DoWatchFreed(Sender: TObject);
procedure EvalInstructionFailed(Sender: TObject);
@ -226,7 +226,7 @@ type
public
// TODO: Pass FCurrentStackFrame to create
constructor Create(AOwner: TLldbDebugger; AWatchValue: TWatchValue);
constructor Create(AOwner: TLldbDebugger; AnExpr: String; AFlags: TDBGEvaluateFlags;
constructor Create(AOwner: TLldbDebugger; AnExpr: String; AFlags: TWatcheEvaluateFlags;
ACallback: TDBGEvaluateResultCallback);
destructor Destroy; override;
end;
@ -329,7 +329,7 @@ type
function LldbStep(AStepAction: TLldbInstructionProcessStepAction): Boolean;
function LldbStop: Boolean;
function LldbPause: Boolean;
function LldbEvaluate(const AExpression: String; EvalFlags: TDBGEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
function LldbEvaluate(const AExpression: String; EvalFlags: TWatcheEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
function LldbEnvironment(const AVariable: String; const ASet: Boolean): Boolean;
procedure TerminateLldb; // Kills external debugger
protected
@ -2593,7 +2593,7 @@ begin
end;
constructor TLldbDebuggerCommandEvaluate.Create(AOwner: TLldbDebugger;
AnExpr: String; AFlags: TDBGEvaluateFlags;
AnExpr: String; AFlags: TWatcheEvaluateFlags;
ACallback: TDBGEvaluateResultCallback);
begin
FExpr := AnExpr;
@ -2816,7 +2816,7 @@ begin
end;
function TLldbDebugger.LldbEvaluate(const AExpression: String;
EvalFlags: TDBGEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
EvalFlags: TWatcheEvaluateFlags; ACallback: TDBGEvaluateResultCallback): Boolean;
var
Cmd: TLldbDebuggerCommandEvaluate;
begin
@ -2996,7 +2996,7 @@ end;
function TLldbDebugger.RequestCommand(const ACommand: TDBGCommand;
const AParams: array of const; const ACallback: TMethod): Boolean;
var
EvalFlags: TDBGEvaluateFlags;
EvalFlags: TWatcheEvaluateFlags;
begin
LockRelease;
try
@ -3012,7 +3012,7 @@ begin
dcEvaluate: begin
EvalFlags := [];
if high(AParams) >= 1 then
EvalFlags := TDBGEvaluateFlags(AParams[1].VInteger);
EvalFlags := TWatcheEvaluateFlags(AParams[1].VInteger);
Result := LldbEvaluate(String(AParams[0].VAnsiString),
EvalFlags, TDBGEvaluateResultCallback(ACallback));
end;

12
components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
View File

@ -132,7 +132,7 @@ type
TstTestName: String;
TstWatch: TTestWatch;
EvalCallTestFlags: TDBGEvaluateFlags;
EvalCallTestFlags: TWatcheEvaluateFlags;
EvalCallResReceived: Boolean;
EvalCallResSuccess: Boolean;
EvalCallResText: String;
@ -140,7 +140,7 @@ type
//TstDspFormat: TWatchDisplayFormat;
//TstRepeatCount: Integer;
//TstEvaluateFlags: TDBGEvaluateFlags;
//TstEvaluateFlags: TWatcheEvaluateFlags;
TstStackFrame: Integer;
TstMinDbg, TstMinFpc: Integer;
@ -162,7 +162,7 @@ type
function AddFlag(AFlag: TWatchExpErrorHandlingFlag; ACond: Boolean): PWatchExpectation;
function AddFlag(AFlags: TWatchExpErrorHandlingFlags; ACond: Boolean): PWatchExpectation;
function AddEvalFlag(AFlags: TDBGEvaluateFlags; ACond: Boolean = True): PWatchExpectation;
function AddEvalFlag(AFlags: TWatcheEvaluateFlags; ACond: Boolean = True): PWatchExpectation;
function Skip(ASymTypes: TSymbolTypes = []): PWatchExpectation;
function SkipIf(ACond: Boolean; ASymTypes: TSymbolTypes = []): PWatchExpectation;
@ -263,14 +263,14 @@ type
): PWatchExpectation;
function Add(ATestName: String;
AnExpr: string; // AEvaluateFlags: TDBGEvaluateFlags; // AFmt: TWatchDisplayFormat;
AnExpr: string; // AEvaluateFlags: TWatcheEvaluateFlags; // AFmt: TWatchDisplayFormat;
AnExpect: TWatchExpectationResult;
AStackFrame: Integer = 0; AMinFpc: Integer = 0; AMinDbg: Integer = 0
// ASpecialFlags: ... // Ignore this or that // maybe per result
): PWatchExpectation;
function Add(
AnExpr: string; // AEvaluateFlags: TDBGEvaluateFlags; // AFmt: TWatchDisplayFormat;
AnExpr: string; // AEvaluateFlags: TWatcheEvaluateFlags; // AFmt: TWatchDisplayFormat;
AnExpect: TWatchExpectationResult;
AStackFrame: Integer = 0; AMinFpc: Integer = 0; AMinDbg: Integer = 0
): PWatchExpectation;
@ -955,7 +955,7 @@ begin
Result := Self;
end;
function TWatchExpectationHelper.AddEvalFlag(AFlags: TDBGEvaluateFlags;
function TWatchExpectationHelper.AddEvalFlag(AFlags: TWatcheEvaluateFlags;
ACond: Boolean): PWatchExpectation;
begin
Result := Self;

2
debugger/evaluatedlg.pp
View File

@ -215,7 +215,7 @@ end;
procedure TEvaluateDlg.Evaluate;
var
S: String;
Opts: TDBGEvaluateFlags;
Opts: TWatcheEvaluateFlags;
begin
S := cmbExpression.Text;
if S = '' then Exit;

4
debugger/inspectdlg.pas
View File

@ -226,7 +226,7 @@ procedure TIDEInspectDlg.DataGridDoubleClick(Sender: TObject);
var
i: Integer;
s: String;
TestOpts: TDBGEvaluateFlags;
TestOpts: TWatcheEvaluateFlags;
begin
if FTestUpdateLock then
exit;
@ -938,7 +938,7 @@ end;
procedure TIDEInspectDlg.UpdateData;
var
Opts: TDBGEvaluateFlags;
Opts: TWatcheEvaluateFlags;
begin
FExpressionWasEvaluated := False;
if DebugBoss.State in [dsRun, dsStop, dsIdle] then begin

2
ide/basedebugmanager.pas
View File

@ -184,7 +184,7 @@ type
function FillProcessList(AList: TRunningProcessInfoList): boolean; virtual; abstract;
function Evaluate(const AExpression: String; ACallback: TDBGEvaluateResultCallback;
EvalFlags: TDBGEvaluateFlags = []): Boolean; virtual; abstract; // Evaluates the given expression, returns true if valid
EvalFlags: TWatcheEvaluateFlags = []): Boolean; virtual; abstract; // Evaluates the given expression, returns true if valid
function Modify(const AExpression: String; const ANewValue: String): Boolean; virtual; abstract; // Modify the given expression, returns true if valid
function GetFullFilename(const AUnitinfo: TDebuggerUnitInfo;

4
ide/debugmanager.pas
View File

@ -246,7 +246,7 @@ type
procedure Detach; override;
function Evaluate(const AExpression: String; ACallback: TDBGEvaluateResultCallback;
EvalFlags: TDBGEvaluateFlags = []): Boolean; override;
EvalFlags: TWatcheEvaluateFlags = []): Boolean; override;
function Modify(const AExpression, ANewValue: String): Boolean; override;
procedure EvaluateModify(const AExpression: String); override;
@ -2959,7 +2959,7 @@ begin
end;
function TDebugManager.Evaluate(const AExpression: String;
ACallback: TDBGEvaluateResultCallback; EvalFlags: TDBGEvaluateFlags): Boolean;
ACallback: TDBGEvaluateResultCallback; EvalFlags: TWatcheEvaluateFlags): Boolean;
begin
Result := (not Destroying)
and (MainIDE.ToolStatus = itDebugger)

4
ide/main.pp
View File

@ -11289,7 +11289,7 @@ end;
procedure TSrcNotebookHintCallback.AddDebuggerResult(Sender: TObject;
ASuccess: Boolean; ResultText: String; ResultDBGType: TDBGType);
var
Opts: TDBGEvaluateFlags;
Opts: TWatcheEvaluateFlags;
begin
try
if not ASuccess then begin
@ -11375,7 +11375,7 @@ var
ActiveUnitInfo: TUnitInfo;
BaseURL, SmartHintStr, Expression: String;
HasHint: Boolean;
Opts: TDBGEvaluateFlags;
Opts: TWatcheEvaluateFlags;
AtomStartPos, AtomEndPos: integer;
AtomRect: TRect;
DebugHint: TSrcNotebookHintCallback;