(reduce_grammar): Remove unnecessary cast to bool.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 8b0e0359bf64372be3a140849a92b7b2cb1085aa..0e0a8c21bebecb0588e8b20fdd628f00f0ea7452 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -1,7 +1,7 @@
 /* Input parser for Bison
 
 /* Input parser for Bison
 

-   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 1998, 2000, 2001, 2002, 2003,
+   2005 Free Software Foundation, Inc.

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


@@ -17,9 +17,10 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 

+#include <config.h>

 #include "system.h"
 
 #include <quotearg.h>
 #include "system.h"
 
 #include <quotearg.h>


@@ -36,25 +37,28 @@
 #include "symtab.h"
 
 static symbol_list *grammar = NULL;
 #include "symtab.h"
 
 static symbol_list *grammar = NULL;

-static int start_flag = 0;
+static bool start_flag = false;

 merger_list *merge_functions;
 
 merger_list *merge_functions;
 

-/* Nonzero if %union has been seen.  */
-int typed = 0;
+/* Was %union seen?  */
+bool typed = false;
+
+/* Should rules have a default precedence?  */
+bool default_prec = true;

 \f
 /*-----------------------.
 | Set the start symbol.  |
 `-----------------------*/
 
 void
 \f
 /*-----------------------.
 | Set the start symbol.  |
 `-----------------------*/
 
 void

-grammar_start_symbol_set (symbol *s, location loc)
+grammar_start_symbol_set (symbol *sym, location loc)

 {
   if (start_flag)
     complain_at (loc, _("multiple %s declarations"), "%start");
   else
     {
 {
   if (start_flag)
     complain_at (loc, _("multiple %s declarations"), "%start");
   else
     {

-      start_flag = 1;
-      startsymbol = s;
+      start_flag = true;
+      startsymbol = sym;

       startsymbol_location = loc;
     }
 }
       startsymbol_location = loc;
     }
 }


@@ -71,36 +75,13 @@ prologue_augment (const char *prologue, location loc)
   struct obstack *oout =
     !typed ? &pre_prologue_obstack : &post_prologue_obstack;
 
   struct obstack *oout =
     !typed ? &pre_prologue_obstack : &post_prologue_obstack;
 

-  obstack_fgrow1 (oout, "]b4_syncline([[%d]], [[", loc.start.line);
+  obstack_fgrow1 (oout, "]b4_syncline(%d, [[", loc.start.line);

   MUSCLE_OBSTACK_SGROW (oout,
                        quotearg_style (c_quoting_style, loc.start.file));
   obstack_sgrow (oout, "]])[\n");
   obstack_sgrow (oout, prologue);
 }
 
   MUSCLE_OBSTACK_SGROW (oout,
                        quotearg_style (c_quoting_style, loc.start.file));
   obstack_sgrow (oout, "]])[\n");
   obstack_sgrow (oout, prologue);
 }
 

