X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.y;h=f87f5815646edf4cc291f1e8f59848d38113e676;hb=41aba5b7c932fca7d8ac17a1d4cc2e43239a475c;hp=1928b4409617ac739f7daceaf5702745a8b944cb;hpb=ecb2f33519ba533cbb8a58944ee243527071ea13;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perly.y b/perly.y
index 1928b44..f87f581 100644
--- a/perly.y
+++ b/perly.y
@@ -1,6 +1,6 @@
 /*    perly.y
  *
- *    Copyright (c) 1991-2001, Larry Wall
+ *    Copyright (c) 1991-2002, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -41,7 +41,7 @@ struct ysv {
     YYSTYPE oldyylval;
 };
 
-static void yydestruct(pTHXo_ void *ptr);
+static void yydestruct(pTHX_ void *ptr);
 
 %}
 
@@ -134,7 +134,7 @@ prog	:	progstart
 /* An ordinary block */
 block	:	'{' remember lineseq '}'
 			{ if (PL_copline > (line_t)$1)
-			      PL_copline = $1;
+			      PL_copline = (line_t)$1;
 			  $$ = block_end($2, $3); }
 	;
 
@@ -154,7 +154,7 @@ progstart:
 
 mblock	:	'{' mremember lineseq '}'
 			{ if (PL_copline > (line_t)$1)
-			      PL_copline = $1;
+			      PL_copline = (line_t)$1;
 			  $$ = block_end($2, $3); }
 	;
 
@@ -206,7 +206,7 @@ sideff	:	error
 	|	expr UNTIL iexpr
 			{ $$ = newLOOPOP(OPf_PARENS, 1, $3, $1);}
 	|	expr FOR expr
-			{ $$ = newFOROP(0, Nullch, $2,
+			{ $$ = newFOROP(0, Nullch, (line_t)$2,
 					Nullop, $3, $1, Nullop); }
 	;
 
@@ -216,18 +216,18 @@ else	:	/* NULL */
 	|	ELSE mblock
 			{ ($2)->op_flags |= OPf_PARENS; $$ = scope($2); }
 	|	ELSIF '(' mexpr ')' mblock else
-			{ PL_copline = $1;
+			{ PL_copline = (line_t)$1;
 			    $$ = newCONDOP(0, $3, scope($5), $6);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 	;
 
 /* Real conditional expressions */
 cond	:	IF '(' remember mexpr ')' mblock else
-			{ PL_copline = $1;
+			{ PL_copline = (line_t)$1;
 			    $$ = block_end($3,
 				   newCONDOP(0, $4, scope($6), $7)); }
 	|	UNLESS '(' remember miexpr ')' mblock else
-			{ PL_copline = $1;
+			{ PL_copline = (line_t)$1;
 			    $$ = block_end($3,
 				   newCONDOP(0, $4, scope($6), $7)); }
 	;
@@ -241,31 +241,31 @@ cont	:	/* NULL */
 
 /* Loops: while, until, for, and a bare block */
 loop	:	label WHILE '(' remember mtexpr ')' mblock cont
-			{ PL_copline = $2;
+			{ PL_copline = (line_t)$2;
 			    $$ = block_end($4,
 				   newSTATEOP(0, $1,
 				     newWHILEOP(0, 1, (LOOP*)Nullop,
 						$2, $5, $7, $8))); }
 	|	label UNTIL '(' remember miexpr ')' mblock cont
-			{ PL_copline = $2;
+			{ PL_copline = (line_t)$2;
 			    $$ = block_end($4,
 				   newSTATEOP(0, $1,
 				     newWHILEOP(0, 1, (LOOP*)Nullop,
 						$2, $5, $7, $8))); }
 	|	label FOR MY remember my_scalar '(' mexpr ')' mblock cont
 			{ $$ = block_end($4,
-				 newFOROP(0, $1, $2, $5, $7, $9, $10)); }
+				 newFOROP(0, $1, (line_t)$2, $5, $7, $9, $10)); }
 	|	label FOR scalar '(' remember mexpr ')' mblock cont
 			{ $$ = block_end($5,
-				 newFOROP(0, $1, $2, mod($3, OP_ENTERLOOP),
+				 newFOROP(0, $1, (line_t)$2, mod($3, OP_ENTERLOOP),
 					  $6, $8, $9)); }
 	|	label FOR '(' remember mexpr ')' mblock cont
 			{ $$ = block_end($4,
-				 newFOROP(0, $1, $2, Nullop, $5, $7, $8)); }
+				 newFOROP(0, $1, (line_t)$2, Nullop, $5, $7, $8)); }
 	|	label FOR '(' remember mnexpr ';' mtexpr ';' mnexpr ')' mblock
 			/* basically fake up an initialize-while lineseq */
 			{ OP *forop;
-			  PL_copline = $2;
+			  PL_copline = (line_t)$2;
 			  forop = newSTATEOP(0, $1,
 					    newWHILEOP(0, 1, (LOOP*)Nullop,
 						$2, scalar($7),