X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.y;h=e649dbc5ffd4e83f5990cafa98c6c06ba2e5bdf8;hb=021db424163d574093ff658e9606a6f31942189d;hp=191d587b66477be93fe0e1ad2baafd0bf903f77d;hpb=035e2bcc0535c60f40214acc38bb076a74774dd2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perly.y b/perly.y
index 191d587..e649dbc 100644
--- a/perly.y
+++ b/perly.y
@@ -79,7 +79,7 @@
 %token <i_tkval> LOCAL MY MYSUB REQUIRE
 %token <i_tkval> COLONATTR
 
-%type <ival> prog progstart remember mremember savescope
+%type <ival> prog progstart remember mremember
 %type <ival>  startsub startanonsub startformsub
 /* FIXME for MAD - are these two ival? */
 %type <ival> mydefsv mintro
@@ -175,9 +175,6 @@ mremember:	/* NULL */	/* start a partial lexical scope */
 			{ $$ = block_start(FALSE); }
 	;
 
-savescope:	/* NULL */	/* remember stack pos in case of error */
-		{ $$ = PL_savestack_ix; }
-
 /* A collection of "lines" in the program */
 lineseq	:	/* NULL */
 			{ $$ = Nullop; }
@@ -188,12 +185,13 @@ lineseq	:	/* NULL */
 			    	    (LISTOP*)$1, (LISTOP*)$2),
 				$1);
 			}
-	|	lineseq savescope line
-			{   LEAVE_SCOPE($2);
-			    $$ = append_list(OP_LINESEQ,
-				(LISTOP*)$1, (LISTOP*)$3);
+	|	lineseq line
+			{   $$ = append_list(OP_LINESEQ,
+				(LISTOP*)$1, (LISTOP*)$2);
 			    PL_pad_reset_pending = TRUE;
-			    if ($1 && $3) PL_hints |= HINT_BLOCK_SCOPE; }
+			    if ($1 && $2)
+				PL_hints |= HINT_BLOCK_SCOPE;
+			}
 	;
 
 /* A "line" in the program */