Don't write to inferior_ptid in bsd-kvm.c

[deliverable/binutils-gdb.git] / gdb / m2-lang.c

diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index f174ad55823f30a487441d9d5f0ee9b080707037..356ed4c3bfa97ab131a4dc6c00e3f7a6dd343afa 100644 (file)
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -222,7 +222,7 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp,
            {
              struct value *temp = arg1;
 
-             type = TYPE_FIELD_TYPE (type, 1);
+             type = type->field (1).type ();
              /* i18n: Do not translate the "_m2_high" part!  */
              arg1 = value_struct_elt (&temp, NULL, "_m2_high", NULL,
                                       _("unbounded structure "
@@ -250,7 +250,7 @@ evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp,
       if (m2_is_unbounded_array (type))
        {
          struct value *temp = arg1;
-         type = TYPE_FIELD_TYPE (type, 0);
+         type = type->field (0).type ();
          if (type == NULL || (type->code () != TYPE_CODE_PTR))
            {
              warning (_("internal error: unbounded "
@@ -368,22 +368,12 @@ extern const struct language_data m2_language_data =
   m2_printstr,                 /* function to print string constant */
   m2_emit_char,                        /* Function to print a single character */
   m2_print_typedef,            /* Print a typedef using appropriate syntax */
-  m2_value_print_inner,                /* la_value_print_inner */
-  c_value_print,               /* Print a top-level value */
   NULL,                                /* name_of_this */
   false,                       /* la_store_sym_names_in_linkage_form_p */
-  basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
-  NULL,                                /* Language specific
-                                  class_name_from_physname */
   m2_op_print_tab,             /* expression operators for printing */
   0,                           /* arrays are first-class (not c-style) */
   0,                           /* String lower bound */
-  default_word_break_characters,
-  default_collect_symbol_completion_matches,
-  c_watch_location_expression,
-  NULL,                                /* la_get_symbol_name_matcher */
   &default_varobj_ops,
-  NULL,
   m2_is_string_type_p,
   "{...}"                      /* la_struct_too_deep_ellipsis */
 };
@@ -431,6 +421,15 @@ public:
   {
     m2_print_type (type, varstring, stream, show, level, flags);
   }
+
+  /* See language.h.  */
+
+  void value_print_inner
+       (struct value *val, struct ui_file *stream, int recurse,
+        const struct value_print_options *options) const override
+  {
+    return m2_value_print_inner (val, stream, recurse, options);
+  }
 };
 
 /* Single instance of the M2 language.  */