mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-13 22:33:03 +00:00
* src/vcg.h (graph_s): color, textcolor, bordercolor are now
enum color_e. * src/print_graph.c (print_graph): Initalize graph.layoutalgorithm to `normal'. * src/reader.c (parse_token_decl): Initialize token with tok_eof. * src/lex.h: Adjust prototype. (token_t): Add `tok_undef'. * src/lex.c (struct percent_table_struct): Retval is now a token_t. (parse_percent_token): Now returns token_t. Add default statement in switch. (lex): Separate `c' as an input variable, from the token_t result part. (unlexed): Is a token_t.
This commit is contained in:
27
src/lex.c
27
src/lex.c
@@ -36,15 +36,17 @@ const char *token_buffer = NULL;
|
||||
bucket *symval;
|
||||
int numval;
|
||||
|
||||
static int unlexed; /* these two describe a token to be reread */
|
||||
static bucket *unlexed_symval; /* by the next call to lex */
|
||||
/* these two describe a token to be reread */
|
||||
static token_t unlexed = tok_undef;
|
||||
/* by the next call to lex */
|
||||
static bucket *unlexed_symval = NULL;
|
||||
|
||||
|
||||
void
|
||||
init_lex (void)
|
||||
{
|
||||
obstack_init (&token_obstack);
|
||||
unlexed = -1;
|
||||
unlexed = tok_undef;
|
||||
}
|
||||
|
||||
|
||||
@@ -356,12 +358,12 @@ lex (void)
|
||||
/* Just to make sure. */
|
||||
token_buffer = NULL;
|
||||
|
||||
if (unlexed >= 0)
|
||||
if (unlexed != tok_undef)
|
||||
{
|
||||
token_t res = unlexed;
|
||||
symval = unlexed_symval;
|
||||
c = unlexed;
|
||||
unlexed = -1;
|
||||
return c;
|
||||
unlexed = tok_undef;
|
||||
return res;
|
||||
}
|
||||
|
||||
c = skip_white_space ();
|
||||
@@ -516,7 +518,7 @@ struct percent_table_struct
|
||||
{
|
||||
const char *name;
|
||||
void *set_flag;
|
||||
int retval;
|
||||
token_t retval;
|
||||
};
|
||||
|
||||
struct percent_table_struct percent_table[] =
|
||||
@@ -566,13 +568,12 @@ struct percent_table_struct percent_table[] =
|
||||
/* Parse a token which starts with %.
|
||||
Assumes the % has already been read and discarded. */
|
||||
|
||||
int
|
||||
token_t
|
||||
parse_percent_token (void)
|
||||
{
|
||||
int c;
|
||||
struct percent_table_struct *tx;
|
||||
|
||||
c = getc (finput);
|
||||
int c = getc (finput);
|
||||
|
||||
switch (c)
|
||||
{
|
||||
@@ -635,6 +636,10 @@ parse_percent_token (void)
|
||||
case tok_obsolete:
|
||||
fatal (_("`%s' is no longer supported"), token_buffer);
|
||||
break;
|
||||
|
||||
default:
|
||||
/* Other cases do not apply here. */
|
||||
break;
|
||||
}
|
||||
|
||||
return tx->retval;
|
||||
|
||||
Reference in New Issue
Block a user