aboutsummaryrefslogtreecommitdiff
path: root/gdb/p-lang.c
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2020-06-02 21:54:49 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2020-06-23 13:34:11 +0100
commitec8cec5b96e2ebbd5e25a737c69d311970a8b219 (patch)
tree6ec122e770ec9883edf23d867e98c4ee2b920f12 /gdb/p-lang.c
parent1bf9c36374d9c758bc49dc18dca7acf0719e290d (diff)
downloadgdb-ec8cec5b96e2ebbd5e25a737c69d311970a8b219.zip
gdb-ec8cec5b96e2ebbd5e25a737c69d311970a8b219.tar.gz
gdb-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/p-lang.c')
-rw-r--r--gdb/p-lang.c30
1 files changed, 12 insertions, 18 deletions
diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 14ca5d7..b0465f4 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -192,23 +192,6 @@ pascal_one_char (int c, struct ui_file *stream, int *in_quotes)
}
}
-static void pascal_emit_char (int c, struct type *type,
- struct ui_file *stream, int quoter);
-
-/* Print the character C on STREAM as part of the contents of a literal
- string whose delimiter is QUOTER. Note that that format for printing
- characters and strings is language specific. */
-
-static void
-pascal_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
-{
- int in_quotes = 0;
-
- pascal_one_char (c, stream, &in_quotes);
- if (in_quotes)
- fputs_filtered ("'", stream);
-}
-
void
pascal_printchar (int c, struct type *type, struct ui_file *stream)
{
@@ -395,7 +378,6 @@ extern const struct language_data pascal_language_data =
&exp_descriptor_standard,
pascal_printchar, /* Print a character constant */
pascal_printstr, /* Function to print string constant */
- pascal_emit_char, /* Print a single char */
pascal_print_typedef, /* Print a typedef using appropriate syntax */
"this", /* name_of_this */
false, /* la_store_sym_names_in_linkage_form_p */
@@ -497,6 +479,18 @@ public:
{
return pascal_parse (ps);
}
+
+ /* See language.h. */
+
+ void emitchar (int ch, struct type *chtype,
+ struct ui_file *stream, int quoter) const override
+ {
+ int in_quotes = 0;
+
+ pascal_one_char (ch, stream, &in_quotes);
+ if (in_quotes)
+ fputs_filtered ("'", stream);
+ }
};
/* Single instance of the Pascal language class. */