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

LazDebuggerFp: added auto-typecast for objects (watches, inspect / not working for hints)

Browse Source 
git-svn-id: branches/fixes_2_0@59575 -
This commit is contained in:
mattias 2018-11-17 20:12:45 +00:00
parent d3bc921507
commit bed1e0f8fc
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1263,7 +1263,7 @@ function TFpDebugDebugger.EvaluateExpression(AWatchValue: TWatchValue; AExpressi
var
AContext: TFpDbgInfoContext;
AController: TDbgController;
APasExpr: TFpPascalExpression;
APasExpr, PasExpr2: TFpPascalExpression;
ADbgInfo: TDbgInfo;
DispFormat: TWatchDisplayFormat;
RepeatCnt: Integer;
@ -1273,6 +1273,10 @@ var
RegList: TDbgRegisterValueList;
Reg: TDbgRegisterValue;
StackList: TCallStackBase;
ResValue: TFpDbgValue;
CastName: String;
ClassAddr, CNameAddr: TFpDbgMemLocation;
NameLen: QWord;
begin
Result := False;
AResText := '';
@ -1286,6 +1290,7 @@ begin
ThreadId := AWatchValue.ThreadId;
DispFormat := AWatchValue.DisplayFormat;
RepeatCnt := AWatchValue.RepeatCount;
EvalFlags := AWatchValue.EvaluateFlags;
end
else begin
ThreadId := Threads.CurrentThreads.CurrentThreadId;
@ -1346,6 +1351,35 @@ begin
begin
FPrettyPrinter.AddressSize:=AContext.SizeOfAddress;
FPrettyPrinter.MemManager := AContext.MemManager;
ResValue := APasExpr.ResultValue;
if (ResValue.Kind = skClass) and (ResValue.AsCardinal <> 0) and (defClassAutoCast in EvalFlags)
then begin
CastName := '';
if FMemManager.ReadAddress(ResValue.DataAddress, AContext.SizeOfAddress, ClassAddr) then begin
ClassAddr.Address := ClassAddr.Address + 3 * AContext.SizeOfAddress;
if FMemManager.ReadAddress(ClassAddr, AContext.SizeOfAddress, CNameAddr) then begin
if (FMemManager.ReadUnsignedInt(CNameAddr, 1, NameLen)) then
if NameLen > 0 then begin
SetLength(CastName, NameLen);
CNameAddr.Address := CNameAddr.Address + 1;
FMemManager.ReadMemory(CNameAddr, NameLen, @CastName[1]);
PasExpr2 := TFpPascalExpression.Create(CastName+'('+AExpression+')', AContext);
PasExpr2.ResultValue;
if PasExpr2.Valid then begin
APasExpr.Free;
APasExpr := PasExpr2;
ResValue := APasExpr.ResultValue;
end
else
PasExpr2.Free;
end;
end;
end;
end;
if defNoTypeInfo in EvalFlags then
Res := FPrettyPrinter.PrintValue(AResText, APasExpr.ResultValue, DispFormat, RepeatCnt)
else