license: reformat to fit 80 columns.

* Makefile, alloca.h, args.c, args.h, arith.c, arith.h, buf.c,
buf.h, chksum.c, chksum.h, chksums/crc32.c, chksums/crc32.h,
combi.c, combi.h, debug.c, debug.h, eval.c, eval.h, ffi.c,
ffi.h, filter.c, filter.h, ftw.c, ftw.h, gc.c, gc.h, glob.c,
glob.h, hash.c, hash.h, itypes.c, itypes.h, jmp.S, lib.c,
lib.h, lisplib.c, lisplib.h, match.c, match.h, parser.c,
parser.h, parser.l, parser.y, rand.c, rand.h, regex.c,
regex.h, signal.c, signal.h, socket.c, socket.h,
stdlib/asm.tl, stdlib/awk.tl, stdlib/build.tl,
stdlib/compiler.tl, stdlib/constfun.tl, stdlib/conv.tl,
stdlib/copy-file.tl, stdlib/debugger.tl, stdlib/defset.tl,
stdlib/doloop.tl, stdlib/each-prod.tl, stdlib/error.tl,
stdlib/except.tl, stdlib/ffi.tl, stdlib/getopts.tl,
stdlib/getput.tl, stdlib/hash.tl, stdlib/ifa.tl,
stdlib/keyparams.tl, stdlib/match.tl, stdlib/op.tl,
stdlib/optimize.tl, stdlib/package.tl, stdlib/param.tl,
stdlib/path-test.tl, stdlib/pic.tl, stdlib/place.tl,
stdlib/pmac.tl, stdlib/quips.tl, stdlib/save-exe.tl,
stdlib/socket.tl, stdlib/stream-wrap.tl, stdlib/struct.tl,
stdlib/tagbody.tl, stdlib/termios.tl, stdlib/trace.tl,
stdlib/txr-case.tl, stdlib/type.tl, stdlib/vm-param.tl,
stdlib/with-resources.tl, stdlib/with-stream.tl,
stdlib/yield.tl, stream.c, stream.h, struct.c, struct.h,
strudel.c, strudel.h, sysif.c, sysif.h, syslog.c, syslog.h,
termios.c, termios.h, time.c, time.h, tree.c, tree.h, txr.c,
txr.h, unwind.c, unwind.h, utf8.c, utf8.h, vm.c, vm.h, vmop.h:
License reformatted.

* lex.yy.c.shipped, y.tab.c.shipped, y.tab.h.shipped: Updated.

1 files changed, 187 insertions, 186 deletions

diff --git a/lex.yy.c.shipped b/lex.yy.c.shipped
index 83d5c5d3..46253bf6 100644
--- a/lex.yy.c.shipped
+++ b/lex.yy.c.shipped
@@ -3802,25 +3802,26 @@ goto find_rule; \
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
-#line 29 "parser.l"
+#line 30 "parser.l"
 
 #include <stdio.h>
 #include <string.h>
@@ -4021,10 +4022,10 @@ static wchar_t *unicode_ident(scanner_t *scn, const char *lex)
   return wlex;
 }
 
-#line 4025 "lex.yy.c"
+#line 4026 "lex.yy.c"
 #define YY_NO_INPUT 1
 
-#line 4028 "lex.yy.c"
+#line 4029 "lex.yy.c"
 
 #define INITIAL 0
 #define SPECIAL 1
