X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftypeprint.c;h=1f824faafb2a171feb4b6a8c7b609e97a791d63e;hb=5a7c5e86304d6298cbeee81f07b626b194980073;hp=8e517a0659901a899d32b0815d0fef46b6681882;hpb=1bac305b7206372b7f2266851d6cc1ee2cb9d7ca;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 8e517a0659..1f824faafb 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -1,13 +1,13 @@
/* Language independent support for printing types for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998,
- 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 1999,
+ 2000, 2001, 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "gdb_obstack.h"
@@ -33,24 +31,21 @@
#include "target.h"
#include "language.h"
#include "cp-abi.h"
-
+#include "typeprint.h"
#include "gdb_string.h"
+#include "exceptions.h"
+#include "valprint.h"
#include
-/* 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 (void);
static void ptype_command (char *, int);
-static struct type *ptype_eval (struct expression *);
-
static void whatis_command (char *, int);
static void whatis_exp (char *, int);
+
/* Print a description of a type in the format of a
typedef for the current language.
NEW is the new name for a type TYPE. */
@@ -58,41 +53,16 @@ static void whatis_exp (char *, int);
void
typedef_print (struct type *type, struct symbol *new, struct ui_file *stream)
{
- CHECK_TYPEDEF (type);
- switch (current_language->la_language)
- {
-#ifdef _LANG_c
- case language_c:
- case language_cplus:
- fprintf_filtered (stream, "typedef ");
- type_print (type, "", stream, 0);
- if (TYPE_NAME ((SYMBOL_TYPE (new))) == 0
- || !STREQ (TYPE_NAME ((SYMBOL_TYPE (new))), SYMBOL_NAME (new)))
- fprintf_filtered (stream, " %s", SYMBOL_SOURCE_NAME (new));
- break;
-#endif
-#ifdef _LANG_m2
- case language_m2:
- fprintf_filtered (stream, "TYPE ");
- if (!TYPE_NAME (SYMBOL_TYPE (new)) ||
- !STREQ (TYPE_NAME (SYMBOL_TYPE (new)), SYMBOL_NAME (new)))
- fprintf_filtered (stream, "%s = ", SYMBOL_SOURCE_NAME (new));
- else
- fprintf_filtered (stream, " = ");
- type_print (type, "", stream, 0);
- break;
-#endif
-#ifdef _LANG_pascal
- case language_pascal:
- fprintf_filtered (stream, "type ");
- fprintf_filtered (stream, "%s = ", SYMBOL_SOURCE_NAME (new));
- type_print (type, "", stream, 0);
- break;
-#endif
- default:
- error ("Language not supported.");
- }
- fprintf_filtered (stream, ";\n");
+ LA_PRINT_TYPEDEF (type, new, stream);
+}
+
+/* The default way to print a typedef. */
+
+void
+default_print_typedef (struct type *type, struct symbol *new_symbol,
+ struct ui_file *stream)
+{
+ error (_("Language not supported."));
}
/* Print a description of a type TYPE in the form of a declaration of a
@@ -109,6 +79,34 @@ type_print (struct type *type, char *varstring, struct ui_file *stream,
LA_PRINT_TYPE (type, varstring, stream, show, 0);
}
+/* Print TYPE to a string, returning it. The caller is responsible for
+ freeing the string. */
+
+char *
+type_to_string (struct type *type)
+{
+ char *s = NULL;
+ long dummy;
+ struct ui_file *stb;
+ struct cleanup *old_chain;
+ volatile struct gdb_exception except;
+
+ stb = mem_fileopen ();
+ old_chain = make_cleanup_ui_file_delete (stb);
+
+ TRY_CATCH (except, RETURN_MASK_ALL)
+ {
+ type_print (type, "", stb, -1);
+ s = ui_file_xstrdup (stb, &dummy);
+ }
+ if (except.reason < 0)
+ s = NULL;
+
+ do_cleanups (old_chain);
+
+ return s;
+}
+
/* Print type of EXP, or last thing in value history if EXP == NULL.
show is passed to type_print. */
@@ -117,12 +115,13 @@ whatis_exp (char *exp, int show)
{
struct expression *expr;
struct value *val;
- register struct cleanup *old_chain = NULL;
+ struct cleanup *old_chain = NULL;
struct type *real_type = NULL;
struct type *type;
int full = 0;
int top = -1;
int using_enc = 0;
+ struct value_print_options opts;
if (exp)
{
@@ -133,14 +132,14 @@ whatis_exp (char *exp, int show)
else
val = access_value_history (0);
- type = VALUE_TYPE (val);
+ type = value_type (val);
- if (objectprint)
+ get_user_print_options (&opts);
+ if (opts.objectprint)
{
- if (((TYPE_CODE (type) == TYPE_CODE_PTR) ||
- (TYPE_CODE (type) == TYPE_CODE_REF))
- &&
- (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
+ if (((TYPE_CODE (type) == TYPE_CODE_PTR)
+ || (TYPE_CODE (type) == TYPE_CODE_REF))
+ && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_CLASS))
{
real_type = value_rtti_target_type (val, &full, &top, &using_enc);
if (real_type)
@@ -152,7 +151,7 @@ whatis_exp (char *exp, int show)
}
}
else if (TYPE_CODE (type) == TYPE_CODE_CLASS)
- real_type = value_rtti_type (val, &full, &top, &using_enc);
+ real_type = value_rtti_type (val, &full, &top, &using_enc);
}
printf_filtered ("type = ");
@@ -173,7 +172,6 @@ whatis_exp (char *exp, int show)
do_cleanups (old_chain);
}
-/* ARGSUSED */
static void
whatis_command (char *exp, int from_tty)
{
@@ -183,56 +181,12 @@ whatis_command (char *exp, int from_tty)
whatis_exp (exp, -1);
}
-/* Simple subroutine for ptype_command. */
-
-static struct type *
-ptype_eval (struct expression *exp)
-{
- if (exp->elts[0].opcode == OP_TYPE)
- {
- return (exp->elts[1].type);
- }
- else
- {
- return (NULL);
- }
-}
-
/* TYPENAME is either the name of a type, or an expression. */
-/* ARGSUSED */
static void
ptype_command (char *typename, int from_tty)
{
- register struct type *type;
- struct expression *expr;
- register struct cleanup *old_chain;
-
- if (typename == NULL)
- {
- /* Print type of last thing in value history. */
- whatis_exp (typename, 1);
- }
- else
- {
- expr = parse_expression (typename);
- old_chain = make_cleanup (free_current_contents, &expr);
- type = ptype_eval (expr);
- if (type != NULL)
- {
- /* User did "ptype " */
- printf_filtered ("type = ");
- type_print (type, "", gdb_stdout, 1);
- printf_filtered ("\n");
- do_cleanups (old_chain);
- }
- else
- {
- /* User did "ptype " */
- do_cleanups (old_chain);
- whatis_exp (typename, 1);
- }
- }
+ whatis_exp (typename, 1);
}
/* Print integral scalar data VAL, of type TYPE, onto stdio stream STREAM.
@@ -245,7 +199,7 @@ ptype_command (char *typename, int from_tty)
currently use it, and it wasn't clear if it really belonged somewhere
else (like printcmd.c). There are a lot of other gdb routines that do
something similar, but they are generally concerned with printing values
- that come from the inferior in target byte order and target size. */
+ that come from the inferior in target byte order and target size. */
void
print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
@@ -304,28 +258,30 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
case TYPE_CODE_SET:
case TYPE_CODE_STRING:
case TYPE_CODE_ERROR:
- case TYPE_CODE_MEMBER:
+ case TYPE_CODE_MEMBERPTR:
+ case TYPE_CODE_METHODPTR:
case TYPE_CODE_METHOD:
case TYPE_CODE_REF:
- error ("internal error: unhandled type in print_type_scalar");
+ case TYPE_CODE_NAMESPACE:
+ error (_("internal error: unhandled type in print_type_scalar"));
break;
default:
- error ("Invalid type code in symbol table.");
+ error (_("Invalid type code in symbol table."));
}
gdb_flush (stream);
}
/* Dump details of a type specified either directly or indirectly.
Uses the same sort of type lookup mechanism as ptype_command()
- and whatis_command(). */
+ and whatis_command(). */
void
maintenance_print_type (char *typename, int from_tty)
{
struct value *val;
- register struct type *type;
- register struct cleanup *old_chain;
+ struct type *type;
+ struct cleanup *old_chain;
struct expression *expr;
if (typename != NULL)
@@ -342,7 +298,7 @@ maintenance_print_type (char *typename, int from_tty)
/* 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);
+ type = value_type (val);
}
if (type != NULL)
{
@@ -356,14 +312,12 @@ maintenance_print_type (char *typename, int from_tty)
void
_initialize_typeprint (void)
{
-
- add_com ("ptype", class_vars, ptype_command,
- "Print definition of type TYPE.\n\
+ add_com ("ptype", class_vars, ptype_command, _("\
+Print definition of type TYPE.\n\
Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n\
or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n\
-The selected stack frame's lexical context is used to look up the name.");
+The selected stack frame's lexical context is used to look up the name."));
add_com ("whatis", class_vars, whatis_command,
- "Print data type of expression EXP.");
-
+ _("Print data type of expression EXP."));
}