cp-demangle.c (demangle_type_ptr): Increment position past pointer and reference...

	* cp-demangle.c (demangle_type_ptr): Increment position past
	pointer and reference characters.

From-SVN: r36151

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 0a474a3..b848632 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,5 +1,10 @@
 2000-09-04  Alex Samuel  <samuel@codesourcery.com>
 
+       * cp-demangle.c (demangle_type_ptr): Increment position past
+       pointer and reference characters.
+
+2000-09-04  Alex Samuel  <samuel@codesourcery.com>
+
        * cp-demangle.c (demangle_nv_offset): New function.
        (demangle_v_offset): Likewise.
        (demangle_call_offset): Likewise.

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index b4e55ee..2407c2b 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -2015,6 +2015,9 @@ demangle_type_ptr (dm, insert_pos, substitution_start)
       /* Insert an asterisk where we're told to; it doesn't
         necessarily go at the end.  */
       RETURN_IF_ERROR (result_insert_char (dm, *insert_pos, '*'));
+      /* The next (outermost) pointer or reference character should go
+        after this one.  */
+      ++(*insert_pos);
     }
   else if (next == 'R')
     {
@@ -2026,6 +2029,9 @@ demangle_type_ptr (dm, insert_pos, substitution_start)
       /* Insert an ampersand where we're told to; it doesn't
         necessarily go at the end.  */
       RETURN_IF_ERROR (result_insert_char (dm, *insert_pos, '&'));
+      /* The next (outermost) pointer or reference character should go
+        after this one.  */
+      ++(*insert_pos);
     }
   else if (next == 'M')
     {