X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/714b58ab4606ed4d40cec3702cb378938f8c883f..7231d76fbf4ae0b501af648e1216b88714aa7353:/src/lexer.c diff --git a/src/lexer.c b/src/lexer.c index fe904e5..8c57c6e 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -284,97 +284,127 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 88 -#define YY_END_OF_BUFFER 89 -static yyconst short int yy_acclist[401] = +#define YY_NUM_RULES 106 +#define YY_END_OF_BUFFER 107 +static yyconst short int yy_acclist[554] = { 0, - 89, 86, 88, 85, 86, 88, 1, 87, 88, 86, - 87, 88, 86, 88, 86, 88, 85, 86, 88, 86, - 88, 86, 88, 26, 86, 88, 1, 27, 87, 88, - 26, 86, 87, 88, 26, 86, 88, 26, 86, 88, - 49, 86, 88, 1, 50, 87, 88, 49, 86, 87, - 88, 42, 49, 86, 88, 49, 86, 88, 49, 86, - 88, 49, 86, 88, 47, 49, 86, 88, 48, 49, - 86, 88, 49, 86, 88, 49, 86, 88, 45, 86, - 88, 1, 46, 87, 88, 45, 86, 87, 88, 44, - 45, 86, 88, 45, 86, 88, 86, 88, 86, 88, - - 77, 86, 88, 77, 86, 88, 86, 88, 80, 86, - 88, 80, 86, 88, 80, 86, 88, 80, 86, 88, - 82, 86, 88, 86, 88, 86, 88, 86, 88, 80, - 86, 88, 80, 86, 88, 80, 86, 88, 80, 86, - 88, 80, 86, 88, 80, 86, 88, 80, 86, 88, - 80, 86, 88, 80, 86, 88, 80, 86, 88, 80, - 86, 88, 80, 86, 88, 83, 86, 88, 84, 86, - 88, 9, 86, 88, 9, 86, 87, 88, 9, 86, - 88, 9, 86, 88, 9, 86, 88, 14, 86, 88, - 14, 86, 87, 88, 14, 86, 88, 14, 86, 88, - - 14, 86, 88, 17, 86, 88, 17, 86, 87, 88, - 17, 86, 88, 21, 33, 25, 22, 41, 34, 43, - 77, 23, 77, 77, 79, 80, 78, 80, 80, 80, - 24, 81, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 8, 6, 13, 10, 12, 11, 13, 16, 15, 3, - 28, 32, 39, 35, 37, 18, 77, 19, 77, 77, - 79, 79, 78, 80, 80, 80, 68, 20, 80, 80, - 80, 80, 80, 80, 80, 63, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 11, - - 29, 30, 31, 40, 36, 38, 79, 80, 54, 80, - 53, 80, 5, 80, 66, 80, 80, 80, 80, 58, - 80, 80, 61, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 55, 80, 7, 51, 80, 53, - 80, 67, 80, 80, 64, 80, 80, 80, 80, 80, - 62, 80, 80, 80, 80, 57, 80, 80, 80, 80, - 80, 65, 80, 80, 80, 80, 69, 80, 75, 80, - 59, 80, 56, 80, 80, 80, 80, 80, 80, 70, - 80, 80, 80, 74, 80, 73, 80, 80, 76, 80, - 80, 60, 80, 72, 80, 71, 80, 2, 4, 52 - + 107, 104, 106, 103, 104, 106, 1, 105, 106, 104, + 105, 106, 104, 106, 104, 106, 103, 104, 106, 104, + 106, 104, 106, 26, 104, 106, 1, 27, 105, 106, + 26, 104, 105, 106, 26, 104, 106, 26, 104, 106, + 50, 104, 106, 1, 51, 105, 106, 50, 104, 105, + 106, 42, 50, 104, 106, 50, 104, 106, 50, 104, + 106, 50, 104, 106, 48, 50, 104, 106, 49, 50, + 104, 106, 50, 104, 106, 50, 104, 106, 46, 104, + 106, 1, 47, 105, 106, 46, 104, 105, 106, 45, + 46, 104, 106, 46, 104, 106, 104, 106, 104, 106, + + 104, 106, 94, 104, 106, 94, 104, 106, 104, 106, + 97, 104, 106, 97, 104, 106, 97, 104, 106, 97, + 104, 106, 100, 104, 106, 104, 106, 104, 106, 104, + 106, 97, 104, 106, 97, 104, 106, 97, 104, 106, + 97, 104, 106, 97, 104, 106, 97, 104, 106, 97, + 104, 106, 97, 104, 106, 97, 104, 106, 97, 104, + 106, 97, 104, 106, 97, 104, 106, 101, 104, 106, + 102, 104, 106, 91, 104, 106, 43, 104, 106, 92, + 104, 106, 93, 104, 106, 97, 104, 106, 97, 104, + 106, 97, 104, 106, 97, 104, 106, 97, 104, 106, + + 97, 104, 106, 97, 104, 106, 97, 104, 106, 97, + 104, 106, 97, 104, 106, 97, 104, 106, 97, 104, + 106, 9, 104, 106, 9, 104, 105, 106, 9, 104, + 106, 9, 104, 106, 9, 104, 106, 14, 104, 106, + 14, 104, 105, 106, 14, 104, 106, 14, 104, 106, + 14, 104, 106, 17, 104, 106, 17, 104, 105, 106, + 17, 104, 106, 21, 33, 25, 22, 41, 34, 44, + 94, 23, 94, 94, 96, 97, 95, 97, 97, 97, + 24, 99, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 8, 6, 13, 10, 12, 11, 13, 16, + 15, 3, 28, 32, 39, 35, 37, 18, 98, 98, + 94, 19, 94, 94, 96, 96, 95, 97, 97, 97, + 69, 20, 97, 97, 97, 97, 97, 97, 97, 64, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 11, 29, 30, 31, 40, + 36, 38, 96, 97, 55, 97, 54, 97, 5, 97, + 67, 97, 97, 97, 97, 59, 97, 97, 62, 97, + + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 56, 97, 97, 97, 97, 59, 97, 97, 97, + 97, 79, 97, 97, 97, 97, 85, 97, 7, 52, + 97, 54, 97, 68, 97, 97, 65, 97, 97, 97, + 97, 97, 97, 63, 97, 97, 97, 97, 58, 97, + 97, 97, 80, 97, 97, 97, 97, 84, 97, 97, + 97, 97, 97, 97, 97, 66, 97, 97, 97, 97, + 97, 70, 97, 76, 97, 60, 97, 57, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 71, 97, 97, 97, 97, 75, 97, 97, + + 97, 97, 97, 81, 97, 82, 97, 97, 97, 74, + 97, 97, 77, 97, 78, 97, 97, 61, 97, 97, + 97, 97, 97, 97, 97, 73, 97, 72, 97, 97, + 97, 87, 97, 97, 97, 97, 2, 89, 97, 97, + 86, 97, 97, 88, 97, 4, 97, 90, 97, 97, + 83, 97, 53 } ; -static yyconst short int yy_accept[359] = +static yyconst short int yy_accept[472] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 4, 7, 10, 13, 15, 17, 20, 22, 24, 27, - 31, 35, 38, 41, 44, 48, 52, 56, 59, 62, - 65, 69, 73, 76, 79, 82, 86, 90, 94, 97, - 99, 101, 104, 107, 109, 112, 115, 118, 121, 124, - 126, 128, 130, 133, 136, 139, 142, 145, 148, 151, - 154, 157, 160, 163, 166, 169, 172, 175, 179, 182, - 185, 188, 191, 195, 198, 201, 204, 207, 211, 214, - 215, 215, 215, 215, 215, 215, 215, 215, 216, 216, - - 217, 217, 217, 217, 217, 217, 218, 218, 219, 219, - 219, 220, 221, 222, 223, 223, 223, 224, 224, 224, - 225, 226, 227, 228, 229, 230, 231, 231, 232, 232, - 232, 232, 233, 234, 235, 236, 237, 238, 239, 240, - 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, - 251, 252, 252, 252, 252, 253, 253, 254, 254, 254, - 254, 255, 256, 256, 258, 259, 260, 260, 261, 261, - 261, 261, 262, 262, 262, 263, 263, 263, 263, 263, - 264, 264, 264, 264, 265, 266, 266, 267, 267, 268, - 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, - - 278, 278, 278, 279, 279, 279, 280, 281, 282, 283, - 284, 285, 286, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 300, 301, 301, 301, - 302, 302, 303, 304, 304, 304, 304, 305, 306, 307, - 307, 308, 309, 311, 313, 313, 314, 315, 317, 318, - 319, 320, 322, 323, 325, 326, 327, 328, 329, 330, - 331, 332, 333, 334, 335, 337, 337, 338, 338, 338, - 339, 339, 339, 339, 339, 339, 339, 340, 342, 344, - 345, 347, 348, 349, 350, 351, 353, 354, 355, 356, - 358, 359, 360, 360, 360, 360, 360, 360, 360, 361, - - 362, 364, 365, 366, 367, 369, 371, 373, 375, 376, - 377, 377, 377, 377, 377, 377, 378, 379, 380, 382, - 383, 384, 386, 386, 386, 386, 386, 386, 388, 389, - 391, 392, 394, 394, 394, 394, 394, 394, 394, 396, - 398, 398, 398, 398, 399, 399, 399, 399, 399, 400, - 400, 400, 400, 400, 400, 400, 401, 401 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 4, 7, 10, 13, 15, 17, + 20, 22, 24, 27, 31, 35, 38, 41, 44, 48, + 52, 56, 59, 62, 65, 69, 73, 76, 79, 82, + 86, 90, 94, 97, 99, 101, 103, 106, 109, 111, + 114, 117, 120, 123, 126, 128, 130, 132, 135, 138, + 141, 144, 147, 150, 153, 156, 159, 162, 165, 168, + 171, 174, 177, 180, 183, 186, 189, 192, 195, 198, + 201, 204, 207, 210, 213, 216, 219, 222, 225, 229, + + 232, 235, 238, 241, 245, 248, 251, 254, 257, 261, + 264, 265, 265, 265, 265, 265, 265, 265, 265, 266, + 266, 267, 267, 267, 267, 267, 267, 268, 268, 269, + 269, 269, 270, 271, 271, 271, 272, 273, 273, 273, + 274, 274, 274, 275, 276, 277, 278, 279, 280, 281, + 281, 282, 282, 282, 282, 283, 284, 285, 286, 287, + 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, + 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, + 308, 309, 310, 311, 312, 313, 314, 314, 314, 314, + 315, 315, 316, 316, 316, 316, 317, 318, 318, 320, + + 321, 322, 322, 323, 323, 323, 323, 324, 324, 324, + 325, 325, 325, 325, 325, 326, 326, 326, 326, 327, + 328, 328, 329, 329, 330, 330, 331, 332, 332, 333, + 334, 335, 336, 337, 338, 339, 340, 341, 342, 342, + 342, 343, 343, 343, 344, 345, 346, 347, 348, 349, + 350, 352, 353, 354, 355, 356, 357, 358, 359, 360, + 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, + 371, 372, 373, 374, 375, 376, 376, 377, 377, 377, + 378, 378, 379, 380, 380, 380, 380, 381, 382, 383, + 383, 384, 385, 387, 389, 389, 390, 391, 393, 394, + + 395, 396, 398, 399, 401, 402, 403, 404, 405, 406, + 407, 408, 409, 410, 411, 412, 414, 415, 416, 417, + 419, 420, 421, 422, 424, 425, 426, 427, 429, 429, + 430, 430, 430, 431, 431, 431, 431, 431, 431, 431, + 432, 434, 436, 437, 439, 440, 441, 442, 443, 444, + 446, 447, 448, 449, 451, 452, 453, 455, 456, 457, + 458, 460, 461, 462, 463, 464, 464, 464, 464, 464, + 464, 464, 465, 466, 468, 469, 470, 471, 472, 474, + 476, 478, 480, 481, 482, 483, 484, 485, 486, 487, + 488, 489, 490, 490, 490, 490, 490, 490, 491, 492, + + 493, 495, 496, 497, 498, 500, 501, 502, 503, 504, + 506, 508, 509, 510, 510, 510, 510, 510, 510, 512, + 513, 515, 517, 518, 520, 521, 522, 523, 524, 525, + 526, 526, 526, 526, 526, 526, 526, 528, 530, 531, + 532, 534, 535, 536, 537, 537, 537, 537, 538, 538, + 540, 541, 543, 544, 546, 546, 546, 546, 547, 548, + 550, 550, 550, 551, 551, 551, 553, 553, 553, 554, + 554 } ; static yyconst int yy_ec[256] = @@ -388,11 +418,11 @@ static yyconst int yy_ec[256] = 1, 21, 1, 1, 22, 22, 22, 22, 23, 22, 24, 24, 25, 24, 24, 24, 24, 24, 24, 24, 24, 26, 27, 24, 24, 24, 24, 24, 24, 24, - 28, 29, 30, 1, 24, 1, 31, 32, 33, 34, + 28, 29, 30, 1, 31, 1, 32, 33, 34, 35, - 35, 36, 37, 38, 39, 24, 24, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, - 24, 24, 53, 1, 54, 1, 1, 1, 1, 1, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 24, 57, 1, 58, 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, @@ -409,314 +439,394 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[55] = +static yyconst int yy_meta[59] = { 0, 1, 2, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 5, 1, 1, 6, 6, 7, 7, 7, 7, 1, 1, 8, - 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, + 7, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 1, 1 + 7, 7, 7, 7, 7, 7, 1, 1 } ; -static yyconst short int yy_base[384] = +static yyconst short int yy_base[499] = { 0, - 0, 4, 7, 13, 17, 69, 24, 36, 123, 0, - 165, 0, 31, 52, 48, 77, 55, 81, 848, 849, - 849, 849, 849, 1, 807, 42, 56, 811, 849, 849, - 849, 831, 817, 849, 849, 849, 849, 57, 10, 0, - 849, 849, 27, 789, 849, 849, 849, 849, 0, 86, - 78, 168, 99, 0, 823, 22, 49, 80, 849, 174, - 93, 206, 50, 187, 78, 161, 176, 169, 183, 163, - 188, 209, 175, 210, 849, 849, 849, 849, 827, 230, - 236, 849, 849, 826, 249, 253, 836, 835, 105, 849, - 834, 805, 238, 800, 220, 211, 206, 849, 789, 849, - - 0, 824, 225, 823, 822, 849, 827, 849, 261, 787, - 849, 849, 254, 849, 825, 259, 270, 276, 0, 286, - 808, 807, 806, 17, 262, 243, 811, 811, 819, 280, - 791, 792, 271, 30, 214, 287, 288, 290, 292, 26, - 294, 293, 295, 178, 297, 296, 298, 302, 299, 303, - 849, 318, 322, 345, 849, 349, 849, 341, 353, 357, - 849, 361, 805, 849, 849, 849, 815, 849, 770, 776, - 762, 849, 783, 760, 849, 759, 772, 761, 783, 849, - 799, 798, 797, 849, 849, 802, 849, 771, 353, 800, - 849, 357, 0, 783, 782, 781, 338, 72, 342, 849, - - 374, 796, 849, 768, 365, 359, 365, 367, 368, 300, - 369, 371, 778, 372, 373, 374, 375, 377, 379, 378, - 380, 384, 382, 385, 388, 429, 849, 749, 278, 849, - 761, 849, 849, 744, 754, 767, 849, 849, 849, 751, - 771, 381, 770, 769, 433, 849, 399, 768, 394, 397, - 386, 767, 411, 766, 393, 418, 423, 424, 425, 431, - 87, 427, 428, 432, 765, 450, 849, 465, 469, 849, - 740, 747, 750, 734, 0, 730, 441, 435, 759, 442, - 758, 456, 437, 445, 460, 757, 461, 463, 464, 756, - 468, 469, 725, 715, 698, 710, 716, 686, 471, 470, - - 678, 472, 473, 475, 664, 651, 643, 580, 479, 477, - 451, 563, 550, 586, 560, 483, 484, 486, 575, 492, - 488, 574, 549, 553, 514, 508, 527, 570, 501, 559, - 496, 549, 522, 519, 532, 523, 540, 522, 534, 516, - 502, 546, 554, 849, 539, 423, 558, 546, 849, 371, - 564, 234, 568, 585, 541, 849, 849, 603, 611, 619, - 627, 635, 643, 651, 659, 667, 670, 674, 678, 686, - 694, 702, 710, 715, 718, 722, 729, 734, 741, 745, - 751, 758, 766 + 0, 4, 7, 12, 17, 73, 26, 36, 131, 0, + 177, 0, 33, 34, 230, 0, 24, 47, 54, 91, + 57, 60, 1099, 1100, 1100, 1100, 1100, 21, 1055, 190, + 60, 1061, 1100, 1100, 1100, 1082, 1068, 1100, 1100, 1100, + 1100, 190, 42, 0, 1100, 1100, 81, 1036, 1100, 1100, + 1100, 1100, 0, 1064, 93, 86, 236, 107, 0, 1073, + 54, 69, 6, 1100, 184, 92, 97, 70, 179, 59, + 187, 185, 188, 82, 184, 207, 239, 197, 175, 1100, + 1100, 1100, 1100, 1100, 1100, 226, 249, 265, 212, 219, + 266, 22, 227, 97, 270, 236, 267, 1100, 1100, 1077, + + 291, 302, 1100, 1100, 1076, 310, 315, 1086, 1085, 247, + 1100, 1084, 1054, 292, 1049, 257, 283, 284, 1100, 1036, + 1100, 0, 1074, 293, 1073, 1072, 1100, 1077, 1100, 323, + 1034, 1100, 1100, 1069, 1068, 320, 1100, 1073, 327, 339, + 349, 0, 355, 1056, 1055, 1054, 307, 312, 313, 1059, + 1059, 1067, 331, 1039, 1040, 340, 350, 355, 341, 191, + 356, 357, 358, 360, 361, 364, 362, 365, 369, 366, + 372, 370, 373, 371, 374, 377, 375, 398, 379, 380, + 174, 283, 382, 383, 381, 1100, 430, 434, 438, 1100, + 443, 1100, 445, 449, 453, 1100, 457, 1053, 1100, 1100, + + 1100, 1063, 1100, 1015, 1021, 1006, 1100, 1030, 1004, 1100, + 1003, 1019, 1006, 1031, 1100, 1047, 1046, 1045, 1100, 1100, + 1050, 1100, 1018, 1100, 1042, 1041, 449, 1046, 1100, 453, + 0, 1029, 1028, 1027, 399, 434, 453, 1100, 471, 1042, + 1100, 1014, 464, 456, 458, 464, 465, 387, 466, 467, + 1024, 468, 469, 470, 473, 474, 472, 471, 476, 479, + 482, 478, 477, 481, 397, 494, 483, 500, 492, 512, + 514, 515, 516, 517, 518, 538, 1100, 992, 488, 1100, + 1006, 1100, 1100, 987, 999, 1013, 1100, 1100, 1100, 994, + 1017, 523, 1016, 1015, 544, 1100, 525, 1014, 531, 534, + + 536, 1013, 539, 1012, 540, 542, 541, 544, 546, 545, + 551, 548, 547, 553, 549, 1011, 405, 559, 552, 557, + 556, 565, 574, 1010, 576, 578, 579, 1009, 597, 1100, + 609, 614, 1100, 981, 990, 993, 975, 0, 971, 584, + 586, 1003, 588, 1002, 589, 594, 602, 604, 607, 1001, + 606, 608, 611, 1000, 612, 614, 999, 613, 615, 616, + 617, 618, 620, 623, 628, 970, 967, 964, 978, 990, + 977, 631, 633, 992, 634, 635, 636, 637, 991, 990, + 984, 976, 641, 642, 644, 645, 646, 647, 649, 656, + 659, 660, 629, 944, 929, 963, 918, 662, 664, 665, + + 920, 663, 670, 672, 904, 673, 678, 675, 684, 890, + 877, 685, 686, 842, 841, 710, 700, 718, 798, 689, + 797, 791, 691, 790, 702, 695, 705, 708, 709, 711, + 753, 756, 729, 735, 745, 737, 772, 761, 718, 740, + 760, 745, 719, 748, 707, 758, 771, 1100, 762, 490, + 750, 486, 758, 485, 391, 780, 764, 1100, 759, 311, + 235, 786, 771, 77, 797, 3, 803, 730, 1100, 1100, + 821, 829, 837, 845, 853, 861, 869, 877, 885, 893, + 896, 900, 904, 912, 920, 928, 936, 944, 949, 952, + 956, 963, 968, 975, 979, 985, 992, 1000 + } ; -static yyconst short int yy_def[384] = +static yyconst short int yy_def[499] = { 0, - 358, 358, 359, 359, 360, 360, 361, 361, 357, 9, - 9, 11, 362, 362, 363, 363, 364, 364, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 365, - 357, 357, 357, 357, 357, 357, 357, 357, 366, 357, - 357, 357, 357, 367, 368, 368, 368, 368, 357, 357, - 357, 369, 368, 368, 368, 368, 368, 368, 368, 368, - 368, 368, 368, 368, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 370, 357, 357, 357, 357, 357, 357, 357, 357, 357, - - 371, 357, 357, 357, 357, 357, 372, 357, 357, 357, - 357, 357, 357, 357, 373, 357, 357, 357, 374, 357, - 375, 368, 376, 368, 368, 368, 357, 357, 377, 357, - 378, 357, 368, 368, 368, 368, 368, 368, 368, 368, - 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, - 357, 357, 357, 357, 357, 379, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 370, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 372, 357, 357, 357, 373, - 357, 357, 374, 375, 380, 376, 368, 368, 368, 357, - - 357, 377, 357, 378, 369, 368, 368, 368, 368, 368, - 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, - 368, 368, 368, 368, 368, 381, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 380, 368, 368, 368, 357, 357, 368, 368, 368, 368, - 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, - 368, 368, 368, 368, 368, 357, 357, 381, 357, 357, - 357, 357, 357, 357, 382, 357, 368, 368, 368, 368, - 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, - 368, 368, 357, 357, 357, 357, 357, 357, 368, 368, - - 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, - 357, 357, 357, 357, 357, 368, 368, 368, 368, 368, - 368, 368, 357, 357, 357, 357, 357, 368, 368, 368, - 368, 368, 357, 357, 357, 357, 357, 357, 368, 368, - 357, 357, 357, 357, 383, 357, 357, 383, 357, 357, - 357, 357, 357, 357, 357, 357, 0, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357 + 471, 471, 472, 472, 473, 473, 474, 474, 470, 9, + 9, 11, 9, 9, 9, 15, 475, 475, 476, 476, + 477, 477, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 478, 470, 470, 470, 470, 470, 470, + 470, 470, 479, 480, 470, 470, 470, 470, 481, 482, + 482, 482, 482, 470, 470, 470, 483, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 470, + 470, 470, 470, 470, 470, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 470, 470, 470, + + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 484, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 485, 470, 470, 470, 470, 470, 486, 470, 470, + 470, 470, 470, 470, 487, 470, 470, 488, 470, 470, + 470, 489, 470, 490, 482, 491, 482, 482, 482, 470, + 470, 492, 470, 493, 470, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 470, 470, 470, 470, 470, + 494, 470, 470, 470, 470, 470, 470, 470, 470, 470, + + 470, 484, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 486, 470, 470, 470, 470, 470, 470, 488, 470, 470, + 489, 490, 495, 491, 482, 482, 482, 470, 470, 492, + 470, 493, 483, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 496, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 495, 482, 482, 482, 470, 470, 482, 482, 482, 482, + + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 470, 470, + 496, 470, 470, 470, 470, 470, 470, 497, 470, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 470, 470, 470, 470, 470, + 470, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 470, 470, 470, 470, 470, 482, 482, 482, + + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 482, 482, 482, 470, 470, 470, 470, 470, 482, 482, + 482, 482, 482, 482, 482, 482, 482, 482, 482, 482, + 470, 470, 470, 470, 470, 470, 482, 482, 482, 482, + 482, 482, 482, 482, 470, 470, 470, 470, 498, 482, + 482, 482, 482, 482, 470, 470, 498, 470, 482, 482, + 470, 470, 482, 470, 470, 482, 470, 470, 470, 0, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470 + } ; -static yyconst short int yy_nxt[904] = +static yyconst short int yy_nxt[1159] = { 0, - 357, 21, 22, 23, 21, 26, 22, 23, 26, 30, - 31, 27, 90, 24, 91, 30, 31, 24, 32, 35, - 36, 106, 37, 107, 32, 38, 46, 47, 109, 48, - 39, 109, 25, 22, 78, 123, 25, 33, 46, 47, - 123, 48, 79, 93, 123, 40, 93, 197, 123, 28, - 22, 83, 49, 80, 22, 78, 80, 22, 88, 84, - 207, 124, 102, 81, 49, 110, 89, 123, 123, 41, - 42, 35, 36, 213, 37, 43, 44, 38, 85, 22, - 83, 85, 39, 22, 88, 103, 95, 94, 86, 114, - 123, 115, 89, 96, 125, 133, 123, 40, 123, 97, - - 113, 113, 113, 113, 128, 123, 129, 165, 98, 104, - 105, 116, 243, 120, 120, 120, 120, 126, 166, 289, - 137, 41, 42, 20, 21, 22, 23, 21, 20, 20, - 20, 20, 20, 20, 20, 50, 51, 52, 53, 53, - 53, 54, 20, 20, 55, 55, 55, 55, 55, 55, - 20, 20, 20, 55, 55, 56, 55, 55, 57, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 58, 55, 55, 55, 55, 59, 20, 60, 61, 123, - 116, 123, 117, 117, 117, 118, 127, 123, 113, 113, - 113, 113, 62, 123, 123, 63, 123, 64, 65, 66, - - 67, 123, 138, 68, 69, 123, 123, 70, 71, 218, - 140, 72, 142, 73, 74, 139, 148, 75, 76, 119, - 130, 130, 130, 130, 134, 141, 135, 123, 123, 136, - 181, 152, 123, 143, 152, 132, 144, 154, 155, 93, - 156, 153, 93, 176, 208, 173, 145, 146, 149, 151, - 158, 177, 150, 158, 160, 161, 147, 162, 174, 170, - 159, 123, 109, 175, 163, 109, 164, 171, 189, 189, - 189, 189, 172, 192, 192, 192, 192, 182, 183, 176, - 123, 199, 116, 94, 117, 117, 117, 118, 116, 123, - 118, 118, 118, 118, 130, 130, 130, 130, 116, 110, - - 120, 120, 120, 120, 198, 123, 123, 206, 123, 132, - 123, 123, 123, 123, 123, 123, 123, 123, 123, 152, - 123, 123, 152, 154, 155, 271, 156, 215, 209, 153, - 172, 251, 220, 216, 212, 214, 210, 217, 211, 219, - 222, 225, 158, 221, 224, 158, 154, 155, 223, 154, - 154, 155, 159, 154, 160, 161, 123, 162, 160, 161, - 123, 160, 160, 161, 163, 160, 227, 189, 189, 189, - 189, 192, 192, 192, 192, 245, 246, 123, 245, 130, - 130, 130, 130, 123, 242, 123, 123, 123, 244, 123, - 123, 123, 123, 123, 132, 123, 123, 123, 123, 123, - - 123, 253, 123, 123, 123, 352, 123, 247, 254, 252, - 248, 123, 123, 249, 250, 123, 258, 123, 255, 260, - 263, 265, 257, 256, 259, 280, 262, 244, 261, 123, - 266, 267, 264, 266, 245, 246, 123, 245, 282, 277, - 278, 123, 123, 123, 279, 123, 123, 269, 283, 123, - 123, 266, 267, 123, 266, 123, 350, 284, 281, 123, - 123, 287, 285, 123, 291, 288, 266, 267, 290, 266, - 266, 267, 286, 266, 123, 299, 301, 304, 123, 123, - 292, 123, 123, 269, 303, 300, 123, 123, 123, 123, - 123, 123, 305, 123, 302, 123, 307, 123, 323, 310, - - 306, 123, 123, 175, 123, 318, 123, 319, 317, 309, - 123, 308, 316, 321, 123, 335, 322, 329, 335, 123, - 330, 332, 320, 336, 337, 337, 331, 345, 338, 340, - 328, 338, 346, 335, 123, 339, 335, 343, 343, 343, - 343, 345, 355, 356, 349, 355, 342, 342, 342, 342, - 344, 349, 123, 341, 343, 343, 343, 343, 347, 349, - 342, 342, 342, 342, 344, 174, 349, 123, 343, 343, - 343, 343, 351, 351, 351, 351, 353, 123, 351, 351, - 351, 351, 354, 354, 354, 354, 355, 356, 123, 355, - 334, 333, 123, 123, 327, 326, 325, 324, 123, 354, - - 354, 354, 354, 20, 20, 20, 20, 20, 20, 20, - 20, 29, 29, 29, 29, 29, 29, 29, 29, 34, - 34, 34, 34, 34, 34, 34, 34, 45, 45, 45, - 45, 45, 45, 45, 45, 77, 77, 77, 77, 77, - 77, 77, 77, 82, 82, 82, 82, 82, 82, 82, - 82, 87, 87, 87, 87, 87, 87, 87, 87, 108, - 108, 123, 108, 108, 108, 108, 108, 112, 112, 123, - 112, 112, 112, 112, 112, 121, 121, 122, 122, 122, - 122, 131, 123, 131, 131, 131, 167, 167, 167, 167, - 167, 167, 167, 167, 179, 179, 123, 179, 179, 179, - - 179, 179, 186, 186, 186, 186, 186, 186, 186, 186, - 190, 190, 190, 190, 190, 190, 190, 190, 193, 315, - 193, 194, 194, 194, 194, 196, 196, 196, 196, 202, - 202, 202, 202, 202, 202, 202, 202, 204, 314, 204, - 204, 204, 226, 226, 313, 312, 226, 226, 241, 241, - 241, 241, 268, 268, 268, 268, 268, 268, 297, 297, - 311, 297, 297, 297, 297, 297, 348, 348, 171, 348, - 348, 348, 348, 348, 123, 123, 123, 123, 298, 296, - 295, 294, 293, 123, 123, 123, 123, 123, 123, 195, - 276, 275, 274, 273, 272, 270, 123, 132, 203, 123, - - 195, 195, 191, 240, 187, 239, 238, 237, 236, 235, - 234, 233, 232, 231, 230, 229, 228, 168, 227, 205, - 132, 203, 201, 200, 123, 123, 195, 191, 188, 187, - 185, 184, 180, 178, 99, 169, 168, 165, 165, 157, - 151, 123, 111, 101, 100, 99, 92, 357, 19, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - - 357, 357, 357 + 470, 25, 26, 27, 25, 30, 26, 27, 30, 34, + 35, 31, 470, 28, 34, 35, 470, 28, 36, 39, + 40, 146, 41, 36, 146, 42, 26, 99, 50, 51, + 43, 52, 111, 29, 112, 100, 37, 29, 50, 51, + 146, 52, 82, 82, 149, 44, 24, 24, 101, 26, + 99, 101, 32, 127, 53, 128, 26, 104, 102, 26, + 109, 181, 26, 109, 53, 105, 60, 60, 110, 60, + 60, 110, 146, 45, 46, 39, 40, 146, 41, 47, + 48, 42, 130, 60, 60, 130, 43, 146, 146, 24, + 24, 116, 106, 26, 104, 106, 147, 137, 117, 138, + + 146, 44, 107, 151, 160, 152, 118, 136, 136, 136, + 136, 153, 153, 153, 153, 146, 119, 148, 156, 139, + 131, 143, 143, 143, 143, 211, 155, 164, 183, 45, + 46, 24, 25, 26, 27, 25, 24, 24, 24, 54, + 24, 24, 24, 55, 56, 57, 58, 58, 58, 59, + 24, 24, 60, 60, 60, 60, 60, 60, 24, 24, + 24, 60, 60, 60, 61, 60, 60, 62, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 63, 60, 60, 60, 60, 60, 64, 24, 65, + 66, 114, 146, 146, 114, 123, 150, 146, 136, 136, + + 136, 136, 146, 146, 67, 146, 146, 271, 68, 146, + 69, 70, 71, 72, 172, 146, 73, 157, 124, 74, + 173, 158, 75, 76, 159, 146, 77, 162, 78, 79, + 146, 161, 163, 80, 81, 83, 165, 146, 115, 84, + 85, 171, 248, 24, 146, 146, 125, 126, 139, 200, + 140, 140, 140, 141, 146, 166, 177, 146, 167, 182, + 201, 178, 86, 87, 88, 89, 90, 146, 174, 73, + 464, 175, 74, 91, 92, 93, 94, 168, 169, 95, + 96, 78, 97, 146, 146, 146, 24, 157, 146, 170, + 142, 185, 187, 114, 159, 187, 114, 179, 216, 205, + + 176, 146, 188, 189, 190, 180, 191, 206, 168, 184, + 160, 193, 173, 207, 193, 186, 195, 196, 208, 197, + 170, 194, 211, 272, 130, 146, 198, 130, 199, 146, + 146, 146, 212, 209, 227, 227, 227, 227, 235, 210, + 115, 230, 230, 230, 230, 153, 153, 153, 153, 217, + 218, 139, 237, 140, 140, 140, 141, 236, 146, 146, + 155, 139, 131, 141, 141, 141, 141, 139, 146, 143, + 143, 143, 143, 146, 146, 146, 146, 244, 146, 146, + 146, 245, 146, 146, 146, 247, 246, 146, 146, 146, + 146, 146, 146, 146, 256, 146, 253, 146, 146, 146, + + 146, 146, 250, 254, 252, 146, 258, 249, 251, 255, + 257, 260, 263, 266, 259, 146, 146, 146, 262, 301, + 274, 261, 264, 146, 270, 461, 267, 275, 265, 268, + 273, 187, 318, 269, 187, 189, 190, 357, 191, 189, + 190, 188, 189, 250, 189, 190, 193, 189, 292, 193, + 195, 196, 146, 197, 195, 196, 194, 195, 195, 196, + 198, 195, 277, 227, 227, 227, 227, 230, 230, 230, + 230, 146, 295, 296, 146, 295, 146, 293, 153, 153, + 153, 153, 146, 146, 146, 146, 146, 146, 146, 146, + 146, 146, 146, 155, 146, 146, 146, 146, 303, 146, + + 146, 146, 294, 146, 146, 304, 298, 297, 146, 302, + 146, 316, 146, 299, 300, 311, 309, 305, 146, 307, + 310, 314, 306, 308, 313, 319, 320, 312, 315, 317, + 146, 322, 146, 146, 146, 146, 146, 321, 334, 329, + 330, 146, 329, 146, 207, 295, 296, 326, 295, 146, + 325, 323, 146, 328, 146, 324, 332, 146, 146, 146, + 146, 327, 146, 146, 146, 146, 146, 146, 340, 146, + 146, 146, 294, 346, 146, 146, 347, 146, 343, 348, + 341, 353, 351, 146, 342, 349, 352, 360, 345, 344, + 355, 354, 146, 358, 146, 350, 146, 146, 329, 330, + + 356, 329, 146, 359, 146, 361, 146, 146, 362, 364, + 329, 330, 146, 329, 352, 329, 330, 363, 329, 372, + 146, 365, 146, 374, 146, 146, 146, 332, 375, 146, + 146, 146, 146, 146, 146, 146, 146, 378, 146, 373, + 379, 146, 381, 385, 376, 384, 146, 388, 380, 146, + 377, 146, 146, 146, 146, 146, 383, 386, 392, 146, + 146, 382, 146, 146, 146, 146, 387, 146, 400, 389, + 401, 390, 399, 391, 146, 398, 404, 146, 146, 414, + 146, 146, 146, 146, 405, 210, 402, 403, 146, 412, + 146, 146, 410, 146, 406, 407, 146, 409, 420, 411, + + 421, 408, 146, 146, 146, 423, 424, 146, 426, 146, + 413, 433, 419, 146, 433, 434, 435, 435, 422, 436, + 146, 427, 436, 146, 437, 438, 146, 146, 425, 146, + 433, 468, 469, 433, 468, 429, 146, 146, 455, 428, + 441, 430, 449, 446, 446, 446, 446, 440, 439, 447, + 447, 447, 447, 450, 442, 448, 449, 444, 146, 447, + 447, 447, 447, 146, 443, 453, 146, 458, 146, 458, + 456, 451, 446, 446, 446, 446, 146, 146, 146, 146, + 452, 448, 458, 454, 458, 447, 447, 447, 447, 146, + 146, 445, 459, 460, 462, 462, 462, 462, 465, 209, + + 462, 462, 462, 462, 468, 469, 466, 468, 146, 146, + 463, 467, 467, 467, 467, 146, 146, 467, 467, 467, + 467, 24, 24, 24, 24, 24, 24, 24, 24, 33, + 33, 33, 33, 33, 33, 33, 33, 38, 38, 38, + 38, 38, 38, 38, 38, 49, 49, 49, 49, 49, + 49, 49, 49, 98, 98, 98, 98, 98, 98, 98, + 98, 103, 103, 103, 103, 103, 103, 103, 103, 108, + 108, 108, 108, 108, 108, 108, 108, 129, 129, 432, + 129, 129, 129, 129, 129, 133, 133, 431, 133, 133, + 133, 133, 133, 134, 134, 146, 134, 134, 134, 134, + + 134, 144, 144, 145, 145, 145, 145, 154, 146, 154, + 154, 154, 202, 202, 202, 202, 202, 202, 202, 202, + 214, 214, 146, 214, 214, 214, 214, 214, 221, 221, + 221, 221, 221, 221, 221, 221, 225, 225, 146, 225, + 225, 225, 225, 225, 228, 228, 228, 228, 228, 228, + 228, 228, 231, 418, 231, 232, 232, 232, 232, 234, + 234, 234, 234, 240, 240, 240, 240, 240, 240, 240, + 240, 242, 417, 242, 242, 242, 276, 276, 416, 415, + 276, 276, 291, 291, 291, 291, 331, 331, 331, 331, + 331, 331, 370, 370, 146, 370, 370, 370, 370, 370, + + 457, 457, 146, 457, 457, 457, 457, 457, 146, 146, + 146, 397, 396, 395, 394, 393, 206, 146, 146, 146, + 146, 146, 371, 369, 368, 367, 366, 146, 146, 146, + 146, 146, 146, 146, 146, 233, 339, 338, 337, 336, + 335, 333, 146, 155, 241, 146, 233, 233, 229, 224, + 224, 290, 222, 289, 288, 287, 286, 285, 284, 283, + 282, 281, 280, 279, 278, 203, 277, 243, 155, 241, + 239, 238, 146, 146, 233, 229, 226, 224, 223, 222, + 220, 219, 215, 213, 120, 204, 203, 200, 200, 192, + 186, 146, 135, 132, 122, 121, 120, 113, 470, 23, + + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470 } ; -static yyconst short int yy_chk[904] = +static yyconst short int yy_chk[1159] = { 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, - 3, 2, 24, 1, 24, 4, 4, 2, 3, 5, - 5, 39, 5, 39, 4, 5, 7, 7, 43, 7, - 5, 43, 1, 13, 13, 124, 2, 4, 8, 8, - 56, 8, 13, 26, 140, 5, 26, 124, 134, 2, - 15, 15, 7, 14, 14, 14, 14, 17, 17, 15, - 134, 56, 38, 14, 8, 43, 17, 57, 63, 5, - 5, 6, 6, 140, 6, 6, 6, 6, 16, 16, - 16, 16, 6, 18, 18, 38, 27, 26, 16, 51, - 198, 51, 18, 27, 57, 63, 65, 6, 58, 27, - - 50, 50, 50, 50, 61, 261, 61, 89, 27, 38, - 38, 53, 198, 53, 53, 53, 53, 58, 89, 261, - 65, 6, 6, 9, 9, 9, 9, 9, 9, 9, + 3, 2, 0, 1, 4, 4, 0, 2, 3, 5, + 5, 466, 5, 4, 63, 5, 17, 17, 7, 7, + 5, 7, 28, 1, 28, 17, 4, 2, 8, 8, + 92, 8, 13, 14, 63, 5, 13, 14, 18, 18, + 18, 18, 2, 43, 7, 43, 19, 19, 18, 21, + 21, 92, 22, 22, 8, 19, 13, 14, 21, 13, + 14, 22, 61, 5, 5, 6, 6, 70, 6, 6, + 6, 6, 47, 13, 14, 47, 6, 62, 68, 13, + 14, 31, 20, 20, 20, 20, 61, 56, 31, 56, + + 74, 6, 20, 66, 70, 66, 31, 55, 55, 55, + 55, 67, 67, 67, 67, 94, 31, 62, 68, 58, + 47, 58, 58, 58, 58, 464, 67, 74, 94, 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, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 11, 11, 66, - 52, 70, 52, 52, 52, 52, 60, 68, 60, 60, - 60, 60, 11, 73, 67, 11, 144, 11, 11, 11, - - 11, 69, 66, 11, 11, 64, 71, 11, 11, 144, - 68, 11, 70, 11, 11, 67, 73, 11, 11, 52, - 62, 62, 62, 62, 64, 69, 64, 72, 74, 64, - 103, 80, 135, 71, 80, 62, 71, 81, 81, 93, - 81, 80, 93, 97, 135, 96, 72, 72, 74, 81, - 85, 97, 74, 85, 86, 86, 72, 86, 96, 95, - 85, 126, 109, 96, 86, 109, 86, 95, 113, 113, - 113, 113, 95, 116, 116, 116, 116, 103, 103, 352, - 125, 126, 117, 93, 117, 117, 117, 117, 118, 133, - 118, 118, 118, 118, 130, 130, 130, 130, 120, 109, - - 120, 120, 120, 120, 125, 136, 137, 133, 138, 130, - 139, 142, 141, 143, 146, 145, 147, 149, 210, 152, - 148, 150, 152, 153, 153, 229, 153, 142, 136, 152, - 229, 210, 146, 143, 139, 141, 137, 143, 138, 145, - 148, 150, 158, 147, 149, 158, 154, 154, 148, 154, - 156, 156, 158, 156, 159, 159, 197, 159, 160, 160, - 199, 160, 162, 162, 159, 162, 159, 189, 189, 189, - 189, 192, 192, 192, 192, 201, 201, 206, 201, 205, - 205, 205, 205, 207, 197, 208, 209, 211, 199, 212, - 214, 215, 216, 217, 205, 218, 220, 219, 221, 242, - - 223, 212, 222, 224, 251, 350, 225, 206, 214, 211, - 207, 255, 249, 208, 209, 250, 218, 247, 215, 220, - 223, 225, 217, 216, 219, 251, 222, 242, 221, 253, - 226, 226, 224, 226, 245, 245, 256, 245, 255, 247, - 249, 257, 258, 259, 250, 262, 263, 226, 256, 260, - 264, 266, 266, 278, 266, 283, 346, 257, 253, 277, - 280, 260, 258, 284, 263, 260, 268, 268, 262, 268, - 269, 269, 259, 269, 282, 277, 280, 284, 285, 287, - 264, 288, 289, 268, 283, 278, 291, 292, 300, 299, - 302, 303, 285, 304, 282, 310, 288, 309, 311, 292, - - 287, 316, 317, 311, 318, 302, 321, 303, 300, 291, - 320, 289, 299, 309, 331, 325, 310, 317, 325, 329, - 318, 321, 304, 326, 326, 326, 320, 338, 327, 331, - 316, 327, 341, 335, 340, 329, 335, 336, 336, 336, - 336, 338, 355, 355, 345, 355, 335, 335, 335, 335, - 337, 348, 339, 334, 337, 337, 337, 337, 342, 345, - 342, 342, 342, 342, 343, 333, 348, 332, 343, 343, - 343, 343, 347, 347, 347, 347, 351, 330, 351, 351, - 351, 351, 353, 353, 353, 353, 354, 354, 328, 354, - 324, 323, 322, 319, 315, 314, 313, 312, 308, 354, - - 354, 354, 354, 358, 358, 358, 358, 358, 358, 358, - 358, 359, 359, 359, 359, 359, 359, 359, 359, 360, - 360, 360, 360, 360, 360, 360, 360, 361, 361, 361, - 361, 361, 361, 361, 361, 362, 362, 362, 362, 362, - 362, 362, 362, 363, 363, 363, 363, 363, 363, 363, - 363, 364, 364, 364, 364, 364, 364, 364, 364, 365, - 365, 307, 365, 365, 365, 365, 365, 366, 366, 306, - 366, 366, 366, 366, 366, 367, 367, 368, 368, 368, - 368, 369, 305, 369, 369, 369, 370, 370, 370, 370, - 370, 370, 370, 370, 371, 371, 301, 371, 371, 371, - - 371, 371, 372, 372, 372, 372, 372, 372, 372, 372, - 373, 373, 373, 373, 373, 373, 373, 373, 374, 298, - 374, 375, 375, 375, 375, 376, 376, 376, 376, 377, - 377, 377, 377, 377, 377, 377, 377, 378, 297, 378, - 378, 378, 379, 379, 296, 295, 379, 379, 380, 380, - 380, 380, 381, 381, 381, 381, 381, 381, 382, 382, - 294, 382, 382, 382, 382, 382, 383, 383, 293, 383, - 383, 383, 383, 383, 290, 286, 281, 279, 276, 274, - 273, 272, 271, 265, 254, 252, 248, 244, 243, 241, - 240, 236, 235, 234, 231, 228, 213, 204, 202, 196, - - 195, 194, 190, 188, 186, 183, 182, 181, 179, 178, - 177, 176, 174, 173, 171, 170, 169, 167, 163, 132, - 131, 129, 128, 127, 123, 122, 121, 115, 110, 107, - 105, 104, 102, 99, 94, 92, 91, 88, 87, 84, - 79, 55, 44, 33, 32, 28, 25, 19, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - 357, 357, 357, 357, 357, 357, 357, 357, 357, 357, - - 357, 357, 357 + 9, 9, 9, 9, 9, 9, 9, 9, 9, 11, + 11, 30, 181, 79, 30, 42, 65, 69, 65, 65, + + 65, 65, 75, 72, 11, 71, 73, 181, 11, 160, + 11, 11, 11, 11, 79, 78, 11, 69, 42, 11, + 79, 69, 11, 11, 69, 76, 11, 72, 11, 11, + 89, 71, 73, 11, 11, 15, 75, 90, 30, 15, + 15, 78, 160, 15, 86, 93, 42, 42, 57, 110, + 57, 57, 57, 57, 96, 76, 89, 77, 76, 93, + 110, 90, 15, 15, 15, 15, 15, 87, 86, 15, + 461, 86, 15, 15, 15, 15, 15, 77, 77, 15, + 15, 15, 15, 88, 91, 97, 15, 87, 95, 77, + 57, 96, 101, 114, 87, 101, 114, 91, 124, 116, + + 88, 182, 101, 102, 102, 91, 102, 116, 95, 95, + 88, 106, 97, 116, 106, 102, 107, 107, 117, 107, + 95, 106, 118, 182, 130, 147, 107, 130, 107, 460, + 148, 149, 118, 117, 136, 136, 136, 136, 147, 117, + 114, 139, 139, 139, 139, 153, 153, 153, 153, 124, + 124, 140, 149, 140, 140, 140, 140, 148, 156, 159, + 153, 141, 130, 141, 141, 141, 141, 143, 157, 143, + 143, 143, 143, 158, 161, 162, 163, 156, 164, 165, + 167, 157, 166, 168, 170, 159, 158, 169, 172, 174, + 171, 173, 175, 177, 167, 176, 165, 179, 180, 185, + + 183, 184, 162, 166, 164, 248, 169, 161, 163, 166, + 168, 171, 173, 176, 170, 265, 178, 235, 172, 248, + 184, 171, 174, 317, 180, 455, 177, 185, 175, 178, + 183, 187, 265, 179, 187, 188, 188, 317, 188, 189, + 189, 187, 189, 178, 191, 191, 193, 191, 235, 193, + 194, 194, 236, 194, 195, 195, 193, 195, 197, 197, + 194, 197, 194, 227, 227, 227, 227, 230, 230, 230, + 230, 237, 239, 239, 244, 239, 245, 236, 243, 243, + 243, 243, 246, 247, 249, 250, 252, 253, 254, 258, + 257, 255, 256, 243, 259, 263, 262, 260, 250, 264, + + 261, 267, 237, 454, 452, 252, 245, 244, 450, 249, + 269, 263, 266, 246, 247, 258, 256, 253, 268, 255, + 257, 261, 254, 255, 260, 266, 267, 259, 262, 264, + 270, 269, 271, 272, 273, 274, 275, 268, 279, 276, + 276, 292, 276, 297, 279, 295, 295, 273, 295, 299, + 272, 270, 300, 275, 301, 271, 276, 303, 305, 307, + 306, 274, 308, 310, 309, 313, 312, 315, 297, 311, + 319, 314, 292, 306, 321, 320, 307, 318, 301, 308, + 299, 312, 311, 322, 300, 309, 311, 320, 305, 303, + 314, 313, 323, 318, 325, 310, 326, 327, 329, 329, + + 315, 329, 340, 319, 341, 321, 343, 345, 322, 325, + 331, 331, 346, 331, 327, 332, 332, 323, 332, 340, + 347, 326, 348, 343, 351, 349, 352, 331, 345, 353, + 355, 358, 356, 359, 360, 361, 362, 348, 363, 341, + 349, 364, 352, 358, 346, 356, 365, 361, 351, 372, + 347, 373, 375, 376, 377, 378, 355, 359, 365, 383, + 384, 353, 385, 386, 387, 388, 360, 389, 375, 362, + 376, 363, 373, 364, 390, 372, 383, 391, 392, 393, + 398, 402, 399, 400, 384, 393, 377, 378, 403, 391, + 404, 406, 389, 408, 385, 386, 407, 388, 399, 390, + + 400, 387, 409, 412, 413, 403, 404, 420, 407, 423, + 392, 416, 398, 426, 416, 417, 417, 417, 402, 418, + 425, 408, 418, 427, 420, 423, 428, 429, 406, 430, + 433, 468, 468, 433, 468, 412, 439, 443, 445, 409, + 427, 413, 436, 433, 433, 433, 433, 426, 425, 434, + 434, 434, 434, 439, 428, 435, 436, 430, 440, 435, + 435, 435, 435, 442, 429, 443, 444, 449, 451, 457, + 446, 440, 446, 446, 446, 446, 453, 459, 441, 438, + 442, 447, 449, 444, 457, 447, 447, 447, 447, 463, + 437, 432, 451, 453, 456, 456, 456, 456, 462, 431, + + 462, 462, 462, 462, 467, 467, 463, 467, 424, 422, + 459, 465, 465, 465, 465, 421, 419, 467, 467, 467, + 467, 471, 471, 471, 471, 471, 471, 471, 471, 472, + 472, 472, 472, 472, 472, 472, 472, 473, 473, 473, + 473, 473, 473, 473, 473, 474, 474, 474, 474, 474, + 474, 474, 474, 475, 475, 475, 475, 475, 475, 475, + 475, 476, 476, 476, 476, 476, 476, 476, 476, 477, + 477, 477, 477, 477, 477, 477, 477, 478, 478, 415, + 478, 478, 478, 478, 478, 479, 479, 414, 479, 479, + 479, 479, 479, 480, 480, 411, 480, 480, 480, 480, + + 480, 481, 481, 482, 482, 482, 482, 483, 410, 483, + 483, 483, 484, 484, 484, 484, 484, 484, 484, 484, + 485, 485, 405, 485, 485, 485, 485, 485, 486, 486, + 486, 486, 486, 486, 486, 486, 487, 487, 401, 487, + 487, 487, 487, 487, 488, 488, 488, 488, 488, 488, + 488, 488, 489, 397, 489, 490, 490, 490, 490, 491, + 491, 491, 491, 492, 492, 492, 492, 492, 492, 492, + 492, 493, 396, 493, 493, 493, 494, 494, 395, 394, + 494, 494, 495, 495, 495, 495, 496, 496, 496, 496, + 496, 496, 497, 497, 382, 497, 497, 497, 497, 497, + + 498, 498, 381, 498, 498, 498, 498, 498, 380, 379, + 374, 371, 370, 369, 368, 367, 366, 357, 354, 350, + 344, 342, 339, 337, 336, 335, 334, 328, 324, 316, + 304, 302, 298, 294, 293, 291, 290, 286, 285, 284, + 281, 278, 251, 242, 240, 234, 233, 232, 228, 226, + 225, 223, 221, 218, 217, 216, 214, 213, 212, 211, + 209, 208, 206, 205, 204, 202, 198, 155, 154, 152, + 151, 150, 146, 145, 144, 138, 135, 134, 131, 128, + 126, 125, 123, 120, 115, 113, 112, 109, 108, 105, + 100, 60, 54, 48, 37, 36, 32, 29, 23, 470, + + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 470, 470, 470 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -770,6 +880,8 @@ static int parenth_depth = 0; static int before_comment = INITIAL; static gboolean class_after_c = FALSE; static int code_type = CCODE; +static int before_string; +static int property_paren_depth = 0; /* GTK+ doc stuff */ static char *gtk_doc_func = NULL; /* current gtk-doc func */ @@ -827,19 +939,23 @@ int yylex(void); #define C_CODE 2 -#define C_CODE_STRING 3 +#define CODE_STRING 3 #define CLASS_CODE 4 #define CLASS_CODE_I 5 -#define GTK_DOC_BEFORE_NAME 6 +#define PROPERTY_CODE 6 -#define GTK_DOC 7 +#define PROPERTY_CODE_I 7 -#define GTK_DOC_LINE 8 +#define GTK_DOC_BEFORE_NAME 8 -#line 843 "lex.yy.c" +#define GTK_DOC 9 + +#define GTK_DOC_LINE 10 + +#line 959 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -993,10 +1109,18 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 102 "lexer.l" +#line 106 "lexer.l" + + + +/* Avoid warning from flex, cuz flex sucks */ +#ifdef FLEX_SCANNER +yy_current_state = 0; +#endif + -#line 1000 "lex.yy.c" +#line 1124 "lex.yy.c" if ( yy_init ) { @@ -1045,14 +1169,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 >= 358 ) + if ( yy_current_state >= 471 ) 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] != 849 ); + while ( yy_base[yy_current_state] != 1100 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1083,7 +1207,7 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 104 "lexer.l" +#line 116 "lexer.l" { line_no++; REJECT; } YY_BREAK case 2: @@ -1091,7 +1215,7 @@ case 2: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 106 "lexer.l" +#line 118 "lexer.l" { /* Thy evil easter egg */ #define QQ(x) long x @@ -1119,12 +1243,12 @@ case 3: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 128 "lexer.l" +#line 140 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 4: YY_RULE_SETUP -#line 129 "lexer.l" +#line 141 "lexer.l" { if(look_for_includes==1) { char *p; @@ -1147,7 +1271,7 @@ case 5: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 146 "lexer.l" +#line 158 "lexer.l" { /* eat out gtk doc stuff */ BEGIN(GTK_DOC_BEFORE_NAME); @@ -1159,7 +1283,7 @@ case 6: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 151 "lexer.l" +#line 163 "lexer.l" { /* empty doc lines */ ; @@ -1170,7 +1294,7 @@ case 7: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 155 "lexer.l" +#line 167 "lexer.l" { char *p; BEGIN(GTK_DOC); @@ -1184,14 +1308,14 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 165 "lexer.l" +#line 177 "lexer.l" { BEGIN(CLASS_CODE_I); } YY_BREAK case 9: YY_RULE_SETUP -#line 168 "lexer.l" +#line 180 "lexer.l" { BEGIN(COMMENT); before_comment = CLASS_CODE_I; @@ -1202,7 +1326,7 @@ case 10: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 172 "lexer.l" +#line 184 "lexer.l" { /* empty doc lines */ add_to_cbuf(" *\n"); @@ -1210,7 +1334,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP -#line 176 "lexer.l" +#line 188 "lexer.l" { BEGIN(CLASS_CODE_I); add_gtk_doc_func(); @@ -1218,7 +1342,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 180 "lexer.l" +#line 192 "lexer.l" { fflush(stdout); add_to_cbuf(" * "); @@ -1227,14 +1351,14 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 185 "lexer.l" +#line 197 "lexer.l" { BEGIN(CLASS_CODE_I); } YY_BREAK case 14: YY_RULE_SETUP -#line 188 "lexer.l" +#line 200 "lexer.l" { BEGIN(COMMENT); before_comment = CLASS_CODE_I; @@ -1242,7 +1366,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 192 "lexer.l" +#line 204 "lexer.l" { BEGIN(CLASS_CODE_I); add_to_cbuf("\n"); @@ -1254,7 +1378,7 @@ case 16: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 197 "lexer.l" +#line 209 "lexer.l" { BEGIN(GTK_DOC); add_to_cbuf(yytext); @@ -1263,7 +1387,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 202 "lexer.l" +#line 214 "lexer.l" { fflush(stdout); add_to_cbuf(yytext); @@ -1274,7 +1398,7 @@ case 18: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 207 "lexer.l" +#line 219 "lexer.l" { add_to_cbuf(yytext); /*comment, ignore*/ } YY_BREAK case 19: @@ -1282,7 +1406,7 @@ case 19: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 208 "lexer.l" +#line 220 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 20: @@ -1290,17 +1414,17 @@ case 20: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 209 "lexer.l" +#line 221 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 21: YY_RULE_SETUP -#line 210 "lexer.l" +#line 222 "lexer.l" {BEGIN(COMMENT); before_comment = INITIAL; } YY_BREAK case 22: YY_RULE_SETUP -#line 211 "lexer.l" +#line 223 "lexer.l" { add_to_cbuf(yytext); BEGIN(COMMENT); @@ -1309,17 +1433,17 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 216 "lexer.l" +#line 228 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE; } YY_BREAK case 24: YY_RULE_SETUP -#line 217 "lexer.l" +#line 229 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } YY_BREAK case 25: YY_RULE_SETUP -#line 218 "lexer.l" +#line 230 "lexer.l" { if(before_comment == C_CODE) add_to_cbuf(yytext); BEGIN(before_comment); @@ -1327,7 +1451,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 222 "lexer.l" +#line 234 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); @@ -1335,7 +1459,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 226 "lexer.l" +#line 238 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); @@ -1343,7 +1467,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 231 "lexer.l" +#line 243 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1355,7 +1479,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 239 "lexer.l" +#line 251 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1367,7 +1491,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 248 "lexer.l" +#line 260 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1379,7 +1503,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 256 "lexer.l" +#line 268 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1391,7 +1515,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 264 "lexer.l" +#line 276 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1403,7 +1527,7 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 272 "lexer.l" +#line 284 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1417,7 +1541,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 282 "lexer.l" +#line 294 "lexer.l" { BEGIN(INITIAL); yylval.cbuf = cbuf; @@ -1429,81 +1553,97 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 291 "lexer.l" +#line 303 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 36: YY_RULE_SETUP -#line 292 "lexer.l" +#line 304 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 37: YY_RULE_SETUP -#line 293 "lexer.l" +#line 305 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 38: YY_RULE_SETUP -#line 294 "lexer.l" +#line 306 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 39: YY_RULE_SETUP -#line 295 "lexer.l" +#line 307 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 40: YY_RULE_SETUP -#line 296 "lexer.l" +#line 308 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 41: YY_RULE_SETUP -#line 298 "lexer.l" +#line 310 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 42: YY_RULE_SETUP -#line 299 "lexer.l" +#line 313 "lexer.l" { - BEGIN(C_CODE_STRING); + BEGIN(CODE_STRING); + before_string = C_CODE; add_to_cbuf(yytext); } YY_BREAK case 43: YY_RULE_SETUP -#line 303 "lexer.l" -{ add_to_cbuf(yytext); } +#line 318 "lexer.l" +{ + BEGIN(CODE_STRING); + before_string = PROPERTY_CODE_I; + add_to_cbuf(yytext); + } YY_BREAK case 44: YY_RULE_SETUP -#line 304 "lexer.l" -{ - BEGIN(C_CODE); - add_to_cbuf(yytext); - } +#line 323 "lexer.l" +{ add_to_cbuf(yytext); } YY_BREAK case 45: YY_RULE_SETUP -#line 308 "lexer.l" -{ add_to_cbuf(yytext); } +#line 324 "lexer.l" +{ + BEGIN(before_string); + add_to_cbuf(yytext); + if (before_string == PROPERTY_CODE_I) { + yylval.id = cbuf->str; + g_string_free (cbuf, FALSE); + cbuf = NULL; + return STRING; + } + } YY_BREAK case 46: YY_RULE_SETUP -#line 309 "lexer.l" +#line 334 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 47: YY_RULE_SETUP -#line 311 "lexer.l" +#line 335 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 48: +YY_RULE_SETUP +#line 337 "lexer.l" { parenth_depth++; add_to_cbuf(yytext); } YY_BREAK -case 48: +case 49: YY_RULE_SETUP -#line 315 "lexer.l" +#line 341 "lexer.l" { parenth_depth--; if(parenth_depth<0) { @@ -1517,19 +1657,19 @@ YY_RULE_SETUP add_to_cbuf(yytext); } YY_BREAK -case 49: +case 50: YY_RULE_SETUP -#line 328 "lexer.l" +#line 354 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 50: +case 51: YY_RULE_SETUP -#line 329 "lexer.l" +#line 355 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 51: +case 52: YY_RULE_SETUP -#line 331 "lexer.l" +#line 357 "lexer.l" { static int found_classes = 0; look_for_includes = 2; @@ -1543,36 +1683,56 @@ YY_RULE_SETUP return CLASS; } YY_BREAK -case 52: +case 53: *yy_cp = yy_hold_char; /* undo effects of setting up yytext */ yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 344 "lexer.l" +#line 370 "lexer.l" { - int maj = 0,min = 0,pl = 0; - int rmaj = 0,rmin = 0,rpl = 0; + int maj = 0, min = 0, pl = 0; + int rmaj = 0, rmin = 0, rpl = 0; + int effective_maj = 0; + int effective_rmaj = 0; char *p; - sscanf(VERSION,"%d.%d.%d",&rmaj,&rmin,&rpl); - p = strchr(yytext,'r'); - g_assert(p); /* we MUST have found it */ - sscanf(p,"requires %d.%d.%d",&maj,&min,&pl); + sscanf (VERSION, "%d.%d.%d", &rmaj, &rmin, &rpl); + effective_rmaj = rmaj; + if (rmin >= 90) + effective_rmaj = rmaj + 1; + + p = strchr (yytext,'r'); + g_assert (p); /* we MUST have found it */ + sscanf (p, "requires %d.%d.%d", &maj, &min, &pl); + effective_maj = maj; + if (min >= 90) + effective_maj = maj + 1; + if(rmaj < maj || (rmaj == maj && rmin < min) || (rmaj == maj && rmin == min && rpl < pl)) { + error_printf (GOB_ERROR, line_no, + "GOB version at least %d.%d.%d required " + "(this is %s)\n" + "To upgrade your gob, see: " + "http://www.5z.com/jirka/gob.html", + maj, min, pl, VERSION); + } + + if(effective_rmaj != effective_maj) { error_printf(GOB_ERROR, line_no, - "GOB version %d.%d.%d required " + "GOB major version %d required " "(this is %s)\n" "To upgrade your gob, see: " "http://www.5z.com/jirka/gob.html", - maj, min, pl, VERSION); + maj, VERSION); } + } YY_BREAK -case 53: +case 54: YY_RULE_SETUP -#line 365 "lexer.l" +#line 411 "lexer.l" { if(for_cpp) { error_printf(GOB_WARN, line_no, @@ -1583,174 +1743,282 @@ YY_RULE_SETUP REJECT; } YY_BREAK -case 54: +case 55: YY_RULE_SETUP -#line 375 "lexer.l" +#line 421 "lexer.l" {return FROM;} YY_BREAK -case 55: +case 56: YY_RULE_SETUP -#line 377 "lexer.l" +#line 423 "lexer.l" {return VOID;} YY_BREAK -case 56: +case 57: YY_RULE_SETUP -#line 378 "lexer.l" +#line 424 "lexer.l" {return STRUCT;} YY_BREAK -case 57: +case 58: YY_RULE_SETUP -#line 379 "lexer.l" +#line 425 "lexer.l" {return UNION;} YY_BREAK -case 58: +case 59: YY_RULE_SETUP -#line 380 "lexer.l" +#line 426 "lexer.l" {return ENUM;} YY_BREAK -case 59: +case 60: YY_RULE_SETUP -#line 381 "lexer.l" +#line 427 "lexer.l" {return SIGNED;} YY_BREAK -case 60: +case 61: YY_RULE_SETUP -#line 382 "lexer.l" +#line 428 "lexer.l" {return UNSIGNED;} YY_BREAK -case 61: +case 62: YY_RULE_SETUP -#line 383 "lexer.l" +#line 429 "lexer.l" {return LONG;} YY_BREAK -case 62: +case 63: YY_RULE_SETUP -#line 384 "lexer.l" +#line 430 "lexer.l" {return SHORT;} YY_BREAK -case 63: +case 64: YY_RULE_SETUP -#line 385 "lexer.l" +#line 431 "lexer.l" {return INT;} YY_BREAK -case 64: +case 65: YY_RULE_SETUP -#line 386 "lexer.l" +#line 432 "lexer.l" {return FLOAT;} YY_BREAK -case 65: +case 66: YY_RULE_SETUP -#line 387 "lexer.l" +#line 433 "lexer.l" {return DOUBLE;} YY_BREAK -case 66: +case 67: YY_RULE_SETUP -#line 388 "lexer.l" +#line 434 "lexer.l" {return CHAR;} YY_BREAK -case 67: +case 68: YY_RULE_SETUP -#line 389 "lexer.l" +#line 435 "lexer.l" {return CONST;} YY_BREAK -case 68: +case 69: YY_RULE_SETUP -#line 391 "lexer.l" +#line 437 "lexer.l" {return THREEDOTS;} YY_BREAK -case 69: +case 70: YY_RULE_SETUP -#line 393 "lexer.l" +#line 439 "lexer.l" {yylval.line = line_no; return PUBLIC;} YY_BREAK -case 70: +case 71: YY_RULE_SETUP -#line 394 "lexer.l" +#line 440 "lexer.l" {yylval.line = line_no; return PRIVATE;} YY_BREAK -case 71: +case 72: YY_RULE_SETUP -#line 395 "lexer.l" +#line 441 "lexer.l" {yylval.line = line_no; return PROTECTED;} YY_BREAK -case 72: +case 73: YY_RULE_SETUP -#line 396 "lexer.l" +#line 442 "lexer.l" {yylval.line = line_no; return CLASSWIDE;} YY_BREAK -case 73: +case 74: YY_RULE_SETUP -#line 397 "lexer.l" +#line 443 "lexer.l" {yylval.line = line_no; return ARGUMENT;} YY_BREAK -case 74: +case 75: YY_RULE_SETUP -#line 398 "lexer.l" +#line 444 "lexer.l" {yylval.line = line_no; return VIRTUAL;} YY_BREAK -case 75: +case 76: YY_RULE_SETUP -#line 399 "lexer.l" +#line 445 "lexer.l" {yylval.line = line_no; return SIGNAL;} YY_BREAK -case 76: +case 77: YY_RULE_SETUP -#line 400 "lexer.l" +#line 446 "lexer.l" {yylval.line = line_no; return OVERRIDE;} YY_BREAK -case 77: +case 78: YY_RULE_SETUP -#line 401 "lexer.l" +#line 447 "lexer.l" +{ + yylval.line = line_no; + BEGIN(PROPERTY_CODE); + return PROPERTY; + } + YY_BREAK +case 79: +YY_RULE_SETUP +#line 452 "lexer.l" +{ yylval.line = line_no; return NICK; } + YY_BREAK +case 80: +YY_RULE_SETUP +#line 453 "lexer.l" +{ yylval.line = line_no; return BLURB; } + YY_BREAK +case 81: +YY_RULE_SETUP +#line 454 "lexer.l" +{ yylval.line = line_no; return MAXIMUM; } + YY_BREAK +case 82: +YY_RULE_SETUP +#line 455 "lexer.l" +{ yylval.line = line_no; return MINIMUM; } + YY_BREAK +case 83: +YY_RULE_SETUP +#line 456 "lexer.l" +{ yylval.line = line_no; return DEFAULT_VALUE; } + YY_BREAK +case 84: +YY_RULE_SETUP +#line 457 "lexer.l" +{ yylval.line = line_no; return FLAGS; } + YY_BREAK +case 85: +YY_RULE_SETUP +#line 458 "lexer.l" +{ yylval.line = line_no; return TYPE; } + YY_BREAK +case 86: +YY_RULE_SETUP +#line 459 "lexer.l" +{ yylval.line = line_no; return FLAGS_TYPE; } + YY_BREAK +case 87: +YY_RULE_SETUP +#line 460 "lexer.l" +{ yylval.line = line_no; return ENUM_TYPE; } + YY_BREAK +case 88: +YY_RULE_SETUP +#line 461 "lexer.l" +{ yylval.line = line_no; return PARAM_TYPE; } + YY_BREAK +case 89: +YY_RULE_SETUP +#line 462 "lexer.l" +{ yylval.line = line_no; return BOXED_TYPE; } + YY_BREAK +case 90: +YY_RULE_SETUP +#line 463 "lexer.l" +{ yylval.line = line_no; return OBJECT_TYPE; } + YY_BREAK +case 91: +YY_RULE_SETUP +#line 464 "lexer.l" +{ + yylval.line = line_no; + property_paren_depth = 1; + BEGIN(PROPERTY_CODE_I); + return '('; + } + YY_BREAK +case 92: +YY_RULE_SETUP +#line 470 "lexer.l" +{ + yylval.line = line_no; + property_paren_depth++; + return '('; + } + YY_BREAK +case 93: +YY_RULE_SETUP +#line 475 "lexer.l" +{ + yylval.line = line_no; + property_paren_depth--; + if (property_paren_depth == 0) { + BEGIN(CLASS_CODE_I); + } + return ')'; + } + YY_BREAK +case 94: +YY_RULE_SETUP +#line 484 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 78: +case 95: YY_RULE_SETUP -#line 405 "lexer.l" +#line 488 "lexer.l" { /* this one is for a classname with a namespace */ yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 79: +case 96: YY_RULE_SETUP -#line 410 "lexer.l" +#line 493 "lexer.l" { /* this is for a classname with an empty namespace */ yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 80: +case 97: YY_RULE_SETUP -#line 415 "lexer.l" +#line 498 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 81: +case 98: YY_RULE_SETUP -#line 420 "lexer.l" +#line 502 "lexer.l" +{ + yylval.id = g_strdup(yytext); + return SINGLE_CHAR; + } + YY_BREAK +case 99: +YY_RULE_SETUP +#line 507 "lexer.l" { yylval.id = g_strdup(yytext); return ARRAY_DIM; } YY_BREAK -case 82: +case 100: YY_RULE_SETUP -#line 425 "lexer.l" +#line 512 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 83: +case 101: YY_RULE_SETUP -#line 429 "lexer.l" +#line 516 "lexer.l" { BEGIN(C_CODE); parenth_depth=1; @@ -1761,44 +2029,46 @@ YY_RULE_SETUP return '{'; } YY_BREAK -case 84: +case 102: YY_RULE_SETUP -#line 438 "lexer.l" +#line 525 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 85: +case 103: YY_RULE_SETUP -#line 443 "lexer.l" +#line 530 "lexer.l" ; /*ignore*/ YY_BREAK -case 86: +case 104: YY_RULE_SETUP -#line 445 "lexer.l" +#line 532 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 87: +case 105: YY_RULE_SETUP -#line 450 "lexer.l" +#line 537 "lexer.l" ; /*ignore*/ YY_BREAK -case 88: +case 106: YY_RULE_SETUP -#line 452 "lexer.l" +#line 539 "lexer.l" ECHO; YY_BREAK -#line 1796 "lex.yy.c" +#line 2064 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): - case YY_STATE_EOF(C_CODE_STRING): + case YY_STATE_EOF(CODE_STRING): case YY_STATE_EOF(CLASS_CODE): case YY_STATE_EOF(CLASS_CODE_I): + case YY_STATE_EOF(PROPERTY_CODE): + case YY_STATE_EOF(PROPERTY_CODE_I): case YY_STATE_EOF(GTK_DOC_BEFORE_NAME): case YY_STATE_EOF(GTK_DOC): case YY_STATE_EOF(GTK_DOC_LINE): @@ -2090,7 +2360,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 >= 358 ) + if ( yy_current_state >= 471 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2120,11 +2390,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 >= 358 ) + if ( yy_current_state >= 471 ) 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 == 357); + yy_is_jam = (yy_current_state == 470); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2682,7 +2952,7 @@ int main() return 0; } #endif -#line 452 "lexer.l" +#line 539 "lexer.l" /* Ugly warning avoiding */