X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/1656cfade4879af0cb003e3847e58264caa5781f..5b42e9400440d86723a27747b2191ab8cd59c2ee:/src/lexer.c diff --git a/src/lexer.c b/src/lexer.c index 2f0c716..824d2e8 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 88 +#define YY_END_OF_BUFFER 89 +static yyconst short int yy_acclist[428] = { 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 + 89, 86, 88, 85, 86, 88, 1, 87, 88, 86, + 87, 88, 86, 88, 86, 88, 86, 88, 85, 86, + 88, 86, 88, 86, 88, 26, 86, 88, 1, 27, + 87, 88, 26, 86, 87, 88, 26, 86, 88, 26, + 86, 88, 49, 86, 88, 1, 50, 87, 88, 49, + 86, 87, 88, 42, 49, 86, 88, 49, 86, 88, + 49, 86, 88, 49, 86, 88, 49, 86, 88, 47, + 49, 86, 88, 48, 49, 86, 88, 49, 86, 88, + 49, 86, 88, 45, 86, 88, 1, 46, 87, 88, + 45, 86, 87, 88, 44, 45, 86, 88, 45, 86, + + 88, 45, 86, 88, 86, 88, 86, 88, 80, 86, + 88, 80, 86, 88, 80, 86, 88, 80, 86, 88, + 80, 86, 88, 82, 86, 88, 86, 88, 86, 88, + 77, 86, 88, 77, 86, 88, 86, 88, 80, 86, + 88, 80, 86, 88, 80, 86, 88, 80, 86, 88, + 80, 86, 88, 80, 86, 88, 80, 86, 88, 80, + 86, 88, 80, 86, 88, 80, 86, 88, 80, 86, + 88, 80, 86, 88, 83, 86, 88, 84, 86, 88, + 9, 86, 88, 9, 86, 87, 88, 9, 86, 88, + 9, 86, 88, 9, 86, 88, 9, 86, 88, 14, + + 86, 88, 14, 86, 87, 88, 14, 86, 88, 14, + 86, 88, 14, 86, 88, 14, 86, 88, 17, 86, + 88, 17, 86, 87, 88, 17, 86, 88, 17, 86, + 88, 21, 33, 25, 22, 41, 34, 43, 23, 79, + 80, 78, 80, 80, 80, 80, 77, 24, 77, 77, + 81, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 8, + 6, 13, 10, 12, 11, 13, 16, 15, 3, 28, + 32, 39, 35, 37, 18, 19, 79, 79, 78, 80, + 80, 80, 80, 68, 77, 20, 77, 77, 80, 80, + + 80, 80, 80, 80, 63, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 11, + 29, 30, 31, 40, 36, 38, 79, 80, 80, 54, + 80, 53, 80, 5, 80, 66, 80, 80, 80, 58, + 80, 80, 61, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 55, 80, 7, 51, 80, + 80, 67, 80, 80, 64, 80, 80, 80, 80, 80, + 80, 62, 80, 80, 80, 80, 57, 80, 80, 80, + 80, 80, 65, 80, 80, 80, 80, 80, 69, 80, + 74, 80, 59, 80, 56, 80, 80, 80, 80, 80, + + 76, 80, 80, 70, 80, 80, 80, 73, 80, 80, + 72, 80, 75, 80, 80, 60, 80, 80, 71, 80, + 80, 4, 80, 2, 2, 80, 52 } ; -static yyconst short int yy_accept[362] = +static yyconst short int yy_accept[372] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, @@ -350,35 +350,36 @@ 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, + 233, 233, 233, 233, 233, 234, 234, 235, 235, 235, + 235, 235, 236, 236, 237, 237, 237, 238, 239, 240, + 240, 241, 242, 243, 244, 245, 246, 247, 247, 248, + 249, 249, 249, 250, 250, 250, 251, 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 + 264, 265, 266, 267, 268, 269, 270, 271, 271, 271, + 271, 272, 272, 273, 273, 273, 273, 274, 275, 275, + 277, 278, 279, 279, 280, 280, 280, 280, 280, 281, + 281, 281, 282, 282, 282, 282, 283, 283, 283, 283, + 284, 285, 285, 286, 286, 286, 287, 288, 289, 290, + + 291, 292, 293, 294, 295, 296, 296, 296, 297, 298, + 299, 299, 300, 301, 302, 303, 304, 305, 307, 308, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, + 319, 320, 320, 321, 321, 321, 321, 322, 322, 323, + 324, 324, 324, 325, 326, 327, 327, 328, 329, 330, + 332, 334, 334, 335, 336, 338, 339, 340, 342, 343, + 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, + 355, 356, 358, 358, 359, 359, 359, 359, 360, 360, + 360, 360, 360, 360, 361, 362, 364, 365, 367, 368, + 369, 370, 371, 372, 374, 375, 376, 377, 379, 380, + + 381, 381, 381, 381, 381, 381, 381, 382, 383, 385, + 386, 387, 388, 389, 391, 393, 395, 397, 398, 399, + 399, 399, 399, 399, 399, 400, 401, 403, 404, 406, + 407, 408, 410, 410, 410, 410, 410, 410, 411, 413, + 415, 416, 418, 418, 418, 418, 418, 418, 419, 421, + 421, 421, 421, 421, 422, 422, 422, 422, 422, 423, + 424, 425, 425, 425, 427, 427, 427, 427, 427, 428, + 428 } ; static yyconst int yy_ec[256] = @@ -423,120 +424,124 @@ 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[393] = { 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, 822, 823, + 823, 823, 823, 4, 794, 777, 44, 49, 781, 823, + 823, 823, 806, 790, 823, 823, 823, 823, 66, 11, + 789, 0, 823, 823, 53, 759, 823, 823, 823, 823, + 787, 0, 50, 0, 797, 47, 2, 28, 66, 823, + 86, 99, 102, 112, 116, 63, 112, 86, 89, 90, + 102, 104, 119, 108, 125, 120, 135, 823, 823, 823, + 823, 800, 784, 168, 177, 823, 823, 798, 782, 252, + 253, 805, 804, 107, 156, 823, 803, 776, 770, 259, + + 765, 120, 228, 105, 823, 754, 823, 792, 254, 791, + 790, 823, 795, 823, 265, 752, 823, 823, 823, 793, + 779, 778, 777, 145, 153, 243, 255, 781, 171, 781, + 787, 285, 290, 300, 0, 305, 308, 758, 252, 262, + 257, 136, 279, 266, 301, 290, 308, 309, 311, 310, + 312, 314, 313, 317, 316, 318, 823, 334, 335, 346, + 823, 361, 823, 366, 367, 378, 823, 382, 776, 823, + 823, 823, 784, 823, 762, 735, 741, 728, 823, 748, + 726, 823, 725, 737, 726, 823, 768, 767, 766, 823, + 823, 771, 823, 737, 769, 823, 755, 754, 753, 8, + + 339, 334, 340, 823, 360, 389, 765, 823, 382, 0, + 385, 370, 366, 377, 326, 372, 385, 751, 386, 387, + 388, 389, 390, 391, 394, 393, 392, 401, 397, 395, + 396, 446, 823, 745, 715, 369, 823, 727, 823, 823, + 710, 720, 823, 823, 823, 718, 744, 407, 405, 743, + 742, 427, 823, 409, 741, 415, 424, 740, 419, 739, + 429, 434, 438, 436, 440, 441, 442, 443, 444, 445, + 447, 738, 466, 823, 485, 491, 725, 823, 706, 713, + 716, 700, 696, 449, 448, 731, 457, 730, 459, 465, + 468, 475, 481, 729, 482, 484, 486, 728, 487, 488, + + 721, 695, 692, 689, 701, 701, 490, 493, 721, 492, + 494, 497, 498, 720, 719, 718, 717, 502, 499, 702, + 465, 693, 680, 691, 48, 507, 712, 508, 707, 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, 823, 554, + 823, 249, 560, 270, 141, 565, 581, 585, 823, 823, + 596, 603, 610, 617, 624, 631, 638, 645, 652, 654, + 658, 665, 672, 679, 683, 687, 694, 698, 703, 707, + 713, 720 + } ; -static yyconst short int yy_def[382] = +static yyconst short int yy_def[393] = { 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 + 371, 371, 372, 372, 373, 373, 374, 374, 370, 9, + 9, 11, 375, 375, 376, 376, 377, 377, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 378, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 379, 370, 380, 381, 381, 381, 381, 381, 370, + 370, 370, 370, 370, 370, 381, 381, 381, 381, 381, + 381, 381, 381, 381, 381, 381, 381, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 382, 370, 370, 370, + + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 383, 370, 370, 370, 370, 370, 370, 384, + 385, 381, 386, 381, 381, 381, 381, 370, 370, 370, + 387, 370, 370, 370, 388, 370, 370, 370, 381, 381, + 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, + 381, 381, 381, 381, 381, 381, 370, 370, 370, 370, + 370, 389, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 382, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 383, 370, 370, 384, 370, 385, 390, 386, 381, + + 381, 381, 381, 370, 370, 370, 387, 370, 370, 388, + 370, 381, 381, 381, 381, 381, 381, 381, 381, 381, + 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, + 381, 391, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 390, 381, 381, 381, + 381, 370, 370, 381, 381, 381, 381, 381, 381, 381, + 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, + 381, 381, 370, 370, 391, 370, 370, 370, 370, 370, + 370, 370, 370, 381, 381, 381, 381, 381, 381, 381, + 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, + + 370, 370, 370, 370, 370, 370, 381, 381, 381, 381, + 381, 381, 381, 381, 381, 381, 381, 381, 381, 370, + 370, 370, 370, 370, 381, 381, 381, 381, 381, 381, + 381, 381, 370, 370, 370, 370, 370, 381, 381, 381, + 381, 381, 370, 370, 370, 370, 370, 381, 381, 370, + 370, 370, 392, 381, 370, 370, 370, 392, 370, 381, + 370, 370, 370, 381, 370, 370, 370, 370, 370, 0, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370 + } ; -static yyconst short int yy_nxt[864] = +static yyconst short int yy_nxt[880] = { 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, + 370, 21, 22, 23, 21, 31, 32, 31, 32, 22, + 81, 24, 33, 96, 33, 97, 82, 123, 48, 49, + 112, 50, 113, 123, 370, 25, 48, 49, 34, 50, + 34, 248, 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, 338, 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, 200, 179, 153, 155, 159, 160, 161, + 156, 162, 98, 205, 205, 205, 201, 215, 157, 183, 43, 44, 20, 21, 22, 23, 21, 20, 20, 20, 20, 20, 20, 53, 20, 20, 20, 54, 20, 20, @@ -544,98 +549,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, 365, 75, 202, 76, + 77, 212, 78, 79, 123, 213, 203, 209, 209, 209, + + 132, 214, 133, 133, 134, 123, 116, 101, 188, 189, + 132, 217, 134, 134, 134, 132, 123, 136, 136, 136, + 137, 137, 137, 123, 123, 123, 123, 123, 123, 123, + 216, 123, 123, 123, 219, 158, 160, 161, 158, 162, + 138, 123, 362, 159, 224, 220, 221, 160, 161, 123, + 160, 218, 222, 226, 123, 123, 223, 225, 228, 231, + 257, 227, 160, 161, 230, 160, 229, 164, 166, 167, + 164, 168, 205, 205, 205, 165, 169, 250, 233, 166, + 167, 123, 166, 166, 167, 123, 166, 123, 249, 251, + 252, 253, 123, 252, 209, 209, 209, 137, 137, 137, + + 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, + 123, 123, 123, 361, 255, 258, 123, 138, 259, 279, + 123, 254, 123, 179, 123, 260, 256, 284, 252, 253, + 123, 252, 272, 265, 123, 261, 262, 267, 270, 123, + 264, 263, 266, 268, 123, 271, 269, 273, 274, 123, + 273, 123, 285, 123, 251, 123, 123, 123, 123, 123, + 123, 276, 123, 123, 123, 286, 287, 273, 274, 288, + 273, 291, 123, 292, 123, 295, 307, 289, 297, 296, + 123, 293, 290, 123, 299, 308, 273, 274, 298, 273, + 123, 294, 273, 274, 309, 273, 123, 123, 300, 123, + + 276, 123, 123, 123, 310, 123, 311, 123, 123, 123, + 313, 325, 123, 123, 123, 334, 314, 123, 312, 182, + 316, 319, 123, 123, 315, 123, 346, 356, 123, 346, + 328, 318, 347, 123, 329, 347, 317, 326, 123, 331, + 327, 332, 348, 123, 353, 340, 123, 341, 330, 342, + 346, 360, 354, 346, 349, 353, 357, 339, 352, 352, + 352, 352, 352, 352, 359, 363, 363, 363, 359, 123, + 366, 355, 363, 363, 363, 123, 359, 367, 367, 367, + 359, 364, 368, 369, 351, 368, 368, 369, 181, 368, + 350, 123, 123, 367, 367, 367, 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, 345, 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, + 199, 199, 199, 199, 207, 207, 207, 207, 207, 207, + + 207, 210, 344, 210, 232, 232, 343, 123, 232, 232, + 247, 247, 247, 247, 275, 275, 275, 275, 275, 275, + 358, 358, 123, 358, 358, 358, 358, 123, 337, 336, + 335, 333, 123, 123, 123, 123, 123, 324, 323, 322, + 321, 178, 320, 123, 123, 123, 123, 306, 305, 304, + 303, 302, 301, 123, 123, 123, 123, 123, 123, 198, + 283, 282, 281, 280, 278, 277, 123, 208, 123, 198, + 198, 196, 246, 193, 245, 244, 243, 242, 241, 240, + 239, 238, 237, 236, 235, 234, 174, 233, 211, 208, + 206, 204, 123, 123, 198, 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, 370, 19, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370 } ; -static yyconst short int yy_chk[864] = +static yyconst short int yy_chk[880] = { 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, 200, 0, 1, 8, 8, 3, 8, + 4, 200, 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, 325, 16, 16, 16, 16, 17, 17, + 2, 39, 16, 56, 14, 17, 58, 325, 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, 365, 6, 6, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, @@ -643,74 +649,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, + 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, 364, 362, 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, 215, 356, 158, 150, 147, 148, 160, 160, 202, + 160, 145, 149, 152, 201, 203, 149, 151, 154, 156, + 215, 153, 162, 162, 155, 162, 154, 164, 165, 165, + 164, 165, 205, 205, 205, 164, 165, 202, 165, 166, + 166, 213, 166, 168, 168, 212, 168, 216, 201, 203, + 206, 206, 214, 206, 209, 209, 209, 211, 211, 211, + + 217, 219, 220, 221, 222, 223, 224, 227, 226, 225, + 230, 231, 229, 355, 213, 216, 228, 211, 217, 236, + 249, 212, 248, 236, 254, 219, 214, 248, 252, 252, + 256, 252, 231, 224, 259, 220, 221, 226, 229, 257, + 223, 222, 225, 227, 261, 230, 228, 232, 232, 262, + 232, 264, 254, 263, 249, 265, 266, 267, 268, 269, + 270, 232, 271, 285, 284, 256, 257, 273, 273, 259, + 273, 263, 287, 264, 289, 267, 284, 261, 268, 267, + 290, 265, 262, 291, 270, 285, 275, 275, 269, 275, + 292, 266, 276, 276, 287, 276, 293, 295, 271, 296, + + 275, 297, 299, 300, 289, 307, 290, 310, 308, 311, + 292, 307, 312, 313, 319, 321, 293, 318, 291, 321, + 296, 300, 326, 328, 295, 330, 336, 351, 331, 336, + 311, 299, 337, 341, 312, 337, 297, 308, 338, 318, + 310, 319, 338, 348, 347, 328, 354, 330, 313, 331, + 346, 354, 348, 346, 341, 347, 352, 326, 352, 352, + 352, 346, 346, 346, 353, 357, 357, 357, 358, 360, + 363, 350, 363, 363, 363, 349, 353, 366, 366, 366, + 358, 360, 367, 367, 345, 367, 368, 368, 344, 368, + 343, 342, 340, 367, 367, 367, 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, 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, - - 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 + 374, 374, 374, 374, 375, 375, 375, 375, 375, 375, + 375, 376, 376, 376, 376, 376, 376, 376, 377, 377, + 377, 377, 377, 377, 377, 378, 378, 339, 378, 378, + 378, 378, 379, 379, 335, 379, 379, 379, 379, 380, + 380, 381, 381, 381, 381, 382, 382, 382, 382, 382, + 382, 382, 383, 383, 383, 383, 383, 383, 383, 384, + 384, 384, 384, 384, 384, 384, 385, 385, 385, 385, + 386, 386, 386, 386, 387, 387, 387, 387, 387, 387, + + 387, 388, 334, 388, 389, 389, 333, 332, 389, 389, + 390, 390, 390, 390, 391, 391, 391, 391, 391, 391, + 392, 392, 329, 392, 392, 392, 392, 327, 324, 323, + 322, 320, 317, 316, 315, 314, 309, 306, 305, 304, + 303, 302, 301, 298, 294, 288, 286, 283, 282, 281, + 280, 279, 277, 272, 260, 258, 255, 251, 250, 247, + 246, 242, 241, 238, 235, 234, 218, 207, 199, 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, 93, 92, 89, 88, + 83, 82, 55, 51, 46, 41, 34, 33, 29, 26, + 25, 19, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 370, 370, 370, 370, 370 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -755,6 +762,7 @@ char *yytext; #include #include +#include "tree.h" #include "parse.h" #include "main.h" #include "util.h" @@ -828,7 +836,7 @@ add_gtk_doc_func(void) #define GTK_DOC_LINE 8 -#line 832 "lex.yy.c" +#line 840 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -982,10 +990,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 95 "lexer.l" +#line 96 "lexer.l" -#line 989 "lex.yy.c" +#line 997 "lex.yy.c" if ( yy_init ) { @@ -1034,14 +1042,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 >= 371 ) 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] != 823 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1072,12 +1080,12 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 97 "lexer.l" +#line 98 "lexer.l" { line_no++; REJECT; } YY_BREAK case 2: YY_RULE_SETUP -#line 99 "lexer.l" +#line 100 "lexer.l" { fprintf(stderr,"You are a bad bad person!\n"); REJECT; } YY_BREAK case 3: @@ -1085,12 +1093,12 @@ case 3: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 101 "lexer.l" +#line 102 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 4: YY_RULE_SETUP -#line 102 "lexer.l" +#line 103 "lexer.l" { if(look_for_includes==1) { char *p; @@ -1113,7 +1121,7 @@ case 5: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 119 "lexer.l" +#line 120 "lexer.l" { /* eat out gtk doc stuff */ BEGIN(GTK_DOC_BEFORE_NAME); @@ -1125,7 +1133,7 @@ case 6: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 124 "lexer.l" +#line 125 "lexer.l" { /* empty doc lines */ ; @@ -1136,7 +1144,7 @@ case 7: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 128 "lexer.l" +#line 129 "lexer.l" { char *p; BEGIN(GTK_DOC); @@ -1150,14 +1158,14 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 138 "lexer.l" +#line 139 "lexer.l" { BEGIN(CLASS_CODE_I); } YY_BREAK case 9: YY_RULE_SETUP -#line 141 "lexer.l" +#line 142 "lexer.l" { BEGIN(COMMENT); before_comment = CLASS_CODE_I; @@ -1168,7 +1176,7 @@ case 10: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 145 "lexer.l" +#line 146 "lexer.l" { /* empty doc lines */ add_to_cbuf(" *\n"); @@ -1176,7 +1184,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP -#line 149 "lexer.l" +#line 150 "lexer.l" { BEGIN(CLASS_CODE_I); add_gtk_doc_func(); @@ -1184,7 +1192,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 153 "lexer.l" +#line 154 "lexer.l" { fflush(stdout); add_to_cbuf(" * "); @@ -1193,14 +1201,14 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 158 "lexer.l" +#line 159 "lexer.l" { BEGIN(CLASS_CODE_I); } YY_BREAK case 14: YY_RULE_SETUP -#line 161 "lexer.l" +#line 162 "lexer.l" { BEGIN(COMMENT); before_comment = CLASS_CODE_I; @@ -1208,7 +1216,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 165 "lexer.l" +#line 166 "lexer.l" { BEGIN(CLASS_CODE_I); add_to_cbuf("\n"); @@ -1220,7 +1228,7 @@ case 16: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 170 "lexer.l" +#line 171 "lexer.l" { BEGIN(GTK_DOC); add_to_cbuf(yytext); @@ -1229,7 +1237,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 175 "lexer.l" +#line 176 "lexer.l" { fflush(stdout); add_to_cbuf(yytext); @@ -1240,7 +1248,7 @@ case 18: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 180 "lexer.l" +#line 181 "lexer.l" { add_to_cbuf(yytext); /*comment, ignore*/ } YY_BREAK case 19: @@ -1248,7 +1256,7 @@ case 19: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 181 "lexer.l" +#line 182 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 20: @@ -1256,17 +1264,17 @@ case 20: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 182 "lexer.l" +#line 183 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 21: YY_RULE_SETUP -#line 183 "lexer.l" +#line 184 "lexer.l" {BEGIN(COMMENT); before_comment = INITIAL; } YY_BREAK case 22: YY_RULE_SETUP -#line 184 "lexer.l" +#line 185 "lexer.l" { add_to_cbuf(yytext); BEGIN(COMMENT); @@ -1275,17 +1283,17 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 189 "lexer.l" +#line 190 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE; } YY_BREAK case 24: YY_RULE_SETUP -#line 190 "lexer.l" +#line 191 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } YY_BREAK case 25: YY_RULE_SETUP -#line 191 "lexer.l" +#line 192 "lexer.l" { if(before_comment == C_CODE) add_to_cbuf(yytext); BEGIN(before_comment); @@ -1293,7 +1301,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 195 "lexer.l" +#line 196 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); @@ -1301,7 +1309,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 199 "lexer.l" +#line 200 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); @@ -1309,43 +1317,67 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 204 "lexer.l" +#line 205 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; - code_type = HTCODE; + code_type = ACODE; clear_cbuf(); ccode_line = line_no; } YY_BREAK case 29: YY_RULE_SETUP -#line 212 "lexer.l" +#line 213 "lexer.l" { 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 222 "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 230 "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 238 "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 246 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1357,9 +1389,9 @@ YY_RULE_SETUP look_for_includes=1; } YY_BREAK -case 32: +case 34: YY_RULE_SETUP -#line 238 "lexer.l" +#line 256 "lexer.l" { BEGIN(INITIAL); yylval.cbuf = cbuf; @@ -1369,83 +1401,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 265 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 36: YY_RULE_SETUP -#line 250 "lexer.l" +#line 266 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 37: YY_RULE_SETUP -#line 251 "lexer.l" +#line 267 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 38: YY_RULE_SETUP -#line 252 "lexer.l" +#line 268 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 39: YY_RULE_SETUP -#line 254 "lexer.l" +#line 269 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 40: YY_RULE_SETUP -#line 255 "lexer.l" +#line 270 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 41: +YY_RULE_SETUP +#line 272 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 42: +YY_RULE_SETUP +#line 273 "lexer.l" { BEGIN(C_CODE_STRING); add_to_cbuf(yytext); } YY_BREAK -case 41: +case 43: YY_RULE_SETUP -#line 259 "lexer.l" +#line 277 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 42: +case 44: YY_RULE_SETUP -#line 260 "lexer.l" +#line 278 "lexer.l" { BEGIN(C_CODE); add_to_cbuf(yytext); } YY_BREAK -case 43: +case 45: YY_RULE_SETUP -#line 264 "lexer.l" +#line 282 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 44: +case 46: YY_RULE_SETUP -#line 265 "lexer.l" +#line 283 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 45: +case 47: YY_RULE_SETUP -#line 267 "lexer.l" +#line 285 "lexer.l" { parenth_depth++; add_to_cbuf(yytext); } YY_BREAK -case 46: +case 48: YY_RULE_SETUP -#line 271 "lexer.l" +#line 289 "lexer.l" { parenth_depth--; if(parenth_depth<0) { @@ -1459,19 +1491,19 @@ YY_RULE_SETUP add_to_cbuf(yytext); } YY_BREAK -case 47: +case 49: YY_RULE_SETUP -#line 284 "lexer.l" +#line 302 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 48: +case 50: YY_RULE_SETUP -#line 285 "lexer.l" +#line 303 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 49: +case 51: YY_RULE_SETUP -#line 287 "lexer.l" +#line 305 "lexer.l" { static int found_classes = 0; look_for_includes = 2; @@ -1486,12 +1518,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 319 "lexer.l" { int maj = 0,min = 0,pl = 0; int rmaj = 0,rmin = 0,rpl = 0; @@ -1516,9 +1548,9 @@ YY_RULE_SETUP } } YY_BREAK -case 51: +case 53: YY_RULE_SETUP -#line 325 "lexer.l" +#line 343 "lexer.l" { if(for_cpp) { char *s; @@ -1531,164 +1563,174 @@ YY_RULE_SETUP REJECT; } YY_BREAK -case 52: +case 54: YY_RULE_SETUP -#line 337 "lexer.l" +#line 355 "lexer.l" {return FROM;} YY_BREAK -case 53: +case 55: YY_RULE_SETUP -#line 339 "lexer.l" +#line 357 "lexer.l" {return VOID;} YY_BREAK -case 54: +case 56: YY_RULE_SETUP -#line 340 "lexer.l" +#line 358 "lexer.l" {return STRUCT;} YY_BREAK -case 55: +case 57: YY_RULE_SETUP -#line 341 "lexer.l" +#line 359 "lexer.l" {return UNION;} YY_BREAK -case 56: +case 58: YY_RULE_SETUP -#line 342 "lexer.l" +#line 360 "lexer.l" {return ENUM;} YY_BREAK -case 57: +case 59: YY_RULE_SETUP -#line 343 "lexer.l" +#line 361 "lexer.l" {return SIGNED;} YY_BREAK -case 58: +case 60: YY_RULE_SETUP -#line 344 "lexer.l" +#line 362 "lexer.l" {return UNSIGNED;} YY_BREAK -case 59: +case 61: YY_RULE_SETUP -#line 345 "lexer.l" +#line 363 "lexer.l" {return LONG;} YY_BREAK -case 60: +case 62: YY_RULE_SETUP -#line 346 "lexer.l" +#line 364 "lexer.l" {return SHORT;} YY_BREAK -case 61: +case 63: YY_RULE_SETUP -#line 347 "lexer.l" +#line 365 "lexer.l" {return INT;} YY_BREAK -case 62: +case 64: YY_RULE_SETUP -#line 348 "lexer.l" +#line 366 "lexer.l" {return FLOAT;} YY_BREAK -case 63: +case 65: YY_RULE_SETUP -#line 349 "lexer.l" +#line 367 "lexer.l" {return DOUBLE;} YY_BREAK -case 64: +case 66: YY_RULE_SETUP -#line 350 "lexer.l" +#line 368 "lexer.l" {return CHAR;} YY_BREAK -case 65: +case 67: YY_RULE_SETUP -#line 351 "lexer.l" +#line 369 "lexer.l" {return CONST;} YY_BREAK -case 66: +case 68: YY_RULE_SETUP -#line 353 "lexer.l" +#line 371 "lexer.l" {return THREEDOTS;} YY_BREAK -case 67: +case 69: YY_RULE_SETUP -#line 355 "lexer.l" +#line 373 "lexer.l" {yylval.line = line_no; return PUBLIC;} YY_BREAK -case 68: +case 70: YY_RULE_SETUP -#line 356 "lexer.l" +#line 374 "lexer.l" {yylval.line = line_no; return PRIVATE;} YY_BREAK -case 69: +case 71: YY_RULE_SETUP -#line 357 "lexer.l" +#line 375 "lexer.l" {yylval.line = line_no; return PROTECTED;} YY_BREAK -case 70: +case 72: YY_RULE_SETUP -#line 358 "lexer.l" +#line 376 "lexer.l" {yylval.line = line_no; return ARGUMENT;} YY_BREAK -case 71: +case 73: YY_RULE_SETUP -#line 359 "lexer.l" +#line 377 "lexer.l" {yylval.line = line_no; return VIRTUAL;} YY_BREAK -case 72: +case 74: YY_RULE_SETUP -#line 360 "lexer.l" +#line 378 "lexer.l" {yylval.line = line_no; return SIGNAL;} YY_BREAK -case 73: +case 75: YY_RULE_SETUP -#line 361 "lexer.l" +#line 379 "lexer.l" {yylval.line = line_no; return OVERRIDE;} YY_BREAK -case 74: +case 76: YY_RULE_SETUP -#line 362 "lexer.l" +#line 380 "lexer.l" {return ONERROR;} YY_BREAK -case 75: +case 77: YY_RULE_SETUP -#line 363 "lexer.l" +#line 381 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 76: +case 78: YY_RULE_SETUP -#line 367 "lexer.l" +#line 385 "lexer.l" { + /* this one is for a classname with a namespace */ yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 77: +case 79: YY_RULE_SETUP -#line 371 "lexer.l" +#line 390 "lexer.l" +{ + /* this is for a classname with an empty namespace */ + yylval.id = g_strdup(yytext); + return TYPETOKEN; + } + YY_BREAK +case 80: +YY_RULE_SETUP +#line 395 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 78: +case 81: YY_RULE_SETUP -#line 376 "lexer.l" +#line 400 "lexer.l" { yylval.id = g_strdup(yytext); return ARRAY_DIM; } YY_BREAK -case 79: +case 82: YY_RULE_SETUP -#line 381 "lexer.l" +#line 405 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 80: +case 83: YY_RULE_SETUP -#line 385 "lexer.l" +#line 409 "lexer.l" { BEGIN(C_CODE); parenth_depth=1; @@ -1699,38 +1741,38 @@ YY_RULE_SETUP return '{'; } YY_BREAK -case 81: +case 84: YY_RULE_SETUP -#line 394 "lexer.l" +#line 418 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 82: +case 85: YY_RULE_SETUP -#line 399 "lexer.l" +#line 423 "lexer.l" ; /*ignore*/ YY_BREAK -case 83: +case 86: YY_RULE_SETUP -#line 401 "lexer.l" +#line 425 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 84: +case 87: YY_RULE_SETUP -#line 406 "lexer.l" +#line 430 "lexer.l" ; /*ignore*/ YY_BREAK -case 85: +case 88: YY_RULE_SETUP -#line 407 "lexer.l" +#line 431 "lexer.l" ECHO; YY_BREAK -#line 1734 "lex.yy.c" +#line 1776 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): @@ -2028,7 +2070,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 >= 371 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2058,11 +2100,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 >= 371 ) 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 == 370); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2620,4 +2662,4 @@ int main() return 0; } #endif -#line 407 "lexer.l" +#line 431 "lexer.l"