Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-13 22:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/symtab.h (SALIAS, SUNDEF): Rename as...

Browse Source 
(USER_NUMBER_ALIAS, USER_NUMBER_UNDEFINED): these.
Adjust dependencies.
* src/output.c (token_definitions_output): Be sure not to output a
`#define 'a'' when fed with `%token 'a' "a"'.
* tests/regression.at (Token definitions): New.
This commit is contained in:
Akim Demaille
2002-05-04 08:48:04 +00:00
parent 8bb936e4f7
commit b87f8b2159
9 changed files with 89 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lex.c
View File

@@ -368,7 +368,7 @@ lex (void)
{
symval->number = ntokens++;
symval->class = token_sym;
if (symval->user_token_number == SUNDEF)
if (symval->user_token_number == USER_NUMBER_UNDEFINED)
symval->user_token_number = code;
}
return tok_identifier;

29
src/output.c
View File

@@ -582,21 +582,25 @@ token_definitions_output (FILE *out)
symbol_t *symbol = symbols[i];
int number = symbol->user_token_number;
if (number == SALIAS)
continue;
/* At this stage, if there are literal aliases, they are part of
SYMBOLS, so we should not find symbols which are the aliases
here. */
assert (number != USER_NUMBER_ALIAS);
/* Skip error token. */
if (symbol == errtoken)
continue;
if (symbol->tag[0] == '\'')
continue; /* skip literal character */
if (symbol->tag[0] == '\"')
{
/* use literal string only if given a symbol with an alias */
if (symbol->alias)
symbol = symbol->alias;
else
continue;
}
/* If this string has an alias, then it is necessarily the alias
which is to be output. */
if (symbol->alias)
symbol = symbol->alias;
/* Don't output literal chars or strings (when defined only as a
string). Note that must be done after the alias resolution:
think about `%token 'f' "f"'. */
if (symbol->tag[0] == '\'' || symbol->tag[0] == '\"')
continue;
/* Don't #define nonliteral tokens whose names contain periods
or '$' (as does the default value of the EOF token). */
@@ -605,6 +609,7 @@ token_definitions_output (FILE *out)
fprintf (out, "%s[[[%s]], [%d]]",
first ? "" : ",\n", symbol->tag, number);
first = 0;
}
}

29
src/reader.c
View File

