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

Let symbols have a location.

Browse Source 
* src/symtab.h, src/symtab.c (symbol_t): Location is a new member.
(getsym): Adjust.
Adjust all callers.
* src/complain.h, src/complain.c (complain_at, fatal_at, warn_at):
Use location_t, not int.
* src/symtab.c (symbol_check_defined): Take advantage of the
location.
* tests/regression.at (Invalid inputs): Adjust.
This commit is contained in:
Akim Demaille
2002-06-15 18:21:46 +00:00
parent 8efe435c05
commit ee000ba4fc
11 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/symtab.c
View File

@@ -41,12 +41,13 @@ location_t startsymbol_location;
`---------------------------------*/
static symbol_t *
symbol_new (const char *tag)
symbol_new (const char *tag, location_t location)
{
symbol_t *res = XMALLOC (symbol_t, 1);
res->tag = xstrdup (tag);
res->type_name = NULL;
res->location = location;
res->number = NUMBER_UNDEFINED;
res->prec = 0;
res->assoc = right_assoc;
@@ -170,8 +171,9 @@ symbol_check_defined (symbol_t *this)
{
if (this->class == unknown_sym)
{
complain
(_("symbol %s is used, but is not defined as a token and has no rules"),
complain_at
(this->location,
_("symbol %s is used, but is not defined as a token and has no rules"),
this->tag);
this->class = nterm_sym;
this->number = nvars++;
@@ -363,7 +365,7 @@ symbols_new (void)
`----------------------------------------------------------------*/
symbol_t *
getsym (const char *key)
getsym (const char *key, location_t location)
{
symbol_t probe;
symbol_t *entry;
@@ -374,7 +376,7 @@ getsym (const char *key)
if (!entry)
{
/* First insertion in the hash. */
entry = symbol_new (key);
entry = symbol_new (key, location);
hash_insert (symbol_table, entry);
}
return entry;
@@ -488,7 +490,9 @@ symbols_pack (void)
symbols_token_translations_init ();
if (startsymbol->class == unknown_sym)
fatal (_("the start symbol %s is undefined"), startsymbol->tag);
fatal_at (startsymbol_location,
_("the start symbol %s is undefined"), startsymbol->tag);
else if (startsymbol->class == token_sym)
fatal (_("the start symbol %s is a token"), startsymbol->tag);
fatal_at (startsymbol_location,
_("the start symbol %s is a token"), startsymbol->tag);
}