OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

d-demangle.c (dlang_call_convention_p): Move declaration before dlang_type.

Browse Source 
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
This commit is contained in:
Iain Buclaw 2017-05-27 11:29:52 +00:00 committed by Iain Buclaw
parent 1a122a71ee
commit 0e3712f6aa
3 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libiberty/ChangeLog
View File

@ -1,3 +1,10 @@
2017-05-27 Iain Buclaw <ibuclaw@gdcproject.org>
* d-demangle.c (dlang_call_convention_p): Move declaration
before dlang_type.
(dlang_type): Handle function types.
* testsuite/d-demangle-expected: Add tests.
2017-05-27 Iain Buclaw <ibuclaw@gdcproject.org>
* d-demangle.c (dlang_parse_real): Remove stack buffer, write

53
libiberty/d-demangle.c
View File

@ -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 *

8
libiberty/testsuite/d-demangle-expected
View File

@ -886,6 +886,10 @@ _D8demangle35__T4testVS8demangle1SS2i1a3_616263Zv
demangle.test!(demangle.S(1, "abc"))
#
--format=dlang
_D8demangle13__T4testTFZaZ6mangleFZv
demangle.test!(char() function).mangle()
#
--format=dlang
_D8demangle4testMxFZv
demangle.test() const
#
@ -1298,3 +1302,7 @@ std.traits.fqnSym!(std).adjustIdent(immutable(char)[])
--format=dlang
_D2rt8lifetime36__T14_d_newarrayOpTS13_d_newarrayiTZ14_d_newarrayOpTFNaNbxC8TypeInfomPmZAv
rt.lifetime._d_newarrayOpT!(_d_newarrayiT)._d_newarrayOpT(const(TypeInfo), ulong, ulong*)
#
--format=dlang
_D4core8demangle16__T6mangleTFZPvZ6mangleFNaNbNfAxaAaZ11DotSplitter5emptyMxFNaNbNdNiNfZb
core.demangle.mangle!(void*() function).mangle(const(char)[], char[]).DotSplitter.empty() const