warnings: factoring: complaints

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index 1e0ec1cce9c96a68ab06ffff8c5304b961804dd3..1d0ed91f4bbbbfc9323c9f3e3c134cc2ab04e3a1 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,35 +1,40 @@
 /* Symbol table manager for Bison.
 
 /* Symbol table manager for Bison.
 

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

    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
    Foundation, Inc.
 
    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 "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;
+static symbol **semantic_types_sorted = NULL;
+

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


@@ -41,6 +46,21 @@ symbol *accept = NULL;
 symbol *startsymbol = NULL;
 location startsymbol_location;
 
 symbol *startsymbol = NULL;
 location startsymbol_location;
 

+/*---------------------------------------.
+| Default %destructor's and %printer's.  |
+`---------------------------------------*/
+
+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.  |
 `---------------------------------*/


@@ -51,12 +71,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, '-'))
+    complain_at (loc, Wyacc,
+                 _("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;

-  res->destructor = NULL;
-  res->printer = NULL;
+  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;


@@ -65,33 +92,111 @@ symbol_new (uniqstr tag, location loc)
 
   res->alias = NULL;
   res->class = unknown_sym;
 
   res->alias = NULL;
   res->class = unknown_sym;

+  res->status = undeclared;

 
   if (nsyms == SYMBOL_NUMBER_MAXIMUM)
 
   if (nsyms == SYMBOL_NUMBER_MAXIMUM)

-    fatal (_("too many symbols in input grammar (limit is %d)"),
-          SYMBOL_NUMBER_MAXIMUM);
+    complain (fatal, _("too many symbols in input grammar (limit is %d)"),
+              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.  |
+`----------------------------------------*/
+
+static semantic_type *
+semantic_type_new (uniqstr tag, const location *loc)
+{
+  semantic_type *res = xmalloc (sizeof *res);
+
+  uniqstr_assert (tag);
+  res->tag = tag;
+  if (loc)
+    res->location = *loc;
+  for (int i = 0; i < CODE_PROPS_SIZE; ++i)
+    code_props_none_init (&res->props[i]);
+
+  return res;
+}
+

 
 /*-----------------.
 | 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 (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)
 {

-  fprintf (f, "\"%s\"", s->tag);
-  SYMBOL_ATTR_PRINT (type_name);
-  SYMBOL_ATTR_PRINT (destructor);
-  SYMBOL_ATTR_PRINT (printer);
+  if (s)
+    {
+      fprintf (f, "\"%s\"", s->tag);
+      SYMBOL_ATTR_PRINT (type_name);
+      SYMBOL_CODE_PRINT (destructor);
+      SYMBOL_CODE_PRINT (printer);
+    }
+  else
+    fprintf (f, "<NULL>");

 }
 
 #undef SYMBOL_ATTR_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 |
 
 /*------------------------------------------------------------------.
 | Complain that S's WHAT is redeclared at SECOND, and was first set |


@@ -99,12 +204,22 @@ symbol_print (symbol *s, FILE *f)
 `------------------------------------------------------------------*/
 
 static void
 `------------------------------------------------------------------*/
 
 static void

-redeclaration (symbol* s, const char *what, location first, location second)
+symbol_redeclaration (symbol *s, const char *what, location first,
+                      location second)

 {
 {

-  complain_at (second, _("%s redeclaration for %s"), what, s->tag);
-  complain_at (first, _("first declaration"));
+  complain_at (second, complaint, _("%s redeclaration for %s"), what, s->tag);
+  complain_at (first, complaint, _("previous declaration"));

 }
 
 }
 

+static void
+semantic_type_redeclaration (semantic_type *s, const char *what, location first,
+                             location second)
+{
+  complain_at (second, complaint, _("%s redeclaration for <%s>"), what, s->tag);
+  complain_at (first, complaint, _("previous declaration"));
+}
+
+

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


@@ -117,47 +232,73 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
   if (type_name)
     {
       if (sym->type_name)
   if (type_name)
     {
       if (sym->type_name)

-       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.  Do nothing if passed 0.  |
-`------------------------------------------------------------------*/
+/*--------------------------------------------------------.
+| Set the DESTRUCTOR or PRINTER associated with the SYM.  |
+`--------------------------------------------------------*/

 
 void
 
 void

