fix for printers and destructors.

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index 81a938ced42b961280ec6dd4f5e1b6cd384bdf5e..14d107c9ef1dc142275c01a22c2845e512ff7685 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,35 +1,39 @@
 /* Symbol table manager for Bison.
 
 /* Symbol table manager for Bison.
 

-   Copyright (C) 1984, 1989, 2000, 2001, 2002, 2004, 2005, 2006 Free
-   Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2012 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 #include <hash.h>
 
 #include <config.h>
 #include "system.h"
 
 #include <hash.h>

-#include <quotearg.h>

 
 #include "complain.h"
 #include "gram.h"
 #include "symtab.h"
 
 
 #include "complain.h"
 #include "gram.h"
 #include "symtab.h"
 

+/*-------------------------------------------------------------------.
+| Symbols sorted by tag.  Allocated by the first invocation of       |
+| symbols_do, after which no more symbols should be created.         |
+`-------------------------------------------------------------------*/
+
+static symbol **symbols_sorted = NULL;
+

 /*------------------------.
 | Distinguished symbols.  |
 `------------------------*/
 /*------------------------.
 | Distinguished symbols.  |
 `------------------------*/


@@ -45,10 +49,16 @@ location startsymbol_location;
 | Default %destructor's and %printer's.  |
 `---------------------------------------*/
 
 | Default %destructor's and %printer's.  |
 `---------------------------------------*/
 

-static code_props default_tagged_destructor = CODE_PROPS_NONE_INIT;
-static code_props default_tagless_destructor = CODE_PROPS_NONE_INIT;
-static code_props default_tagged_printer = CODE_PROPS_NONE_INIT;
-static code_props default_tagless_printer = CODE_PROPS_NONE_INIT;
+static code_props default_tagged_code_props[CODE_PROPS_SIZE] =
+  {
+    CODE_PROPS_NONE_INIT,
+    CODE_PROPS_NONE_INIT,
+  };
+static code_props default_tagless_code_props[CODE_PROPS_SIZE] =
+  {
+    CODE_PROPS_NONE_INIT,
+    CODE_PROPS_NONE_INIT,
+  };

 
 /*---------------------------------.
 | Create a new symbol, named TAG.  |
 
 /*---------------------------------.
 | Create a new symbol, named TAG.  |


@@ -60,12 +70,19 @@ symbol_new (uniqstr tag, location loc)
   symbol *res = xmalloc (sizeof *res);
 
   uniqstr_assert (tag);
   symbol *res = xmalloc (sizeof *res);
 
   uniqstr_assert (tag);

+
+  /* If the tag is not a string (starts with a double quote), check
+     that it is valid for Yacc. */
+  if (tag[0] != '\"' && tag[0] != '\'' && strchr (tag, '-'))
+    yacc_at (loc, _("POSIX Yacc forbids dashes in symbol names: %s"),
+             tag);
+

   res->tag = tag;
   res->location = loc;
 
   res->type_name = NULL;
   res->tag = tag;
   res->location = loc;
 
   res->type_name = NULL;

-  code_props_none_init (&res->destructor);
-  code_props_none_init (&res->printer);
+  for (int i = 0; i < CODE_PROPS_SIZE; ++i)
+    code_props_none_init (&res->props[i]);

 
   res->number = NUMBER_UNDEFINED;
   res->prec = 0;
 
   res->number = NUMBER_UNDEFINED;
   res->prec = 0;


@@ -74,15 +91,28 @@ symbol_new (uniqstr tag, location loc)
 
   res->alias = NULL;
   res->class = unknown_sym;
 
   res->alias = NULL;
   res->class = unknown_sym;

-  res->declared = false;
+  res->status = undeclared;

 
   if (nsyms == SYMBOL_NUMBER_MAXIMUM)
     fatal (_("too many symbols in input grammar (limit is %d)"),
 
   if (nsyms == SYMBOL_NUMBER_MAXIMUM)
     fatal (_("too many symbols in input grammar (limit is %d)"),

-          SYMBOL_NUMBER_MAXIMUM);
+           SYMBOL_NUMBER_MAXIMUM);

   nsyms++;
   return res;
 }
 
   nsyms++;
   return res;
 }
 

+char const *
+code_props_type_string (code_props_type kind)
+{
+  switch (kind)
+    {
+    case destructor:
+      return "%destructor";
+    case printer:
+      return "%printer";
+    }
+  assert (0);
+}
+

 /*----------------------------------------.
 | Create a new semantic type, named TAG.  |
 `----------------------------------------*/
 /*----------------------------------------.
 | Create a new semantic type, named TAG.  |
 `----------------------------------------*/


