Use explicit %empty

4 files changed, 36 insertions, 36 deletions

diff --git a/perly.act b/perly.act
index 41ca498c61..16abe6eb6b 100644
--- a/perly.act
+++ b/perly.act
@@ -730,7 +730,7 @@ case 2:
 
   case 86:
 #line 605 "perly.y"
-                                { (yyval.opval) = NULL; }
+                        { (yyval.opval) = NULL; }
 
     break;
 
@@ -2124,6 +2124,6 @@ case 2:
     
 
 /* Generated from:
- * 8501134166a6baa08c401894156c496a30dbabab6b166ea837cd490b6db2e410 perly.y
+ * 9a5909b0af5f61f96907e330008f3cdc9dadcab1417c5bcb188cb3b9f6593c01 perly.y
  * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.h b/perly.h
index 550c5228f8..a9286314a9 100644
--- a/perly.h
+++ b/perly.h
@@ -215,6 +215,6 @@ int yyparse (void);
 
 
 /* Generated from:
- * 8501134166a6baa08c401894156c496a30dbabab6b166ea837cd490b6db2e410 perly.y
+ * 9a5909b0af5f61f96907e330008f3cdc9dadcab1417c5bcb188cb3b9f6593c01 perly.y
  * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.tab b/perly.tab
index 3c1942e55e..d615eb09d8 100644
--- a/perly.tab
+++ b/perly.tab
@@ -74,17 +74,17 @@ static const yytype_int8 yytranslate[] =
 static const yytype_int16 yyrline[] =
 {
        0,   137,   137,   136,   148,   147,   158,   157,   171,   170,
-     184,   183,   197,   196,   207,   206,   219,   227,   235,   239,
-     247,   253,   254,   264,   265,   274,   278,   282,   289,   299,
+     184,   183,   197,   196,   207,   206,   219,   227,   234,   239,
+     246,   252,   254,   263,   265,   274,   278,   282,   289,   299,
      301,   314,   311,   335,   330,   351,   359,   358,   367,   373,
      379,   384,   386,   388,   395,   403,   405,   402,   422,   427,
      434,   433,   448,   456,   462,   469,   468,   483,   487,   492,
-     500,   518,   519,   523,   527,   529,   531,   533,   535,   537,
-     539,   542,   548,   549,   554,   565,   566,   572,   578,   579,
-     584,   587,   591,   596,   600,   604,   605,   609,   615,   620,
-     625,   626,   631,   632,   637,   638,   640,   645,   647,   659,
-     660,   665,   667,   671,   691,   692,   694,   700,   765,   767,
-     773,   775,   779,   785,   786,   791,   792,   796,   800,   800,
+     500,   517,   519,   523,   527,   529,   531,   533,   535,   537,
+     539,   542,   547,   549,   554,   564,   566,   571,   577,   579,
+     583,   587,   591,   596,   600,   604,   605,   608,   614,   619,
+     625,   626,   630,   632,   636,   638,   640,   645,   647,   658,
+     660,   665,   667,   671,   690,   692,   694,   700,   765,   767,
+     773,   775,   779,   784,   786,   790,   792,   796,   800,   800,
      868,   869,   874,   885,   886,   889,   900,   902,   904,   908,
      910,   915,   919,   923,   927,   933,   938,   944,   950,   952,
      954,   957,   956,   967,   968,   972,   976,   979,   984,   989,
@@ -99,7 +99,7 @@ static const yytype_int16 yyrline[] =
     1251,  1253,  1255,  1258,  1260,  1263,  1265,  1267,  1269,  1271,
     1273,  1275,  1277,  1279,  1282,  1284,  1286,  1288,  1290,  1292,
     1296,  1299,  1298,  1311,  1312,  1313,  1317,  1319,  1321,  1326,
-    1328,  1331,  1333,  1335,  1340,  1342,  1347,  1348,  1353,  1354,
+    1328,  1331,  1333,  1335,  1340,  1342,  1346,  1348,  1352,  1354,
     1360,  1364,  1365,  1366,  1369,  1370,  1373,  1374,  1377,  1381,
     1385,  1391,  1397,  1399,  1403,  1407,  1408,  1412,  1413,  1417,
     1418,  1423,  1425,  1427,  1430
@@ -1156,6 +1156,6 @@ static const toketypes yy_type_tab[] =
 };
 
 /* Generated from:
- * 8501134166a6baa08c401894156c496a30dbabab6b166ea837cd490b6db2e410 perly.y
+ * 9a5909b0af5f61f96907e330008f3cdc9dadcab1417c5bcb188cb3b9f6593c01 perly.y
  * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.y b/perly.y
index bd65eb44de..8e3630b581 100644
--- a/perly.y
+++ b/perly.y
@@ -231,7 +231,7 @@ formblock:	PERLY_EQUAL_SIGN remember PERLY_SEMICOLON FORMRBRACK formstmtseq PERL
 			}
 	;
 
-remember:	/* NULL */	/* start a full lexical scope */
+remember:	%empty	/* start a full lexical scope */
 			{ $$ = block_start(TRUE);
 			  parser->parsed_sub = 0; }
 	;
@@ -243,13 +243,13 @@ mblock	:	PERLY_BRACE_OPEN mremember stmtseq PERLY_BRACE_CLOSE
 			}
 	;
 
-mremember:	/* NULL */	/* start a partial lexical scope */
+mremember:	%empty	/* start a partial lexical scope */
 			{ $$ = block_start(FALSE);
 			  parser->parsed_sub = 0; }
 	;
 
 /* A sequence of statements in the program */
