FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cp_lookup_symbol_nonlocal: Move definition closer to its subroutines.

Browse source 
gdb/ChangeLog:

	* cp-namespace.c (cp_lookup_symbol_nonlocal): Move definition,
	closer to its subroutines.
This commit is contained in:
Doug Evans 2014-12-10 10:42:22 -08:00
parent 34ef845277
commit 56286edfdc
2 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2014-12-10 Doug Evans <xdje42@gmail.com>
* cp-namespace.c (cp_lookup_symbol_nonlocal): Move definition,
closer to its subroutines.
2014-12-10 Doug Evans <xdje42@gmail.com> 2014-12-10 Doug Evans <xdje42@gmail.com>
* cp-namespace.c (lookup_symbol_file): Move next to only caller. * cp-namespace.c (lookup_symbol_file): Move next to only caller.

52
gdb/cp-namespace.c
View file

@ -32,12 +32,6 @@
#include "buildsym.h" #include "buildsym.h"
#include "language.h" #include "language.h"
static struct symbol *lookup_namespace_scope (const char *name,
const struct block *block,
const domain_enum domain,
const char *scope,
int scope_len);
static struct type *cp_lookup_transparent_type_loop (const char *name, static struct type *cp_lookup_transparent_type_loop (const char *name,
const char *scope, const char *scope,
int scope_len); int scope_len);
@ -208,29 +202,6 @@ cp_is_anonymous (const char *namespace)
!= NULL); != NULL);
} }
/* The C++-specific version of name lookup for static and global
names. This makes sure that names get looked for in all namespaces
that are in scope. NAME is the natural name of the symbol that
we're looking for, BLOCK is the block that we're searching within,
DOMAIN says what kind of symbols we're looking for. */
struct symbol *
cp_lookup_symbol_nonlocal (const char *name,
const struct block *block,
const domain_enum domain)
{
struct symbol *sym;
const char *scope = block_scope (block);
sym = lookup_namespace_scope (name, block,
domain, scope, 0);
if (sym != NULL)
return sym;
return cp_lookup_symbol_namespace (scope, name,
block, domain);
}
/* Look up NAME in BLOCK's static block and in global blocks. If /* Look up NAME in BLOCK's static block and in global blocks. If
ANONYMOUS_NAMESPACE is nonzero, the symbol in question is located ANONYMOUS_NAMESPACE is nonzero, the symbol in question is located
within an anonymous namespace. If SEARCH is non-zero, search through within an anonymous namespace. If SEARCH is non-zero, search through
@ -699,6 +670,29 @@ lookup_namespace_scope (const char *name,
block, domain, 1); block, domain, 1);
} }
/* The C++-specific version of name lookup for static and global
names. This makes sure that names get looked for in all namespaces
that are in scope. NAME is the natural name of the symbol that
we're looking for, BLOCK is the block that we're searching within,
DOMAIN says what kind of symbols we're looking for. */
struct symbol *
cp_lookup_symbol_nonlocal (const char *name,
const struct block *block,
const domain_enum domain)
{
struct symbol *sym;
const char *scope = block_scope (block);
sym = lookup_namespace_scope (name, block,
domain, scope, 0);
if (sym != NULL)
return sym;
return cp_lookup_symbol_namespace (scope, name,
block, domain);
}
/* Search through the base classes of PARENT_TYPE for a base class /* Search through the base classes of PARENT_TYPE for a base class
named NAME and return its type. If not found, return NULL. */ named NAME and return its type. If not found, return NULL. */