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

Debugger: clean up

Browse Source 
git-svn-id: trunk@41273 -
This commit is contained in:
martin 2013-05-19 09:44:15 +00:00
parent 20444bcb36
commit 792b67b47b
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debugger/gdbmidebugger.pp
View File

@ -208,6 +208,12 @@ type
TGDBMIBreakpointReason = (gbrBreak, gbrWatchTrigger, gbrWatchScope); TGDBMIBreakpointReason = (gbrBreak, gbrWatchTrigger, gbrWatchScope);
TGDBMIProcessResultOpt = (
prNoLeadingTab, // Do not require/strip the leading #9
prKeepBackShlash // Workaround, because TGDBMINameValueList does already do this
);
TGDBMIProcessResultOpts = set of TGDBMIProcessResultOpt;
TGDBMIDebuggerCommand = class(TRefCountedObject) TGDBMIDebuggerCommand = class(TRefCountedObject)
private private
FDefaultTimeOut: Integer; FDefaultTimeOut: Integer;
@ -269,8 +275,7 @@ type
): Boolean; overload; ): Boolean; overload;
procedure DoTimeoutFeedback; procedure DoTimeoutFeedback;
function ProcessResult(var AResult: TGDBMIExecResult; ATimeOut: Integer = -1): Boolean; function ProcessResult(var AResult: TGDBMIExecResult; ATimeOut: Integer = -1): Boolean;
function ProcessGDBResultText(S: String; NoLeadingTab: Boolean = False; function ProcessGDBResultText(S: String; Opts: TGDBMIProcessResultOpts = []): String;
NoBackSlashRemove: Boolean = False): String;
function GetStackDepth(MaxDepth: integer): Integer; function GetStackDepth(MaxDepth: integer): Integer;
function FindStackFrame(FP: TDBGPtr; StartAt, MaxDepth: Integer): Integer; function FindStackFrame(FP: TDBGPtr; StartAt, MaxDepth: Integer): Integer;
function GetFrame(const AIndex: Integer): String; function GetFrame(const AIndex: Integer): String;
@ -8890,7 +8895,7 @@ function TGDBMIDebuggerCommandLocals.DoExecute: Boolean;
begin begin
// AnsiString // AnsiString
if (length(Value) > 0) and (Value[1] in ['''', '#']) then begin if (length(Value) > 0) and (Value[1] in ['''', '#']) then begin
Value := MakePrintable(ProcessGDBResultText(Value, True, True)); Value := MakePrintable(ProcessGDBResultText(Value, [prNoLeadingTab, prKeepBackShlash]));
end end
else else
Value := DeleteEscapeChars(List.Values['value']); Value := DeleteEscapeChars(List.Values['value']);
@ -8898,7 +8903,7 @@ function TGDBMIDebuggerCommandLocals.DoExecute: Boolean;
else else
// ShortString // ShortString
if (length(Value) > 0) and (Value[1] in ['''', '#']) then begin if (length(Value) > 0) and (Value[1] in ['''', '#']) then begin
Value := MakePrintable(ProcessGDBResultText(Value, True, True)); Value := MakePrintable(ProcessGDBResultText(Value, [prNoLeadingTab, prKeepBackShlash]));
end end
else else
Value := DeleteEscapeChars(Value); Value := DeleteEscapeChars(Value);
@ -10820,7 +10825,7 @@ begin
end; end;
function TGDBMIDebuggerCommand.ProcessGDBResultText(S: String; function TGDBMIDebuggerCommand.ProcessGDBResultText(S: String;
NoLeadingTab: Boolean = False; NoBackSlashRemove: Boolean = False): String; Opts: TGDBMIProcessResultOpts = []): String;
var var
Trailor: String; Trailor: String;
n, len, idx: Integer; n, len, idx: Integer;
@ -10829,7 +10834,7 @@ begin
// don't use ' as end terminator, there might be one as part of the text // don't use ' as end terminator, there might be one as part of the text
// since ' will be the last char, simply strip it. // since ' will be the last char, simply strip it.
if (not NoLeadingTab) then begin if not (prNOLeadingTab in Opts) then begin
S := GetPart(['\t'], [], S); S := GetPart(['\t'], [], S);
if (length(S) > 0) and (S[1] = ' ') then if (length(S) > 0) and (S[1] = ' ') then
delete(S,1,1); delete(S,1,1);
@ -10856,7 +10861,7 @@ begin
if idx > len then Break; if idx > len then Break;
if S[idx] <> '''' then Break; if S[idx] <> '''' then Break;
end; end;
'\' : if not NoBackSlashRemove then begin '\' : if not (prKeepBackShlash in Opts) then begin
Inc(idx); Inc(idx);
if idx > len then Break; if idx > len then Break;
case S[idx] of case S[idx] of
@ -12609,7 +12614,7 @@ var
if (i <= length(FTextValue)) and (FTextValue[i] in ['''', '#']) if (i <= length(FTextValue)) and (FTextValue[i] in ['''', '#'])
then then
FTextValue := MakePrintable(ProcessGDBResultText( FTextValue := MakePrintable(ProcessGDBResultText(
copy(FTextValue, i, length(FTextValue) - i + 1), True, True)) copy(FTextValue, i, length(FTextValue) - i + 1), [prNoLeadingTab, prKeepBackShlash]))
else else
if Addr = 0 if Addr = 0
then then
@ -12691,7 +12696,7 @@ var
FTextValue := FormatCurrency(FTextValue) FTextValue := FormatCurrency(FTextValue)
else else
if ResultInfo.TypeName = 'ShortString' then if ResultInfo.TypeName = 'ShortString' then
FTextValue := MakePrintable(ProcessGDBResultText(FTextValue, True, True)) FTextValue := MakePrintable(ProcessGDBResultText(FTextValue, [prNoLeadingTab, prKeepBackShlash]))
else else
if (ResultInfo.TypeName = '&ShortString') then // should no longer happen if (ResultInfo.TypeName = '&ShortString') then // should no longer happen
FTextValue := GetStrValue('ShortString(%s)', [AnExpression]) // we have an address here, so we need to typecast FTextValue := GetStrValue('ShortString(%s)', [AnExpression]) // we have an address here, so we need to typecast