* data/lalr1.cc: Reinstall the former ctor, for sake of

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 0adee6fc8c5c301632364e0485ea05186f43e7f6..1cd035cce245f06289f16db55fad9e41136eb208 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -41,6 +41,9 @@ merger_list *merge_functions;
 
 /* Has %union been seen?  */
 bool typed = false;
 
 /* Has %union been seen?  */
 bool typed = false;

+
+/* Should rules have a default precedence?  */
+bool default_prec = true;

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


@@ -409,7 +412,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;