re PR libstdc++/13045 (Demangler does demangle floating values.)

PR libstdc++/13045
* bits/demangle.h
namespace __gnu_cxx::demangler
(enum substitution_nt): Removed trailing comma.
(implementation_details): Added.
(session<Allocator>::M_implementation_details): Added.
(session<Allocator>::session): Pass implementation_details.
(session<Allocator>::decode_encoding): Same.
(session<Allocator>::decode_real): Added.
(_GLIBCXX_DEMANGLER_STYLE_VOID _GLIBCXX_DEMANGLER_STYLE_LITERAL
_GLIBCXX_DEMANGLER_STYLE_LITERAL_INT
_GLIBCXX_DEMANGLER_STYLE_COMPACT_EXPR_OPS
_GLIBCXX_DEMANGLER_STYLE_SIZEOF_TYPENAME): Replaced with
implementation_details equivalent.
(session<Allocator>::decode_expression):
Use M_implementation_details instead of macros. Add extra parentheses
around 'larger than' operator in expressions in template arguments.
(session<Allocator>::decode_bare_function_type): Idem.
(session<Allocator>::decode_literal):
Idem, and call decode_real for floating literals.
(session<Allocator>::decode_type_with_postfix): Put the postfix
of the return type of (member) functions after the function
instead of after the return type.  Also, put a space after the
prefix of qualified function pointers: "int (* const<space>".
* src/demangle.cc: include most dependent header file first.
* testsuite/demangle/regression/cw-16.cc: Updated two
and added three tests.

From-SVN: r74304

libstdc++-v3/ChangeLog

+2003-12-05  Carlo Wood  <carlo@alinoe.com>
+
+	PR libstdc++/13045
+	* bits/demangle.h
+	namespace __gnu_cxx::demangler
+	(enum substitution_nt): Removed trailing comma.
+	(implementation_details): Added.
+	(session<Allocator>::M_implementation_details): Added.
+	(session<Allocator>::session): Pass implementation_details.
+	(session<Allocator>::decode_encoding): Same.
+	(session<Allocator>::decode_real): Added.
+	(_GLIBCXX_DEMANGLER_STYLE_VOID _GLIBCXX_DEMANGLER_STYLE_LITERAL
+	_GLIBCXX_DEMANGLER_STYLE_LITERAL_INT
+	_GLIBCXX_DEMANGLER_STYLE_COMPACT_EXPR_OPS
+	_GLIBCXX_DEMANGLER_STYLE_SIZEOF_TYPENAME): Replaced with
+	implementation_details equivalent.
+	(session<Allocator>::decode_expression):
+	Use M_implementation_details instead of macros. Add extra parentheses
+	around 'larger than' operator in expressions in template arguments.
+	(session<Allocator>::decode_bare_function_type): Idem.
+	(session<Allocator>::decode_literal):
+	Idem, and call decode_real for floating literals.
+	(session<Allocator>::decode_type_with_postfix): Put the postfix
+	of the return type of (member) functions after the function
+	instead of after the return type.  Also, put a space after the
+	prefix of qualified function pointers: "int (* const<space>".
+	* src/demangle.cc: include most dependent header file first.
+	* testsuite/demangle/regression/cw-16.cc: Updated two
+	and added three tests.
+
 2003-12-04  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/13284

libstdc++-v3/src/demangle.cc

@@ -28,8 +28,8 @@
 // invalidate any other reasons why the executable file might be covered by
 // the GNU General Public License.
 
-#include <cxxabi.h>
 #include <bits/demangle.h>
+#include <cxxabi.h>
 
 // __cxa_demangle
 //

libstdc++-v3/testsuite/demangle/regression/cw-16.cc

@@ -32,15 +32,22 @@ verify_demangle("_Z3fooIA6_KiEvA9_KT_rVPrS4_",
 		"void foo<int const [6]>(int const [9][6], int const restrict (* volatile restrict) [9][6])");
 // 2003/11/12, libstdc++/12947
 verify_demangle("_Z1fILi5E1AEvN1CIXqugtT_Li0ELi1ELi2EEE1qE",
-                "void f<5, A>(C<((5) > (0)) ? (1) : (2)>::q)");
+                "void f<5, A>(C<(((5) > (0))) ? (1) : (2)>::q)");
 verify_demangle("_Z1fILi5EEvN1AIXcvimlT_Li22EEE1qE",
                 "void f<5>(A<(int)((5) * (22))>::q)");
 verify_demangle("_Z1fPFYPFiiEiE",
-                "f(int (*)(int) (*) [extern \"C\"] (int))");
+                "f(int (*(*) [extern \"C\"] (int))(int))");
 verify_demangle("_Z1fI1XENT_1tES2_",
                 "X::t f<X>(X::t)");
 verify_demangle("_Z1fILi5E1AEvN1CIXstN1T1tEEXszsrS2_1tEE1qE",
                 "void f<5, A>(C<sizeof (T::t), sizeof (T::t)>::q)");
+// 2003/12/03, libstdc++/13045
+verify_demangle("_Z1fILi1ELc120EEv1AIXplT_cviLd4028ae147ae147aeEEE",
+                "void f<1, (char)120>(A<(1) + ((int)((double)[4028ae147ae147ae]))>)");
+verify_demangle("_Z1fILi1ELc120EEv1AIXplT_cviLf3f800000EEE",
+                "void f<1, (char)120>(A<(1) + ((int)((float)[3f800000]))>)");
+verify_demangle("_Z9hairyfuncM1YKFPVPFrPA2_PM1XKFKPA3_ilEPcEiE",
+                "hairyfunc(int (* const (X::** (* restrict (* volatile* (Y::*)(int) const)(char*)) [2])(long) const) [3])");
 
   return 0;
 }