X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-support.h;h=a2be977a8fdee9adcd70c33682e3491d358b1b75;hb=228c8f4be0c428369ec6b68e25696863d1e62ed7;hp=407da625059b9921aaf6d94f979964f42ecbae76;hpb=32d0add0a654c1204ab71dc8a55d9374538c4b33;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-support.h b/gdb/cp-support.h index 407da62505..a2be977a8f 100644 --- a/gdb/cp-support.h +++ b/gdb/cp-support.h @@ -1,5 +1,5 @@ /* Helper routines for C++ support in GDB. - Copyright (C) 2002-2015 Free Software Foundation, Inc. + Copyright (C) 2002-2019 Free Software Foundation, Inc. Contributed by MontaVista Software. Namespace support contributed by David Carlton. @@ -25,17 +25,20 @@ /* We need this for 'domain_enum', alas... */ #include "symtab.h" -#include "vec.h" -#include "gdb_vecs.h" +#include "gdbsupport/gdb_vecs.h" #include "gdb_obstack.h" +#include "gdbsupport/array-view.h" +#include /* Opaque declarations. */ struct symbol; struct block; +struct buildsym_compunit; struct objfile; struct type; struct demangle_component; +struct using_direct; /* A string representing the name of the anonymous namespace used in GDB. */ @@ -45,10 +48,22 @@ struct demangle_component; #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; @@ -59,101 +74,18 @@ struct demangle_parse_info struct obstack obstack; }; -/* This struct is designed to store data from using directives. It - says that names from namespace IMPORT_SRC should be visible within - namespace IMPORT_DEST. These form a linked list; NEXT is the next - element of the list. If the imported namespace or declaration has - been aliased within the IMPORT_DEST namespace, ALIAS is set to a - string representing the alias. Otherwise, ALIAS is NULL. - DECLARATION is the name of the imported declaration, if this import - statement represents one. Otherwise DECLARATION is NULL and this - import statement represents a namespace. - - C++: using namespace A; - Fortran: use A - import_src = "A" - import_dest = local scope of the import statement even such as "" - alias = NULL - declaration = NULL - excludes = NULL - - C++: using A::x; - Fortran: use A, only: x - import_src = "A" - import_dest = local scope of the import statement even such as "" - alias = NULL - declaration = "x" - excludes = NULL - The declaration will get imported as import_dest::x. - - C++ has no way to import all names except those listed ones. - Fortran: use A, localname => x - import_src = "A" - import_dest = local scope of the import statement even such as "" - alias = "localname" - declaration = "x" - excludes = NULL - + - import_src = "A" - import_dest = local scope of the import statement even such as "" - alias = NULL - declaration = NULL - excludes = ["x"] - All the entries of A get imported except of "x". "x" gets imported as - "localname". "x" is not defined as a local name by this statement. - - C++: namespace LOCALNS = A; - Fortran has no way to address non-local namespace/module. - import_src = "A" - import_dest = local scope of the import statement even such as "" - alias = "LOCALNS" - declaration = NULL - excludes = NULL - The namespace will get imported as the import_dest::LOCALNS - namespace. - - C++ cannot express it, it would be something like: using localname - = A::x; - Fortran: use A, only localname => x - import_src = "A" - import_dest = local scope of the import statement even such as "" - alias = "localname" - declaration = "x" - excludes = NULL - The declaration will get imported as localname or - `import_dest`localname. */ - -struct using_direct -{ - const char *import_src; - const char *import_dest; - - const char *alias; - const char *declaration; - - struct using_direct *next; - - /* Used during import search to temporarily mark this node as - searched. */ - int searched; - - /* USING_DIRECT has variable allocation size according to the number of - EXCLUDES entries, the last entry is NULL. */ - const char *excludes[1]; -}; - /* Functions from cp-support.c. */ -extern char *cp_canonicalize_string (const char *string); +extern std::string cp_canonicalize_string (const char *string); -extern char *cp_canonicalize_string_no_typedefs (const char *string); +extern std::string cp_canonicalize_string_no_typedefs (const char *string); typedef const char *(canonicalization_ftype) (struct type *, void *); -extern char *cp_canonicalize_string_full (const char *string, - canonicalization_ftype *finder, - void *data); +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); @@ -163,55 +95,73 @@ 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 cp_func_name (const char *full_name); -extern char *cp_remove_params (const char *demangled_name); +extern gdb::unique_xmalloc_ptr cp_remove_params + (const char *demanged_name); -extern struct symbol **make_symbol_overload_list (const char *, - const char *); +/* 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 cp_remove_params_if_any + (const char *demangled_name, bool completion_mode); -extern struct symbol **make_symbol_overload_list_adl (struct type **arg_types, - int nargs, - const char *func_name); +extern std::vector make_symbol_overload_list (const char *, + const char *); + +extern void add_symbol_overload_list_adl + (gdb::array_view arg_types, + const char *func_name, + std::vector *overload_list); extern struct type *cp_lookup_rtti_type (const char *name, - struct block *block); + const struct block *block); + +/* Produce an unsigned hash value from SEARCH_NAME that is compatible + with cp_symbol_name_matches. Only the last component in + "foo::bar::function()" is considered for hashing purposes (i.e., + the entire prefix is skipped), so that later on looking up for + "function" or "bar::function" in all namespaces is possible. */ +extern unsigned int cp_search_name_hash (const char *search_name); + +/* 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_add_using_directive (const char *dest, - const char *src, - const char *alias, - const char *declaration, - VEC (const_char_ptr) *excludes, - int copy_names, - struct obstack *obstack); - -extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol, +extern void cp_scan_for_anonymous_namespaces (struct buildsym_compunit *, + const struct symbol *symbol, struct objfile *objfile); -extern struct symbol *cp_lookup_symbol_nonlocal +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 symbol *cp_lookup_symbol_namespace (const char *namespace, - 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 symbol *cp_lookup_symbol_imports_or_template +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 symbol *cp_lookup_nested_symbol (struct type *parent_type, - const char *nested_name, - const struct block *block); +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); @@ -222,21 +172,16 @@ struct type *cp_find_type_baseclass_by_name (struct type *parent_type, /* Functions from cp-name-parser.y. */ -extern struct demangle_parse_info *cp_demangled_name_to_comp - (const char *demangled_name, const char **errmsg); +extern std::unique_ptr cp_demangled_name_to_comp + (const char *demangled_name, std::string *errmsg); -extern char *cp_comp_to_string (struct demangle_component *result, - int estimated_len); +extern gdb::unique_xmalloc_ptr cp_comp_to_string + (struct demangle_component *result, int estimated_len); -extern void cp_demangled_name_parse_free (struct demangle_parse_info *); -extern struct cleanup *make_cleanup_cp_demangled_name_parse_free - (struct demangle_parse_info *); extern void cp_merge_demangle_parse_infos (struct demangle_parse_info *, struct demangle_component *, struct demangle_parse_info *); -extern struct demangle_parse_info *cp_new_demangle_parse_info (void); - /* The list of "maint cplus" commands. */ extern struct cmd_list_element *maint_cplus_cmd_list; @@ -245,4 +190,8 @@ extern struct cmd_list_element *maint_cplus_cmd_list; 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 */