-stmtseq	:	/* NULL */
+stmtseq	:	%empty
 			{ $$ = NULL; }
 	|	stmtseq[list] fullstmt
 			{   $$ = op_append_list(OP_LINESEQ, $list, $fullstmt);
@@ -260,7 +260,7 @@ stmtseq	:	/* NULL */
 	;
 
 /* A sequence of format lines */
-formstmtseq:	/* NULL */
+formstmtseq:	%empty
 			{ $$ = NULL; }
 	|	formstmtseq[list] formline
 			{   $$ = op_append_list(OP_LINESEQ, $list, $formline);
@@ -514,7 +514,7 @@ formline:	THING formarg
 			}
 	;
 
-formarg	:	/* NULL */
+formarg	:	%empty
 			{ $$ = NULL; }
 	|	FORMLBRACK stmtseq FORMRBRACK
 			{ $$ = op_unscope($stmtseq); }
@@ -544,7 +544,7 @@ sideff	:	error
 	;
 
 /* else and elsif blocks */
-else	:	/* NULL */
+else	:	%empty
 			{ $$ = NULL; }
 	|	ELSE mblock
 			{
@@ -561,26 +561,26 @@ else	:	/* NULL */
 	;
 
 /* Continue blocks */
-cont	:	/* NULL */
+cont	:	%empty
 			{ $$ = NULL; }
 	|	CONTINUE block
 			{ $$ = op_scope($block); }
 	;
 
 /* determine whether there are any new my declarations */
-mintro	:	/* NULL */
+mintro	:	%empty
 			{ $$ = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
 			  intro_my(); }
 
 /* Normal expression */
-nexpr	:	/* NULL */
+nexpr	:	%empty
 			{ $$ = NULL; }
 	|	sideff
 	;
 
 /* Boolean expression */
-texpr	:	/* NULL means true */
+texpr	:	%empty /* NULL means true */
 			{ YYSTYPE tmplval;
 			  (void)scan_num("1", &tmplval);
 			  $$ = tmplval.opval; }
@@ -602,21 +602,21 @@ mnexpr	:	nexpr
 	;
 
 formname:	BAREWORD	{ $$ = $BAREWORD; }
-	|	/* NULL */	{ $$ = NULL; }
+	|	%empty	{ $$ = NULL; }
 	;
 
-startsub:	/* NULL */	/* start a regular subroutine scope */
+startsub:	%empty	/* start a regular subroutine scope */
 			{ $$ = start_subparse(FALSE, 0);
 			    SAVEFREESV(PL_compcv); }
 
 	;
 
-startanonsub:	/* NULL */	/* start an anonymous subroutine scope */
+startanonsub:	%empty	/* start an anonymous subroutine scope */
 			{ $$ = start_subparse(FALSE, CVf_ANON);
 			    SAVEFREESV(PL_compcv); }
 	;
 
-startformsub:	/* NULL */	/* start a format subroutine scope */
+startformsub:	%empty	/* start a format subroutine scope */
 			{ $$ = start_subparse(TRUE, 0);
 			    SAVEFREESV(PL_compcv); }
 	;
@@ -627,13 +627,13 @@ subname	:	BAREWORD
 	;
 
 /* Subroutine prototype */
-proto	:	/* NULL */
+proto	:	%empty
 			{ $$ = NULL; }
 	|	THING
 	;
 
 /* Optional list of subroutine attributes */
-subattrlist:	/* NULL */
+subattrlist:	%empty
 			{ $$ = NULL; }
 	|	COLONATTR THING
 			{ $$ = $THING; }
@@ -655,7 +655,7 @@ myattrlist:	COLONATTR THING
  */
 
 /* the '' or 'foo' part of a '$' or '@foo' etc signature variable  */
-sigvarname:     /* NULL */
+sigvarname:     %empty
 			{ parser->in_my = 0; $$ = NULL; }
         |       PRIVATEREF
                         { parser->in_my = 0; $$ = $PRIVATEREF; }
@@ -687,7 +687,7 @@ sigslurpelem: sigslurpsigil sigvarname sigdefault/* def only to catch errors */
 	;
 
 /* default part of sub signature scalar element: i.e. '= default_expr' */
-sigdefault:	/* NULL */
+sigdefault:	%empty
 			{ $$ = NULL; }
         |       ASSIGNOP
                         { $$ = newOP(OP_NULL, 0); }
@@ -781,13 +781,13 @@ siglist:
 	;
 
 /* () or (....) */
-siglistornull:		/* NULL */
+siglistornull:		%empty
 			{ $$ = NULL; }
 	|	siglist
 			{ $$ = $siglist; }
 
 /* optional subroutine signature */
-optsubsignature:	/* NULL */
+optsubsignature:	%empty
 			{ $$ = NULL; }
 	|	subsignature
 			{ $$ = $subsignature; }
@@ -1337,19 +1337,19 @@ myterm	:	PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE
 	;
 
 /* Basic list expressions */
-optlistexpr:	/* NULL */ %prec PREC_LOW
+optlistexpr:	%empty %prec PREC_LOW
 			{ $$ = NULL; }
 	|	listexpr    %prec PREC_LOW
 			{ $$ = $listexpr; }
 	;
 
-optexpr:	/* NULL */
+optexpr:	%empty
 			{ $$ = NULL; }
 	|	expr
 			{ $$ = $expr; }
 	;
 
-optrepl:	/* NULL */
+optrepl:	%empty
 			{ $$ = NULL; }
 	|	PERLY_SLASH expr
 			{ $$ = $expr; }