cplus-dem.c (do_type): Handle pointer to member types whose enclosing classes have namespace scope.

* cplus-dem.c (do_type): Handle pointer to member types whose
	enclosing classes have namespace scope.

From-SVN: r29901
This commit is contained in:
Mark Mitchell 1999-10-11 08:32:10 +00:00 committed by Mark Mitchell
parent ba33cb50d6
commit 7c56a6cef7
3 changed files with 23 additions and 1 deletions

View File

@ -1,3 +1,8 @@
1999-10-11 Mark Mitchell <mark@codesourcery.com>
* cplus-dem.c (do_type): Handle pointer to member types whose
enclosing classes have namespace scope.
Sun Oct 10 01:23:50 1999 Marc Espie <espie@cvs.openbsd.org>
* config.table: Provide a backup shell for executing move-if-change.

View File

@ -3072,7 +3072,12 @@ do_type (work, mangled, result)
(*mangled)++;
string_append (&decl, ")");
string_prepend (&decl, SCOPE_STRING (work));
/* We don't need to prepend `::' for a qualified name;
demangle_qualified will do that for us. */
if (**mangled != 'Q')
string_prepend (&decl, SCOPE_STRING (work));
if (isdigit ((unsigned char)**mangled))
{
n = consume_count (mangled);
@ -3105,6 +3110,14 @@ do_type (work, mangled, result)
else
break;
}
else if (**mangled == 'Q')
{
success = demangle_qualified (work, mangled, &decl,
/*isfuncnam=*/0,
/*append=*/0);
if (!success)
break;
}
else
{
success = 0;

View File

@ -2470,3 +2470,7 @@ _Utf390_1__1_9223372036854775807__9223372036854775
--format=gnu
call__H1Z4Test_RX01_t1C2ZX01PMX01FPX01i_vQ2X016output
C<Test, Test::output> call<Test>(Test &)
#
--format=gnu
fn__FPQ21n1cPMQ21n1cFPQ21n1c_i
fn(n::c *, int (n::c::*)(n::c *))