@@ -94,8 +124,8 @@ semantic_type_new (uniqstr tag)
 
   uniqstr_assert (tag);
   res->tag = tag;
 
   uniqstr_assert (tag);
   res->tag = tag;

-  code_props_none_init (&res->destructor);
-  code_props_none_init (&res->printer);
+  for (int i = 0; i < CODE_PROPS_SIZE; ++i)
+    code_props_none_init (&res->props[i]);

 
   return res;
 }
 
   return res;
 }


@@ -105,13 +135,13 @@ semantic_type_new (uniqstr tag)
 | Print a symbol.  |
 `-----------------*/
 
 | Print a symbol.  |
 `-----------------*/
 

-#define SYMBOL_ATTR_PRINT(Attr)                                \
-  if (s->Attr)                                         \
+#define SYMBOL_ATTR_PRINT(Attr)                         \
+  if (s->Attr)                                          \

     fprintf (f, " %s { %s }", #Attr, s->Attr)
 
     fprintf (f, " %s { %s }", #Attr, s->Attr)
 

-#define SYMBOL_CODE_PRINT(Attr)                                \
-  if (code_props_code_get (s->Attr))                   \
-    fprintf (f, " %s { %s }", #Attr, code_props_code_get(s->Attr))
+#define SYMBOL_CODE_PRINT(Attr)                                         \
+  if (s->props[Attr].code)                                              \
+    fprintf (f, " %s { %s }", #Attr, s->props[Attr].code)

 
 void
 symbol_print (symbol *s, FILE *f)
 
 void
 symbol_print (symbol *s, FILE *f)


@@ -130,6 +160,41 @@ symbol_print (symbol *s, FILE *f)
 #undef SYMBOL_ATTR_PRINT
 #undef SYMBOL_CODE_PRINT
 
 #undef SYMBOL_ATTR_PRINT
 #undef SYMBOL_CODE_PRINT
 

+
+/*----------------------------------.
+| Whether S is a valid identifier.  |
+`----------------------------------*/
+
+static bool
+is_identifier (uniqstr s)
+{
+  static char const alphanum[26 + 26 + 1 + 10] =
+    "abcdefghijklmnopqrstuvwxyz"
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "_"
+    "0123456789";
+  if (!s || ! memchr (alphanum, *s, sizeof alphanum - 10))
+    return false;
+  for (++s; *s; ++s)
+    if (! memchr (alphanum, *s, sizeof alphanum))
+      return false;
+  return true;
+}
+
+
+/*-----------------------------------------------.
+| Get the identifier associated to this symbol.  |
+`-----------------------------------------------*/
+uniqstr
+symbol_id_get (symbol const *sym)
+{
+  aver (sym->user_token_number != USER_NUMBER_HAS_STRING_ALIAS);
+  if (sym->alias)
+    sym = sym->alias;
+  return is_identifier (sym->tag) ? sym->tag : 0;
+}
+
+

 /*------------------------------------------------------------------.
 | Complain that S's WHAT is redeclared at SECOND, and was first set |
 | at FIRST.                                                         |
 /*------------------------------------------------------------------.
 | Complain that S's WHAT is redeclared at SECOND, and was first set |
 | at FIRST.                                                         |


@@ -152,6 +217,7 @@ semantic_type_redeclaration (semantic_type *s, const char *what, location first,
 }
 
 
 }
 
 

+

 /*-----------------------------------------------------------------.
 | Set the TYPE_NAME associated with SYM.  Does nothing if passed 0 |
 | as TYPE_NAME.                                                    |
 /*-----------------------------------------------------------------.
 | Set the TYPE_NAME associated with SYM.  Does nothing if passed 0 |
 | as TYPE_NAME.                                                    |


@@ -163,124 +229,72 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
   if (type_name)
     {
       if (sym->type_name)
   if (type_name)
     {
       if (sym->type_name)

-       symbol_redeclaration (sym, "%type", sym->type_location, loc);
+        symbol_redeclaration (sym, "%type", sym->type_location, loc);

       uniqstr_assert (type_name);
       sym->type_name = type_name;
       sym->type_location = loc;
     }
 }
 
       uniqstr_assert (type_name);
       sym->type_name = type_name;
       sym->type_location = loc;
     }
 }
 

-
-/*-----------------------------------------.
-| Set the DESTRUCTOR associated with SYM.  |
-`-----------------------------------------*/
-
-void
-symbol_destructor_set (symbol *sym, code_props destructor)
-{
-  if (code_props_code_get (sym->destructor))
-    symbol_redeclaration (sym, "%destructor",
-                          code_props_location_get (sym->destructor),
-                          code_props_location_get (destructor));
-  sym->destructor = destructor;
-}
-
-/*------------------------------------------.
-| Set the DESTRUCTOR associated with TYPE.  |
-`------------------------------------------*/
-
-void
-semantic_type_destructor_set (semantic_type *type, code_props destructor)
-{
-  if (code_props_code_get (type->destructor))
-    semantic_type_redeclaration (type, "%destructor",
-                                 code_props_location_get (type->destructor),
-                                 code_props_location_get (destructor));
-  type->destructor = destructor;
-}
-
-/*---------------------------------------.
-| Get the computed %destructor for SYM.  |
-`---------------------------------------*/
-
-code_props
-symbol_destructor_get (symbol *sym)
-{
-  /* Per-symbol %destructor.  */
-  if (code_props_code_get (sym->destructor))
-    return sym->destructor;
-
-  /* Per-type %destructor.  */
-  if (sym->type_name)
-    {
-      code_props destructor = semantic_type_get (sym->type_name)->destructor;
-      if (code_props_code_get (destructor))
-        return destructor;
-    }
-
-  /* Apply default %destructor's only to user-defined symbols.  */
-  if (sym->tag[0] == '$' || sym == errtoken)
-    return code_props_none;
-
-  if (sym->type_name)
-    return default_tagged_destructor;
-  return default_tagless_destructor;
-}
-
-/*--------------------------------------.
-| Set the PRINTER associated with SYM.  |
-`--------------------------------------*/
+/*--------------------------------------------------------.
+| Set the DESTRUCTOR or PRINTER associated with the SYM.  |
+`--------------------------------------------------------*/

 
 void
 
 void

-symbol_printer_set (symbol *sym, code_props printer)
+symbol_code_props_set (symbol *sym, code_props_type kind,
+                       code_props const *code)

 {
 {

-  if (code_props_code_get (sym->printer))
-    symbol_redeclaration (sym, "%printer",
-                          code_props_location_get (sym->printer),
-                          code_props_location_get (printer));
-  sym->printer = printer;
+  if (sym->props[kind].code)
+    symbol_redeclaration (sym, code_props_type_string (kind),
+                          sym->props[kind].location,
+                          code->location);
+  sym->props[kind] = *code;

 }
 
 }
 

-/*---------------------------------------.
-| Set the PRINTER associated with TYPE.  |
-`---------------------------------------*/
+/*-----------------------------------------------------.
+| Set the DESTRUCTOR or PRINTER associated with TYPE.  |
+`-----------------------------------------------------*/

 
 void
 
 void

-semantic_type_printer_set (semantic_type *type, code_props printer)
+semantic_type_code_props_set (semantic_type *type,
+                              code_props_type kind,
+                              code_props const *code)

 {
 {

-  if (code_props_code_get (type->printer))
-    semantic_type_redeclaration (type, "%printer",
-                                 code_props_location_get (type->printer),
-                                 code_props_location_get (printer));
-  type->printer = printer;
+  if (type->props[kind].code)
+    semantic_type_redeclaration (type, code_props_type_string (kind),
+                                 type->props[kind].location,
+                                 code->location);
+  type->props[kind] = *code;

 }
 
 }
 

-/*------------------------------------.
-| Get the computed %printer for SYM.  |
-`------------------------------------*/
+/*---------------------------------------------------.
+| Get the computed %destructor or %printer for SYM.  |
+`---------------------------------------------------*/

 
 

-code_props
-symbol_printer_get (symbol *sym)
+code_props const *
+symbol_code_props_get (symbol const *sym,
+                       code_props_type kind)

 {
 {

-  /* Per-symbol %printer.  */
-  if (code_props_code_get (sym->printer))
-    return sym->printer;
+  /* Per-symbol code props.  */
+  if (sym->props[kind].code)
+    return &sym->props[kind];

 
 

-  /* Per-type %printer.  */
+  /* Per-type code props.  */

   if (sym->type_name)
     {
   if (sym->type_name)
     {

-      code_props printer = semantic_type_get (sym->type_name)->printer;
-      if (code_props_code_get (printer))
-        return printer;
+      code_props const *code =
+        &semantic_type_get (sym->type_name)->props[kind];
+      if (code->code)
+        return code;

     }
 
     }
 

-  /* Apply the default %printer only to user-defined symbols.  */
+  /* Apply default code props's only to user-defined symbols.  */

   if (sym->tag[0] == '$' || sym == errtoken)
   if (sym->tag[0] == '$' || sym == errtoken)

-    return code_props_none;
+    return &code_props_none;

 
   if (sym->type_name)
 
   if (sym->type_name)

-    return default_tagged_printer;
-  return default_tagless_printer;
+    return &default_tagged_code_props[kind];
+  return &default_tagless_code_props[kind];

 }
 
 /*-----------------------------------------------------------------.
 }
 
 /*-----------------------------------------------------------------.


@@ -294,7 +308,7 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
   if (a != undef_assoc)
     {
       if (sym->prec != 0)
   if (a != undef_assoc)
     {
       if (sym->prec != 0)

-       symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location,
+        symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location,

                               loc);
       sym->prec = prec;
       sym->assoc = a;
                               loc);
       sym->prec = prec;
       sym->assoc = a;


@@ -313,10 +327,12 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
 void
 symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
 {
 void
 symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
 {

+  bool warned = false;

   if (sym->class != unknown_sym && sym->class != class)
     {
       complain_at (loc, _("symbol %s redefined"), sym->tag);
   if (sym->class != unknown_sym && sym->class != class)
     {
       complain_at (loc, _("symbol %s redefined"), sym->tag);

-      sym->declared = false;
+      // Don't report both "redefined" and "redeclared".
+      warned = true;

     }
 
   if (class == nterm_sym && sym->class != nterm_sym)
     }
 
   if (class == nterm_sym && sym->class != nterm_sym)


@@ -328,9 +344,9 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
 
   if (declaring)
     {
 
   if (declaring)
     {

-      if (sym->declared)
-       warn_at (loc, _("symbol %s redeclared"), sym->tag);
-      sym->declared = true;
+      if (sym->status == declared && !warned)
+        warn_at (loc, _("symbol %s redeclared"), sym->tag);
+      sym->status = declared;

     }
 }
 
     }
 }
 


@@ -344,9 +360,7 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
 {
   int *user_token_numberp;
 
 {
   int *user_token_numberp;
 

-  aver (sym->class == token_sym);
-
-  if (sym->user_token_number != USER_NUMBER_ALIAS)
+  if (sym->user_token_number != USER_NUMBER_HAS_STRING_ALIAS)

     user_token_numberp = &sym->user_token_number;
   else
     user_token_numberp = &sym->alias->user_token_number;
     user_token_numberp = &sym->user_token_number;
   else
     user_token_numberp = &sym->alias->user_token_number;


@@ -359,10 +373,11 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
   if (user_token_number == 0)
     {
       endtoken = sym;
   if (user_token_number == 0)
     {
       endtoken = sym;

-      endtoken->number = 0;

       /* It is always mapped to 0, so it was already counted in
       /* It is always mapped to 0, so it was already counted in

-        NTOKENS.  */
-      --ntokens;
+         NTOKENS.  */
+      if (endtoken->number != NUMBER_UNDEFINED)
+        --ntokens;
+      endtoken->number = 0;

     }
 }
 
     }
 }
 


@@ -377,10 +392,26 @@ symbol_check_defined (symbol *sym)
 {
   if (sym->class == unknown_sym)
     {
 {
   if (sym->class == unknown_sym)
     {

-      complain_at
-       (sym->location,
-        _("symbol %s is used, but is not defined as a token and has no rules"),
-        sym->tag);
+      switch (sym->status)
+        {
+        case used:
+          warn_at (sym->location,
+                   _("symbol %s is used, but is not defined as a token"
+                     " and has no rules"),
+                   sym->tag);
+          break;
+        case undeclared:
+        case needed:
+          complain_at (sym->location,
+                       _("symbol %s is used, but is not defined as a token"
+                         " and has no rules"),
+                       sym->tag);
+          break;
+        case declared:
+          /* If declared, then sym->class != unknown_sym. */
+          assert (0);
+        }
+

       sym->class = nterm_sym;
       sym->number = nvars++;
     }
       sym->class = nterm_sym;
       sym->number = nvars++;
     }


@@ -395,29 +426,24 @@ symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED)
 }
 
 
 }
 
 

