diff options
author | Iain Buclaw <ibuclaw@gdcproject.org> | 2017-05-27 11:29:52 +0000 |
---|---|---|
committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2017-05-27 11:29:52 +0000 |
commit | 0e3712f6aa8dcd27433ac8090a0d1c48976003ae (patch) | |
tree | e7902a4dfb5a0be30b80f4b0e0366df50eeabd62 /libiberty/d-demangle.c | |
parent | 1a122a71eeb0671f92037ccdf5d2dc0b307af620 (diff) |
d-demangle.c (dlang_call_convention_p): Move declaration before dlang_type.
libiberty/ChangeLog:
* d-demangle.c (dlang_call_convention_p): Move declaration
before dlang_type.
(dlang_type): Handle function types.
* testsuite/d-demangle-expected: Add tests.
From-SVN: r248538
Diffstat (limited to 'libiberty/d-demangle.c')
-rw-r--r-- | libiberty/d-demangle.c | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/libiberty/d-demangle.c b/libiberty/d-demangle.c index 030cab3333f..829050bc0b8 100644 --- a/libiberty/d-demangle.c +++ b/libiberty/d-demangle.c @@ -251,6 +251,22 @@ dlang_hexdigit (const char *mangled, char *ret) return mangled; } +/* Extract the function calling convention from MANGLED and + return 1 on success or 0 on failure. */ +static int +dlang_call_convention_p (const char *mangled) +{ + switch (*mangled) + { + case 'F': case 'U': case 'V': + case 'W': case 'R': case 'Y': + return 1; + + default: + return 0; + } +} + /* Demangle the calling convention from MANGLED and append it to DECL. Return the remaining string on success or NULL on failure. */ static const char * @@ -600,17 +616,22 @@ dlang_type (string *decl, const char *mangled) } case 'P': /* pointer (T*) */ mangled++; - /* Function pointer types don't include the trailing asterisk. */ - switch (*mangled) + if (!dlang_call_convention_p (mangled)) { - case 'F': case 'U': case 'W': - case 'V': case 'R': case 'Y': - mangled = dlang_function_type (decl, mangled); - string_append (decl, "function"); + mangled = dlang_type (decl, mangled); + string_append (decl, "*"); return mangled; } - mangled = dlang_type (decl, mangled); - string_append (decl, "*"); + /* Fall through */ + case 'F': /* function T (D) */ + case 'U': /* function T (C) */ + case 'W': /* function T (Windows) */ + case 'V': /* function T (Pascal) */ + case 'R': /* function T (C++) */ + case 'Y': /* function T (Objective-C) */ + /* Function pointer types don't include the trailing asterisk. */ + mangled = dlang_function_type (decl, mangled); + string_append (decl, "function"); return mangled; case 'I': /* ident T */ case 'C': /* class T */ @@ -1311,22 +1332,6 @@ dlang_value (string *decl, const char *mangled, const char *name, char type) return mangled; } -/* Extract the function calling convention from MANGLED and - return 1 on success or 0 on failure. */ -static int -dlang_call_convention_p (const char *mangled) -{ - switch (*mangled) - { - case 'F': case 'U': case 'V': - case 'W': case 'R': case 'Y': - return 1; - - default: - return 0; - } -} - /* Extract and demangle the symbol in MANGLED and append it to DECL. Returns the remaining signature on success or NULL on failure. */ static const char * |