diff options
| author | Eugene Sandulenko | 2019-12-02 21:24:17 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-12-02 21:24:17 +0100 |
| commit | bbc8b177ed75f83187116ead882a151b5c29c952 (patch) | |
| tree | c39007ad6681ae6a61df9449795de065642c7d70 | |
| parent | 6060ec7fcc1982a1f46526197d48c358961466a9 (diff) | |
| download | scummvm-rg350-bbc8b177ed75f83187116ead882a151b5c29c952.tar.gz scummvm-rg350-bbc8b177ed75f83187116ead882a151b5c29c952.tar.bz2 scummvm-rg350-bbc8b177ed75f83187116ead882a151b5c29c952.zip | |
DIRECTOR: LINGO: Resolved grammar conflict for '=' vs tEQ
| -rw-r--r-- | engines/director/lingo/lingo-gr.cpp | 1692 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-gr.y | 15 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 2 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-lex.l | 8 |
4 files changed, 851 insertions, 866 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index b462393262..d0fc362b83 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -540,16 +540,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 127 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1755 +#define YYLAST 1764 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 106 +#define YYNTOKENS 105 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 49 /* YYNRULES -- Number of rules. */ -#define YYNRULES 173 +#define YYNRULES 172 /* YYNRULES -- Number of states. */ -#define YYNSTATES 369 +#define YYNSTATES 367 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -562,15 +562,15 @@ union yyalloc static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 98, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 97, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 97, 92, 2, - 99, 100, 95, 93, 105, 94, 2, 96, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 96, 91, 2, + 98, 99, 94, 92, 104, 93, 2, 95, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 102, 91, 101, 2, 2, 2, 2, 2, 2, 2, + 101, 2, 100, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 103, 2, 104, 2, 2, 2, 2, 2, 2, + 2, 102, 2, 103, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -605,116 +605,116 @@ static const yytype_uint16 yyprhs[] = { 0, 0, 3, 7, 9, 12, 14, 16, 18, 20, 22, 23, 25, 27, 32, 37, 42, 47, 52, 57, - 63, 68, 73, 79, 81, 83, 85, 87, 89, 95, - 106, 118, 122, 129, 134, 141, 151, 161, 171, 182, - 193, 200, 201, 205, 208, 210, 213, 215, 222, 224, - 231, 238, 241, 242, 245, 249, 251, 253, 254, 255, - 257, 260, 263, 267, 269, 271, 273, 275, 277, 279, - 281, 284, 287, 292, 297, 299, 301, 304, 306, 310, - 314, 318, 322, 326, 330, 334, 338, 342, 346, 350, - 354, 358, 361, 365, 369, 373, 377, 380, 383, 387, - 391, 396, 401, 406, 413, 418, 425, 430, 437, 442, - 449, 452, 455, 457, 459, 462, 464, 467, 470, 473, - 475, 478, 481, 483, 486, 491, 496, 503, 508, 511, - 515, 517, 521, 523, 527, 529, 533, 536, 539, 542, - 545, 549, 552, 555, 557, 561, 564, 567, 570, 574, - 577, 578, 582, 583, 592, 595, 596, 605, 614, 621, - 624, 625, 627, 631, 636, 637, 639, 643, 644, 647, - 648, 650, 654, 656 + 62, 67, 73, 75, 77, 79, 81, 83, 89, 100, + 112, 116, 123, 128, 135, 145, 155, 165, 176, 187, + 194, 195, 199, 202, 204, 207, 209, 216, 218, 225, + 232, 235, 236, 239, 243, 245, 247, 248, 249, 251, + 254, 257, 261, 263, 265, 267, 269, 271, 273, 275, + 278, 281, 286, 291, 293, 295, 298, 300, 304, 308, + 312, 316, 320, 324, 328, 332, 336, 340, 344, 348, + 352, 355, 359, 363, 367, 371, 374, 377, 381, 385, + 390, 395, 400, 407, 412, 419, 424, 431, 436, 443, + 446, 449, 451, 453, 456, 458, 461, 464, 467, 469, + 472, 475, 477, 480, 485, 490, 497, 502, 505, 509, + 511, 515, 517, 521, 523, 527, 530, 533, 536, 539, + 543, 546, 549, 551, 555, 558, 561, 564, 568, 571, + 572, 576, 577, 586, 589, 590, 599, 608, 615, 618, + 619, 621, 625, 630, 631, 633, 637, 638, 641, 642, + 644, 648, 650 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 107, 0, -1, 107, 108, 113, -1, 113, -1, 1, - 108, -1, 98, -1, 53, -1, 58, -1, 36, -1, - 52, -1, -1, 145, -1, 116, -1, 49, 134, 42, - 28, -1, 49, 134, 42, 135, -1, 49, 134, 75, - 134, -1, 49, 134, 76, 134, -1, 51, 28, 91, - 134, -1, 51, 13, 91, 134, -1, 51, 14, 134, - 91, 134, -1, 51, 28, 54, 134, -1, 51, 13, - 54, 134, -1, 51, 14, 134, 54, 134, -1, 152, - -1, 134, -1, 136, -1, 115, -1, 117, -1, 125, - 123, 131, 130, 32, -1, 126, 91, 134, 130, 54, - 134, 130, 131, 130, 32, -1, 126, 91, 134, 130, - 34, 54, 134, 130, 131, 130, 32, -1, 132, 115, - 130, -1, 133, 134, 108, 131, 130, 32, -1, 133, - 134, 54, 134, -1, 127, 123, 109, 131, 130, 32, - -1, 127, 123, 109, 131, 130, 110, 131, 130, 32, - -1, 127, 123, 109, 131, 130, 129, 119, 130, 32, - -1, 127, 123, 109, 131, 130, 110, 129, 115, 130, - -1, 127, 123, 112, 129, 115, 130, 120, 130, 118, - 130, -1, 127, 123, 112, 129, 115, 130, 110, 129, - 115, 130, -1, 127, 123, 112, 129, 115, 130, -1, - -1, 110, 129, 115, -1, 119, 122, -1, 122, -1, - 120, 121, -1, 121, -1, 128, 123, 112, 129, 116, - 130, -1, 120, -1, 128, 123, 112, 129, 131, 130, - -1, 128, 123, 109, 129, 131, 130, -1, 124, 134, - -1, -1, 50, 57, -1, 50, 56, 28, -1, 41, - -1, 111, -1, -1, -1, 129, -1, 131, 108, -1, - 131, 116, -1, 55, 28, 112, -1, 87, -1, 12, - -1, 15, -1, 31, -1, 29, -1, 135, -1, 23, - -1, 24, 134, -1, 25, 154, -1, 25, 99, 154, - 100, -1, 28, 99, 153, 100, -1, 28, -1, 13, - -1, 14, 134, -1, 114, -1, 134, 93, 134, -1, - 134, 94, 134, -1, 134, 95, 134, -1, 134, 96, - 134, -1, 134, 74, 134, -1, 134, 101, 134, -1, - 134, 102, 134, -1, 134, 69, 134, -1, 134, 70, - 134, -1, 134, 65, 134, -1, 134, 66, 134, -1, - 134, 71, 134, -1, 134, 72, 134, -1, 73, 134, - -1, 134, 92, 134, -1, 134, 77, 134, -1, 134, - 78, 134, -1, 134, 79, 134, -1, 93, 134, -1, - 94, 134, -1, 99, 134, 100, -1, 103, 153, 104, - -1, 84, 134, 85, 134, -1, 84, 134, 86, 134, - -1, 80, 134, 47, 134, -1, 80, 134, 54, 134, - 47, 134, -1, 81, 134, 47, 134, -1, 81, 134, - 54, 134, 47, 134, -1, 82, 134, 47, 134, -1, - 82, 134, 54, 134, 47, 134, -1, 83, 134, 47, - 134, -1, 83, 134, 54, 134, 47, 134, -1, 27, - 134, -1, 49, 134, -1, 140, -1, 143, -1, 37, - 50, -1, 37, -1, 39, 137, -1, 88, 138, -1, - 64, 139, -1, 17, -1, 19, 134, -1, 18, 134, - -1, 18, -1, 20, 154, -1, 20, 99, 154, 100, - -1, 90, 99, 28, 100, -1, 90, 99, 28, 105, - 153, 100, -1, 61, 134, 56, 134, -1, 61, 134, - -1, 21, 28, 153, -1, 28, -1, 137, 105, 28, - -1, 28, -1, 138, 105, 28, -1, 28, -1, 139, - 105, 28, -1, 40, 43, -1, 40, 46, -1, 40, - 48, -1, 40, 141, -1, 40, 141, 142, -1, 40, - 142, -1, 38, 134, -1, 134, -1, 47, 45, 134, - -1, 45, 134, -1, 62, 63, -1, 62, 141, -1, - 62, 141, 142, -1, 62, 142, -1, -1, 33, 144, - 153, -1, -1, 44, 28, 146, 129, 149, 108, 151, - 131, -1, 59, 28, -1, -1, 60, 28, 147, 129, - 149, 108, 151, 131, -1, 148, 129, 149, 108, 151, - 131, 32, 150, -1, 148, 129, 149, 108, 151, 131, - -1, 89, 28, -1, -1, 28, -1, 149, 105, 28, - -1, 149, 108, 105, 28, -1, -1, 28, -1, 150, - 105, 28, -1, -1, 28, 154, -1, -1, 134, -1, - 153, 105, 134, -1, 134, -1, 154, 105, 134, -1 + 106, 0, -1, 106, 107, 112, -1, 112, -1, 1, + 107, -1, 97, -1, 53, -1, 58, -1, 36, -1, + 52, -1, -1, 144, -1, 115, -1, 49, 133, 42, + 28, -1, 49, 133, 42, 134, -1, 49, 133, 75, + 133, -1, 49, 133, 76, 133, -1, 51, 28, 69, + 133, -1, 51, 13, 69, 133, -1, 51, 28, 54, + 133, -1, 51, 13, 54, 133, -1, 51, 14, 133, + 54, 133, -1, 151, -1, 133, -1, 135, -1, 114, + -1, 116, -1, 124, 122, 130, 129, 32, -1, 125, + 69, 133, 129, 54, 133, 129, 130, 129, 32, -1, + 125, 69, 133, 129, 34, 54, 133, 129, 130, 129, + 32, -1, 131, 114, 129, -1, 132, 133, 107, 130, + 129, 32, -1, 132, 133, 54, 133, -1, 126, 122, + 108, 130, 129, 32, -1, 126, 122, 108, 130, 129, + 109, 130, 129, 32, -1, 126, 122, 108, 130, 129, + 128, 118, 129, 32, -1, 126, 122, 108, 130, 129, + 109, 128, 114, 129, -1, 126, 122, 111, 128, 114, + 129, 119, 129, 117, 129, -1, 126, 122, 111, 128, + 114, 129, 109, 128, 114, 129, -1, 126, 122, 111, + 128, 114, 129, -1, -1, 109, 128, 114, -1, 118, + 121, -1, 121, -1, 119, 120, -1, 120, -1, 127, + 122, 111, 128, 115, 129, -1, 119, -1, 127, 122, + 111, 128, 130, 129, -1, 127, 122, 108, 128, 130, + 129, -1, 123, 133, -1, -1, 50, 57, -1, 50, + 56, 28, -1, 41, -1, 110, -1, -1, -1, 128, + -1, 130, 107, -1, 130, 115, -1, 55, 28, 111, + -1, 87, -1, 12, -1, 15, -1, 31, -1, 29, + -1, 134, -1, 23, -1, 24, 133, -1, 25, 153, + -1, 25, 98, 153, 99, -1, 28, 98, 152, 99, + -1, 28, -1, 13, -1, 14, 133, -1, 113, -1, + 133, 92, 133, -1, 133, 93, 133, -1, 133, 94, + 133, -1, 133, 95, 133, -1, 133, 74, 133, -1, + 133, 100, 133, -1, 133, 101, 133, -1, 133, 69, + 133, -1, 133, 70, 133, -1, 133, 65, 133, -1, + 133, 66, 133, -1, 133, 71, 133, -1, 133, 72, + 133, -1, 73, 133, -1, 133, 91, 133, -1, 133, + 77, 133, -1, 133, 78, 133, -1, 133, 79, 133, + -1, 92, 133, -1, 93, 133, -1, 98, 133, 99, + -1, 102, 152, 103, -1, 84, 133, 85, 133, -1, + 84, 133, 86, 133, -1, 80, 133, 47, 133, -1, + 80, 133, 54, 133, 47, 133, -1, 81, 133, 47, + 133, -1, 81, 133, 54, 133, 47, 133, -1, 82, + 133, 47, 133, -1, 82, 133, 54, 133, 47, 133, + -1, 83, 133, 47, 133, -1, 83, 133, 54, 133, + 47, 133, -1, 27, 133, -1, 49, 133, -1, 139, + -1, 142, -1, 37, 50, -1, 37, -1, 39, 136, + -1, 88, 137, -1, 64, 138, -1, 17, -1, 19, + 133, -1, 18, 133, -1, 18, -1, 20, 153, -1, + 20, 98, 153, 99, -1, 90, 98, 28, 99, -1, + 90, 98, 28, 104, 152, 99, -1, 61, 133, 56, + 133, -1, 61, 133, -1, 21, 28, 152, -1, 28, + -1, 136, 104, 28, -1, 28, -1, 137, 104, 28, + -1, 28, -1, 138, 104, 28, -1, 40, 43, -1, + 40, 46, -1, 40, 48, -1, 40, 140, -1, 40, + 140, 141, -1, 40, 141, -1, 38, 133, -1, 133, + -1, 47, 45, 133, -1, 45, 133, -1, 62, 63, + -1, 62, 140, -1, 62, 140, 141, -1, 62, 141, + -1, -1, 33, 143, 152, -1, -1, 44, 28, 145, + 128, 148, 107, 150, 130, -1, 59, 28, -1, -1, + 60, 28, 146, 128, 148, 107, 150, 130, -1, 147, + 128, 148, 107, 150, 130, 32, 149, -1, 147, 128, + 148, 107, 150, 130, -1, 89, 28, -1, -1, 28, + -1, 148, 104, 28, -1, 148, 107, 104, 28, -1, + -1, 28, -1, 149, 104, 28, -1, -1, 28, 153, + -1, -1, 133, -1, 152, 104, 133, -1, 133, -1, + 153, 104, 133, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 121, 121, 122, 123, 126, 133, 140, 147, 154, - 157, 158, 159, 162, 168, 171, 172, 173, 179, 186, - 192, 198, 205, 213, 214, 215, 218, 219, 224, 237, - 255, 269, 274, 277, 282, 292, 304, 316, 326, 336, - 346, 358, 359, 362, 363, 366, 367, 370, 378, 379, - 385, 393, 396, 399, 402, 409, 416, 424, 427, 430, - 431, 432, 435, 441, 445, 448, 451, 454, 457, 458, - 461, 464, 465, 466, 469, 473, 481, 487, 488, 489, - 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, - 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, - 510, 511, 512, 513, 514, 515, 516, 517, 518, 519, - 522, 527, 528, 529, 530, 531, 532, 533, 534, 535, - 538, 541, 544, 548, 549, 550, 551, 552, 553, 554, - 557, 558, 561, 562, 565, 566, 577, 578, 579, 580, - 584, 588, 594, 595, 598, 599, 602, 603, 607, 611, - 615, 615, 645, 645, 650, 651, 651, 656, 663, 669, - 671, 672, 673, 674, 677, 678, 679, 682, 686, 694, - 695, 696, 699, 700 + 0, 120, 120, 121, 122, 125, 132, 139, 146, 153, + 156, 157, 158, 161, 167, 170, 171, 172, 178, 185, + 191, 198, 206, 207, 208, 211, 212, 217, 230, 248, + 262, 267, 270, 275, 285, 297, 309, 319, 329, 339, + 351, 352, 355, 356, 359, 360, 363, 371, 372, 378, + 386, 389, 392, 395, 402, 409, 417, 420, 423, 424, + 425, 428, 434, 438, 441, 444, 447, 450, 451, 454, + 457, 458, 459, 462, 466, 474, 480, 481, 482, 483, + 484, 485, 486, 487, 488, 489, 490, 491, 492, 493, + 494, 495, 496, 497, 498, 499, 500, 501, 502, 503, + 504, 505, 506, 507, 508, 509, 510, 511, 512, 515, + 520, 521, 522, 523, 524, 525, 526, 527, 528, 531, + 534, 537, 541, 542, 543, 544, 545, 546, 547, 550, + 551, 554, 555, 558, 559, 570, 571, 572, 573, 577, + 581, 587, 588, 591, 592, 595, 596, 600, 604, 608, + 608, 638, 638, 643, 644, 644, 649, 656, 662, 664, + 665, 666, 667, 670, 671, 672, 675, 679, 687, 688, + 689, 692, 693 }; #endif @@ -736,11 +736,11 @@ static const char *const yytname[] = "tPLAY", "tDONE", "tINSTANCE", "tGE", "tLE", "tGT", "tLT", "tEQ", "tNEQ", "tAND", "tOR", "tNOT", "tMOD", "tAFTER", "tBEFORE", "tCONCAT", "tCONTAINS", "tSTARTS", "tCHAR", "tITEM", "tLINE", "tWORD", "tSPRITE", - "tINTERSECTS", "tWITHIN", "tTELL", "tPROPERTY", "tON", "tME", "'='", - "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "'>'", - "'<'", "'['", "']'", "','", "$accept", "program", "nl", "thennl", - "nlelse", "nlelsif", "then", "programline", "asgn", "stmtoneliner", - "stmt", "ifstmt", "elsestmtoneliner", "elseifstmt", "elseifstmtoneliner", + "tINTERSECTS", "tWITHIN", "tTELL", "tPROPERTY", "tON", "tME", "'&'", + "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "'>'", "'<'", + "'['", "']'", "','", "$accept", "program", "nl", "thennl", "nlelse", + "nlelsif", "then", "programline", "asgn", "stmtoneliner", "stmt", + "ifstmt", "elsestmtoneliner", "elseifstmt", "elseifstmtoneliner", "elseifstmtoneliner1", "elseifstmt1", "cond", "begincond", "repeatwhile", "repeatwith", "if", "elseif", "begin", "end", "stmtlist", "when", "tell", "expr", "reference", "proc", "globallist", "propertylist", @@ -764,55 +764,55 @@ static const yytype_uint16 yytoknum[] = 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 345, 61, 38, 43, 45, 42, 47, 37, 10, 40, - 41, 62, 60, 91, 93, 44 + 345, 38, 43, 45, 42, 47, 37, 10, 40, 41, + 62, 60, 91, 93, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 106, 107, 107, 107, 108, 109, 110, 111, 112, - 113, 113, 113, 114, 114, 114, 114, 114, 114, 114, - 114, 114, 114, 115, 115, 115, 116, 116, 116, 116, - 116, 116, 116, 116, 117, 117, 117, 117, 117, 117, - 117, 118, 118, 119, 119, 120, 120, 121, 122, 122, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 131, 131, 132, 133, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 135, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 136, 136, 136, 136, 136, 136, 136, 136, 136, 136, - 137, 137, 138, 138, 139, 139, 140, 140, 140, 140, - 140, 140, 141, 141, 142, 142, 143, 143, 143, 143, - 144, 143, 146, 145, 145, 147, 145, 145, 145, 148, - 149, 149, 149, 149, 150, 150, 150, 151, 152, 153, - 153, 153, 154, 154 + 0, 105, 106, 106, 106, 107, 108, 109, 110, 111, + 112, 112, 112, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 114, 114, 114, 115, 115, 115, 115, 115, + 115, 115, 115, 116, 116, 116, 116, 116, 116, 116, + 117, 117, 118, 118, 119, 119, 120, 121, 121, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 130, + 130, 131, 132, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 134, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 136, + 136, 137, 137, 138, 138, 139, 139, 139, 139, 139, + 139, 140, 140, 141, 141, 142, 142, 142, 142, 143, + 142, 145, 144, 144, 146, 144, 144, 144, 147, 148, + 148, 148, 148, 149, 149, 149, 150, 151, 152, 152, + 152, 153, 153 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 3, 1, 2, 1, 1, 1, 1, 1, - 0, 1, 1, 4, 4, 4, 4, 4, 4, 5, - 4, 4, 5, 1, 1, 1, 1, 1, 5, 10, - 11, 3, 6, 4, 6, 9, 9, 9, 10, 10, - 6, 0, 3, 2, 1, 2, 1, 6, 1, 6, - 6, 2, 0, 2, 3, 1, 1, 0, 0, 1, - 2, 2, 3, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 4, 4, 1, 1, 2, 1, 3, 3, + 0, 1, 1, 4, 4, 4, 4, 4, 4, 4, + 4, 5, 1, 1, 1, 1, 1, 5, 10, 11, + 3, 6, 4, 6, 9, 9, 9, 10, 10, 6, + 0, 3, 2, 1, 2, 1, 6, 1, 6, 6, + 2, 0, 2, 3, 1, 1, 0, 0, 1, 2, + 2, 3, 1, 1, 1, 1, 1, 1, 1, 2, + 2, 4, 4, 1, 1, 2, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 2, 3, 3, 3, 3, 2, 2, 3, 3, - 4, 4, 4, 6, 4, 6, 4, 6, 4, 6, - 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, - 2, 2, 1, 2, 4, 4, 6, 4, 2, 3, - 1, 3, 1, 3, 1, 3, 2, 2, 2, 2, - 3, 2, 2, 1, 3, 2, 2, 2, 3, 2, - 0, 3, 0, 8, 2, 0, 8, 8, 6, 2, - 0, 1, 3, 4, 0, 1, 3, 0, 2, 0, - 1, 3, 1, 3 + 2, 3, 3, 3, 3, 2, 2, 3, 3, 4, + 4, 4, 6, 4, 6, 4, 6, 4, 6, 2, + 2, 1, 1, 2, 1, 2, 2, 2, 1, 2, + 2, 1, 2, 4, 4, 6, 4, 2, 3, 1, + 3, 1, 3, 1, 3, 2, 2, 2, 2, 3, + 2, 2, 1, 3, 2, 2, 2, 3, 2, 0, + 3, 0, 8, 2, 0, 8, 8, 6, 2, 0, + 1, 3, 4, 0, 1, 3, 0, 2, 0, 1, + 3, 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -820,107 +820,107 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 64, 75, 0, 65, 119, 122, 0, 0, - 0, 69, 0, 0, 0, 74, 67, 66, 150, 115, - 0, 0, 55, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, - 0, 0, 0, 0, 0, 0, 169, 0, 3, 77, - 26, 12, 27, 52, 0, 52, 0, 0, 24, 68, - 25, 112, 113, 11, 57, 23, 5, 4, 74, 0, - 76, 121, 120, 0, 172, 123, 169, 70, 0, 71, - 110, 169, 168, 169, 114, 130, 116, 0, 136, 0, - 137, 0, 138, 143, 139, 141, 152, 111, 0, 53, - 0, 0, 0, 0, 154, 155, 128, 146, 147, 149, - 134, 118, 91, 0, 0, 0, 0, 0, 132, 117, - 159, 0, 96, 97, 0, 170, 0, 1, 10, 57, - 0, 0, 0, 58, 0, 0, 0, 0, 0, 0, + 0, 0, 63, 74, 0, 64, 118, 121, 0, 0, + 0, 68, 0, 0, 0, 73, 66, 65, 149, 114, + 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, + 0, 0, 0, 0, 0, 0, 168, 0, 3, 76, + 25, 12, 26, 51, 0, 51, 0, 0, 23, 67, + 24, 111, 112, 11, 56, 22, 5, 4, 73, 0, + 75, 120, 119, 0, 171, 122, 168, 69, 0, 70, + 109, 168, 167, 168, 113, 129, 115, 0, 135, 0, + 136, 0, 137, 142, 138, 140, 151, 110, 0, 52, + 0, 0, 0, 0, 153, 154, 127, 145, 146, 148, + 133, 117, 90, 0, 0, 0, 0, 0, 131, 116, + 158, 0, 95, 96, 0, 169, 0, 1, 10, 56, + 0, 0, 0, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 160, 169, 0, 172, 0, 0, 129, 0, - 170, 0, 151, 0, 142, 145, 0, 140, 57, 0, - 0, 0, 54, 0, 0, 0, 0, 0, 9, 62, - 57, 0, 148, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 98, 99, 0, 2, - 59, 58, 51, 58, 6, 57, 57, 31, 0, 57, - 87, 88, 85, 86, 89, 90, 82, 93, 94, 95, - 92, 78, 79, 80, 81, 83, 84, 161, 0, 124, - 173, 72, 73, 131, 144, 160, 13, 14, 15, 16, - 21, 18, 0, 0, 20, 17, 160, 127, 135, 102, - 0, 104, 0, 106, 0, 108, 0, 100, 101, 133, - 125, 169, 171, 60, 61, 0, 0, 58, 0, 33, - 58, 0, 167, 0, 22, 19, 0, 0, 0, 0, - 0, 0, 28, 0, 0, 57, 58, 0, 162, 0, - 57, 167, 167, 103, 105, 107, 109, 126, 0, 58, - 34, 7, 57, 0, 40, 32, 163, 158, 57, 57, - 58, 57, 59, 58, 8, 56, 58, 48, 46, 44, - 52, 57, 58, 52, 164, 153, 156, 57, 58, 58, - 0, 43, 0, 45, 0, 0, 41, 0, 165, 157, - 58, 0, 37, 35, 36, 57, 57, 58, 57, 58, - 57, 0, 0, 29, 57, 57, 39, 0, 38, 0, - 166, 30, 58, 58, 58, 42, 50, 47, 49 + 0, 0, 159, 168, 0, 171, 0, 0, 128, 0, + 169, 0, 150, 0, 141, 144, 0, 139, 56, 0, + 0, 0, 53, 0, 0, 0, 0, 0, 9, 61, + 56, 0, 147, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 97, 98, 0, 2, + 58, 57, 50, 57, 6, 56, 56, 30, 0, 56, + 86, 87, 84, 85, 88, 89, 81, 92, 93, 94, + 91, 77, 78, 79, 80, 82, 83, 160, 0, 123, + 172, 71, 72, 130, 143, 159, 13, 14, 15, 16, + 20, 18, 0, 19, 17, 159, 126, 134, 101, 0, + 103, 0, 105, 0, 107, 0, 99, 100, 132, 124, + 168, 170, 59, 60, 0, 0, 57, 0, 32, 57, + 0, 166, 0, 21, 0, 0, 0, 0, 0, 0, + 27, 0, 0, 56, 57, 0, 161, 0, 56, 166, + 166, 102, 104, 106, 108, 125, 0, 57, 33, 7, + 56, 0, 39, 31, 162, 157, 56, 56, 57, 56, + 58, 57, 8, 55, 57, 47, 45, 43, 51, 56, + 57, 51, 163, 152, 155, 56, 57, 57, 0, 42, + 0, 44, 0, 0, 40, 0, 164, 156, 57, 0, + 36, 34, 35, 56, 56, 57, 56, 57, 56, 0, + 0, 28, 56, 56, 38, 0, 37, 0, 165, 29, + 57, 57, 57, 41, 49, 46, 48 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 47, 263, 205, 302, 315, 179, 48, 49, 50, - 264, 52, 349, 316, 317, 318, 319, 129, 130, 53, - 54, 55, 323, 200, 207, 201, 56, 57, 58, 59, + -1, 47, 262, 205, 300, 313, 179, 48, 49, 50, + 263, 52, 347, 314, 315, 316, 317, 129, 130, 53, + 54, 55, 321, 200, 207, 201, 56, 57, 58, 59, 60, 86, 119, 111, 61, 94, 95, 62, 83, 63, - 168, 180, 64, 228, 339, 290, 65, 161, 75 + 168, 180, 64, 228, 337, 288, 65, 161, 75 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -283 +#define YYPACT_NINF -288 static const yytype_int16 yypact[] = { - 356, -49, -283, -283, 1013, -283, -283, 1013, 1013, 1053, - 23, -283, 1013, 1126, 1013, 1166, -283, -283, -283, 13, - 27, 899, -283, 41, 1013, 49, 48, 57, 68, 90, - 1013, 940, 92, 1013, 1013, 1013, 1013, 1013, 1013, -283, - 96, 99, 56, 1013, 1013, 1013, 1013, 5, -283, -283, - -283, -283, -283, -283, 71, -283, 816, 1013, 1619, -283, - -283, -283, -283, -283, -283, -283, -283, -283, 64, 1013, - 1619, 1619, 1619, 1013, 1619, 59, 1013, 1619, 1013, 59, - 1619, 1013, 59, 1013, -283, -283, 61, 1013, -283, 1013, - -283, 122, -283, 1619, 36, -283, -283, 157, 140, -283, - -39, 1013, -38, 119, -283, -283, 1513, -283, 36, -283, - -283, 69, -7, 1207, 1241, 1275, 1309, 1547, -283, 72, - -283, 150, -7, -7, 1581, 1619, 18, -283, 448, -283, - 1013, 1013, 101, -283, 792, 1013, 1013, 1013, 1013, 1013, - 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, 1013, - 1013, 1013, 151, 1013, 157, 1581, -74, 1013, 76, 8, - 1581, 10, 76, 165, 1619, 1619, 1013, -283, -283, 130, - 1013, 1013, -283, 1013, 1013, 1479, 1013, 1013, -283, -283, - -283, 1013, -283, 167, 1013, 1013, 1013, 1013, 1013, 1013, - 1013, 1013, 1013, 1013, 168, 11, -283, -283, 1013, -283, - -283, 632, 1619, 1619, -283, -283, -283, -283, 1013, -283, - -3, -3, -3, -3, 1653, 1653, -7, 1619, -3, -3, - -36, 30, 30, -7, -7, 1619, 1619, -283, 4, -283, - 1619, -283, -283, -283, 1619, 151, -283, -283, 1619, 1619, - 1619, 1619, 1013, 1013, 1619, 1619, 151, 1619, -283, 1619, - 1343, 1619, 1377, 1619, 1411, 1619, 1445, 1619, 1619, -283, - -283, 1013, 1619, -283, -283, 166, -6, 632, 816, 1619, - 632, 177, 103, 4, 1619, 1619, 4, 1013, 1013, 1013, - 1013, 12, -283, 156, 1013, -8, -283, 179, -283, 184, - -283, 103, 103, 1619, 1619, 1619, 1619, -283, 1013, 1619, - -283, -283, -283, 178, -11, -283, -283, 540, -283, -283, - 1619, -283, 816, 632, -283, -283, 178, 178, -283, -283, - -283, -283, 178, -283, 187, 632, 632, -283, 632, -283, - 185, -283, 186, -283, 101, 816, 158, 119, -283, 115, - 632, 189, -283, -283, -283, -283, -283, -283, -283, -283, - -283, 197, 198, -283, -283, 724, -283, 816, -283, 724, - -283, -283, 632, -283, 632, -283, -283, -283, -283 + 354, -81, -288, -288, 1007, -288, -288, 1007, 1007, 1047, + 37, -288, 1007, 1123, 1007, 1163, -288, -288, -288, 41, + 46, 891, -288, 70, 1007, 38, 12, 90, 97, 99, + 1007, 931, 104, 1007, 1007, 1007, 1007, 1007, 1007, -288, + 127, 132, 63, 1007, 1007, 1007, 1007, 4, -288, -288, + -288, -288, -288, -288, 93, -288, 809, 1007, 1630, -288, + -288, -288, -288, -288, -288, -288, -288, -288, 65, 1007, + 1630, 1630, 1630, 1007, 1630, 60, 1007, 1630, 1007, 60, + 1630, 1007, 60, 1007, -288, -288, 62, 1007, -288, 1007, + -288, 122, -288, 1630, 36, -288, -288, 1197, 140, -288, + -3, 1007, -2, 119, -288, -288, 1527, -288, 36, -288, + -288, 73, -39, 1230, 1263, 1296, 1329, 1560, -288, 74, + -288, 146, -39, -39, 1593, 1630, 20, -288, 445, -288, + 1007, 1007, 52, -288, 1494, 1007, 1007, 1007, 1007, 1007, + 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, 1007, + 1007, 1007, 151, 1007, 1197, 1593, -77, 1007, 77, -28, + 1593, -14, 77, 165, 1630, 1630, 1007, -288, -288, 126, + 1007, 1007, -288, 1007, 1007, 785, 1007, 1007, -288, -288, + -288, 1007, -288, 167, 1007, 1007, 1007, 1007, 1007, 1007, + 1007, 1007, 1007, 1007, 168, 18, -288, -288, 1007, -288, + -288, 627, 1630, 1630, -288, -288, -288, -288, 1007, -288, + 15, 15, 15, 15, 1663, 1663, -39, 1630, 15, 15, + 19, -46, -46, -39, -39, 1630, 1630, -288, -44, -288, + 1630, -288, -288, -288, 1630, 151, -288, -288, 1630, 1630, + 1630, 15, 1007, 1630, 15, 151, 1630, -288, 1630, 1362, + 1630, 1395, 1630, 1428, 1630, 1461, 1630, 1630, -288, -288, + 1007, 1630, -288, -288, 166, 24, 627, 809, 1630, 627, + 171, 102, -44, 1630, -44, 1007, 1007, 1007, 1007, 27, + -288, 155, 1007, -8, -288, 178, -288, 183, -288, 102, + 102, 1630, 1630, 1630, 1630, -288, 1007, 1630, -288, -288, + -288, 177, 5, -288, -288, 536, -288, -288, 1630, -288, + 809, 627, -288, -288, 177, 177, -288, -288, -288, -288, + 177, -288, 186, 627, 627, -288, 627, -288, 184, -288, + 185, -288, 52, 809, 157, 119, -288, 114, 627, 188, + -288, -288, -288, -288, -288, -288, -288, -288, -288, 193, + 190, -288, -288, 718, -288, 809, -288, 718, -288, -288, + 627, -288, 627, -288, -288, -288, -288 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -283, -283, 17, -97, -282, -283, -128, 111, -283, -55, - 0, -283, -283, -283, -64, -203, -73, -53, -283, -283, - -283, -283, -276, -47, 1, -108, -283, -283, -1, 75, - -283, -283, -283, -283, -283, 217, -21, -283, -283, -283, - -283, -283, -283, -168, -283, -131, -283, -37, 6 + -288, -288, 17, -108, -287, -288, -127, 98, -288, -55, + 0, -288, -288, -288, -75, -218, -89, -53, -288, -288, + -288, -288, -244, -47, 1, -106, -288, -288, -1, 59, + -288, -288, -288, -288, -288, 198, -21, -288, -288, -288, + -288, -288, -288, -176, -288, -132, -288, -37, 6 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -930,362 +930,364 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -11 static const yytype_int16 yytable[] = { - 51, 133, 132, 70, 206, 127, 71, 72, 74, 126, - 109, 77, 74, 80, 74, 173, 176, 152, 67, 79, - 93, 82, 321, 97, 300, 314, 229, 320, 283, 106, - 93, 157, 112, 113, 114, 115, 116, 117, 141, 158, - 320, 142, 122, 123, 124, 125, 162, 301, 284, 66, - 301, 76, 174, 177, 348, 85, 134, 146, 147, 148, - 149, 100, 101, 84, 128, 150, 151, 273, 154, 96, - 142, 141, 155, 167, 142, 125, 102, 155, 276, 156, - 160, 89, 125, 91, 159, 103, 164, 182, 165, 145, - 146, 147, 148, 149, 150, 151, 104, 267, 150, 151, - 175, 270, 66, 66, 141, 98, 99, 142, 231, 271, - 232, 260, 297, 157, 333, 198, 261, 198, 105, 333, - 110, 235, 197, 198, 118, 148, 149, 120, 51, 202, - 203, 150, 151, 246, 210, 211, 212, 213, 214, 215, + 51, 133, 132, 70, 127, 206, 71, 72, 74, 126, + 109, 77, 74, 80, 74, 319, 66, 152, 67, 79, + 93, 82, 229, 97, 298, 100, 101, 157, 141, 106, + 93, 142, 112, 113, 114, 115, 116, 117, 142, 158, + 102, 312, 122, 123, 124, 125, 162, 346, 148, 149, + 299, 173, 176, 66, 150, 151, 134, 318, 281, 272, + 270, 150, 151, 299, 128, 76, 174, 177, 154, 274, + 318, 231, 155, 167, 85, 125, 157, 155, 282, 156, + 160, 89, 125, 91, 159, 232, 164, 182, 165, 141, + 198, 84, 142, 141, 98, 99, 142, 331, 96, 266, + 175, 66, 331, 269, 178, 204, 145, 146, 147, 148, + 149, 146, 147, 148, 149, 150, 151, 259, 103, 150, + 151, 235, 260, 197, 198, 104, 295, 105, 51, 202, + 203, 198, 110, 245, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, - 226, 209, 125, 178, 204, 121, 230, 14, 236, 268, - 308, 309, 131, 153, 157, 234, 163, 166, 172, 238, - 239, 178, 240, 241, 183, 244, 245, 194, 195, 227, - 247, 198, 307, 249, 250, 251, 252, 253, 254, 255, - 256, 257, 258, 233, 313, 248, 259, 262, 282, 169, - 325, 326, 265, 328, 266, 288, 346, 269, 289, 350, - 298, 305, 306, 286, 314, 338, 301, 343, 344, 340, - 351, 353, 135, 136, 281, 360, 137, 138, 139, 140, - 361, 141, 170, 171, 142, 143, 144, 345, 303, 199, - 322, 274, 275, 331, 237, 272, 362, 364, 108, 145, - 146, 147, 148, 149, 0, 312, 0, 329, 150, 151, - 125, 0, 0, 0, 0, 0, 0, 334, 285, 0, - 337, 287, 0, 0, 335, 0, 293, 294, 295, 296, - 347, 0, 0, 299, 0, 0, 0, 304, 0, 0, - 291, 0, 0, 292, 0, 0, 0, 310, 354, 355, - 311, 357, 365, 359, 0, 0, 0, 0, 0, 0, - 0, 327, 0, 0, 330, 0, 0, 332, 0, 0, - 0, 0, 0, 336, 0, 0, 0, 0, 0, 341, - 342, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 352, 0, 0, 0, 0, 0, 0, 356, 0, - 358, 0, 0, 0, 0, 363, -10, 1, 0, 363, - 0, 0, 0, 366, 367, 368, 0, 0, 2, 3, + 226, 209, 125, 14, 236, 118, 230, 306, 307, 267, + 120, 121, 131, 153, 157, 234, 163, 166, 172, 238, + 239, 178, 240, 241, 195, 243, 244, 183, 194, 227, + 246, 198, 305, 248, 249, 250, 251, 252, 253, 254, + 255, 256, 257, 233, 311, 247, 258, 261, 280, 286, + 323, 324, 264, 326, 265, 344, 287, 268, 348, 296, + 303, 304, 284, 312, 336, 299, 341, 342, 349, 338, + 351, 358, 359, 279, 343, 329, 199, 320, 237, 108, + 0, 0, 0, 0, 0, 0, 301, 0, 0, 0, + 0, 273, 0, 0, 0, 271, 360, 362, 0, 0, + 0, 0, 0, 310, 0, 327, 0, 0, 0, 125, + 0, 0, 0, 0, 0, 332, 0, 283, 335, 0, + 285, 0, 333, 0, 291, 292, 293, 294, 345, 0, + 0, 297, 0, 0, 0, 302, 0, 0, 0, 289, + 0, 290, 0, 0, 0, 308, 352, 353, 309, 355, + 363, 357, 0, 0, 0, 0, 0, 0, 0, 325, + 0, 0, 328, 0, 0, 330, 0, 0, 0, 0, + 0, 334, 0, 0, 0, 0, 0, 339, 340, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 350, + 0, 0, 0, 0, 0, 0, 354, 0, 356, 0, + 0, 0, 0, 361, -10, 1, 0, 361, 0, 0, + 0, 364, 365, 366, 0, 0, 2, 3, 4, 5, + 0, 6, 7, 8, 9, 10, 0, 11, 12, 13, + 0, 14, 15, 16, 0, 17, 0, 18, 0, 0, + 0, 19, 0, 20, 21, 22, 0, 0, 23, 0, + 0, 0, 0, 24, 25, 26, 0, 0, 0, 27, + 0, 0, 0, 28, 29, 30, 31, 0, 32, 0, + 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, + 0, 0, 0, 0, 34, 35, 36, 37, 38, 0, + 0, 39, 40, 41, 42, 0, 43, 44, 0, 0, + 0, -10, 45, 0, 0, 0, 46, 2, 3, 4, + 5, 0, 6, 7, 8, 9, 10, 0, 11, 12, + 13, 0, 14, 15, 16, 0, 17, 0, 18, 0, + 0, 0, 19, 0, 20, 21, 22, 0, 0, 23, + 0, 0, 0, 0, 24, 25, 26, 0, 0, 0, + 27, 0, 0, 0, 28, 29, 30, 31, 0, 32, + 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 34, 35, 36, 37, 38, + 0, 0, 39, 40, 41, 42, 0, 43, 44, 0, + 0, 0, 0, 45, 0, 0, 0, 46, 2, 3, 4, 5, 0, 6, 7, 8, 9, 10, 0, 11, - 12, 13, 0, 14, 15, 16, 0, 17, 0, 18, + 12, 13, 0, 14, 15, 16, 0, 17, 322, 18, 0, 0, 0, 19, 0, 20, 21, 22, 0, 0, - 23, 0, 0, 0, 0, 24, 25, 26, 0, 0, - 0, 27, 0, 0, 0, 28, 29, 30, 31, 0, + 0, 0, 0, 0, 0, 24, 25, 26, 0, 0, + 0, 27, 0, 0, 0, 0, 0, 30, 31, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 35, 36, 37, - 38, 0, 0, 39, 40, 41, 42, 0, 0, 43, - 44, 0, 0, 0, -10, 45, 0, 0, 0, 46, + 38, 0, 0, 39, 40, 0, 42, 0, 43, 44, + 0, 0, 0, 66, 45, 0, 0, 0, 46, 2, + 3, 4, 5, 0, 6, 7, 8, 9, 10, 0, + 11, 12, 13, 0, 14, 15, 16, 0, 17, 0, + 18, 0, 0, 0, 19, 0, 20, 21, 22, 0, + 0, 0, 0, 0, 0, 0, 24, 25, 26, 0, + 0, 0, 27, 0, 0, 0, 0, 0, 30, 31, + 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, + 33, 0, 0, 0, 0, 0, 0, 34, 35, 36, + 37, 38, 0, 0, 39, 40, 0, 42, 0, 43, + 44, 0, 0, 0, 66, 45, 0, 0, 0, 46, 2, 3, 4, 5, 0, 6, 7, 8, 9, 10, 0, 11, 12, 13, 0, 14, 15, 16, 0, 17, 0, 18, 0, 0, 0, 19, 0, 20, 21, 22, - 0, 0, 23, 0, 0, 0, 0, 24, 25, 26, - 0, 0, 0, 27, 0, 0, 0, 28, 29, 30, + 0, 0, 0, 0, 0, 0, 0, 24, 25, 26, + 0, 0, 0, 27, 0, 0, 0, 0, 0, 30, 31, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, 35, - 36, 37, 38, 0, 0, 39, 40, 41, 42, 0, - 0, 43, 44, 0, 0, 0, 0, 45, 0, 0, - 0, 46, 2, 3, 4, 5, 0, 6, 7, 8, - 9, 10, 0, 11, 12, 13, 0, 14, 15, 16, - 0, 17, 324, 18, 0, 0, 0, 19, 0, 20, - 21, 22, 0, 0, 0, 0, 0, 0, 0, 24, - 25, 26, 0, 0, 0, 27, 0, 0, 0, 0, - 0, 30, 31, 0, 32, 0, 0, 0, 0, 0, - 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, - 34, 35, 36, 37, 38, 0, 0, 39, 40, 0, - 42, 0, 0, 43, 44, 0, 0, 0, 66, 45, - 0, 0, 0, 46, 2, 3, 4, 5, 0, 6, - 7, 8, 9, 10, 0, 11, 12, 13, 0, 14, - 15, 16, 0, 17, 0, 18, 0, 0, 0, 19, - 0, 20, 21, 22, 0, 0, 0, 0, 0, 0, - 0, 24, 25, 26, 0, 0, 0, 27, 0, 0, - 0, 0, 0, 30, 31, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 33, 0, 0, 0, 0, - 0, 0, 34, 35, 36, 37, 38, 0, 0, 39, - 40, 0, 42, 0, 0, 43, 44, 0, 0, 0, - 66, 45, 0, 0, 0, 46, 2, 3, 4, 5, - 0, 6, 7, 8, 9, 10, 0, 11, 12, 13, - 0, 14, 15, 16, 0, 17, 0, 18, 0, 0, - 0, 19, 0, 20, 21, 22, 0, 0, 0, 0, - 0, 0, 0, 24, 25, 26, 0, 0, 0, 27, - 0, 0, 0, 0, 0, 30, 31, 0, 32, 0, - 0, 0, 0, 0, 0, 0, 0, 33, 0, 0, - 0, 0, 0, 0, 34, 35, 36, 37, 38, 0, - 0, 39, 40, 0, 42, 0, 0, 43, 44, 0, - 0, 0, 0, 45, 0, 0, 0, 46, 2, 3, - 4, 5, 0, 6, 7, 8, 9, 10, 0, 11, - 12, 13, 0, 14, 15, 16, 208, 17, 0, 18, - 0, 0, 0, 19, 0, 20, 21, 135, 136, 0, - 0, 137, 138, 139, 140, 24, 141, 26, 0, 142, - 143, 144, 0, 0, 0, 0, 0, 30, 31, 0, - 32, 0, 0, 0, 145, 146, 147, 148, 149, 33, - 66, 0, 0, 150, 151, 0, 34, 35, 36, 37, - 38, 0, 0, 0, 40, 0, 42, 0, 0, 43, - 44, 2, 3, 4, 5, 45, 0, 0, 0, 46, - 0, 0, 11, 12, 13, 0, 14, 68, 16, 0, - 17, 0, 0, 0, 0, 0, 0, 87, 0, 0, - 0, 0, 88, 0, 89, 90, 91, 92, 69, 0, - 26, 0, 2, 3, 4, 5, 0, 0, 0, 0, - 0, 0, 0, 11, 12, 13, 0, 14, 68, 16, - 0, 17, 33, 0, 0, 0, 0, 0, 87, 34, - 35, 36, 37, 38, 0, 89, 0, 91, 0, 69, - 0, 26, 43, 44, 0, 0, 0, 0, 45, 0, - 0, 0, 46, 107, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 33, 0, 0, 0, 0, 0, 0, - 34, 35, 36, 37, 38, 2, 3, 4, 5, 0, - 0, 0, 0, 43, 44, 0, 11, 12, 13, 45, - 14, 68, 16, 46, 17, 0, 0, 0, 0, 0, + 36, 37, 38, 0, 0, 39, 40, 0, 42, 0, + 43, 44, 0, 0, 0, 0, 45, 0, 0, 0, + 46, 2, 3, 4, 5, 0, 6, 7, 8, 9, + 10, 0, 11, 12, 13, 0, 14, 15, 16, 242, + 17, 0, 18, 0, 0, 0, 19, 0, 20, 21, + 135, 136, 0, 0, 137, 138, 139, 140, 24, 141, + 26, 0, 142, 143, 144, 0, 0, 0, 0, 0, + 30, 31, 0, 32, 0, 0, 145, 146, 147, 148, + 149, 0, 33, 0, 0, 150, 151, 0, 0, 34, + 35, 36, 37, 38, 0, 0, 0, 40, 0, 42, + 0, 43, 44, 2, 3, 4, 5, 45, 0, 0, + 0, 46, 0, 0, 11, 12, 13, 0, 14, 68, + 16, 0, 17, 0, 0, 0, 0, 0, 0, 87, + 0, 0, 0, 0, 88, 0, 89, 90, 91, 92, + 69, 0, 26, 2, 3, 4, 5, 0, 0, 0, + 0, 0, 0, 0, 11, 12, 13, 0, 14, 68, + 16, 0, 17, 0, 33, 0, 0, 0, 0, 87, + 0, 34, 35, 36, 37, 38, 89, 0, 91, 0, + 69, 0, 26, 43, 44, 0, 0, 0, 0, 45, + 0, 0, 0, 46, 107, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, + 0, 34, 35, 36, 37, 38, 0, 0, 0, 2, + 3, 4, 5, 43, 44, 0, 0, 0, 0, 45, + 11, 12, 13, 46, 14, 68, 16, 0, 17, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 69, 0, 26, 2, + 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, + 11, 12, 13, 0, 14, 68, 16, 0, 17, 0, + 33, 0, 0, 0, 0, 0, 0, 34, 35, 36, + 37, 38, 0, 0, 0, 0, 69, 0, 26, 43, + 44, 0, 0, 0, 0, 45, 0, 0, 0, 46, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 33, 0, 0, 0, 0, 0, 0, 34, 35, 36, + 37, 38, 0, 0, 0, 2, 3, 4, 5, 43, + 44, 0, 0, 0, 0, 73, 11, 12, 13, 46, + 14, 68, 16, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69, 0, 26, 2, 3, 4, 5, 0, 0, 0, 0, 0, 0, 0, 11, 12, 13, 0, 14, 68, 16, 0, 17, 0, 33, 0, 0, 0, 0, 0, 0, 34, 35, 36, 37, 38, 0, 0, - 0, 0, 69, 0, 26, 0, 43, 44, 0, 0, - 0, 0, 45, 0, 0, 0, 46, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, - 0, 0, 0, 34, 35, 36, 37, 38, 2, 3, - 4, 5, 0, 0, 0, 0, 43, 44, 0, 11, - 12, 13, 73, 14, 68, 16, 46, 17, 0, 0, + 0, 0, 69, 0, 26, 43, 44, 0, 0, 0, + 0, 78, 0, 0, 0, 46, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 33, 0, 0, 169, + 0, 0, 0, 34, 35, 36, 37, 38, 0, 0, + 0, 0, 0, 0, 0, 43, 44, 0, 0, 0, + 0, 81, 135, 136, 0, 46, 137, 138, 139, 140, + 0, 141, 170, 171, 142, 143, 144, 184, 0, 0, + 0, 0, 0, 0, 185, 0, 0, 0, 145, 146, + 147, 148, 149, 0, 0, 135, 136, 150, 151, 137, + 138, 139, 140, 0, 141, 0, 0, 142, 143, 144, + 186, 0, 0, 0, 0, 0, 0, 187, 0, 0, + 0, 145, 146, 147, 148, 149, 0, 0, 135, 136, + 150, 151, 137, 138, 139, 140, 0, 141, 0, 0, + 142, 143, 144, 188, 0, 0, 0, 0, 0, 0, + 189, 0, 0, 0, 145, 146, 147, 148, 149, 0, + 0, 135, 136, 150, 151, 137, 138, 139, 140, 0, + 141, 0, 0, 142, 143, 144, 190, 0, 0, 0, + 0, 0, 0, 191, 0, 0, 0, 145, 146, 147, + 148, 149, 0, 0, 135, 136, 150, 151, 137, 138, + 139, 140, 0, 141, 0, 0, 142, 143, 144, 275, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 69, 0, 26, 2, 3, - 4, 5, 0, 0, 0, 0, 0, 0, 0, 11, - 12, 13, 0, 14, 68, 16, 0, 17, 0, 33, - 0, 0, 0, 0, 0, 0, 34, 35, 36, 37, - 38, 0, 0, 0, 0, 69, 0, 26, 0, 43, - 44, 0, 0, 0, 0, 78, 0, 0, 0, 46, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 33, - 0, 0, 0, 0, 0, 0, 34, 35, 36, 37, - 38, 0, 0, 0, 184, 0, 0, 0, 0, 43, - 44, 185, 0, 0, 0, 81, 0, 0, 0, 46, - 0, 0, 135, 136, 0, 0, 137, 138, 139, 140, - 0, 141, 0, 0, 142, 143, 144, 0, 186, 0, - 0, 0, 0, 0, 0, 187, 0, 0, 0, 145, - 146, 147, 148, 149, 0, 0, 135, 136, 150, 151, - 137, 138, 139, 140, 0, 141, 0, 0, 142, 143, - 144, 0, 188, 0, 0, 0, 0, 0, 0, 189, + 145, 146, 147, 148, 149, 0, 0, 135, 136, 150, + 151, 137, 138, 139, 140, 0, 141, 0, 0, 142, + 143, 144, 276, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 146, 147, 148, 149, 0, 0, 135, 136, 150, 151, 137, 138, 139, 140, 0, 141, - 0, 0, 142, 143, 144, 0, 190, 0, 0, 0, - 0, 0, 0, 191, 0, 0, 0, 145, 146, 147, - 148, 149, 0, 0, 135, 136, 150, 151, 137, 138, - 139, 140, 0, 141, 0, 0, 142, 143, 144, 0, - 277, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 145, 146, 147, 148, 149, 0, 0, 135, 136, - 150, 151, 137, 138, 139, 140, 0, 141, 0, 0, - 142, 143, 144, 0, 278, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 145, 146, 147, 148, 149, - 0, 0, 135, 136, 150, 151, 137, 138, 139, 140, - 0, 141, 0, 0, 142, 143, 144, 0, 279, 0, + 0, 0, 142, 143, 144, 277, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 145, 146, 147, 148, + 149, 0, 0, 135, 136, 150, 151, 137, 138, 139, + 140, 0, 141, 0, 0, 142, 143, 144, 278, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 146, 147, 148, 149, 0, 0, 135, 136, 150, 151, 137, 138, 139, 140, 0, 141, 0, 0, 142, 143, - 144, 0, 280, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 145, 146, 147, 148, 149, 0, 0, - 135, 136, 150, 151, 137, 138, 139, 140, 0, 141, - 0, 0, 142, 143, 144, 0, 0, 0, 0, 0, - 0, 0, 0, 242, 0, 0, 0, 145, 146, 147, - 148, 149, 0, 0, 135, 136, 150, 151, 137, 138, - 139, 140, 0, 141, 0, 0, 142, 143, 144, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 181, - 243, 145, 146, 147, 148, 149, 0, 0, 135, 136, + 144, 0, 0, 0, 0, 0, 0, 0, 208, 0, + 0, 0, 145, 146, 147, 148, 149, 0, 0, 135, + 136, 150, 151, 137, 138, 139, 140, 0, 141, 0, + 0, 142, 143, 144, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 181, 0, 145, 146, 147, 148, 149, + 0, 66, 135, 136, 150, 151, 137, 138, 139, 140, + 0, 141, 0, 0, 142, 143, 144, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 145, 146, + 147, 148, 149, 0, 0, 135, 136, 150, 151, 137, + 138, 139, 140, 0, 141, 0, 0, 142, 143, 144, + 0, 0, 0, 0, 0, 192, 193, 0, 0, 0, + 0, 145, 146, 147, 148, 149, 0, 0, 135, 136, 150, 151, 137, 138, 139, 140, 0, 141, 0, 0, 142, 143, 144, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 145, 146, 147, 148, 149, - 0, 0, 135, 136, 150, 151, 137, 138, 139, 140, - 0, 141, 0, 0, 142, 143, 144, 0, 0, 0, - 0, 0, 192, 193, 0, 0, 0, 0, 0, 145, - 146, 147, 148, 149, 0, 0, 135, 136, 150, 151, - 137, 138, 139, 140, 0, 141, 0, 0, 142, 143, - 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 145, 146, 147, 148, 149, 0, 0, - 0, 196, 150, 151, 135, 136, 0, 0, 137, 138, - 139, 140, 0, 141, 0, 0, 142, 143, 144, 0, + 0, 0, 0, 0, 145, 146, 147, 148, 149, 0, + 0, 0, 196, 150, 151, 135, 136, 0, 0, 137, + 138, 139, 140, 0, 141, 0, 0, 142, 143, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 145, 146, 147, 148, 149, 0, 0, 135, 136, 150, 151, 137, 138, 0, 0, 0, 141, 0, 0, 142, 143, 144, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 145, 146, 147, 148, 149, - 0, 0, 0, 0, 150, 151 + 0, 0, 0, 0, 145, 146, 147, 148, 149, 0, + 0, 0, 0, 150, 151 }; static const yytype_int16 yycheck[] = { - 0, 56, 55, 4, 132, 0, 7, 8, 9, 46, - 31, 12, 13, 14, 15, 54, 54, 64, 1, 13, - 21, 15, 304, 24, 32, 36, 100, 303, 34, 30, - 31, 105, 33, 34, 35, 36, 37, 38, 74, 76, - 316, 77, 43, 44, 45, 46, 83, 58, 54, 98, - 58, 28, 91, 91, 336, 28, 57, 93, 94, 95, - 96, 13, 14, 50, 47, 101, 102, 235, 69, 28, - 77, 74, 73, 94, 77, 76, 28, 78, 246, 73, - 81, 45, 83, 47, 78, 28, 87, 108, 89, 92, - 93, 94, 95, 96, 101, 102, 28, 205, 101, 102, - 101, 209, 98, 98, 74, 56, 57, 77, 100, 105, - 100, 100, 100, 105, 317, 105, 105, 105, 28, 322, - 28, 168, 104, 105, 28, 95, 96, 28, 128, 130, - 131, 101, 102, 180, 135, 136, 137, 138, 139, 140, + 0, 56, 55, 4, 0, 132, 7, 8, 9, 46, + 31, 12, 13, 14, 15, 302, 97, 64, 1, 13, + 21, 15, 99, 24, 32, 13, 14, 104, 74, 30, + 31, 77, 33, 34, 35, 36, 37, 38, 77, 76, + 28, 36, 43, 44, 45, 46, 83, 334, 94, 95, + 58, 54, 54, 97, 100, 101, 57, 301, 34, 235, + 104, 100, 101, 58, 47, 28, 69, 69, 69, 245, + 314, 99, 73, 94, 28, 76, 104, 78, 54, 73, + 81, 45, 83, 47, 78, 99, 87, 108, 89, 74, + 104, 50, 77, 74, 56, 57, 77, 315, 28, 205, + 101, 97, 320, 209, 52, 53, 91, 92, 93, 94, + 95, 92, 93, 94, 95, 100, 101, 99, 28, 100, + 101, 168, 104, 103, 104, 28, 99, 28, 128, 130, + 131, 104, 28, 180, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 151, 134, 153, 52, 53, 99, 157, 27, 28, 206, - 291, 292, 91, 99, 105, 166, 105, 45, 28, 170, - 171, 52, 173, 174, 105, 176, 177, 105, 28, 28, - 181, 105, 290, 184, 185, 186, 187, 188, 189, 190, - 191, 192, 193, 28, 302, 28, 28, 198, 32, 42, - 308, 309, 201, 311, 203, 28, 334, 208, 105, 337, - 54, 32, 28, 268, 36, 28, 58, 32, 32, 327, - 105, 32, 65, 66, 261, 28, 69, 70, 71, 72, - 32, 74, 75, 76, 77, 78, 79, 334, 285, 128, - 304, 242, 243, 316, 169, 228, 354, 355, 31, 92, - 93, 94, 95, 96, -1, 302, -1, 312, 101, 102, - 261, -1, -1, -1, -1, -1, -1, 320, 267, -1, - 323, 270, -1, -1, 321, -1, 277, 278, 279, 280, - 335, -1, -1, 284, -1, -1, -1, 286, -1, -1, - 273, -1, -1, 276, -1, -1, -1, 298, 345, 346, - 299, 348, 357, 350, -1, -1, -1, -1, -1, -1, - -1, 310, -1, -1, 313, -1, -1, 316, -1, -1, - -1, -1, -1, 322, -1, -1, -1, -1, -1, 328, - 329, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 340, -1, -1, -1, -1, -1, -1, 347, -1, - 349, -1, -1, -1, -1, 355, 0, 1, -1, 359, - -1, -1, -1, 362, 363, 364, -1, -1, 12, 13, + 151, 134, 153, 27, 28, 28, 157, 289, 290, 206, + 28, 98, 69, 98, 104, 166, 104, 45, 28, 170, + 171, 52, 173, 174, 28, 176, 177, 104, 104, 28, + 181, 104, 288, 184, 185, 186, 187, 188, 189, 190, + 191, 192, 193, 28, 300, 28, 28, 198, 32, 28, + 306, 307, 201, 309, 203, 332, 104, 208, 335, 54, + 32, 28, 267, 36, 28, 58, 32, 32, 104, 325, + 32, 28, 32, 260, 332, 314, 128, 302, 169, 31, + -1, -1, -1, -1, -1, -1, 283, -1, -1, -1, + -1, 242, -1, -1, -1, 228, 352, 353, -1, -1, + -1, -1, -1, 300, -1, 310, -1, -1, -1, 260, + -1, -1, -1, -1, -1, 318, -1, 266, 321, -1, + 269, -1, 319, -1, 275, 276, 277, 278, 333, -1, + -1, 282, -1, -1, -1, 284, -1, -1, -1, 272, + -1, 274, -1, -1, -1, 296, 343, 344, 297, 346, + 355, 348, -1, -1, -1, -1, -1, -1, -1, 308, + -1, -1, 311, -1, -1, 314, -1, -1, -1, -1, + -1, 320, -1, -1, -1, -1, -1, 326, 327, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 338, + -1, -1, -1, -1, -1, -1, 345, -1, 347, -1, + -1, -1, -1, 353, 0, 1, -1, 357, -1, -1, + -1, 360, 361, 362, -1, -1, 12, 13, 14, 15, + -1, 17, 18, 19, 20, 21, -1, 23, 24, 25, + -1, 27, 28, 29, -1, 31, -1, 33, -1, -1, + -1, 37, -1, 39, 40, 41, -1, -1, 44, -1, + -1, -1, -1, 49, 50, 51, -1, -1, -1, 55, + -1, -1, -1, 59, 60, 61, 62, -1, 64, -1, + -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, + -1, -1, -1, -1, 80, 81, 82, 83, 84, -1, + -1, 87, 88, 89, 90, -1, 92, 93, -1, -1, + -1, 97, 98, -1, -1, -1, 102, 12, 13, 14, + 15, -1, 17, 18, 19, 20, 21, -1, 23, 24, + 25, -1, 27, 28, 29, -1, 31, -1, 33, -1, + -1, -1, 37, -1, 39, 40, 41, -1, -1, 44, + -1, -1, -1, -1, 49, 50, 51, -1, -1, -1, + 55, -1, -1, -1, 59, 60, 61, 62, -1, 64, + -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, + -1, -1, -1, -1, -1, 80, 81, 82, 83, 84, + -1, -1, 87, 88, 89, 90, -1, 92, 93, -1, + -1, -1, -1, 98, -1, -1, -1, 102, 12, 13, 14, 15, -1, 17, 18, 19, 20, 21, -1, 23, - 24, 25, -1, 27, 28, 29, -1, 31, -1, 33, + 24, 25, -1, 27, 28, 29, -1, 31, 32, 33, -1, -1, -1, 37, -1, 39, 40, 41, -1, -1, - 44, -1, -1, -1, -1, 49, 50, 51, -1, -1, - -1, 55, -1, -1, -1, 59, 60, 61, 62, -1, + -1, -1, -1, -1, -1, 49, 50, 51, -1, -1, + -1, 55, -1, -1, -1, -1, -1, 61, 62, -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, 80, 81, 82, 83, - 84, -1, -1, 87, 88, 89, 90, -1, -1, 93, - 94, -1, -1, -1, 98, 99, -1, -1, -1, 103, + 84, -1, -1, 87, 88, -1, 90, -1, 92, 93, + -1, -1, -1, 97, 98, -1, -1, -1, 102, 12, + 13, 14, 15, -1, 17, 18, 19, 20, 21, -1, + 23, 24, 25, -1, 27, 28, 29, -1, 31, -1, + 33, -1, -1, -1, 37, -1, 39, 40, 41, -1, + -1, -1, -1, -1, -1, -1, 49, 50, 51, -1, + -1, -1, 55, -1, -1, -1, -1, -1, 61, 62, + -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, + 73, -1, -1, -1, -1, -1, -1, 80, 81, 82, + 83, 84, -1, -1, 87, 88, -1, 90, -1, 92, + 93, -1, -1, -1, 97, 98, -1, -1, -1, 102, 12, 13, 14, 15, -1, 17, 18, 19, 20, 21, -1, 23, 24, 25, -1, 27, 28, 29, -1, 31, -1, 33, -1, -1, -1, 37, -1, 39, 40, 41, - -1, -1, 44, -1, -1, -1, -1, 49, 50, 51, - -1, -1, -1, 55, -1, -1, -1, 59, 60, 61, + -1, -1, -1, -1, -1, -1, -1, 49, 50, 51, + -1, -1, -1, 55, -1, -1, -1, -1, -1, 61, 62, -1, 64, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, 80, 81, - 82, 83, 84, -1, -1, 87, 88, 89, 90, -1, - -1, 93, 94, -1, -1, -1, -1, 99, -1, -1, - -1, 103, 12, 13, 14, 15, -1, 17, 18, 19, - 20, 21, -1, 23, 24, 25, -1, 27, 28, 29, - -1, 31, 32, 33, -1, -1, -1, 37, -1, 39, - 40, 41, -1, -1, -1, -1, -1, -1, -1, 49, - 50, 51, -1, -1, -1, 55, -1, -1, -1, -1, - -1, 61, 62, -1, 64, -1, -1, -1, -1, -1, - -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, - 80, 81, 82, 83, 84, -1, -1, 87, 88, -1, - 90, -1, -1, 93, 94, -1, -1, -1, 98, 99, - -1, -1, -1, 103, 12, 13, 14, 15, -1, 17, - 18, 19, 20, 21, -1, 23, 24, 25, -1, 27, - 28, 29, -1, 31, -1, 33, -1, -1, -1, 37, - -1, 39, 40, 41, -1, -1, -1, -1, -1, -1, - -1, 49, 50, 51, -1, -1, -1, 55, -1, -1, - -1, -1, -1, 61, 62, -1, 64, -1, -1, -1, - -1, -1, -1, -1, -1, 73, -1, -1, -1, -1, - -1, -1, 80, 81, 82, 83, 84, -1, -1, 87, - 88, -1, 90, -1, -1, 93, 94, -1, -1, -1, - 98, 99, -1, -1, -1, 103, 12, 13, 14, 15, - -1, 17, 18, 19, 20, 21, -1, 23, 24, 25, - -1, 27, 28, 29, -1, 31, -1, 33, -1, -1, - -1, 37, -1, 39, 40, 41, -1, -1, -1, -1, - -1, -1, -1, 49, 50, 51, -1, -1, -1, 55, - -1, -1, -1, -1, -1, 61, 62, -1, 64, -1, - -1, -1, -1, -1, -1, -1, -1, 73, -1, -1, - -1, -1, -1, -1, 80, 81, 82, 83, 84, -1, - -1, 87, 88, -1, 90, -1, -1, 93, 94, -1, - -1, -1, -1, 99, -1, -1, -1, 103, 12, 13, - 14, 15, -1, 17, 18, 19, 20, 21, -1, 23, - 24, 25, -1, 27, 28, 29, 54, 31, -1, 33, - -1, -1, -1, 37, -1, 39, 40, 65, 66, -1, - -1, 69, 70, 71, 72, 49, 74, 51, -1, 77, - 78, 79, -1, -1, -1, -1, -1, 61, 62, -1, - 64, -1, -1, -1, 92, 93, 94, 95, 96, 73, - 98, -1, -1, 101, 102, -1, 80, 81, 82, 83, - 84, -1, -1, -1, 88, -1, 90, -1, -1, 93, - 94, 12, 13, 14, 15, 99, -1, -1, -1, 103, - -1, -1, 23, 24, 25, -1, 27, 28, 29, -1, - 31, -1, -1, -1, -1, -1, -1, 38, -1, -1, - -1, -1, 43, -1, 45, 46, 47, 48, 49, -1, - 51, -1, 12, 13, 14, 15, -1, -1, -1, -1, - -1, -1, -1, 23, 24, 25, -1, 27, 28, 29, - -1, 31, 73, -1, -1, -1, -1, -1, 38, 80, - 81, 82, 83, 84, -1, 45, -1, 47, -1, 49, - -1, 51, 93, 94, -1, -1, -1, -1, 99, -1, - -1, -1, 103, 63, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, - 80, 81, 82, 83, 84, 12, 13, 14, 15, -1, - -1, -1, -1, 93, 94, -1, 23, 24, 25, 99, - 27, 28, 29, 103, 31, -1, -1, -1, -1, -1, + 82, 83, 84, -1, -1, 87, 88, -1, 90, -1, + 92, 93, -1, -1, -1, -1, 98, -1, -1, -1, + 102, 12, 13, 14, 15, -1, 17, 18, 19, 20, + 21, -1, 23, 24, 25, -1, 27, 28, 29, 54, + 31, -1, 33, -1, -1, -1, 37, -1, 39, 40, + 65, 66, -1, -1, 69, 70, 71, 72, 49, 74, + 51, -1, 77, 78, 79, -1, -1, -1, -1, -1, + 61, 62, -1, 64, -1, -1, 91, 92, 93, 94, + 95, -1, 73, -1, -1, 100, 101, -1, -1, 80, + 81, 82, 83, 84, -1, -1, -1, 88, -1, 90, + -1, 92, 93, 12, 13, 14, 15, 98, -1, -1, + -1, 102, -1, -1, 23, 24, 25, -1, 27, 28, + 29, -1, 31, -1, -1, -1, -1, -1, -1, 38, + -1, -1, -1, -1, 43, -1, 45, 46, 47, 48, + 49, -1, 51, 12, 13, 14, 15, -1, -1, -1, + -1, -1, -1, -1, 23, 24, 25, -1, 27, 28, + 29, -1, 31, -1, 73, -1, -1, -1, -1, 38, + -1, 80, 81, 82, 83, 84, 45, -1, 47, -1, + 49, -1, 51, 92, 93, -1, -1, -1, -1, 98, + -1, -1, -1, 102, 63, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 73, -1, -1, -1, -1, -1, + -1, 80, 81, 82, 83, 84, -1, -1, -1, 12, + 13, 14, 15, 92, 93, -1, -1, -1, -1, 98, + 23, 24, 25, 102, 27, 28, 29, -1, 31, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 49, -1, 51, 12, + 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, + 23, 24, 25, -1, 27, 28, 29, -1, 31, -1, + 73, -1, -1, -1, -1, -1, -1, 80, 81, 82, + 83, 84, -1, -1, -1, -1, 49, -1, 51, 92, + 93, -1, -1, -1, -1, 98, -1, -1, -1, 102, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 73, -1, -1, -1, -1, -1, -1, 80, 81, 82, + 83, 84, -1, -1, -1, 12, 13, 14, 15, 92, + 93, -1, -1, -1, -1, 98, 23, 24, 25, 102, + 27, 28, 29, -1, 31, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 49, -1, 51, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, 23, 24, 25, -1, 27, 28, 29, -1, 31, -1, 73, -1, -1, -1, -1, -1, -1, 80, 81, 82, 83, 84, -1, -1, - -1, -1, 49, -1, 51, -1, 93, 94, -1, -1, - -1, -1, 99, -1, -1, -1, 103, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 73, -1, -1, -1, - -1, -1, -1, 80, 81, 82, 83, 84, 12, 13, - 14, 15, -1, -1, -1, -1, 93, 94, -1, 23, - 24, 25, 99, 27, 28, 29, 103, 31, -1, -1, + -1, -1, 49, -1, 51, 92, 93, -1, -1, -1, + -1, 98, -1, -1, -1, 102, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 73, -1, -1, 42, + -1, -1, -1, 80, 81, 82, 83, 84, -1, -1, + -1, -1, -1, -1, -1, 92, 93, -1, -1, -1, + -1, 98, 65, 66, -1, 102, 69, 70, 71, 72, + -1, 74, 75, 76, 77, 78, 79, 47, -1, -1, + -1, -1, -1, -1, 54, -1, -1, -1, 91, 92, + 93, 94, 95, -1, -1, 65, 66, 100, 101, 69, + 70, 71, 72, -1, 74, -1, -1, 77, 78, 79, + 47, -1, -1, -1, -1, -1, -1, 54, -1, -1, + -1, 91, 92, 93, 94, 95, -1, -1, 65, 66, + 100, 101, 69, 70, 71, 72, -1, 74, -1, -1, + 77, 78, 79, 47, -1, -1, -1, -1, -1, -1, + 54, -1, -1, -1, 91, 92, 93, 94, 95, -1, + -1, 65, 66, 100, 101, 69, 70, 71, 72, -1, + 74, -1, -1, 77, 78, 79, 47, -1, -1, -1, + -1, -1, -1, 54, -1, -1, -1, 91, 92, 93, + 94, 95, -1, -1, 65, 66, 100, 101, 69, 70, + 71, 72, -1, 74, -1, -1, 77, 78, 79, 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 49, -1, 51, 12, 13, - 14, 15, -1, -1, -1, -1, -1, -1, -1, 23, - 24, 25, -1, 27, 28, 29, -1, 31, -1, 73, - -1, -1, -1, -1, -1, -1, 80, 81, 82, 83, - 84, -1, -1, -1, -1, 49, -1, 51, -1, 93, - 94, -1, -1, -1, -1, 99, -1, -1, -1, 103, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, - -1, -1, -1, -1, -1, -1, 80, 81, 82, 83, - 84, -1, -1, -1, 47, -1, -1, -1, -1, 93, - 94, 54, -1, -1, -1, 99, -1, -1, -1, 103, - -1, -1, 65, 66, -1, -1, 69, 70, 71, 72, - -1, 74, -1, -1, 77, 78, 79, -1, 47, -1, - -1, -1, -1, -1, -1, 54, -1, -1, -1, 92, - 93, 94, 95, 96, -1, -1, 65, 66, 101, 102, - 69, 70, 71, 72, -1, 74, -1, -1, 77, 78, - 79, -1, 47, -1, -1, -1, -1, -1, -1, 54, - -1, -1, -1, 92, 93, 94, 95, 96, -1, -1, - 65, 66, 101, 102, 69, 70, 71, 72, -1, 74, - -1, -1, 77, 78, 79, -1, 47, -1, -1, -1, - -1, -1, -1, 54, -1, -1, -1, 92, 93, 94, - 95, 96, -1, -1, 65, 66, 101, 102, 69, 70, - 71, 72, -1, 74, -1, -1, 77, 78, 79, -1, - 47, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 92, 93, 94, 95, 96, -1, -1, 65, 66, - 101, 102, 69, 70, 71, 72, -1, 74, -1, -1, - 77, 78, 79, -1, 47, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 92, 93, 94, 95, 96, - -1, -1, 65, 66, 101, 102, 69, 70, 71, 72, - -1, 74, -1, -1, 77, 78, 79, -1, 47, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 92, - 93, 94, 95, 96, -1, -1, 65, 66, 101, 102, + 91, 92, 93, 94, 95, -1, -1, 65, 66, 100, + 101, 69, 70, 71, 72, -1, 74, -1, -1, 77, + 78, 79, 47, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 91, 92, 93, 94, 95, -1, -1, + 65, 66, 100, 101, 69, 70, 71, 72, -1, 74, + -1, -1, 77, 78, 79, 47, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 91, 92, 93, 94, + 95, -1, -1, 65, 66, 100, 101, 69, 70, 71, + 72, -1, 74, -1, -1, 77, 78, 79, 47, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 91, + 92, 93, 94, 95, -1, -1, 65, 66, 100, 101, 69, 70, 71, 72, -1, 74, -1, -1, 77, 78, - 79, -1, 47, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 92, 93, 94, 95, 96, -1, -1, - 65, 66, 101, 102, 69, 70, 71, 72, -1, 74, - -1, -1, 77, 78, 79, -1, -1, -1, -1, -1, - -1, -1, -1, 54, -1, -1, -1, 92, 93, 94, - 95, 96, -1, -1, 65, 66, 101, 102, 69, 70, - 71, 72, -1, 74, -1, -1, 77, 78, 79, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 56, - 91, 92, 93, 94, 95, 96, -1, -1, 65, 66, - 101, 102, 69, 70, 71, 72, -1, 74, -1, -1, - 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 92, 93, 94, 95, 96, - -1, -1, 65, 66, 101, 102, 69, 70, 71, 72, + 79, -1, -1, -1, -1, -1, -1, -1, 54, -1, + -1, -1, 91, 92, 93, 94, 95, -1, -1, 65, + 66, 100, 101, 69, 70, 71, 72, -1, 74, -1, + -1, 77, 78, 79, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 56, -1, 91, 92, 93, 94, 95, + -1, 97, 65, 66, 100, 101, 69, 70, 71, 72, -1, 74, -1, -1, 77, 78, 79, -1, -1, -1, - -1, -1, 85, 86, -1, -1, -1, -1, -1, 92, - 93, 94, 95, 96, -1, -1, 65, 66, 101, 102, - 69, 70, 71, 72, -1, 74, -1, -1, 77, 78, - 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 92, 93, 94, 95, 96, -1, -1, - -1, 100, 101, 102, 65, 66, -1, -1, 69, 70, - 71, 72, -1, 74, -1, -1, 77, 78, 79, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 91, 92, + 93, 94, 95, -1, -1, 65, 66, 100, 101, 69, + 70, 71, 72, -1, 74, -1, -1, 77, 78, 79, + -1, -1, -1, -1, -1, 85, 86, -1, -1, -1, + -1, 91, 92, 93, 94, 95, -1, -1, 65, 66, + 100, 101, 69, 70, 71, 72, -1, 74, -1, -1, + 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 91, 92, 93, 94, 95, -1, + -1, -1, 99, 100, 101, 65, 66, -1, -1, 69, + 70, 71, 72, -1, 74, -1, -1, 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 92, 93, 94, 95, 96, -1, -1, 65, 66, - 101, 102, 69, 70, -1, -1, -1, 74, -1, -1, + -1, 91, 92, 93, 94, 95, -1, -1, 65, 66, + 100, 101, 69, 70, -1, -1, -1, 74, -1, -1, 77, 78, 79, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 92, 93, 94, 95, 96, - -1, -1, -1, -1, 101, 102 + -1, -1, -1, -1, 91, 92, 93, 94, 95, -1, + -1, -1, -1, 100, 101 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1296,39 +1298,39 @@ static const yytype_uint8 yystos[] = 21, 23, 24, 25, 27, 28, 29, 31, 33, 37, 39, 40, 41, 44, 49, 50, 51, 55, 59, 60, 61, 62, 64, 73, 80, 81, 82, 83, 84, 87, - 88, 89, 90, 93, 94, 99, 103, 107, 113, 114, - 115, 116, 117, 125, 126, 127, 132, 133, 134, 135, - 136, 140, 143, 145, 148, 152, 98, 108, 28, 49, - 134, 134, 134, 99, 134, 154, 28, 134, 99, 154, - 134, 99, 154, 144, 50, 28, 137, 38, 43, 45, - 46, 47, 48, 134, 141, 142, 28, 134, 56, 57, - 13, 14, 28, 28, 28, 28, 134, 63, 141, 142, - 28, 139, 134, 134, 134, 134, 134, 134, 28, 138, - 28, 99, 134, 134, 134, 134, 153, 0, 108, 123, - 124, 91, 123, 115, 134, 65, 66, 69, 70, 71, - 72, 74, 77, 78, 79, 92, 93, 94, 95, 96, - 101, 102, 129, 99, 134, 134, 154, 105, 153, 154, - 134, 153, 153, 105, 134, 134, 45, 142, 146, 42, - 75, 76, 28, 54, 91, 134, 54, 91, 52, 112, - 147, 56, 142, 105, 47, 54, 47, 54, 47, 54, - 47, 54, 85, 86, 105, 28, 100, 104, 105, 113, - 129, 131, 134, 134, 53, 109, 112, 130, 54, 108, - 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 28, 149, 100, - 134, 100, 100, 28, 134, 129, 28, 135, 134, 134, - 134, 134, 54, 91, 134, 134, 129, 134, 28, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 134, 28, - 100, 105, 134, 108, 116, 130, 130, 131, 129, 134, - 131, 105, 108, 149, 134, 134, 149, 47, 47, 47, - 47, 153, 32, 34, 54, 130, 115, 130, 28, 105, - 151, 108, 108, 134, 134, 134, 134, 100, 54, 134, - 32, 58, 110, 129, 130, 32, 28, 131, 151, 151, - 134, 130, 129, 131, 36, 111, 119, 120, 121, 122, - 128, 110, 120, 128, 32, 131, 131, 130, 131, 115, - 130, 122, 130, 121, 123, 129, 130, 123, 28, 150, - 131, 130, 130, 32, 32, 109, 112, 115, 110, 118, - 112, 105, 130, 32, 129, 129, 130, 129, 130, 129, - 28, 32, 131, 116, 131, 115, 130, 130, 130 + 88, 89, 90, 92, 93, 98, 102, 106, 112, 113, + 114, 115, 116, 124, 125, 126, 131, 132, 133, 134, + 135, 139, 142, 144, 147, 151, 97, 107, 28, 49, + 133, 133, 133, 98, 133, 153, 28, 133, 98, 153, + 133, 98, 153, 143, 50, 28, 136, 38, 43, 45, + 46, 47, 48, 133, 140, 141, 28, 133, 56, 57, + 13, 14, 28, 28, 28, 28, 133, 63, 140, 141, + 28, 138, 133, 133, 133, 133, 133, 133, 28, 137, + 28, 98, 133, 133, 133, 133, 152, 0, 107, 122, + 123, 69, 122, 114, 133, 65, 66, 69, 70, 71, + 72, 74, 77, 78, 79, 91, 92, 93, 94, 95, + 100, 101, 128, 98, 133, 133, 153, 104, 152, 153, + 133, 152, 152, 104, 133, 133, 45, 141, 145, 42, + 75, 76, 28, 54, 69, 133, 54, 69, 52, 111, + 146, 56, 141, 104, 47, 54, 47, 54, 47, 54, + 47, 54, 85, 86, 104, 28, 99, 103, 104, 112, + 128, 130, 133, 133, 53, 108, 111, 129, 54, 107, + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 28, 148, 99, + 133, 99, 99, 28, 133, 128, 28, 134, 133, 133, + 133, 133, 54, 133, 133, 128, 133, 28, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 133, 28, 99, + 104, 133, 107, 115, 129, 129, 130, 128, 133, 130, + 104, 107, 148, 133, 148, 47, 47, 47, 47, 152, + 32, 34, 54, 129, 114, 129, 28, 104, 150, 107, + 107, 133, 133, 133, 133, 99, 54, 133, 32, 58, + 109, 128, 129, 32, 28, 130, 150, 150, 133, 129, + 128, 130, 36, 110, 118, 119, 120, 121, 127, 109, + 119, 127, 32, 130, 130, 129, 130, 114, 129, 121, + 129, 120, 122, 128, 129, 122, 28, 149, 130, 129, + 129, 32, 32, 108, 111, 114, 109, 117, 111, 104, + 129, 32, 128, 128, 129, 128, 129, 128, 28, 32, + 130, 115, 130, 114, 129, 129, 129 }; #define yyerrok (yyerrstatus = 0) @@ -2143,12 +2145,12 @@ yyreduce: switch (yyn) { case 4: -#line 123 "engines/director/lingo/lingo-gr.y" +#line 122 "engines/director/lingo/lingo-gr.y" { yyerrok; ;} break; case 5: -#line 126 "engines/director/lingo/lingo-gr.y" +#line 125 "engines/director/lingo/lingo-gr.y" { g_lingo->_linenumber++; g_lingo->_colnumber = 1; @@ -2157,7 +2159,7 @@ yyreduce: break; case 6: -#line 133 "engines/director/lingo/lingo-gr.y" +#line 132 "engines/director/lingo/lingo-gr.y" { g_lingo->_linenumber++; g_lingo->_colnumber = 1; @@ -2166,7 +2168,7 @@ yyreduce: break; case 7: -#line 140 "engines/director/lingo/lingo-gr.y" +#line 139 "engines/director/lingo/lingo-gr.y" { g_lingo->_linenumber++; g_lingo->_colnumber = 5; @@ -2175,7 +2177,7 @@ yyreduce: break; case 8: -#line 147 "engines/director/lingo/lingo-gr.y" +#line 146 "engines/director/lingo/lingo-gr.y" { g_lingo->_linenumber++; g_lingo->_colnumber = 8; @@ -2184,12 +2186,12 @@ yyreduce: break; case 9: -#line 154 "engines/director/lingo/lingo-gr.y" +#line 153 "engines/director/lingo/lingo-gr.y" { g_lingo->_inCond = false; ;} break; case 13: -#line 162 "engines/director/lingo/lingo-gr.y" +#line 161 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_varpush); g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str()); @@ -2199,24 +2201,24 @@ yyreduce: break; case 14: -#line 168 "engines/director/lingo/lingo-gr.y" +#line 167 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_assign); (yyval.code) = (yyvsp[(2) - (4)].code); ;} break; case 15: -#line 171 "engines/director/lingo/lingo-gr.y" +#line 170 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_after); ;} break; case 16: -#line 172 "engines/director/lingo/lingo-gr.y" +#line 171 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_before); ;} break; case 17: -#line 173 "engines/director/lingo/lingo-gr.y" +#line 172 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); @@ -2226,7 +2228,7 @@ yyreduce: break; case 18: -#line 179 "engines/director/lingo/lingo-gr.y" +#line 178 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(0); // Put dummy id @@ -2237,17 +2239,7 @@ yyreduce: break; case 19: -#line 186 "engines/director/lingo/lingo-gr.y" - { - g_lingo->code1(g_lingo->c_swap); - g_lingo->code1(g_lingo->c_theentityassign); - g_lingo->codeInt((yyvsp[(2) - (5)].e)[0]); - g_lingo->codeInt((yyvsp[(2) - (5)].e)[1]); - (yyval.code) = (yyvsp[(5) - (5)].code); ;} - break; - - case 20: -#line 192 "engines/director/lingo/lingo-gr.y" +#line 185 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); @@ -2256,8 +2248,8 @@ yyreduce: delete (yyvsp[(2) - (4)].s); ;} break; - case 21: -#line 198 "engines/director/lingo/lingo-gr.y" + case 20: +#line 191 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(0); // Put dummy id @@ -2267,8 +2259,8 @@ yyreduce: (yyval.code) = (yyvsp[(4) - (4)].code); ;} break; - case 22: -#line 205 "engines/director/lingo/lingo-gr.y" + case 21: +#line 198 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_swap); g_lingo->code1(g_lingo->c_theentityassign); @@ -2277,8 +2269,8 @@ yyreduce: (yyval.code) = (yyvsp[(5) - (5)].code); ;} break; - case 28: -#line 224 "engines/director/lingo/lingo-gr.y" + case 27: +#line 217 "engines/director/lingo/lingo-gr.y" { inst body = 0, end = 0; WRITE_UINT32(&body, (yyvsp[(3) - (5)].code) - (yyvsp[(1) - (5)].code)); @@ -2289,8 +2281,8 @@ yyreduce: checkEnd((yyvsp[(5) - (5)].s), "repeat", true); ;} break; - case 29: -#line 237 "engines/director/lingo/lingo-gr.y" + case 28: +#line 230 "engines/director/lingo/lingo-gr.y" { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, (yyvsp[(3) - (10)].code) - (yyvsp[(1) - (10)].code)); @@ -2307,8 +2299,8 @@ yyreduce: checkEnd((yyvsp[(10) - (10)].s), "repeat", true); ;} break; - case 30: -#line 255 "engines/director/lingo/lingo-gr.y" + case 29: +#line 248 "engines/director/lingo/lingo-gr.y" { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, (yyvsp[(3) - (11)].code) - (yyvsp[(1) - (11)].code)); @@ -2325,8 +2317,8 @@ yyreduce: checkEnd((yyvsp[(11) - (11)].s), "repeat", true); ;} break; - case 31: -#line 269 "engines/director/lingo/lingo-gr.y" + case 30: +#line 262 "engines/director/lingo/lingo-gr.y" { inst end = 0; WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code)); @@ -2334,22 +2326,22 @@ yyreduce: (*g_lingo->_currentScript)[(yyvsp[(1) - (3)].code) + 1] = end; ;} break; - case 32: -#line 274 "engines/director/lingo/lingo-gr.y" + case 31: +#line 267 "engines/director/lingo/lingo-gr.y" { warning("STUB: TELL is not implemented"); checkEnd((yyvsp[(6) - (6)].s), "tell", true); ;} break; - case 33: -#line 277 "engines/director/lingo/lingo-gr.y" + case 32: +#line 270 "engines/director/lingo/lingo-gr.y" { warning("STUB: TELL is not implemented"); ;} break; - case 34: -#line 282 "engines/director/lingo/lingo-gr.y" + case 33: +#line 275 "engines/director/lingo/lingo-gr.y" { inst then = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code)); @@ -2362,8 +2354,8 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 35: -#line 292 "engines/director/lingo/lingo-gr.y" + case 34: +#line 285 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code)); @@ -2378,8 +2370,8 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 36: -#line 304 "engines/director/lingo/lingo-gr.y" + case 35: +#line 297 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code)); @@ -2394,8 +2386,8 @@ yyreduce: g_lingo->processIf(0, (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code)); ;} break; - case 37: -#line 316 "engines/director/lingo/lingo-gr.y" + case 36: +#line 309 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code)); @@ -2408,8 +2400,8 @@ yyreduce: g_lingo->processIf(0, (yyvsp[(9) - (9)].code) - (yyvsp[(1) - (9)].code)); ;} break; - case 38: -#line 326 "engines/director/lingo/lingo-gr.y" + case 37: +#line 319 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code)); @@ -2422,8 +2414,8 @@ yyreduce: g_lingo->processIf(0, (yyvsp[(10) - (10)].code) - (yyvsp[(1) - (10)].code)); ;} break; - case 39: -#line 336 "engines/director/lingo/lingo-gr.y" + case 38: +#line 329 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code)); @@ -2436,8 +2428,8 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 40: -#line 346 "engines/director/lingo/lingo-gr.y" + case 39: +#line 339 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code)); @@ -2450,18 +2442,18 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 41: -#line 358 "engines/director/lingo/lingo-gr.y" + case 40: +#line 351 "engines/director/lingo/lingo-gr.y" { (yyval.code) = 0; ;} break; - case 42: -#line 359 "engines/director/lingo/lingo-gr.y" + case 41: +#line 352 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (3)].code); ;} break; - case 47: -#line 370 "engines/director/lingo/lingo-gr.y" + case 46: +#line 363 "engines/director/lingo/lingo-gr.y" { inst then = 0; WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code)); @@ -2470,8 +2462,8 @@ yyreduce: g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;} break; - case 49: -#line 379 "engines/director/lingo/lingo-gr.y" + case 48: +#line 372 "engines/director/lingo/lingo-gr.y" { inst then = 0; WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code)); @@ -2480,8 +2472,8 @@ yyreduce: g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;} break; - case 50: -#line 385 "engines/director/lingo/lingo-gr.y" + case 49: +#line 378 "engines/director/lingo/lingo-gr.y" { inst then = 0; WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code)); @@ -2490,23 +2482,23 @@ yyreduce: g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;} break; - case 51: -#line 393 "engines/director/lingo/lingo-gr.y" + case 50: +#line 386 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(STOP); ;} break; - case 52: -#line 396 "engines/director/lingo/lingo-gr.y" + case 51: +#line 389 "engines/director/lingo/lingo-gr.y" { g_lingo->_inCond = true; ;} break; - case 53: -#line 399 "engines/director/lingo/lingo-gr.y" + case 52: +#line 392 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;} break; - case 54: -#line 402 "engines/director/lingo/lingo-gr.y" + case 53: +#line 395 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP); g_lingo->code3(STOP, STOP, STOP); @@ -2514,8 +2506,8 @@ yyreduce: delete (yyvsp[(3) - (3)].s); ;} break; - case 55: -#line 409 "engines/director/lingo/lingo-gr.y" + case 54: +#line 402 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_ifcode); g_lingo->code3(STOP, STOP, STOP); @@ -2523,8 +2515,8 @@ yyreduce: g_lingo->codeLabel(0); ;} break; - case 56: -#line 416 "engines/director/lingo/lingo-gr.y" + case 55: +#line 409 "engines/director/lingo/lingo-gr.y" { inst skipEnd; WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions @@ -2533,23 +2525,23 @@ yyreduce: g_lingo->code1(skipEnd); ;} break; - case 57: -#line 424 "engines/director/lingo/lingo-gr.y" + case 56: +#line 417 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->_currentScript->size(); ;} break; - case 58: -#line 427 "engines/director/lingo/lingo-gr.y" + case 57: +#line 420 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;} break; - case 59: -#line 430 "engines/director/lingo/lingo-gr.y" + case 58: +#line 423 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->_currentScript->size(); ;} break; - case 62: -#line 435 "engines/director/lingo/lingo-gr.y" + case 61: +#line 428 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_whencode); g_lingo->code1(STOP); @@ -2557,82 +2549,82 @@ yyreduce: delete (yyvsp[(2) - (3)].s); ;} break; - case 63: -#line 441 "engines/director/lingo/lingo-gr.y" + case 62: +#line 434 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_tellcode); g_lingo->code1(STOP); ;} break; - case 64: -#line 445 "engines/director/lingo/lingo-gr.y" + case 63: +#line 438 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt((yyvsp[(1) - (1)].i)); ;} break; - case 65: -#line 448 "engines/director/lingo/lingo-gr.y" + case 64: +#line 441 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_floatpush); g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;} break; - case 66: -#line 451 "engines/director/lingo/lingo-gr.y" + case 65: +#line 444 "engines/director/lingo/lingo-gr.y" { // D3 (yyval.code) = g_lingo->code1(g_lingo->c_symbolpush); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;} break; - case 67: -#line 454 "engines/director/lingo/lingo-gr.y" + case 66: +#line 447 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_stringpush); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;} break; - case 69: -#line 458 "engines/director/lingo/lingo-gr.y" + case 68: +#line 451 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0); delete (yyvsp[(1) - (1)].s); ;} break; - case 70: -#line 461 "engines/director/lingo/lingo-gr.y" + case 69: +#line 454 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 71: -#line 464 "engines/director/lingo/lingo-gr.y" + case 70: +#line 457 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; - case 72: -#line 465 "engines/director/lingo/lingo-gr.y" + case 71: +#line 458 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;} break; - case 73: -#line 466 "engines/director/lingo/lingo-gr.y" + case 72: +#line 459 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); delete (yyvsp[(1) - (4)].s); ;} break; - case 74: -#line 469 "engines/director/lingo/lingo-gr.y" + case 73: +#line 462 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_eval); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 75: -#line 473 "engines/director/lingo/lingo-gr.y" + case 74: +#line 466 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(0); // Put dummy id @@ -2643,8 +2635,8 @@ yyreduce: g_lingo->code2(e, f); ;} break; - case 76: -#line 481 "engines/director/lingo/lingo-gr.y" + case 75: +#line 474 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_theentitypush); inst e = 0, f = 0; @@ -2653,395 +2645,395 @@ yyreduce: g_lingo->code2(e, f); ;} break; - case 78: -#line 488 "engines/director/lingo/lingo-gr.y" + case 77: +#line 481 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_add); ;} break; - case 79: -#line 489 "engines/director/lingo/lingo-gr.y" + case 78: +#line 482 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_sub); ;} break; - case 80: -#line 490 "engines/director/lingo/lingo-gr.y" + case 79: +#line 483 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_mul); ;} break; - case 81: -#line 491 "engines/director/lingo/lingo-gr.y" + case 80: +#line 484 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_div); ;} break; - case 82: -#line 492 "engines/director/lingo/lingo-gr.y" + case 81: +#line 485 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_mod); ;} break; - case 83: -#line 493 "engines/director/lingo/lingo-gr.y" + case 82: +#line 486 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gt); ;} break; - case 84: -#line 494 "engines/director/lingo/lingo-gr.y" + case 83: +#line 487 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lt); ;} break; - case 85: -#line 495 "engines/director/lingo/lingo-gr.y" + case 84: +#line 488 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_eq); ;} break; - case 86: -#line 496 "engines/director/lingo/lingo-gr.y" + case 85: +#line 489 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_neq); ;} break; - case 87: -#line 497 "engines/director/lingo/lingo-gr.y" + case 86: +#line 490 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_ge); ;} break; - case 88: -#line 498 "engines/director/lingo/lingo-gr.y" + case 87: +#line 491 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_le); ;} break; - case 89: -#line 499 "engines/director/lingo/lingo-gr.y" + case 88: +#line 492 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_and); ;} break; - case 90: -#line 500 "engines/director/lingo/lingo-gr.y" + case 89: +#line 493 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_or); ;} break; - case 91: -#line 501 "engines/director/lingo/lingo-gr.y" + case 90: +#line 494 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_not); ;} break; - case 92: -#line 502 "engines/director/lingo/lingo-gr.y" + case 91: +#line 495 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_ampersand); ;} break; - case 93: -#line 503 "engines/director/lingo/lingo-gr.y" + case 92: +#line 496 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_concat); ;} break; - case 94: -#line 504 "engines/director/lingo/lingo-gr.y" + case 93: +#line 497 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_contains); ;} break; - case 95: -#line 505 "engines/director/lingo/lingo-gr.y" + case 94: +#line 498 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_starts); ;} break; - case 96: -#line 506 "engines/director/lingo/lingo-gr.y" + case 95: +#line 499 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (2)].code); ;} break; - case 97: -#line 507 "engines/director/lingo/lingo-gr.y" + case 96: +#line 500 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;} break; - case 98: -#line 508 "engines/director/lingo/lingo-gr.y" + case 97: +#line 501 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (3)].code); ;} break; - case 99: -#line 509 "engines/director/lingo/lingo-gr.y" + case 98: +#line 502 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_arraypush); g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;} break; - case 100: -#line 510 "engines/director/lingo/lingo-gr.y" + case 99: +#line 503 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intersects); ;} break; - case 101: -#line 511 "engines/director/lingo/lingo-gr.y" + case 100: +#line 504 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_within); ;} break; - case 102: -#line 512 "engines/director/lingo/lingo-gr.y" + case 101: +#line 505 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_charOf); ;} break; - case 103: -#line 513 "engines/director/lingo/lingo-gr.y" + case 102: +#line 506 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_charToOf); ;} break; - case 104: -#line 514 "engines/director/lingo/lingo-gr.y" + case 103: +#line 507 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_itemOf); ;} break; - case 105: -#line 515 "engines/director/lingo/lingo-gr.y" + case 104: +#line 508 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_itemToOf); ;} break; - case 106: -#line 516 "engines/director/lingo/lingo-gr.y" + case 105: +#line 509 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lineOf); ;} break; - case 107: -#line 517 "engines/director/lingo/lingo-gr.y" + case 106: +#line 510 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lineToOf); ;} break; - case 108: -#line 518 "engines/director/lingo/lingo-gr.y" + case 107: +#line 511 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_wordOf); ;} break; - case 109: -#line 519 "engines/director/lingo/lingo-gr.y" + case 108: +#line 512 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_wordToOf); ;} break; - case 110: -#line 522 "engines/director/lingo/lingo-gr.y" + case 109: +#line 515 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 111: -#line 527 "engines/director/lingo/lingo-gr.y" + case 110: +#line 520 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_printtop); ;} break; - case 114: -#line 530 "engines/director/lingo/lingo-gr.y" + case 113: +#line 523 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_exitRepeat); ;} break; - case 115: -#line 531 "engines/director/lingo/lingo-gr.y" + case 114: +#line 524 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_procret); ;} break; - case 119: -#line 535 "engines/director/lingo/lingo-gr.y" + case 118: +#line 528 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0); delete (yyvsp[(1) - (1)].s); ;} break; - case 120: -#line 538 "engines/director/lingo/lingo-gr.y" + case 119: +#line 531 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 121: -#line 541 "engines/director/lingo/lingo-gr.y" + case 120: +#line 534 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 122: -#line 544 "engines/director/lingo/lingo-gr.y" + case 121: +#line 537 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_voidpush); g_lingo->codeFunc((yyvsp[(1) - (1)].s), 1); delete (yyvsp[(1) - (1)].s); ;} break; - case 123: -#line 548 "engines/director/lingo/lingo-gr.y" + case 122: +#line 541 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; - case 124: -#line 549 "engines/director/lingo/lingo-gr.y" + case 123: +#line 542 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;} break; - case 125: -#line 550 "engines/director/lingo/lingo-gr.y" + case 124: +#line 543 "engines/director/lingo/lingo-gr.y" { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;} break; - case 126: -#line 551 "engines/director/lingo/lingo-gr.y" + case 125: +#line 544 "engines/director/lingo/lingo-gr.y" { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;} break; - case 127: -#line 552 "engines/director/lingo/lingo-gr.y" + case 126: +#line 545 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_open); ;} break; - case 128: -#line 553 "engines/director/lingo/lingo-gr.y" + case 127: +#line 546 "engines/director/lingo/lingo-gr.y" { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;} break; - case 129: -#line 554 "engines/director/lingo/lingo-gr.y" + case 128: +#line 547 "engines/director/lingo/lingo-gr.y" { Common::String s(*(yyvsp[(1) - (3)].s)); s += '-'; s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;} break; - case 130: -#line 557 "engines/director/lingo/lingo-gr.y" + case 129: +#line 550 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 131: -#line 558 "engines/director/lingo/lingo-gr.y" + case 130: +#line 551 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; - case 132: -#line 561 "engines/director/lingo/lingo-gr.y" + case 131: +#line 554 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 133: -#line 562 "engines/director/lingo/lingo-gr.y" + case 132: +#line 555 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; - case 134: -#line 565 "engines/director/lingo/lingo-gr.y" + case 133: +#line 558 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 135: -#line 566 "engines/director/lingo/lingo-gr.y" + case 134: +#line 559 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; - case 136: -#line 577 "engines/director/lingo/lingo-gr.y" + case 135: +#line 570 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoloop); ;} break; - case 137: -#line 578 "engines/director/lingo/lingo-gr.y" + case 136: +#line 571 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotonext); ;} break; - case 138: -#line 579 "engines/director/lingo/lingo-gr.y" + case 137: +#line 572 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoprevious); ;} break; - case 139: -#line 580 "engines/director/lingo/lingo-gr.y" + case 138: +#line 573 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(1); g_lingo->code1(g_lingo->c_goto); ;} break; - case 140: -#line 584 "engines/director/lingo/lingo-gr.y" + case 139: +#line 577 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(3); g_lingo->code1(g_lingo->c_goto); ;} break; - case 141: -#line 588 "engines/director/lingo/lingo-gr.y" + case 140: +#line 581 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(2); g_lingo->code1(g_lingo->c_goto); ;} break; - case 146: -#line 602 "engines/director/lingo/lingo-gr.y" + case 145: +#line 595 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_playdone); ;} break; - case 147: -#line 603 "engines/director/lingo/lingo-gr.y" + case 146: +#line 596 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(1); g_lingo->code1(g_lingo->c_play); ;} break; - case 148: -#line 607 "engines/director/lingo/lingo-gr.y" + case 147: +#line 600 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(3); g_lingo->code1(g_lingo->c_play); ;} break; - case 149: -#line 611 "engines/director/lingo/lingo-gr.y" + case 148: +#line 604 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(2); g_lingo->code1(g_lingo->c_play); ;} break; - case 150: -#line 615 "engines/director/lingo/lingo-gr.y" + case 149: +#line 608 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(true); ;} break; - case 151: -#line 615 "engines/director/lingo/lingo-gr.y" + case 150: +#line 608 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(false); g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;} break; - case 152: -#line 645 "engines/director/lingo/lingo-gr.y" + case 151: +#line 638 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;} break; - case 153: -#line 646 "engines/director/lingo/lingo-gr.y" + case 152: +#line 639 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg)); g_lingo->_indef = false; ;} break; - case 154: -#line 650 "engines/director/lingo/lingo-gr.y" + case 153: +#line 643 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;} break; - case 155: -#line 651 "engines/director/lingo/lingo-gr.y" + case 154: +#line 644 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; ;} break; - case 156: -#line 652 "engines/director/lingo/lingo-gr.y" + case 155: +#line 645 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg) + 1, &g_lingo->_currentFactory); g_lingo->_indef = false; ;} break; - case 157: -#line 656 "engines/director/lingo/lingo-gr.y" + case 156: +#line 649 "engines/director/lingo/lingo-gr.y" { // D3 g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(1) - (8)].s), (yyvsp[(2) - (8)].code), (yyvsp[(3) - (8)].narg)); @@ -3051,8 +3043,8 @@ yyreduce: checkEnd((yyvsp[(7) - (8)].s), (yyvsp[(1) - (8)].s)->c_str(), false); ;} break; - case 158: -#line 663 "engines/director/lingo/lingo-gr.y" + case 157: +#line 656 "engines/director/lingo/lingo-gr.y" { // D4. No 'end' clause g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(1) - (6)].s), (yyvsp[(2) - (6)].code), (yyvsp[(3) - (6)].narg)); @@ -3060,38 +3052,38 @@ yyreduce: g_lingo->_ignoreMe = false; ;} break; - case 159: -#line 669 "engines/director/lingo/lingo-gr.y" + case 158: +#line 662 "engines/director/lingo/lingo-gr.y" { (yyval.s) = (yyvsp[(2) - (2)].s); g_lingo->_indef = true; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; ;} break; - case 160: -#line 671 "engines/director/lingo/lingo-gr.y" + case 159: +#line 664 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 161: -#line 672 "engines/director/lingo/lingo-gr.y" + case 160: +#line 665 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;} break; - case 162: -#line 673 "engines/director/lingo/lingo-gr.y" + case 161: +#line 666 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; - case 163: -#line 674 "engines/director/lingo/lingo-gr.y" + case 162: +#line 667 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;} break; - case 167: -#line 682 "engines/director/lingo/lingo-gr.y" + case 166: +#line 675 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArgStore(); ;} break; - case 168: -#line 686 "engines/director/lingo/lingo-gr.y" + case 167: +#line 679 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_call); g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str()); @@ -3100,34 +3092,34 @@ yyreduce: g_lingo->code1(numpar); ;} break; - case 169: -#line 694 "engines/director/lingo/lingo-gr.y" + case 168: +#line 687 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 170: -#line 695 "engines/director/lingo/lingo-gr.y" + case 169: +#line 688 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 171: -#line 696 "engines/director/lingo/lingo-gr.y" + case 170: +#line 689 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; - case 172: -#line 699 "engines/director/lingo/lingo-gr.y" + case 171: +#line 692 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 173: -#line 700 "engines/director/lingo/lingo-gr.y" + case 172: +#line 693 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; /* Line 1267 of yacc.c. */ -#line 3131 "engines/director/lingo/lingo-gr.cpp" +#line 3123 "engines/director/lingo/lingo-gr.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3341,6 +3333,6 @@ yyreturn: } -#line 703 "engines/director/lingo/lingo-gr.y" +#line 696 "engines/director/lingo/lingo-gr.y" diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index fe4030ec72..892a24c57b 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -108,7 +108,6 @@ void checkEnd(Common::String *token, const char *expect, bool required) { %type<narg> argdef arglist nonemptyarglist %type<s> on -%right '=' %left tAND tOR %left tLT tLE tGT tGE tNEQ tCONTAINS tSTARTS tEQ %left '&' @@ -170,25 +169,19 @@ asgn: tPUT expr tINTO ID { $$ = $2; } | tPUT expr tAFTER expr { $$ = g_lingo->code1(g_lingo->c_after); } // D3 | tPUT expr tBEFORE expr { $$ = g_lingo->code1(g_lingo->c_before); } // D3 - | tSET ID '=' expr { + | tSET ID tEQ expr { g_lingo->code1(g_lingo->c_varpush); g_lingo->codeString($2->c_str()); g_lingo->code1(g_lingo->c_assign); $$ = $4; delete $2; } - | tSET THEENTITY '=' expr { + | tSET THEENTITY tEQ expr { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(0); // Put dummy id g_lingo->code1(g_lingo->c_theentityassign); g_lingo->codeInt($2[0]); g_lingo->codeInt($2[1]); $$ = $4; } - | tSET THEENTITYWITHID expr '=' expr { - g_lingo->code1(g_lingo->c_swap); - g_lingo->code1(g_lingo->c_theentityassign); - g_lingo->codeInt($2[0]); - g_lingo->codeInt($2[1]); - $$ = $5; } | tSET ID tTO expr { g_lingo->code1(g_lingo->c_varpush); g_lingo->codeString($2->c_str()); @@ -234,7 +227,7 @@ stmt: stmtoneliner // statements // end repeat // - | repeatwith '=' expr end tTO expr end stmtlist end ENDCLAUSE { + | repeatwith tEQ expr end tTO expr end stmtlist end ENDCLAUSE { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, $3 - $1); WRITE_UINT32(&finish, $6 - $1); @@ -252,7 +245,7 @@ stmt: stmtoneliner // statements // end repeat // - | repeatwith '=' expr end tDOWN tTO expr end stmtlist end ENDCLAUSE { + | repeatwith tEQ expr end tDOWN tTO expr end stmtlist end ENDCLAUSE { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, $3 - $1); WRITE_UINT32(&finish, $7 - $1); diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index e7c683ee57..c35eafe492 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -1513,7 +1513,7 @@ YY_RULE_SETUP case 68: YY_RULE_SETUP #line 267 "engines/director/lingo/lingo-lex.l" -{ count(); return g_lingo->_inCond ? tEQ : '='; } +{ count(); return tEQ; } YY_BREAK case 69: YY_RULE_SETUP diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l index c133b866a0..d01849d772 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -253,18 +253,18 @@ whitespace [\t ] (?i:then) { count(); return tTHEN; } (?i:then[\n\r]+) { count(); return tTHENNL; } (?i:to) { count(); return tTO; } -(?i:sprite) { count(); return tSPRITE; } +(?i:sprite) { count(); return tSPRITE; } (?i:with) { count(); return tWITH; } -(?i:within) { count(); return tWITHIN; } +(?i:within) { count(); return tWITHIN; } (?i:when) { count(); return tWHEN; } -(?i:while) { count(); return tWHILE; } +(?i:while) { count(); return tWHILE; } (?i:word) { count(); return tWORD; } [<][>] { count(); return tNEQ; } [>][=] { count(); return tGE; } [<][=] { count(); return tLE; } [&][&] { count(); return tCONCAT; } -[=] { count(); return g_lingo->_inCond ? tEQ : '='; } +[=] { count(); return tEQ; } {identifier} { count(); |