aboutsummaryrefslogtreecommitdiff
path: root/gdb/rust-lang.c
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2020-06-03 16:44:05 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2020-06-23 13:34:11 +0100
commitd711ee67aca06c9753f09dc154eb8c75cb4f58ef (patch)
tree3eb445d93e521604f3e07adadf2eba3ceac068f6 /gdb/rust-lang.c
parent52b50f2c1b1eaf6fd6e685e2c9575f92c581a6dc (diff)
downloadgdb-d711ee67aca06c9753f09dc154eb8c75cb4f58ef.zip
gdb-d711ee67aca06c9753f09dc154eb8c75cb4f58ef.tar.gz
gdb-d711ee67aca06c9753f09dc154eb8c75cb4f58ef.tar.bz2
gdb: Convert language la_printstr field to a method
This commit changes the language_data::la_printstr 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 (ada_language_data): Delete la_printstr initializer. (ada_language::printstr): New member function. * c-lang.c (c_language_data): Delete la_printstr initializer. (cplus_language_data): Likewise. (asm_language_data): Likewise. (minimal_language_data): Likewise. * d-lang.c (d_language_data): Likewise. * f-lang.c (f_printstr): Rename to f_language::printstr. (f_language_data): Delete la_printstr initializer. (f_language::printstr): New member function, implementation from f_printstr. * go-lang.c (go_language_data): Delete la_printstr initializer. * language.c (language_defn::printstr): Define new member function. (unk_lang_printstr): Delete. (unknown_language_data): Delete la_printstr initializer. (unknown_language::printstr): New member function. (auto_language_data): Delete la_printstr initializer. (auto_language::printstr): New member function. * language.h (language_data): Delete la_printstr field. (language_defn::printstr): Declare new member function. (LA_PRINT_STRING): Update call to printstr. * m2-lang.c (m2_printstr): Rename to m2_language::printstr. (m2_language_data): Delete la_printstr initializer. (m2_language::printstr): New member function, implementation from m2_printstr. * objc-lang.c (objc_language_data): Delete la_printstr initializer. * opencl-lang.c (opencl_language_data): Likewise. * p-lang.c (pascal_printstr): Rename to pascal_language::printstr. (pascal_language_data): Delete la_printstr initializer. (pascal_language::printstr): New member function, implementation from pascal_printstr. * p-lang.h (pascal_printstr): Delete declaration. * rust-lang.c (rust_printstr): Update header comment. (rust_language_data): Delete la_printstr initializer. (rust_language::printstr): New member function.
Diffstat (limited to 'gdb/rust-lang.c')
-rw-r--r--gdb/rust-lang.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index 36e2617..b13623f 100644
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -281,7 +281,7 @@ rust_get_trait_object_pointer (struct value *value)
-/* la_printstr implementation for Rust. */
+/* language_defn::printstr implementation for Rust. */
static void
rust_printstr (struct ui_file *stream, struct type *type,
@@ -1953,7 +1953,6 @@ extern const struct language_data rust_language_data =
macro_expansion_no,
rust_extensions,
&exp_descriptor_rust,
- rust_printstr, /* Function to print string constant */
rust_print_typedef, /* Print a typedef using appropriate syntax */
NULL, /* name_of_this */
false, /* la_store_sym_names_in_linkage_form_p */
@@ -2145,6 +2144,17 @@ public:
LA_EMIT_CHAR (ch, chtype, stream, '\'');
fputs_filtered ("'", stream);
}
+
+ /* See language.h. */
+
+ void printstr (struct ui_file *stream, struct type *elttype,
+ const gdb_byte *string, unsigned int length,
+ const char *encoding, int force_ellipses,
+ const struct value_print_options *options) const override
+ {
+ rust_printstr (stream, elttype, string, length, encoding,
+ force_ellipses, options);
+ }
};
/* Single instance of the Rust language class. */