OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove paren_depth global 

This removes the "paren_depth" global.  In most cases, it is made into
a static global in a given parser.  I consider this a slight
improvement, because it makes it clear that the variable isn't used
for communication between different modules of gdb.  The one exception
is the Rust parser, which already incorporates all local state into a
transient object; in this case the parser depth is now a member.

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

	* rust-exp.y (struct rust_parser) <paren_depth>: New member.
	(rustyylex, rust_lex_test_init, rust_lex_test_one)
	(rust_lex_test_sequence, rust_lex_test_push_back): Update.
	* parser-defs.h (paren_depth): Don't declare.
	* parse.c (paren_depth): Remove global.
	(parse_exp_in_context): Update.
	* p-exp.y (paren_depth): New global.
	(pascal_parse): Initialize it.
	* m2-exp.y (paren_depth): New global.
	(m2_parse): Initialize it.
	* go-exp.y (paren_depth): New global.
	(go_parse): Initialize it.
	* f-exp.y (paren_depth): New global.
	(f_parse): Initialize it.
	* d-exp.y (paren_depth): New global.
	(d_parse): Initialize it.
	* c-exp.y (paren_depth): New global.
	(c_parse): Initialize it.
	* ada-lex.l (paren_depth): New global.
	(lexer_init): Initialize it.
This commit is contained in:
Tom Tromey 2019-03-24 11:33:10 -06:00
parent 1e58a4a4db
commit 28aaf3fdf9
11 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdb/ChangeLog
View File

@ -1,3 +1,26 @@
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <paren_depth>: New member.
(rustyylex, rust_lex_test_init, rust_lex_test_one)
(rust_lex_test_sequence, rust_lex_test_push_back): Update.
* parser-defs.h (paren_depth): Don't declare.
* parse.c (paren_depth): Remove global.
(parse_exp_in_context): Update.
* p-exp.y (paren_depth): New global.
(pascal_parse): Initialize it.
* m2-exp.y (paren_depth): New global.
(m2_parse): Initialize it.
* go-exp.y (paren_depth): New global.
(go_parse): Initialize it.
* f-exp.y (paren_depth): New global.
(f_parse): Initialize it.
* d-exp.y (paren_depth): New global.
(d_parse): Initialize it.
* c-exp.y (paren_depth): New global.
(c_parse): Initialize it.
* ada-lex.l (paren_depth): New global.
(lexer_init): Initialize it.
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (rust_parser::crate_name, rust_parser::super_name)

4
gdb/ada-lex.l
View File

@ -84,6 +84,9 @@ static void rewind_to_char (int);
static int find_dot_all (const char *);
/* Depth of parentheses. */
static int paren_depth;
%}
%option case-insensitive interactive nodefault
@ -305,6 +308,7 @@ static void
lexer_init (FILE *inp)
{
BEGIN INITIAL;
paren_depth = 0;
yyrestart (inp);
}

4
gdb/c-exp.y
View File

@ -2527,6 +2527,9 @@ static int saw_name_at_eof;
operator -- either '.' or ARROW. */
static bool last_was_structop;
/* Depth of parentheses. */
static int paren_depth;
/* Read one token, getting characters through lexptr. */
static int
@ -3315,6 +3318,7 @@ c_parse (struct parser_state *par_state)
/* Initialize some state used by the lexer. */
last_was_structop = false;
saw_name_at_eof = 0;
paren_depth = 0;
token_fifo.clear ();
popping = 0;

4
gdb/d-exp.y
View File

@ -1020,6 +1020,9 @@ static int saw_name_at_eof;
This is used only when parsing to do field name completion. */
static int last_was_structop;
/* Depth of parentheses. */
static int paren_depth;
/* Read one token, getting characters through lexptr. */
static int
@ -1619,6 +1622,7 @@ d_parse (struct parser_state *par_state)
/* Initialize some state used by the lexer. */
last_was_structop = 0;
saw_name_at_eof = 0;
paren_depth = 0;
token_fifo.clear ();
popping = 0;

4
gdb/f-exp.y
View File

@ -68,6 +68,9 @@
static struct parser_state *pstate = NULL;
/* Depth of parentheses. */
static int paren_depth;
int yyparse (void);
static int yylex (void);
@ -1328,6 +1331,7 @@ f_parse (struct parser_state *par_state)
parser_debug);
gdb_assert (par_state != NULL);
pstate = par_state;
paren_depth = 0;
return yyparse ();
}

4
gdb/go-exp.y
View File

