/* Language independent support for printing types for GDB, the GNU debugger.
- Copyright 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 1999,
- 2000, 2001 Free Software Foundation, Inc.
+
+ Copyright (C) 1986, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1998, 1999,
+ 2000, 2001, 2003, 2006, 2007, 2008 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,
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 <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "gdb_obstack.h"
#include "target.h"
#include "language.h"
#include "cp-abi.h"
-
+#include "typeprint.h"
#include "gdb_string.h"
#include <errno.h>
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);
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));
+ || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), DEPRECATED_SYMBOL_NAME (new)) != 0)
+ fprintf_filtered (stream, " %s", SYMBOL_PRINT_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));
+ if (!TYPE_NAME (SYMBOL_TYPE (new))
+ || strcmp (TYPE_NAME ((SYMBOL_TYPE (new))), DEPRECATED_SYMBOL_NAME (new)) != 0)
+ fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new));
else
fprintf_filtered (stream, "<builtin> = ");
type_print (type, "", stream, 0);
#ifdef _LANG_pascal
case language_pascal:
fprintf_filtered (stream, "type ");
- fprintf_filtered (stream, "%s = ", SYMBOL_SOURCE_NAME (new));
+ fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new));
type_print (type, "", stream, 0);
break;
#endif
default:
- error ("Language not supported.");
+ error (_("Language not supported."));
}
fprintf_filtered (stream, ";\n");
}
{
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;
else
val = access_value_history (0);
- type = VALUE_TYPE (val);
+ type = value_type (val);
if (objectprint)
{
do_cleanups (old_chain);
}
-/* ARGSUSED */
static void
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 <typename>" */
- printf_filtered ("type = ");
- type_print (type, "", gdb_stdout, 1);
- printf_filtered ("\n");
- do_cleanups (old_chain);
- }
- else
- {
- /* User did "ptype <symbolname>" */
- do_cleanups (old_chain);
- whatis_exp (typename, 1);
- }
- }
+ whatis_exp (typename, 1);
}
/* Print integral scalar data VAL, of type TYPE, onto stdio stream 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);
}
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)
/* 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)
{
_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."));
}