gdb

	* macroexp.c (get_pp_number): Require digit after leading ".".
	Correctly handle suffixes.
gdb/testsuite
	* gdb.base/macscp.exp: New regression test.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9a1956911edb17864aebb16c71181312d8b0364f..1b31438ccf4692fd23362868c7c8dad591117c44 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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

diff --git a/gdb/macroexp.c b/gdb/macroexp.c
index 7fb23ce65b3e90fd7bbfbf5a10f80cba59b64302..dda3592db317db70ecf368cd4d9008d305b3de61 100644 (file)
--- 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 cc5e3655bce810e3e2fa8d4e619c28bd6a926873..71f97129236c4a6dad5569423acc9b14bf2ab50f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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".

diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index f7553a5c986c0c588228a0ac53936a0868988a34..b6d6016dba55099d0e785ba0f8fa9e279ed50a18 100644 (file)
--- 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"