X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/2310330e7d4d724bf6641339836be8523f95c916..6d0fe9d5f8c513045bf064ea256c822beac19037:/src/lexer.c diff --git a/src/lexer.c b/src/lexer.c index 770320c..a2c7013 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -284,78 +284,81 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 66 -#define YY_END_OF_BUFFER 67 -static yyconst short int yy_acclist[336] = +#define YY_NUM_RULES 68 +#define YY_END_OF_BUFFER 69 +static yyconst short int yy_acclist[343] = { 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 + 69, 66, 68, 65, 66, 68, 1, 67, 68, 66, + 67, 68, 66, 68, 66, 68, 66, 68, 66, 68, + 13, 66, 68, 1, 14, 67, 68, 13, 66, 67, + 68, 13, 66, 68, 13, 66, 68, 32, 66, 68, + 1, 33, 67, 68, 32, 66, 67, 68, 25, 32, + 66, 68, 32, 66, 68, 32, 66, 68, 32, 66, + 68, 32, 66, 68, 30, 32, 66, 68, 31, 32, + 66, 68, 32, 66, 68, 32, 66, 68, 28, 66, + 68, 1, 29, 67, 68, 28, 66, 67, 68, 27, + 28, 66, 68, 28, 66, 68, 28, 66, 68, 66, + + 68, 66, 68, 60, 66, 68, 60, 66, 68, 60, + 66, 68, 60, 66, 68, 60, 66, 68, 62, 66, + 68, 66, 68, 66, 68, 58, 66, 68, 58, 66, + 68, 66, 68, 60, 66, 68, 60, 66, 68, 60, + 66, 68, 60, 66, 68, 60, 66, 68, 60, 66, + 68, 60, 66, 68, 60, 66, 68, 60, 66, 68, + 60, 66, 68, 60, 66, 68, 60, 66, 68, 63, + 66, 68, 64, 66, 68, 8, 16, 12, 9, 24, + 17, 26, 10, 60, 59, 60, 60, 60, 60, 58, + 11, 58, 58, 61, 60, 60, 60, 60, 60, 60, + + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 3, 15, 22, 18, 20, 5, 6, 59, + 60, 60, 60, 60, 50, 58, 7, 58, 58, 60, + 60, 60, 60, 60, 60, 45, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 23, + 19, 21, 60, 60, 36, 60, 35, 60, 60, 48, + 60, 60, 60, 40, 60, 60, 43, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 37, 60, + 34, 60, 60, 49, 60, 60, 46, 60, 60, 60, + 60, 60, 44, 60, 60, 60, 60, 39, 60, 60, + + 60, 60, 60, 47, 60, 60, 60, 60, 51, 60, + 55, 60, 41, 60, 38, 60, 60, 60, 60, 60, + 57, 60, 60, 52, 60, 60, 54, 60, 60, 53, + 60, 56, 60, 42, 60, 60, 60, 4, 60, 2, + 2, 60 } ; -static yyconst short int yy_accept[249] = +static yyconst short int yy_accept[266] = { 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, + 53, 56, 59, 62, 65, 69, 73, 76, 79, 82, + 86, 90, 94, 97, 100, 102, 104, 107, 110, 113, + 116, 119, 122, 124, 126, 129, 132, 134, 137, 140, + 143, 146, 149, 152, 155, 158, 161, 164, 167, 170, + 173, 176, 177, 177, 177, 177, 177, 178, 179, 179, + 179, 179, 179, 180, 180, 181, 181, 181, 182, 183, + 184, 184, 184, 185, 186, 187, 188, 189, 190, 190, + + 191, 192, 192, 192, 193, 193, 193, 194, 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 + 206, 207, 208, 209, 210, 211, 212, 213, 213, 214, + 214, 214, 215, 216, 216, 216, 216, 217, 218, 218, + 219, 219, 219, 220, 220, 221, 222, 223, 224, 225, + 226, 227, 227, 228, 229, 230, 230, 231, 232, 233, + 234, 235, 236, 238, 239, 240, 241, 242, 243, 244, + 245, 246, 247, 248, 249, 250, 250, 250, 251, 252, + 253, 253, 254, 255, 257, 259, 260, 262, 263, 264, + 266, 267, 269, 270, 271, 272, 273, 274, 275, 276, + + 277, 278, 279, 281, 281, 282, 282, 283, 284, 286, + 287, 289, 290, 291, 292, 293, 295, 296, 297, 298, + 300, 301, 302, 302, 302, 303, 304, 306, 307, 308, + 309, 311, 313, 315, 317, 318, 319, 319, 319, 320, + 321, 323, 324, 326, 327, 329, 329, 329, 330, 332, + 334, 336, 336, 336, 337, 337, 337, 338, 338, 338, + 339, 340, 341, 343, 343 } ; static yyconst int yy_ec[256] = @@ -363,17 +366,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, 22, 47, 48, 49, 50, 51, 22, 52, + 22, 22, 53, 1, 54, 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 +393,228 @@ static yyconst int yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst int yy_meta[50] = +static yyconst int yy_meta[55] = { 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, 1, 1 } ; -static yyconst short int yy_base[263] = +static yyconst short int yy_base[281] = { 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, 36, 88, 26, 45, 142, 0, + 187, 0, 572, 573, 573, 573, 573, 8, 545, 528, + 2, 573, 573, 573, 558, 542, 573, 573, 573, 573, + 15, 13, 541, 0, 573, 573, 21, 512, 573, 573, + 573, 573, 539, 0, 34, 0, 549, 37, 11, 12, + 18, 573, 61, 45, 68, 73, 52, 57, 82, 62, + 64, 73, 85, 83, 86, 88, 91, 90, 189, 573, + 573, 573, 560, 534, 528, 507, 573, 573, 551, 197, + 550, 549, 573, 553, 573, 201, 511, 573, 573, 573, + 551, 538, 537, 536, 95, 103, 94, 190, 540, 194, + + 573, 546, 197, 202, 233, 0, 242, 245, 518, 21, + 203, 204, 211, 212, 224, 229, 238, 96, 234, 245, + 87, 248, 249, 250, 251, 253, 255, 544, 573, 523, + 497, 573, 573, 536, 535, 534, 573, 573, 538, 573, + 505, 536, 573, 523, 522, 102, 257, 252, 258, 573, + 262, 533, 573, 267, 0, 271, 272, 274, 275, 276, + 283, 279, 520, 286, 287, 289, 292, 293, 294, 296, + 298, 299, 301, 300, 302, 514, 485, 573, 573, 573, + 490, 304, 303, 516, 515, 312, 514, 305, 314, 513, + 313, 512, 316, 317, 324, 318, 322, 332, 315, 330, + + 331, 337, 511, 498, 573, 474, 99, 338, 508, 343, + 507, 345, 351, 346, 353, 506, 352, 357, 358, 505, + 361, 363, 498, 482, 362, 364, 502, 366, 367, 369, + 501, 500, 499, 498, 374, 370, 479, 468, 371, 376, + 446, 382, 440, 384, 413, 407, 422, 97, 408, 407, + 403, 380, 393, 386, 201, 397, 401, 186, 410, 573, + 402, 573, 17, 573, 429, 435, 441, 447, 453, 459, + 461, 465, 471, 477, 483, 487, 491, 497, 501, 506 } ; -static yyconst short int yy_def[263] = +static yyconst short int yy_def[281] = { 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 + 265, 265, 266, 266, 267, 267, 268, 268, 264, 9, + 9, 11, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 269, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 270, 264, 271, 272, 272, 272, 272, + 272, 264, 264, 264, 264, 264, 264, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 264, + 264, 264, 273, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 274, 264, 264, 264, 264, 264, 264, + 275, 276, 272, 277, 272, 272, 272, 272, 264, 264, + + 264, 278, 264, 264, 264, 279, 264, 264, 264, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 273, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 274, 264, + 264, 275, 264, 276, 277, 272, 272, 272, 272, 264, + 264, 278, 264, 264, 279, 264, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 264, 264, 264, 264, 264, + 264, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + + 272, 272, 272, 264, 264, 264, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 272, 272, 272, 272, + 272, 272, 264, 264, 272, 272, 272, 272, 272, 272, + 272, 272, 272, 272, 272, 272, 264, 264, 272, 272, + 272, 272, 272, 272, 272, 264, 264, 272, 272, 272, + 272, 264, 264, 272, 264, 280, 272, 264, 280, 264, + 272, 264, 272, 0, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264 } ; -static yyconst short int yy_nxt[581] = +static yyconst short int yy_nxt[628] = { 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 + 264, 15, 16, 17, 15, 16, 17, 264, 264, 21, + 18, 23, 24, 18, 23, 24, 72, 25, 73, 79, + 25, 83, 86, 84, 19, 94, 94, 19, 40, 41, + 42, 94, 94, 26, 20, 94, 26, 20, 28, 29, + 30, 76, 90, 31, 91, 80, 32, 40, 41, 42, + 43, 94, 96, 101, 77, 102, 44, 98, 97, 157, + 33, 87, 95, 108, 108, 108, 34, 81, 82, 43, + 99, 94, 100, 100, 100, 44, 94, 103, 94, 104, + 104, 105, 103, 109, 107, 107, 107, 94, 35, 36, + 28, 29, 30, 37, 38, 31, 94, 94, 32, 94, + + 94, 94, 94, 110, 94, 94, 113, 114, 94, 94, + 94, 94, 33, 94, 115, 254, 94, 94, 34, 106, + 168, 111, 146, 96, 182, 225, 112, 117, 116, 118, + 122, 123, 165, 125, 120, 147, 119, 121, 148, 124, + 35, 36, 14, 15, 16, 17, 14, 14, 14, 14, + 14, 14, 45, 14, 14, 14, 46, 14, 14, 47, + 47, 47, 47, 47, 47, 47, 48, 47, 47, 47, + 47, 14, 14, 14, 47, 47, 49, 47, 47, 50, + 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, + 51, 47, 47, 47, 52, 14, 53, 54, 55, 56, + + 56, 134, 86, 94, 94, 151, 151, 151, 154, 154, + 154, 103, 262, 104, 104, 105, 57, 94, 94, 58, + 258, 59, 60, 61, 62, 94, 94, 63, 64, 126, + 149, 65, 66, 127, 67, 158, 68, 69, 94, 70, + 71, 87, 103, 94, 105, 105, 105, 159, 94, 135, + 136, 103, 94, 107, 107, 107, 108, 108, 108, 94, + 160, 161, 94, 94, 94, 94, 94, 94, 162, 94, + 166, 94, 94, 151, 151, 151, 109, 163, 154, 154, + 154, 164, 108, 108, 108, 167, 94, 170, 94, 94, + 94, 172, 169, 94, 184, 175, 171, 94, 173, 174, + + 94, 94, 109, 94, 183, 185, 94, 94, 94, 189, + 94, 191, 94, 94, 94, 94, 94, 94, 94, 94, + 187, 186, 188, 207, 192, 190, 94, 94, 94, 94, + 94, 94, 94, 193, 196, 194, 94, 203, 94, 198, + 197, 201, 195, 200, 94, 94, 94, 199, 202, 219, + 185, 94, 94, 209, 208, 210, 214, 94, 215, 94, + 94, 211, 212, 213, 217, 94, 94, 94, 218, 221, + 216, 94, 94, 220, 226, 94, 94, 94, 94, 227, + 94, 94, 239, 94, 94, 94, 222, 231, 94, 228, + 94, 229, 233, 232, 230, 236, 94, 256, 94, 248, + + 94, 260, 242, 255, 235, 243, 234, 240, 256, 257, + 244, 245, 241, 260, 260, 94, 94, 94, 250, 251, + 261, 94, 94, 253, 249, 252, 260, 94, 263, 14, + 14, 14, 14, 14, 14, 22, 22, 22, 22, 22, + 22, 27, 27, 27, 27, 27, 27, 39, 39, 39, + 39, 39, 39, 85, 94, 85, 85, 85, 85, 89, + 94, 89, 89, 89, 89, 92, 92, 93, 93, 93, + 93, 128, 128, 128, 128, 128, 128, 139, 139, 139, + 139, 139, 139, 142, 142, 142, 142, 142, 142, 144, + 144, 144, 144, 145, 145, 145, 145, 152, 152, 152, + + 152, 152, 152, 155, 247, 155, 259, 246, 259, 259, + 259, 259, 94, 94, 94, 94, 94, 238, 237, 94, + 94, 94, 94, 224, 223, 94, 94, 94, 94, 94, + 94, 206, 205, 204, 94, 153, 94, 94, 143, 181, + 140, 180, 179, 178, 177, 176, 129, 156, 153, 150, + 94, 94, 94, 143, 141, 140, 138, 137, 133, 132, + 131, 130, 129, 94, 74, 88, 74, 74, 78, 75, + 74, 264, 13, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264 } ; -static yyconst short int yy_chk[581] = +static yyconst short int yy_chk[628] = { 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, 0, 0, 2, + 1, 3, 3, 2, 4, 4, 18, 3, 18, 31, + 4, 32, 37, 32, 1, 49, 50, 2, 7, 7, + 7, 263, 51, 3, 1, 110, 4, 2, 5, 5, + 5, 21, 45, 5, 45, 31, 5, 8, 8, 8, + 7, 48, 49, 54, 21, 54, 7, 51, 50, 110, + 5, 37, 48, 57, 57, 57, 5, 31, 31, 8, + 53, 58, 53, 53, 53, 8, 60, 55, 61, 55, + 55, 55, 56, 57, 56, 56, 56, 62, 5, 5, + 6, 6, 6, 6, 6, 6, 59, 64, 6, 63, + + 65, 121, 66, 58, 68, 67, 60, 61, 97, 95, + 118, 248, 6, 207, 62, 248, 146, 96, 6, 55, + 121, 59, 95, 59, 146, 207, 59, 64, 63, 65, + 67, 67, 118, 68, 66, 96, 65, 66, 97, 67, + 6, 6, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 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, 11, 11, 11, 11, + + 11, 80, 86, 69, 98, 100, 100, 100, 103, 103, + 103, 104, 258, 104, 104, 104, 11, 111, 112, 11, + 255, 11, 11, 11, 11, 113, 114, 11, 11, 69, + 98, 11, 11, 69, 11, 111, 11, 11, 115, 11, + 11, 86, 105, 116, 105, 105, 105, 112, 119, 80, + 80, 107, 117, 107, 107, 107, 108, 108, 108, 120, + 113, 114, 122, 123, 124, 125, 148, 126, 115, 127, + 119, 147, 149, 151, 151, 151, 108, 116, 154, 154, + 154, 117, 156, 156, 156, 120, 157, 123, 158, 159, + 160, 125, 122, 162, 148, 127, 124, 161, 125, 126, + + 164, 165, 156, 166, 147, 149, 167, 168, 169, 160, + 170, 162, 171, 172, 174, 173, 175, 183, 182, 188, + 158, 157, 159, 182, 164, 161, 186, 191, 189, 199, + 193, 194, 196, 165, 168, 166, 197, 175, 195, 170, + 169, 173, 167, 172, 200, 201, 198, 171, 174, 199, + 183, 202, 208, 188, 186, 189, 195, 210, 196, 212, + 214, 191, 193, 194, 198, 213, 217, 215, 198, 201, + 197, 218, 219, 200, 208, 221, 225, 222, 226, 210, + 228, 229, 225, 230, 236, 239, 202, 215, 235, 212, + 240, 213, 218, 217, 214, 222, 242, 253, 244, 239, + + 254, 256, 229, 252, 221, 230, 219, 226, 253, 254, + 235, 236, 228, 256, 259, 257, 261, 251, 242, 244, + 257, 250, 249, 247, 240, 246, 259, 245, 261, 265, + 265, 265, 265, 265, 265, 266, 266, 266, 266, 266, + 266, 267, 267, 267, 267, 267, 267, 268, 268, 268, + 268, 268, 268, 269, 243, 269, 269, 269, 269, 270, + 241, 270, 270, 270, 270, 271, 271, 272, 272, 272, + 272, 273, 273, 273, 273, 273, 273, 274, 274, 274, + 274, 274, 274, 275, 275, 275, 275, 275, 275, 276, + 276, 276, 276, 277, 277, 277, 277, 278, 278, 278, + + 278, 278, 278, 279, 238, 279, 280, 237, 280, 280, + 280, 280, 234, 233, 232, 231, 227, 224, 223, 220, + 216, 211, 209, 206, 204, 203, 192, 190, 187, 185, + 184, 181, 177, 176, 163, 152, 145, 144, 142, 141, + 139, 136, 135, 134, 131, 130, 128, 109, 102, 99, + 94, 93, 92, 91, 87, 84, 82, 81, 79, 76, + 75, 74, 73, 47, 43, 38, 33, 26, 25, 20, + 19, 13, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264, 264, 264, 264, + 264, 264, 264, 264, 264, 264, 264 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -639,6 +657,7 @@ char *yytext; #include "config.h" #include +#include #include "parse.h" #include "main.h" @@ -653,6 +672,10 @@ static int header_c = FALSE; 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 +708,7 @@ add_to_cbuf(char *s) #define CLASS_CODE_I 5 -#line 689 "lex.yy.c" +#line 712 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -839,10 +862,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 69 "lexer.l" +#line 74 "lexer.l" -#line 846 "lex.yy.c" +#line 869 "lex.yy.c" if ( yy_init ) { @@ -891,14 +914,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 >= 265 ) 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] != 573 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -929,12 +952,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 76 "lexer.l" { line_no++; REJECT; } YY_BREAK case 2: YY_RULE_SETUP -#line 73 "lexer.l" +#line 78 "lexer.l" { fprintf(stderr,"You are a bad bad person!\n"); REJECT; } YY_BREAK case 3: @@ -942,84 +965,104 @@ 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 80 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK case 4: +YY_RULE_SETUP +#line 81 "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 98 "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 99 "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 100 "lexer.l" { ; /*comment, ignore*/ } YY_BREAK -case 7: +case 8: YY_RULE_SETUP -#line 79 "lexer.l" +#line 101 "lexer.l" {BEGIN(COMMENT); before_comment = INITIAL; } YY_BREAK -case 8: +case 9: YY_RULE_SETUP -#line 80 "lexer.l" +#line 102 "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 107 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE; } YY_BREAK -case 10: +case 11: YY_RULE_SETUP -#line 86 "lexer.l" +#line 108 "lexer.l" {BEGIN(COMMENT); before_comment = CLASS_CODE_I; } YY_BREAK -case 11: +case 12: YY_RULE_SETUP -#line 87 "lexer.l" +#line 109 "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 113 "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 117 "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 122 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1029,9 +1072,9 @@ YY_RULE_SETUP ccode_line = line_no; } YY_BREAK -case 15: +case 16: YY_RULE_SETUP -#line 108 "lexer.l" +#line 130 "lexer.l" { BEGIN(C_CODE); parenth_depth = 1; @@ -1039,98 +1082,102 @@ YY_RULE_SETUP header_c = FALSE; clear_cbuf(); ccode_line = line_no; + if(look_for_includes==0) + look_for_includes=1; } YY_BREAK -case 16: +case 17: YY_RULE_SETUP -#line 116 "lexer.l" +#line 140 "lexer.l" { BEGIN(INITIAL); yylval.cbuf = cbuf; cbuf = NULL; + if(look_for_includes==1) + look_for_includes=0; if(header_c) return HCODE; else return CCODE; } YY_BREAK -case 17: -YY_RULE_SETUP -#line 126 "lexer.l" -{ add_to_cbuf(yytext); } - YY_BREAK case 18: YY_RULE_SETUP -#line 127 "lexer.l" +#line 152 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 19: YY_RULE_SETUP -#line 128 "lexer.l" +#line 153 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 20: YY_RULE_SETUP -#line 129 "lexer.l" +#line 154 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 21: YY_RULE_SETUP -#line 130 "lexer.l" +#line 155 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 22: YY_RULE_SETUP -#line 131 "lexer.l" +#line 156 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 23: YY_RULE_SETUP -#line 133 "lexer.l" +#line 157 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK case 24: YY_RULE_SETUP -#line 134 "lexer.l" +#line 159 "lexer.l" +{ add_to_cbuf(yytext); } + YY_BREAK +case 25: +YY_RULE_SETUP +#line 160 "lexer.l" { BEGIN(C_CODE_STRING); add_to_cbuf(yytext); } YY_BREAK -case 25: +case 26: YY_RULE_SETUP -#line 138 "lexer.l" +#line 164 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 26: +case 27: YY_RULE_SETUP -#line 139 "lexer.l" +#line 165 "lexer.l" { BEGIN(C_CODE); add_to_cbuf(yytext); } YY_BREAK -case 27: +case 28: YY_RULE_SETUP -#line 143 "lexer.l" +#line 169 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 28: +case 29: YY_RULE_SETUP -#line 144 "lexer.l" +#line 170 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 29: +case 30: YY_RULE_SETUP -#line 146 "lexer.l" +#line 172 "lexer.l" { parenth_depth++; add_to_cbuf(yytext); } YY_BREAK -case 30: +case 31: YY_RULE_SETUP -#line 150 "lexer.l" +#line 176 "lexer.l" { parenth_depth--; if(parenth_depth<0) { @@ -1144,27 +1191,28 @@ YY_RULE_SETUP add_to_cbuf(yytext); } YY_BREAK -case 31: +case 32: YY_RULE_SETUP -#line 163 "lexer.l" +#line 189 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 32: +case 33: YY_RULE_SETUP -#line 164 "lexer.l" +#line 190 "lexer.l" { add_to_cbuf(yytext); } YY_BREAK -case 33: +case 34: YY_RULE_SETUP -#line 166 "lexer.l" +#line 192 "lexer.l" { + look_for_includes = 2; BEGIN(CLASS_CODE); return CLASS; } YY_BREAK -case 34: +case 35: YY_RULE_SETUP -#line 171 "lexer.l" +#line 198 "lexer.l" { if(for_cpp) { char *s; @@ -1177,192 +1225,201 @@ YY_RULE_SETUP REJECT; } YY_BREAK -case 35: +case 36: YY_RULE_SETUP -#line 183 "lexer.l" +#line 210 "lexer.l" {return FROM;} YY_BREAK -case 36: +case 37: YY_RULE_SETUP -#line 185 "lexer.l" +#line 212 "lexer.l" {return VOID;} YY_BREAK -case 37: +case 38: YY_RULE_SETUP -#line 186 "lexer.l" +#line 213 "lexer.l" {return STRUCT;} YY_BREAK -case 38: +case 39: YY_RULE_SETUP -#line 187 "lexer.l" +#line 214 "lexer.l" {return UNION;} YY_BREAK -case 39: +case 40: YY_RULE_SETUP -#line 188 "lexer.l" +#line 215 "lexer.l" {return ENUM;} YY_BREAK -case 40: +case 41: YY_RULE_SETUP -#line 189 "lexer.l" +#line 216 "lexer.l" {return SIGNED;} YY_BREAK -case 41: +case 42: YY_RULE_SETUP -#line 190 "lexer.l" +#line 217 "lexer.l" {return UNSIGNED;} YY_BREAK -case 42: +case 43: YY_RULE_SETUP -#line 191 "lexer.l" +#line 218 "lexer.l" {return LONG;} YY_BREAK -case 43: +case 44: YY_RULE_SETUP -#line 192 "lexer.l" +#line 219 "lexer.l" {return SHORT;} YY_BREAK -case 44: +case 45: YY_RULE_SETUP -#line 193 "lexer.l" +#line 220 "lexer.l" {return INT;} YY_BREAK -case 45: +case 46: YY_RULE_SETUP -#line 194 "lexer.l" +#line 221 "lexer.l" {return FLOAT;} YY_BREAK -case 46: +case 47: YY_RULE_SETUP -#line 195 "lexer.l" +#line 222 "lexer.l" {return DOUBLE;} YY_BREAK -case 47: +case 48: YY_RULE_SETUP -#line 196 "lexer.l" +#line 223 "lexer.l" {return CHAR;} YY_BREAK -case 48: +case 49: YY_RULE_SETUP -#line 197 "lexer.l" +#line 224 "lexer.l" {return CONST;} YY_BREAK -case 49: +case 50: YY_RULE_SETUP -#line 199 "lexer.l" +#line 226 "lexer.l" {return THREEDOTS;} YY_BREAK -case 50: +case 51: YY_RULE_SETUP -#line 201 "lexer.l" +#line 228 "lexer.l" {yylval.line = line_no; return PUBLIC;} YY_BREAK -case 51: +case 52: YY_RULE_SETUP -#line 202 "lexer.l" +#line 229 "lexer.l" {yylval.line = line_no; return PRIVATE;} YY_BREAK -case 52: +case 53: YY_RULE_SETUP -#line 203 "lexer.l" +#line 230 "lexer.l" {yylval.line = line_no; return ARGUMENT;} YY_BREAK -case 53: +case 54: YY_RULE_SETUP -#line 204 "lexer.l" +#line 231 "lexer.l" {yylval.line = line_no; return VIRTUAL;} YY_BREAK -case 54: +case 55: YY_RULE_SETUP -#line 205 "lexer.l" +#line 232 "lexer.l" {yylval.line = line_no; return SIGNAL;} YY_BREAK -case 55: +case 56: YY_RULE_SETUP -#line 206 "lexer.l" +#line 233 "lexer.l" {yylval.line = line_no; return OVERRIDE;} YY_BREAK -case 56: +case 57: YY_RULE_SETUP -#line 207 "lexer.l" +#line 234 "lexer.l" {return ONERROR;} YY_BREAK -case 57: +case 58: YY_RULE_SETUP -#line 208 "lexer.l" +#line 235 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 58: +case 59: YY_RULE_SETUP -#line 212 "lexer.l" +#line 239 "lexer.l" { yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 59: +case 60: YY_RULE_SETUP -#line 216 "lexer.l" +#line 243 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 60: +case 61: YY_RULE_SETUP -#line 221 "lexer.l" +#line 248 "lexer.l" +{ + yylval.id = g_strdup(yytext); + return ARRAY_DIM; + } + YY_BREAK +case 62: +YY_RULE_SETUP +#line 253 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 61: +case 63: YY_RULE_SETUP -#line 225 "lexer.l" +#line 257 "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 64: YY_RULE_SETUP -#line 233 "lexer.l" +#line 266 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 63: +case 65: YY_RULE_SETUP -#line 238 "lexer.l" +#line 271 "lexer.l" ; /*ignore*/ YY_BREAK -case 64: +case 66: YY_RULE_SETUP -#line 240 "lexer.l" +#line 273 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 65: +case 67: YY_RULE_SETUP -#line 245 "lexer.l" +#line 278 "lexer.l" ; /*ignore*/ YY_BREAK -case 66: +case 68: YY_RULE_SETUP -#line 246 "lexer.l" +#line 279 "lexer.l" ECHO; YY_BREAK -#line 1366 "lex.yy.c" +#line 1423 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): @@ -1657,7 +1714,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 >= 265 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1687,11 +1744,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 >= 265 ) 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 == 264); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2249,4 +2306,4 @@ int main() return 0; } #endif -#line 246 "lexer.l" +#line 279 "lexer.l"