-/*------------------------------------------------------------------.
-| Declare the new symbol SYM.  Make it an alias of SYMVAL, and type |
-| SYMVAL with SYM's type.                                           |
-`------------------------------------------------------------------*/
-

 void
 void

-symbol_make_alias (symbol *sym, symbol *symval, location loc)
+symbol_make_alias (symbol *sym, symbol *str, location loc)

 {
 {

-  if (symval->alias)
-    warn_at (loc, _("symbol `%s' used more than once as a literal string"),
-            symval->tag);
+  if (str->alias)
+    warn_at (loc, _("symbol %s used more than once as a literal string"),
+             str->tag);

   else if (sym->alias)
   else if (sym->alias)

-    warn_at (loc, _("symbol `%s' given more than one literal string"),
-            sym->tag);
+    warn_at (loc, _("symbol %s given more than one literal string"),
+             sym->tag);

   else
     {
   else
     {

-      symval->class = token_sym;
-      symval->user_token_number = sym->user_token_number;
-      sym->user_token_number = USER_NUMBER_ALIAS;
-      symval->alias = sym;
-      sym->alias = symval;
-      symval->number = sym->number;
-      symbol_type_set (symval, sym->type_name, loc);
+      str->class = token_sym;
+      str->user_token_number = sym->user_token_number;
+      sym->user_token_number = USER_NUMBER_HAS_STRING_ALIAS;
+      str->alias = sym;
+      sym->alias = str;
+      str->number = sym->number;
+      symbol_type_set (str, sym->type_name, loc);

     }
 }
 
     }
 }
 


