From b63a3f3fc4e998b4efd5fd49aa0eb044e9cee261 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Tue, 4 Aug 2020 15:59:52 +0100 Subject: gdb: Convert language_data::la_varobj_ops to a method Convert language_data::la_varobj_ops member variable to a virtual method language_defn::varobj_ops. There should be no user visible changes after this commit. gdb/ChangeLog: * ada-lang.c (ada_language_data): Remove la_varobj_ops initializer. (ada_language::varobj_ops): New member function. * c-lang.c (c_language_data): Remove la_varobj_ops initializer. (cplus_language_data): Likewise. (cplus_language::varobj_ops): New member function. (asm_language_data): Remove la_varobj_ops initializer. (minimal_language_data): Likewise. * d-lang.c (d_language_data): Likewise. * f-lang.c (f_language_data): Likewise. * go-lang.c (go_language_data): Likewise. * language.c (language_defn::varobj_ops): New function. (unknown_language_data): Remove la_varobj_ops initializer. (auto_language_data): Likewise. * language.h (language_data): Remove la_varobj_ops field. (language_defn::varobj_ops): Declare new member function. * m2-lang.c (m2_language_data): Remove la_varobj_ops initializer. * objc-lang.c (objc_language_data): Likewise. * opencl-lang.c (opencl_language_data): Likewise. * p-lang.c (pascal_language_data): Likewise. * rust-lang.c (rust_language_data): Likewise. * varobj.c (varobj_create): Update call to varobj_ops. * varobj.h (default_varobj_ops): Delete define. --- gdb/c-lang.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gdb/c-lang.c') diff --git a/gdb/c-lang.c b/gdb/c-lang.c index a478dd8..9b21da1 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -877,7 +877,6 @@ extern const struct language_data c_language_data = { &exp_descriptor_c, c_op_print_tab, /* expression operators for printing */ - &c_varobj_ops, }; /* Class representing the C language. */ @@ -988,7 +987,6 @@ extern const struct language_data cplus_language_data = { &exp_descriptor_c, c_op_print_tab, /* expression operators for printing */ - &cplus_varobj_ops, }; /* A class for the C++ language. */ @@ -1176,6 +1174,11 @@ public: enum macro_expansion macro_expansion () const override { return macro_expansion_c; } + /* See language.h. */ + + const struct lang_varobj_ops *varobj_ops () const override + { return &cplus_varobj_ops; } + protected: /* See language.h. */ @@ -1197,7 +1200,6 @@ extern const struct language_data asm_language_data = { &exp_descriptor_c, c_op_print_tab, /* expression operators for printing */ - &default_varobj_ops, }; /* A class for the ASM language. */ @@ -1269,7 +1271,6 @@ extern const struct language_data minimal_language_data = { &exp_descriptor_c, c_op_print_tab, /* expression operators for printing */ - &default_varobj_ops, }; /* A class for the minimal language. */ -- cgit v1.1