mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 10:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdb: Convert language_data::la_macro_expansion to a method

Browse Source 
Convert language_data::la_macro_expansion member variable to a virtual
method language_defn::macro_expansion.

There should be no user visible changes after this commit.

gdb/ChangeLog:

	* ada-lang.c (ada_language_data): Remove la_macro_expansion
	initializer.
	* c-lang.c (c_language_data): Likewise.
	(c_language::macro_expansion): New member function.
	(cplus_language_data): Likewise.
	(cplus_language::macro_expansion): New member function.
	(asm_language_data): Likewise.
	(asm_language::macro_expansion): New member function.
	(minimal_language_data): Likewise.
	(minimal_language::macro_expansion): New member function.
	* d-lang.c (d_language_data): Remove la_macro_expansion
	initializer.
	* f-lang.c (f_language_data): Likewise.
	* go-lang.c (go_language_data): Likewise.
	* language.c (unknown_language_data): Likewise.
	(auto_language_data): Likewise.
	* language.h (language_data): Remove la_macro_expansion field.
	(language_defn::macro_expansion): New member function.
	* m2-lang.c (m2_language_data): Remove la_macro_expansion
	initializer.
	* objc-lang.c (objc_language_data): Likewise.
	(objc_language::macro_expansion): New member function.
	* opencl-lang.c (opencl_language_data): Likewise.
	(opencl_language::macro_expansion): New member function.
	* p-lang.c (pascal_language_data): Remove la_macro_expansion
	initializer.
	* rust-lang.c (rust_language_data): Likewise.
	* symtab.c (default_collect_symbol_completion_matches_break_on):
	Update call to macro_expansion.
This commit is contained in:
Andrew Burgess 2020-07-31 15:56:15 +01:00
parent 3a3440fb8b
commit 1ac14a0402
14 changed files with 69 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gdb/ChangeLog
View File

@ -1,3 +1,35 @@
2020-09-16 Andrew Burgess <andrew.burgess@embecosm.com>
* ada-lang.c (ada_language_data): Remove la_macro_expansion
initializer.
* c-lang.c (c_language_data): Likewise.
(c_language::macro_expansion): New member function.
(cplus_language_data): Likewise.
(cplus_language::macro_expansion): New member function.
(asm_language_data): Likewise.
(asm_language::macro_expansion): New member function.
(minimal_language_data): Likewise.
(minimal_language::macro_expansion): New member function.
* d-lang.c (d_language_data): Remove la_macro_expansion
initializer.
* f-lang.c (f_language_data): Likewise.
* go-lang.c (go_language_data): Likewise.
* language.c (unknown_language_data): Likewise.
(auto_language_data): Likewise.
* language.h (language_data): Remove la_macro_expansion field.
(language_defn::macro_expansion): New member function.
* m2-lang.c (m2_language_data): Remove la_macro_expansion
initializer.
* objc-lang.c (objc_language_data): Likewise.
(objc_language::macro_expansion): New member function.
* opencl-lang.c (opencl_language_data): Likewise.
(opencl_language::macro_expansion): New member function.
* p-lang.c (pascal_language_data): Remove la_macro_expansion
initializer.
* rust-lang.c (rust_language_data): Likewise.
* symtab.c (default_collect_symbol_completion_matches_break_on):
Update call to macro_expansion.
2020-09-16 Andrew Burgess <andrew.burgess@embecosm.com>
* ada-lang.c (ada_language_data): Remove la_array_ordering

1
gdb/ada-lang.c
View File

