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

Move arglist_len et al to parser_state

Browse source 
This moves arglist_len, start_arglist, and end_arglist to
parser_state.

gdb/ChangeLog
2019-04-04  Tom Tromey  <tom@tromey.com>

	* parser-defs.h (struct parser_state) <start_arglist,
	end_arglist>: New methods.
	<arglist_len, m_funcall_chain>: New members.
	(arglist_len, start_arglist, end_arglist): Don't declare.
	* parse.c (arglist_len, funcall_chain): Remove global.
	(start_arglist, end_arglist): Remove functions.
	(parse_exp_in_context): Update.
	* p-exp.y: Update rules.
	* m2-exp.y: Update rules.
	* go-exp.y: Update rules.
	* f-exp.y: Update rules.
	* d-exp.y: Update rules.
	* c-exp.y: Update rules.
This commit is contained in:
Tom Tromey 2019-03-24 21:38:40 -06:00
parent 5776fca307
commit 43476f0b1b
9 changed files with 89 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

32
gdb/parse.c
View file

@ -67,7 +67,6 @@ const struct exp_descriptor exp_descriptor_standard =
/* Global variables declared in parser-defs.h (and commented there). */
innermost_block_tracker innermost_block;
int arglist_len;
static struct type_stack type_stack;
/* True if parsing an expression to attempt completion. */
@ -128,33 +127,6 @@ innermost_block_tracker::update (const struct block *b,
m_innermost_block = b;
}
/* Data structure for saving values of arglist_len for function calls whose
arguments contain other function calls. */
static std::vector<int> *funcall_chain;
/* Begin counting arguments for a function call,
saving the data about any containing call. */
void
start_arglist (void)
{
funcall_chain->push_back (arglist_len);
arglist_len = 0;
}
/* Return the number of arguments in a function call just terminated,
and restore the data for the containing function call. */
int
end_arglist (void)
{
int val = arglist_len;
arglist_len = funcall_chain->back ();
funcall_chain->pop_back ();
return val;
}
/* See definition in parser-defs.h. */
@ -1119,10 +1091,6 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
if (*stringptr == 0 || **stringptr == 0)
error_no_arg (_("expression to compute"));
std::vector<int> funcalls;
scoped_restore save_funcall_chain = make_scoped_restore (&funcall_chain,
&funcalls);
const struct block *expression_context_block = block;
CORE_ADDR expression_context_pc = 0;