mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 02:53:48 +08:00
c62446b12b
A few places in the completion code look for a "(" to find a
function's parameter list, in order to strip it, because psymtabs (and
gdb index) don't include parameter info in the symbol names.
See compare_symbol_name and
default_collect_symbol_completion_matches_break_on.
This is too naive. Consider:
ns_overload2_test::([TAB]
We'd want to complete that to:
ns_overload2_test::(anonymous namespace)::struct_overload2_test
Or:
b (anonymous namespace)::[TAB]
That currently completes to:
b (anonymous namespace)
Which is obviously broken. This patch makes that work.
Also, the current compare_symbol_name hack means that while this
works:
"b function([TAB]" -> "b function()"
This does not:
"b function ([TAB]"
This patch fixes that. Whitespace "ignoring" now Just Works, i.e.,
assuming a symbol named "function(int, long)", this:
b function ( int , lon[TAB]
completes to:
b function ( int , long)
To address all of this, this patch builds on top of the rest of the
series, and pushes the responsibility of stripping parameters from a
lookup name to the new lookup_name_info object, where we can apply
per-language rules. Also note that we now only make a version of the
lookup name with parameters stripped out where it's actually required
to do that, in the psymtab and GDB index code.
For C++, the right way to strip parameters is with "cp_remove_params",
which uses a real parser (cp-name-parser.y) to split the name into a
component tree and then discards parameters.
The trouble for completion is that in that case we have an incomplete
name, like "foo::func(int" and thus cp_remove_params throws an error.
This patch sorts that by adding a cp_remove_params_if_any variant of
cp_remove_params that tries removing characters from the end of the
string until cp_remove_params works. So cp_remove_params_if_any
behaves like this:
With a complete name:
"foo::func(int)" => foo::func(int) # cp_remove_params_1 succeeds the first time.
With an incomplete name:
"foo::func(int" => NULL # cp_remove_params fails the first time.
"foo::func(in" => NULL # and again...
"foo::func(i" => NULL # and again...
"foo::func(" => NULL # and again...
"foo::func" => "foo::func" # success!
Note that even if this approach removes significant rightmost
characters, it's still OK, because this parameter stripping is only
necessary for psymtabs and gdb index, where we're determining whether
to expand a symbol table. Say cp_remove_params_if_any returned
"foo::" above for "foo::func(int". That'd cause us to expand more
symtabs than ideal (because we'd expand all symtabs with symbols that
start with "foo::", not just "foo::func"), but then when we actually
look for completion matches, we'd still use the original lookup name,
with parameter information ["foo::func(int"], and thus we'll return no
false positive to the user. Whether the stripping works as intended
and doesn't strip too much is thus covered by a unit test instead of a
testsuite test.
The "if_any" part of the name refers to the fact that while
cp_remove_params returns NULL if the input name has no parameters in
the first place, like:
"foo::func" => NULL # cp_remove_params
cp_remove_params_if_any still returns the function name:
"foo::func" => "foo::func" # cp_remove_params_if_any
gdb/ChangeLog:
2017-11-08 Pedro Alves <palves@redhat.com>
* Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
unittests/lookup_name_info-selftests.c.
(SUBDIR_UNITTESTS_OBS): Add lookup_name_info-selftests.o.
* cp-support.c: Include "selftest.h".
(cp_remove_params_1): Rename from cp_remove_params. Add
'require_param' parameter, and handle it.
(cp_remove_params): Reimplement.
(cp_remove_params_if_any): New.
(selftests::quote): New.
(selftests::check_remove_params): New.
(selftests::test_cp_remove_params): New.
(_initialize_cp_support): Install
selftests::test_cp_remove_params.
* cp-support.h (cp_remove_params_if_any): Declare.
* dwarf2read.c :Include "selftest.h".
(dw2_expand_symtabs_matching_symbol): Use
lookup_name_info::make_ignore_params.
(selftests::dw2_expand_symtabs_matching::mock_mapped_index)
(selftests::dw2_expand_symtabs_matching::string_or_null)
(selftests::dw2_expand_symtabs_matching::check_match)
(selftests::dw2_expand_symtabs_matching::test_symbols)
(selftests::dw2_expand_symtabs_matching::run_test): New.
(_initialize_dwarf2_read): Register
selftests::dw2_expand_symtabs_matching::run_test.
* psymtab.c (psym_expand_symtabs_matching): Use
lookup_name_info::make_ignore_params.
* symtab.c (demangle_for_lookup_info::demangle_for_lookup_info):
If the lookup name wants to ignore parameters, strip them.
(compare_symbol_name): Remove sym_text/sym_text_len parameters and
code handling '('.
(completion_list_add_name): Don't pass down sym_text/sym_text_len.
(default_collect_symbol_completion_matches_break_on): Don't try to
strip parameters.
* symtab.h (lookup_name_info::lookup_name_info): Add
'ignore_parameters' parameter.
(lookup_name_info::ignore_parameters)
(lookup_name_info::make_ignore_params): New methods.
(lookup_name_info::m_ignore_parameters): New field.
* unittests/lookup_name_info-selftests.c: New file.
187 lines
5.6 KiB
C++
187 lines
5.6 KiB
C++
/* Helper routines for C++ support in GDB.
|
|
Copyright (C) 2002-2017 Free Software Foundation, Inc.
|
|
|
|
Contributed by MontaVista Software.
|
|
Namespace support contributed by David Carlton.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef CP_SUPPORT_H
|
|
#define CP_SUPPORT_H
|
|
|
|
/* We need this for 'domain_enum', alas... */
|
|
|
|
#include "symtab.h"
|
|
#include "vec.h"
|
|
#include "gdb_vecs.h"
|
|
#include "gdb_obstack.h"
|
|
|
|
/* Opaque declarations. */
|
|
|
|
struct symbol;
|
|
struct block;
|
|
struct objfile;
|
|
struct type;
|
|
struct demangle_component;
|
|
struct using_direct;
|
|
|
|
/* A string representing the name of the anonymous namespace used in GDB. */
|
|
|
|
#define CP_ANONYMOUS_NAMESPACE_STR "(anonymous namespace)"
|
|
|
|
/* The length of the string representing the anonymous namespace. */
|
|
|
|
#define CP_ANONYMOUS_NAMESPACE_LEN 21
|
|
|
|
/* A string representing the start of an operator name. */
|
|
|
|
#define CP_OPERATOR_STR "operator"
|
|
|
|
/* The length of CP_OPERATOR_STR. */
|
|
|
|
#define CP_OPERATOR_LEN 8
|
|
|
|
/* The result of parsing a name. */
|
|
|
|
struct demangle_parse_info
|
|
{
|
|
demangle_parse_info ();
|
|
|
|
~demangle_parse_info ();
|
|
|
|
/* The memory used during the parse. */
|
|
struct demangle_info *info;
|
|
|
|
/* The result of the parse. */
|
|
struct demangle_component *tree;
|
|
|
|
/* Any temporary memory used during typedef replacement. */
|
|
struct obstack obstack;
|
|
};
|
|
|
|
|
|
/* Functions from cp-support.c. */
|
|
|
|
extern std::string cp_canonicalize_string (const char *string);
|
|
|
|
extern std::string cp_canonicalize_string_no_typedefs (const char *string);
|
|
|
|
typedef const char *(canonicalization_ftype) (struct type *, void *);
|
|
|
|
extern std::string cp_canonicalize_string_full (const char *string,
|
|
canonicalization_ftype *finder,
|
|
void *data);
|
|
|
|
extern char *cp_class_name_from_physname (const char *physname);
|
|
|
|
extern char *method_name_from_physname (const char *physname);
|
|
|
|
extern unsigned int cp_find_first_component (const char *name);
|
|
|
|
extern unsigned int cp_entire_prefix_len (const char *name);
|
|
|
|
extern char *cp_func_name (const char *full_name);
|
|
|
|
extern gdb::unique_xmalloc_ptr<char> cp_remove_params
|
|
(const char *demanged_name);
|
|
|
|
/* DEMANGLED_NAME is the name of a function, (optionally) including
|
|
parameters and (optionally) a return type. Return the name of the
|
|
function without parameters or return type, or NULL if we can not
|
|
parse the name. If COMPLETION_MODE is true, then tolerate a
|
|
non-existing or unbalanced parameter list. */
|
|
extern gdb::unique_xmalloc_ptr<char> cp_remove_params_if_any
|
|
(const char *demangled_name, bool completion_mode);
|
|
|
|
extern struct symbol **make_symbol_overload_list (const char *,
|
|
const char *);
|
|
|
|
extern struct symbol **make_symbol_overload_list_adl (struct type **arg_types,
|
|
int nargs,
|
|
const char *func_name);
|
|
|
|
extern struct type *cp_lookup_rtti_type (const char *name,
|
|
struct block *block);
|
|
|
|
/* Implement the "la_get_symbol_name_matcher" language_defn method for
|
|
C++. */
|
|
extern symbol_name_matcher_ftype *cp_get_symbol_name_matcher
|
|
(const lookup_name_info &lookup_name);
|
|
|
|
/* Functions/variables from cp-namespace.c. */
|
|
|
|
extern int cp_is_in_anonymous (const char *symbol_name);
|
|
|
|
extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol,
|
|
struct objfile *objfile);
|
|
|
|
extern struct block_symbol cp_lookup_symbol_nonlocal
|
|
(const struct language_defn *langdef,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain);
|
|
|
|
extern struct block_symbol
|
|
cp_lookup_symbol_namespace (const char *the_namespace,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain);
|
|
|
|
extern struct block_symbol cp_lookup_symbol_imports_or_template
|
|
(const char *scope,
|
|
const char *name,
|
|
const struct block *block,
|
|
const domain_enum domain);
|
|
|
|
extern struct block_symbol
|
|
cp_lookup_nested_symbol (struct type *parent_type,
|
|
const char *nested_name,
|
|
const struct block *block,
|
|
const domain_enum domain);
|
|
|
|
struct type *cp_lookup_transparent_type (const char *name);
|
|
|
|
/* See description in cp-namespace.c. */
|
|
|
|
struct type *cp_find_type_baseclass_by_name (struct type *parent_type,
|
|
const char *name);
|
|
|
|
/* Functions from cp-name-parser.y. */
|
|
|
|
extern std::unique_ptr<demangle_parse_info> cp_demangled_name_to_comp
|
|
(const char *demangled_name, const char **errmsg);
|
|
|
|
extern gdb::unique_xmalloc_ptr<char> cp_comp_to_string
|
|
(struct demangle_component *result, int estimated_len);
|
|
|
|
extern void cp_merge_demangle_parse_infos (struct demangle_parse_info *,
|
|
struct demangle_component *,
|
|
struct demangle_parse_info *);
|
|
|
|
/* The list of "maint cplus" commands. */
|
|
|
|
extern struct cmd_list_element *maint_cplus_cmd_list;
|
|
|
|
/* A wrapper for bfd_demangle. */
|
|
|
|
char *gdb_demangle (const char *name, int options);
|
|
|
|
/* Like gdb_demangle, but suitable for use as la_sniff_from_mangled_name. */
|
|
|
|
int gdb_sniff_from_mangled_name (const char *mangled, char **demangled);
|
|
|
|
#endif /* CP_SUPPORT_H */
|