1999-04-16 03:35:26 +02:00
|
|
|
/* Support for printing Java types for GDB, the GNU debugger.
|
2011-01-01 16:34:07 +01:00
|
|
|
Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2011
|
2008-01-01 23:53:26 +01:00
|
|
|
Free Software Foundation, Inc.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
This file is part of GDB.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-23 20:08:50 +02:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-07-07 22:19:36 +02:00
|
|
|
(at your option) any later version.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 20:08:50 +02:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
#include "value.h"
|
|
|
|
#include "demangle.h"
|
2011-11-10 21:21:29 +01:00
|
|
|
#include "gdb-demangle.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
#include "jv-lang.h"
|
|
|
|
#include "gdb_string.h"
|
|
|
|
#include "typeprint.h"
|
1999-04-26 20:34:20 +02:00
|
|
|
#include "c-lang.h"
|
(Changes from Daniel Berlin, with revisions by Jim Blandy.)
Abstract out operations specific to particular C++ ABI's, and
invoke them through a function table. This removes the C++ ABI
dependencies scattered throughout the code, and allows us to
cleanly add support for new C++ ABI's.
* cp-abi.h, cp-abi.h, gnu-v2-abi.c, hpacc-abi.c: New files.
* c-typeprint.c, c-valprint.c, dbxread.c, eval.c, gdbtypes.c,
jv-typeprint.c, linespec.c, symtab.c, typeprint.c, valops.c:
#include "cp-abi.h". These files all use functions now declared
there.
* symtab.h (OPNAME_PREFIX_P, VTBL_PREFIX_P, DESTRUCTOR_PREFIX_P):
Deleted. These services are now provided by functions declared in
cp-abi.h.
* value.h (value_rtti_type, value_virtual_fn_field): Same.
* values.c (value_virtual_fn_field): Same, for this definition.
* valops.c (value_rtti_type): Same.
* c-typeprint.c (c_type_print_base): Use the functions from
"cp-abi.h", instead of the old macros, or hard-coded ABI-specific
tests.
* dbxread.c (record_minimal_symbol): Same.
* gdbtypes.c (get_destructor_fn_field, virtual_base_index,
virtual_base_index_skip_primaries): Same.
* jv-typeprint.c (java_type_print_base): Same.
* linespec.c (find_methods, decode_line_1): Same.
* symtab.c (gdb_mangle_name): Same.
* Makefile.in (SFILES): Add the new .c files mentioned above.
(cp_abi_h): New variable.
(COMMON_OBS): Add gnu-v2-abi.o, hpacc-abi.o, and cp-abi.o.
(cp-abi.o, gnu-v2-abi.o, hpacc-abi.o): New targets.
(c-typeprint.o, c-valprint.o, dbxread.o, eval.o, gdbtypes.o,
jv-typeprint.o, symtab.o, linespec.o, typeprint.o, valops.o): Add
dependency on $(cp_abi_h).
2001-04-27 02:19:09 +02:00
|
|
|
#include "cp-abi.h"
|
2010-03-31 02:48:29 +02:00
|
|
|
#include "gdb_assert.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
1999-05-25 20:09:09 +02:00
|
|
|
/* Local functions */
|
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
static void java_type_print_base (struct type * type,
|
|
|
|
struct ui_file *stream, int show,
|
|
|
|
int level);
|
1999-05-25 20:09:09 +02:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
java_type_print_derivation_info (struct ui_file *stream, struct type *type)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
int i;
|
|
|
|
int n_bases;
|
|
|
|
int prev;
|
|
|
|
|
|
|
|
n_bases = TYPE_N_BASECLASSES (type);
|
|
|
|
|
|
|
|
for (i = 0, prev = 0; i < n_bases; i++)
|
|
|
|
{
|
|
|
|
int kind;
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
kind = BASETYPE_VIA_VIRTUAL (type, i) ? 'I' : 'E';
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
fputs_filtered (kind == prev ? ", "
|
|
|
|
: kind == 'I' ? " implements "
|
|
|
|
: " extends ",
|
|
|
|
stream);
|
|
|
|
prev = kind;
|
|
|
|
name = type_name_no_tag (TYPE_BASECLASS (type, i));
|
|
|
|
|
|
|
|
fprintf_filtered (stream, "%s", name ? name : "(null)");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i > 0)
|
|
|
|
fputs_filtered (" ", stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print the name of the type (or the ultimate pointer target,
|
|
|
|
function value or array element), or the description of a
|
|
|
|
structure or union.
|
|
|
|
|
|
|
|
SHOW positive means print details about the type (e.g. enum values),
|
|
|
|
and print structure elements passing SHOW - 1 for show.
|
|
|
|
SHOW negative means just print the type name or struct tag if there is one.
|
|
|
|
If there is no name, print something sensible but concise like
|
|
|
|
"struct {...}".
|
|
|
|
SHOW zero means just print the type name or struct tag if there is one.
|
|
|
|
If there is no name, print something sensible but not as concise like
|
|
|
|
"struct {int x; int y;}".
|
|
|
|
|
|
|
|
LEVEL is the number of spaces to indent by.
|
|
|
|
We increase it for some recursive calls. */
|
|
|
|
|
1999-05-25 20:09:09 +02:00
|
|
|
static void
|
2000-07-30 03:48:28 +02:00
|
|
|
java_type_print_base (struct type *type, struct ui_file *stream, int show,
|
|
|
|
int level)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2003-09-14 Andrew Cagney <cagney@redhat.com>
* alpha-nat.c: Remove some occurances of "register".
* alpha-tdep.c, arm-tdep.c, blockframe.c, breakpoint.c: Ditto.
* buildsym.c, c-typeprint.c, c-valprint.c, coffread.c: Ditto.
* corefile.c, cp-support.c, cp-valprint.c, cris-tdep.c: Ditto.
* dbxread.c, dcache.c, dwarf2read.c, elfread.c: Ditto.
* environ.c, eval.c, event-top.c, f-typeprint.c: Ditto.
* f-valprint.c, findvar.c, frame.c, gdbtypes.c: Ditto.
* h8300-tdep.c, hppa-tdep.c, hppab-nat.c, hppah-nat.c: Ditto.
* hppam3-nat.c, hpread.c, ia64-aix-nat.c, ia64-linux-nat.c: Ditto.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Ditto.
* infttrace.c, irix5-nat.c, jv-typeprint.c: Ditto.
* jv-valprint.c, m68k-tdep.c, m68klinux-nat.c, main.c: Ditto.
* mdebugread.c, minsyms.c, mips-linux-tdep.c: Ditto.
* mips-nat.c, mips-tdep.c, mipsread.c, mipsv4-nat.c: Ditto.
* ns32k-tdep.c, objfiles.c, p-typeprint.c: Ditto.
* p-valprint.c, ppc-linux-nat.c, printcmd.c: Ditto.
* remote-mips.c, remote-vx.c, rs6000-nat.c: Ditto.
* rs6000-tdep.c, scm-exp.c, sh-tdep.c, sh64-tdep.c: Ditto.
* solib.c, somread.c, source.c, sparc-tdep.c: Ditto.
* stabsread.c, stack.c, standalone.c, symfile.c: Ditto.
* symmisc.c, symtab.c, top.c, tracepoint.c: Ditto.
* typeprint.c, utils.c, valarith.c, valops.c: Ditto.
* values.c, vax-tdep.c, xcoffread.c: Ditto.
2003-09-14 18:32:14 +02:00
|
|
|
int i;
|
|
|
|
int len;
|
1999-04-16 03:35:26 +02:00
|
|
|
char *mangled_name;
|
|
|
|
char *demangled_name;
|
|
|
|
|
2010-05-15 01:41:05 +02:00
|
|
|
QUIT;
|
1999-04-16 03:35:26 +02:00
|
|
|
wrap_here (" ");
|
|
|
|
|
|
|
|
if (type == NULL)
|
|
|
|
{
|
|
|
|
fputs_filtered ("<type unknown>", stream);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* When SHOW is zero or less, and there is a valid type name, then always
|
|
|
|
just print the type name directly from the type. */
|
|
|
|
|
|
|
|
if (show <= 0
|
|
|
|
&& TYPE_NAME (type) != NULL)
|
|
|
|
{
|
|
|
|
fputs_filtered (TYPE_NAME (type), stream);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
CHECK_TYPEDEF (type);
|
|
|
|
|
|
|
|
switch (TYPE_CODE (type))
|
|
|
|
{
|
|
|
|
case TYPE_CODE_PTR:
|
|
|
|
java_type_print_base (TYPE_TARGET_TYPE (type), stream, show, level);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TYPE_CODE_STRUCT:
|
|
|
|
if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
|
|
|
|
{ /* array type */
|
|
|
|
char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
|
2010-05-15 01:41:05 +02:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
fputs_filtered (name, stream);
|
2000-12-15 02:01:51 +01:00
|
|
|
xfree (name);
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (show >= 0)
|
|
|
|
fprintf_filtered (stream, "class ");
|
|
|
|
|
|
|
|
if (TYPE_TAG_NAME (type) != NULL)
|
|
|
|
{
|
|
|
|
fputs_filtered (TYPE_TAG_NAME (type), stream);
|
|
|
|
if (show > 0)
|
|
|
|
fputs_filtered (" ", stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
wrap_here (" ");
|
|
|
|
|
|
|
|
if (show < 0)
|
|
|
|
{
|
|
|
|
/* If we just printed a tag name, no need to print anything else. */
|
|
|
|
if (TYPE_TAG_NAME (type) == NULL)
|
|
|
|
fprintf_filtered (stream, "{...}");
|
|
|
|
}
|
|
|
|
else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
|
|
|
|
{
|
|
|
|
java_type_print_derivation_info (stream, type);
|
1999-07-07 22:19:36 +02:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
fprintf_filtered (stream, "{\n");
|
|
|
|
if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
|
1999-04-26 20:34:20 +02:00
|
|
|
{
|
2001-12-12 03:11:52 +01:00
|
|
|
if (TYPE_STUB (type))
|
1999-04-26 20:34:20 +02:00
|
|
|
fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
|
|
|
|
else
|
|
|
|
fprintfi_filtered (level + 4, stream, "<no data fields>\n");
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/* If there is a base class for this type,
|
|
|
|
do not print the field that it occupies. */
|
|
|
|
|
|
|
|
len = TYPE_NFIELDS (type);
|
|
|
|
for (i = TYPE_N_BASECLASSES (type); i < len; i++)
|
|
|
|
{
|
|
|
|
QUIT;
|
|
|
|
/* Don't print out virtual function table. */
|
2003-02-07 01:27:31 +01:00
|
|
|
if (strncmp (TYPE_FIELD_NAME (type, i), "_vptr", 5) == 0
|
1999-04-16 03:35:26 +02:00
|
|
|
&& is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
|
|
|
|
continue;
|
|
|
|
|
2011-01-09 04:08:57 +01:00
|
|
|
/* Don't print the dummy field "class". */
|
2003-02-07 01:27:31 +01:00
|
|
|
if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0)
|
1999-04-16 03:35:26 +02:00
|
|
|
continue;
|
|
|
|
|
|
|
|
print_spaces_filtered (level + 4, stream);
|
|
|
|
|
|
|
|
if (HAVE_CPLUS_STRUCT (type))
|
1999-04-26 20:34:20 +02:00
|
|
|
{
|
|
|
|
if (TYPE_FIELD_PROTECTED (type, i))
|
|
|
|
fprintf_filtered (stream, "protected ");
|
|
|
|
else if (TYPE_FIELD_PRIVATE (type, i))
|
|
|
|
fprintf_filtered (stream, "private ");
|
|
|
|
else
|
|
|
|
fprintf_filtered (stream, "public ");
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
Convert static_kind into loc_kind enum.
* gdbtypes.h (enum field_loc_kind): New.
(union field_location): New field dwarf_block.
(struct field): Rename static_kind as loc_kind.
(FIELD_STATIC_KIND): Rename to ...
(FIELD_LOC_KIND): ... here.
(TYPE_FIELD_STATIC_KIND): Rename to ...
(TYPE_FIELD_LOC_KIND): ... here and use there now new FIELD_LOC_KIND.
(TYPE_FIELD_STATIC_HAS_ADDR): Remove.
(TYPE_FIELD_STATIC): Remove.
(TYPE_FIELD_BITPOS): Reformat.
(SET_FIELD_BITPOS): New.
(FIELD_PHYSADDR): Rename to ...
(FIELD_STATIC_PHYSADDR): ... here.
(TYPE_FIELD_STATIC_PHYSADDR): Follow the FIELD_PHYSADDR rename.
(SET_FIELD_PHYSADDR): Use new FIELD_LOC_KIND.
(FIELD_PHYSNAME): Rename to ...
(FIELD_STATIC_PHYSNAME): ... here.
(TYPE_FIELD_STATIC_PHYSNAME): Follow the FIELD_PHYSNAME rename.
(SET_FIELD_PHYSNAME): Use new FIELD_LOC_KIND.
(FIELD_DWARF_BLOCK, TYPE_FIELD_DWARF_BLOCK, SET_FIELD_DWARF_BLOCK): New.
(field_is_static): New declaration.
* gdbtypes.c (field_is_static): New function.
(copy_type_recursive): Update throughout.
* amd64-tdep.c, c-typeprint.c, coffread.c, cp-valprint.c, dwarf2read.c,
eval.c, jv-typeprint.c, jv-valprint.c, mdebugread.c, p-typeprint.c,
p-valprint.c, valops.c, value.c, varobj.c: Update throughout.
2008-10-08 14:49:13 +02:00
|
|
|
if (field_is_static (&TYPE_FIELD (type, i)))
|
1999-04-16 03:35:26 +02:00
|
|
|
fprintf_filtered (stream, "static ");
|
|
|
|
|
|
|
|
java_print_type (TYPE_FIELD_TYPE (type, i),
|
|
|
|
TYPE_FIELD_NAME (type, i),
|
|
|
|
stream, show - 1, level + 4);
|
|
|
|
|
|
|
|
fprintf_filtered (stream, ";\n");
|
|
|
|
}
|
|
|
|
|
2011-01-09 04:08:57 +01:00
|
|
|
/* If there are both fields and methods, put a space between. */
|
1999-04-16 03:35:26 +02:00
|
|
|
len = TYPE_NFN_FIELDS (type);
|
|
|
|
if (len)
|
1999-07-07 22:19:36 +02:00
|
|
|
fprintf_filtered (stream, "\n");
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2011-01-09 04:08:57 +01:00
|
|
|
/* Print out the methods. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
{
|
|
|
|
struct fn_field *f;
|
|
|
|
int j;
|
|
|
|
char *method_name;
|
|
|
|
char *name;
|
|
|
|
int is_constructor;
|
|
|
|
int n_overloads;
|
|
|
|
|
|
|
|
f = TYPE_FN_FIELDLIST1 (type, i);
|
|
|
|
n_overloads = TYPE_FN_FIELDLIST_LENGTH (type, i);
|
|
|
|
method_name = TYPE_FN_FIELDLIST_NAME (type, i);
|
|
|
|
name = type_name_no_tag (type);
|
2003-01-17 20:12:19 +01:00
|
|
|
is_constructor = name && strcmp (method_name, name) == 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
for (j = 0; j < n_overloads; j++)
|
|
|
|
{
|
2011-05-18 18:30:37 +02:00
|
|
|
const char *real_physname;
|
|
|
|
char *physname, *p;
|
1999-04-16 03:35:26 +02:00
|
|
|
int is_full_physname_constructor;
|
|
|
|
|
2010-03-31 02:48:29 +02:00
|
|
|
real_physname = TYPE_FN_FIELD_PHYSNAME (f, j);
|
|
|
|
|
|
|
|
/* The physname will contain the return type
|
|
|
|
after the final closing parenthesis. Strip it off. */
|
|
|
|
p = strrchr (real_physname, ')');
|
|
|
|
gdb_assert (p != NULL);
|
|
|
|
++p; /* Keep the trailing ')'. */
|
|
|
|
physname = alloca (p - real_physname + 1);
|
|
|
|
memcpy (physname, real_physname, p - real_physname);
|
|
|
|
physname[p - real_physname] = '\0';
|
1999-04-16 03:35:26 +02:00
|
|
|
|
(Changes from Daniel Berlin, with revisions by Jim Blandy.)
Abstract out operations specific to particular C++ ABI's, and
invoke them through a function table. This removes the C++ ABI
dependencies scattered throughout the code, and allows us to
cleanly add support for new C++ ABI's.
* cp-abi.h, cp-abi.h, gnu-v2-abi.c, hpacc-abi.c: New files.
* c-typeprint.c, c-valprint.c, dbxread.c, eval.c, gdbtypes.c,
jv-typeprint.c, linespec.c, symtab.c, typeprint.c, valops.c:
#include "cp-abi.h". These files all use functions now declared
there.
* symtab.h (OPNAME_PREFIX_P, VTBL_PREFIX_P, DESTRUCTOR_PREFIX_P):
Deleted. These services are now provided by functions declared in
cp-abi.h.
* value.h (value_rtti_type, value_virtual_fn_field): Same.
* values.c (value_virtual_fn_field): Same, for this definition.
* valops.c (value_rtti_type): Same.
* c-typeprint.c (c_type_print_base): Use the functions from
"cp-abi.h", instead of the old macros, or hard-coded ABI-specific
tests.
* dbxread.c (record_minimal_symbol): Same.
* gdbtypes.c (get_destructor_fn_field, virtual_base_index,
virtual_base_index_skip_primaries): Same.
* jv-typeprint.c (java_type_print_base): Same.
* linespec.c (find_methods, decode_line_1): Same.
* symtab.c (gdb_mangle_name): Same.
* Makefile.in (SFILES): Add the new .c files mentioned above.
(cp_abi_h): New variable.
(COMMON_OBS): Add gnu-v2-abi.o, hpacc-abi.o, and cp-abi.o.
(cp-abi.o, gnu-v2-abi.o, hpacc-abi.o): New targets.
(c-typeprint.o, c-valprint.o, dbxread.o, eval.o, gdbtypes.o,
jv-typeprint.o, symtab.o, linespec.o, typeprint.o, valops.o): Add
dependency on $(cp_abi_h).
2001-04-27 02:19:09 +02:00
|
|
|
is_full_physname_constructor
|
|
|
|
= (is_constructor_name (physname)
|
|
|
|
|| is_destructor_name (physname));
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
QUIT;
|
|
|
|
|
|
|
|
print_spaces_filtered (level + 4, stream);
|
|
|
|
|
|
|
|
if (TYPE_FN_FIELD_PROTECTED (f, j))
|
|
|
|
fprintf_filtered (stream, "protected ");
|
|
|
|
else if (TYPE_FN_FIELD_PRIVATE (f, j))
|
|
|
|
fprintf_filtered (stream, "private ");
|
|
|
|
else if (TYPE_FN_FIELD_PUBLIC (f, j))
|
|
|
|
fprintf_filtered (stream, "public ");
|
|
|
|
|
|
|
|
if (TYPE_FN_FIELD_ABSTRACT (f, j))
|
|
|
|
fprintf_filtered (stream, "abstract ");
|
|
|
|
if (TYPE_FN_FIELD_STATIC (f, j))
|
|
|
|
fprintf_filtered (stream, "static ");
|
|
|
|
if (TYPE_FN_FIELD_FINAL (f, j))
|
|
|
|
fprintf_filtered (stream, "final ");
|
|
|
|
if (TYPE_FN_FIELD_SYNCHRONIZED (f, j))
|
|
|
|
fprintf_filtered (stream, "synchronized ");
|
|
|
|
if (TYPE_FN_FIELD_NATIVE (f, j))
|
|
|
|
fprintf_filtered (stream, "native ");
|
|
|
|
|
|
|
|
if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) == 0)
|
|
|
|
{
|
|
|
|
/* Keep GDB from crashing here. */
|
|
|
|
fprintf_filtered (stream, "<undefined type> %s;\n",
|
1999-07-07 22:19:36 +02:00
|
|
|
TYPE_FN_FIELD_PHYSNAME (f, j));
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (!is_constructor && !is_full_physname_constructor)
|
|
|
|
{
|
|
|
|
type_print (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)),
|
|
|
|
"", stream, -1);
|
|
|
|
fputs_filtered (" ", stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, j))
|
|
|
|
/* Build something we can demangle. */
|
|
|
|
mangled_name = gdb_mangle_name (type, i, j);
|
|
|
|
else
|
2010-03-31 02:48:29 +02:00
|
|
|
mangled_name = physname;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
demangled_name =
|
|
|
|
cplus_demangle (mangled_name,
|
|
|
|
DMGL_ANSI | DMGL_PARAMS | DMGL_JAVA);
|
|
|
|
|
|
|
|
if (demangled_name == NULL)
|
1999-12-07 04:56:43 +01:00
|
|
|
demangled_name = xstrdup (mangled_name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
{
|
|
|
|
char *demangled_no_class;
|
|
|
|
char *ptr;
|
|
|
|
|
|
|
|
ptr = demangled_no_class = demangled_name;
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
{
|
|
|
|
char c;
|
|
|
|
|
|
|
|
c = *ptr++;
|
|
|
|
|
|
|
|
if (c == 0 || c == '(')
|
|
|
|
break;
|
|
|
|
if (c == '.')
|
|
|
|
demangled_no_class = ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
fputs_filtered (demangled_no_class, stream);
|
2000-12-15 02:01:51 +01:00
|
|
|
xfree (demangled_name);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (TYPE_FN_FIELD_STUB (f, j))
|
2000-12-15 02:01:51 +01:00
|
|
|
xfree (mangled_name);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
fprintf_filtered (stream, ";\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintfi_filtered (level, stream, "}");
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-07-07 22:19:36 +02:00
|
|
|
default:
|
|
|
|
c_type_print_base (type, stream, show, level);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* LEVEL is the depth to indent lines by. */
|
|
|
|
|
2000-02-02 01:21:19 +01:00
|
|
|
extern void c_type_print_varspec_suffix (struct type *, struct ui_file *,
|
|
|
|
int, int, int);
|
1999-04-26 20:34:20 +02:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
void
|
2010-06-14 10:26:57 +02:00
|
|
|
java_print_type (struct type *type, const char *varstring,
|
|
|
|
struct ui_file *stream, int show, int level)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int demangled_args;
|
|
|
|
|
|
|
|
java_type_print_base (type, stream, show, level);
|
|
|
|
|
|
|
|
if (varstring != NULL && *varstring != '\0')
|
|
|
|
{
|
|
|
|
fputs_filtered (" ", stream);
|
|
|
|
fputs_filtered (varstring, stream);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For demangled function names, we have the arglist as part of the name,
|
2011-01-09 04:08:57 +01:00
|
|
|
so don't print an additional pair of ()'s. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2007-05-14 18:44:27 +02:00
|
|
|
demangled_args = varstring != NULL && strchr (varstring, '(') != NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
|
|
|
|
}
|