json: omission in quasiquoted array.

* parser.y (json_val): Handle json_vals being a list,
indicating quasiquoting. We must nreverse it and turn it into
a sys:vector-lit form.

* y.tab.c.shipped: Updated.

1 files changed, 261 insertions, 257 deletions

diff --git a/y.tab.c.shipped b/y.tab.c.shipped
index 2c8f69ed..be060761 100644
--- a/y.tab.c.shipped
+++ b/y.tab.c.shipped
@@ -849,31 +849,31 @@ static const yytype_uint16 yyrline[] =
      819,   820,   821,   822,   823,   827,   832,   835,   839,   842,
      843,   845,   847,   850,   855,   864,   869,   872,   877,   882,
      886,   892,   896,   903,   907,   911,   915,   920,   924,   937,
-     941,   943,   943,   946,   947,   948,   949,   951,   952,   953,
-     954,   958,   958,   963,   963,   968,   968,   971,   972,   974,
-     976,   980,   984,   993,   995,   999,  1008,  1021,  1022,  1024,
-    1027,  1028,  1034,  1035,  1036,  1037,  1041,  1046,  1050,  1055,
-    1059,  1063,  1064,  1065,  1069,  1070,  1071,  1074,  1077,  1078,
-    1081,  1083,  1088,  1091,  1091,  1095,  1095,  1099,  1099,  1102,
-    1102,  1105,  1108,  1110,  1114,  1116,  1122,  1123,  1125,  1126,
-    1127,  1128,  1129,  1130,  1131,  1132,  1133,  1134,  1135,  1136,
-    1137,  1138,  1139,  1140,  1141,  1143,  1143,  1147,  1147,  1151,
-    1151,  1155,  1155,  1158,  1161,  1162,  1164,  1165,  1167,  1168,
-    1169,  1170,  1171,  1172,  1173,  1174,  1175,  1176,  1177,  1178,
-    1179,  1180,  1181,  1182,  1183,  1185,  1185,  1189,  1189,  1193,
-    1193,  1197,  1200,  1206,  1210,  1216,  1217,  1220,  1221,  1222,
-    1222,  1225,  1228,  1229,  1232,  1233,  1234,  1237,  1240,  1245,
-    1249,  1255,  1258,  1259,  1260,  1261,  1264,  1265,  1266,  1269,
-    1270,  1271,  1272,  1273,  1280,  1281,  1283,  1284,  1285,  1286,
-    1287,  1288,  1289,  1290,  1294,  1295,  1298,  1299,  1300,  1303,
-    1305,  1306,  1307,  1308,  1309,  1310,  1311,  1312,  1313,  1314,
-    1315,  1316,  1319,  1333,  1334,  1338,  1339,  1341,  1345,  1358,
-    1360,  1364,  1369,  1370,  1373,  1377,  1379,  1383,  1384,  1385,
-    1387,  1394,  1395,  1397,  1398,  1401,  1402,  1403,  1404,  1407,
-    1408,  1409,  1411,  1415,  1416,  1417,  1419,  1425,  1427,  1430,
-    1435,  1437,  1441,  1442,  1449,  1450,  1451,  1452,  1453,  1454,
-    1455,  1456,  1457,  1458,  1460,  1462,  1464,  1466,  1468,  1470,
-    1472,  1477
+     941,   943,   943,   946,   947,   948,   949,   951,   952,   957,
+     958,   962,   962,   967,   967,   972,   972,   975,   976,   978,
+     980,   984,   988,   997,   999,  1003,  1012,  1025,  1026,  1028,
+    1031,  1032,  1038,  1039,  1040,  1041,  1045,  1050,  1054,  1059,
+    1063,  1067,  1068,  1069,  1073,  1074,  1075,  1078,  1081,  1082,
+    1085,  1087,  1092,  1095,  1095,  1099,  1099,  1103,  1103,  1106,
+    1106,  1109,  1112,  1114,  1118,  1120,  1126,  1127,  1129,  1130,
+    1131,  1132,  1133,  1134,  1135,  1136,  1137,  1138,  1139,  1140,
+    1141,  1142,  1143,  1144,  1145,  1147,  1147,  1151,  1151,  1155,
+    1155,  1159,  1159,  1162,  1165,  1166,  1168,  1169,  1171,  1172,
+    1173,  1174,  1175,  1176,  1177,  1178,  1179,  1180,  1181,  1182,
+    1183,  1184,  1185,  1186,  1187,  1189,  1189,  1193,  1193,  1197,
+    1197,  1201,  1204,  1210,  1214,  1220,  1221,  1224,  1225,  1226,
+    1226,  1229,  1232,  1233,  1236,  1237,  1238,  1241,  1244,  1249,
+    1253,  1259,  1262,  1263,  1264,  1265,  1268,  1269,  1270,  1273,
+    1274,  1275,  1276,  1277,  1284,  1285,  1287,  1288,  1289,  1290,
+    1291,  1292,  1293,  1294,  1298,  1299,  1302,  1303,  1304,  1307,
+    1309,  1310,  1311,  1312,  1313,  1314,  1315,  1316,  1317,  1318,
+    1319,  1320,  1323,  1337,  1338,  1342,  1343,  1345,  1349,  1362,
+    1364,  1368,  1373,  1374,  1377,  1381,  1383,  1387,  1388,  1389,
+    1391,  1398,  1399,  1401,  1402,  1405,  1406,  1407,  1408,  1411,
+    1412,  1413,  1415,  1419,  1420,  1421,  1423,  1429,  1431,  1434,
+    1439,  1441,  1445,  1446,  1453,  1454,  1455,  1456,  1457,  1458,
+    1459,  1460,  1461,  1462,  1464,  1466,  1468,  1470,  1472,  1474,
+    1476,  1481
 };
 #endif
 
@@ -5064,20 +5064,24 @@ yyreduce:
 
 /* Line 1806 of yacc.c  */
 #line 952 "parser.y"
-    { (yyval.val) = (yyvsp[(2) - (3)].val); }
+    { (yyval.val) = if3(vectorp((yyvsp[(2) - (3)].val)),
+                                           (yyvsp[(2) - (3)].val),
+                                           rl(cons(vector_lit_s,
+                                                   cons(nreverse((yyvsp[(2) - (3)].val)), nil)),
+                                              (yyvsp[(2) - (3)].val))); }
     break;
 
   case 229:
 
 /* Line 1806 of yacc.c  */
-#line 953 "parser.y"
+#line 957 "parser.y"
     { (yyval.val) = make_hash(nil, nil, t); }
     break;
 
   case 230:
 
 /* Line 1806 of yacc.c  */
