PR symtab/12984:

[deliverable/binutils-gdb.git] / gdb / cp-support.h

diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 1e52d93ef88d94845fa5f3d04a0557cd0f278728..d23f19ed0e7ba419eb2cff261a948187229f2995 100644 (file)
--- 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, 2010
+   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
@@ -27,6 +27,8 @@
 
 #include "symtab.h"
 
+#include "vec.h"
+
 /* Opaque declarations.  */
 
 struct symbol;
@@ -36,14 +38,23 @@ 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
+
 /* 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.
+   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
@@ -51,6 +62,7 @@ struct demangle_component;
    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
@@ -58,23 +70,45 @@ struct demangle_component;
    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
-   The namespace will get imported as the import_dest::LOCALNS namespace.
+   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;
+   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"
-   The declaration will get imported as localname or `import_dest`localname.  */
+   excludes = NULL
+   The declaration will get imported as localname or
+   `import_dest`localname.  */
 
 struct using_direct
 {
@@ -86,8 +120,13 @@ struct using_direct
 
   struct using_direct *next;
 
-  /* Used during import search to temporarily mark this node as searched.  */
+  /* 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];
 };
 
 
@@ -123,10 +162,13 @@ extern int cp_validate_operator (const char *input);
 
 extern int cp_is_anonymous (const char *namespace);
 
+DEF_VEC_P (const_char_ptr);
+
 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);
@@ -168,9 +210,6 @@ 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.  */