Merge remote-tracking branch 'origin/maint'

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index 124da3729b2bf1cdd383f6290579ca0db08b9839..66e20c0520e2c0566e2a0ca38ba6b08f8de51145 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -46,20 +46,6 @@ 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.  |


@@ -75,8 +61,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;


@@ -95,8 +81,8 @@ 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;
 }


@@ -147,7 +133,7 @@ semantic_type_new (uniqstr tag, const location *loc)
     fprintf (f, " %s { %s }", #Attr, s->props[Attr].code)
 
 void
     fprintf (f, " %s { %s }", #Attr, s->props[Attr].code)
 
 void

-symbol_print (symbol *s, FILE *f)
+symbol_print (symbol const *s, FILE *f)

 {
   if (s)
     {
 {
   if (s)
     {


@@ -207,16 +193,24 @@ 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"));
+  unsigned i = 0;
+  complain_at_indent (second, complaint, &i,
+                      _("%s redeclaration for %s"), what, s->tag);
+  i += SUB_INDENT;
+  complain_at_indent (first, complaint, &i,
+                      _("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"));
+  unsigned i = 0;
+  complain_at_indent (second, complaint, &i,
+                      _("%s redeclaration for <%s>"), what, s->tag);
+  i += SUB_INDENT;
+  complain_at_indent (first, complaint, &i,
+                      _("previous declaration"));

 }
 
 
 }
 
 


@@ -274,9 +268,8 @@ semantic_type_code_props_set (semantic_type *type,
 | Get the computed %destructor or %printer for SYM.  |
 `---------------------------------------------------*/
 
 | Get the computed %destructor or %printer for SYM.  |
 `---------------------------------------------------*/
 

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

 {
   /* Per-symbol code props.  */
   if (sym->props[kind].code)
 {
   /* Per-symbol code props.  */
   if (sym->props[kind].code)


@@ -285,19 +278,21 @@ symbol_code_props_get (symbol const *sym,
   /* Per-type code props.  */
   if (sym->type_name)
     {
   /* Per-type code props.  */
   if (sym->type_name)
     {

-      code_props const *code =
+      code_props *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.  */
         &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];
+  if (sym->tag[0] != '$' && sym != errtoken)
+    {
+      code_props *code =
+        &semantic_type_get (sym->type_name ? "*" : "", NULL)->props[kind];
+      if (code->code)
+        return code;
+    }
+  return &code_props_none;

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


@@ -333,7 +328,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;
     }


@@ -348,7 +343,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;
     }
 }


@@ -369,7 +364,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? */


@@ -395,38 +391,18 @@ symbol_check_defined (symbol *sym)
 {
   if (sym->class == unknown_sym)
     {
 {
   if (sym->class == unknown_sym)
     {

-      switch (sym->status)
-        {
-        case used:
-          warn_at (sym->location,
+      assert (sym->status != declared);
+      complain_at (sym->location,
+                   sym->status == needed ? complaint : Wother,

                    _("symbol %s is used, but is not defined as a token"
                      " and has no rules"),
                    sym->tag);
                    _("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++;
     }
 
   for (int i = 0; i < 2; ++i)
       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;
-      }
+    symbol_code_props_get (sym, 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. */
 
   /* Set the semantic type status associated to the current symbol to
      'declared' so that we could check semantic types unnecessary uses. */


@@ -443,19 +419,22 @@ symbol_check_defined (symbol *sym)
 static inline bool
 semantic_type_check_defined (semantic_type *sem_type)
 {
 static inline bool
 semantic_type_check_defined (semantic_type *sem_type)
 {

-  if (sem_type->status == declared)
+  // <*> and <> do not have to be "declared".
+  if (sem_type->status == declared
+      || !*sem_type->tag
+      || STREQ(sem_type->tag, "*"))

     {
       for (int i = 0; i < 2; ++i)
         if (sem_type->props[i].kind != CODE_PROPS_NONE
             && ! sem_type->props[i].is_used)
     {
       for (int i = 0; i < 2; ++i)
         if (sem_type->props[i].kind != CODE_PROPS_NONE
             && ! sem_type->props[i].is_used)

-          warn_at (sem_type->location,
-                   _("useless %s for type <%s>"),
-                   code_props_type_string (i), sem_type->tag);
+          complain_at (sem_type->location, Wother,
+                       _("useless %s for type <%s>"),
+                       code_props_type_string (i), sem_type->tag);

     }
   else
     }
   else

-    warn_at (sem_type->location,
-             _("type <%s> is used, but is not associated to any symbol"),
-             sem_type->tag);
+    complain_at (sem_type->location, Wother,
+                 _("type <%s> is used, but is not associated to any symbol"),
+                 sem_type->tag);

 
   return true;
 }
 
   return true;
 }


@@ -478,11 +457,11 @@ void
 symbol_make_alias (symbol *sym, symbol *str, location loc)
 {
   if (str->alias)
 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;


@@ -575,6 +554,7 @@ symbol_pack_processor (void *this, void *null ATTRIBUTE_UNUSED)
 static void
 user_token_number_redeclaration (int num, symbol *first, symbol *second)
 {
 static void
 user_token_number_redeclaration (int num, symbol *first, symbol *second)
 {

+  unsigned i = 0;

   /* User token numbers are not assigned during the parsing, but in a
      second step, via a traversal of the symbol table sorted on tag.
 
   /* User token numbers are not assigned during the parsing, but in a
      second step, via a traversal of the symbol table sorted on tag.
 


@@ -586,11 +566,13 @@ user_token_number_redeclaration (int num, symbol *first, symbol *second)
       first = second;
       second = tmp;
     }
       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);
+  complain_at_indent (second->location, complaint, &i,
+                      _("user token number %d redeclaration for %s"),
+                      num, second->tag);
+  i += SUB_INDENT;
+  complain_at_indent (first->location, complaint, &i,
+                      _("previous declaration for %s"),
+                      first->tag);

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


@@ -968,44 +950,11 @@ 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);
-}
-
-
-/*--------------------------------------------------.
-| 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,
-                   _("redeclaration for default tagged %s"),
-                   code_props_type_string (kind));
-      complain_at (default_tagged_code_props[kind].location,
-                   _("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,
-                   _("redeclaration for default tagless %s"),
-                   code_props_type_string (kind));
-      complain_at (default_tagless_code_props[kind].location,
-                   _("previous declaration"));
-    }
-  default_tagless_code_props[kind] = *code;
+    complain_at (startsymbol_location, fatal,
+                 _("the start symbol %s is a token"),
+                 startsymbol->tag);

 }
 }