@@ -430,54 +456,43 @@ symbol_make_alias (symbol *sym, symbol *symval, location loc)
 static inline void
 symbol_check_alias_consistency (symbol *this)
 {
 static inline void
 symbol_check_alias_consistency (symbol *this)
 {

-  symbol *alias = this;
-  symbol *orig  = this->alias;
+  symbol *sym = this;
+  symbol *str = this->alias;

 
 

-  /* Check only those that _are_ the aliases.  */
-  if (!(this->alias && this->user_token_number == USER_NUMBER_ALIAS))
+  /* Check only the symbol in the symbol-string pair.  */
+  if (!(this->alias
+        && this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS))

     return;
 
     return;
 

-  if (orig->type_name != alias->type_name)
+  if (str->type_name != sym->type_name)

     {
     {

-      if (orig->type_name)
-       symbol_type_set (alias, orig->type_name, orig->type_location);
+      if (str->type_name)
+        symbol_type_set (sym, str->type_name, str->type_location);

       else
       else

-       symbol_type_set (orig, alias->type_name, alias->type_location);
+        symbol_type_set (str, sym->type_name, sym->type_location);

     }
 
 
     }
 
 

-  if (code_props_code_get (orig->destructor)
-      || code_props_code_get (alias->destructor))
-    {
-      if (code_props_code_get (orig->destructor))
-       symbol_destructor_set (alias, orig->destructor);
-      else
-       symbol_destructor_set (orig, alias->destructor);
-    }
-
-  if (code_props_code_get (orig->printer)
-      || code_props_code_get (alias->printer))
-    {
-      if (code_props_code_get (orig->printer))
-       symbol_printer_set (alias, orig->printer);
-      else
-       symbol_printer_set (orig, alias->printer);
-    }
+  for (int i = 0; i < CODE_PROPS_SIZE; ++i)
+    if (str->props[i].code)
+      symbol_code_props_set (sym, i, &str->props[i]);
+    else if (sym->props[i].code)
+      symbol_code_props_set (str, i, &sym->props[i]);

 
 

-  if (alias->prec || orig->prec)
+  if (sym->prec || str->prec)

     {
     {

-      if (orig->prec)
-       symbol_precedence_set (alias, orig->prec, orig->assoc,
-                              orig->prec_location);
+      if (str->prec)
+        symbol_precedence_set (sym, str->prec, str->assoc,
+                               str->prec_location);

       else
       else

-       symbol_precedence_set (orig, alias->prec, alias->assoc,
-                              alias->prec_location);
+        symbol_precedence_set (str, sym->prec, sym->assoc,
+                               sym->prec_location);

     }
 }
 
 static bool
 symbol_check_alias_consistency_processor (void *this,
     }
 }
 
 static bool
 symbol_check_alias_consistency_processor (void *this,

-                                         void *null ATTRIBUTE_UNUSED)
+                                          void *null ATTRIBUTE_UNUSED)

 {
   symbol_check_alias_consistency (this);
   return true;
 {
   symbol_check_alias_consistency (this);
   return true;


@@ -492,31 +507,11 @@ symbol_check_alias_consistency_processor (void *this,
 static inline bool
 symbol_pack (symbol *this)
 {
 static inline bool
 symbol_pack (symbol *this)
 {

+  aver (this->number != NUMBER_UNDEFINED);

   if (this->class == nterm_sym)
   if (this->class == nterm_sym)

-    {
-      this->number += ntokens;
-    }
-  else if (this->alias)
-    {
-      /* This symbol and its alias are a single token defn.
-        Allocate a tokno, and assign to both check agreement of
-        prec and assoc fields and make both the same */
-      if (this->number == NUMBER_UNDEFINED)
-       {
-         if (this == endtoken || this->alias == endtoken)
-           this->number = this->alias->number = 0;
-         else
-           {
-             aver (this->alias->number != NUMBER_UNDEFINED);
-             this->number = this->alias->number;
-           }
-       }
-      /* Do not do processing below for USER_NUMBER_ALIASes.  */
-      if (this->user_token_number == USER_NUMBER_ALIAS)
-       return true;
-    }
-  else /* this->class == token_sym */
-    aver (this->number != NUMBER_UNDEFINED);
+    this->number += ntokens;
+  else if (this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS)
+    return true;

 
   symbols[this->number] = this;
   return true;
 
   symbols[this->number] = this;
   return true;


@@ -529,7 +524,26 @@ symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED)
 }
 
 
 }
 
 

+static void
+user_token_number_redeclaration (int num, symbol *first, symbol *second)
+{
+  /* User token numbers are not assigned during the parsing, but in a
+     second step, via a traversal of the symbol table sorted on tag.

 
 

+     However, error messages make more sense if we keep the first
+     declaration first.  */
+  if (location_cmp (first->location, second->location) > 0)
+    {
+      symbol* tmp = first;
+      first = second;
+      second = tmp;
+    }
+  complain_at (second->location,
+               _("user token number %d redeclaration for %s"),
+               num, second->tag);
+  complain_at (first->location, _("previous declaration for %s"),
+               first->tag);
+}

 
 /*--------------------------------------------------.
 | Put THIS in TOKEN_TRANSLATIONS if it is a token.  |
 
 /*--------------------------------------------------.
 | Put THIS in TOKEN_TRANSLATIONS if it is a token.  |


@@ -540,14 +554,14 @@ symbol_translation (symbol *this)
 {
   /* Non-terminal? */
   if (this->class == token_sym
 {
   /* Non-terminal? */
   if (this->class == token_sym

-      && this->user_token_number != USER_NUMBER_ALIAS)
+      && this->user_token_number != USER_NUMBER_HAS_STRING_ALIAS)

     {
       /* A token which translation has already been set? */
       if (token_translations[this->user_token_number] != undeftoken->number)
     {
       /* A token which translation has already been set? */
       if (token_translations[this->user_token_number] != undeftoken->number)

-       complain_at (this->location,
-                    _("tokens %s and %s both assigned number %d"),
-                    symbols[token_translations[this->user_token_number]]->tag,
-                    this->tag, this->user_token_number);
+        user_token_number_redeclaration
+          (this->user_token_number,
+           symbols[token_translations[this->user_token_number]],
+           this);

 
       token_translations[this->user_token_number] = this->number;
     }
 
       token_translations[this->user_token_number] = this->number;
     }


@@ -632,15 +646,15 @@ void
 symbols_new (void)
 {
   symbol_table = hash_initialize (HT_INITIAL_CAPACITY,
 symbols_new (void)
 {
   symbol_table = hash_initialize (HT_INITIAL_CAPACITY,

-                                 NULL,
-                                 hash_symbol_hasher,
-                                 hash_symbol_comparator,
-                                 free);
+                                  NULL,
+                                  hash_symbol_hasher,
+                                  hash_symbol_comparator,
+                                  free);

   semantic_type_table = hash_initialize (HT_INITIAL_CAPACITY,
   semantic_type_table = hash_initialize (HT_INITIAL_CAPACITY,

-                                        NULL,
-                                        hash_semantic_type_hasher,
-                                        hash_semantic_type_comparator,
-                                        free);
+                                         NULL,
+                                         hash_semantic_type_hasher,
+                                         hash_semantic_type_comparator,
+                                         free);

 }
 
 
 }
 
 


@@ -661,8 +675,10 @@ symbol_from_uniqstr (const uniqstr key, location loc)
   if (!entry)
     {
       /* First insertion in the hash. */
   if (!entry)
     {
       /* First insertion in the hash. */

+      aver (!symbols_sorted);

       entry = symbol_new (key, loc);
       entry = symbol_new (key, loc);

-      hash_insert (symbol_table, entry);
+      if (!hash_insert (symbol_table, entry))
+        xalloc_die ();

     }
   return entry;
 }
     }
   return entry;
 }


@@ -686,7 +702,8 @@ semantic_type_from_uniqstr (const uniqstr key)
     {
       /* First insertion in the hash. */
       entry = semantic_type_new (key);
     {
       /* First insertion in the hash. */
       entry = semantic_type_new (key);

-      hash_insert (semantic_type_table, entry);
+      if (!hash_insert (semantic_type_table, entry))
+        xalloc_die ();

     }
   return entry;
 }
     }
   return entry;
 }


