tests: minor fixes/simplifications

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index ac95a215d15b72cd66604942937dd8831e17381a..2e0aa5ee81449787635c1af365d39f63cb2472da 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
    Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,
 /* Input parser for Bison
 
    Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000-2003, 2005-2007,

-   2009-2011 Free Software Foundation, Inc.
+   2009-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.
 


@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <quote.h>
 #include "system.h"
 
 #include <quote.h>

-#include <quotearg.h>

 
 #include "complain.h"
 #include "conflicts.h"
 
 #include "complain.h"
 #include "conflicts.h"


@@ -95,7 +94,7 @@ get_merge_function (uniqstr name)
       syms->next = xmalloc (sizeof syms->next[0]);
       syms->next->name = uniqstr_new (name);
       /* After all symbol type declarations have been parsed, packgram invokes
       syms->next = xmalloc (sizeof syms->next[0]);
       syms->next->name = uniqstr_new (name);
       /* After all symbol type declarations have been parsed, packgram invokes

-        record_merge_function_type to set the type.  */
+         record_merge_function_type to set the type.  */

       syms->next->type = NULL;
       syms->next->next = NULL;
       merge_functions = head.next;
       syms->next->type = NULL;
       syms->next->next = NULL;
       merge_functions = head.next;


@@ -130,17 +129,17 @@ record_merge_function_type (int merger, uniqstr type, location declaration_loc)
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {
       complain_at (declaration_loc,
   if (merge_function->type != NULL && !UNIQSTR_EQ (merge_function->type, type))
     {
       complain_at (declaration_loc,

-                  _("result type clash on merge function `%s': <%s> != <%s>"),
-                  merge_function->name, type, merge_function->type);
+                   _("result type clash on merge function %s: <%s> != <%s>"),
+                   quote (merge_function->name), type, merge_function->type);

       complain_at (merge_function->type_declaration_location,
       complain_at (merge_function->type_declaration_location,

-                  _("previous declaration"));
+                   _("previous declaration"));

     }
   merge_function->type = uniqstr_new (type);
   merge_function->type_declaration_location = declaration_loc;
 }
 
 /*--------------------------------------.
     }
   merge_function->type = uniqstr_new (type);
   merge_function->type_declaration_location = declaration_loc;
 }
 
 /*--------------------------------------.

-| Free all merge-function definitions. |
+| Free all merge-function definitions.  |

 `--------------------------------------*/
 
 void
 `--------------------------------------*/
 
 void


@@ -199,8 +198,8 @@ assign_named_ref (symbol_list *p, named_ref *name)
   if (name->id == sym->tag)
     {
       warn_at (name->loc,
   if (name->id == sym->tag)
     {
       warn_at (name->loc,

-              _("duplicated symbol name for %s ignored"),
-              quote (sym->tag));
+               _("duplicated symbol name for %s ignored"),
+               quote (sym->tag));

       named_ref_free (name);
     }
   else
       named_ref_free (name);
     }
   else


@@ -221,7 +220,7 @@ static symbol_list *previous_rule_end = NULL;
 
 void
 grammar_current_rule_begin (symbol *lhs, location loc,
 
 void
 grammar_current_rule_begin (symbol *lhs, location loc,

-                           named_ref *lhs_name)
+                            named_ref *lhs_name)

 {
   symbol_list* p;
 
 {
   symbol_list* p;
 


@@ -231,7 +230,7 @@ grammar_current_rule_begin (symbol *lhs, location loc,
 
   p = grammar_symbol_append (lhs, loc);
   if (lhs_name)
 
   p = grammar_symbol_append (lhs, loc);
   if (lhs_name)

-    assign_named_ref(p, lhs_name);
+    assign_named_ref (p, named_ref_copy (lhs_name));

 
   current_rule = grammar_end;
 
 
   current_rule = grammar_end;
 


@@ -250,22 +249,25 @@ grammar_current_rule_begin (symbol *lhs, location loc,
 /*----------------------------------------------------------------------.
 | A symbol should be used if either:                                    |
 |   1. It has a destructor.                                             |
 /*----------------------------------------------------------------------.
 | A symbol should be used if either:                                    |
 |   1. It has a destructor.                                             |

-|   2. --warnings=midrule-values and the symbol is a mid-rule symbol    |
-|      (i.e., the generated LHS replacing a mid-rule action) that was   |
-|      assigned to or used, as in "exp: { $$ = 1; } { $$ = $1; }".      |
+|   2. The symbol is a mid-rule symbol (i.e., the generated LHS         |
+|      replacing a mid-rule action) that was assigned to or used, as in |
+|      "exp: { $$ = 1; } { $$ = $1; }".                                 |

 `----------------------------------------------------------------------*/
 
 static bool
 `----------------------------------------------------------------------*/
 
 static bool

-symbol_should_be_used (symbol_list const *s)
+symbol_should_be_used (symbol_list const *s, bool *midrule_warning)

 {
   if (symbol_destructor_get (s->content.sym)->code)
     return true;
 {
   if (symbol_destructor_get (s->content.sym)->code)
     return true;

-  if (warnings_flag & warnings_midrule_values)
-    return ((s->midrule && s->midrule->action_props.is_value_used)
-           || (s->midrule_parent_rule
-               && symbol_list_n_get (s->midrule_parent_rule,
-                                     s->midrule_parent_rhs_index)
-                     ->action_props.is_value_used));
+  if ((s->midrule && s->midrule->action_props.is_value_used)
+      || (s->midrule_parent_rule
+          && symbol_list_n_get (s->midrule_parent_rule,
+                                s->midrule_parent_rhs_index)
+               ->action_props.is_value_used))
+    {
+      *midrule_warning = true;
+      return true;
+    }

   return false;
 }
 
   return false;
 }
 


@@ -289,19 +291,19 @@ grammar_rule_check (const symbol_list *r)
       symbol *first_rhs = r->next->content.sym;
       /* If $$ is being set in default way, report if any type mismatch.  */
       if (first_rhs)
       symbol *first_rhs = r->next->content.sym;
       /* If $$ is being set in default way, report if any type mismatch.  */
       if (first_rhs)

-       {
-         char const *lhs_type = r->content.sym->type_name;
-         const char *rhs_type =
-           first_rhs->type_name ? first_rhs->type_name : "";
-         if (!UNIQSTR_EQ (lhs_type, rhs_type))
-           warn_at (r->location,
-                    _("type clash on default action: <%s> != <%s>"),
-                    lhs_type, rhs_type);
-       }
+        {
+          char const *lhs_type = r->content.sym->type_name;
+          const char *rhs_type =
+            first_rhs->type_name ? first_rhs->type_name : "";
+          if (!UNIQSTR_EQ (lhs_type, rhs_type))
+            warn_at (r->location,
+                     _("type clash on default action: <%s> != <%s>"),
+                     lhs_type, rhs_type);
+        }

       /* Warn if there is no default for $$ but we need one.  */
       else
       /* Warn if there is no default for $$ but we need one.  */
       else

-       warn_at (r->location,
-                _("empty rule for typed nonterminal, and no action"));
+        warn_at (r->location,
+                 _("empty rule for typed nonterminal, and no action"));

     }
 
   /* Check that symbol values that should be used are in fact used.  */
     }
 
   /* Check that symbol values that should be used are in fact used.  */


@@ -309,16 +311,21 @@ grammar_rule_check (const symbol_list *r)
     symbol_list const *l = r;
     int n = 0;
     for (; l && l->content.sym; l = l->next, ++n)
     symbol_list const *l = r;
     int n = 0;
     for (; l && l->content.sym; l = l->next, ++n)

-      if (! (l->action_props.is_value_used
-            || !symbol_should_be_used (l)
-            /* The default action, $$ = $1, `uses' both.  */
-            || (!r->action_props.code && (n == 0 || n == 1))))
-       {
-         if (n)
-           warn_at (r->location, _("unused value: $%d"), n);
-         else
-           warn_at (r->location, _("unset value: $$"));
-       }
+      {
+        bool midrule_warning = false;
+        if (!l->action_props.is_value_used
+            && symbol_should_be_used (l, &midrule_warning)
+            /* The default action, $$ = $1, `uses' both.  */
+            && (r->action_props.code || (n != 0 && n != 1)))
+          {
+            void (*warn_at_ptr)(location, char const*, ...) =
+              midrule_warning ? midrule_value_at : warn_at;
+            if (n)
+              warn_at_ptr (r->location, _("unused value: $%d"), n);
+            else
+              warn_at_ptr (r->location, _("unset value: $$"));
+          }
+      }

   }
 
   /* See comments in grammar_current_rule_prec_set for how POSIX
   }
 
   /* See comments in grammar_current_rule_prec_set for how POSIX


@@ -378,7 +385,7 @@ grammar_midrule_action (void)
                                current_rule->action_props.code,
                                current_rule->action_props.location,
                                midrule, 0,
                                current_rule->action_props.code,
                                current_rule->action_props.location,
                                midrule, 0,

-                              current_rule->action_props.is_predicate);
+                               current_rule->action_props.is_predicate);

   code_props_none_init (&current_rule->action_props);
 
   if (previous_rule_end)
   code_props_none_init (&current_rule->action_props);
 
   if (previous_rule_end)


@@ -455,7 +462,7 @@ grammar_current_rule_merge_set (uniqstr name, location loc)
 
 void
 grammar_current_rule_symbol_append (symbol *sym, location loc,
 
 void
 grammar_current_rule_symbol_append (symbol *sym, location loc,

-                                   named_ref *name)
+                                    named_ref *name)

 {
   symbol_list *p;
   if (current_rule->action_props.code)
 {
   symbol_list *p;
   if (current_rule->action_props.code)


@@ -469,7 +476,7 @@ grammar_current_rule_symbol_append (symbol *sym, location loc,
 
 void
 grammar_current_rule_action_append (const char *action, location loc,
 
 void
 grammar_current_rule_action_append (const char *action, location loc,

-                                   named_ref *name, bool is_predicate)
+                                    named_ref *name, bool is_predicate)

 {
   if (current_rule->action_props.code)
     grammar_midrule_action ();
 {
   if (current_rule->action_props.code)
     grammar_midrule_action ();


@@ -504,7 +511,7 @@ packgram (void)
       int rule_length = 0;
       symbol *ruleprec = p->ruleprec;
       record_merge_function_type (p->merger, p->content.sym->type_name,
       int rule_length = 0;
       symbol *ruleprec = p->ruleprec;
       record_merge_function_type (p->merger, p->content.sym->type_name,

-                                 p->merger_declaration_location);
+                                  p->merger_declaration_location);

       rules[ruleno].user_number = ruleno;
       rules[ruleno].number = ruleno;
       rules[ruleno].lhs = p->content.sym;
       rules[ruleno].user_number = ruleno;
       rules[ruleno].number = ruleno;
       rules[ruleno].lhs = p->content.sym;


@@ -520,47 +527,47 @@ packgram (void)
       rules[ruleno].is_predicate = p->action_props.is_predicate;
 
       /* If the midrule's $$ is set or its $n is used, remove the `$' from the
       rules[ruleno].is_predicate = p->action_props.is_predicate;
 
       /* If the midrule's $$ is set or its $n is used, remove the `$' from the

-        symbol name so that it's a user-defined symbol so that the default
-        %destructor and %printer apply.  */
+         symbol name so that it's a user-defined symbol so that the default
+         %destructor and %printer apply.  */

       if (p->midrule_parent_rule
           && (p->action_props.is_value_used
       if (p->midrule_parent_rule
           && (p->action_props.is_value_used

-             || symbol_list_n_get (p->midrule_parent_rule,
-                                   p->midrule_parent_rhs_index)
+              || symbol_list_n_get (p->midrule_parent_rule,
+                                    p->midrule_parent_rhs_index)

                    ->action_props.is_value_used))
                    ->action_props.is_value_used))

