Merge remote-tracking branch 'origin/maint'

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index b30ccaf1eb577df2f149f4b00c9c14a2d1f26401..1d0ed91f4bbbbfc9323c9f3e3c134cc2ab04e3a1 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -33,6 +33,7 @@
 `-------------------------------------------------------------------*/
 
 static symbol **symbols_sorted = NULL;
 `-------------------------------------------------------------------*/
 
 static symbol **symbols_sorted = NULL;

+static symbol **semantic_types_sorted = NULL;

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


@@ -74,8 +75,8 @@ symbol_new (uniqstr tag, location loc)
   /* 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, '-'))
   /* 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);
+    complain_at (loc, Wyacc,
+                 _("POSIX Yacc forbids dashes in symbol names: %s"), tag);

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


@@ -94,17 +95,13 @@ symbol_new (uniqstr tag, location loc)
   res->status = undeclared;
 
   if (nsyms == SYMBOL_NUMBER_MAXIMUM)
   res->status = undeclared;
 
   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;
 }
 

-/*-------------------------------------------------------.
-| Name of the code_props type: %destructor or %printer.  |
-`-------------------------------------------------------*/
-
-static char const *
+char const *

 code_props_type_string (code_props_type kind)
 {
   switch (kind)
 code_props_type_string (code_props_type kind)
 {
   switch (kind)


@@ -122,12 +119,14 @@ code_props_type_string (code_props_type kind)
 `----------------------------------------*/
 
 static semantic_type *
 `----------------------------------------*/
 
 static semantic_type *

-semantic_type_new (uniqstr tag)
+semantic_type_new (uniqstr tag, const location *loc)

 {
   semantic_type *res = xmalloc (sizeof *res);
 
   uniqstr_assert (tag);
   res->tag = tag;
 {
   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]);
 
   for (int i = 0; i < CODE_PROPS_SIZE; ++i)
     code_props_none_init (&res->props[i]);
 


@@ -208,16 +207,16 @@ static void
 symbol_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, _("previous 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)
 {
 }
 
 static void
 semantic_type_redeclaration (semantic_type *s, const char *what, location first,
                              location second)
 {

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

 }
 
 
 }
 
 


@@ -287,7 +286,7 @@ symbol_code_props_get (symbol const *sym,
   if (sym->type_name)
     {
       code_props const *code =
   if (sym->type_name)
     {
       code_props const *code =

-        &semantic_type_get (sym->type_name)->props[kind];
+        &semantic_type_get (sym->type_name, NULL)->props[kind];

       if (code->code)
         return code;
     }
       if (code->code)
         return code;
     }


@@ -334,7 +333,7 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
   bool warned = false;
   if (sym->class != unknown_sym && sym->class != class)
     {
   bool warned = false;
   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;
     }
       // Don't report both "redefined" and "redeclared".
       warned = true;
     }


@@ -349,7 +348,7 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
   if (declaring)
     {
       if (sym->status == declared && !warned)
   if (declaring)
     {
       if (sym->status == declared && !warned)

-        warn_at (loc, _("symbol %s redeclared"), sym->tag);
+        complain_at (loc, Wother, _("symbol %s redeclared"), sym->tag);

       sym->status = declared;
     }
 }
       sym->status = declared;
     }
 }


@@ -370,7 +369,8 @@ symbol_user_token_number_set (symbol *sym, int user_token_number, location loc)
     user_token_numberp = &sym->alias->user_token_number;
   if (*user_token_numberp != USER_NUMBER_UNDEFINED
       && *user_token_numberp != user_token_number)
     user_token_numberp = &sym->alias->user_token_number;
   if (*user_token_numberp != USER_NUMBER_UNDEFINED
       && *user_token_numberp != user_token_number)

-    complain_at (loc, _("redefining user token number of %s"), sym->tag);
+    complain_at (loc, complaint, _("redefining user token number of %s"),
+                 sym->tag);

 
   *user_token_numberp = user_token_number;
   /* User defined $end token? */
 
   *user_token_numberp = user_token_number;
   /* User defined $end token? */


