diff options
Diffstat (limited to 'gdb/ada-lang.c')
| -rw-r--r-- | gdb/ada-lang.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 3265c21..38d1ce6 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -6357,7 +6357,7 @@ bool ada_lookup_name_info::matches (const char *sym_name, symbol_name_match_type match_type, - completion_match *comp_match) const + completion_match_result *comp_match_res) const { bool match = false; const char *text = m_encoded_name.c_str (); @@ -6415,15 +6415,12 @@ ada_lookup_name_info::matches if (!match) return false; - if (comp_match != NULL) + if (comp_match_res != NULL) { - std::string &match_str = comp_match->storage (); + std::string &match_str = comp_match_res->match.storage (); if (!m_encoded_p) - { - match_str = ada_decode (sym_name); - comp_match->set_match (match_str.c_str ()); - } + match_str = ada_decode (sym_name); else { if (m_verbatim_p) @@ -6431,8 +6428,9 @@ ada_lookup_name_info::matches else match_str = sym_name; - comp_match->set_match (match_str.c_str ()); } + + comp_match_res->set_match (match_str.c_str ()); } return true; @@ -13925,7 +13923,7 @@ static const struct exp_descriptor ada_exp_descriptor = { static bool do_wild_match (const char *symbol_search_name, const lookup_name_info &lookup_name, - completion_match *match) + completion_match_result *comp_match_res) { return wild_match (symbol_search_name, ada_lookup_name (lookup_name)); } @@ -13935,7 +13933,7 @@ do_wild_match (const char *symbol_search_name, static bool do_full_match (const char *symbol_search_name, const lookup_name_info &lookup_name, - completion_match *match) + completion_match_result *comp_match_res) { return full_match (symbol_search_name, ada_lookup_name (lookup_name)); } @@ -14005,11 +14003,11 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) static bool ada_symbol_name_matches (const char *symbol_search_name, const lookup_name_info &lookup_name, - completion_match *match) + completion_match_result *comp_match_res) { return lookup_name.ada ().matches (symbol_search_name, lookup_name.match_type (), - match); + comp_match_res); } /* Implement the "la_get_symbol_name_matcher" language_defn method for |