(rules_or_grammar_declaration): Require a

semicolon after a grammar declaration, in the interest of possible
future changes to the Bison input language.
Do not allow a stray semicolon at the start of the grammar.
(rhses.1): Allow one or more semicolons after any rule, including
just before "|" as required by POSIX.

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 606ec569fc49fe53f41a35b1fc5c95fa763d7aa6..02608bb0476352b7139973e54616c30b08dbb73b 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -332,7 +332,7 @@ grammar:
    body of the grammar.  */
 rules_or_grammar_declaration:
   rules
    body of the grammar.  */
 rules_or_grammar_declaration:
   rules

-| grammar_declaration
+| grammar_declaration ";"

     {
       if (yacc_flag)
        complain_at (@$, _("POSIX forbids declarations in the grammar"));
     {
       if (yacc_flag)
        complain_at (@$, _("POSIX forbids declarations in the grammar"));


@@ -341,7 +341,6 @@ rules_or_grammar_declaration:
     {
       yyerrok;
     }
     {
       yyerrok;
     }

-| ";"

 ;
 
 rules:
 ;
 
 rules:


@@ -351,6 +350,7 @@ rules:
 rhses.1:
   rhs                { grammar_rule_end (@1); }
 | rhses.1 "|" rhs    { grammar_rule_end (@3); }
 rhses.1:
   rhs                { grammar_rule_end (@1); }
 | rhses.1 "|" rhs    { grammar_rule_end (@3); }

+| rhses.1 ";"

 ;
 
 rhs:
 ;
 
 rhs: