X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/503de4705ff6537018ae94e9179e16636748b2a6..842c41230043ce99d4bf7b2c79aed85ce2908e89:/perly.y

diff --git a/perly.y b/perly.y
index e649dbc..edbcb19 100644
--- a/perly.y
+++ b/perly.y
@@ -1,6 +1,7 @@
 /*    perly.y
  *
  *    Copyright (c) 1991-2002, 2003, 2004, 2005, 2006 Larry Wall
+ *    Copyright (c) 2007, 2008 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -9,8 +10,12 @@
 
 /*
  * 'I see,' laughed Strider.  'I look foul and feel fair.  Is that it?
- * All that is gold does not glitter, not all those who wander are lost.'
+ *  All that is gold does not glitter, not all those who wander are lost.'
  *
+ *     [p.171 of _The Lord of the Rings_, I/x: "Strider"]
+ */
+
+/*
  * This file holds the grammar for the Perl language. If edited, you need
  * to run regen_perly.pl, which re-creates the files perly.h, perly.tab
  * and perly.act which are derived from this.
@@ -68,11 +73,12 @@
 
 %token <opval> WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF
 %token <opval> FUNC0SUB UNIOPSUB LSTOPSUB
+%token <opval> PLUGEXPR PLUGSTMT
 %token <p_tkval> LABEL
 %token <i_tkval> FORMAT SUB ANONSUB PACKAGE USE
 %token <i_tkval> WHILE UNTIL IF UNLESS ELSE ELSIF CONTINUE FOR
 %token <i_tkval> GIVEN WHEN DEFAULT
-%token <i_tkval> LOOPEX DOTDOT
+%token <i_tkval> LOOPEX DOTDOT YADAYADA
 %token <i_tkval> FUNC0 FUNC1 FUNC UNIOP LSTOP
 %token <i_tkval> RELOP EQOP MULOP ADDOP
 %token <i_tkval> DOLSHARP DO HASHBRACK NOAMP
@@ -86,7 +92,7 @@
 
 %type <opval> decl format subrout mysubrout package use peg
 
-%type <opval> block mblock lineseq line loop cond else
+%type <opval> block package_block mblock lineseq line loop cond else
 %type <opval> expr term subscripted scalar ary hsh arylen star amper sideff
 %type <opval> argexpr nexpr texpr iexpr mexpr mnexpr miexpr
 %type <opval> listexpr listexprcom indirob listop method
@@ -106,7 +112,7 @@
 %left <i_tkval> ','
 %right <i_tkval> ASSIGNOP
 %right <i_tkval> '?' ':'
-%nonassoc DOTDOT
+%nonassoc DOTDOT YADAYADA
 %left <i_tkval> OROR DORDOR
 %left <i_tkval> ANDAND
 %left <i_tkval> BITOROP
@@ -152,7 +158,7 @@ remember:	/* NULL */	/* start a full lexical scope */
 	;
 
 mydefsv:	/* NULL */	/* lexicalize $_ */
-			{ $$ = (I32) allocmy("$_"); }
+			{ $$ = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); }
 	;
 
 progstart:
@@ -177,7 +183,7 @@ mremember:	/* NULL */	/* start a partial lexical scope */
 
 /* A collection of "lines" in the program */
 lineseq	:	/* NULL */
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	lineseq decl
 			{
 			$$ = IF_MAD(
@@ -213,7 +219,7 @@ line	:	label cond
 			  else {
 			      $$ = IF_MAD(
 					newOP(OP_NULL, 0),
-					Nullop);
+					(OP*)NULL);
                               PL_parser->copline = NOLINE;
 			      TOKEN_FREE($1);
 			      TOKEN_GETMAD($2,$$,';');
@@ -236,11 +242,18 @@ line	:	label cond
 			      }
 			  })
 			}
+	|	package_block
+			{ $$ = newSTATEOP(0, NULL,
+				 newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+					    NOLINE, (OP*)NULL, $1,
+					    (OP*)NULL, 0)); }
+	|	label PLUGSTMT
+			{ $$ = newSTATEOP(0, PVAL($1), $2); }
 	;
 
 /* An expression which may have a side-effect */
 sideff	:	error
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	expr
 			{ $$ = $1; }
 	|	expr IF expr
@@ -260,22 +273,24 @@ sideff	:	error
 			  TOKEN_GETMAD($2,$$,'w');
 			}
 	|	expr FOR expr