-symbol_destructor_set (symbol *sym, char *destructor, location loc)
+symbol_code_props_set (symbol *sym, code_props_type kind,
+                       code_props const *code)

 {
 {

-  if (destructor)
-    {
-      if (sym->destructor)
-       redeclaration (sym, "%destructor", sym->destructor_location, loc);
-      sym->destructor = destructor;
-      sym->destructor_location = loc;
-    }
+  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 SYM.  Do nothing if passed 0.  |
-`---------------------------------------------------------------*/
+/*-----------------------------------------------------.
+| Set the DESTRUCTOR or PRINTER associated with TYPE.  |
+`-----------------------------------------------------*/

 
 void
 
 void

-symbol_printer_set (symbol *sym, char *printer, location loc)
+semantic_type_code_props_set (semantic_type *type,
+                              code_props_type kind,
+                              code_props const *code)
+{
+  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 %destructor or %printer for SYM.  |
+`---------------------------------------------------*/
+
+code_props const *
+symbol_code_props_get (symbol const *sym,
+                       code_props_type kind)

 {
 {

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

     {
     {

-      if (sym->printer)
-       redeclaration (sym, "%printer", sym->destructor_location, loc);
-      sym->printer = printer;
-      sym->printer_location = loc;
+      code_props const *code =
+        &semantic_type_get (sym->type_name, NULL)->props[kind];
+      if (code->code)
+        return code;

     }
     }

-}

 
 

+  /* Apply default code props's only to user-defined symbols.  */
+  if (sym->tag[0] == '$' || sym == errtoken)
+    return &code_props_none;
+
+  if (sym->type_name)
+    return &default_tagged_code_props[kind];
+  return &default_tagless_code_props[kind];
+}

 
 /*-----------------------------------------------------------------.
 | Set the PRECEDENCE associated with SYM.  Does nothing if invoked |
 
 /*-----------------------------------------------------------------.
 | Set the PRECEDENCE associated with SYM.  Does nothing if invoked |


@@ -170,14 +311,15 @@ 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)

-       redeclaration (sym, assoc_to_string (a), sym->prec_location, loc);
+        symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location,
+                              loc);

       sym->prec = prec;
       sym->assoc = a;
       sym->prec_location = loc;
     }
 
   /* Only terminals have a precedence. */
       sym->prec = prec;
       sym->assoc = a;
       sym->prec_location = loc;
     }
 
   /* Only terminals have a precedence. */

-  symbol_class_set (sym, token_sym, loc);
+  symbol_class_set (sym, token_sym, loc, false);

 }
 
 
 }
 
 


@@ -186,10 +328,15 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
 `------------------------------------*/
 
 void
 `------------------------------------*/
 
 void

-symbol_class_set (symbol *sym, symbol_class class, location loc)
+symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)

 {
 {

+  bool warned = false;

   if (sym->class != unknown_sym && sym->class != class)
   if (sym->class != unknown_sym && sym->class != class)

-    complain_at (loc, _("symbol %s redefined"), sym->tag);
+    {
+      complain_at (loc, complaint, _("symbol %s redefined"), sym->tag);
+      // Don't report both "redefined" and "redeclared".
+      warned = true;
+    }

 
   if (class == nterm_sym && sym->class != nterm_sym)
     sym->number = nvars++;
 
   if (class == nterm_sym && sym->class != nterm_sym)
     sym->number = nvars++;


@@ -197,6 +344,13 @@ symbol_class_set (symbol *sym, symbol_class class, location loc)
     sym->number = ntokens++;
 
   sym->class = class;
     sym->number = ntokens++;
 
   sym->class = class;

+
+  if (declaring)
+    {
+      if (sym->status == declared && !warned)
+        complain_at (loc, Wother, _("symbol %s redeclared"), sym->tag);
+      sym->status = declared;
+    }

 }
 
 
 }
 
 


@@ -207,22 +361,27 @@ symbol_class_set (symbol *sym, symbol_class class, location loc)
 void
 symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
 {
 void
 symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
 {

-  if (sym->class != token_sym)
-    abort ();
+  int *user_token_numberp;

 
 

-  if (sym->user_token_number != USER_NUMBER_UNDEFINED
-      && sym->user_token_number != user_token_number)
-    complain_at (loc, _("redefining user token number of %s"), sym->tag);
+  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;
+  if (*user_token_numberp != USER_NUMBER_UNDEFINED
+      && *user_token_numberp != user_token_number)
+    complain_at (loc, complaint, _("redefining user token number of %s"),
+                 sym->tag);

 
 

-  sym->user_token_number = user_token_number;
+  *user_token_numberp = user_token_number;

   /* User defined $end token? */
   if (user_token_number == 0)
     {
       endtoken = sym;
   /* User defined $end token? */
   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;

     }
 }
 
     }
 }
 


@@ -237,14 +396,68 @@ 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:
+          complain_at (sym->location, Wother,
+                   _("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, complaint,
+                    _("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++;
     }
 

+  for (int i = 0; i < 2; ++i)
+    if (sym->props[i].kind == CODE_PROPS_NONE && sym->type_name)
+      {
+        semantic_type *sem_type = semantic_type_get (sym->type_name, NULL);
+        if (sem_type
+            && sem_type->props[i].kind != CODE_PROPS_NONE)
+          sem_type->props[i].is_used = true;
+      }
+
+  /* Set the semantic type status associated to the current symbol to
+     'declared' so that we could check semantic types unnecessary uses. */
+  if (sym->type_name)
+    {
+      semantic_type *sem_type = semantic_type_get (sym->type_name, NULL);
+      if (sem_type)
+        sem_type->status = declared;
+    }
+
+  return true;
+}
+
+static inline bool
+semantic_type_check_defined (semantic_type *sem_type)
+{
+  if (sem_type->status == declared)
+    {
+      for (int i = 0; i < 2; ++i)
+        if (sem_type->props[i].kind != CODE_PROPS_NONE
+            && ! sem_type->props[i].is_used)
+          complain_at (sem_type->location, Wother,
+                   _("useless %s for type <%s>"),
+                   code_props_type_string (i), sem_type->tag);
+    }
+  else
+    complain_at (sem_type->location, Wother,
+                 _("type <%s> is used, but is not associated to any symbol"),
+                 sem_type->tag);
+

   return true;
 }
 
   return true;
 }
 


@@ -254,36 +467,32 @@ symbol_check_defined_processor (void *sym, void *null ATTRIBUTE_UNUSED)
   return symbol_check_defined (sym);
 }
 
   return symbol_check_defined (sym);
 }
 

+static bool
+semantic_type_check_defined_processor (void *sem_type,
+                                       void *null ATTRIBUTE_UNUSED)
+{
+  return semantic_type_check_defined (sem_type);
+}

 
 

-/*------------------------------------------------------------------.
-| 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)
+    complain_at (loc, Wother,
+              _("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);
+    complain_at (loc, Wother,
+              _("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;
-      /* sym and symval combined are only one symbol.  */
-      nsyms--;
-      ntokens--;
-      if (ntokens != sym->number && ntokens != symval->number)
-       abort ();
-      sym->number = symval->number =
-       (symval->number < sym->number) ? 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);

     }
 }
 
     }
 }
 


@@ -296,54 +505,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 (orig->destructor || alias->destructor)
-    {
-      if (orig->destructor)
-       symbol_destructor_set (alias, orig->destructor,
-                              orig->destructor_location);
-      else
-       symbol_destructor_set (orig, alias->destructor,
-                              alias->destructor_location);
-    }
+  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 (orig->printer || alias->printer)
+  if (sym->prec || str->prec)

     {
     {

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

       else
       else

-       symbol_printer_set (orig, alias->printer, alias->printer_location);
-    }
-
-  if (alias->prec || orig->prec)
-    {
-      if (orig->prec)
-       symbol_precedence_set (alias, orig->prec, orig->assoc,
-                              orig->prec_location);
-      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;


@@ -358,35 +556,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
-           {
-             if (this->alias->number == NUMBER_UNDEFINED)
-               abort ();
-             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 */
-    {
-      if (this->number == NUMBER_UNDEFINED)
-       abort ();
-    }
+    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;


@@ -399,7 +573,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, complaint,
+               _("user token number %d redeclaration for %s"),
+               num, second->tag);
+  complain_at (first->location, complaint, _("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.  |


@@ -410,18 +603,18 @@ 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;
     }

-
+  

   return true;
 }
 
   return true;
 }
 


@@ -432,14 +625,15 @@ symbol_translation_processor (void *this, void *null ATTRIBUTE_UNUSED)
 }
 
 
 }
 
 

-/*----------------------.
-| A symbol hash table.  |
-`----------------------*/
+/*---------------------------------------.
+| Symbol and semantic type hash tables.  |
+`---------------------------------------*/

 
 

-/* Initial capacity of symbols hash table.  */
+/* Initial capacity of symbol and semantic type hash table.  */

 #define HT_INITIAL_CAPACITY 257
 
 static struct hash_table *symbol_table = NULL;
 #define HT_INITIAL_CAPACITY 257
 
 static struct hash_table *symbol_table = NULL;

+static struct hash_table *semantic_type_table = NULL;

 
 static inline bool
 hash_compare_symbol (const symbol *m1, const symbol *m2)
 
 static inline bool
 hash_compare_symbol (const symbol *m1, const symbol *m2)


@@ -448,12 +642,25 @@ hash_compare_symbol (const symbol *m1, const symbol *m2)
   return UNIQSTR_EQ (m1->tag, m2->tag);
 }
 
   return UNIQSTR_EQ (m1->tag, m2->tag);
 }
 

+static inline bool
+hash_compare_semantic_type (const semantic_type *m1, const semantic_type *m2)
+{
+  /* Since names are unique, we can compare the pointers themselves.  */
+  return UNIQSTR_EQ (m1->tag, m2->tag);
+}
+

 static bool
 hash_symbol_comparator (void const *m1, void const *m2)
 {
   return hash_compare_symbol (m1, m2);
 }
 
 static bool
 hash_symbol_comparator (void const *m1, void const *m2)
 {
   return hash_compare_symbol (m1, m2);
 }
 

+static bool
+hash_semantic_type_comparator (void const *m1, void const *m2)
+{
+  return hash_compare_semantic_type (m1, m2);
+}
+

 static inline size_t
 hash_symbol (const symbol *m, size_t tablesize)
 {
 static inline size_t
 hash_symbol (const symbol *m, size_t tablesize)
 {


@@ -461,12 +668,24 @@ hash_symbol (const symbol *m, size_t tablesize)
   return ((uintptr_t) m->tag) % tablesize;
 }
 
   return ((uintptr_t) m->tag) % tablesize;
 }
 

+static inline size_t
+hash_semantic_type (const semantic_type *m, size_t tablesize)
+{
+  /* Since names are unique, we can hash the pointer itself.  */
+  return ((uintptr_t) m->tag) % tablesize;
+}
+

 static size_t
 hash_symbol_hasher (void const *m, size_t tablesize)
 {
   return hash_symbol (m, tablesize);
 }
 
 static size_t
 hash_symbol_hasher (void const *m, size_t tablesize)
 {
   return hash_symbol (m, tablesize);
 }
 

+static size_t
+hash_semantic_type_hasher (void const *m, size_t tablesize)
+{
+  return hash_semantic_type (m, tablesize);
+}

 
 /*-------------------------------.
 | Create the symbol hash table.  |
 
 /*-------------------------------.
 | Create the symbol hash table.  |


@@ -476,10 +695,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,
+                                         NULL,
+                                         hash_semantic_type_hasher,
+                                         hash_semantic_type_comparator,
+                                         free);

 }
 
 
 }
 
 


@@ -489,25 +713,75 @@ symbols_new (void)
 `----------------------------------------------------------------*/
 
 symbol *
 `----------------------------------------------------------------*/
 
 symbol *

-symbol_get (const char *key, location loc)
+symbol_from_uniqstr (const uniqstr key, location loc)

 {
   symbol probe;
   symbol *entry;
 
 {
   symbol probe;
   symbol *entry;
 

-  key = uniqstr_new (key);

   probe.tag = key;
   entry = hash_lookup (symbol_table, &probe);
 
   if (!entry)
     {
       /* First insertion in the hash. */
   probe.tag = key;
   entry = hash_lookup (symbol_table, &probe);
 
   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;
+}
+
+
+/*-----------------------------------------------------------------------.
+| Find the semantic type named KEY, and return it.  If it does not exist |
+| yet, create it.                                                        |
+`-----------------------------------------------------------------------*/
+
+semantic_type *
+semantic_type_from_uniqstr (const uniqstr key, const location *loc)
+{
+  semantic_type probe;
+  semantic_type *entry;
+
+  probe.tag = key;
+  entry = hash_lookup (semantic_type_table, &probe);
+
+  if (!entry)
+    {
+      /* First insertion in the hash. */
+      entry = semantic_type_new (key, loc);
+      if (!hash_insert (semantic_type_table, entry))
+        xalloc_die ();

     }
   return entry;
 }
 
 
     }
   return entry;
 }
 
 

