#endif
}
-%token <ival> GRAMPROG GRAMBLOCK GRAMFULLSTMT GRAMSTMTSEQ
+%token <ival> GRAMPROG GRAMBLOCK GRAMBARESTMT GRAMFULLSTMT GRAMSTMTSEQ
%token <i_tkval> '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';'
%type <i_tkval> lpar_or_qw
-%type <ival> grammar prog progstart remember mremember
+%type <ival> grammar remember mremember
%type <ival> startsub startanonsub startformsub
/* FIXME for MAD - are these two ival? */
%type <ival> mydefsv mintro
%% /* RULES */
/* Top-level choice of what kind of thing yyparse was called to parse */
-grammar : GRAMPROG prog
- { $$ = $2; }
+grammar : GRAMPROG
+ {
+ PL_parser->expect = XSTATE;
+ }
+ remember stmtseq
+ {
+ newPROG(block_end($3,$4));
+ $$ = 0;
+ }
| GRAMBLOCK
{
parser->expect = XBLOCK;
yyunlex();
parser->yychar = YYEOF;
}
+ | GRAMBARESTMT
+ {
+ parser->expect = XSTATE;
+ }
+ barestmt
+ {
+ PL_pad_reset_pending = TRUE;
+ PL_eval_root = $3;
+ $$ = 0;
+ yyunlex();
+ parser->yychar = YYEOF;
+ }
| GRAMFULLSTMT
{
parser->expect = XSTATE;
}
;
-/* The whole program */
-prog : progstart
- /*CONTINUED*/ stmtseq
- { $$ = $1; newPROG(block_end($1,$2)); }
- ;
-
/* An ordinary block */
block : '{' remember stmtseq '}'
{ if (PL_parser->copline > (line_t)IVAL($1))
{ $$ = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); }
;
-progstart:
- {
- PL_parser->expect = XSTATE; $$ = block_start(TRUE);
- }
- ;
-
-
mblock : '{' mremember stmtseq '}'
{ if (PL_parser->copline > (line_t)IVAL($1))
PL_parser->copline = (line_t)IVAL($1);
}
| IF lpar_or_qw remember mexpr ')' mblock else
{
- $$ = block_end($3, newCONDOP(0, $4, scope($6), $7));
+ $$ = block_end($3,
+ newCONDOP(0, $4, op_scope($6), $7));
TOKEN_GETMAD($1,$$,'I');
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($5,$$,')');
}
| UNLESS lpar_or_qw remember miexpr ')' mblock else
{
- $$ = block_end($3, newCONDOP(0, $4, scope($6), $7));
+ $$ = block_end($3,
+ newCONDOP(0, $4, op_scope($6), $7));
TOKEN_GETMAD($1,$$,'I');
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($5,$$,')');
| GIVEN lpar_or_qw remember mydefsv mexpr ')' mblock
{
$$ = block_end($3,
- newGIVENOP($5, scope($7), (PADOFFSET)$4));
+ newGIVENOP($5, op_scope($7), (PADOFFSET)$4));
PL_parser->copline = (line_t)IVAL($1);
}
| WHEN lpar_or_qw remember mexpr ')' mblock
- { $$ = block_end($3, newWHENOP($4, scope($6))); }
+ { $$ = block_end($3, newWHENOP($4, op_scope($6))); }
| DEFAULT block
- { $$ = newWHENOP(0, scope($2)); }
+ { $$ = newWHENOP(0, op_scope($2)); }
| WHILE lpar_or_qw remember texpr ')' mintro mblock cont
{
$$ = block_end($3,
newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
- IVAL($1), $4, $7, $8, $6));
+ $4, $7, $8, $6));
TOKEN_GETMAD($1,$$,'W');
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($5,$$,')');
| UNTIL lpar_or_qw remember iexpr ')' mintro mblock cont
{
$$ = block_end($3,
- newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
- IVAL($1), $4, $7, $8, $6));
+ newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+ $4, $7, $8, $6));
TOKEN_GETMAD($1,$$,'W');
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($5,$$,')');
{
OP *initop = IF_MAD($4 ? $4 : newOP(OP_NULL, 0), $4);
OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
- IVAL($1), scalar($6), $11, $9, $8);
+ scalar($6), $11, $9, $8);
if (initop) {
forop = op_prepend_elem(OP_LINESEQ, initop,
op_append_elem(OP_LINESEQ,
}
| FOR MY remember my_scalar lpar_or_qw mexpr ')' mblock cont
{
- $$ = block_end($3,
- newFOROP(0, (line_t)IVAL($1),
- $4, $6, $8, $9));
+ $$ = block_end($3, newFOROP(0, $4, $6, $8, $9));
TOKEN_GETMAD($1,$$,'W');
TOKEN_GETMAD($2,$$,'d');
TOKEN_GETMAD($5,$$,'(');
}
| FOR scalar lpar_or_qw remember mexpr ')' mblock cont
{
- $$ = block_end($4,
- newFOROP(0, (line_t)IVAL($1),
- mod($2, OP_ENTERLOOP), $5, $7, $8));
+ $$ = block_end($4, newFOROP(0,
+ op_lvalue($2, OP_ENTERLOOP), $5, $7, $8));
TOKEN_GETMAD($1,$$,'W');
TOKEN_GETMAD($3,$$,'(');
TOKEN_GETMAD($6,$$,')');
| FOR lpar_or_qw remember mexpr ')' mblock cont
{
$$ = block_end($3,
- newFOROP(0, (line_t)IVAL($1),
- (OP*)NULL, $4, $6, $7));
+ newFOROP(0, (OP*)NULL, $4, $6, $7));
TOKEN_GETMAD($1,$$,'W');
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($5,$$,')');
{
/* a block is a loop that happens once */
$$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
- NOLINE, (OP*)NULL, $1, $2, 0);
+ (OP*)NULL, $1, $2, 0);
}
| PACKAGE WORD WORD '{' remember
{
stmtseq '}'
{
/* a block is a loop that happens once */
- $$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, NOLINE,
+ $$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
(OP*)NULL, block_end($5, $7), (OP*)NULL, 0);
op_free($3);
if ($2)
TOKEN_GETMAD($2,$$,'w');
}
| expr FOR expr
- { $$ = newFOROP(0, (line_t)IVAL($2),
- (OP*)NULL, $3, $1, (OP*)NULL);
+ { $$ = newFOROP(0, (OP*)NULL, $3, $1, (OP*)NULL);
TOKEN_GETMAD($2,$$,'w');
+ PL_parser->copline = (line_t)IVAL($2);
}
| expr WHEN expr
- { $$ = newWHENOP($3, scope($1)); }
+ { $$ = newWHENOP($3, op_scope($1)); }
;
/* else and elsif blocks */
else : /* NULL */
{ $$ = (OP*)NULL; }
| ELSE mblock
- { ($2)->op_flags |= OPf_PARENS; $$ = scope($2);
+ {
+ ($2)->op_flags |= OPf_PARENS;
+ $$ = op_scope($2);
TOKEN_GETMAD($1,$$,'o');
}
| ELSIF lpar_or_qw mexpr ')' mblock else
{ PL_parser->copline = (line_t)IVAL($1);
- $$ = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,$3), scope($5), $6);
- PL_hints |= HINT_BLOCK_SCOPE;
+ $$ = newCONDOP(0,
+ newSTATEOP(OPf_SPECIAL,NULL,$3),
+ op_scope($5), $6);
+ PL_hints |= HINT_BLOCK_SCOPE;
TOKEN_GETMAD($1,$$,'I');
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($4,$$,')');
cont : /* NULL */
{ $$ = (OP*)NULL; }
| CONTINUE block
- { $$ = scope($2);
+ {
+ $$ = op_scope($2);
TOKEN_GETMAD($1,$$,'o');
}
;
}
| term POSTINC /* $x++ */
{ $$ = newUNOP(OP_POSTINC, 0,
- mod(scalar($1), OP_POSTINC));
+ op_lvalue(scalar($1), OP_POSTINC));
TOKEN_GETMAD($2,$$,'o');
}
| term POSTDEC /* $x-- */
{ $$ = newUNOP(OP_POSTDEC, 0,
- mod(scalar($1), OP_POSTDEC));
+ op_lvalue(scalar($1), OP_POSTDEC));
TOKEN_GETMAD($2,$$,'o');
}
| PREINC term /* ++$x */
{ $$ = newUNOP(OP_PREINC, 0,
- mod(scalar($2), OP_PREINC));
+ op_lvalue(scalar($2), OP_PREINC));
TOKEN_GETMAD($1,$$,'o');
}
| PREDEC term /* --$x */
{ $$ = newUNOP(OP_PREDEC, 0,
- mod(scalar($2), OP_PREDEC));
+ op_lvalue(scalar($2), OP_PREDEC));
TOKEN_GETMAD($1,$$,'o');
}
TOKEN_GETMAD($1,$$,'o');
}
| DO block %prec '(' /* do { code */
- { $$ = newUNOP(OP_NULL, OPf_SPECIAL, scope($2));
+ { $$ = newUNOP(OP_NULL, OPf_SPECIAL, op_scope($2));
TOKEN_GETMAD($1,$$,'D');
}
| DO WORD lpar_or_qw ')' /* do somesub() */
TOKEN_GETMAD($4,$$,':');
}
| REFGEN term /* \$x, \@y, \%z */
- { $$ = newUNOP(OP_REFGEN, 0, mod($2,OP_REFGEN));
+ { $$ = newUNOP(OP_REFGEN, 0, op_lvalue($2,OP_REFGEN));
TOKEN_GETMAD($1,$$,'o');
}
| myattrterm %prec UNIOP
| scalar %prec PREC_LOW
{ $$ = scalar($1); }
| block
- { $$ = scope($1); }
+ { $$ = op_scope($1); }
| PRIVATEREF
{ $$ = $1; }
https://perl5.git.perl.org / perl5.git / blobdiff