@@ -126,7 +126,7 @@ symbol_make_alias (symbol_t *symbol, char *typename)
symval->class = token_sym;
symval->type_name = typename;
symval->user_token_number = symbol->user_token_number;
symbol->user_token_number = SALIAS;
symbol->user_token_number = USER_NUMBER_ALIAS;
symval->alias = symbol;
symbol->alias = symval;
/* symbol and symval combined are only one symbol */
@@ -149,7 +149,7 @@ static bool
symbol_check_alias_consistence (symbol_t *this)
{
/* Check only those who _are_ the aliases. */
if (this->alias && this->user_token_number == SALIAS)
if (this->alias && this->user_token_number == USER_NUMBER_ALIAS)
{
if (this->prec != this->alias->prec)
{
@@ -204,8 +204,8 @@ symbol_pack (symbol_t *this)
this->number = this->alias->number;
}
}
/* Do not do processing below for SALIASs. */
if (this->user_token_number == SALIAS)
/* Do not do processing below for USER_NUMBER_ALIASs. */
if (this->user_token_number == USER_NUMBER_ALIAS)
return TRUE;
}
else /* this->class == token_sym */
@@ -229,7 +229,7 @@ symbol_translation (symbol_t *this)
{
/* Non-terminal? */
if (this->class == token_sym
&& this->user_token_number != SALIAS)
&& this->user_token_number != USER_NUMBER_ALIAS)
{
/* A token which translation has already been set? */
if (token_translations[this->user_token_number] != undeftoken->number)
@@ -998,10 +998,10 @@ parse_expect_decl (void)
| |
| Two symbols are entered in the table, one for the token symbol and |
| one for the literal. Both are given the <type>, if any, from the |
| declaration. The ->user_token_number of the first is SALIAS and |
| the ->user_token_number of the second is set to the number, if |
| any, from the declaration. The two symbols are linked via |
| pointers in their ->alias fields. |
| declaration. The ->user_token_number of the first is |
| USER_NUMBER_ALIAS and the ->user_token_number of the second is set |
| to the number, if any, from the declaration. The two symbols are |
| linked via pointers in their ->alias fields. |
| |
| During OUTPUT_DEFINES_TABLE, the symbol is reported thereafter, |
| only the literal string is retained it is the literal string that |
@@ -1014,7 +1014,7 @@ parse_thong_decl (void)
token_t token;
symbol_t *symbol;
char *typename = 0;
int usrtoknum = SUNDEF;
int usrtoknum = USER_NUMBER_UNDEFINED;
token = lex (); /* fetch typename or first token */
if (token == tok_typename)
@@ -1035,7 +1035,7 @@ parse_thong_decl (void)
}
symval->class = token_sym;
symval->type_name = typename;
symval->user_token_number = SALIAS;
symval->user_token_number = USER_NUMBER_ALIAS;
symbol = symval;
token = lex (); /* get number or literal string */
@@ -1666,7 +1666,7 @@ token_translations_init (void)
for (i = 0; i < ntokens; ++i)
{
symbol_t *this = symbols[i];
if (this->user_token_number != SUNDEF)
if (this->user_token_number != USER_NUMBER_UNDEFINED)
{
if (this->user_token_number > max_user_token_number)
max_user_token_number = this->user_token_number;
@@ -1676,7 +1676,8 @@ token_translations_init (void)
}
/* If 256 is not used, assign it to error, to follow POSIX. */
if (num_256_available_p && errtoken->user_token_number == SUNDEF)
if (num_256_available_p
&& errtoken->user_token_number == USER_NUMBER_UNDEFINED)
errtoken->user_token_number = 256;
/* Set the missing user numbers. */
@@ -1686,7 +1687,7 @@ token_translations_init (void)
for (i = 0; i < ntokens; ++i)
{
symbol_t *this = symbols[i];
if (this->user_token_number == SUNDEF)
if (this->user_token_number == USER_NUMBER_UNDEFINED)
this->user_token_number = ++max_user_token_number;
if (this->user_token_number > max_user_token_number)
max_user_token_number = this->user_token_number;

2
src/symtab.c
View File

@@ -38,7 +38,7 @@ symbol_new (const char *tag)
res->number = NUMBER_UNDEFINED;
res->prec = 0;
res->assoc = right_assoc;
res->user_token_number = SUNDEF;
res->user_token_number = USER_NUMBER_UNDEFINED;
res->alias = NULL;
res->class = unknown_sym;

25
src/symtab.h
View File

@@ -41,14 +41,12 @@ typedef enum
nterm_sym /* non-terminal */
} symbol_class;
/* Internal token numbers. */
typedef short token_number_t;
#define SUNDEF -1 /* For undefined user number. */
#define SALIAS -9991 /* for symbol generated with an alias */
#define NUMBER_UNDEFINED ((token_number_t) -1)
typedef struct symbol_s symbol_t;
struct symbol_s
{
/* The key, name of the symbol. */
@@ -61,14 +59,25 @@ struct symbol_s
associativity assoc;
int user_token_number;
/* Points to the other in the identifier-symbol pair for an
alias. Special value SALIAS in the identifier half of the
/* Points to the other in the identifier-symbol pair for an alias.
Special value USER_NUMBER_ALIAS in the identifier half of the
identifier-symbol pair for an alias. */
struct symbol_s *alias;
symbol_t *alias;
symbol_class class;
};
typedef struct symbol_s symbol_t;
/* Undefined user number. */
#define USER_NUMBER_UNDEFINED -1
/* `symbol->user_token_number == USER_NUMBER_ALIAS' means this symbol
*has* (not is) a string literal alias. For instance, `%token foo
"foo"' has `"foo"' numbered regularly, and `foo' numbered as
USER_NUMBER_ALIAS. */
#define USER_NUMBER_ALIAS -9991
/* Undefined internal token number. */
#define NUMBER_UNDEFINED ((token_number_t) -1)
/* A function to apply to each symbol. */
typedef bool (*symbol_processor) PARAMS ((symbol_t *));