+/*----------------------------------------------------------------.
+| Find the symbol named KEY, and return it.  If it does not exist |
+| yet, create it.                                                 |
+`----------------------------------------------------------------*/
+
+symbol *
+symbol_get (const char *key, location loc)
+{
+  return symbol_from_uniqstr (uniqstr_new (key), loc);
+}
+
+
+/*-----------------------------------------------------------------------.
+| Find the semantic type named KEY, and return it.  If it does not exist |
+| yet, create it.                                                        |
+`-----------------------------------------------------------------------*/
+
+semantic_type *
+semantic_type_get (const char *key, const location *loc)
+{
+  return semantic_type_from_uniqstr (uniqstr_new (key), loc);
+}
+
+

 /*------------------------------------------------------------------.
 | Generate a dummy nonterminal, whose name cannot conflict with the |
 | user's names.                                                     |
 /*------------------------------------------------------------------.
 | Generate a dummy nonterminal, whose name cannot conflict with the |
 | user's names.                                                     |


@@ -522,13 +796,18 @@ dummy_symbol_get (location loc)
 
   symbol *sym;
 
 
   symbol *sym;
 

-  sprintf (buf, "@%d", ++dummy_count);
+  sprintf (buf, "$@%d", ++dummy_count);

   sym = symbol_get (buf, loc);
   sym->class = nterm_sym;
   sym->number = nvars++;
   return sym;
 }
 
   sym = symbol_get (buf, loc);
   sym->class = nterm_sym;
   sym->number = nvars++;
   return sym;
 }
 

+bool
+symbol_is_dummy (const symbol *sym)
+{
+  return sym->tag[0] == '@' || (sym->tag[0] == '$' && sym->tag[1] == '@');
+}

 
 /*-------------------.
 | Free the symbols.  |
 
 /*-------------------.
 | Free the symbols.  |


@@ -538,7 +817,9 @@ void
 symbols_free (void)
 {
   hash_free (symbol_table);
 symbols_free (void)
 {
   hash_free (symbol_table);

+  hash_free (semantic_type_table);

   free (symbols);
   free (symbols);

+  free (symbols_sorted);

 }
 
 
 }
 
 


@@ -547,12 +828,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 |


@@ -562,7 +866,10 @@ 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);
+  symbols_do (semantic_type_check_defined_processor, NULL,
+              semantic_type_table, semantic_types_sorted);

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


@@ -583,12 +890,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.  */


