/* Helper routines for C++ support in GDB.
- Copyright 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
Contributed by David Carlton and by Kealia, Inc.
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,
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/>. */
#include "defs.h"
#include "cp-support.h"
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
const char *scope,
int scope_len);
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
int anonymous_namespace);
static struct type *cp_lookup_transparent_type_loop (const char *name,
int len,
struct objfile *objfile);
-static
-struct symbol *lookup_possible_namespace_symbol (const char *name,
- struct symtab **symtab);
+static struct symbol *lookup_possible_namespace_symbol (const char *name);
static void maintenance_cplus_namespace (char *args, int from_tty);
cp_lookup_symbol_nonlocal (const char *name,
const char *linkage_name,
const struct block *block,
- const domain_enum domain,
- struct symtab **symtab)
+ const domain_enum domain)
{
return lookup_namespace_scope (name, linkage_name, block, domain,
- symtab, block_scope (block), 0);
+ block_scope (block), 0);
}
/* Lookup NAME at namespace scope (or, in C terms, in static and
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
const char *scope,
int scope_len)
{
}
new_scope_len += cp_find_first_component (scope + new_scope_len);
sym = lookup_namespace_scope (name, linkage_name, block,
- domain, symtab,
- scope, new_scope_len);
+ domain, scope, new_scope_len);
if (sym != NULL)
return sym;
}
strncpy (namespace, scope, scope_len);
namespace[scope_len] = '\0';
return cp_lookup_symbol_namespace (namespace, name, linkage_name,
- block, domain, symtab);
+ block, domain);
}
/* Look up NAME in the C++ namespace NAMESPACE, applying the using
const char *name,
const char *linkage_name,
const struct block *block,
- const domain_enum domain,
- struct symtab **symtab)
+ const domain_enum domain)
{
const struct using_direct *current;
struct symbol *sym;
name,
linkage_name,
block,
- domain,
- symtab);
+ domain);
if (sym != NULL)
return sym;
}
if (namespace[0] == '\0')
{
return lookup_symbol_file (name, linkage_name, block,
- domain, symtab, 0);
+ domain, 0);
}
else
{
strcat (concatenated_name, "::");
strcat (concatenated_name, name);
sym = lookup_symbol_file (concatenated_name, linkage_name,
- block, domain, symtab,
+ block, domain,
cp_is_anonymous (namespace));
return sym;
}
const char *linkage_name,
const struct block *block,
const domain_enum domain,
- struct symtab **symtab,
int anonymous_namespace)
{
struct symbol *sym = NULL;
- sym = lookup_symbol_static (name, linkage_name, block, domain, symtab);
+ sym = lookup_symbol_static (name, linkage_name, block, domain);
if (sym != NULL)
return sym;
if (global_block != NULL)
sym = lookup_symbol_aux_block (name, linkage_name, global_block,
- domain, symtab);
+ domain);
}
else
{
- sym = lookup_symbol_global (name, linkage_name, domain, symtab);
+ sym = lookup_symbol_global (name, linkage_name, block, domain);
}
if (sym != NULL)
if (domain == VAR_DOMAIN)
{
- sym = lookup_possible_namespace_symbol (name, symtab);
+ sym = lookup_possible_namespace_symbol (name);
if (sym != NULL)
return sym;
}
nested_name,
NULL,
block,
- VAR_DOMAIN,
- NULL);
+ VAR_DOMAIN);
if (sym == NULL || SYMBOL_CLASS (sym) != LOC_TYPEDEF)
return NULL;
else
}
default:
internal_error (__FILE__, __LINE__,
- "cp_lookup_nested_type called on a non-aggregate type.");
+ _("cp_lookup_nested_type called on a non-aggregate type."));
}
}
cp_lookup_transparent_type_loop (const char *name, const char *scope,
int length)
{
- int scope_length = cp_find_first_component (scope + length);
+ int scope_length = length + cp_find_first_component (scope + length);
char *full_name;
/* If the current scope is followed by "::", look in the next
namespace_symtab->free_code = free_nothing;
namespace_symtab->dirname = NULL;
- bv = obstack_alloc (&objfile->symbol_obstack,
+ bv = obstack_alloc (&objfile->objfile_obstack,
sizeof (struct blockvector)
+ FIRST_LOCAL_BLOCK * sizeof (struct block *));
BLOCKVECTOR_NBLOCKS (bv) = FIRST_LOCAL_BLOCK + 1;
/* Allocate empty GLOBAL_BLOCK and STATIC_BLOCK. */
- bl = allocate_block (&objfile->symbol_obstack);
- BLOCK_DICT (bl) = dict_create_linear (&objfile->symbol_obstack,
+ bl = allocate_block (&objfile->objfile_obstack);
+ BLOCK_DICT (bl) = dict_create_linear (&objfile->objfile_obstack,
NULL);
BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK) = bl;
- bl = allocate_block (&objfile->symbol_obstack);
- BLOCK_DICT (bl) = dict_create_linear (&objfile->symbol_obstack,
+ bl = allocate_block (&objfile->objfile_obstack);
+ BLOCK_DICT (bl) = dict_create_linear (&objfile->objfile_obstack,
NULL);
BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK) = bl;
having a symtab/block for this purpose seems like the best
solution for now. */
- bl = allocate_block (&objfile->symbol_obstack);
+ bl = allocate_block (&objfile->objfile_obstack);
BLOCK_DICT (bl) = dict_create_hashed_expandable ();
BLOCKVECTOR_BLOCK (bv, FIRST_LOCAL_BLOCK) = bl;
struct objfile *objfile)
{
struct block *block = get_possible_namespace_block (objfile);
- char *name_copy = obsavestring (name, len, &objfile->symbol_obstack);
- struct symbol *sym = lookup_block_symbol (block, name_copy, NULL,
- VAR_DOMAIN);
+ char *name_copy = alloca (len + 1);
+ struct symbol *sym;
+
+ memcpy (name_copy, name, len);
+ name_copy[len] = '\0';
+ sym = lookup_block_symbol (block, name_copy, NULL, VAR_DOMAIN);
if (sym == NULL)
{
- struct type *type = init_type (TYPE_CODE_NAMESPACE, 0, 0,
- name_copy, objfile);
+ struct type *type;
+ name_copy = obsavestring (name, len, &objfile->objfile_obstack);
+
+ type = init_type (TYPE_CODE_NAMESPACE, 0, 0, name_copy, objfile);
+
TYPE_TAG_NAME (type) = TYPE_NAME (type);
- sym = obstack_alloc (&objfile->symbol_obstack, sizeof (struct symbol));
+ sym = obstack_alloc (&objfile->objfile_obstack, sizeof (struct symbol));
memset (sym, 0, sizeof (struct symbol));
SYMBOL_LANGUAGE (sym) = language_cplus;
SYMBOL_SET_NAMES (sym, name_copy, len, objfile);
return 0;
}
else
- {
- obstack_free (&objfile->symbol_obstack, name_copy);
-
- return 1;
- }
+ return 1;
}
/* Look for a symbol named NAME in all the possible namespace blocks.
- If one is found, return it; if SYMTAB is non-NULL, set *SYMTAB to
- equal the symtab where it was found. */
+ If one is found, return it. */
static struct symbol *
-lookup_possible_namespace_symbol (const char *name, struct symtab **symtab)
+lookup_possible_namespace_symbol (const char *name)
{
struct objfile *objfile;
name, NULL, VAR_DOMAIN);
if (sym != NULL)
- {
- if (symtab != NULL)
- *symtab = objfile->cp_namespace_symtab;
-
- return sym;
- }
+ return sym;
}
return NULL;
maintenance_cplus_namespace (char *args, int from_tty)
{
struct objfile *objfile;
- printf_unfiltered ("Possible namespaces:\n");
+ printf_unfiltered (_("Possible namespaces:\n"));
ALL_OBJFILES (objfile)
{
struct dict_iterator iter;
_initialize_cp_namespace (void)
{
add_cmd ("namespace", class_maintenance, maintenance_cplus_namespace,
- "Print the list of possible C++ namespaces.",
+ _("Print the list of possible C++ namespaces."),
&maint_cplus_cmd_list);
}
projects / deliverable / binutils-gdb.git / blobdiff