-
-
-
-/*----------------------.
-| Handle the epilogue.  |
-`----------------------*/
-
-void
-epilogue_augment (const char *epilogue, location loc)
-{
-  char *extension = NULL;
-  obstack_fgrow1 (&muscle_obstack, "]b4_syncline([[%d]], [[", loc.start.line);
-  MUSCLE_OBSTACK_SGROW (&muscle_obstack,
-                       quotearg_style (c_quoting_style, loc.start.file));
-  obstack_sgrow (&muscle_obstack, "]])[\n");
-  obstack_sgrow (&muscle_obstack, epilogue);
-  obstack_1grow (&muscle_obstack, 0);
-  extension = obstack_finish (&muscle_obstack);
-  muscle_grow ("epilogue", extension, "");
-  obstack_free (&muscle_obstack, extension);
-}
-
-

 \f
 
 /*-------------------------------------------------------------------.
 \f
 
 /*-------------------------------------------------------------------.


@@ -123,12 +104,12 @@ get_merge_function (uniqstr name, uniqstr type, location loc)
     type = uniqstr_new ("");
 
   head.next = merge_functions;
     type = uniqstr_new ("");
 
   head.next = merge_functions;

-  for (syms = &head, n = 1; syms->next != NULL; syms = syms->next, n += 1)
+  for (syms = &head, n = 1; syms->next; syms = syms->next, n += 1)

     if (UNIQSTR_EQ (name, syms->next->name))
       break;
   if (syms->next == NULL)
     {
     if (UNIQSTR_EQ (name, syms->next->name))
       break;
   if (syms->next == NULL)
     {

-      MALLOC (syms->next, 1);
+      syms->next = xmalloc (sizeof syms->next[0]);

       syms->next->name = uniqstr_new (name);
       syms->next->type = uniqstr_new (type);
       syms->next->next = NULL;
       syms->next->name = uniqstr_new (name);
       syms->next->type = uniqstr_new (type);
       syms->next->next = NULL;


@@ -147,11 +128,8 @@ get_merge_function (uniqstr name, uniqstr type, location loc)
 void
 free_merger_functions (void)
 {
 void
 free_merger_functions (void)
 {

-  merger_list *L0;
-  if (! glr_parser)
-    return;
-  L0 = merge_functions;
-  while (L0 != NULL)
+  merger_list *L0 = merge_functions;
+  while (L0)

     {
       merger_list *L1 = L0->next;
       free (L0);
     {
       merger_list *L1 = L0->next;
       free (L0);


@@ -169,20 +147,13 @@ free_merger_functions (void)
 |                                                                    |
 | All actions are copied out, labelled by the rule number they apply |
 | to.                                                                |
 |                                                                    |
 | All actions are copied out, labelled by the rule number they apply |
 | to.                                                                |

-|                                                                    |
-| Bison used to allow some %directives in the rules sections, but    |
-| this is no longer consider appropriate: (i) the documented grammar |
-| doesn't claim it, (ii), it would promote bad style, (iii), error   |
-| recovery for %directives consists in skipping the junk until a `%' |
-| is seen and helrp synchronizing.  This scheme is definitely wrong  |
-| in the rules section.                                              |

 `-------------------------------------------------------------------*/
 
 /* The (currently) last symbol of GRAMMAR. */
 `-------------------------------------------------------------------*/
 
 /* The (currently) last symbol of GRAMMAR. */

-symbol_list *grammar_end = NULL;
+static symbol_list *grammar_end = NULL;

 
 /* Append SYM to the grammar.  */
 
 /* Append SYM to the grammar.  */

-void
+static void

 grammar_symbol_append (symbol *sym, location loc)
 {
   symbol_list *p = symbol_list_new (sym, loc);
 grammar_symbol_append (symbol *sym, location loc)
 {
   symbol_list *p = symbol_list_new (sym, loc);


@@ -193,13 +164,18 @@ grammar_symbol_append (symbol *sym, location loc)
     grammar = p;
 
   grammar_end = p;
     grammar = p;
 
   grammar_end = p;

+
+  /* A null SYM stands for an end of rule; it is not an actual
+     part of it.  */
+  if (sym)
+    ++nritems;

 }
 
 /* The rule currently being defined, and the previous rule.
    CURRENT_RULE points to the first LHS of the current rule, while
    PREVIOUS_RULE_END points to the *end* of the previous rule (NULL).  */
 symbol_list *current_rule = NULL;
 }
 
 /* The rule currently being defined, and the previous rule.
    CURRENT_RULE points to the first LHS of the current rule, while
    PREVIOUS_RULE_END points to the *end* of the previous rule (NULL).  */
 symbol_list *current_rule = NULL;

-symbol_list *previous_rule_end = NULL;
+static symbol_list *previous_rule_end = NULL;

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


@@ -207,25 +183,22 @@ symbol_list *previous_rule_end = NULL;
 `----------------------------------------------*/
 
 void
 `----------------------------------------------*/
 
 void

-grammar_rule_begin (symbol *lhs, location loc)
+grammar_current_rule_begin (symbol *lhs, location loc)

 {
   if (!start_flag)
     {
       startsymbol = lhs;
       startsymbol_location = loc;
 {
   if (!start_flag)
     {
       startsymbol = lhs;
       startsymbol_location = loc;

-      start_flag = 1;
+      start_flag = true;

     }
 
   /* Start a new rule and record its lhs.  */
   ++nrules;
     }
 
   /* Start a new rule and record its lhs.  */
   ++nrules;

-  ++nritems;
-

   previous_rule_end = grammar_end;
   grammar_symbol_append (lhs, loc);
   current_rule = grammar_end;
 
   /* Mark the rule's lhs as a nonterminal if not already so.  */
   previous_rule_end = grammar_end;
   grammar_symbol_append (lhs, loc);
   current_rule = grammar_end;
 
   /* Mark the rule's lhs as a nonterminal if not already so.  */

-

   if (lhs->class == unknown_sym)
     {
       lhs->class = nterm_sym;
   if (lhs->class == unknown_sym)
     {
       lhs->class = nterm_sym;


@@ -236,39 +209,58 @@ grammar_rule_begin (symbol *lhs, location loc)
     complain_at (loc, _("rule given for %s, which is a token"), lhs->tag);
 }
 
     complain_at (loc, _("rule given for %s, which is a token"), lhs->tag);
 }
 

-/* Check that the last rule (CURRENT_RULE) is properly defined.  For
-   instance, there should be no type clash on the default action.  */
+
+/*----------------------------------------------------------------.
+| Check that the rule R is properly defined.  For instance, there |
+| should be no type clash on the default action.                  |
+`----------------------------------------------------------------*/

 
 static void
 
 static void

