gdb: Convert language_data::la_macro_expansion to a method

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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8988e41dd425c9deeb44e8c31e32bebb40fe5b6..44786285082f9568a9372a46c059ca436b981e3d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 9d020d72ac84c532c0c62bdc44c227de37f7c3ff..43b3af1f04f6b4e96f06100eea576ba07fc45871 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -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,

diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index e752e50a68fa115c33046ffb10be565b2fa50dd6..a478dd81b2327d4720b1c9824d472400aa17d371 100644 (file)
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -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.  */

diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 435d77147780ba07655537b92178c6780861e94b..348702276e6f37f11ca225121e85abb700d0a2ec 100644 (file)
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -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,

diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 67e4e8990d7e6119877f9397a5392822a9c230b6..cd596b5df4771930f8ec2a015f97be6f25aaff09 100644 (file)
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -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,

diff --git a/gdb/go-lang.c b/gdb/go-lang.c
index ceda7aff89c96b7ede5be30b74e915828460c80f..92d2819ac4af5a364faa634a0545de68988a13ad 100644 (file)
--- a/gdb/go-lang.c
+++ b/gdb/go-lang.c
@@ -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,

diff --git a/gdb/language.c b/gdb/language.c
index 507c51a6fee40619479e4a1dd497c982bdf9c7eb..d255035495b41429a327031b468d1cdbf0b2f58f 100644 (file)
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -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,

diff --git a/gdb/language.h b/gdb/language.h
index 5ec5daa4aef52c5c3b5e958339768359fea66b42..a2a970e192b264b6f64d0ea2661baac0d23d561c 100644 (file)
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -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.

diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index b587242e07bbeafffca7695beefcebf1179289b6..ac251af24e8b1e7d977e1d4dfbe8cf38df78620e 100644 (file)
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -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,

diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 60e0eaddbf4422de4bd08167ee5725578ef31d5a..2246e125fc302edfc3c877e747ea24ea32192a1e 100644 (file)
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -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.  */

diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index dffdae472f15fc4d02ab45878ce4759def3d4457..8f19f253cc96efe531131649b90d59eeac6ef9e5 100644 (file)
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -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.  */

diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index d1e6e69cb04a0cf01771803dad04bde147664f23..aa2b9fcb8cace149cdaeec8e80bb82260ae11471 100644 (file)
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -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,

diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index fb248cdc4d3b53543df81a27755f1ac77e193683..2c82ddb7abc9d41020303cc92f931970b37d3f8f 100644 (file)
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -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,

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 61f96b2ab8c2a035812c9956a82f80491c26dd12..04891c4a89b8073370eec059f8a13e9cecffb89e 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -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;