shithub: mc

Info  •  Files  •  Log  •  Branches

Fix grammar conflicts.

    Oops, a few typos gave us shift/reduce and reduce/reduce conflicts.
    So did empty matches. Fixed.

--- a/parse/gram.y

+++ b/parse/gram.y

@@ -384,7 +384,7 @@

         | castexpr

         ;

-castexpr: landexpr Tcast Toparen type Tcparen

+castexpr: borexpr Tcast Toparen type Tcparen

             {$$ = mkexpr($1->line, Ocast, $1, NULL);

              $$->expr.type = $4;}

         | borexpr

@@ -549,9 +549,7 @@

         ;

 blockbody

-        : /* empty */

-            {$$ = mkblock(line, mkstab());}

-        | stmt

+        : stmt

             {$$ = mkblock(line, mkstab());

              if ($1)

                 lappend(&$$->block.stmts, &$$->block.nstmts, $1);