X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/38fac18bf81df672821ebbac4130ce41f0a6c61f..308dc7bdfb924370cfd205f656eb0e83191d01a9:/src/lexer.c diff --git a/src/lexer.c b/src/lexer.c index dd2c64f..dde2475 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -284,80 +284,81 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 110 -#define YY_END_OF_BUFFER 111 -static yyconst short int yy_acclist[606] = +#define YY_NUM_RULES 113 +#define YY_END_OF_BUFFER 114 +static yyconst short int yy_acclist[615] = { 0, - 111, 108, 110, 107, 108, 110, 1, 109, 110, 108, - 109, 110, 108, 110, 108, 110, 108, 110, 98, 108, - 110, 98, 108, 110, 108, 110, 101, 108, 110, 101, - 108, 110, 101, 108, 110, 101, 108, 110, 107, 108, - 110, 108, 110, 108, 110, 101, 108, 110, 27, 108, - 110, 1, 28, 109, 110, 27, 108, 109, 110, 27, - 108, 110, 27, 108, 110, 27, 108, 110, 51, 108, - 110, 1, 52, 109, 110, 51, 108, 109, 110, 43, - 51, 108, 110, 51, 108, 110, 51, 108, 110, 51, - 108, 110, 49, 51, 108, 110, 50, 51, 108, 110, - - 51, 108, 110, 51, 108, 110, 47, 108, 110, 1, - 48, 109, 110, 47, 108, 109, 110, 46, 47, 108, - 110, 47, 108, 110, 47, 108, 110, 108, 110, 101, - 108, 110, 101, 108, 110, 101, 108, 110, 104, 108, - 110, 108, 110, 108, 110, 108, 110, 101, 108, 110, - 101, 108, 110, 101, 108, 110, 101, 108, 110, 101, - 108, 110, 101, 108, 110, 101, 108, 110, 101, 108, - 110, 101, 108, 110, 101, 108, 110, 101, 108, 110, - 101, 108, 110, 105, 108, 110, 106, 108, 110, 95, - 108, 110, 44, 108, 110, 96, 108, 110, 97, 108, - - 110, 101, 108, 110, 101, 108, 110, 101, 108, 110, - 101, 108, 110, 101, 108, 110, 101, 108, 110, 101, - 108, 110, 101, 108, 110, 101, 108, 110, 101, 108, - 110, 101, 108, 110, 101, 108, 110, 10, 108, 110, - 10, 108, 109, 110, 10, 108, 110, 10, 108, 110, - 10, 108, 110, 10, 108, 110, 15, 108, 110, 15, - 108, 109, 110, 15, 108, 110, 15, 108, 110, 15, - 108, 110, 15, 108, 110, 18, 108, 110, 18, 108, - 109, 110, 18, 108, 110, 18, 108, 110, 98, 22, - 98, 98, 100, 101, 99, 101, 101, 101, 101, 34, - - 101, 26, 23, 42, 35, 45, 24, 101, 101, 101, - 25, 103, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 9, 7, 14, 11, 13, 12, 14, 17, - 16, 102, 102, 98, 3, 98, 98, 100, 100, 99, - 101, 101, 101, 101, 29, 33, 101, 40, 36, 38, - 19, 20, 101, 101, 101, 73, 21, 101, 101, 101, - 101, 101, 101, 101, 68, 101, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - - 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 12, 100, 101, 55, 101, 101, 101, 30, 31, 32, - 101, 41, 37, 39, 101, 59, 101, 58, 101, 6, - 101, 71, 101, 101, 101, 101, 63, 101, 101, 66, - 101, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 60, 101, 101, 101, 101, 63, 101, 101, - 101, 101, 83, 101, 101, 101, 101, 89, 101, 8, - 53, 101, 54, 101, 56, 101, 101, 101, 58, 101, - 72, 101, 101, 69, 101, 101, 101, 101, 101, 101, - 67, 101, 101, 101, 101, 62, 101, 101, 101, 84, - - 101, 101, 101, 101, 88, 101, 101, 101, 101, 101, - 101, 101, 101, 70, 101, 101, 101, 101, 101, 74, - 101, 80, 101, 64, 101, 61, 101, 101, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 4, 101, 101, - 101, 101, 75, 101, 101, 101, 101, 79, 101, 101, - 101, 101, 101, 85, 101, 86, 101, 101, 101, 101, - 78, 101, 101, 81, 101, 82, 101, 101, 65, 101, - 101, 101, 101, 101, 101, 101, 77, 101, 76, 101, - 101, 101, 91, 101, 101, 101, 101, 4, 2, 93, - 101, 101, 90, 101, 101, 92, 101, 5, 101, 94, - - 101, 101, 87, 101, 57 + 114, 111, 113, 110, 111, 113, 1, 112, 113, 111, + 112, 113, 111, 113, 111, 113, 111, 113, 100, 111, + 113, 100, 111, 113, 111, 113, 104, 111, 113, 104, + 111, 113, 104, 111, 113, 104, 111, 113, 110, 111, + 113, 111, 113, 111, 113, 104, 111, 113, 29, 111, + 113, 1, 30, 112, 113, 29, 111, 112, 113, 29, + 111, 113, 29, 111, 113, 29, 111, 113, 53, 111, + 113, 1, 54, 112, 113, 53, 111, 112, 113, 45, + 53, 111, 113, 53, 111, 113, 53, 111, 113, 53, + 111, 113, 51, 53, 111, 113, 52, 53, 111, 113, + + 53, 111, 113, 53, 111, 113, 49, 111, 113, 1, + 50, 112, 113, 49, 111, 112, 113, 48, 49, 111, + 113, 49, 111, 113, 49, 111, 113, 111, 113, 104, + 111, 113, 104, 111, 113, 104, 111, 113, 107, 111, + 113, 111, 113, 111, 113, 111, 113, 104, 111, 113, + 104, 111, 113, 104, 111, 113, 104, 111, 113, 104, + 111, 113, 104, 111, 113, 104, 111, 113, 104, 111, + 113, 104, 111, 113, 104, 111, 113, 104, 111, 113, + 104, 111, 113, 108, 111, 113, 109, 111, 113, 97, + 111, 113, 46, 111, 113, 98, 111, 113, 99, 111, + + 113, 111, 113, 104, 111, 113, 104, 111, 113, 104, + 111, 113, 104, 111, 113, 104, 111, 113, 104, 111, + 113, 104, 111, 113, 104, 111, 113, 104, 111, 113, + 104, 111, 113, 104, 111, 113, 104, 111, 113, 10, + 111, 113, 10, 111, 112, 113, 10, 111, 113, 10, + 111, 113, 10, 111, 113, 10, 111, 113, 15, 111, + 113, 15, 111, 112, 113, 15, 111, 113, 15, 111, + 113, 15, 111, 113, 15, 111, 113, 18, 111, 113, + 18, 111, 112, 113, 18, 111, 113, 18, 111, 113, + 100, 23, 100, 100, 103, 104, 102, 104, 104, 104, + + 104, 36, 104, 28, 24, 44, 37, 47, 25, 104, + 104, 104, 26, 106, 104, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, + 104, 104, 27, 104, 104, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 104, 9, 7, 14, 13, 11, + 12, 14, 17, 16, 105, 105, 100, 3, 100, 100, + 103, 103, 102, 101, 102, 104, 104, 104, 104, 31, + 35, 104, 42, 38, 40, 19, 20, 104, 104, 104, + 75, 21, 104, 104, 104, 104, 104, 104, 104, 70, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, + + 104, 104, 104, 22, 104, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 104, 104, 12, 103, 102, 101, + 102, 104, 57, 104, 104, 104, 32, 33, 34, 104, + 43, 39, 41, 104, 61, 104, 60, 104, 6, 104, + 73, 104, 104, 104, 104, 65, 104, 104, 68, 104, + 104, 104, 104, 104, 104, 104, 104, 104, 104, 104, + 104, 62, 104, 104, 104, 104, 65, 104, 104, 104, + 104, 85, 104, 104, 104, 104, 91, 104, 8, 55, + 104, 56, 104, 58, 104, 104, 104, 60, 104, 74, + 104, 104, 71, 104, 104, 104, 104, 104, 104, 69, + + 104, 104, 104, 104, 64, 104, 104, 104, 86, 104, + 104, 104, 104, 90, 104, 104, 104, 104, 104, 104, + 104, 104, 72, 104, 104, 104, 104, 104, 76, 104, + 82, 104, 66, 104, 63, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 104, 104, 4, 104, 104, 104, + 104, 77, 104, 104, 104, 104, 81, 104, 104, 104, + 104, 104, 87, 104, 88, 104, 104, 104, 104, 80, + 104, 104, 83, 104, 84, 104, 104, 67, 104, 104, + 104, 104, 104, 104, 104, 79, 104, 78, 104, 104, + 104, 93, 104, 104, 104, 104, 4, 2, 95, 104, + + 104, 92, 104, 104, 94, 104, 5, 104, 96, 104, + 104, 89, 104, 59 } ; -static yyconst short int yy_accept[509] = +static yyconst short int yy_accept[517] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -368,53 +369,54 @@ static yyconst short int yy_accept[509] = 114, 118, 122, 125, 128, 130, 133, 136, 139, 142, 144, 146, 148, 151, 154, 157, 160, 163, 166, 169, 172, 175, 178, 181, 184, 187, 190, 193, 196, 199, - 202, 205, 208, 211, 214, 217, 220, 223, 226, 229, - - 232, 235, 238, 241, 245, 248, 251, 254, 257, 260, - 264, 267, 270, 273, 276, 279, 283, 286, 289, 289, - 289, 290, 291, 291, 291, 292, 292, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 300, 300, 300, 300, - 300, 300, 300, 301, 302, 303, 303, 303, 303, 303, - 303, 304, 304, 305, 305, 305, 306, 307, 308, 308, - 309, 310, 311, 311, 312, 312, 312, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 202, 204, 207, 210, 213, 216, 219, 222, 225, 228, + + 231, 234, 237, 240, 243, 247, 250, 253, 256, 259, + 262, 266, 269, 272, 275, 278, 281, 285, 288, 291, + 291, 291, 292, 293, 293, 293, 294, 294, 294, 295, + 296, 297, 298, 299, 300, 301, 302, 302, 302, 302, + 302, 302, 302, 302, 303, 304, 305, 305, 305, 305, + 305, 305, 306, 306, 307, 307, 307, 308, 309, 310, + 310, 311, 312, 313, 313, 314, 314, 314, 314, 315, + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, + 326, 327, 328, 329, 330, 331, 332, 333, 334, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 344, 344, 344, 345, 345, 346, 346, 346, 346, 347, - 348, 348, 350, 351, 352, 353, 353, 354, 355, 355, - 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, - 365, 365, 365, 365, 366, 366, 366, 367, 367, 367, - 368, 368, 369, 369, 369, 369, 370, 371, 371, 372, - 372, 372, 373, 374, 375, 376, 377, 377, 377, 378, - 378, 378, 379, 380, 381, 382, 383, 384, 385, 387, - 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, - 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, - 408, 409, 410, 411, 411, 412, 413, 414, 416, 417, - - 418, 418, 418, 418, 419, 419, 420, 421, 421, 422, - 422, 423, 424, 425, 425, 426, 428, 430, 430, 431, - 432, 434, 435, 436, 437, 439, 440, 442, 443, 444, - 445, 446, 447, 448, 449, 450, 451, 452, 453, 455, - 456, 457, 458, 460, 461, 462, 463, 465, 466, 467, - 468, 470, 470, 471, 471, 471, 473, 475, 477, 477, - 477, 477, 477, 477, 478, 478, 478, 479, 481, 483, - 484, 486, 487, 488, 489, 490, 491, 493, 494, 495, - 496, 498, 499, 500, 502, 503, 504, 505, 507, 508, - 509, 510, 511, 511, 511, 511, 511, 511, 512, 512, - - 512, 513, 514, 516, 517, 518, 519, 520, 522, 524, - 526, 528, 529, 530, 531, 532, 533, 534, 535, 536, - 537, 538, 538, 539, 539, 539, 540, 540, 540, 541, - 542, 543, 545, 546, 547, 548, 550, 551, 552, 553, - 554, 556, 558, 559, 560, 560, 560, 560, 560, 561, - 561, 561, 563, 564, 566, 568, 569, 571, 572, 573, - 574, 575, 576, 577, 577, 577, 577, 577, 577, 577, - 577, 577, 579, 581, 582, 583, 585, 586, 587, 588, - 588, 589, 589, 589, 589, 590, 590, 592, 593, 595, - 596, 598, 598, 598, 598, 599, 600, 602, 602, 602, - - 603, 603, 603, 605, 605, 605, 606, 606 + 345, 346, 347, 347, 347, 347, 348, 348, 349, 349, + 349, 350, 351, 351, 353, 354, 355, 356, 356, 357, + 358, 358, 359, 360, 361, 362, 363, 364, 366, 367, + 368, 369, 370, 370, 370, 370, 370, 371, 371, 371, + 372, 372, 372, 373, 373, 374, 374, 374, 374, 375, + 376, 376, 377, 377, 377, 378, 379, 380, 381, 382, + 382, 382, 383, 383, 383, 384, 385, 386, 387, 388, + 389, 390, 392, 393, 394, 395, 396, 397, 398, 399, + 400, 401, 402, 403, 404, 404, 405, 406, 407, 408, + 409, 410, 411, 412, 413, 414, 415, 416, 417, 417, + + 418, 418, 419, 420, 422, 423, 425, 426, 427, 427, + 427, 427, 428, 428, 429, 430, 430, 431, 431, 432, + 433, 434, 434, 435, 437, 439, 439, 440, 441, 443, + 444, 445, 446, 448, 449, 451, 452, 453, 454, 455, + 456, 457, 458, 459, 460, 461, 462, 464, 465, 466, + 467, 469, 470, 471, 472, 474, 475, 476, 477, 479, + 479, 480, 480, 480, 482, 484, 486, 486, 486, 486, + 486, 486, 487, 487, 487, 488, 490, 492, 493, 495, + 496, 497, 498, 499, 500, 502, 503, 504, 505, 507, + 508, 509, 511, 512, 513, 514, 516, 517, 518, 519, + + 520, 520, 520, 520, 520, 520, 521, 521, 521, 522, + 523, 525, 526, 527, 528, 529, 531, 533, 535, 537, + 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, + 547, 548, 548, 548, 549, 549, 549, 550, 551, 552, + 554, 555, 556, 557, 559, 560, 561, 562, 563, 565, + 567, 568, 569, 569, 569, 569, 569, 570, 570, 570, + 572, 573, 575, 577, 578, 580, 581, 582, 583, 584, + 585, 586, 586, 586, 586, 586, 586, 586, 586, 586, + 588, 590, 591, 592, 594, 595, 596, 597, 597, 598, + 598, 598, 598, 599, 599, 601, 602, 604, 605, 607, + + 607, 607, 607, 608, 609, 611, 611, 611, 612, 612, + 612, 614, 614, 614, 615, 615 } ; static yyconst int yy_ec[256] = @@ -459,133 +461,135 @@ static yyconst int yy_meta[60] = 8, 8, 8, 8, 8, 8, 8, 1, 1 } ; -static yyconst short int yy_base[536] = +static yyconst short int yy_base[546] = { 0, 0, 58, 58, 65, 69, 126, 80, 85, 60, 86, - 172, 1204, 102, 111, 225, 1203, 101, 149, 140, 158, - 162, 165, 1210, 1213, 1213, 1213, 1213, 1179, 163, 67, - 177, 225, 0, 1188, 42, 57, 45, 196, 103, 164, - 105, 1213, 1213, 1213, 1192, 114, 1178, 1213, 1213, 1213, - 1213, 169, 87, 0, 1213, 1213, 209, 1146, 1213, 1213, - 1213, 1213, 0, 212, 117, 130, 61, 149, 1213, 266, + 172, 1224, 102, 111, 225, 1223, 101, 149, 140, 158, + 162, 165, 1230, 1233, 1233, 1233, 1233, 1199, 163, 67, + 177, 225, 0, 1208, 42, 57, 45, 196, 103, 164, + 105, 1233, 1233, 1233, 1212, 114, 1198, 1233, 1233, 1233, + 1233, 169, 87, 0, 1233, 1233, 209, 1166, 1233, 1233, + 1233, 1233, 0, 212, 117, 130, 61, 149, 1233, 266, 175, 270, 197, 255, 49, 157, 139, 209, 201, 152, - 214, 270, 245, 272, 1213, 1213, 1213, 1213, 1213, 1213, - 261, 274, 278, 254, 273, 283, 277, 215, 218, 286, - - 276, 284, 1213, 1213, 1189, 326, 328, 334, 1213, 1213, - 1188, 339, 340, 341, 1199, 1198, 242, 355, 1190, 1189, - 346, 1213, 1195, 350, 357, 363, 0, 369, 1177, 1176, - 1175, 287, 339, 303, 315, 387, 1157, 388, 1152, 351, - 354, 218, 1213, 358, 1213, 0, 1182, 343, 1181, 1180, - 1213, 1186, 1213, 394, 1142, 1213, 1213, 1213, 1184, 377, - 378, 385, 1172, 1172, 1181, 397, 1152, 1153, 331, 384, - 388, 309, 391, 398, 399, 400, 402, 403, 409, 407, - 410, 404, 411, 413, 416, 414, 419, 422, 425, 427, - 429, 433, 438, 439, 440, 445, 447, 448, 1213, 475, - - 467, 488, 1213, 495, 1213, 497, 502, 510, 1213, 516, - 1166, 1213, 1213, 1213, 1213, 1170, 1169, 507, 1175, 1213, - 511, 0, 1157, 1156, 1155, 451, 455, 459, 472, 1125, - 1127, 1128, 1113, 1213, 1137, 1111, 1213, 1110, 1126, 467, - 1139, 1213, 1155, 1154, 1153, 1213, 1213, 1159, 1213, 1126, - 1157, 1213, 463, 487, 489, 1213, 531, 1156, 1213, 1127, - 525, 501, 511, 515, 516, 518, 519, 525, 1137, 526, - 527, 528, 531, 529, 530, 535, 533, 537, 548, 539, - 540, 542, 550, 552, 543, 551, 554, 555, 558, 573, - 574, 577, 578, 597, 1213, 1136, 582, 1135, 584, 585, - - 1101, 1116, 554, 1213, 1116, 1213, 1213, 1097, 588, 1124, - 1213, 1213, 1213, 1105, 589, 1128, 1127, 616, 1213, 593, - 1126, 591, 594, 600, 1125, 596, 1124, 601, 604, 606, - 608, 611, 605, 621, 612, 607, 610, 615, 1123, 630, - 619, 636, 639, 640, 641, 642, 1122, 643, 645, 646, - 1121, 667, 1213, 673, 678, 1120, 1119, 1118, 1096, 686, - 1089, 1098, 1101, 647, 0, 1080, 657, 652, 1112, 662, - 1111, 654, 665, 676, 678, 680, 1110, 681, 682, 683, - 1109, 684, 686, 1108, 688, 685, 689, 690, 691, 692, - 694, 696, 1077, 721, 1078, 1075, 1072, 711, 1099, 1086, - - 701, 712, 1095, 713, 714, 704, 716, 1087, 1086, 1077, - 1070, 722, 723, 730, 732, 734, 735, 738, 740, 737, - 741, 1044, 760, 712, 1043, 743, 1068, 1036, 745, 752, - 753, 1018, 751, 755, 760, 1006, 754, 766, 761, 769, - 989, 983, 775, 779, 944, 979, 924, 870, 798, 784, - 804, 889, 785, 888, 886, 787, 885, 792, 793, 794, - 795, 796, 797, 818, 897, 838, 838, 832, 838, 846, - 812, 819, 810, 805, 808, 801, 809, 812, 815, 562, - 1213, 460, 852, 860, 1213, 837, 465, 817, 340, 847, - 292, 273, 864, 866, 1213, 854, 234, 215, 873, 865, - - 150, 877, 172, 895, 897, 1213, 1213, 914, 923, 932, - 941, 950, 959, 968, 971, 975, 983, 992, 997, 1006, - 1015, 1020, 1023, 1027, 1035, 1044, 1053, 1062, 1067, 1075, - 1079, 1086, 1094, 1103, 1112 + 214, 270, 245, 272, 1233, 1233, 1233, 1233, 1233, 1233, + 236, 261, 274, 278, 254, 273, 283, 277, 218, 225, + + 286, 276, 284, 1233, 1233, 1209, 326, 328, 334, 1233, + 1233, 1208, 339, 340, 341, 1219, 1218, 320, 355, 1210, + 1209, 346, 1233, 1215, 350, 357, 363, 0, 369, 1197, + 1196, 1195, 287, 215, 309, 358, 387, 1177, 388, 1172, + 348, 358, 310, 1233, 376, 1233, 0, 1202, 344, 1201, + 1200, 1233, 1206, 1233, 395, 1162, 1233, 1233, 1233, 1204, + 378, 384, 385, 1192, 1192, 1201, 396, 1172, 1173, 389, + 387, 388, 397, 398, 399, 402, 403, 404, 333, 413, + 410, 409, 414, 415, 418, 420, 421, 1233, 1198, 422, + 292, 425, 426, 438, 427, 428, 437, 444, 441, 448, + + 446, 1233, 471, 486, 493, 1233, 495, 1233, 498, 500, + 506, 1233, 1185, 1233, 1233, 1233, 1233, 1189, 1188, 500, + 1194, 1233, 504, 0, 1176, 1175, 1174, 1173, 456, 460, + 490, 494, 1143, 1145, 1146, 1131, 1233, 1155, 1129, 1233, + 1128, 1144, 473, 1157, 1233, 1173, 1172, 1171, 1233, 1233, + 1177, 1233, 1144, 1175, 1233, 504, 505, 507, 1233, 526, + 1174, 1233, 1145, 522, 510, 511, 514, 515, 447, 522, + 516, 1155, 523, 524, 525, 528, 526, 527, 532, 531, + 534, 544, 536, 537, 1171, 1233, 539, 549, 562, 548, + 551, 555, 563, 567, 571, 572, 552, 574, 597, 1233, + + 610, 1153, 1152, 1151, 577, 1150, 581, 582, 1116, 1131, + 557, 1233, 1131, 1233, 1233, 1112, 586, 1139, 1233, 1233, + 1233, 1120, 587, 1143, 1142, 616, 1233, 594, 1141, 600, + 601, 603, 1140, 604, 1139, 605, 609, 606, 612, 616, + 610, 615, 624, 614, 625, 617, 1138, 620, 630, 621, + 458, 626, 638, 641, 1137, 643, 645, 647, 1136, 666, + 1233, 673, 679, 1135, 1134, 1133, 1111, 685, 1104, 1113, + 1116, 651, 0, 1095, 660, 653, 1127, 668, 1126, 669, + 672, 675, 674, 676, 1125, 678, 679, 680, 1124, 682, + 683, 1123, 686, 687, 684, 694, 692, 693, 697, 701, + + 1092, 721, 1093, 1090, 1087, 710, 1108, 1088, 709, 700, + 1103, 699, 714, 722, 723, 1094, 1087, 1074, 1073, 724, + 728, 730, 732, 733, 734, 736, 738, 737, 739, 1055, + 760, 712, 1040, 743, 1031, 993, 740, 751, 748, 993, + 745, 760, 753, 987, 747, 768, 773, 775, 979, 970, + 776, 778, 924, 907, 866, 872, 797, 788, 806, 891, + 781, 890, 889, 789, 888, 790, 791, 793, 794, 795, + 796, 817, 899, 847, 857, 831, 837, 845, 813, 868, + 860, 802, 807, 854, 804, 811, 806, 866, 1233, 839, + 851, 859, 1233, 829, 540, 838, 462, 809, 335, 273, + + 867, 859, 1233, 840, 237, 217, 873, 859, 150, 881, + 172, 899, 901, 1233, 1233, 918, 927, 936, 945, 954, + 963, 972, 975, 979, 987, 996, 1001, 1010, 1019, 1024, + 1027, 1031, 1039, 1048, 1057, 1066, 1071, 1080, 1088, 1092, + 1096, 1103, 1111, 1120, 1129 } ; -static yyconst short int yy_def[536] = +static yyconst short int yy_def[546] = { 0, - 507, 1, 508, 508, 509, 509, 510, 510, 1, 1, - 1, 11, 1, 1, 1, 15, 511, 511, 512, 512, - 513, 513, 507, 507, 507, 507, 507, 514, 507, 507, - 507, 507, 515, 516, 516, 516, 516, 507, 507, 507, - 516, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 517, 507, 507, 507, 507, 507, 507, - 507, 507, 518, 507, 507, 516, 516, 516, 507, 507, - 507, 519, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 507, 507, 507, 507, 507, 507, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - - 516, 516, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 520, - 507, 507, 521, 507, 507, 507, 522, 507, 523, 516, - 524, 516, 516, 516, 516, 507, 507, 507, 507, 507, - 507, 507, 507, 516, 507, 525, 507, 507, 507, 507, - 507, 526, 507, 507, 507, 507, 507, 507, 527, 516, - 516, 516, 507, 507, 528, 507, 529, 507, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 507, 507, - - 507, 507, 507, 530, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 521, 507, - 507, 522, 523, 531, 524, 516, 516, 516, 516, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 516, - 507, 507, 507, 507, 507, 507, 507, 526, 507, 507, - 527, 507, 516, 516, 516, 507, 507, 528, 507, 529, - 519, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 532, 507, 531, 516, 516, 516, 516, - - 507, 507, 507, 507, 507, 507, 507, 507, 516, 507, - 507, 507, 507, 507, 516, 516, 516, 507, 507, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 507, 507, 532, 507, 516, 516, 516, 507, 507, - 507, 507, 507, 516, 533, 507, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 507, 507, 507, 507, 507, 516, 507, 507, - - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 507, 507, 507, 507, 516, 507, 507, 516, 516, - 516, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 516, 507, 507, 507, 507, 516, 507, - 507, 516, 516, 516, 516, 516, 516, 516, 516, 516, - 516, 516, 516, 507, 534, 507, 507, 507, 507, 507, - 507, 516, 516, 516, 516, 516, 516, 516, 516, 534, - 507, 507, 507, 507, 507, 535, 516, 516, 516, 516, - 516, 507, 507, 535, 507, 516, 516, 507, 507, 516, - - 507, 507, 516, 507, 507, 507, 0, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507 + 515, 1, 516, 516, 517, 517, 518, 518, 1, 1, + 1, 11, 1, 1, 1, 15, 519, 519, 520, 520, + 521, 521, 515, 515, 515, 515, 515, 522, 515, 515, + 515, 515, 523, 524, 524, 524, 524, 515, 515, 515, + 524, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 525, 515, 515, 515, 515, 515, 515, + 515, 515, 526, 515, 515, 524, 524, 524, 515, 515, + 515, 527, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 515, 515, 515, 515, 515, 515, + 515, 524, 524, 524, 524, 524, 524, 524, 524, 524, + + 524, 524, 524, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 528, 515, 515, 529, 515, 515, 515, 530, 515, 531, + 524, 532, 524, 524, 524, 524, 515, 515, 515, 515, + 515, 515, 515, 515, 524, 515, 533, 515, 515, 515, + 515, 515, 534, 515, 515, 515, 515, 515, 515, 535, + 524, 524, 524, 515, 515, 536, 515, 537, 515, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 515, 538, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + + 524, 515, 515, 515, 515, 515, 539, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 529, 515, 515, 530, 531, 540, 532, 541, 524, 524, + 524, 524, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 524, 515, 515, 515, 515, 515, 515, 515, + 534, 515, 515, 535, 515, 524, 524, 524, 515, 515, + 536, 515, 537, 527, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 538, 515, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 542, 515, + + 515, 540, 532, 541, 524, 524, 524, 524, 515, 515, + 515, 515, 515, 515, 515, 515, 524, 515, 515, 515, + 515, 515, 524, 524, 524, 515, 515, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 515, + 515, 542, 515, 524, 524, 524, 515, 515, 515, 515, + 515, 524, 543, 515, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + + 515, 515, 515, 515, 515, 524, 515, 515, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 515, + 515, 515, 515, 524, 515, 515, 524, 524, 524, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 524, 515, 515, 515, 515, 524, 515, 515, 524, + 524, 524, 524, 524, 524, 524, 524, 524, 524, 524, + 524, 515, 544, 515, 515, 515, 515, 515, 515, 524, + 524, 524, 524, 524, 524, 524, 524, 544, 515, 515, + 515, 515, 515, 545, 524, 524, 524, 524, 524, 515, + + 515, 545, 515, 524, 524, 515, 515, 524, 515, 515, + 524, 515, 515, 515, 0, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515 } ; -static yyconst short int yy_nxt[1273] = +static yyconst short int yy_nxt[1293] = { 0, 24, 25, 26, 25, 27, 25, 24, 24, 24, 28, 24, 24, 24, 29, 30, 31, 32, 32, 32, 33, @@ -593,143 +597,146 @@ static yyconst short int yy_nxt[1273] = 24, 34, 34, 34, 35, 34, 36, 37, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 24, 24, 38, - 43, 131, 44, 38, 131, 39, 40, 43, 131, 44, - 45, 49, 46, 50, 65, 51, 131, 45, 52, 122, - 131, 123, 60, 53, 61, 132, 62, 60, 135, 61, - 47, 62, 64, 39, 66, 173, 34, 67, 54, 151, - - 65, 152, 133, 26, 138, 104, 134, 41, 138, 63, - 161, 68, 87, 105, 63, 138, 24, 69, 39, 138, - 66, 87, 34, 67, 131, 24, 55, 56, 49, 158, - 50, 159, 51, 57, 58, 52, 34, 68, 34, 34, - 53, 144, 26, 69, 110, 34, 139, 34, 34, 131, - 106, 26, 111, 104, 106, 54, 107, 139, 131, 112, - 26, 108, 110, 112, 26, 113, 116, 26, 131, 116, - 114, 131, 118, 160, 117, 147, 131, 117, 121, 121, - 121, 121, 175, 55, 56, 70, 71, 164, 162, 165, - 124, 131, 125, 125, 125, 126, 140, 136, 148, 238, - - 72, 136, 174, 141, 73, 178, 74, 75, 76, 77, - 154, 142, 78, 138, 154, 79, 131, 138, 80, 81, - 131, 143, 82, 68, 83, 84, 149, 150, 131, 85, - 86, 88, 127, 131, 131, 89, 90, 131, 124, 24, - 128, 128, 128, 128, 213, 137, 169, 177, 195, 155, - 196, 501, 139, 131, 176, 139, 214, 238, 91, 92, - 93, 94, 95, 179, 131, 78, 180, 239, 79, 96, - 97, 98, 99, 131, 131, 100, 101, 83, 102, 163, - 131, 121, 121, 121, 121, 166, 166, 166, 166, 131, - 184, 131, 131, 131, 170, 131, 131, 131, 171, 190, - - 168, 172, 131, 131, 187, 131, 131, 188, 498, 181, - 182, 131, 185, 170, 189, 192, 191, 194, 186, 226, - 172, 183, 131, 193, 173, 181, 197, 200, 131, 138, - 186, 200, 198, 138, 131, 202, 203, 183, 201, 204, - 206, 138, 208, 209, 206, 138, 210, 229, 199, 243, - 131, 207, 228, 211, 265, 212, 138, 213, 131, 131, - 138, 218, 218, 218, 218, 221, 221, 221, 221, 262, - 124, 139, 125, 125, 125, 126, 124, 131, 126, 126, - 126, 126, 124, 139, 128, 128, 128, 128, 136, 138, - 235, 227, 136, 138, 232, 154, 131, 131, 139, 154, - - 244, 245, 233, 131, 131, 236, 240, 131, 234, 253, - 131, 237, 166, 166, 166, 166, 263, 131, 131, 131, - 264, 131, 131, 131, 254, 255, 131, 168, 131, 131, - 131, 139, 131, 131, 155, 131, 137, 139, 131, 271, - 274, 131, 276, 266, 131, 268, 131, 270, 131, 272, - 267, 269, 131, 278, 281, 273, 275, 131, 131, 131, - 277, 286, 284, 279, 131, 280, 131, 131, 202, 203, - 131, 282, 204, 289, 131, 268, 200, 283, 131, 285, - 200, 290, 131, 288, 131, 292, 131, 201, 287, 202, - 203, 131, 492, 202, 291, 293, 202, 203, 206, 298, - - 202, 297, 206, 208, 209, 299, 131, 210, 131, 207, - 300, 208, 209, 315, 211, 208, 295, 208, 209, 309, - 131, 208, 218, 218, 218, 218, 221, 221, 221, 221, - 131, 316, 318, 319, 131, 131, 318, 131, 131, 317, - 166, 166, 166, 166, 131, 131, 131, 131, 131, 131, - 131, 324, 131, 320, 131, 168, 131, 326, 131, 131, - 321, 131, 131, 325, 327, 322, 323, 131, 481, 131, - 131, 131, 332, 131, 131, 339, 328, 131, 330, 333, - 334, 329, 331, 336, 342, 335, 341, 343, 337, 344, - 338, 340, 131, 131, 345, 346, 131, 131, 352, 353, - - 347, 131, 352, 131, 131, 361, 349, 131, 131, 348, - 131, 234, 131, 131, 351, 131, 355, 318, 319, 131, - 131, 318, 350, 131, 131, 131, 131, 131, 364, 131, - 131, 131, 356, 357, 131, 358, 373, 367, 131, 317, - 131, 368, 374, 370, 375, 369, 380, 371, 382, 131, - 372, 376, 381, 378, 385, 131, 377, 379, 131, 131, - 131, 131, 131, 384, 131, 131, 131, 383, 352, 353, - 387, 131, 352, 131, 352, 353, 131, 391, 352, 352, - 353, 131, 379, 352, 131, 389, 390, 394, 386, 392, - 388, 394, 355, 401, 404, 131, 398, 131, 403, 131, - - 131, 131, 131, 131, 131, 131, 402, 131, 131, 131, - 131, 131, 407, 131, 408, 131, 405, 410, 413, 414, - 131, 417, 394, 131, 409, 406, 394, 421, 415, 412, - 131, 131, 131, 131, 411, 131, 423, 423, 423, 423, - 416, 131, 131, 418, 419, 420, 429, 426, 431, 131, - 432, 131, 430, 131, 131, 433, 131, 131, 435, 131, - 131, 446, 131, 447, 131, 446, 436, 434, 443, 237, - 131, 131, 131, 131, 131, 423, 423, 423, 423, 131, - 131, 437, 441, 438, 442, 131, 440, 453, 131, 454, - 439, 456, 444, 449, 131, 457, 452, 459, 131, 468, - - 469, 470, 470, 468, 131, 471, 131, 455, 460, 471, - 458, 131, 131, 131, 131, 131, 131, 131, 486, 468, - 131, 472, 473, 468, 131, 461, 462, 131, 131, 131, - 476, 131, 486, 468, 131, 463, 131, 468, 131, 474, - 488, 487, 477, 495, 479, 489, 475, 483, 483, 483, - 483, 491, 478, 484, 484, 484, 484, 485, 495, 490, - 496, 484, 484, 484, 484, 493, 131, 483, 483, 483, - 483, 485, 495, 131, 482, 484, 484, 484, 484, 499, - 499, 499, 499, 497, 131, 236, 502, 495, 499, 499, - 499, 499, 504, 504, 504, 504, 505, 506, 505, 506, - - 505, 503, 505, 481, 131, 131, 500, 131, 131, 467, - 504, 504, 504, 504, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 48, 48, 48, 48, 48, 48, 48, - 48, 48, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 103, 103, 103, 103, 103, 103, 103, 103, 103, - 109, 109, 109, 109, 109, 109, 109, 109, 109, 115, - 115, 115, 115, 115, 115, 115, 115, 115, 119, 119, - 466, 119, 119, 119, 119, 119, 119, 129, 129, 130, - 130, 130, 130, 153, 153, 465, 153, 153, 153, 153, - 153, 153, 157, 157, 464, 157, 157, 157, 157, 157, - - 157, 167, 131, 167, 167, 167, 216, 216, 131, 216, - 216, 216, 216, 216, 216, 219, 219, 219, 219, 219, - 219, 219, 219, 219, 222, 131, 222, 223, 223, 223, - 223, 225, 225, 225, 225, 241, 241, 131, 241, 241, - 241, 241, 241, 241, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 260, 451, 260, 260, 260, 294, 294, 450, 448, - 445, 294, 294, 296, 296, 296, 296, 354, 354, 131, - 354, 354, 354, 354, 399, 399, 131, 399, 399, 399, - - 399, 399, 399, 480, 480, 131, 131, 480, 480, 480, - 480, 480, 494, 494, 131, 494, 494, 494, 494, 494, - 494, 428, 427, 425, 424, 233, 422, 131, 131, 131, - 131, 131, 400, 397, 396, 395, 393, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 366, 365, - 363, 362, 360, 359, 131, 224, 131, 168, 259, 252, - 314, 249, 313, 312, 311, 310, 308, 307, 306, 305, - 304, 303, 302, 301, 131, 224, 224, 220, 215, 215, - 295, 261, 168, 259, 257, 256, 252, 250, 249, 247, - 246, 242, 231, 230, 131, 131, 224, 220, 217, 215, - - 213, 213, 205, 199, 156, 146, 145, 131, 120, 507, - 39, 39, 23, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507 + 43, 132, 44, 38, 132, 39, 40, 43, 132, 44, + 45, 49, 46, 50, 65, 51, 132, 45, 52, 123, + 132, 124, 60, 53, 61, 133, 62, 60, 136, 61, + 47, 62, 64, 39, 66, 174, 34, 67, 54, 152, + + 65, 153, 134, 26, 139, 105, 135, 41, 139, 63, + 162, 68, 87, 106, 63, 139, 24, 69, 39, 139, + 66, 87, 34, 67, 132, 24, 55, 56, 49, 159, + 50, 160, 51, 57, 58, 52, 34, 68, 34, 34, + 53, 145, 26, 69, 111, 34, 140, 34, 34, 132, + 107, 26, 112, 105, 107, 54, 108, 140, 132, 113, + 26, 109, 111, 113, 26, 114, 117, 26, 132, 117, + 115, 132, 119, 161, 118, 148, 132, 118, 122, 122, + 122, 122, 176, 55, 56, 70, 71, 165, 163, 166, + 125, 132, 126, 126, 126, 127, 141, 137, 149, 241, + + 72, 137, 175, 142, 73, 179, 74, 75, 76, 77, + 155, 143, 78, 139, 155, 79, 132, 139, 80, 81, + 132, 144, 82, 68, 83, 84, 150, 151, 132, 85, + 86, 88, 128, 132, 132, 89, 90, 132, 125, 91, + 129, 129, 129, 129, 132, 138, 170, 178, 188, 156, + 189, 198, 140, 509, 177, 140, 132, 199, 92, 93, + 94, 95, 96, 180, 132, 78, 181, 230, 79, 97, + 98, 99, 100, 132, 132, 101, 102, 83, 103, 164, + 132, 122, 122, 122, 122, 167, 167, 167, 167, 132, + 185, 132, 132, 132, 171, 132, 132, 132, 172, 193, + + 169, 173, 132, 132, 190, 132, 132, 191, 506, 182, + 183, 132, 186, 171, 192, 195, 194, 197, 187, 229, + 173, 184, 215, 196, 174, 182, 200, 203, 132, 139, + 187, 203, 201, 139, 216, 205, 206, 184, 204, 207, + 209, 139, 211, 212, 209, 139, 211, 288, 202, 241, + 246, 210, 132, 213, 132, 214, 139, 215, 231, 242, + 139, 220, 220, 220, 220, 223, 223, 223, 223, 274, + 125, 140, 126, 126, 126, 127, 125, 132, 127, 127, + 127, 127, 125, 140, 129, 129, 129, 129, 137, 139, + 232, 235, 137, 139, 238, 132, 155, 132, 140, 236, + + 155, 247, 248, 132, 132, 237, 132, 132, 132, 239, + 256, 167, 167, 167, 167, 240, 132, 132, 132, 266, + 267, 132, 132, 132, 243, 258, 169, 265, 132, 132, + 257, 140, 132, 132, 132, 156, 138, 132, 140, 132, + 132, 132, 268, 277, 132, 132, 132, 132, 271, 273, + 269, 270, 279, 275, 272, 278, 132, 132, 281, 276, + 132, 284, 289, 132, 280, 132, 132, 132, 282, 283, + 291, 294, 203, 293, 287, 132, 203, 132, 290, 132, + 332, 132, 292, 204, 271, 295, 297, 205, 206, 395, + 296, 207, 132, 298, 205, 206, 205, 206, 205, 209, + + 205, 211, 212, 209, 306, 211, 305, 301, 212, 132, + 210, 301, 213, 132, 300, 220, 220, 220, 220, 223, + 223, 223, 223, 132, 132, 317, 132, 326, 327, 132, + 132, 326, 308, 132, 132, 132, 307, 167, 167, 167, + 167, 132, 132, 132, 132, 132, 132, 132, 334, 324, + 132, 132, 169, 132, 323, 132, 132, 325, 132, 132, + 329, 335, 328, 132, 330, 331, 333, 132, 132, 340, + 132, 132, 347, 336, 132, 338, 341, 342, 337, 339, + 344, 132, 132, 343, 345, 349, 132, 346, 348, 352, + 132, 132, 351, 132, 350, 353, 132, 358, 360, 361, + + 132, 132, 360, 354, 357, 132, 132, 356, 369, 355, + 359, 301, 212, 132, 237, 301, 363, 326, 327, 132, + 132, 326, 132, 132, 132, 132, 372, 364, 132, 132, + 365, 132, 366, 132, 132, 132, 132, 325, 375, 132, + 132, 381, 382, 132, 132, 132, 378, 386, 383, 132, + 376, 387, 377, 392, 380, 379, 384, 132, 388, 389, + 132, 385, 132, 390, 132, 393, 132, 360, 361, 391, + 132, 360, 132, 394, 360, 361, 396, 399, 360, 132, + 360, 361, 397, 387, 360, 398, 402, 132, 132, 400, + 402, 132, 363, 132, 132, 132, 409, 132, 132, 132, + + 406, 132, 132, 132, 411, 132, 132, 410, 415, 412, + 416, 132, 132, 132, 418, 421, 132, 422, 132, 132, + 132, 417, 402, 413, 414, 425, 402, 420, 132, 132, + 423, 419, 429, 132, 439, 424, 431, 431, 431, 431, + 438, 132, 132, 132, 426, 427, 434, 132, 428, 132, + 440, 132, 132, 132, 437, 132, 132, 132, 132, 132, + 443, 454, 132, 455, 132, 454, 132, 132, 451, 240, + 132, 444, 132, 441, 442, 431, 431, 431, 431, 132, + 449, 445, 450, 446, 462, 448, 461, 132, 465, 447, + 452, 460, 132, 457, 132, 132, 464, 132, 476, 467, + + 132, 463, 476, 466, 477, 478, 478, 479, 132, 132, + 132, 479, 132, 132, 132, 132, 132, 480, 476, 494, + 468, 132, 476, 132, 481, 132, 132, 470, 132, 484, + 132, 469, 476, 494, 471, 503, 476, 482, 495, 496, + 497, 485, 499, 487, 483, 505, 491, 491, 491, 491, + 503, 486, 492, 492, 492, 492, 493, 132, 498, 132, + 492, 492, 492, 492, 501, 503, 491, 491, 491, 491, + 493, 500, 489, 132, 492, 492, 492, 492, 132, 132, + 503, 504, 507, 507, 507, 507, 510, 132, 507, 507, + 507, 507, 508, 490, 239, 511, 512, 512, 512, 512, + + 513, 514, 513, 514, 513, 489, 513, 132, 132, 132, + 132, 475, 474, 473, 512, 512, 512, 512, 42, 42, + 42, 42, 42, 42, 42, 42, 42, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 59, 59, 59, 59, + 59, 59, 59, 59, 59, 104, 104, 104, 104, 104, + 104, 104, 104, 104, 110, 110, 110, 110, 110, 110, + 110, 110, 110, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 120, 120, 472, 120, 120, 120, 120, 120, + 120, 130, 130, 131, 131, 131, 131, 154, 154, 132, + 154, 154, 154, 154, 154, 154, 158, 158, 132, 158, + + 158, 158, 158, 158, 158, 168, 132, 168, 168, 168, + 218, 218, 132, 218, 218, 218, 218, 218, 218, 221, + 221, 221, 221, 221, 221, 221, 221, 221, 224, 459, + 224, 225, 225, 225, 225, 227, 227, 227, 227, 244, + 244, 458, 244, 244, 244, 244, 244, 244, 251, 251, + 251, 251, 251, 251, 251, 251, 251, 254, 254, 254, + 254, 254, 254, 254, 254, 254, 261, 261, 261, 261, + 261, 261, 261, 261, 261, 263, 456, 263, 263, 263, + 285, 285, 285, 285, 285, 285, 285, 285, 285, 299, + 299, 453, 132, 132, 299, 299, 302, 302, 302, 302, + + 304, 304, 304, 304, 362, 362, 132, 362, 362, 362, + 362, 407, 407, 132, 407, 407, 407, 407, 407, 407, + 488, 488, 132, 436, 488, 488, 488, 488, 488, 502, + 502, 435, 502, 502, 502, 502, 502, 502, 433, 432, + 236, 430, 132, 132, 132, 132, 132, 408, 405, 404, + 403, 401, 132, 132, 132, 132, 132, 132, 132, 132, + 132, 132, 132, 374, 373, 371, 370, 368, 367, 132, + 132, 303, 226, 286, 132, 169, 262, 255, 322, 252, + 321, 320, 319, 318, 316, 315, 314, 313, 312, 311, + 310, 309, 132, 303, 226, 226, 222, 217, 217, 300, + + 286, 264, 169, 262, 260, 259, 255, 253, 252, 250, + 249, 245, 234, 233, 228, 132, 226, 222, 219, 217, + 215, 215, 208, 202, 157, 147, 146, 132, 121, 515, + 39, 39, 23, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515 + } ; -static yyconst short int yy_chk[1273] = +static yyconst short int yy_chk[1293] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -751,126 +758,129 @@ static yyconst short int yy_chk[1273] = 20, 18, 20, 20, 21, 20, 21, 22, 68, 22, 20, 80, 22, 66, 21, 52, 76, 22, 29, 29, 29, 29, 77, 6, 6, 11, 11, 71, 68, 71, - 31, 503, 31, 31, 31, 31, 40, 38, 52, 501, + 31, 511, 31, 31, 31, 31, 40, 38, 52, 509, 11, 38, 76, 40, 11, 80, 11, 11, 11, 11, 57, 40, 11, 64, 57, 11, 73, 64, 11, 11, 79, 40, 11, 11, 11, 11, 52, 52, 78, 11, - 11, 15, 31, 81, 98, 15, 15, 99, 32, 15, - 32, 32, 32, 32, 117, 38, 73, 79, 98, 57, - 99, 498, 57, 497, 78, 64, 117, 142, 15, 15, - 15, 15, 15, 81, 83, 15, 81, 142, 15, 15, - 15, 15, 15, 94, 74, 15, 15, 15, 15, 70, - 91, 70, 70, 70, 70, 72, 72, 72, 72, 82, - 83, 84, 95, 92, 74, 101, 97, 93, 74, 94, - - 72, 74, 96, 102, 91, 100, 132, 91, 492, 82, - 82, 491, 84, 92, 93, 96, 95, 97, 84, 132, - 92, 82, 134, 96, 93, 100, 100, 106, 172, 107, - 102, 106, 101, 107, 135, 108, 108, 100, 106, 108, - 112, 113, 114, 114, 112, 113, 114, 135, 108, 148, - 169, 112, 134, 114, 172, 114, 118, 118, 133, 489, - 118, 121, 121, 121, 121, 124, 124, 124, 124, 169, - 125, 107, 125, 125, 125, 125, 126, 144, 126, 126, - 126, 126, 128, 113, 128, 128, 128, 128, 136, 138, - 141, 133, 136, 138, 140, 154, 160, 161, 118, 154, - - 148, 148, 140, 170, 162, 141, 144, 171, 140, 160, - 173, 141, 166, 166, 166, 166, 170, 174, 175, 176, - 171, 177, 178, 182, 161, 162, 180, 166, 179, 181, - 183, 138, 184, 186, 154, 185, 136, 154, 187, 178, - 180, 188, 182, 173, 189, 175, 190, 177, 191, 179, - 174, 176, 192, 184, 186, 179, 181, 193, 194, 195, - 183, 191, 189, 184, 196, 185, 197, 198, 201, 201, - 226, 187, 201, 194, 227, 191, 200, 188, 228, 190, - 200, 195, 253, 193, 487, 197, 240, 200, 192, 202, - 202, 229, 482, 202, 196, 198, 204, 204, 206, 227, - - 204, 226, 206, 207, 207, 228, 254, 207, 255, 206, - 229, 208, 208, 253, 207, 208, 207, 210, 210, 240, - 262, 210, 218, 218, 218, 218, 221, 221, 221, 221, - 263, 254, 257, 257, 264, 265, 257, 266, 267, 255, - 261, 261, 261, 261, 268, 270, 271, 272, 274, 275, - 273, 266, 277, 262, 276, 261, 278, 268, 280, 281, - 263, 282, 285, 267, 270, 264, 265, 279, 480, 283, - 286, 284, 274, 287, 288, 281, 271, 289, 273, 275, - 276, 272, 273, 278, 284, 277, 283, 285, 279, 286, - 280, 282, 290, 291, 287, 288, 292, 293, 294, 294, - - 289, 297, 294, 299, 300, 303, 291, 309, 315, 290, - 322, 303, 320, 323, 293, 326, 294, 318, 318, 324, - 328, 318, 292, 329, 333, 330, 336, 331, 309, 337, - 332, 335, 297, 299, 338, 300, 329, 320, 341, 315, - 334, 322, 330, 324, 331, 323, 335, 326, 337, 340, - 328, 332, 336, 334, 341, 342, 333, 334, 343, 344, - 345, 346, 348, 340, 349, 350, 364, 338, 352, 352, - 343, 368, 352, 372, 354, 354, 367, 348, 354, 355, - 355, 370, 350, 355, 373, 345, 346, 360, 342, 349, - 344, 360, 354, 367, 372, 374, 364, 375, 370, 376, - - 378, 379, 380, 382, 386, 383, 368, 385, 387, 388, - 389, 390, 375, 391, 376, 392, 373, 379, 383, 385, - 401, 388, 394, 406, 378, 374, 394, 392, 386, 382, - 398, 402, 404, 405, 380, 407, 394, 394, 394, 394, - 387, 412, 413, 389, 390, 391, 401, 398, 404, 414, - 405, 415, 402, 416, 417, 406, 420, 418, 412, 419, - 421, 423, 426, 424, 429, 423, 413, 407, 420, 424, - 433, 430, 431, 437, 434, 423, 423, 423, 423, 435, - 439, 414, 418, 415, 419, 438, 417, 430, 440, 431, - 416, 434, 421, 426, 443, 435, 429, 438, 444, 449, - - 450, 450, 450, 449, 453, 451, 456, 433, 439, 451, - 437, 458, 459, 460, 461, 462, 463, 449, 471, 464, - 476, 453, 456, 464, 474, 440, 443, 475, 477, 473, - 460, 478, 471, 468, 479, 444, 488, 468, 472, 458, - 475, 474, 461, 486, 463, 477, 459, 468, 468, 468, - 468, 479, 462, 469, 469, 469, 469, 470, 486, 478, - 488, 470, 470, 470, 470, 483, 490, 483, 483, 483, - 483, 484, 494, 496, 467, 484, 484, 484, 484, 493, - 493, 493, 493, 490, 500, 466, 499, 494, 499, 499, - 499, 499, 502, 502, 502, 502, 504, 504, 505, 505, - - 504, 500, 505, 465, 457, 455, 496, 454, 452, 448, - 504, 504, 504, 504, 508, 508, 508, 508, 508, 508, - 508, 508, 508, 509, 509, 509, 509, 509, 509, 509, - 509, 509, 510, 510, 510, 510, 510, 510, 510, 510, - 510, 511, 511, 511, 511, 511, 511, 511, 511, 511, - 512, 512, 512, 512, 512, 512, 512, 512, 512, 513, - 513, 513, 513, 513, 513, 513, 513, 513, 514, 514, - 447, 514, 514, 514, 514, 514, 514, 515, 515, 516, - 516, 516, 516, 517, 517, 446, 517, 517, 517, 517, - 517, 517, 518, 518, 445, 518, 518, 518, 518, 518, - - 518, 519, 442, 519, 519, 519, 520, 520, 441, 520, - 520, 520, 520, 520, 520, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 522, 436, 522, 523, 523, 523, - 523, 524, 524, 524, 524, 525, 525, 432, 525, 525, - 525, 525, 525, 525, 526, 526, 526, 526, 526, 526, - 526, 526, 526, 527, 527, 527, 527, 527, 527, 527, - 527, 527, 528, 528, 528, 528, 528, 528, 528, 528, - 528, 529, 428, 529, 529, 529, 530, 530, 427, 425, - 422, 530, 530, 531, 531, 531, 531, 532, 532, 411, - 532, 532, 532, 532, 533, 533, 410, 533, 533, 533, - - 533, 533, 533, 534, 534, 409, 408, 534, 534, 534, - 534, 534, 535, 535, 403, 535, 535, 535, 535, 535, - 535, 400, 399, 397, 396, 395, 393, 384, 381, 377, - 371, 369, 366, 363, 362, 361, 359, 358, 357, 356, - 351, 347, 339, 327, 325, 321, 317, 316, 314, 310, - 308, 305, 302, 301, 298, 296, 269, 260, 258, 251, - 250, 248, 245, 244, 243, 241, 239, 238, 236, 235, - 233, 232, 231, 230, 225, 224, 223, 219, 217, 216, - 211, 168, 167, 165, 164, 163, 159, 155, 152, 150, - 149, 147, 139, 137, 131, 130, 129, 123, 120, 119, - - 116, 115, 111, 105, 58, 47, 45, 34, 28, 23, - 16, 12, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 507, 507, 507, 507, - 507, 507 + 11, 15, 31, 81, 134, 15, 15, 99, 32, 15, + 32, 32, 32, 32, 100, 38, 73, 79, 91, 57, + 91, 99, 57, 506, 78, 64, 505, 100, 15, 15, + 15, 15, 15, 81, 83, 15, 81, 134, 15, 15, + 15, 15, 15, 95, 74, 15, 15, 15, 15, 70, + 92, 70, 70, 70, 70, 72, 72, 72, 72, 82, + 83, 84, 96, 93, 74, 102, 98, 94, 74, 95, + + 72, 74, 97, 103, 92, 101, 133, 92, 500, 82, + 82, 191, 84, 93, 94, 97, 96, 98, 84, 133, + 93, 82, 118, 97, 94, 101, 101, 107, 135, 108, + 103, 107, 102, 108, 118, 109, 109, 101, 107, 109, + 113, 114, 115, 115, 113, 114, 115, 191, 109, 143, + 149, 113, 179, 115, 499, 115, 119, 119, 135, 143, + 119, 122, 122, 122, 122, 125, 125, 125, 125, 179, + 126, 108, 126, 126, 126, 126, 127, 136, 127, 127, + 127, 127, 129, 114, 129, 129, 129, 129, 137, 139, + 136, 141, 137, 139, 142, 145, 155, 161, 119, 141, + + 155, 149, 149, 162, 163, 141, 171, 172, 170, 142, + 161, 167, 167, 167, 167, 142, 173, 174, 175, 171, + 172, 176, 177, 178, 145, 163, 167, 170, 182, 181, + 162, 139, 180, 183, 184, 155, 137, 185, 155, 186, + 187, 190, 173, 181, 192, 193, 195, 196, 176, 178, + 174, 175, 183, 180, 177, 182, 197, 194, 185, 180, + 199, 187, 192, 198, 184, 201, 269, 200, 185, 186, + 194, 197, 203, 196, 190, 229, 203, 351, 193, 230, + 269, 497, 195, 203, 194, 198, 200, 204, 204, 351, + 199, 204, 243, 201, 205, 205, 207, 207, 205, 209, + + 207, 210, 210, 209, 230, 210, 229, 211, 211, 231, + 209, 211, 210, 232, 210, 220, 220, 220, 220, 223, + 223, 223, 223, 256, 257, 243, 258, 260, 260, 265, + 266, 260, 232, 267, 268, 271, 231, 264, 264, 264, + 264, 270, 273, 274, 275, 277, 278, 276, 271, 257, + 280, 279, 264, 281, 256, 283, 284, 258, 287, 495, + 266, 273, 265, 282, 267, 268, 270, 290, 288, 277, + 291, 297, 284, 274, 292, 276, 278, 279, 275, 276, + 281, 289, 293, 280, 282, 288, 294, 283, 287, 291, + 295, 296, 290, 298, 289, 292, 305, 297, 299, 299, + + 307, 308, 299, 293, 296, 317, 323, 295, 311, 294, + 298, 301, 301, 328, 311, 301, 299, 326, 326, 330, + 331, 326, 332, 334, 336, 338, 317, 305, 337, 341, + 307, 339, 308, 344, 342, 340, 346, 323, 328, 348, + 350, 337, 338, 343, 345, 352, 332, 342, 339, 349, + 330, 342, 331, 348, 336, 334, 340, 353, 343, 344, + 354, 341, 356, 345, 357, 349, 358, 360, 360, 346, + 372, 360, 376, 350, 362, 362, 352, 356, 362, 375, + 363, 363, 353, 358, 363, 354, 368, 378, 380, 357, + 368, 381, 362, 383, 382, 384, 375, 386, 387, 388, + + 372, 390, 391, 395, 378, 393, 394, 376, 383, 380, + 384, 397, 398, 396, 387, 391, 399, 393, 412, 410, + 400, 386, 402, 381, 382, 396, 402, 390, 409, 406, + 394, 388, 400, 413, 412, 395, 402, 402, 402, 402, + 410, 414, 415, 420, 397, 398, 406, 421, 399, 422, + 413, 423, 424, 425, 409, 426, 428, 427, 429, 437, + 420, 431, 434, 432, 441, 431, 445, 439, 428, 432, + 438, 421, 443, 414, 415, 431, 431, 431, 431, 442, + 426, 422, 427, 423, 439, 425, 438, 446, 443, 424, + 429, 437, 447, 434, 448, 451, 442, 452, 457, 446, + + 461, 441, 457, 445, 458, 458, 458, 459, 464, 466, + 467, 459, 468, 469, 470, 471, 457, 461, 472, 479, + 447, 482, 472, 485, 464, 487, 483, 451, 498, 468, + 486, 448, 476, 479, 452, 494, 476, 466, 482, 483, + 485, 469, 487, 471, 467, 498, 476, 476, 476, 476, + 494, 470, 477, 477, 477, 477, 478, 496, 486, 504, + 478, 478, 478, 478, 491, 502, 491, 491, 491, 491, + 492, 490, 488, 484, 492, 492, 492, 492, 508, 481, + 502, 496, 501, 501, 501, 501, 507, 480, 507, 507, + 507, 507, 504, 475, 474, 508, 510, 510, 510, 510, + + 512, 512, 513, 513, 512, 473, 513, 465, 463, 462, + 460, 456, 455, 454, 512, 512, 512, 512, 516, 516, + 516, 516, 516, 516, 516, 516, 516, 517, 517, 517, + 517, 517, 517, 517, 517, 517, 518, 518, 518, 518, + 518, 518, 518, 518, 518, 519, 519, 519, 519, 519, + 519, 519, 519, 519, 520, 520, 520, 520, 520, 520, + 520, 520, 520, 521, 521, 521, 521, 521, 521, 521, + 521, 521, 522, 522, 453, 522, 522, 522, 522, 522, + 522, 523, 523, 524, 524, 524, 524, 525, 525, 450, + 525, 525, 525, 525, 525, 525, 526, 526, 449, 526, + + 526, 526, 526, 526, 526, 527, 444, 527, 527, 527, + 528, 528, 440, 528, 528, 528, 528, 528, 528, 529, + 529, 529, 529, 529, 529, 529, 529, 529, 530, 436, + 530, 531, 531, 531, 531, 532, 532, 532, 532, 533, + 533, 435, 533, 533, 533, 533, 533, 533, 534, 534, + 534, 534, 534, 534, 534, 534, 534, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 536, 536, 536, 536, + 536, 536, 536, 536, 536, 537, 433, 537, 537, 537, + 538, 538, 538, 538, 538, 538, 538, 538, 538, 539, + 539, 430, 419, 418, 539, 539, 540, 540, 540, 540, + + 541, 541, 541, 541, 542, 542, 417, 542, 542, 542, + 542, 543, 543, 416, 543, 543, 543, 543, 543, 543, + 544, 544, 411, 408, 544, 544, 544, 544, 544, 545, + 545, 407, 545, 545, 545, 545, 545, 545, 405, 404, + 403, 401, 392, 389, 385, 379, 377, 374, 371, 370, + 369, 367, 366, 365, 364, 359, 355, 347, 335, 333, + 329, 325, 324, 322, 318, 316, 313, 310, 309, 306, + 304, 303, 302, 285, 272, 263, 261, 254, 253, 251, + 248, 247, 246, 244, 242, 241, 239, 238, 236, 235, + 234, 233, 228, 227, 226, 225, 221, 219, 218, 213, + + 189, 169, 168, 166, 165, 164, 160, 156, 153, 151, + 150, 148, 140, 138, 132, 131, 130, 124, 121, 120, + 117, 116, 112, 106, 58, 47, 45, 34, 28, 23, + 16, 12, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, + 515, 515 + } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -912,9 +922,10 @@ char *yytext; #line 22 "lexer.l" #include "config.h" -#include +#include #include #include +#include #include "treefuncs.h" #include "parse.h" @@ -922,7 +933,13 @@ char *yytext; #include "util.h" static int parenth_depth = 0; -static int before_comment = INITIAL; +static int before_comment +/* New flex is on drugs */ +#if defined(FLEX_SCANNER) && ! defined(INITIAL) + = 0; +#else + = INITIAL; +#endif static gboolean class_after_c = FALSE; static int code_type = CCODE; static int before_string; @@ -1002,7 +1019,7 @@ int yylex(void); #define GTK_DOC_LINE 10 -#line 1006 "lex.yy.c" +#line 1023 "lexer.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1156,7 +1173,7 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 109 "lexer.l" +#line 116 "lexer.l" @@ -1167,7 +1184,7 @@ yy_current_state = 0; -#line 1171 "lex.yy.c" +#line 1188 "lexer.c" if ( yy_init ) { @@ -1216,14 +1233,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 >= 508 ) + if ( yy_current_state >= 516 ) 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] != 1213 ); + while ( yy_base[yy_current_state] != 1233 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1254,7 +1271,7 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 119 "lexer.l" +#line 126 "lexer.l" { line_no++; REJECT; } YY_BREAK case 2: @@ -1262,7 +1279,7 @@ case 2: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 121 "lexer.l" +#line 128 "lexer.l" { /* Thy evil easter egg */ #define QQ(x) long x @@ -1290,12 +1307,12 @@ case 3: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 143 "lexer.l" +#line 150 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 4: YY_RULE_SETUP -#line 145 "lexer.l" +#line 152 "lexer.l" { char *p; char *number; @@ -1335,7 +1352,7 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 182 "lexer.l" +#line 189 "lexer.l" { if(look_for_includes==1) { char *p; @@ -1358,7 +1375,7 @@ case 6: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 199 "lexer.l" +#line 206 "lexer.l" { /* eat out gtk doc stuff */ BEGIN(GTK_DOC_BEFORE_NAME); @@ -1370,7 +1387,7 @@ case 7: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 204 "lexer.l" +#line 211 "lexer.l" { /* empty doc lines */ ; @@ -1381,7 +1398,7 @@ case 8: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 208 "lexer.l" +#line 215 "lexer.l" { char *p; BEGIN(GTK_DOC); @@ -1395,14 +1412,14 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 218 "lexer.l" +#line 225 "lexer.l" { BEGIN(CLASS_CODE_I); } YY_BREAK case 10: YY_RULE_SETUP -#line 221 "lexer.l" +#line 228 "lexer.l" { BEGIN(COMMENT); before_comment = CLASS_CODE_I; @@ -1413,7 +1430,7 @@ case 11: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 225 "lexer.l" +#line 232 "lexer.l" { /* empty doc lines */ add_to_cbuf(" *\n"); @@ -1421,7 +1438,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 229 "lexer.l" +#line 236 "lexer.l" { BEGIN(CLASS_CODE_I); add_gtk_doc_func(); @@ -1429,7 +1446,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 233 "lexer.l" +#line 240 "lexer.l" { fflush(stdout); add_to_cbuf(" * "); @@ -1438,14 +1455,14 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 238 "lexer.l" +#line 245 "lexer.l" { BEGIN(CLASS_CODE_I); } YY_BREAK case 15: YY_RULE_SETUP -#line 241 "lexer.l" +#line 248 "lexer.l" { BEGIN(COMMENT); before_comment = CLASS_CODE_I; @@ -1453,7 +1470,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 245 "lexer.l" +#line 252 "lexer.l" { BEGIN(CLASS_CODE_I); add_to_cbuf("\n"); @@ -1465,7 +1482,7 @@ case 17: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 250 "lexer.l" +#line 257 "lexer.l" { BEGIN(GTK_DOC); add_to_cbuf(yytext); @@ -1474,7 +1491,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 255 "lexer.l" +#line 262 "lexer.l" { fflush(stdout); add_to_cbuf(yytext); @@ -1485,7 +1502,7 @@ case 19: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 260 "lexer.l" +#line 267 "lexer.l" { add_to_cbuf(yytext); /*comment, ignore*/ } YY_BREAK case 20: @@ -1493,7 +1510,7 @@ case 20: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 261 "lexer.l" +#line 268 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 21: @@ -1501,60 +1518,73 @@ case 21: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 262 "lexer.l" +#line 269 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 22: +*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 263 "lexer.l" -{BEGIN(COMMENT); before_comment = INITIAL; } +#line 270 "lexer.l" +{ ; /*comment, ignore*/ } YY_BREAK case 23: YY_RULE_SETUP -#line 264 "lexer.l" +#line 271 "lexer.l" +{BEGIN(COMMENT); before_comment = INITIAL; } + YY_BREAK +case 24: +YY_RULE_SETUP +#line 272 "lexer.l" { add_to_cbuf(yytext); BEGIN(COMMENT); before_comment = C_CODE; } YY_BREAK -case 24: +case 25: YY_RULE_SETUP -#line 269 "lexer.l" +#line 277 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE; } YY_BREAK -case 25: +case 26: YY_RULE_SETUP -#line 270 "lexer.l" +#line 278 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } YY_BREAK -case 26: +case 27: YY_RULE_SETUP -#line 271 "lexer.l" +#line 279 "lexer.l" +{BEGIN(COMMENT); before_comment = PROPERTY_CODE_I; } + YY_BREAK +case 28: +YY_RULE_SETUP +#line 280 "lexer.l" { if(before_comment == C_CODE) add_to_cbuf(yytext); BEGIN(before_comment); } YY_BREAK -case 27: +case 29: YY_RULE_SETUP -#line 275 "lexer.l" +#line 284 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); } YY_BREAK -case 28: +case 30: YY_RULE_SETUP -#line 279 "lexer.l" +#line 288 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); } YY_BREAK -case 29: +case 31: YY_RULE_SETUP -#line 284 "lexer.l" +#line 293 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1564,9 +1594,9 @@ YY_RULE_SETUP ccode_line = line_no; } YY_BREAK -case 30: +case 32: YY_RULE_SETUP -#line 292 "lexer.l" +#line 301 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1576,9 +1606,9 @@ YY_RULE_SETUP ccode_line = line_no; } YY_BREAK -case 31: +case 33: YY_RULE_SETUP -#line 301 "lexer.l" +#line 310 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1588,9 +1618,9 @@ YY_RULE_SETUP ccode_line = line_no; } YY_BREAK -case 32: +case 34: YY_RULE_SETUP -#line 309 "lexer.l" +#line 318 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1600,9 +1630,9 @@ YY_RULE_SETUP ccode_line = line_no; } YY_BREAK -case 33: +case 35: YY_RULE_SETUP -#line 317 "lexer.l" +#line 326 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1612,9 +1642,9 @@ YY_RULE_SETUP ccode_line = line_no; } YY_BREAK -case 34: +case 36: YY_RULE_SETUP -#line 325 "lexer.l" +#line 334 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1626,9 +1656,9 @@ YY_RULE_SETUP look_for_includes=1; } YY_BREAK -case 35: +case 37: YY_RULE_SETUP -#line 335 "lexer.l" +#line 344 "lexer.l" { BEGIN(INITIAL); yylval.cbuf = cbuf; @@ -1638,67 +1668,67 @@ YY_RULE_SETUP return code_type; } YY_BREAK -case 36: -YY_RULE_SETUP -#line 344 "lexer.l" -{ add_to_cbuf(yytext); } - YY_BREAK -case 37: -YY_RULE_SETUP -#line 345 "lexer.l" -{ add_to_cbuf(yytext); } - YY_BREAK case 38: YY_RULE_SETUP -#line 346 "lexer.l" +#line 353 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 39: YY_RULE_SETUP -#line 347 "lexer.l" +#line 354 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 40: YY_RULE_SETUP -#line 348 "lexer.l" +#line 355 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 41: YY_RULE_SETUP -#line 349 "lexer.l" +#line 356 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 42: YY_RULE_SETUP -#line 351 "lexer.l" +#line 357 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 43: YY_RULE_SETUP -#line 354 "lexer.l" +#line 358 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 44: +YY_RULE_SETUP +#line 360 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 45: +YY_RULE_SETUP +#line 363 "lexer.l" { BEGIN(CODE_STRING); before_string = C_CODE; add_to_cbuf(yytext); } YY_BREAK -case 44: +case 46: YY_RULE_SETUP -#line 359 "lexer.l" +#line 368 "lexer.l" { BEGIN(CODE_STRING); before_string = PROPERTY_CODE_I; add_to_cbuf(yytext); } YY_BREAK -case 45: +case 47: YY_RULE_SETUP -#line 364 "lexer.l" +#line 373 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 46: +case 48: YY_RULE_SETUP -#line 365 "lexer.l" +#line 374 "lexer.l" { BEGIN(before_string); add_to_cbuf(yytext); @@ -1710,27 +1740,27 @@ YY_RULE_SETUP } } YY_BREAK -case 47: +case 49: YY_RULE_SETUP -#line 375 "lexer.l" +#line 384 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 48: +case 50: YY_RULE_SETUP -#line 376 "lexer.l" +#line 385 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 49: +case 51: YY_RULE_SETUP -#line 378 "lexer.l" +#line 387 "lexer.l" { parenth_depth++; add_to_cbuf(yytext); } YY_BREAK -case 50: +case 52: YY_RULE_SETUP -#line 382 "lexer.l" +#line 391 "lexer.l" { parenth_depth--; if(parenth_depth<0) { @@ -1744,19 +1774,19 @@ YY_RULE_SETUP add_to_cbuf(yytext); } YY_BREAK -case 51: +case 53: YY_RULE_SETUP -#line 395 "lexer.l" +#line 404 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 52: +case 54: YY_RULE_SETUP -#line 396 "lexer.l" +#line 405 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 53: +case 55: YY_RULE_SETUP -#line 398 "lexer.l" +#line 407 "lexer.l" { static int found_classes = 0; look_for_includes = 2; @@ -1770,27 +1800,27 @@ YY_RULE_SETUP return CLASS; } YY_BREAK -case 54: +case 56: YY_RULE_SETUP -#line 411 "lexer.l" +#line 420 "lexer.l" { return ERROR; } YY_BREAK -case 55: +case 57: YY_RULE_SETUP -#line 412 "lexer.l" +#line 421 "lexer.l" { return ENUM; } YY_BREAK -case 56: +case 58: YY_RULE_SETUP -#line 413 "lexer.l" +#line 422 "lexer.l" { return FLAGS; } YY_BREAK -case 57: +case 59: *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 415 "lexer.l" +#line 424 "lexer.l" { int maj = 0, min = 0, pl = 0; int rmaj = 0, rmin = 0, rpl = 0; @@ -1832,9 +1862,9 @@ YY_RULE_SETUP } YY_BREAK -case 58: +case 60: YY_RULE_SETUP -#line 456 "lexer.l" +#line 465 "lexer.l" { if(for_cpp) { error_printf(GOB_WARN, line_no, @@ -1845,193 +1875,193 @@ YY_RULE_SETUP REJECT; } YY_BREAK -case 59: +case 61: YY_RULE_SETUP -#line 466 "lexer.l" +#line 475 "lexer.l" {return FROM;} YY_BREAK -case 60: +case 62: YY_RULE_SETUP -#line 468 "lexer.l" +#line 477 "lexer.l" {return VOID;} YY_BREAK -case 61: +case 63: YY_RULE_SETUP -#line 469 "lexer.l" +#line 478 "lexer.l" {return STRUCT;} YY_BREAK -case 62: +case 64: YY_RULE_SETUP -#line 470 "lexer.l" +#line 479 "lexer.l" {return UNION;} YY_BREAK -case 63: +case 65: YY_RULE_SETUP -#line 471 "lexer.l" +#line 480 "lexer.l" {return ENUM;} YY_BREAK -case 64: +case 66: YY_RULE_SETUP -#line 472 "lexer.l" +#line 481 "lexer.l" {return SIGNED;} YY_BREAK -case 65: +case 67: YY_RULE_SETUP -#line 473 "lexer.l" +#line 482 "lexer.l" {return UNSIGNED;} YY_BREAK -case 66: +case 68: YY_RULE_SETUP -#line 474 "lexer.l" +#line 483 "lexer.l" {return LONG;} YY_BREAK -case 67: +case 69: YY_RULE_SETUP -#line 475 "lexer.l" +#line 484 "lexer.l" {return SHORT;} YY_BREAK -case 68: +case 70: YY_RULE_SETUP -#line 476 "lexer.l" +#line 485 "lexer.l" {return INT;} YY_BREAK -case 69: +case 71: YY_RULE_SETUP -#line 477 "lexer.l" +#line 486 "lexer.l" {return FLOAT;} YY_BREAK -case 70: +case 72: YY_RULE_SETUP -#line 478 "lexer.l" +#line 487 "lexer.l" {return DOUBLE;} YY_BREAK -case 71: +case 73: YY_RULE_SETUP -#line 479 "lexer.l" +#line 488 "lexer.l" {return CHAR;} YY_BREAK -case 72: +case 74: YY_RULE_SETUP -#line 480 "lexer.l" +#line 489 "lexer.l" {return CONST;} YY_BREAK -case 73: +case 75: YY_RULE_SETUP -#line 482 "lexer.l" +#line 491 "lexer.l" {return THREEDOTS;} YY_BREAK -case 74: +case 76: YY_RULE_SETUP -#line 484 "lexer.l" +#line 493 "lexer.l" {yylval.line = line_no; return PUBLIC;} YY_BREAK -case 75: +case 77: YY_RULE_SETUP -#line 485 "lexer.l" +#line 494 "lexer.l" {yylval.line = line_no; return PRIVATE;} YY_BREAK -case 76: +case 78: YY_RULE_SETUP -#line 486 "lexer.l" +#line 495 "lexer.l" {yylval.line = line_no; return PROTECTED;} YY_BREAK -case 77: +case 79: YY_RULE_SETUP -#line 487 "lexer.l" +#line 496 "lexer.l" {yylval.line = line_no; return CLASSWIDE;} YY_BREAK -case 78: +case 80: YY_RULE_SETUP -#line 488 "lexer.l" +#line 497 "lexer.l" {yylval.line = line_no; return ARGUMENT;} YY_BREAK -case 79: +case 81: YY_RULE_SETUP -#line 489 "lexer.l" +#line 498 "lexer.l" {yylval.line = line_no; return VIRTUAL;} YY_BREAK -case 80: +case 82: YY_RULE_SETUP -#line 490 "lexer.l" +#line 499 "lexer.l" {yylval.line = line_no; return SIGNAL;} YY_BREAK -case 81: +case 83: YY_RULE_SETUP -#line 491 "lexer.l" +#line 500 "lexer.l" {yylval.line = line_no; return OVERRIDE;} YY_BREAK -case 82: +case 84: YY_RULE_SETUP -#line 492 "lexer.l" +#line 501 "lexer.l" { yylval.line = line_no; BEGIN(PROPERTY_CODE); return PROPERTY; } YY_BREAK -case 83: +case 85: YY_RULE_SETUP -#line 497 "lexer.l" +#line 506 "lexer.l" { yylval.line = line_no; return NICK; } YY_BREAK -case 84: +case 86: YY_RULE_SETUP -#line 498 "lexer.l" +#line 507 "lexer.l" { yylval.line = line_no; return BLURB; } YY_BREAK -case 85: +case 87: YY_RULE_SETUP -#line 499 "lexer.l" +#line 508 "lexer.l" { yylval.line = line_no; return MAXIMUM; } YY_BREAK -case 86: +case 88: YY_RULE_SETUP -#line 500 "lexer.l" +#line 509 "lexer.l" { yylval.line = line_no; return MINIMUM; } YY_BREAK -case 87: +case 89: YY_RULE_SETUP -#line 501 "lexer.l" +#line 510 "lexer.l" { yylval.line = line_no; return DEFAULT_VALUE; } YY_BREAK -case 88: +case 90: YY_RULE_SETUP -#line 502 "lexer.l" +#line 511 "lexer.l" { yylval.line = line_no; return FLAGS; } YY_BREAK -case 89: +case 91: YY_RULE_SETUP -#line 503 "lexer.l" +#line 512 "lexer.l" { yylval.line = line_no; return TYPE; } YY_BREAK -case 90: +case 92: YY_RULE_SETUP -#line 504 "lexer.l" +#line 513 "lexer.l" { yylval.line = line_no; return FLAGS_TYPE; } YY_BREAK -case 91: +case 93: YY_RULE_SETUP -#line 505 "lexer.l" +#line 514 "lexer.l" { yylval.line = line_no; return ENUM_TYPE; } YY_BREAK -case 92: +case 94: YY_RULE_SETUP -#line 506 "lexer.l" +#line 515 "lexer.l" { yylval.line = line_no; return PARAM_TYPE; } YY_BREAK -case 93: +case 95: YY_RULE_SETUP -#line 507 "lexer.l" +#line 516 "lexer.l" { yylval.line = line_no; return BOXED_TYPE; } YY_BREAK -case 94: +case 96: YY_RULE_SETUP -#line 508 "lexer.l" +#line 517 "lexer.l" { yylval.line = line_no; return OBJECT_TYPE; } YY_BREAK -case 95: +case 97: YY_RULE_SETUP -#line 509 "lexer.l" +#line 518 "lexer.l" { yylval.line = line_no; property_paren_depth = 1; @@ -2039,18 +2069,18 @@ YY_RULE_SETUP return '('; } YY_BREAK -case 96: +case 98: YY_RULE_SETUP -#line 515 "lexer.l" +#line 524 "lexer.l" { yylval.line = line_no; property_paren_depth++; return '('; } YY_BREAK -case 97: +case 99: YY_RULE_SETUP -#line 520 "lexer.l" +#line 529 "lexer.l" { yylval.line = line_no; property_paren_depth--; @@ -2060,67 +2090,80 @@ YY_RULE_SETUP return ')'; } YY_BREAK -case 98: +case 100: YY_RULE_SETUP -#line 529 "lexer.l" +#line 538 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 99: +case 101: +YY_RULE_SETUP +#line 542 "lexer.l" +{ + /* This is cpp kind of token thingie */ + if (for_cpp) { + yylval.id = g_strdup(yytext); + return TOKEN; + } else { + REJECT; + } + } + YY_BREAK +case 102: YY_RULE_SETUP -#line 533 "lexer.l" +#line 551 "lexer.l" { /* this one is for a classname with a namespace */ yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 100: +case 103: YY_RULE_SETUP -#line 538 "lexer.l" +#line 556 "lexer.l" { /* this is for a classname with an empty namespace */ yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 101: +case 104: YY_RULE_SETUP -#line 543 "lexer.l" +#line 561 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 102: +case 105: YY_RULE_SETUP -#line 547 "lexer.l" +#line 565 "lexer.l" { yylval.id = g_strdup(yytext); return SINGLE_CHAR; } YY_BREAK -case 103: +case 106: YY_RULE_SETUP -#line 552 "lexer.l" +#line 570 "lexer.l" { yylval.id = g_strdup(yytext); return ARRAY_DIM; } YY_BREAK -case 104: +case 107: YY_RULE_SETUP -#line 557 "lexer.l" +#line 575 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 105: +case 108: YY_RULE_SETUP -#line 561 "lexer.l" +#line 579 "lexer.l" { BEGIN(C_CODE); parenth_depth=1; @@ -2131,38 +2174,38 @@ YY_RULE_SETUP return '{'; } YY_BREAK -case 106: +case 109: YY_RULE_SETUP -#line 570 "lexer.l" +#line 588 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 107: +case 110: YY_RULE_SETUP -#line 575 "lexer.l" +#line 593 "lexer.l" ; /*ignore*/ YY_BREAK -case 108: +case 111: YY_RULE_SETUP -#line 577 "lexer.l" +#line 595 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 109: +case 112: YY_RULE_SETUP -#line 582 "lexer.l" +#line 600 "lexer.l" ; /*ignore*/ YY_BREAK -case 110: +case 113: YY_RULE_SETUP -#line 584 "lexer.l" +#line 602 "lexer.l" ECHO; YY_BREAK -#line 2166 "lex.yy.c" +#line 2209 "lexer.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): @@ -2462,7 +2505,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 >= 508 ) + if ( yy_current_state >= 516 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2492,11 +2535,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 >= 508 ) + if ( yy_current_state >= 516 ) 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 == 507); + yy_is_jam = (yy_current_state == 515); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2549,6 +2592,7 @@ register char *yy_bp; #endif /* ifndef YY_NO_UNPUT */ +#ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput() #else @@ -2621,7 +2665,7 @@ static int input() return c; } - +#endif /* YY_NO_INPUT */ #ifdef YY_USE_PROTOS void yyrestart( FILE *input_file ) @@ -3049,16 +3093,5 @@ int main() return 0; } #endif -#line 584 "lexer.l" - - -/* Ugly warning avoiding */ -#ifdef FLEX_SCANNER -static void warning_avoider(void) G_GNUC_UNUSED; -static void warning_avoider(void) { - yy_flex_realloc(NULL, 0); - yyunput(0, NULL); - warning_avoider(); -} -#endif +#line 602 "lexer.l"