summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--perly.act444
-rw-r--r--perly.h2
-rw-r--r--perly.tab56
-rw-r--r--perly.y6
4 files changed, 257 insertions, 251 deletions
diff --git a/perly.act b/perly.act
index bf9f5e97ef..ad8add1dc4 100644
--- a/perly.act
+++ b/perly.act
@@ -332,7 +332,7 @@ case 2:
break;
case 40:
-#line 384 "perly.y"
+#line 388 "perly.y"
{
package((ps[-1].val.opval));
if ((ps[-2].val.opval))
@@ -343,13 +343,13 @@ case 2:
break;
case 41:
-#line 391 "perly.y"
+#line 395 "perly.y"
{ CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
break;
case 42:
-#line 393 "perly.y"
+#line 399 "perly.y"
{
SvREFCNT_inc_simple_void(PL_compcv);
utilize((ps[-6].val.ival), (ps[-5].val.ival), (ps[-3].val.opval), (ps[-2].val.opval), (ps[-1].val.opval));
@@ -360,7 +360,7 @@ case 2:
break;
case 43:
-#line 400 "perly.y"
+#line 406 "perly.y"
{
(yyval.opval) = block_end((ps[-4].val.ival),
newCONDOP(0, (ps[-3].val.opval), op_scope((ps[-1].val.opval)), (ps[0].val.opval)));
@@ -370,7 +370,7 @@ case 2:
break;
case 44:
-#line 406 "perly.y"
+#line 412 "perly.y"
{
(yyval.opval) = block_end((ps[-4].val.ival),
newCONDOP(0, (ps[-3].val.opval), (ps[0].val.opval), op_scope((ps[-1].val.opval))));
@@ -380,7 +380,7 @@ case 2:
break;
case 45:
-#line 412 "perly.y"
+#line 418 "perly.y"
{
(yyval.opval) = block_end((ps[-3].val.ival), newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0));
parser->copline = (line_t)(ps[-5].val.ival);
@@ -389,19 +389,19 @@ case 2:
break;
case 46:
-#line 417 "perly.y"
+#line 423 "perly.y"
{ (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); }
break;
case 47:
-#line 419 "perly.y"
+#line 425 "perly.y"
{ (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); }
break;
case 48:
-#line 421 "perly.y"
+#line 427 "perly.y"
{
(yyval.opval) = block_end((ps[-5].val.ival),
newWHILEOP(0, 1, NULL,
@@ -412,7 +412,7 @@ case 2:
break;
case 49:
-#line 428 "perly.y"
+#line 434 "perly.y"
{
(yyval.opval) = block_end((ps[-5].val.ival),
newWHILEOP(0, 1, NULL,
@@ -423,19 +423,19 @@ case 2:
break;
case 50:
-#line 435 "perly.y"
+#line 441 "perly.y"
{ parser->expect = XTERM; }
break;
case 51:
-#line 437 "perly.y"
+#line 443 "perly.y"
{ parser->expect = XTERM; }
break;
case 52:
-#line 440 "perly.y"
+#line 446 "perly.y"
{
OP *initop = (ps[-9].val.opval);
OP *forop = newWHILEOP(0, 1, NULL,
@@ -454,7 +454,7 @@ case 2:
break;
case 53:
-#line 455 "perly.y"
+#line 461 "perly.y"
{
(yyval.opval) = block_end((ps[-6].val.ival), newFOROP(0, (ps[-5].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
parser->copline = (line_t)(ps[-8].val.ival);
@@ -463,7 +463,7 @@ case 2:
break;
case 54:
-#line 460 "perly.y"
+#line 466 "perly.y"
{
if ((ps[-6].val.opval)->op_type == OP_PADSV)
/* degenerate case of 1 var: for my ($x) ....
@@ -476,7 +476,7 @@ case 2:
break;
case 55:
-#line 469 "perly.y"
+#line 475 "perly.y"
{
(yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0,
op_lvalue((ps[-6].val.opval), OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
@@ -486,13 +486,13 @@ case 2:
break;
case 56:
-#line 475 "perly.y"
+#line 481 "perly.y"
{ parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
break;
case 57:
-#line 477 "perly.y"
+#line 483 "perly.y"
{
(yyval.opval) = block_end(
(ps[-7].val.ival),
@@ -509,7 +509,7 @@ case 2:
break;
case 58:
-#line 490 "perly.y"
+#line 496 "perly.y"
{
(yyval.opval) = block_end((ps[-4].val.ival), newFOROP(
0, op_lvalue(newUNOP(OP_REFGEN, 0,
@@ -521,7 +521,7 @@ case 2:
break;
case 59:
-#line 498 "perly.y"
+#line 504 "perly.y"
{
(yyval.opval) = block_end((ps[-4].val.ival),
newFOROP(0, NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
@@ -531,7 +531,7 @@ case 2:
break;
case 60:
-#line 504 "perly.y"
+#line 510 "perly.y"
{
if(!(ps[0].val.opval)) {
yyerror("catch block requires a (VAR)");
@@ -542,7 +542,7 @@ case 2:
break;
case 61:
-#line 511 "perly.y"
+#line 517 "perly.y"
{
(yyval.opval) = newTRYCATCHOP(0,
(ps[-6].val.opval), (ps[-3].val.opval), block_end((ps[-4].val.ival), op_scope((ps[-1].val.opval))));
@@ -554,7 +554,7 @@ case 2:
break;
case 62:
-#line 519 "perly.y"
+#line 525 "perly.y"
{
/* a block is a loop that happens once */
(yyval.opval) = newWHILEOP(0, 1, NULL,
@@ -564,7 +564,7 @@ case 2:
break;
case 63:
-#line 525 "perly.y"
+#line 531 "perly.y"
{
package((ps[-2].val.opval));
if ((ps[-3].val.opval)) {
@@ -575,7 +575,7 @@ case 2:
break;
case 64:
-#line 532 "perly.y"
+#line 538 "perly.y"
{
/* a block is a loop that happens once */
(yyval.opval) = newWHILEOP(0, 1, NULL,
@@ -587,7 +587,7 @@ case 2:
break;
case 65:
-#line 540 "perly.y"
+#line 546 "perly.y"
{
(yyval.opval) = (ps[-1].val.opval);
}
@@ -595,7 +595,7 @@ case 2:
break;
case 66:
-#line 544 "perly.y"
+#line 550 "perly.y"
{
(yyval.opval) = newDEFEROP(0, op_scope((ps[0].val.opval)));
}
@@ -603,7 +603,7 @@ case 2:
break;
case 67:
-#line 548 "perly.y"
+#line 554 "perly.y"
{
(yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
@@ -612,7 +612,7 @@ case 2:
break;
case 68:
-#line 553 "perly.y"
+#line 559 "perly.y"
{
(yyval.opval) = NULL;
parser->copline = NOLINE;
@@ -621,7 +621,7 @@ case 2:
break;
case 69:
-#line 561 "perly.y"
+#line 567 "perly.y"
{ OP *list;
if ((ps[0].val.opval)) {
OP *term = (ps[0].val.opval);
@@ -640,62 +640,62 @@ case 2:
break;
case 71:
-#line 580 "perly.y"
+#line 586 "perly.y"
{ (yyval.opval) = op_unscope((ps[-1].val.opval)); }
break;
case 73:
-#line 588 "perly.y"
+#line 594 "perly.y"
{ (yyval.opval) = NULL; }
break;
case 74:
-#line 590 "perly.y"
+#line 596 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 75:
-#line 592 "perly.y"
+#line 598 "perly.y"
{ (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
break;
case 76:
-#line 594 "perly.y"
+#line 600 "perly.y"
{ (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
break;
case 77:
-#line 596 "perly.y"
+#line 602 "perly.y"
{ (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); }
break;
case 78:
-#line 598 "perly.y"
+#line 604 "perly.y"
{ (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); }
break;
case 79:
-#line 600 "perly.y"
+#line 606 "perly.y"
{ (yyval.opval) = newFOROP(0, NULL, (ps[0].val.opval), (ps[-2].val.opval), NULL);
parser->copline = (line_t)(ps[-1].val.ival); }
break;
case 80:
-#line 603 "perly.y"
+#line 609 "perly.y"
{ (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); }
break;
case 82:
-#line 610 "perly.y"
+#line 616 "perly.y"
{
((ps[0].val.opval))->op_flags |= OPf_PARENS;
(yyval.opval) = op_scope((ps[0].val.opval));
@@ -704,7 +704,7 @@ case 2:
break;
case 83:
-#line 615 "perly.y"
+#line 621 "perly.y"
{ parser->copline = (line_t)(ps[-5].val.ival);
(yyval.opval) = newCONDOP(0,
newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)),
@@ -715,25 +715,25 @@ case 2:
break;
case 85:
-#line 627 "perly.y"
+#line 633 "perly.y"
{ (yyval.opval) = op_scope((ps[0].val.opval)); }
break;
case 86:
-#line 632 "perly.y"
+#line 638 "perly.y"
{ (yyval.opval) = NULL; }
break;
case 87:
-#line 634 "perly.y"
+#line 640 "perly.y"
{ (yyval.opval) = op_scope((ps[0].val.opval)); }
break;
case 88:
-#line 639 "perly.y"
+#line 645 "perly.y"
{ (yyval.ival) = (PL_min_intro_pending &&
PL_max_intro_pending >= PL_min_intro_pending);
intro_my(); }
@@ -741,7 +741,7 @@ case 2:
break;
case 91:
-#line 651 "perly.y"
+#line 657 "perly.y"
{ YYSTYPE tmplval;
(void)scan_num("1", &tmplval);
(yyval.opval) = tmplval.opval; }
@@ -749,100 +749,100 @@ case 2:
break;
case 93:
-#line 659 "perly.y"
+#line 665 "perly.y"
{ (yyval.opval) = invert(scalar((ps[0].val.opval))); }
break;
case 94:
-#line 664 "perly.y"
+#line 670 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); intro_my(); }
break;
case 95:
-#line 668 "perly.y"
+#line 674 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); intro_my(); }
break;
case 96:
-#line 671 "perly.y"
+#line 677 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 98:
-#line 676 "perly.y"
+#line 682 "perly.y"
{ (yyval.ival) = start_subparse(FALSE, 0);
SAVEFREESV(PL_compcv); }
break;
case 99:
-#line 682 "perly.y"
+#line 688 "perly.y"
{ (yyval.ival) = start_subparse(FALSE, CVf_ANON);
SAVEFREESV(PL_compcv); }
break;
case 100:
-#line 687 "perly.y"
+#line 693 "perly.y"
{ (yyval.ival) = start_subparse(TRUE, 0);
SAVEFREESV(PL_compcv); }
break;
case 106:
-#line 706 "perly.y"
+#line 712 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 107:
-#line 708 "perly.y"
+#line 714 "perly.y"
{ (yyval.opval) = NULL; }
break;
case 108:
-#line 713 "perly.y"
+#line 719 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 109:
-#line 715 "perly.y"
+#line 721 "perly.y"
{ (yyval.opval) = NULL; }
break;
case 110:
-#line 726 "perly.y"
+#line 732 "perly.y"
{ parser->in_my = 0; (yyval.opval) = NULL; }
break;
case 111:
-#line 728 "perly.y"
+#line 734 "perly.y"
{ parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
break;
case 112:
-#line 733 "perly.y"
+#line 739 "perly.y"
{ (yyval.ival) = '@'; }
break;
case 113:
-#line 735 "perly.y"
+#line 741 "perly.y"
{ (yyval.ival) = '%'; }
break;
case 114:
-#line 739 "perly.y"
+#line 745 "perly.y"
{
I32 sigil = (ps[-2].val.ival);
OP *var = (ps[-1].val.opval);
@@ -862,19 +862,19 @@ case 2:
break;
case 116:
-#line 760 "perly.y"
+#line 766 "perly.y"
{ (yyval.opval) = newOP(OP_NULL, 0); }
break;
case 117:
-#line 762 "perly.y"
+#line 768 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 118:
-#line 768 "perly.y"
+#line 774 "perly.y"
{
OP *var = (ps[-1].val.opval);
OP *defexpr = (ps[0].val.opval);
@@ -939,25 +939,25 @@ case 2:
break;
case 119:
-#line 833 "perly.y"
+#line 839 "perly.y"
{ parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
break;
case 120:
-#line 835 "perly.y"
+#line 841 "perly.y"
{ parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
break;
case 121:
-#line 841 "perly.y"
+#line 847 "perly.y"
{ (yyval.opval) = (ps[-1].val.opval); }
break;
case 122:
-#line 843 "perly.y"
+#line 849 "perly.y"
{
(yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval));
}
@@ -965,19 +965,19 @@ case 2:
break;
case 123:
-#line 847 "perly.y"
+#line 853 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 128:
-#line 864 "perly.y"
+#line 870 "perly.y"
{ (yyval.opval) = (ps[-1].val.opval); }
break;
case 129:
-#line 867 "perly.y"
+#line 873 "perly.y"
{
ENTER;
SAVEIV(parser->sig_elems);
@@ -992,7 +992,7 @@ case 2:
break;
case 130:
-#line 878 "perly.y"
+#line 884 "perly.y"
{
OP *sigops = (ps[0].val.opval);
struct op_argcheck_aux *aux;
@@ -1049,13 +1049,13 @@ case 2:
break;
case 132:
-#line 935 "perly.y"
+#line 941 "perly.y"
{ (yyval.opval) = NULL; }
break;
case 133:
-#line 941 "perly.y"
+#line 947 "perly.y"
{
if (parser->copline > (line_t)(ps[-2].val.ival))
parser->copline = (line_t)(ps[-2].val.ival);
@@ -1065,13 +1065,13 @@ case 2:
break;
case 135:
-#line 953 "perly.y"
+#line 959 "perly.y"
{ (yyval.opval) = NULL; }
break;
case 136:
-#line 958 "perly.y"
+#line 964 "perly.y"
{
if (parser->copline > (line_t)(ps[-2].val.ival))
parser->copline = (line_t)(ps[-2].val.ival);
@@ -1082,25 +1082,25 @@ case 2:
break;
case 137:
-#line 969 "perly.y"
+#line 975 "perly.y"
{ (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 138:
-#line 971 "perly.y"
+#line 977 "perly.y"
{ (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 140:
-#line 977 "perly.y"
+#line 983 "perly.y"
{ (yyval.opval) = (ps[-1].val.opval); }
break;
case 141:
-#line 979 "perly.y"
+#line 985 "perly.y"
{
OP* term = (ps[0].val.opval);
(yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term);
@@ -1109,7 +1109,7 @@ case 2:
break;
case 143:
-#line 988 "perly.y"
+#line 994 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED,
op_prepend_elem(OP_LIST, newGVREF((ps[-2].val.ival),(ps[-1].val.opval)), (ps[0].val.opval)) );
}
@@ -1117,7 +1117,7 @@ case 2:
break;
case 144:
-#line 992 "perly.y"
+#line 998 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-4].val.ival), OPf_STACKED,
op_prepend_elem(OP_LIST, newGVREF((ps[-4].val.ival),(ps[-2].val.opval)), (ps[-1].val.opval)) );
}
@@ -1125,7 +1125,7 @@ case 2:
break;
case 145:
-#line 996 "perly.y"
+#line 1002 "perly.y"
{ (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, scalar((ps[-5].val.opval)), (ps[-1].val.opval)),
@@ -1135,7 +1135,7 @@ case 2:
break;
case 146:
-#line 1002 "perly.y"
+#line 1008 "perly.y"
{ (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, scalar((ps[-2].val.opval)),
newMETHOP(OP_METHOD, 0, (ps[0].val.opval))));
@@ -1144,7 +1144,7 @@ case 2:
break;
case 147:
-#line 1007 "perly.y"
+#line 1013 "perly.y"
{ (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)),
@@ -1154,7 +1154,7 @@ case 2:
break;
case 148:
-#line 1013 "perly.y"
+#line 1019 "perly.y"
{ (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, (ps[-3].val.opval), (ps[-1].val.opval)),
@@ -1164,32 +1164,32 @@ case 2:
break;
case 149:
-#line 1019 "perly.y"
+#line 1025 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }
break;
case 150:
-#line 1021 "perly.y"
+#line 1027 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
break;
case 151:
-#line 1023 "perly.y"
+#line 1029 "perly.y"
{ (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
break;
case 152:
-#line 1025 "perly.y"
+#line 1031 "perly.y"
{ SvREFCNT_inc_simple_void(PL_compcv);
(yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); }
break;
case 153:
-#line 1028 "perly.y"
+#line 1034 "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)));
@@ -1198,20 +1198,20 @@ case 2:
break;
case 156:
-#line 1043 "perly.y"
+#line 1049 "perly.y"
{ (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); }
break;
case 157:
-#line 1045 "perly.y"
+#line 1051 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval)));
}
break;
case 158:
-#line 1048 "perly.y"
+#line 1054 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0,
ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
scalar((ps[-1].val.opval)));
@@ -1220,7 +1220,7 @@ case 2:
break;
case 159:
-#line 1053 "perly.y"
+#line 1059 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0,
ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
scalar((ps[-1].val.opval)));
@@ -1229,14 +1229,14 @@ case 2:
break;
case 160:
-#line 1058 "perly.y"
+#line 1064 "perly.y"
{ (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval)));
}
break;
case 161:
-#line 1061 "perly.y"
+#line 1067 "perly.y"
{ (yyval.opval) = newBINOP(OP_HELEM, 0,
ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
jmaybe((ps[-2].val.opval))); }
@@ -1244,7 +1244,7 @@ case 2:
break;
case 162:
-#line 1065 "perly.y"
+#line 1071 "perly.y"
{ (yyval.opval) = newBINOP(OP_HELEM, 0,
ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
jmaybe((ps[-2].val.opval))); }
@@ -1252,7 +1252,7 @@ case 2:
break;
case 163:
-#line 1069 "perly.y"
+#line 1075 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
newCVREF(0, scalar((ps[-3].val.opval))));
if (parser->expect == XBLOCK)
@@ -1262,7 +1262,7 @@ case 2:
break;
case 164:
-#line 1075 "perly.y"
+#line 1081 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[-1].val.opval),
newCVREF(0, scalar((ps[-4].val.opval)))));
@@ -1273,7 +1273,7 @@ case 2:
break;
case 165:
-#line 1083 "perly.y"
+#line 1089 "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)))));
@@ -1284,7 +1284,7 @@ case 2:
break;
case 166:
-#line 1090 "perly.y"
+#line 1096 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
newCVREF(0, scalar((ps[-2].val.opval))));
if (parser->expect == XBLOCK)
@@ -1294,37 +1294,37 @@ case 2:
break;
case 167:
-#line 1096 "perly.y"
+#line 1102 "perly.y"
{ (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }
break;
case 168:
-#line 1098 "perly.y"
+#line 1104 "perly.y"
{ (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }
break;
case 169:
-#line 1100 "perly.y"
+#line 1106 "perly.y"
{ (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); }
break;
case 170:
-#line 1105 "perly.y"
+#line 1111 "perly.y"
{ (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }
break;
case 171:
-#line 1107 "perly.y"
+#line 1113 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 172:
-#line 1109 "perly.y"
+#line 1115 "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)));
@@ -1333,183 +1333,183 @@ case 2:
break;
case 173:
-#line 1114 "perly.y"
+#line 1120 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 174:
-#line 1116 "perly.y"
+#line 1122 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 175:
-#line 1118 "perly.y"
+#line 1124 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 176:
-#line 1120 "perly.y"
+#line 1126 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 177:
-#line 1122 "perly.y"
+#line 1128 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 178:
-#line 1124 "perly.y"
+#line 1130 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 179:
-#line 1126 "perly.y"
+#line 1132 "perly.y"
{ (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 180:
-#line 1128 "perly.y"
+#line 1134 "perly.y"
{ (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 181:
-#line 1130 "perly.y"
+#line 1136 "perly.y"
{ (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 182:
-#line 1132 "perly.y"
+#line 1138 "perly.y"
{ (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 183:
-#line 1134 "perly.y"
+#line 1140 "perly.y"
{ (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 184:
-#line 1138 "perly.y"
+#line 1144 "perly.y"
{ (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
break;
case 185:
-#line 1140 "perly.y"
+#line 1146 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 186:
-#line 1142 "perly.y"
+#line 1148 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 187:
-#line 1144 "perly.y"
+#line 1150 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 188:
-#line 1148 "perly.y"
+#line 1154 "perly.y"
{ (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 189:
-#line 1150 "perly.y"
+#line 1156 "perly.y"
{ (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 190:
-#line 1154 "perly.y"
+#line 1160 "perly.y"
{ (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
break;
case 191:
-#line 1156 "perly.y"
+#line 1162 "perly.y"
{ (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
break;
case 192:
-#line 1158 "perly.y"
+#line 1164 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 193:
-#line 1160 "perly.y"
+#line 1166 "perly.y"
{ yyerror("syntax error"); YYERROR; }
break;
case 194:
-#line 1164 "perly.y"
+#line 1170 "perly.y"
{ (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 195:
-#line 1166 "perly.y"
+#line 1172 "perly.y"
{ (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 196:
-#line 1171 "perly.y"
+#line 1177 "perly.y"
{ (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
break;
case 197:
-#line 1173 "perly.y"
+#line 1179 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 198:
-#line 1176 "perly.y"
+#line 1182 "perly.y"
{ (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
break;
case 199:
-#line 1178 "perly.y"
+#line 1184 "perly.y"
{ (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }
break;
case 200:
-#line 1180 "perly.y"
+#line 1186 "perly.y"
{ (yyval.opval) = newUNOP(OP_POSTINC, 0,
op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }
break;
case 201:
-#line 1183 "perly.y"
+#line 1189 "perly.y"
{ (yyval.opval) = newUNOP(OP_POSTDEC, 0,
op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
break;
case 202:
-#line 1186 "perly.y"
+#line 1192 "perly.y"
{ (yyval.opval) = op_convert_list(OP_JOIN, 0,
op_append_elem(
OP_LIST,
@@ -1524,137 +1524,137 @@ case 2:
break;
case 203:
-#line 1197 "perly.y"
+#line 1203 "perly.y"
{ (yyval.opval) = newUNOP(OP_PREINC, 0,
op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }
break;
case 204:
-#line 1200 "perly.y"
+#line 1206 "perly.y"
{ (yyval.opval) = newUNOP(OP_PREDEC, 0,
op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }
break;
case 205:
-#line 1208 "perly.y"
+#line 1214 "perly.y"
{ (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
break;
case 206:
-#line 1210 "perly.y"
+#line 1216 "perly.y"
{ (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
break;
case 207:
-#line 1212 "perly.y"
+#line 1218 "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 208:
-#line 1215 "perly.y"
+#line 1221 "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 209:
-#line 1221 "perly.y"
+#line 1227 "perly.y"
{ (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
break;
case 210:
-#line 1223 "perly.y"
+#line 1229 "perly.y"
{ (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
break;
case 215:
-#line 1231 "perly.y"
+#line 1237 "perly.y"
{ (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
break;
case 216:
-#line 1233 "perly.y"
+#line 1239 "perly.y"
{ (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
break;
case 217:
-#line 1235 "perly.y"
+#line 1241 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 218:
-#line 1237 "perly.y"
+#line 1243 "perly.y"
{ (yyval.opval) = localize((ps[0].val.opval),0); }
break;
case 219:
-#line 1239 "perly.y"
+#line 1245 "perly.y"
{ (yyval.opval) = sawparens((ps[-1].val.opval)); }
break;
case 220:
-#line 1241 "perly.y"
+#line 1247 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 221:
-#line 1243 "perly.y"
+#line 1249 "perly.y"
{ (yyval.opval) = sawparens(newNULLLIST()); }
break;
case 222:
-#line 1245 "perly.y"
+#line 1251 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 223:
-#line 1247 "perly.y"
+#line 1253 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 224:
-#line 1249 "perly.y"
+#line 1255 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 225:
-#line 1251 "perly.y"
+#line 1257 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 226:
-#line 1253 "perly.y"
+#line 1259 "perly.y"
{ (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
break;
case 227:
-#line 1255 "perly.y"
+#line 1261 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 228:
-#line 1257 "perly.y"
+#line 1263 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_ASLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_ASLICE, 0,
@@ -1668,7 +1668,7 @@ case 2:
break;
case 229:
-#line 1267 "perly.y"
+#line 1273 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_KVASLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_KVASLICE, 0,
@@ -1682,7 +1682,7 @@ case 2:
break;
case 230:
-#line 1277 "perly.y"
+#line 1283 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_HSLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_HSLICE, 0,
@@ -1696,7 +1696,7 @@ case 2:
break;
case 231:
-#line 1287 "perly.y"
+#line 1293 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_KVHSLICE, 0,
@@ -1710,26 +1710,26 @@ case 2:
break;
case 232:
-#line 1297 "perly.y"
+#line 1303 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 233:
-#line 1299 "perly.y"
+#line 1305 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
break;
case 234:
-#line 1301 "perly.y"
+#line 1307 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
}
break;
case 235:
-#line 1304 "perly.y"
+#line 1310 "perly.y"
{
(yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
@@ -1738,7 +1738,7 @@ case 2:
break;
case 236:
-#line 1309 "perly.y"
+#line 1315 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
}
@@ -1746,130 +1746,130 @@ case 2:
break;
case 237:
-#line 1313 "perly.y"
+#line 1319 "perly.y"
{ (yyval.opval) = newSVREF((ps[-3].val.opval)); }
break;
case 238:
-#line 1315 "perly.y"
+#line 1321 "perly.y"
{ (yyval.opval) = newAVREF((ps[-3].val.opval)); }
break;
case 239:
-#line 1317 "perly.y"
+#line 1323 "perly.y"
{ (yyval.opval) = newHVREF((ps[-3].val.opval)); }
break;
case 240:
-#line 1319 "perly.y"
+#line 1325 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
break;
case 241:
-#line 1322 "perly.y"
+#line 1328 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
break;
case 242:
-#line 1324 "perly.y"
+#line 1330 "perly.y"
{ (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
PL_hints |= HINT_BLOCK_SCOPE; }
break;
case 243:
-#line 1327 "perly.y"
+#line 1333 "perly.y"
{ (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
break;
case 244:
-#line 1329 "perly.y"
+#line 1335 "perly.y"
{ (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
break;
case 245:
-#line 1331 "perly.y"
+#line 1337 "perly.y"
{ (yyval.opval) = newOP((ps[0].val.ival), 0); }
break;
case 246:
-#line 1333 "perly.y"
+#line 1339 "perly.y"
{ (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
break;
case 247:
-#line 1335 "perly.y"
+#line 1341 "perly.y"
{ (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
break;
case 248:
-#line 1337 "perly.y"
+#line 1343 "perly.y"
{ (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
break;
case 249:
-#line 1339 "perly.y"
+#line 1345 "perly.y"
{ (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
break;
case 250:
-#line 1341 "perly.y"
+#line 1347 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
break;
case 251:
-#line 1343 "perly.y"
+#line 1349 "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 252:
-#line 1346 "perly.y"
+#line 1352 "perly.y"
{ (yyval.opval) = newOP((ps[0].val.ival), 0); }
break;
case 253:
-#line 1348 "perly.y"
+#line 1354 "perly.y"
{ (yyval.opval) = newOP((ps[-2].val.ival), 0);}
break;
case 254:
-#line 1350 "perly.y"
+#line 1356 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 255:
-#line 1352 "perly.y"
+#line 1358 "perly.y"
{ (yyval.opval) = (ps[-2].val.opval); }
break;
case 256:
-#line 1354 "perly.y"
+#line 1360 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
break;
case 257:
-#line 1356 "perly.y"
+#line 1362 "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); }
@@ -1877,13 +1877,13 @@ case 2:
break;
case 258:
-#line 1360 "perly.y"
+#line 1366 "perly.y"
{ (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
break;
case 259:
-#line 1362 "perly.y"
+#line 1368 "perly.y"
{
if ( (ps[0].val.opval)->op_type != OP_TRANS
&& (ps[0].val.opval)->op_type != OP_TRANSR
@@ -1898,85 +1898,85 @@ case 2:
break;
case 260:
-#line 1373 "perly.y"
+#line 1379 "perly.y"
{ (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
break;
case 264:
-#line 1382 "perly.y"
+#line 1388 "perly.y"
{ (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
break;
case 265:
-#line 1384 "perly.y"
+#line 1390 "perly.y"
{ (yyval.opval) = localize((ps[0].val.opval),1); }
break;
case 266:
-#line 1386 "perly.y"
+#line 1392 "perly.y"
{ (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
break;
case 267:
-#line 1388 "perly.y"
+#line 1394 "perly.y"
{ (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
break;
case 268:
-#line 1393 "perly.y"
+#line 1399 "perly.y"
{ (yyval.opval) = sawparens((ps[-1].val.opval)); }
break;
case 269:
-#line 1395 "perly.y"
+#line 1401 "perly.y"
{ (yyval.opval) = sawparens(newNULLLIST()); }
break;
case 270:
-#line 1398 "perly.y"
+#line 1404 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 271:
-#line 1400 "perly.y"
+#line 1406 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 272:
-#line 1402 "perly.y"
+#line 1408 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 278:
-#line 1418 "perly.y"
+#line 1424 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
case 279:
-#line 1424 "perly.y"
+#line 1430 "perly.y"
{ parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
break;
case 280:
-#line 1429 "perly.y"
+#line 1435 "perly.y"
{ (yyval.opval) = (ps[-1].val.opval); }
break;
case 281:
-#line 1431 "perly.y"
+#line 1437 "perly.y"
{
(yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), (ps[0].val.opval));
}
@@ -1984,25 +1984,25 @@ case 2:
break;
case 283:
-#line 1438 "perly.y"
+#line 1444 "perly.y"
{ parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
break;
case 291:
-#line 1455 "perly.y"
+#line 1461 "perly.y"
{ (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
break;
case 292:
-#line 1459 "perly.y"
+#line 1465 "perly.y"
{ (yyval.opval) = newSVREF((ps[0].val.opval)); }
break;
case 293:
-#line 1463 "perly.y"
+#line 1469 "perly.y"
{ (yyval.opval) = newAVREF((ps[0].val.opval));
if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
}
@@ -2010,7 +2010,7 @@ case 2:
break;
case 294:
-#line 1469 "perly.y"
+#line 1475 "perly.y"
{ (yyval.opval) = newHVREF((ps[0].val.opval));
if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
}
@@ -2018,61 +2018,61 @@ case 2:
break;
case 295:
-#line 1475 "perly.y"
+#line 1481 "perly.y"
{ (yyval.opval) = newAVREF((ps[0].val.opval)); }
break;
case 296:
-#line 1477 "perly.y"
+#line 1483 "perly.y"
{ (yyval.opval) = newAVREF((ps[-3].val.opval)); }
break;
case 297:
-#line 1481 "perly.y"
+#line 1487 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
break;
case 299:
-#line 1486 "perly.y"
+#line 1492 "perly.y"
{ (yyval.opval) = newAVREF((ps[-2].val.opval)); }
break;
case 301:
-#line 1491 "perly.y"
+#line 1497 "perly.y"
{ (yyval.opval) = newHVREF((ps[-2].val.opval)); }
break;
case 303:
-#line 1496 "perly.y"
+#line 1502 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
break;
case 304:
-#line 1501 "perly.y"
+#line 1507 "perly.y"
{ (yyval.opval) = scalar((ps[0].val.opval)); }
break;
case 305:
-#line 1503 "perly.y"
+#line 1509 "perly.y"
{ (yyval.opval) = scalar((ps[0].val.opval)); }
break;
case 306:
-#line 1505 "perly.y"
+#line 1511 "perly.y"
{ (yyval.opval) = op_scope((ps[0].val.opval)); }
break;
case 307:
-#line 1508 "perly.y"
+#line 1514 "perly.y"
{ (yyval.opval) = (ps[0].val.opval); }
break;
@@ -2083,6 +2083,6 @@ case 2:
/* Generated from:
- * 963e49faa7d19d5de631a5b22e01030327621687cee61ec2c63cb7c2602c5e3a perly.y
+ * 55819ef14038cb090c9e92492b254a2a51afa95b3471703ddad0a2546d352fae perly.y
* acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
* ex: set ro: */
diff --git a/perly.h b/perly.h
index a01d778b44..af81a01e0c 100644
--- a/perly.h
+++ b/perly.h
@@ -220,6 +220,6 @@ int yyparse (void);
/* Generated from:
- * 963e49faa7d19d5de631a5b22e01030327621687cee61ec2c63cb7c2602c5e3a perly.y
+ * 55819ef14038cb090c9e92492b254a2a51afa95b3471703ddad0a2546d352fae perly.y
* acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
* ex: set ro: */
diff --git a/perly.tab b/perly.tab
index 00541430b0..1cc3513a09 100644
--- a/perly.tab
+++ b/perly.tab
@@ -76,33 +76,33 @@ static const yytype_uint16 yyrline[] =
200, 199, 213, 212, 223, 222, 235, 243, 247, 254,
259, 266, 272, 276, 278, 275, 285, 286, 296, 297,
306, 310, 314, 321, 331, 333, 346, 343, 367, 362,
- 383, 391, 390, 399, 405, 411, 416, 418, 420, 427,
- 435, 437, 434, 454, 459, 468, 475, 474, 489, 497,
- 504, 503, 518, 525, 524, 539, 543, 547, 552, 560,
- 578, 579, 583, 587, 589, 591, 593, 595, 597, 599,
- 602, 608, 609, 614, 625, 626, 631, 633, 638, 645,
- 646, 650, 654, 658, 663, 667, 671, 672, 675, 681,
- 686, 692, 693, 698, 699, 704, 705, 707, 712, 714,
- 725, 727, 732, 734, 738, 758, 759, 761, 767, 832,
- 834, 840, 842, 846, 852, 853, 858, 859, 863, 867,
- 867, 934, 935, 940, 952, 953, 957, 968, 970, 972,
- 976, 978, 983, 987, 991, 995, 1001, 1006, 1012, 1018,
- 1020, 1022, 1025, 1024, 1035, 1036, 1040, 1044, 1047, 1052,
- 1057, 1060, 1064, 1068, 1074, 1082, 1089, 1095, 1097, 1099,
- 1104, 1106, 1108, 1113, 1115, 1117, 1119, 1121, 1123, 1125,
- 1127, 1129, 1131, 1133, 1137, 1139, 1141, 1143, 1147, 1149,
- 1153, 1155, 1157, 1159, 1163, 1165, 1170, 1172, 1175, 1177,
- 1179, 1182, 1185, 1196, 1199, 1207, 1209, 1211, 1214, 1220,
- 1222, 1226, 1227, 1228, 1229, 1230, 1232, 1234, 1236, 1238,
- 1240, 1242, 1244, 1246, 1248, 1250, 1252, 1254, 1256, 1266,
- 1276, 1286, 1296, 1298, 1300, 1303, 1308, 1312, 1314, 1316,
- 1318, 1321, 1323, 1326, 1328, 1330, 1332, 1334, 1336, 1338,
- 1340, 1342, 1345, 1347, 1349, 1351, 1353, 1355, 1359, 1362,
- 1361, 1374, 1375, 1376, 1381, 1383, 1385, 1387, 1392, 1394,
- 1397, 1399, 1401, 1407, 1408, 1412, 1413, 1417, 1418, 1423,
- 1428, 1430, 1434, 1437, 1441, 1442, 1443, 1446, 1447, 1450,
- 1451, 1454, 1458, 1462, 1468, 1474, 1476, 1480, 1484, 1485,
- 1489, 1490, 1494, 1495, 1500, 1502, 1504, 1507
+ 383, 395, 394, 405, 411, 417, 422, 424, 426, 433,
+ 441, 443, 440, 460, 465, 474, 481, 480, 495, 503,
+ 510, 509, 524, 531, 530, 545, 549, 553, 558, 566,
+ 584, 585, 589, 593, 595, 597, 599, 601, 603, 605,
+ 608, 614, 615, 620, 631, 632, 637, 639, 644, 651,
+ 652, 656, 660, 664, 669, 673, 677, 678, 681, 687,
+ 692, 698, 699, 704, 705, 710, 711, 713, 718, 720,
+ 731, 733, 738, 740, 744, 764, 765, 767, 773, 838,
+ 840, 846, 848, 852, 858, 859, 864, 865, 869, 873,
+ 873, 940, 941, 946, 958, 959, 963, 974, 976, 978,
+ 982, 984, 989, 993, 997, 1001, 1007, 1012, 1018, 1024,
+ 1026, 1028, 1031, 1030, 1041, 1042, 1046, 1050, 1053, 1058,
+ 1063, 1066, 1070, 1074, 1080, 1088, 1095, 1101, 1103, 1105,
+ 1110, 1112, 1114, 1119, 1121, 1123, 1125, 1127, 1129, 1131,
+ 1133, 1135, 1137, 1139, 1143, 1145, 1147, 1149, 1153, 1155,
+ 1159, 1161, 1163, 1165, 1169, 1171, 1176, 1178, 1181, 1183,
+ 1185, 1188, 1191, 1202, 1205, 1213, 1215, 1217, 1220, 1226,
+ 1228, 1232, 1233, 1234, 1235, 1236, 1238, 1240, 1242, 1244,
+ 1246, 1248, 1250, 1252, 1254, 1256, 1258, 1260, 1262, 1272,
+ 1282, 1292, 1302, 1304, 1306, 1309, 1314, 1318, 1320, 1322,
+ 1324, 1327, 1329, 1332, 1334, 1336, 1338, 1340, 1342, 1344,
+ 1346, 1348, 1351, 1353, 1355, 1357, 1359, 1361, 1365, 1368,
+ 1367, 1380, 1381, 1382, 1387, 1389, 1391, 1393, 1398, 1400,
+ 1403, 1405, 1407, 1413, 1414, 1418, 1419, 1423, 1424, 1429,
+ 1434, 1436, 1440, 1443, 1447, 1448, 1449, 1452, 1453, 1456,
+ 1457, 1460, 1464, 1468, 1474, 1480, 1482, 1486, 1490, 1491,
+ 1495, 1496, 1500, 1501, 1506, 1508, 1510, 1513
};
#endif
@@ -1152,6 +1152,6 @@ static const toketypes yy_type_tab[] =
};
/* Generated from:
- * 963e49faa7d19d5de631a5b22e01030327621687cee61ec2c63cb7c2602c5e3a perly.y
+ * 55819ef14038cb090c9e92492b254a2a51afa95b3471703ddad0a2546d352fae perly.y
* acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
* ex: set ro: */
diff --git a/perly.y b/perly.y
index d755fffc6c..fe0c717540 100644
--- a/perly.y
+++ b/perly.y
@@ -381,6 +381,10 @@ barestmt: PLUGSTMT
parser->parsed_sub = 1;
}
| KW_PACKAGE BAREWORD[version] BAREWORD[package] PERLY_SEMICOLON
+ /* version and package appear in the reverse order to what may be
+ * expected, because toke.c has already pushed both of them to a stack
+ * by calling force_next() from within force_version().
+ * When the parser pops them back out again they appear swapped */
{
package($package);
if ($version)
@@ -390,6 +394,8 @@ barestmt: PLUGSTMT
| KW_USE_or_NO startsub
{ CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
BAREWORD[version] BAREWORD[module] optlistexpr PERLY_SEMICOLON
+ /* version and package appear in reverse order for the same reason as
+ * KW_PACKAGE; see comment above */
{
SvREFCNT_inc_simple_void(PL_compcv);
utilize($KW_USE_or_NO, $startsub, $version, $module, $optlistexpr);