X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/b9f22ab5a7f4d4bfe0932debf8864a21b5c852cd..4c9cb9b99991c36920bd17e366e2128d1b22eb6e:/src/lexer.c?ds=sidebyside diff --git a/src/lexer.c b/src/lexer.c index 2663aee..1e4dccb 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -284,71 +284,65 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 62 -#define YY_END_OF_BUFFER 63 -static yyconst short int yy_acclist[293] = +#define YY_NUM_RULES 58 +#define YY_END_OF_BUFFER 59 +static yyconst short int yy_acclist[269] = { 0, - 63, 61, 62, 60, 61, 62, 1, 60, 62, 61, - 62, 61, 62, 61, 62, 11, 61, 62, 1, 62, - 11, 61, 62, 26, 61, 62, 1, 27, 62, 20, - 26, 61, 62, 26, 61, 62, 26, 61, 62, 26, - 61, 62, 24, 26, 61, 62, 25, 26, 61, 62, - 26, 61, 62, 23, 61, 62, 22, 23, 61, 62, - 23, 61, 62, 61, 62, 61, 62, 56, 61, 62, - 56, 61, 62, 57, 61, 62, 61, 62, 61, 62, - 54, 61, 62, 54, 61, 62, 56, 61, 62, 56, - 61, 62, 56, 61, 62, 56, 61, 62, 56, 61, - - 62, 56, 61, 62, 56, 61, 62, 56, 61, 62, - 56, 61, 62, 56, 61, 62, 56, 61, 62, 56, - 61, 62, 56, 61, 62, 56, 61, 62, 58, 61, - 62, 59, 61, 62, 6, 13, 10, 7, 19, 14, - 21, 8, 56, 55, 56, 54, 9, 54, 54, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 2, 12, 15, 17, 3, 4, 55, 56, 54, 5, - 54, 54, 56, 56, 56, 56, 56, 56, 56, 38, - 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - - 56, 56, 56, 56, 56, 56, 16, 18, 29, 56, - 56, 41, 56, 56, 56, 33, 56, 56, 56, 47, - 56, 36, 56, 51, 56, 56, 56, 56, 56, 56, - 56, 56, 52, 56, 56, 56, 56, 30, 56, 28, - 56, 50, 56, 56, 48, 56, 39, 56, 56, 56, - 56, 56, 37, 56, 56, 56, 56, 32, 56, 56, - 56, 56, 40, 56, 56, 56, 56, 42, 56, 46, - 56, 34, 56, 31, 56, 56, 56, 56, 53, 56, - 56, 43, 56, 56, 45, 56, 44, 56, 49, 56, - 35, 56 - + 59, 57, 58, 56, 57, 58, 1, 56, 58, 57, + 58, 57, 58, 57, 58, 11, 57, 58, 1, 12, + 58, 11, 57, 58, 27, 57, 58, 1, 28, 58, + 21, 27, 57, 58, 27, 57, 58, 27, 57, 58, + 27, 57, 58, 25, 27, 57, 58, 26, 27, 57, + 58, 27, 57, 58, 24, 57, 58, 1, 58, 23, + 24, 57, 58, 24, 57, 58, 57, 58, 57, 58, + 52, 57, 58, 52, 57, 58, 53, 57, 58, 57, + 58, 57, 58, 50, 57, 58, 50, 57, 58, 52, + 57, 58, 52, 57, 58, 52, 57, 58, 52, 57, + + 58, 52, 57, 58, 52, 57, 58, 52, 57, 58, + 52, 57, 58, 52, 57, 58, 52, 57, 58, 52, + 57, 58, 52, 57, 58, 54, 57, 58, 55, 57, + 58, 6, 14, 10, 7, 20, 15, 22, 8, 52, + 51, 52, 50, 9, 50, 50, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 2, 13, 16, 18, 3, 4, 51, + 52, 50, 5, 50, 50, 52, 52, 52, 52, 52, + 39, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 17, 19, 30, 52, 52, 42, + + 52, 52, 34, 52, 52, 37, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 31, 52, 29, + 52, 52, 40, 52, 52, 52, 52, 52, 38, 52, + 52, 52, 52, 33, 52, 52, 52, 52, 41, 52, + 52, 52, 52, 43, 52, 47, 52, 35, 52, 32, + 52, 52, 52, 52, 49, 52, 52, 44, 52, 52, + 46, 52, 45, 52, 48, 52, 36, 52 } ; -static yyconst short int yy_accept[217] = +static yyconst short int yy_accept[200] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 7, 10, 12, 14, 16, - 19, 21, 24, 27, 30, 34, 37, 40, 43, 47, - 51, 54, 57, 61, 64, 66, 68, 71, 74, 77, - 79, 81, 84, 87, 90, 93, 96, 99, 102, 105, - 108, 111, 114, 117, 120, 123, 126, 129, 132, 135, - 136, 136, 136, 136, 137, 138, 138, 138, 138, 139, - 139, 140, 141, 142, 143, 143, 143, 144, 145, 146, - 147, 148, 148, 148, 149, 149, 149, 150, 151, 152, - 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, - - 163, 164, 165, 166, 167, 168, 169, 170, 171, 171, - 172, 172, 173, 173, 173, 174, 175, 175, 176, 176, - 177, 177, 178, 179, 180, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 207, 208, 209, 211, 212, 214, 215, 216, - 218, 219, 220, 222, 224, 226, 227, 228, 229, 230, - 231, 232, 233, 235, 236, 237, 238, 240, 241, 242, - 244, 245, 247, 249, 250, 251, 252, 253, 255, 256, - 257, 258, 260, 261, 262, 263, 265, 266, 267, 268, - - 270, 272, 274, 276, 277, 278, 279, 281, 282, 284, - 285, 287, 289, 291, 293, 293 + 19, 22, 25, 28, 31, 35, 38, 41, 44, 48, + 52, 55, 58, 60, 64, 67, 69, 71, 74, 77, + 80, 82, 84, 87, 90, 93, 96, 99, 102, 105, + 108, 111, 114, 117, 120, 123, 126, 129, 132, 133, + 133, 133, 133, 134, 135, 135, 135, 135, 136, 136, + 137, 138, 139, 140, 140, 140, 141, 142, 143, 144, + 145, 145, 145, 146, 146, 146, 147, 148, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, + + 161, 162, 163, 164, 164, 165, 165, 166, 166, 166, + 167, 168, 168, 169, 169, 170, 170, 171, 172, 173, + 173, 174, 175, 176, 177, 178, 179, 180, 181, 183, + 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, + 194, 195, 195, 196, 197, 199, 200, 202, 203, 205, + 206, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 220, 221, 222, 223, 225, 226, 227, 228, + 229, 231, 232, 233, 234, 236, 237, 238, 239, 241, + 242, 243, 244, 246, 248, 250, 252, 253, 254, 255, + 257, 258, 260, 261, 263, 265, 267, 269, 269 + } ; static yyconst int yy_ec[256] = @@ -364,9 +358,9 @@ static yyconst int yy_ec[256] = 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 1, 16, 1, 1, 15, 1, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 15, 26, 27, 28, 29, - 30, 31, 15, 32, 33, 34, 35, 36, 15, 37, - 38, 15, 39, 1, 40, 1, 1, 1, 1, 1, + 21, 22, 23, 24, 25, 15, 15, 26, 27, 28, + 29, 30, 15, 31, 32, 33, 34, 35, 15, 36, + 15, 15, 37, 1, 38, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -383,196 +377,180 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[41] = +static yyconst int yy_meta[39] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 3, 3, 3, 4, 5, 6, 1, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 1, 1 + 6, 6, 6, 6, 6, 6, 1, 1 } ; -static yyconst short int yy_base[231] = +static yyconst short int yy_base[214] = { 0, - 0, 2, 3, 5, 19, 57, 10, 13, 97, 0, - 137, 0, 491, 492, 492, 492, 11, 463, 0, 492, - 492, 480, 492, 492, 492, 11, 23, 0, 492, 492, - 448, 492, 492, 0, 24, 0, 474, 2, 492, 26, - 33, 33, 44, 33, 40, 44, 54, 55, 56, 58, - 59, 165, 167, 166, 168, 63, 65, 492, 492, 492, - 483, 468, 445, 492, 492, 8, 477, 476, 492, 478, - 492, 492, 492, 492, 477, 466, 465, 464, 173, 172, - 492, 473, 177, 185, 197, 0, 202, 64, 198, 185, - 191, 203, 204, 205, 208, 209, 66, 68, 210, 211, - - 73, 212, 214, 215, 217, 219, 227, 220, 472, 492, - 441, 492, 467, 466, 492, 492, 468, 492, 467, 492, - 456, 455, 230, 239, 464, 492, 243, 0, 233, 243, - 244, 247, 248, 249, 253, 453, 251, 254, 256, 258, - 259, 260, 261, 265, 266, 267, 268, 271, 273, 274, - 172, 432, 492, 492, 451, 279, 450, 280, 286, 449, - 281, 287, 448, 447, 446, 290, 291, 292, 299, 297, - 312, 298, 445, 301, 303, 305, 444, 492, 306, 443, - 307, 442, 441, 319, 321, 322, 323, 439, 324, 325, - 326, 395, 328, 330, 335, 389, 331, 339, 337, 362, - - 361, 360, 358, 340, 341, 342, 356, 349, 354, 352, - 353, 216, 71, 36, 492, 376, 382, 388, 394, 400, - 406, 408, 412, 418, 424, 430, 434, 438, 444, 448 + 0, 2, 3, 5, 19, 55, 10, 13, 93, 0, + 124, 0, 434, 435, 435, 435, 11, 407, 0, 435, + 435, 423, 435, 435, 435, 11, 23, 0, 435, 435, + 393, 435, 435, 435, 0, 24, 0, 417, 21, 435, + 28, 34, 34, 43, 34, 49, 37, 50, 54, 55, + 56, 129, 134, 127, 59, 61, 435, 435, 435, 426, + 411, 390, 435, 435, 38, 420, 419, 435, 421, 435, + 435, 435, 435, 420, 409, 408, 407, 126, 159, 435, + 416, 162, 167, 172, 0, 177, 66, 64, 2, 163, + 173, 168, 135, 177, 178, 179, 182, 180, 183, 181, + + 190, 192, 194, 415, 435, 385, 435, 410, 409, 435, + 435, 411, 435, 410, 435, 399, 398, 197, 206, 407, + 435, 215, 0, 195, 200, 215, 207, 71, 395, 198, + 201, 217, 222, 223, 224, 225, 226, 227, 229, 228, + 230, 332, 435, 435, 345, 231, 318, 233, 317, 232, + 316, 238, 239, 249, 250, 234, 251, 258, 260, 261, + 263, 315, 435, 265, 266, 314, 267, 268, 269, 270, + 313, 272, 279, 277, 312, 278, 287, 281, 311, 282, + 288, 290, 308, 307, 306, 304, 294, 292, 299, 154, + 301, 153, 303, 125, 124, 78, 69, 435, 332, 338, + + 344, 350, 356, 362, 364, 368, 374, 380, 386, 390, + 394, 400, 404 } ; -static yyconst short int yy_def[231] = +static yyconst short int yy_def[214] = { 0, - 216, 216, 217, 217, 218, 218, 219, 219, 215, 9, - 215, 11, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215, 215, 215, 215, 215, 215, 220, 215, 215, - 215, 215, 215, 221, 215, 222, 223, 223, 215, 215, - 215, 215, 215, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 215, 215, 215, - 224, 215, 215, 215, 215, 215, 215, 215, 215, 225, - 215, 215, 215, 215, 226, 227, 223, 228, 223, 215, - 215, 229, 215, 215, 215, 230, 215, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - - 223, 223, 223, 223, 223, 223, 223, 223, 224, 215, - 215, 215, 215, 215, 215, 215, 225, 215, 226, 215, - 227, 228, 223, 215, 229, 215, 215, 230, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 215, 215, 215, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 215, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - - 223, 223, 223, 223, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 0, 215, 215, 215, 215, 215, - 215, 215, 215, 215, 215, 215, 215, 215, 215, 215 + 199, 199, 200, 200, 201, 201, 202, 202, 198, 9, + 9, 11, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 203, 198, 198, + 198, 198, 198, 198, 204, 198, 205, 206, 206, 198, + 198, 198, 198, 198, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 198, 198, 198, 207, + 198, 198, 198, 198, 198, 198, 198, 198, 208, 198, + 198, 198, 198, 209, 210, 206, 211, 206, 198, 198, + 212, 198, 198, 198, 213, 198, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + + 206, 206, 206, 207, 198, 198, 198, 198, 198, 198, + 198, 208, 198, 209, 198, 210, 211, 206, 198, 212, + 198, 198, 213, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 198, 198, 198, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 198, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 0, 198, 198, + + 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198 } ; -static yyconst short int yy_nxt[533] = +static yyconst short int yy_nxt[474] = { 0, - 215, 15, 16, 15, 16, 21, 19, 21, 17, 22, - 17, 22, 21, 33, 78, 21, 33, 60, 18, 61, - 18, 24, 25, 63, 26, 34, 66, 27, 34, 69, - 74, 70, 75, 79, 28, 80, 80, 80, 64, 81, - 83, 82, 84, 84, 85, 78, 113, 114, 78, 67, - 68, 83, 78, 87, 87, 87, 78, 29, 30, 24, - 25, 31, 26, 89, 88, 27, 78, 78, 78, 86, - 78, 78, 28, 90, 95, 78, 78, 78, 78, 92, - 78, 93, 91, 78, 94, 78, 129, 96, 140, 107, - 143, 106, 139, 97, 108, 29, 30, 14, 15, 16, - - 14, 14, 14, 14, 14, 35, 14, 14, 14, 36, - 37, 37, 14, 37, 37, 37, 37, 37, 38, 37, - 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, - 37, 37, 37, 37, 37, 39, 14, 14, 15, 16, - 14, 14, 14, 14, 40, 41, 42, 43, 43, 36, - 37, 37, 14, 44, 37, 45, 46, 47, 48, 37, - 37, 49, 37, 50, 37, 51, 52, 53, 37, 54, - 55, 56, 57, 37, 37, 58, 59, 78, 78, 78, - 78, 124, 124, 124, 78, 78, 127, 127, 127, 102, - 103, 177, 83, 98, 84, 84, 85, 78, 100, 104, - - 99, 101, 123, 78, 83, 105, 85, 85, 85, 83, - 78, 87, 87, 87, 130, 78, 78, 78, 131, 132, - 78, 78, 78, 78, 78, 133, 78, 78, 78, 78, - 141, 78, 78, 135, 134, 142, 145, 138, 136, 78, - 137, 144, 78, 148, 151, 78, 146, 147, 124, 124, - 124, 149, 127, 127, 127, 78, 78, 155, 150, 78, - 78, 78, 158, 78, 159, 78, 78, 156, 78, 162, - 78, 78, 78, 78, 157, 160, 164, 78, 78, 78, - 78, 161, 165, 78, 163, 78, 78, 169, 173, 166, - 167, 78, 78, 78, 171, 168, 170, 175, 78, 78, - - 174, 172, 78, 78, 78, 180, 179, 176, 186, 78, - 78, 78, 181, 78, 182, 78, 191, 78, 78, 78, - 183, 184, 185, 187, 78, 193, 195, 196, 189, 192, - 188, 78, 190, 78, 78, 78, 78, 78, 78, 194, - 78, 200, 78, 78, 202, 198, 205, 78, 197, 78, - 201, 78, 78, 78, 78, 199, 204, 209, 208, 203, - 210, 78, 207, 206, 78, 78, 78, 211, 78, 213, - 78, 214, 78, 78, 78, 212, 14, 14, 14, 14, - 14, 14, 20, 20, 20, 20, 20, 20, 23, 23, - 23, 23, 23, 23, 32, 32, 32, 32, 32, 32, - - 71, 78, 71, 71, 71, 71, 73, 78, 73, 73, - 73, 73, 76, 76, 77, 77, 77, 77, 109, 109, - 109, 109, 109, 109, 117, 117, 117, 117, 117, 117, - 119, 119, 119, 119, 119, 119, 121, 121, 121, 121, - 122, 122, 122, 122, 125, 125, 125, 125, 125, 125, - 128, 78, 128, 78, 78, 78, 78, 78, 78, 78, - 78, 78, 78, 78, 178, 78, 126, 78, 78, 120, - 118, 154, 153, 152, 110, 126, 78, 78, 78, 120, - 118, 116, 115, 112, 111, 110, 78, 72, 65, 62, - 215, 13, 215, 215, 215, 215, 215, 215, 215, 215, - - 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215 + 198, 15, 16, 15, 16, 21, 19, 21, 17, 22, + 17, 22, 33, 34, 77, 33, 34, 59, 18, 60, + 18, 24, 25, 62, 26, 35, 65, 27, 35, 68, + 73, 69, 74, 77, 28, 126, 63, 79, 79, 79, + 80, 82, 81, 83, 83, 84, 77, 66, 67, 77, + 82, 78, 86, 86, 86, 29, 30, 24, 25, 31, + 26, 77, 77, 27, 87, 89, 77, 77, 77, 85, + 28, 77, 88, 77, 108, 109, 77, 90, 77, 91, + 125, 77, 92, 77, 93, 102, 101, 150, 124, 103, + 77, 29, 30, 14, 15, 16, 14, 14, 14, 14, + + 14, 36, 14, 14, 14, 37, 38, 38, 14, 38, + 38, 38, 38, 38, 39, 38, 38, 38, 38, 38, + 38, 38, 38, 38, 38, 38, 38, 38, 38, 40, + 14, 41, 42, 43, 44, 44, 77, 77, 77, 77, + 45, 77, 46, 47, 48, 49, 77, 77, 50, 51, + 98, 99, 52, 53, 118, 54, 94, 55, 56, 100, + 57, 58, 130, 95, 96, 77, 77, 97, 119, 119, + 119, 122, 122, 122, 82, 77, 83, 83, 84, 82, + 77, 84, 84, 84, 82, 77, 86, 86, 86, 77, + 77, 77, 77, 77, 77, 77, 127, 131, 132, 134, + + 129, 128, 77, 133, 77, 136, 77, 77, 135, 77, + 77, 137, 77, 77, 138, 119, 119, 119, 141, 77, + 151, 139, 140, 145, 122, 122, 122, 77, 146, 77, + 147, 152, 148, 149, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 153, 155, 162, + 77, 77, 157, 160, 156, 159, 154, 164, 165, 158, + 161, 77, 77, 77, 166, 169, 171, 172, 167, 168, + 77, 173, 77, 77, 170, 77, 174, 77, 77, 77, + 77, 77, 77, 176, 77, 178, 179, 175, 183, 77, + 77, 77, 181, 77, 77, 180, 177, 184, 185, 77, + + 77, 182, 77, 188, 77, 187, 77, 191, 189, 186, + 192, 77, 190, 77, 193, 77, 77, 194, 77, 77, + 77, 196, 197, 77, 77, 77, 77, 77, 77, 77, + 77, 195, 14, 14, 14, 14, 14, 14, 20, 20, + 20, 20, 20, 20, 23, 23, 23, 23, 23, 23, + 32, 32, 32, 32, 32, 32, 70, 77, 70, 70, + 70, 70, 72, 163, 72, 72, 72, 72, 75, 75, + 76, 76, 76, 76, 104, 104, 104, 104, 104, 104, + 112, 112, 112, 112, 112, 112, 114, 114, 114, 114, + 114, 114, 116, 116, 116, 116, 117, 117, 117, 117, + + 120, 120, 120, 120, 120, 120, 123, 77, 123, 121, + 77, 77, 115, 113, 144, 143, 142, 105, 121, 77, + 77, 77, 115, 113, 111, 110, 107, 106, 105, 77, + 71, 64, 61, 198, 13, 198, 198, 198, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198 } ; -static yyconst short int yy_chk[533] = +static yyconst short int yy_chk[474] = { 0, 0, 1, 1, 2, 2, 3, 2, 4, 1, 3, - 2, 4, 7, 7, 38, 8, 8, 17, 1, 17, + 2, 4, 7, 7, 89, 8, 8, 17, 1, 17, 2, 5, 5, 19, 5, 7, 26, 5, 8, 27, - 35, 27, 35, 38, 5, 40, 40, 40, 19, 41, - 42, 41, 42, 42, 42, 44, 66, 66, 214, 26, - 26, 43, 45, 43, 43, 43, 46, 5, 5, 6, - 6, 6, 6, 45, 44, 6, 47, 48, 49, 42, - 50, 51, 6, 46, 50, 56, 88, 57, 97, 48, - 98, 48, 47, 213, 49, 101, 88, 50, 98, 57, - 101, 56, 97, 51, 57, 6, 6, 9, 9, 9, + 36, 27, 36, 39, 5, 89, 19, 41, 41, 41, + 42, 43, 42, 43, 43, 43, 45, 26, 26, 47, + 44, 39, 44, 44, 44, 5, 5, 6, 6, 6, + 6, 46, 48, 6, 45, 47, 49, 50, 51, 43, + 6, 55, 46, 56, 65, 65, 88, 48, 87, 49, + 88, 197, 50, 128, 51, 56, 55, 128, 87, 56, + 196, 6, 6, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 52, 54, 53, - 55, 80, 80, 80, 151, 79, 83, 83, 83, 54, - 54, 151, 84, 52, 84, 84, 84, 90, 53, 54, - - 52, 53, 79, 91, 85, 55, 85, 85, 85, 87, - 89, 87, 87, 87, 89, 92, 93, 94, 89, 90, - 95, 96, 99, 100, 102, 91, 103, 104, 212, 105, - 99, 106, 108, 93, 92, 100, 103, 96, 94, 107, - 95, 102, 123, 106, 108, 129, 104, 105, 124, 124, - 124, 106, 127, 127, 127, 130, 131, 123, 107, 132, - 133, 134, 131, 137, 132, 135, 138, 129, 139, 135, - 140, 141, 142, 143, 130, 133, 138, 144, 145, 146, - 147, 134, 139, 148, 137, 149, 150, 143, 147, 140, - 141, 156, 158, 161, 145, 142, 144, 149, 159, 162, - - 148, 146, 166, 167, 168, 158, 156, 150, 168, 170, - 172, 169, 159, 174, 161, 175, 172, 176, 179, 181, - 162, 166, 167, 169, 171, 175, 179, 181, 171, 174, - 170, 184, 171, 185, 186, 187, 189, 190, 191, 176, - 193, 187, 194, 197, 190, 185, 194, 195, 184, 199, - 189, 198, 204, 205, 206, 186, 193, 199, 198, 191, - 204, 208, 197, 195, 210, 211, 209, 205, 207, 208, - 203, 210, 202, 201, 200, 206, 216, 216, 216, 216, - 216, 216, 217, 217, 217, 217, 217, 217, 218, 218, - 218, 218, 218, 218, 219, 219, 219, 219, 219, 219, - - 220, 196, 220, 220, 220, 220, 221, 192, 221, 221, - 221, 221, 222, 222, 223, 223, 223, 223, 224, 224, - 224, 224, 224, 224, 225, 225, 225, 225, 225, 225, - 226, 226, 226, 226, 226, 226, 227, 227, 227, 227, - 228, 228, 228, 228, 229, 229, 229, 229, 229, 229, - 230, 188, 230, 183, 182, 180, 177, 173, 165, 164, - 163, 160, 157, 155, 152, 136, 125, 122, 121, 119, - 117, 114, 113, 111, 109, 82, 78, 77, 76, 75, - 70, 68, 67, 63, 62, 61, 37, 31, 22, 18, - 13, 215, 215, 215, 215, 215, 215, 215, 215, 215, - - 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215, 215, 215, 215, 215, 215, 215, 215, 215, - 215, 215 + 9, 11, 11, 11, 11, 11, 195, 194, 78, 54, + 11, 52, 11, 11, 11, 11, 53, 93, 11, 11, + 54, 54, 11, 11, 78, 11, 52, 11, 11, 54, + 11, 11, 93, 52, 53, 192, 190, 53, 79, 79, + 79, 82, 82, 82, 83, 90, 83, 83, 83, 84, + 92, 84, 84, 84, 86, 91, 86, 86, 86, 94, + 95, 96, 98, 100, 97, 99, 90, 94, 95, 97, + + 92, 91, 101, 96, 102, 99, 103, 124, 98, 118, + 130, 100, 125, 131, 101, 119, 119, 119, 103, 127, + 130, 101, 102, 118, 122, 122, 122, 126, 124, 132, + 125, 131, 126, 127, 133, 134, 135, 136, 137, 138, + 140, 139, 141, 146, 150, 148, 156, 132, 134, 141, + 152, 153, 136, 139, 135, 138, 133, 146, 148, 137, + 140, 154, 155, 157, 150, 154, 156, 157, 152, 153, + 158, 157, 159, 160, 155, 161, 158, 164, 165, 167, + 168, 169, 170, 160, 172, 164, 165, 159, 170, 174, + 176, 173, 168, 178, 180, 167, 161, 172, 173, 177, + + 181, 169, 182, 177, 188, 176, 187, 181, 178, 174, + 182, 189, 180, 191, 187, 193, 186, 188, 185, 184, + 183, 191, 193, 179, 175, 171, 166, 162, 151, 149, + 147, 189, 199, 199, 199, 199, 199, 199, 200, 200, + 200, 200, 200, 200, 201, 201, 201, 201, 201, 201, + 202, 202, 202, 202, 202, 202, 203, 145, 203, 203, + 203, 203, 204, 142, 204, 204, 204, 204, 205, 205, + 206, 206, 206, 206, 207, 207, 207, 207, 207, 207, + 208, 208, 208, 208, 208, 208, 209, 209, 209, 209, + 209, 209, 210, 210, 210, 210, 211, 211, 211, 211, + + 212, 212, 212, 212, 212, 212, 213, 129, 213, 120, + 117, 116, 114, 112, 109, 108, 106, 104, 81, 77, + 76, 75, 74, 69, 67, 66, 62, 61, 60, 38, + 31, 22, 18, 13, 198, 198, 198, 198, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198, 198, 198, 198, 198, 198, 198, 198, + 198, 198, 198 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -624,6 +602,7 @@ static int class_after_c = FALSE; static int header_c = FALSE; static GString *cbuf = NULL; +int ccode_line = 1; int line_no = 1; @@ -657,7 +636,7 @@ add_to_cbuf(char *s) #define CLASS_CODE_I 5 -#line 661 "lex.yy.c" +#line 640 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -811,10 +790,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 65 "lexer.l" +#line 66 "lexer.l" -#line 818 "lex.yy.c" +#line 797 "lex.yy.c" if ( yy_init ) { @@ -863,14 +842,14 @@ 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 >= 216 ) + if ( yy_current_state >= 199 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *yy_state_ptr++ = yy_current_state; ++yy_cp; } - while ( yy_base[yy_current_state] != 492 ); + while ( yy_base[yy_current_state] != 435 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -901,7 +880,7 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 67 "lexer.l" +#line 68 "lexer.l" { line_no++; REJECT; } YY_BREAK case 2: @@ -909,7 +888,7 @@ case 2: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 69 "lexer.l" +#line 70 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 3: @@ -917,7 +896,7 @@ case 3: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 70 "lexer.l" +#line 71 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 4: @@ -925,7 +904,7 @@ case 4: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 71 "lexer.l" +#line 72 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 5: @@ -933,64 +912,71 @@ case 5: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 72 "lexer.l" +#line 73 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 6: YY_RULE_SETUP -#line 73 "lexer.l" +#line 74 "lexer.l" {BEGIN(COMMENT); before_comment = INITIAL; } YY_BREAK case 7: YY_RULE_SETUP -#line 74 "lexer.l" +#line 75 "lexer.l" {BEGIN(COMMENT); before_comment = C_CODE; } YY_BREAK case 8: YY_RULE_SETUP -#line 75 "lexer.l" +#line 76 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE; } YY_BREAK case 9: YY_RULE_SETUP -#line 76 "lexer.l" +#line 77 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } YY_BREAK case 10: YY_RULE_SETUP -#line 77 "lexer.l" +#line 78 "lexer.l" {BEGIN(before_comment);} YY_BREAK case 11: YY_RULE_SETUP -#line 78 "lexer.l" +#line 79 "lexer.l" { ; /* comment, ignore */ } YY_BREAK case 12: YY_RULE_SETUP #line 80 "lexer.l" +{ ; /* comment, ignore */ } + YY_BREAK +case 13: +YY_RULE_SETUP +#line 82 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; header_c = TRUE; clear_cbuf(); + ccode_line = line_no; } YY_BREAK -case 13: +case 14: YY_RULE_SETUP -#line 87 "lexer.l" +#line 90 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; header_c = FALSE; clear_cbuf(); + ccode_line = line_no; } YY_BREAK -case 14: +case 15: YY_RULE_SETUP -#line 94 "lexer.l" +#line 98 "lexer.l" { BEGIN(INITIAL); yylval.cbuf = cbuf; @@ -1001,51 +987,43 @@ YY_RULE_SETUP return CCODE; } YY_BREAK -case 15: -YY_RULE_SETUP -#line 104 "lexer.l" -{ add_to_cbuf(yytext); } - YY_BREAK case 16: YY_RULE_SETUP -#line 105 "lexer.l" +#line 108 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 17: YY_RULE_SETUP -#line 106 "lexer.l" +#line 109 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 18: YY_RULE_SETUP -#line 107 "lexer.l" +#line 110 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 19: YY_RULE_SETUP -#line 109 "lexer.l" +#line 111 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 20: YY_RULE_SETUP -#line 110 "lexer.l" -{ - BEGIN(C_CODE_STRING); - add_to_cbuf(yytext); - } +#line 113 "lexer.l" +{ add_to_cbuf(yytext); } YY_BREAK case 21: YY_RULE_SETUP #line 114 "lexer.l" { - add_to_cbuf(yytext); - } + BEGIN(C_CODE_STRING); + add_to_cbuf(yytext); + } YY_BREAK case 22: YY_RULE_SETUP -#line 117 "lexer.l" +#line 118 "lexer.l" { - BEGIN(C_CODE); add_to_cbuf(yytext); } YY_BREAK @@ -1053,20 +1031,28 @@ case 23: YY_RULE_SETUP #line 121 "lexer.l" { + BEGIN(C_CODE); add_to_cbuf(yytext); } YY_BREAK case 24: YY_RULE_SETUP #line 125 "lexer.l" +{ + add_to_cbuf(yytext); + } + YY_BREAK +case 25: +YY_RULE_SETUP +#line 129 "lexer.l" { parenth_depth++; add_to_cbuf(yytext); } YY_BREAK -case 25: +case 26: YY_RULE_SETUP -#line 129 "lexer.l" +#line 133 "lexer.l" { parenth_depth--; if(parenth_depth<0) { @@ -1080,218 +1066,195 @@ YY_RULE_SETUP add_to_cbuf(yytext); } YY_BREAK -case 26: +case 27: YY_RULE_SETUP -#line 142 "lexer.l" +#line 146 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 27: +case 28: YY_RULE_SETUP -#line 143 "lexer.l" +#line 147 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 28: +case 29: YY_RULE_SETUP -#line 145 "lexer.l" +#line 149 "lexer.l" { BEGIN(CLASS_CODE); return CLASS; } YY_BREAK -case 29: -YY_RULE_SETUP -#line 150 "lexer.l" -{return FROM;} - YY_BREAK case 30: YY_RULE_SETUP -#line 152 "lexer.l" -{return VOID;} +#line 154 "lexer.l" +{return FROM;} YY_BREAK case 31: YY_RULE_SETUP -#line 153 "lexer.l" -{return STRUCT;} +#line 156 "lexer.l" +{return VOID;} YY_BREAK case 32: YY_RULE_SETUP -#line 154 "lexer.l" -{return UNION;} +#line 157 "lexer.l" +{return STRUCT;} YY_BREAK case 33: YY_RULE_SETUP -#line 155 "lexer.l" -{return ENUM;} +#line 158 "lexer.l" +{return UNION;} YY_BREAK case 34: YY_RULE_SETUP -#line 156 "lexer.l" -{return SIGNED;} +#line 159 "lexer.l" +{return ENUM;} YY_BREAK case 35: YY_RULE_SETUP -#line 157 "lexer.l" -{return UNSIGNED;} +#line 160 "lexer.l" +{return SIGNED;} YY_BREAK case 36: YY_RULE_SETUP -#line 158 "lexer.l" -{return LONG;} +#line 161 "lexer.l" +{return UNSIGNED;} YY_BREAK case 37: YY_RULE_SETUP -#line 159 "lexer.l" -{return SHORT;} +#line 162 "lexer.l" +{return LONG;} YY_BREAK case 38: YY_RULE_SETUP -#line 160 "lexer.l" -{return INT;} +#line 163 "lexer.l" +{return SHORT;} YY_BREAK case 39: YY_RULE_SETUP -#line 161 "lexer.l" -{return FLOAT;} +#line 164 "lexer.l" +{return INT;} YY_BREAK case 40: YY_RULE_SETUP -#line 162 "lexer.l" -{return DOUBLE;} - YY_BREAK -case 41: -YY_RULE_SETUP -#line 163 "lexer.l" -{return CHAR;} - YY_BREAK -case 42: -YY_RULE_SETUP #line 165 "lexer.l" -{yylval.line = line_no; return PUBLIC;} +{return FLOAT;} YY_BREAK -case 43: +case 41: YY_RULE_SETUP #line 166 "lexer.l" -{yylval.line = line_no; return PRIVATE;} +{return DOUBLE;} YY_BREAK -case 44: +case 42: YY_RULE_SETUP #line 167 "lexer.l" -{yylval.line = line_no; return ARGUMENT;} - YY_BREAK -case 45: -YY_RULE_SETUP -#line 168 "lexer.l" -{yylval.line = line_no; return VIRTUAL;} +{return CHAR;} YY_BREAK -case 46: +case 43: YY_RULE_SETUP #line 169 "lexer.l" -{yylval.line = line_no; return SIGNAL;} +{yylval.line = line_no; return PUBLIC;} YY_BREAK -case 47: +case 44: YY_RULE_SETUP #line 170 "lexer.l" -{return LAST;} +{yylval.line = line_no; return PRIVATE;} YY_BREAK -case 48: +case 45: YY_RULE_SETUP #line 171 "lexer.l" -{return FIRST;} +{yylval.line = line_no; return ARGUMENT;} YY_BREAK -case 49: +case 46: YY_RULE_SETUP #line 172 "lexer.l" -{yylval.line = line_no; return OVERRIDE;} +{yylval.line = line_no; return VIRTUAL;} YY_BREAK -case 50: +case 47: YY_RULE_SETUP #line 173 "lexer.l" -{return CHECK;} +{yylval.line = line_no; return SIGNAL;} YY_BREAK -case 51: +case 48: YY_RULE_SETUP #line 174 "lexer.l" -{return CNULL;} +{yylval.line = line_no; return OVERRIDE;} YY_BREAK -case 52: +case 49: YY_RULE_SETUP #line 175 "lexer.l" -{return TYPE;} - YY_BREAK -case 53: -YY_RULE_SETUP -#line 176 "lexer.l" {return ONERROR;} YY_BREAK -case 54: +case 50: YY_RULE_SETUP -#line 177 "lexer.l" +#line 176 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 55: +case 51: YY_RULE_SETUP -#line 181 "lexer.l" +#line 180 "lexer.l" { yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 56: +case 52: YY_RULE_SETUP -#line 185 "lexer.l" +#line 184 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 57: +case 53: YY_RULE_SETUP -#line 190 "lexer.l" +#line 189 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 58: +case 54: YY_RULE_SETUP -#line 194 "lexer.l" +#line 193 "lexer.l" { BEGIN(C_CODE); parenth_depth=1; class_after_c = TRUE; + ccode_line = line_no; + yylval.line = line_no; return '{'; } YY_BREAK -case 59: +case 55: YY_RULE_SETUP -#line 200 "lexer.l" +#line 201 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 60: +case 56: YY_RULE_SETUP -#line 205 "lexer.l" +#line 206 "lexer.l" ; /*ignore*/ YY_BREAK -case 61: +case 57: YY_RULE_SETUP -#line 207 "lexer.l" +#line 208 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 62: +case 58: YY_RULE_SETUP -#line 211 "lexer.l" +#line 212 "lexer.l" ECHO; YY_BREAK -#line 1295 "lex.yy.c" +#line 1258 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): @@ -1586,7 +1549,7 @@ static yy_state_type yy_get_previous_state() 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 >= 216 ) + if ( yy_current_state >= 199 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1616,11 +1579,11 @@ yy_state_type yy_current_state; 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 >= 216 ) + if ( yy_current_state >= 199 ) 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 == 215); + yy_is_jam = (yy_current_state == 198); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2178,4 +2141,4 @@ int main() return 0; } #endif -#line 211 "lexer.l" +#line 212 "lexer.l"