-			{ $$ = newFOROP(0, Nullch, (line_t)IVAL($2),
-					Nullop, $3, $1, Nullop);
+			{ $$ = newFOROP(0, NULL, (line_t)IVAL($2),
+					(OP*)NULL, $3, $1, (OP*)NULL);
 			  TOKEN_GETMAD($2,((LISTOP*)$$)->op_first->op_sibling,'w');
 			}
+	|	expr WHEN expr
+			{ $$ = newWHENOP($3, scope($1)); }
 	;
 
 /* else and elsif blocks */
 else	:	/* NULL */
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	ELSE mblock
 			{ ($2)->op_flags |= OPf_PARENS; $$ = scope($2);
 			  TOKEN_GETMAD($1,$$,'o');
 			}
 	|	ELSIF '(' mexpr ')' mblock else
 			{ PL_parser->copline = (line_t)IVAL($1);
-			    $$ = newCONDOP(0, $3, scope($5), $6);
+			    $$ = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,$3), scope($5), $6);
 			    PL_hints |= HINT_BLOCK_SCOPE;
 			  TOKEN_GETMAD($1,$$,'I');
 			  TOKEN_GETMAD($2,$$,'(');
@@ -312,7 +327,7 @@ case	:	WHEN '(' remember mexpr ')' mblock
 
 /* Continue blocks */
 cont	:	/* NULL */
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	CONTINUE block
 			{ $$ = scope($2);
 			  TOKEN_GETMAD($1,$$,'o');
@@ -322,10 +337,10 @@ cont	:	/* NULL */
 /* Loops: while, until, for, and a bare block */
 loop	:	label WHILE '(' remember texpr ')' mintro mblock cont
 			{ OP *innerop;
-			  PL_parser->copline = (line_t)$2;
+			  PL_parser->copline = (line_t)IVAL($2);
 			    $$ = block_end($4,
 				   newSTATEOP(0, PVAL($1),
-				     innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
+				     innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
 						IVAL($2), $5, $8, $9, $7)));
 			  TOKEN_GETMAD($1,innerop,'L');
 			  TOKEN_GETMAD($2,innerop,'W');
@@ -335,10 +350,10 @@ loop	:	label WHILE '(' remember texpr ')' mintro mblock cont
 
 	|	label UNTIL '(' remember iexpr ')' mintro mblock cont
 			{ OP *innerop;
-			  PL_parser->copline = (line_t)$2;
+			  PL_parser->copline = (line_t)IVAL($2);
 			    $$ = block_end($4,
 				   newSTATEOP(0, PVAL($1),
-				     innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
+				     innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
 						IVAL($2), $5, $8, $9, $7)));
 			  TOKEN_GETMAD($1,innerop,'L');
 			  TOKEN_GETMAD($2,innerop,'W');
@@ -370,7 +385,7 @@ loop	:	label WHILE '(' remember texpr ')' mintro mblock cont
 			{ OP *innerop;
 			  $$ = block_end($4,
 			     innerop = newFOROP(0, PVAL($1), (line_t)IVAL($2),
-						    Nullop, $5, $7, $8));
+						    (OP*)NULL, $5, $7, $8));
 			  TOKEN_GETMAD($1,((LISTOP*)innerop)->op_first,'L');
 			  TOKEN_GETMAD($2,((LISTOP*)innerop)->op_first->op_sibling,'W');
 			  TOKEN_GETMAD($3,((LISTOP*)innerop)->op_first->op_sibling,'(');
@@ -382,7 +397,7 @@ loop	:	label WHILE '(' remember texpr ')' mintro mblock cont
 			{ OP *forop;
 			  PL_parser->copline = (line_t)IVAL($2);
 			  forop = newSTATEOP(0, PVAL($1),
-					    newWHILEOP(0, 1, (LOOP*)Nullop,
+					    newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
 						IVAL($2), scalar($7),
 						$12, $10, $9));
 #ifdef MAD
@@ -410,14 +425,14 @@ loop	:	label WHILE '(' remember texpr ')' mintro mblock cont
 			  $$ = block_end($4, forop); }
 	|	label block cont  /* a block is a loop that happens once */
 			{ $$ = newSTATEOP(0, PVAL($1),
-				 newWHILEOP(0, 1, (LOOP*)Nullop,
-					    NOLINE, Nullop, $2, $3, 0));
+				 newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+					    NOLINE, (OP*)NULL, $2, $3, 0));
 			  TOKEN_GETMAD($1,((LISTOP*)$$)->op_first,'L'); }
 	;
 
 /* Switch blocks */
 switch	:	label GIVEN '(' remember mydefsv mexpr ')' mblock