@@ -753,6 +770,7 @@ symbols_free (void)
   hash_free (symbol_table);
   hash_free (semantic_type_table);
   free (symbols);
   hash_free (symbol_table);
   hash_free (semantic_type_table);
   free (symbols);

+  free (symbols_sorted);

 }
 
 
 }
 
 


@@ -761,12 +779,35 @@ symbols_free (void)
 | terminals.                                                     |
 `---------------------------------------------------------------*/
 
 | terminals.                                                     |
 `---------------------------------------------------------------*/
 

-static void
-symbols_do (Hash_processor processor, void *processor_data)
+static int
+symbols_cmp (symbol const *a, symbol const *b)

 {
 {

-  hash_do_for_each (symbol_table, processor, processor_data);
+  return strcmp (a->tag, b->tag);

 }
 
 }
 

+static int
+symbols_cmp_qsort (void const *a, void const *b)
+{
+  return symbols_cmp (*(symbol * const *)a, *(symbol * const *)b);
+}
+
+static void
+symbols_do (Hash_processor processor, void *processor_data,
+            struct hash_table *table, symbol **sorted)
+{
+  size_t count = hash_get_n_entries (table);
+  if (!sorted)
+    {
+      sorted = xnmalloc (count, sizeof *sorted);
+      hash_get_entries (table, (void**)sorted, count);
+      qsort (sorted, count, sizeof *sorted, symbols_cmp_qsort);
+    }
+  {
+    size_t i;
+    for (i = 0; i < count; ++i)
+      processor (sorted[i], processor_data);
+  }
+}

 
 /*--------------------------------------------------------------.
 | Check that all the symbols are defined.  Report any undefined |
 
 /*--------------------------------------------------------------.
 | Check that all the symbols are defined.  Report any undefined |


@@ -776,7 +817,8 @@ symbols_do (Hash_processor processor, void *processor_data)
 void
 symbols_check_defined (void)
 {
 void
 symbols_check_defined (void)
 {

-  symbols_do (symbol_check_defined_processor, NULL);
+  symbols_do (symbol_check_defined_processor, NULL,
+              symbol_table, symbols_sorted);

 }
 
 /*------------------------------------------------------------------.
 }
 
 /*------------------------------------------------------------------.


@@ -797,12 +839,12 @@ symbols_token_translations_init (void)
     {
       symbol *this = symbols[i];
       if (this->user_token_number != USER_NUMBER_UNDEFINED)
     {
       symbol *this = symbols[i];
       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;
-         if (this->user_token_number == 256)
-           num_256_available_p = false;
-       }
+        {
+          if (this->user_token_number > max_user_token_number)
+            max_user_token_number = this->user_token_number;
+          if (this->user_token_number == 256)
+            num_256_available_p = false;
+        }

     }
 
   /* If 256 is not used, assign it to error, to follow POSIX.  */
     }
 
   /* If 256 is not used, assign it to error, to follow POSIX.  */