-#line 954 "parser.y"
+#line 958 "parser.y"
     { (yyval.val) = if3(hashp((yyvsp[(2) - (3)].val)),
                                            (yyvsp[(2) - (3)].val),
                                            rl(cons(hash_lit_s,
@@ -5087,14 +5091,14 @@ yyreduce:
   case 231:
 
 /* Line 1806 of yacc.c  */
-#line 958 "parser.y"
+#line 962 "parser.y"
     { parser->quasi_level--; }
     break;
 
   case 232:
 
 /* Line 1806 of yacc.c  */
-#line 959 "parser.y"
+#line 963 "parser.y"
     { parser->quasi_level++;
                                   end_of_json_unquote(scnr);
                                   (yyval.val) = rl(rlc(list(sys_unquote_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)),
@@ -5104,14 +5108,14 @@ yyreduce:
   case 233:
 
 /* Line 1806 of yacc.c  */
-#line 963 "parser.y"
+#line 967 "parser.y"
     { parser->quasi_level--; }
     break;
 
   case 234:
 
 /* Line 1806 of yacc.c  */
-#line 964 "parser.y"
+#line 968 "parser.y"
     { parser->quasi_level++;
                                   end_of_json_unquote(scnr);
                                   (yyval.val) = rl(rlc(list(sys_splice_s, (yyvsp[(3) - (3)].val), nao), (yyvsp[(3) - (3)].val)),
@@ -5121,14 +5125,14 @@ yyreduce:
   case 235:
 
 /* Line 1806 of yacc.c  */
-#line 968 "parser.y"
+#line 972 "parser.y"
     { parser_circ_def(parser, (yyvsp[(1) - (1)].val), unique_s); }
     break;
 
   case 236:
 
 /* Line 1806 of yacc.c  */
-#line 969 "parser.y"
+#line 973 "parser.y"
     { parser_circ_def(parser, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
                                   (yyval.val) = (yyvsp[(3) - (3)].val); }
     break;
@@ -5136,14 +5140,14 @@ yyreduce:
   case 237:
 
 /* Line 1806 of yacc.c  */
-#line 971 "parser.y"
+#line 975 "parser.y"
     { (yyval.val) = parser_circ_ref(parser, (yyvsp[(1) - (1)].val)); }
     break;
 
   case 238:
 
 /* Line 1806 of yacc.c  */
-#line 972 "parser.y"
+#line 976 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("JSON string")); }
     break;
@@ -5151,7 +5155,7 @@ yyreduce:
   case 239:
 
 /* Line 1806 of yacc.c  */
-#line 974 "parser.y"
+#line 978 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("JSON array")); }
     break;
@@ -5159,7 +5163,7 @@ yyreduce:
   case 240:
 
 /* Line 1806 of yacc.c  */
-#line 976 "parser.y"
+#line 980 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("JSON hash")); }
     break;
@@ -5167,7 +5171,7 @@ yyreduce:
   case 241:
 
 /* Line 1806 of yacc.c  */
-#line 980 "parser.y"
+#line 984 "parser.y"
     { (yyval.val) = if3(parser->quasi_level > 0 &&
                                                    unquotes_occur((yyvsp[(1) - (1)].val), 0),
                                                    cons((yyvsp[(1) - (1)].val), nil),
@@ -5177,7 +5181,7 @@ yyreduce:
   case 242:
 
 /* Line 1806 of yacc.c  */
-#line 984 "parser.y"
+#line 988 "parser.y"
     { if (consp((yyvsp[(1) - (3)].val)))
                                           { (yyval.val) = cons((yyvsp[(3) - (3)].val), (yyvsp[(1) - (3)].val)); }
                                           else if (parser->quasi_level > 0 &&
@@ -5192,7 +5196,7 @@ yyreduce:
   case 243:
 
 /* Line 1806 of yacc.c  */
-#line 993 "parser.y"
+#line 997 "parser.y"
     { yyerr("missing comma in JSON array");
                                           (yyval.val) = (yyvsp[(1) - (2)].val); }
     break;
@@ -5200,7 +5204,7 @@ yyreduce:
   case 244:
 
 /* Line 1806 of yacc.c  */
-#line 995 "parser.y"
+#line 999 "parser.y"
     { yyerr("bad element in JSON array");
                                           (yyval.val) = (yyvsp[(1) - (2)].val); }
     break;
@@ -5208,7 +5212,7 @@ yyreduce:
   case 245:
 
 /* Line 1806 of yacc.c  */
-#line 999 "parser.y"
+#line 1003 "parser.y"
     { if (!stringp((yyvsp[(1) - (3)].val)))
                                             yyerr("non-string key in JSON hash");
                                           if (parser->quasi_level > 0 &&
@@ -5223,7 +5227,7 @@ yyreduce:
   case 246:
 
 /* Line 1806 of yacc.c  */
-#line 1009 "parser.y"
+#line 1013 "parser.y"
     { if (!stringp((yyvsp[(3) - (5)].val)))
                                            yyerr("non-string key in JSON hash");
                                          if (consp((yyvsp[(1) - (5)].val)))
@@ -5241,35 +5245,35 @@ yyreduce:
   case 247:
 
 /* Line 1806 of yacc.c  */
-#line 1021 "parser.y"
+#line 1025 "parser.y"
     { yyerr("missing colon in JSON hash"); }
     break;
 
   case 248:
 
 /* Line 1806 of yacc.c  */
-#line 1023 "parser.y"
+#line 1027 "parser.y"
     { yyerr("missing comma in JSON hash"); }
     break;
 
   case 249:
 
 /* Line 1806 of yacc.c  */
-#line 1024 "parser.y"
+#line 1028 "parser.y"
     { yyerr("bad element in JSON hash"); }
     break;
 
   case 250:
 
 /* Line 1806 of yacc.c  */
-#line 1027 "parser.y"
+#line 1031 "parser.y"
     { (yyval.val) = rl((yyvsp[(2) - (3)].val), num((yyvsp[(1) - (3)].lineno))); }
     break;
 
   case 251:
 
 /* Line 1806 of yacc.c  */
-#line 1028 "parser.y"
+#line 1032 "parser.y"
     { val a = car((yyvsp[(3) - (4)].val));
                                   val ur = uref_helper(parser, a);
                                   if (ur == a)
@@ -5281,28 +5285,28 @@ yyreduce:
   case 252:
 
 /* Line 1806 of yacc.c  */
-#line 1034 "parser.y"
+#line 1038 "parser.y"
     { (yyval.val) = nil; }
     break;
 
   case 253:
 
 /* Line 1806 of yacc.c  */
-#line 1035 "parser.y"
+#line 1039 "parser.y"
     { (yyval.val) = (yyvsp[(3) - (4)].val); }
     break;
 
   case 254:
 
 /* Line 1806 of yacc.c  */
-#line 1036 "parser.y"
+#line 1040 "parser.y"
     { (yyval.val) = (yyvsp[(3) - (4)].val); }
     break;
 
   case 255:
 
 /* Line 1806 of yacc.c  */
-#line 1037 "parser.y"
+#line 1041 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("expression")); }
     break;
@@ -5310,7 +5314,7 @@ yyreduce:
   case 256:
 
 /* Line 1806 of yacc.c  */
-#line 1041 "parser.y"
+#line 1045 "parser.y"
     { if (consp((yyvsp[(2) - (2)].val)))
                                     (yyval.val) = rl(cons(expr_s, cons((yyvsp[(2) - (2)].val), nil)), num((yyvsp[(1) - (2)].lineno)));
                                   else
@@ -5321,7 +5325,7 @@ yyreduce:
   case 257:
 
 /* Line 1806 of yacc.c  */
-#line 1046 "parser.y"
+#line 1050 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("meta expression")); }
     break;
@@ -5329,7 +5333,7 @@ yyreduce:
   case 258:
 
 /* Line 1806 of yacc.c  */
-#line 1050 "parser.y"
+#line 1054 "parser.y"
     { if (consp((yyvsp[(2) - (2)].val)))
                                     (yyval.val) = rl(cons(expr_s, cons((yyvsp[(2) - (2)].val), nil)), num((yyvsp[(1) - (2)].chr)));
                                   else
@@ -5340,7 +5344,7 @@ yyreduce:
   case 259:
 
 /* Line 1806 of yacc.c  */
-#line 1055 "parser.y"
+#line 1059 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("meta expression")); }
     break;
@@ -5348,7 +5352,7 @@ yyreduce:
   case 260:
 
 /* Line 1806 of yacc.c  */
-#line 1059 "parser.y"
+#line 1063 "parser.y"
     { val a = car((yyvsp[(3) - (4)].val));
                                   val ur = uref_helper(parser, a);
                                   (yyval.val) = rlcp_tree(cons(dwim_s,
@@ -5358,21 +5362,21 @@ yyreduce:
   case 261:
 
 /* Line 1806 of yacc.c  */
-#line 1063 "parser.y"
+#line 1067 "parser.y"
     { (yyval.val) = rl(cons(dwim_s, (yyvsp[(2) - (3)].val)), num((yyvsp[(1) - (3)].lineno))); }
     break;
 
   case 262:
 
 /* Line 1806 of yacc.c  */
-#line 1064 "parser.y"
+#line 1068 "parser.y"
     { (yyval.val) = rl(cons(dwim_s, nil), num((yyvsp[(1) - (2)].lineno))); }
     break;
 
   case 263:
 
 /* Line 1806 of yacc.c  */
-#line 1065 "parser.y"
+#line 1069 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("DWIM expression")); }
     break;
@@ -5380,28 +5384,28 @@ yyreduce:
   case 267:
 
 /* Line 1806 of yacc.c  */
-#line 1074 "parser.y"
+#line 1078 "parser.y"
     { (yyval.val) = rlc(expand_meta((yyvsp[(1) - (1)].val), nil), (yyvsp[(1) - (1)].val)); }
     break;
 
   case 268:
 
 /* Line 1806 of yacc.c  */
-#line 1077 "parser.y"
+#line 1081 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 269:
 
 /* Line 1806 of yacc.c  */
-#line 1078 "parser.y"
+#line 1082 "parser.y"
     { (yyval.val) = nil; }
     break;
 
   case 270:
 
 /* Line 1806 of yacc.c  */
-#line 1081 "parser.y"
+#line 1085 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val)->c.cdr;
                                   (yyvsp[(1) - (1)].val)->c.cdr = nil; }
     break;
@@ -5409,7 +5413,7 @@ yyreduce:
   case 271:
 
 /* Line 1806 of yacc.c  */
-#line 1084 "parser.y"
+#line 1088 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (3)].val)->c.cdr;
                                   (yyvsp[(1) - (3)].val)->c.cdr = (yyvsp[(3) - (3)].val); }
     break;
@@ -5417,7 +5421,7 @@ yyreduce:
   case 272:
 
 /* Line 1806 of yacc.c  */
-#line 1088 "parser.y"
+#line 1092 "parser.y"
     { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil);
                                   rlc((yyval.val), (yyvsp[(1) - (1)].val));
                                   (yyval.val)->c.cdr = (yyval.val); }
@@ -5426,14 +5430,14 @@ yyreduce:
   case 273:
 
 /* Line 1806 of yacc.c  */
-#line 1091 "parser.y"
+#line 1095 "parser.y"
     { parser->ignore = 1; }
     break;
 
   case 274:
 
 /* Line 1806 of yacc.c  */
-#line 1092 "parser.y"
+#line 1096 "parser.y"
     { parser->ignore = 0;
                                   (yyval.val) = cons(nil, nil);
                                   (yyval.val)->c.cdr = (yyval.val); }
@@ -5442,14 +5446,14 @@ yyreduce:
   case 275:
 
 /* Line 1806 of yacc.c  */
-#line 1095 "parser.y"
+#line 1099 "parser.y"
     { parser->ignore = 1; }
     break;
 
   case 276:
 
 /* Line 1806 of yacc.c  */
-#line 1096 "parser.y"
+#line 1100 "parser.y"
     { parser->ignore = 0;
                                   (yyval.val) = cons(nil, nil);
                                   (yyval.val)->c.cdr = (yyval.val); }
@@ -5458,14 +5462,14 @@ yyreduce:
   case 277:
 
 /* Line 1806 of yacc.c  */
-#line 1099 "parser.y"
+#line 1103 "parser.y"
     { parser->ignore = 1; }
     break;
 
   case 278:
 
 /* Line 1806 of yacc.c  */
-#line 1100 "parser.y"
+#line 1104 "parser.y"
     { parser->ignore = 0;
                                   (yyval.val) = (yyvsp[(1) - (4)].val); }
     break;
@@ -5473,14 +5477,14 @@ yyreduce:
   case 279:
 
 /* Line 1806 of yacc.c  */
-#line 1102 "parser.y"
+#line 1106 "parser.y"
     { parser->ignore = 1; }
     break;
 
   case 280:
 
 /* Line 1806 of yacc.c  */
-#line 1103 "parser.y"
+#line 1107 "parser.y"
     { parser->ignore = 0;
                                   (yyval.val) = (yyvsp[(1) - (5)].val); }
     break;
@@ -5488,7 +5492,7 @@ yyreduce:
   case 281:
 
 /* Line 1806 of yacc.c  */
-#line 1105 "parser.y"
+#line 1109 "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); }
@@ -5497,7 +5501,7 @@ yyreduce:
   case 282:
 
 /* Line 1806 of yacc.c  */
-#line 1108 "parser.y"
+#line 1112 "parser.y"
     { (yyval.val) = lastcons(rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno))));
                                   (yyval.val)->c.cdr = (yyvsp[(2) - (2)].val); }
     break;
@@ -5505,7 +5509,7 @@ yyreduce:
   case 283:
 
 /* Line 1806 of yacc.c  */
-#line 1111 "parser.y"
+#line 1115 "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); }
@@ -5514,7 +5518,7 @@ yyreduce:
   case 284:
 
 /* Line 1806 of yacc.c  */
-#line 1114 "parser.y"
+#line 1118 "parser.y"
     { (yyval.val) = lastcons(rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno))));
                                   (yyval.val)->c.cdr = (yyvsp[(2) - (2)].val); }
     break;
@@ -5522,7 +5526,7 @@ yyreduce:
   case 285:
 
 /* Line 1806 of yacc.c  */
-#line 1117 "parser.y"
+#line 1121 "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); }
@@ -5531,14 +5535,14 @@ yyreduce:
   case 286:
 
 /* Line 1806 of yacc.c  */
-#line 1122 "parser.y"
+#line 1126 "parser.y"
     { (yyval.val) = ifnign(symhlpr((yyvsp[(1) - (1)].lexeme), t)); }
     break;
 
   case 287:
 
 /* Line 1806 of yacc.c  */
-#line 1123 "parser.y"
+#line 1127 "parser.y"
     { (yyval.val) = cons(var_s, cons((yyvsp[(1) - (1)].val), nil));
                                   rl((yyval.val), num(parser->lineno)); }
     break;
@@ -5546,119 +5550,119 @@ yyreduce:
   case 288:
 
 /* Line 1806 of yacc.c  */
-#line 1125 "parser.y"
+#line 1129 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 289:
 
 /* Line 1806 of yacc.c  */
-#line 1126 "parser.y"
+#line 1130 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 290:
 
 /* Line 1806 of yacc.c  */
-#line 1127 "parser.y"
+#line 1131 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 291:
 
 /* Line 1806 of yacc.c  */
-#line 1128 "parser.y"
+#line 1132 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 292:
 
 /* Line 1806 of yacc.c  */
-#line 1129 "parser.y"
+#line 1133 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 293:
 
 /* Line 1806 of yacc.c  */
-#line 1130 "parser.y"
+#line 1134 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 294:
 
 /* Line 1806 of yacc.c  */
-#line 1131 "parser.y"
+#line 1135 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 295:
 
 /* Line 1806 of yacc.c  */
-#line 1132 "parser.y"
+#line 1136 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 296:
 
 /* Line 1806 of yacc.c  */
-#line 1133 "parser.y"
+#line 1137 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 297:
 
 /* Line 1806 of yacc.c  */
-#line 1134 "parser.y"
+#line 1138 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 298:
 
 /* Line 1806 of yacc.c  */
-#line 1135 "parser.y"
+#line 1139 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 299:
 
 /* Line 1806 of yacc.c  */
-#line 1136 "parser.y"
+#line 1140 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 300:
 
 /* Line 1806 of yacc.c  */
-#line 1137 "parser.y"
+#line 1141 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 301:
 
 /* Line 1806 of yacc.c  */
-#line 1138 "parser.y"
+#line 1142 "parser.y"
     { (yyval.val) = rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno))); }
     break;
 
   case 302:
 
 /* Line 1806 of yacc.c  */
-#line 1139 "parser.y"
+#line 1143 "parser.y"
     { (yyval.val) = rl(cons(quasilist_s, (yyvsp[(2) - (2)].val)), num((yyvsp[(1) - (2)].lineno))); }
     break;
 
   case 303:
 
 /* Line 1806 of yacc.c  */
-#line 1140 "parser.y"
+#line 1144 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 304:
 
 /* Line 1806 of yacc.c  */
-#line 1141 "parser.y"
+#line 1145 "parser.y"
     { (yyval.val) = rl(rlc(list(quote_s, (yyvsp[(2) - (2)].val), nao), (yyvsp[(2) - (2)].val)),
                                           num(parser->lineno)); }
     break;
@@ -5666,14 +5670,14 @@ yyreduce:
   case 305:
 
 /* Line 1806 of yacc.c  */
-#line 1143 "parser.y"
+#line 1147 "parser.y"
     { parser->quasi_level++; }
     break;
 
   case 306:
 
 /* Line 1806 of yacc.c  */
-#line 1144 "parser.y"
+#line 1148 "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)); }
@@ -5682,14 +5686,14 @@ yyreduce:
   case 307:
 
 /* Line 1806 of yacc.c  */
-#line 1147 "parser.y"
+#line 1151 "parser.y"
     { parser->quasi_level--; }
     break;
 
   case 308:
 
 /* Line 1806 of yacc.c  */
-#line 1148 "parser.y"
+#line 1152 "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)); }
@@ -5698,14 +5702,14 @@ yyreduce:
   case 309:
 
 /* Line 1806 of yacc.c  */
-#line 1151 "parser.y"
+#line 1155 "parser.y"
     { parser->quasi_level--; }
     break;
 
   case 310:
 
 /* Line 1806 of yacc.c  */
-#line 1152 "parser.y"
+#line 1156 "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)); }
@@ -5714,14 +5718,14 @@ yyreduce:
   case 311:
 
 /* Line 1806 of yacc.c  */
-#line 1155 "parser.y"
+#line 1159 "parser.y"
     { parser_circ_def(parser, (yyvsp[(1) - (1)].val), unique_s); }
     break;
 
   case 312:
 
 /* Line 1806 of yacc.c  */
-#line 1156 "parser.y"
+#line 1160 "parser.y"
     { parser_circ_def(parser, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
                                   (yyval.val) = (yyvsp[(3) - (3)].val); }
     break;
@@ -5729,35 +5733,35 @@ yyreduce:
   case 313:
 
 /* Line 1806 of yacc.c  */
-#line 1158 "parser.y"
+#line 1162 "parser.y"
     { (yyval.val) = parser_circ_ref(parser, (yyvsp[(1) - (1)].val)); }
     break;
 
   case 314:
 
 /* Line 1806 of yacc.c  */
-#line 1161 "parser.y"
+#line 1165 "parser.y"
     { (yyval.val) = uref_helper(parser, (yyvsp[(2) - (2)].val)); }
     break;
 
   case 315:
 
 /* Line 1806 of yacc.c  */
-#line 1162 "parser.y"
+#line 1166 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 316:
 
 /* Line 1806 of yacc.c  */
-#line 1164 "parser.y"
+#line 1168 "parser.y"
     { (yyval.val) = ifnign(symhlpr((yyvsp[(1) - (1)].lexeme), t)); }
     break;
 
   case 317:
 
 /* Line 1806 of yacc.c  */
-#line 1165 "parser.y"
+#line 1169 "parser.y"
     { (yyval.val) = cons(var_s, cons((yyvsp[(1) - (1)].val), nil));
                                   rl((yyval.val), num(parser->lineno)); }
     break;
@@ -5765,119 +5769,119 @@ yyreduce:
   case 318:
 
 /* Line 1806 of yacc.c  */
-#line 1167 "parser.y"
+#line 1171 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 319:
 
 /* Line 1806 of yacc.c  */
-#line 1168 "parser.y"
+#line 1172 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 320:
 
 /* Line 1806 of yacc.c  */
-#line 1169 "parser.y"
+#line 1173 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 321:
 
 /* Line 1806 of yacc.c  */
-#line 1170 "parser.y"
+#line 1174 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 322:
 
 /* Line 1806 of yacc.c  */
-#line 1171 "parser.y"
+#line 1175 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 323:
 
 /* Line 1806 of yacc.c  */
-#line 1172 "parser.y"
+#line 1176 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 324:
 
 /* Line 1806 of yacc.c  */
-#line 1173 "parser.y"
+#line 1177 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 325:
 
 /* Line 1806 of yacc.c  */
-#line 1174 "parser.y"
+#line 1178 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 326:
 
 /* Line 1806 of yacc.c  */
-#line 1175 "parser.y"
+#line 1179 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 327:
 
 /* Line 1806 of yacc.c  */
-#line 1176 "parser.y"
+#line 1180 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 328:
 
 /* Line 1806 of yacc.c  */
-#line 1177 "parser.y"
+#line 1181 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 329:
 
 /* Line 1806 of yacc.c  */
-#line 1178 "parser.y"
+#line 1182 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 330:
 
 /* Line 1806 of yacc.c  */
-#line 1179 "parser.y"
+#line 1183 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 331:
 
 /* Line 1806 of yacc.c  */
-#line 1180 "parser.y"
+#line 1184 "parser.y"
     { (yyval.val) = rl((yyvsp[(2) - (2)].val), num((yyvsp[(1) - (2)].lineno))); }
     break;
 
   case 332:
 
 /* Line 1806 of yacc.c  */
-#line 1181 "parser.y"
+#line 1185 "parser.y"
     { (yyval.val) = rl(cons(quasilist_s, (yyvsp[(2) - (2)].val)), num((yyvsp[(1) - (2)].lineno))); }
     break;
 
   case 333:
 
 /* Line 1806 of yacc.c  */
-#line 1182 "parser.y"
+#line 1186 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 334:
 
 /* Line 1806 of yacc.c  */
-#line 1183 "parser.y"
+#line 1187 "parser.y"
     { (yyval.val) = rl(rlc(list(quote_s, (yyvsp[(2) - (2)].val), nao), (yyvsp[(2) - (2)].val)),
                                           num(parser->lineno)); }
     break;
@@ -5885,14 +5889,14 @@ yyreduce:
   case 335:
 
 /* Line 1806 of yacc.c  */
-#line 1185 "parser.y"
+#line 1189 "parser.y"
     { parser->quasi_level++; }
     break;
 
   case 336:
 
 /* Line 1806 of yacc.c  */
-#line 1186 "parser.y"
+#line 1190 "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)); }
@@ -5901,14 +5905,14 @@ yyreduce:
   case 337:
 
 /* Line 1806 of yacc.c  */
-#line 1189 "parser.y"
+#line 1193 "parser.y"
     { parser->quasi_level--; }
     break;
 
   case 338:
 
 /* Line 1806 of yacc.c  */
-#line 1190 "parser.y"
+#line 1194 "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)); }
@@ -5917,14 +5921,14 @@ yyreduce:
   case 339:
 
 /* Line 1806 of yacc.c  */
-#line 1193 "parser.y"
+#line 1197 "parser.y"
     { parser->quasi_level--; }
     break;
 
   case 340:
 
 /* Line 1806 of yacc.c  */
-#line 1194 "parser.y"
+#line 1198 "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)); }
@@ -5933,7 +5937,7 @@ yyreduce:
   case 341:
 
 /* Line 1806 of yacc.c  */
-#line 1197 "parser.y"
+#line 1201 "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))); }
@@ -5942,7 +5946,7 @@ yyreduce:
   case 342:
 
 /* Line 1806 of yacc.c  */
-#line 1201 "parser.y"
+#line 1205 "parser.y"
     { uses_or2;
                                   (yyval.val) = rlc(list(rcons_s, (yyvsp[(1) - (4)].val),
                                                           uref_helper(parser, (yyvsp[(4) - (4)].val)),
@@ -5953,7 +5957,7 @@ yyreduce:
   case 343:
 
 /* Line 1806 of yacc.c  */
-#line 1207 "parser.y"
+#line 1211 "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))); }
@@ -5962,7 +5966,7 @@ yyreduce:
   case 344:
 
 /* Line 1806 of yacc.c  */
-#line 1211 "parser.y"
+#line 1215 "parser.y"
     { uses_or2;
                                   (yyval.val) = rlc(list(rcons_s, (yyvsp[(1) - (4)].val),
                                                           uref_helper(parser, (yyvsp[(4) - (4)].val)),
@@ -5973,14 +5977,14 @@ yyreduce:
   case 345:
 
 /* Line 1806 of yacc.c  */
-#line 1216 "parser.y"
+#line 1220 "parser.y"
     { (yyval.val) = qref_helper(parser, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val)); }
     break;
 
   case 346:
 
 /* Line 1806 of yacc.c  */
-#line 1217 "parser.y"
+#line 1221 "parser.y"
     { (yyval.val) = qref_helper(parser,
                                                    cons(t, cons((yyvsp[(1) - (3)].val), nil)),
                                                         (yyvsp[(3) - (3)].val)); }
@@ -5989,28 +5993,28 @@ yyreduce:
   case 347:
 
 /* Line 1806 of yacc.c  */
-#line 1220 "parser.y"
+#line 1224 "parser.y"
     { (yyval.val) = uref_helper(parser, (yyvsp[(2) - (2)].val)); }
     break;
 
   case 348:
 
 /* Line 1806 of yacc.c  */
-#line 1221 "parser.y"
+#line 1225 "parser.y"
     { (yyval.val) = uoref_helper(parser, (yyvsp[(2) - (2)].val)); }
     break;
 
   case 349:
 
 /* Line 1806 of yacc.c  */
-#line 1222 "parser.y"
+#line 1226 "parser.y"
     { parser_circ_def(parser, (yyvsp[(1) - (1)].val), unique_s); }
     break;
 
   case 350:
 
 /* Line 1806 of yacc.c  */
-#line 1223 "parser.y"
+#line 1227 "parser.y"
     { parser_circ_def(parser, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val));
                                   (yyval.val) = (yyvsp[(3) - (3)].val); }
     break;
@@ -6018,49 +6022,49 @@ yyreduce:
   case 351:
 
 /* Line 1806 of yacc.c  */
-#line 1225 "parser.y"
+#line 1229 "parser.y"
     { (yyval.val) = parser_circ_ref(parser, (yyvsp[(1) - (1)].val)); }
     break;
 
   case 352:
 
 /* Line 1806 of yacc.c  */
-#line 1228 "parser.y"
+#line 1232 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 353:
 
 /* Line 1806 of yacc.c  */
-#line 1229 "parser.y"
+#line 1233 "parser.y"
     { (yyval.val) = nil; }
     break;
 
   case 354:
 
 /* Line 1806 of yacc.c  */
-#line 1232 "parser.y"
+#line 1236 "parser.y"
     { (yyval.val) = uref_helper(parser, (yyvsp[(2) - (2)].val)); }
     break;
 
   case 355:
 
 /* Line 1806 of yacc.c  */
-#line 1233 "parser.y"
+#line 1237 "parser.y"
     { (yyval.val) = uoref_helper(parser, (yyvsp[(2) - (2)].val)); }
     break;
 
   case 356:
 
 /* Line 1806 of yacc.c  */
-#line 1234 "parser.y"
+#line 1238 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 357:
 
 /* Line 1806 of yacc.c  */
-#line 1237 "parser.y"
+#line 1241 "parser.y"
     { (yyval.val) = regex_compile((yyvsp[(2) - (3)].val), nil);
                                   end_of_regex(scnr);
                                   rl((yyval.val), num(parser->lineno)); }
@@ -6069,7 +6073,7 @@ yyreduce:
   case 358:
 
 /* Line 1806 of yacc.c  */
-#line 1240 "parser.y"
+#line 1244 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("regex"));
                                   end_of_regex(scnr); }
@@ -6078,7 +6082,7 @@ yyreduce:
   case 359:
 
 /* Line 1806 of yacc.c  */
-#line 1246 "parser.y"
+#line 1250 "parser.y"
     { (yyval.val) = regex_compile((yyvsp[(2) - (3)].val), nil);
                                   end_of_regex(scnr);
                                   rl((yyval.val), num(parser->lineno)); }
@@ -6087,7 +6091,7 @@ yyreduce:
   case 360:
 
 /* Line 1806 of yacc.c  */
-#line 1250 "parser.y"
+#line 1254 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("regex"));
                                   end_of_regex(scnr); }
@@ -6096,7 +6100,7 @@ yyreduce:
   case 361:
 
 /* Line 1806 of yacc.c  */
-#line 1255 "parser.y"
+#line 1259 "parser.y"
     { (yyval.val) = if3(cdr((yyvsp[(1) - (1)].val)),
                                                    cons(compound_s, (yyvsp[(1) - (1)].val)),
                                                    car((yyvsp[(1) - (1)].val))); }
@@ -6105,84 +6109,84 @@ yyreduce:
   case 362:
 
 /* Line 1806 of yacc.c  */
-#line 1258 "parser.y"
+#line 1262 "parser.y"
     { (yyval.val) = list(or_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao); }
     break;
 
   case 363:
 
 /* Line 1806 of yacc.c  */
-#line 1259 "parser.y"
+#line 1263 "parser.y"
     { (yyval.val) = list(and_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao); }
     break;
 
   case 364:
 
 /* Line 1806 of yacc.c  */
-#line 1260 "parser.y"
+#line 1264 "parser.y"
     { (yyval.val) = list(compl_s, (yyvsp[(2) - (2)].val), nao); }
     break;
 
   case 365:
 
 /* Line 1806 of yacc.c  */
-#line 1261 "parser.y"
+#line 1265 "parser.y"
     { (yyval.val) = nil; }
     break;
 
   case 366:
 
 /* Line 1806 of yacc.c  */
-#line 1264 "parser.y"
+#line 1268 "parser.y"
     { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil); }
     break;
 
   case 367:
 
 /* Line 1806 of yacc.c  */
-#line 1265 "parser.y"
+#line 1269 "parser.y"
     { (yyval.val) = cons((yyvsp[(1) - (2)].val), (yyvsp[(2) - (2)].val)); }
     break;
 
   case 368:
 
 /* Line 1806 of yacc.c  */
-#line 1266 "parser.y"
+#line 1270 "parser.y"
     { (yyval.val) = list((yyvsp[(1) - (3)].val), list(compl_s, (yyvsp[(3) - (3)].val), nao), nao); }
     break;
 
   case 369:
 
 /* Line 1806 of yacc.c  */
-#line 1269 "parser.y"
+#line 1273 "parser.y"
     { (yyval.val) = list(zeroplus_s, (yyvsp[(1) - (2)].val), nao); }
     break;
 
   case 370:
 
 /* Line 1806 of yacc.c  */
-#line 1270 "parser.y"
+#line 1274 "parser.y"
     { (yyval.val) = list(oneplus_s, (yyvsp[(1) - (2)].val), nao); }
     break;
 
   case 371:
 
 /* Line 1806 of yacc.c  */
-#line 1271 "parser.y"
+#line 1275 "parser.y"
     { (yyval.val) = list(optional_s, (yyvsp[(1) - (2)].val), nao); }
     break;
 
   case 372:
 
 /* Line 1806 of yacc.c  */
-#line 1272 "parser.y"
+#line 1276 "parser.y"
     { (yyval.val) = list(nongreedy_s, (yyvsp[(1) - (3)].val), (yyvsp[(3) - (3)].val), nao); }
     break;
 
   case 373:
 
 /* Line 1806 of yacc.c  */
-#line 1273 "parser.y"
+#line 1277 "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)));
@@ -6195,14 +6199,14 @@ yyreduce:
   case 374:
 
 /* Line 1806 of yacc.c  */
-#line 1280 "parser.y"
+#line 1284 "parser.y"
     { (yyval.val) = cons(set_s, nil); }
     break;
 
   case 375:
 
 /* Line 1806 of yacc.c  */
-#line 1281 "parser.y"
+#line 1285 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("regex character class")); }
     break;
@@ -6210,56 +6214,56 @@ yyreduce:
   case 376:
 
 /* Line 1806 of yacc.c  */
-#line 1283 "parser.y"
+#line 1287 "parser.y"
     { (yyval.val) = wild_s; }
     break;
 
   case 377:
 
 /* Line 1806 of yacc.c  */
-#line 1284 "parser.y"
+#line 1288 "parser.y"
     { (yyval.val) = chr(']'); }
     break;
 
   case 378:
 
 /* Line 1806 of yacc.c  */
-#line 1285 "parser.y"
+#line 1289 "parser.y"
     { (yyval.val) = chr('-'); }
     break;
 
   case 379:
 
 /* Line 1806 of yacc.c  */
-#line 1286 "parser.y"
+#line 1290 "parser.y"
     { (yyval.val) = chr((yyvsp[(1) - (1)].chr)); }
     break;
 
   case 380:
 
 /* Line 1806 of yacc.c  */
-#line 1287 "parser.y"
+#line 1291 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 381:
 
 /* Line 1806 of yacc.c  */
-#line 1288 "parser.y"
+#line 1292 "parser.y"
     { (yyval.val) = list(compound_s, string_own((yyvsp[(1) - (1)].lexeme)), nao); }
     break;
 
   case 382:
 
 /* Line 1806 of yacc.c  */
-#line 1289 "parser.y"
+#line 1293 "parser.y"
     { (yyval.val) = (yyvsp[(2) - (3)].val); }
     break;
 
   case 383:
 
 /* Line 1806 of yacc.c  */
-#line 1290 "parser.y"
+#line 1294 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("regex subexpression")); }
     break;
@@ -6267,133 +6271,133 @@ yyreduce:
   case 384:
 
 /* Line 1806 of yacc.c  */
-#line 1294 "parser.y"
+#line 1298 "parser.y"
     { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil); }
     break;
 
   case 385:
 
 /* Line 1806 of yacc.c  */
-#line 1295 "parser.y"
+#line 1299 "parser.y"
     { (yyval.val) = cons((yyvsp[(1) - (2)].val), (yyvsp[(2) - (2)].val)); }
     break;
 
   case 386:
 
 /* Line 1806 of yacc.c  */
-#line 1298 "parser.y"
+#line 1302 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 387:
 
 /* Line 1806 of yacc.c  */
-#line 1299 "parser.y"
+#line 1303 "parser.y"
     { (yyval.val) = chr((yyvsp[(1) - (1)].chr)); }
     break;
 
   case 388:
 
 /* Line 1806 of yacc.c  */
-#line 1300 "parser.y"
+#line 1304 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 389:
 
 /* Line 1806 of yacc.c  */
-#line 1303 "parser.y"
+#line 1307 "parser.y"
     { (yyval.val) = cons(chr((yyvsp[(1) - (3)].chr)), chr((yyvsp[(3) - (3)].chr))); }
     break;
 
   case 390:
 
 /* Line 1806 of yacc.c  */
-#line 1305 "parser.y"
+#line 1309 "parser.y"
     { (yyval.chr) = '?'; }
     break;
 
   case 391:
 
 /* Line 1806 of yacc.c  */
-#line 1306 "parser.y"
+#line 1310 "parser.y"
     { (yyval.chr) = '.'; }
     break;
 
   case 392:
 
 /* Line 1806 of yacc.c  */
-#line 1307 "parser.y"
+#line 1311 "parser.y"
     { (yyval.chr) = '*'; }
     break;
 
   case 393:
 
 /* Line 1806 of yacc.c  */
-#line 1308 "parser.y"
+#line 1312 "parser.y"
     { (yyval.chr) = '+'; }
     break;
 
   case 394:
 
 /* Line 1806 of yacc.c  */
-#line 1309 "parser.y"
+#line 1313 "parser.y"
     { (yyval.chr) = '('; }
     break;
 
   case 395:
 
 /* Line 1806 of yacc.c  */
-#line 1310 "parser.y"
+#line 1314 "parser.y"
     { (yyval.chr) = ')'; }
     break;
 
   case 396:
 
 /* Line 1806 of yacc.c  */
-#line 1311 "parser.y"
+#line 1315 "parser.y"
     { (yyval.chr) = '|'; }
     break;
 
   case 397:
 
 /* Line 1806 of yacc.c  */
-#line 1312 "parser.y"
+#line 1316 "parser.y"
     { (yyval.chr) = '~'; }
     break;
 
   case 398:
 
 /* Line 1806 of yacc.c  */
-#line 1313 "parser.y"
+#line 1317 "parser.y"
     { (yyval.chr) = '&'; }
     break;
 
   case 399:
 
 /* Line 1806 of yacc.c  */
-#line 1314 "parser.y"
+#line 1318 "parser.y"
     { (yyval.chr) = '%'; }
     break;
 
   case 400:
 
 /* Line 1806 of yacc.c  */
-#line 1315 "parser.y"
+#line 1319 "parser.y"
     { (yyval.chr) = '/'; }
     break;
 
   case 401:
 
 /* Line 1806 of yacc.c  */
-#line 1316 "parser.y"
+#line 1320 "parser.y"
     { (yyval.chr) = (yyvsp[(1) - (1)].chr); }
     break;
 
   case 402:
 
 /* Line 1806 of yacc.c  */
-#line 1319 "parser.y"
+#line 1323 "parser.y"
     { switch ((yyvsp[(1) - (1)].chr))
                                   { case 's':
                                       (yyval.val) = space_k; break;
@@ -6412,7 +6416,7 @@ yyreduce:
   case 404:
 
 /* Line 1806 of yacc.c  */
-#line 1334 "parser.y"
+#line 1338 "parser.y"
     { yyerr("newline expected after directive");
                           yyerrok; }
     break;
@@ -6420,14 +6424,14 @@ yyreduce:
   case 405:
 
 /* Line 1806 of yacc.c  */
-#line 1338 "parser.y"
+#line 1342 "parser.y"
     { (yyval.val) = null_string; }
     break;
 
   case 406:
 
 /* Line 1806 of yacc.c  */
-#line 1339 "parser.y"
+#line 1343 "parser.y"
     { (yyval.val) = (yyvsp[(2) - (3)].val);
                                   rl((yyval.val), num(parser->lineno)); }
     break;
@@ -6435,7 +6439,7 @@ yyreduce:
   case 407:
 
 /* Line 1806 of yacc.c  */
-#line 1341 "parser.y"
+#line 1345 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("string literal")); }
     break;
@@ -6443,7 +6447,7 @@ yyreduce:
   case 408:
 
 /* Line 1806 of yacc.c  */
-#line 1345 "parser.y"
+#line 1349 "parser.y"
     { wchar_t ch;
                                   val str = string_own((yyvsp[(2) - (2)].lexeme));
                                   const wchar_t *cstr = c_str(str);
@@ -6462,7 +6466,7 @@ yyreduce:
   case 409:
 
 /* Line 1806 of yacc.c  */
-#line 1358 "parser.y"
+#line 1362 "parser.y"
     { (yyval.val) = chr((yyvsp[(2) - (2)].chr));
                                   end_of_char(scnr); }
     break;
@@ -6470,7 +6474,7 @@ yyreduce:
   case 410:
 
 /* Line 1806 of yacc.c  */
-#line 1360 "parser.y"
+#line 1364 "parser.y"
     { free((yyvsp[(2) - (2)].lexeme));
                                    yyerrorf(scnr,
                                             lit("invalid UTF-8 used as character name"),
@@ -6480,7 +6484,7 @@ yyreduce:
   case 411:
 
 /* Line 1806 of yacc.c  */
-#line 1364 "parser.y"
+#line 1368 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar,
                                              lit("character literal")); }
@@ -6489,14 +6493,14 @@ yyreduce:
   case 412:
 
 /* Line 1806 of yacc.c  */
-#line 1369 "parser.y"
+#line 1373 "parser.y"
     { (yyval.val) = null_string; }
     break;
 
   case 413:
 
 /* Line 1806 of yacc.c  */
-#line 1370 "parser.y"
+#line 1374 "parser.y"
     { (yyval.val) = cons(quasi_s, (yyvsp[(2) - (3)].val));
                                   rlc((yyval.val), (yyvsp[(2) - (3)].val));
                                   rl((yyval.val), num(parser->lineno)); }
@@ -6505,7 +6509,7 @@ yyreduce:
   case 414:
 
 /* Line 1806 of yacc.c  */
-#line 1373 "parser.y"
+#line 1377 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("quasistring")); }
     break;
@@ -6513,7 +6517,7 @@ yyreduce:
   case 415:
 
 /* Line 1806 of yacc.c  */
-#line 1377 "parser.y"
+#line 1381 "parser.y"
     { (yyval.val) = cons((yyvsp[(1) - (1)].val), nil);
                                           rl((yyval.val), num(parser->lineno)); }
     break;
@@ -6521,7 +6525,7 @@ yyreduce:
   case 416:
 
 /* Line 1806 of yacc.c  */
-#line 1379 "parser.y"
+#line 1383 "parser.y"
     { (yyval.val) = cons((yyvsp[(1) - (2)].val), (yyvsp[(2) - (2)].val));
                                           rl((yyval.val), num(parser->lineno)); }
     break;
@@ -6529,21 +6533,21 @@ yyreduce:
   case 417:
 
 /* Line 1806 of yacc.c  */
-#line 1383 "parser.y"
+#line 1387 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 418:
 
 /* Line 1806 of yacc.c  */
-#line 1384 "parser.y"
+#line 1388 "parser.y"
     { (yyval.val) = (yyvsp[(1) - (1)].val); }
     break;
 
   case 419:
 
 /* Line 1806 of yacc.c  */
-#line 1385 "parser.y"
+#line 1389 "parser.y"
     { (yyval.val) = cons(var_s, cons((yyvsp[(1) - (1)].val), nil));
                                   rl((yyval.val), num(parser->lineno)); }
     break;
@@ -6551,7 +6555,7 @@ yyreduce:
   case 420:
 
 /* Line 1806 of yacc.c  */
-#line 1387 "parser.y"
+#line 1391 "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));
@@ -6562,14 +6566,14 @@ yyreduce:
   case 421:
 
 /* Line 1806 of yacc.c  */
-#line 1394 "parser.y"
+#line 1398 "parser.y"
     { (yyval.val) = mkstring(one, chr((yyvsp[(1) - (1)].chr))); }
     break;
 
   case 422:
 
 /* Line 1806 of yacc.c  */
-#line 1395 "parser.y"
+#line 1399 "parser.y"
     { val ch = mkstring(one, chr((yyvsp[(1) - (2)].chr)));
                                   (yyval.val) = string_extend(ch, (yyvsp[(2) - (2)].val)); }
     break;
@@ -6577,63 +6581,63 @@ yyreduce:
   case 423:
 
 /* Line 1806 of yacc.c  */
-#line 1397 "parser.y"
+#line 1401 "parser.y"
     { (yyval.val) = string_own((yyvsp[(1) - (1)].lexeme)); }
     break;
 
   case 424:
 
 /* Line 1806 of yacc.c  */
-#line 1398 "parser.y"
+#line 1402 "parser.y"
     { (yyval.val) = string_extend(string_own((yyvsp[(1) - (2)].lexeme)), (yyvsp[(2) - (2)].val)); }
     break;
 
   case 425:
 
 /* Line 1806 of yacc.c  */
-#line 1401 "parser.y"
+#line 1405 "parser.y"
     { (yyval.val) = mkstring(one, chr((yyvsp[(1) - (1)].chr))); }
     break;
 
   case 426:
 
 /* Line 1806 of yacc.c  */
-#line 1402 "parser.y"
+#line 1406 "parser.y"
     { (yyval.val) = string_extend((yyvsp[(1) - (2)].val), chr((yyvsp[(2) - (2)].chr))); }
     break;
 
   case 427:
 
 /* Line 1806 of yacc.c  */
-#line 1403 "parser.y"
+#line 1407 "parser.y"
     { (yyval.val) = string_own((yyvsp[(1) - (1)].lexeme)); }
     break;
 
   case 428:
 
 /* Line 1806 of yacc.c  */
-#line 1404 "parser.y"
+#line 1408 "parser.y"
     { (yyval.val) = string_extend((yyvsp[(1) - (2)].val), string_own((yyvsp[(2) - (2)].lexeme))); }
     break;
 
   case 429:
 
 /* Line 1806 of yacc.c  */
-#line 1407 "parser.y"
+#line 1411 "parser.y"
     { (yyval.val) = nil; }
     break;
 
   case 430:
 
 /* Line 1806 of yacc.c  */
-#line 1408 "parser.y"
+#line 1412 "parser.y"
     { (yyval.val) = (yyvsp[(2) - (2)].val); }
     break;
 
   case 431:
 
 /* Line 1806 of yacc.c  */
-#line 1409 "parser.y"
+#line 1413 "parser.y"
     { val word = (yyvsp[(1) - (2)].val);
                                   (yyval.val) = rlc(cons(word, (yyvsp[(2) - (2)].val)), (yyvsp[(1) - (2)].val)); }
     break;
@@ -6641,7 +6645,7 @@ yyreduce:
   case 432:
 
 /* Line 1806 of yacc.c  */
-#line 1411 "parser.y"
+#line 1415 "parser.y"
     { (yyval.val) = nil;
                                   yybadtok(yychar, lit("word list")); }
     break;
@@ -6649,21 +6653,21 @@ yyreduce:
   case 433:
 
 /* Line 1806 of yacc.c  */
-#line 1415 "parser.y"
+#line 1419 "parser.y"
     { (yyval.val) = nil; }
     break;
 
   case 434:
 
 /* Line 1806 of yacc.c  */
-#line 1416 "parser.y"
+#line 1420 "parser.y"
     { (yyval.val) = (yyvsp[(2) - (2)].val); }
     break;
 
   case 435:
 
 /* Line 1806 of yacc.c  */
-#line 1417 "parser.y"
+#line 1421 "parser.y"
     { val qword = cons(quasi_s, (yyvsp[(1) - (2)].val));
                                    (yyval.val) = rlc(cons(qword, nil), (yyvsp[(1) - (2)].val)); }
     break;
@@ -6671,7 +6675,7 @@ yyreduce:
   case 436:
 
 /* Line 1806 of yacc.c  */
-#line 1421 "parser.y"
+#line 1425 "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;
@@ -6679,7 +6683,7 @@ yyreduce:
   case 437:
 
 /* Line 1806 of yacc.c  */
-#line 1425 "parser.y"
+#line 1429 "parser.y"
     { (yyval.val) = make_buf(zero, nil, nil);
                                            end_of_buflit(scnr); }
     break;
@@ -6687,7 +6691,7 @@ yyreduce:
   case 438:
 
 /* Line 1806 of yacc.c  */
-#line 1427 "parser.y"
+#line 1431 "parser.y"
     { end_of_buflit(scnr);
                                            buf_trim((yyvsp[(2) - (3)].val));
                                            (yyval.val) = (yyvsp[(2) - (3)].val); }
@@ -6696,7 +6700,7 @@ yyreduce:
   case 439:
 
 /* Line 1806 of yacc.c  */
-#line 1430 "parser.y"
+#line 1434 "parser.y"
     { yyerr("unterminated buffer literal");
                                            end_of_buflit(scnr);
                                            yyerrok; }
@@ -6705,7 +6709,7 @@ yyreduce:
   case 440:
 
 /* Line 1806 of yacc.c  */
-#line 1435 "parser.y"
+#line 1439 "parser.y"
     { buf_put_u8((yyvsp[(1) - (2)].val), length_buf((yyval.val)), (yyvsp[(2) - (2)].val));
                                           (yyval.val) = (yyvsp[(1) - (2)].val); }
     break;
@@ -6713,7 +6717,7 @@ yyreduce:
   case 441:
 
 /* Line 1806 of yacc.c  */
-#line 1437 "parser.y"
+#line 1441 "parser.y"
     { (yyval.val) = make_buf(zero, nil, num_fast(512));
                                           buf_put_u8((yyval.val), zero, (yyvsp[(1) - (1)].val)); }
     break;
@@ -6721,14 +6725,14 @@ yyreduce:
   case 442:
 
 /* Line 1806 of yacc.c  */
-#line 1441 "parser.y"
+#line 1445 "parser.y"
     { (yyval.val) = num((yyvsp[(1) - (2)].chr) << 4 | (yyvsp[(2) - (2)].chr)); }
     break;
 
   case 443:
 
 /* Line 1806 of yacc.c  */
-#line 1442 "parser.y"
+#line 1446 "parser.y"
     { (yyval.val) = zero;
                                           yyerr("unpaired digit in buffer literal");
                                           yyerrok; }
@@ -6737,119 +6741,119 @@ yyreduce:
   case 444:
 
 /* Line 1806 of yacc.c  */
-#line 1449 "parser.y"
+#line 1453 "parser.y"
     { (yyval.val) = mkexp(all_s, nil, num(parser->lineno)); }
     break;
 
   case 445:
 
 /* Line 1806 of yacc.c  */
-#line 1450 "parser.y"
+#line 1454 "parser.y"
     { (yyval.val) = mkexp(some_s, nil, num(parser->lineno)); }
     break;
 
   case 446:
 
 /* Line 1806 of yacc.c  */
-#line 1451 "parser.y"
+#line 1455 "parser.y"
     { (yyval.val) = mkexp(none_s, nil, num(parser->lineno)); }
     break;
 
   case 447:
 
 /* Line 1806 of yacc.c  */
-#line 1452 "parser.y"
+#line 1456 "parser.y"
     { (yyval.val) = mkexp(maybe_s, nil, num(parser->lineno)); }
     break;
 
   case 448:
 
 /* Line 1806 of yacc.c  */
-#line 1453 "parser.y"
+#line 1457 "parser.y"
     { (yyval.val) = mkexp(cases_s, nil, num(parser->lineno)); }
     break;
 
   case 449:
 
 /* Line 1806 of yacc.c  */
-#line 1454 "parser.y"
+#line 1458 "parser.y"
     { (yyval.val) = mkexp(and_s, nil, num(parser->lineno)); }
     break;
 
   case 450:
 
 /* Line 1806 of yacc.c  */
-#line 1455 "parser.y"
+#line 1459 "parser.y"
     { (yyval.val) = mkexp(or_s, nil, num(parser->lineno)); }
     break;
 
   case 451:
 
 /* Line 1806 of yacc.c  */
-#line 1456 "parser.y"
+#line 1460 "parser.y"
     { (yyval.val) = mkexp(try_s, nil, num(parser->lineno)); }
     break;
 
   case 452:
 
 /* Line 1806 of yacc.c  */
-#line 1457 "parser.y"
+#line 1461 "parser.y"
     { (yyval.val) = mkexp(finally_s, nil, num(parser->lineno)); }
     break;
 
   case 453:
 
 /* Line 1806 of yacc.c  */
-#line 1459 "parser.y"
+#line 1463 "parser.y"
     { (yyval.val) = mkexp(block_s, (yyvsp[(2) - (3)].val), nil); }
     break;
 
   case 454:
 
 /* Line 1806 of yacc.c  */
-#line 1461 "parser.y"
+#line 1465 "parser.y"
     { (yyval.val) = mkexp(choose_s, (yyvsp[(2) - (3)].val), nil); }
     break;
 
   case 455:
 
 /* Line 1806 of yacc.c  */
-#line 1463 "parser.y"
+#line 1467 "parser.y"
     { (yyval.val) = mkexp(collect_s, (yyvsp[(2) - (3)].val), nil); }
     break;
 
   case 456:
 
 /* Line 1806 of yacc.c  */
-#line 1465 "parser.y"
+#line 1469 "parser.y"
     { (yyval.val) = mkexp(coll_s, (yyvsp[(2) - (3)].val), nil); }
     break;
 
   case 457:
 
 /* Line 1806 of yacc.c  */
-#line 1467 "parser.y"
+#line 1471 "parser.y"
     { (yyval.val) = mkexp(gather_s, (yyvsp[(2) - (3)].val), nil); }
     break;
 
   case 458:
 
 /* Line 1806 of yacc.c  */
-#line 1469 "parser.y"
+#line 1473 "parser.y"
     { (yyval.val) = mkexp(define_s, (yyvsp[(2) - (3)].val), nil); }
     break;
 
   case 459:
 
 /* Line 1806 of yacc.c  */
-#line 1471 "parser.y"
+#line 1475 "parser.y"
     { (yyval.val) = mkexp(catch_s, (yyvsp[(2) - (3)].val), nil); }
     break;
 
   case 460:
 
 /* Line 1806 of yacc.c  */
-#line 1473 "parser.y"
+#line 1477 "parser.y"
     { (yyval.val) = mkexp(if_s,
                                                          cons((yyvsp[(2) - (5)].val),
                                                               cons((yyvsp[(3) - (5)].val), (yyvsp[(4) - (5)].val))),
@@ -6859,14 +6863,14 @@ yyreduce:
   case 461:
 
 /* Line 1806 of yacc.c  */
-#line 1478 "parser.y"
+#line 1482 "parser.y"
     { yyerr("@(output) doesn't nest"); }
     break;
 
 
 
 /* Line 1806 of yacc.c  */
-#line 6900 "y.tab.c"
+#line 6904 "y.tab.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -7097,7 +7101,7 @@ yyreturn:
 
 
 /* Line 2067 of yacc.c  */
-#line 1482 "parser.y"
+#line 1486 "parser.y"
 
 
 const int have_yydebug = YYDEBUG;