-			{ PL_parser->copline = (line_t) $2;
+			{ PL_parser->copline = (line_t) IVAL($2);
 			    $$ = block_end($4,
 				newSTATEOP(0, PVAL($1),
 				    newGIVENOP($6, scope($8),
@@ -432,7 +447,7 @@ mintro	:	/* NULL */
 
 /* Normal expression */
 nexpr	:	/* NULL */
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	sideff
 	;
 
@@ -467,10 +482,10 @@ label	:	/* empty */
 			{
 #ifdef MAD
 			  YYSTYPE tmplval;
-			  tmplval.pval = Nullch;
+			  tmplval.pval = NULL;
 			  $$ = newTOKEN(OP_NULL, tmplval, 0);
 #else
-			  $$ = Nullch;
+			  $$ = NULL;
 #endif
 			}
 	|	LABEL
@@ -501,7 +516,9 @@ peg	:	PEG
 	;
 
 format	:	FORMAT startformsub formname block
-			{ SvREFCNT_inc_simple_void(PL_compcv);
+			{
+			  CV *fmtcv = PL_compcv;
+			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
 			  $$ = newFORM($2, $3, $4);
 			  prepend_madprops($1->tk_mad, $$, 'F');
@@ -509,13 +526,17 @@ format	:	FORMAT startformsub formname block
 			  token_free($1);
 #else
 			  newFORM($2, $3, $4);
-			  $$ = Nullop;
+			  $$ = (OP*)NULL;
 #endif
+			  if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) {
+			    SvREFCNT_inc_simple_void(fmtcv);
+			    pad_add_anon((SV*)fmtcv, OP_NULL);
+			  }
 			}
 	;
 
 formname:	WORD		{ $$ = $1; }
-	|	/* NULL */	{ $$ = Nullop; }
+	|	/* NULL */	{ $$ = (OP*)NULL; }
 	;
 
 /* Unimplemented "my sub foo { }" */
@@ -526,7 +547,7 @@ mysubrout:	MYSUB startsub subname proto subattrlist subbody
 			  token_getmad($1,$$,'d');
 #else
 			  newMYSUB($2, $3, $4, $5, $6);
-			  $$ = Nullop;
+			  $$ = (OP*)NULL;
 #endif
 			}
 	;
@@ -549,7 +570,7 @@ subrout	:	SUB startsub subname proto subattrlist subbody
 			    }
 #else
 			  newATTRSUB($2, $3, $4, $5, $6);
-			  $$ = Nullop;
+			  $$ = (OP*)NULL;
 #endif
 			}
 	;
@@ -581,13 +602,13 @@ subname	:	WORD	{ const char *const name = SvPV_nolen_const(((SVOP*)$1)->op_sv);
 
 /* Subroutine prototype */
 proto	:	/* NULL */
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	THING
 	;
 
 /* Optional list of subroutine attributes */
 subattrlist:	/* NULL */
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	COLONATTR THING
 			{ $$ = $2;
 			  TOKEN_GETMAD($1,$$,':');
@@ -595,7 +616,7 @@ subattrlist:	/* NULL */
 	|	COLONATTR
 			{ $$ = IF_MAD(
 				    newOP(OP_NULL, 0),
-				    Nullop
+				    (OP*)NULL
 				);
 			  TOKEN_GETMAD($1,$$,':');
 			}
@@ -609,7 +630,7 @@ myattrlist:	COLONATTR THING
 	|	COLONATTR
 			{ $$ = IF_MAD(
 				    newOP(OP_NULL, 0),
-				    Nullop
+				    (OP*)NULL
 				);
 			  TOKEN_GETMAD($1,$$,':');
 			}
@@ -619,26 +640,55 @@ myattrlist:	COLONATTR THING
 subbody	:	block	{ $$ = $1; }
 	|	';'	{ $$ = IF_MAD(
 				    newOP(OP_NULL,0),
-				    Nullop
+				    (OP*)NULL
 				);
 			  PL_parser->expect = XSTATE;
 			  TOKEN_GETMAD($1,$$,';');
 			}
 	;
 
-package :	PACKAGE WORD ';'
+package :	PACKAGE WORD WORD ';'
 			{
 #ifdef MAD
-			  $$ = package($2);
+			  $$ = package($3);
 			  token_getmad($1,$$,'o');
-			  token_getmad($3,$$,';');
+			  if ($2)
+			      package_version($2);
+			  token_getmad($4,$$,';');
 #else
-			  package($2);
-			  $$ = Nullop;
+			  package($3);
+			  if ($2)
+			      package_version($2);
+			  $$ = (OP*)NULL;
 #endif
 			}
 	;
 
+package_block:	PACKAGE WORD WORD '{' remember
+			{
+			  int save_3_latefree = $3->op_latefree;
+			  $3->op_latefree = 1;
+			  package($3);
+			  $3->op_latefree = save_3_latefree;
+			  if ($2) {
+			      int save_2_latefree = $2->op_latefree;
+			      $2->op_latefree = 1;
+			      package_version($2);
+			      $2->op_latefree = save_2_latefree;
+			  }
+			}
+		    lineseq '}'
+			{ if (PL_parser->copline > (line_t)IVAL($4))
+			      PL_parser->copline = (line_t)IVAL($4);
+			  $$ = block_end($5, $7);
+			  TOKEN_GETMAD($4,$$,'{');
+			  TOKEN_GETMAD($8,$$,'}');
+			  op_free($3);
+			  if ($2)
+			      op_free($2);
+			}
+	;
+
 use	:	USE startsub
 			{ CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
 		    WORD WORD listexpr ';'
@@ -649,10 +699,10 @@ use	:	USE startsub
 			  token_getmad($7,$$,';');
 			  if (PL_parser->rsfp_filters &&
 				      AvFILLp(PL_parser->rsfp_filters) >= 0)
-			      append_madprops(newMADPROP('!', MAD_PV, "", 0), $$, 0);
+			      append_madprops(newMADPROP('!', MAD_NULL, NULL, 0), $$, 0);
 #else
 			  utilize(IVAL($1), $2, $4, $5, $6);
-			  $$ = Nullop;
+			  $$ = (OP*)NULL;
 #endif
 			}
 	;
@@ -750,7 +800,7 @@ listop	:	LSTOP indirob argexpr /* map {...} @args or print $fh @args */
 			}
 	|	LSTOPSUB startanonsub block /* sub f(&@);   f { foo } ... */
 			{ SvREFCNT_inc_simple_void(PL_compcv);
-			  $<opval>$ = newANONATTRSUB($2, 0, Nullop, $3); }
+			  $<opval>$ = newANONATTRSUB($2, 0, (OP*)NULL, $3); }
 		    listexpr		%prec LSTOP  /* ... @bar */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 append_elem(OP_LIST,
@@ -856,7 +906,7 @@ subscripted:    star '{' expr ';' '}'        /* *main::{something} */
 			  TOKEN_GETMAD($6,$$,']');
 			}
 	|	'(' ')' '[' expr ']'                 /* empty list slice! */
-			{ $$ = newSLICEOP(0, $4, Nullop);
+			{ $$ = newSLICEOP(0, $4, (OP*)NULL);
 			  TOKEN_GETMAD($1,$$,'(');
 			  TOKEN_GETMAD($2,$$,')');
 			  TOKEN_GETMAD($3,$$,'[');
@@ -986,7 +1036,7 @@ anonymous:	'[' expr ']'
 			  TOKEN_GETMAD($3,$$,']');
 			}
 	|	'[' ']'
-			{ $$ = newANONLIST(Nullop);
+			{ $$ = newANONLIST((OP*)NULL);
 			  TOKEN_GETMAD($1,$$,'[');
 			  TOKEN_GETMAD($2,$$,']');
 			}
@@ -997,7 +1047,7 @@ anonymous:	'[' expr ']'
 			  TOKEN_GETMAD($4,$$,'}');
 			}
 	|	HASHBRACK ';' '}'	%prec '(' /* { } (';' by tokener) */
-			{ $$ = newANONHASH(Nullop);
+			{ $$ = newANONHASH((OP*)NULL);
 			  TOKEN_GETMAD($1,$$,'{');
 			  TOKEN_GETMAD($2,$$,';');
 			  TOKEN_GETMAD($3,$$,'}');
@@ -1028,7 +1078,7 @@ termdo	:       DO term	%prec UNIOP                     /* do $filename */
 				scalar(newCVREF(
 				    (OPpENTERSUB_AMPER<<8),
 				    scalar($2)
-				)),Nullop)); dep();
+				)),(OP*)NULL)); dep();
 			  TOKEN_GETMAD($1,$$,'o');
 			  TOKEN_GETMAD($3,$$,'(');
 			  TOKEN_GETMAD($4,$$,')');
