paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 07:55:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: fixed handling of single quotes in string-watches (moved implementation to correct place) follow up revision 41233 #1d623aeab7

Browse Source 
git-svn-id: trunk@41265 -
This commit is contained in:
martin 2013-05-18 23:43:49 +00:00
parent 9fba4b5031
commit 5eda51845b
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/debugutils.pp
View File

@ -224,7 +224,7 @@ begin
if not InString then if not InString then
ToggleInString; ToggleInString;
Result := Result + AString[n]; Result := Result + AString[n];
//if AString[n] = '''' then Result := Result + ''''; if AString[n] = '''' then Result := Result + '''';
end; end;
#192..#255: begin // Maybe utf8 #192..#255: begin // Maybe utf8
u := UTF8CharacterLength(@AString[n]); u := UTF8CharacterLength(@AString[n]);

2
debugger/gdbmidebugger.pp
View File

@ -10827,8 +10827,6 @@ begin
Inc(idx); Inc(idx);
if idx > len then Break; if idx > len then Break;
if S[idx] <> '''' then Break; if S[idx] <> '''' then Break;
inc(n);
Result[n] := ''''; // must keep both quotes
end; end;
'\' : if not NoBackSlashRemove then begin '\' : if not NoBackSlashRemove then begin
Inc(idx); Inc(idx);

6
debugger/test/Gdbmi/TestApps/WatchesPrgString.inc
View File

@ -415,9 +415,9 @@
ConstUtf8TextShortStr: ShortString = 'a üü1'' \\t 2 \t 3'#9'4'#13'5\n6'; ConstUtf8TextShortStr: ShortString = 'a üü1'' \\t 2 \t 3'#9'4'#13'5\n6';
ConstUtf8TextShort: String[40] = 'a üü1'' \\t 2 \t 3'#9'4'#13'5\n6'; ConstUtf8TextShort: String[40] = 'a üü1'' \\t 2 \t 3'#9'4'#13'5\n6';
ConstUtf8TextAnsi2: AnsiString = 'üü1'; // start with utf8 ConstUtf8TextAnsi2: AnsiString = 'üü''1'; // start with utf8
ConstUtf8TextShortStr2: ShortString = 'üü1'; ConstUtf8TextShortStr2: ShortString = 'üü''1';
ConstUtf8TextShort2: String[40] = 'üü1'; ConstUtf8TextShort2: String[40] = 'üü''1';
ConstUtf8TextAnsiBad: AnsiString = 'a '#170'b'; ConstUtf8TextAnsiBad: AnsiString = 'a '#170'b';
ConstUtf8TextShortStrBad: ShortString = 'a '#170'b'; ConstUtf8TextShortStrBad: ShortString = 'a '#170'b';

12
debugger/test/Gdbmi/testwatches.pas
View File

@ -1184,12 +1184,12 @@ begin
r:=AddShortStrFmtDef('VarUtf8TextShort', 'a üü1'''' \\\\t 2 \\t 3''#9''4''#13''5\\n6', 'ShortString', []); r:=AddShortStrFmtDef('VarUtf8TextShort', 'a üü1'''' \\\\t 2 \\t 3''#9''4''#13''5\\n6', 'ShortString', []);
r:=AddShortStrFmtDef('VarUtf8TextShortStr', 'a üü1'''' \\\\t 2 \\t 3''#9''4''#13''5\\n6', 'ShortString', []); r:=AddShortStrFmtDef('VarUtf8TextShortStr', 'a üü1'''' \\\\t 2 \\t 3''#9''4''#13''5\\n6', 'ShortString', []);
r:=AddStringFmtDef ('ConstUtf8TextAnsi2', 'üü1', 'AnsiString', []); r:=AddStringFmtDef ('ConstUtf8TextAnsi2', 'üü''''1', 'AnsiString', []);
r:=AddShortStrFmtDef('ConstUtf8TextShort2', 'üü1', 'ShortString', []); r:=AddShortStrFmtDef('ConstUtf8TextShort2', 'üü''''1', 'ShortString', []);
r:=AddShortStrFmtDef('ConstUtf8TextShortStr2', 'üü1', 'ShortString', []); r:=AddShortStrFmtDef('ConstUtf8TextShortStr2', 'üü''''1', 'ShortString', []);
r:=AddStringFmtDef ('VarUtf8TextAnsi2', 'üü1', 'AnsiString', []); r:=AddStringFmtDef ('VarUtf8TextAnsi2', 'üü''''1', 'AnsiString', []);
r:=AddShortStrFmtDef('VarUtf8TextShort2', 'üü1', 'ShortString', []); r:=AddShortStrFmtDef('VarUtf8TextShort2', 'üü''''1', 'ShortString', []);
r:=AddShortStrFmtDef('VarUtf8TextShortStr2', 'üü1', 'ShortString', []); r:=AddShortStrFmtDef('VarUtf8TextShortStr2', 'üü''''1', 'ShortString', []);
r:=AddStringFmtDef ('ConstUtf8TextAnsiBad', 'a ''#170''b', 'AnsiString', []); r:=AddStringFmtDef ('ConstUtf8TextAnsiBad', 'a ''#170''b', 'AnsiString', []);
r:=AddShortStrFmtDef('ConstUtf8TextShortBad', 'a ''#170''b', 'ShortString', []); r:=AddShortStrFmtDef('ConstUtf8TextShortBad', 'a ''#170''b', 'ShortString', []);