* defs.h (is_cplus_marker, set_demangling_style): Moved to ...

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

diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 1b60830a854ad41524a8432bc93d48a7b008fbe6..b1e6aba6de8078182c7665517ef8c008cce6b8b4 100644 (file)
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -1,11 +1,12 @@
 /* Support for printing Java types for GDB, the GNU debugger.
 /* Support for printing Java types for GDB, the GNU debugger.

-   Copyright 1997-2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2007, 2008, 2009, 2010, 2011
+   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,


@@ -14,9 +15,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., 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 "defs.h"


@@ -24,10 +23,13 @@
 #include "gdbtypes.h"
 #include "value.h"
 #include "demangle.h"
 #include "gdbtypes.h"
 #include "value.h"
 #include "demangle.h"

+#include "gdb-demangle.h"

 #include "jv-lang.h"
 #include "gdb_string.h"
 #include "typeprint.h"
 #include "c-lang.h"
 #include "jv-lang.h"
 #include "gdb_string.h"
 #include "typeprint.h"
 #include "c-lang.h"

+#include "cp-abi.h"
+#include "gdb_assert.h"

 
 /* Local functions */
 
 
 /* Local functions */
 


@@ -36,9 +38,7 @@ static void java_type_print_base (struct type * type,
                                  int level);
 
 static void
                                  int level);
 
 static void