@@ -818,20 +860,20 @@ symbols_token_translations_init (void)
     {
       symbol *this = symbols[i];
       if (this->user_token_number == USER_NUMBER_UNDEFINED)
     {
       symbol *this = symbols[i];
       if (this->user_token_number == USER_NUMBER_UNDEFINED)

-       this->user_token_number = ++max_user_token_number;
+        this->user_token_number = ++max_user_token_number;

       if (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;
+        max_user_token_number = this->user_token_number;

     }
 
   token_translations = xnmalloc (max_user_token_number + 1,
     }
 
   token_translations = xnmalloc (max_user_token_number + 1,

-                                sizeof *token_translations);
+                                 sizeof *token_translations);

 
 

-  /* Initialize all entries for literal tokens to 2, the internal
-     token number for $undefined, which represents all invalid inputs.
-     */
+  /* Initialize all entries for literal tokens to the internal token
+     number for $undefined, which represents all invalid inputs.  */

   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;
   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;

-  symbols_do (symbol_translation_processor, NULL);
+  symbols_do (symbol_translation_processor, NULL,
+              symbol_table, symbols_sorted);

 }
 
 
 }
 
 


@@ -843,10 +885,11 @@ symbols_token_translations_init (void)
 void
 symbols_pack (void)
 {
 void
 symbols_pack (void)
 {

-  symbols_do (symbol_check_alias_consistency_processor, NULL);
+  symbols_do (symbol_check_alias_consistency_processor, NULL,
+              symbol_table, symbols_sorted);

 
   symbols = xcalloc (nsyms, sizeof *symbols);
 
   symbols = xcalloc (nsyms, sizeof *symbols);

-  symbols_do (symbol_pack_processor, NULL);
+  symbols_do (symbol_pack_processor, NULL, symbol_table, symbols_sorted);

 
   /* Aliases leave empty slots in symbols, so remove them.  */
   {
 
   /* Aliases leave empty slots in symbols, so remove them.  */
   {


@@ -876,12 +919,12 @@ symbols_pack (void)
 
   if (startsymbol->class == unknown_sym)
     fatal_at (startsymbol_location,
 
   if (startsymbol->class == unknown_sym)
     fatal_at (startsymbol_location,

-             _("the start symbol %s is undefined"),
-             startsymbol->tag);
+              _("the start symbol %s is undefined"),
+              startsymbol->tag);

   else if (startsymbol->class == token_sym)
     fatal_at (startsymbol_location,
   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"),
+              startsymbol->tag);

 }
 
 
 }
 
 


@@ -890,54 +933,30 @@ symbols_pack (void)
 `--------------------------------------------------*/
 
 void
 `--------------------------------------------------*/
 
 void

-default_tagged_destructor_set (code_props destructor)
-{
-  if (code_props_code_get (default_tagged_destructor))
-    {
-      complain_at (code_props_location_get (destructor),
-                   _("redeclaration for default tagged %%destructor"));
-      complain_at (code_props_location_get (default_tagged_destructor),
-                  _("previous declaration"));
-    }
-  default_tagged_destructor = destructor;
-}
-
-void
-default_tagless_destructor_set (code_props destructor)
-{
-  if (code_props_code_get (default_tagless_destructor))
-    {
-      complain_at (code_props_location_get (destructor),
-                   _("redeclaration for default tagless %%destructor"));
-      complain_at (code_props_location_get (default_tagless_destructor),
-                  _("previous declaration"));
-    }
-  default_tagless_destructor = destructor;
-}
-
-void
-default_tagged_printer_set (code_props printer)
+default_tagged_code_props_set (code_props_type kind, code_props const *code)

 {
 {

-  if (code_props_code_get (default_tagged_printer))
+  if (default_tagged_code_props[kind].code)

     {
     {

-      complain_at (code_props_location_get (printer),
-                   _("redeclaration for default tagged %%printer"));
-      complain_at (code_props_location_get (default_tagged_printer),
-                  _("previous declaration"));
+      complain_at (code->location,
+                   _("redeclaration for default tagged %s"),
+                   code_props_type_string (kind));
+      complain_at (default_tagged_code_props[kind].location,
+                   _("previous declaration"));

     }
     }

-  default_tagged_printer = printer;
+  default_tagged_code_props[kind] = *code;

 }
 
 void
 }
 
 void

-default_tagless_printer_set (code_props printer)
+default_tagless_code_props_set (code_props_type kind, code_props const *code)

 {
 {

-  if (code_props_code_get (default_tagless_printer))
+  if (default_tagless_code_props[kind].code)

     {
     {

-      complain_at (code_props_location_get (printer),
-                   _("redeclaration for default tagless %%printer"));
-      complain_at (code_props_location_get (default_tagless_printer),
-                  _("previous declaration"));
+      complain_at (code->location,
+                   _("redeclaration for default tagless %s"),
+                   code_props_type_string (kind));
+      complain_at (default_tagless_code_props[kind].location,
+                   _("previous declaration"));

     }
     }

-  default_tagless_printer = printer;
+  default_tagless_code_props[kind] = *code;

 }
 
 }