@@ -4337,10 +4338,10 @@ YY_DECL
 		}
 
 	{
-#line 290 "parser.l"
+#line 291 "parser.l"
 
 
-#line 4344 "lex.yy.c"
+#line 4345 "lex.yy.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -4423,7 +4424,7 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 292 "parser.l"
+#line 293 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext));
 
@@ -4438,7 +4439,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 304 "parser.l"
+#line 305 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext + 2));
   int base;
@@ -4460,7 +4461,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 323 "parser.l"
+#line 324 "parser.l"
 {
   int base = 0;
   val str = string_own(utf8_dup_from(yytext + 2));
@@ -4485,7 +4486,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 345 "parser.l"
+#line 346 "parser.l"
 {
   if (yy_top_state(yyscanner) == INITIAL
       || yy_top_state(yyscanner) == QSILIT
@@ -4499,12 +4500,12 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 5:
-#line 358 "parser.l"
-case 6:
 #line 359 "parser.l"
+case 6:
+#line 360 "parser.l"
 case 7:
 YY_RULE_SETUP
-#line 359 "parser.l"
+#line 360 "parser.l"
 {
   val str = string_utf8(yytext);
 
@@ -4528,7 +4529,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 375 "parser.l"
+#line 376 "parser.l"
 {
   if (yy_top_state(yyscanner) == INITIAL
       || yy_top_state(yyscanner) == QSILIT
@@ -4542,10 +4543,10 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 9:
-#line 388 "parser.l"
+#line 389 "parser.l"
 case 10:
 YY_RULE_SETUP
-#line 388 "parser.l"
+#line 389 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext + 1));
 
@@ -4558,10 +4559,10 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 11:
-#line 400 "parser.l"
+#line 401 "parser.l"
 case 12:
 YY_RULE_SETUP
-#line 400 "parser.l"
+#line 401 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext + 3));
 
@@ -4574,10 +4575,10 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 13:
-#line 412 "parser.l"
+#line 413 "parser.l"
 case 14:
 YY_RULE_SETUP
-#line 412 "parser.l"
+#line 413 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext + 3));
 
@@ -4591,7 +4592,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 423 "parser.l"
+#line 424 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext + 3));
 
@@ -4604,12 +4605,12 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 16:
-#line 435 "parser.l"
-case 17:
 #line 436 "parser.l"
+case 17:
+#line 437 "parser.l"
 case 18:
 YY_RULE_SETUP
-#line 436 "parser.l"
+#line 437 "parser.l"
 {
   yyerrorf(yyg, lit("cramped floating-point literal: "
                     "space needed between ~a and dot."),
@@ -4626,12 +4627,12 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 19:
-#line 453 "parser.l"
-case 20:
 #line 454 "parser.l"
+case 20:
+#line 455 "parser.l"
 case 21:
 YY_RULE_SETUP
-#line 454 "parser.l"
+#line 455 "parser.l"
 {
   if (yy_top_state(yyscanner) == INITIAL
       || yy_top_state(yyscanner) == QSILIT
@@ -4643,10 +4644,10 @@ YY_RULE_SETUP
 }
 	YY_BREAK
 case 22:
-#line 465 "parser.l"
+#line 466 "parser.l"
 case 23:
 YY_RULE_SETUP
-#line 465 "parser.l"
+#line 466 "parser.l"
 {
   if (yy_top_state(yyscanner) == INITIAL
       || yy_top_state(yyscanner) == QSILIT
@@ -4662,7 +4663,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 478 "parser.l"
+#line 479 "parser.l"
 {
   return directive_tok(yyg, ALL, 0);
 }
@@ -4674,28 +4675,28 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 482 "parser.l"
+#line 483 "parser.l"
 {
   return directive_tok(yyg, SOME, NESTED);
 }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 486 "parser.l"
+#line 487 "parser.l"
 {
   return directive_tok(yyg, NONE, 0);
 }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 490 "parser.l"
+#line 491 "parser.l"
 {
   return directive_tok(yyg, MAYBE, 0);
 }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 494 "parser.l"
+#line 495 "parser.l"
 {
   return directive_tok(yyg, CASES, 0);
 }
@@ -4707,7 +4708,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 498 "parser.l"
+#line 499 "parser.l"
 {
   return directive_tok(yyg, BLOCK, NESTED);
 }
@@ -4719,7 +4720,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 502 "parser.l"
+#line 503 "parser.l"
 {
   return directive_tok(yyg, CHOOSE, NESTED);
 }
@@ -4731,28 +4732,28 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 506 "parser.l"
+#line 507 "parser.l"
 {
   return directive_tok(yyg, GATHER, NESTED);
 }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 510 "parser.l"
+#line 511 "parser.l"
 {
   return directive_tok(yyg, AND, 0);
 }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 514 "parser.l"
+#line 515 "parser.l"
 {
   return directive_tok(yyg, OR, 0);
 }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 518 "parser.l"
+#line 519 "parser.l"
 {
   return directive_tok(yyg, END, 0);
 }
@@ -4764,7 +4765,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 522 "parser.l"
+#line 523 "parser.l"
 {
   return directive_tok(yyg, COLLECT, NESTED);
 }
@@ -4776,7 +4777,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 526 "parser.l"
+#line 527 "parser.l"
 {
   return directive_tok(yyg, COLL, NESTED);
 }
@@ -4788,7 +4789,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 530 "parser.l"
+#line 531 "parser.l"
 {
   return directive_tok(yyg, UNTIL, NESTED);
 }
@@ -4800,7 +4801,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 534 "parser.l"
+#line 535 "parser.l"
 {
   return directive_tok(yyg, OUTPUT, NESTED);
 }
@@ -4812,7 +4813,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 538 "parser.l"
+#line 539 "parser.l"
 {
   return directive_tok(yyg, REPEAT, NESTED);
 }
@@ -4824,21 +4825,21 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 542 "parser.l"
+#line 543 "parser.l"
 {
   return directive_tok(yyg, REP, NESTED);
 }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 546 "parser.l"
+#line 547 "parser.l"
 {
   return directive_tok(yyg, SINGLE, 0);
 }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 550 "parser.l"
+#line 551 "parser.l"
 {
   return directive_tok(yyg, FIRST, 0);
 }
@@ -4850,14 +4851,14 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 554 "parser.l"
+#line 555 "parser.l"
 {
   return directive_tok(yyg, LAST, NESTED);
 }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 558 "parser.l"
+#line 559 "parser.l"
 {
   return directive_tok(yyg, EMPTY, 0);
 }
@@ -4869,7 +4870,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 562 "parser.l"
+#line 563 "parser.l"
 {
   return directive_tok(yyg, MOD, NESTED);
 }
@@ -4881,7 +4882,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 566 "parser.l"
+#line 567 "parser.l"
 {
   return directive_tok(yyg, MODLAST, NESTED);
 }
@@ -4893,14 +4894,14 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 570 "parser.l"
+#line 571 "parser.l"
 {
   return directive_tok(yyg, DEFINE, NESTED);
 }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 574 "parser.l"
+#line 575 "parser.l"
 {
   return directive_tok(yyg, TRY, 0);
 }
@@ -4912,14 +4913,14 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 578 "parser.l"
+#line 579 "parser.l"
 {
   return directive_tok(yyg, CATCH, NESTED);
 }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 582 "parser.l"
+#line 583 "parser.l"
 {
   return directive_tok(yyg, FINALLY, 0);
 }
@@ -4931,7 +4932,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 586 "parser.l"
+#line 587 "parser.l"
 {
   return directive_tok(yyg, IF, NESTED);
 }
@@ -4943,21 +4944,21 @@ YY_LINENO_REWIND_TO(yy_cp - 1);
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 590 "parser.l"
+#line 591 "parser.l"
 {
   return directive_tok(yyg, ELIF, NESTED);
 }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 594 "parser.l"
+#line 595 "parser.l"
 {
   return directive_tok(yyg, ELSE, 0);
 }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 598 "parser.l"
+#line 599 "parser.l"
 {
   yy_push_state(BRACED, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -4966,7 +4967,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 604 "parser.l"
+#line 605 "parser.l"
 {
  yy_push_state(NESTED, yyscanner);
  yylval->lineno = yyextra->lineno;
@@ -4975,7 +4976,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 610 "parser.l"
+#line 611 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return (opt_compat && opt_compat <= 248) ? OLD_AT : '@';
@@ -4983,7 +4984,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 615 "parser.l"
+#line 616 "parser.l"
 {
   yylval->chr = '*';
   return SPLICE;
@@ -4991,7 +4992,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 620 "parser.l"
+#line 621 "parser.l"
 {
   yylval->chr = yytext[0];
   return yytext[0];
@@ -4999,7 +5000,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 625 "parser.l"
+#line 626 "parser.l"
 {
   yy_pop_state(yyscanner);
   if (yy_top_state(yyscanner) == INITIAL
@@ -5014,7 +5015,7 @@ case 60:
 yyg->yy_c_buf_p = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 634 "parser.l"
+#line 635 "parser.l"
 {
   yyerrorf(yyg, lit("cramped floating-point literal: "
                     "space or 0 needed between ~a and dot."),
@@ -5031,7 +5032,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 649 "parser.l"
+#line 650 "parser.l"
 {
   yy_pop_state(yyscanner);
   if (yy_top_state(yyscanner) == INITIAL
@@ -5043,14 +5044,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 658 "parser.l"
+#line 659 "parser.l"
 {
   /* Eat whitespace in directive */
 }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 662 "parser.l"
+#line 663 "parser.l"
 {
   yy_push_state(STRLIT, yyscanner);
   return '"';
@@ -5058,7 +5059,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 667 "parser.l"
+#line 668 "parser.l"
 {
   yy_push_state(CHRLIT, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -5067,7 +5068,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 673 "parser.l"
+#line 674 "parser.l"
 {
   yy_push_state(BUFLIT, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -5076,7 +5077,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 679 "parser.l"
+#line 680 "parser.l"
 {
   yy_push_state(REGEX, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -5085,7 +5086,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 685 "parser.l"
+#line 686 "parser.l"
 {
   yy_push_state(QSILIT, yyscanner);
   return '`';
@@ -5093,7 +5094,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 690 "parser.l"
+#line 691 "parser.l"
 {
   yy_push_state(WLIT, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -5102,7 +5103,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 696 "parser.l"
+#line 697 "parser.l"
 {
   yy_push_state(WLIT, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -5111,7 +5112,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 702 "parser.l"
+#line 703 "parser.l"
 {
   yy_push_state(QWLIT, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -5120,7 +5121,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 708 "parser.l"
+#line 709 "parser.l"
 {
   yy_push_state(QWLIT, yyscanner);
   yylval->lineno = yyextra->lineno;
@@ -5129,14 +5130,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 714 "parser.l"
+#line 715 "parser.l"
 {
   return '#';
 }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 718 "parser.l"
+#line 719 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return HASH_H;
@@ -5144,7 +5145,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 723 "parser.l"
+#line 724 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return HASH_S;
@@ -5152,7 +5153,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 728 "parser.l"
+#line 729 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return HASH_R;
@@ -5160,7 +5161,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 733 "parser.l"
+#line 734 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return HASH_N;
@@ -5168,7 +5169,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 738 "parser.l"
+#line 739 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return HASH_T;
@@ -5176,7 +5177,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 743 "parser.l"
+#line 744 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   yy_push_state(JSON, yyscanner);
@@ -5185,7 +5186,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 749 "parser.l"
+#line 750 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return HASH_SEMI;
@@ -5193,7 +5194,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 754 "parser.l"
+#line 755 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext + 1));
   yylval->val = int_str(str, num(10));
@@ -5202,7 +5203,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 760 "parser.l"
+#line 761 "parser.l"
 {
   val str = string_own(utf8_dup_from(yytext + 1));
   yylval->val = int_str(str, num(10));
@@ -5211,7 +5212,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 766 "parser.l"
+#line 767 "parser.l"
 {
   yylval->lineno = yyextra->lineno;
   return (opt_compat && opt_compat <= 185) ? OLD_DOTDOT : DOTDOT;
@@ -5219,7 +5220,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 771 "parser.l"
+#line 772 "parser.l"
 {
   yy_pop_state(yyscanner);
   yylval->lexeme = chk_strdup(L"@");
@@ -5229,14 +5230,14 @@ YY_RULE_SETUP
 case 84:
 /* rule 84 can match eol */
 YY_RULE_SETUP
-#line 777 "parser.l"
+#line 778 "parser.l"
 {
   yyextra->lineno++;
 }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 781 "parser.l"
+#line 782 "parser.l"
 {
   yy_push_state(REGEX, yyscanner);
   return '/';
@@ -5244,7 +5245,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 786 "parser.l"
+#line 787 "parser.l"
 {
   yylval->chr = '.';
   return CONSDOT;
@@ -5252,7 +5253,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 791 "parser.l"
+#line 792 "parser.l"
 {
   yylval->chr = '.';
   return LAMBDOT;
@@ -5260,7 +5261,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 796 "parser.l"
+#line 797 "parser.l"
 {
   yylval->chr = '.';
   return UREFDOT;
@@ -5268,7 +5269,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 801 "parser.l"
+#line 802 "parser.l"
 {
   yylval->chr = '.';
   return '.';
@@ -5276,7 +5277,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 806 "parser.l"
+#line 807 "parser.l"
 {
   yylval->chr = '.';
   return OREFDOT;
@@ -5284,7 +5285,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 811 "parser.l"
+#line 812 "parser.l"
 {
   yylval->chr = '.';
   return UOREFDOT;
@@ -5293,7 +5294,7 @@ YY_RULE_SETUP
 case 92:
 /* rule 92 can match eol */
 YY_RULE_SETUP
-#line 816 "parser.l"
+#line 817 "parser.l"
 {
   if (YYSTATE == SPECIAL)
     yy_pop_state(yyscanner);  /* @\ continuation */
@@ -5302,7 +5303,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 822 "parser.l"
+#line 823 "parser.l"
 {
   wchar_t lexeme[2];
   lexeme[0] = char_esc(yytext[1]);
@@ -5314,7 +5315,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 831 "parser.l"
+#line 832 "parser.l"
 {
   wchar_t lexeme[2];
   lexeme[0] = num_esc(yyg, yytext + 1);
@@ -5333,28 +5334,28 @@ YY_RULE_SETUP
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 847 "parser.l"
+#line 848 "parser.l"
 {
   yyerrorf(yyg, lit("\\x escape without digits"), nao);
 }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 851 "parser.l"
+#line 852 "parser.l"
 {
   yyerrorf(yyg, lit("unrecognized escape \\~a"), chr(yytext[1]), nao);
 }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 855 "parser.l"
+#line 856 "parser.l"
 {
   /* comment */
 }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 859 "parser.l"
+#line 860 "parser.l"
 {
   val ch = chr_str(string_utf8(yytext), zero);
   if (chr_isspace(ch))
@@ -5374,7 +5375,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 876 "parser.l"
+#line 877 "parser.l"
 {
   yyerrprepf(yyg, lit("non-UTF-8 byte #x~02x in directive"),
              num(convert(unsigned char, yytext[0])), nao);
@@ -5383,7 +5384,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 882 "parser.l"
+#line 883 "parser.l"
 {
   yylval->chr = '/';
   return (YYSTATE == SREGEX) ? REGCHAR : '/';
@@ -5391,7 +5392,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 887 "parser.l"
+#line 888 "parser.l"
 {
   yylval->chr = char_esc(yytext[1]);
   return REGCHAR;
@@ -5399,7 +5400,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 892 "parser.l"
+#line 893 "parser.l"
 {
   yylval->chr = num_esc(yyg, yytext + 1);
   return REGCHAR;
@@ -5407,7 +5408,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 897 "parser.l"
+#line 898 "parser.l"
 {
   yylval->chr = yytext[1];
   return REGTOKEN;
@@ -5416,7 +5417,7 @@ YY_RULE_SETUP
 case 104:
 /* rule 104 can match eol */
 YY_RULE_SETUP
-#line 902 "parser.l"
+#line 903 "parser.l"
 {
   yyextra->lineno++;
 }
@@ -5424,7 +5425,7 @@ YY_RULE_SETUP
 case 105:
 /* rule 105 can match eol */
 YY_RULE_SETUP
-#line 906 "parser.l"
+#line 907 "parser.l"
 {
   yyextra->lineno++;
   yyerrprepf(yyg, lit("newline in regex"), nao);
@@ -5434,7 +5435,7 @@ YY_RULE_SETUP
 case 106:
 /* rule 106 can match eol */
 YY_RULE_SETUP
-#line 912 "parser.l"
+#line 913 "parser.l"
 {
   yyextra->lineno++;
   yylval->chr = yytext[0];
@@ -5443,7 +5444,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 918 "parser.l"
+#line 919 "parser.l"
 {
   yylval->chr = yytext[0];
   return yytext[0];
@@ -5451,7 +5452,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 923 "parser.l"
+#line 924 "parser.l"
 {
   yylval->chr = yytext[1];
   return REGCHAR;
@@ -5459,7 +5460,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 928 "parser.l"
+#line 929 "parser.l"
 {
   if (opt_compat && opt_compat <= 105) {
     yylval->chr = yytext[1];
@@ -5475,7 +5476,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 941 "parser.l"
+#line 942 "parser.l"
 {
   yyerrprepf(yyg, lit("dangling backslash in regex"), nao);
   return ERRTOK;
@@ -5483,7 +5484,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 946 "parser.l"
+#line 947 "parser.l"
 {
   wchar_t wchr[8];
   if (utf8_from_buf(wchr, coerce(unsigned char *, yytext), yyleng) != 2) {
@@ -5496,7 +5497,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 956 "parser.l"
+#line 957 "parser.l"
 {
   yylval->chr = convert(unsigned char, yytext[0]) + 0xDC00;
   return REGCHAR;
@@ -5504,7 +5505,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 961 "parser.l"
+#line 962 "parser.l"
 {
   yylval->lexeme = utf8_dup_from(yytext);
   return SPACE;
@@ -5512,7 +5513,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 966 "parser.l"
+#line 967 "parser.l"
 {
   yylval->lexeme = utf8_dup_from(yytext);
   return TEXT;
@@ -5521,7 +5522,7 @@ YY_RULE_SETUP
 case 115:
 /* rule 115 can match eol */
 YY_RULE_SETUP
-#line 971 "parser.l"
+#line 972 "parser.l"
 {
   yyextra->lineno++;
   return '\n';
@@ -5529,7 +5530,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 976 "parser.l"
+#line 977 "parser.l"
 {
   yy_push_state(SPECIAL, yyscanner);
   return '*';
@@ -5537,7 +5538,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 981 "parser.l"
+#line 982 "parser.l"
 {
   yy_push_state(SPECIAL, yyscanner);
 }
@@ -5545,7 +5546,7 @@ YY_RULE_SETUP
 case 118:
 /* rule 118 can match eol */
 YY_RULE_SETUP
-#line 985 "parser.l"
+#line 986 "parser.l"
 {
   /* eat whole line comment */
   yyextra->lineno++;
@@ -5553,14 +5554,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 990 "parser.l"
+#line 991 "parser.l"
 {
   /* comment to end of line */
 }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 994 "parser.l"
+#line 995 "parser.l"
 {
   yy_pop_state(yyscanner);
   return yytext[0];
@@ -5568,7 +5569,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 999 "parser.l"
+#line 1000 "parser.l"
 {
   yy_pop_state(yyscanner);
   return yytext[0];
@@ -5576,7 +5577,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 1004 "parser.l"
+#line 1005 "parser.l"
 {
   yylval->chr = char_esc(yytext[1]);
   return LITCHAR;
@@ -5584,7 +5585,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 1009 "parser.l"
+#line 1010 "parser.l"
 {
   yylval->chr = char_esc(yytext[1]);
   return LITCHAR;
@@ -5593,7 +5594,7 @@ YY_RULE_SETUP
 case 124:
 /* rule 124 can match eol */
 YY_RULE_SETUP
-#line 1014 "parser.l"
+#line 1015 "parser.l"
 {
   yyextra->lineno++;
 }
@@ -5601,7 +5602,7 @@ YY_RULE_SETUP
 case 125:
 /* rule 125 can match eol */
 YY_RULE_SETUP
-#line 1018 "parser.l"
+#line 1019 "parser.l"
 {
   yyextra->lineno++;
 
@@ -5611,7 +5612,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 1026 "parser.l"
+#line 1027 "parser.l"
 {
   yylval->chr = num_esc(yyg, yytext+1);
   return LITCHAR;
@@ -5619,21 +5620,21 @@ YY_RULE_SETUP
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 1031 "parser.l"
+#line 1032 "parser.l"
 {
   yyerrorf(yyg, lit("\\x escape without digits"), nao);
 }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 1035 "parser.l"
+#line 1036 "parser.l"
 {
   yyerrorf(yyg, lit("unrecognized escape: \\~a"), chr(yytext[1]), nao);
 }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 1039 "parser.l"
+#line 1040 "parser.l"
 {
   yylval->chr = num_esc(yyg, yytext);
   return LITCHAR;
@@ -5641,7 +5642,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 1044 "parser.l"
+#line 1045 "parser.l"
 {
   yylval->lexeme = utf8_dup_from(yytext);
   return SYMTOK;
@@ -5649,7 +5650,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 1049 "parser.l"
+#line 1050 "parser.l"
 {
   yylval->lexeme = utf8_dup_from(yytext);
   return SYMTOK; /* hack */
@@ -5658,7 +5659,7 @@ YY_RULE_SETUP
 case 132:
 /* rule 132 can match eol */
 YY_RULE_SETUP
-#line 1054 "parser.l"
+#line 1055 "parser.l"
 {
   yyerrprepf(yyg, lit("newline in string literal"), nao);
   yyextra->lineno++;
@@ -5669,7 +5670,7 @@ YY_RULE_SETUP
 case 133:
 /* rule 133 can match eol */
 YY_RULE_SETUP
-#line 1061 "parser.l"
+#line 1062 "parser.l"
 {
   yyerrprepf(yyg, lit("newline in character literal"), nao);
   yyextra->lineno++;
@@ -5680,7 +5681,7 @@ YY_RULE_SETUP
 case 134:
 /* rule 134 can match eol */
 YY_RULE_SETUP
-#line 1068 "parser.l"
+#line 1069 "parser.l"
 {
   yyerrprepf(yyg, lit("newline in string quasiliteral"), nao);
   yyextra->lineno++;
@@ -5691,7 +5692,7 @@ YY_RULE_SETUP
 case 135:
 /* rule 135 can match eol */
 YY_RULE_SETUP
-#line 1075 "parser.l"
+#line 1076 "parser.l"
 {
   yyextra->lineno++;
 
@@ -5708,7 +5709,7 @@ case 136:
 yyg->yy_c_buf_p = yy_cp = yy_bp + 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 1086 "parser.l"
+#line 1087 "parser.l"
 {
   yy_push_state(QSPECIAL, yyscanner);
   return yytext[0];
@@ -5716,7 +5717,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 1091 "parser.l"
+#line 1092 "parser.l"
 {
   yyerrprepf(yyg, lit("malformed @ expression in quasiliteral"), nao);
   return ERRTOK;
@@ -5724,14 +5725,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 1096 "parser.l"
+#line 1097 "parser.l"
 {
   return ' ';
 }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 1100 "parser.l"
+#line 1101 "parser.l"
 {
   yy_pop_state(yyscanner);
   return yytext[0];
@@ -5739,7 +5740,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 1105 "parser.l"
+#line 1106 "parser.l"
 {
   yylval->chr = char_esc(yytext[1]);
   return LITCHAR;
@@ -5747,7 +5748,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 1110 "parser.l"
+#line 1111 "parser.l"
 {
   wchar_t ch0, ch1;
   yytext[6] = 0;
@@ -5759,7 +5760,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 1119 "parser.l"
+#line 1120 "parser.l"
 {
   wchar_t ch = num_esc(yyg, yytext + 1);
   yylval->chr = if3(ch, ch, 0xDC00);
@@ -5768,14 +5769,14 @@ YY_RULE_SETUP
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 1125 "parser.l"
+#line 1126 "parser.l"
 {
   yyerrorf(yyg, lit("JSON \\u escape needs four digits"), nao);
 }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 1129 "parser.l"
+#line 1130 "parser.l"
 {
   yyerrorf(yyg, lit("unrecognized JSON escape: \\~a"), chr(yytext[1]), nao);
 }
@@ -5783,7 +5784,7 @@ YY_RULE_SETUP
 case 145:
 /* rule 145 can match eol */
 YY_RULE_SETUP
-#line 1133 "parser.l"
+#line 1134 "parser.l"
 {
   yyerrprepf(yyg, lit("newline in JSON string"), nao);
   yyextra->lineno++;
@@ -5793,7 +5794,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 1140 "parser.l"
+#line 1141 "parser.l"
 {
   wchar_t wchr[8];
   if (utf8_from_buf(wchr, coerce(unsigned char *, yytext), yyleng) != 2) {
@@ -5806,7 +5807,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 1150 "parser.l"
+#line 1151 "parser.l"
 {
   yylval->chr = strtol(yytext, 0, 16);
   return LITCHAR;
@@ -5814,28 +5815,28 @@ YY_RULE_SETUP
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 1155 "parser.l"
+#line 1156 "parser.l"
 {
   return '\'';
 }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 1159 "parser.l"
+#line 1160 "parser.l"
 {
 }
 	YY_BREAK
 case 150:
 /* rule 150 can match eol */
 YY_RULE_SETUP
-#line 1162 "parser.l"
+#line 1163 "parser.l"
 {
   yyextra->lineno++;
 }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 1166 "parser.l"
+#line 1167 "parser.l"
 {
   yyerrorf(yyg, lit("bad character ~s in buffer literal"),
            chr(yytext[0]), nao);
@@ -5843,7 +5844,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 1171 "parser.l"
+#line 1172 "parser.l"
 {
   yylval->chr = convert(unsigned char, yytext[0]) + 0xDC00;
   return LITCHAR;
@@ -5851,7 +5852,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 1176 "parser.l"
+#line 1177 "parser.l"
 {
   if ((yylval->val = flo_str_utf8(yytext)) == nil)
     out_of_range_float(yyg, yytext);
@@ -5865,7 +5866,7 @@ YY_LINENO_REWIND_TO(yy_bp + 4);
 yyg->yy_c_buf_p = yy_cp = yy_bp + 4;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 1182 "parser.l"
+#line 1183 "parser.l"
 {
   yylval->val = t;
   return JSKW;
@@ -5878,7 +5879,7 @@ YY_LINENO_REWIND_TO(yy_bp + 5);
 yyg->yy_c_buf_p = yy_cp = yy_bp + 5;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 1187 "parser.l"
+#line 1188 "parser.l"
 {
   yylval->val = nil;
   return JSKW;
@@ -5891,7 +5892,7 @@ YY_LINENO_REWIND_TO(yy_bp + 4);
 yyg->yy_c_buf_p = yy_cp = yy_bp + 4;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 1192 "parser.l"
+#line 1193 "parser.l"
 {
   yylval->val = null_s;
   return JSKW;
@@ -5899,7 +5900,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 1197 "parser.l"
+#line 1198 "parser.l"
 {
   if (strcmp("true", yytext) == 0) {
     yylval->val = t;
@@ -5924,7 +5925,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 1219 "parser.l"
+#line 1220 "parser.l"
 {
   yy_push_state(JLIT, yyscanner);
   return yytext[0];
@@ -5932,7 +5933,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 1224 "parser.l"
+#line 1225 "parser.l"
 {
   yy_push_state(JMARKER, yyscanner);
   yy_push_state(NESTED, yyscanner);
@@ -5941,7 +5942,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 1230 "parser.l"
+#line 1231 "parser.l"
 {
   yy_push_state(JMARKER, yyscanner);
   yy_push_state(NESTED, yyscanner);
@@ -5950,7 +5951,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 1236 "parser.l"
+#line 1237 "parser.l"
 {
   return yytext[0];
 }
@@ -5958,20 +5959,20 @@ YY_RULE_SETUP
 case 162:
 /* rule 162 can match eol */
 YY_RULE_SETUP
-#line 1240 "parser.l"
+#line 1241 "parser.l"
 {
   yyextra->lineno++;
 }
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 1244 "parser.l"
+#line 1245 "parser.l"
 {
 }
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 1247 "parser.l"
+#line 1248 "parser.l"
 {
   yyerrorf(yyg, lit("bad character ~s in JSON literal"),
            chr(yytext[0]), nao);
@@ -5979,7 +5980,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 1252 "parser.l"
+#line 1253 "parser.l"
 {
   yy_push_state(JLIT, yyscanner);
   return yytext[0];
@@ -5987,17 +5988,17 @@ YY_RULE_SETUP
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 1257 "parser.l"
+#line 1258 "parser.l"
 {
   internal_error("scanner processed input JMARKER state");
 }
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 1261 "parser.l"
+#line 1262 "parser.l"
 ECHO;
 	YY_BREAK
-#line 6001 "lex.yy.c"
+#line 6002 "lex.yy.c"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(SPECIAL):
 			case YY_STATE_EOF(BRACED):
@@ -7210,7 +7211,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 1261 "parser.l"
+#line 1262 "parser.l"
 
 
 static int directive_tok(scanner_t *yyscanner, int tok, int state)