X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/1656cfade4879af0cb003e3847e58264caa5781f..b17287deb56775a49030d738d8c8c0e9cd15f9fe:/src/lexer.c diff --git a/src/lexer.c b/src/lexer.c index 2f0c716..c2d69fa 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -284,60 +284,60 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 85 -#define YY_END_OF_BUFFER 86 -static yyconst short int yy_acclist[422] = +#define YY_NUM_RULES 87 +#define YY_END_OF_BUFFER 88 +static yyconst short int yy_acclist[424] = { 0, - 86, 83, 85, 82, 83, 85, 1, 84, 85, 83, - 84, 85, 83, 85, 83, 85, 83, 85, 82, 83, - 85, 83, 85, 83, 85, 26, 83, 85, 1, 27, - 84, 85, 26, 83, 84, 85, 26, 83, 85, 26, - 83, 85, 47, 83, 85, 1, 48, 84, 85, 47, - 83, 84, 85, 40, 47, 83, 85, 47, 83, 85, - 47, 83, 85, 47, 83, 85, 47, 83, 85, 45, - 47, 83, 85, 46, 47, 83, 85, 47, 83, 85, - 47, 83, 85, 43, 83, 85, 1, 44, 84, 85, - 43, 83, 84, 85, 42, 43, 83, 85, 43, 83, - - 85, 43, 83, 85, 83, 85, 83, 85, 77, 83, - 85, 77, 83, 85, 77, 83, 85, 77, 83, 85, - 77, 83, 85, 79, 83, 85, 83, 85, 83, 85, - 75, 83, 85, 75, 83, 85, 83, 85, 77, 83, - 85, 77, 83, 85, 77, 83, 85, 77, 83, 85, - 77, 83, 85, 77, 83, 85, 77, 83, 85, 77, - 83, 85, 77, 83, 85, 77, 83, 85, 77, 83, - 85, 77, 83, 85, 80, 83, 85, 81, 83, 85, - 9, 83, 85, 9, 83, 84, 85, 9, 83, 85, - 9, 83, 85, 9, 83, 85, 9, 83, 85, 14, - - 83, 85, 14, 83, 84, 85, 14, 83, 85, 14, - 83, 85, 14, 83, 85, 14, 83, 85, 17, 83, - 85, 17, 83, 84, 85, 17, 83, 85, 17, 83, - 85, 21, 31, 25, 22, 39, 32, 41, 23, 77, - 76, 77, 77, 77, 77, 75, 24, 75, 75, 78, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 8, 6, - 13, 10, 12, 11, 13, 16, 15, 3, 30, 37, - 33, 35, 18, 19, 76, 77, 77, 77, 77, 66, - 75, 20, 75, 75, 77, 77, 77, 77, 77, 77, - - 61, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 11, 28, 29, 38, 34, - 36, 77, 77, 52, 77, 51, 77, 5, 77, 64, - 77, 77, 77, 56, 77, 77, 59, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 53, - 77, 7, 49, 77, 77, 65, 77, 77, 62, 77, - 77, 77, 77, 77, 77, 60, 77, 77, 77, 77, - 55, 77, 77, 77, 77, 77, 63, 77, 77, 77, - 77, 77, 67, 77, 72, 77, 57, 77, 54, 77, - 77, 77, 77, 77, 74, 77, 77, 68, 77, 77, - - 77, 71, 77, 77, 70, 77, 73, 77, 77, 58, - 77, 77, 69, 77, 77, 4, 77, 2, 2, 77, - 50 + 88, 85, 87, 84, 85, 87, 1, 86, 87, 85, + 86, 87, 85, 87, 85, 87, 85, 87, 84, 85, + 87, 85, 87, 85, 87, 26, 85, 87, 1, 27, + 86, 87, 26, 85, 86, 87, 26, 85, 87, 26, + 85, 87, 49, 85, 87, 1, 50, 86, 87, 49, + 85, 86, 87, 42, 49, 85, 87, 49, 85, 87, + 49, 85, 87, 49, 85, 87, 49, 85, 87, 47, + 49, 85, 87, 48, 49, 85, 87, 49, 85, 87, + 49, 85, 87, 45, 85, 87, 1, 46, 86, 87, + 45, 85, 86, 87, 44, 45, 85, 87, 45, 85, + + 87, 45, 85, 87, 85, 87, 85, 87, 79, 85, + 87, 79, 85, 87, 79, 85, 87, 79, 85, 87, + 79, 85, 87, 81, 85, 87, 85, 87, 85, 87, + 77, 85, 87, 77, 85, 87, 85, 87, 79, 85, + 87, 79, 85, 87, 79, 85, 87, 79, 85, 87, + 79, 85, 87, 79, 85, 87, 79, 85, 87, 79, + 85, 87, 79, 85, 87, 79, 85, 87, 79, 85, + 87, 79, 85, 87, 82, 85, 87, 83, 85, 87, + 9, 85, 87, 9, 85, 86, 87, 9, 85, 87, + 9, 85, 87, 9, 85, 87, 9, 85, 87, 14, + + 85, 87, 14, 85, 86, 87, 14, 85, 87, 14, + 85, 87, 14, 85, 87, 14, 85, 87, 17, 85, + 87, 17, 85, 86, 87, 17, 85, 87, 17, 85, + 87, 21, 33, 25, 22, 41, 34, 43, 23, 79, + 78, 79, 79, 79, 79, 77, 24, 77, 77, 80, + 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 79, 79, 79, 79, 8, 6, + 13, 10, 12, 11, 13, 16, 15, 3, 28, 32, + 39, 35, 37, 18, 19, 78, 79, 79, 79, 79, + 68, 77, 20, 77, 77, 79, 79, 79, 79, 79, + + 79, 63, 79, 79, 79, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 79, 79, 11, 29, 30, 31, + 40, 36, 38, 79, 79, 54, 79, 53, 79, 5, + 79, 66, 79, 79, 79, 58, 79, 79, 61, 79, + 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, + 79, 55, 79, 7, 51, 79, 79, 67, 79, 79, + 64, 79, 79, 79, 79, 79, 79, 62, 79, 79, + 79, 79, 57, 79, 79, 79, 79, 79, 65, 79, + 79, 79, 79, 79, 69, 79, 74, 79, 59, 79, + 56, 79, 79, 79, 79, 79, 76, 79, 79, 70, + + 79, 79, 79, 73, 79, 79, 72, 79, 75, 79, + 79, 60, 79, 79, 71, 79, 79, 4, 79, 2, + 2, 79, 52 } ; -static yyconst short int yy_accept[362] = +static yyconst short int yy_accept[370] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, @@ -350,35 +350,35 @@ static yyconst short int yy_accept[362] = 184, 188, 191, 194, 197, 200, 203, 207, 210, 213, 216, 219, 222, 226, 229, 232, 233, 233, 233, 233, - 233, 233, 233, 233, 234, 234, 235, 235, 235, 235, - 235, 236, 236, 237, 237, 237, 238, 239, 240, 240, - 240, 241, 242, 243, 244, 245, 246, 246, 247, 248, - 248, 248, 249, 249, 249, 250, 250, 251, 252, 253, - 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, - 264, 265, 266, 267, 268, 269, 270, 270, 270, 270, - 271, 271, 272, 272, 272, 272, 273, 274, 274, 276, - 277, 278, 278, 279, 279, 279, 279, 279, 280, 280, - 280, 280, 281, 281, 281, 281, 282, 283, 283, 284, - 284, 284, 285, 285, 286, 287, 288, 289, 290, 291, - - 292, 292, 292, 293, 294, 295, 295, 296, 297, 298, - 299, 300, 301, 303, 304, 305, 306, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 316, 316, 317, 317, - 317, 317, 318, 319, 319, 319, 320, 321, 322, 322, - 323, 324, 326, 328, 328, 329, 330, 332, 333, 334, - 336, 337, 339, 340, 341, 342, 343, 344, 345, 346, - 347, 348, 349, 350, 352, 352, 353, 353, 353, 353, - 354, 354, 354, 354, 354, 355, 356, 358, 359, 361, - 362, 363, 364, 365, 366, 368, 369, 370, 371, 373, - 374, 375, 375, 375, 375, 375, 375, 376, 377, 379, - - 380, 381, 382, 383, 385, 387, 389, 391, 392, 393, - 393, 393, 393, 393, 393, 394, 395, 397, 398, 400, - 401, 402, 404, 404, 404, 404, 404, 404, 405, 407, - 409, 410, 412, 412, 412, 412, 412, 412, 413, 415, - 415, 415, 415, 415, 416, 416, 416, 416, 416, 417, - 418, 419, 419, 419, 421, 421, 421, 421, 421, 422, - 422 + 233, 233, 233, 233, 233, 234, 234, 235, 235, 235, + 235, 235, 236, 236, 237, 237, 237, 238, 239, 240, + 240, 240, 241, 242, 243, 244, 245, 246, 246, 247, + 248, 248, 248, 249, 249, 249, 250, 250, 251, 252, + 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, + 263, 264, 265, 266, 267, 268, 269, 270, 270, 270, + 270, 271, 271, 272, 272, 272, 272, 273, 274, 274, + 276, 277, 278, 278, 279, 279, 279, 279, 279, 280, + 280, 280, 281, 281, 281, 281, 282, 282, 282, 282, + 283, 284, 284, 285, 285, 285, 286, 286, 287, 288, + + 289, 290, 291, 292, 293, 293, 293, 294, 295, 296, + 296, 297, 298, 299, 300, 301, 302, 304, 305, 306, + 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 317, 318, 318, 318, 318, 319, 319, 320, 321, + 321, 321, 322, 323, 324, 324, 325, 326, 328, 330, + 330, 331, 332, 334, 335, 336, 338, 339, 341, 342, + 343, 344, 345, 346, 347, 348, 349, 350, 351, 352, + 354, 354, 355, 355, 355, 355, 356, 356, 356, 356, + 356, 356, 357, 358, 360, 361, 363, 364, 365, 366, + 367, 368, 370, 371, 372, 373, 375, 376, 377, 377, + + 377, 377, 377, 377, 377, 378, 379, 381, 382, 383, + 384, 385, 387, 389, 391, 393, 394, 395, 395, 395, + 395, 395, 395, 396, 397, 399, 400, 402, 403, 404, + 406, 406, 406, 406, 406, 406, 407, 409, 411, 412, + 414, 414, 414, 414, 414, 414, 415, 417, 417, 417, + 417, 417, 418, 418, 418, 418, 418, 419, 420, 421, + 421, 421, 423, 423, 423, 423, 423, 424, 424 } ; static yyconst int yy_ec[256] = @@ -423,120 +423,120 @@ static yyconst int yy_meta[57] = 7, 7, 7, 7, 1, 1 } ; -static yyconst short int yy_base[382] = +static yyconst short int yy_base[390] = { 0, 0, 35, 3, 5, 82, 136, 16, 24, 192, 0, - 238, 0, 7, 49, 31, 63, 66, 77, 806, 807, - 807, 807, 807, 4, 778, 761, 44, 17, 765, 807, - 807, 807, 790, 774, 807, 807, 807, 807, 68, 11, - 773, 0, 807, 807, 77, 743, 807, 807, 807, 807, - 771, 0, 50, 0, 781, 28, 2, 47, 61, 807, - 84, 94, 96, 102, 113, 85, 89, 74, 67, 106, - 102, 105, 113, 115, 136, 109, 117, 807, 807, 807, - 807, 784, 768, 151, 167, 807, 807, 782, 766, 155, - 171, 789, 788, 168, 251, 807, 787, 760, 754, 253, - - 749, 228, 141, 807, 738, 807, 776, 130, 775, 774, - 807, 779, 807, 254, 736, 807, 807, 807, 777, 763, - 762, 761, 159, 248, 241, 244, 765, 248, 765, 771, - 284, 290, 295, 0, 300, 303, 742, 249, 291, 139, - 276, 279, 254, 296, 303, 304, 305, 307, 306, 308, - 310, 311, 313, 316, 314, 807, 335, 356, 364, 807, - 368, 807, 370, 374, 380, 807, 385, 760, 807, 807, - 807, 768, 807, 746, 719, 734, 712, 807, 711, 723, - 712, 807, 754, 753, 752, 807, 807, 757, 807, 723, - 755, 807, 741, 740, 8, 318, 330, 328, 807, 378, - - 392, 752, 807, 385, 0, 388, 365, 373, 346, 317, - 388, 323, 738, 389, 390, 391, 392, 393, 394, 397, - 319, 395, 396, 399, 398, 411, 448, 807, 732, 702, - 714, 807, 807, 697, 707, 807, 807, 807, 705, 252, - 402, 731, 730, 421, 807, 412, 729, 403, 400, 728, - 404, 727, 409, 414, 441, 422, 417, 415, 445, 446, - 420, 451, 418, 726, 466, 807, 471, 475, 713, 807, - 702, 705, 689, 685, 456, 465, 720, 469, 719, 470, - 472, 473, 474, 476, 718, 477, 478, 479, 717, 480, - 483, 710, 682, 679, 691, 691, 482, 481, 711, 484, - - 485, 489, 486, 710, 709, 708, 707, 490, 492, 692, - 216, 679, 656, 667, 493, 495, 685, 502, 637, 503, - 497, 630, 571, 544, 548, 527, 534, 522, 571, 567, - 515, 562, 552, 523, 515, 542, 537, 533, 535, 500, - 401, 548, 542, 529, 323, 301, 551, 561, 807, 552, - 807, 151, 558, 125, 29, 561, 579, 583, 807, 807, - 594, 601, 608, 615, 622, 629, 636, 643, 650, 652, - 656, 663, 670, 677, 681, 685, 692, 696, 701, 707, - 714 + 238, 0, 7, 49, 31, 63, 66, 77, 816, 817, + 817, 817, 817, 4, 788, 771, 44, 49, 775, 817, + 817, 817, 800, 784, 817, 817, 817, 817, 66, 11, + 783, 0, 817, 817, 53, 753, 817, 817, 817, 817, + 781, 0, 50, 0, 791, 47, 2, 28, 66, 817, + 86, 99, 102, 112, 116, 63, 112, 86, 89, 90, + 102, 104, 119, 108, 125, 120, 135, 817, 817, 817, + 817, 794, 778, 168, 177, 817, 817, 792, 776, 252, + 253, 799, 798, 107, 156, 817, 797, 770, 764, 259, + + 759, 120, 228, 105, 817, 748, 817, 786, 254, 785, + 784, 817, 789, 817, 265, 746, 817, 817, 817, 787, + 773, 772, 771, 145, 153, 243, 255, 775, 171, 775, + 781, 285, 290, 300, 0, 305, 308, 752, 252, 262, + 257, 136, 279, 266, 301, 290, 308, 309, 311, 310, + 312, 314, 313, 317, 316, 318, 817, 334, 335, 346, + 817, 361, 817, 366, 367, 378, 817, 382, 770, 817, + 817, 817, 778, 817, 756, 729, 735, 722, 817, 742, + 720, 817, 719, 731, 720, 817, 762, 761, 760, 817, + 817, 765, 817, 731, 763, 817, 749, 748, 8, 339, + + 334, 340, 817, 360, 389, 760, 817, 382, 0, 385, + 370, 366, 377, 326, 372, 385, 746, 386, 387, 388, + 389, 390, 391, 394, 393, 392, 401, 397, 395, 396, + 446, 817, 740, 710, 369, 817, 722, 817, 817, 705, + 715, 817, 817, 817, 713, 407, 405, 739, 738, 427, + 817, 409, 737, 415, 424, 736, 419, 735, 429, 434, + 438, 436, 440, 441, 442, 443, 444, 445, 447, 734, + 466, 817, 485, 491, 721, 817, 702, 709, 712, 696, + 692, 449, 448, 727, 457, 726, 459, 465, 468, 475, + 481, 725, 482, 484, 486, 724, 487, 488, 717, 691, + + 688, 685, 697, 697, 490, 493, 717, 492, 494, 497, + 498, 716, 715, 714, 713, 502, 499, 698, 465, 689, + 676, 687, 48, 507, 708, 508, 703, 510, 513, 692, + 687, 657, 614, 525, 531, 523, 632, 577, 518, 576, + 566, 542, 547, 549, 539, 528, 560, 551, 494, 546, + 559, 531, 386, 306, 553, 563, 817, 554, 817, 249, + 560, 270, 141, 565, 581, 585, 817, 817, 596, 603, + 610, 617, 624, 631, 638, 645, 652, 654, 658, 665, + 672, 679, 683, 687, 694, 698, 703, 709, 716 } ; -static yyconst short int yy_def[382] = +static yyconst short int yy_def[390] = { 0, - 361, 361, 362, 362, 363, 363, 364, 364, 360, 9, - 9, 11, 365, 365, 366, 366, 367, 367, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 368, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 369, 360, 370, 371, 371, 371, 371, 371, 360, - 360, 360, 360, 360, 360, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 371, 371, 371, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 372, 360, 360, 360, - - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 373, 360, 360, 360, 360, 360, 360, 374, 375, - 371, 376, 371, 371, 371, 371, 360, 360, 360, 377, - 360, 360, 360, 378, 360, 360, 360, 371, 371, 371, - 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 371, 360, 360, 360, 360, 360, - 379, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 372, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 373, 360, 360, - 374, 360, 375, 376, 371, 371, 371, 371, 360, 360, - - 360, 377, 360, 360, 378, 360, 371, 371, 371, 371, - 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 371, 371, 380, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 371, - 371, 371, 371, 360, 360, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 360, 360, 380, 360, 360, 360, - 360, 360, 360, 360, 371, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 371, 371, 371, 371, 371, 371, - 371, 360, 360, 360, 360, 360, 371, 371, 371, 371, - - 371, 371, 371, 371, 371, 371, 371, 371, 371, 360, - 360, 360, 360, 360, 371, 371, 371, 371, 371, 371, - 371, 371, 360, 360, 360, 360, 360, 371, 371, 371, - 371, 371, 360, 360, 360, 360, 360, 371, 371, 360, - 360, 360, 381, 371, 360, 360, 360, 381, 360, 371, - 360, 360, 360, 371, 360, 360, 360, 360, 360, 0, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360 + 369, 369, 370, 370, 371, 371, 372, 372, 368, 9, + 9, 11, 373, 373, 374, 374, 375, 375, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 376, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 377, 368, 378, 379, 379, 379, 379, 379, 368, + 368, 368, 368, 368, 368, 379, 379, 379, 379, 379, + 379, 379, 379, 379, 379, 379, 379, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 380, 368, 368, 368, + + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 381, 368, 368, 368, 368, 368, 368, 382, + 383, 379, 384, 379, 379, 379, 379, 368, 368, 368, + 385, 368, 368, 368, 386, 368, 368, 368, 379, 379, + 379, 379, 379, 379, 379, 379, 379, 379, 379, 379, + 379, 379, 379, 379, 379, 379, 368, 368, 368, 368, + 368, 387, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 380, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 381, 368, 368, 382, 368, 383, 384, 379, 379, + + 379, 379, 368, 368, 368, 385, 368, 368, 386, 368, + 379, 379, 379, 379, 379, 379, 379, 379, 379, 379, + 379, 379, 379, 379, 379, 379, 379, 379, 379, 379, + 388, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 379, 379, 379, 379, 368, + 368, 379, 379, 379, 379, 379, 379, 379, 379, 379, + 379, 379, 379, 379, 379, 379, 379, 379, 379, 379, + 368, 368, 388, 368, 368, 368, 368, 368, 368, 368, + 368, 379, 379, 379, 379, 379, 379, 379, 379, 379, + 379, 379, 379, 379, 379, 379, 379, 379, 368, 368, + + 368, 368, 368, 368, 379, 379, 379, 379, 379, 379, + 379, 379, 379, 379, 379, 379, 379, 368, 368, 368, + 368, 368, 379, 379, 379, 379, 379, 379, 379, 379, + 368, 368, 368, 368, 368, 379, 379, 379, 379, 379, + 368, 368, 368, 368, 368, 379, 379, 368, 368, 368, + 389, 379, 368, 368, 368, 389, 368, 379, 368, 368, + 368, 379, 368, 368, 368, 368, 368, 0, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368 } ; -static yyconst short int yy_nxt[864] = +static yyconst short int yy_nxt[874] = { 0, - 360, 21, 22, 23, 21, 31, 32, 31, 32, 22, - 81, 24, 33, 96, 33, 97, 82, 122, 48, 49, - 111, 50, 112, 122, 360, 25, 48, 49, 34, 50, - 34, 240, 83, 22, 87, 26, 27, 22, 23, 27, - 88, 51, 28, 122, 124, 100, 24, 52, 100, 51, - 84, 22, 81, 84, 123, 52, 89, 102, 85, 118, - 25, 119, 122, 103, 90, 22, 87, 90, 22, 93, - 26, 104, 91, 107, 83, 94, 122, 179, 114, 22, - 93, 114, 122, 29, 36, 37, 94, 38, 89, 122, - 39, 95, 101, 40, 127, 125, 128, 128, 128, 108, - - 122, 126, 95, 129, 122, 130, 131, 41, 132, 132, - 133, 142, 131, 42, 135, 135, 135, 122, 115, 141, - 122, 122, 109, 110, 122, 136, 136, 136, 122, 139, - 122, 124, 122, 138, 140, 183, 43, 44, 36, 37, - 122, 38, 45, 46, 39, 137, 144, 40, 143, 134, - 145, 122, 157, 153, 122, 157, 163, 146, 154, 163, - 158, 41, 155, 148, 164, 147, 149, 42, 159, 160, - 170, 161, 165, 166, 122, 167, 150, 151, 156, 171, - 168, 179, 169, 209, 184, 185, 152, 195, 355, 180, + 368, 21, 22, 23, 21, 31, 32, 31, 32, 22, + 81, 24, 33, 96, 33, 97, 82, 123, 48, 49, + 112, 50, 113, 123, 368, 25, 48, 49, 34, 50, + 34, 246, 83, 22, 87, 26, 27, 22, 23, 27, + 88, 51, 28, 123, 125, 100, 24, 52, 100, 51, + 84, 22, 81, 84, 115, 52, 89, 115, 85, 119, + 25, 120, 123, 123, 90, 22, 87, 90, 22, 93, + 26, 108, 91, 124, 83, 94, 126, 336, 123, 22, + 93, 123, 102, 29, 36, 37, 94, 38, 89, 103, + 39, 95, 101, 40, 116, 104, 128, 109, 129, 129, + + 129, 123, 95, 105, 123, 123, 127, 41, 130, 171, + 131, 139, 132, 42, 133, 133, 134, 123, 172, 123, + 110, 111, 132, 123, 136, 136, 136, 123, 137, 137, + 137, 142, 144, 143, 123, 123, 43, 44, 36, 37, + 123, 38, 45, 46, 39, 183, 145, 40, 138, 146, + 123, 123, 140, 184, 125, 135, 149, 141, 171, 150, + 123, 41, 177, 147, 154, 151, 152, 42, 123, 158, + 178, 148, 158, 199, 179, 153, 155, 159, 160, 161, + 156, 162, 98, 204, 204, 204, 200, 214, 157, 183, 43, 44, 20, 21, 22, 23, 21, 20, 20, 20, 20, 20, 20, 53, 20, 20, 20, 54, 20, 20, @@ -544,98 +544,99 @@ static yyconst short int yy_nxt[864] = 55, 55, 20, 20, 20, 55, 55, 57, 55, 55, 58, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 59, 55, 55, 55, 60, 20, 61, 62, - 63, 64, 64, 170, 100, 114, 122, 100, 114, 122, - 200, 200, 200, 122, 122, 176, 324, 122, 65, 122, - 178, 66, 275, 67, 68, 69, 70, 98, 177, 71, - 72, 196, 178, 73, 74, 198, 197, 75, 207, 76, - 77, 122, 78, 79, 122, 115, 204, 204, 204, 212, - - 131, 101, 132, 132, 133, 131, 122, 133, 133, 133, - 131, 122, 135, 135, 135, 136, 136, 136, 122, 122, - 122, 122, 122, 122, 208, 122, 122, 210, 122, 122, - 211, 122, 122, 122, 122, 137, 157, 352, 122, 157, - 219, 215, 216, 122, 158, 122, 213, 214, 217, 221, - 351, 249, 218, 220, 223, 226, 251, 159, 160, 222, - 161, 122, 224, 259, 225, 159, 160, 241, 159, 159, - 160, 163, 159, 242, 163, 165, 166, 243, 167, 164, - 122, 165, 166, 168, 165, 228, 165, 166, 122, 165, - 200, 200, 200, 244, 245, 248, 244, 204, 204, 204, - - 136, 136, 136, 122, 122, 122, 122, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 246, 122, 122, 122, - 137, 247, 244, 245, 122, 244, 122, 122, 252, 122, - 122, 250, 122, 122, 346, 122, 257, 122, 253, 254, - 262, 261, 278, 256, 255, 258, 260, 264, 263, 265, - 266, 243, 265, 277, 279, 276, 122, 280, 284, 283, - 122, 122, 281, 268, 289, 285, 122, 265, 266, 291, - 265, 122, 265, 266, 282, 265, 265, 266, 286, 265, - 122, 288, 287, 297, 122, 122, 268, 122, 122, 122, - 290, 122, 122, 122, 122, 122, 122, 122, 122, 122, - - 122, 122, 298, 315, 122, 122, 299, 122, 122, 303, - 122, 304, 122, 301, 306, 300, 309, 122, 122, 305, - 345, 318, 328, 302, 308, 316, 319, 321, 336, 307, - 122, 336, 317, 332, 322, 337, 320, 122, 337, 330, - 331, 338, 343, 336, 122, 329, 336, 349, 122, 350, - 122, 339, 341, 343, 342, 342, 342, 344, 347, 349, - 342, 342, 342, 353, 353, 353, 349, 122, 356, 177, - 353, 353, 353, 357, 357, 357, 340, 122, 349, 354, - 358, 359, 122, 358, 358, 359, 122, 358, 335, 334, - 333, 357, 357, 357, 20, 20, 20, 20, 20, 20, - - 20, 30, 30, 30, 30, 30, 30, 30, 35, 35, - 35, 35, 35, 35, 35, 47, 47, 47, 47, 47, - 47, 47, 80, 80, 80, 80, 80, 80, 80, 86, - 86, 86, 86, 86, 86, 86, 92, 92, 92, 92, - 92, 92, 92, 113, 113, 122, 113, 113, 113, 113, - 117, 117, 122, 117, 117, 117, 117, 120, 120, 121, - 121, 121, 121, 172, 172, 172, 172, 172, 172, 172, - 188, 188, 188, 188, 188, 188, 188, 191, 191, 191, - 191, 191, 191, 191, 193, 193, 193, 193, 194, 194, - 194, 194, 202, 202, 202, 202, 202, 202, 202, 205, - - 122, 205, 227, 227, 327, 326, 227, 227, 267, 267, - 267, 267, 267, 267, 348, 348, 325, 348, 348, 348, - 348, 323, 122, 122, 122, 122, 122, 314, 313, 312, - 311, 310, 122, 122, 122, 122, 296, 295, 294, 293, - 292, 122, 122, 122, 122, 122, 122, 274, 273, 272, - 271, 270, 269, 122, 203, 122, 122, 192, 239, 189, - 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, - 173, 228, 206, 203, 201, 199, 122, 122, 122, 192, - 190, 189, 187, 186, 182, 181, 105, 175, 174, 173, - 170, 170, 98, 162, 98, 156, 122, 98, 116, 98, - - 98, 106, 105, 99, 98, 360, 19, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360 + 63, 64, 64, 164, 166, 167, 164, 168, 123, 187, + 100, 165, 169, 100, 170, 180, 115, 123, 65, 115, + 123, 66, 123, 67, 68, 69, 70, 123, 181, 71, + 72, 123, 182, 73, 74, 123, 363, 75, 201, 76, + 77, 211, 78, 79, 123, 212, 202, 208, 208, 208, + + 132, 213, 133, 133, 134, 123, 116, 101, 188, 189, + 132, 216, 134, 134, 134, 132, 123, 136, 136, 136, + 137, 137, 137, 123, 123, 123, 123, 123, 123, 123, + 215, 123, 123, 123, 218, 158, 160, 161, 158, 162, + 138, 123, 360, 159, 223, 219, 220, 160, 161, 123, + 160, 217, 221, 225, 123, 123, 222, 224, 227, 230, + 255, 226, 160, 161, 229, 160, 228, 164, 166, 167, + 164, 168, 204, 204, 204, 165, 169, 248, 232, 166, + 167, 123, 166, 166, 167, 123, 166, 123, 247, 249, + 250, 251, 123, 250, 208, 208, 208, 137, 137, 137, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 359, 253, 256, 123, 138, 257, 277, + 123, 252, 123, 179, 123, 258, 254, 282, 250, 251, + 123, 250, 270, 263, 123, 259, 260, 265, 268, 123, + 262, 261, 264, 266, 123, 269, 267, 271, 272, 123, + 271, 123, 283, 123, 249, 123, 123, 123, 123, 123, + 123, 274, 123, 123, 123, 284, 285, 271, 272, 286, + 271, 289, 123, 290, 123, 293, 305, 287, 295, 294, + 123, 291, 288, 123, 297, 306, 271, 272, 296, 271, + 123, 292, 271, 272, 307, 271, 123, 123, 298, 123, + + 274, 123, 123, 123, 308, 123, 309, 123, 123, 123, + 311, 323, 123, 123, 123, 332, 312, 123, 310, 182, + 314, 317, 123, 123, 313, 123, 344, 354, 123, 344, + 326, 316, 345, 123, 327, 345, 315, 324, 123, 329, + 325, 330, 346, 123, 351, 338, 123, 339, 328, 340, + 344, 358, 352, 344, 347, 351, 355, 337, 350, 350, + 350, 350, 350, 350, 357, 361, 361, 361, 357, 123, + 364, 353, 361, 361, 361, 123, 357, 365, 365, 365, + 357, 362, 366, 367, 349, 366, 366, 367, 181, 366, + 348, 123, 123, 365, 365, 365, 20, 20, 20, 20, + + 20, 20, 20, 30, 30, 30, 30, 30, 30, 30, + 35, 35, 35, 35, 35, 35, 35, 47, 47, 47, + 47, 47, 47, 47, 80, 80, 80, 80, 80, 80, + 80, 86, 86, 86, 86, 86, 86, 86, 92, 92, + 92, 92, 92, 92, 92, 114, 114, 123, 114, 114, + 114, 114, 118, 118, 343, 118, 118, 118, 118, 121, + 121, 122, 122, 122, 122, 173, 173, 173, 173, 173, + 173, 173, 192, 192, 192, 192, 192, 192, 192, 195, + 195, 195, 195, 195, 195, 195, 197, 197, 197, 197, + 198, 198, 198, 198, 206, 206, 206, 206, 206, 206, + + 206, 209, 342, 209, 231, 231, 341, 123, 231, 231, + 273, 273, 273, 273, 273, 273, 356, 356, 123, 356, + 356, 356, 356, 123, 335, 334, 333, 331, 123, 123, + 123, 123, 123, 322, 321, 320, 319, 178, 318, 123, + 123, 123, 123, 304, 303, 302, 301, 300, 299, 123, + 123, 123, 123, 123, 123, 281, 280, 279, 278, 276, + 275, 123, 207, 123, 123, 196, 245, 193, 244, 243, + 242, 241, 240, 239, 238, 237, 236, 235, 234, 233, + 174, 232, 210, 207, 205, 203, 123, 123, 123, 196, + 194, 193, 191, 190, 186, 185, 106, 176, 175, 174, + + 171, 171, 98, 163, 98, 157, 123, 98, 117, 98, + 98, 107, 106, 99, 98, 368, 19, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368 } ; -static yyconst short int yy_chk[864] = +static yyconst short int yy_chk[874] = { 0, 0, 1, 1, 1, 1, 3, 3, 4, 4, 13, 13, 1, 3, 24, 4, 24, 13, 57, 7, 7, - 40, 7, 40, 195, 0, 1, 8, 8, 3, 8, - 4, 195, 13, 15, 15, 1, 2, 2, 2, 2, - 15, 7, 2, 56, 57, 27, 2, 7, 27, 8, - 14, 14, 14, 14, 56, 8, 15, 28, 14, 53, - 2, 53, 58, 28, 16, 16, 16, 16, 17, 17, - 2, 28, 16, 39, 14, 17, 59, 355, 45, 18, - 18, 45, 69, 2, 5, 5, 18, 5, 16, 68, - 5, 17, 27, 5, 61, 58, 61, 61, 61, 39, - - 66, 59, 18, 62, 67, 62, 63, 5, 63, 63, - 63, 69, 64, 5, 64, 64, 64, 71, 45, 68, - 72, 70, 39, 39, 76, 65, 65, 65, 73, 67, - 74, 67, 77, 66, 67, 108, 5, 5, 6, 6, - 354, 6, 6, 6, 6, 65, 71, 6, 70, 63, - 72, 75, 84, 76, 140, 84, 90, 73, 77, 90, - 84, 6, 77, 74, 90, 73, 74, 6, 85, 85, - 94, 85, 91, 91, 123, 91, 75, 75, 85, 94, - 91, 103, 91, 140, 108, 108, 75, 123, 352, 103, + 40, 7, 40, 199, 0, 1, 8, 8, 3, 8, + 4, 199, 13, 15, 15, 1, 2, 2, 2, 2, + 15, 7, 2, 58, 57, 27, 2, 7, 27, 8, + 14, 14, 14, 14, 45, 8, 15, 45, 14, 53, + 2, 53, 56, 323, 16, 16, 16, 16, 17, 17, + 2, 39, 16, 56, 14, 17, 58, 323, 66, 18, + 18, 59, 28, 2, 5, 5, 18, 5, 16, 28, + 5, 17, 27, 5, 45, 28, 61, 39, 61, 61, + + 61, 68, 18, 28, 69, 70, 59, 5, 62, 94, + 62, 66, 63, 5, 63, 63, 63, 71, 94, 72, + 39, 39, 64, 74, 64, 64, 64, 67, 65, 65, + 65, 68, 70, 69, 73, 76, 5, 5, 6, 6, + 75, 6, 6, 6, 6, 104, 71, 6, 65, 72, + 77, 142, 67, 104, 67, 63, 74, 67, 95, 74, + 124, 6, 102, 73, 76, 75, 75, 6, 125, 84, + 102, 73, 84, 124, 102, 75, 77, 84, 85, 85, + 77, 85, 95, 129, 129, 129, 125, 142, 85, 363, 6, 6, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -643,74 +644,75 @@ static yyconst short int yy_chk[864] = 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 11, 11, - 11, 11, 11, 95, 100, 114, 125, 100, 114, 126, - 128, 128, 128, 124, 138, 102, 311, 240, 11, 143, - 311, 11, 240, 11, 11, 11, 11, 95, 102, 11, - 11, 124, 102, 11, 11, 126, 125, 11, 138, 11, - 11, 141, 11, 11, 142, 114, 131, 131, 131, 143, - - 132, 100, 132, 132, 132, 133, 139, 133, 133, 133, - 135, 144, 135, 135, 135, 136, 136, 136, 145, 146, - 147, 149, 148, 150, 139, 151, 152, 141, 153, 155, - 142, 154, 210, 196, 221, 136, 157, 346, 212, 157, - 149, 146, 147, 198, 157, 197, 144, 145, 148, 151, - 345, 210, 148, 150, 153, 155, 212, 158, 158, 152, - 158, 209, 153, 221, 154, 159, 159, 196, 159, 161, - 161, 163, 161, 197, 163, 164, 164, 198, 164, 163, - 207, 165, 165, 164, 165, 164, 167, 167, 208, 167, - 200, 200, 200, 201, 201, 209, 201, 204, 204, 204, - - 206, 206, 206, 211, 214, 215, 216, 217, 218, 219, - 222, 223, 220, 225, 224, 249, 207, 241, 248, 251, - 206, 208, 244, 244, 253, 244, 226, 246, 214, 254, - 258, 211, 257, 263, 341, 261, 219, 256, 215, 216, - 224, 223, 249, 218, 217, 220, 222, 226, 225, 227, - 227, 241, 227, 248, 251, 246, 255, 253, 257, 256, - 259, 260, 254, 227, 261, 258, 262, 265, 265, 263, - 265, 275, 267, 267, 255, 267, 268, 268, 259, 268, - 276, 260, 259, 275, 278, 280, 267, 281, 282, 283, - 262, 284, 286, 287, 288, 290, 298, 297, 291, 300, - - 301, 303, 276, 297, 302, 308, 278, 309, 315, 283, - 316, 284, 321, 281, 287, 280, 291, 318, 320, 286, - 340, 301, 315, 282, 290, 298, 302, 308, 326, 288, - 331, 326, 300, 321, 309, 327, 303, 328, 327, 318, - 320, 328, 337, 336, 344, 316, 336, 343, 338, 344, - 339, 331, 335, 337, 336, 336, 336, 338, 342, 343, - 342, 342, 342, 347, 347, 347, 348, 350, 353, 334, - 353, 353, 353, 356, 356, 356, 333, 332, 348, 350, - 357, 357, 330, 357, 358, 358, 329, 358, 325, 324, - 323, 357, 357, 357, 361, 361, 361, 361, 361, 361, - - 361, 362, 362, 362, 362, 362, 362, 362, 363, 363, - 363, 363, 363, 363, 363, 364, 364, 364, 364, 364, - 364, 364, 365, 365, 365, 365, 365, 365, 365, 366, - 366, 366, 366, 366, 366, 366, 367, 367, 367, 367, - 367, 367, 367, 368, 368, 322, 368, 368, 368, 368, - 369, 369, 319, 369, 369, 369, 369, 370, 370, 371, - 371, 371, 371, 372, 372, 372, 372, 372, 372, 372, - 373, 373, 373, 373, 373, 373, 373, 374, 374, 374, - 374, 374, 374, 374, 375, 375, 375, 375, 376, 376, - 376, 376, 377, 377, 377, 377, 377, 377, 377, 378, - - 317, 378, 379, 379, 314, 313, 379, 379, 380, 380, - 380, 380, 380, 380, 381, 381, 312, 381, 381, 381, - 381, 310, 307, 306, 305, 304, 299, 296, 295, 294, - 293, 292, 289, 285, 279, 277, 274, 273, 272, 271, - 269, 264, 252, 250, 247, 243, 242, 239, 235, 234, - 231, 230, 229, 213, 202, 194, 193, 191, 190, 188, - 185, 184, 183, 181, 180, 179, 177, 176, 175, 174, - 172, 168, 137, 130, 129, 127, 122, 121, 120, 119, - 115, 112, 110, 109, 107, 105, 101, 99, 98, 97, - 93, 92, 89, 88, 83, 82, 55, 51, 46, 41, + 11, 11, 11, 90, 91, 91, 90, 91, 126, 109, + 100, 90, 91, 100, 91, 103, 115, 139, 11, 115, + 127, 11, 141, 11, 11, 11, 11, 140, 103, 11, + 11, 144, 103, 11, 11, 362, 360, 11, 126, 11, + 11, 139, 11, 11, 143, 140, 127, 132, 132, 132, + + 133, 141, 133, 133, 133, 146, 115, 100, 109, 109, + 134, 144, 134, 134, 134, 136, 145, 136, 136, 136, + 137, 137, 137, 147, 148, 150, 149, 151, 153, 152, + 143, 155, 154, 156, 146, 158, 159, 159, 158, 159, + 137, 214, 354, 158, 150, 147, 148, 160, 160, 201, + 160, 145, 149, 152, 200, 202, 149, 151, 154, 156, + 214, 153, 162, 162, 155, 162, 154, 164, 165, 165, + 164, 165, 204, 204, 204, 164, 165, 201, 165, 166, + 166, 212, 166, 168, 168, 211, 168, 215, 200, 202, + 205, 205, 213, 205, 208, 208, 208, 210, 210, 210, + + 216, 218, 219, 220, 221, 222, 223, 226, 225, 224, + 229, 230, 228, 353, 212, 215, 227, 210, 216, 235, + 247, 211, 246, 235, 252, 218, 213, 246, 250, 250, + 254, 250, 230, 223, 257, 219, 220, 225, 228, 255, + 222, 221, 224, 226, 259, 229, 227, 231, 231, 260, + 231, 262, 252, 261, 247, 263, 264, 265, 266, 267, + 268, 231, 269, 283, 282, 254, 255, 271, 271, 257, + 271, 261, 285, 262, 287, 265, 282, 259, 266, 265, + 288, 263, 260, 289, 268, 283, 273, 273, 267, 273, + 290, 264, 274, 274, 285, 274, 291, 293, 269, 294, + + 273, 295, 297, 298, 287, 305, 288, 308, 306, 309, + 290, 305, 310, 311, 317, 319, 291, 316, 289, 319, + 294, 298, 324, 326, 293, 328, 334, 349, 329, 334, + 309, 297, 335, 339, 310, 335, 295, 306, 336, 316, + 308, 317, 336, 346, 345, 326, 352, 328, 311, 329, + 344, 352, 346, 344, 339, 345, 350, 324, 350, 350, + 350, 344, 344, 344, 351, 355, 355, 355, 356, 358, + 361, 348, 361, 361, 361, 347, 351, 364, 364, 364, + 356, 358, 365, 365, 343, 365, 366, 366, 342, 366, + 341, 340, 338, 365, 365, 365, 369, 369, 369, 369, + + 369, 369, 369, 370, 370, 370, 370, 370, 370, 370, + 371, 371, 371, 371, 371, 371, 371, 372, 372, 372, + 372, 372, 372, 372, 373, 373, 373, 373, 373, 373, + 373, 374, 374, 374, 374, 374, 374, 374, 375, 375, + 375, 375, 375, 375, 375, 376, 376, 337, 376, 376, + 376, 376, 377, 377, 333, 377, 377, 377, 377, 378, + 378, 379, 379, 379, 379, 380, 380, 380, 380, 380, + 380, 380, 381, 381, 381, 381, 381, 381, 381, 382, + 382, 382, 382, 382, 382, 382, 383, 383, 383, 383, + 384, 384, 384, 384, 385, 385, 385, 385, 385, 385, + + 385, 386, 332, 386, 387, 387, 331, 330, 387, 387, + 388, 388, 388, 388, 388, 388, 389, 389, 327, 389, + 389, 389, 389, 325, 322, 321, 320, 318, 315, 314, + 313, 312, 307, 304, 303, 302, 301, 300, 299, 296, + 292, 286, 284, 281, 280, 279, 278, 277, 275, 270, + 258, 256, 253, 249, 248, 245, 241, 240, 237, 234, + 233, 217, 206, 198, 197, 195, 194, 192, 189, 188, + 187, 185, 184, 183, 181, 180, 178, 177, 176, 175, + 173, 169, 138, 131, 130, 128, 123, 122, 121, 120, + 116, 113, 111, 110, 108, 106, 101, 99, 98, 97, - 34, 33, 29, 26, 25, 19, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360, 360, 360, 360, 360, 360, 360, 360, - 360, 360, 360 + 93, 92, 89, 88, 83, 82, 55, 51, 46, 41, + 34, 33, 29, 26, 25, 19, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368, 368, 368, 368, 368, 368, 368, 368, + 368, 368, 368 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -828,7 +830,7 @@ add_gtk_doc_func(void) #define GTK_DOC_LINE 8 -#line 832 "lex.yy.c" +#line 834 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -985,7 +987,7 @@ YY_DECL #line 95 "lexer.l" -#line 989 "lex.yy.c" +#line 991 "lex.yy.c" if ( yy_init ) { @@ -1034,14 +1036,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 >= 361 ) + if ( yy_current_state >= 369 ) 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] != 807 ); + while ( yy_base[yy_current_state] != 817 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1314,7 +1316,7 @@ YY_RULE_SETUP BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; - code_type = HTCODE; + code_type = ACODE; clear_cbuf(); ccode_line = line_no; } @@ -1326,26 +1328,50 @@ YY_RULE_SETUP BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; - code_type = PHCODE; + code_type = ATCODE; clear_cbuf(); ccode_line = line_no; } YY_BREAK case 30: YY_RULE_SETUP -#line 220 "lexer.l" +#line 221 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; - code_type = HCODE; + code_type = HTCODE; clear_cbuf(); ccode_line = line_no; } YY_BREAK case 31: YY_RULE_SETUP -#line 228 "lexer.l" +#line 229 "lexer.l" +{ + BEGIN(C_CODE); + parenth_depth = 1; + class_after_c = FALSE; + code_type = PHCODE; + clear_cbuf(); + ccode_line = line_no; + } + YY_BREAK +case 32: +YY_RULE_SETUP +#line 237 "lexer.l" +{ + BEGIN(C_CODE); + parenth_depth = 1; + class_after_c = FALSE; + code_type = HCODE; + clear_cbuf(); + ccode_line = line_no; + } + YY_BREAK +case 33: +YY_RULE_SETUP +#line 245 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1357,9 +1383,9 @@ YY_RULE_SETUP look_for_includes=1; } YY_BREAK -case 32: +case 34: YY_RULE_SETUP -#line 238 "lexer.l" +#line 255 "lexer.l" { BEGIN(INITIAL); yylval.cbuf = cbuf; @@ -1369,83 +1395,83 @@ YY_RULE_SETUP return code_type; } YY_BREAK -case 33: -YY_RULE_SETUP -#line 247 "lexer.l" -{ add_to_cbuf(yytext); } - YY_BREAK -case 34: -YY_RULE_SETUP -#line 248 "lexer.l" -{ add_to_cbuf(yytext); } - YY_BREAK case 35: YY_RULE_SETUP -#line 249 "lexer.l" +#line 264 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 36: YY_RULE_SETUP -#line 250 "lexer.l" +#line 265 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 37: YY_RULE_SETUP -#line 251 "lexer.l" +#line 266 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 38: YY_RULE_SETUP -#line 252 "lexer.l" +#line 267 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 39: YY_RULE_SETUP -#line 254 "lexer.l" +#line 268 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 40: YY_RULE_SETUP -#line 255 "lexer.l" +#line 269 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 41: +YY_RULE_SETUP +#line 271 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 42: +YY_RULE_SETUP +#line 272 "lexer.l" { BEGIN(C_CODE_STRING); add_to_cbuf(yytext); } YY_BREAK -case 41: +case 43: YY_RULE_SETUP -#line 259 "lexer.l" +#line 276 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 42: +case 44: YY_RULE_SETUP -#line 260 "lexer.l" +#line 277 "lexer.l" { BEGIN(C_CODE); add_to_cbuf(yytext); } YY_BREAK -case 43: +case 45: YY_RULE_SETUP -#line 264 "lexer.l" +#line 281 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 44: +case 46: YY_RULE_SETUP -#line 265 "lexer.l" +#line 282 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 45: +case 47: YY_RULE_SETUP -#line 267 "lexer.l" +#line 284 "lexer.l" { parenth_depth++; add_to_cbuf(yytext); } YY_BREAK -case 46: +case 48: YY_RULE_SETUP -#line 271 "lexer.l" +#line 288 "lexer.l" { parenth_depth--; if(parenth_depth<0) { @@ -1459,19 +1485,19 @@ YY_RULE_SETUP add_to_cbuf(yytext); } YY_BREAK -case 47: +case 49: YY_RULE_SETUP -#line 284 "lexer.l" +#line 301 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 48: +case 50: YY_RULE_SETUP -#line 285 "lexer.l" +#line 302 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 49: +case 51: YY_RULE_SETUP -#line 287 "lexer.l" +#line 304 "lexer.l" { static int found_classes = 0; look_for_includes = 2; @@ -1486,12 +1512,12 @@ YY_RULE_SETUP return CLASS; } YY_BREAK -case 50: +case 52: *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 301 "lexer.l" +#line 318 "lexer.l" { int maj = 0,min = 0,pl = 0; int rmaj = 0,rmin = 0,rpl = 0; @@ -1516,9 +1542,9 @@ YY_RULE_SETUP } } YY_BREAK -case 51: +case 53: YY_RULE_SETUP -#line 325 "lexer.l" +#line 342 "lexer.l" { if(for_cpp) { char *s; @@ -1531,164 +1557,164 @@ YY_RULE_SETUP REJECT; } YY_BREAK -case 52: +case 54: YY_RULE_SETUP -#line 337 "lexer.l" +#line 354 "lexer.l" {return FROM;} YY_BREAK -case 53: +case 55: YY_RULE_SETUP -#line 339 "lexer.l" +#line 356 "lexer.l" {return VOID;} YY_BREAK -case 54: +case 56: YY_RULE_SETUP -#line 340 "lexer.l" +#line 357 "lexer.l" {return STRUCT;} YY_BREAK -case 55: +case 57: YY_RULE_SETUP -#line 341 "lexer.l" +#line 358 "lexer.l" {return UNION;} YY_BREAK -case 56: +case 58: YY_RULE_SETUP -#line 342 "lexer.l" +#line 359 "lexer.l" {return ENUM;} YY_BREAK -case 57: +case 59: YY_RULE_SETUP -#line 343 "lexer.l" +#line 360 "lexer.l" {return SIGNED;} YY_BREAK -case 58: +case 60: YY_RULE_SETUP -#line 344 "lexer.l" +#line 361 "lexer.l" {return UNSIGNED;} YY_BREAK -case 59: +case 61: YY_RULE_SETUP -#line 345 "lexer.l" +#line 362 "lexer.l" {return LONG;} YY_BREAK -case 60: +case 62: YY_RULE_SETUP -#line 346 "lexer.l" +#line 363 "lexer.l" {return SHORT;} YY_BREAK -case 61: +case 63: YY_RULE_SETUP -#line 347 "lexer.l" +#line 364 "lexer.l" {return INT;} YY_BREAK -case 62: +case 64: YY_RULE_SETUP -#line 348 "lexer.l" +#line 365 "lexer.l" {return FLOAT;} YY_BREAK -case 63: +case 65: YY_RULE_SETUP -#line 349 "lexer.l" +#line 366 "lexer.l" {return DOUBLE;} YY_BREAK -case 64: +case 66: YY_RULE_SETUP -#line 350 "lexer.l" +#line 367 "lexer.l" {return CHAR;} YY_BREAK -case 65: +case 67: YY_RULE_SETUP -#line 351 "lexer.l" +#line 368 "lexer.l" {return CONST;} YY_BREAK -case 66: +case 68: YY_RULE_SETUP -#line 353 "lexer.l" +#line 370 "lexer.l" {return THREEDOTS;} YY_BREAK -case 67: +case 69: YY_RULE_SETUP -#line 355 "lexer.l" +#line 372 "lexer.l" {yylval.line = line_no; return PUBLIC;} YY_BREAK -case 68: +case 70: YY_RULE_SETUP -#line 356 "lexer.l" +#line 373 "lexer.l" {yylval.line = line_no; return PRIVATE;} YY_BREAK -case 69: +case 71: YY_RULE_SETUP -#line 357 "lexer.l" +#line 374 "lexer.l" {yylval.line = line_no; return PROTECTED;} YY_BREAK -case 70: +case 72: YY_RULE_SETUP -#line 358 "lexer.l" +#line 375 "lexer.l" {yylval.line = line_no; return ARGUMENT;} YY_BREAK -case 71: +case 73: YY_RULE_SETUP -#line 359 "lexer.l" +#line 376 "lexer.l" {yylval.line = line_no; return VIRTUAL;} YY_BREAK -case 72: +case 74: YY_RULE_SETUP -#line 360 "lexer.l" +#line 377 "lexer.l" {yylval.line = line_no; return SIGNAL;} YY_BREAK -case 73: +case 75: YY_RULE_SETUP -#line 361 "lexer.l" +#line 378 "lexer.l" {yylval.line = line_no; return OVERRIDE;} YY_BREAK -case 74: +case 76: YY_RULE_SETUP -#line 362 "lexer.l" +#line 379 "lexer.l" {return ONERROR;} YY_BREAK -case 75: +case 77: YY_RULE_SETUP -#line 363 "lexer.l" +#line 380 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 76: +case 78: YY_RULE_SETUP -#line 367 "lexer.l" +#line 384 "lexer.l" { yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 77: +case 79: YY_RULE_SETUP -#line 371 "lexer.l" +#line 388 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 78: +case 80: YY_RULE_SETUP -#line 376 "lexer.l" +#line 393 "lexer.l" { yylval.id = g_strdup(yytext); return ARRAY_DIM; } YY_BREAK -case 79: +case 81: YY_RULE_SETUP -#line 381 "lexer.l" +#line 398 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 80: +case 82: YY_RULE_SETUP -#line 385 "lexer.l" +#line 402 "lexer.l" { BEGIN(C_CODE); parenth_depth=1; @@ -1699,38 +1725,38 @@ YY_RULE_SETUP return '{'; } YY_BREAK -case 81: +case 83: YY_RULE_SETUP -#line 394 "lexer.l" +#line 411 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 82: +case 84: YY_RULE_SETUP -#line 399 "lexer.l" +#line 416 "lexer.l" ; /*ignore*/ YY_BREAK -case 83: +case 85: YY_RULE_SETUP -#line 401 "lexer.l" +#line 418 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 84: +case 86: YY_RULE_SETUP -#line 406 "lexer.l" +#line 423 "lexer.l" ; /*ignore*/ YY_BREAK -case 85: +case 87: YY_RULE_SETUP -#line 407 "lexer.l" +#line 424 "lexer.l" ECHO; YY_BREAK -#line 1734 "lex.yy.c" +#line 1760 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): @@ -2028,7 +2054,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 >= 361 ) + if ( yy_current_state >= 369 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2058,11 +2084,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 >= 361 ) + if ( yy_current_state >= 369 ) 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 == 360); + yy_is_jam = (yy_current_state == 368); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2620,4 +2646,4 @@ int main() return 0; } #endif -#line 407 "lexer.l" +#line 424 "lexer.l"