diff options
| author | Tom Tromey <tromey@redhat.com> | 2008-12-12 17:03:37 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2008-12-12 17:03:37 +0000 |
| commit | 17c8aaf5078f15d4cd621a5428a82080a7f4c516 (patch) | |
| tree | fcedb227ffe2eabd84c347593e64bc3992776ce7 /gdb | |
| parent | cc704ebecf3fd0ca95eadf7a89c6dfd4446e5c26 (diff) | |
| download | binutils-17c8aaf5078f15d4cd621a5428a82080a7f4c516.tar.gz binutils-17c8aaf5078f15d4cd621a5428a82080a7f4c516.tar.bz2 binutils-17c8aaf5078f15d4cd621a5428a82080a7f4c516.zip | |
gdb
* macroexp.c (get_pp_number): Require digit after leading ".".
Correctly handle suffixes.
gdb/testsuite
* gdb.base/macscp.exp: New regression test.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/macroexp.c | 18 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/macscp.exp | 8 |
4 files changed, 27 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9a1956911ed..1b31438ccf4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 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 macro name. (print_one_macro): Print space after macro name. diff --git a/gdb/macroexp.c b/gdb/macroexp.c index 7fb23ce65b3..dda3592db31 100644 --- a/gdb/macroexp.c +++ b/gdb/macroexp.c @@ -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; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index cc5e3655bce..71f97129236 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 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". * gdb.base/macscp1.c (struct outer): New struct. (address): New global. diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp index f7553a5c986..b6d6016dba5 100644 --- a/gdb/testsuite/gdb.base/macscp.exp +++ b/gdb/testsuite/gdb.base/macscp.exp @@ -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" |