X-Git-Url: http://git.draconx.ca/gitweb/gob-dx.git/blobdiff_plain/6d0fe9d5f8c513045bf064ea256c822beac19037..2255b3d84eeb947d4c065332f16e410ae4704c63:/src/lexer.c diff --git a/src/lexer.c b/src/lexer.c index a2c7013..fc6e1d1 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -284,51 +284,51 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 68 -#define YY_END_OF_BUFFER 69 -static yyconst short int yy_acclist[343] = +#define YY_NUM_RULES 69 +#define YY_END_OF_BUFFER 70 +static yyconst short int yy_acclist[351] = { 0, - 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 + 70, 67, 69, 66, 67, 69, 1, 68, 69, 67, + 68, 69, 67, 69, 67, 69, 67, 69, 67, 69, + 13, 67, 69, 1, 14, 68, 69, 13, 67, 68, + 69, 13, 67, 69, 13, 67, 69, 32, 67, 69, + 1, 33, 68, 69, 32, 67, 68, 69, 25, 32, + 67, 69, 32, 67, 69, 32, 67, 69, 32, 67, + 69, 32, 67, 69, 30, 32, 67, 69, 31, 32, + 67, 69, 32, 67, 69, 32, 67, 69, 28, 67, + 69, 1, 29, 68, 69, 28, 67, 68, 69, 27, + 28, 67, 69, 28, 67, 69, 28, 67, 69, 67, + + 69, 67, 69, 61, 67, 69, 61, 67, 69, 61, + 67, 69, 61, 67, 69, 61, 67, 69, 63, 67, + 69, 67, 69, 67, 69, 59, 67, 69, 59, 67, + 69, 67, 69, 61, 67, 69, 61, 67, 69, 61, + 67, 69, 61, 67, 69, 61, 67, 69, 61, 67, + 69, 61, 67, 69, 61, 67, 69, 61, 67, 69, + 61, 67, 69, 61, 67, 69, 61, 67, 69, 64, + 67, 69, 65, 67, 69, 8, 16, 12, 9, 24, + 17, 26, 10, 61, 60, 61, 61, 61, 61, 59, + 11, 59, 59, 62, 61, 61, 61, 61, 61, 61, + + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 3, 15, 22, 18, 20, 5, 6, 60, + 61, 61, 61, 61, 50, 59, 7, 59, 59, 61, + 61, 61, 61, 61, 61, 45, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 23, 19, 21, 61, 61, 36, 61, 35, 61, 61, + 48, 61, 61, 61, 40, 61, 61, 43, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 37, 61, 34, 61, 61, 49, 61, 61, 46, 61, + 61, 61, 61, 61, 61, 44, 61, 61, 61, 61, + + 39, 61, 61, 61, 61, 61, 47, 61, 61, 61, + 61, 61, 51, 61, 56, 61, 41, 61, 38, 61, + 61, 61, 61, 61, 58, 61, 61, 52, 61, 61, + 61, 55, 61, 61, 54, 61, 57, 61, 61, 42, + 61, 61, 53, 61, 61, 4, 61, 2, 2, 61 } ; -static yyconst short int yy_accept[266] = +static yyconst short int yy_accept[273] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 7, 10, 13, 15, 17, @@ -348,17 +348,18 @@ static yyconst short int yy_accept[266] = 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 + 245, 246, 247, 248, 249, 250, 251, 251, 251, 252, + 253, 254, 254, 255, 256, 258, 260, 261, 263, 264, + 265, 267, 268, 270, 271, 272, 273, 274, 275, 276, + + 277, 278, 279, 280, 281, 283, 283, 284, 284, 285, + 286, 288, 289, 291, 292, 293, 294, 295, 296, 298, + 299, 300, 301, 303, 304, 305, 305, 305, 306, 307, + 309, 310, 311, 312, 313, 315, 317, 319, 321, 322, + 323, 323, 323, 324, 325, 327, 328, 330, 331, 332, + 334, 334, 334, 335, 337, 339, 340, 342, 342, 342, + 343, 345, 345, 345, 346, 346, 346, 347, 348, 349, + 351, 351 } ; static yyconst int yy_ec[256] = @@ -403,77 +404,79 @@ static yyconst int yy_meta[55] = 6, 6, 1, 1 } ; -static yyconst short int yy_base[281] = +static yyconst short int yy_base[288] = { 0, 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, + 187, 0, 586, 587, 587, 587, 587, 8, 559, 542, + 2, 587, 587, 587, 572, 556, 587, 587, 587, 587, + 15, 13, 555, 0, 587, 587, 21, 526, 587, 587, + 587, 587, 553, 0, 34, 0, 563, 37, 11, 12, + 18, 587, 61, 45, 68, 73, 52, 57, 82, 62, + 64, 73, 85, 83, 86, 88, 91, 90, 189, 587, + 587, 587, 574, 548, 542, 521, 587, 587, 565, 197, + 564, 563, 587, 567, 587, 201, 525, 587, 587, 587, + 565, 552, 551, 550, 95, 103, 94, 190, 554, 194, + + 587, 560, 197, 202, 233, 0, 242, 245, 532, 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 + 87, 248, 249, 250, 251, 253, 255, 558, 587, 537, + 511, 587, 587, 550, 549, 548, 587, 587, 552, 587, + 519, 550, 587, 537, 536, 102, 257, 252, 258, 587, + 262, 547, 587, 267, 0, 271, 272, 274, 276, 279, + 283, 286, 534, 289, 287, 292, 293, 294, 295, 299, + 296, 297, 300, 301, 302, 305, 528, 499, 587, 587, + 587, 504, 303, 310, 530, 529, 312, 528, 314, 315, + 527, 316, 526, 317, 320, 321, 323, 318, 333, 335, + + 334, 337, 338, 341, 525, 512, 587, 488, 99, 346, + 522, 347, 521, 351, 356, 355, 358, 359, 520, 360, + 363, 361, 519, 364, 365, 512, 496, 371, 370, 516, + 372, 373, 374, 375, 515, 514, 513, 508, 380, 385, + 491, 439, 386, 388, 455, 391, 428, 392, 390, 427, + 422, 438, 97, 424, 423, 397, 421, 410, 415, 398, + 410, 201, 413, 401, 186, 418, 587, 417, 587, 17, + 587, 444, 450, 456, 462, 468, 474, 476, 480, 486, + 492, 498, 502, 506, 512, 516, 521 } ; -static yyconst short int yy_def[281] = +static yyconst short int yy_def[288] = { 0, - 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 + 272, 272, 273, 273, 274, 274, 275, 275, 271, 9, + 9, 11, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 276, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 277, 271, 278, 279, 279, 279, 279, + 279, 271, 271, 271, 271, 271, 271, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 271, + 271, 271, 280, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 281, 271, 271, 271, 271, 271, 271, + 282, 283, 279, 284, 279, 279, 279, 279, 271, 271, + + 271, 285, 271, 271, 271, 286, 271, 271, 271, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 280, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 281, 271, + 271, 282, 271, 283, 284, 279, 279, 279, 279, 271, + 271, 285, 271, 271, 286, 271, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 271, 271, 271, 271, + 271, 271, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, + + 279, 279, 279, 279, 279, 271, 271, 271, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 271, 271, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 271, 271, 279, 279, 279, 279, 279, 279, 279, 279, + 271, 271, 279, 279, 279, 279, 279, 271, 271, 279, + 279, 271, 287, 279, 271, 287, 271, 279, 271, 279, + 0, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271 } ; -static yyconst short int yy_nxt[628] = +static yyconst short int yy_nxt[642] = { 0, - 264, 15, 16, 17, 15, 16, 17, 264, 264, 21, + 271, 15, 16, 17, 15, 16, 17, 271, 271, 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, @@ -485,8 +488,8 @@ static yyconst short int yy_nxt[628] = 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, + 94, 94, 33, 94, 115, 260, 94, 94, 34, 106, + 169, 111, 146, 96, 183, 228, 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, @@ -496,60 +499,62 @@ static yyconst short int yy_nxt[628] = 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, + 154, 103, 269, 104, 104, 105, 57, 94, 94, 58, + 265, 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 + 154, 164, 108, 108, 108, 167, 94, 171, 94, 168, + 94, 173, 170, 94, 185, 176, 172, 94, 174, 175, + + 94, 94, 109, 94, 184, 186, 94, 94, 94, 94, + 94, 94, 190, 94, 94, 94, 94, 94, 192, 94, + 188, 187, 209, 189, 94, 191, 94, 193, 94, 94, + 94, 94, 94, 194, 94, 94, 198, 94, 195, 200, + 205, 203, 197, 196, 202, 199, 201, 94, 94, 94, + 204, 94, 94, 216, 210, 94, 212, 186, 218, 217, + 94, 94, 211, 214, 213, 94, 215, 220, 222, 94, + 94, 221, 94, 94, 94, 94, 224, 94, 94, 94, + 223, 219, 229, 230, 94, 94, 94, 94, 94, 94, + 225, 243, 234, 235, 94, 231, 232, 240, 237, 94, + + 94, 236, 94, 233, 94, 94, 94, 239, 246, 238, + 247, 94, 94, 244, 253, 94, 249, 267, 245, 263, + 268, 264, 267, 248, 94, 257, 250, 255, 256, 267, + 263, 94, 261, 262, 267, 94, 254, 94, 94, 259, + 258, 94, 94, 270, 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, 252, 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, 251, + 155, 266, 94, 266, 266, 266, 266, 94, 94, 94, + 94, 242, 241, 94, 94, 94, 94, 227, 226, 94, + 94, 94, 94, 94, 94, 208, 207, 206, 94, 153, + 94, 94, 143, 182, 140, 181, 180, 179, 178, 177, + 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, 271, 13, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271 } ; -static yyconst short int yy_chk[628] = +static yyconst short int yy_chk[642] = { 0, 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, + 7, 270, 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, @@ -558,8 +563,8 @@ static yyconst short int yy_chk[628] = 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, + 118, 253, 6, 209, 62, 253, 146, 96, 6, 55, + 121, 59, 95, 59, 146, 209, 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, @@ -569,52 +574,54 @@ static yyconst short int yy_chk[628] = 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, + 103, 104, 265, 104, 104, 104, 11, 111, 112, 11, + 262, 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 + 154, 117, 156, 156, 156, 120, 157, 123, 158, 120, + 159, 125, 122, 160, 148, 127, 124, 161, 125, 126, + + 162, 165, 156, 164, 147, 149, 166, 167, 168, 169, + 171, 172, 160, 170, 173, 174, 175, 183, 162, 176, + 158, 157, 183, 159, 184, 161, 187, 164, 189, 190, + 192, 194, 198, 165, 195, 196, 169, 197, 166, 171, + 176, 174, 168, 167, 173, 170, 172, 199, 201, 200, + 175, 202, 203, 196, 187, 204, 190, 184, 198, 197, + 210, 212, 189, 194, 192, 214, 195, 200, 201, 216, + 215, 200, 217, 218, 220, 222, 203, 221, 224, 225, + 202, 199, 210, 212, 229, 228, 231, 232, 233, 234, + 204, 228, 217, 218, 239, 214, 215, 225, 221, 240, + + 243, 220, 244, 216, 249, 246, 248, 224, 232, 222, + 233, 256, 260, 229, 243, 264, 239, 263, 231, 259, + 264, 260, 266, 234, 261, 249, 240, 246, 248, 263, + 259, 268, 256, 258, 266, 257, 244, 255, 254, 252, + 251, 250, 247, 268, 272, 272, 272, 272, 272, 272, + 273, 273, 273, 273, 273, 273, 274, 274, 274, 274, + 274, 274, 275, 275, 275, 275, 275, 275, 276, 245, + 276, 276, 276, 276, 277, 242, 277, 277, 277, 277, + 278, 278, 279, 279, 279, 279, 280, 280, 280, 280, + 280, 280, 281, 281, 281, 281, 281, 281, 282, 282, + + 282, 282, 282, 282, 283, 283, 283, 283, 284, 284, + 284, 284, 285, 285, 285, 285, 285, 285, 286, 241, + 286, 287, 238, 287, 287, 287, 287, 237, 236, 235, + 230, 227, 226, 223, 219, 213, 211, 208, 206, 205, + 193, 191, 188, 186, 185, 182, 178, 177, 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, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271, 271, 271, 271, 271, 271, 271, 271, 271, 271, + 271 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -708,7 +715,7 @@ add_to_cbuf(char *s) #define CLASS_CODE_I 5 -#line 712 "lex.yy.c" +#line 719 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -865,7 +872,7 @@ YY_DECL #line 74 "lexer.l" -#line 869 "lex.yy.c" +#line 876 "lex.yy.c" if ( yy_init ) { @@ -914,14 +921,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 >= 265 ) + if ( yy_current_state >= 272 ) 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] != 573 ); + while ( yy_base[yy_current_state] != 587 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1313,71 +1320,76 @@ YY_RULE_SETUP case 53: YY_RULE_SETUP #line 230 "lexer.l" -{yylval.line = line_no; return ARGUMENT;} +{yylval.line = line_no; return PROTECTED;} YY_BREAK case 54: YY_RULE_SETUP #line 231 "lexer.l" -{yylval.line = line_no; return VIRTUAL;} +{yylval.line = line_no; return ARGUMENT;} YY_BREAK case 55: YY_RULE_SETUP #line 232 "lexer.l" -{yylval.line = line_no; return SIGNAL;} +{yylval.line = line_no; return VIRTUAL;} YY_BREAK case 56: YY_RULE_SETUP #line 233 "lexer.l" -{yylval.line = line_no; return OVERRIDE;} +{yylval.line = line_no; return SIGNAL;} YY_BREAK case 57: YY_RULE_SETUP #line 234 "lexer.l" -{return ONERROR;} +{yylval.line = line_no; return OVERRIDE;} YY_BREAK case 58: YY_RULE_SETUP #line 235 "lexer.l" +{return ONERROR;} + YY_BREAK +case 59: +YY_RULE_SETUP +#line 236 "lexer.l" { yylval.id = g_strdup(yytext); return NUMBER; } YY_BREAK -case 59: +case 60: YY_RULE_SETUP -#line 239 "lexer.l" +#line 240 "lexer.l" { yylval.id = g_strdup(yytext); return TYPETOKEN; } YY_BREAK -case 60: +case 61: YY_RULE_SETUP -#line 243 "lexer.l" +#line 244 "lexer.l" { yylval.id = g_strdup(yytext); return TOKEN; } YY_BREAK -case 61: +case 62: YY_RULE_SETUP -#line 248 "lexer.l" +#line 249 "lexer.l" { yylval.id = g_strdup(yytext); return ARRAY_DIM; } YY_BREAK -case 62: +case 63: YY_RULE_SETUP -#line 253 "lexer.l" +#line 254 "lexer.l" { BEGIN(CLASS_CODE_I); return '{'; } YY_BREAK -case 63: +case 64: YY_RULE_SETUP -#line 257 "lexer.l" +#line 258 "lexer.l" { BEGIN(C_CODE); parenth_depth=1; @@ -1388,38 +1400,38 @@ YY_RULE_SETUP return '{'; } YY_BREAK -case 64: +case 65: YY_RULE_SETUP -#line 266 "lexer.l" +#line 267 "lexer.l" { BEGIN(INITIAL); return '}'; } YY_BREAK -case 65: +case 66: YY_RULE_SETUP -#line 271 "lexer.l" +#line 272 "lexer.l" ; /*ignore*/ YY_BREAK -case 66: +case 67: YY_RULE_SETUP -#line 273 "lexer.l" +#line 274 "lexer.l" { yylval.line = line_no; return yytext[0]; } YY_BREAK -case 67: +case 68: YY_RULE_SETUP -#line 278 "lexer.l" +#line 279 "lexer.l" ; /*ignore*/ YY_BREAK -case 68: +case 69: YY_RULE_SETUP -#line 279 "lexer.l" +#line 280 "lexer.l" ECHO; YY_BREAK -#line 1423 "lex.yy.c" +#line 1435 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(COMMENT): case YY_STATE_EOF(C_CODE): @@ -1714,7 +1726,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 >= 265 ) + if ( yy_current_state >= 272 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1744,11 +1756,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 >= 265 ) + if ( yy_current_state >= 272 ) 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 == 264); + yy_is_jam = (yy_current_state == 271); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2306,4 +2318,4 @@ int main() return 0; } #endif -#line 279 "lexer.l" +#line 280 "lexer.l"