+2010-02-05 Sami Wagiaalla <swagiaal@redhat.com>
+
+ PR c++/7935:
+ * cp-support.h: Added char* alias element to using_direct data
+ struct.
+ (cp_add_using): Added char* alias argument.
+ (cp_add_using_directive): Ditto.
+ * cp-namespace.c: Updated with the above changes.
+ (cp_lookup_symbol_imports): Check for aliases.
+ * dwarf2read.c (read_import_statement): Figure out local alias
+ for the import and pass it on to cp_add_using.
+ (read_namespace): Pass alias argument to cp_add_using.
+
2010-02-05 Hui Zhu <teawater@gmail.com>
* defs.h (gdb_bfd_errmsg): New extern.
anonymous namespace. So add symbols in it to the
namespace given by the previous component if there is
one, or to the global namespace if there isn't. */
- cp_add_using_directive (dest, src);
+ cp_add_using_directive (dest, src, NULL);
}
/* The "+ 2" is for the "::". */
previous_component = next_component + 2;
has already been added, don't add it twice. */
void
-cp_add_using_directive (const char *dest, const char *src)
+cp_add_using_directive (const char *dest, const char *src, const char *alias)
{
struct using_direct *current;
struct using_direct *new;
return;
}
- using_directives = cp_add_using (dest, src, using_directives);
+ using_directives = cp_add_using (dest, src, alias, using_directives);
}
!= NULL);
}
-/* Create a new struct using direct which imports the namespace SRC
- into the scope DEST.
+/* Create a new struct using direct which imports the namespace SRC into the
+ scope DEST. ALIAS is the name of the imported namespace in the current
+ scope. If ALIAS is NULL then the namespace is known by its original name.
Set its next member in the linked list to NEXT; allocate all memory
using xmalloc. It copies the strings, so NAME can be a temporary
string. */
struct using_direct *
cp_add_using (const char *dest,
const char *src,
+ const char *alias,
struct using_direct *next)
{
struct using_direct *retval;
retval = xmalloc (sizeof (struct using_direct));
retval->import_src = savestring (src, strlen(src));
retval->import_dest = savestring (dest, strlen(dest));
+
+ if (alias != NULL)
+ retval->alias = savestring (alias, strlen (alias));
+ else
+ retval->alias = NULL;
+
retval->next = next;
retval->searched = 0;
current->searched = 1;
searched_cleanup = make_cleanup (reset_directive_searched, current);
- sym = cp_lookup_symbol_namespace (current->import_src,
- name,
- linkage_name,
- block,
- domain,
- 0);
-
+ if (current->alias != NULL && strcmp (name, current->alias) == 0)
+ /* If the import is creating an alias and the alias matches the
+ sought name. Pass current->import_src as the NAME to direct the
+ search towards the aliased namespace. */
+ {
+ sym = cp_lookup_symbol_in_namespace (scope,
+ current->import_src,
+ linkage_name,
+ block,
+ domain);
+ }
+ else if (current->alias == NULL)
+ {
+ /* If this import statement creates no alias, pass current->inner as
+ NAMESPACE to direct the search towards the imported namespace. */
+ sym = cp_lookup_symbol_imports (current->import_src,
+ name,
+ linkage_name,
+ block,
+ domain,
+ 0);
+ }
current->searched = 0;
discard_cleanups (searched_cleanup);
/* 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 has been aliased, ALIAS is set to a
+ string representing the alias. Otherwise, ALIAS is NULL.
+ Eg:
+ namespace C = A::B;
+ ALIAS = "C"
+*/
struct using_direct
{
char *import_src;
char *import_dest;
+
+ char *alias;
+
struct using_direct *next;
/* Used during import search to temporarily mark this node as searched. */
extern int cp_is_anonymous (const char *namespace);
extern void cp_add_using_directive (const char *dest,
- const char *src);
+ const char *src,
+ const char *alias);
extern struct using_direct *cp_add_using (const char *dest,
const char *src,
+ const char *alias,
struct using_direct *next);
extern void cp_initialize_namespace (void);
struct dwarf2_cu *imported_cu;
const char *imported_name;
const char *imported_name_prefix;
+ char *import_alias;
+
const char *import_prefix;
char *canonical_name;
return;
}
- /* FIXME: dwarf2_name (die); for the local name after import. */
+ /* Figure out the local name after import. */
+ import_alias = dwarf2_name (die, cu);
/* Figure out where the statement is being imported to. */
import_prefix = determine_prefix (die, cu);
if (strlen (imported_name_prefix) > 0)
{
- canonical_name = alloca (strlen (imported_name_prefix) + 2 + strlen (imported_name) + 1);
+ canonical_name = alloca (strlen (imported_name_prefix)
+ + 2 + strlen (imported_name) + 1);
strcpy (canonical_name, imported_name_prefix);
strcat (canonical_name, "::");
strcat (canonical_name, imported_name);
strcpy (canonical_name, imported_name);
}
- using_directives = cp_add_using (import_prefix,canonical_name, using_directives);
+ using_directives = cp_add_using (import_prefix,
+ canonical_name,
+ import_alias,
+ using_directives);
}
static void
if (is_anonymous)
{
const char *previous_prefix = determine_prefix (die, cu);
- cp_add_using_directive (previous_prefix, TYPE_NAME (type));
+ cp_add_using_directive (previous_prefix, TYPE_NAME (type), NULL);
}
}
+2010-02-05 Sami Wagiaalla <swagiaal@redhat.com>
+
+ PR c++/7935:
+ * gdb.cp/namespace-using.exp: Removed kfail; bug has been fixed.
+
2010-02-04 Tom Tromey <tromey@redhat.com>
* gdb.cp/virtbase.exp: Make test case names unique.
continue
}
-setup_kfail "gdb/7935" "*-*-*"
gdb_test "print B::_a" "= 1"
-setup_kfail "gdb/7935" "*-*-*"
gdb_test "print _a" "No symbol \"_a\" in current context." \
"print _a in namespace alias scope"
-setup_kfail "gdb/7935" "*-*-*"
gdb_test "print x" "No symbol \"x\" in current context." \
"print x in namespace alias scope"
projects / binutils-gdb.git / commitdiff