X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcp-support.h;h=6ca898315bb1a8d4f9632e73680eab260167c622;hb=ae090bdbf8876d4f72f357cf78301b5e8ec13751;hp=f463d598c60e9b88d9372596af4c5788d16591aa;hpb=d3cbe7ef42305a5a67982ea342c8df8d3fc5fc5f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index f463d598c6..6ca898315b 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -1,5 +1,5 @@
 /* Helper routines for C++ support in GDB.
-   Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2002-2020 Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
    Namespace support contributed by David Carlton.
@@ -8,7 +8,7 @@
 
    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 2 of the License, or
+   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,
@@ -17,9 +17,7 @@
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CP_SUPPORT_H
 #define CP_SUPPORT_H
@@ -27,31 +25,69 @@
 /* We need this for 'domain_enum', alas...  */
 
 #include "symtab.h"
+#include "gdbsupport/gdb_vecs.h"
+#include "gdb_obstack.h"
+#include "gdbsupport/array-view.h"
+#include <vector>
 
 /* Opaque declarations.  */
 
 struct symbol;
-struct obstack;
 struct block;
+struct buildsym_compunit;
 struct objfile;
 struct type;
+struct demangle_component;
+struct using_direct;
 
-/* This struct is designed to store data from using directives.  It
-   says that names from namespace INNER should be visible within
-   namespace OUTER.  OUTER should always be a strict initial substring
-   of INNER.  These form a linked list; NEXT is the next element of
-   the list.  */
+/* A string representing the name of the anonymous namespace used in GDB.  */
 
-struct using_direct
+#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
 {
-  char *inner;
-  char *outer;
-  struct using_direct *next;
+  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 gdb::unique_xmalloc_ptr<char> cp_canonicalize_string
+  (const char *string);
+
+extern gdb::unique_xmalloc_ptr<char> cp_canonicalize_string_no_typedefs
+  (const char *string);
+
+typedef const char *(canonicalization_ftype) (struct type *, void *);
+
+extern gdb::unique_xmalloc_ptr<char> 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);
@@ -60,67 +96,103 @@ 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_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 std::vector<symbol *> make_symbol_overload_list (const char *,
+							const char *);
 
-extern struct symbol **make_symbol_overload_list (const char *,
-						  const char *);
+extern void add_symbol_overload_list_adl
+  (gdb::array_view<type *> arg_types,
+   const char *func_name,
+   std::vector<symbol *> *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 unsigned char processing_has_namespace_info;
+extern int cp_is_in_anonymous (const char *symbol_name);
 
-extern const char *processing_current_prefix;
+extern void cp_scan_for_anonymous_namespaces (struct buildsym_compunit *,
+					      const struct symbol *symbol,
+					      struct objfile *objfile);
 
-extern int cp_is_anonymous (const char *namespace);
+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 void cp_add_using_directive (const char *name,
-				    unsigned int outer_length,
-				    unsigned int inner_length);
+extern struct block_symbol
+  cp_lookup_symbol_namespace (const char *the_namespace,
+			      const char *name,
+			      const struct block *block,
+			      const domain_enum domain);
 
-extern void cp_initialize_namespace (void);
+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 void cp_finalize_namespace (struct block *static_block,
-				   struct obstack *obstack);
+extern struct block_symbol
+  cp_lookup_nested_symbol (struct type *parent_type,
+			   const char *nested_name,
+			   const struct block *block,
+			   const domain_enum domain);
 
-extern void cp_set_block_scope (const struct symbol *symbol,
-				struct block *block,
-				struct obstack *obstack);
+struct type *cp_lookup_transparent_type (const char *name);
 
-extern void cp_scan_for_anonymous_namespaces (const struct symbol *symbol);
+/* See description in cp-namespace.c.  */
 
-extern struct symbol *cp_lookup_symbol_nonlocal (const char *name,
-						 const char *linkage_name,
-						 const struct block *block,
-						 const domain_enum domain,
-						 struct symtab **symtab);
+struct type *cp_find_type_baseclass_by_name (struct type *parent_type,
+					     const char *name);
 
-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,
-						  struct symtab **symtab);
+/* Functions from cp-name-parser.y.  */
 
-extern struct type *cp_lookup_nested_type (struct type *parent_type,
-					   const char *nested_name,
-					   const struct block *block);
+extern std::unique_ptr<demangle_parse_info> cp_demangled_name_to_comp
+     (const char *demangled_name, std::string *errmsg);
 
-extern void cp_check_possible_namespace_symbols (const char *name,
-						 struct objfile *objfile);
+extern gdb::unique_xmalloc_ptr<char> cp_comp_to_string
+  (struct demangle_component *result, int estimated_len);
 
-struct type *cp_lookup_transparent_type (const char *name);
+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;
 
-/* Pointer to member function.  Depends on compiler implementation.  */
+/* 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.  */
 
-#define METHOD_PTR_IS_VIRTUAL(ADDR)  ((ADDR) & 0x80000000)
-#define METHOD_PTR_FROM_VOFFSET(OFFSET) (0x80000000 + (OFFSET))
-#define METHOD_PTR_TO_VOFFSET(ADDR) (~0x80000000 & (ADDR))
+int gdb_sniff_from_mangled_name (const char *mangled, char **demangled);
 
 #endif /* CP_SUPPORT_H */