{
struct value *temp = arg1;
- type = TYPE_FIELD_TYPE (type, 1);
+ type = type->field (1).type ();
/* i18n: Do not translate the "_m2_high" part! */
arg1 = value_struct_elt (&temp, NULL, "_m2_high", NULL,
_("unbounded structure "
if (m2_is_unbounded_array (type))
{
struct value *temp = arg1;
- type = TYPE_FIELD_TYPE (type, 0);
+ type = type->field (0).type ();
if (type == NULL || (type->code () != TYPE_CODE_PTR))
{
warning (_("internal error: unbounded "
nr_m2_primitive_types
};
-static void
-m2_language_arch_info (struct gdbarch *gdbarch,
- struct language_arch_info *lai)
-{
- const struct builtin_m2_type *builtin = builtin_m2_type (gdbarch);
-
- lai->string_char_type = builtin->builtin_char;
- lai->primitive_type_vector
- = GDBARCH_OBSTACK_CALLOC (gdbarch, nr_m2_primitive_types + 1,
- struct type *);
-
- lai->primitive_type_vector [m2_primitive_type_char]
- = builtin->builtin_char;
- lai->primitive_type_vector [m2_primitive_type_int]
- = builtin->builtin_int;
- lai->primitive_type_vector [m2_primitive_type_card]
- = builtin->builtin_card;
- lai->primitive_type_vector [m2_primitive_type_real]
- = builtin->builtin_real;
- lai->primitive_type_vector [m2_primitive_type_bool]
- = builtin->builtin_bool;
-
- lai->bool_type_symbol = "BOOLEAN";
- lai->bool_type_default = builtin->builtin_bool;
-}
-
const struct exp_descriptor exp_descriptor_modula2 =
{
print_subexp_standard,
evaluate_subexp_modula2
};
-extern const struct language_defn m2_language_defn =
+/* Constant data describing the M2 language. */
+
+extern const struct language_data m2_language_data =
{
"modula-2",
"Modula-2",
m2_printchar, /* Print character constant */
m2_printstr, /* function to print string constant */
m2_emit_char, /* Function to print a single character */
- m2_print_type, /* Print a type using appropriate syntax */
m2_print_typedef, /* Print a typedef using appropriate syntax */
- m2_value_print_inner, /* la_value_print_inner */
- c_value_print, /* Print a top-level value */
- default_read_var_value, /* la_read_var_value */
- NULL, /* Language specific skip_trampoline */
NULL, /* name_of_this */
false, /* la_store_sym_names_in_linkage_form_p */
- basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
- basic_lookup_transparent_type,/* lookup_transparent_type */
- NULL, /* Language specific symbol demangler */
- NULL,
- NULL, /* Language specific
- class_name_from_physname */
m2_op_print_tab, /* expression operators for printing */
0, /* arrays are first-class (not c-style) */
0, /* String lower bound */
- default_word_break_characters,
- default_collect_symbol_completion_matches,
- m2_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,
m2_is_string_type_p,
"{...}" /* la_struct_too_deep_ellipsis */
};
+/* Class representing the M2 language. */
+
+class m2_language : public language_defn
+{
+public:
+ m2_language ()
+ : language_defn (language_m2, m2_language_data)
+ { /* Nothing. */ }
+
+ /* See language.h. */
+ void language_arch_info (struct gdbarch *gdbarch,
+ struct language_arch_info *lai) const override
+ {
+ const struct builtin_m2_type *builtin = builtin_m2_type (gdbarch);
+
+ lai->string_char_type = builtin->builtin_char;
+ lai->primitive_type_vector
+ = GDBARCH_OBSTACK_CALLOC (gdbarch, nr_m2_primitive_types + 1,
+ struct type *);
+
+ lai->primitive_type_vector [m2_primitive_type_char]
+ = builtin->builtin_char;
+ lai->primitive_type_vector [m2_primitive_type_int]
+ = builtin->builtin_int;
+ lai->primitive_type_vector [m2_primitive_type_card]
+ = builtin->builtin_card;
+ lai->primitive_type_vector [m2_primitive_type_real]
+ = builtin->builtin_real;
+ lai->primitive_type_vector [m2_primitive_type_bool]
+ = builtin->builtin_bool;
+
+ lai->bool_type_symbol = "BOOLEAN";
+ lai->bool_type_default = builtin->builtin_bool;
+ }
+
+ /* 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
+ {
+ m2_print_type (type, varstring, stream, show, level, flags);
+ }
+
+ /* See language.h. */
+
+ void value_print_inner
+ (struct value *val, struct ui_file *stream, int recurse,
+ const struct value_print_options *options) const override
+ {
+ return m2_value_print_inner (val, stream, recurse, options);
+ }
+};
+
+/* Single instance of the M2 language. */
+
+static m2_language m2_language_defn;
+
static void *
build_m2_types (struct gdbarch *gdbarch)
{