X-Git-Url: https://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/2310330e7d4d724bf6641339836be8523f95c916..e10d6e307623d0952f6e1f5d9fee8720ddab4808:/src/lexer.c diff --git a/src/lexer.c b/src/lexer.c index 770320c..d9990cd 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -284,78 +284,88 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 66 -#define YY_END_OF_BUFFER 67 -static yyconst short int yy_acclist[336] = +#define YY_NUM_RULES 72 +#define YY_END_OF_BUFFER 73 +static yyconst short int yy_acclist[359] = { 0, - 67, 64, 66, 63, 64, 66, 1, 65, 66, 64, - 65, 66, 64, 66, 64, 66, 64, 66, 64, 66, - 12, 64, 66, 1, 13, 65, 66, 12, 64, 65, - 66, 12, 64, 66, 12, 64, 66, 31, 64, 66, - 1, 32, 65, 66, 31, 64, 65, 66, 24, 31, - 64, 66, 31, 64, 66, 31, 64, 66, 31, 64, - 66, 31, 64, 66, 29, 31, 64, 66, 30, 31, - 64, 66, 31, 64, 66, 27, 64, 66, 1, 28, - 65, 66, 27, 64, 65, 66, 26, 27, 64, 66, - 27, 64, 66, 27, 64, 66, 64, 66, 64, 66, - - 59, 64, 66, 59, 64, 66, 59, 64, 66, 59, - 64, 66, 59, 64, 66, 60, 64, 66, 64, 66, - 64, 66, 57, 64, 66, 57, 64, 66, 59, 64, - 66, 59, 64, 66, 59, 64, 66, 59, 64, 66, - 59, 64, 66, 59, 64, 66, 59, 64, 66, 59, - 64, 66, 59, 64, 66, 59, 64, 66, 59, 64, - 66, 59, 64, 66, 61, 64, 66, 62, 64, 66, - 7, 15, 11, 8, 23, 16, 25, 9, 59, 58, - 59, 59, 59, 59, 57, 10, 57, 57, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - - 59, 59, 59, 59, 59, 59, 3, 14, 21, 17, - 19, 4, 5, 58, 59, 59, 59, 59, 49, 57, - 6, 57, 57, 59, 59, 59, 59, 59, 59, 44, - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 22, 18, 20, 59, 59, 35, 59, - 34, 59, 59, 47, 59, 59, 59, 39, 59, 59, - 42, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 36, 59, 33, 59, 59, 48, 59, 59, - 45, 59, 59, 59, 59, 59, 43, 59, 59, 59, - 59, 38, 59, 59, 59, 59, 59, 46, 59, 59, - - 59, 59, 50, 59, 54, 59, 40, 59, 37, 59, - 59, 59, 59, 59, 56, 59, 59, 51, 59, 59, - 53, 59, 59, 52, 59, 55, 59, 41, 59, 59, - 59, 59, 2, 2, 59 + 73, 70, 72, 69, 70, 72, 1, 71, 72, 70, + 71, 72, 70, 72, 70, 72, 70, 72, 69, 70, + 72, 70, 72, 70, 72, 13, 70, 72, 1, 14, + 71, 72, 13, 70, 71, 72, 13, 70, 72, 13, + 70, 72, 34, 70, 72, 1, 35, 71, 72, 34, + 70, 71, 72, 27, 34, 70, 72, 34, 70, 72, + 34, 70, 72, 34, 70, 72, 34, 70, 72, 32, + 34, 70, 72, 33, 34, 70, 72, 34, 70, 72, + 34, 70, 72, 30, 70, 72, 1, 31, 71, 72, + 30, 70, 71, 72, 29, 30, 70, 72, 30, 70, + + 72, 30, 70, 72, 70, 72, 70, 72, 64, 70, + 72, 64, 70, 72, 64, 70, 72, 64, 70, 72, + 64, 70, 72, 66, 70, 72, 70, 72, 70, 72, + 62, 70, 72, 62, 70, 72, 70, 72, 64, 70, + 72, 64, 70, 72, 64, 70, 72, 64, 70, 72, + 64, 70, 72, 64, 70, 72, 64, 70, 72, 64, + 70, 72, 64, 70, 72, 64, 70, 72, 64, 70, + 72, 64, 70, 72, 67, 70, 72, 68, 70, 72, + 8, 18, 12, 9, 26, 19, 28, 10, 64, 63, + 64, 64, 64, 64, 62, 11, 62, 62, 65, 64, + + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 3, 17, 24, + 20, 22, 5, 6, 63, 64, 64, 64, 64, 53, + 62, 7, 62, 62, 64, 64, 64, 64, 64, 64, + 48, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 15, 16, 25, 21, 23, + 64, 64, 39, 64, 38, 64, 64, 51, 64, 64, + 64, 43, 64, 64, 46, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 64, 40, 64, 36, + 64, 64, 52, 64, 64, 49, 64, 64, 64, 64, + + 64, 64, 47, 64, 64, 64, 64, 42, 64, 64, + 64, 64, 64, 50, 64, 64, 64, 64, 64, 54, + 64, 59, 64, 44, 64, 41, 64, 64, 64, 64, + 64, 61, 64, 64, 55, 64, 64, 64, 58, 64, + 64, 57, 64, 60, 64, 64, 45, 64, 64, 56, + 64, 64, 4, 64, 2, 2, 64, 37 } ; -static yyconst short int yy_accept[249] = +static yyconst short int yy_accept[315] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 7, 10, 13, 15, 17, - 19, 21, 24, 28, 32, 35, 38, 41, 45, 49, - 53, 56, 59, 62, 65, 69, 73, 76, 79, 83, - 87, 91, 94, 97, 99, 101, 104, 107, 110, 113, - 116, 119, 121, 123, 126, 129, 132, 135, 138, 141, - 144, 147, 150, 153, 156, 159, 162, 165, 168, 171, - 172, 172, 172, 172, 172, 173, 174, 174, 174, 174, - 174, 175, 175, 176, 177, 178, 179, 179, 179, 180, - 181, 182, 183, 184, 185, 185, 186, 187, 187, 187, - - 188, 188, 188, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, - 206, 207, 207, 208, 208, 208, 209, 210, 210, 210, - 210, 211, 212, 212, 213, 213, 214, 214, 215, 216, - 217, 218, 219, 220, 221, 221, 222, 223, 224, 225, - 226, 227, 228, 229, 230, 232, 233, 234, 235, 236, - 237, 238, 239, 240, 241, 242, 243, 244, 244, 244, - 245, 246, 247, 248, 249, 251, 253, 254, 256, 257, - 258, 260, 261, 263, 264, 265, 266, 267, 268, 269, - 270, 271, 272, 273, 275, 275, 276, 277, 278, 280, - - 281, 283, 284, 285, 286, 287, 289, 290, 291, 292, - 294, 295, 296, 296, 297, 298, 300, 301, 302, 303, - 305, 307, 309, 311, 312, 313, 313, 314, 315, 317, - 318, 320, 321, 323, 323, 324, 326, 328, 330, 330, - 331, 331, 332, 332, 333, 334, 336, 336 + 19, 22, 24, 26, 29, 33, 37, 40, 43, 46, + 50, 54, 58, 61, 64, 67, 70, 74, 78, 81, + 84, 87, 91, 95, 99, 102, 105, 107, 109, 112, + 115, 118, 121, 124, 127, 129, 131, 134, 137, 139, + 142, 145, 148, 151, 154, 157, 160, 163, 166, 169, + 172, 175, 178, 181, 182, 182, 182, 182, 182, 182, + 182, 182, 183, 183, 184, 184, 184, 184, 184, 185, + 185, 186, 186, 186, 187, 188, 189, 189, 189, 190, + + 191, 192, 193, 194, 195, 195, 196, 197, 197, 197, + 198, 198, 198, 199, 199, 200, 201, 202, 203, 204, + 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, + 215, 216, 217, 218, 218, 219, 219, 219, 219, 219, + 220, 220, 220, 220, 221, 221, 221, 221, 222, 223, + 223, 224, 224, 224, 225, 225, 226, 227, 228, 229, + 230, 231, 232, 232, 233, 234, 235, 235, 236, 237, + 238, 239, 240, 241, 243, 244, 245, 246, 247, 248, + 249, 250, 251, 252, 253, 254, 255, 256, 256, 256, + 256, 257, 258, 258, 258, 259, 260, 261, 261, 262, + + 263, 265, 267, 268, 270, 271, 272, 274, 275, 277, + 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, + 288, 290, 290, 291, 291, 291, 291, 291, 292, 293, + 295, 296, 298, 299, 300, 301, 302, 303, 305, 306, + 307, 308, 310, 311, 312, 312, 312, 312, 312, 312, + 313, 314, 316, 317, 318, 319, 320, 322, 324, 326, + 328, 329, 330, 330, 330, 330, 330, 330, 331, 332, + 334, 335, 337, 338, 339, 341, 341, 341, 341, 341, + 341, 342, 344, 346, 347, 349, 349, 349, 349, 349, + 349, 350, 352, 352, 352, 352, 352, 353, 353, 353, + + 353, 353, 354, 355, 356, 356, 356, 358, 358, 358, + 358, 358, 359, 359 } ; static yyconst int yy_ec[256] = @@ -363,17 +373,17 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 5, 1, 1, 6, 1, 7, 1, - 1, 8, 1, 1, 1, 9, 10, 11, 12, 12, - 12, 12, 12, 12, 12, 13, 13, 14, 1, 1, - 1, 1, 1, 1, 15, 15, 16, 15, 17, 18, - 19, 20, 19, 19, 21, 19, 22, 19, 23, 19, - 19, 24, 19, 25, 26, 19, 19, 19, 19, 19, - 1, 27, 1, 1, 19, 1, 28, 29, 30, 31, - - 32, 33, 34, 35, 36, 19, 19, 37, 38, 39, - 40, 41, 19, 42, 43, 44, 45, 46, 19, 47, - 19, 19, 48, 1, 49, 1, 1, 1, 1, 1, + 1, 2, 1, 5, 6, 1, 7, 1, 8, 1, + 1, 9, 1, 1, 1, 10, 11, 12, 13, 13, + 13, 13, 13, 13, 13, 14, 14, 15, 1, 16, + 1, 17, 1, 1, 18, 18, 19, 18, 20, 21, + 22, 23, 22, 22, 24, 22, 25, 22, 26, 22, + 22, 27, 22, 28, 29, 22, 22, 22, 22, 22, + 30, 31, 32, 1, 22, 1, 33, 34, 35, 36, + + 37, 38, 39, 40, 41, 22, 22, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 22, 53, + 22, 22, 54, 1, 55, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -390,213 +400,258 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[50] = +static yyconst int yy_meta[56] = { 0, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 3, 3, 3, 4, 5, 5, 5, 5, 6, 6, - 6, 6, 6, 6, 6, 6, 1, 5, 5, 5, - 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 1, 1 + 1, 3, 3, 3, 4, 1, 1, 5, 5, 5, + 5, 6, 6, 6, 6, 6, 6, 6, 6, 1, + 1, 1, 5, 5, 5, 5, 5, 5, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 1, 1 } ; -static yyconst short int yy_base[263] = +static yyconst short int yy_base[330] = { 0, - 0, 3, 12, 15, 35, 82, 24, 44, 131, 0, - 172, 0, 530, 531, 531, 531, 531, 4, 506, 491, - 6, 531, 531, 531, 517, 503, 531, 531, 531, 531, - 16, 16, 502, 0, 531, 531, 475, 531, 531, 531, - 531, 500, 0, 42, 0, 508, 21, 18, 17, 39, - 531, 64, 48, 69, 82, 54, 65, 58, 22, 53, - 83, 85, 177, 180, 175, 87, 192, 531, 531, 531, - 518, 495, 491, 470, 531, 531, 510, 58, 509, 508, - 531, 511, 531, 531, 531, 531, 510, 498, 497, 496, - 89, 96, 174, 193, 500, 100, 531, 505, 106, 184, - - 222, 0, 227, 94, 101, 185, 212, 213, 216, 223, - 227, 228, 229, 232, 172, 230, 231, 233, 235, 234, - 236, 504, 531, 486, 462, 531, 531, 497, 496, 495, - 531, 531, 498, 531, 497, 531, 485, 484, 107, 237, - 239, 238, 531, 251, 494, 531, 271, 0, 240, 245, - 255, 259, 241, 272, 482, 260, 275, 276, 277, 278, - 279, 281, 282, 285, 283, 287, 291, 478, 451, 531, - 531, 531, 106, 289, 479, 478, 288, 477, 290, 292, - 476, 293, 475, 294, 296, 300, 297, 295, 316, 310, - 302, 321, 298, 474, 463, 531, 46, 328, 472, 331, - - 471, 332, 333, 335, 336, 470, 337, 339, 338, 469, - 342, 340, 464, 343, 344, 467, 345, 353, 348, 465, - 421, 415, 388, 357, 351, 375, 350, 359, 386, 361, - 385, 363, 384, 381, 176, 377, 376, 299, 177, 364, - 170, 378, 45, 372, 531, 3, 531, 403, 409, 415, - 421, 427, 433, 435, 439, 445, 451, 457, 461, 465, - 471, 475 + 0, 3, 9, 12, 49, 102, 19, 36, 157, 0, + 203, 0, 650, 651, 651, 651, 651, 8, 623, 606, + 7, 2, 610, 651, 651, 651, 635, 619, 651, 651, + 651, 651, 15, 18, 618, 0, 651, 651, 6, 588, + 651, 651, 651, 651, 616, 0, 21, 0, 626, 47, + 16, 11, 28, 651, 65, 54, 71, 76, 79, 18, + 56, 49, 72, 30, 82, 67, 84, 87, 80, 85, + 99, 651, 651, 651, 637, 611, 605, 74, 600, 95, + 75, 651, 589, 651, 627, 213, 626, 625, 651, 629, + 651, 218, 587, 651, 651, 651, 627, 614, 613, 612, + + 21, 104, 102, 110, 616, 129, 651, 622, 140, 209, + 214, 0, 250, 218, 594, 116, 210, 222, 214, 219, + 103, 227, 231, 232, 236, 238, 246, 241, 256, 257, + 259, 261, 263, 620, 651, 599, 572, 587, 565, 651, + 564, 576, 565, 651, 607, 606, 605, 651, 651, 609, + 651, 576, 607, 651, 594, 593, 266, 267, 269, 270, + 651, 278, 604, 651, 284, 0, 289, 272, 278, 273, + 279, 284, 291, 591, 292, 295, 296, 299, 300, 303, + 305, 302, 310, 313, 314, 315, 318, 585, 555, 567, + 651, 651, 550, 560, 651, 651, 651, 558, 119, 317, + + 584, 583, 319, 582, 320, 321, 581, 322, 580, 323, + 325, 324, 327, 326, 332, 341, 333, 337, 344, 334, + 579, 566, 651, 555, 558, 542, 538, 360, 354, 573, + 361, 572, 345, 362, 364, 365, 369, 571, 371, 373, + 374, 570, 377, 378, 563, 535, 532, 544, 544, 380, + 379, 564, 381, 382, 390, 384, 563, 562, 561, 560, + 391, 393, 545, 96, 536, 523, 534, 387, 392, 555, + 395, 554, 400, 397, 553, 548, 521, 525, 562, 561, + 407, 547, 542, 402, 539, 486, 458, 438, 434, 414, + 416, 459, 453, 439, 431, 434, 405, 444, 434, 440, + + 444, 651, 435, 651, 423, 445, 441, 187, 451, 464, + 466, 651, 651, 478, 484, 490, 496, 502, 508, 510, + 514, 520, 526, 532, 536, 540, 546, 550, 555 } ; -static yyconst short int yy_def[263] = +static yyconst short int yy_def[330] = { 0, - 248, 248, 249, 249, 250, 250, 251, 251, 247, 9, - 9, 11, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 252, 247, 247, 247, 247, 247, 247, - 247, 247, 253, 247, 254, 255, 255, 255, 255, 255, - 247, 247, 247, 247, 247, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 247, 247, 247, - 256, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 257, 247, 247, 247, 247, 258, 259, 255, 260, - 255, 255, 255, 255, 247, 247, 247, 261, 247, 247, - - 247, 262, 247, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 256, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 257, 247, 258, 247, 259, 260, 255, 255, - 255, 255, 247, 247, 261, 247, 247, 262, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 247, 247, 247, - 247, 247, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 247, 247, 255, 255, 255, 255, - - 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 247, 255, 255, 255, 255, 255, 255, 255, - 255, 255, 255, 255, 255, 247, 255, 255, 255, 255, - 255, 255, 255, 247, 255, 255, 255, 255, 247, 255, - 247, 255, 247, 255, 247, 255, 0, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247 + 314, 314, 315, 315, 316, 316, 317, 317, 313, 9, + 9, 11, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 318, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 319, 313, 320, 321, 321, + 321, 321, 321, 313, 313, 313, 313, 313, 313, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 313, 313, 313, 322, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 323, + 313, 313, 313, 313, 313, 313, 324, 325, 321, 326, + + 321, 321, 321, 321, 313, 313, 313, 327, 313, 313, + 313, 328, 313, 313, 313, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 322, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 323, + 313, 313, 324, 313, 325, 326, 321, 321, 321, 321, + 313, 313, 327, 313, 313, 328, 313, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 321, 321, + + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 313, 313, 313, 313, 313, 313, 321, 321, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 321, 321, 313, 313, 313, 313, 313, 321, + 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, + 321, 321, 313, 313, 313, 313, 313, 321, 321, 321, + 321, 321, 321, 321, 321, 313, 313, 313, 313, 313, + 321, 321, 321, 321, 321, 313, 313, 313, 313, 313, + 321, 321, 313, 313, 313, 329, 321, 313, 313, 313, + + 329, 313, 321, 313, 313, 313, 321, 313, 313, 313, + 313, 313, 0, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313 } ; -static yyconst short int yy_nxt[581] = +static yyconst short int yy_nxt[707] = { 0, - 247, 15, 16, 17, 15, 16, 17, 247, 21, 18, - 247, 70, 18, 71, 23, 24, 90, 23, 24, 25, - 77, 19, 25, 81, 19, 82, 39, 40, 41, 20, - 90, 90, 20, 26, 90, 90, 26, 28, 29, 30, - 74, 31, 78, 91, 32, 42, 39, 40, 41, 86, - 43, 87, 90, 75, 92, 97, 33, 98, 93, 90, - 108, 34, 128, 79, 80, 42, 90, 90, 245, 214, - 43, 90, 95, 94, 96, 96, 96, 99, 90, 100, - 100, 101, 35, 36, 28, 29, 30, 37, 31, 109, - 99, 32, 103, 103, 103, 104, 90, 107, 90, 105, - - 90, 92, 90, 33, 106, 129, 130, 90, 34, 90, - 144, 144, 144, 139, 90, 102, 147, 147, 147, 90, - 90, 110, 197, 140, 111, 119, 173, 149, 150, 35, - 36, 14, 15, 16, 17, 14, 14, 14, 14, 14, - 44, 14, 14, 14, 45, 46, 46, 46, 46, 46, - 46, 46, 47, 46, 46, 46, 46, 14, 46, 46, - 48, 46, 46, 49, 46, 46, 46, 46, 46, 46, - 46, 46, 46, 46, 50, 46, 46, 46, 51, 14, - 52, 53, 54, 55, 55, 90, 243, 90, 90, 90, - 90, 240, 99, 90, 100, 100, 101, 241, 90, 56, - - 160, 57, 58, 59, 60, 90, 90, 61, 62, 116, - 117, 63, 64, 141, 65, 112, 66, 67, 118, 68, - 69, 114, 113, 151, 115, 90, 90, 120, 142, 90, - 99, 121, 101, 101, 101, 99, 90, 103, 103, 103, - 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, - 90, 90, 90, 90, 90, 154, 152, 153, 90, 157, - 158, 144, 144, 144, 162, 156, 155, 159, 90, 161, - 164, 167, 90, 90, 163, 166, 175, 165, 181, 174, - 176, 147, 147, 147, 177, 90, 178, 180, 90, 90, - 90, 90, 90, 183, 90, 90, 90, 179, 90, 182, - - 90, 90, 90, 90, 90, 90, 90, 90, 90, 90, - 90, 90, 90, 90, 187, 90, 184, 185, 192, 189, - 188, 194, 186, 90, 191, 198, 190, 204, 200, 90, - 193, 176, 205, 199, 90, 202, 201, 203, 206, 209, - 210, 90, 212, 207, 90, 90, 90, 208, 90, 90, - 90, 90, 90, 90, 211, 90, 90, 90, 90, 215, - 227, 90, 216, 90, 90, 220, 90, 225, 218, 222, - 90, 217, 90, 221, 90, 235, 90, 90, 219, 231, - 224, 223, 228, 230, 242, 90, 229, 233, 232, 90, - 90, 90, 237, 238, 244, 246, 239, 90, 90, 90, - - 234, 90, 236, 14, 14, 14, 14, 14, 14, 22, - 22, 22, 22, 22, 22, 27, 27, 27, 27, 27, - 27, 38, 38, 38, 38, 38, 38, 83, 90, 83, - 83, 83, 83, 85, 90, 85, 85, 85, 85, 88, - 88, 89, 89, 89, 89, 122, 122, 122, 122, 122, - 122, 133, 133, 133, 133, 133, 133, 135, 135, 135, - 135, 135, 135, 137, 137, 137, 137, 138, 138, 138, - 138, 145, 145, 145, 145, 145, 145, 148, 90, 148, - 90, 226, 90, 90, 90, 90, 213, 90, 90, 90, - 90, 90, 90, 196, 195, 90, 146, 90, 90, 136, - - 134, 172, 171, 170, 169, 168, 123, 146, 143, 90, - 90, 90, 136, 134, 132, 131, 127, 126, 125, 124, - 123, 90, 72, 84, 72, 72, 76, 73, 72, 247, - 13, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247 + 313, 15, 16, 17, 21, 16, 17, 92, 78, 22, + 18, 25, 26, 18, 25, 26, 74, 27, 75, 85, + 27, 42, 43, 44, 19, 100, 89, 19, 90, 96, + 100, 97, 100, 28, 20, 100, 28, 20, 42, 43, + 44, 80, 100, 45, 100, 86, 93, 81, 157, 46, + 23, 30, 31, 32, 79, 82, 33, 102, 103, 34, + 45, 100, 107, 100, 108, 116, 46, 104, 87, 88, + 100, 121, 101, 35, 105, 78, 106, 106, 106, 36, + 109, 100, 110, 110, 111, 109, 100, 113, 113, 113, + 114, 114, 114, 119, 100, 117, 100, 102, 100, 100, + + 118, 100, 37, 38, 30, 31, 32, 39, 40, 33, + 115, 123, 34, 100, 141, 120, 100, 100, 100, 128, + 129, 79, 142, 112, 100, 122, 35, 124, 131, 130, + 100, 138, 36, 100, 126, 125, 158, 127, 228, 132, + 162, 162, 162, 133, 139, 277, 159, 173, 140, 140, + 160, 165, 165, 165, 168, 37, 38, 14, 15, 16, + 17, 14, 14, 14, 14, 14, 14, 47, 14, 14, + 14, 48, 14, 14, 49, 49, 49, 49, 49, 49, + 49, 50, 49, 49, 49, 49, 14, 14, 14, 49, + 49, 51, 49, 49, 52, 49, 49, 49, 49, 49, + + 49, 49, 49, 49, 49, 49, 53, 49, 49, 49, + 54, 14, 55, 56, 57, 58, 58, 145, 109, 92, + 110, 110, 111, 109, 100, 111, 111, 111, 100, 114, + 114, 114, 59, 100, 141, 60, 100, 61, 62, 63, + 64, 100, 169, 65, 66, 100, 100, 67, 68, 115, + 100, 69, 100, 70, 71, 100, 72, 73, 93, 109, + 100, 113, 113, 113, 171, 170, 146, 147, 176, 172, + 100, 100, 177, 100, 175, 100, 174, 100, 178, 180, + 100, 100, 179, 100, 100, 181, 100, 100, 199, 162, + 162, 162, 100, 100, 182, 165, 165, 165, 100, 184, + + 114, 114, 114, 187, 183, 100, 100, 185, 186, 100, + 100, 201, 206, 100, 100, 200, 100, 100, 202, 100, + 115, 205, 203, 208, 100, 204, 207, 100, 100, 100, + 209, 100, 100, 100, 100, 100, 100, 100, 100, 100, + 100, 100, 210, 211, 214, 216, 100, 100, 100, 213, + 212, 100, 215, 221, 219, 100, 235, 218, 100, 100, + 217, 229, 231, 236, 220, 202, 237, 241, 100, 230, + 233, 232, 234, 239, 100, 100, 100, 240, 100, 100, + 242, 238, 243, 100, 244, 100, 250, 100, 100, 253, + 251, 100, 100, 100, 100, 100, 100, 252, 100, 256, + + 268, 100, 254, 257, 100, 100, 100, 100, 259, 100, + 262, 100, 258, 255, 100, 281, 100, 271, 296, 100, + 261, 100, 269, 260, 303, 291, 272, 274, 270, 296, + 100, 283, 285, 273, 275, 289, 284, 292, 302, 297, + 300, 282, 295, 295, 295, 295, 295, 295, 302, 100, + 302, 306, 306, 306, 309, 100, 306, 306, 306, 308, + 302, 307, 310, 310, 310, 311, 312, 311, 312, 305, + 304, 299, 298, 100, 294, 310, 310, 310, 14, 14, + 14, 14, 14, 14, 24, 24, 24, 24, 24, 24, + 29, 29, 29, 29, 29, 29, 41, 41, 41, 41, + + 41, 41, 91, 139, 91, 91, 91, 91, 95, 293, + 95, 95, 95, 95, 98, 98, 99, 99, 99, 99, + 134, 134, 134, 134, 134, 134, 150, 150, 150, 150, + 150, 150, 153, 153, 153, 153, 153, 153, 155, 155, + 155, 155, 156, 156, 156, 156, 163, 163, 163, 163, + 163, 163, 166, 100, 166, 301, 100, 301, 301, 301, + 301, 100, 290, 289, 288, 287, 286, 100, 100, 100, + 280, 279, 278, 276, 100, 100, 100, 100, 100, 267, + 266, 265, 264, 263, 100, 100, 100, 100, 249, 248, + 247, 246, 245, 100, 100, 100, 100, 100, 100, 227, + + 226, 225, 224, 223, 222, 100, 164, 100, 100, 154, + 198, 151, 197, 196, 195, 194, 193, 192, 191, 190, + 189, 188, 135, 167, 164, 161, 100, 100, 100, 154, + 152, 151, 149, 148, 144, 143, 83, 137, 136, 135, + 100, 76, 94, 76, 76, 84, 83, 77, 76, 313, + 13, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + + 313, 313, 313, 313, 313, 313 } ; -static yyconst short int yy_chk[581] = +static yyconst short int yy_chk[707] = { 0, - 0, 1, 1, 1, 2, 2, 2, 0, 2, 1, - 0, 18, 2, 18, 3, 3, 246, 4, 4, 3, - 31, 1, 4, 32, 2, 32, 7, 7, 7, 1, - 49, 48, 2, 3, 47, 59, 4, 5, 5, 5, - 21, 5, 31, 47, 5, 7, 8, 8, 8, 44, - 7, 44, 50, 21, 48, 53, 5, 53, 49, 197, - 59, 5, 78, 31, 31, 8, 60, 56, 243, 197, - 8, 58, 52, 50, 52, 52, 52, 54, 57, 54, - 54, 54, 5, 5, 6, 6, 6, 6, 6, 60, - 55, 6, 55, 55, 55, 56, 61, 58, 62, 57, - - 66, 57, 91, 6, 57, 78, 78, 104, 6, 92, - 96, 96, 96, 91, 105, 54, 99, 99, 99, 173, - 139, 61, 173, 92, 62, 66, 139, 104, 105, 6, - 6, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 0, 1, 1, 1, 2, 2, 2, 39, 21, 2, + 1, 3, 3, 2, 4, 4, 18, 3, 18, 33, + 4, 7, 7, 7, 1, 52, 34, 2, 34, 47, + 51, 47, 60, 3, 1, 101, 4, 2, 8, 8, + 8, 22, 53, 7, 64, 33, 39, 22, 101, 7, + 2, 5, 5, 5, 21, 22, 5, 51, 52, 5, + 8, 50, 56, 62, 56, 60, 8, 53, 33, 33, + 61, 64, 50, 5, 55, 78, 55, 55, 55, 5, + 57, 66, 57, 57, 57, 58, 63, 58, 58, 58, + 59, 59, 59, 62, 69, 61, 65, 61, 67, 70, + + 61, 68, 5, 5, 6, 6, 6, 6, 6, 6, + 59, 66, 6, 71, 81, 63, 103, 121, 102, 69, + 69, 78, 81, 57, 104, 65, 6, 67, 70, 69, + 116, 80, 6, 199, 68, 67, 102, 68, 199, 71, + 106, 106, 106, 71, 80, 264, 103, 121, 80, 264, + 104, 109, 109, 109, 116, 6, 6, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 11, 11, 11, 11, 11, 115, 241, 93, 65, 235, - 63, 235, 100, 64, 100, 100, 100, 239, 106, 11, - - 115, 11, 11, 11, 11, 67, 94, 11, 11, 65, - 65, 11, 11, 93, 11, 63, 11, 11, 65, 11, - 11, 64, 63, 106, 64, 107, 108, 67, 94, 109, - 101, 67, 101, 101, 101, 103, 110, 103, 103, 103, - 111, 112, 113, 116, 117, 114, 118, 120, 119, 121, - 140, 142, 141, 149, 153, 109, 107, 108, 150, 112, - 113, 144, 144, 144, 117, 111, 110, 114, 151, 116, - 119, 121, 152, 156, 118, 120, 141, 119, 153, 140, - 142, 147, 147, 147, 149, 154, 150, 152, 157, 158, - 159, 160, 161, 156, 162, 163, 165, 151, 164, 154, - - 166, 177, 174, 179, 167, 180, 182, 184, 188, 185, - 187, 193, 238, 186, 160, 191, 157, 158, 165, 162, - 161, 167, 159, 190, 164, 177, 163, 186, 180, 189, - 166, 174, 187, 179, 192, 184, 182, 185, 188, 190, - 191, 198, 193, 189, 200, 202, 203, 189, 204, 205, - 207, 209, 208, 212, 192, 211, 214, 215, 217, 198, - 214, 219, 200, 227, 225, 205, 218, 212, 203, 208, - 224, 202, 228, 207, 230, 227, 232, 240, 204, 219, - 211, 209, 215, 218, 240, 244, 217, 225, 224, 237, - 236, 242, 230, 232, 242, 244, 234, 233, 231, 229, - - 226, 223, 228, 248, 248, 248, 248, 248, 248, 249, - 249, 249, 249, 249, 249, 250, 250, 250, 250, 250, - 250, 251, 251, 251, 251, 251, 251, 252, 222, 252, - 252, 252, 252, 253, 221, 253, 253, 253, 253, 254, - 254, 255, 255, 255, 255, 256, 256, 256, 256, 256, - 256, 257, 257, 257, 257, 257, 257, 258, 258, 258, - 258, 258, 258, 259, 259, 259, 259, 260, 260, 260, - 260, 261, 261, 261, 261, 261, 261, 262, 220, 262, - 216, 213, 210, 206, 201, 199, 195, 194, 183, 181, - 178, 176, 175, 169, 168, 155, 145, 138, 137, 135, - - 133, 130, 129, 128, 125, 124, 122, 98, 95, 90, - 89, 88, 87, 82, 80, 79, 77, 74, 73, 72, - 71, 46, 42, 37, 33, 26, 25, 20, 19, 13, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 247, 247, 247 + + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 11, 11, 11, 11, 11, 86, 110, 92, + 110, 110, 110, 111, 117, 111, 111, 111, 119, 114, + 114, 114, 11, 120, 308, 11, 118, 11, 11, 11, + 11, 122, 117, 11, 11, 123, 124, 11, 11, 114, + 125, 11, 126, 11, 11, 128, 11, 11, 92, 113, + 127, 113, 113, 113, 119, 118, 86, 86, 124, 120, + 129, 130, 125, 131, 123, 132, 122, 133, 126, 127, + 157, 158, 126, 159, 160, 128, 168, 170, 157, 162, + 162, 162, 169, 171, 129, 165, 165, 165, 172, 131, + + 167, 167, 167, 133, 130, 173, 175, 131, 132, 176, + 177, 159, 171, 178, 179, 158, 182, 180, 160, 181, + 167, 170, 168, 173, 183, 169, 172, 184, 185, 186, + 175, 200, 187, 203, 205, 206, 208, 210, 212, 211, + 214, 213, 176, 177, 180, 182, 215, 217, 220, 179, + 178, 218, 181, 187, 185, 216, 212, 184, 219, 233, + 183, 203, 206, 213, 186, 200, 214, 217, 229, 205, + 210, 208, 211, 216, 228, 231, 234, 216, 235, 236, + 218, 215, 219, 237, 220, 239, 228, 240, 241, 233, + 229, 243, 244, 251, 250, 253, 254, 231, 256, 236, + + 250, 268, 234, 237, 255, 261, 269, 262, 240, 271, + 244, 274, 239, 235, 273, 268, 284, 254, 290, 297, + 243, 281, 251, 241, 297, 281, 255, 261, 253, 290, + 291, 271, 274, 256, 262, 289, 273, 284, 296, 291, + 295, 269, 295, 295, 295, 289, 289, 289, 301, 303, + 296, 300, 300, 300, 306, 307, 306, 306, 306, 305, + 301, 303, 309, 309, 309, 310, 310, 311, 311, 299, + 298, 294, 293, 292, 288, 310, 310, 310, 314, 314, + 314, 314, 314, 314, 315, 315, 315, 315, 315, 315, + 316, 316, 316, 316, 316, 316, 317, 317, 317, 317, + + 317, 317, 318, 287, 318, 318, 318, 318, 319, 286, + 319, 319, 319, 319, 320, 320, 321, 321, 321, 321, + 322, 322, 322, 322, 322, 322, 323, 323, 323, 323, + 323, 323, 324, 324, 324, 324, 324, 324, 325, 325, + 325, 325, 326, 326, 326, 326, 327, 327, 327, 327, + 327, 327, 328, 285, 328, 329, 283, 329, 329, 329, + 329, 282, 280, 279, 278, 277, 276, 275, 272, 270, + 267, 266, 265, 263, 260, 259, 258, 257, 252, 249, + 248, 247, 246, 245, 242, 238, 232, 230, 227, 226, + 225, 224, 222, 221, 209, 207, 204, 202, 201, 198, + + 194, 193, 190, 189, 188, 174, 163, 156, 155, 153, + 152, 150, 147, 146, 145, 143, 142, 141, 139, 138, + 137, 136, 134, 115, 108, 105, 100, 99, 98, 97, + 93, 90, 88, 87, 85, 83, 79, 77, 76, 75, + 49, 45, 40, 35, 28, 27, 23, 20, 19, 13, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + + 313, 313, 313, 313, 313, 313 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -639,20 +694,24 @@ char *yytext; #include "config.h" #include +#include #include "parse.h" #include "main.h" - -extern gboolean for_cpp; +#include "util.h" static int parenth_depth = 0; static int before_comment = INITIAL; -static int class_after_c = FALSE; -static int header_c = FALSE; +static gboolean class_after_c = FALSE; +static int code_type = CCODE; static GString *cbuf = NULL; int ccode_line = 1; +GList *include_files = NULL; +/* 0 no, 1 means yes, 2+ means don't even start looking anymore */ +static int look_for_includes = 0; + int line_no = 1; static void @@ -685,7 +744,7 @@ add_to_cbuf(char *s) #define CLASS_CODE_I 5 -#line 689 "lex.yy.c" +#line 748 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -839,10 +898,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 69 "lexer.l" +#line 73 "lexer.l" -#line 846 "lex.yy.c" +#line 905 "lex.yy.c" if ( yy_init ) { @@ -891,14 +950,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 >= 248 ) + if ( yy_current_state >= 314 ) 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] != 531 ); + while ( yy_base[yy_current_state] != 651 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -929,12 +988,12 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 71 "lexer.l" +#line 75 "lexer.l" { line_no++; REJECT; } YY_BREAK case 2: YY_RULE_SETUP -#line 73 "lexer.l" +#line 77 "lexer.l" { fprintf(stderr,"You are a bad bad person!\n"); REJECT; } YY_BREAK case 3: @@ -942,195 +1001,240 @@ case 3: yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 75 "lexer.l" +#line 79 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 4: +YY_RULE_SETUP +#line 80 "lexer.l" +{ + if(look_for_includes==1) { + char *p; + char *file; + char *str = g_strdup(yytext); + file = strchr(str,'"'); + if(!file) file = strchr(str,'<'); + file++; + p = strchr(file,'"'); + if(!p) p = strchr(file,'>'); + *p = '\0'; + include_files = g_list_prepend(include_files,g_strdup(file)); + g_free(str); + } + REJECT; +} + YY_BREAK +case 5: *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 76 "lexer.l" +#line 97 "lexer.l" { add_to_cbuf(yytext); /*comment, ignore*/ } YY_BREAK -case 5: +case 6: *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 77 "lexer.l" +#line 98 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK -case 6: +case 7: *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 78 "lexer.l" +#line 99 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK -case 7: +case 8: YY_RULE_SETUP -#line 79 "lexer.l" +#line 100 "lexer.l" {BEGIN(COMMENT); before_comment = INITIAL; } YY_BREAK -case 8: +case 9: YY_RULE_SETUP -#line 80 "lexer.l" +#line 101 "lexer.l" { add_to_cbuf(yytext); BEGIN(COMMENT); before_comment = C_CODE; } YY_BREAK -case 9: +case 10: YY_RULE_SETUP -#line 85 "lexer.l" +#line 106 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE; } YY_BREAK -case 10: +case 11: YY_RULE_SETUP -#line 86 "lexer.l" +#line 107 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } YY_BREAK -case 11: +case 12: YY_RULE_SETUP -#line 87 "lexer.l" +#line 108 "lexer.l" { if(before_comment == C_CODE) add_to_cbuf(yytext); BEGIN(before_comment); } YY_BREAK -case 12: +case 13: YY_RULE_SETUP -#line 91 "lexer.l" +#line 112 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); } YY_BREAK -case 13: +case 14: YY_RULE_SETUP -#line 95 "lexer.l" +#line 116 "lexer.l" { /* comment, ignore */ if(before_comment == C_CODE) add_to_cbuf(yytext); } YY_BREAK -case 14: +case 15: YY_RULE_SETUP -#line 100 "lexer.l" +#line 121 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; - header_c = TRUE; + code_type = HTCODE; clear_cbuf(); ccode_line = line_no; } YY_BREAK -case 15: +case 16: YY_RULE_SETUP -#line 108 "lexer.l" +#line 129 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; class_after_c = FALSE; - header_c = FALSE; + code_type = PHCODE; clear_cbuf(); ccode_line = line_no; } YY_BREAK -case 16: +case 17: YY_RULE_SETUP -#line 116 "lexer.l" +#line 137 "lexer.l" +{ + BEGIN(C_CODE); + parenth_depth = 1; + class_after_c = FALSE; + code_type = HCODE; + clear_cbuf(); + ccode_line = line_no; + } + YY_BREAK +case 18: +YY_RULE_SETUP +#line 145 "lexer.l" +{ + BEGIN(C_CODE); + parenth_depth = 1; + class_after_c = FALSE; + code_type = CCODE; + clear_cbuf(); + ccode_line = line_no; + if(look_for_includes==0) + look_for_includes=1; + } + YY_BREAK +case 19: +YY_RULE_SETUP +#line 155 "lexer.l" { BEGIN(INITIAL); yylval.cbuf = cbuf; cbuf = NULL; - if(header_c) - return HCODE; - else - return CCODE; + if(look_for_includes==1) + look_for_includes=0; + return code_type; } YY_BREAK -case 17: +case 20: YY_RULE_SETUP -#line 126 "lexer.l" +#line 164 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 18: +case 21: YY_RULE_SETUP -#line 127 "lexer.l" +#line 165 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 19: +case 22: YY_RULE_SETUP -#line 128 "lexer.l" +#line 166 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 20: +case 23: YY_RULE_SETUP -#line 129 "lexer.l" +#line 167 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 21: +case 24: YY_RULE_SETUP -#line 130 "lexer.l" +#line 168 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 22: +case 25: YY_RULE_SETUP -#line 131 "lexer.l" +#line 169 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 23: +case 26: YY_RULE_SETUP -#line 133 "lexer.l" +#line 171 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 24: +case 27: YY_RULE_SETUP -#line 134 "lexer.l" +#line 172 "lexer.l" { BEGIN(C_CODE_STRING); add_to_cbuf(yytext); } YY_BREAK -case 25: +case 28: YY_RULE_SETUP -#line 138 "lexer.l" +#line 176 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 26: +case 29: YY_RULE_SETUP -#line 139 "lexer.l" +#line 177 "lexer.l" { BEGIN(C_CODE); add_to_cbuf(yytext); } YY_BREAK -case 27: +case 30: YY_RULE_SETUP -#line 143 "lexer.l" +#line 181 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 28: +case 31: YY_RULE_SETUP -#line 144 "lexer.l" +#line 182 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 29: +case 32: YY_RULE_SETUP -#line 146 "lexer.l" +#line 184 "lexer.l" { parenth_depth++; add_to_cbuf(yytext); } YY_BREAK -case 30: +case 33: YY_RULE_SETUP -#line 150 "lexer.l" +#line 188 "lexer.l" { parenth_depth--; if(parenth_depth<0) { @@ -1144,27 +1248,58 @@ YY_RULE_SETUP add_to_cbuf(yytext); } YY_BREAK -case 31: +case 34: YY_RULE_SETUP -#line 163 "lexer.l" +#line 201 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 32: +case 35: YY_RULE_SETUP -#line 164 "lexer.l" +#line 202 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 33: +case 36: YY_RULE_SETUP -#line 166 "lexer.l" +#line 204 "lexer.l" { + look_for_includes = 2; BEGIN(CLASS_CODE); return CLASS; } YY_BREAK -case 34: +case 37: +*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 171 "lexer.l" +#line 210 "lexer.l" +{ + int maj = 0,min = 0,pl = 0; + int rmaj = 0,rmin = 0,rpl = 0; + char *p; + + sscanf(VERSION,"%d.%d.%d",&rmaj,&rmin,&rpl); + p = strchr(yytext,'r'); + g_assert(p); /* we MUST have found it */ + sscanf(p,"requires %d.%d.%d",&maj,&min,&pl); + if(rmaj < maj || + (rmaj == maj && rmin < min) || + (rmaj == maj && rmin == min && rpl < pl)) { + char *s; + s = g_strdup_printf( + "GOB version %d.%d.%d required " + "(this is %s)\n" + "To upgrade your gob, see: " + "http://www.5z.com/jirka/gob.html", + maj,min,pl,VERSION); + print_error(FALSE,s, line_no); + g_free(s); + } + } + YY_BREAK +case 38: +YY_RULE_SETUP +#line 234 "lexer.l" { if(for_cpp) { char *s; @@ -1177,192 +1312,206 @@ YY_RULE_SETUP REJECT; } YY_BREAK -case 35: +case 39: YY_RULE_SETUP -#line 183 "lexer.l" +#line 246 "lexer.l" {return FROM;} YY_BREAK -case 36: +case 40: YY_RULE_SETUP -#line 185 "lexer.l" +#line 248 "lexer.l" {return VOID;} YY_BREAK -case 37: +case 41: YY_RULE_SETUP -#line 186 "lexer.l" +#line 249 "lexer.l" {return STRUCT;} YY_BREAK -case 38: +case 42: YY_RULE_SETUP -#line 187 "lexer.l" +#line 250 "lexer.l" {return UNION;} YY_BREAK -case 39: +case 43: YY_RULE_SETUP -#line 188 "lexer.l" +#line 251 "lexer.l" {return ENUM;} YY_BREAK -case 40: +case 44: YY_RULE_SETUP -#line 189 "lexer.l" +#line 252 "lexer.l" {return SIGNED;} YY_BREAK -case 41: +case 45: YY_RULE_SETUP -#line 190 "lexer.l" +#line 253 "lexer.l" {return UNSIGNED;} YY_BREAK -case 42: +case 46: YY_RULE_SETUP -#line 191 "lexer.l" +#line 254 "lexer.l" {return LONG;} YY_BREAK -case 43: +case 47: YY_RULE_SETUP -#line 192 "lexer.l" +#line 255 "lexer.l" {return SHORT;} YY_BREAK -case 44: +case 48: YY_RULE_SETUP -#line 193 "lexer.l" +#line 256 "lexer.l" {return INT;} YY_BREAK -case 45: +case 49: YY_RULE_SETUP -#line 194 "lexer.l" +#line 257 "lexer.l" {return FLOAT;} YY_BREAK -case 46: +case 50: YY_RULE_SETUP -#line 195 "lexer.l" +#line 258 "lexer.l" {return DOUBLE;} YY_BREAK -case 47: +case 51: YY_RULE_SETUP -#line 196 "lexer.l" +#line 259 "lexer.l" {return CHAR;} YY_BREAK -case 48: +case 52: YY_RULE_SETUP -#line 197 "lexer.l" +#line 260 "lexer.l" {return CONST;} YY_BREAK -case 49: +case 53: YY_RULE_SETUP -#line 199 "lexer.l" +#line 262 "lexer.l" {return THREEDOTS;} YY_BREAK -case 50: +case 54: YY_RULE_SETUP -#line 201 "lexer.l" +#line 264 "lexer.l" {yylval.line = line_no; return PUBLIC;} YY_BREAK -case 51: +case 55: YY_RULE_SETUP -#line 202 "lexer.l" +#line 265 "lexer.l" {yylval.line = line_no; return PRIVATE;} YY_BREAK -case 52: +case 56: YY_RULE_SETUP -#line 203 "lexer.l" +#line 266 "lexer.l" +{yylval.line = line_no; return PROTECTED;} + YY_BREAK +case 57: +YY_RULE_SETUP +#line 267 "lexer.l" {yylval.line = line_no; return ARGUMENT;} YY_BREAK -case 53: +case 58: YY_RULE_SETUP -#line 204 "lexer.l" +#line 268 "lexer.l" {yylval.line = line_no; return VIRTUAL;} YY_BREAK -case 54: +case 59: YY_RULE_SETUP -#line 205 "lexer.l" +#line 269 "lexer.l" {yylval.line = line_no; return SIGNAL;} YY_BREAK -case 55: +case 60: YY_RULE_SETUP -#line 206 "lexer.l" +#line 270 "lexer.l" {yylval.line = line_no; return OVERRIDE;} YY_BREAK -case 56: +case 61: YY_RULE_SETUP -#line 207 "lexer.l" +#line 271 "lexer.l" {return ONERROR;} YY_BREAK -case 57: +case 62: YY_RULE_SETUP -#line 208 "lexer.l" +#line 272 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 58: +case 63: YY_RULE_SETUP -#line 212 "lexer.l" +#line 276 "lexer.l" { yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 59: +case 64: YY_RULE_SETUP -#line 216 "lexer.l" +#line 280 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 60: +case 65: +YY_RULE_SETUP +#line 285 "lexer.l" +{ + yylval.id = g_strdup(yytext); + return ARRAY_DIM; + } + YY_BREAK +case 66: YY_RULE_SETUP -#line 221 "lexer.l" +#line 290 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 61: +case 67: YY_RULE_SETUP -#line 225 "lexer.l" +#line 294 "lexer.l" { BEGIN(C_CODE); parenth_depth=1; class_after_c = TRUE; - ccode_line = line_no; yylval.line = line_no; + clear_cbuf(); + ccode_line = line_no; return '{'; } YY_BREAK -case 62: +case 68: YY_RULE_SETUP -#line 233 "lexer.l" +#line 303 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 63: +case 69: YY_RULE_SETUP -#line 238 "lexer.l" +#line 308 "lexer.l" ; /*ignore*/ YY_BREAK -case 64: +case 70: YY_RULE_SETUP -#line 240 "lexer.l" +#line 310 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 65: +case 71: YY_RULE_SETUP -#line 245 "lexer.l" +#line 315 "lexer.l" ; /*ignore*/ YY_BREAK -case 66: +case 72: YY_RULE_SETUP -#line 246 "lexer.l" +#line 316 "lexer.l" ECHO; YY_BREAK -#line 1366 "lex.yy.c" +#line 1515 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): @@ -1657,7 +1806,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 >= 248 ) + if ( yy_current_state >= 314 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1687,11 +1836,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 >= 248 ) + if ( yy_current_state >= 314 ) 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 == 247); + yy_is_jam = (yy_current_state == 313); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2249,4 +2398,4 @@ int main() return 0; } #endif -#line 246 "lexer.l" +#line 316 "lexer.l"