@@ -1049,7 +1099,7 @@ termdo	:       DO term	%prec UNIOP                     /* do $filename */
 	|	DO scalar '(' ')'                      /* do $subref () */
 			{ $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
-				scalar(newCVREF(0,scalar($2))), Nullop)); dep();
+				scalar(newCVREF(0,scalar($2))), (OP*)NULL)); dep();
 			  TOKEN_GETMAD($1,$$,'o');
 			  TOKEN_GETMAD($3,$$,'(');
 			  TOKEN_GETMAD($4,$$,')');
@@ -1227,6 +1277,13 @@ term	:	termbinop
 			}
 	|	WORD
 	|	listop
+	|	YADAYADA
+			{
+			  $$ = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
+				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
+			  TOKEN_GETMAD($1,$$,'X');
+			}
+	|	PLUGEXPR
 	;
 
 /* "my" declarations, with optional attributes */
@@ -1265,13 +1322,13 @@ myterm	:	'(' expr ')'
 
 /* Basic list expressions */
 listexpr:	/* NULL */ %prec PREC_LOW
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	argexpr    %prec PREC_LOW
 			{ $$ = $1; }
 	;
 
 listexprcom:	/* NULL */
-			{ $$ = Nullop; }
+			{ $$ = (OP*)NULL; }
 	|	expr
 			{ $$ = $1; }
 	|	expr ','