diff options
| -rw-r--r-- | parser.y | 8 | ||||
| -rw-r--r-- | y.tab.c.shipped | 432 |
2 files changed, 222 insertions, 218 deletions
@@ -1120,7 +1120,9 @@ exprs_opt : exprs { $$ = $1; } ; n_exprs : listacc { $$ = $1->c.cdr; - $1->c.cdr = nil; } + $1->c.cdr = nil; + if ($$->c.car == nao) + $$ = $$->c.cdr; } | listacc CONSDOT n_expr { $$ = $1->c.cdr; $1->c.cdr = $3; } @@ -1131,11 +1133,11 @@ listacc : n_expr { $$ = cons($1, nil); $$->c.cdr = $$; } | HASH_SEMI { parser->ignore = 1; } n_expr { parser->ignore = 0; - $$ = cons(nil, nil); + $$ = cons(nao, nil); $$->c.cdr = $$; } | HASH_SEMI '.' { parser->ignore = 1; } n_expr { parser->ignore = 0; - $$ = cons(nil, nil); + $$ = cons(nao, nil); $$->c.cdr = $$; } | listacc HASH_SEMI { parser->ignore = 1; } n_expr { parser->ignore = 0; diff --git a/y.tab.c.shipped b/y.tab.c.shipped index c0721d96..2dd3c380 100644 --- a/y.tab.c.shipped +++ b/y.tab.c.shipped @@ -858,26 +858,26 @@ static const yytype_uint16 yyrline[] = 1003, 1004, 1006, 1008, 1012, 1014, 1017, 1021, 1030, 1032, 1036, 1043, 1054, 1055, 1057, 1060, 1064, 1068, 1069, 1075, 1076, 1077, 1078, 1082, 1087, 1091, 1096, 1100, 1104, 1105, - 1106, 1110, 1111, 1112, 1115, 1118, 1119, 1122, 1124, 1129, - 1132, 1132, 1136, 1136, 1140, 1140, 1143, 1143, 1146, 1149, - 1151, 1155, 1157, 1163, 1164, 1166, 1167, 1168, 1169, 1170, - 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, - 1181, 1182, 1184, 1184, 1188, 1188, 1192, 1192, 1196, 1196, - 1199, 1202, 1203, 1205, 1206, 1208, 1209, 1210, 1211, 1212, - 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, - 1223, 1224, 1226, 1226, 1230, 1230, 1234, 1234, 1238, 1241, - 1247, 1251, 1257, 1258, 1261, 1262, 1263, 1263, 1266, 1269, - 1270, 1273, 1274, 1275, 1278, 1281, 1286, 1290, 1296, 1299, - 1300, 1301, 1302, 1305, 1306, 1307, 1310, 1311, 1312, 1313, - 1314, 1321, 1322, 1324, 1325, 1326, 1327, 1328, 1329, 1330, - 1331, 1335, 1336, 1339, 1340, 1341, 1344, 1346, 1347, 1348, - 1349, 1350, 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1360, - 1374, 1375, 1379, 1380, 1382, 1386, 1399, 1401, 1405, 1410, - 1411, 1414, 1418, 1420, 1424, 1425, 1426, 1428, 1435, 1436, - 1438, 1439, 1442, 1443, 1444, 1445, 1448, 1449, 1450, 1452, - 1456, 1457, 1458, 1460, 1466, 1468, 1471, 1476, 1478, 1482, - 1483, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, - 1499, 1501, 1503, 1505, 1507, 1509, 1511, 1513, 1518 + 1106, 1110, 1111, 1112, 1115, 1118, 1119, 1122, 1126, 1131, + 1134, 1134, 1138, 1138, 1142, 1142, 1145, 1145, 1148, 1151, + 1153, 1157, 1159, 1165, 1166, 1168, 1169, 1170, 1171, 1172, + 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, + 1183, 1184, 1186, 1186, 1190, 1190, 1194, 1194, 1198, 1198, + 1201, 1204, 1205, 1207, 1208, 1210, 1211, 1212, 1213, 1214, + 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, + 1225, 1226, 1228, 1228, 1232, 1232, 1236, 1236, 1240, 1243, + 1249, 1253, 1259, 1260, 1263, 1264, 1265, 1265, 1268, 1271, + 1272, 1275, 1276, 1277, 1280, 1283, 1288, 1292, 1298, 1301, + 1302, 1303, 1304, 1307, 1308, 1309, 1312, 1313, 1314, 1315, + 1316, 1323, 1324, 1326, 1327, 1328, 1329, 1330, 1331, 1332, + 1333, 1337, 1338, 1341, 1342, 1343, 1346, 1348, 1349, 1350, + 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1362, + 1376, 1377, 1381, 1382, 1384, 1388, 1401, 1403, 1407, 1412, + 1413, 1416, 1420, 1422, 1426, 1427, 1428, 1430, 1437, 1438, + 1440, 1441, 1444, 1445, 1446, 1447, 1450, 1451, 1452, 1454, + 1458, 1459, 1460, 1462, 1468, 1470, 1473, 1478, 1480, 1484, + 1485, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, + 1501, 1503, 1505, 1507, 1509, 1511, 1513, 1515, 1520 }; #endif @@ -5488,13 +5488,15 @@ yyreduce: /* Line 1806 of yacc.c */ #line 1122 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val)->c.cdr; - (yyvsp[(1) - (1)].val)->c.cdr = nil; } + (yyvsp[(1) - (1)].val)->c.cdr = nil; + if ((yyval.val)->c.car == nao) + (yyval.val) = (yyval.val)->c.cdr; } break; case 278: /* Line 1806 of yacc.c */ -#line 1125 "parser.y" +#line 1127 "parser.y" { (yyval.val) = (yyvsp[(1) - (3)].val)->c.cdr; (yyvsp[(1) - (3)].val)->c.cdr = (yyvsp[(3) - (3)].val); } break; @@ -5502,7 +5504,7 @@ yyreduce: case 279: /* Line 1806 of yacc.c */ -#line 1129 "parser.y" +#line 1131 "parser.y" { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil); rlc((yyval.val), (yyvsp[(1) - (1)].val)); (yyval.val)->c.cdr = (yyval.val); } @@ -5511,46 +5513,46 @@ yyreduce: case 280: /* Line 1806 of yacc.c */ -#line 1132 "parser.y" +#line 1134 "parser.y" { parser->ignore = 1; } break; case 281: /* Line 1806 of yacc.c */ -#line 1133 "parser.y" +#line 1135 "parser.y" { parser->ignore = 0; - (yyval.val) = cons(nil, nil); + (yyval.val) = cons(nao, nil); (yyval.val)->c.cdr = (yyval.val); } break; case 282: /* Line 1806 of yacc.c */ -#line 1136 "parser.y" +#line 1138 "parser.y" { parser->ignore = 1; } break; case 283: /* Line 1806 of yacc.c */ -#line 1137 "parser.y" +#line 1139 "parser.y" { parser->ignore = 0; - (yyval.val) = cons(nil, nil); + (yyval.val) = cons(nao, nil); (yyval.val)->c.cdr = (yyval.val); } break; case 284: /* Line 1806 of yacc.c */ -#line 1140 "parser.y" +#line 1142 "parser.y" { parser->ignore = 1; } break; case 285: /* Line 1806 of yacc.c */ -#line 1141 "parser.y" +#line 1143 "parser.y" { parser->ignore = 0; (yyval.val) = (yyvsp[(1) - (4)].val); } break; @@ -5558,14 +5560,14 @@ yyreduce: case 286: /* Line 1806 of yacc.c */ -#line 1143 "parser.y" +#line 1145 "parser.y" { parser->ignore = 1; } break; case 287: /* Line 1806 of yacc.c */ -#line 1144 "parser.y" +#line 1146 "parser.y" { parser->ignore = 0; (yyval.val) = (yyvsp[(1) - (5)].val); } break; @@ -5573,7 +5575,7 @@ yyreduce: case 288: /* Line 1806 of yacc.c */ -#line 1146 "parser.y" +#line 1148 "parser.y" { uses_or2; (yyval.val) = rlc(cons((yyvsp[(2) - (2)].val), (yyvsp[(1) - (2)].val)->c.cdr), or2((yyvsp[(2) - (2)].val), (yyvsp[(1) - (2)].val)->c.cdr)); (yyvsp[(1) - (2)].val)->c.cdr = (yyval.val); } @@ -5582,7 +5584,7 @@ yyreduce: case 289: /* Line 1806 of yacc.c */ -#line 1149 "parser.y" +#line 1151 "parser.y" { (yyval.val) = lastcons(rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno)))); (yyval.val)->c.cdr = (yyvsp[(2) - (2)].val); } break; @@ -5590,7 +5592,7 @@ yyreduce: case 290: /* Line 1806 of yacc.c */ -#line 1152 "parser.y" +#line 1154 "parser.y" { (yyval.val) = lastcons(rl((yyvsp[(3) - (3)].val), num((yyvsp[(2) - (3)].lineno)))); (yyval.val)->c.cdr = (yyvsp[(1) - (3)].val)->c.cdr; (yyvsp[(1) - (3)].val)->c.cdr = (yyvsp[(3) - (3)].val); } @@ -5599,7 +5601,7 @@ yyreduce: case 291: /* Line 1806 of yacc.c */ -#line 1155 "parser.y" +#line 1157 "parser.y" { (yyval.val) = lastcons(rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno)))); (yyval.val)->c.cdr = (yyvsp[(2) - (2)].val); } break; @@ -5607,7 +5609,7 @@ yyreduce: case 292: /* Line 1806 of yacc.c */ -#line 1158 "parser.y" +#line 1160 "parser.y" { (yyval.val) = lastcons(rl((yyvsp[(3) - (3)].val), num((yyvsp[(2) - (3)].lineno)))); (yyval.val)->c.cdr = (yyvsp[(1) - (3)].val)->c.cdr; (yyvsp[(1) - (3)].val)->c.cdr = (yyvsp[(3) - (3)].val); } @@ -5616,14 +5618,14 @@ yyreduce: case 293: /* Line 1806 of yacc.c */ -#line 1163 "parser.y" +#line 1165 "parser.y" { (yyval.val) = ifnign(symhlpr((yyvsp[(1) - (1)].lexeme), t)); } break; case 294: /* Line 1806 of yacc.c */ -#line 1164 "parser.y" +#line 1166 "parser.y" { (yyval.val) = cons(var_s, cons((yyvsp[(1) - (1)].val), nil)); rl((yyval.val), num(parser->lineno)); } break; @@ -5631,119 +5633,119 @@ yyreduce: case 295: /* Line 1806 of yacc.c */ -#line 1166 "parser.y" +#line 1168 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 296: /* Line 1806 of yacc.c */ -#line 1167 "parser.y" +#line 1169 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 297: /* Line 1806 of yacc.c */ -#line 1168 "parser.y" +#line 1170 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 298: /* Line 1806 of yacc.c */ -#line 1169 "parser.y" +#line 1171 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 299: /* Line 1806 of yacc.c */ -#line 1170 "parser.y" +#line 1172 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 300: /* Line 1806 of yacc.c */ -#line 1171 "parser.y" +#line 1173 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 301: /* Line 1806 of yacc.c */ -#line 1172 "parser.y" +#line 1174 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 302: /* Line 1806 of yacc.c */ -#line 1173 "parser.y" +#line 1175 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 303: /* Line 1806 of yacc.c */ -#line 1174 "parser.y" +#line 1176 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 304: /* Line 1806 of yacc.c */ -#line 1175 "parser.y" +#line 1177 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 305: /* Line 1806 of yacc.c */ -#line 1176 "parser.y" +#line 1178 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 306: /* Line 1806 of yacc.c */ -#line 1177 "parser.y" +#line 1179 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 307: /* Line 1806 of yacc.c */ -#line 1178 "parser.y" +#line 1180 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 308: /* Line 1806 of yacc.c */ -#line 1179 "parser.y" +#line 1181 "parser.y" { (yyval.val) = rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno))); } break; case 309: /* Line 1806 of yacc.c */ -#line 1180 "parser.y" +#line 1182 "parser.y" { (yyval.val) = rl(cons(quasilist_s, (yyvsp[(2) - (2)].val)), num((yyvsp[(1) - (2)].lineno))); } break; case 310: /* Line 1806 of yacc.c */ -#line 1181 "parser.y" +#line 1183 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 311: /* Line 1806 of yacc.c */ -#line 1182 "parser.y" +#line 1184 "parser.y" { (yyval.val) = rl(rlc(list(quote_s, (yyvsp[(2) - (2)].val), nao), (yyvsp[(2) - (2)].val)), num(parser->lineno)); } break; @@ -5751,14 +5753,14 @@ yyreduce: case 312: /* Line 1806 of yacc.c */ -#line 1184 "parser.y" +#line 1186 "parser.y" { parser->quasi_level++; } break; case 313: /* Line 1806 of yacc.c */ -#line 1185 "parser.y" +#line 1187 "parser.y" { parser->quasi_level--; (yyval.val) = rl(rlc(list(sys_qquote_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)), num(parser->lineno)); } @@ -5767,14 +5769,14 @@ yyreduce: case 314: /* Line 1806 of yacc.c */ -#line 1188 "parser.y" +#line 1190 "parser.y" { parser->quasi_level--; } break; case 315: /* Line 1806 of yacc.c */ -#line 1189 "parser.y" +#line 1191 "parser.y" { parser->quasi_level++; (yyval.val) = rl(rlc(list(sys_unquote_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)), num(parser->lineno)); } @@ -5783,14 +5785,14 @@ yyreduce: case 316: /* Line 1806 of yacc.c */ -#line 1192 "parser.y" +#line 1194 "parser.y" { parser->quasi_level--; } break; case 317: /* Line 1806 of yacc.c */ -#line 1193 "parser.y" +#line 1195 "parser.y" { parser->quasi_level++; (yyval.val) = rl(rlc(list(sys_splice_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)), num(parser->lineno)); } @@ -5799,14 +5801,14 @@ yyreduce: case 318: /* Line 1806 of yacc.c */ -#line 1196 "parser.y" +#line 1198 "parser.y" { parser_circ_def(parser, (yyvsp[(1) - (1)].val), unique_s); } break; case 319: /* Line 1806 of yacc.c */ -#line 1197 "parser.y" +#line 1199 "parser.y" { parser_circ_def(parser, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); (yyval.val) = (yyvsp[(3) - (3)].val); } break; @@ -5814,35 +5816,35 @@ yyreduce: case 320: /* Line 1806 of yacc.c */ -#line 1199 "parser.y" +#line 1201 "parser.y" { (yyval.val) = parser_circ_ref(parser, (yyvsp[(1) - (1)].val)); } break; case 321: /* Line 1806 of yacc.c */ -#line 1202 "parser.y" +#line 1204 "parser.y" { (yyval.val) = uref_helper(parser, (yyvsp[(2) - (2)].val)); } break; case 322: /* Line 1806 of yacc.c */ -#line 1203 "parser.y" +#line 1205 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 323: /* Line 1806 of yacc.c */ -#line 1205 "parser.y" +#line 1207 "parser.y" { (yyval.val) = ifnign(symhlpr((yyvsp[(1) - (1)].lexeme), t)); } break; case 324: /* Line 1806 of yacc.c */ -#line 1206 "parser.y" +#line 1208 "parser.y" { (yyval.val) = cons(var_s, cons((yyvsp[(1) - (1)].val), nil)); rl((yyval.val), num(parser->lineno)); } break; @@ -5850,119 +5852,119 @@ yyreduce: case 325: /* Line 1806 of yacc.c */ -#line 1208 "parser.y" +#line 1210 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 326: /* Line 1806 of yacc.c */ -#line 1209 "parser.y" +#line 1211 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 327: /* Line 1806 of yacc.c */ -#line 1210 "parser.y" +#line 1212 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 328: /* Line 1806 of yacc.c */ -#line 1211 "parser.y" +#line 1213 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 329: /* Line 1806 of yacc.c */ -#line 1212 "parser.y" +#line 1214 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 330: /* Line 1806 of yacc.c */ -#line 1213 "parser.y" +#line 1215 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 331: /* Line 1806 of yacc.c */ -#line 1214 "parser.y" +#line 1216 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 332: /* Line 1806 of yacc.c */ -#line 1215 "parser.y" +#line 1217 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 333: /* Line 1806 of yacc.c */ -#line 1216 "parser.y" +#line 1218 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 334: /* Line 1806 of yacc.c */ -#line 1217 "parser.y" +#line 1219 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 335: /* Line 1806 of yacc.c */ -#line 1218 "parser.y" +#line 1220 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 336: /* Line 1806 of yacc.c */ -#line 1219 "parser.y" +#line 1221 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 337: /* Line 1806 of yacc.c */ -#line 1220 "parser.y" +#line 1222 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 338: /* Line 1806 of yacc.c */ -#line 1221 "parser.y" +#line 1223 "parser.y" { (yyval.val) = rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno))); } break; case 339: /* Line 1806 of yacc.c */ -#line 1222 "parser.y" +#line 1224 "parser.y" { (yyval.val) = rl(cons(quasilist_s, (yyvsp[(2) - (2)].val)), num((yyvsp[(1) - (2)].lineno))); } break; case 340: /* Line 1806 of yacc.c */ -#line 1223 "parser.y" +#line 1225 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 341: /* Line 1806 of yacc.c */ -#line 1224 "parser.y" +#line 1226 "parser.y" { (yyval.val) = rl(rlc(list(quote_s, (yyvsp[(2) - (2)].val), nao), (yyvsp[(2) - (2)].val)), num(parser->lineno)); } break; @@ -5970,14 +5972,14 @@ yyreduce: case 342: /* Line 1806 of yacc.c */ -#line 1226 "parser.y" +#line 1228 "parser.y" { parser->quasi_level++; } break; case 343: /* Line 1806 of yacc.c */ -#line 1227 "parser.y" +#line 1229 "parser.y" { parser->quasi_level--; (yyval.val) = rl(rlc(list(sys_qquote_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)), num(parser->lineno)); } @@ -5986,14 +5988,14 @@ yyreduce: case 344: /* Line 1806 of yacc.c */ -#line 1230 "parser.y" +#line 1232 "parser.y" { parser->quasi_level--; } break; case 345: /* Line 1806 of yacc.c */ -#line 1231 "parser.y" +#line 1233 "parser.y" { parser->quasi_level++; (yyval.val) = rl(rlc(list(sys_unquote_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)), num(parser->lineno)); } @@ -6002,14 +6004,14 @@ yyreduce: case 346: /* Line 1806 of yacc.c */ -#line 1234 "parser.y" +#line 1236 "parser.y" { parser->quasi_level--; } break; case 347: /* Line 1806 of yacc.c */ -#line 1235 "parser.y" +#line 1237 "parser.y" { parser->quasi_level++; (yyval.val) = rl(rlc(list(sys_splice_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)), num(parser->lineno)); } @@ -6018,7 +6020,7 @@ yyreduce: case 348: /* Line 1806 of yacc.c */ -#line 1238 "parser.y" +#line 1240 "parser.y" { uses_or2; (yyval.val) = rlc(list(rcons_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao), or2((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val))); } @@ -6027,7 +6029,7 @@ yyreduce: case 349: /* Line 1806 of yacc.c */ -#line 1242 "parser.y" +#line 1244 "parser.y" { uses_or2; (yyval.val) = rlc(list(rcons_s, (yyvsp[(1) - (4)].val), uref_helper(parser, (yyvsp[(4) - (4)].val)), @@ -6038,7 +6040,7 @@ yyreduce: case 350: /* Line 1806 of yacc.c */ -#line 1248 "parser.y" +#line 1250 "parser.y" { uses_or2; (yyval.val) = rlc(list(rcons_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao), or2((yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val))); } @@ -6047,7 +6049,7 @@ yyreduce: case 351: /* Line 1806 of yacc.c */ -#line 1252 "parser.y" +#line 1254 "parser.y" { uses_or2; (yyval.val) = rlc(list(rcons_s, (yyvsp[(1) - (4)].val), uref_helper(parser, (yyvsp[(4) - (4)].val)), @@ -6058,14 +6060,14 @@ yyreduce: case 352: /* Line 1806 of yacc.c */ -#line 1257 "parser.y" +#line 1259 "parser.y" { (yyval.val) = qref_helper(parser, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); } break; case 353: /* Line 1806 of yacc.c */ -#line 1258 "parser.y" +#line 1260 "parser.y" { (yyval.val) = qref_helper(parser, cons(t, cons((yyvsp[(1) - (3)].val), nil)), (yyvsp[(3) - (3)].val)); } @@ -6074,28 +6076,28 @@ yyreduce: case 354: /* Line 1806 of yacc.c */ -#line 1261 "parser.y" +#line 1263 "parser.y" { (yyval.val) = uref_helper(parser, (yyvsp[(2) - (2)].val)); } break; case 355: /* Line 1806 of yacc.c */ -#line 1262 "parser.y" +#line 1264 "parser.y" { (yyval.val) = uoref_helper(parser, (yyvsp[(2) - (2)].val)); } break; case 356: /* Line 1806 of yacc.c */ -#line 1263 "parser.y" +#line 1265 "parser.y" { parser_circ_def(parser, (yyvsp[(1) - (1)].val), unique_s); } break; case 357: /* Line 1806 of yacc.c */ -#line 1264 "parser.y" +#line 1266 "parser.y" { parser_circ_def(parser, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); (yyval.val) = (yyvsp[(3) - (3)].val); } break; @@ -6103,49 +6105,49 @@ yyreduce: case 358: /* Line 1806 of yacc.c */ -#line 1266 "parser.y" +#line 1268 "parser.y" { (yyval.val) = parser_circ_ref(parser, (yyvsp[(1) - (1)].val)); } break; case 359: /* Line 1806 of yacc.c */ -#line 1269 "parser.y" +#line 1271 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 360: /* Line 1806 of yacc.c */ -#line 1270 "parser.y" +#line 1272 "parser.y" { (yyval.val) = nil; } break; case 361: /* Line 1806 of yacc.c */ -#line 1273 "parser.y" +#line 1275 "parser.y" { (yyval.val) = uref_helper(parser, (yyvsp[(2) - (2)].val)); } break; case 362: /* Line 1806 of yacc.c */ -#line 1274 "parser.y" +#line 1276 "parser.y" { (yyval.val) = uoref_helper(parser, (yyvsp[(2) - (2)].val)); } break; case 363: /* Line 1806 of yacc.c */ -#line 1275 "parser.y" +#line 1277 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 364: /* Line 1806 of yacc.c */ -#line 1278 "parser.y" +#line 1280 "parser.y" { (yyval.val) = regex_compile((yyvsp[(2) - (3)].val), nil); end_of_regex(scnr); rl((yyval.val), num(parser->lineno)); } @@ -6154,7 +6156,7 @@ yyreduce: case 365: /* Line 1806 of yacc.c */ -#line 1281 "parser.y" +#line 1283 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("regex")); end_of_regex(scnr); } @@ -6163,7 +6165,7 @@ yyreduce: case 366: /* Line 1806 of yacc.c */ -#line 1287 "parser.y" +#line 1289 "parser.y" { (yyval.val) = regex_compile((yyvsp[(2) - (3)].val), nil); end_of_regex(scnr); rl((yyval.val), num(parser->lineno)); } @@ -6172,7 +6174,7 @@ yyreduce: case 367: /* Line 1806 of yacc.c */ -#line 1291 "parser.y" +#line 1293 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("regex")); end_of_regex(scnr); } @@ -6181,7 +6183,7 @@ yyreduce: case 368: /* Line 1806 of yacc.c */ -#line 1296 "parser.y" +#line 1298 "parser.y" { (yyval.val) = if3(cdr((yyvsp[(1) - (1)].val)), cons(compound_s, (yyvsp[(1) - (1)].val)), car((yyvsp[(1) - (1)].val))); } @@ -6190,84 +6192,84 @@ yyreduce: case 369: /* Line 1806 of yacc.c */ -#line 1299 "parser.y" +#line 1301 "parser.y" { (yyval.val) = list(or_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao); } break; case 370: /* Line 1806 of yacc.c */ -#line 1300 "parser.y" +#line 1302 "parser.y" { (yyval.val) = list(and_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao); } break; case 371: /* Line 1806 of yacc.c */ -#line 1301 "parser.y" +#line 1303 "parser.y" { (yyval.val) = list(compl_s, (yyvsp[(2) - (2)].val), nao); } break; case 372: /* Line 1806 of yacc.c */ -#line 1302 "parser.y" +#line 1304 "parser.y" { (yyval.val) = nil; } break; case 373: /* Line 1806 of yacc.c */ -#line 1305 "parser.y" +#line 1307 "parser.y" { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil); } break; case 374: /* Line 1806 of yacc.c */ -#line 1306 "parser.y" +#line 1308 "parser.y" { (yyval.val) = cons((yyvsp[(1) - (2)].val), (yyvsp[(2) - (2)].val)); } break; case 375: /* Line 1806 of yacc.c */ -#line 1307 "parser.y" +#line 1309 "parser.y" { (yyval.val) = list((yyvsp[(1) - (3)].val), list(compl_s, (yyvsp[(3) - (3)].val), nao), nao); } break; case 376: /* Line 1806 of yacc.c */ -#line 1310 "parser.y" +#line 1312 "parser.y" { (yyval.val) = list(zeroplus_s, (yyvsp[(1) - (2)].val), nao); } break; case 377: /* Line 1806 of yacc.c */ -#line 1311 "parser.y" +#line 1313 "parser.y" { (yyval.val) = list(oneplus_s, (yyvsp[(1) - (2)].val), nao); } break; case 378: /* Line 1806 of yacc.c */ -#line 1312 "parser.y" +#line 1314 "parser.y" { (yyval.val) = list(optional_s, (yyvsp[(1) - (2)].val), nao); } break; case 379: /* Line 1806 of yacc.c */ -#line 1313 "parser.y" +#line 1315 "parser.y" { (yyval.val) = list(nongreedy_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao); } break; case 380: /* Line 1806 of yacc.c */ -#line 1314 "parser.y" +#line 1316 "parser.y" { if (first((yyvsp[(2) - (3)].val)) == chr('^')) { if (rest((yyvsp[(2) - (3)].val))) (yyval.val) = cons(cset_s, rest((yyvsp[(2) - (3)].val))); @@ -6280,14 +6282,14 @@ yyreduce: case 381: /* Line 1806 of yacc.c */ -#line 1321 "parser.y" +#line 1323 "parser.y" { (yyval.val) = cons(set_s, nil); } break; case 382: /* Line 1806 of yacc.c */ -#line 1322 "parser.y" +#line 1324 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("regex character class")); } break; @@ -6295,56 +6297,56 @@ yyreduce: case 383: /* Line 1806 of yacc.c */ -#line 1324 "parser.y" +#line 1326 "parser.y" { (yyval.val) = wild_s; } break; case 384: /* Line 1806 of yacc.c */ -#line 1325 "parser.y" +#line 1327 "parser.y" { (yyval.val) = chr(']'); } break; case 385: /* Line 1806 of yacc.c */ -#line 1326 "parser.y" +#line 1328 "parser.y" { (yyval.val) = chr('-'); } break; case 386: /* Line 1806 of yacc.c */ -#line 1327 "parser.y" +#line 1329 "parser.y" { (yyval.val) = chr((yyvsp[(1) - (1)].chr)); } break; case 387: /* Line 1806 of yacc.c */ -#line 1328 "parser.y" +#line 1330 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 388: /* Line 1806 of yacc.c */ -#line 1329 "parser.y" +#line 1331 "parser.y" { (yyval.val) = list(compound_s, string_own((yyvsp[(1) - (1)].lexeme)), nao); } break; case 389: /* Line 1806 of yacc.c */ -#line 1330 "parser.y" +#line 1332 "parser.y" { (yyval.val) = (yyvsp[(2) - (3)].val); } break; case 390: /* Line 1806 of yacc.c */ -#line 1331 "parser.y" +#line 1333 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("regex subexpression")); } break; @@ -6352,133 +6354,133 @@ yyreduce: case 391: /* Line 1806 of yacc.c */ -#line 1335 "parser.y" +#line 1337 "parser.y" { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil); } break; case 392: /* Line 1806 of yacc.c */ -#line 1336 "parser.y" +#line 1338 "parser.y" { (yyval.val) = cons((yyvsp[(1) - (2)].val), (yyvsp[(2) - (2)].val)); } break; case 393: /* Line 1806 of yacc.c */ -#line 1339 "parser.y" +#line 1341 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 394: /* Line 1806 of yacc.c */ -#line 1340 "parser.y" +#line 1342 "parser.y" { (yyval.val) = chr((yyvsp[(1) - (1)].chr)); } break; case 395: /* Line 1806 of yacc.c */ -#line 1341 "parser.y" +#line 1343 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 396: /* Line 1806 of yacc.c */ -#line 1344 "parser.y" +#line 1346 "parser.y" { (yyval.val) = cons(chr((yyvsp[(1) - (3)].chr)), chr((yyvsp[(3) - (3)].chr))); } break; case 397: /* Line 1806 of yacc.c */ -#line 1346 "parser.y" +#line 1348 "parser.y" { (yyval.chr) = '?'; } break; case 398: /* Line 1806 of yacc.c */ -#line 1347 "parser.y" +#line 1349 "parser.y" { (yyval.chr) = '.'; } break; case 399: /* Line 1806 of yacc.c */ -#line 1348 "parser.y" +#line 1350 "parser.y" { (yyval.chr) = '*'; } break; case 400: /* Line 1806 of yacc.c */ -#line 1349 "parser.y" +#line 1351 "parser.y" { (yyval.chr) = '+'; } break; case 401: /* Line 1806 of yacc.c */ -#line 1350 "parser.y" +#line 1352 "parser.y" { (yyval.chr) = '('; } break; case 402: /* Line 1806 of yacc.c */ -#line 1351 "parser.y" +#line 1353 "parser.y" { (yyval.chr) = ')'; } break; case 403: /* Line 1806 of yacc.c */ -#line 1352 "parser.y" +#line 1354 "parser.y" { (yyval.chr) = '|'; } break; case 404: /* Line 1806 of yacc.c */ -#line 1353 "parser.y" +#line 1355 "parser.y" { (yyval.chr) = '~'; } break; case 405: /* Line 1806 of yacc.c */ -#line 1354 "parser.y" +#line 1356 "parser.y" { (yyval.chr) = '&'; } break; case 406: /* Line 1806 of yacc.c */ -#line 1355 "parser.y" +#line 1357 "parser.y" { (yyval.chr) = '%'; } break; case 407: /* Line 1806 of yacc.c */ -#line 1356 "parser.y" +#line 1358 "parser.y" { (yyval.chr) = '/'; } break; case 408: /* Line 1806 of yacc.c */ -#line 1357 "parser.y" +#line 1359 "parser.y" { (yyval.chr) = (yyvsp[(1) - (1)].chr); } break; case 409: /* Line 1806 of yacc.c */ -#line 1360 "parser.y" +#line 1362 "parser.y" { switch ((yyvsp[(1) - (1)].chr)) { case 's': (yyval.val) = space_k; break; @@ -6497,7 +6499,7 @@ yyreduce: case 411: /* Line 1806 of yacc.c */ -#line 1375 "parser.y" +#line 1377 "parser.y" { yyerr("newline expected after directive"); yyerrok; } break; @@ -6505,14 +6507,14 @@ yyreduce: case 412: /* Line 1806 of yacc.c */ -#line 1379 "parser.y" +#line 1381 "parser.y" { (yyval.val) = null_string; } break; case 413: /* Line 1806 of yacc.c */ -#line 1380 "parser.y" +#line 1382 "parser.y" { (yyval.val) = (yyvsp[(2) - (3)].val); rl((yyval.val), num(parser->lineno)); } break; @@ -6520,7 +6522,7 @@ yyreduce: case 414: /* Line 1806 of yacc.c */ -#line 1382 "parser.y" +#line 1384 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("string literal")); } break; @@ -6528,7 +6530,7 @@ yyreduce: case 415: /* Line 1806 of yacc.c */ -#line 1386 "parser.y" +#line 1388 "parser.y" { wchar_t ch; val str = string_own((yyvsp[(2) - (2)].lexeme)); const wchar_t *cstr = c_str(str, nil); @@ -6547,7 +6549,7 @@ yyreduce: case 416: /* Line 1806 of yacc.c */ -#line 1399 "parser.y" +#line 1401 "parser.y" { (yyval.val) = chr((yyvsp[(2) - (2)].chr)); end_of_char(scnr); } break; @@ -6555,7 +6557,7 @@ yyreduce: case 417: /* Line 1806 of yacc.c */ -#line 1401 "parser.y" +#line 1403 "parser.y" { free((yyvsp[(2) - (2)].lexeme)); yyerrorf(scnr, lit("invalid UTF-8 used as character name"), @@ -6565,7 +6567,7 @@ yyreduce: case 418: /* Line 1806 of yacc.c */ -#line 1405 "parser.y" +#line 1407 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("character literal")); } @@ -6574,14 +6576,14 @@ yyreduce: case 419: /* Line 1806 of yacc.c */ -#line 1410 "parser.y" +#line 1412 "parser.y" { (yyval.val) = null_string; } break; case 420: /* Line 1806 of yacc.c */ -#line 1411 "parser.y" +#line 1413 "parser.y" { (yyval.val) = cons(quasi_s, (yyvsp[(2) - (3)].val)); rlc((yyval.val), (yyvsp[(2) - (3)].val)); rl((yyval.val), num(parser->lineno)); } @@ -6590,7 +6592,7 @@ yyreduce: case 421: /* Line 1806 of yacc.c */ -#line 1414 "parser.y" +#line 1416 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("quasistring")); } break; @@ -6598,7 +6600,7 @@ yyreduce: case 422: /* Line 1806 of yacc.c */ -#line 1418 "parser.y" +#line 1420 "parser.y" { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil); rl((yyval.val), num(parser->lineno)); } break; @@ -6606,7 +6608,7 @@ yyreduce: case 423: /* Line 1806 of yacc.c */ -#line 1420 "parser.y" +#line 1422 "parser.y" { (yyval.val) = cons((yyvsp[(1) - (2)].val), (yyvsp[(2) - (2)].val)); rl((yyval.val), num(parser->lineno)); } break; @@ -6614,21 +6616,21 @@ yyreduce: case 424: /* Line 1806 of yacc.c */ -#line 1424 "parser.y" +#line 1426 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 425: /* Line 1806 of yacc.c */ -#line 1425 "parser.y" +#line 1427 "parser.y" { (yyval.val) = (yyvsp[(1) - (1)].val); } break; case 426: /* Line 1806 of yacc.c */ -#line 1426 "parser.y" +#line 1428 "parser.y" { (yyval.val) = cons(var_s, cons((yyvsp[(1) - (1)].val), nil)); rl((yyval.val), num(parser->lineno)); } break; @@ -6636,7 +6638,7 @@ yyreduce: case 427: /* Line 1806 of yacc.c */ -#line 1428 "parser.y" +#line 1430 "parser.y" { if (integerp((yyvsp[(2) - (2)].val)) || symbolp((yyvsp[(2) - (2)].val))) (yyval.val) = rlcp_tree(cons(var_s, cons((yyvsp[(2) - (2)].val), nil)), (yyvsp[(2) - (2)].val)); @@ -6647,14 +6649,14 @@ yyreduce: case 428: /* Line 1806 of yacc.c */ -#line 1435 "parser.y" +#line 1437 "parser.y" { (yyval.val) = mkstring(one, chr((yyvsp[(1) - (1)].chr))); } break; case 429: /* Line 1806 of yacc.c */ -#line 1436 "parser.y" +#line 1438 "parser.y" { val ch = mkstring(one, chr((yyvsp[(1) - (2)].chr))); (yyval.val) = string_extend(ch, (yyvsp[(2) - (2)].val), t); } break; @@ -6662,63 +6664,63 @@ yyreduce: case 430: /* Line 1806 of yacc.c */ -#line 1438 "parser.y" +#line 1440 "parser.y" { (yyval.val) = string_own((yyvsp[(1) - (1)].lexeme)); } break; case 431: /* Line 1806 of yacc.c */ -#line 1439 "parser.y" +#line 1441 "parser.y" { (yyval.val) = string_extend(string_own((yyvsp[(1) - (2)].lexeme)), (yyvsp[(2) - (2)].val), t); } break; case 432: /* Line 1806 of yacc.c */ -#line 1442 "parser.y" +#line 1444 "parser.y" { (yyval.val) = mkstring(one, chr((yyvsp[(1) - (1)].chr))); } break; case 433: /* Line 1806 of yacc.c */ -#line 1443 "parser.y" +#line 1445 "parser.y" { (yyval.val) = string_extend((yyvsp[(1) - (2)].val), chr((yyvsp[(2) - (2)].chr)), nil); } break; case 434: /* Line 1806 of yacc.c */ -#line 1444 "parser.y" +#line 1446 "parser.y" { (yyval.val) = string_own((yyvsp[(1) - (1)].lexeme)); } break; case 435: /* Line 1806 of yacc.c */ -#line 1445 "parser.y" +#line 1447 "parser.y" { (yyval.val) = string_extend((yyvsp[(1) - (2)].val), string_own((yyvsp[(2) - (2)].lexeme)), nil); } break; case 436: /* Line 1806 of yacc.c */ -#line 1448 "parser.y" +#line 1450 "parser.y" { (yyval.val) = nil; } break; case 437: /* Line 1806 of yacc.c */ -#line 1449 "parser.y" +#line 1451 "parser.y" { (yyval.val) = (yyvsp[(2) - (2)].val); } break; case 438: /* Line 1806 of yacc.c */ -#line 1450 "parser.y" +#line 1452 "parser.y" { val word = (yyvsp[(1) - (2)].val); (yyval.val) = rlc(cons(word, (yyvsp[(2) - (2)].val)), (yyvsp[(1) - (2)].val)); } break; @@ -6726,7 +6728,7 @@ yyreduce: case 439: /* Line 1806 of yacc.c */ -#line 1452 "parser.y" +#line 1454 "parser.y" { (yyval.val) = nil; yybadtok(yychar, lit("word list")); } break; @@ -6734,21 +6736,21 @@ yyreduce: case 440: /* Line 1806 of yacc.c */ -#line 1456 "parser.y" +#line 1458 "parser.y" { (yyval.val) = nil; } break; case 441: /* Line 1806 of yacc.c */ -#line 1457 "parser.y" +#line 1459 "parser.y" { (yyval.val) = (yyvsp[(2) - (2)].val); } break; case 442: /* Line 1806 of yacc.c */ -#line 1458 "parser.y" +#line 1460 "parser.y" { val qword = cons(quasi_s, (yyvsp[(1) - (2)].val)); (yyval.val) = rlc(cons(qword, nil), (yyvsp[(1) - (2)].val)); } break; @@ -6756,7 +6758,7 @@ yyreduce: case 443: /* Line 1806 of yacc.c */ -#line 1462 "parser.y" +#line 1464 "parser.y" { val qword = cons(quasi_s, (yyvsp[(1) - (3)].val)); (yyval.val) = rlc(cons(qword, (yyvsp[(3) - (3)].val)), (yyvsp[(1) - (3)].val)); } break; @@ -6764,7 +6766,7 @@ yyreduce: case 444: /* Line 1806 of yacc.c */ -#line 1466 "parser.y" +#line 1468 "parser.y" { (yyval.val) = make_buf(zero, nil, nil); end_of_buflit(scnr); } break; @@ -6772,7 +6774,7 @@ yyreduce: case 445: /* Line 1806 of yacc.c */ -#line 1468 "parser.y" +#line 1470 "parser.y" { end_of_buflit(scnr); buf_trim((yyvsp[(2) - (3)].val)); (yyval.val) = (yyvsp[(2) - (3)].val); } @@ -6781,7 +6783,7 @@ yyreduce: case 446: /* Line 1806 of yacc.c */ -#line 1471 "parser.y" +#line 1473 "parser.y" { yyerr("unterminated buffer literal"); end_of_buflit(scnr); yyerrok; } @@ -6790,7 +6792,7 @@ yyreduce: case 447: /* Line 1806 of yacc.c */ -#line 1476 "parser.y" +#line 1478 "parser.y" { buf_put_u8((yyvsp[(1) - (2)].val), length_buf((yyval.val)), (yyvsp[(2) - (2)].val)); (yyval.val) = (yyvsp[(1) - (2)].val); } break; @@ -6798,7 +6800,7 @@ yyreduce: case 448: /* Line 1806 of yacc.c */ -#line 1478 "parser.y" +#line 1480 "parser.y" { (yyval.val) = make_buf(zero, nil, num_fast(512)); buf_put_u8((yyval.val), zero, (yyvsp[(1) - (1)].val)); } break; @@ -6806,14 +6808,14 @@ yyreduce: case 449: /* Line 1806 of yacc.c */ -#line 1482 "parser.y" +#line 1484 "parser.y" { (yyval.val) = num((yyvsp[(1) - (2)].chr) << 4 | (yyvsp[(2) - (2)].chr)); } break; case 450: /* Line 1806 of yacc.c */ -#line 1483 "parser.y" +#line 1485 "parser.y" { (yyval.val) = zero; yyerr("unpaired digit in buffer literal"); yyerrok; } @@ -6822,119 +6824,119 @@ yyreduce: case 451: /* Line 1806 of yacc.c */ -#line 1490 "parser.y" +#line 1492 "parser.y" { (yyval.val) = mkexp(all_s, nil, num(parser->lineno)); } break; case 452: /* Line 1806 of yacc.c */ -#line 1491 "parser.y" +#line 1493 "parser.y" { (yyval.val) = mkexp(some_s, nil, num(parser->lineno)); } break; case 453: /* Line 1806 of yacc.c */ -#line 1492 "parser.y" +#line 1494 "parser.y" { (yyval.val) = mkexp(none_s, nil, num(parser->lineno)); } break; case 454: /* Line 1806 of yacc.c */ -#line 1493 "parser.y" +#line 1495 "parser.y" { (yyval.val) = mkexp(maybe_s, nil, num(parser->lineno)); } break; case 455: /* Line 1806 of yacc.c */ -#line 1494 "parser.y" +#line 1496 "parser.y" { (yyval.val) = mkexp(cases_s, nil, num(parser->lineno)); } break; case 456: /* Line 1806 of yacc.c */ -#line 1495 "parser.y" +#line 1497 "parser.y" { (yyval.val) = mkexp(and_s, nil, num(parser->lineno)); } break; case 457: /* Line 1806 of yacc.c */ -#line 1496 "parser.y" +#line 1498 "parser.y" { (yyval.val) = mkexp(or_s, nil, num(parser->lineno)); } break; case 458: /* Line 1806 of yacc.c */ -#line 1497 "parser.y" +#line 1499 "parser.y" { (yyval.val) = mkexp(try_s, nil, num(parser->lineno)); } break; case 459: /* Line 1806 of yacc.c */ -#line 1498 "parser.y" +#line 1500 "parser.y" { (yyval.val) = mkexp(finally_s, nil, num(parser->lineno)); } break; case 460: /* Line 1806 of yacc.c */ -#line 1500 "parser.y" +#line 1502 "parser.y" { (yyval.val) = mkexp(block_s, (yyvsp[(2) - (3)].val), nil); } break; case 461: /* Line 1806 of yacc.c */ -#line 1502 "parser.y" +#line 1504 "parser.y" { (yyval.val) = mkexp(choose_s, (yyvsp[(2) - (3)].val), nil); } break; case 462: /* Line 1806 of yacc.c */ -#line 1504 "parser.y" +#line 1506 "parser.y" { (yyval.val) = mkexp(collect_s, (yyvsp[(2) - (3)].val), nil); } break; case 463: /* Line 1806 of yacc.c */ -#line 1506 "parser.y" +#line 1508 "parser.y" { (yyval.val) = mkexp(coll_s, (yyvsp[(2) - (3)].val), nil); } break; case 464: /* Line 1806 of yacc.c */ -#line 1508 "parser.y" +#line 1510 "parser.y" { (yyval.val) = mkexp(gather_s, (yyvsp[(2) - (3)].val), nil); } break; case 465: /* Line 1806 of yacc.c */ -#line 1510 "parser.y" +#line 1512 "parser.y" { (yyval.val) = mkexp(define_s, (yyvsp[(2) - (3)].val), nil); } break; case 466: /* Line 1806 of yacc.c */ -#line 1512 "parser.y" +#line 1514 "parser.y" { (yyval.val) = mkexp(catch_s, (yyvsp[(2) - (3)].val), nil); } break; case 467: /* Line 1806 of yacc.c */ -#line 1514 "parser.y" +#line 1516 "parser.y" { (yyval.val) = mkexp(if_s, cons((yyvsp[(2) - (5)].val), cons((yyvsp[(3) - (5)].val), (yyvsp[(4) - (5)].val))), @@ -6944,14 +6946,14 @@ yyreduce: case 468: /* Line 1806 of yacc.c */ -#line 1519 "parser.y" +#line 1521 "parser.y" { yyerr("@(output) doesn't nest"); } break; /* Line 1806 of yacc.c */ -#line 6985 "y.tab.c" +#line 6987 "y.tab.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -7182,7 +7184,7 @@ yyreturn: /* Line 2067 of yacc.c */ -#line 1523 "parser.y" +#line 1525 "parser.y" const int have_yydebug = YYDEBUG; |