* cpphash.c (collect_params): Fix off-by-one error.

	(dump_hash_helper): Dump all four macro nodetypes.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33613 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c751b6f..020031c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-02  Zack Weinberg  <zack@wolery.cumb.org>
+
+       * cpphash.c (collect_params): Fix off-by-one error.
+       (dump_hash_helper): Dump all four macro nodetypes.
+
 2000-05-02  Jakub Jelinek  <jakub@redhat.com>
 
        * cpphash.c (trad_stringify): Adjust p after stringification as

diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index 3fcd006..8684b65 100644 (file)
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -804,7 +804,7 @@ collect_params (pfile, list, arglist)
        argv[a].len = len;
        argv[a].name = p;
        argv[a].rest_arg = 0;
-       p += len;
+       p += len + 1;
        a++;
        break;
 
@@ -1934,7 +1934,8 @@ dump_hash_helper (h, p)
   HASHNODE *hp = (HASHNODE *)*h;
   cpp_reader *pfile = (cpp_reader *)p;
 
-  if (hp->type == T_MACRO)
+  if (hp->type == T_MACRO || hp->type == T_FMACRO
+      || hp->type == T_IDENTITY || hp->type == T_EMPTY)
     _cpp_dump_definition (pfile, hp);
   return 1;
 }