@@ -399,17 +399,17 @@ symbol_check_defined (symbol *sym)
       switch (sym->status)
         {
         case used:
       switch (sym->status)
         {
         case used:

-          warn_at (sym->location,
+          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:
                    _("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);
+          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. */
           break;
         case declared:
           /* If declared, then sym->class != unknown_sym. */


@@ -420,6 +420,44 @@ symbol_check_defined (symbol *sym)
       sym->number = nvars++;
     }
 
       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;
 }
 


@@ -429,16 +467,23 @@ 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);
+}
+

 
 void
 symbol_make_alias (symbol *sym, symbol *str, location loc)
 {
   if (str->alias)
 
 void
 symbol_make_alias (symbol *sym, symbol *str, location loc)
 {
   if (str->alias)

-    warn_at (loc, _("symbol %s used more than once as a literal string"),
-             str->tag);
+    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
     {
       str->class = token_sym;
   else
     {
       str->class = token_sym;


@@ -542,10 +587,10 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second)
       first = second;
       second = tmp;
     }
       first = second;
       second = tmp;
     }

-  complain_at (second->location,
+  complain_at (second->location, complaint,

                _("user token number %d redeclaration for %s"),
                num, second->tag);
                _("user token number %d redeclaration for %s"),
                num, second->tag);

-  complain_at (first->location, _("previous declaration for %s"),
+  complain_at (first->location, complaint, _("previous declaration for %s"),

                first->tag);
 }
 
                first->tag);
 }
 


@@ -566,10 +611,10 @@ symbol_translation (symbol *this)
           (this->user_token_number,
            symbols[token_translations[this->user_token_number]],
            this);
           (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;
 }
 


@@ -694,7 +739,7 @@ symbol_from_uniqstr (const uniqstr key, location loc)
 `-----------------------------------------------------------------------*/
 
 semantic_type *
 `-----------------------------------------------------------------------*/
 
 semantic_type *

-semantic_type_from_uniqstr (const uniqstr key)
+semantic_type_from_uniqstr (const uniqstr key, const location *loc)

 {
   semantic_type probe;
   semantic_type *entry;
 {
   semantic_type probe;
   semantic_type *entry;


@@ -705,7 +750,7 @@ semantic_type_from_uniqstr (const uniqstr key)
   if (!entry)
     {
       /* First insertion in the hash. */
   if (!entry)
     {
       /* First insertion in the hash. */

-      entry = semantic_type_new (key);
+      entry = semantic_type_new (key, loc);

       if (!hash_insert (semantic_type_table, entry))
         xalloc_die ();
     }
       if (!hash_insert (semantic_type_table, entry))
         xalloc_die ();
     }


@@ -731,9 +776,9 @@ symbol_get (const char *key, location loc)
 `-----------------------------------------------------------------------*/
 
 semantic_type *
 `-----------------------------------------------------------------------*/
 
 semantic_type *

-semantic_type_get (const char *key)
+semantic_type_get (const char *key, const location *loc)

 {
 {

-  return semantic_type_from_uniqstr (uniqstr_new (key));
+  return semantic_type_from_uniqstr (uniqstr_new (key), loc);

 }
 
 
 }
 
 


@@ -823,6 +868,8 @@ symbols_check_defined (void)
 {
   symbols_do (symbol_check_defined_processor, NULL,
               symbol_table, symbols_sorted);
 {
   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);

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


@@ -922,13 +969,13 @@ symbols_pack (void)
   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);

 }
 
 
 }
 
 


@@ -941,10 +988,10 @@ default_tagged_code_props_set (code_props_type kind, code_props const *code)
 {
   if (default_tagged_code_props[kind].code)
     {
 {
   if (default_tagged_code_props[kind].code)
     {

-      complain_at (code->location,
+      complain_at (code->location, complaint,

                    _("redeclaration for default tagged %s"),
                    code_props_type_string (kind));
                    _("redeclaration for default tagged %s"),
                    code_props_type_string (kind));

-      complain_at (default_tagged_code_props[kind].location,
+      complain_at (default_tagged_code_props[kind].location, complaint,

                    _("previous declaration"));
     }
   default_tagged_code_props[kind] = *code;
                    _("previous declaration"));
     }
   default_tagged_code_props[kind] = *code;


@@ -955,12 +1002,11 @@ default_tagless_code_props_set (code_props_type kind, code_props const *code)
 {
   if (default_tagless_code_props[kind].code)
     {
 {
   if (default_tagless_code_props[kind].code)
     {

-      complain_at (code->location,
+      complain_at (code->location, complaint,

                    _("redeclaration for default tagless %s"),
                    code_props_type_string (kind));
                    _("redeclaration for default tagless %s"),
                    code_props_type_string (kind));

-      complain_at (default_tagless_code_props[kind].location,
+      complain_at (default_tagless_code_props[kind].location, complaint,

                    _("previous declaration"));
     }
   default_tagless_code_props[kind] = *code;
 }
                    _("previous declaration"));
     }
   default_tagless_code_props[kind] = *code;
 }

-