diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2022-01-10 23:52:28 -0800 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2022-01-10 23:52:28 -0800 |
commit | e2e4c5a3de3a948054f58c9ba5e8ce14ce02a94a (patch) | |
tree | 8d37da3ce705fd052232047614f1b88f45391d37 /lex.yy.c.shipped | |
parent | 15a45c00d9d8acaaa6e4eb43f553243230760c54 (diff) | |
download | txr-e2e4c5a3de3a948054f58c9ba5e8ce14ce02a94a.tar.gz txr-e2e4c5a3de3a948054f58c9ba5e8ce14ce02a94a.tar.bz2 txr-e2e4c5a3de3a948054f58c9ba5e8ce14ce02a94a.zip |
parser: bug: carriage returns in JSON causing errors.
* parser.l (NJPUNC): This inverted class lexical category must
exclude the carriage return character \r, otherwise it matches
it. The JSON keywords true, false and null are recognized as
sequences of NJPUNC. If we don't exclude \r from NJPUNC, it
looks like a symbol constituent, comprising an unrecognized
JSON keyword.
* lex.yy.c.shipped: Updated.
Diffstat (limited to 'lex.yy.c.shipped')
-rw-r--r-- | lex.yy.c.shipped | 701 |
1 files changed, 346 insertions, 355 deletions
diff --git a/lex.yy.c.shipped b/lex.yy.c.shipped index 46253bf6..448eed69 100644 --- a/lex.yy.c.shipped +++ b/lex.yy.c.shipped @@ -347,8 +347,8 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 167 -#define YY_END_OF_BUFFER 168 +#define YY_NUM_RULES 166 +#define YY_END_OF_BUFFER 167 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -356,186 +356,185 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_acclist[1613] = +static const flex_int16_t yy_acclist[1611] = { 0, 62, 62, 62, 62, 62, 62, 62, 62, 138, 138, - 138, 138, 149, 149, 163, 163, 168, 114, 167, 115, - 167, 115, 167, 113, 167, 117, 167, 114, 167, 114, - 167, 114, 167, 117, 167, 98, 99, 167, 62, 98, - 99, 167, 84, 167, 84, 98, 99, 167, 63, 98, - 99, 167, 98, 99, 167, 55, 98, 99, 167, 61, - 98, 99, 167, 98, 99, 167, 89, 98, 99, 167, - 85, 98, 99, 167, 1, 19, 98, 99, 167,16400, - 97, 98, 99, 167, 83, 98, 99, 167, 19, 98, - 99, 167,16400, 55, 98, 99, 167, 98, 99, 167, - - 67, 98, 99, 167, 54, 98, 99, 167, 61, 98, - 99, 167, 99, 167, 99, 167, 99, 167, 99, 167, - 62, 98, 99, 167, 20, 98, 99, 167,16401, 72, - 98, 99, 167, 58, 98, 99, 167, 20, 98, 99, - 167,16401, 58, 98, 99, 167, 89, 98, 99, 167, - 1, 20, 98, 99, 167,16401, 20, 98, 99, 167, - 16401, 56, 98, 99, 167, 20, 98, 99, 167,16401, - 59, 98, 99, 167, 99, 167, 99, 167, 99, 167, - 62, 98, 99, 167, 21, 98, 99, 167,16402, 72, - 98, 99, 167, 21, 98, 99, 167,16402, 89, 98, - - 99, 167, 1, 21, 98, 99, 167,16402, 21, 98, - 99, 167,16402, 56, 98, 99, 167, 21, 98, 99, - 167,16402, 99, 167, 99, 167, 99, 167, 111, 112, - 167, 111, 112, 167, 105, 167, 105, 111, 112, 167, - 107, 111, 112, 167, 100, 107, 111, 112, 167, 110, - 111, 112, 167, 112, 167, 112, 167, 112, 167, 112, - 167, 106, 167, 106, 111, 112, 167, 146, 152, 167, - 146, 152, 167, 132, 167, 132, 146, 152, 167, 120, - 146, 152, 167, 146, 152, 167, 152, 167, 152, 167, - 152, 167, 152, 167, 131, 146, 152, 167, 133, 167, - - 133, 146, 152, 167, 130, 131, 146, 152, 167, 130, - 131, 146, 152, 167, 130, 131, 146, 152, 167, 131, - 152, 167, 131, 152, 167, 131, 152, 167, 131, 152, - 167, 134, 167, 134, 146, 152, 167, 137, 146, 152, - 167, 146, 152, 167, 121, 146, 152, 167, 62, 98, - 99, 167, 98, 99, 167, 98, 99, 167, 89, 98, - 99, 167, 1, 10, 19, 98, 99, 167,16400, 56, - 98, 99, 167, 98, 99, 167, 138, 146, 152, 167, - 135, 167, 135, 146, 152, 167, 146, 152, 167, 146, - 152, 167, 151, 167, 149, 151, 167, 150, 167, 150, - - 151, 167, 148, 151, 167, 147, 151, 167, 157, 164, - 167, 163, 164, 167, 162, 167, 157, 162, 164, 167, - 158, 161, 164, 165, 167, 157, 164, 167, 161, 164, - 167, 157, 164, 167, 153, 157, 164, 167, 153, 157, - 164, 167, 157, 164, 167, 157, 164, 167, 157, 164, - 167, 160, 161, 164, 167, 145, 167, 145, 146, 152, - 167, 139, 146, 152, 167, 146, 152, 167, 166, 167, - 167, 114, 114, 114, 114, 115, 113, 119, 116, 114, - 114, 114, 119, 62, 88, 84, 68, 66, 64, 70, - 1, 87, 4, 90, 1, 19,16400, 19,16400, 19, - - 16400, 97, 96, 92, 92, 96, 93, 96, 94, 96, - 95, 96, 98, 62, 88, 20, 22,16401, 20,16401, - 20, 22,16401, 20,16401, 20,16401, 79, 73, 78, - 76, 75, 74, 77, 1, 20, 22,16401, 57, 4, - 20, 22,16401, 20, 22,16401, 20,16401, 22, 20, - 16401, 20,16401, 20,16401, 9, 20,16401, 92, 20, - 98,16401, 62, 88, 21, 23,16402, 21,16402, 21, - 23,16402, 21,16402, 21,16402, 1, 21, 23,16402, - 82, 4, 21, 23,16402, 21, 23,16402, 21,16402, - 23, 21,16402, 21,16402, 21,16402, 9, 21,16402, - - 21, 98,16402, 105, 109, 104, 104, 109, 101, 109, - 108, 109, 102, 109, 103, 109, 109, 111, 106, 132, - 128, 124, 125, 124, 125, 128, 122, 128, 126, 128, - 127, 128, 146, 133, 130, 129, 130, 129, 130, 134, - 136, 9, 136, 136, 123, 128, 62, 88, 1, 10, - 1, 10, 19,16400, 138, 135, 125, 125, 128, 149, - 150, 157, 163, 162, 157, 153, 157, 153, 157, 157, - 157, 153, 157, 157, 157, 157, 159, 145, 144, 140, - 144, 143, 144, 119, 114, 119, 118, 118, 119, 86, - 91, 69, 71, 65, 2, 2, 2, 60, 4, 5, - - 5, 5, 8, 4, 5, 8, 8208, 5, 8, 5, - 8, 4, 19,16400, 8208, 92, 94, 94, 94, 20, + 138, 138, 149, 149, 163, 163, 167, 114, 166, 115, + 166, 115, 166, 113, 166, 117, 166, 114, 166, 114, + 166, 114, 166, 117, 166, 98, 99, 166, 62, 98, + 99, 166, 84, 166, 84, 98, 99, 166, 63, 98, + 99, 166, 98, 99, 166, 55, 98, 99, 166, 61, + 98, 99, 166, 98, 99, 166, 89, 98, 99, 166, + 85, 98, 99, 166, 1, 19, 98, 99, 166,16400, + 97, 98, 99, 166, 83, 98, 99, 166, 19, 98, + 99, 166,16400, 55, 98, 99, 166, 98, 99, 166, + + 67, 98, 99, 166, 54, 98, 99, 166, 61, 98, + 99, 166, 99, 166, 99, 166, 99, 166, 99, 166, + 62, 98, 99, 166, 20, 98, 99, 166,16401, 72, + 98, 99, 166, 58, 98, 99, 166, 20, 98, 99, + 166,16401, 58, 98, 99, 166, 89, 98, 99, 166, + 1, 20, 98, 99, 166,16401, 20, 98, 99, 166, + 16401, 56, 98, 99, 166, 20, 98, 99, 166,16401, + 59, 98, 99, 166, 99, 166, 99, 166, 99, 166, + 62, 98, 99, 166, 21, 98, 99, 166,16402, 72, + 98, 99, 166, 21, 98, 99, 166,16402, 89, 98, + + 99, 166, 1, 21, 98, 99, 166,16402, 21, 98, + 99, 166,16402, 56, 98, 99, 166, 21, 98, 99, + 166,16402, 99, 166, 99, 166, 99, 166, 111, 112, + 166, 111, 112, 166, 105, 166, 105, 111, 112, 166, + 107, 111, 112, 166, 100, 107, 111, 112, 166, 110, + 111, 112, 166, 112, 166, 112, 166, 112, 166, 112, + 166, 106, 166, 106, 111, 112, 166, 146, 152, 166, + 146, 152, 166, 132, 166, 132, 146, 152, 166, 120, + 146, 152, 166, 146, 152, 166, 152, 166, 152, 166, + 152, 166, 152, 166, 131, 146, 152, 166, 133, 166, + + 133, 146, 152, 166, 130, 131, 146, 152, 166, 130, + 131, 146, 152, 166, 130, 131, 146, 152, 166, 131, + 152, 166, 131, 152, 166, 131, 152, 166, 131, 152, + 166, 134, 166, 134, 146, 152, 166, 137, 146, 152, + 166, 146, 152, 166, 121, 146, 152, 166, 62, 98, + 99, 166, 98, 99, 166, 98, 99, 166, 89, 98, + 99, 166, 1, 10, 19, 98, 99, 166,16400, 56, + 98, 99, 166, 98, 99, 166, 138, 146, 152, 166, + 135, 166, 135, 146, 152, 166, 146, 152, 166, 146, + 152, 166, 151, 166, 149, 151, 166, 150, 166, 150, + + 151, 166, 148, 151, 166, 147, 151, 166, 157, 164, + 166, 163, 164, 166, 162, 166, 162, 164, 166, 158, + 161, 164, 166, 157, 164, 166, 161, 164, 166, 157, + 164, 166, 153, 157, 164, 166, 153, 157, 164, 166, + 157, 164, 166, 157, 164, 166, 157, 164, 166, 160, + 161, 164, 166, 145, 166, 145, 146, 152, 166, 139, + 146, 152, 166, 146, 152, 166, 165, 166, 166, 114, + 114, 114, 114, 115, 113, 119, 116, 114, 114, 114, + 119, 62, 88, 84, 68, 66, 64, 70, 1, 87, + 4, 90, 1, 19,16400, 19,16400, 19,16400, 97, + + 96, 92, 92, 96, 93, 96, 94, 96, 95, 96, + 98, 62, 88, 20, 22,16401, 20,16401, 20, 22, + 16401, 20,16401, 20,16401, 79, 73, 78, 76, 75, + 74, 77, 1, 20, 22,16401, 57, 4, 20, 22, + 16401, 20, 22,16401, 20,16401, 22, 20,16401, 20, + 16401, 20,16401, 9, 20,16401, 92, 20, 98,16401, + 62, 88, 21, 23,16402, 21,16402, 21, 23,16402, + 21,16402, 21,16402, 1, 21, 23,16402, 82, 4, + 21, 23,16402, 21, 23,16402, 21,16402, 23, 21, + 16402, 21,16402, 21,16402, 9, 21,16402, 21, 98, + + 16402, 105, 109, 104, 104, 109, 101, 109, 108, 109, + 102, 109, 103, 109, 109, 111, 106, 132, 128, 124, + 125, 124, 125, 128, 122, 128, 126, 128, 127, 128, + 146, 133, 130, 129, 130, 129, 130, 134, 136, 9, + 136, 136, 123, 128, 62, 88, 1, 10, 1, 10, + 19,16400, 138, 135, 125, 125, 128, 149, 150, 157, + 163, 162, 157, 153, 157, 153, 157, 157, 157, 153, + 157, 157, 157, 157, 159, 145, 144, 140, 144, 143, + 144, 119, 114, 119, 118, 118, 119, 86, 91, 69, + 71, 65, 2, 2, 2, 60, 4, 5, 5, 5, + + 8, 4, 5, 8, 8208, 5, 8, 5, 8, 4, + 19,16400, 8208, 92, 94, 94, 94, 20, 22,16401, + 20, 22,16401, 20, 22,16401, 20, 22,16401, 8209, + 20, 22,16401, 20, 22,16401, 20, 22,16401, 22, + 22, 81, 80, 20, 22,16401, 20,16401, 20,16401, + 4, 8209, 1, 20, 22,16401, 20, 22,16401, 6, + 4, 6, 6, 6, 6, 8, 8, 4, 6, 8, + 8209, 6, 8, 8, 6, 8, 8, 8, 8, 20, + 22,16401, 4, 20, 22,16401, 20, 22,16401, 20, + 22,16401, 22, 20, 22,16401, 22, 20, 22,16401, + + 20,16401, 20,16401, 9, 20, 22,16401, 21, 23, + 16402, 21, 23,16402, 21, 23,16402, 21, 23,16402, + 8210, 21, 23,16402, 21, 23,16402, 21, 23,16402, + 23, 23, 21, 23,16402, 21,16402, 21,16402, 4, + 8210, 1, 21, 23,16402, 21, 23,16402, 7, 4, + 7, 7, 7, 7, 8, 8, 4, 7, 8, 8210, + 7, 8, 8, 7, 8, 8, 8, 8, 21, 23, + 16402, 4, 21, 23,16402, 21, 23,16402, 21, 23, + 16402, 23, 21, 23,16402, 23, 21, 23,16402, 21, + 16402, 21,16402, 9, 21, 23,16402, 104, 104, 102, + + 102, 102, 124, 125, 124, 125, 126, 126, 126, 9, + 2, 14, 2, 12, 8, 8208, 125, 125, 81, 157, + 80, 157, 153, 157, 157, 153, 157, 157, 157, 157, + 118, 5, 4, 2, 3, 3, 2, 3, 2, 3, + 51, 51, 51, 51, 51, 51, 33, 4, 5, 8, + 4, 5, 4, 5, 8208, 4, 5, 4, 5, 19, + 16400, 5, 19,16400, 6, 4, 20, 22,16401, 20, 22,16401, 20, 22,16401, 20, 22,16401, 20, 22, - 16401, 8209, 20, 22,16401, 20, 22,16401, 20, 22, - 16401, 22, 22, 81, 80, 20, 22,16401, 20,16401, - 20,16401, 4, 8209, 1, 20, 22,16401, 20, 22, - 16401, 6, 4, 6, 6, 6, 6, 8, 8, 4, - 6, 8, 8209, 6, 8, 8, 6, 8, 8, 8, - 8, 20, 22,16401, 4, 20, 22,16401, 20, 22, - 16401, 20, 22,16401, 22, 20, 22,16401, 22, 20, - - 22,16401, 20,16401, 20,16401, 9, 20, 22,16401, - 21, 23,16402, 21, 23,16402, 21, 23,16402, 21, - 23,16402, 8210, 21, 23,16402, 21, 23,16402, 21, - 23,16402, 23, 23, 21, 23,16402, 21,16402, 21, - 16402, 4, 8210, 1, 21, 23,16402, 21, 23,16402, - 7, 4, 7, 7, 7, 7, 8, 8, 4, 7, - 8, 8210, 7, 8, 8, 7, 8, 8, 8, 8, - 21, 23,16402, 4, 21, 23,16402, 21, 23,16402, - 21, 23,16402, 23, 21, 23,16402, 23, 21, 23, - 16402, 21,16402, 21,16402, 9, 21, 23,16402, 104, - - 104, 102, 102, 102, 124, 125, 124, 125, 126, 126, - 126, 9, 2, 14, 2, 12, 8, 8208, 125, 125, - 81, 157, 80, 157, 153, 157, 157, 153, 157, 157, - 157, 157, 118, 5, 4, 2, 3, 3, 2, 3, - 2, 3, 51, 51, 51, 51, 51, 51, 33, 4, - 5, 8, 4, 5, 4, 5, 8208, 4, 5, 4, - 5, 19,16400, 5, 19,16400, 6, 4, 20, 22, - 16401, 20, 22,16401, 20, 22,16401, 20, 22,16401, - 20, 22,16401, 20, 22,16401, 22, 22, 22, 22, - 20, 22,16401, 20, 22,16401, 20, 22,16401, 4, - - 6, 8209, 6, 6, 6, 6, 6, 4, 6, 6, - 6, 6, 6, 6, 4, 6, 4, 6, 8209, 6, - 4, 6, 6, 20, 22,16401, 20, 22,16401, 4, - 6, 20, 22,16401, 6, 20, 22,16401, 22, 20, - 22,16401, 20, 22,16401, 20, 22,16401, 9, 20, - 22,16401, 7, 4, 21, 23,16402, 21, 23,16402, - 21, 23,16402, 21, 23,16402, 21, 23,16402, 21, - 23,16402, 23, 23, 23, 23, 21, 23,16402, 21, - 23,16402, 21, 23,16402, 4, 7, 8210, 7, 7, - 7, 7, 7, 4, 7, 7, 7, 7, 7, 7, - - 4, 7, 4, 7, 8210, 7, 4, 7, 7, 21, - 23,16402, 21, 23,16402, 4, 7, 21, 23,16402, - 7, 21, 23,16402, 23, 21, 23,16402, 21, 23, - 16402, 21, 23,16402, 15, 13, 11, 9, 21, 23, - 16402, 2, 3, 14, 2, 3, 12, 157, 157, 157, - 24, 32, 34, 45, 45, 45, 45, 45, 45, 40, - 40, 40, 40, 40, 40, 48, 4, 5, 8208, 4, - 6, 20, 22,16401, 20, 22,16401, 20, 22,16401, - 22, 6, 6, 6, 6, 6, 4, 6, 4, 6, - 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, - + 16401, 20, 22,16401, 22, 22, 22, 22, 20, 22, + 16401, 20, 22,16401, 20, 22,16401, 4, 6, 8209, + + 6, 6, 6, 6, 6, 4, 6, 6, 6, 6, + 6, 6, 4, 6, 4, 6, 8209, 6, 4, 6, + 6, 20, 22,16401, 20, 22,16401, 4, 6, 20, + 22,16401, 6, 20, 22,16401, 22, 20, 22,16401, + 20, 22,16401, 20, 22,16401, 9, 20, 22,16401, + 7, 4, 21, 23,16402, 21, 23,16402, 21, 23, + 16402, 21, 23,16402, 21, 23,16402, 21, 23,16402, + 23, 23, 23, 23, 21, 23,16402, 21, 23,16402, + 21, 23,16402, 4, 7, 8210, 7, 7, 7, 7, + 7, 4, 7, 7, 7, 7, 7, 7, 4, 7, + + 4, 7, 8210, 7, 4, 7, 7, 21, 23,16402, + 21, 23,16402, 4, 7, 21, 23,16402, 7, 21, + 23,16402, 23, 21, 23,16402, 21, 23,16402, 21, + 23,16402, 15, 13, 11, 9, 21, 23,16402, 2, + 3, 14, 2, 3, 12, 157, 157, 157, 24, 32, + 34, 45, 45, 45, 45, 45, 45, 40, 40, 40, + 40, 40, 40, 48, 4, 5, 8208, 4, 6, 20, + 22,16401, 20, 22,16401, 20, 22,16401, 22, 6, + 6, 6, 6, 6, 4, 6, 4, 6, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, 22,16401, - 6, 8209, 6, 20, 22,16401, 6, 20, 22,16401, - 4, 6, 20, 22,16401, 6, 20, 22,16401, 6, + + 6, 20, 22,16401, 6, 20, 22,16401, 6, 8209, + 6, 20, 22,16401, 6, 20, 22,16401, 4, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, 22, - 16401, 6, 22, 6, 22, 4, 7, 21, 23,16402, - 21, 23,16402, 21, 23,16402, 23, 7, 7, 7, - 7, 7, 4, 7, 4, 7, 7, 21, 23,16402, - 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, - 23,16402, 7, 21, 23,16402, 7, 8210, 7, 21, - 23,16402, 7, 21, 23,16402, 4, 7, 21, 23, + 16401, 6, 20, 22,16401, 6, 20, 22,16401, 6, + 22, 6, 22, 4, 7, 21, 23,16402, 21, 23, + 16402, 21, 23,16402, 23, 7, 7, 7, 7, 7, + 4, 7, 4, 7, 7, 21, 23,16402, 7, 21, + 23,16402, 7, 21, 23,16402, 7, 21, 23,16402, + 7, 21, 23,16402, 7, 8210, 7, 21, 23,16402, + 7, 21, 23,16402, 4, 7, 21, 23,16402, 7, - 16402, 7, 21, 23,16402, 7, 21, 23,16402, 7, - 21, 23,16402, 7, 21, 23,16402, 7, 23, 7, - 23, 157, 156, 154, 36, 36, 36, 36, 36, 36, - 52, 52, 52, 52, 52, 52, 53, 43, 43, 43, - 43, 43, 43, 26, 25, 25, 25, 25, 25, 25, - 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, + 21, 23,16402, 7, 21, 23,16402, 7, 21, 23, + 16402, 7, 21, 23,16402, 7, 23, 7, 23, 157, + 156, 154, 36, 36, 36, 36, 36, 36, 52, 52, + 52, 52, 52, 52, 53, 43, 43, 43, 43, 43, + 43, 26, 25, 25, 25, 25, 25, 25, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, 22,16401, - 6, 20, 22,16401, 6, 8209, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, + 22,16401, 6, 8209, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, 22,16401, + 6, 20, 22,16401, 6, 20, 22,16401, 6, 22, - 6, 22, 6, 22, 6, 22, 6, 22, 7, 21, - 23,16402, 7, 21, 23,16402, 7, 21, 23,16402, + 6, 22, 6, 22, 6, 22, 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, - 23,16402, 7, 8210, 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, 23,16402, - 7, 21, 23,16402, 7, 21, 23,16402, 7, 23, - 7, 23, 7, 23, 7, 23, 155, 142, 142, 29, - 29, 29, 29, 29, 29, 28, 49, 49, 49, 49, - 49, 49, 44, 42, 27, 37, 37, 37, 37, 37, - 37, 6, 20, 22,16401, 6, 20, 22,16401, 6, - + 7, 8210, 7, 21, 23,16402, 7, 21, 23,16402, + 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, + 23,16402, 7, 21, 23,16402, 7, 23, 7, 23, + 7, 23, 7, 23, 155, 142, 142, 29, 29, 29, + 29, 29, 29, 28, 49, 49, 49, 49, 49, 49, + 44, 42, 27, 37, 37, 37, 37, 37, 37, 6, 20, 22,16401, 6, 20, 22,16401, 6, 20, 22, + 16401, 6, 20, 22,16401, 6, 20, 22,16401, 6, - 20, 22,16401, 6, 20, 22,16401, 6, 22, 7, - 21, 23,16402, 7, 21, 23,16402, 7, 21, 23, + 20, 22,16401, 6, 20, 22,16401, 6, 20, 22, + 16401, 6, 20, 22,16401, 6, 22, 7, 21, 23, 16402, 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, 23,16402, 7, 21, 23, - 16402, 7, 21, 23,16402, 7, 23, 30, 30, 30, - 30, 30, 30, 47, 47, 47, 47, 47, 47, 31, - 31, 31, 31, 31, 31, 38, 38, 38, 38, 38, - 38, 39, 39, 39, 39, 39, 39, 41, 35, 35, + 16402, 7, 21, 23,16402, 7, 21, 23,16402, 7, + 21, 23,16402, 7, 23, 30, 30, 30, 30, 30, + 30, 47, 47, 47, 47, 47, 47, 31, 31, 31, + 31, 31, 31, 38, 38, 38, 38, 38, 38, 39, + 39, 39, 39, 39, 39, 41, 35, 35, 35, 35, - 35, 35, 35, 35, 50, 46, 46, 46, 46, 46, - 46, 141 + 35, 35, 50, 46, 46, 46, 46, 46, 46, 141 } ; static const flex_int16_t yy_accept[1651] = @@ -556,171 +555,171 @@ static const flex_int16_t yy_accept[1651] = 310, 315, 320, 323, 326, 329, 332, 334, 338, 342, 345, 349, 353, 356, 359, 363, 370, 374, 377, 381, 383, 387, 390, 393, 395, 398, 400, 403, 406, 409, - 412, 415, 417, 421, 426, 429, 432, 435, 439, 443, - 446, 449, 452, 456, 458, 462, 466, 469, 471, 472, - 473, 474, 475, 476, 477, 478, 478, 479, 480, 481, - 482, 483, 483, 484, 485, 485, 486, 486, 487, 488, - 488, 489, 490, 491, 491, 491, 491, 491, 491, 491, - - 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, - 491, 491, 491, 491, 491, 491, 491, 491, 491, 491, - 491, 492, 493, 494, 495, 495, 498, 500, 502, 503, - 503, 504, 505, 507, 509, 511, 513, 514, 514, 514, - 515, 515, 516, 516, 519, 521, 521, 524, 524, 526, - 526, 526, 526, 526, 528, 529, 530, 531, 532, 533, - 534, 535, 535, 539, 540, 541, 541, 544, 547, 549, - 550, 552, 552, 552, 552, 554, 554, 556, 559, 559, - 559, 559, 560, 563, 563, 563, 564, 564, 565, 565, - 568, 570, 570, 573, 573, 575, 575, 575, 575, 577, - - 577, 581, 582, 583, 583, 586, 589, 591, 592, 594, - 594, 594, 594, 596, 596, 598, 601, 601, 601, 601, - 604, 604, 604, 604, 604, 605, 606, 607, 609, 611, - 613, 615, 617, 618, 619, 619, 619, 620, 620, 620, - 621, 622, 624, 627, 629, 631, 633, 634, 634, 634, - 635, 636, 638, 640, 641, 641, 642, 642, 644, 645, - 647, 648, 649, 649, 649, 651, 651, 655, 655, 656, - 656, 657, 658, 660, 661, 662, 663, 664, 665, 666, - 668, 670, 671, 672, 674, 675, 676, 677, 678, 679, - 680, 682, 684, 685, 686, 687, 688, 690, 691, 692, - - 692, 692, 693, 694, 695, 695, 696, 696, 697, 697, - 698, 698, 698, 698, 698, 698, 698, 698, 698, 698, - 698, 698, 698, 698, 698, 698, 698, 698, 698, 698, - 698, 698, 698, 698, 698, 698, 698, 698, 698, 698, - 698, 698, 698, 698, 698, 698, 698, 698, 698, 698, - 698, 698, 698, 698, 698, 698, 698, 699, 699, 699, - 701, 702, 703, 704, 708, 710, 712, 712, 715, 716, - 717, 718, 719, 720, 720, 720, 720, 720, 723, 726, - 729, 732, 732, 732, 732, 733, 736, 739, 742, 742, - 742, 742, 743, 743, 744, 744, 744, 744, 744, 744, - - 745, 746, 749, 751, 753, 753, 753, 753, 755, 759, - 762, 763, 763, 763, 765, 766, 766, 767, 767, 767, - 767, 769, 770, 774, 776, 777, 779, 780, 781, 782, - 785, 789, 792, 795, 796, 799, 799, 799, 799, 800, - 800, 800, 800, 800, 800, 803, 805, 807, 807, 807, - 807, 811, 811, 811, 811, 811, 811, 811, 814, 817, - 820, 823, 823, 823, 823, 824, 827, 830, 833, 833, - 833, 833, 834, 834, 835, 835, 835, 835, 835, 835, - 838, 840, 842, 842, 842, 842, 844, 848, 851, 852, - 852, 852, 854, 855, 855, 856, 856, 856, 856, 858, - - 859, 863, 865, 866, 868, 869, 870, 871, 874, 878, - 881, 884, 885, 888, 888, 888, 888, 889, 889, 889, - 889, 889, 889, 892, 894, 896, 896, 896, 896, 896, - 896, 896, 900, 900, 900, 900, 901, 902, 903, 904, - 905, 905, 907, 909, 910, 911, 912, 912, 913, 913, - 915, 915, 917, 917, 919, 920, 921, 923, 925, 927, - 928, 930, 931, 932, 933, 933, 933, 934, 935, 936, - 938, 939, 941, 943, 943, 943, 943, 943, 943, 943, - 943, 943, 943, 943, 943, 943, 943, 943, 943, 943, - 943, 943, 943, 943, 943, 943, 943, 943, 943, 943, - - 943, 943, 943, 943, 943, 943, 943, 943, 943, 943, - 943, 943, 943, 943, 943, 944, 945, 946, 947, 948, - 949, 949, 949, 949, 949, 949, 950, 950, 950, 950, - 950, 950, 950, 950, 953, 953, 955, 958, 960, 960, - 964, 967, 968, 968, 969, 972, 975, 978, 978, 978, - 978, 978, 978, 981, 984, 987, 987, 987, 987, 987, - 987, 988, 989, 990, 990, 990, 990, 991, 991, 991, - 991, 991, 991, 991, 994, 997, 1000, 1000, 1000, 1000, - 1000, 1000, 1003, 1004, 1005, 1005, 1005, 1005, 1006, 1007, - 1008, 1010, 1011, 1012, 1012, 1012, 1012, 1013, 1013, 1013, - - 1013, 1014, 1014, 1014, 1014, 1015, 1017, 1017, 1017, 1020, - 1021, 1023, 1027, 1030, 1030, 1035, 1039, 1039, 1039, 1039, - 1039, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040, 1040, - 1043, 1046, 1049, 1049, 1049, 1049, 1049, 1049, 1053, 1053, - 1054, 1054, 1055, 1058, 1061, 1064, 1064, 1064, 1064, 1064, - 1064, 1067, 1070, 1073, 1073, 1073, 1073, 1073, 1073, 1074, - 1075, 1076, 1076, 1076, 1076, 1077, 1077, 1077, 1077, 1077, - 1077, 1077, 1080, 1083, 1086, 1086, 1086, 1086, 1086, 1086, - 1089, 1090, 1091, 1091, 1091, 1091, 1092, 1093, 1094, 1096, - 1097, 1098, 1098, 1098, 1098, 1099, 1099, 1099, 1099, 1100, - - 1100, 1100, 1100, 1101, 1103, 1103, 1103, 1106, 1107, 1109, - 1113, 1116, 1116, 1121, 1125, 1125, 1125, 1125, 1125, 1126, - 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1129, 1132, - 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1136, 1136, 1137, - 1137, 1138, 1142, 1142, 1145, 1148, 1149, 1150, 1151, 1151, + 412, 415, 417, 420, 424, 427, 430, 433, 437, 441, + 444, 447, 450, 454, 456, 460, 464, 467, 469, 470, + 471, 472, 473, 474, 475, 476, 476, 477, 478, 479, + 480, 481, 481, 482, 483, 483, 484, 484, 485, 486, + 486, 487, 488, 489, 489, 489, 489, 489, 489, 489, + + 489, 489, 489, 489, 489, 489, 489, 489, 489, 489, + 489, 489, 489, 489, 489, 489, 489, 489, 489, 489, + 489, 490, 491, 492, 493, 493, 496, 498, 500, 501, + 501, 502, 503, 505, 507, 509, 511, 512, 512, 512, + 513, 513, 514, 514, 517, 519, 519, 522, 522, 524, + 524, 524, 524, 524, 526, 527, 528, 529, 530, 531, + 532, 533, 533, 537, 538, 539, 539, 542, 545, 547, + 548, 550, 550, 550, 550, 552, 552, 554, 557, 557, + 557, 557, 558, 561, 561, 561, 562, 562, 563, 563, + 566, 568, 568, 571, 571, 573, 573, 573, 573, 575, + + 575, 579, 580, 581, 581, 584, 587, 589, 590, 592, + 592, 592, 592, 594, 594, 596, 599, 599, 599, 599, + 602, 602, 602, 602, 602, 603, 604, 605, 607, 609, + 611, 613, 615, 616, 617, 617, 617, 618, 618, 618, + 619, 620, 622, 625, 627, 629, 631, 632, 632, 632, + 633, 634, 636, 638, 639, 639, 640, 640, 642, 643, + 645, 646, 647, 647, 647, 649, 649, 653, 653, 654, + 654, 655, 656, 658, 659, 660, 661, 662, 663, 664, + 666, 668, 669, 670, 672, 673, 674, 675, 676, 677, + 678, 680, 682, 683, 684, 685, 686, 688, 689, 690, + + 690, 690, 691, 692, 693, 693, 694, 694, 695, 695, + 696, 696, 696, 696, 696, 696, 696, 696, 696, 696, + 696, 696, 696, 696, 696, 696, 696, 696, 696, 696, + 696, 696, 696, 696, 696, 696, 696, 696, 696, 696, + 696, 696, 696, 696, 696, 696, 696, 696, 696, 696, + 696, 696, 696, 696, 696, 696, 696, 697, 697, 697, + 699, 700, 701, 702, 706, 708, 710, 710, 713, 714, + 715, 716, 717, 718, 718, 718, 718, 718, 721, 724, + 727, 730, 730, 730, 730, 731, 734, 737, 740, 740, + 740, 740, 741, 741, 742, 742, 742, 742, 742, 742, + + 743, 744, 747, 749, 751, 751, 751, 751, 753, 757, + 760, 761, 761, 761, 763, 764, 764, 765, 765, 765, + 765, 767, 768, 772, 774, 775, 777, 778, 779, 780, + 783, 787, 790, 793, 794, 797, 797, 797, 797, 798, + 798, 798, 798, 798, 798, 801, 803, 805, 805, 805, + 805, 809, 809, 809, 809, 809, 809, 809, 812, 815, + 818, 821, 821, 821, 821, 822, 825, 828, 831, 831, + 831, 831, 832, 832, 833, 833, 833, 833, 833, 833, + 836, 838, 840, 840, 840, 840, 842, 846, 849, 850, + 850, 850, 852, 853, 853, 854, 854, 854, 854, 856, + + 857, 861, 863, 864, 866, 867, 868, 869, 872, 876, + 879, 882, 883, 886, 886, 886, 886, 887, 887, 887, + 887, 887, 887, 890, 892, 894, 894, 894, 894, 894, + 894, 894, 898, 898, 898, 898, 899, 900, 901, 902, + 903, 903, 905, 907, 908, 909, 910, 910, 911, 911, + 913, 913, 915, 915, 917, 918, 919, 921, 923, 925, + 926, 928, 929, 930, 931, 931, 931, 932, 933, 934, + 936, 937, 939, 941, 941, 941, 941, 941, 941, 941, + 941, 941, 941, 941, 941, 941, 941, 941, 941, 941, + 941, 941, 941, 941, 941, 941, 941, 941, 941, 941, + + 941, 941, 941, 941, 941, 941, 941, 941, 941, 941, + 941, 941, 941, 941, 941, 942, 943, 944, 945, 946, + 947, 947, 947, 947, 947, 947, 948, 948, 948, 948, + 948, 948, 948, 948, 951, 951, 953, 956, 958, 958, + 962, 965, 966, 966, 967, 970, 973, 976, 976, 976, + 976, 976, 976, 979, 982, 985, 985, 985, 985, 985, + 985, 986, 987, 988, 988, 988, 988, 989, 989, 989, + 989, 989, 989, 989, 992, 995, 998, 998, 998, 998, + 998, 998, 1001, 1002, 1003, 1003, 1003, 1003, 1004, 1005, + 1006, 1008, 1009, 1010, 1010, 1010, 1010, 1011, 1011, 1011, + + 1011, 1012, 1012, 1012, 1012, 1013, 1015, 1015, 1015, 1018, + 1019, 1021, 1025, 1028, 1028, 1033, 1037, 1037, 1037, 1037, + 1037, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038, + 1041, 1044, 1047, 1047, 1047, 1047, 1047, 1047, 1051, 1051, + 1052, 1052, 1053, 1056, 1059, 1062, 1062, 1062, 1062, 1062, + 1062, 1065, 1068, 1071, 1071, 1071, 1071, 1071, 1071, 1072, + 1073, 1074, 1074, 1074, 1074, 1075, 1075, 1075, 1075, 1075, + 1075, 1075, 1078, 1081, 1084, 1084, 1084, 1084, 1084, 1084, + 1087, 1088, 1089, 1089, 1089, 1089, 1090, 1091, 1092, 1094, + 1095, 1096, 1096, 1096, 1096, 1097, 1097, 1097, 1097, 1098, + + 1098, 1098, 1098, 1099, 1101, 1101, 1101, 1104, 1105, 1107, + 1111, 1114, 1114, 1119, 1123, 1123, 1123, 1123, 1123, 1124, + 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1127, 1130, + 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1134, 1134, 1135, + 1135, 1136, 1140, 1140, 1143, 1146, 1147, 1148, 1149, 1149, + 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, + 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, + 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1150, 1150, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, - 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, - 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1152, 1152, - 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, - 1153, 1154, 1154, 1154, 1154, 1154, 1154, 1155, 1156, 1157, - - 1157, 1158, 1159, 1160, 1160, 1160, 1161, 1162, 1163, 1163, - 1164, 1165, 1166, 1166, 1166, 1166, 1167, 1167, 1168, 1170, - 1172, 1175, 1178, 1181, 1181, 1181, 1181, 1181, 1181, 1181, - 1181, 1181, 1181, 1182, 1182, 1182, 1182, 1182, 1182, 1182, - 1182, 1182, 1182, 1182, 1182, 1183, 1183, 1183, 1183, 1183, - 1183, 1184, 1184, 1184, 1184, 1185, 1185, 1185, 1185, 1185, - 1185, 1185, 1185, 1186, 1187, 1187, 1187, 1187, 1187, 1187, - 1189, 1189, 1191, 1195, 1199, 1203, 1207, 1207, 1207, 1207, - 1211, 1213, 1217, 1221, 1226, 1230, 1230, 1230, 1230, 1234, - 1238, 1242, 1242, 1242, 1242, 1244, 1244, 1246, 1246, 1246, - - 1246, 1246, 1246, 1246, 1246, 1246, 1246, 1246, 1246, 1246, - 1248, 1251, 1254, 1257, 1257, 1257, 1257, 1257, 1257, 1257, - 1257, 1257, 1257, 1258, 1258, 1258, 1258, 1258, 1258, 1258, - 1258, 1258, 1258, 1258, 1258, 1259, 1259, 1259, 1259, 1259, - 1259, 1260, 1260, 1260, 1260, 1261, 1261, 1261, 1261, 1261, - 1261, 1261, 1261, 1262, 1263, 1263, 1263, 1263, 1263, 1263, - 1265, 1265, 1267, 1271, 1275, 1279, 1283, 1283, 1283, 1283, - 1287, 1289, 1293, 1297, 1302, 1306, 1306, 1306, 1306, 1310, - 1314, 1318, 1318, 1318, 1318, 1320, 1320, 1322, 1322, 1322, - 1322, 1322, 1322, 1322, 1322, 1322, 1322, 1322, 1322, 1322, - - 1323, 1324, 1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325, - 1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325, - 1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325, 1325, - 1326, 1327, 1328, 1328, 1329, 1330, 1331, 1331, 1332, 1333, - 1334, 1335, 1336, 1337, 1337, 1338, 1338, 1338, 1338, 1338, - 1339, 1340, 1341, 1342, 1343, 1344, 1344, 1344, 1344, 1345, - 1345, 1345, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1351, - 1351, 1351, 1351, 1351, 1351, 1351, 1351, 1351, 1351, 1351, - 1351, 1351, 1351, 1351, 1351, 1351, 1351, 1351, 1351, 1351, - 1351, 1355, 1359, 1363, 1363, 1363, 1363, 1363, 1363, 1367, - - 1371, 1375, 1375, 1375, 1375, 1377, 1381, 1385, 1389, 1389, - 1389, 1389, 1389, 1389, 1393, 1397, 1401, 1401, 1401, 1401, - 1401, 1401, 1403, 1405, 1407, 1407, 1407, 1407, 1409, 1409, - 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, - 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, - 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1409, 1413, 1417, - 1421, 1421, 1421, 1421, 1421, 1421, 1425, 1429, 1433, 1433, - 1433, 1433, 1435, 1439, 1443, 1447, 1447, 1447, 1447, 1447, - 1447, 1451, 1455, 1459, 1459, 1459, 1459, 1459, 1459, 1461, - 1463, 1465, 1465, 1465, 1465, 1467, 1467, 1467, 1467, 1467, - - 1467, 1467, 1467, 1467, 1468, 1469, 1470, 1470, 1470, 1470, - 1470, 1470, 1470, 1470, 1470, 1470, 1470, 1470, 1470, 1470, - 1470, 1470, 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1476, - 1477, 1478, 1479, 1480, 1481, 1482, 1483, 1483, 1483, 1483, - 1483, 1484, 1484, 1484, 1485, 1485, 1485, 1486, 1486, 1486, - 1486, 1486, 1487, 1488, 1489, 1490, 1491, 1492, 1492, 1492, - 1492, 1492, 1492, 1492, 1496, 1500, 1504, 1504, 1504, 1504, - 1504, 1504, 1504, 1508, 1512, 1516, 1516, 1516, 1516, 1516, - 1516, 1520, 1524, 1528, 1528, 1528, 1528, 1528, 1528, 1528, - 1528, 1528, 1528, 1530, 1530, 1530, 1530, 1530, 1530, 1530, - - 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1534, 1538, - 1542, 1542, 1542, 1542, 1542, 1542, 1542, 1546, 1550, 1554, - 1554, 1554, 1554, 1554, 1554, 1558, 1562, 1566, 1566, 1566, - 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1568, 1568, 1568, - 1568, 1568, 1568, 1568, 1568, 1568, 1568, 1568, 1568, 1568, - 1568, 1568, 1568, 1568, 1568, 1568, 1569, 1570, 1571, 1572, - 1573, 1574, 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1580, - 1581, 1582, 1583, 1584, 1585, 1586, 1586, 1587, 1588, 1589, - 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1597, 1598, 1598, - 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, - - 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, - 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, - 1599, 1599, 1599, 1600, 1601, 1602, 1603, 1604, 1605, 1605, - 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1612, 1612, 1612, - 1612, 1612, 1612, 1612, 1612, 1612, 1612, 1612, 1613, 1613 + 1151, 1152, 1152, 1152, 1152, 1152, 1152, 1153, 1154, 1155, + + 1155, 1156, 1157, 1158, 1158, 1158, 1159, 1160, 1161, 1161, + 1162, 1163, 1164, 1164, 1164, 1164, 1165, 1165, 1166, 1168, + 1170, 1173, 1176, 1179, 1179, 1179, 1179, 1179, 1179, 1179, + 1179, 1179, 1179, 1180, 1180, 1180, 1180, 1180, 1180, 1180, + 1180, 1180, 1180, 1180, 1180, 1181, 1181, 1181, 1181, 1181, + 1181, 1182, 1182, 1182, 1182, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1184, 1185, 1185, 1185, 1185, 1185, 1185, + 1187, 1187, 1189, 1193, 1197, 1201, 1205, 1205, 1205, 1205, + 1209, 1211, 1215, 1219, 1224, 1228, 1228, 1228, 1228, 1232, + 1236, 1240, 1240, 1240, 1240, 1242, 1242, 1244, 1244, 1244, + + 1244, 1244, 1244, 1244, 1244, 1244, 1244, 1244, 1244, 1244, + 1246, 1249, 1252, 1255, 1255, 1255, 1255, 1255, 1255, 1255, + 1255, 1255, 1255, 1256, 1256, 1256, 1256, 1256, 1256, 1256, + 1256, 1256, 1256, 1256, 1256, 1257, 1257, 1257, 1257, 1257, + 1257, 1258, 1258, 1258, 1258, 1259, 1259, 1259, 1259, 1259, + 1259, 1259, 1259, 1260, 1261, 1261, 1261, 1261, 1261, 1261, + 1263, 1263, 1265, 1269, 1273, 1277, 1281, 1281, 1281, 1281, + 1285, 1287, 1291, 1295, 1300, 1304, 1304, 1304, 1304, 1308, + 1312, 1316, 1316, 1316, 1316, 1318, 1318, 1320, 1320, 1320, + 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, 1320, + + 1321, 1322, 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, + 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, + 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, 1323, + 1324, 1325, 1326, 1326, 1327, 1328, 1329, 1329, 1330, 1331, + 1332, 1333, 1334, 1335, 1335, 1336, 1336, 1336, 1336, 1336, + 1337, 1338, 1339, 1340, 1341, 1342, 1342, 1342, 1342, 1343, + 1343, 1343, 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1349, + 1349, 1349, 1349, 1349, 1349, 1349, 1349, 1349, 1349, 1349, + 1349, 1349, 1349, 1349, 1349, 1349, 1349, 1349, 1349, 1349, + 1349, 1353, 1357, 1361, 1361, 1361, 1361, 1361, 1361, 1365, + + 1369, 1373, 1373, 1373, 1373, 1375, 1379, 1383, 1387, 1387, + 1387, 1387, 1387, 1387, 1391, 1395, 1399, 1399, 1399, 1399, + 1399, 1399, 1401, 1403, 1405, 1405, 1405, 1405, 1407, 1407, + 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1407, + 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1407, + 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1407, 1411, 1415, + 1419, 1419, 1419, 1419, 1419, 1419, 1423, 1427, 1431, 1431, + 1431, 1431, 1433, 1437, 1441, 1445, 1445, 1445, 1445, 1445, + 1445, 1449, 1453, 1457, 1457, 1457, 1457, 1457, 1457, 1459, + 1461, 1463, 1463, 1463, 1463, 1465, 1465, 1465, 1465, 1465, + + 1465, 1465, 1465, 1465, 1466, 1467, 1468, 1468, 1468, 1468, + 1468, 1468, 1468, 1468, 1468, 1468, 1468, 1468, 1468, 1468, + 1468, 1468, 1468, 1469, 1470, 1471, 1472, 1473, 1474, 1474, + 1475, 1476, 1477, 1478, 1479, 1480, 1481, 1481, 1481, 1481, + 1481, 1482, 1482, 1482, 1483, 1483, 1483, 1484, 1484, 1484, + 1484, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1490, 1490, + 1490, 1490, 1490, 1490, 1494, 1498, 1502, 1502, 1502, 1502, + 1502, 1502, 1502, 1506, 1510, 1514, 1514, 1514, 1514, 1514, + 1514, 1518, 1522, 1526, 1526, 1526, 1526, 1526, 1526, 1526, + 1526, 1526, 1526, 1528, 1528, 1528, 1528, 1528, 1528, 1528, + + 1528, 1528, 1528, 1528, 1528, 1528, 1528, 1528, 1532, 1536, + 1540, 1540, 1540, 1540, 1540, 1540, 1540, 1544, 1548, 1552, + 1552, 1552, 1552, 1552, 1552, 1556, 1560, 1564, 1564, 1564, + 1564, 1564, 1564, 1564, 1564, 1564, 1564, 1566, 1566, 1566, + 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1566, + 1566, 1566, 1566, 1566, 1566, 1566, 1567, 1568, 1569, 1570, + 1571, 1572, 1572, 1573, 1574, 1575, 1576, 1577, 1578, 1578, + 1579, 1580, 1581, 1582, 1583, 1584, 1584, 1585, 1586, 1587, + 1588, 1589, 1590, 1591, 1592, 1593, 1594, 1595, 1596, 1596, + 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + + 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, + 1597, 1597, 1597, 1598, 1599, 1600, 1601, 1602, 1603, 1603, + 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1610, 1610, 1610, + 1610, 1610, 1610, 1610, 1610, 1610, 1610, 1610, 1611, 1611 } ; static const YY_CHAR yy_ec[256] = @@ -998,7 +997,7 @@ static const flex_int16_t yy_def[1899] = 1667, 1667, 1649, 1649, 1649, 1649, 1649, 1649, 1668, 1666, 1649, 1649, 1649, 1649, 1649, 1657, 1649, 1649, 1649, 1649, 1649, 130, 130, 1649, 1649, 1649, 1649, 1649, 1649, 1669, - 1649, 1649, 1669, 1649, 1669, 1649, 1669, 1669, 1669, 1669, + 1649, 1649, 1649, 1649, 1669, 1649, 1669, 1669, 1669, 1669, 1669, 1669, 1649, 1649, 1649, 1649, 1670, 1649, 1649, 1656, 1656, 1656, 1656, 1649, 1649, 1649, 1671, 1649, 1656, 1656, 1656, 1649, 1672, 1649, 1649, 1649, 1649, 1649, 1649, 1649, @@ -2054,7 +2053,7 @@ static const flex_int16_t yy_nxt[11709] = 351, 1649, 1649, 1649, 351, 1649, 351, 351, 359, 359, 359, 1649, 359, 1649, 1649, 359, 1649, 1649, 359, 359, - 359, 359, 359, 376, 1649, 1649, 376, 1649, 376, 1649, + 359, 359, 359, 376, 1649, 1649, 1649, 1649, 376, 1649, 376, 376, 1649, 1649, 376, 376, 376, 376, 1649, 376, 376, 376, 1649, 376, 376, 376, 390, 390, 1649, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, 390, @@ -2114,7 +2113,7 @@ static const flex_int16_t yy_nxt[11709] = 359, 359, 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, 1649, 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, 227, 1649, 227, 1649, 1649, - 1649, 227, 1649, 227, 227, 376, 1649, 1649, 376, 1649, + 1649, 227, 1649, 227, 227, 376, 1649, 1649, 1649, 1649, 376, 1649, 376, 376, 1649, 1649, 376, 376, 376, 376, 1649, 376, 376, 376, 1649, 376, 376, 376, 393, 393, 1649, 393, 393, 393, 393, 393, 393, 393, 393, 393, @@ -2208,7 +2207,7 @@ static const flex_int16_t yy_nxt[11709] = 1649, 671, 671, 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, 463, 1649, 463, 463, 463, 463, - 463, 463, 463, 463, 463, 463, 376, 1649, 1649, 376, + 463, 463, 463, 463, 463, 463, 376, 1649, 1649, 1649, 1649, 376, 1649, 376, 376, 1649, 1649, 376, 376, 376, 376, 1649, 376, 376, 376, 1649, 376, 376, 376, 461, 1649, 1649, 461, 1649, 1649, 1649, 461, 1649, 461, 461, @@ -2306,7 +2305,7 @@ static const flex_int16_t yy_nxt[11709] = 1649, 928, 1649, 1649, 928, 928, 928, 928, 928, 928, 1649, 928, 928, 928, 928, 928, 928, 671, 1649, 1649, - 1649, 671, 1649, 671, 671, 376, 1649, 1649, 376, 1649, + 1649, 671, 1649, 671, 671, 376, 1649, 1649, 1649, 1649, 376, 1649, 376, 376, 1649, 1649, 376, 376, 376, 376, 1649, 376, 376, 376, 1649, 376, 376, 376, 997, 997, 997, 997, 997, 1649, 997, 997, 997, 997, 1649, 1649, @@ -2384,7 +2383,7 @@ static const flex_int16_t yy_nxt[11709] = 1649, 1389, 1389, 1389, 1389, 1389, 1395, 1649, 1395, 1649, 1649, 1395, 1395, 1649, 1395, 1395, 1649, 1649, 1649, 1395, - 1395, 1395, 1395, 1395, 376, 376, 376, 376, 376, 376, + 1395, 1395, 1395, 1395, 376, 376, 376, 1649, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 376, 1230, 1230, 1230, 1230, 1230, 1649, 1230, 1230, 1230, 1230, 1649, 1649, 1230, @@ -3346,7 +3345,7 @@ static const flex_int16_t yy_chk[11709] = 1667, 0, 0, 0, 1667, 0, 1667, 1667, 1668, 1668, 1668, 0, 1668, 0, 0, 1668, 0, 0, 1668, 1668, - 1668, 1668, 1668, 1669, 0, 0, 1669, 0, 1669, 0, + 1668, 1668, 1668, 1669, 0, 0, 0, 0, 1669, 0, 1669, 1669, 0, 0, 1669, 1669, 1669, 1669, 0, 1669, 1669, 1669, 0, 1669, 1669, 1669, 1670, 1670, 0, 1670, 1670, 1670, 1670, 1670, 1670, 1670, 1670, 1670, 1670, 1670, @@ -3406,7 +3405,7 @@ static const flex_int16_t yy_chk[11709] = 1701, 1701, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 0, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1704, 0, 1704, 0, 0, - 0, 1704, 0, 1704, 1704, 1705, 0, 0, 1705, 0, + 0, 1704, 0, 1704, 1704, 1705, 0, 0, 0, 0, 1705, 0, 1705, 1705, 0, 0, 1705, 1705, 1705, 1705, 0, 1705, 1705, 1705, 0, 1705, 1705, 1705, 1707, 1707, 0, 1707, 1707, 1707, 1707, 1707, 1707, 1707, 1707, 1707, @@ -3500,7 +3499,7 @@ static const flex_int16_t yy_chk[11709] = 0, 1757, 1757, 1759, 1759, 1759, 1759, 1759, 1759, 1759, 1759, 1759, 1759, 1759, 1759, 0, 1759, 1759, 1759, 1759, - 1759, 1759, 1759, 1759, 1759, 1759, 1760, 0, 0, 1760, + 1759, 1759, 1759, 1759, 1759, 1759, 1760, 0, 0, 0, 0, 1760, 0, 1760, 1760, 0, 0, 1760, 1760, 1760, 1760, 0, 1760, 1760, 1760, 0, 1760, 1760, 1760, 1763, 0, 0, 1763, 0, 0, 0, 1763, 0, 1763, 1763, @@ -3598,7 +3597,7 @@ static const flex_int16_t yy_chk[11709] = 0, 1810, 0, 0, 1810, 1810, 1810, 1810, 1810, 1810, 0, 1810, 1810, 1810, 1810, 1810, 1810, 1812, 0, 0, - 0, 1812, 0, 1812, 1812, 1813, 0, 0, 1813, 0, + 0, 1812, 0, 1812, 1812, 1813, 0, 0, 0, 0, 1813, 0, 1813, 1813, 0, 0, 1813, 1813, 1813, 1813, 0, 1813, 1813, 1813, 0, 1813, 1813, 1813, 1816, 1816, 1816, 1816, 1816, 0, 1816, 1816, 1816, 1816, 0, 0, @@ -3676,7 +3675,7 @@ static const flex_int16_t yy_chk[11709] = 0, 1852, 1852, 1852, 1852, 1852, 1853, 0, 1853, 0, 0, 1853, 1853, 0, 1853, 1853, 0, 0, 0, 1853, - 1853, 1853, 1853, 1853, 1854, 1854, 1854, 1854, 1854, 1854, + 1853, 1853, 1853, 1853, 1854, 1854, 1854, 0, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1854, 1857, 1857, 1857, 1857, 1857, 0, 1857, 1857, 1857, 1857, 0, 0, 1857, @@ -4022,10 +4021,10 @@ static wchar_t *unicode_ident(scanner_t *scn, const char *lex) return wlex; } -#line 4026 "lex.yy.c" +#line 4025 "lex.yy.c" #define YY_NO_INPUT 1 -#line 4029 "lex.yy.c" +#line 4028 "lex.yy.c" #define INITIAL 0 #define SPECIAL 1 @@ -4341,7 +4340,7 @@ YY_DECL #line 291 "parser.l" -#line 4345 "lex.yy.c" +#line 4344 "lex.yy.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -5982,23 +5981,15 @@ case 165: YY_RULE_SETUP #line 1253 "parser.l" { - yy_push_state(JLIT, yyscanner); - return yytext[0]; -} - YY_BREAK -case 166: -YY_RULE_SETUP -#line 1258 "parser.l" -{ internal_error("scanner processed input JMARKER state"); } YY_BREAK -case 167: +case 166: YY_RULE_SETUP -#line 1262 "parser.l" +#line 1257 "parser.l" ECHO; YY_BREAK -#line 6002 "lex.yy.c" +#line 5993 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SPECIAL): case YY_STATE_EOF(BRACED): @@ -7211,7 +7202,7 @@ void yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 1262 "parser.l" +#line 1257 "parser.l" static int directive_tok(scanner_t *yyscanner, int tok, int state) |