diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2000-09-13 22:59:40 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@axis.com> | 2000-09-13 22:59:40 +0000 |
| commit | d3e8500506c29c035b8f35c09019b6736f556acd (patch) | |
| tree | e766eb9a849f5ce03c3a0e4d1a9fc7af799c5419 | |
| parent | 064002de2b47fd7dc86feefc50dd489ca110cff0 (diff) | |
| download | gdb-d3e8500506c29c035b8f35c09019b6736f556acd.zip gdb-d3e8500506c29c035b8f35c09019b6736f556acd.tar.gz gdb-d3e8500506c29c035b8f35c09019b6736f556acd.tar.bz2 | |
* testsuite/demangle-expected: Add two tests for anonymous
namespaces.
* cplus-dem.c (gnu_special): Handle anonymous namespaces.
| -rw-r--r-- | libiberty/ChangeLog | 7 | ||||
| -rw-r--r-- | libiberty/cplus-dem.c | 19 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 8 |
3 files changed, 33 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 27de2ac..a415366 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,8 +1,13 @@ +2000-09-14 Hans-Peter Nilsson <hp@axis.com> + + * testsuite/demangle-expected: Add two tests for anonymous + namespaces. + * cplus-dem.c (gnu_special): Handle anonymous namespaces. + 2000-09-10 Hans-Peter Nilsson <hp@axis.com> * testsuite/demangle-expected: Add four tests for type_info mangling. - * cplus-dem.c (gnu_special): Use do_type, not demangle_fund_type, for a non-template non-qualified type_info function or node. diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c index da95133..8a672c6 100644 --- a/libiberty/cplus-dem.c +++ b/libiberty/cplus-dem.c @@ -2812,6 +2812,25 @@ gnu_special (work, mangled, declp) success = 0; break; } + + if (n > 10 && strncmp (*mangled, "_GLOBAL_", 8) == 0 + && (*mangled)[9] == 'N' + && (*mangled)[8] == (*mangled)[10] + && strchr (cplus_markers, (*mangled)[8])) + { + /* A member of the anonymous namespace. There's information + about what identifier or filename it was keyed to, but + it's just there to make the mangled name unique; we just + step over it. */ + string_append (declp, "{anonymous}"); + (*mangled) += n; + + /* Now p points to the marker before the N, so we need to + update it to the first marker after what we consumed. */ + p = strpbrk (*mangled, cplus_markers); + break; + } + string_appendn (declp, *mangled, n); (*mangled) += n; } diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index fb6448c..a5d72fa 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -2558,3 +2558,11 @@ sockaddr * type_info node --format=gnu __tiPQ25libcwt16option_event_tct1Z12burst_app_ct libcw::option_event_tct<burst_app_ct> * type_info node +# +--format=gnu +_27_GLOBAL_.N.__12burst_app_ct.app_instance +{anonymous}::app_instance +# +--format=gnu +_26_GLOBAL_\$N\$_tmp_n.iilg4Gya\$app_instance +{anonymous}::app_instance |