%token <ival> GRAMPROG GRAMEXPR GRAMBLOCK GRAMBARESTMT GRAMFULLSTMT GRAMSTMTSEQ
-%token <ival> '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';' '=' '.'
+%token <ival> '{' '}' '[' ']' '-' '+' '@' '%' '&' '=' '.'
%token <opval> WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF QWLIST
%token <opval> FUNC0OP FUNC0SUB UNIOPSUB LSTOPSUB
%type <opval> expr term subscripted scalar ary hsh arylen star amper sideff
%type <opval> sliceme kvslice gelem
%type <opval> listexpr nexpr texpr iexpr mexpr mnexpr miexpr
-%type <opval> optlistexpr optexpr indirob listop method
+%type <opval> optlistexpr optexpr optrepl indirob listop method
%type <opval> formname subname proto optsubbody cont my_scalar my_var
%type <opval> refgen_topic formblock
%type <opval> subattrlist myattrlist myattrterm myterm
-%type <opval> realsubbody subsignature termbinop termunop anonymous termdo
+%type <opval> subsignature termbinop termunop anonymous termdo
%type <opval> formstmtseq formline formarg
%nonassoc <ival> PREC_LOW
remember stmtseq
{
newPROG(block_end($3,$4));
+ PL_compiling.cop_seq = 0;
$$ = 0;
}
| GRAMEXPR
;
remember: /* NULL */ /* start a full lexical scope */
- { $$ = block_start(TRUE); }
+ { $$ = block_start(TRUE);
+ parser->parsed_sub = 0; }
;
mblock : '{' mremember stmtseq '}'
;
mremember: /* NULL */ /* start a partial lexical scope */
- { $$ = block_start(FALSE); }
+ { $$ = block_start(FALSE);
+ parser->parsed_sub = 0; }
;
/* A sequence of statements in the program */
newFORM($2, $3, $4);
$$ = (OP*)NULL;
if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
- SvREFCNT_inc_simple_void(fmtcv);
- pad_add_anon(fmtcv, OP_NULL);
+ pad_add_weakref(fmtcv);
}
+ parser->parsed_sub = 1;
}
| SUB subname startsub
{
;
$$ = (OP*)NULL;
intro_my();
+ parser->parsed_sub = 1;
+ }
+ | SUB subname startsub
+ {
+ if ($2->op_type == OP_CONST) {
+ const char *const name =
+ SvPV_nolen_const(((SVOP*)$2)->op_sv);
+ if (strEQ(name, "BEGIN") || strEQ(name, "END")
+ || strEQ(name, "INIT") || strEQ(name, "CHECK")
+ || strEQ(name, "UNITCHECK"))
+ CvSPECIAL_on(PL_compcv);
+ }
+ else
+ /* State subs inside anonymous subs need to be
+ clonable themselves. */
+ if (CvANON(CvOUTSIDE(PL_compcv))
+ || CvCLONE(CvOUTSIDE(PL_compcv))
+ || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
+ CvOUTSIDE(PL_compcv)
+ ))[$2->op_targ]))
+ CvCLONE_on(PL_compcv);
+ parser->in_my = 0;
+ parser->in_my_stash = NULL;
+ }
+ remember subsignature subattrlist '{' stmtseq '}'
+ {
+ OP *body;
+ if (parser->copline > (line_t)$8)
+ parser->copline = (line_t)$8;
+ body = block_end($5,
+ op_append_list(OP_LINESEQ, $6, $9));
+
+ SvREFCNT_inc_simple_void(PL_compcv);
+ $2->op_type == OP_CONST
+ ? newATTRSUB($3, $2, NULL, $7, body)
+ : newMYSUB($3, $2, NULL, $7, body)
+ ;
+ $$ = (OP*)NULL;
+ intro_my();
+ parser->parsed_sub = 1;
}
| PACKAGE WORD WORD ';'
{
{
SvREFCNT_inc_simple_void(PL_compcv);
utilize($1, $2, $4, $5, $6);
+ parser->parsed_sub = 1;
$$ = (OP*)NULL;
}
| IF '(' remember mexpr ')' mblock else
newOP(OP_UNSTACK, OPf_SPECIAL),
forop));
}
+ PL_hints |= HINT_BLOCK_SCOPE;
$$ = block_end($3, forop);
parser->copline = (line_t)$1;
}
parser->copline = CopLINE(PL_curcop)-1;
else parser->copline--;
$$ = newSTATEOP(0, NULL,
- convert(OP_FORMLINE, 0, list));
+ op_convert_list(OP_FORMLINE, 0, list));
}
;
{ $$ = (OP*)NULL; }
;
-/* Optional subroutine signature */
-subsignature: /* NULL */ { $$ = (OP*)NULL; }
- | '('
+/* Subroutine signature */
+subsignature: '('
{
- if (!FEATURE_SIGNATURES_IS_ENABLED)
- Perl_croak(aTHX_ "Experimental "
- "subroutine signatures not enabled");
+ /* We shouldn't get here otherwise */
+ assert(FEATURE_SIGNATURES_IS_ENABLED);
+
Perl_ck_warner_d(aTHX_
packWARN(WARN_EXPERIMENTAL__SIGNATURES),
"The signatures feature is experimental");
{
$$ = op_append_list(OP_LINESEQ, $<opval>2,
newSTATEOP(0, NULL, sawparens(newNULLLIST())));
- parser->expect = XBLOCK;
- }
- ;
-
-/* Subroutine body - block with optional signature */
-realsubbody: remember subsignature '{' stmtseq '}'
- {
- if (parser->copline > (line_t)$3)
- parser->copline = (line_t)$3;
- $$ = block_end($1,
- op_append_list(OP_LINESEQ, $2, $4));
+ parser->expect = XATTRBLOCK;
}
;
/* Optional subroutine body, for named subroutine declaration */
-optsubbody: realsubbody { $$ = $1; }
+optsubbody: block
| ';' { $$ = (OP*)NULL; }
;
listexpr: listexpr ','
{ $$ = $1; }
| listexpr ',' term
- {
+ {
OP* term = $3;
$$ = op_append_elem(OP_LIST, $1, term);
}
/* List operators */
listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */
- { $$ = convert($1, OPf_STACKED,
+ { $$ = op_convert_list($1, OPf_STACKED,
op_prepend_elem(OP_LIST, newGVREF($1,$2), $3) );
}
| FUNC '(' indirob expr ')' /* print ($fh @args */
- { $$ = convert($1, OPf_STACKED,
+ { $$ = op_convert_list($1, OPf_STACKED,
op_prepend_elem(OP_LIST, newGVREF($1,$3), $4) );
}
| term ARROW method '(' optexpr ')' /* $foo->bar(list) */
- { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+ { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, scalar($1), $5),
newMETHOP(OP_METHOD, 0, $3)));
}
| term ARROW method /* $foo->bar */
- { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+ { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, scalar($1),
newMETHOP(OP_METHOD, 0, $3)));
}
| METHOD indirob optlistexpr /* new Class @args */
- { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+ { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, $2, $3),
newMETHOP(OP_METHOD, 0, $1)));
}
| FUNCMETH indirob '(' optexpr ')' /* method $object (@args) */
- { $$ = convert(OP_ENTERSUB, OPf_STACKED,
+ { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, $2, $4),
newMETHOP(OP_METHOD, 0, $1)));
}
| LSTOP optlistexpr /* print @args */
- { $$ = convert($1, 0, $2); }
+ { $$ = op_convert_list($1, 0, $2); }
| FUNC '(' optexpr ')' /* print (@args) */
- { $$ = convert($1, 0, $3); }
+ { $$ = op_convert_list($1, 0, $3); }
| LSTOPSUB startanonsub block /* sub f(&@); f { foo } ... */
{ SvREFCNT_inc_simple_void(PL_compcv);
$<opval>$ = newANONATTRSUB($2, 0, (OP*)NULL, $3); }
| '!' term /* !$x */
{ $$ = newUNOP(OP_NOT, 0, scalar($2)); }
| '~' term /* ~$x */
- { $$ = newUNOP(OP_COMPLEMENT, 0, scalar($2)); }
+ { $$ = newUNOP($1, 0, scalar($2)); }
| term POSTINC /* $x++ */
{ $$ = newUNOP(OP_POSTINC, 0,
op_lvalue(scalar($1), OP_POSTINC)); }
{ $$ = newUNOP(OP_POSTDEC, 0,
op_lvalue(scalar($1), OP_POSTDEC));}
| term POSTJOIN /* implicit join after interpolated ->@ */
- { $$ = convert(OP_JOIN, 0,
+ { $$ = op_convert_list(OP_JOIN, 0,
op_append_elem(
OP_LIST,
newSVREF(scalar(
{ $$ = newANONHASH($2); }
| HASHBRACK ';' '}' %prec '(' /* { } (';' by tokener) */
{ $$ = newANONHASH((OP*)NULL); }
- | ANONSUB startanonsub proto subattrlist realsubbody %prec '('
+ | ANONSUB startanonsub proto subattrlist block %prec '('
{ SvREFCNT_inc_simple_void(PL_compcv);
$$ = newANONATTRSUB($2, $3, $4, $5); }
+ | ANONSUB startanonsub remember subsignature subattrlist '{' stmtseq '}' %prec '('
+ {
+ OP *body;
+ if (parser->copline > (line_t)$6)
+ parser->copline = (line_t)$6;
+ body = block_end($3,
+ op_append_list(OP_LINESEQ, $4, $7));
+ SvREFCNT_inc_simple_void(PL_compcv);
+ $$ = newANONATTRSUB($2, NULL, $5, body);
+ }
;
| term '?' term ':' term
{ $$ = newCONDOP(0, $1, $3, $5); }
| REFGEN term /* \$x, \@y, \%z */
- { $$ = newUNOP(OP_REFGEN, 0, op_lvalue($2,OP_REFGEN)); }
+ { $$ = newUNOP(OP_REFGEN, 0, $2); }
| myattrterm %prec UNIOP
{ $$ = $1; }
| LOCAL term %prec UNIOP
} else
$<ival>$ = 0;
}
- '(' listexpr ')'
- { $$ = pmruntime($1, $4, 1, $<ival>2); }
+ '(' listexpr optrepl ')'
+ { $$ = pmruntime($1, $4, $5, 1, $<ival>2); }
| WORD
| listop
| YADAYADA
{ $$ = $1; }
;
+optrepl: /* NULL */
+ { $$ = (OP*)NULL; }
+ | '/' expr
+ { $$ = $2; }
+ ;
+
/* A little bit of trickery to make "for my $foo (@bar)" actually be
lexical */
my_scalar: scalar
https://perl5.git.perl.org / perl5.git / blobdiff