* cplus-dem.c (do_type): Use demangle_template_value_parm for arrays.

From-SVN: r21325

gcc/ChangeLog

+Tue Jul 21 13:28:19 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* cplus-dem.c (do_type): Use demangle_template_value_parm for arrays.
+
+Sun Jul 12 01:27:05 1998  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* fold-const.c (non_lvalue): Don't deal with null pointer 
+	constants here.
+	(fold, case COMPOUND_EXPR): Wrap a constant 0 in a NOP_EXPR.
+
 Tue Jul 21 15:49:31 1998  David Edelsohn  <edelsohn@mhpcc.edu>
 
 	* rs6000.h (PREDICATE_CODES): Add CONSTANT_P_RTX.

gcc/cplus-dem.c

@@ -2535,22 +2535,13 @@ do_type (work, mangled, result)
 	  /* An array */
 	case 'A':
 	  {
-	    const char *p = ++(*mangled);
-
+	    ++(*mangled);
 	    string_prepend (&decl, "(");
 	    string_append (&decl, ")[");
-	    /* Copy anything up until the next underscore (the size of the
-	       array).  */
-	    while (**mangled && **mangled != '_')
-	      ++(*mangled);
+	    success = demangle_template_value_parm (work, mangled, &decl);
 	    if (**mangled == '_')
-	      {
-		string_appendn (&decl, p, *mangled - p);
-		string_append (&decl, "]");             
-		*mangled += 1;
-	      }
-	    else
-	      success = 0;
+	      ++(*mangled);
+	    string_append (&decl, "]");
 	    break;
 	  }