summaryrefslogtreecommitdiff
path: root/perly.act
diff options
context:
space:
mode:
authorFather Chrysostomos <sprout@cpan.org>2016-05-20 22:28:31 -0700
committerFather Chrysostomos <sprout@cpan.org>2016-07-17 11:24:06 -0700
commite118fea3ba754e973a9016295ef418b1aacb88b1 (patch)
treee9d8748b2870f675953fb88e2a11d44b04594065 /perly.act
parentbec88f1bea9be699db294f4c38b20fef00a7f605 (diff)
downloadperl-e118fea3ba754e973a9016295ef418b1aacb88b1.tar.gz
Allow my \$a
This applies to ‘my’, ‘our’, ‘state’ and ‘local’, and both to single variable and lists of variables, in all their variations: my \$a # equivalent to \my $a my \($a,$b) # equivalent to \my($a, $b) my (\($a,$b)) # same my (\$a, $b) # equivalent to (\my $a, $b)
Diffstat (limited to 'perly.act')
-rw-r--r--perly.act246
1 files changed, 128 insertions, 118 deletions
diff --git a/perly.act b/perly.act
index 445c2641b1..b4dc8f058b 100644
--- a/perly.act
+++ b/perly.act
@@ -424,22 +424,22 @@ case 2:
case 48:
#line 422 "perly.y"
- { parser->in_my = 0; (yyval.opval) = my((ps[(5) - (5)].val.opval)); ;}
+ { parser->in_my = 0; (yyval.opval) = my((ps[(4) - (4)].val.opval)); ;}
break;
case 49:
#line 424 "perly.y"
{
(yyval.opval) = block_end(
- (ps[(4) - (11)].val.ival),
+ (ps[(3) - (10)].val.ival),
newFOROP(0,
op_lvalue(
newUNOP(OP_REFGEN, 0,
- (ps[(6) - (11)].val.opval)),
+ (ps[(5) - (10)].val.opval)),
OP_ENTERLOOP),
- (ps[(8) - (11)].val.opval), (ps[(10) - (11)].val.opval), (ps[(11) - (11)].val.opval))
+ (ps[(7) - (10)].val.opval), (ps[(9) - (10)].val.opval), (ps[(10) - (10)].val.opval))
);
- parser->copline = (line_t)(ps[(1) - (11)].val.ival);
+ parser->copline = (line_t)(ps[(1) - (10)].val.ival);
;}
break;
@@ -1110,32 +1110,32 @@ case 2:
case 169:
#line 890 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+ { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[(3) - (3)].val.opval),1)); ;}
break;
case 170:
#line 892 "perly.y"
- { (yyval.opval) = localize((ps[(2) - (2)].val.opval),0); ;}
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 171:
#line 894 "perly.y"
- { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;}
+ { (yyval.opval) = localize((ps[(2) - (2)].val.opval),0); ;}
break;
case 172:
#line 896 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+ { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;}
break;
case 173:
#line 898 "perly.y"
- { (yyval.opval) = sawparens(newNULLLIST()); ;}
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 174:
#line 900 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+ { (yyval.opval) = sawparens(newNULLLIST()); ;}
break;
case 175:
@@ -1155,16 +1155,21 @@ case 2:
case 178:
#line 908 "perly.y"
- { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 179:
#line 910 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+ { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
break;
case 180:
#line 912 "perly.y"
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+ break;
+
+ case 181:
+#line 914 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_ASLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_ASLICE, 0,
@@ -1176,8 +1181,8 @@ case 2:
;}
break;
- case 181:
-#line 922 "perly.y"
+ case 182:
+#line 924 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_KVASLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_KVASLICE, 0,
@@ -1189,8 +1194,8 @@ case 2:
;}
break;
- case 182:
-#line 932 "perly.y"
+ case 183:
+#line 934 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_HSLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_HSLICE, 0,
@@ -1202,8 +1207,8 @@ case 2:
;}
break;
- case 183:
-#line 942 "perly.y"
+ case 184:
+#line 944 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_KVHSLICE, 0,
@@ -1215,87 +1220,82 @@ case 2:
;}
break;
- case 184:
-#line 952 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
- break;
-
case 185:
#line 954 "perly.y"
- { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 186:
#line 956 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
+ break;
+
+ case 187:
+#line 958 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
;}
break;
- case 187:
-#line 959 "perly.y"
+ case 188:
+#line 961 "perly.y"
{
(yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
;}
break;
- case 188:
-#line 964 "perly.y"
+ case 189:
+#line 966 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval))));
;}
break;
- case 189:
-#line 968 "perly.y"
- { (yyval.opval) = newSVREF((ps[(1) - (4)].val.opval)); ;}
- break;
-
case 190:
#line 970 "perly.y"
- { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); ;}
+ { (yyval.opval) = newSVREF((ps[(1) - (4)].val.opval)); ;}
break;
case 191:
#line 972 "perly.y"
- { (yyval.opval) = newHVREF((ps[(1) - (4)].val.opval)); ;}
+ { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); ;}
break;
case 192:
#line 974 "perly.y"
- { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
- scalar(newCVREF((ps[(3) - (4)].val.ival),(ps[(1) - (4)].val.opval)))); ;}
+ { (yyval.opval) = newHVREF((ps[(1) - (4)].val.opval)); ;}
break;
case 193:
-#line 977 "perly.y"
- { (yyval.opval) = newGVREF(0,(ps[(1) - (4)].val.opval)); ;}
+#line 976 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
+ scalar(newCVREF((ps[(3) - (4)].val.ival),(ps[(1) - (4)].val.opval)))); ;}
break;
case 194:
#line 979 "perly.y"
- { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), OPf_SPECIAL);
- PL_hints |= HINT_BLOCK_SCOPE; ;}
+ { (yyval.opval) = newGVREF(0,(ps[(1) - (4)].val.opval)); ;}
break;
case 195:
-#line 982 "perly.y"
- { (yyval.opval) = newLOOPEX((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval)); ;}
+#line 981 "perly.y"
+ { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), OPf_SPECIAL);
+ PL_hints |= HINT_BLOCK_SCOPE; ;}
break;
case 196:
#line 984 "perly.y"
- { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); ;}
+ { (yyval.opval) = newLOOPEX((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval)); ;}
break;
case 197:
#line 986 "perly.y"
- { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;}
+ { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); ;}
break;
case 198:
#line 988 "perly.y"
- { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;}
+ { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;}
break;
case 199:
@@ -1305,64 +1305,69 @@ case 2:
case 200:
#line 992 "perly.y"
- { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.ival) ? OPf_SPECIAL : 0); ;}
+ { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;}
break;
case 201:
#line 994 "perly.y"
- { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.ival) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval)); ;}
+ { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.ival) ? OPf_SPECIAL : 0); ;}
break;
case 202:
#line 996 "perly.y"
- { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
+ { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.ival) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval)); ;}
break;
case 203:
#line 998 "perly.y"
- { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
- op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
break;
case 204:
-#line 1001 "perly.y"
- { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;}
+#line 1000 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+ op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
break;
case 205:
#line 1003 "perly.y"
- { (yyval.opval) = newOP((ps[(1) - (3)].val.ival), 0);;}
+ { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;}
break;
case 206:
#line 1005 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+ { (yyval.opval) = newOP((ps[(1) - (3)].val.ival), 0);;}
break;
case 207:
#line 1007 "perly.y"
- { (yyval.opval) = (ps[(1) - (3)].val.opval); ;}
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 208:
#line 1009 "perly.y"
- { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
+ { (yyval.opval) = (ps[(1) - (3)].val.opval); ;}
break;
case 209:
#line 1011 "perly.y"
+ { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
+ break;
+
+ case 210:
+#line 1013 "perly.y"
{ (yyval.opval) = ((ps[(1) - (3)].val.ival) == OP_NOT)
? newUNOP((ps[(1) - (3)].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0)))
: newOP((ps[(1) - (3)].val.ival), OPf_SPECIAL); ;}
break;
- case 210:
-#line 1015 "perly.y"
+ case 211:
+#line 1017 "perly.y"
{ (yyval.opval) = newUNOP((ps[(1) - (4)].val.ival), 0, (ps[(3) - (4)].val.opval)); ;}
break;
- case 211:
-#line 1017 "perly.y"
+ case 212:
+#line 1019 "perly.y"
{
if ( (ps[(1) - (1)].val.opval)->op_type != OP_TRANS
&& (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR
@@ -1375,47 +1380,42 @@ case 2:
;}
break;
- case 212:
-#line 1028 "perly.y"
+ case 213:
+#line 1030 "perly.y"
{ (yyval.opval) = pmruntime((ps[(1) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), 1, (ps[(2) - (6)].val.ival)); ;}
break;
- case 215:
-#line 1032 "perly.y"
+ case 216:
+#line 1034 "perly.y"
{
(yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
;}
break;
- case 217:
-#line 1041 "perly.y"
- { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval)); ;}
- break;
-
case 218:
#line 1043 "perly.y"
- { (yyval.opval) = localize((ps[(2) - (2)].val.opval),1); ;}
+ { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval)); ;}
break;
case 219:
-#line 1048 "perly.y"
- { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;}
+#line 1045 "perly.y"
+ { (yyval.opval) = localize((ps[(2) - (2)].val.opval),1); ;}
break;
case 220:
-#line 1050 "perly.y"
- { (yyval.opval) = sawparens(newNULLLIST()); ;}
+#line 1047 "perly.y"
+ { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[(3) - (4)].val.opval),(ps[(4) - (4)].val.opval))); ;}
break;
case 221:
-#line 1053 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1052 "perly.y"
+ { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;}
break;
case 222:
-#line 1055 "perly.y"
- { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1054 "perly.y"
+ { (yyval.opval) = sawparens(newNULLLIST()); ;}
break;
case 223:
@@ -1424,111 +1424,121 @@ case 2:
break;
case 224:
-#line 1062 "perly.y"
- { (yyval.opval) = (OP*)NULL; ;}
+#line 1059 "perly.y"
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 225:
-#line 1064 "perly.y"
+#line 1061 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 226:
-#line 1068 "perly.y"
+#line 1066 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
case 227:
-#line 1070 "perly.y"
+#line 1068 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 228:
-#line 1074 "perly.y"
+#line 1072 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
case 229:
-#line 1076 "perly.y"
- { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
+#line 1074 "perly.y"
+ { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
case 230:
-#line 1082 "perly.y"
+#line 1078 "perly.y"
+ { (yyval.opval) = (OP*)NULL; ;}
+ break;
+
+ case 231:
+#line 1080 "perly.y"
+ { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
+ break;
+
+ case 232:
+#line 1086 "perly.y"
{ parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
break;
- case 236:
-#line 1095 "perly.y"
+ case 240:
+#line 1103 "perly.y"
{ (yyval.opval) = newCVREF((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval)); ;}
break;
- case 237:
-#line 1099 "perly.y"
+ case 241:
+#line 1107 "perly.y"
{ (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); ;}
break;
- case 238:
-#line 1103 "perly.y"
+ case 242:
+#line 1111 "perly.y"
{ (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
if ((yyval.opval)) (yyval.opval)->op_private |= (ps[(1) - (2)].val.ival);
;}
break;
- case 239:
-#line 1109 "perly.y"
+ case 243:
+#line 1117 "perly.y"
{ (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
if ((yyval.opval)) (yyval.opval)->op_private |= (ps[(1) - (2)].val.ival);
;}
break;
- case 240:
-#line 1115 "perly.y"
+ case 244:
+#line 1123 "perly.y"
{ (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); ;}
break;
- case 241:
-#line 1117 "perly.y"
+ case 245:
+#line 1125 "perly.y"
{ (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); ;}
break;
- case 242:
-#line 1121 "perly.y"
+ case 246:
+#line 1129 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); ;}
break;
- case 244:
-#line 1126 "perly.y"
+ case 248:
+#line 1134 "perly.y"
{ (yyval.opval) = newAVREF((ps[(1) - (3)].val.opval)); ;}
break;
- case 246:
-#line 1131 "perly.y"
+ case 250:
+#line 1139 "perly.y"
{ (yyval.opval) = newHVREF((ps[(1) - (3)].val.opval)); ;}
break;
- case 248:
-#line 1136 "perly.y"
+ case 252:
+#line 1144 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[(1) - (3)].val.opval)); ;}
break;
- case 249:
-#line 1141 "perly.y"
+ case 253:
+#line 1149 "perly.y"
{ (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
break;
- case 250:
-#line 1143 "perly.y"
+ case 254:
+#line 1151 "perly.y"
{ (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
break;
- case 251:
-#line 1145 "perly.y"
+ case 255:
+#line 1153 "perly.y"
{ (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;}
break;
- case 252:
-#line 1148 "perly.y"
+ case 256:
+#line 1156 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
@@ -1539,6 +1549,6 @@ case 2:
/* Generated from:
- * 70adb6e1be5382fb5c8cd783cd886cb4725c98a3e69c54eb16da5d7829d929aa perly.y
+ * 0e541d3dbc868833736c1ead2e604316bea18db0d8a011efbabaa89bc12eee70 perly.y
* 3e1dff60f26df8933d7aed0c0e87177a0f022c14800c0707eb62a7db4196ac98 regen_perly.pl
* ex: set ro: */