@@ -604,20 +911,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);

 }
 
 
 }
 
 


@@ -629,19 +936,77 @@ symbols_token_translations_init (void)
 void
 symbols_pack (void)
 {
 void
 symbols_pack (void)
 {

-  symbols = xcalloc (nsyms, sizeof *symbols);
+  symbols_do (symbol_check_alias_consistency_processor, NULL,
+              symbol_table, symbols_sorted);

 
 

-  symbols_do (symbol_check_alias_consistency_processor, NULL);
-  symbols_do (symbol_pack_processor, NULL);
+  symbols = xcalloc (nsyms, sizeof *symbols);
+  symbols_do (symbol_pack_processor, NULL, symbol_table, symbols_sorted);
+
+  /* Aliases leave empty slots in symbols, so remove them.  */
+  {
+    int writei;
+    int readi;
+    int nsyms_old = nsyms;
+    for (writei = 0, readi = 0; readi < nsyms_old; readi += 1)
+      {
+        if (symbols[readi] == NULL)
+          {
+            nsyms -= 1;
+            ntokens -= 1;
+          }
+        else
+          {
+            symbols[writei] = symbols[readi];
+            symbols[writei]->number = writei;
+            if (symbols[writei]->alias)
+              symbols[writei]->alias->number = writei;
+            writei += 1;
+          }
+      }
+  }
+  symbols = xnrealloc (symbols, nsyms, sizeof *symbols);

 
   symbols_token_translations_init ();
 
   if (startsymbol->class == unknown_sym)
 
   symbols_token_translations_init ();
 
   if (startsymbol->class == unknown_sym)

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

   else if (startsymbol->class == token_sym)
   else if (startsymbol->class == token_sym)

-    fatal_at (startsymbol_location,
-             _("the start symbol %s is a token"),
-             startsymbol->tag);
+    complain_at (startsymbol_location, fatal,
+                 _("the start symbol %s is a token"),
+                 startsymbol->tag);
+}
+
+
+/*--------------------------------------------------.
+| Set default tagged/tagless %destructor/%printer.  |
+`--------------------------------------------------*/
+
+void
+default_tagged_code_props_set (code_props_type kind, code_props const *code)
+{
+  if (default_tagged_code_props[kind].code)
+    {
+      complain_at (code->location, complaint,
+                   _("redeclaration for default tagged %s"),
+                   code_props_type_string (kind));
+      complain_at (default_tagged_code_props[kind].location, complaint,
+                   _("previous declaration"));
+    }
+  default_tagged_code_props[kind] = *code;
+}
+
+void
+default_tagless_code_props_set (code_props_type kind, code_props const *code)
+{
+  if (default_tagless_code_props[kind].code)
+    {
+      complain_at (code->location, complaint,
+                   _("redeclaration for default tagless %s"),
+                   code_props_type_string (kind));
+      complain_at (default_tagless_code_props[kind].location, complaint,
+                   _("previous declaration"));
+    }
+  default_tagless_code_props[kind] = *code;

 }
 }