%token <i_tkval> LOCAL MY MYSUB REQUIRE
%token <i_tkval> COLONATTR
-%type <i_tkval> lpar_or_qw
-
%type <ival> grammar remember mremember
%type <ival> startsub startanonsub startformsub
/* FIXME for MAD - are these two ival? */
labfullstmt: LABEL barestmt
{
- $$ = newSTATEOP(0, PVAL($1), $2);
+ $$ = newSTATEOP(SvUTF8(((SVOP*)$1)->op_sv),
+ savepv(SvPVX(((SVOP*)$1)->op_sv)), $2);
TOKEN_GETMAD($1,
$2 ? cLISTOPx($$)->op_first : $$, 'L');
}
| LABEL labfullstmt
{
- $$ = newSTATEOP(0, PVAL($1), $2);
+ $$ = newSTATEOP(SvUTF8(((SVOP*)$1)->op_sv),
+ savepv(SvPVX(((SVOP*)$1)->op_sv)), $2);
TOKEN_GETMAD($1, cLISTOPx($$)->op_first, 'L');
}
;
newFORM($2, $3, $4);
$$ = (OP*)NULL;
#endif
- if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) {
+ if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
SvREFCNT_inc_simple_void(fmtcv);
pad_add_anon(fmtcv, OP_NULL);
}
$$ = (OP*)NULL;
#endif
}
- | IF lpar_or_qw remember mexpr ')' mblock else
+ | IF '(' remember mexpr ')' mblock else
{
$$ = block_end($3,
newCONDOP(0, $4, op_scope($6), $7));
TOKEN_GETMAD($5,$$,')');
PL_parser->copline = (line_t)IVAL($1);
}
- | UNLESS lpar_or_qw remember miexpr ')' mblock else
+ | UNLESS '(' remember miexpr ')' mblock else
{
$$ = block_end($3,
newCONDOP(0, $4, op_scope($6), $7));
TOKEN_GETMAD($5,$$,')');
PL_parser->copline = (line_t)IVAL($1);
}
- | GIVEN lpar_or_qw remember mydefsv mexpr ')' mblock
+ | GIVEN '(' remember mydefsv mexpr ')' mblock
{
$$ = block_end($3,
newGIVENOP($5, op_scope($7), (PADOFFSET)$4));
PL_parser->copline = (line_t)IVAL($1);
}
- | WHEN lpar_or_qw remember mexpr ')' mblock
+ | WHEN '(' remember mexpr ')' mblock
{ $$ = block_end($3, newWHENOP($4, op_scope($6))); }
| DEFAULT block
{ $$ = newWHENOP(0, op_scope($2)); }
- | WHILE lpar_or_qw remember texpr ')' mintro mblock cont
+ | WHILE '(' remember texpr ')' mintro mblock cont
{
$$ = block_end($3,
newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
TOKEN_GETMAD($5,$$,')');
PL_parser->copline = (line_t)IVAL($1);
}
- | UNTIL lpar_or_qw remember iexpr ')' mintro mblock cont
+ | UNTIL '(' remember iexpr ')' mintro mblock cont
{
$$ = block_end($3,
newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
TOKEN_GETMAD($5,$$,')');
PL_parser->copline = (line_t)IVAL($1);
}
- | FOR lpar_or_qw remember mnexpr ';' texpr ';' mintro mnexpr ')'
+ | FOR '(' remember mnexpr ';' texpr ';' mintro mnexpr ')'
mblock
{
OP *initop = IF_MAD($4 ? $4 : newOP(OP_NULL, 0), $4);
TOKEN_GETMAD($10,$$,')');
PL_parser->copline = (line_t)IVAL($1);
}
- | FOR MY remember my_scalar lpar_or_qw mexpr ')' mblock cont
+ | FOR MY remember my_scalar '(' mexpr ')' mblock cont
{
$$ = block_end($3, newFOROP(0, $4, $6, $8, $9));
TOKEN_GETMAD($1,$$,'W');
TOKEN_GETMAD($7,$$,')');
PL_parser->copline = (line_t)IVAL($1);
}
- | FOR scalar lpar_or_qw remember mexpr ')' mblock cont
+ | FOR scalar '(' remember mexpr ')' mblock cont
{
$$ = block_end($4, newFOROP(0,
op_lvalue($2, OP_ENTERLOOP), $5, $7, $8));
TOKEN_GETMAD($6,$$,')');
PL_parser->copline = (line_t)IVAL($1);
}
- | FOR lpar_or_qw remember mexpr ')' mblock cont
+ | FOR '(' remember mexpr ')' mblock cont
{
$$ = block_end($3,
newFOROP(0, (OP*)NULL, $4, $6, $7));
}
| 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;
}
}
stmtseq '}'
/* a block is a loop that happens once */
$$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
(OP*)NULL, block_end($5, $7), (OP*)NULL, 0);
- op_free($3);
- if ($2)
- op_free($2);
TOKEN_GETMAD($4,$$,'{');
TOKEN_GETMAD($8,$$,'}');
if (PL_parser->copline > (line_t)IVAL($4))
$$ = op_scope($2);
TOKEN_GETMAD($1,$$,'o');
}
- | ELSIF lpar_or_qw mexpr ')' mblock else
+ | ELSIF '(' mexpr ')' mblock else
{ PL_parser->copline = (line_t)IVAL($1);
$$ = newCONDOP(0,
newSTATEOP(OPf_SPECIAL,NULL,$3),
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($5,$$,')');
}
- | term ARROW method lpar_or_qw optexpr ')' /* $foo->bar(list) */
+ | term ARROW method '(' optexpr ')' /* $foo->bar(list) */
{ $$ = convert(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, scalar($1), $5),
TOKEN_GETMAD($5,$$,')');
}
- | subscripted lpar_or_qw expr ')' /* $foo->{bar}->(@args) */
+ | subscripted '(' expr ')' /* $foo->{bar}->(@args) */
{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, $3,
newCVREF(0, scalar($1))));
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($4,$$,')');
}
- | subscripted lpar_or_qw ')' /* $foo->{bar}->() */
+ | subscripted '(' ')' /* $foo->{bar}->() */
{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
newCVREF(0, scalar($1)));
TOKEN_GETMAD($2,$$,'(');
{ $$ = newUNOP(OP_NULL, OPf_SPECIAL, op_scope($2));
TOKEN_GETMAD($1,$$,'D');
}
- | DO WORD lpar_or_qw ')' /* do somesub() */
+ | DO WORD '(' ')' /* do somesub() */
{ $$ = newUNOP(OP_ENTERSUB,
OPf_SPECIAL|OPf_STACKED,
op_prepend_elem(OP_LIST,
TOKEN_GETMAD($3,$$,'(');
TOKEN_GETMAD($4,$$,')');
}
- | DO WORD lpar_or_qw expr ')' /* do somesub(@args) */
+ | DO WORD '(' expr ')' /* do somesub(@args) */
{ $$ = newUNOP(OP_ENTERSUB,
OPf_SPECIAL|OPf_STACKED,
op_append_elem(OP_LIST,
TOKEN_GETMAD($3,$$,'(');
TOKEN_GETMAD($5,$$,')');
}
- | DO scalar lpar_or_qw ')' /* do $subref () */
+ | DO scalar '(' ')' /* do $subref () */
{ $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
op_prepend_elem(OP_LIST,
scalar(newCVREF(0,scalar($2))), (OP*)NULL)); dep();
TOKEN_GETMAD($3,$$,'(');
TOKEN_GETMAD($4,$$,')');
}
- | DO scalar lpar_or_qw expr ')' /* do $subref (@args) */
+ | DO scalar '(' expr ')' /* do $subref (@args) */
{ $$ = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
op_prepend_elem(OP_LIST,
$4,
{ $$ = $1; }
| amper /* &foo; */
{ $$ = newUNOP(OP_ENTERSUB, 0, scalar($1)); }
- | amper lpar_or_qw ')' /* &foo() */
+ | amper '(' ')' /* &foo() */
{ $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1));
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($3,$$,')');
}
- | amper lpar_or_qw expr ')' /* &foo(@args) */
+ | amper '(' expr ')' /* &foo(@args) */
{
$$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, $3, scalar($1)));
TOKEN_GETMAD($2,$$,'(');
TOKEN_GETMAD($4,$$,')');
}
- | PMFUNC '(' listexpr ')' /* m//, s///, tr/// */
- { $$ = pmruntime($1, $3, 1);
- TOKEN_GETMAD($2,$$,'(');
- TOKEN_GETMAD($4,$$,')');
+ | PMFUNC /* m//, s///, qr//, tr/// */
+ {
+ if ( $1->op_type != OP_TRANS
+ && $1->op_type != OP_TRANSR
+ && (((PMOP*)$1)->op_pmflags & PMf_HAS_CV))
+ {
+ $<ival>$ = start_subparse(FALSE, CVf_ANON);
+ SAVEFREESV(PL_compcv);
+ } else
+ $<ival>$ = 0;
+ }
+ '(' listexpr ')'
+ { $$ = pmruntime($1, $4, 1, $<ival>2);
+ TOKEN_GETMAD($3,$$,'(');
+ TOKEN_GETMAD($5,$$,')');
}
| WORD
| listop
{ $$ = $1; }
;
-lpar_or_qw: '('
- { $$ = $1; }
- | QWLIST
- { munge_qwlist_to_paren_list($1); }
- '('
- { $$ = $3; }
- ;
-
/* A little bit of trickery to make "for my $foo (@bar)" actually be
lexical */
my_scalar: scalar