From 9a27b4a4d8ed9cce0905c91d78c279be127de229 Mon Sep 17 00:00:00 2001 From: "Paul \"LeoNerd\" Evans" Date: Fri, 14 Oct 2022 13:14:47 +0100 Subject: Better handling of builtin CV attributes The previous code would handle subroutine attributes directly against `PL_compcv` as a side-effect of merely parsing the syntax in `yyl_colon()`, an unlikely place for anyone to find it. This complicates the way the parser works. The new structure creates a new function to apply all the builtin attributes out of an attribute list to any given CV, and invokes it from the parser at a slightly better time. --- perly.act | 343 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 174 insertions(+), 169 deletions(-) (limited to 'perly.act') diff --git a/perly.act b/perly.act index ad8add1dc4..d3b095d2cf 100644 --- a/perly.act +++ b/perly.act @@ -795,54 +795,59 @@ case 2: case 106: #line 712 "perly.y" - { (yyval.opval) = (ps[0].val.opval); } + { + OP *attrlist = (ps[0].val.opval); + if(attrlist && !PL_parser->sig_seen) + attrlist = apply_builtin_cv_attributes(PL_compcv, attrlist); + (yyval.opval) = attrlist; + } break; case 107: -#line 714 "perly.y" +#line 719 "perly.y" { (yyval.opval) = NULL; } break; case 108: -#line 719 "perly.y" +#line 724 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 109: -#line 721 "perly.y" +#line 726 "perly.y" { (yyval.opval) = NULL; } break; case 110: -#line 732 "perly.y" +#line 737 "perly.y" { parser->in_my = 0; (yyval.opval) = NULL; } break; case 111: -#line 734 "perly.y" +#line 739 "perly.y" { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); } break; case 112: -#line 739 "perly.y" +#line 744 "perly.y" { (yyval.ival) = '@'; } break; case 113: -#line 741 "perly.y" +#line 746 "perly.y" { (yyval.ival) = '%'; } break; case 114: -#line 745 "perly.y" +#line 750 "perly.y" { I32 sigil = (ps[-2].val.ival); OP *var = (ps[-1].val.opval); @@ -862,19 +867,19 @@ case 2: break; case 116: -#line 766 "perly.y" +#line 771 "perly.y" { (yyval.opval) = newOP(OP_NULL, 0); } break; case 117: -#line 768 "perly.y" +#line 773 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 118: -#line 774 "perly.y" +#line 779 "perly.y" { OP *var = (ps[-1].val.opval); OP *defexpr = (ps[0].val.opval); @@ -939,25 +944,25 @@ case 2: break; case 119: -#line 839 "perly.y" +#line 844 "perly.y" { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); } break; case 120: -#line 841 "perly.y" +#line 846 "perly.y" { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); } break; case 121: -#line 847 "perly.y" +#line 852 "perly.y" { (yyval.opval) = (ps[-1].val.opval); } break; case 122: -#line 849 "perly.y" +#line 854 "perly.y" { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval)); } @@ -965,19 +970,19 @@ case 2: break; case 123: -#line 853 "perly.y" +#line 858 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 128: -#line 870 "perly.y" +#line 875 "perly.y" { (yyval.opval) = (ps[-1].val.opval); } break; case 129: -#line 873 "perly.y" +#line 878 "perly.y" { ENTER; SAVEIV(parser->sig_elems); @@ -992,7 +997,7 @@ case 2: break; case 130: -#line 884 "perly.y" +#line 889 "perly.y" { OP *sigops = (ps[0].val.opval); struct op_argcheck_aux *aux; @@ -1049,13 +1054,13 @@ case 2: break; case 132: -#line 941 "perly.y" +#line 946 "perly.y" { (yyval.opval) = NULL; } break; case 133: -#line 947 "perly.y" +#line 952 "perly.y" { if (parser->copline > (line_t)(ps[-2].val.ival)) parser->copline = (line_t)(ps[-2].val.ival); @@ -1065,13 +1070,13 @@ case 2: break; case 135: -#line 959 "perly.y" +#line 964 "perly.y" { (yyval.opval) = NULL; } break; case 136: -#line 964 "perly.y" +#line 969 "perly.y" { if (parser->copline > (line_t)(ps[-2].val.ival)) parser->copline = (line_t)(ps[-2].val.ival); @@ -1082,25 +1087,25 @@ case 2: break; case 137: -#line 975 "perly.y" +#line 980 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 138: -#line 977 "perly.y" +#line 982 "perly.y" { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 140: -#line 983 "perly.y" +#line 988 "perly.y" { (yyval.opval) = (ps[-1].val.opval); } break; case 141: -#line 985 "perly.y" +#line 990 "perly.y" { OP* term = (ps[0].val.opval); (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term); @@ -1109,7 +1114,7 @@ case 2: break; case 143: -#line 994 "perly.y" +#line 999 "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 +1122,7 @@ case 2: break; case 144: -#line 998 "perly.y" +#line 1003 "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 +1130,7 @@ case 2: break; case 145: -#line 1002 "perly.y" +#line 1007 "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 +1140,7 @@ case 2: break; case 146: -#line 1008 "perly.y" +#line 1013 "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 +1149,7 @@ case 2: break; case 147: -#line 1013 "perly.y" +#line 1018 "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 +1159,7 @@ case 2: break; case 148: -#line 1019 "perly.y" +#line 1024 "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 +1169,32 @@ case 2: break; case 149: -#line 1025 "perly.y" +#line 1030 "perly.y" { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; case 150: -#line 1027 "perly.y" +#line 1032 "perly.y" { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; case 151: -#line 1029 "perly.y" +#line 1034 "perly.y" { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; case 152: -#line 1031 "perly.y" +#line 1036 "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 1034 "perly.y" +#line 1039 "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 +1203,20 @@ case 2: break; case 156: -#line 1049 "perly.y" +#line 1054 "perly.y" { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); } break; case 157: -#line 1051 "perly.y" +#line 1056 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval))); } break; case 158: -#line 1054 "perly.y" +#line 1059 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[-4].val.opval)),OP_RV2AV), scalar((ps[-1].val.opval))); @@ -1220,7 +1225,7 @@ case 2: break; case 159: -#line 1059 "perly.y" +#line 1064 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[-3].val.opval)),OP_RV2AV), scalar((ps[-1].val.opval))); @@ -1229,14 +1234,14 @@ case 2: break; case 160: -#line 1064 "perly.y" +#line 1069 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval))); } break; case 161: -#line 1067 "perly.y" +#line 1072 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[-5].val.opval)),OP_RV2HV), jmaybe((ps[-2].val.opval))); } @@ -1244,7 +1249,7 @@ case 2: break; case 162: -#line 1071 "perly.y" +#line 1076 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[-4].val.opval)),OP_RV2HV), jmaybe((ps[-2].val.opval))); } @@ -1252,7 +1257,7 @@ case 2: break; case 163: -#line 1075 "perly.y" +#line 1080 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[-3].val.opval)))); if (parser->expect == XBLOCK) @@ -1262,7 +1267,7 @@ case 2: break; case 164: -#line 1081 "perly.y" +#line 1086 "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 +1278,7 @@ case 2: break; case 165: -#line 1089 "perly.y" +#line 1094 "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 +1289,7 @@ case 2: break; case 166: -#line 1096 "perly.y" +#line 1101 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[-2].val.opval)))); if (parser->expect == XBLOCK) @@ -1294,37 +1299,37 @@ case 2: break; case 167: -#line 1102 "perly.y" +#line 1107 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); } break; case 168: -#line 1104 "perly.y" +#line 1109 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); } break; case 169: -#line 1106 "perly.y" +#line 1111 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); } break; case 170: -#line 1111 "perly.y" +#line 1116 "perly.y" { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); } break; case 171: -#line 1113 "perly.y" +#line 1118 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 172: -#line 1115 "perly.y" +#line 1120 "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 +1338,183 @@ case 2: break; case 173: -#line 1120 "perly.y" +#line 1125 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 174: -#line 1122 "perly.y" +#line 1127 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 175: -#line 1124 "perly.y" +#line 1129 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 176: -#line 1126 "perly.y" +#line 1131 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 177: -#line 1128 "perly.y" +#line 1133 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 178: -#line 1130 "perly.y" +#line 1135 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 179: -#line 1132 "perly.y" +#line 1137 "perly.y" { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 180: -#line 1134 "perly.y" +#line 1139 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 181: -#line 1136 "perly.y" +#line 1141 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 182: -#line 1138 "perly.y" +#line 1143 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); } break; case 183: -#line 1140 "perly.y" +#line 1145 "perly.y" { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 184: -#line 1144 "perly.y" +#line 1149 "perly.y" { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); } break; case 185: -#line 1146 "perly.y" +#line 1151 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 186: -#line 1148 "perly.y" +#line 1153 "perly.y" { yyerror("syntax error"); YYERROR; } break; case 187: -#line 1150 "perly.y" +#line 1155 "perly.y" { yyerror("syntax error"); YYERROR; } break; case 188: -#line 1154 "perly.y" +#line 1159 "perly.y" { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 189: -#line 1156 "perly.y" +#line 1161 "perly.y" { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 190: -#line 1160 "perly.y" +#line 1165 "perly.y" { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); } break; case 191: -#line 1162 "perly.y" +#line 1167 "perly.y" { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); } break; case 192: -#line 1164 "perly.y" +#line 1169 "perly.y" { yyerror("syntax error"); YYERROR; } break; case 193: -#line 1166 "perly.y" +#line 1171 "perly.y" { yyerror("syntax error"); YYERROR; } break; case 194: -#line 1170 "perly.y" +#line 1175 "perly.y" { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 195: -#line 1172 "perly.y" +#line 1177 "perly.y" { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 196: -#line 1177 "perly.y" +#line 1182 "perly.y" { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); } break; case 197: -#line 1179 "perly.y" +#line 1184 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 198: -#line 1182 "perly.y" +#line 1187 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); } break; case 199: -#line 1184 "perly.y" +#line 1189 "perly.y" { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); } break; case 200: -#line 1186 "perly.y" +#line 1191 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); } break; case 201: -#line 1189 "perly.y" +#line 1194 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));} break; case 202: -#line 1192 "perly.y" +#line 1197 "perly.y" { (yyval.opval) = op_convert_list(OP_JOIN, 0, op_append_elem( OP_LIST, @@ -1524,137 +1529,137 @@ case 2: break; case 203: -#line 1203 "perly.y" +#line 1208 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); } break; case 204: -#line 1206 "perly.y" +#line 1211 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); } break; case 205: -#line 1214 "perly.y" +#line 1219 "perly.y" { (yyval.opval) = newANONLIST((ps[-1].val.opval)); } break; case 206: -#line 1216 "perly.y" +#line 1221 "perly.y" { (yyval.opval) = newANONHASH((ps[-2].val.opval)); } break; case 207: -#line 1218 "perly.y" +#line 1223 "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 1221 "perly.y" +#line 1226 "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 1227 "perly.y" +#line 1232 "perly.y" { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));} break; case 210: -#line 1229 "perly.y" +#line 1234 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));} break; case 215: -#line 1237 "perly.y" +#line 1242 "perly.y" { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); } break; case 216: -#line 1239 "perly.y" +#line 1244 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); } break; case 217: -#line 1241 "perly.y" +#line 1246 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 218: -#line 1243 "perly.y" +#line 1248 "perly.y" { (yyval.opval) = localize((ps[0].val.opval),0); } break; case 219: -#line 1245 "perly.y" +#line 1250 "perly.y" { (yyval.opval) = sawparens((ps[-1].val.opval)); } break; case 220: -#line 1247 "perly.y" +#line 1252 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 221: -#line 1249 "perly.y" +#line 1254 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); } break; case 222: -#line 1251 "perly.y" +#line 1256 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 223: -#line 1253 "perly.y" +#line 1258 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 224: -#line 1255 "perly.y" +#line 1260 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 225: -#line 1257 "perly.y" +#line 1262 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 226: -#line 1259 "perly.y" +#line 1264 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));} break; case 227: -#line 1261 "perly.y" +#line 1266 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 228: -#line 1263 "perly.y" +#line 1268 "perly.y" { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1668,7 +1673,7 @@ case 2: break; case 229: -#line 1273 "perly.y" +#line 1278 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVASLICE, 0, @@ -1682,7 +1687,7 @@ case 2: break; case 230: -#line 1283 "perly.y" +#line 1288 "perly.y" { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1696,7 +1701,7 @@ case 2: break; case 231: -#line 1293 "perly.y" +#line 1298 "perly.y" { (yyval.opval) = op_prepend_elem(OP_KVHSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_KVHSLICE, 0, @@ -1710,26 +1715,26 @@ case 2: break; case 232: -#line 1303 "perly.y" +#line 1308 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 233: -#line 1305 "perly.y" +#line 1310 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); } break; case 234: -#line 1307 "perly.y" +#line 1312 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval))); } break; case 235: -#line 1310 "perly.y" +#line 1315 "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 +1743,7 @@ case 2: break; case 236: -#line 1315 "perly.y" +#line 1320 "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 +1751,130 @@ case 2: break; case 237: -#line 1319 "perly.y" +#line 1324 "perly.y" { (yyval.opval) = newSVREF((ps[-3].val.opval)); } break; case 238: -#line 1321 "perly.y" +#line 1326 "perly.y" { (yyval.opval) = newAVREF((ps[-3].val.opval)); } break; case 239: -#line 1323 "perly.y" +#line 1328 "perly.y" { (yyval.opval) = newHVREF((ps[-3].val.opval)); } break; case 240: -#line 1325 "perly.y" +#line 1330 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); } break; case 241: -#line 1328 "perly.y" +#line 1333 "perly.y" { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); } break; case 242: -#line 1330 "perly.y" +#line 1335 "perly.y" { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL); PL_hints |= HINT_BLOCK_SCOPE; } break; case 243: -#line 1333 "perly.y" +#line 1338 "perly.y" { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); } break; case 244: -#line 1335 "perly.y" +#line 1340 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); } break; case 245: -#line 1337 "perly.y" +#line 1342 "perly.y" { (yyval.opval) = newOP((ps[0].val.ival), 0); } break; case 246: -#line 1339 "perly.y" +#line 1344 "perly.y" { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; case 247: -#line 1341 "perly.y" +#line 1346 "perly.y" { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); } break; case 248: -#line 1343 "perly.y" +#line 1348 "perly.y" { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); } break; case 249: -#line 1345 "perly.y" +#line 1350 "perly.y" { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); } break; case 250: -#line 1347 "perly.y" +#line 1352 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); } break; case 251: -#line 1349 "perly.y" +#line 1354 "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 1352 "perly.y" +#line 1357 "perly.y" { (yyval.opval) = newOP((ps[0].val.ival), 0); } break; case 253: -#line 1354 "perly.y" +#line 1359 "perly.y" { (yyval.opval) = newOP((ps[-2].val.ival), 0);} break; case 254: -#line 1356 "perly.y" +#line 1361 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 255: -#line 1358 "perly.y" +#line 1363 "perly.y" { (yyval.opval) = (ps[-2].val.opval); } break; case 256: -#line 1360 "perly.y" +#line 1365 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); } break; case 257: -#line 1362 "perly.y" +#line 1367 "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 +1882,13 @@ case 2: break; case 258: -#line 1366 "perly.y" +#line 1371 "perly.y" { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); } break; case 259: -#line 1368 "perly.y" +#line 1373 "perly.y" { if ( (ps[0].val.opval)->op_type != OP_TRANS && (ps[0].val.opval)->op_type != OP_TRANSR @@ -1898,85 +1903,85 @@ case 2: break; case 260: -#line 1379 "perly.y" +#line 1384 "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 1388 "perly.y" +#line 1393 "perly.y" { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); } break; case 265: -#line 1390 "perly.y" +#line 1395 "perly.y" { (yyval.opval) = localize((ps[0].val.opval),1); } break; case 266: -#line 1392 "perly.y" +#line 1397 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); } break; case 267: -#line 1394 "perly.y" +#line 1399 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); } break; case 268: -#line 1399 "perly.y" +#line 1404 "perly.y" { (yyval.opval) = sawparens((ps[-1].val.opval)); } break; case 269: -#line 1401 "perly.y" +#line 1406 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); } break; case 270: -#line 1404 "perly.y" +#line 1409 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 271: -#line 1406 "perly.y" +#line 1411 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 272: -#line 1408 "perly.y" +#line 1413 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 278: -#line 1424 "perly.y" +#line 1429 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; case 279: -#line 1430 "perly.y" +#line 1435 "perly.y" { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); } break; case 280: -#line 1435 "perly.y" +#line 1440 "perly.y" { (yyval.opval) = (ps[-1].val.opval); } break; case 281: -#line 1437 "perly.y" +#line 1442 "perly.y" { (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), (ps[0].val.opval)); } @@ -1984,25 +1989,25 @@ case 2: break; case 283: -#line 1444 "perly.y" +#line 1449 "perly.y" { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); } break; case 291: -#line 1461 "perly.y" +#line 1466 "perly.y" { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); } break; case 292: -#line 1465 "perly.y" +#line 1470 "perly.y" { (yyval.opval) = newSVREF((ps[0].val.opval)); } break; case 293: -#line 1469 "perly.y" +#line 1474 "perly.y" { (yyval.opval) = newAVREF((ps[0].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival); } @@ -2010,7 +2015,7 @@ case 2: break; case 294: -#line 1475 "perly.y" +#line 1480 "perly.y" { (yyval.opval) = newHVREF((ps[0].val.opval)); if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival); } @@ -2018,61 +2023,61 @@ case 2: break; case 295: -#line 1481 "perly.y" +#line 1486 "perly.y" { (yyval.opval) = newAVREF((ps[0].val.opval)); } break; case 296: -#line 1483 "perly.y" +#line 1488 "perly.y" { (yyval.opval) = newAVREF((ps[-3].val.opval)); } break; case 297: -#line 1487 "perly.y" +#line 1492 "perly.y" { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); } break; case 299: -#line 1492 "perly.y" +#line 1497 "perly.y" { (yyval.opval) = newAVREF((ps[-2].val.opval)); } break; case 301: -#line 1497 "perly.y" +#line 1502 "perly.y" { (yyval.opval) = newHVREF((ps[-2].val.opval)); } break; case 303: -#line 1502 "perly.y" +#line 1507 "perly.y" { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); } break; case 304: -#line 1507 "perly.y" +#line 1512 "perly.y" { (yyval.opval) = scalar((ps[0].val.opval)); } break; case 305: -#line 1509 "perly.y" +#line 1514 "perly.y" { (yyval.opval) = scalar((ps[0].val.opval)); } break; case 306: -#line 1511 "perly.y" +#line 1516 "perly.y" { (yyval.opval) = op_scope((ps[0].val.opval)); } break; case 307: -#line 1514 "perly.y" +#line 1519 "perly.y" { (yyval.opval) = (ps[0].val.opval); } break; @@ -2083,6 +2088,6 @@ case 2: /* Generated from: - * 55819ef14038cb090c9e92492b254a2a51afa95b3471703ddad0a2546d352fae perly.y + * 5ba7f8a893bb141a95582705e51153fff2545e4365cca4e6af78232a0722e764 perly.y * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl * ex: set ro: */ -- cgit v1.2.1