X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcp-support.h;h=51f808f80efc19657f510d2b78df33dd16bb13eb;hb=3a93a0c2ef1629add02bfdb6efe81015819acd35;hp=b5a5c5fca7f8b461973d21b4ba2ea7b14a11242c;hpb=8c902bb1fe198081e40e925140473001c1c9e486;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/cp-support.h b/gdb/cp-support.h index b5a5c5fca7..51f808f80e 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, 2003, 2004, 2005, 2007, 2008, 2009 + Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by MontaVista Software. @@ -26,27 +26,120 @@ /* We need this for 'domain_enum', alas... */ #include "symtab.h" +#include "vec.h" +#include "gdb_obstack.h" /* Opaque declarations. */ struct symbol; -struct obstack; struct block; struct objfile; struct type; struct demangle_component; +/* 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 + +/* The result of parsing a name. */ + +struct 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; +}; + /* 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. IMPORT_DEST should always be a strict initial - substring of IMPORT_SRC. These form a linked list; NEXT is the next element - of the list. */ + 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]; }; @@ -54,6 +147,8 @@ struct using_direct extern char *cp_canonicalize_string (const char *string); +extern char *cp_canonicalize_string_no_typedefs (const char *string); + extern char *cp_class_name_from_physname (const char *physname); extern char *method_name_from_physname (const char *physname); @@ -69,19 +164,27 @@ extern char *cp_remove_params (const char *demangled_name); 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); +extern int cp_validate_operator (const char *input); + /* 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); +DEF_VEC_P (const_char_ptr); -extern struct using_direct *cp_add_using (const char *dest, - const char *src, - struct using_direct *next); +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); @@ -97,33 +200,50 @@ extern void cp_set_block_scope (const struct symbol *symbol, extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol); extern struct symbol *cp_lookup_symbol_nonlocal (const char *name, - const char *linkage_name, const struct block *block, const domain_enum domain); extern struct symbol *cp_lookup_symbol_namespace (const char *namespace, const char *name, - const char *linkage_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 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 void cp_check_possible_namespace_symbols (const char *name, - struct objfile *objfile); - struct type *cp_lookup_transparent_type (const char *name); /* Functions from cp-name-parser.y. */ -extern struct demangle_component *cp_demangled_name_to_comp - (const char *demangled_name, const char **errmsg); +extern struct demangle_parse_info *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;