-       p->content.sym->tag += 1;
+        p->content.sym->tag += 1;

 
       /* Don't check the generated rule 0.  It has no action, so some rhs
 
       /* Don't check the generated rule 0.  It has no action, so some rhs

-        symbols may appear unused, but the parsing algorithm ensures that
-        %destructor's are invoked appropriately.  */
+         symbols may appear unused, but the parsing algorithm ensures that
+         %destructor's are invoked appropriately.  */

       if (p != grammar)
       if (p != grammar)

-       grammar_rule_check (p);
+        grammar_rule_check (p);

 
       for (p = p->next; p && p->content.sym; p = p->next)
 
       for (p = p->next; p && p->content.sym; p = p->next)

-       {
-         ++rule_length;
+        {
+          ++rule_length;

 
 

-         /* Don't allow rule_length == INT_MAX, since that might
-            cause confusion with strtol if INT_MAX == LONG_MAX.  */
-         if (rule_length == INT_MAX)
-             fatal_at (rules[ruleno].location, _("rule is too long"));
+          /* Don't allow rule_length == INT_MAX, since that might
+             cause confusion with strtol if INT_MAX == LONG_MAX.  */
+          if (rule_length == INT_MAX)
+              fatal_at (rules[ruleno].location, _("rule is too long"));

 
 

-         /* item_number = symbol_number.
-            But the former needs to contain more: negative rule numbers. */
-         ritem[itemno++] =
+          /* item_number = symbol_number.
+             But the former needs to contain more: negative rule numbers. */
+          ritem[itemno++] =

             symbol_number_as_item_number (p->content.sym->number);
             symbol_number_as_item_number (p->content.sym->number);

-         /* A rule gets by default the precedence and associativity
-            of its last token.  */
-         if (p->content.sym->class == token_sym && default_prec)
-           rules[ruleno].prec = p->content.sym;
-       }
+          /* A rule gets by default the precedence and associativity
+             of its last token.  */
+          if (p->content.sym->class == token_sym && default_prec)
+            rules[ruleno].prec = p->content.sym;
+        }

 
       /* If this rule has a %prec,
          the specified symbol's precedence replaces the default.  */
       if (ruleprec)
 
       /* If this rule has a %prec,
          the specified symbol's precedence replaces the default.  */
       if (ruleprec)

