paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-07-26 23:36:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazDebuggerFp: Fix, showing pchar and string version for index access of string/pchar

Browse Source 
git-svn-id: trunk@59862 -
This commit is contained in:
martin 2018-12-19 01:42:45 +00:00
parent 53ff21a2b4
commit e74b00e9dc
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1334,7 +1334,7 @@ var
StackFrame, ThreadId: Integer; StackFrame, ThreadId: Integer;
StackList: TCallStackBase; StackList: TCallStackBase;
ResValue: TFpDbgValue; ResValue: TFpDbgValue;
CastName: String; CastName, ResText2: String;
ClassAddr, CNameAddr: TFpDbgMemLocation; ClassAddr, CNameAddr: TFpDbgMemLocation;
NameLen: QWord; NameLen: QWord;
begin begin
@ -1420,7 +1420,18 @@ begin
Res := FPrettyPrinter.PrintValue(AResText, APasExpr.ResultValue, DispFormat, RepeatCnt) Res := FPrettyPrinter.PrintValue(AResText, APasExpr.ResultValue, DispFormat, RepeatCnt)
else else
Res := FPrettyPrinter.PrintValue(AResText, ATypeInfo, APasExpr.ResultValue, DispFormat, RepeatCnt); Res := FPrettyPrinter.PrintValue(AResText, ATypeInfo, APasExpr.ResultValue, DispFormat, RepeatCnt);
// TODO: PCHAR/String
// PCHAR/String
if APasExpr.HasPCharIndexAccess then begin
// TODO: Only dwarf 2
APasExpr.FixPCharIndexAccess := True;
APasExpr.ResetEvaluation;
ResValue := APasExpr.ResultValue;
if (ResValue=nil) or (not FPrettyPrinter.PrintValue(ResText2, ResValue, DispFormat, RepeatCnt)) then
ResText2 := 'Failed';
AResText := 'PChar: '+AResText+ LineEnding + 'String: '+ResText2;
end;
if Res then if Res then
begin begin
if AWatchValue <> nil then if AWatchValue <> nil then