@ -13708,7 +13708,6 @@ ada_get_symbol_name_matcher (const lookup_name_info &lookup_name)
extern const struct language_data ada_language_data =
{
macro_expansion_no,
&ada_exp_descriptor,
ada_op_print_tab, /* expression operators for printing */
&ada_varobj_ops,

24
gdb/c-lang.c
View File

@ -875,7 +875,6 @@ const struct exp_descriptor exp_descriptor_c =
extern const struct language_data c_language_data =
{
macro_expansion_c,
&exp_descriptor_c,
c_op_print_tab, /* expression operators for printing */
&c_varobj_ops,
@ -944,6 +943,11 @@ public:
bool store_sym_names_in_linkage_form_p () const override
{ return true; }
/* See language.h. */
enum macro_expansion macro_expansion () const override
{ return macro_expansion_c; }
};
/* Single instance of the C language class. */
@ -982,7 +986,6 @@ enum cplus_primitive_types {
extern const struct language_data cplus_language_data =
{
macro_expansion_c,
&exp_descriptor_c,
c_op_print_tab, /* expression operators for printing */
&cplus_varobj_ops,
@ -1168,6 +1171,11 @@ public:
const char *name_of_this () const override
{ return "this"; }
/* See language.h. */
enum macro_expansion macro_expansion () const override
{ return macro_expansion_c; }
protected:
/* See language.h. */
@ -1187,7 +1195,6 @@ static cplus_language cplus_language_defn;
extern const struct language_data asm_language_data =
{
macro_expansion_c,
&exp_descriptor_c,
c_op_print_tab, /* expression operators for printing */
&default_varobj_ops,
@ -1243,6 +1250,11 @@ public:
bool store_sym_names_in_linkage_form_p () const override
{ return true; }
/* See language.h. */
enum macro_expansion macro_expansion () const override
{ return macro_expansion_c; }
};
/* The single instance of the ASM language class. */
@ -1255,7 +1267,6 @@ static asm_language asm_language_defn;
extern const struct language_data minimal_language_data =
{
macro_expansion_c,
&exp_descriptor_c,
c_op_print_tab, /* expression operators for printing */
&default_varobj_ops,
@ -1300,6 +1311,11 @@ public:
bool store_sym_names_in_linkage_form_p () const override
{ return true; }
/* See language.h. */
enum macro_expansion macro_expansion () const override
{ return macro_expansion_c; }
};
/* The single instance of the minimal language class. */

1
gdb/d-lang.c
View File

@ -128,7 +128,6 @@ enum d_primitive_types {
extern const struct language_data d_language_data =
{
macro_expansion_no,
&exp_descriptor_c,
d_op_print_tab, /* Expression operators for printing. */
&default_varobj_ops,

1
gdb/f-lang.c
View File

@ -486,7 +486,6 @@ static const struct exp_descriptor exp_descriptor_f =
extern const struct language_data f_language_data =
{
macro_expansion_no,
&exp_descriptor_f,
f_op_print_tab, /* expression operators for printing */
&default_varobj_ops,

1
gdb/go-lang.c
View File

@ -508,7 +508,6 @@ enum go_primitive_types {
extern const struct language_data go_language_data =
{
macro_expansion_no,
&exp_descriptor_c,
go_op_print_tab, /* Expression operators for printing. */
&default_varobj_ops,

2
gdb/language.c
View File

@ -798,7 +798,6 @@ unknown_language_arch_info (struct gdbarch *gdbarch,
extern const struct language_data unknown_language_data =
{
macro_expansion_no,
&exp_descriptor_standard,
unk_op_print_tab, /* expression operators for printing */
&default_varobj_ops,
@ -932,7 +931,6 @@ static unknown_language unknown_language_defn;
extern const struct language_data auto_language_data =
{
macro_expansion_no,
&exp_descriptor_standard,
unk_op_print_tab, /* expression operators for printing */
&default_varobj_ops,

9
gdb/language.h
View File

@ -168,9 +168,6 @@ extern const char *default_word_break_characters (void);
struct language_data
{
/* Style of macro expansion, if any, supported by this language. */
enum macro_expansion la_macro_expansion;
/* Definitions related to expression printing, prefixifying, and
dumping. */
@ -562,6 +559,12 @@ struct language_defn : language_data
virtual enum array_ordering array_ordering () const
{ return array_row_major; }
/* Style of macro expansion, if any, supported by this language. The
default is no macro expansion. */
virtual enum macro_expansion macro_expansion () const
{ return macro_expansion_no; }
protected:
/* This is the overridable part of the GET_SYMBOL_NAME_MATCHER method.

1
gdb/m2-lang.c
View File

@ -199,7 +199,6 @@ const struct exp_descriptor exp_descriptor_modula2 =
extern const struct language_data m2_language_data =
{
macro_expansion_no,
&exp_descriptor_modula2,
m2_op_print_tab, /* expression operators for printing */
&default_varobj_ops,

6
gdb/objc-lang.c
View File

@ -323,7 +323,6 @@ static const struct op_print objc_op_print_tab[] =
extern const struct language_data objc_language_data =
{
macro_expansion_c,
&exp_descriptor_standard,
objc_op_print_tab, /* Expression operators for printing */
&default_varobj_ops,
@ -425,6 +424,11 @@ public:
const char *name_of_this () const override
{ return "self"; }
/* See language.h. */
enum macro_expansion macro_expansion () const override
{ return macro_expansion_c; }
};
/* Single instance of the class representing the Objective-C language. */

6
gdb/opencl-lang.c
View File

@ -1006,7 +1006,6 @@ const struct exp_descriptor exp_descriptor_opencl =
/* Constant data representing the OpenCL language. */
extern const struct language_data opencl_language_data =
{
macro_expansion_c,
&exp_descriptor_opencl,
c_op_print_tab, /* expression operators for printing */
&default_varobj_ops,
@ -1067,6 +1066,11 @@ public:
c_print_type (type, varstring, stream, show, level, flags);
}
/* See language.h. */
enum macro_expansion macro_expansion () const override
{ return macro_expansion_c; }
};
/* Single instance of the OpenCL language class. */

1
gdb/p-lang.c
View File

@ -252,7 +252,6 @@ enum pascal_primitive_types {
extern const struct language_data pascal_language_data =
{
macro_expansion_no,
&exp_descriptor_standard,
pascal_op_print_tab, /* expression operators for printing */
&default_varobj_ops,

1
gdb/rust-lang.c
View File

@ -1901,7 +1901,6 @@ static const struct exp_descriptor exp_descriptor_rust =
extern const struct language_data rust_language_data =
{
macro_expansion_no,
&exp_descriptor_rust,
c_op_print_tab, /* expression operators for printing */
&default_varobj_ops,

2
gdb/symtab.c
View File

@ -5768,7 +5768,7 @@ default_collect_symbol_completion_matches_break_on
/* Skip macros if we are completing a struct tag -- arguable but
usually what is expected. */
if (current_language->la_macro_expansion == macro_expansion_c
if (current_language->macro_expansion () == macro_expansion_c
&& code == TYPE_CODE_UNDEF)
{
gdb::unique_xmalloc_ptr<struct macro_scope> scope;