-       {
-         rules[ruleno].precsym = ruleprec;
-         rules[ruleno].prec = ruleprec;
-       }
+        {
+          rules[ruleno].precsym = ruleprec;
+          rules[ruleno].prec = ruleprec;
+        }

       /* An item ends by the rule number (negated).  */
       ritem[itemno++] = rule_number_as_item_number (ruleno);
       aver (itemno < ITEM_NUMBER_MAX);
       /* An item ends by the rule number (negated).  */
       ritem[itemno++] = rule_number_as_item_number (ruleno);
       aver (itemno < ITEM_NUMBER_MAX);


@@ -568,7 +575,7 @@ packgram (void)
       aver (ruleno < RULE_NUMBER_MAX);
 
       if (p)
       aver (ruleno < RULE_NUMBER_MAX);
 
       if (p)

-       p = p->next;
+        p = p->next;

     }
 
   aver (itemno == nritems);
     }
 
   aver (itemno == nritems);


@@ -631,8 +638,8 @@ prepare_percent_define_front_end_variables (void)
        default.  */
     muscle_percent_define_default ("lr.type", "lalr");
     lr_type = muscle_percent_define_get ("lr.type");
        default.  */
     muscle_percent_define_default ("lr.type", "lalr");
     lr_type = muscle_percent_define_get ("lr.type");

