cplus-dem.c (demangle_fund_type): Process CV and u codes before bumping the pointer...

Fri Dec 18 16:11:43 EST 1998  Andrew MacLeod  <amacleod@cygnus.com>
	* cplus-dem.c (demangle_fund_type): Process CV and u codes before
	bumping the pointer we read from. Also prepend these codes,
	as we do in other places.

From-SVN: r24374

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 4ee7acf398bbf90aba749b153c52ef061c91c6c0..b681f2082ee733e6eeb9d80e405c5b0e4c432a69 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 18 16:11:43 EST 1998  Andrew MacLeod  <amacleod@cygnus.com>
+
+       * cplus-dem.c (demangle_fund_type): Process CV and u codes before
+       bumping the pointer we read from. Also prepend these codes,
+       as we do in other places.
+
 Mon Dec 14 09:55:50 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * choose-temp.c: Don't check IN_GCC anymore.

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 2293aa24d02561b64deaa740f955dfa1161372f0..1d0ef28ae72a239d44bb3f956ec7a7d9b7351b30 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -3153,12 +3153,13 @@ demangle_fund_type (work, mangled, result)
        case 'C':
        case 'V':
        case 'u':
-         (*mangled)++;
          if (PRINT_ANSI_QUALIFIERS)
            {
-             APPEND_BLANK (result);
-             string_append (result, demangle_qualifier (**mangled));
+              if (!STRING_EMPTY (result))
+                string_prepend (result, " ");
+             string_prepend (result, demangle_qualifier (**mangled));
            }
+         (*mangled)++;
          break;
        case 'U':
          (*mangled)++;