From 6920ae7ce5828a0221f4fa95fcc426858307d7a9 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 20 Apr 2014 23:44:54 -0400 Subject: quiet some warnings about intentionally ignored escape sequences i'm not planning on supporting switching character sets, so i don't really care about getting warnings about these escape sequences --- src/parser.c | 659 +++++++++++++++++++++++++++++++---------------------------- src/parser.l | 12 ++ 2 files changed, 360 insertions(+), 311 deletions(-) diff --git a/src/parser.c b/src/parser.c index e19e023..205b796 100644 --- a/src/parser.c +++ b/src/parser.c @@ -351,8 +351,8 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 49 -#define YY_END_OF_BUFFER 50 +#define YY_NUM_RULES 54 +#define YY_END_OF_BUFFER 55 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -360,234 +360,255 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[133] = +static yyconst flex_int16_t yy_accept[146] = { 0, - 0, 0, 50, 47, 1, 2, 3, 4, 5, 6, - 7, 40, 32, 48, 34, 35, 36, 45, 46, 12, - 13, 8, 9, 10, 38, 39, 11, 0, 0, 0, - 32, 0, 0, 0, 33, 35, 36, 41, 42, 37, - 37, 42, 42, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 0, 0, 0, 43, - 44, 44, 44, 44, 0, 0, 0, 0, 0, 0, - 0, 36, 37, 37, 37, 27, 28, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 37, 0, - 29, 0, 0, 0, 0, 30, 0, 0, 0, 0, - - 31, 0, 0, 0, 0, 0, 37, 37, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 23, 24, - 37, 0, 0, 0, 37, 37, 0, 37, 37, 0, - 37, 0 + 0, 0, 55, 52, 1, 2, 3, 4, 5, 6, + 7, 8, 45, 37, 53, 39, 40, 41, 50, 51, + 51, 51, 51, 51, 13, 14, 9, 10, 11, 43, + 44, 12, 0, 0, 0, 37, 0, 0, 0, 38, + 40, 41, 0, 33, 0, 34, 0, 35, 0, 36, + 46, 47, 42, 42, 47, 47, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 0, + 0, 0, 48, 49, 49, 49, 49, 0, 0, 0, + 0, 0, 0, 0, 41, 42, 42, 42, 28, 29, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 42, 0, 30, 0, 0, 0, 0, 31, 0, + 0, 0, 0, 32, 0, 0, 0, 0, 0, 42, + 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 24, 25, 42, 0, 0, 0, 42, 42, 0, + 42, 42, 0, 42, 0 } ; static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5, - 6, 7, 8, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 9, 1, 1, 1, - 1, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 11, 12, 13, - 14, 14, 14, 14, 15, 16, 14, 10, 17, 18, - 19, 20, 21, 10, 22, 23, 24, 25, 10, 10, - 10, 26, 10, 27, 28, 29, 30, 10, 10, 31, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 32, 10, 33, 10, 10, 10, 10, 10, 10, 10, - - 10, 10, 34, 35, 10, 10, 10, 36, 37, 10, - 10, 10, 10, 38, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 1, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, - - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 41, 41, 41, 41, 42, - 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, - 43, 43, 43, 43, 43 + 6, 7, 8, 1, 9, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 10, 1, 1, 1, + 1, 11, 11, 11, 11, 11, 11, 11, 11, 12, + 13, 14, 15, 11, 11, 11, 11, 16, 17, 18, + 19, 19, 19, 19, 20, 21, 19, 22, 23, 24, + 25, 26, 27, 22, 28, 29, 30, 31, 22, 22, + 22, 32, 22, 33, 34, 35, 36, 22, 22, 37, + 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, + 38, 22, 39, 22, 22, 22, 22, 22, 22, 22, + + 22, 22, 40, 41, 22, 22, 22, 42, 43, 22, + 22, 22, 22, 44, 22, 22, 22, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 1, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 46, 46, 46, 46, 46, 46, 46, 46, 46, + + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 46, 46, 46, 46, 46, 46, 46, + 46, 46, 46, 47, 47, 47, 47, 47, 47, 47, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 48, + 48, 48, 48, 48, 48, 48, 48, 49, 49, 49, + 49, 49, 49, 49, 49 } ; -static yyconst flex_int32_t yy_meta[44] = +static yyconst flex_int32_t yy_meta[50] = { 0, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, - 4, 4, 4, 4, 4, 4, 5, 6, 6, 3, - 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 5, 5, 3, 3, 7, 3, - 3, 3, 7 + 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, + 4, 3, 5, 6, 6, 3, 6, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 5, 5, 3, 3, 7, 8, 8, 8, 7 } ; -static yyconst flex_int16_t yy_base[147] = +static yyconst flex_int16_t yy_base[164] = { 0, - 0, 43, 318, 511, 511, 511, 511, 511, 511, 511, - 511, 86, 13, 511, 278, 277, 276, 511, 511, 511, - 511, 511, 511, 511, 128, 170, 511, 274, 273, 272, - 16, 271, 270, 257, 19, 256, 255, 511, 511, 0, - 511, 212, 244, 511, 511, 511, 511, 511, 511, 511, - 511, 511, 511, 511, 511, 511, 254, 253, 252, 511, - 511, 271, 270, 269, 246, 245, 244, 243, 242, 241, - 231, 230, 4, 45, 262, 511, 511, 228, 227, 24, - 27, 30, 226, 225, 224, 223, 288, 0, 9, 222, - 511, 33, 212, 170, 169, 511, 165, 165, 164, 163, - - 511, 266, 162, 161, 158, 157, 0, 15, 163, 316, - 156, 155, 154, 153, 151, 147, 334, 58, 511, 511, - 350, 86, 39, 24, 368, 166, 384, 400, 170, 416, - 0, 511, 454, 459, 465, 469, 472, 477, 482, 487, - 490, 493, 496, 498, 501, 504 + 0, 49, 359, 574, 574, 574, 574, 574, 574, 574, + 574, 574, 98, 14, 574, 313, 312, 311, 574, 574, + 0, 5, 10, 15, 574, 574, 574, 574, 574, 146, + 194, 574, 310, 309, 308, 17, 297, 296, 295, 20, + 294, 293, 20, 574, 25, 574, 58, 574, 63, 574, + 574, 574, 182, 574, 227, 256, 574, 574, 574, 574, + 574, 574, 574, 574, 574, 574, 574, 574, 574, 292, + 291, 290, 574, 574, 310, 309, 305, 282, 281, 279, + 270, 269, 268, 267, 266, 17, 190, 275, 574, 574, + 265, 262, 41, 189, 219, 261, 260, 258, 252, 302, + + 63, 66, 243, 574, 232, 242, 241, 218, 574, 236, + 208, 205, 204, 574, 283, 194, 188, 185, 184, 0, + 190, 258, 331, 183, 178, 173, 171, 163, 98, 350, + 195, 574, 574, 367, 47, 41, 40, 394, 200, 411, + 428, 277, 445, 0, 574, 488, 494, 500, 504, 508, + 512, 518, 524, 529, 534, 541, 548, 553, 556, 559, + 561, 564, 567 } ; -static yyconst flex_int16_t yy_def[147] = +static yyconst flex_int16_t yy_def[164] = { 0, - 133, 133, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 134, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 135, 132, 132, 132, 132, - 134, 132, 132, 132, 136, 132, 132, 132, 132, 25, - 132, 132, 42, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 137, 42, 42, 132, 132, 132, 132, 138, - 139, 140, 132, 132, 132, 132, 42, 132, 141, 132, - 132, 138, 132, 132, 132, 132, 139, 132, 132, 132, - - 132, 140, 132, 132, 132, 132, 87, 142, 143, 75, - 132, 132, 132, 132, 132, 132, 87, 144, 132, 132, - 75, 132, 132, 132, 87, 145, 87, 87, 146, 87, - 130, 0, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132 + 146, 146, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 147, 145, 145, 145, 145, 145, 145, + 148, 149, 150, 151, 145, 145, 145, 145, 145, 145, + 152, 145, 145, 145, 145, 147, 145, 145, 145, 153, + 145, 145, 148, 145, 149, 145, 150, 145, 151, 145, + 145, 145, 30, 145, 30, 55, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 154, 55, 55, 145, 145, + 145, 145, 155, 156, 157, 145, 145, 145, 145, 55, + + 145, 158, 145, 145, 155, 145, 145, 145, 145, 156, + 145, 145, 145, 145, 157, 145, 145, 145, 145, 100, + 159, 160, 88, 145, 145, 145, 145, 145, 145, 100, + 161, 145, 145, 55, 145, 145, 145, 100, 162, 100, + 100, 163, 55, 143, 0, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145 } ; -static yyconst flex_int16_t yy_nxt[555] = +static yyconst flex_int16_t yy_nxt[624] = { 0, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 132, - 109, 109, 109, 109, 109, 109, 73, 39, 39, 132, - 39, 88, 88, 132, 88, 91, 88, 88, 96, 88, - 132, 101, 88, 88, 91, 88, 132, 39, 14, 15, - 16, 17, 14, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 32, 33, 34, 32, 33, 34, 32, 33, - 34, 89, 102, 93, 94, 95, 98, 99, 100, 103, - 104, 105, 93, 94, 95, 88, 88, 97, 88, 53, - 54, 14, 15, 16, 17, 14, 18, 18, 18, 18, - 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, - - 20, 21, 19, 19, 22, 23, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 24, 19, 25, 26, 27, - 19, 19, 19, 19, 92, 28, 29, 30, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 39, 40, 40, - 40, 40, 40, 40, 41, 42, 42, 39, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 39, 52, 39, - 39, 39, 53, 54, 55, 56, 96, 57, 58, 59, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 118, - 62, 63, 64, 88, 88, 124, 88, 88, 88, 102, - 88, 123, 97, 122, 92, 61, 116, 119, 120, 115, - - 102, 114, 113, 97, 98, 99, 100, 112, 111, 65, - 66, 67, 38, 38, 38, 38, 38, 38, 38, 38, - 38, 39, 74, 74, 74, 74, 74, 74, 41, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 92, 57, 58, 59, 75, 75, 75, 75, 75, 75, - 39, 35, 19, 106, 61, 90, 39, 101, 35, 86, - 76, 77, 75, 75, 75, 75, 75, 75, 89, 35, - 85, 19, 84, 83, 61, 82, 81, 80, 76, 77, - 79, 78, 39, 72, 35, 71, 53, 54, 107, 107, - - 107, 107, 107, 107, 108, 103, 104, 105, 70, 35, - 69, 68, 19, 48, 37, 36, 35, 132, 132, 132, - 132, 132, 53, 54, 55, 56, 121, 121, 121, 121, - 121, 121, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 39, 39, 125, 125, 125, 125, 125, 125, - 126, 132, 132, 132, 132, 132, 132, 132, 132, 39, - 121, 121, 121, 121, 121, 121, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 39, 39, 125, 125, - 125, 125, 125, 125, 126, 132, 132, 132, 132, 132, - 132, 132, 132, 39, 128, 128, 128, 128, 128, 128, - - 129, 132, 132, 132, 132, 132, 132, 132, 132, 39, - 128, 128, 128, 128, 128, 128, 129, 132, 132, 132, - 132, 132, 132, 132, 132, 39, 131, 131, 131, 131, - 131, 131, 129, 132, 132, 132, 132, 132, 132, 132, - 132, 39, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 39, 13, 13, 13, 13, 13, 13, - 13, 31, 31, 31, 31, 61, 61, 61, 61, 61, - 61, 35, 35, 35, 35, 87, 132, 87, 92, 92, - 92, 92, 92, 97, 97, 97, 97, 97, 102, 102, - 102, 102, 102, 110, 132, 110, 117, 132, 117, 109, - - 109, 109, 132, 109, 127, 132, 127, 130, 132, 130, - 3, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132 + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 43, 43, 43, 43, 43, 45, 45, 45, 45, 45, + 47, 47, 47, 47, 47, 49, 49, 49, 49, 49, + 43, 43, 43, 43, 43, 45, 45, 45, 45, 45, + 101, 101, 104, 101, 15, 16, 17, 18, 15, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 37, + 38, 39, 37, 38, 39, 37, 38, 39, 47, 47, + 47, 47, 47, 49, 49, 49, 49, 49, 122, 122, + 122, 122, 122, 122, 115, 110, 106, 107, 108, 101, + 101, 105, 101, 15, 16, 17, 18, 15, 19, 19, + + 19, 19, 19, 19, 19, 19, 19, 19, 20, 21, + 22, 23, 24, 20, 20, 20, 20, 25, 26, 20, + 20, 20, 27, 28, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 29, 20, 30, 31, 32, 20, 20, + 20, 20, 137, 33, 34, 35, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 52, 52, 52, 52, + 52, 53, 53, 53, 53, 53, 53, 52, 54, 55, + 55, 52, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 52, 65, 52, 52, 52, 66, 67, 68, 69, + 109, 70, 71, 72, 73, 73, 73, 73, 73, 73, + + 73, 73, 73, 73, 86, 52, 52, 115, 52, 75, + 76, 77, 102, 101, 101, 136, 101, 110, 101, 101, + 114, 101, 135, 101, 101, 52, 101, 105, 74, 129, + 66, 67, 128, 104, 111, 112, 113, 109, 115, 78, + 79, 80, 87, 87, 87, 87, 87, 87, 127, 126, + 52, 52, 110, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 125, 52, 116, 117, 118, 52, 52, 52, + 52, 88, 88, 88, 88, 88, 88, 106, 107, 108, + 131, 111, 112, 113, 114, 124, 105, 52, 89, 90, + 88, 88, 88, 88, 88, 88, 40, 102, 132, 133, + + 101, 101, 20, 101, 119, 74, 103, 89, 90, 52, + 40, 99, 40, 98, 20, 66, 67, 120, 120, 120, + 120, 120, 120, 97, 121, 96, 74, 95, 116, 117, + 118, 94, 93, 61, 92, 91, 52, 85, 40, 84, + 83, 40, 66, 67, 68, 69, 134, 134, 134, 134, + 134, 134, 82, 81, 20, 42, 41, 40, 145, 145, + 145, 145, 145, 52, 52, 138, 138, 138, 138, 138, + 138, 145, 139, 145, 145, 145, 145, 145, 145, 145, + 145, 52, 134, 134, 134, 134, 134, 134, 145, 102, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 66, 67, 138, + 138, 138, 138, 138, 138, 145, 139, 145, 145, 145, + 145, 145, 145, 145, 145, 52, 141, 141, 141, 141, + 141, 141, 145, 142, 145, 145, 145, 145, 145, 145, + 145, 145, 52, 141, 141, 141, 141, 141, 141, 145, + 142, 145, 145, 145, 145, 145, 145, 145, 145, 52, + 144, 144, 144, 144, 144, 144, 145, 142, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 66, 67, 68, 14, 14, + 14, 14, 14, 14, 14, 14, 36, 36, 36, 36, + + 145, 36, 44, 44, 44, 44, 46, 46, 46, 46, + 48, 48, 48, 48, 50, 50, 50, 50, 74, 74, + 74, 74, 74, 74, 145, 74, 40, 40, 40, 40, + 145, 40, 100, 145, 100, 105, 105, 105, 105, 105, + 145, 105, 110, 110, 110, 110, 110, 145, 110, 115, + 115, 115, 115, 115, 145, 115, 123, 145, 123, 130, + 145, 130, 122, 122, 122, 145, 122, 140, 145, 140, + 143, 145, 143, 3, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145 } ; -static yyconst flex_int16_t yy_chk[555] = +static yyconst flex_int16_t yy_chk[624] = { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 88, 88, 88, 88, 88, 88, 40, 40, 40, 0, - 40, 73, 73, 0, 73, 80, 89, 89, 81, 89, - 0, 82, 108, 108, 92, 108, 0, 40, 1, 1, - 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 13, 13, 13, 31, 31, 31, 35, 35, - 35, 74, 124, 80, 80, 80, 81, 81, 81, 82, - 82, 82, 92, 92, 92, 118, 118, 123, 118, 74, - 74, 2, 2, 2, 2, 2, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 12, 12, 122, 12, 12, 12, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 97, 25, 25, 25, - 26, 26, 26, 26, 26, 26, 26, 26, 26, 109, - 26, 26, 26, 126, 126, 116, 126, 129, 129, 115, - 129, 114, 113, 112, 111, 106, 105, 109, 109, 104, - - 103, 100, 99, 98, 97, 97, 97, 95, 94, 26, - 26, 26, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 93, 42, 42, 42, 43, 43, 43, 43, 43, 43, - 90, 86, 85, 84, 83, 79, 78, 102, 72, 71, - 43, 43, 75, 75, 75, 75, 75, 75, 75, 70, - 69, 68, 67, 66, 65, 64, 63, 62, 75, 75, - 59, 58, 57, 37, 36, 34, 75, 75, 87, 87, - - 87, 87, 87, 87, 87, 102, 102, 102, 33, 32, - 30, 29, 28, 87, 17, 16, 15, 3, 0, 0, - 0, 0, 87, 87, 87, 87, 110, 110, 110, 110, - 110, 110, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 110, 110, 117, 117, 117, 117, 117, 117, - 117, 0, 0, 0, 0, 0, 0, 0, 0, 117, - 121, 121, 121, 121, 121, 121, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 121, 121, 125, 125, - 125, 125, 125, 125, 125, 0, 0, 0, 0, 0, - 0, 0, 0, 125, 127, 127, 127, 127, 127, 127, - - 127, 0, 0, 0, 0, 0, 0, 0, 0, 127, - 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, - 0, 0, 0, 0, 0, 128, 130, 130, 130, 130, - 130, 130, 130, 0, 0, 0, 0, 0, 0, 0, - 0, 130, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 130, 133, 133, 133, 133, 133, 133, - 133, 134, 134, 134, 134, 135, 135, 135, 135, 135, - 135, 136, 136, 136, 136, 137, 0, 137, 138, 138, - 138, 138, 138, 139, 139, 139, 139, 139, 140, 140, - 140, 140, 140, 141, 0, 141, 142, 0, 142, 143, - - 143, 144, 0, 144, 145, 0, 145, 146, 0, 146, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132, 132, 132, 132, 132, 132, 132, - 132, 132, 132, 132 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, + 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, + 43, 43, 43, 43, 43, 45, 45, 45, 45, 45, + 86, 86, 93, 86, 1, 1, 1, 1, 1, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 14, + 14, 14, 36, 36, 36, 40, 40, 40, 47, 47, + 47, 47, 47, 49, 49, 49, 49, 49, 101, 101, + 101, 101, 101, 101, 137, 136, 93, 93, 93, 102, + 102, 135, 102, 2, 2, 2, 2, 2, 13, 13, + + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 129, 13, 13, 13, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, + 94, 30, 30, 30, 31, 31, 31, 31, 31, 31, + + 31, 31, 31, 31, 53, 53, 53, 128, 53, 31, + 31, 31, 87, 121, 121, 127, 121, 126, 131, 131, + 95, 131, 125, 139, 139, 53, 139, 124, 119, 118, + 87, 87, 117, 105, 94, 94, 94, 110, 116, 31, + 31, 31, 55, 55, 55, 55, 55, 55, 113, 112, + 55, 55, 111, 55, 55, 55, 55, 55, 55, 55, + 55, 55, 108, 55, 95, 95, 95, 55, 55, 55, + 55, 56, 56, 56, 56, 56, 56, 105, 105, 105, + 122, 110, 110, 110, 115, 107, 106, 103, 56, 56, + 88, 88, 88, 88, 88, 88, 99, 88, 122, 122, + + 142, 142, 98, 142, 97, 96, 92, 88, 88, 91, + 85, 84, 83, 82, 81, 88, 88, 100, 100, 100, + 100, 100, 100, 80, 100, 79, 78, 77, 115, 115, + 115, 76, 75, 100, 72, 71, 70, 42, 41, 39, + 38, 37, 100, 100, 100, 100, 123, 123, 123, 123, + 123, 123, 35, 34, 33, 18, 17, 16, 3, 0, + 0, 0, 0, 123, 123, 130, 130, 130, 130, 130, + 130, 0, 130, 0, 0, 0, 0, 0, 0, 0, + 0, 130, 134, 134, 134, 134, 134, 134, 0, 134, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 134, 134, 138, + 138, 138, 138, 138, 138, 0, 138, 0, 0, 0, + 0, 0, 0, 0, 0, 138, 140, 140, 140, 140, + 140, 140, 0, 140, 0, 0, 0, 0, 0, 0, + 0, 0, 140, 141, 141, 141, 141, 141, 141, 0, + 141, 0, 0, 0, 0, 0, 0, 0, 0, 141, + 143, 143, 143, 143, 143, 143, 0, 143, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 143, 143, 143, 146, 146, + 146, 146, 146, 146, 146, 146, 147, 147, 147, 147, + + 0, 147, 148, 148, 148, 148, 149, 149, 149, 149, + 150, 150, 150, 150, 151, 151, 151, 151, 152, 152, + 152, 152, 152, 152, 0, 152, 153, 153, 153, 153, + 0, 153, 154, 0, 154, 155, 155, 155, 155, 155, + 0, 155, 156, 156, 156, 156, 156, 0, 156, 157, + 157, 157, 157, 157, 0, 157, 158, 0, 158, 159, + 0, 159, 160, 160, 161, 0, 161, 162, 0, 162, + 163, 0, 163, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, + 145, 145, 145 } ; /* The intent behind this definition is that it'll catch @@ -607,7 +628,7 @@ static yyconst flex_int16_t yy_chk[555] = #define YY_EXIT_FAILURE (UNUSED(yyscanner), 2) #define YY_NO_INPUT 1 -#line 73 "src/parser.l" +#line 79 "src/parser.l" static void runes_parser_handle_bel(RunesTerm *t); static void runes_parser_handle_bs(RunesTerm *t); static void runes_parser_handle_tab(RunesTerm *t); @@ -643,7 +664,7 @@ static void runes_parser_handle_osc1(RunesTerm *t, char *buf, size_t len); static void runes_parser_handle_osc2(RunesTerm *t, char *buf, size_t len); static void runes_parser_handle_ascii(RunesTerm *t, char *text, size_t len); static void runes_parser_handle_text(RunesTerm *t, char *text, size_t len); -#line 647 "src/parser.c" +#line 668 "src/parser.c" #define INITIAL 0 @@ -891,10 +912,10 @@ YY_DECL } { -#line 110 "src/parser.l" +#line 116 "src/parser.l" -#line 898 "src/parser.c" +#line 919 "src/parser.c" while ( 1 ) /* loops until end-of-file is reached */ { @@ -921,13 +942,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 133 ) + if ( yy_current_state >= 146 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 132 ); + while ( yy_current_state != 145 ); yy_cp = yyg->yy_last_accepting_cpos; yy_current_state = yyg->yy_last_accepting_state; @@ -949,191 +970,207 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 112 "src/parser.l" +#line 118 "src/parser.l" runes_parser_handle_bel(yyextra); return -1; YY_BREAK case 2: YY_RULE_SETUP -#line 113 "src/parser.l" +#line 119 "src/parser.l" runes_parser_handle_bs(yyextra); return -1; YY_BREAK case 3: YY_RULE_SETUP -#line 114 "src/parser.l" +#line 120 "src/parser.l" runes_parser_handle_tab(yyextra); return -1; YY_BREAK case 4: /* rule 4 can match eol */ -#line 116 "src/parser.l" +#line 122 "src/parser.l" case 5: /* rule 5 can match eol */ -#line 117 "src/parser.l" +#line 123 "src/parser.l" case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 117 "src/parser.l" +#line 123 "src/parser.l" runes_parser_handle_lf(yyextra); return -1; YY_BREAK case 7: YY_RULE_SETUP -#line 118 "src/parser.l" +#line 124 "src/parser.l" runes_parser_handle_cr(yyextra); return -1; YY_BREAK case 8: YY_RULE_SETUP -#line 120 "src/parser.l" -runes_parser_handle_deckpam(yyextra); return -1; +#line 125 "src/parser.l" +return -1; YY_BREAK case 9: YY_RULE_SETUP -#line 121 "src/parser.l" -runes_parser_handle_deckpnm(yyextra); return -1; +#line 127 "src/parser.l" +runes_parser_handle_deckpam(yyextra); return -1; YY_BREAK case 10: YY_RULE_SETUP -#line 122 "src/parser.l" -runes_parser_handle_ri(yyextra); return -1; +#line 128 "src/parser.l" +runes_parser_handle_deckpnm(yyextra); return -1; YY_BREAK case 11: YY_RULE_SETUP -#line 123 "src/parser.l" -runes_parser_handle_vb(yyextra); return -1; +#line 129 "src/parser.l" +runes_parser_handle_ri(yyextra); return -1; YY_BREAK case 12: YY_RULE_SETUP -#line 124 "src/parser.l" -runes_parser_handle_decsc(yyextra); return -1; +#line 130 "src/parser.l" +runes_parser_handle_vb(yyextra); return -1; YY_BREAK case 13: YY_RULE_SETUP -#line 125 "src/parser.l" -runes_parser_handle_decrc(yyextra); return -1; +#line 131 "src/parser.l" +runes_parser_handle_decsc(yyextra); return -1; YY_BREAK case 14: YY_RULE_SETUP -#line 127 "src/parser.l" -runes_parser_handle_cuu(yyextra, yytext, yyleng); return -1; +#line 132 "src/parser.l" +runes_parser_handle_decrc(yyextra); return -1; YY_BREAK case 15: YY_RULE_SETUP -#line 128 "src/parser.l" -runes_parser_handle_cud(yyextra, yytext, yyleng); return -1; +#line 134 "src/parser.l" +runes_parser_handle_cuu(yyextra, yytext, yyleng); return -1; YY_BREAK case 16: YY_RULE_SETUP -#line 129 "src/parser.l" -runes_parser_handle_cuf(yyextra, yytext, yyleng); return -1; +#line 135 "src/parser.l" +runes_parser_handle_cud(yyextra, yytext, yyleng); return -1; YY_BREAK case 17: YY_RULE_SETUP -#line 130 "src/parser.l" -runes_parser_handle_cub(yyextra, yytext, yyleng); return -1; +#line 136 "src/parser.l" +runes_parser_handle_cuf(yyextra, yytext, yyleng); return -1; YY_BREAK case 18: YY_RULE_SETUP -#line 131 "src/parser.l" -runes_parser_handle_cup(yyextra, yytext, yyleng); return -1; +#line 137 "src/parser.l" +runes_parser_handle_cub(yyextra, yytext, yyleng); return -1; YY_BREAK case 19: YY_RULE_SETUP -#line 132 "src/parser.l" -runes_parser_handle_ed(yyextra, yytext, yyleng); return -1; +#line 138 "src/parser.l" +runes_parser_handle_cup(yyextra, yytext, yyleng); return -1; YY_BREAK case 20: YY_RULE_SETUP -#line 133 "src/parser.l" -runes_parser_handle_el(yyextra, yytext, yyleng); return -1; +#line 139 "src/parser.l" +runes_parser_handle_ed(yyextra, yytext, yyleng); return -1; YY_BREAK case 21: YY_RULE_SETUP -#line 134 "src/parser.l" -runes_parser_handle_il(yyextra, yytext, yyleng); return -1; +#line 140 "src/parser.l" +runes_parser_handle_el(yyextra, yytext, yyleng); return -1; YY_BREAK case 22: YY_RULE_SETUP -#line 135 "src/parser.l" -runes_parser_handle_dch(yyextra, yytext, yyleng); return -1; +#line 141 "src/parser.l" +runes_parser_handle_il(yyextra, yytext, yyleng); return -1; YY_BREAK case 23: YY_RULE_SETUP -#line 136 "src/parser.l" -runes_parser_handle_sm(yyextra, yytext, yyleng); return -1; +#line 142 "src/parser.l" +runes_parser_handle_dch(yyextra, yytext, yyleng); return -1; YY_BREAK case 24: YY_RULE_SETUP -#line 137 "src/parser.l" -runes_parser_handle_rm(yyextra, yytext, yyleng); return -1; +#line 143 "src/parser.l" +runes_parser_handle_sm(yyextra, yytext, yyleng); return -1; YY_BREAK case 25: YY_RULE_SETUP -#line 138 "src/parser.l" -runes_parser_handle_sgr(yyextra, yytext, yyleng); return -1; +#line 144 "src/parser.l" +runes_parser_handle_rm(yyextra, yytext, yyleng); return -1; YY_BREAK case 26: YY_RULE_SETUP -#line 139 "src/parser.l" -runes_parser_handle_csr(yyextra, yytext, yyleng); return -1; +#line 145 "src/parser.l" +runes_parser_handle_sgr(yyextra, yytext, yyleng); return -1; YY_BREAK case 27: YY_RULE_SETUP -#line 141 "src/parser.l" -runes_parser_handle_decsed(yyextra, yytext, yyleng); return -1; +#line 146 "src/parser.l" +runes_parser_handle_csr(yyextra, yytext, yyleng); return -1; YY_BREAK case 28: YY_RULE_SETUP -#line 142 "src/parser.l" -runes_parser_handle_decsel(yyextra, yytext, yyleng); return -1; +#line 148 "src/parser.l" +runes_parser_handle_decsed(yyextra, yytext, yyleng); return -1; YY_BREAK case 29: YY_RULE_SETUP -#line 144 "src/parser.l" -runes_parser_handle_osc0(yyextra, yytext, yyleng); return -1; +#line 149 "src/parser.l" +runes_parser_handle_decsel(yyextra, yytext, yyleng); return -1; YY_BREAK case 30: YY_RULE_SETUP -#line 145 "src/parser.l" -runes_parser_handle_osc1(yyextra, yytext, yyleng); return -1; +#line 151 "src/parser.l" +runes_parser_handle_osc0(yyextra, yytext, yyleng); return -1; YY_BREAK case 31: YY_RULE_SETUP -#line 146 "src/parser.l" -runes_parser_handle_osc2(yyextra, yytext, yyleng); return -1; +#line 152 "src/parser.l" +runes_parser_handle_osc1(yyextra, yytext, yyleng); return -1; YY_BREAK case 32: YY_RULE_SETUP -#line 148 "src/parser.l" -runes_parser_handle_ascii(yyextra, yytext, yyleng); return -1; +#line 153 "src/parser.l" +runes_parser_handle_osc2(yyextra, yytext, yyleng); return -1; YY_BREAK case 33: -YY_RULE_SETUP -#line 149 "src/parser.l" -runes_parser_handle_text(yyextra, yytext, yyleng); return -1; - YY_BREAK +#line 156 "src/parser.l" case 34: -#line 152 "src/parser.l" +#line 157 "src/parser.l" case 35: -#line 153 "src/parser.l" +#line 158 "src/parser.l" case 36: -#line 154 "src/parser.l" +YY_RULE_SETUP +#line 158 "src/parser.l" +return -1; + YY_BREAK case 37: -#line 155 "src/parser.l" +YY_RULE_SETUP +#line 160 "src/parser.l" +runes_parser_handle_ascii(yyextra, yytext, yyleng); return -1; + YY_BREAK case 38: -#line 156 "src/parser.l" +YY_RULE_SETUP +#line 161 "src/parser.l" +runes_parser_handle_text(yyextra, yytext, yyleng); return -1; + YY_BREAK case 39: -#line 157 "src/parser.l" +#line 164 "src/parser.l" case 40: +#line 165 "src/parser.l" +case 41: +#line 166 "src/parser.l" +case 42: +#line 167 "src/parser.l" +case 43: +#line 168 "src/parser.l" +case 44: +#line 169 "src/parser.l" +case 45: YY_RULE_SETUP -#line 157 "src/parser.l" +#line 169 "src/parser.l" return yyleng; YY_BREAK case YY_STATE_EOF(INITIAL): -#line 159 "src/parser.l" +#line 171 "src/parser.l" return 0; YY_BREAK -case 41: -/* rule 41 can match eol */ +case 46: +/* rule 46 can match eol */ YY_RULE_SETUP -#line 161 "src/parser.l" +#line 173 "src/parser.l" { fprintf( stderr, "unhandled CSI sequence: \\033%*s\\%hho\n", @@ -1141,9 +1178,9 @@ YY_RULE_SETUP return -1; } YY_BREAK -case 42: +case 47: YY_RULE_SETUP -#line 168 "src/parser.l" +#line 180 "src/parser.l" { fprintf( stderr, "unhandled CSI sequence: \\033%*s\n", @@ -1151,10 +1188,10 @@ YY_RULE_SETUP return -1; } YY_BREAK -case 43: -/* rule 43 can match eol */ +case 48: +/* rule 48 can match eol */ YY_RULE_SETUP -#line 175 "src/parser.l" +#line 187 "src/parser.l" { fprintf( stderr, "unhandled OSC sequence: \\033%*s\\%hho\n", @@ -1162,9 +1199,9 @@ YY_RULE_SETUP return -1; } YY_BREAK -case 44: +case 49: YY_RULE_SETUP -#line 182 "src/parser.l" +#line 194 "src/parser.l" { fprintf( stderr, "unhandled OSC sequence: \\033%*s\n", @@ -1172,18 +1209,18 @@ YY_RULE_SETUP return -1; } YY_BREAK -case 45: -/* rule 45 can match eol */ +case 50: +/* rule 50 can match eol */ YY_RULE_SETUP -#line 189 "src/parser.l" +#line 201 "src/parser.l" { fprintf(stderr, "unhandled escape sequence: \\%hho\n", yytext[1]); return -1; } YY_BREAK -case 46: +case 51: YY_RULE_SETUP -#line 194 "src/parser.l" +#line 206 "src/parser.l" { fprintf( stderr, "unhandled escape sequence: %*s\n", @@ -1191,29 +1228,29 @@ YY_RULE_SETUP return -1; } YY_BREAK -case 47: -/* rule 47 can match eol */ +case 52: +/* rule 52 can match eol */ YY_RULE_SETUP -#line 201 "src/parser.l" +#line 213 "src/parser.l" { fprintf(stderr, "unhandled control character: \\%hho\n", yytext[0]); return -1; } YY_BREAK -case 48: +case 53: YY_RULE_SETUP -#line 206 "src/parser.l" +#line 218 "src/parser.l" { fprintf(stderr, "invalid utf8 byte: \\%hho\n", yytext[0]); return -1; } YY_BREAK -case 49: +case 54: YY_RULE_SETUP -#line 211 "src/parser.l" +#line 223 "src/parser.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1217 "src/parser.c" +#line 1254 "src/parser.c" case YY_END_OF_BUFFER: { @@ -1507,7 +1544,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 133 ) + if ( yy_current_state >= 146 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1536,11 +1573,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 133 ) + if ( yy_current_state >= 146 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 132); + yy_is_jam = (yy_current_state == 145); (void)yyg; return yy_is_jam ? 0 : yy_current_state; @@ -2305,7 +2342,7 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 211 "src/parser.l" +#line 223 "src/parser.l" diff --git a/src/parser.l b/src/parser.l index a4c4ced..c8a20ab 100644 --- a/src/parser.l +++ b/src/parser.l @@ -30,6 +30,7 @@ LF \012 VT \013 FF \014 CR \015 +SI \017 ESC \033 DECKPAM {ESC}= @@ -69,6 +70,11 @@ OSC0 {OSC}0;{CHAR}*{ST} OSC1 {OSC}1;{CHAR}*{ST} OSC2 {OSC}2;{CHAR}*{ST} +GZD4 {ESC}\([\040-\057]*[\060-\176] +G1D4 {ESC}\)[\040-\057]*[\060-\176] +G2D4 {ESC}\*[\040-\057]*[\060-\176] +G3D4 {ESC}\+[\040-\057]*[\060-\176] + %{ static void runes_parser_handle_bel(RunesTerm *t); static void runes_parser_handle_bs(RunesTerm *t); @@ -116,6 +122,7 @@ static void runes_parser_handle_text(RunesTerm *t, char *text, size_t len); {VT} | {FF} runes_parser_handle_lf(yyextra); return -1; {CR} runes_parser_handle_cr(yyextra); return -1; +{SI} return -1; {DECKPAM} runes_parser_handle_deckpam(yyextra); return -1; {DECKPNM} runes_parser_handle_deckpnm(yyextra); return -1; @@ -145,6 +152,11 @@ static void runes_parser_handle_text(RunesTerm *t, char *text, size_t len); {OSC1} runes_parser_handle_osc1(yyextra, yytext, yyleng); return -1; {OSC2} runes_parser_handle_osc2(yyextra, yytext, yyleng); return -1; +{GZD4} | +{G1D4} | +{G2D4} | +{G3D4} return -1; + {ASCII}+ runes_parser_handle_ascii(yyextra, yytext, yyleng); return -1; {CHAR}+ runes_parser_handle_text(yyextra, yytext, yyleng); return -1; -- cgit v1.2.3-54-g00ecf