diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-06-02 21:54:49 +0100 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2020-06-23 13:34:11 +0100 |
| commit | ec8cec5b96e2ebbd5e25a737c69d311970a8b219 (patch) | |
| tree | 6ec122e770ec9883edf23d867e98c4ee2b920f12 /gdb/ada-lang.c | |
| parent | 1bf9c36374d9c758bc49dc18dca7acf0719e290d (diff) | |
| download | binutils-ec8cec5b96e2ebbd5e25a737c69d311970a8b219.zip binutils-ec8cec5b96e2ebbd5e25a737c69d311970a8b219.tar.gz binutils-ec8cec5b96e2ebbd5e25a737c69d311970a8b219.tar.bz2 | |
gdb: Convert language la_emitchar field to a method
This commit changes the language_data::la_emitchar function pointer
member variable into a member function of language_defn.
There should be no user visible changes after this commit.
gdb/ChangeLog:
* ada-lang.c (emit_char): Renamed to ada_language::emitchar.
(ada_language_data): Delete la_emitchar initializer.
(ada_language::emitchar): New member function, implementation from
emit_char.
* c-lang.c (c_language_data): Delete la_emitchar initializer.
(cplus_language_data): Likewise.
(asm_language_data): Likewise.
(minimal_language_data): Likewise.
* d-lang.c (d_language_data): Likewise.
* f-lang.c (f_emit_char): Rename to f_language::emitchar.
(f_language_data): Delete la_emitchar initializer.
(f_language::emitchar): New member function, implementation from
f_emit_char.
* go-lang.c (go_language_data): Delete la_emitchar initializer.
* language.c (unk_lang_emit_char): Delete.
(language_defn::emitchar): New member function definition.
(unknown_language_data): Delete la_emitchar initializer.
(unknown_language::emitchar): New member function.
(auto_language_data): Delete la_emitchar initializer.
(auto_language::emitchar): New member function.
* language.h (language_data): Delete la_emitchar field.
(language_defn::emitchar): New member field declaration.
(LA_EMIT_CHAR): Update call to emitchar.
* m2-lang.c (m2_emit_char): Rename to m2_language::emitchar.
(m2_language_data): Delete la_emitchar initializer.
(m2_language::emitchar): New member function, implementation from
m2_emit_char.
* objc-lang.c (objc_language_data): Delete la_emitchar
initializer.
* opencl-lang.c (opencl_language_data): Likewise.
* p-lang.c (pascal_emit_char): Rename to pascal_language::emitchar.
(pascal_language_data): Delete la_emitchar initializer.
(pascal_language::emitchar): New member function, implementation
from pascal_emit_char.
* rust-lang.c (rust_emitchar): Rename to rust_language::emitchar.
(rust_language_data): Delete la_emitchar initializer.
(rust_language::emitchar): New member function, implementation
from rust_emitchar.
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index bb6d011..7858679 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13504,14 +13504,6 @@ enum ada_primitive_types { /* Language vector */ -/* Not really used, but needed in the ada_language_defn. */ - -static void -emit_char (int c, struct type *type, struct ui_file *stream, int quoter) -{ - ada_emit_char (c, type, stream, quoter, 1); -} - static const struct exp_descriptor ada_exp_descriptor = { ada_print_subexp, ada_operator_length, @@ -13691,7 +13683,6 @@ extern const struct language_data ada_language_data = &ada_exp_descriptor, ada_printchar, /* Print a character constant */ ada_printstr, /* Function to print string constant */ - emit_char, /* Function to print single char (not used) */ ada_print_typedef, /* Print a typedef using appropriate syntax */ NULL, /* name_of_this */ true, /* la_store_sym_names_in_linkage_form_p */ @@ -14116,6 +14107,14 @@ public: resolve_subexp (expp, &pc, 1, context_type, completing, tracker); } + /* See language.h. */ + + void emitchar (int ch, struct type *chtype, + struct ui_file *stream, int quoter) const override + { + ada_emit_char (ch, chtype, stream, quoter, 1); + } + protected: /* See language.h. */ |