gdb: Convert language la_lookup_symbol_nonlocal field to a method

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

diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index f94f4c531436e566d846c9c55d07ca007dc11800..5c1b273e7f5260718b49347a6925dcc2f0e185b3 100644 (file)
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -399,15 +399,11 @@ extern const struct language_data pascal_language_data =
   pascal_printstr,             /* Function to print string constant */
   pascal_emit_char,            /* Print a single char */
   pascal_print_typedef,                /* Print a typedef using appropriate syntax */
-  pascal_value_print_inner,    /* la_value_print_inner */
-  pascal_value_print,          /* Print a top-level value */
   "this",                      /* name_of_this */
   false,                       /* la_store_sym_names_in_linkage_form_p */
-  basic_lookup_symbol_nonlocal,        /* lookup_symbol_nonlocal */
   pascal_op_print_tab,         /* expression operators for printing */
   1,                           /* c-style arrays */
   0,                           /* String lower bound */
-  c_watch_location_expression,
   &default_varobj_ops,
   pascal_is_string_type_p,
   "{...}"                      /* la_struct_too_deep_ellipsis */
@@ -479,6 +475,23 @@ public:
   {
     pascal_print_type (type, varstring, stream, show, level, flags);
   }
+
+  /* See language.h.  */
+
+  void value_print (struct value *val, struct ui_file *stream,
+                   const struct value_print_options *options) const override
+  {
+    return pascal_value_print (val, stream, options);
+  }
+
+  /* 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 pascal_value_print_inner (val, stream, recurse, options);
+  }
 };
 
 /* Single instance of the Pascal language class.  */