shithub: mc

Info  •  Files  •  Log  •  Branches

rename 'body' to 'blkbody' -- there are lots of possible bodies.

--- a/parse/gram.y

+++ b/parse/gram.y

@@ -137,7 +137,7 @@

 %type <node> pat unionpat match

 %type <node> castexpr

 %type <ucon> unionelt

-%type <node> body

+%type <node> blkbody

 %type <nodelist> arglist argdefs params matches

 %type <nodelist> structbody seqbody tupbody tuprest

@@ -587,9 +587,9 @@

         | Tboollit      {$$ = mkbool($1->line, !strcmp($1->str, "true"));}

         ;

-funclit : Tobrace params Tendln body Tcbrace

+funclit : Tobrace params Tendln blkbody Tcbrace

             {$$ = mkfunc($1->line, $2.nl, $2.nn, mktyvar($3->line), $4);}

-        | Tobrace params Tret type Tendln body Tcbrace

+        | Tobrace params Tret type Tendln blkbody Tcbrace

             {$$ = mkfunc($1->line, $2.nl, $2.nn, $4, $6);}

         ;

@@ -645,11 +645,11 @@

             {$$ = mkloopstmt($1->line, NULL, $2, NULL, $3);}

         ;

-ifstmt  : Tif exprln body elifs

+ifstmt  : Tif exprln blkbody elifs

             {$$ = mkifstmt($1->line, $2, $3, $4);}

         ;

-elifs   : Telif exprln body elifs

+elifs   : Telif exprln blkbody elifs

             {$$ = mkifstmt($1->line, $2, $3, $4);}

         | Telse block

             {$$ = $2;}

@@ -686,16 +686,16 @@

             {$$ = mkexpr($1->line, Oucon, mkname($2->line, $2->str), NULL);}

         ;

-block   : body Tendblk

+block   : blkbody Tendblk

         ;

-body    : stmt

+blkbody : stmt

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

              if ($1)

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

              if ($1 && $1->type == Ndecl)

                 putdcl($$->block.scope, $1);}

-        | body Tendln stmt

+        | blkbody Tendln stmt

             {if ($3)

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

              if ($3 && $3->type == Ndecl)