/* Make the parser re-entrant. */
-%pure_parser
+%pure-parser
%start grammar
%token <ival> GRAMPROG GRAMEXPR GRAMBLOCK GRAMBARESTMT GRAMFULLSTMT GRAMSTMTSEQ
-%token <ival> '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';' '=' '.'
+%token <ival> '{' '}' '[' ']' '-' '+' '@' '%' '&' '=' '.'
-%token <opval> WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF QWLIST
+%token <opval> BAREWORD METHOD FUNCMETH THING PMFUNC PRIVATEREF QWLIST
%token <opval> FUNC0OP FUNC0SUB UNIOPSUB LSTOPSUB
%token <opval> PLUGEXPR PLUGSTMT
%token <pval> LABEL
%type <opval> stmtseq fullstmt labfullstmt barestmt block mblock else
%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> listexpr nexpr texpr iexpr mexpr mnexpr
+%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
intro_my();
parser->parsed_sub = 1;
}
- | PACKAGE WORD WORD ';'
+ | 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 BAREWORD BAREWORD ';'
{
package($3);
if ($2)
}
| USE startsub
{ CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
- WORD WORD optlistexpr ';'
+ BAREWORD BAREWORD optlistexpr ';'
{
SvREFCNT_inc_simple_void(PL_compcv);
utilize($1, $2, $4, $5, $6);
newCONDOP(0, $4, op_scope($6), $7));
parser->copline = (line_t)$1;
}
- | UNLESS '(' remember miexpr ')' mblock else
+ | UNLESS '(' remember mexpr ')' mblock else
{
$$ = block_end($3,
- newCONDOP(0, $4, op_scope($6), $7));
+ newCONDOP(0, $4, $7, op_scope($6)));
parser->copline = (line_t)$1;
}
| GIVEN '(' remember mexpr ')' mblock
{
- const PADOFFSET offset = pad_findmy_pvs("$_", 0);
- $$ = block_end($3,
- newGIVENOP($4, op_scope($6),
- offset == NOT_IN_PAD
- || PAD_COMPNAME_FLAGS_isOUR(offset)
- ? 0
- : offset));
+ $$ = block_end($3, newGIVENOP($4, op_scope($6), 0));
parser->copline = (line_t)$1;
}
| WHEN '(' remember mexpr ')' mblock
op_lvalue($2, OP_ENTERLOOP), $5, $7, $8));
parser->copline = (line_t)$1;
}
- | FOR REFGEN MY remember my_var
- { parser->in_my = 0; $<opval>$ = my($5); }
+ | FOR my_refgen remember my_var
+ { parser->in_my = 0; $<opval>$ = my($4); }
'(' mexpr ')' mblock cont
{
$$ = block_end(
- $4,
+ $3,
newFOROP(0,
op_lvalue(
newUNOP(OP_REFGEN, 0,
- $<opval>6),
+ $<opval>5),
OP_ENTERLOOP),
- $8, $10, $11)
+ $7, $9, $10)
);
parser->copline = (line_t)$1;
}
$$ = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
(OP*)NULL, $1, $2, 0);
}
- | PACKAGE WORD WORD '{' remember
+ | PACKAGE BAREWORD BAREWORD '{' remember
{
package($3);
if ($2) {
{ $$ = $1; intro_my(); }
;
-miexpr : iexpr
- { $$ = $1; intro_my(); }
- ;
-
-formname: WORD { $$ = $1; }
+formname: BAREWORD { $$ = $1; }
| /* NULL */ { $$ = (OP*)NULL; }
;
;
/* Name of a subroutine - must be a bareword, could be special */
-subname : WORD
+subname : BAREWORD
| PRIVATEREF
;
{ $$ = (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);
}
| '!' 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)); }
{ $$ = 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); }
+ | MY REFGEN term
+ { $$ = newUNOP(OP_REFGEN, 0, localize($3,1)); }
| myattrterm %prec UNIOP
{ $$ = $1; }
| LOCAL term %prec UNIOP
- { $$ = localize($2,$1); }
+ { $$ = localize($2,0); }
| '(' expr ')'
{ $$ = sawparens($2); }
| QWLIST
} else
$<ival>$ = 0;
}
- '(' listexpr ')'
- { $$ = pmruntime($1, $4, 1, $<ival>2); }
- | WORD
+ '(' listexpr optrepl ')'
+ { $$ = pmruntime($1, $4, $5, 1, $<ival>2); }
+ | BAREWORD
| listop
| YADAYADA
{
myattrterm: MY myterm myattrlist
{ $$ = my_attrs($2,$3); }
| MY myterm
- { $$ = localize($2,$1); }
+ { $$ = localize($2,1); }
+ | MY REFGEN myterm myattrlist
+ { $$ = newUNOP(OP_REFGEN, 0, my_attrs($3,$4)); }
;
/* Things that can be "my"'d */
{ $$ = $1; }
;
+optrepl: /* NULL */
+ { $$ = (OP*)NULL; }
+ | '/' expr
+ { $$ = $2; }
+ ;
+
/* A little bit of trickery to make "for my $foo (@bar)" actually be
lexical */
my_scalar: scalar
| amper
;
+my_refgen: MY REFGEN
+ | REFGEN MY
+ ;
+
amper : '&' indirob
{ $$ = newCVREF($1,$2); }
;
;
/* Indirect objects */
-indirob : WORD
+indirob : BAREWORD
{ $$ = scalar($1); }
| scalar %prec PREC_LOW
{ $$ = scalar($1); }