Commit 3c3b76bc90 for perl
commit 3c3b76bc90ca9e2ac181564c1302a0a704963ce2
Author: Branislav Zahradník <barney@cpan.org>
Date: Sun Sep 27 13:28:45 2026 +0200
[perly] method invocation -> Action build_method_invocation
Replace implementation details with intention in `bison` actions.
A reader of the grammar does not need to know the exact op-tree logic
to write or maintain parser actions.
diff --git a/embed.fnc b/embed.fnc
index 4bdb4671ae..2500994b78 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -1019,6 +1019,10 @@ p |OP * |build_infix_plugin \
|NN OP *lhs \
|NN OP *rhs \
|NN void *tokendata
+dp |OP * |build_method_invocation \
+ |NN OP *target \
+ |NN OP *method \
+ |NULLOK OP *arguments
dp |OP * |build_method_invocation_arguments \
|NN OP *target \
|NULLOK OP *arguments
diff --git a/embed.h b/embed.h
index e2faf55664..3b51c4558c 100644
--- a/embed.h
+++ b/embed.h
@@ -1004,6 +1004,7 @@
# define boot_core_builtin() Perl_boot_core_builtin(aTHX)
# define boot_core_mro() Perl_boot_core_mro(aTHX)
# define build_infix_plugin(a,b,c) Perl_build_infix_plugin(aTHX_ a,b,c)
+# define build_method_invocation(a,b,c) Perl_build_method_invocation(aTHX_ a,b,c)
# define build_method_invocation_arguments(a,b) Perl_build_method_invocation_arguments(aTHX_ a,b)
# define cando(a,b,c) Perl_cando(aTHX_ a,b,c)
# define check_utf8_print(a,b) Perl_check_utf8_print(aTHX_ a,b)
diff --git a/op.c b/op.c
index dad34088a4..2f6f535db5 100644
--- a/op.c
+++ b/op.c
@@ -4893,13 +4893,59 @@ Perl_block_end(pTHX_ I32 floor, OP *seq)
}
/*
+=for apidoc build_method_invocation
+ build_method_invocation ($target, $method, $arguments);
+ build_method_invocation ($target, $method, NULL);
+
+Build an C<OP *> representing the structure recognised as method invocation.
+
+Arguments:
+
+=over
+
+=item C<target>
+
+Expression on which the method invocation is invoked.
+
+=item C<method>
+
+Invoked method.
+
+=item C<arguments>
+
+Expression (list) representing the method invocation arguments.
+
+=back
+
+Available since: v5.46
+
+=cut
+*/
+
+OP*
+Perl_build_method_invocation (pTHX_ OP *target, OP *method, OP *arguments)
+{
+ PERL_ARGS_ASSERT_BUILD_METHOD_INVOCATION;
+
+ return op_convert_list (
+ OP_ENTERSUB,
+ OPf_STACKED,
+ op_append_elem (
+ OP_LIST,
+ build_method_invocation_arguments (target, arguments),
+ method
+ )
+ );
+}
+
+/*
=for apidoc build_method_invocation_arguments
build_method_invocation_arguments ($target, $arguments);
build_method_invocation_arguments ($target, NULL);
-Build an C<OP *> representing the structure recognised as method call arguments.
+Build an C<OP *> representing the structure recognised as method invocation arguments.
Arguments:
diff --git a/perly.act b/perly.act
index 9728423638..64c4884a8e 100644
--- a/perly.act
+++ b/perly.act
@@ -1225,118 +1225,95 @@ case 2: /* @1: %empty */
case 194: /* listop: term ARROW methodname PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */
#line 1348 "perly.y"
{
- (yyval.opval) = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ((ps[-5].val.opval)), (ps[-1].val.opval)),
- newMETHOP (OP_METHOD, 0, (ps[-3].val.opval))
- )
+ (yyval.opval) = build_method_invocation (
+ scalar ((ps[-5].val.opval)),
+ newMETHOP (OP_METHOD, 0, (ps[-3].val.opval)),
+ (ps[-1].val.opval)
);
}
break;
case 195: /* listop: term ARROW methodname */
-#line 1363 "perly.y"
+#line 1359 "perly.y"
{
- (yyval.opval) = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ((ps[-2].val.opval)), NULL),
- newMETHOP (OP_METHOD, 0, (ps[0].val.opval))
- )
+ (yyval.opval) = build_method_invocation (
+ scalar ((ps[-2].val.opval)),
+ newMETHOP (OP_METHOD, 0, (ps[0].val.opval)),
+ NULL
);
}
break;
case 196: /* listop: term ARROW PERLY_AMPERSAND subname PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */
-#line 1382 "perly.y"
+#line 1374 "perly.y"
{
- (yyval.opval) = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ((ps[-6].val.opval)), (ps[-1].val.opval)),
- newCVREF (0, (ps[-3].val.opval))
- )
+ (yyval.opval) = build_method_invocation (
+ scalar ((ps[-6].val.opval)),
+ newCVREF (0, (ps[-3].val.opval)),
+ (ps[-1].val.opval)
);
}
break;
case 197: /* listop: term ARROW PERLY_AMPERSAND subname */
-#line 1398 "perly.y"
+#line 1386 "perly.y"
{
- (yyval.opval) = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ((ps[-3].val.opval)), NULL),
- newCVREF (0, (ps[0].val.opval))
- )
+ (yyval.opval) = build_method_invocation (
+ scalar ((ps[-3].val.opval)),
+ newCVREF (0, (ps[0].val.opval)),
+ NULL
);
}
break;
case 198: /* listop: METHCALL0 indirob optlistexpr */
-#line 1413 "perly.y"
+#line 1397 "perly.y"
{
- (yyval.opval) = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments ((ps[-1].val.opval), (ps[0].val.opval)),
- newMETHOP (OP_METHOD, 0, (ps[-2].val.opval))
- )
+ (yyval.opval) = build_method_invocation (
+ (ps[-1].val.opval),
+ newMETHOP (OP_METHOD, 0, (ps[-2].val.opval)),
+ (ps[0].val.opval)
);
}
break;
case 199: /* listop: METHCALL indirob PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */
-#line 1430 "perly.y"
+#line 1410 "perly.y"
{
- (yyval.opval) = op_convert_list (
- OP_ENTERSUB, OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments ((ps[-3].val.opval), (ps[-1].val.opval)),
- newMETHOP(OP_METHOD, 0, (ps[-4].val.opval))
- )
+ (yyval.opval) = build_method_invocation (
+ (ps[-3].val.opval),
+ newMETHOP (OP_METHOD, 0, (ps[-4].val.opval)),
+ (ps[-1].val.opval)
);
}
break;
case 200: /* listop: LSTOP optlistexpr */
-#line 1441 "perly.y"
+#line 1418 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }
break;
case 201: /* listop: FUNC PERLY_PAREN_OPEN optexpr PERLY_PAREN_CLOSE */
-#line 1443 "perly.y"
+#line 1420 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
break;
case 202: /* listop: FUNC SUBLEXSTART optexpr SUBLEXEND */
-#line 1445 "perly.y"
+#line 1422 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
break;
case 203: /* @24: %empty */
-#line 1447 "perly.y"
+#line 1424 "perly.y"
{ SvREFCNT_inc_simple_void(PL_compcv);
(yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval));
/* prevent double op_free() if the following fails to parse */
@@ -1346,7 +1323,7 @@ case 2: /* @1: %empty */
break;
case 204: /* listop: LSTOPSUB startanonsub block @24 optlistexpr */
-#line 1453 "perly.y"
+#line 1430 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), (ps[-4].val.opval)));
@@ -1355,20 +1332,20 @@ case 2: /* @1: %empty */
break;
case 207: /* subscripted: gelem subscript_keys */
-#line 1468 "perly.y"
+#line 1445 "perly.y"
{ (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-1].val.opval), scalar((ps[0].val.opval))); }
break;
case 208: /* subscripted: scalar subscript_index */
-#line 1470 "perly.y"
+#line 1447 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-1].val.opval)), scalar((ps[0].val.opval)));
}
break;
case 209: /* subscripted: subscriptable_reference subscript_index */
-#line 1473 "perly.y"
+#line 1450 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0,
ref(newAVREF((ps[-1].val.opval)),OP_RV2AV),
scalar((ps[0].val.opval)));
@@ -1377,14 +1354,14 @@ case 2: /* @1: %empty */
break;
case 210: /* subscripted: scalar subscript_keys */
-#line 1478 "perly.y"
+#line 1455 "perly.y"
{ (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-1].val.opval)), jmaybe((ps[0].val.opval)));
}
break;
case 211: /* subscripted: subscriptable_reference subscript_keys */
-#line 1481 "perly.y"
+#line 1458 "perly.y"
{ (yyval.opval) = newBINOP(OP_HELEM, 0,
ref(newHVREF((ps[-1].val.opval)),OP_RV2HV),
jmaybe((ps[0].val.opval))); }
@@ -1392,7 +1369,7 @@ case 2: /* @1: %empty */
break;
case 212: /* subscripted: subscriptable_reference PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */
-#line 1485 "perly.y"
+#line 1462 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[-1].val.opval),
newCVREF(0, scalar((ps[-3].val.opval)))));
@@ -1403,7 +1380,7 @@ case 2: /* @1: %empty */
break;
case 213: /* subscripted: subscriptable_reference PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */
-#line 1492 "perly.y"
+#line 1469 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
newCVREF(0, scalar((ps[-2].val.opval))));
if (parser->expect == XBLOCK)
@@ -1413,55 +1390,55 @@ case 2: /* @1: %empty */
break;
case 214: /* subscripted: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE subscript_index */
-#line 1498 "perly.y"
+#line 1475 "perly.y"
{ (yyval.opval) = newSLICEOP(0, (ps[0].val.opval), (ps[-2].val.opval)); }
break;
case 215: /* subscripted: QWLIST subscript_index */
-#line 1500 "perly.y"
+#line 1477 "perly.y"
{ (yyval.opval) = newSLICEOP(0, (ps[0].val.opval), (ps[-1].val.opval)); }
break;
case 216: /* subscripted: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE subscript_index */
-#line 1502 "perly.y"
+#line 1479 "perly.y"
{ (yyval.opval) = newSLICEOP(0, (ps[0].val.opval), NULL); }
break;
case 217: /* termbinop: term PLUGIN_HIGH_OP term */
-#line 1507 "perly.y"
+#line 1484 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 218: /* termbinop: term ASSIGNOP term */
-#line 1509 "perly.y"
+#line 1486 "perly.y"
{ (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }
break;
case 219: /* termbinop: term PLUGIN_ASSIGN_OP term */
-#line 1511 "perly.y"
+#line 1488 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 220: /* termbinop: term POWOP term */
-#line 1513 "perly.y"
+#line 1490 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 221: /* termbinop: term PLUGIN_POW_OP term */
-#line 1515 "perly.y"
+#line 1492 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 222: /* termbinop: term MULOP term */
-#line 1517 "perly.y"
+#line 1494 "perly.y"
{ if ((ps[-1].val.ival) != OP_REPEAT)
scalar((ps[-2].val.opval));
(yyval.opval) = newBINOP((ps[-1].val.ival), 0, (ps[-2].val.opval), scalar((ps[0].val.opval)));
@@ -1470,219 +1447,219 @@ case 2: /* @1: %empty */
break;
case 223: /* termbinop: term PLUGIN_MUL_OP term */
-#line 1522 "perly.y"
+#line 1499 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 224: /* termbinop: term ADDOP term */
-#line 1524 "perly.y"
+#line 1501 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 225: /* termbinop: term PLUGIN_ADD_OP term */
-#line 1526 "perly.y"
+#line 1503 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 226: /* termbinop: term SHIFTOP term */
-#line 1528 "perly.y"
+#line 1505 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 227: /* termbinop: termrelop */
-#line 1530 "perly.y"
+#line 1507 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 228: /* termbinop: termeqop */
-#line 1532 "perly.y"
+#line 1509 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 229: /* termbinop: term BITANDOP term */
-#line 1534 "perly.y"
+#line 1511 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 230: /* termbinop: term BITOROP term */
-#line 1536 "perly.y"
+#line 1513 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 231: /* termbinop: term DOTDOT term */
-#line 1538 "perly.y"
+#line 1515 "perly.y"
{ (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 232: /* termbinop: term ANDAND term */
-#line 1540 "perly.y"
+#line 1517 "perly.y"
{ (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 233: /* termbinop: term PLUGIN_LOGICAL_AND_OP term */
-#line 1542 "perly.y"
+#line 1519 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 234: /* termbinop: term OROR term */
-#line 1544 "perly.y"
+#line 1521 "perly.y"
{ (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 235: /* termbinop: term PLUGIN_LOGICAL_OR_OP term */
-#line 1546 "perly.y"
+#line 1523 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 236: /* termbinop: term DORDOR term */
-#line 1548 "perly.y"
+#line 1525 "perly.y"
{ (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 237: /* termbinop: term MATCHOP term */
-#line 1550 "perly.y"
+#line 1527 "perly.y"
{ (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 238: /* termbinop: term PLUGIN_LOW_OP term */
-#line 1552 "perly.y"
+#line 1529 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 239: /* termrelop: relopchain */
-#line 1556 "perly.y"
+#line 1533 "perly.y"
{ (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
break;
case 240: /* termrelop: term NCRELOP term */
-#line 1558 "perly.y"
+#line 1535 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 241: /* termrelop: termrelop NCRELOP */
-#line 1560 "perly.y"
+#line 1537 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 242: /* termrelop: termrelop CHRELOP */
-#line 1562 "perly.y"
+#line 1539 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 243: /* termrelop: term PLUGIN_REL_OP term */
-#line 1564 "perly.y"
+#line 1541 "perly.y"
{ (yyval.opval) = build_infix_plugin((ps[-2].val.opval), (ps[0].val.opval), (ps[-1].val.pval)); }
break;
case 244: /* relopchain: term CHRELOP term */
-#line 1568 "perly.y"
+#line 1545 "perly.y"
{ (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 245: /* relopchain: relopchain CHRELOP term */
-#line 1570 "perly.y"
+#line 1547 "perly.y"
{ (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 246: /* termeqop: eqopchain */
-#line 1574 "perly.y"
+#line 1551 "perly.y"
{ (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
break;
case 247: /* termeqop: term NCEQOP term */
-#line 1576 "perly.y"
+#line 1553 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 248: /* termeqop: termeqop NCEQOP */
-#line 1578 "perly.y"
+#line 1555 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 249: /* termeqop: termeqop CHEQOP */
-#line 1580 "perly.y"
+#line 1557 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 250: /* eqopchain: term CHEQOP term */
-#line 1584 "perly.y"
+#line 1561 "perly.y"
{ (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 251: /* eqopchain: eqopchain CHEQOP term */
-#line 1586 "perly.y"
+#line 1563 "perly.y"
{ (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 252: /* termunop: PERLY_MINUS term */
-#line 1591 "perly.y"
+#line 1568 "perly.y"
{ (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
break;
case 253: /* termunop: PERLY_PLUS term */
-#line 1593 "perly.y"
+#line 1570 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 254: /* termunop: PERLY_EXCLAMATION_MARK term */
-#line 1596 "perly.y"
+#line 1573 "perly.y"
{ (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
break;
case 255: /* termunop: PERLY_TILDE term */
-#line 1598 "perly.y"
+#line 1575 "perly.y"
{ (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }
break;
case 256: /* termunop: term POSTINC */
-#line 1600 "perly.y"
+#line 1577 "perly.y"
{ (yyval.opval) = newUNOP(OP_POSTINC, 0,
op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }
break;
case 257: /* termunop: term POSTDEC */
-#line 1603 "perly.y"
+#line 1580 "perly.y"
{ (yyval.opval) = newUNOP(OP_POSTDEC, 0,
op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
break;
case 258: /* termunop: term POSTJOIN */
-#line 1606 "perly.y"
+#line 1583 "perly.y"
{ (yyval.opval) = op_convert_list(OP_JOIN, 0,
op_append_elem(
OP_LIST,
@@ -1697,59 +1674,59 @@ case 2: /* @1: %empty */
break;
case 259: /* termunop: PREINC term */
-#line 1617 "perly.y"
+#line 1594 "perly.y"
{ (yyval.opval) = newUNOP(OP_PREINC, 0,
op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }
break;
case 260: /* termunop: PREDEC term */
-#line 1620 "perly.y"
+#line 1597 "perly.y"
{ (yyval.opval) = newUNOP(OP_PREDEC, 0,
op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }
break;
case 261: /* anonymous: PERLY_BRACKET_OPEN optexpr PERLY_BRACKET_CLOSE */
-#line 1628 "perly.y"
+#line 1605 "perly.y"
{ (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
break;
case 262: /* anonymous: HASHBRACK optexpr PERLY_SEMICOLON PERLY_BRACE_CLOSE */
-#line 1630 "perly.y"
+#line 1607 "perly.y"
{ (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
break;
case 263: /* anonymous: KW_SUB_anon startanonsub proto subattrlist subbody */
-#line 1632 "perly.y"
+#line 1609 "perly.y"
{ SvREFCNT_inc_simple_void(PL_compcv);
(yyval.opval) = newANONATTRSUB((ps[-3].val.ival), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)); }
break;
case 264: /* anonymous: KW_SUB_anon startanonsub proto subattrlist */
-#line 1635 "perly.y"
+#line 1612 "perly.y"
{ yyerror("Illegal declaration of anonymous subroutine"); YYERROR; }
break;
case 265: /* anonymous: KW_SUB_anon_sig startanonsub subattrlist sigsubbody */
-#line 1637 "perly.y"
+#line 1614 "perly.y"
{ SvREFCNT_inc_simple_void(PL_compcv);
(yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); }
break;
case 266: /* anonymous: KW_SUB_anon_sig startanonsub subattrlist */
-#line 1640 "perly.y"
+#line 1617 "perly.y"
{ yyerror("Illegal declaration of anonymous subroutine"); YYERROR; }
break;
case 267: /* anonymous: KW_METHOD_anon startanonmethod subattrlist sigsubbody */
-#line 1642 "perly.y"
+#line 1619 "perly.y"
{
SvREFCNT_inc_simple_void(PL_compcv);
(yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval));
@@ -1758,103 +1735,103 @@ case 2: /* @1: %empty */
break;
case 268: /* anonymous: KW_METHOD_anon startanonmethod subattrlist */
-#line 1647 "perly.y"
+#line 1624 "perly.y"
{ yyerror("Illegal declaration of anonymous subroutine"); YYERROR; }
break;
case 269: /* termdo: KW_DO term */
-#line 1652 "perly.y"
+#line 1629 "perly.y"
{ (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
break;
case 270: /* termdo: KW_DO block */
-#line 1654 "perly.y"
+#line 1631 "perly.y"
{ (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
break;
case 275: /* term: term PERLY_QUESTION_MARK term PERLY_COLON term */
-#line 1662 "perly.y"
+#line 1639 "perly.y"
{ (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 276: /* term: REFGEN term */
-#line 1664 "perly.y"
+#line 1641 "perly.y"
{ (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
break;
case 277: /* term: myattrterm */
-#line 1666 "perly.y"
+#line 1643 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 278: /* term: KW_LOCAL term */
-#line 1668 "perly.y"
+#line 1645 "perly.y"
{ (yyval.opval) = localize((ps[0].val.opval),0); }
break;
case 279: /* term: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */
-#line 1670 "perly.y"
+#line 1647 "perly.y"
{ (yyval.opval) = sawparens((ps[-1].val.opval)); }
break;
case 280: /* term: QWLIST */
-#line 1672 "perly.y"
+#line 1649 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 281: /* term: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */
-#line 1674 "perly.y"
+#line 1651 "perly.y"
{ (yyval.opval) = sawparens(newNULLLIST()); }
break;
case 282: /* term: scalar */
-#line 1676 "perly.y"
+#line 1653 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 283: /* term: star */
-#line 1678 "perly.y"
+#line 1655 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 284: /* term: hsh */
-#line 1680 "perly.y"
+#line 1657 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 285: /* term: ary */
-#line 1682 "perly.y"
+#line 1659 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 286: /* term: arylen */
-#line 1684 "perly.y"
+#line 1661 "perly.y"
{ (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
break;
case 287: /* term: subscripted */
-#line 1686 "perly.y"
+#line 1663 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 288: /* term: sliceme subscript_index */
-#line 1688 "perly.y"
+#line 1665 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_ASLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_ASLICE, 0,
@@ -1868,7 +1845,7 @@ case 2: /* @1: %empty */
break;
case 289: /* term: kvslice subscript_index */
-#line 1698 "perly.y"
+#line 1675 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_KVASLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_KVASLICE, 0,
@@ -1882,7 +1859,7 @@ case 2: /* @1: %empty */
break;
case 290: /* term: sliceme subscript_keys */
-#line 1708 "perly.y"
+#line 1685 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_HSLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_HSLICE, 0,
@@ -1896,7 +1873,7 @@ case 2: /* @1: %empty */
break;
case 291: /* term: kvslice subscript_keys */
-#line 1718 "perly.y"
+#line 1695 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_KVHSLICE, 0,
@@ -1910,26 +1887,26 @@ case 2: /* @1: %empty */
break;
case 292: /* term: THING */
-#line 1728 "perly.y"
+#line 1705 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 293: /* term: amper */
-#line 1730 "perly.y"
+#line 1707 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
break;
case 294: /* term: amper PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */
-#line 1732 "perly.y"
+#line 1709 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
}
break;
case 295: /* term: amper PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */
-#line 1735 "perly.y"
+#line 1712 "perly.y"
{
(yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
@@ -1938,7 +1915,7 @@ case 2: /* @1: %empty */
break;
case 296: /* term: NOAMP subname optlistexpr */
-#line 1740 "perly.y"
+#line 1717 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
}
@@ -1946,130 +1923,130 @@ case 2: /* @1: %empty */
break;
case 297: /* term: term ARROW PERLY_DOLLAR PERLY_STAR */
-#line 1744 "perly.y"
+#line 1721 "perly.y"
{ (yyval.opval) = newSVREF((ps[-3].val.opval)); }
break;
case 298: /* term: term ARROW PERLY_SNAIL PERLY_STAR */
-#line 1746 "perly.y"
+#line 1723 "perly.y"
{ (yyval.opval) = newAVREF((ps[-3].val.opval)); }
break;
case 299: /* term: term ARROW PERLY_PERCENT_SIGN PERLY_STAR */
-#line 1748 "perly.y"
+#line 1725 "perly.y"
{ (yyval.opval) = newHVREF((ps[-3].val.opval)); }
break;
case 300: /* term: term ARROW PERLY_AMPERSAND PERLY_STAR */
-#line 1750 "perly.y"
+#line 1727 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
break;
case 301: /* term: term ARROW PERLY_STAR PERLY_STAR */
-#line 1753 "perly.y"
+#line 1730 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
break;
case 302: /* term: LOOPEX */
-#line 1755 "perly.y"
+#line 1732 "perly.y"
{ (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
PL_hints |= HINT_BLOCK_SCOPE; }
break;
case 303: /* term: LOOPEX term */
-#line 1758 "perly.y"
+#line 1735 "perly.y"
{ (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
break;
case 304: /* term: NOTOP listexpr */
-#line 1760 "perly.y"
+#line 1737 "perly.y"
{ (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
break;
case 305: /* term: UNIOP */
-#line 1762 "perly.y"
+#line 1739 "perly.y"
{ (yyval.opval) = newOP((ps[0].val.ival), 0); }
break;
case 306: /* term: UNIOP block */
-#line 1764 "perly.y"
+#line 1741 "perly.y"
{ (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
break;
case 307: /* term: UNIOP term */
-#line 1766 "perly.y"
+#line 1743 "perly.y"
{ (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
break;
case 308: /* term: KW_REQUIRE */
-#line 1768 "perly.y"
+#line 1745 "perly.y"
{ (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
break;
case 309: /* term: KW_REQUIRE term */
-#line 1770 "perly.y"
+#line 1747 "perly.y"
{ (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
break;
case 310: /* term: UNIOPSUB */
-#line 1772 "perly.y"
+#line 1749 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
break;
case 311: /* term: UNIOPSUB term */
-#line 1774 "perly.y"
+#line 1751 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); }
break;
case 312: /* term: FUNC0 */
-#line 1777 "perly.y"
+#line 1754 "perly.y"
{ (yyval.opval) = newOP((ps[0].val.ival), 0); }
break;
case 313: /* term: FUNC0 PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */
-#line 1779 "perly.y"
+#line 1756 "perly.y"
{ (yyval.opval) = newOP((ps[-2].val.ival), 0);}
break;
case 314: /* term: FUNC0OP */
-#line 1781 "perly.y"
+#line 1758 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 315: /* term: FUNC0OP PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */
-#line 1783 "perly.y"
+#line 1760 "perly.y"
{ (yyval.opval) = (ps[-2].val.opval); }
break;
case 316: /* term: FUNC0SUB */
-#line 1785 "perly.y"
+#line 1762 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
break;
case 317: /* term: FUNC1 PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */
-#line 1787 "perly.y"
+#line 1764 "perly.y"
{ (yyval.opval) = ((ps[-2].val.ival) == OP_NOT)
? newUNOP((ps[-2].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0)))
: newOP((ps[-2].val.ival), OPf_SPECIAL); }
@@ -2077,13 +2054,13 @@ case 2: /* @1: %empty */
break;
case 318: /* term: FUNC1 PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */
-#line 1791 "perly.y"
+#line 1768 "perly.y"
{ (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
break;
case 319: /* @25: %empty */
-#line 1793 "perly.y"
+#line 1770 "perly.y"
{
if ( (ps[0].val.opval)->op_type != OP_TRANS
&& (ps[0].val.opval)->op_type != OP_TRANSR
@@ -2098,67 +2075,67 @@ case 2: /* @1: %empty */
break;
case 320: /* term: PMFUNC @25 SUBLEXSTART listexpr optrepl SUBLEXEND */
-#line 1804 "perly.y"
+#line 1781 "perly.y"
{ (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
break;
case 324: /* myattrterm: KW_MY myterm attrlist */
-#line 1813 "perly.y"
+#line 1790 "perly.y"
{ (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
break;
case 325: /* myattrterm: KW_MY myterm */
-#line 1815 "perly.y"
+#line 1792 "perly.y"
{ (yyval.opval) = localize((ps[0].val.opval),1); }
break;
case 326: /* myattrterm: KW_MY REFGEN myterm attrlist */
-#line 1817 "perly.y"
+#line 1794 "perly.y"
{ (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
break;
case 327: /* myattrterm: KW_MY REFGEN term */
-#line 1819 "perly.y"
+#line 1796 "perly.y"
{ (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
break;
case 328: /* myterm: PERLY_PAREN_OPEN expr PERLY_PAREN_CLOSE */
-#line 1824 "perly.y"
+#line 1801 "perly.y"
{ (yyval.opval) = sawparens((ps[-1].val.opval)); }
break;
case 329: /* myterm: PERLY_PAREN_OPEN PERLY_PAREN_CLOSE */
-#line 1826 "perly.y"
+#line 1803 "perly.y"
{ (yyval.opval) = sawparens(newNULLLIST()); }
break;
case 330: /* myterm: scalar */
-#line 1829 "perly.y"
+#line 1806 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 331: /* myterm: hsh */
-#line 1831 "perly.y"
+#line 1808 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 332: /* myterm: ary */
-#line 1833 "perly.y"
+#line 1810 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 333: /* fieldvar: scalar */
-#line 1838 "perly.y"
+#line 1815 "perly.y"
{
(yyval.pval) = PadnamelistARRAY(PL_comppad_name)[(ps[0].val.opval)->op_targ];
op_free((ps[0].val.opval));
@@ -2167,7 +2144,7 @@ case 2: /* @1: %empty */
break;
case 334: /* fieldvar: hsh */
-#line 1843 "perly.y"
+#line 1820 "perly.y"
{
(yyval.pval) = PadnamelistARRAY(PL_comppad_name)[(ps[0].val.opval)->op_targ];
op_free((ps[0].val.opval));
@@ -2176,7 +2153,7 @@ case 2: /* @1: %empty */
break;
case 335: /* fieldvar: ary */
-#line 1848 "perly.y"
+#line 1825 "perly.y"
{
(yyval.pval) = PadnamelistARRAY(PL_comppad_name)[(ps[0].val.opval)->op_targ];
op_free((ps[0].val.opval));
@@ -2185,7 +2162,7 @@ case 2: /* @1: %empty */
break;
case 336: /* fielddecl: KW_FIELD fieldvar optattrlist */
-#line 1856 "perly.y"
+#line 1833 "perly.y"
{
parser->in_my = 0;
if((ps[0].val.opval))
@@ -2196,7 +2173,7 @@ case 2: /* @1: %empty */
break;
case 337: /* $@26: %empty */
-#line 1863 "perly.y"
+#line 1840 "perly.y"
{
parser->in_my = 0;
if((ps[-1].val.opval))
@@ -2208,7 +2185,7 @@ case 2: /* @1: %empty */
break;
case 338: /* fielddecl: KW_FIELD fieldvar optattrlist ASSIGNOP $@26 term */
-#line 1871 "perly.y"
+#line 1848 "perly.y"
{
class_set_field_defop((PADNAME *)(ps[-4].val.pval), (ps[-2].val.ival), (ps[0].val.opval));
LEAVE;
@@ -2218,25 +2195,25 @@ case 2: /* @1: %empty */
break;
case 344: /* optrepl: PERLY_SLASH expr */
-#line 1891 "perly.y"
+#line 1868 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 345: /* my_scalar: scalar */
-#line 1897 "perly.y"
+#line 1874 "perly.y"
{ parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
break;
case 346: /* list_of_itervars: list_of_itervars PERLY_COMMA */
-#line 1902 "perly.y"
+#line 1879 "perly.y"
{ (yyval.opval) = (ps[-1].val.opval); }
break;
case 347: /* list_of_itervars: list_of_itervars PERLY_COMMA scalar */
-#line 1904 "perly.y"
+#line 1881 "perly.y"
{
(yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), (ps[0].val.opval));
}
@@ -2244,7 +2221,7 @@ case 2: /* @1: %empty */
break;
case 348: /* list_of_itervars: list_of_itervars PERLY_COMMA REFGEN my_var */
-#line 1908 "perly.y"
+#line 1885 "perly.y"
{
(yyval.opval) = op_append_elem(OP_LIST, (ps[-3].val.opval), newUNOP(OP_REFGEN, 0, (ps[0].val.opval)));
}
@@ -2252,7 +2229,7 @@ case 2: /* @1: %empty */
break;
case 350: /* list_of_itervars: REFGEN my_var */
-#line 1913 "perly.y"
+#line 1890 "perly.y"
{
(yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval));
}
@@ -2260,25 +2237,25 @@ case 2: /* @1: %empty */
break;
case 351: /* my_list_of_itervars: list_of_itervars */
-#line 1919 "perly.y"
+#line 1896 "perly.y"
{ parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
break;
case 359: /* amper: PERLY_AMPERSAND indirob */
-#line 1936 "perly.y"
+#line 1913 "perly.y"
{ (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
break;
case 360: /* scalar: PERLY_DOLLAR indirob */
-#line 1940 "perly.y"
+#line 1917 "perly.y"
{ (yyval.opval) = newSVREF((ps[0].val.opval)); }
break;
case 361: /* ary: PERLY_SNAIL indirob */
-#line 1944 "perly.y"
+#line 1921 "perly.y"
{ (yyval.opval) = newAVREF((ps[0].val.opval));
if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
}
@@ -2286,7 +2263,7 @@ case 2: /* @1: %empty */
break;
case 362: /* hsh: PERLY_PERCENT_SIGN indirob */
-#line 1950 "perly.y"
+#line 1927 "perly.y"
{ (yyval.opval) = newHVREF((ps[0].val.opval));
if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
}
@@ -2294,61 +2271,61 @@ case 2: /* @1: %empty */
break;
case 363: /* arylen: DOLSHARP indirob */
-#line 1956 "perly.y"
+#line 1933 "perly.y"
{ (yyval.opval) = newAVREF((ps[0].val.opval)); }
break;
case 364: /* arylen: term ARROW DOLSHARP PERLY_STAR */
-#line 1958 "perly.y"
+#line 1935 "perly.y"
{ (yyval.opval) = newAVREF((ps[-3].val.opval)); }
break;
case 365: /* star: PERLY_STAR indirob */
-#line 1962 "perly.y"
+#line 1939 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
break;
case 367: /* sliceme: term ARROW PERLY_SNAIL */
-#line 1967 "perly.y"
+#line 1944 "perly.y"
{ (yyval.opval) = newAVREF((ps[-2].val.opval)); }
break;
case 369: /* kvslice: term ARROW PERLY_PERCENT_SIGN */
-#line 1972 "perly.y"
+#line 1949 "perly.y"
{ (yyval.opval) = newHVREF((ps[-2].val.opval)); }
break;
case 371: /* gelem: term ARROW PERLY_STAR */
-#line 1977 "perly.y"
+#line 1954 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
break;
case 372: /* indirob: BAREWORD */
-#line 1982 "perly.y"
+#line 1959 "perly.y"
{ (yyval.opval) = scalar((ps[0].val.opval)); }
break;
case 373: /* indirob: scalar */
-#line 1984 "perly.y"
+#line 1961 "perly.y"
{ (yyval.opval) = scalar((ps[0].val.opval)); }
break;
case 374: /* indirob: block */
-#line 1986 "perly.y"
+#line 1963 "perly.y"
{ (yyval.opval) = op_scope((ps[0].val.opval)); }
break;
case 375: /* indirob: PRIVATEREF */
-#line 1989 "perly.y"
+#line 1966 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
@@ -2360,6 +2337,6 @@ case 2: /* @1: %empty */
/* Generated from:
- * b12d68c6ed2e81f035beefd1839db151da3de7f4f927226ab445f4f26d83aac2 perly.y
+ * b5e6ab7c55756d33fa71abcf265983baf1706f90247cd28f30e446d04f94b5d2 perly.y
* ba173fe7f0e9b6b5465fb5d0705af3290ac7d8b511f0eead585307eb6c68918d regen_perly.pl
* ex: set ro ft=c: */
diff --git a/perly.h b/perly.h
index 0fccf3e929..978df52f1c 100644
--- a/perly.h
+++ b/perly.h
@@ -248,6 +248,6 @@ int yyparse (void);
/* Generated from:
- * b12d68c6ed2e81f035beefd1839db151da3de7f4f927226ab445f4f26d83aac2 perly.y
+ * b5e6ab7c55756d33fa71abcf265983baf1706f90247cd28f30e446d04f94b5d2 perly.y
* ba173fe7f0e9b6b5465fb5d0705af3290ac7d8b511f0eead585307eb6c68918d regen_perly.pl
* ex: set ro ft=c: */
diff --git a/perly.tab b/perly.tab
index c309288b01..476085e504 100644
--- a/perly.tab
+++ b/perly.tab
@@ -384,25 +384,25 @@ static const yytype_int16 yyrline[] =
1188, 1190, 1195, 1197, 1205, 1206, 1207, 1212, 1213, 1218,
1219, 1223, 1227, 1227, 1260, 1261, 1267, 1266, 1283, 1284,
1289, 1294, 1288, 1306, 1308, 1310, 1312, 1314, 1318, 1320,
- 1325, 1329, 1333, 1337, 1342, 1360, 1375, 1394, 1410, 1425,
- 1440, 1442, 1444, 1447, 1446, 1460, 1461, 1465, 1469, 1472,
- 1477, 1480, 1484, 1491, 1497, 1499, 1501, 1506, 1508, 1510,
- 1512, 1514, 1516, 1521, 1523, 1525, 1527, 1529, 1531, 1533,
- 1535, 1537, 1539, 1541, 1543, 1545, 1547, 1549, 1551, 1555,
- 1557, 1559, 1561, 1563, 1567, 1569, 1573, 1575, 1577, 1579,
- 1583, 1585, 1590, 1592, 1595, 1597, 1599, 1602, 1605, 1616,
- 1619, 1627, 1629, 1631, 1634, 1636, 1639, 1641, 1646, 1651,
- 1653, 1657, 1658, 1659, 1660, 1661, 1663, 1665, 1667, 1669,
- 1671, 1673, 1675, 1677, 1679, 1681, 1683, 1685, 1687, 1697,
- 1707, 1717, 1727, 1729, 1731, 1734, 1739, 1743, 1745, 1747,
- 1749, 1752, 1754, 1757, 1759, 1761, 1763, 1765, 1767, 1769,
- 1771, 1773, 1776, 1778, 1780, 1782, 1784, 1786, 1790, 1793,
- 1792, 1805, 1806, 1807, 1812, 1814, 1816, 1818, 1823, 1825,
- 1828, 1830, 1832, 1837, 1842, 1847, 1855, 1863, 1862, 1880,
- 1881, 1885, 1886, 1890, 1891, 1896, 1901, 1903, 1907, 1911,
- 1912, 1918, 1922, 1923, 1924, 1927, 1928, 1931, 1932, 1935,
- 1939, 1943, 1949, 1955, 1957, 1961, 1965, 1966, 1970, 1971,
- 1975, 1976, 1981, 1983, 1985, 1988
+ 1325, 1329, 1333, 1337, 1342, 1356, 1367, 1382, 1394, 1405,
+ 1417, 1419, 1421, 1424, 1423, 1437, 1438, 1442, 1446, 1449,
+ 1454, 1457, 1461, 1468, 1474, 1476, 1478, 1483, 1485, 1487,
+ 1489, 1491, 1493, 1498, 1500, 1502, 1504, 1506, 1508, 1510,
+ 1512, 1514, 1516, 1518, 1520, 1522, 1524, 1526, 1528, 1532,
+ 1534, 1536, 1538, 1540, 1544, 1546, 1550, 1552, 1554, 1556,
+ 1560, 1562, 1567, 1569, 1572, 1574, 1576, 1579, 1582, 1593,
+ 1596, 1604, 1606, 1608, 1611, 1613, 1616, 1618, 1623, 1628,
+ 1630, 1634, 1635, 1636, 1637, 1638, 1640, 1642, 1644, 1646,
+ 1648, 1650, 1652, 1654, 1656, 1658, 1660, 1662, 1664, 1674,
+ 1684, 1694, 1704, 1706, 1708, 1711, 1716, 1720, 1722, 1724,
+ 1726, 1729, 1731, 1734, 1736, 1738, 1740, 1742, 1744, 1746,
+ 1748, 1750, 1753, 1755, 1757, 1759, 1761, 1763, 1767, 1770,
+ 1769, 1782, 1783, 1784, 1789, 1791, 1793, 1795, 1800, 1802,
+ 1805, 1807, 1809, 1814, 1819, 1824, 1832, 1840, 1839, 1857,
+ 1858, 1862, 1863, 1867, 1868, 1873, 1878, 1880, 1884, 1888,
+ 1889, 1895, 1899, 1900, 1901, 1904, 1905, 1908, 1909, 1912,
+ 1916, 1920, 1926, 1932, 1934, 1938, 1942, 1943, 1947, 1948,
+ 1952, 1953, 1958, 1960, 1962, 1965
};
#endif
@@ -1667,6 +1667,6 @@ static const toketypes yy_type_tab[] =
};
/* Generated from:
- * b12d68c6ed2e81f035beefd1839db151da3de7f4f927226ab445f4f26d83aac2 perly.y
+ * b5e6ab7c55756d33fa71abcf265983baf1706f90247cd28f30e446d04f94b5d2 perly.y
* ba173fe7f0e9b6b5465fb5d0705af3290ac7d8b511f0eead585307eb6c68918d regen_perly.pl
* ex: set ro ft=c: */
diff --git a/perly.y b/perly.y
index a107e387df..00773c8f02 100644
--- a/perly.y
+++ b/perly.y
@@ -1346,14 +1346,10 @@ listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */
optexpr [arguments]
PERLY_PAREN_CLOSE
{
- $$ = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ($target), $arguments),
- newMETHOP (OP_METHOD, 0, $method)
- )
+ $$ = build_method_invocation (
+ scalar ($target),
+ newMETHOP (OP_METHOD, 0, $method),
+ $arguments
);
}
| /* $foo->bar */
@@ -1361,14 +1357,10 @@ listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */
ARROW
methodname [method]
{
- $$ = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ($target), NULL),
- newMETHOP (OP_METHOD, 0, $method)
- )
+ $$ = build_method_invocation (
+ scalar ($target),
+ newMETHOP (OP_METHOD, 0, $method),
+ NULL
);
}
| /* $foo->&bar(list) */
@@ -1380,14 +1372,10 @@ listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */
optexpr [arguments]
PERLY_PAREN_CLOSE
{
- $$ = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ($target), $arguments),
- newCVREF (0, $method)
- )
+ $$ = build_method_invocation (
+ scalar ($target),
+ newCVREF (0, $method),
+ $arguments
);
}
| /* $foo->&bar */
@@ -1396,14 +1384,10 @@ listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */
PERLY_AMPERSAND
subname [method]
{
- $$ = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments (scalar ($target), NULL),
- newCVREF (0, $method)
- )
+ $$ = build_method_invocation (
+ scalar ($target),
+ newCVREF (0, $method),
+ NULL
);
}
| /* new Class @args */
@@ -1411,14 +1395,10 @@ listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */
indirob [target]
optlistexpr [arguments]
{
- $$ = op_convert_list (
- OP_ENTERSUB,
- OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments ($target, $arguments),
- newMETHOP (OP_METHOD, 0, $method)
- )
+ $$ = build_method_invocation (
+ $target,
+ newMETHOP (OP_METHOD, 0, $method),
+ $arguments
);
}
| /* method $object (@args) */
@@ -1428,13 +1408,10 @@ listop : LSTOP indirob listexpr /* map {...} @args or print $fh @args */
optexpr [arguments]
PERLY_PAREN_CLOSE
{
- $$ = op_convert_list (
- OP_ENTERSUB, OPf_STACKED,
- op_append_elem (
- OP_LIST,
- build_method_invocation_arguments ($target, $arguments),
- newMETHOP(OP_METHOD, 0, $method)
- )
+ $$ = build_method_invocation (
+ $target,
+ newMETHOP (OP_METHOD, 0, $method),
+ $arguments
);
}
| LSTOP optlistexpr /* print @args */
diff --git a/proto.h b/proto.h
index 2f683993e1..d57d113b28 100644
--- a/proto.h
+++ b/proto.h
@@ -571,6 +571,17 @@ Perl_build_infix_plugin(pTHX_ OP *lhs, OP *rhs, void *tokendata)
assert(tokendata); PERL_UNUSED_CONTEXT_FOR_ARGS_ASSERT; \
} STMT_END
+PERL_CALLCONV OP *
+Perl_build_method_invocation(pTHX_ OP *target, OP *method, OP *arguments)
+ Perl_attribute_nonnull_aTHX
+ Perl_attribute_nonnull(pTHX_1)
+ Perl_attribute_nonnull(pTHX_2)
+ __attribute__visibility__("hidden");
+#define PERL_ARGS_ASSERT_BUILD_METHOD_INVOCATION \
+ STMT_START { Perl_assert_aTHX; assert(target); assert(method); \
+ PERL_UNUSED_CONTEXT_FOR_ARGS_ASSERT; \
+ } STMT_END
+
PERL_CALLCONV OP *
Perl_build_method_invocation_arguments(pTHX_ OP *target, OP *arguments)
Perl_attribute_nonnull_aTHX