regen.

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index 90f7b01d3bcf2676dc5e462f6c7445c2fdaa178d..bb1b275eda134bd3cf6711d57d1f9286a8bd65d4 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -47,8 +47,11 @@ 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->type_name = NULL;
+  res->destructor = NULL;
+
   res->number = NUMBER_UNDEFINED;
   res->prec = 0;
   res->assoc = right_assoc;
@@ -102,38 +105,77 @@ symbol_tag_print (symbol_t *symbol, FILE *out)
 `------------------------------------------------------------------*/
 
 void
-symbol_type_set (symbol_t *symbol, location_t location, char *type_name)
+symbol_type_set (symbol_t *symbol, char *type_name, location_t location)
 {
   if (type_name)
     {
       if (symbol->type_name)
        complain_at (location,
-                    _("type redeclaration for %s"), symbol->tag);
+                    _("type redeclaration for %s"), symbol_tag_get (symbol));
       symbol->type_name = type_name;
     }
 }
 
 
+/*-------------------------------------------------------------------.
+| Set the DESTRUCTOR associated to SYMBOL.  Do nothing if passed 0.  |
+`-------------------------------------------------------------------*/
+
+void
+symbol_destructor_set (symbol_t *symbol, char *destructor, location_t location)
+{
+  if (destructor)
+    {
+      if (symbol->destructor)
+       complain_at (location,
+                    _("%s redeclaration for %s"),
+                    "%destructor", symbol_tag_get (symbol));
+      symbol->destructor = destructor;
+      symbol->destructor_location = location;
+    }
+}
+
+
+/*----------------------------------------------------------------.
+| Set the PRITNER associated to SYMBOL.  Do nothing if passed 0.  |
+`----------------------------------------------------------------*/
+
+void
+symbol_printer_set (symbol_t *symbol, char *printer, location_t location)
+{
+  if (printer)
+    {
+      if (symbol->printer)
+       complain_at (location,
+                    _("%s redeclaration for %s"),
+                    "%printer", symbol_tag_get (symbol));
+      symbol->printer = printer;
+      symbol->printer_location = location;
+    }
+}
+
+
 /*------------------------------------------------------------------.
 | Set the PRECEDENCE associated to SYMBOL.  Does nothing if invoked |
 | with UNDEF_ASSOC as ASSOC.                                        |
 `------------------------------------------------------------------*/
 
 void
-symbol_precedence_set (symbol_t *symbol, location_t location,
-                      int prec, associativity assoc)
+symbol_precedence_set (symbol_t *symbol,
+                      int prec, associativity assoc, location_t location)
 {
   if (assoc != undef_assoc)
     {
       if (symbol->prec != 0)
        complain_at (location,
-                    _("redefining precedence of %s"), symbol->tag);
+                    _("redefining precedence of %s"),
+                    symbol_tag_get (symbol));
       symbol->prec = prec;
       symbol->assoc = assoc;
     }
 
   /* Only terminals have a precedence. */
-  symbol_class_set (symbol, token_sym);
+  symbol_class_set (symbol, token_sym, location);
 }
 
 
@@ -142,10 +184,10 @@ symbol_precedence_set (symbol_t *symbol, location_t location,
 `-------------------------------------*/
 
 void
-symbol_class_set (symbol_t *symbol, symbol_class class)
+symbol_class_set (symbol_t *symbol, symbol_class class, location_t location)
 {
   if (symbol->class != unknown_sym && symbol->class != class)
-    complain (_("symbol %s redefined"), symbol->tag);
+    complain_at (location, _("symbol %s redefined"), symbol_tag_get (symbol));
 
   if (class == nterm_sym && symbol->class != nterm_sym)
     symbol->number = nvars++;
@@ -161,13 +203,15 @@ symbol_class_set (symbol_t *symbol, symbol_class class)
 `-------------------------------------------------*/
 
 void
-symbol_user_token_number_set (symbol_t *symbol, int user_token_number)
+symbol_user_token_number_set (symbol_t *symbol,
+                             int user_token_number, location_t location)
 {
   assert (symbol->class == token_sym);
 
   if (symbol->user_token_number != USER_NUMBER_UNDEFINED
       && symbol->user_token_number != user_token_number)
-    complain (_("redefining user token number of %s"), symbol->tag);
+    complain_at (location, _("redefining user token number of %s"),
+                symbol_tag_get (symbol));
 
   symbol->user_token_number = user_token_number;
   /* User defined EOF token? */
@@ -212,7 +256,7 @@ symbol_check_defined (symbol_t *this)
       complain_at
        (this->location,
         _("symbol %s is used, but is not defined as a token and has no rules"),
-        this->tag);
+        symbol_tag_get (this));
       this->class = nterm_sym;
       this->number = nvars++;
     }
@@ -231,10 +275,10 @@ symbol_make_alias (symbol_t *symbol, symbol_t *symval)
 {
   if (symval->alias)
     warn (_("symbol `%s' used more than once as a literal string"),
-         symval->tag);
+         symbol_tag_get (symval));
   else if (symbol->alias)
     warn (_("symbol `%s' given more than one literal string"),
-         symbol->tag);
+         symbol_tag_get (symbol));
   else
     {
       symval->class = token_sym;
@@ -267,7 +311,7 @@ symbol_check_alias_consistence (symbol_t *this)
        {
          if (this->prec != 0 && this->alias->prec != 0)
            complain (_("conflicting precedences for %s and %s"),
-                     this->tag, this->alias->tag);
+                     symbol_tag_get (this), symbol_tag_get (this->alias));
          if (this->prec != 0)
            this->alias->prec = this->prec;
          else
@@ -282,7 +326,7 @@ symbol_check_alias_consistence (symbol_t *this)
          if (this->assoc != right_assoc
              && this->alias->assoc != right_assoc)
            complain (_("conflicting associativities for %s and %s"),
-                     this->tag, this->alias->tag);
+                     symbol_tag_get (this), symbol_tag_get (this->alias));
          if (this->assoc != 0)
            this->alias->assoc = this->assoc;
          else
@@ -350,8 +394,8 @@ symbol_translation (symbol_t *this)
       /* A token which translation has already been set? */
       if (token_translations[this->user_token_number] != undeftoken->number)
        complain (_("tokens %s and %s both assigned number %d"),
-                 symbols[token_translations[this->user_token_number]]->tag,
-                 this->tag, this->user_token_number);
+                 symbol_tag_get (symbols[token_translations[this->user_token_number]]),
+                 symbol_tag_get (this), this->user_token_number);
 
       token_translations[this->user_token_number] = this->number;
     }
@@ -529,8 +573,10 @@ symbols_pack (void)
 
   if (startsymbol->class == unknown_sym)
     fatal_at (startsymbol_location,
-             _("the start symbol %s is undefined"), startsymbol->tag);
+             _("the start symbol %s is undefined"),
+             symbol_tag_get (startsymbol));
   else if (startsymbol->class == token_sym)
     fatal_at (startsymbol_location,
-             _("the start symbol %s is a token"), startsymbol->tag);
+             _("the start symbol %s is a token"),
+             symbol_tag_get (startsymbol));
 }