From 5aba6ebefb9488163c82e198b73ecf0a05a5d1fd Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Tue, 4 Aug 2020 16:31:56 +0100 Subject: gdb: Convert language_data::la_exp_desc to a method Convert language_data::la_exp_desc member variable to a virtual method language_defn::expression_ops. The change of names brings this method more into line with the existing varobj_ops method, that also returns a table of function pointers. There should be no user visible changes after this commit. gdb/ChangeLog: * ada-lang.c (ada_language_data): Remove la_exp_desc initializer. (ada_language::expression_ops): New member function. * c-lang.c (c_language_data): Remove la_exp_desc initializer. (c_language::expression_ops): New member function. (cplus_language_data): Remove la_exp_desc initializer. (cplus_language::expression_ops): New member function. (asm_language_data): Remove la_exp_desc initializer. (asm_language::expression_ops): New member function. (minimal_language_data): Remove la_exp_desc initializer. (minimal_language::expression_ops): New member function. * d-lang.c (d_language_data): Remove la_exp_desc initializer. (d_language::expression_ops): New member function. * eval.c (evaluate_subexp): Update call to expression_ops. * expprint.c (print_subexp): Likewise. (op_name): Likewise. (dump_subexp_body): Likewise. * f-lang.c (f_language_data): Remove la_exp_desc initializer. (f_language::expression_ops): New member function. * go-lang.c (go_language_data): Remove la_exp_desc initializer. (go_language::expression_ops): New member function. * language.c (language_defn::expression_ops): New function. (unknown_language_data): Remove la_exp_desc initializer. (auto_language_data): Likewise. * language.h (language_data): Remove la_exp_desc field. (language_defn::expression_ops): Declare new member function. * m2-lang.c (m2_language_data): Remove la_exp_desc initializer. (m2_language::expression_ops): New member function. * objc-lang.c (objc_language_data): Remove la_exp_desc initializer. * opencl-lang.c (opencl_language_data): Remove la_exp_desc initializer. (opencl_language::expression_ops): New member function. * p-lang.c (pascal_language_data): Remove la_exp_desc initializer. * parse.c (operator_length): Update call to expression_ops. (exp_iterate): Likewise. * rust-lang.c (rust_language_data): Remove la_exp_desc initializer. (ruse_language::expression_ops): New member function. --- gdb/expprint.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gdb/expprint.c') diff --git a/gdb/expprint.c b/gdb/expprint.c index 36e18ea..8cca5b4 100644 --- a/gdb/expprint.c +++ b/gdb/expprint.c @@ -50,7 +50,8 @@ void print_subexp (struct expression *exp, int *pos, struct ui_file *stream, enum precedence prec) { - exp->language_defn->la_exp_desc->print_subexp (exp, pos, stream, prec); + exp->language_defn->expression_ops ()->print_subexp (exp, pos, stream, + prec); } /* Standard implementation of print_subexp for use in language_defn @@ -692,7 +693,7 @@ op_name (struct expression *exp, enum exp_opcode opcode) unsigned (opcode)); return cell; } - return exp->language_defn->la_exp_desc->op_name (opcode); + return exp->language_defn->expression_ops ()->op_name (opcode); } /* Default name for the standard operator OPCODE (i.e., one defined in @@ -793,7 +794,8 @@ dump_subexp (struct expression *exp, struct ui_file *stream, int elt) static int dump_subexp_body (struct expression *exp, struct ui_file *stream, int elt) { - return exp->language_defn->la_exp_desc->dump_subexp_body (exp, stream, elt); + return exp->language_defn->expression_ops ()->dump_subexp_body (exp, stream, + elt); } /* Default value for subexp_body in exp_descriptor vector. */ -- cgit v1.1