darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gdb

Browse source 
* macroexp.c (get_pp_number): Require digit after leading ".".
	Correctly handle suffixes.
gdb/testsuite
	* gdb.base/macscp.exp: New regression test.
This commit is contained in:
Tom Tromey 2008-12-12 17:03:37 +00:00
parent cc704ebecf
commit 17c8aaf507
4 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2008-12-11 Tom Tromey <tromey@redhat.com>
* macroexp.c (get_pp_number): Require digit after leading ".".
Correctly handle suffixes.
2008-12-11 Tom Tromey <tromey@redhat.com>
* macrocmd.c (macro_define_command): Skip whitespace after

18
gdb/macroexp.c
View file

@ -278,20 +278,22 @@ get_pp_number (struct macro_buffer *tok, char *p, char *end)
{
if (p < end
&& (macro_is_digit (*p)
|| *p == '.'))
|| (*p == '.'
&& p + 2 <= end
&& macro_is_digit (p[1]))))
{
char *tok_start = p;
while (p < end)
{
if (macro_is_digit (*p)
|| macro_is_identifier_nondigit (*p)
|| *p == '.')
p++;
else if (p + 2 <= end
&& strchr ("eEpP.", *p)
&& (p[1] == '+' || p[1] == '-'))
if (p + 2 <= end
&& strchr ("eEpP", *p)
&& (p[1] == '+' || p[1] == '-'))
p += 2;
else if (macro_is_digit (*p)
|| macro_is_identifier_nondigit (*p)
|| *p == '.')
p++;
else
break;
}

4
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,7 @@
2008-12-11 Tom Tromey <tromey@redhat.com>
* gdb.base/macscp.exp: New regression test.
2008-12-11 Tom Tromey <tromey@redhat.com>
* gdb.base/macscp.exp: Print "address.addr".

8
gdb/testsuite/gdb.base/macscp.exp
View file

@ -656,3 +656,11 @@ gdb_test "print str(maude)" \
gdb_test "print xstr(maude)" \
" = \"5\"" \
"stringify with substitution"
# Regression test for pp-number bug.
gdb_test "macro define si_addr fields.fault.si_addr" \
"" \
"define si_addr macro"
gdb_test "macro expand siginfo.si_addr" \
"expands to: siginfo.fields.fault.si_addr" \
"macro expand siginfo.si_addr"