@ -1001,6 +1001,9 @@ static int saw_name_at_eof;
do field name completion. */
static int last_was_structop;
/* Depth of parentheses. */
static int paren_depth;
/* Read one token, getting characters through lexptr. */
static int
@ -1566,6 +1569,7 @@ go_parse (struct parser_state *par_state)
/* Initialize some state used by the lexer. */
last_was_structop = 0;
saw_name_at_eof = 0;
paren_depth = 0;
token_fifo.clear ();
popping = 0;

4
gdb/m2-exp.y
View File

@ -763,6 +763,9 @@ static struct keyword keytab[] =
};
/* Depth of parentheses. */
static int paren_depth;
/* Read one token, getting characters through lexptr. */
/* This is where we will check to make sure that the language and the
@ -1039,6 +1042,7 @@ m2_parse (struct parser_state *par_state)
scoped_restore pstate_restore = make_scoped_restore (&pstate);
gdb_assert (par_state != NULL);
pstate = par_state;
paren_depth = 0;
return yyparse ();
}

4
gdb/p-exp.y
View File

@ -68,6 +68,9 @@
static struct parser_state *pstate = NULL;
/* Depth of parentheses. */
static int paren_depth;
int yyparse (void);
static int yylex (void);
@ -1723,6 +1726,7 @@ pascal_parse (struct parser_state *par_state)
scoped_restore pstate_restore = make_scoped_restore (&pstate);
gdb_assert (par_state != NULL);
pstate = par_state;
paren_depth = 0;
return yyparse ();
}

2
gdb/parse.c
View File

@ -71,7 +71,6 @@ int arglist_len;
static struct type_stack type_stack;
const char *lexptr;
const char *prev_lexptr;
int paren_depth;
int comma_terminates;
/* True if parsing an expression to attempt completion. */
@ -1117,7 +1116,6 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
lexptr = *stringptr;
prev_lexptr = NULL;
paren_depth = 0;
type_stack.elements.clear ();
expout_last_struct = -1;
expout_tag_completion_type = TYPE_CODE_UNDEF;

4
gdb/parser-defs.h
View File

@ -356,10 +356,6 @@ extern const char *lexptr;
Currently used only for error reporting. */
extern const char *prev_lexptr;
/* Current depth in parentheses within the expression. */
extern int paren_depth;
/* Nonzero means stop parsing on first comma (if not within parentheses). */
extern int comma_terminates;

19
gdb/rust-exp.y
View File

@ -300,6 +300,9 @@ struct rust_parser
/* The parser state gdb gave us. */
struct parser_state *pstate;
/* Depth of parentheses. */
int paren_depth = 0;
};
/* Rust AST operations. We build a tree of these; then lower them to
@ -1664,14 +1667,14 @@ rustyylex (YYSTYPE *lvalp, rust_parser *parser)
else if (lexptr[0] == '}' || lexptr[0] == ']')
{
/* Falls through to lex_operator. */
--paren_depth;
--parser->paren_depth;
}
else if (lexptr[0] == '(' || lexptr[0] == '{')
{
/* Falls through to lex_operator. */
++paren_depth;
++parser->paren_depth;
}
else if (lexptr[0] == ',' && comma_terminates && paren_depth == 0)
else if (lexptr[0] == ',' && comma_terminates && parser->paren_depth == 0)
return 0;
return lex_operator (lvalp);
@ -2552,11 +2555,11 @@ rustyyerror (rust_parser *parser, const char *msg)
/* Initialize the lexer for testing. */
static void
rust_lex_test_init (const char *input)
rust_lex_test_init (rust_parser *parser, const char *input)
{
prev_lexptr = NULL;
lexptr = input;
paren_depth = 0;
parser->paren_depth = 0;
}
/* A test helper that lexes a string, expecting a single token. It
@ -2568,7 +2571,7 @@ rust_lex_test_one (rust_parser *parser, const char *input, int expected)
int token;
RUSTSTYPE result;
rust_lex_test_init (input);
rust_lex_test_init (parser, input);
token = rustyylex (&result, parser);
SELF_CHECK (token == expected);
@ -2632,7 +2635,7 @@ rust_lex_test_sequence (rust_parser *parser, const char *input, int len,
int i;
lexptr = input;
paren_depth = 0;
parser->paren_depth = 0;
for (i = 0; i < len; ++i)
{
@ -2686,7 +2689,7 @@ rust_lex_test_push_back (rust_parser *parser)
int token;
RUSTSTYPE lval;
rust_lex_test_init (">>=");
rust_lex_test_init (parser, ">>=");
token = rustyylex (&lval, parser);
SELF_CHECK (token == COMPOUND_ASSIGN);