diff options
| author | DJ Delorie <dj@delorie.com> | 2007-08-31 20:20:49 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@delorie.com> | 2007-08-31 20:20:49 +0000 |
| commit | 5b8f6d8e22433f6d4ea0c67b22c72cca919fb25f (patch) | |
| tree | f65495e673b5f1e7f46ef4d427672cd4fbde30ca | |
| parent | c046eb888a9f96255a26b883248793c89ffb0df4 (diff) | |
| download | binutils-redhat-5b8f6d8e22433f6d4ea0c67b22c72cca919fb25f.tar.gz | |
merge from gcc
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/demangle.h | 3 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 10 | ||||
| -rw-r--r-- | libiberty/cp-demangle.c | 18 |
4 files changed, 35 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 188c0948c8..3c6743b2ca 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2007-08-31 Douglas Gregor <doug.gregor@gmail.com> + + * demangle.h (enum demangle_component_type): Add + DEMANGLE_COMPONENT_RVALUE_REFERENCE. + 2007-07-25 Ben Elliston <bje@au.ibm.com> * ternary.h: Remove. diff --git a/include/demangle.h b/include/demangle.h index 49f23e543e..b55226d859 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -296,6 +296,9 @@ enum demangle_component_type /* A reference. The one subtree is the type which is being referenced. */ DEMANGLE_COMPONENT_REFERENCE, + /* C++0x: An rvalue reference. The one subtree is the type which is + being referenced. */ + DEMANGLE_COMPONENT_RVALUE_REFERENCE, /* A complex type. The one subtree is the base type. */ DEMANGLE_COMPONENT_COMPLEX, /* An imaginary type. The one subtree is the base type. */ diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 8e3444820c..2e4339064e 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,13 @@ +2007-08-31 Douglas Gregor <doug.gregor@gmail.com> + + * cp-demangle.c (d_dump): Handle + DEMANGLE_COMPONENT_RVALUE_REFERENCE. + (d_make_comp): Ditto. + (cplus_demangle_type): Ditto. + (d_print_comp): Ditto. + (d_print_mod): Ditto. + (d_print_function_type): Ditto. + 2007-08-24 Kai Tietz <kai.tietz@onevision.com> * pex-common.h: (pex_funcs): Retyped wait and exec_child to pid_t. diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index e4869f029d..3fc6a2197a 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -596,6 +596,9 @@ d_dump (struct demangle_component *dc, int indent) case DEMANGLE_COMPONENT_REFERENCE: printf ("reference\n"); break; + case DEMANGLE_COMPONENT_RVALUE_REFERENCE: + printf ("rvalue reference\n"); + break; case DEMANGLE_COMPONENT_COMPLEX: printf ("complex\n"); break; @@ -785,6 +788,7 @@ d_make_comp (struct d_info *di, enum demangle_component_type type, case DEMANGLE_COMPONENT_HIDDEN_ALIAS: case DEMANGLE_COMPONENT_POINTER: case DEMANGLE_COMPONENT_REFERENCE: + case DEMANGLE_COMPONENT_RVALUE_REFERENCE: case DEMANGLE_COMPONENT_COMPLEX: case DEMANGLE_COMPONENT_IMAGINARY: case DEMANGLE_COMPONENT_VENDOR_TYPE: @@ -1726,6 +1730,7 @@ d_ctor_dtor_name (struct d_info *di) ::= <CV-qualifiers> <type> ::= P <type> ::= R <type> + ::= O <type> (C++0x) ::= C <type> ::= G <type> ::= U <source-name> <type> @@ -1892,6 +1897,12 @@ cplus_demangle_type (struct d_info *di) } break; + case 'O': + d_advance (di, 1); + ret = d_make_comp (di, DEMANGLE_COMPONENT_RVALUE_REFERENCE, + cplus_demangle_type (di), NULL); + break; + case 'P': d_advance (di, 1); ret = d_make_comp (di, DEMANGLE_COMPONENT_POINTER, @@ -1901,7 +1912,7 @@ cplus_demangle_type (struct d_info *di) case 'R': d_advance (di, 1); ret = d_make_comp (di, DEMANGLE_COMPONENT_REFERENCE, - cplus_demangle_type (di), NULL); + cplus_demangle_type (di), NULL); break; case 'C': @@ -3184,6 +3195,7 @@ d_print_comp (struct d_print_info *dpi, case DEMANGLE_COMPONENT_VENDOR_TYPE_QUAL: case DEMANGLE_COMPONENT_POINTER: case DEMANGLE_COMPONENT_REFERENCE: + case DEMANGLE_COMPONENT_RVALUE_REFERENCE: case DEMANGLE_COMPONENT_COMPLEX: case DEMANGLE_COMPONENT_IMAGINARY: { @@ -3708,6 +3720,9 @@ d_print_mod (struct d_print_info *dpi, case DEMANGLE_COMPONENT_REFERENCE: d_append_char (dpi, '&'); return; + case DEMANGLE_COMPONENT_RVALUE_REFERENCE: + d_append_string (dpi, "&&"); + return; case DEMANGLE_COMPONENT_COMPLEX: d_append_string (dpi, "complex "); return; @@ -3757,6 +3772,7 @@ d_print_function_type (struct d_print_info *dpi, { case DEMANGLE_COMPONENT_POINTER: case DEMANGLE_COMPONENT_REFERENCE: + case DEMANGLE_COMPONENT_RVALUE_REFERENCE: need_paren = 1; break; case DEMANGLE_COMPONENT_RESTRICT: |