/* Language independent support for printing types for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991, 1992, 1993 Free Software Foundation, Inc.
+ Copyright 1986, 1988, 1989, 1991-1993, 1998, 2000 Free Software Foundation, Inc.
-This file is part of GDB.
+ This file is part of GDB.
-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
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
-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.
+ 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.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "obstack.h"
#include "language.h"
#include "demangle.h"
-#include <string.h>
+#include "gdb_string.h"
#include <errno.h>
+/* For real-type printing in whatis_exp() */
+extern int objectprint; /* Controls looking up an object's derived type
+ using what we find in its vtables. */
+
+extern void _initialize_typeprint PARAMS ((void));
+
static void
ptype_command PARAMS ((char *, int));
static struct type *
-ptype_eval PARAMS ((struct expression *));
+ ptype_eval PARAMS ((struct expression *));
static void
whatis_command PARAMS ((char *, int));
type_print (type, varstring, stream, show)
struct type *type;
char *varstring;
- GDB_FILE *stream;
+ struct ui_file *stream;
int show;
{
LA_PRINT_TYPE (type, varstring, stream, show, 0);
int show;
{
struct expression *expr;
- register value val;
+ register value_ptr val;
register struct cleanup *old_chain = NULL;
+ struct type *real_type = NULL;
+ int full = 0;
+ int top = -1;
+ int using_enc = 0;
if (exp)
{
expr = parse_expression (exp);
- old_chain = make_cleanup (free_current_contents, &expr);
+ old_chain = make_cleanup ((make_cleanup_func) free_current_contents,
+ &expr);
val = evaluate_type (expr);
}
else
val = access_value_history (0);
+ real_type = value_rtti_type (val, &full, &top, &using_enc);
+
printf_filtered ("type = ");
+
+ if (real_type && objectprint)
+ printf_filtered ("/* real type = %s%s */\n",
+ TYPE_NAME (real_type),
+ full ? "" : " (incomplete object)");
+ /* FIXME: maybe better to use type_print (real_type, "", gdb_stdout, -1); */
+
type_print (VALUE_TYPE (val), "", gdb_stdout, show);
printf_filtered ("\n");
else
{
expr = parse_expression (typename);
- old_chain = make_cleanup (free_current_contents, &expr);
+ old_chain = make_cleanup ((make_cleanup_func) free_current_contents,
+ &expr);
type = ptype_eval (expr);
if (type != NULL)
{
print_type_scalar (type, val, stream)
struct type *type;
LONGEST val;
- GDB_FILE *stream;
+ struct ui_file *stream;
{
unsigned int i;
unsigned len;
+ CHECK_TYPEDEF (type);
+
switch (TYPE_CODE (type))
{
fprintf_filtered (stream, val ? "TRUE" : "FALSE");
break;
+ case TYPE_CODE_RANGE:
+ print_type_scalar (TYPE_TARGET_TYPE (type), val, stream);
+ return;
+
case TYPE_CODE_UNDEF:
case TYPE_CODE_PTR:
case TYPE_CODE_ARRAY:
case TYPE_CODE_FLT:
case TYPE_CODE_VOID:
case TYPE_CODE_SET:
- case TYPE_CODE_RANGE:
case TYPE_CODE_STRING:
case TYPE_CODE_ERROR:
case TYPE_CODE_MEMBER:
gdb_flush (stream);
}
-#if MAINTENANCE_CMDS
-
/* Dump details of a type specified either directly or indirectly.
Uses the same sort of type lookup mechanism as ptype_command()
and whatis_command(). */
char *typename;
int from_tty;
{
- register value val;
+ register value_ptr val;
register struct type *type;
register struct cleanup *old_chain;
struct expression *expr;
if (typename != NULL)
- {
- expr = parse_expression (typename);
- old_chain = make_cleanup (free_current_contents, &expr);
- if (expr -> elts[0].opcode == OP_TYPE)
- {
- /* The user expression names a type directly, just use that type. */
- type = expr -> elts[1].type;
- }
- else
- {
- /* The user expression may name a type indirectly by naming an
- object of that type. Find that indirectly named type. */
- val = evaluate_type (expr);
- type = VALUE_TYPE (val);
- }
- if (type != NULL)
- {
- recursive_dump_type (type, 0);
- }
- do_cleanups (old_chain);
- }
+ {
+ expr = parse_expression (typename);
+ old_chain = make_cleanup ((make_cleanup_func) free_current_contents, &expr);
+ if (expr->elts[0].opcode == OP_TYPE)
+ {
+ /* The user expression names a type directly, just use that type. */
+ type = expr->elts[1].type;
+ }
+ else
+ {
+ /* The user expression may name a type indirectly by naming an
+ object of that type. Find that indirectly named type. */
+ val = evaluate_type (expr);
+ type = VALUE_TYPE (val);
+ }
+ if (type != NULL)
+ {
+ recursive_dump_type (type, 0);
+ }
+ do_cleanups (old_chain);
+ }
}
-
-#endif /* MAINTENANCE_CMDS */
-
\f
+
void
_initialize_typeprint ()
{