From 85967615df75e299b375223cc5d211ef78fcf3e8 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Fri, 3 Jul 2020 18:51:34 +0100 Subject: gdb: Move la_language into the language_defn class Move the language_data::la_language member variable into the langage_defn class. I have not made the la_language member variable a method of langage_defn simply because of the large number of places that la_language is referenced throughout GDB. I have made the new member variable constant though, so this should prevent accidental assignment. In the future we might consider converting la_language to a method, but right now my goal is to remove the langage_data class, so I'm happy to leave la_language as a constant member variable. There should be no user visible changes after this commit. gdb/ChangeLog: * ada-lang.c (ada_language_data): Remove la_language initializer. * c-lang.c (c_language_data): Likewise. (cplus_language_data): Likewise. (asm_language_data): Likewise. (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 (unknown_language_data): Likewise. (auto_language_data): Likewise. * language.h (language_data): Remove la_language field. (language_defn::language_defn): Initialise la_language field. (language_defn::la_language): New member variable. * m2-lang.c (m2_language_data): Remove la_language field. * 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. --- gdb/language.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gdb/language.h') diff --git a/gdb/language.h b/gdb/language.h index 9a7ad21..731b641 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -188,10 +188,6 @@ extern const char *default_word_break_characters (void); struct language_data { - /* its symtab language-enum (defs.h). */ - - enum language la_language; - /* Default range checking. */ enum range_check la_range_check; @@ -253,13 +249,18 @@ struct language_data struct language_defn : language_data { language_defn (enum language lang, const language_data &init_data) - : language_data (init_data) + : language_data (init_data), + la_language (lang) { /* We should only ever create one instance of each language. */ gdb_assert (languages[lang] == nullptr); languages[lang] = this; } + /* Which language this is. */ + + const enum language la_language; + /* Name of the language. */ virtual const char *name () const = 0; -- cgit v1.1