static void unk_lang_value_print (struct value *, struct ui_file *,
const struct value_print_options *);
-static CORE_ADDR unk_lang_trampoline (struct frame_info *, CORE_ADDR pc);
-
-/* Forward declaration */
-extern const struct language_defn unknown_language_defn;
-
/* The current (default at startup) state of type and range checking.
(If the modes are set to "auto", though, these are changed based
on the default language at startup, and then again based on the
/* The current language and language_mode (see language.h). */
-const struct language_defn *current_language = &unknown_language_defn;
+const struct language_defn *current_language = nullptr;
enum language_mode language_mode = language_mode_auto;
/* The language that the user expects to be typing in (the language
const struct language_defn *expected_language;
-/* The list of supported languages. Keep this in the same order as
- the 'enum language' values. */
-
-static const struct language_defn *languages[] = {
- &unknown_language_defn,
- &auto_language_defn,
- &c_language_defn,
- &objc_language_defn,
- &cplus_language_defn,
- &d_language_defn,
- &go_language_defn,
- &f_language_defn,
- &m2_language_defn,
- &asm_language_defn,
- &pascal_language_defn,
- &opencl_language_defn,
- &rust_language_defn,
- &minimal_language_defn,
- &ada_language_defn,
-};
+/* Define the array containing all languages. */
+
+const struct language_defn *language_defn::languages[nr_languages];
/* The current values of the "set language/range/case-sensitive" enum
commands. */
language = "auto";
/* Search the list of languages for a match. */
- for (const auto &lang : languages)
+ for (const auto &lang : language_defn::languages)
{
if (strcmp (lang->la_name, language) == 0)
{
enum language prev_language;
prev_language = current_language->la_language;
- current_language = languages[lang];
+ current_language = language_def (lang);
set_range_case ();
return prev_language;
}
int
pointer_type (struct type *type)
{
- return TYPE_CODE (type) == TYPE_CODE_PTR || TYPE_IS_REFERENCE (type);
+ return type->code () == TYPE_CODE_PTR || TYPE_IS_REFERENCE (type);
}
\f
enum language
language_enum (const char *str)
{
- for (const auto &lang : languages)
+ for (const auto &lang : language_defn::languages)
if (strcmp (lang->la_name, str) == 0)
return lang->la_language;
const struct language_defn *
language_def (enum language lang)
{
- return languages[lang];
+ const struct language_defn *l = language_defn::languages[lang];
+ gdb_assert (l != nullptr);
+ return l;
}
/* Return the language as a string. */
const char *
language_str (enum language lang)
{
- return languages[lang]->la_name;
-}
-
-static void
-set_check (const char *ignore, int from_tty)
-{
- printf_unfiltered (
- "\"set check\" must be followed by the name of a check subcommand.\n");
- help_list (setchecklist, "set check ", all_commands, gdb_stdout);
+ return language_def (lang)->la_name;
}
-static void
-show_check (const char *ignore, int from_tty)
-{
- cmd_show_list (showchecklist, from_tty, "");
-}
\f
/* Build and install the "set language LANG" command. */
/* Build the language names array, to be used as enumeration in the
"set language" enum command. +1 for "local" and +1 for NULL
termination. */
- language_names = new const char *[ARRAY_SIZE (languages) + 2];
+ language_names = new const char *[ARRAY_SIZE (language_defn::languages) + 2];
/* Display "auto", "local" and "unknown" first, and then the rest,
alpha sorted. */
const char **language_names_p = language_names;
- *language_names_p++ = auto_language_defn.la_name;
+ *language_names_p++ = language_def (language_auto)->la_name;
*language_names_p++ = "local";
- *language_names_p++ = unknown_language_defn.la_name;
+ *language_names_p++ = language_def (language_unknown)->la_name;
const char **sort_begin = language_names_p;
- for (const auto &lang : languages)
+ for (const auto &lang : language_defn::languages)
{
/* Already handled above. */
if (lang->la_language == language_auto
std::sort (sort_begin, language_names_p, compare_cstrings);
/* Add the filename extensions. */
- for (const auto &lang : languages)
+ for (const auto &lang : language_defn::languages)
if (lang->la_filename_extensions != NULL)
{
for (size_t i = 0; lang->la_filename_extensions[i] != NULL; ++i)
"The currently understood settings are:\n\nlocal or "
"auto Automatic setting based on source file"));
- for (const auto &lang : languages)
+ for (const auto &lang : language_defn::languages)
{
/* Already dealt with these above. */
if (lang->la_language == language_unknown
CORE_ADDR
skip_language_trampoline (struct frame_info *frame, CORE_ADDR pc)
{
- for (const auto &lang : languages)
+ for (const auto &lang : language_defn::languages)
{
- if (lang->skip_trampoline != NULL)
- {
- CORE_ADDR real_pc = lang->skip_trampoline (frame, pc);
+ CORE_ADDR real_pc = lang->skip_trampoline (frame, pc);
- if (real_pc)
- return real_pc;
- }
+ if (real_pc != 0)
+ return real_pc;
}
return 0;
language_demangle (const struct language_defn *current_language,
const char *mangled, int options)
{
- if (current_language != NULL && current_language->la_demangle)
- return current_language->la_demangle (mangled, options);
+ if (current_language != NULL)
+ return current_language->demangle (mangled, options);
return NULL;
}
-/* See language.h. */
-
-int
-language_sniff_from_mangled_name (const struct language_defn *lang,
- const char *mangled, char **demangled)
-{
- gdb_assert (lang != NULL);
-
- if (lang->la_sniff_from_mangled_name == NULL)
- {
- *demangled = NULL;
- return 0;
- }
-
- return lang->la_sniff_from_mangled_name (mangled, demangled);
-}
-
/* Return class name from physname or NULL. */
char *
language_class_name_from_physname (const struct language_defn *lang,
struct language_pass_by_ref_info
language_pass_by_reference (struct type *type)
{
- return current_language->la_pass_by_reference (type);
-}
-
-/* Return a default struct that provides pass-by-reference information
- about the given TYPE. Languages should update the default values
- as appropriate. */
-
-struct language_pass_by_ref_info
-default_pass_by_reference (struct type *type)
-{
- return {};
+ return current_language->pass_by_reference_info (type);
}
/* Return the default string containing the list of characters
return " \t\n!@#$%^&*()+=|~`}{[]\"';:?/>.<,-";
}
-/* Print the index of array elements using the C99 syntax. */
+/* See language.h. */
void
-default_print_array_index (struct value *index_value, struct ui_file *stream,
- const struct value_print_options *options)
+language_defn::print_array_index (struct type *index_type, LONGEST index,
+ struct ui_file *stream,
+ const value_print_options *options) const
{
+ struct value *index_value = value_from_longest (index_type, index);
+
fprintf_filtered (stream, "[");
LA_VALUE_PRINT (index_value, stream, options);
fprintf_filtered (stream, "] = ");
const lookup_name_info &lookup_name,
completion_match_result *comp_match_res)
{
- const std::string &name = lookup_name.name ();
+ gdb::string_view name = lookup_name.name ();
completion_match_for_lcd *match_for_lcd
= (comp_match_res != NULL ? &comp_match_res->match_for_lcd : NULL);
strncmp_iw_mode mode = (lookup_name.completion_mode ()
? strncmp_iw_mode::NORMAL
: strncmp_iw_mode::MATCH_PARAMS);
- if (strncmp_iw_with_mode (symbol_search_name, name.c_str (), name.size (),
+ if (strncmp_iw_with_mode (symbol_search_name, name.data (), name.size (),
mode, language_minimal, match_for_lcd) == 0)
{
if (comp_match_res != NULL)
default_is_string_type_p (struct type *type)
{
type = check_typedef (type);
- while (TYPE_CODE (type) == TYPE_CODE_REF)
+ while (type->code () == TYPE_CODE_REF)
{
type = TYPE_TARGET_TYPE (type);
type = check_typedef (type);
}
- return (TYPE_CODE (type) == TYPE_CODE_STRING);
+ return (type->code () == TYPE_CODE_STRING);
}
/* See language.h. */
}
static void
-unk_lang_print_type (struct type *type, const char *varstring,
- struct ui_file *stream, int show, int level,
- const struct type_print_options *flags)
-{
- error (_("internal error - unimplemented "
- "function unk_lang_print_type called."));
-}
-
-static void
-unk_lang_val_print (struct type *type,
- int embedded_offset, CORE_ADDR address,
- struct ui_file *stream, int recurse,
- struct value *val,
- const struct value_print_options *options)
+unk_lang_value_print_inner (struct value *val,
+ struct ui_file *stream, int recurse,
+ const struct value_print_options *options)
{
error (_("internal error - unimplemented "
- "function unk_lang_val_print called."));
+ "function unk_lang_value_print_inner called."));
}
static void
"function unk_lang_value_print called."));
}
-static CORE_ADDR unk_lang_trampoline (struct frame_info *frame, CORE_ADDR pc)
-{
- return 0;
-}
-
-/* Unknown languages just use the cplus demangler. */
-static char *unk_lang_demangle (const char *mangled, int options)
-{
- return gdb_demangle (mangled, options);
-}
-
static char *unk_lang_class_name (const char *mangled)
{
return NULL;
struct type *);
}
-const struct language_defn unknown_language_defn =
+/* Constant data that describes the unknown language. */
+
+extern const struct language_data unknown_language_data =
{
"unknown",
"Unknown",
unk_lang_printchar, /* Print character constant */
unk_lang_printstr,
unk_lang_emit_char,
- unk_lang_print_type, /* Print a type using appropriate syntax */
default_print_typedef, /* Print a typedef using appropriate syntax */
- unk_lang_val_print, /* Print a value using appropriate syntax */
+ unk_lang_value_print_inner, /* la_value_print_inner */
unk_lang_value_print, /* Print a top-level value */
- default_read_var_value, /* la_read_var_value */
- unk_lang_trampoline, /* Language specific skip_trampoline */
"this", /* name_of_this */
true, /* store_sym_names_in_linkage_form_p */
basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
- basic_lookup_transparent_type,/* lookup_transparent_type */
- unk_lang_demangle, /* Language specific symbol demangler */
- NULL,
unk_lang_class_name, /* Language specific
class_name_from_physname */
unk_op_print_tab, /* expression operators for printing */
0, /* String lower bound */
default_word_break_characters,
default_collect_symbol_completion_matches,
- unknown_language_arch_info, /* la_language_arch_info. */
- default_print_array_index,
- default_pass_by_reference,
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
- iterate_over_symbols,
- default_search_name_hash,
&default_varobj_ops,
NULL,
- NULL,
default_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};
-/* These two structs define fake entries for the "local" and "auto"
- options. */
-const struct language_defn auto_language_defn =
+/* Class representing the unknown language. */
+
+class unknown_language : public language_defn
+{
+public:
+ unknown_language ()
+ : language_defn (language_unknown, unknown_language_data)
+ { /* Nothing. */ }
+
+ /* See language.h. */
+ void language_arch_info (struct gdbarch *gdbarch,
+ struct language_arch_info *lai) const override
+ {
+ unknown_language_arch_info (gdbarch, lai);
+ }
+
+ /* See language.h. */
+
+ void print_type (struct type *type, const char *varstring,
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags) const override
+ {
+ error (_("unimplemented unknown_language::print_type called"));
+ }
+
+ /* See language.h. */
+
+ char *demangle (const char *mangled, int options) const override
+ {
+ /* The unknown language just uses the C++ demangler. */
+ return gdb_demangle (mangled, options);
+ }
+};
+
+/* Single instance of the unknown language class. */
+
+static unknown_language unknown_language_defn;
+
+/* Constant data for the fake "auto" language. */
+
+extern const struct language_data auto_language_data =
{
"auto",
"Auto",
unk_lang_printchar, /* Print character constant */
unk_lang_printstr,
unk_lang_emit_char,
- unk_lang_print_type, /* Print a type using appropriate syntax */
default_print_typedef, /* Print a typedef using appropriate syntax */
- unk_lang_val_print, /* Print a value using appropriate syntax */
+ unk_lang_value_print_inner, /* la_value_print_inner */
unk_lang_value_print, /* Print a top-level value */
- default_read_var_value, /* la_read_var_value */
- unk_lang_trampoline, /* Language specific skip_trampoline */
"this", /* name_of_this */
false, /* store_sym_names_in_linkage_form_p */
basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
- basic_lookup_transparent_type,/* lookup_transparent_type */
- unk_lang_demangle, /* Language specific symbol demangler */
- NULL,
unk_lang_class_name, /* Language specific
class_name_from_physname */
unk_op_print_tab, /* expression operators for printing */
0, /* String lower bound */
default_word_break_characters,
default_collect_symbol_completion_matches,
- unknown_language_arch_info, /* la_language_arch_info. */
- default_print_array_index,
- default_pass_by_reference,
c_watch_location_expression,
NULL, /* la_get_symbol_name_matcher */
- iterate_over_symbols,
- default_search_name_hash,
&default_varobj_ops,
NULL,
- NULL,
default_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};
+/* Class representing the fake "auto" language. */
+
+class auto_language : public language_defn
+{
+public:
+ auto_language ()
+ : language_defn (language_auto, auto_language_data)
+ { /* Nothing. */ }
+
+ /* See language.h. */
+ void language_arch_info (struct gdbarch *gdbarch,
+ struct language_arch_info *lai) const override
+ {
+ unknown_language_arch_info (gdbarch, lai);
+ }
+
+ /* See language.h. */
+
+ void print_type (struct type *type, const char *varstring,
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags) const override
+ {
+ error (_("unimplemented auto_language::print_type called"));
+ }
+
+ /* See language.h. */
+
+ char *demangle (const char *mangled, int options) const override
+ {
+ /* The auto language just uses the C++ demangler. */
+ return gdb_demangle (mangled, options);
+ }
+};
+
+/* Single instance of the fake "auto" language. */
+
+static auto_language auto_language_defn;
+
\f
/* Per-architecture language information. */
struct language_gdbarch *l;
l = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct language_gdbarch);
- for (const auto &lang : languages)
- if (lang != NULL && lang->la_language_arch_info != NULL)
- {
- lang->la_language_arch_info (gdbarch,
- l->arch_info + lang->la_language);
- }
+ for (const auto &lang : language_defn::languages)
+ {
+ gdb_assert (lang != nullptr);
+ lang->language_arch_info (gdbarch,
+ l->arch_info + lang->la_language);
+ }
return l;
}
{
struct type *type = SYMBOL_TYPE (sym);
- if (type && TYPE_CODE (type) == TYPE_CODE_BOOL)
+ if (type && type->code () == TYPE_CODE_BOOL)
return type;
}
}
for (p = lai->primitive_type_vector; (*p) != NULL; p++)
{
- if (strcmp (TYPE_NAME (*p), name) == 0)
+ if (strcmp ((*p)->name (), name) == 0)
return p;
}
return NULL;
gdbarch = TYPE_OWNER (type).gdbarch;
symbol = new (gdbarch_obstack (gdbarch)) struct symbol ();
- symbol->m_name = TYPE_NAME (type);
+ symbol->m_name = type->name ();
symbol->set_language (lang, nullptr);
symbol->owner.arch = gdbarch;
SYMBOL_OBJFILE_OWNED (symbol) = 0;
+ SYMBOL_SECTION (symbol) = 0;
SYMBOL_TYPE (symbol) = type;
SYMBOL_DOMAIN (symbol) = VAR_DOMAIN;
SYMBOL_ACLASS_INDEX (symbol) = LOC_TYPEDEF;
/* Initialize the language routines. */
+void _initialize_language ();
void
-_initialize_language (void)
+_initialize_language ()
{
static const char *const type_or_range_names[]
= { "on", "off", "warn", "auto", NULL };
/* GDB commands for language specific stuff. */
- add_prefix_cmd ("check", no_class, set_check,
- _("Set the status of the type/range checker."),
- &setchecklist, "set check ", 0, &setlist);
+ add_basic_prefix_cmd ("check", no_class,
+ _("Set the status of the type/range checker."),
+ &setchecklist, "set check ", 0, &setlist);
add_alias_cmd ("c", "check", no_class, 1, &setlist);
add_alias_cmd ("ch", "check", no_class, 1, &setlist);
- add_prefix_cmd ("check", no_class, show_check,
- _("Show the status of the type/range checker."),
- &showchecklist, "show check ", 0, &showlist);
+ add_show_prefix_cmd ("check", no_class,
+ _("Show the status of the type/range checker."),
+ &showchecklist, "show check ", 0, &showlist);
add_alias_cmd ("c", "check", no_class, 1, &showlist);
add_alias_cmd ("ch", "check", no_class, 1, &showlist);
show_case_command,
&setlist, &showlist);
+ /* In order to call SET_LANGUAGE (below) we need to make sure that
+ CURRENT_LANGUAGE is not NULL. So first set the language to unknown,
+ then we can change the language to 'auto'. */
+ current_language = language_def (language_unknown);
+
add_set_language_command ();
language = "auto";