Use `optexpr` in anonymous to reduce number of symbols

1 files changed, 159 insertions, 171 deletions

diff --git a/perly.act b/perly.act
index b0579676a7..1af5c37ace 100644
--- a/perly.act
+++ b/perly.act
@@ -1521,135 +1521,123 @@ case 2:
     break;
 
   case 202:
-#line 1179 "perly.y"
+#line 1180 "perly.y"
     { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
 
     break;
 
   case 203:
-#line 1181 "perly.y"
-    { (yyval.opval) = newANONLIST(NULL);}
-
-    break;
-
-  case 204:
-#line 1183 "perly.y"
+#line 1182 "perly.y"
     { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
 
     break;
 
-  case 205:
-#line 1185 "perly.y"
-    { (yyval.opval) = newANONHASH(NULL); }
-
-    break;
-
-  case 206:
-#line 1187 "perly.y"
+  case 204:
+#line 1184 "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 207:
-#line 1190 "perly.y"
+  case 205:
+#line 1187 "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 208:
-#line 1196 "perly.y"
+  case 206:
+#line 1193 "perly.y"
     { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
 
     break;
 
-  case 209:
-#line 1198 "perly.y"
+  case 207:
+#line 1195 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
 
     break;
 
-  case 214:
-#line 1206 "perly.y"
+  case 212:
+#line 1203 "perly.y"
     { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 215:
-#line 1208 "perly.y"
+  case 213:
+#line 1205 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
 
     break;
 
-  case 216:
-#line 1210 "perly.y"
+  case 214:
+#line 1207 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 217:
-#line 1212 "perly.y"
+  case 215:
+#line 1209 "perly.y"
     { (yyval.opval) = localize((ps[0].val.opval),0); }
 
     break;
 
-  case 218:
-#line 1214 "perly.y"
+  case 216:
+#line 1211 "perly.y"
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
-  case 219:
-#line 1216 "perly.y"
+  case 217:
+#line 1213 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 220:
-#line 1218 "perly.y"
+  case 218:
+#line 1215 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
-  case 221:
-#line 1220 "perly.y"
+  case 219:
+#line 1217 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 222:
-#line 1222 "perly.y"
+  case 220:
+#line 1219 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 223:
-#line 1224 "perly.y"
+  case 221:
+#line 1221 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 224:
-#line 1226 "perly.y"
+  case 222:
+#line 1223 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 225:
-#line 1228 "perly.y"
+  case 223:
+#line 1225 "perly.y"
     { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
 
     break;
 
-  case 226:
-#line 1230 "perly.y"
+  case 224:
+#line 1227 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 227:
-#line 1232 "perly.y"
+  case 225:
+#line 1229 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
@@ -1662,8 +1650,8 @@ case 2:
 
     break;
 
-  case 228:
-#line 1242 "perly.y"
+  case 226:
+#line 1239 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_KVASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVASLICE, 0,
@@ -1676,8 +1664,8 @@ case 2:
 
     break;
 
-  case 229:
-#line 1252 "perly.y"
+  case 227:
+#line 1249 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
@@ -1690,8 +1678,8 @@ case 2:
 
     break;
 
-  case 230:
-#line 1262 "perly.y"
+  case 228:
+#line 1259 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVHSLICE, 0,
@@ -1704,27 +1692,27 @@ case 2:
 
     break;
 
-  case 231:
-#line 1272 "perly.y"
+  case 229:
+#line 1269 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 232:
-#line 1274 "perly.y"
+  case 230:
+#line 1271 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 233:
-#line 1276 "perly.y"
+  case 231:
+#line 1273 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
 			}
 
     break;
 
-  case 234:
-#line 1279 "perly.y"
+  case 232:
+#line 1276 "perly.y"
     {
 			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
@@ -1732,153 +1720,153 @@ case 2:
 
     break;
 
-  case 235:
-#line 1284 "perly.y"
+  case 233:
+#line 1281 "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 236:
-#line 1288 "perly.y"
+  case 234:
+#line 1285 "perly.y"
     { (yyval.opval) = newSVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 237:
-#line 1290 "perly.y"
+  case 235:
+#line 1287 "perly.y"
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 238:
-#line 1292 "perly.y"
+  case 236:
+#line 1289 "perly.y"
     { (yyval.opval) = newHVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 239:
-#line 1294 "perly.y"
+  case 237:
+#line 1291 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
 				       scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
 
     break;
 
-  case 240:
-#line 1297 "perly.y"
+  case 238:
+#line 1294 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
 
     break;
 
-  case 241:
-#line 1299 "perly.y"
+  case 239:
+#line 1296 "perly.y"
     { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 
     break;
 
-  case 242:
-#line 1302 "perly.y"
+  case 240:
+#line 1299 "perly.y"
     { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
-  case 243:
-#line 1304 "perly.y"
+  case 241:
+#line 1301 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 244:
-#line 1306 "perly.y"
+  case 242:
+#line 1303 "perly.y"
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
-  case 245:
-#line 1308 "perly.y"
+  case 243:
+#line 1305 "perly.y"
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
-  case 246:
-#line 1310 "perly.y"
+  case 244:
+#line 1307 "perly.y"
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
-  case 247:
-#line 1312 "perly.y"
+  case 245:
+#line 1309 "perly.y"
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
 
     break;
 
-  case 248:
-#line 1314 "perly.y"
+  case 246:
+#line 1311 "perly.y"
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
 
     break;
 
-  case 249:
-#line 1316 "perly.y"
+  case 247:
+#line 1313 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 250:
-#line 1318 "perly.y"
+  case 248:
+#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)))); }
 
     break;
 
-  case 251:
-#line 1321 "perly.y"
+  case 249:
+#line 1318 "perly.y"
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
-  case 252:
-#line 1323 "perly.y"
+  case 250:
+#line 1320 "perly.y"
     { (yyval.opval) = newOP((ps[-2].val.ival), 0);}
 
     break;
 
-  case 253:
-#line 1325 "perly.y"
+  case 251:
+#line 1322 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 254:
-#line 1327 "perly.y"
+  case 252:
+#line 1324 "perly.y"
     { (yyval.opval) = (ps[-2].val.opval); }
 
     break;
 
-  case 255:
-#line 1329 "perly.y"
+  case 253:
+#line 1326 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 256:
-#line 1331 "perly.y"
+  case 254:
+#line 1328 "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); }
 
     break;
 
-  case 257:
-#line 1335 "perly.y"
+  case 255:
+#line 1332 "perly.y"
     { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
-  case 258:
-#line 1337 "perly.y"
+  case 256:
+#line 1334 "perly.y"
     {
 			    if (   (ps[0].val.opval)->op_type != OP_TRANS
 			        && (ps[0].val.opval)->op_type != OP_TRANSR
@@ -1892,182 +1880,182 @@ case 2:
 
     break;
 
-  case 259:
-#line 1348 "perly.y"
+  case 257:
+#line 1345 "perly.y"
     { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
 
     break;
 
-  case 263:
-#line 1357 "perly.y"
+  case 261:
+#line 1354 "perly.y"
     { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
 
     break;
 
-  case 264:
-#line 1359 "perly.y"
+  case 262:
+#line 1356 "perly.y"
     { (yyval.opval) = localize((ps[0].val.opval),1); }
 
     break;
 
-  case 265:
-#line 1361 "perly.y"
+  case 263:
+#line 1358 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
 
     break;
 
-  case 266:
-#line 1363 "perly.y"
+  case 264:
+#line 1360 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
 
     break;
 
-  case 267:
-#line 1368 "perly.y"
+  case 265:
+#line 1365 "perly.y"
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
-  case 268:
-#line 1370 "perly.y"
+  case 266:
+#line 1367 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
-  case 269:
-#line 1373 "perly.y"
+  case 267:
+#line 1370 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 270:
-#line 1375 "perly.y"
+  case 268:
+#line 1372 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 271:
-#line 1377 "perly.y"
+  case 269:
+#line 1374 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 277:
-#line 1393 "perly.y"
+  case 275:
+#line 1390 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 278:
-#line 1399 "perly.y"
+  case 276:
+#line 1396 "perly.y"
     { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
 
     break;
 
-  case 279:
-#line 1404 "perly.y"
+  case 277:
+#line 1401 "perly.y"
     { (yyval.opval) = (ps[-1].val.opval); }
 
     break;
 
-  case 280:
-#line 1406 "perly.y"
+  case 278:
+#line 1403 "perly.y"
     {
 			  (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), (ps[0].val.opval));
 			}
 
     break;
 
-  case 282:
-#line 1413 "perly.y"
+  case 280:
+#line 1410 "perly.y"
     { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 290:
-#line 1430 "perly.y"
+  case 288:
+#line 1427 "perly.y"
     { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
-  case 291:
-#line 1434 "perly.y"
+  case 289:
+#line 1431 "perly.y"
     { (yyval.opval) = newSVREF((ps[0].val.opval)); }
 
     break;
 
-  case 292:
-#line 1438 "perly.y"
+  case 290:
+#line 1435 "perly.y"
     { (yyval.opval) = newAVREF((ps[0].val.opval));
 			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
 			}
 
     break;
 
-  case 293:
-#line 1444 "perly.y"
+  case 291:
+#line 1441 "perly.y"
     { (yyval.opval) = newHVREF((ps[0].val.opval));
 			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
 			}
 
     break;
 
-  case 294:
-#line 1450 "perly.y"
+  case 292:
+#line 1447 "perly.y"
     { (yyval.opval) = newAVREF((ps[0].val.opval)); }
 
     break;
 
-  case 295:
-#line 1452 "perly.y"
+  case 293:
+#line 1449 "perly.y"
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 296:
-#line 1456 "perly.y"
+  case 294:
+#line 1453 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
 
     break;
 
-  case 298:
-#line 1461 "perly.y"
+  case 296:
+#line 1458 "perly.y"
     { (yyval.opval) = newAVREF((ps[-2].val.opval)); }
 
     break;
 
-  case 300:
-#line 1466 "perly.y"
+  case 298:
+#line 1463 "perly.y"
     { (yyval.opval) = newHVREF((ps[-2].val.opval)); }
 
     break;
 
-  case 302:
-#line 1471 "perly.y"
+  case 300:
+#line 1468 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
 
     break;
 
-  case 303:
-#line 1476 "perly.y"
+  case 301:
+#line 1473 "perly.y"
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
-  case 304:
-#line 1478 "perly.y"
+  case 302:
+#line 1475 "perly.y"
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
-  case 305:
-#line 1480 "perly.y"
+  case 303:
+#line 1477 "perly.y"
     { (yyval.opval) = op_scope((ps[0].val.opval)); }
 
     break;
 
-  case 306:
-#line 1483 "perly.y"
+  case 304:
+#line 1480 "perly.y"
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
@@ -2078,6 +2066,6 @@ case 2:
     
 
 /* Generated from:
- * 2dfefce380093b4e965ea327b172cdeabe9d706bf879f0fea6e9388ee185bd32 perly.y
+ * ca24735b20f03bbadda9ec058afec3167a568972f3c67a6554ab9fb37433b5ea perly.y
  * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl
  * ex: set ro: */