-    if (0 != strcmp (lr_type, "canonical-lr"))
-      muscle_percent_define_default ("lr.default-reductions", "all");
+    if (STRNEQ (lr_type, "canonical-lr"))
+      muscle_percent_define_default ("lr.default-reductions", "most");

     else
       muscle_percent_define_default ("lr.default-reductions", "accepting");
     free (lr_type);
     else
       muscle_percent_define_default ("lr.default-reductions", "accepting");
     free (lr_type);


@@ -642,7 +649,7 @@ prepare_percent_define_front_end_variables (void)
   {
     static char const * const values[] = {
       "lr.type", "lalr", "ielr", "canonical-lr", NULL,
   {
     static char const * const values[] = {
       "lr.type", "lalr", "ielr", "canonical-lr", NULL,

-      "lr.default-reductions", "all", "consistent", "accepting", NULL,
+      "lr.default-reductions", "most", "consistent", "accepting", NULL,

       NULL
     };
     muscle_percent_define_check_values (values);
       NULL
     };
     muscle_percent_define_check_values (values);


@@ -652,7 +659,7 @@ prepare_percent_define_front_end_variables (void)
 
 /*-------------------------------------------------------------.
 | Check the grammar that has just been read, and convert it to |
 
 /*-------------------------------------------------------------.
 | Check the grammar that has just been read, and convert it to |

-| internal form.                                              |
+| internal form.                                               |

 `-------------------------------------------------------------*/
 
 static void
 `-------------------------------------------------------------*/
 
 static void