-grammar_current_rule_check (void)
+grammar_rule_check (const symbol_list *r)

 {
 {

-  symbol *lhs = current_rule->sym;
-  char const *lhs_type = lhs->type_name;
-  symbol *first_rhs = current_rule->next->sym;
+  /* Type check.

 
 

-  /* If there is an action, then there is nothing we can do: the user
-     is allowed to shoot herself in the foot.  */
-  if (current_rule->action)
-    return;
+     If there is an action, then there is nothing we can do: the user
+     is allowed to shoot herself in the foot.

 
 

-  /* Don't worry about the default action if $$ is untyped, since $$'s
+     Don't worry about the default action if $$ is untyped, since $$'s

      value can't be used.  */
      value can't be used.  */

-  if (! lhs_type)
-    return;
-
-  /* If $$ is being set in default way, report if any type mismatch.  */
-  if (first_rhs)
+  if (!r->action && r->sym->type_name)

     {
     {

-      const char *rhs_type = first_rhs->type_name ? first_rhs->type_name : "";
-      if (!UNIQSTR_EQ (lhs_type, rhs_type))
-       warn_at (current_rule->location,
-                _("type clash on default action: <%s> != <%s>"),
-                lhs_type, rhs_type);
+      symbol *first_rhs = r->next->sym;
+      /* If $$ is being set in default way, report if any type mismatch.  */
+      if (first_rhs)
+       {
+         char const *lhs_type = r->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_at (r->location,
+                _("empty rule for typed nonterminal, and no action"));

     }
     }

-  /* Warn if there is no default for $$ but we need one.  */
-  else
-    warn_at (current_rule->location,
-            _("empty rule for typed nonterminal, and no action"));
+
+  /* Check that typed symbol values are used.  */
+  {
+    symbol_list const *l = r;
+    int n = 0;
+    for (; l && l->sym; l = l->next, ++n)
+      if (! (l->used
+            || !l->sym->type_name
+            /* The default action, $$ = $1, `uses' both.  */
+            || (!r->action && (n == 0 || n == 1))))
+       {
+         if (n)
+           warn_at (r->location, _("unused value: $%d"), n);
+         else
+           warn_at (r->location, _("unset value: $$"));
+       }
+  }

 }
 
 
 }
 
 


@@ -277,12 +269,12 @@ grammar_current_rule_check (void)
 `-------------------------------------*/
 
 void
 `-------------------------------------*/
 
 void

-grammar_rule_end (location loc)
+grammar_current_rule_end (location loc)

 {
   /* Put an empty link in the list to mark the end of this rule  */
   grammar_symbol_append (NULL, grammar_end->location);
   current_rule->location = loc;
 {
   /* Put an empty link in the list to mark the end of this rule  */
   grammar_symbol_append (NULL, grammar_end->location);
   current_rule->location = loc;

-  grammar_current_rule_check ();
+  grammar_rule_check (current_rule);

 }
 
 
 }
 
 


@@ -293,7 +285,7 @@ grammar_rule_end (location loc)
 | rule.                                                              |
 `-------------------------------------------------------------------*/
 
 | rule.                                                              |
 `-------------------------------------------------------------------*/
 

-void
+static void

 grammar_midrule_action (void)
 {
   /* Since the action was written out with this rule's number, we must
 grammar_midrule_action (void)
 {
   /* Since the action was written out with this rule's number, we must


@@ -378,7 +370,6 @@ grammar_current_rule_symbol_append (symbol *sym, location loc)
 {
   if (current_rule->action)
     grammar_midrule_action ();
 {
   if (current_rule->action)
     grammar_midrule_action ();

-  ++nritems;

   grammar_symbol_append (sym, loc);
 }
 
   grammar_symbol_append (sym, loc);
 }
 


@@ -407,8 +398,8 @@ packgram (void)
   rule_number ruleno = 0;
   symbol_list *p = grammar;
 
   rule_number ruleno = 0;
   symbol_list *p = grammar;
 

-  CALLOC (ritem, nritems);
-  CALLOC (rules, nrules);
+  ritem = xnmalloc (nritems, sizeof *ritem);
+  rules = xnmalloc (nrules, sizeof *rules);

 
   while (p)
     {
 
   while (p)
     {


@@ -417,12 +408,14 @@ packgram (void)
       rules[ruleno].number = ruleno;
       rules[ruleno].lhs = p->sym;
       rules[ruleno].rhs = ritem + itemno;
       rules[ruleno].number = ruleno;
       rules[ruleno].lhs = p->sym;
       rules[ruleno].rhs = ritem + itemno;

+      rules[ruleno].prec = NULL;
+      rules[ruleno].dprec = p->dprec;
+      rules[ruleno].merger = p->merger;
+      rules[ruleno].precsym = NULL;

       rules[ruleno].location = p->location;
       rules[ruleno].useful = true;
       rules[ruleno].action = p->action;
       rules[ruleno].action_location = p->action_location;
       rules[ruleno].location = p->location;
       rules[ruleno].useful = true;
       rules[ruleno].action = p->action;
       rules[ruleno].action_location = p->action_location;

-      rules[ruleno].dprec = p->dprec;
-      rules[ruleno].merger = p->merger;

 
       p = p->next;
       while (p && p->sym)
 
       p = p->next;
       while (p && p->sym)


@@ -432,7 +425,7 @@ packgram (void)
          ritem[itemno++] = symbol_number_as_item_number (p->sym->number);
          /* A rule gets by default the precedence and associativity
             of the last token in it.  */
          ritem[itemno++] = symbol_number_as_item_number (p->sym->number);
          /* A rule gets by default the precedence and associativity
             of the last token in it.  */

-         if (p->sym->class == token_sym)
+         if (p->sym->class == token_sym && default_prec)

            rules[ruleno].prec = p->sym;
          if (p)
            p = p->next;
            rules[ruleno].prec = p->sym;
          if (p)
            p = p->next;


@@ -492,8 +485,7 @@ reader (void)
   obstack_init (&pre_prologue_obstack);
   obstack_init (&post_prologue_obstack);
 
   obstack_init (&pre_prologue_obstack);
   obstack_init (&post_prologue_obstack);
 

-  finput = xfopen (grammar_file, "r");
-  gram_in = finput;
+  gram_in = xfopen (grammar_file, "r");

 
   gram__flex_debug = trace_flag & trace_scan;
   gram_debug = trace_flag & trace_parse;
 
   gram__flex_debug = trace_flag & trace_scan;
   gram_debug = trace_flag & trace_parse;


@@ -541,7 +533,7 @@ reader (void)
   if (! (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars))
     abort ();
 
   if (! (nsyms <= SYMBOL_NUMBER_MAXIMUM && nsyms == ntokens + nvars))
     abort ();
 

-  xfclose (finput);
+  xfclose (gram_in);

 
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */
 
   /* Assign the symbols their symbol numbers.  Write #defines for the
      token symbols into FDEFINES if requested.  */