merge from gcc

[deliverable/binutils-gdb.git] / gdb / typeprint.c

diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index d31d521bf8f1512f3a5e5b46f531b83f7888fdaa..ce9f551ba226b4b4d9d8e3cdfe22037640aeb455 100644 (file)
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -1,13 +1,14 @@
 /* Language independent support for printing types for GDB, the GNU debugger.
 
 /* Language independent support for printing types for GDB, the GNU debugger.
 

-   Copyright (C) 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, 2010
+   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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,9 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "gdb_obstack.h"
 
 #include "defs.h"
 #include "gdb_obstack.h"


@@ -35,12 +34,10 @@
 #include "cp-abi.h"
 #include "typeprint.h"
 #include "gdb_string.h"
 #include "cp-abi.h"
 #include "typeprint.h"
 #include "gdb_string.h"

+#include "exceptions.h"
+#include "valprint.h"

 #include <errno.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 (void);
 
 static void ptype_command (char *, int);
 extern void _initialize_typeprint (void);
 
 static void ptype_command (char *, int);


@@ -49,6 +46,7 @@ static void whatis_command (char *, int);
 
 static void whatis_exp (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. */
 /* 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. */


@@ -56,41 +54,16 @@ static void whatis_exp (char *, int);
 void
 typedef_print (struct type *type, struct symbol *new, struct ui_file *stream)
 {
 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
-         || 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))
-         || 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);
-      break;
-#endif
-#ifdef _LANG_pascal
-    case language_pascal:
-      fprintf_filtered (stream, "type ");
-      fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_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
 }
 
 /* Print a description of a type TYPE in the form of a declaration of a


@@ -107,6 +80,33 @@ type_print (struct type *type, char *varstring, struct ui_file *stream,
   LA_PRINT_TYPE (type, varstring, stream, show, 0);
 }
 
   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;
+  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, NULL);
+    }
+  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.  */
 
 /* Print type of EXP, or last thing in value history if EXP == NULL.
    show is passed to type_print.  */
 


@@ -121,6 +121,7 @@ whatis_exp (char *exp, int show)
   int full = 0;
   int top = -1;
   int using_enc = 0;
   int full = 0;
   int top = -1;
   int using_enc = 0;

+  struct value_print_options opts;

 
   if (exp)
     {
 
   if (exp)
     {


@@ -133,12 +134,12 @@ whatis_exp (char *exp, int show)
 
   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)
         {
           real_type = value_rtti_target_type (val, &full, &top, &using_enc);
           if (real_type)


@@ -150,7 +151,7 @@ whatis_exp (char *exp, int show)
             }
         }
       else if (TYPE_CODE (type) == TYPE_CODE_CLASS)
             }
         }
       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 = ");
     }
 
   printf_filtered ("type = ");


@@ -198,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
    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)
 
 void
 print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)


@@ -235,7 +236,7 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
       break;
 
     case TYPE_CODE_CHAR:
       break;
 
     case TYPE_CODE_CHAR:

-      LA_PRINT_CHAR ((unsigned char) val, stream);
+      LA_PRINT_CHAR ((unsigned char) val, type, stream);

       break;
 
     case TYPE_CODE_BOOL:
       break;
 
     case TYPE_CODE_BOOL:


@@ -257,7 +258,8 @@ 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_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:
     case TYPE_CODE_NAMESPACE:
     case TYPE_CODE_METHOD:
     case TYPE_CODE_REF:
     case TYPE_CODE_NAMESPACE:


@@ -272,7 +274,7 @@ print_type_scalar (struct type *type, LONGEST val, struct ui_file *stream)
 
 /* Dump details of a type specified either directly or indirectly.
    Uses the same sort of type lookup mechanism as ptype_command()
 
 /* 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)
 
 void
 maintenance_print_type (char *typename, int from_tty)


@@ -310,7 +312,6 @@ maintenance_print_type (char *typename, int from_tty)
 void
 _initialize_typeprint (void)
 {
 void
 _initialize_typeprint (void)
 {

-

   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\
   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\


@@ -319,5 +320,4 @@ 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."));
 
   add_com ("whatis", class_vars, whatis_command,
           _("Print data type of expression EXP."));

-

 }
 }