Move construction of IA-32 vector types to i386-tdep.c.

[deliverable/binutils-gdb.git] / gdb / cp-valprint.c

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 51c2129091e5ff7d683a4fb90e2a6ff93c9765ad..cc481b4dd5d88884a74086afe6fd20ff376b3d79 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -36,11 +36,41 @@
 #include "cp-abi.h"
 #include "valprint.h"
 #include "cp-support.h"
+#include "language.h"
+
+/* Controls printing of vtbl's */
+int vtblprint;
+static void
+show_vtblprint (struct ui_file *file, int from_tty,
+               struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("\
+Printing of C++ virtual function tables is %s.\n"),
+                   value);
+}
+
+/* Controls looking up an object's derived type using what we find in
+   its vtables.  */
+int objectprint;
+static void
+show_objectprint (struct ui_file *file, int from_tty,
+                 struct cmd_list_element *c,
+                 const char *value)
+{
+  fprintf_filtered (file, _("\
+Printing of object's derived type based on vtable info is %s.\n"),
+                   value);
+}
 
-int vtblprint;                 /* Controls printing of vtbl's */
-int objectprint;               /* Controls looking up an object's derived type
-                                  using what we find in its vtables.  */
 int static_field_print;                /* Controls printing of static fields. */
+static void
+show_static_field_print (struct ui_file *file, int from_tty,
+                        struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("Printing of C++ static members is %s.\n"),
+                   value);
+}
+
 
 static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
@@ -117,7 +147,7 @@ cp_print_class_method (const bfd_byte *valaddr,
              fputs_filtered ("?? <not supported with HP aCC>", stream);
              return;
            }
-         error ("invalid pointer to member function");
+         error (_("invalid pointer to member function"));
        }
       len = TYPE_NFN_FIELDS (domain);
       for (i = 0; i < len; i++)
@@ -319,11 +349,11 @@ cp_print_value_fields (struct type *type, struct type *real_type,
              if (TYPE_FIELD_STATIC (type, i))
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
-                                      language_cplus,
+                                      current_language->la_language,
                                       DMGL_PARAMS | DMGL_ANSI);
              fputs_filtered ("\" \"", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
-                                      language_cplus,
+                                      current_language->la_language,
                                       DMGL_PARAMS | DMGL_ANSI);
              fputs_filtered ("\") \"", stream);
            }
@@ -334,7 +364,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
              if (TYPE_FIELD_STATIC (type, i))
                fputs_filtered ("static ", stream);
              fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i),
-                                      language_cplus,
+                                      current_language->la_language,
                                       DMGL_PARAMS | DMGL_ANSI);
              annotate_field_name_end ();
              /* do not print leading '=' in case of anonymous unions */
@@ -359,8 +389,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
                    (TYPE_FIELD_TYPE (type, i), 
                     unpack_field_as_long (type, valaddr + offset, i));
 
-                 val_print (TYPE_FIELD_TYPE (type, i), value_contents (v),
-                            0, 0, stream, format, 0, recurse + 1, pretty);
+                 common_val_print (v, stream, format, 0, recurse + 1, pretty);
                }
            }
          else
@@ -424,8 +453,7 @@ cp_print_value_fields (struct type *type, struct type *real_type,
       v = value_from_pointer (lookup_pointer_type (builtin_type_unsigned_long),
                              *(unsigned long *) (valaddr + offset));
 
-      val_print (value_type (v), value_contents (v), 0, 0,
-                stream, format, 0, recurse + 1, pretty);
+      common_val_print (v, stream, format, 0, recurse + 1, pretty);
       fields_seen = 1;
 
       if (vtblprint)
@@ -544,8 +572,8 @@ cp_print_value (struct type *type, struct type *real_type,
          find_rt_vbase_offset (type, TYPE_BASECLASS (type, i),
                                valaddr, offset, &boffset, &skip);
          if (skip >= 0)
-           error ("Virtual base class offset not found from vtable while"
-                  " printing");
+           error (_("Virtual base class offset not found from vtable while"
+                  " printing"));
          base_valaddr = valaddr;
        }
       else
@@ -792,8 +820,7 @@ cp_print_hpacc_virtual_table_entries (struct type *type, int *vfuncs,
          deprecated_set_value_type (vf, value_type (v));
 
          /* print out the entry */
-         val_print (value_type (vf), value_contents (vf), 0, 0,
-                    stream, format, 0, recurse + 1, pretty);
+         common_val_print (vf, stream, format, 0, recurse + 1, pretty);
          field_physname
            = TYPE_FN_FIELD_PHYSNAME (TYPE_FN_FIELDLIST1 (type, fn), oi);
          /* pai: (temp) FIXME Maybe this should be DMGL_ANSI */
@@ -809,26 +836,29 @@ cp_print_hpacc_virtual_table_entries (struct type *type, int *vfuncs,
 void
 _initialize_cp_valprint (void)
 {
-  deprecated_add_show_from_set
-    (add_set_cmd ("static-members", class_support, var_boolean,
-                 (char *) &static_field_print,
-                 "Set printing of C++ static members.",
-                 &setprintlist),
-     &showprintlist);
+  add_setshow_boolean_cmd ("static-members", class_support,
+                          &static_field_print, _("\
+Set printing of C++ static members."), _("\
+Show printing of C++ static members."), NULL,
+                          NULL,
+                          show_static_field_print,
+                          &setprintlist, &showprintlist);
   /* Turn on printing of static fields.  */
   static_field_print = 1;
 
-  deprecated_add_show_from_set
-    (add_set_cmd ("vtbl", class_support, var_boolean, (char *) &vtblprint,
-                 "Set printing of C++ virtual function tables.",
-                 &setprintlist),
-     &showprintlist);
-
-  deprecated_add_show_from_set
-    (add_set_cmd ("object", class_support, var_boolean, (char *) &objectprint,
-             "Set printing of object's derived type based on vtable info.",
-                 &setprintlist),
-     &showprintlist);
+  add_setshow_boolean_cmd ("vtbl", class_support, &vtblprint, _("\
+Set printing of C++ virtual function tables."), _("\
+Show printing of C++ virtual function tables."), NULL,
+                          NULL,
+                          show_vtblprint,
+                          &setprintlist, &showprintlist);
+
+  add_setshow_boolean_cmd ("object", class_support, &objectprint, _("\
+Set printing of object's derived type based on vtable info."), _("\
+Show printing of object's derived type based on vtable info."), NULL,
+                          NULL,
+                          show_objectprint,
+                          &setprintlist, &showprintlist);
 
   /* Give people the defaults which they are used to.  */
   objectprint = 0;