diff options
Diffstat (limited to 'gdb/ada-exp.y')
| -rw-r--r-- | gdb/ada-exp.y | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 1546ae9..ed5694e 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -35,7 +35,6 @@ %{ -#include <ctype.h> #include "gdbsupport/unordered_map.h" #include "expression.h" #include "value.h" @@ -1338,7 +1337,7 @@ write_object_renaming (struct parser_state *par_state, SEARCH_VFT); if (sym_info.symbol == NULL) error (_("Could not find renamed variable: %s"), ada_decode (name).c_str ()); - else if (sym_info.symbol->aclass () == LOC_TYPEDEF) + else if (sym_info.symbol->loc_class () == LOC_TYPEDEF) /* We have a renaming of an old-style renaming symbol. Don't trust the block information. */ sym_info.block = orig_left_context; @@ -1380,7 +1379,7 @@ write_object_renaming (struct parser_state *par_state, [[fallthrough]]; case 'S': renaming_expr += 1; - if (isdigit (*renaming_expr)) + if (c_isdigit (*renaming_expr)) { char *next; long val = strtol (renaming_expr, &next, 10); @@ -1408,7 +1407,7 @@ write_object_renaming (struct parser_state *par_state, SEARCH_VFT); if (index_sym_info.symbol == NULL) error (_("Could not find %s"), index_name); - else if (index_sym_info.symbol->aclass () == LOC_TYPEDEF) + else if (index_sym_info.symbol->loc_class () == LOC_TYPEDEF) /* Index is an old-style renaming symbol. */ index_sym_info.block = orig_left_context; write_var_from_sym (par_state, index_sym_info); @@ -1478,14 +1477,14 @@ block_lookup (const struct block *context, const char *raw_name) = ada_lookup_symbol_list (name, context, SEARCH_FUNCTION_DOMAIN); if (context == NULL - && (syms.empty () || syms[0].symbol->aclass () != LOC_BLOCK)) + && (syms.empty () || syms[0].symbol->loc_class () != LOC_BLOCK)) symtab = lookup_symtab (current_program_space, name); else symtab = NULL; if (symtab != NULL) result = symtab->compunit ()->blockvector ()->static_block (); - else if (syms.empty () || syms[0].symbol->aclass () != LOC_BLOCK) + else if (syms.empty () || syms[0].symbol->loc_class () != LOC_BLOCK) { if (context == NULL) error (_("No file or function \"%s\"."), raw_name); @@ -1511,7 +1510,7 @@ select_possible_type_sym (const std::vector<struct block_symbol> &syms) preferred_index = -1; preferred_type = NULL; for (i = 0; i < syms.size (); i += 1) - switch (syms[i].symbol->aclass ()) + switch (syms[i].symbol->loc_class ()) { case LOC_TYPEDEF: if (ada_prefer_type (syms[i].symbol->type (), preferred_type)) @@ -1555,7 +1554,7 @@ find_primitive_type (struct parser_state *par_state, const char *name) strcpy (expanded_name, "standard__"); strcat (expanded_name, name); sym = ada_lookup_symbol (expanded_name, NULL, SEARCH_TYPE_DOMAIN).symbol; - if (sym != NULL && sym->aclass () == LOC_TYPEDEF) + if (sym != NULL && sym->loc_class () == LOC_TYPEDEF) type = sym->type (); } @@ -1888,7 +1887,7 @@ ada_parse_state::find_completion_bounds () const char *end = pstate->lexptr; /* First the end of the prefix. Here we stop at the token start or at '.' or space. */ - for (; end > m_original_expr && end[-1] != '.' && !isspace (end[-1]); --end) + for (; end > m_original_expr && end[-1] != '.' && !c_isspace (end[-1]); --end) { /* Nothing. */ } @@ -1966,7 +1965,7 @@ write_name_assoc (struct parser_state *par_state, struct stoken name) par_state->expression_context_block, SEARCH_VFT); - if (syms.size () != 1 || syms[0].symbol->aclass () == LOC_TYPEDEF) + if (syms.size () != 1 || syms[0].symbol->loc_class () == LOC_TYPEDEF) pstate->push_new<ada_string_operation> (copy_name (name)); else write_var_from_sym (par_state, syms[0]); |