diff --git a/code/globalcpp/parser/yyLexer.cpp b/code/globalcpp/parser/yyLexer.cpp index e60d1145..76b1196f 100644 --- a/code/globalcpp/parser/yyLexer.cpp +++ b/code/globalcpp/parser/yyLexer.cpp @@ -446,8 +446,8 @@ static void yynoreturn yy_fatal_error ( const char* msg ); (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 91 -#define YY_END_OF_BUFFER 92 +#define YY_NUM_RULES 92 +#define YY_END_OF_BUFFER 93 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -455,50 +455,50 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_acclist[354] = +static const flex_int16_t yy_acclist[358] = { 0, - 13, 14, 22, 13, 14, 22, 7, 7, 92, 90, - 91, 14, 90, 91, 13, 91, 13, 90, 91, 14, - 90, 91, 72, 90, 91, 90, 91, 76, 90, 91, - 71, 90, 91, 62, 90, 91, 44, 90, 91, 31, - 90, 91, 32, 90, 91, 58, 90, 91, 51, 90, - 91, 75, 90, 91, 54, 89, 90, 91, 74, 80, - 89, 90, 91, 60, 89, 90, 91, 79, 80, 89, - 90, 91, 36, 90, 91, 38, 90, 91, 46, 90, - 91, 35, 90, 91, 47, 90, 91, 16, 90, 91, - 89, 90, 91, 89, 90, 91, 33, 90, 91, 34, + 14, 15, 23, 14, 15, 23, 8, 8, 93, 91, + 92, 15, 91, 92, 14, 92, 14, 91, 92, 15, + 91, 92, 73, 91, 92, 91, 92, 77, 91, 92, + 72, 91, 92, 63, 91, 92, 45, 91, 92, 32, + 91, 92, 33, 91, 92, 59, 91, 92, 52, 91, + 92, 76, 91, 92, 55, 90, 91, 92, 75, 81, + 90, 91, 92, 61, 90, 91, 92, 80, 81, 90, + 91, 92, 37, 91, 92, 39, 91, 92, 47, 91, + 92, 36, 91, 92, 48, 91, 92, 17, 91, 92, + 90, 91, 92, 90, 91, 92, 34, 91, 92, 90, - 90, 91, 43, 90, 91, 89, 90, 91, 89, 90, - 91, 89, 90, 91, 89, 90, 91, 89, 90, 91, - 89, 90, 91, 89, 90, 91, 89, 90, 91, 89, - 90, 91, 89, 90, 91, 89, 90, 91, 89, 90, - 91, 89, 90, 91, 89, 90, 91, 29, 90, 91, - 42, 90, 91, 30, 90, 91, 73, 90, 91, 4, - 91, 3, 91, 4, 91, 91, 12, 91, 7, 91, - 7, 12, 91, 11, 12, 91, 9, 12, 91, 11, - 12, 91, 11, 12, 91, 14, 13, 50, 45, 15, - 63, 41, 68, 5, 59, 53, 52, 54, 57, 89, + 91, 92, 35, 91, 92, 44, 91, 92, 90, 91, + 92, 90, 91, 92, 90, 91, 92, 90, 91, 92, + 90, 91, 92, 90, 91, 92, 90, 91, 92, 90, + 91, 92, 90, 91, 92, 90, 91, 92, 90, 91, + 92, 90, 91, 92, 90, 91, 92, 90, 91, 92, + 30, 91, 92, 43, 91, 92, 31, 91, 92, 74, + 91, 92, 4, 92, 3, 92, 4, 92, 92, 13, + 92, 8, 92, 8, 13, 92, 12, 13, 92, 10, + 13, 92, 12, 13, 92, 12, 13, 92, 15, 14, + 51, 46, 16, 64, 42, 69, 5, 60, 54, 53, - 89, 55, 80, 89, 89, 1, 6, 89, 61, 79, - 80, 89, 37, 64, 48, 39, 49, 66, 89, 89, - 69, 89, 89, 89, 21, 89, 89, 89, 89, 89, - 89, 17, 89, 89, 89, 89, 89, 89, 89, 89, - 89, 89, 70, 40, 2, 7, 10, 11, 11, 11, - 11, 57, 56, 89, 6, 6, 89, 65, 67, 78, - 89, 89, 89, 89, 89, 89, 89, 89, 20, 89, - 89, 89, 89, 89, 89, 89, 89, 89, 89, 81, - 89, 89, 10, 11, 80, 80, 89, 77, 89, 89, - 84, 89, 89, 89, 18, 89, 89, 89, 22, 89, + 55, 58, 90, 90, 56, 81, 90, 90, 1, 7, + 90, 62, 80, 81, 90, 38, 65, 49, 40, 50, + 67, 90, 90, 6, 70, 90, 90, 90, 22, 90, + 90, 90, 90, 90, 90, 18, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 90, 71, 41, 2, 8, + 11, 12, 12, 12, 12, 58, 57, 90, 7, 7, + 90, 66, 68, 79, 90, 90, 90, 90, 90, 90, + 90, 90, 21, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 82, 90, 90, 11, 12, 81, 81, + 90, 78, 90, 90, 85, 90, 90, 90, 19, 90, - 89, 89, 89, 89, 89, 26, 89, 28, 89, 89, - 89, 8, 11, 85, 89, 82, 89, 89, 89, 89, - 23, 89, 24, 89, 25, 89, 89, 89, 27, 89, - 89, 19, 89, 89, 89, 89, 89, 89, 83, 89, - 89, 89, 89, 89, 89, 86, 89, 88, 89, 89, - 89, 87, 89 + 90, 90, 23, 90, 90, 90, 90, 90, 90, 27, + 90, 29, 90, 90, 90, 9, 12, 86, 90, 83, + 90, 90, 90, 90, 24, 90, 25, 90, 26, 90, + 90, 90, 28, 90, 90, 20, 90, 90, 90, 90, + 90, 90, 84, 90, 90, 90, 90, 90, 90, 87, + 90, 89, 90, 90, 90, 88, 90 } ; -static const flex_int16_t yy_accept[218] = +static const flex_int16_t yy_accept[220] = { 0, 1, 4, 7, 7, 7, 7, 7, 8, 9, 9, 9, 10, 12, 15, 17, 20, 23, 26, 28, 31, @@ -506,24 +506,24 @@ static const flex_int16_t yy_accept[218] = 68, 73, 76, 79, 82, 85, 88, 91, 94, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124, 127, 130, 133, 136, 139, 142, 145, 148, 151, 154, 157, - 160, 162, 164, 166, 167, 169, 171, 174, 177, 180, - 183, 186, 187, 188, 188, 189, 190, 190, 191, 191, - 192, 193, 194, 195, 196, 197, 198, 199, 201, 202, - 203, 205, 206, 207, 209, 210, 213, 214, 215, 216, + 160, 163, 165, 167, 169, 170, 172, 174, 177, 180, + 183, 186, 189, 190, 191, 191, 192, 193, 193, 194, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 204, + 205, 206, 208, 209, 210, 212, 213, 216, 217, 218, - 217, 218, 219, 220, 221, 222, 223, 224, 225, 227, - 228, 229, 230, 231, 232, 234, 235, 236, 237, 238, - 239, 240, 241, 242, 243, 244, 245, 246, 247, 247, - 249, 250, 250, 251, 252, 253, 254, 254, 255, 256, - 258, 259, 260, 262, 263, 264, 265, 266, 267, 268, - 269, 271, 272, 273, 274, 275, 276, 277, 278, 279, - 280, 282, 283, 284, 285, 286, 286, 288, 290, 291, - 293, 294, 295, 297, 298, 299, 301, 302, 303, 304, - 305, 306, 308, 310, 311, 312, 314, 316, 318, 319, - 320, 321, 323, 325, 327, 328, 329, 331, 332, 334, + 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, + 229, 231, 232, 233, 234, 235, 236, 238, 239, 240, + 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, + 251, 251, 253, 254, 254, 255, 256, 257, 258, 258, + 259, 260, 262, 263, 264, 266, 267, 268, 269, 270, + 271, 272, 273, 275, 276, 277, 278, 279, 280, 281, + 282, 283, 284, 286, 287, 288, 289, 290, 290, 292, + 294, 295, 297, 298, 299, 301, 302, 303, 305, 306, + 307, 308, 309, 310, 312, 314, 315, 316, 318, 320, + 322, 323, 324, 325, 327, 329, 331, 332, 333, 335, - 335, 336, 337, 338, 339, 341, 342, 343, 344, 345, - 346, 348, 350, 351, 352, 354, 354 + 336, 338, 339, 340, 341, 342, 343, 345, 346, 347, + 348, 349, 350, 352, 354, 355, 356, 358, 358 } ; static const YY_CHAR yy_ec[256] = @@ -569,162 +569,162 @@ static const YY_CHAR yy_meta[64] = 1, 1, 1 } ; -static const flex_int16_t yy_base[223] = +static const flex_int16_t yy_base[225] = { 0, 0, 0, 61, 62, 0, 0, 76, 0, 0, 0, - 336, 779, 64, 64, 67, 138, 310, 134, 779, 779, - 236, 133, 779, 779, 123, 130, 779, 141, 143, 145, - 155, 237, 779, 49, 232, 127, 779, 157, 161, 779, - 779, 227, 165, 171, 173, 167, 175, 178, 177, 181, - 183, 182, 187, 204, 189, 205, 779, 174, 779, 779, - 779, 779, 228, 779, 779, 200, 223, 261, 779, 0, - 199, 169, 229, 197, 229, 779, 318, 779, 197, 779, - 779, 779, 779, 779, 779, 779, 779, 213, 231, 779, - 321, 233, 779, 362, 779, 324, 779, 153, 779, 779, + 331, 784, 64, 64, 67, 138, 232, 134, 784, 784, + 231, 133, 784, 784, 123, 130, 784, 141, 143, 145, + 155, 233, 784, 49, 228, 127, 784, 157, 161, 784, + 167, 784, 227, 171, 175, 177, 173, 178, 181, 182, + 189, 184, 183, 195, 193, 205, 187, 784, 153, 784, + 784, 784, 784, 230, 784, 784, 200, 212, 257, 784, + 0, 203, 233, 233, 231, 316, 784, 219, 784, 206, + 784, 784, 784, 784, 784, 784, 784, 784, 317, 318, + 784, 319, 321, 784, 360, 784, 419, 784, 150, 784, - 779, 132, 323, 325, 779, 421, 422, 423, 235, 424, - 326, 426, 425, 429, 322, 427, 428, 434, 432, 430, - 437, 450, 433, 461, 779, 779, 779, 239, 500, 0, - 0, 437, 0, 90, 779, 779, 315, 481, 0, 0, - 779, 779, 327, 463, 465, 485, 464, 509, 493, 555, - 333, 495, 511, 556, 487, 557, 559, 560, 562, 563, - 335, 564, 779, 33, 779, 237, 436, 489, 566, 491, - 565, 569, 499, 567, 570, 571, 572, 594, 596, 597, - 601, 602, 605, 608, 611, 0, 622, 625, 626, 631, - 632, 633, 634, 635, 637, 639, 640, 643, 646, 649, + 784, 784, 132, 320, 322, 238, 784, 323, 420, 421, + 324, 422, 423, 424, 429, 428, 325, 425, 426, 433, + 431, 430, 437, 427, 435, 459, 784, 784, 784, 240, + 498, 0, 0, 455, 0, 90, 784, 784, 314, 482, + 0, 0, 784, 784, 330, 461, 462, 466, 464, 507, + 491, 487, 489, 492, 553, 493, 554, 555, 557, 558, + 559, 560, 496, 562, 784, 33, 784, 230, 561, 563, + 564, 565, 568, 566, 569, 570, 571, 575, 592, 595, + 597, 600, 602, 608, 610, 612, 615, 0, 623, 624, + 625, 626, 628, 633, 635, 636, 640, 641, 648, 653, - 655, 657, 661, 664, 666, 669, 671, 672, 675, 677, - 673, 681, 693, 695, 697, 779, 753, 758, 763, 766, - 768, 773 + 657, 658, 661, 662, 663, 664, 665, 666, 670, 671, + 686, 695, 678, 679, 696, 700, 701, 784, 758, 763, + 768, 771, 773, 778 } ; -static const flex_int16_t yy_def[223] = +static const flex_int16_t yy_def[225] = { 0, - 216, 1, 217, 217, 218, 218, 216, 7, 218, 218, - 216, 216, 216, 216, 216, 216, 216, 219, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 220, 220, 220, - 220, 216, 216, 216, 216, 216, 216, 220, 220, 216, - 216, 216, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 221, - 221, 216, 216, 216, 216, 216, 219, 216, 219, 216, - 216, 216, 216, 216, 216, 216, 216, 220, 220, 216, - 220, 220, 216, 216, 216, 220, 216, 216, 216, 216, + 218, 1, 219, 219, 220, 220, 218, 7, 220, 220, + 218, 218, 218, 218, 218, 218, 218, 221, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 222, 222, 222, + 222, 218, 218, 218, 218, 218, 218, 222, 222, 218, + 222, 218, 218, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 223, 223, 218, 218, 218, 218, 218, 221, 218, 221, + 218, 218, 218, 218, 218, 218, 218, 218, 222, 222, + 218, 222, 222, 218, 218, 218, 222, 218, 218, 218, - 216, 216, 220, 220, 216, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 216, 216, 216, 216, 68, 221, - 68, 129, 221, 221, 216, 216, 216, 220, 222, 94, - 216, 216, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 216, 221, 216, 216, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 221, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, + 218, 218, 218, 222, 222, 218, 218, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 218, 218, 218, 218, + 69, 223, 69, 131, 223, 223, 218, 218, 218, 222, + 224, 95, 218, 218, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 218, 223, 218, 218, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 223, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 0, 216, 216, 216, 216, - 216, 216 + 222, 222, 222, 222, 222, 222, 222, 222, 222, 222, + 222, 222, 222, 222, 222, 222, 222, 0, 218, 218, + 218, 218, 218, 218 } ; -static const flex_int16_t yy_nxt[843] = +static const flex_int16_t yy_nxt[848] = { 0, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 38, 38, 38, - 39, 38, 40, 38, 41, 42, 38, 43, 44, 45, - 46, 47, 48, 38, 49, 38, 50, 51, 38, 52, - 53, 38, 54, 55, 38, 38, 56, 38, 38, 57, - 58, 59, 60, 62, 62, 72, 73, 73, 72, 73, - 73, 98, 99, 186, 63, 63, 65, 65, 66, 67, - 65, 65, 68, 65, 65, 65, 65, 65, 65, 65, - 65, 65, 65, 69, 65, 70, 65, 65, 65, 65, + 39, 38, 40, 41, 42, 43, 38, 44, 45, 46, + 47, 48, 49, 38, 50, 38, 51, 52, 38, 53, + 54, 38, 55, 56, 38, 38, 57, 38, 38, 58, + 59, 60, 61, 63, 63, 73, 74, 74, 73, 74, + 74, 99, 100, 188, 64, 64, 66, 66, 67, 68, + 66, 66, 69, 66, 66, 66, 66, 66, 66, 66, + 66, 66, 66, 70, 66, 71, 66, 66, 66, 66, - 65, 65, 70, 70, 70, 70, 70, 70, 65, 65, - 65, 65, 70, 70, 70, 70, 70, 70, 70, 70, - 70, 70, 70, 70, 70, 70, 70, 70, 71, 70, - 70, 70, 70, 70, 70, 65, 65, 65, 65, 72, - 78, 83, 72, 81, 85, 87, 84, 216, 164, 216, - 101, 102, 74, 86, 75, 142, 82, 88, 93, 216, - 91, 216, 91, 94, 90, 216, 216, 79, 95, 216, - 72, 216, 91, 72, 96, 216, 141, 216, 216, 216, - 216, 216, 216, 92, 216, 216, 216, 216, 216, 103, - 216, 216, 104, 216, 216, 92, 216, 125, 216, 216, + 66, 66, 71, 71, 71, 71, 71, 71, 66, 66, + 66, 66, 71, 71, 71, 71, 71, 71, 71, 71, + 71, 71, 71, 71, 71, 71, 71, 71, 72, 71, + 71, 71, 71, 71, 71, 66, 66, 66, 66, 73, + 79, 84, 73, 82, 86, 88, 85, 218, 166, 218, + 102, 103, 75, 87, 76, 144, 83, 89, 94, 218, + 92, 218, 92, 95, 91, 218, 218, 80, 96, 106, + 106, 218, 92, 143, 97, 218, 127, 218, 218, 218, + 218, 218, 218, 93, 218, 218, 218, 218, 218, 104, + 218, 218, 105, 218, 218, 93, 218, 218, 218, 218, - 216, 216, 128, 128, 216, 216, 216, 107, 216, 216, - 216, 85, 216, 110, 113, 111, 106, 216, 115, 118, - 108, 116, 109, 120, 112, 128, 128, 216, 216, 114, - 117, 73, 73, 87, 126, 216, 216, 216, 119, 216, - 123, 128, 128, 134, 121, 135, 127, 137, 124, 138, - 105, 137, 136, 137, 216, 100, 216, 97, 216, 80, - 122, 129, 129, 129, 129, 129, 129, 130, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 131, 129, 129, 129, 129, 129, 129, 131, 131, 131, - 131, 131, 131, 129, 132, 129, 129, 131, 131, 131, + 218, 218, 130, 130, 218, 218, 218, 218, 218, 218, + 218, 109, 218, 128, 130, 130, 218, 115, 218, 112, + 120, 113, 108, 117, 110, 79, 111, 114, 218, 118, + 126, 122, 116, 123, 73, 74, 74, 73, 119, 121, + 106, 106, 130, 130, 139, 86, 139, 136, 129, 124, + 107, 101, 80, 98, 81, 77, 125, 131, 131, 131, + 131, 131, 131, 132, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 133, 131, 131, 131, + 131, 131, 131, 133, 133, 133, 133, 133, 133, 131, + 134, 131, 131, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 131, 131, 131, 131, + 88, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 167, 137, 167, 218, 139, 92, 140, 92, 138, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 145, + 218, 146, 218, 218, 168, 218, 218, 218, 218, 93, + 141, 141, 218, 147, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 142, 142, 142, 142, + 141, 141, 141, 141, 141, 141, 142, 142, 142, 142, + 142, 142, 141, 142, 141, 141, 142, 142, 142, 142, + + 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 142, 142, 142, 142, 141, + 141, 141, 141, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 92, 218, 97, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 93, + 218, 131, 152, 218, 157, 218, 218, 218, 218, 150, + 218, 162, 148, 149, 151, 153, 154, 155, 158, 159, + 156, 160, 218, 161, 218, 218, 218, 218, 131, 218, + 170, 218, 163, 218, 218, 218, 218, 218, 171, 169, + + 218, 169, 173, 164, 165, 218, 172, 218, 218, 218, + 218, 218, 218, 176, 218, 218, 218, 131, 218, 218, + 218, 218, 93, 177, 131, 131, 131, 131, 131, 131, + 218, 175, 178, 180, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, - 129, 129, 129, 129, 78, 216, 216, 216, 216, 216, - 216, 216, 165, 76, 165, 216, 216, 216, 91, 216, - 91, 91, 216, 96, 216, 216, 216, 216, 216, 216, - 216, 79, 143, 216, 144, 166, 216, 216, 216, 216, - 216, 92, 139, 139, 92, 150, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 140, 140, - 140, 140, 139, 139, 139, 139, 139, 139, 140, 140, - 140, 140, 140, 140, 139, 140, 139, 139, 140, 140, + 131, 131, 131, 131, 131, 131, 131, 218, 218, 218, + 174, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 181, 218, 218, 218, 218, 182, 218, 183, 218, 218, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 139, 139, 139, 139, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 129, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 145, 216, 216, 216, 216, 155, 216, 216, 216, - 129, 148, 152, 216, 146, 147, 149, 151, 153, 156, - 157, 158, 154, 159, 216, 216, 216, 216, 216, 216, - 161, 216, 168, 216, 160, 216, 216, 216, 167, 216, + 185, 218, 218, 218, 218, 184, 218, 179, 187, 189, + 191, 190, 218, 186, 218, 218, 218, 218, 218, 218, + 218, 192, 193, 218, 218, 218, 197, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 198, 218, 218, 218, + 218, 195, 194, 196, 218, 218, 218, 218, 218, 218, + 200, 218, 218, 199, 218, 201, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 202, 218, 218, 218, 203, 218, 204, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 205, 206, 218, 218, 218, 207, 209, 210, 218, - 167, 169, 171, 216, 216, 162, 163, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 129, - 216, 92, 216, 179, 216, 170, 129, 129, 129, 129, - 129, 129, 216, 173, 216, 176, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 216, - 216, 216, 172, 216, 216, 177, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 174, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 175, 216, 216, 216, 216, 178, 180, 216, 181, + 218, 218, 218, 218, 218, 218, 213, 218, 218, 218, + 218, 218, 208, 218, 211, 212, 218, 218, 218, 218, + 218, 218, 215, 218, 218, 218, 218, 214, 214, 218, + 218, 216, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 217, 218, 218, 218, 217, 62, 62, + 62, 62, 62, 65, 65, 65, 65, 65, 78, 78, + 78, 78, 78, 90, 218, 90, 135, 135, 141, 218, + 141, 141, 141, 11, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 216, 216, 216, 183, 216, 216, 216, 182, 188, 216, - 185, 187, 216, 189, 216, 216, 184, 216, 190, 216, - 216, 191, 192, 195, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 196, 216, 216, 216, 216, 216, 216, - 193, 216, 194, 216, 216, 216, 198, 216, 216, 216, - 216, 199, 197, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 200, 216, 216, 216, 216, 216, - 216, 216, 201, 202, 216, 216, 205, 216, 203, 216, - 204, 207, 216, 208, 216, 216, 216, 216, 216, 216, - - 216, 216, 216, 206, 216, 216, 216, 216, 216, 211, - 216, 213, 209, 214, 216, 210, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 212, 212, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 215, 216, 215, 61, 61, 61, 61, 61, 64, 64, - 64, 64, 64, 77, 77, 77, 77, 77, 89, 216, - 89, 133, 133, 139, 216, 139, 139, 139, 11, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216 + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218 } ; -static const flex_int16_t yy_chk[843] = +static const flex_int16_t yy_chk[848] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -733,7 +733,7 @@ static const flex_int16_t yy_chk[843] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 4, 13, 14, 14, 13, 15, - 15, 34, 34, 164, 3, 4, 7, 7, 7, 7, + 15, 34, 34, 166, 3, 4, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, @@ -741,94 +741,94 @@ static const flex_int16_t yy_chk[843] = 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 16, - 18, 25, 16, 22, 26, 28, 25, 29, 134, 30, - 36, 36, 16, 26, 16, 102, 22, 28, 30, 31, - 29, 38, 29, 30, 28, 39, 29, 18, 30, 43, - 72, 46, 31, 72, 31, 44, 98, 45, 31, 47, - 38, 49, 48, 29, 39, 50, 52, 51, 43, 39, - 46, 53, 39, 55, 44, 31, 45, 58, 47, 79, + 18, 25, 16, 22, 26, 28, 25, 29, 136, 30, + 36, 36, 16, 26, 16, 103, 22, 28, 30, 31, + 29, 38, 29, 30, 28, 39, 29, 18, 30, 41, + 41, 41, 31, 99, 31, 44, 59, 47, 31, 45, + 38, 46, 48, 29, 39, 49, 50, 53, 52, 39, + 41, 57, 39, 51, 44, 31, 47, 55, 45, 54, - 49, 48, 66, 66, 50, 52, 51, 44, 54, 56, - 53, 74, 55, 46, 48, 46, 43, 88, 49, 51, - 44, 50, 45, 53, 47, 67, 67, 54, 56, 48, - 50, 73, 73, 75, 58, 89, 88, 92, 52, 109, - 55, 128, 128, 71, 54, 75, 63, 92, 56, 92, - 42, 166, 75, 166, 89, 35, 92, 32, 109, 21, - 54, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 46, 48, 67, 67, 49, 50, 53, 52, 80, 56, + 57, 45, 51, 59, 68, 68, 55, 49, 54, 47, + 52, 47, 44, 50, 45, 78, 46, 48, 56, 51, + 57, 54, 49, 55, 73, 74, 74, 73, 51, 53, + 106, 106, 130, 130, 168, 75, 168, 72, 64, 55, + 43, 35, 78, 32, 21, 17, 56, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 77, 91, 115, 103, 96, 104, - 111, 143, 137, 17, 137, 11, 0, 151, 91, 161, - 91, 96, 0, 96, 91, 115, 103, 96, 104, 111, - 143, 77, 103, 0, 104, 137, 151, 0, 161, 0, - 0, 91, 94, 94, 96, 111, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 69, 69, 69, 69, 69, 69, 69, 69, 69, 69, + 76, 89, 90, 92, 104, 93, 105, 108, 111, 117, + 11, 139, 76, 139, 145, 93, 92, 93, 92, 76, + 89, 90, 92, 104, 93, 105, 108, 111, 117, 104, + 0, 105, 0, 145, 139, 0, 0, 0, 0, 92, + 95, 95, 0, 108, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 106, 107, 108, 110, 113, - 112, 116, 117, 114, 120, 0, 119, 123, 118, 132, - 167, 121, 0, 132, 106, 107, 108, 110, 113, 112, - 116, 117, 114, 120, 122, 119, 123, 118, 0, 167, - 121, 106, 0, 0, 0, 124, 117, 144, 147, 145, - 132, 108, 113, 122, 107, 107, 110, 112, 114, 118, - 119, 120, 116, 121, 124, 138, 144, 147, 145, 146, - 123, 155, 144, 168, 122, 170, 0, 149, 138, 152, + 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, + 95, 95, 95, 97, 109, 110, 112, 113, 114, 118, + 119, 124, 116, 115, 122, 121, 97, 120, 97, 125, + 0, 123, 97, 109, 110, 112, 113, 114, 118, 119, + 124, 116, 115, 122, 121, 0, 120, 134, 125, 97, + 123, 134, 113, 126, 119, 146, 147, 0, 149, 110, + 148, 124, 109, 109, 112, 114, 115, 116, 120, 121, + 118, 122, 126, 123, 146, 147, 140, 149, 134, 148, + 146, 152, 125, 153, 0, 151, 154, 156, 147, 140, - 138, 145, 147, 173, 138, 124, 129, 0, 146, 0, - 155, 0, 168, 148, 170, 153, 149, 0, 152, 129, - 0, 138, 173, 155, 0, 146, 129, 129, 129, 129, - 129, 129, 148, 149, 153, 152, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 150, - 154, 156, 148, 157, 158, 153, 159, 160, 162, 171, - 169, 174, 0, 172, 175, 176, 177, 0, 150, 154, - 156, 150, 157, 158, 0, 159, 160, 162, 171, 169, - 174, 150, 172, 175, 176, 177, 154, 156, 178, 157, + 163, 140, 149, 126, 131, 140, 148, 0, 0, 0, + 152, 150, 153, 152, 151, 154, 156, 131, 0, 163, + 0, 0, 140, 152, 131, 131, 131, 131, 131, 131, + 150, 151, 154, 156, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 155, 157, 158, + 150, 159, 160, 161, 162, 169, 164, 170, 171, 172, + 174, 0, 173, 175, 176, 177, 155, 157, 158, 178, + 159, 160, 161, 162, 169, 164, 170, 171, 172, 174, + 157, 173, 175, 176, 177, 158, 179, 159, 178, 180, - 179, 180, 0, 159, 0, 181, 182, 158, 171, 183, - 162, 169, 184, 172, 0, 185, 160, 178, 174, 179, - 180, 175, 177, 180, 181, 182, 187, 0, 183, 188, - 189, 184, 0, 180, 185, 190, 191, 192, 193, 194, - 178, 195, 179, 196, 197, 187, 184, 198, 188, 189, - 199, 185, 181, 200, 190, 191, 192, 193, 194, 201, - 195, 202, 196, 197, 0, 203, 198, 0, 204, 199, - 205, 0, 200, 206, 189, 207, 208, 211, 201, 209, - 202, 210, 190, 191, 203, 212, 198, 204, 195, 205, - 196, 201, 206, 202, 207, 208, 211, 213, 209, 214, + 161, 181, 0, 0, 182, 160, 183, 155, 164, 171, + 174, 173, 184, 162, 185, 179, 186, 0, 180, 187, + 181, 176, 177, 182, 0, 183, 182, 189, 190, 191, + 192, 184, 193, 185, 0, 186, 182, 194, 187, 195, + 196, 180, 179, 181, 197, 198, 189, 190, 191, 192, + 186, 193, 199, 183, 0, 187, 194, 200, 195, 196, + 0, 201, 202, 197, 198, 203, 204, 205, 206, 207, + 208, 199, 0, 191, 209, 210, 200, 192, 0, 193, + 201, 202, 213, 214, 203, 204, 205, 206, 207, 208, + 211, 197, 198, 209, 210, 0, 200, 203, 204, 212, - 210, 215, 0, 200, 212, 0, 0, 0, 0, 206, - 0, 209, 203, 210, 0, 204, 213, 0, 214, 0, - 215, 0, 0, 0, 0, 0, 0, 0, 207, 208, + 215, 213, 214, 0, 216, 217, 208, 0, 0, 211, + 0, 0, 202, 0, 205, 206, 0, 0, 212, 215, + 0, 0, 211, 216, 217, 0, 0, 209, 210, 0, + 0, 212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 213, 0, 214, 217, 217, 217, 217, 217, 218, 218, - 218, 218, 218, 219, 219, 219, 219, 219, 220, 0, - 220, 221, 221, 222, 0, 222, 222, 222, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, + 0, 0, 0, 215, 0, 0, 0, 216, 219, 219, + 219, 219, 219, 220, 220, 220, 220, 220, 221, 221, + 221, 221, 221, 222, 0, 222, 223, 223, 224, 0, + 224, 224, 224, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216 + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 218 } ; /* Table of booleans, true if rule could match eol. */ -static const flex_int32_t yy_rule_can_match_eol[92] = +static const flex_int32_t yy_rule_can_match_eol[93] = { 0, -0, 0, 1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, +0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; extern int yy_flex_debug; int yy_flex_debug = 0; @@ -1236,14 +1236,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 >= 217 ) + if ( yy_current_state >= 219 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *(yy_state_ptr)++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 216 ); + while ( yy_current_state != 218 ); yy_find_action: yy_current_state = *--(yy_state_ptr); @@ -1307,40 +1307,46 @@ YY_RULE_SETUP { Compiler.CompileError( parsedata.pos - yyleng, "'*/' found outside of comment" ); } YY_BREAK case 6: +/* rule 6 can match eol */ YY_RULE_SETUP -#line 152 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); } +#line 153 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ ; } YY_BREAK case 7: -/* rule 7 can match eol */ YY_RULE_SETUP #line 154 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( INITIAL ); YYLEX( TOKEN_EOL ); } +{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); } YY_BREAK case 8: +/* rule 8 can match eol */ YY_RULE_SETUP -#line 155 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_SIZE ); } +#line 156 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( INITIAL ); YYLEX( TOKEN_EOL ); } YY_BREAK case 9: YY_RULE_SETUP -#line 156 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_PERIOD ); } +#line 157 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_SIZE ); } YY_BREAK case 10: -/* rule 10 can match eol */ -YY_RULE_SETUP -#line 157 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLLOCSET; TextEscapeValue( yytext + 1, strlen( yytext ) - 2 ); YYLEX( TOKEN_STRING ); } - YY_BREAK -case 11: YY_RULE_SETUP #line 158 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLLOCSET; TextValue( yytext, strlen( yytext ) ); YYLEX( TOKEN_IDENTIFIER ); } +{ YYLEX( TOKEN_PERIOD ); } + YY_BREAK +case 11: +/* rule 11 can match eol */ +YY_RULE_SETUP +#line 159 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLLOCSET; TextEscapeValue( yytext + 1, strlen( yytext ) - 2 ); YYLEX( TOKEN_STRING ); } YY_BREAK case 12: YY_RULE_SETUP -#line 159 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +#line 160 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLLOCSET; TextValue( yytext, strlen( yytext ) ); YYLEX( TOKEN_IDENTIFIER ); } + YY_BREAK +case 13: +YY_RULE_SETUP +#line 161 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" { for ( int i = yyleng - 1; i >= 0; --i ) unput( yytext[ i ] ); @@ -1350,391 +1356,391 @@ YY_RULE_SETUP BEGIN( INITIAL ); } YY_BREAK -case 13: -/* rule 13 can match eol */ +case 14: +/* rule 14 can match eol */ YY_RULE_SETUP -#line 168 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +#line 170 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" { if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); } YY_BREAK -case 14: -YY_RULE_SETUP -#line 169 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ ; } - YY_BREAK case 15: -/* rule 15 can match eol */ YY_RULE_SETUP #line 171 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLLOCSET; TextEscapeValue( yytext + 1, strlen( yytext ) - 2 ); YYLEX( TOKEN_STRING ); } +{ ; } YY_BREAK case 16: +/* rule 16 can match eol */ YY_RULE_SETUP -#line 174 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_TERNARY ); } +#line 173 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLLOCSET; TextEscapeValue( yytext + 1, strlen( yytext ) - 2 ); YYLEX( TOKEN_STRING ); } YY_BREAK case 17: YY_RULE_SETUP -#line 175 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_IF ); } +#line 176 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_TERNARY ); } YY_BREAK case 18: YY_RULE_SETUP -#line 176 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_ELSE ); } +#line 177 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_IF ); } YY_BREAK case 19: YY_RULE_SETUP -#line 177 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_WHILE ); } +#line 178 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_ELSE ); } YY_BREAK case 20: YY_RULE_SETUP -#line 178 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_FOR ); } +#line 179 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_WHILE ); } YY_BREAK case 21: YY_RULE_SETUP -#line 179 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_DO ); } +#line 180 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_FOR ); } YY_BREAK case 22: YY_RULE_SETUP #line 181 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_game ); YYLEX( TOKEN_LISTENER ); } +{ YYLEX( TOKEN_DO ); } YY_BREAK case 23: YY_RULE_SETUP -#line 182 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_group ); YYLEX( TOKEN_LISTENER ); } +#line 183 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_game ); YYLEX( TOKEN_LISTENER ); } YY_BREAK case 24: YY_RULE_SETUP -#line 183 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_level ); YYLEX( TOKEN_LISTENER ); } +#line 184 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_group ); YYLEX( TOKEN_LISTENER ); } YY_BREAK case 25: YY_RULE_SETUP -#line 184 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_local ); YYLEX( TOKEN_LISTENER ); } +#line 185 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_level ); YYLEX( TOKEN_LISTENER ); } YY_BREAK case 26: YY_RULE_SETUP -#line 185 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_parm ); YYLEX( TOKEN_LISTENER ); } +#line 186 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_local ); YYLEX( TOKEN_LISTENER ); } YY_BREAK case 27: YY_RULE_SETUP -#line 186 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_owner ); YYLEX( TOKEN_LISTENER ); } +#line 187 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_parm ); YYLEX( TOKEN_LISTENER ); } YY_BREAK case 28: YY_RULE_SETUP -#line 187 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_self ); YYLEX( TOKEN_LISTENER ); } +#line 188 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_owner ); YYLEX( TOKEN_LISTENER ); } YY_BREAK case 29: YY_RULE_SETUP #line 189 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ parsedata.braces_count++; YYLEX( TOKEN_LBRACKET ); } +{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_self ); YYLEX( TOKEN_LISTENER ); } YY_BREAK case 30: YY_RULE_SETUP -#line 190 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ parsedata.braces_count--; YYLEX( TOKEN_RBRACKET ); } +#line 191 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ parsedata.braces_count++; YYLEX( TOKEN_LBRACKET ); } YY_BREAK case 31: YY_RULE_SETUP -#line 191 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLLOCSET; YYLEX( TOKEN_LPAREN ); } +#line 192 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ parsedata.braces_count--; YYLEX( TOKEN_RBRACKET ); } YY_BREAK case 32: YY_RULE_SETUP -#line 192 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); YYLLOCSET; YYLEX( TOKEN_RPAREN ); } +#line 193 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLLOCSET; YYLEX( TOKEN_LPAREN ); } YY_BREAK case 33: YY_RULE_SETUP -#line 193 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_LSQUARE ); } +#line 194 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); YYLLOCSET; YYLEX( TOKEN_RPAREN ); } YY_BREAK case 34: YY_RULE_SETUP -#line 194 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); YYLEX( TOKEN_RSQUARE ); } +#line 195 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_LSQUARE ); } YY_BREAK case 35: YY_RULE_SETUP #line 196 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_ASSIGNMENT ); } +{ BEGIN( VARIABLES ); YYLEX( TOKEN_RSQUARE ); } YY_BREAK case 36: YY_RULE_SETUP -#line 197 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_COLON ); } +#line 198 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_ASSIGNMENT ); } YY_BREAK case 37: YY_RULE_SETUP -#line 198 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_DOUBLE_COLON ); } +#line 199 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_COLON ); } YY_BREAK case 38: YY_RULE_SETUP -#line 199 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_SEMICOLON ); } +#line 200 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_DOUBLE_COLON ); } YY_BREAK case 39: YY_RULE_SETUP #line 201 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_EQUALITY ); } +{ YYLEX( TOKEN_SEMICOLON ); } YY_BREAK case 40: YY_RULE_SETUP -#line 202 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_LOGICAL_OR ); } +#line 203 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_EQUALITY ); } YY_BREAK case 41: YY_RULE_SETUP -#line 203 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_LOGICAL_AND ); } +#line 204 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_LOGICAL_OR ); } YY_BREAK case 42: YY_RULE_SETUP #line 205 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_BITWISE_OR ); } +{ YYLEX( TOKEN_LOGICAL_AND ); } YY_BREAK case 43: YY_RULE_SETUP -#line 206 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_BITWISE_EXCL_OR ); } +#line 207 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_BITWISE_OR ); } YY_BREAK case 44: YY_RULE_SETUP -#line 207 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_BITWISE_AND ); } +#line 208 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_BITWISE_EXCL_OR ); } YY_BREAK case 45: YY_RULE_SETUP -#line 208 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_INEQUALITY ); } +#line 209 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_BITWISE_AND ); } YY_BREAK case 46: YY_RULE_SETUP -#line 209 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_LESS_THAN ); } +#line 210 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_INEQUALITY ); } YY_BREAK case 47: YY_RULE_SETUP -#line 210 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_GREATER_THAN ); } +#line 211 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_LESS_THAN ); } YY_BREAK case 48: YY_RULE_SETUP -#line 211 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); } +#line 212 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_GREATER_THAN ); } YY_BREAK case 49: YY_RULE_SETUP -#line 212 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); } +#line 213 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); } YY_BREAK case 50: YY_RULE_SETUP -#line 213 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_NEG ); } +#line 214 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); } YY_BREAK case 51: YY_RULE_SETUP #line 215 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_PLUS ); } +{ YYLEX( TOKEN_NEG ); } YY_BREAK case 52: YY_RULE_SETUP -#line 216 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_PLUS_EQUALS ); } +#line 217 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_PLUS ); } YY_BREAK case 53: YY_RULE_SETUP -#line 217 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_INCREMENT ); } +#line 218 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_PLUS_EQUALS ); } YY_BREAK case 54: YY_RULE_SETUP -#line 218 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_MINUS ); } +#line 219 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_INCREMENT ); } YY_BREAK case 55: YY_RULE_SETUP -#line 219 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_MINUS_EQUALS ); } +#line 220 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_MINUS ); } YY_BREAK case 56: YY_RULE_SETUP -#line 220 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +#line 221 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" { YYLEX( TOKEN_MINUS_EQUALS ); } YY_BREAK case 57: YY_RULE_SETUP -#line 221 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_DECREMENT ); } +#line 222 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_MINUS_EQUALS ); } YY_BREAK case 58: YY_RULE_SETUP -#line 222 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_MULTIPLY ); } +#line 223 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_DECREMENT ); } YY_BREAK case 59: YY_RULE_SETUP -#line 223 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_MULTIPLY_EQUALS ); } +#line 224 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_MULTIPLY ); } YY_BREAK case 60: YY_RULE_SETUP -#line 224 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_DIVIDE ); } +#line 225 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_MULTIPLY_EQUALS ); } YY_BREAK case 61: YY_RULE_SETUP -#line 225 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_DIVIDE_EQUALS ); } +#line 226 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_DIVIDE ); } YY_BREAK case 62: YY_RULE_SETUP -#line 226 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_MODULUS ); } +#line 227 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_DIVIDE_EQUALS ); } YY_BREAK case 63: YY_RULE_SETUP -#line 227 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_MODULUS_EQUALS ); } +#line 228 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_MODULUS ); } YY_BREAK case 64: YY_RULE_SETUP -#line 228 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_SHIFT_LEFT ); } +#line 229 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_MODULUS_EQUALS ); } YY_BREAK case 65: YY_RULE_SETUP -#line 229 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_SHIFT_LEFT_EQUALS ); } +#line 230 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_SHIFT_LEFT ); } YY_BREAK case 66: YY_RULE_SETUP -#line 230 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_SHIFT_RIGHT ); } +#line 231 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_SHIFT_LEFT_EQUALS ); } YY_BREAK case 67: YY_RULE_SETUP -#line 231 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_SHIFT_RIGHT_EQUALS ); } +#line 232 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_SHIFT_RIGHT ); } YY_BREAK case 68: YY_RULE_SETUP -#line 232 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_AND_EQUALS ); } +#line 233 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_SHIFT_RIGHT_EQUALS ); } YY_BREAK case 69: YY_RULE_SETUP -#line 233 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_EXCL_OR_EQUALS ); } +#line 234 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_AND_EQUALS ); } YY_BREAK case 70: YY_RULE_SETUP -#line 234 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_OR_EQUALS ); } +#line 235 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_EXCL_OR_EQUALS ); } YY_BREAK case 71: YY_RULE_SETUP -#line 235 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ BEGIN( VARIABLES ); YYLEX( TOKEN_DOLLAR ); } +#line 236 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_OR_EQUALS ); } YY_BREAK case 72: YY_RULE_SETUP -#line 236 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_NOT ); } +#line 237 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ BEGIN( VARIABLES ); YYLEX( TOKEN_DOLLAR ); } YY_BREAK case 73: YY_RULE_SETUP -#line 237 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_COMPLEMENT ); } +#line 238 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_NOT ); } YY_BREAK case 74: YY_RULE_SETUP #line 239 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_PERIOD ); } +{ YYLEX( TOKEN_COMPLEMENT ); } YY_BREAK case 75: YY_RULE_SETUP #line 241 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_COMMA ); } +{ YYLEX( TOKEN_PERIOD ); } YY_BREAK case 76: YY_RULE_SETUP -#line 242 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_NUMBER ); } +#line 243 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_COMMA ); } YY_BREAK case 77: YY_RULE_SETUP #line 244 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_NULL ); } +{ YYLEX( TOKEN_NUMBER ); } YY_BREAK case 78: YY_RULE_SETUP -#line 245 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_NIL ); } +#line 246 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_NULL ); } YY_BREAK case 79: YY_RULE_SETUP #line 247 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLLOCSET; sscanf( yytext, "%d", &yylval.s.val.intValue ); YYLEX( TOKEN_INTEGER ); } +{ YYLEX( TOKEN_NIL ); } YY_BREAK case 80: YY_RULE_SETUP -#line 248 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLLOCSET; sscanf( yytext, "%f", &yylval.s.val.floatValue ); YYLEX( TOKEN_FLOAT ); } +#line 249 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLLOCSET; sscanf( yytext, "%d", &yylval.s.val.intValue ); YYLEX( TOKEN_INTEGER ); } YY_BREAK case 81: YY_RULE_SETUP #line 250 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_TRY ); } +{ YYLLOCSET; sscanf( yytext, "%f", &yylval.s.val.floatValue ); YYLEX( TOKEN_FLOAT ); } YY_BREAK case 82: YY_RULE_SETUP -#line 251 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_CATCH ); } +#line 252 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_TRY ); } YY_BREAK case 83: YY_RULE_SETUP -#line 252 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_SWITCH ); } +#line 253 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_CATCH ); } YY_BREAK case 84: YY_RULE_SETUP #line 254 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_CASE ); } +{ YYLEX( TOKEN_SWITCH ); } YY_BREAK case 85: YY_RULE_SETUP -#line 255 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_BREAK ); } +#line 256 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_CASE ); } YY_BREAK case 86: YY_RULE_SETUP -#line 256 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_CONTINUE ); } +#line 257 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_BREAK ); } YY_BREAK case 87: YY_RULE_SETUP #line 258 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_MAKEARRAY ); } +{ YYLEX( TOKEN_CONTINUE ); } YY_BREAK case 88: YY_RULE_SETUP -#line 259 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" -{ YYLEX( TOKEN_ENDARRAY ); } +#line 260 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_MAKEARRAY ); } YY_BREAK case 89: YY_RULE_SETUP #line 261 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +{ YYLEX( TOKEN_ENDARRAY ); } + YY_BREAK +case 90: +YY_RULE_SETUP +#line 263 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" { if( UseField() ) { @@ -1749,9 +1755,9 @@ YY_RULE_SETUP } } YY_BREAK -case 90: +case 91: YY_RULE_SETUP -#line 275 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +#line 277 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" { yylexerror( "bad token:\n" ); } YY_BREAK @@ -1759,12 +1765,12 @@ YY_RULE_SETUP #undef fprintf -case 91: +case 92: YY_RULE_SETUP -#line 283 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +#line 285 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1767 "../../../code/globalcpp/parser/yyLexer.cpp" +#line 1773 "../../../code/globalcpp/parser/yyLexer.cpp" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(C_COMMENT): case YY_STATE_EOF(C_LINE_COMMENT): @@ -2030,7 +2036,7 @@ static int yy_get_next_buffer (void) 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 >= 217 ) + if ( yy_current_state >= 219 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2053,11 +2059,11 @@ static int yy_get_next_buffer (void) 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 >= 217 ) + if ( yy_current_state >= 219 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 216); + yy_is_jam = (yy_current_state == 218); if ( ! yy_is_jam ) *(yy_state_ptr)++ = yy_current_state; @@ -2755,6 +2761,6 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 283 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +#line 285 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" diff --git a/code/globalcpp/parser/yyLexer.h b/code/globalcpp/parser/yyLexer.h index f9ff3b86..1ab29be4 100644 --- a/code/globalcpp/parser/yyLexer.h +++ b/code/globalcpp/parser/yyLexer.h @@ -400,7 +400,7 @@ extern int yylex (void); #undef YY_DECL #endif -#line 283 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" +#line 285 "..\\..\\..\\code\\globalcpp\\parser\\yyLexer.l" #line 406 "../../../code/globalcpp/parser/yyLexer.h" diff --git a/code/globalcpp/parser/yyParser.cpp b/code/globalcpp/parser/yyParser.cpp index b3b37ffd..78958c49 100644 --- a/code/globalcpp/parser/yyParser.cpp +++ b/code/globalcpp/parser/yyParser.cpp @@ -597,16 +597,16 @@ static const yytype_int8 yyrhs[] = static const yytype_uint16 yyrline[] = { 0, 111, 111, 115, 117, 118, 122, 123, 124, 125, - 126, 127, 128, 129, 130, 135, 136, 137, 138, 139, - 140, 142, 144, 145, 146, 147, 148, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 161, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 190, - 192, 194, 195, 196, 197, 198, 199, 203, 204, 205, - 209, 210, 214, 215, 216, 220, 221, 222, 223, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, - 235, 236, 237, 241, 242, 246, 250, 251, 252, 256, - 257, 261, 262 + 126, 127, 128, 129, 130, 139, 140, 141, 142, 143, + 144, 146, 148, 149, 150, 151, 152, 153, 154, 155, + 156, 157, 158, 159, 160, 161, 165, 169, 170, 171, + 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, + 182, 183, 184, 185, 186, 187, 188, 189, 190, 194, + 196, 198, 199, 200, 201, 202, 203, 207, 208, 209, + 213, 214, 218, 219, 220, 224, 225, 226, 227, 228, + 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, + 239, 240, 241, 245, 246, 250, 254, 255, 256, 260, + 261, 265, 266 }; #endif @@ -1926,487 +1926,487 @@ yyreduce: case 15: /* Line 1792 of yacc.c */ -#line 135 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 139 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_do, (yyvsp[(3) - (6)].s.val), (yyvsp[(6) - (6)].s.val), YYLLOC ); } break; case 16: /* Line 1792 of yacc.c */ -#line 136 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 140 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_catch, (yyvsp[(3) - (7)].s.val), (yyvsp[(7) - (7)].s.val), YYLLOC ); } break; case 17: /* Line 1792 of yacc.c */ -#line 137 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 141 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_switch, (yyvsp[(2) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 18: /* Line 1792 of yacc.c */ -#line 138 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 142 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_break, YYLLOC ); } break; case 19: /* Line 1792 of yacc.c */ -#line 139 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 143 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_continue, YYLLOC ); } break; case 20: /* Line 1792 of yacc.c */ -#line 140 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 144 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_cmd, (yyvsp[(1) - (2)].s).val, node1( sval_none, (yyvsp[(2) - (2)].s.val) ), node_pos( (yyvsp[(1) - (2)].s).sourcePos ) ); } break; case 21: /* Line 1792 of yacc.c */ -#line 142 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 146 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_cmd_method, (yyvsp[(1) - (3)].s.val), (yyvsp[(2) - (3)].s).val, node1( sval_none, (yyvsp[(3) - (3)].s.val) ), node_pos( (yyvsp[(2) - (3)].s).sourcePos ) ); } break; case 22: /* Line 1792 of yacc.c */ -#line 144 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 148 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ); } break; case 23: /* Line 1792 of yacc.c */ -#line 145 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 149 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_PLUS ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 24: /* Line 1792 of yacc.c */ -#line 146 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 150 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_MINUS ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 25: /* Line 1792 of yacc.c */ -#line 147 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 151 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_MULTIPLY ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 26: /* Line 1792 of yacc.c */ -#line 148 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 152 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_DIVIDE ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 27: /* Line 1792 of yacc.c */ -#line 149 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 153 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_PERCENTAGE ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 28: /* Line 1792 of yacc.c */ -#line 150 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 154 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_BITWISE_AND ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 29: /* Line 1792 of yacc.c */ -#line 151 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 155 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_BITWISE_EXCL_OR ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 30: /* Line 1792 of yacc.c */ -#line 152 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 156 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_BITWISE_OR ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 31: /* Line 1792 of yacc.c */ -#line 153 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 157 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_SHIFT_LEFT ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 32: /* Line 1792 of yacc.c */ -#line 154 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 158 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (3)].s.val), node4( sval_operation, node1b( OP_BIN_SHIFT_RIGHT ), (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ), YYLLOC ); } break; case 33: /* Line 1792 of yacc.c */ -#line 155 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 159 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (2)].s.val), node2( sval_func1, node1b( OP_UN_INC ), (yyvsp[(1) - (2)].s.val) ), YYLLOC ); } break; case 34: /* Line 1792 of yacc.c */ -#line 156 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 160 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_assignment, (yyvsp[(1) - (2)].s.val), node2( sval_func1, node1b( OP_UN_DEC ), (yyvsp[(1) - (2)].s.val) ), YYLLOC ); } break; case 36: /* Line 1792 of yacc.c */ -#line 161 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 165 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_statement_list, (yyvsp[(3) - (5)].s.val) ); } break; case 37: /* Line 1792 of yacc.c */ -#line 165 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 169 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_and, (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 38: /* Line 1792 of yacc.c */ -#line 166 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 170 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_or, (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 39: /* Line 1792 of yacc.c */ -#line 167 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 171 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_BITWISE_AND ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 40: /* Line 1792 of yacc.c */ -#line 168 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 172 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_BITWISE_EXCL_OR ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 41: /* Line 1792 of yacc.c */ -#line 169 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 173 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_BITWISE_OR ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 42: /* Line 1792 of yacc.c */ -#line 170 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 174 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_EQUALITY ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 43: /* Line 1792 of yacc.c */ -#line 171 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 175 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_INEQUALITY ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 44: /* Line 1792 of yacc.c */ -#line 172 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 176 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_LESS_THAN ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 45: /* Line 1792 of yacc.c */ -#line 173 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 177 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_GREATER_THAN ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 46: /* Line 1792 of yacc.c */ -#line 174 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 178 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_LESS_THAN_OR_EQUAL ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 47: /* Line 1792 of yacc.c */ -#line 175 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 179 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_GREATER_THAN_OR_EQUAL ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 48: /* Line 1792 of yacc.c */ -#line 176 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 180 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_PLUS ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 49: /* Line 1792 of yacc.c */ -#line 177 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 181 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_MINUS ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 50: /* Line 1792 of yacc.c */ -#line 178 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 182 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_MULTIPLY ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 51: /* Line 1792 of yacc.c */ -#line 179 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 183 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_DIVIDE ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 52: /* Line 1792 of yacc.c */ -#line 180 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 184 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_PERCENTAGE ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 53: /* Line 1792 of yacc.c */ -#line 181 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 185 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_SHIFT_LEFT ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 54: /* Line 1792 of yacc.c */ -#line 182 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 186 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_operation, node1b( OP_BIN_SHIFT_RIGHT ), (yyvsp[(1) - (4)].s.val), (yyvsp[(4) - (4)].s.val), YYLLOC ); } break; case 55: /* Line 1792 of yacc.c */ -#line 183 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 187 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_ifelse, (yyvsp[(1) - (5)].s.val), (yyvsp[(3) - (5)].s.val), (yyvsp[(5) - (5)].s.val), YYLLOC ); } break; case 58: /* Line 1792 of yacc.c */ -#line 186 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 190 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_store_string, (yyvsp[(1) - (1)].s).val ); } break; case 59: /* Line 1792 of yacc.c */ -#line 190 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 194 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_cmd_default_ret, (yyvsp[(1) - (2)].s).val, node1( sval_none, (yyvsp[(2) - (2)].s.val) ), node_pos( (yyvsp[(1) - (2)].s).sourcePos ) ); } break; case 60: /* Line 1792 of yacc.c */ -#line 192 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 196 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_cmd_method_ret, (yyvsp[(1) - (3)].s.val), (yyvsp[(2) - (3)].s).val, node1( sval_none, (yyvsp[(3) - (3)].s.val) ), node_pos( (yyvsp[(2) - (3)].s).sourcePos ) ); } break; case 61: /* Line 1792 of yacc.c */ -#line 194 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 198 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_MINUS ), (yyvsp[(2) - (2)].s.val), YYLLOC ); } break; case 62: /* Line 1792 of yacc.c */ -#line 195 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 199 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_COMPLEMENT ), (yyvsp[(2) - (2)].s.val), YYLLOC ); } break; case 63: /* Line 1792 of yacc.c */ -#line 196 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 200 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node2( sval_not, (yyvsp[(2) - (2)].s.val), YYLLOC ); } break; case 64: /* Line 1792 of yacc.c */ -#line 197 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 201 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_constarray, node2( sval_store_string, (yyvsp[(1) - (3)].s).val, node_pos( (yyvsp[(1) - (3)].s).sourcePos ) ), (yyvsp[(3) - (3)].s.val), YYLLOC ); } break; case 65: /* Line 1792 of yacc.c */ -#line 198 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 202 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_constarray, (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ); } break; case 66: /* Line 1792 of yacc.c */ -#line 199 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 203 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_makearray, (yyvsp[(3) - (5)].s.val) ); } break; case 67: /* Line 1792 of yacc.c */ -#line 203 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 207 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node0( sval_none ); } break; case 68: /* Line 1792 of yacc.c */ -#line 204 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 208 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = append_node( (yyvsp[(1) - (2)].s.val), (yyvsp[(2) - (2)].s.val) ); } break; case 69: /* Line 1792 of yacc.c */ -#line 205 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 209 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = linked_list_end( (yyvsp[(1) - (1)].s.val) ); } break; case 70: /* Line 1792 of yacc.c */ -#line 209 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 213 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = append_node( (yyvsp[(1) - (2)].s.val), (yyvsp[(2) - (2)].s.val) ); } break; case 71: /* Line 1792 of yacc.c */ -#line 210 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 214 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = linked_list_end( (yyvsp[(1) - (1)].s.val) ); } break; case 73: /* Line 1792 of yacc.c */ -#line 215 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 219 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_store_string, (yyvsp[(1) - (1)].s).val ); } break; case 74: /* Line 1792 of yacc.c */ -#line 216 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 220 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_constarray, (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s.val), YYLLOC ); } break; case 75: /* Line 1792 of yacc.c */ -#line 220 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 224 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_TARGETNAME ), (yyvsp[(3) - (4)].s.val), YYLLOC ); } break; case 76: /* Line 1792 of yacc.c */ -#line 221 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 225 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_TARGETNAME ), node1( sval_store_string, (yyvsp[(2) - (2)].s).val ), YYLLOC ); } break; case 77: /* Line 1792 of yacc.c */ -#line 222 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 226 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_TARGETNAME ), node1( sval_store_string, (yyvsp[(2) - (2)].s).val ), YYLLOC ); } break; case 78: /* Line 1792 of yacc.c */ -#line 223 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 227 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_field, (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s).val, node_pos( (yyvsp[(3) - (3)].s).sourcePos ) ); } break; case 79: /* Line 1792 of yacc.c */ -#line 224 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 228 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_field, (yyvsp[(1) - (3)].s.val), (yyvsp[(3) - (3)].s).val, node_pos( (yyvsp[(3) - (3)].s).sourcePos ) ); } break; case 80: /* Line 1792 of yacc.c */ -#line 225 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 229 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_SIZE ), (yyvsp[(1) - (3)].s.val), YYLLOC ); } break; case 81: /* Line 1792 of yacc.c */ -#line 226 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 230 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_array, (yyvsp[(1) - (4)].s.val), (yyvsp[(3) - (4)].s.val), (yyvsp[(1) - (4)].s.val) ); } break; case 82: /* Line 1792 of yacc.c */ -#line 227 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 231 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_store_string, (yyvsp[(1) - (1)].s).val ); } break; case 84: /* Line 1792 of yacc.c */ -#line 229 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 233 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node4( sval_calc_vector, (yyvsp[(2) - (5)].s.val), (yyvsp[(3) - (5)].s.val), (yyvsp[(4) - (5)].s.val), YYLLOC ); } break; case 85: /* Line 1792 of yacc.c */ -#line 230 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 234 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node2( sval_store_method, (yyvsp[(1) - (1)].s).val, YYLLOC ); } break; case 86: /* Line 1792 of yacc.c */ -#line 231 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 235 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = (yyvsp[(2) - (3)].s.val); } break; case 87: /* Line 1792 of yacc.c */ -#line 232 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 236 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node0( sval_none ); } break; case 88: /* Line 1792 of yacc.c */ -#line 233 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 237 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_MINUS ), (yyvsp[(2) - (2)].s.val), YYLLOC ); } break; case 89: /* Line 1792 of yacc.c */ -#line 234 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 238 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node3( sval_func1, node1b( OP_UN_COMPLEMENT ), (yyvsp[(2) - (2)].s.val), YYLLOC ); } break; case 90: /* Line 1792 of yacc.c */ -#line 235 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 239 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node2( sval_not, (yyvsp[(2) - (2)].s.val), YYLLOC ); } break; case 91: /* Line 1792 of yacc.c */ -#line 236 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 240 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_store_null, YYLLOC ); } break; case 92: /* Line 1792 of yacc.c */ -#line 237 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 241 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_store_nil, YYLLOC ); } break; case 93: /* Line 1792 of yacc.c */ -#line 241 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 245 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_store_float, (yyvsp[(1) - (1)].s).val ); } break; case 94: /* Line 1792 of yacc.c */ -#line 242 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 246 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node1( sval_store_integer, (yyvsp[(1) - (1)].s).val ); } break; case 96: /* Line 1792 of yacc.c */ -#line 250 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 254 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = node0( sval_none ); } break; case 97: /* Line 1792 of yacc.c */ -#line 251 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 255 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = append_node( (yyvsp[(1) - (3)].s.val), node1( sval_makearray, (yyvsp[(2) - (3)].s.val) ) ); } break; case 98: /* Line 1792 of yacc.c */ -#line 252 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 256 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = linked_list_end( node1( sval_makearray, (yyvsp[(1) - (2)].s.val) ) ); } break; case 99: /* Line 1792 of yacc.c */ -#line 256 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 260 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = linked_list_end( (yyvsp[(1) - (1)].s.val) ); } break; case 100: /* Line 1792 of yacc.c */ -#line 257 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 261 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" { (yyval.s.val) = append_node( (yyvsp[(1) - (2)].s.val), (yyvsp[(2) - (2)].s.val) ); } break; case 101: /* Line 1792 of yacc.c */ -#line 261 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 265 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" {} break; @@ -2644,5 +2644,5 @@ yyreturn: /* Line 2055 of yacc.c */ -#line 265 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" +#line 269 "..\\..\\..\\code\\globalcpp\\parser\\yyParser.yy" diff --git a/code/globalcpp/parser/yyParser.yy b/code/globalcpp/parser/yyParser.yy index 9b1ce050..c08ed10b 100644 --- a/code/globalcpp/parser/yyParser.yy +++ b/code/globalcpp/parser/yyParser.yy @@ -43,7 +43,7 @@ extern yyparsedata parsedata; %error-verbose -%expect 281 +%expect 304 %token END 0 %token TOKEN_EOL @@ -132,6 +132,10 @@ statement: sval_u while_stmt = node4( sval_while, $E, $S, node1( sval_statement_list, $INC ), YYLLOC ); $$ = node1( sval_statement_list, append_node( linked_list_end( $SINIT ), while_stmt ) ); } + | TOKEN_FOR TOKEN_LPAREN TOKEN_SEMICOLON expr[E] TOKEN_SEMICOLON statement_list[INC] TOKEN_RPAREN newline statement[S] + { + $$ = node4( sval_while, $E, $S, node1( sval_statement_list, $INC ), YYLLOC ); + } | TOKEN_DO newline statement[S] newline TOKEN_WHILE prim_expr[E] { $$ = node3( sval_do, $S, $E, YYLLOC ); } | TOKEN_TRY newline compound_statement newline TOKEN_CATCH newline compound_statement { $$ = node3( sval_catch, $3, $7, YYLLOC ); } | TOKEN_SWITCH prim_expr newline compound_statement { $$ = node3( sval_switch, $2, $4, YYLLOC ); }