regen.

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index 57bb79657065ef9964de53ebddcea61559af826e..bb1b275eda134bd3cf6711d57d1f9286a8bd65d4 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -105,7 +105,7 @@ 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)
     {
@@ -122,7 +122,7 @@ symbol_type_set (symbol_t *symbol, location_t location, char *type_name)
 `-------------------------------------------------------------------*/
 
 void
-symbol_destructor_set (symbol_t *symbol, location_t location, char *destructor)
+symbol_destructor_set (symbol_t *symbol, char *destructor, location_t location)
 {
   if (destructor)
     {
@@ -161,8 +161,8 @@ symbol_printer_set (symbol_t *symbol, char *printer, location_t location)
 `------------------------------------------------------------------*/
 
 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)
     {
@@ -175,7 +175,7 @@ symbol_precedence_set (symbol_t *symbol, location_t location,
     }
 
   /* Only terminals have a precedence. */
-  symbol_class_set (symbol, token_sym);
+  symbol_class_set (symbol, token_sym, location);
 }
 
 
@@ -184,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_get (symbol));
+    complain_at (location, _("symbol %s redefined"), symbol_tag_get (symbol));
 
   if (class == nterm_sym && symbol->class != nterm_sym)
     symbol->number = nvars++;
@@ -203,14 +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_get (symbol));
+    complain_at (location, _("redefining user token number of %s"),
+                symbol_tag_get (symbol));
 
   symbol->user_token_number = user_token_number;
   /* User defined EOF token? */