-java_type_print_derivation_info (stream, type)
-     struct ui_file *stream;
-     struct type *type;
+java_type_print_derivation_info (struct ui_file *stream, struct type *type)

 {
   char *name;
   int i;
 {
   char *name;
   int i;


@@ -84,18 +84,15 @@ java_type_print_derivation_info (stream, type)
    We increase it for some recursive calls.  */
 
 static void
    We increase it for some recursive calls.  */
 
 static void

-java_type_print_base (type, stream, show, level)
-     struct type *type;
-     struct ui_file *stream;
-     int show;
-     int level;
+java_type_print_base (struct type *type, struct ui_file *stream, int show,
+                     int level)

 {
 {

-  register int i;
-  register int len;
+  int i;
+  int len;

   char *mangled_name;
   char *demangled_name;
   char *mangled_name;
   char *demangled_name;

-  QUIT;

 
 

+  QUIT;

   wrap_here ("    ");
 
   if (type == NULL)
   wrap_here ("    ");
 
   if (type == NULL)


@@ -126,8 +123,9 @@ java_type_print_base (type, stream, show, level)
       if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
        {                       /* array type */
          char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));
       if (TYPE_TAG_NAME (type) != NULL && TYPE_TAG_NAME (type)[0] == '[')
        {                       /* array type */
          char *name = java_demangle_type_signature (TYPE_TAG_NAME (type));

+

          fputs_filtered (name, stream);
          fputs_filtered (name, stream);

-         free (name);
+         xfree (name);

          break;
        }
 
          break;
        }
 


@@ -156,7 +154,7 @@ java_type_print_base (type, stream, show, level)
          fprintf_filtered (stream, "{\n");
          if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
            {
          fprintf_filtered (stream, "{\n");
          if ((TYPE_NFIELDS (type) == 0) && (TYPE_NFN_FIELDS (type) == 0))
            {

-             if (TYPE_FLAGS (type) & TYPE_FLAG_STUB)
+             if (TYPE_STUB (type))

                fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
              else
                fprintfi_filtered (level + 4, stream, "<no data fields>\n");
                fprintfi_filtered (level + 4, stream, "<incomplete type>\n");
              else
                fprintfi_filtered (level + 4, stream, "<no data fields>\n");


@@ -170,12 +168,12 @@ java_type_print_base (type, stream, show, level)
            {
              QUIT;
              /* Don't print out virtual function table.  */
            {
              QUIT;
              /* Don't print out virtual function table.  */

-             if (STREQN (TYPE_FIELD_NAME (type, i), "_vptr", 5)
+             if (strncmp (TYPE_FIELD_NAME (type, i), "_vptr", 5) == 0

                  && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
                continue;
 
                  && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
                continue;
 

-             /* Don't print the dummy field "class". */
-             if (STREQN (TYPE_FIELD_NAME (type, i), "class", 5))
+             /* Don't print the dummy field "class".  */
+             if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0)

                continue;
 
              print_spaces_filtered (level + 4, stream);
                continue;
 
              print_spaces_filtered (level + 4, stream);


@@ -190,7 +188,7 @@ java_type_print_base (type, stream, show, level)
                    fprintf_filtered (stream, "public ");
                }
 
                    fprintf_filtered (stream, "public ");
                }
 

-             if (TYPE_FIELD_STATIC (type, i))
+             if (field_is_static (&TYPE_FIELD (type, i)))

                fprintf_filtered (stream, "static ");
 
              java_print_type (TYPE_FIELD_TYPE (type, i),
                fprintf_filtered (stream, "static ");
 
              java_print_type (TYPE_FIELD_TYPE (type, i),


@@ -200,12 +198,12 @@ java_type_print_base (type, stream, show, level)
              fprintf_filtered (stream, ";\n");
            }
 
              fprintf_filtered (stream, ";\n");
            }
 

-         /* If there are both fields and methods, put a space between. */
+         /* If there are both fields and methods, put a space between.  */

          len = TYPE_NFN_FIELDS (type);
          if (len)
            fprintf_filtered (stream, "\n");
 
          len = TYPE_NFN_FIELDS (type);
          if (len)
            fprintf_filtered (stream, "\n");
 

-         /* Print out the methods */
+         /* Print out the methods.  */

 
          for (i = 0; i < len; i++)
            {
 
          for (i = 0; i < len; i++)
            {


@@ -220,21 +218,28 @@ java_type_print_base (type, stream, show, level)
              n_overloads = TYPE_FN_FIELDLIST_LENGTH (type, i);
              method_name = TYPE_FN_FIELDLIST_NAME (type, i);
              name = type_name_no_tag (type);
              n_overloads = TYPE_FN_FIELDLIST_LENGTH (type, i);
              method_name = TYPE_FN_FIELDLIST_NAME (type, i);
              name = type_name_no_tag (type);

-             is_constructor = name && STREQ (method_name, name);
+             is_constructor = name && strcmp (method_name, name) == 0;

 
              for (j = 0; j < n_overloads; j++)
                {
 
              for (j = 0; j < n_overloads; j++)
                {

-                 char *physname;
+                 const char *real_physname;
+                 char *physname, *p;

                  int is_full_physname_constructor;
 
                  int is_full_physname_constructor;
 

-                 physname = TYPE_FN_FIELD_PHYSNAME (f, j);
+                 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';

 
 

-                 is_full_physname_constructor =
-                   ((physname[0] == '_' && physname[1] == '_'
-                     && strchr ("0123456789Qt", physname[2]))
-                    || STREQN (physname, "__ct__", 6)
-                    || DESTRUCTOR_PREFIX_P (physname)
-                    || STREQN (physname, "__dt__", 6));
+                 is_full_physname_constructor
+                    = (is_constructor_name (physname)
+                       || is_destructor_name (physname));

 
                  QUIT;
 
 
                  QUIT;
 


@@ -276,7 +281,7 @@ java_type_print_base (type, stream, show, level)
                    /* Build something we can demangle.  */
                    mangled_name = gdb_mangle_name (type, i, j);
                  else
                    /* Build something we can demangle.  */
                    mangled_name = gdb_mangle_name (type, i, j);
                  else

-                   mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j);
+                   mangled_name = physname;

 
                  demangled_name =
                    cplus_demangle (mangled_name,
 
                  demangled_name =
                    cplus_demangle (mangled_name,


@@ -304,11 +309,11 @@ java_type_print_base (type, stream, show, level)
                      }
 
                    fputs_filtered (demangled_no_class, stream);
                      }
 
                    fputs_filtered (demangled_no_class, stream);

-                   free (demangled_name);
+                   xfree (demangled_name);

                  }
 
                  if (TYPE_FN_FIELD_STUB (f, j))
                  }
 
                  if (TYPE_FN_FIELD_STUB (f, j))

-                   free (mangled_name);
+                   xfree (mangled_name);

 
                  fprintf_filtered (stream, ";\n");
                }
 
                  fprintf_filtered (stream, ";\n");
                }


@@ -329,12 +334,8 @@ extern void c_type_print_varspec_suffix (struct type *, struct ui_file *,
                                         int, int, int);
 
 void
                                         int, int, int);
 
 void

-java_print_type (type, varstring, stream, show, level)
-     struct type *type;
-     char *varstring;
-     struct ui_file *stream;
-     int show;
-     int level;
+java_print_type (struct type *type, const char *varstring,
+                struct ui_file *stream, int show, int level)

 {
   int demangled_args;
 
 {
   int demangled_args;
 


@@ -347,8 +348,8 @@ java_print_type (type, varstring, stream, show, level)
     }
 
   /* For demangled function names, we have the arglist as part of the name,
     }
 
   /* For demangled function names, we have the arglist as part of the name,

-     so don't print an additional pair of ()'s */
+     so don't print an additional pair of ()'s.  */

 
 

-  demangled_args = strchr (varstring, '(') != NULL;
+  demangled_args = varstring != NULL && strchr (varstring, '(') != NULL;

   c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
 }
   c_type_print_varspec_suffix (type, stream, show, 0, demangled_args);
 }