X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-support.h;h=9054bf678c837d3c2ceeed0c078bf951f46febc1;hb=a6c21d4a553de184562fd8409a5bcd3f2cc2561a;hp=03ccb733cbb241fa51538792ead98a2d5d732126;hpb=111dfaae0479f43eab9f3411c90ee03104a2be2d;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-support.h b/gdb/cp-support.h index 03ccb733cb..9054bf678c 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-2005, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2002-2017 Free Software Foundation, Inc. Contributed by MontaVista Software. Namespace support contributed by David Carlton. @@ -36,6 +36,7 @@ struct block; struct objfile; struct type; struct demangle_component; +struct using_direct; /* A string representing the name of the anonymous namespace used in GDB. */ @@ -49,6 +50,10 @@ struct demangle_component; struct demangle_parse_info { + demangle_parse_info (); + + ~demangle_parse_info (); + /* The memory used during the parse. */ struct demangle_info *info; @@ -59,95 +64,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 -{ - char *import_src; - char *import_dest; - - char *alias; - 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 std::string cp_canonicalize_string (const char *string); -/* Functions from cp-support.c. */ +extern std::string cp_canonicalize_string_no_typedefs (const char *string); -extern char *cp_canonicalize_string (const char *string); +typedef const char *(canonicalization_ftype) (struct type *, void *); -extern char *cp_canonicalize_string_no_typedefs (const char *string); +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); @@ -173,76 +101,64 @@ extern struct type *cp_lookup_rtti_type (const char *name, /* Functions/variables from cp-namespace.c. */ -extern int cp_is_anonymous (const char *namespace); - -extern void cp_add_using_directive (const char *dest, - const char *src, - const char *alias, - const char *declaration, - VEC (const_char_ptr) *excludes, - struct obstack *obstack); - -extern void cp_initialize_namespace (void); - -extern void cp_finalize_namespace (struct block *static_block, - struct obstack *obstack); - -extern void cp_set_block_scope (const struct symbol *symbol, - struct block *block, - struct obstack *obstack, - const char *processing_current_prefix, - int processing_has_namespace_info); +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 symbol *cp_lookup_symbol_nonlocal (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_nonlocal + (const struct language_defn *langdef, + const char *name, + const struct block *block, + const domain_enum domain); -extern struct symbol *cp_lookup_symbol_imports (const char *scope, - const char *name, - const struct block *block, - const domain_enum domain, - const int declaration_only, - const int search_parents); +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 type *cp_lookup_nested_type (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); +/* 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 struct demangle_parse_info *cp_demangled_name_to_comp +extern std::unique_ptr cp_demangled_name_to_comp (const char *demangled_name, const char **errmsg); extern char *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; +/* 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 */