X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.y;h=f87f5815646edf4cc291f1e8f59848d38113e676;hb=4ab32378b9b2843e98cabc7278d6f17749dac2b7;hp=6b7df9b2e84ef7dd24d15e489949d4d23358f71a;hpb=0ddaf51316ca1bab139289c51c648ec8213a8af3;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perly.y b/perly.y index 6b7df9b..f87f581 100644 --- a/perly.y +++ b/perly.y @@ -16,7 +16,7 @@ #include "EXTERN.h" #define PERL_IN_PERLY_C #include "perl.h" -#if defined(EBCDIC) || defined(VMS) +#ifdef EBCDIC #undef YYDEBUG #endif #define dep() deprecate("\"do\" to call subroutines") @@ -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),