aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-02 21:57:22 +0100
committerEugene Sandulenko2019-12-02 21:57:22 +0100
commitc8d37abd9a8d82447a04b0ccbe754cf97df553b1 (patch)
treea1c40b2d6a30d8d0879b3262224b54539fb4f5e4
parent2cc1c337c88e8af61e10df50f3dc2fd4524f4fb5 (diff)
downloadscummvm-rg350-c8d37abd9a8d82447a04b0ccbe754cf97df553b1.tar.gz
scummvm-rg350-c8d37abd9a8d82447a04b0ccbe754cf97df553b1.tar.bz2
scummvm-rg350-c8d37abd9a8d82447a04b0ccbe754cf97df553b1.zip
DIRECTOR: LINGO: Fix setting cast member values
-rw-r--r--engines/director/lingo/lingo-gr.cpp1588
-rw-r--r--engines/director/lingo/lingo-gr.y21
-rw-r--r--engines/director/lingo/tests/the.lingo1
3 files changed, 821 insertions, 789 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 119043f098..a74e1a0730 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -538,18 +538,18 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 127
+#define YYFINAL 128
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1848
+#define YYLAST 1857
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 105
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 46
+#define YYNNTS 47
/* YYNRULES -- Number of rules. */
-#define YYNRULES 169
+#define YYNRULES 171
/* YYNRULES -- Number of states. */
-#define YYNSTATES 364
+#define YYNSTATES 368
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -605,21 +605,22 @@ static const yytype_uint16 yyprhs[] =
{
0, 0, 3, 7, 9, 12, 14, 16, 18, 20,
21, 23, 25, 30, 35, 40, 45, 50, 55, 60,
- 65, 71, 73, 75, 77, 79, 81, 87, 98, 110,
- 114, 121, 126, 133, 143, 153, 163, 174, 185, 192,
- 193, 197, 200, 202, 205, 207, 214, 216, 223, 230,
- 233, 237, 239, 241, 242, 243, 245, 248, 251, 255,
- 257, 259, 261, 263, 265, 267, 269, 272, 275, 280,
- 285, 287, 289, 292, 294, 298, 302, 306, 310, 314,
- 318, 322, 326, 330, 334, 338, 342, 346, 349, 353,
- 357, 361, 365, 368, 371, 375, 379, 384, 389, 394,
- 401, 406, 413, 418, 425, 430, 437, 440, 443, 445,
- 447, 450, 452, 455, 458, 461, 463, 466, 469, 471,
- 474, 479, 484, 491, 496, 499, 503, 505, 509, 511,
- 515, 517, 521, 524, 527, 530, 533, 537, 540, 543,
- 545, 549, 552, 555, 558, 562, 565, 566, 570, 571,
- 580, 583, 584, 593, 602, 609, 612, 613, 615, 619,
- 624, 625, 627, 631, 632, 635, 636, 638, 642, 644
+ 65, 71, 77, 79, 81, 83, 85, 87, 93, 104,
+ 116, 120, 127, 132, 139, 149, 159, 169, 180, 191,
+ 198, 199, 203, 206, 208, 211, 213, 220, 222, 229,
+ 236, 239, 243, 245, 247, 248, 249, 251, 254, 257,
+ 261, 263, 265, 267, 269, 271, 273, 275, 277, 279,
+ 282, 285, 290, 295, 297, 300, 302, 306, 310, 314,
+ 318, 322, 326, 330, 334, 338, 342, 346, 350, 354,
+ 357, 361, 365, 369, 373, 376, 379, 383, 387, 392,
+ 397, 402, 409, 414, 421, 426, 433, 438, 445, 448,
+ 451, 453, 455, 458, 460, 463, 466, 469, 471, 474,
+ 477, 479, 482, 487, 492, 499, 504, 507, 511, 513,
+ 517, 519, 523, 525, 529, 532, 535, 538, 541, 545,
+ 548, 551, 553, 557, 560, 563, 566, 570, 573, 574,
+ 578, 579, 588, 591, 592, 601, 610, 617, 620, 621,
+ 623, 627, 632, 633, 635, 639, 640, 643, 644, 646,
+ 650, 652
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -627,69 +628,70 @@ static const yytype_int16 yyrhs[] =
{
106, 0, -1, 106, 107, 111, -1, 111, -1, 1,
107, -1, 97, -1, 53, -1, 58, -1, 36, -1,
- -1, 141, -1, 114, -1, 49, 130, 42, 28, -1,
- 49, 130, 42, 131, -1, 49, 130, 75, 130, -1,
- 49, 130, 76, 130, -1, 51, 28, 69, 130, -1,
- 51, 13, 69, 130, -1, 51, 28, 54, 130, -1,
- 51, 13, 54, 130, -1, 51, 14, 130, 54, 130,
- -1, 148, -1, 130, -1, 132, -1, 113, -1, 115,
- -1, 121, 130, 127, 126, 32, -1, 122, 69, 130,
- 126, 54, 130, 126, 127, 126, 32, -1, 122, 69,
- 130, 126, 34, 54, 130, 126, 127, 126, 32, -1,
- 128, 113, 126, -1, 129, 130, 107, 127, 126, 32,
- -1, 129, 130, 54, 130, -1, 123, 130, 108, 127,
- 126, 32, -1, 123, 130, 108, 127, 126, 109, 127,
- 126, 32, -1, 123, 130, 108, 127, 126, 125, 117,
- 126, 32, -1, 123, 130, 108, 127, 126, 109, 125,
- 113, 126, -1, 123, 130, 52, 125, 113, 126, 118,
- 126, 116, 126, -1, 123, 130, 52, 125, 113, 126,
- 109, 125, 113, 126, -1, 123, 130, 52, 125, 113,
- 126, -1, -1, 109, 125, 113, -1, 117, 120, -1,
- 120, -1, 118, 119, -1, 119, -1, 124, 130, 52,
- 125, 114, 126, -1, 118, -1, 124, 130, 52, 125,
- 127, 126, -1, 124, 130, 108, 125, 127, 126, -1,
- 50, 57, -1, 50, 56, 28, -1, 41, -1, 110,
- -1, -1, -1, 125, -1, 127, 107, -1, 127, 114,
- -1, 55, 28, 52, -1, 87, -1, 12, -1, 15,
- -1, 31, -1, 29, -1, 131, -1, 23, -1, 24,
- 130, -1, 25, 150, -1, 25, 98, 150, 99, -1,
- 28, 98, 149, 99, -1, 28, -1, 13, -1, 14,
- 130, -1, 112, -1, 130, 92, 130, -1, 130, 93,
- 130, -1, 130, 94, 130, -1, 130, 95, 130, -1,
- 130, 74, 130, -1, 130, 100, 130, -1, 130, 101,
- 130, -1, 130, 69, 130, -1, 130, 70, 130, -1,
- 130, 65, 130, -1, 130, 66, 130, -1, 130, 71,
- 130, -1, 130, 72, 130, -1, 73, 130, -1, 130,
- 91, 130, -1, 130, 77, 130, -1, 130, 78, 130,
- -1, 130, 79, 130, -1, 92, 130, -1, 93, 130,
- -1, 98, 130, 99, -1, 102, 149, 103, -1, 84,
- 130, 85, 130, -1, 84, 130, 86, 130, -1, 80,
- 130, 47, 130, -1, 80, 130, 54, 130, 47, 130,
- -1, 81, 130, 47, 130, -1, 81, 130, 54, 130,
- 47, 130, -1, 82, 130, 47, 130, -1, 82, 130,
- 54, 130, 47, 130, -1, 83, 130, 47, 130, -1,
- 83, 130, 54, 130, 47, 130, -1, 27, 130, -1,
- 49, 130, -1, 136, -1, 139, -1, 37, 50, -1,
- 37, -1, 39, 133, -1, 88, 134, -1, 64, 135,
- -1, 17, -1, 19, 130, -1, 18, 130, -1, 18,
- -1, 20, 150, -1, 20, 98, 150, 99, -1, 90,
- 98, 28, 99, -1, 90, 98, 28, 104, 149, 99,
- -1, 61, 130, 56, 130, -1, 61, 130, -1, 21,
- 28, 149, -1, 28, -1, 133, 104, 28, -1, 28,
- -1, 134, 104, 28, -1, 28, -1, 135, 104, 28,
- -1, 40, 43, -1, 40, 46, -1, 40, 48, -1,
- 40, 137, -1, 40, 137, 138, -1, 40, 138, -1,
- 38, 130, -1, 130, -1, 47, 45, 130, -1, 45,
- 130, -1, 62, 63, -1, 62, 137, -1, 62, 137,
- 138, -1, 62, 138, -1, -1, 33, 140, 149, -1,
- -1, 44, 28, 142, 125, 145, 107, 147, 127, -1,
- 59, 28, -1, -1, 60, 28, 143, 125, 145, 107,
- 147, 127, -1, 144, 125, 145, 107, 147, 127, 32,
- 146, -1, 144, 125, 145, 107, 147, 127, -1, 89,
- 28, -1, -1, 28, -1, 145, 104, 28, -1, 145,
- 107, 104, 28, -1, -1, 28, -1, 146, 104, 28,
- -1, -1, 28, 150, -1, -1, 130, -1, 149, 104,
- 130, -1, 130, -1, 150, 104, 130, -1
+ -1, 142, -1, 114, -1, 49, 131, 42, 28, -1,
+ 49, 131, 42, 132, -1, 49, 131, 75, 131, -1,
+ 49, 131, 76, 131, -1, 51, 28, 69, 131, -1,
+ 51, 13, 69, 131, -1, 51, 28, 54, 131, -1,
+ 51, 13, 54, 131, -1, 51, 14, 131, 54, 131,
+ -1, 51, 14, 130, 69, 131, -1, 149, -1, 131,
+ -1, 133, -1, 113, -1, 115, -1, 121, 131, 127,
+ 126, 32, -1, 122, 69, 131, 126, 54, 131, 126,
+ 127, 126, 32, -1, 122, 69, 131, 126, 34, 54,
+ 131, 126, 127, 126, 32, -1, 128, 113, 126, -1,
+ 129, 131, 107, 127, 126, 32, -1, 129, 131, 54,
+ 131, -1, 123, 131, 108, 127, 126, 32, -1, 123,
+ 131, 108, 127, 126, 109, 127, 126, 32, -1, 123,
+ 131, 108, 127, 126, 125, 117, 126, 32, -1, 123,
+ 131, 108, 127, 126, 109, 125, 113, 126, -1, 123,
+ 131, 52, 125, 113, 126, 118, 126, 116, 126, -1,
+ 123, 131, 52, 125, 113, 126, 109, 125, 113, 126,
+ -1, 123, 131, 52, 125, 113, 126, -1, -1, 109,
+ 125, 113, -1, 117, 120, -1, 120, -1, 118, 119,
+ -1, 119, -1, 124, 131, 52, 125, 114, 126, -1,
+ 118, -1, 124, 131, 52, 125, 127, 126, -1, 124,
+ 131, 108, 125, 127, 126, -1, 50, 57, -1, 50,
+ 56, 28, -1, 41, -1, 110, -1, -1, -1, 125,
+ -1, 127, 107, -1, 127, 114, -1, 55, 28, 52,
+ -1, 87, -1, 12, -1, 15, -1, 31, -1, 29,
+ -1, 28, -1, 130, -1, 132, -1, 23, -1, 24,
+ 131, -1, 25, 151, -1, 25, 98, 151, 99, -1,
+ 28, 98, 150, 99, -1, 13, -1, 14, 131, -1,
+ 112, -1, 131, 92, 131, -1, 131, 93, 131, -1,
+ 131, 94, 131, -1, 131, 95, 131, -1, 131, 74,
+ 131, -1, 131, 100, 131, -1, 131, 101, 131, -1,
+ 131, 69, 131, -1, 131, 70, 131, -1, 131, 65,
+ 131, -1, 131, 66, 131, -1, 131, 71, 131, -1,
+ 131, 72, 131, -1, 73, 131, -1, 131, 91, 131,
+ -1, 131, 77, 131, -1, 131, 78, 131, -1, 131,
+ 79, 131, -1, 92, 131, -1, 93, 131, -1, 98,
+ 131, 99, -1, 102, 150, 103, -1, 84, 131, 85,
+ 131, -1, 84, 131, 86, 131, -1, 80, 131, 47,
+ 131, -1, 80, 131, 54, 131, 47, 131, -1, 81,
+ 131, 47, 131, -1, 81, 131, 54, 131, 47, 131,
+ -1, 82, 131, 47, 131, -1, 82, 131, 54, 131,
+ 47, 131, -1, 83, 131, 47, 131, -1, 83, 131,
+ 54, 131, 47, 131, -1, 27, 131, -1, 49, 131,
+ -1, 137, -1, 140, -1, 37, 50, -1, 37, -1,
+ 39, 134, -1, 88, 135, -1, 64, 136, -1, 17,
+ -1, 19, 131, -1, 18, 131, -1, 18, -1, 20,
+ 151, -1, 20, 98, 151, 99, -1, 90, 98, 28,
+ 99, -1, 90, 98, 28, 104, 150, 99, -1, 61,
+ 131, 56, 131, -1, 61, 131, -1, 21, 28, 150,
+ -1, 28, -1, 134, 104, 28, -1, 28, -1, 135,
+ 104, 28, -1, 28, -1, 136, 104, 28, -1, 40,
+ 43, -1, 40, 46, -1, 40, 48, -1, 40, 138,
+ -1, 40, 138, 139, -1, 40, 139, -1, 38, 131,
+ -1, 131, -1, 47, 45, 131, -1, 45, 131, -1,
+ 62, 63, -1, 62, 138, -1, 62, 138, 139, -1,
+ 62, 139, -1, -1, 33, 141, 150, -1, -1, 44,
+ 28, 143, 125, 146, 107, 148, 127, -1, 59, 28,
+ -1, -1, 60, 28, 144, 125, 146, 107, 148, 127,
+ -1, 145, 125, 146, 107, 148, 127, 32, 147, -1,
+ 145, 125, 146, 107, 148, 127, -1, 89, 28, -1,
+ -1, 28, -1, 146, 104, 28, -1, 146, 107, 104,
+ 28, -1, -1, 28, -1, 147, 104, 28, -1, -1,
+ 28, 151, -1, -1, 131, -1, 150, 104, 131, -1,
+ 131, -1, 151, 104, 131, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -697,21 +699,22 @@ static const yytype_uint16 yyrline[] =
{
0, 120, 120, 121, 122, 125, 130, 135, 140, 145,
146, 147, 150, 156, 159, 160, 161, 167, 174, 180,
- 187, 195, 196, 197, 200, 201, 206, 219, 237, 251,
- 256, 259, 264, 274, 286, 298, 308, 318, 328, 340,
- 341, 344, 345, 348, 349, 352, 360, 361, 367, 375,
- 378, 385, 392, 400, 403, 406, 407, 408, 411, 417,
- 421, 424, 427, 430, 433, 434, 437, 440, 441, 442,
- 445, 449, 457, 463, 464, 465, 466, 467, 468, 469,
- 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
- 480, 481, 482, 483, 484, 485, 486, 487, 488, 489,
- 490, 491, 492, 493, 494, 495, 498, 503, 504, 505,
- 506, 507, 508, 509, 510, 511, 514, 517, 520, 524,
- 525, 526, 527, 528, 529, 530, 533, 534, 537, 538,
- 541, 542, 553, 554, 555, 556, 560, 564, 570, 571,
- 574, 575, 578, 579, 583, 587, 591, 591, 621, 621,
- 626, 627, 627, 632, 639, 645, 647, 648, 649, 650,
- 653, 654, 655, 658, 662, 670, 671, 672, 675, 676
+ 187, 193, 201, 202, 203, 206, 207, 212, 225, 243,
+ 257, 262, 265, 270, 280, 292, 304, 314, 324, 334,
+ 346, 347, 350, 351, 354, 355, 358, 366, 367, 373,
+ 381, 384, 391, 398, 406, 409, 412, 413, 414, 417,
+ 423, 427, 430, 433, 436, 439, 445, 446, 447, 450,
+ 453, 454, 455, 458, 466, 472, 473, 474, 475, 476,
+ 477, 478, 479, 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, 507, 512,
+ 513, 514, 515, 516, 517, 518, 519, 520, 523, 526,
+ 529, 533, 534, 535, 536, 537, 538, 539, 542, 543,
+ 546, 547, 550, 551, 562, 563, 564, 565, 569, 573,
+ 579, 580, 583, 584, 587, 588, 592, 596, 600, 600,
+ 630, 630, 635, 636, 636, 641, 648, 654, 656, 657,
+ 658, 659, 662, 663, 664, 667, 671, 679, 680, 681,
+ 684, 685
};
#endif
@@ -739,11 +742,11 @@ static const char *const yytname[] =
"nlelsif", "programline", "asgn", "stmtoneliner", "stmt", "ifstmt",
"elsestmtoneliner", "elseifstmt", "elseifstmtoneliner",
"elseifstmtoneliner1", "elseifstmt1", "repeatwhile", "repeatwith", "if",
- "elseif", "begin", "end", "stmtlist", "when", "tell", "expr",
- "reference", "proc", "globallist", "propertylist", "instancelist",
- "gotofunc", "gotoframe", "gotomovie", "playfunc", "@1", "defn", "@2",
- "@3", "on", "argdef", "endargdef", "argstore", "macro", "arglist",
- "nonemptyarglist", 0
+ "elseif", "begin", "end", "stmtlist", "when", "tell", "simpleexpr",
+ "expr", "reference", "proc", "globallist", "propertylist",
+ "instancelist", "gotofunc", "gotoframe", "gotomovie", "playfunc", "@1",
+ "defn", "@2", "@3", "on", "argdef", "endargdef", "argstore", "macro",
+ "arglist", "nonemptyarglist", 0
};
#endif
@@ -771,21 +774,22 @@ static const yytype_uint8 yyr1[] =
{
0, 105, 106, 106, 106, 107, 108, 109, 110, 111,
111, 111, 112, 112, 112, 112, 112, 112, 112, 112,
- 112, 113, 113, 113, 114, 114, 114, 114, 114, 114,
- 114, 114, 115, 115, 115, 115, 115, 115, 115, 116,
- 116, 117, 117, 118, 118, 119, 120, 120, 120, 121,
- 122, 123, 124, 125, 126, 127, 127, 127, 128, 129,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 131, 132, 132, 132,
- 132, 132, 132, 132, 132, 132, 132, 132, 132, 132,
- 132, 132, 132, 132, 132, 132, 133, 133, 134, 134,
- 135, 135, 136, 136, 136, 136, 136, 136, 137, 137,
- 138, 138, 139, 139, 139, 139, 140, 139, 142, 141,
- 141, 143, 141, 141, 141, 144, 145, 145, 145, 145,
- 146, 146, 146, 147, 148, 149, 149, 149, 150, 150
+ 112, 112, 113, 113, 113, 114, 114, 114, 114, 114,
+ 114, 114, 114, 115, 115, 115, 115, 115, 115, 115,
+ 116, 116, 117, 117, 118, 118, 119, 120, 120, 120,
+ 121, 122, 123, 124, 125, 126, 127, 127, 127, 128,
+ 129, 130, 130, 130, 130, 130, 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, 131, 131, 131, 131, 131, 131, 131, 131,
+ 131, 131, 131, 131, 131, 131, 131, 131, 132, 133,
+ 133, 133, 133, 133, 133, 133, 133, 133, 133, 133,
+ 133, 133, 133, 133, 133, 133, 133, 133, 134, 134,
+ 135, 135, 136, 136, 137, 137, 137, 137, 137, 137,
+ 138, 138, 139, 139, 140, 140, 140, 140, 141, 140,
+ 143, 142, 142, 144, 142, 142, 142, 145, 146, 146,
+ 146, 146, 147, 147, 147, 148, 149, 150, 150, 150,
+ 151, 151
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -793,21 +797,22 @@ static const yytype_uint8 yyr2[] =
{
0, 2, 3, 1, 2, 1, 1, 1, 1, 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,
- 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, 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
+ 5, 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, 3, 1, 1, 0, 0, 1, 2, 2, 3,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
+ 2, 4, 4, 1, 2, 1, 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
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -815,107 +820,107 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 60, 71, 0, 61, 115, 118, 0, 0,
- 0, 65, 0, 0, 0, 70, 63, 62, 146, 111,
- 0, 0, 51, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 59,
- 0, 0, 0, 0, 0, 0, 165, 0, 3, 73,
- 24, 11, 25, 0, 0, 0, 0, 0, 22, 64,
- 23, 108, 109, 10, 53, 21, 5, 4, 70, 0,
- 72, 117, 116, 0, 168, 119, 165, 66, 0, 67,
- 106, 165, 164, 165, 110, 126, 112, 0, 132, 0,
- 133, 0, 134, 139, 135, 137, 148, 107, 0, 49,
- 0, 0, 0, 0, 150, 151, 124, 142, 143, 145,
- 130, 114, 87, 0, 0, 0, 0, 0, 128, 113,
- 155, 0, 92, 93, 0, 166, 0, 1, 9, 53,
- 0, 0, 54, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 61, 73, 0, 62, 117, 120, 0, 0,
+ 0, 68, 0, 0, 0, 65, 64, 63, 148, 113,
+ 0, 0, 52, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 60,
+ 0, 0, 0, 0, 0, 0, 167, 0, 3, 75,
+ 25, 11, 26, 0, 0, 0, 0, 0, 66, 23,
+ 67, 24, 110, 111, 10, 54, 22, 5, 4, 65,
+ 0, 74, 119, 118, 0, 170, 121, 167, 69, 0,
+ 70, 108, 167, 166, 167, 112, 128, 114, 0, 134,
+ 0, 135, 0, 136, 141, 137, 139, 150, 109, 0,
+ 50, 0, 0, 0, 0, 152, 153, 126, 144, 145,
+ 147, 132, 116, 89, 0, 0, 0, 0, 0, 130,
+ 115, 157, 0, 94, 95, 0, 168, 0, 1, 9,
+ 54, 0, 0, 55, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 156, 165, 0, 168, 0, 0, 125, 0, 166,
- 0, 147, 0, 138, 141, 0, 136, 53, 0, 0,
- 0, 50, 0, 0, 0, 0, 0, 58, 53, 0,
- 144, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 94, 95, 0, 2, 55, 54,
- 54, 53, 6, 53, 29, 0, 53, 83, 84, 81,
- 82, 85, 86, 78, 89, 90, 91, 88, 74, 75,
- 76, 77, 79, 80, 157, 0, 120, 169, 68, 69,
- 127, 140, 156, 12, 13, 14, 15, 19, 17, 0,
- 18, 16, 156, 123, 131, 98, 0, 100, 0, 102,
- 0, 104, 0, 96, 97, 129, 121, 165, 167, 56,
- 57, 0, 0, 0, 54, 31, 54, 0, 163, 0,
- 20, 0, 0, 0, 0, 0, 0, 26, 0, 0,
- 54, 53, 0, 158, 0, 53, 163, 163, 99, 101,
- 103, 105, 122, 0, 54, 38, 32, 7, 53, 0,
- 30, 159, 154, 53, 53, 54, 53, 8, 53, 52,
- 54, 44, 0, 55, 54, 54, 46, 42, 0, 160,
- 149, 152, 53, 54, 0, 43, 39, 0, 54, 0,
- 41, 0, 0, 161, 153, 54, 0, 54, 53, 54,
- 53, 35, 33, 34, 53, 53, 0, 0, 27, 37,
- 0, 36, 0, 53, 53, 162, 28, 40, 54, 54,
- 54, 45, 47, 48
+ 0, 0, 158, 167, 0, 170, 0, 0, 127, 0,
+ 168, 0, 149, 0, 140, 143, 0, 138, 54, 0,
+ 0, 0, 51, 0, 0, 66, 0, 0, 0, 59,
+ 54, 0, 146, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 96, 97, 0, 2,
+ 56, 55, 55, 54, 6, 54, 30, 0, 54, 85,
+ 86, 83, 84, 87, 88, 80, 91, 92, 93, 90,
+ 76, 77, 78, 79, 81, 82, 159, 0, 122, 171,
+ 71, 72, 129, 142, 158, 12, 13, 14, 15, 19,
+ 17, 0, 0, 18, 16, 158, 125, 133, 100, 0,
+ 102, 0, 104, 0, 106, 0, 98, 99, 131, 123,
+ 167, 169, 57, 58, 0, 0, 0, 55, 32, 55,
+ 0, 165, 0, 21, 20, 0, 0, 0, 0, 0,
+ 0, 27, 0, 0, 55, 54, 0, 160, 0, 54,
+ 165, 165, 101, 103, 105, 107, 124, 0, 55, 39,
+ 33, 7, 54, 0, 31, 161, 156, 54, 54, 55,
+ 54, 8, 54, 53, 55, 45, 0, 56, 55, 55,
+ 47, 43, 0, 162, 151, 154, 54, 55, 0, 44,
+ 40, 0, 55, 0, 42, 0, 0, 163, 155, 55,
+ 0, 55, 54, 55, 54, 36, 34, 35, 54, 54,
+ 0, 0, 28, 38, 0, 37, 0, 54, 54, 164,
+ 29, 41, 55, 55, 55, 46, 48, 49
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 47, 259, 203, 298, 309, 48, 49, 50, 260,
- 52, 339, 315, 316, 311, 317, 53, 54, 55, 312,
- 198, 204, 199, 56, 57, 58, 59, 60, 86, 119,
- 111, 61, 94, 95, 62, 83, 63, 167, 178, 64,
- 225, 334, 285, 65, 160, 75
+ -1, 47, 262, 205, 302, 313, 48, 49, 50, 263,
+ 52, 343, 319, 320, 315, 321, 53, 54, 55, 316,
+ 200, 206, 201, 56, 57, 58, 59, 60, 61, 87,
+ 120, 112, 62, 95, 96, 63, 84, 64, 168, 180,
+ 65, 227, 338, 289, 66, 161, 76
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -291
+#define YYPACT_NINF -287
static const yytype_int16 yypact[] =
{
- 372, -75, -291, -291, 1025, -291, -291, 1025, 1025, 1065,
- 27, -291, 1025, 1141, 1025, 1181, -291, -291, -291, -25,
- 35, 909, -291, 39, 1025, 45, 51, 57, 65, 76,
- 1025, 949, 79, 1025, 1025, 1025, 1025, 1025, 1025, -291,
- 88, 89, 20, 1025, 1025, 1025, 1025, 2, -291, -291,
- -291, -291, -291, 1025, 50, 1025, 827, 1025, 1747, -291,
- -291, -291, -291, -291, -291, -291, -291, -291, 28, 1025,
- 1747, 1747, 1747, 1025, 1747, 21, 1025, 1747, 1025, 21,
- 1747, 1025, 21, 1025, -291, -291, 46, 1025, -291, 1025,
- -291, 106, -291, 1747, 36, -291, -291, 1215, 124, -291,
- -10, 1025, 18, 102, -291, -291, 1644, -291, 36, -291,
- -291, 52, -53, 1248, 1281, 1314, 1347, 1677, -291, 53,
- -291, 127, -53, -53, 1710, 1747, 6, -291, 463, 1747,
- 1025, 1512, -291, 1611, 1025, 1025, 1025, 1025, 1025, 1025,
- 1025, 1025, 1025, 1025, 1025, 1025, 1025, 1025, 1025, 1025,
- 1025, 130, 1025, 1215, 1710, -46, 1025, 55, -30, 1710,
- -8, 55, 132, 1747, 1747, 1025, -291, -291, 85, 1025,
- 1025, -291, 1025, 1025, 803, 1025, 1025, -291, -291, 1025,
- -291, 133, 1025, 1025, 1025, 1025, 1025, 1025, 1025, 1025,
- 1025, 1025, 136, -7, -291, -291, 1025, -291, -291, 645,
- 1747, -291, -291, -291, -291, 1025, -291, 29, 29, 29,
- 29, 151, 151, -53, 1747, 29, 29, 173, -6, -6,
- -53, -53, 1747, 1747, -291, -48, -291, 1747, -291, -291,
- -291, 1747, 130, -291, -291, 1747, 1747, 1747, 29, 1025,
- 1747, 29, 130, 1747, -291, 1747, 1380, 1747, 1413, 1747,
- 1446, 1747, 1479, 1747, 1747, -291, -291, 1025, 1747, -291,
- -291, 139, 3, 827, 645, 1747, 645, 137, 64, -48,
- 1747, -48, 1025, 1025, 1025, 1025, 1, -291, 121, 1025,
- -291, -29, 145, -291, 150, -291, 64, 64, 1747, 1747,
- 1747, 1747, -291, 1025, 1747, -22, -291, -291, -291, 153,
- -291, -291, 554, -291, -291, 1747, -291, -291, -291, -291,
- 153, -291, 1025, 827, 645, 153, 153, -291, 1025, 163,
- 645, 645, -291, 645, 827, -291, 134, 1578, -291, 162,
- -291, 164, 1545, -291, 91, 645, 166, -291, -291, -291,
- -291, -291, -291, -291, -291, -291, 171, 168, -291, -291,
- 827, -291, 736, 736, -291, -291, -291, -291, -291, 645,
- 645, -291, -291, -291
+ 381, -50, -287, -287, 1034, -287, -287, 1034, 1034, 1074,
+ 41, -287, 1034, 1150, 1034, 1190, -287, -287, -287, 38,
+ 45, 918, -287, 64, 1034, -32, 42, 91, 98, 123,
+ 1034, 958, 124, 1034, 1034, 1034, 1034, 1034, 1034, -287,
+ 125, 127, -33, 1034, 1034, 1034, 1034, 3, -287, -287,
+ -287, -287, -287, 1034, 87, 1034, 836, 1034, -287, 1756,
+ -287, -287, -287, -287, -287, -287, -287, -287, -287, 59,
+ 1034, 1756, 1756, 1756, 1034, 1756, 54, 1034, 1756, 1034,
+ 54, 1756, 1034, 54, 1034, -287, -287, 55, 1034, -287,
+ 1034, -287, 115, -287, 1756, 37, -287, -287, 1224, 133,
+ -287, -1, 1034, 6, 110, -287, -287, 1653, -287, 37,
+ -287, -287, 61, -63, 1257, 1290, 1323, 1356, 1686, -287,
+ 62, -287, 141, -63, -63, 1719, 1756, -2, -287, 472,
+ 1756, 1034, 1521, -287, 1620, 1034, 1034, 1034, 1034, 1034,
+ 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
+ 1034, 1034, 144, 1034, 1224, 1719, -40, 1034, 69, -27,
+ 1719, -8, 69, 149, 1756, 1756, 1034, -287, -287, 97,
+ 1034, 1034, -287, 1034, 1034, 111, 812, 1034, 1034, -287,
+ -287, 1034, -287, 163, 1034, 1034, 1034, 1034, 1034, 1034,
+ 1034, 1034, 1034, 1034, 165, 19, -287, -287, 1034, -287,
+ -287, 654, 1756, -287, -287, -287, -287, 1034, -287, 12,
+ 12, 12, 12, 158, 158, -63, 1756, 12, 12, 16,
+ 20, 20, -63, -63, 1756, 1756, -287, -46, -287, 1756,
+ -287, -287, -287, 1756, 144, -287, -287, 1756, 1756, 1756,
+ 12, 1034, 1034, 1756, 12, 144, 1756, -287, 1756, 1389,
+ 1756, 1422, 1756, 1455, 1756, 1488, 1756, 1756, -287, -287,
+ 1034, 1756, -287, -287, 162, -5, 836, 654, 1756, 654,
+ 168, 99, -46, 12, 1756, -46, 1034, 1034, 1034, 1034,
+ 23, -287, 147, 1034, -287, -10, 170, -287, 177, -287,
+ 99, 99, 1756, 1756, 1756, 1756, -287, 1034, 1756, -13,
+ -287, -287, -287, 171, -287, -287, 563, -287, -287, 1756,
+ -287, -287, -287, -287, 171, -287, 1034, 836, 654, 171,
+ 171, -287, 1034, 178, 654, 654, -287, 654, 836, -287,
+ 150, 1587, -287, 179, -287, 180, 1554, -287, 105, 654,
+ 181, -287, -287, -287, -287, -287, -287, -287, -287, -287,
+ 182, 183, -287, -287, 836, -287, 745, 745, -287, -287,
+ -287, -287, -287, 654, 654, -287, -287, -287
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -291, -291, 15, -131, -280, -291, 77, -291, -49, 0,
- -291, -291, -291, -91, -290, -109, -291, -291, -291, -276,
- -4, 23, -95, -291, -291, -3, 42, -291, -291, -291,
- -291, -291, 176, -18, -291, -291, -291, -291, -291, -291,
- -181, -291, -172, -291, -38, 4
+ -287, -287, 15, -122, -286, -287, 89, -287, -49, 0,
+ -287, -287, -287, -80, -257, -99, -287, -287, -287, -283,
+ -4, 28, -110, -287, -287, 119, -3, 56, -287, -287,
+ -287, -287, -287, 195, -29, -287, -287, -287, -287, -287,
+ -287, -219, -287, -160, -287, -38, 4
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -925,45 +930,55 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -10
static const yytype_int16 yytable[] =
{
- 51, 70, 127, 296, 71, 72, 74, 132, 126, 77,
- 74, 80, 74, 109, 307, 308, 67, 79, 93, 82,
- 325, 97, 66, 318, 141, 84, 325, 106, 93, 297,
- 112, 113, 114, 115, 116, 117, 297, 278, 157, 318,
- 122, 123, 124, 125, 172, 161, 338, 149, 150, 66,
- 129, 269, 131, 226, 133, 76, 267, 279, 156, 173,
- 151, 271, 128, 85, 100, 101, 153, 96, 140, 228,
- 154, 141, 175, 125, 156, 154, 166, 155, 159, 102,
- 125, 89, 158, 91, 163, 103, 164, 176, 147, 148,
- 180, 229, 256, 104, 149, 150, 196, 257, 174, 66,
- 292, 98, 99, 140, 105, 196, 141, 110, 264, 195,
- 196, 266, 14, 233, 303, 304, 118, 120, 121, 130,
- 144, 145, 146, 147, 148, 156, 152, 200, 51, 149,
- 150, 207, 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 218, 219, 220, 221, 222, 223, 206, 125,
- 162, 165, 171, 227, 177, 193, 181, 192, 224, 196,
- 230, 244, 231, 232, 255, 283, 235, 236, 284, 237,
- 238, 277, 240, 241, 242, 293, 243, 300, 301, 245,
- 246, 247, 248, 249, 250, 251, 252, 253, 254, 307,
- 302, 333, 297, 258, 342, 346, 343, 263, 348, 355,
- 356, 345, 265, 314, 310, 197, 330, 108, 320, 321,
- 234, 323, 0, 0, 280, 0, 134, 135, 0, 276,
- 136, 137, 261, 262, 0, 140, 0, 335, 141, 142,
- 143, 0, 0, 0, 0, 0, 270, 0, 0, 0,
- 268, 0, 144, 145, 146, 147, 148, 140, 0, 0,
- 141, 149, 150, 0, 125, 0, 0, 0, 359, 360,
- 0, 0, 0, 0, 328, 145, 146, 147, 148, 288,
- 289, 290, 291, 149, 150, 337, 294, 299, 0, 0,
- 0, 0, 0, 0, 286, 0, 287, 281, 0, 282,
- 305, 0, 0, 0, 313, 0, 0, 0, 0, 0,
- 0, 357, 0, 295, 324, 0, 0, 0, 0, 327,
- 0, 0, 0, 0, 0, 332, 0, 306, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 322, 0,
- 0, 0, 0, 326, 350, 0, 352, 329, 331, 0,
- 353, 354, 0, 0, 0, 0, 336, 0, 0, 0,
- 0, 341, 358, 358, 0, 0, 0, 0, 347, 0,
- 349, 0, 351, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, -9, 1, 0, 0, 0, 0, 0, 0,
- 0, 361, 362, 363, 2, 3, 4, 5, 0, 6,
+ 51, 71, 110, 128, 72, 73, 75, 133, 127, 78,
+ 75, 81, 75, 312, 142, 272, 68, 80, 94, 83,
+ 322, 98, 300, 311, 99, 100, 275, 107, 94, 282,
+ 113, 114, 115, 116, 117, 118, 322, 150, 151, 158,
+ 123, 124, 125, 126, 342, 301, 162, 67, 301, 283,
+ 130, 67, 132, 173, 134, 101, 102, 329, 270, 228,
+ 177, 152, 129, 329, 157, 122, 167, 154, 174, 77,
+ 103, 155, 230, 86, 126, 178, 155, 157, 156, 160,
+ 182, 126, 90, 159, 92, 164, 141, 165, 85, 142,
+ 141, 231, 97, 142, 141, 267, 198, 142, 269, 176,
+ 67, 197, 198, 145, 146, 147, 148, 149, 146, 147,
+ 148, 149, 150, 151, 148, 149, 150, 151, 259, 104,
+ 150, 151, 296, 260, 14, 235, 105, 198, 202, 51,
+ 307, 308, 209, 210, 211, 212, 213, 214, 215, 216,
+ 217, 218, 219, 220, 221, 222, 223, 224, 225, 208,
+ 126, 106, 111, 119, 229, 121, 131, 153, 157, 163,
+ 166, 172, 179, 233, 234, 183, 194, 237, 238, 195,
+ 239, 240, 226, 198, 243, 244, 245, 232, 246, 306,
+ 241, 248, 249, 250, 251, 252, 253, 254, 255, 256,
+ 257, 247, 318, 258, 281, 261, 287, 324, 325, 266,
+ 327, 297, 304, 288, 268, 305, 337, 311, 301, 350,
+ 359, 346, 347, 352, 349, 360, 339, 284, 199, 314,
+ 334, 175, 280, 135, 136, 236, 109, 137, 138, 264,
+ 265, 0, 141, 0, 0, 142, 143, 144, 273, 274,
+ 0, 0, 271, 0, 0, 0, 0, 363, 364, 145,
+ 146, 147, 148, 149, 0, 0, 0, 126, 150, 151,
+ 0, 0, 0, 0, 0, 0, 0, 0, 332, 0,
+ 0, 0, 0, 292, 293, 294, 295, 0, 0, 341,
+ 298, 303, 0, 0, 0, 0, 0, 290, 0, 0,
+ 291, 0, 0, 0, 309, 285, 0, 286, 317, 0,
+ 0, 0, 0, 0, 0, 361, 0, 0, 328, 0,
+ 0, 0, 299, 331, 0, 0, 0, 0, 0, 336,
+ 0, 0, 0, 0, 0, 0, 310, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 326, 354, 0,
+ 356, 0, 330, 0, 357, 358, 333, 335, 0, 0,
+ 0, 0, 0, 0, 0, 340, 362, 362, 0, 0,
+ 345, 0, 0, 0, 0, 0, 0, 351, 0, 353,
+ 0, 355, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, -9, 1, 0, 0, 0, 0, 0, 0, 0,
+ 365, 366, 367, 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, -9, 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,
@@ -971,26 +986,26 @@ static const yytype_int16 yytable[] =
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, -9,
+ 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, 0, 0, 0,
- 19, 0, 20, 21, 22, 0, 0, 23, 0, 0,
+ 14, 15, 16, 0, 17, 323, 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, 28, 29, 30, 31, 0, 32, 0, 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, 43, 44, 0, 0, 0,
- 0, 45, 0, 0, 0, 46, 2, 3, 4, 5,
+ 39, 40, 0, 42, 0, 43, 44, 0, 0, 0,
+ 67, 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, 319, 18, 0, 0,
+ 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,
+ 0, 67, 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,
@@ -999,160 +1014,161 @@ static const yytype_int16 yytable[] =
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,
+ 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,
- 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, 0, 45, 0, 0, 0, 46, 2,
- 3, 4, 5, 0, 6, 7, 8, 9, 10, 0,
- 11, 12, 13, 0, 14, 15, 16, 239, 17, 0,
- 18, 0, 0, 0, 19, 0, 20, 21, 134, 135,
- 0, 0, 136, 137, 138, 139, 24, 140, 26, 0,
- 141, 142, 143, 0, 0, 0, 0, 0, 30, 31,
- 0, 32, 0, 0, 144, 145, 146, 147, 148, 0,
- 33, 0, 0, 149, 150, 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,
+ 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, 69, 16, 0, 17,
+ 0, 0, 0, 0, 0, 0, 88, 0, 0, 0,
+ 0, 89, 0, 90, 91, 92, 93, 70, 0, 26,
+ 2, 3, 4, 5, 0, 0, 0, 0, 0, 0,
+ 0, 11, 12, 13, 0, 14, 69, 16, 0, 17,
+ 0, 33, 0, 0, 0, 0, 88, 0, 34, 35,
+ 36, 37, 38, 90, 0, 92, 0, 70, 0, 26,
+ 43, 44, 0, 0, 0, 0, 45, 0, 0, 0,
+ 46, 108, 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, 69, 16, 0, 17, 0, 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, 70, 0, 26, 2, 3, 4, 5,
+ 0, 0, 0, 0, 0, 0, 0, 11, 12, 13,
+ 0, 14, 69, 16, 0, 17, 0, 33, 0, 0,
+ 0, 0, 0, 0, 34, 35, 36, 37, 38, 0,
+ 0, 0, 0, 70, 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, 74, 11, 12, 13, 46, 14, 69, 16,
+ 0, 17, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 70,
+ 0, 26, 2, 3, 4, 5, 0, 0, 0, 0,
+ 0, 0, 0, 11, 12, 13, 0, 14, 69, 16,
+ 0, 17, 0, 33, 0, 0, 0, 0, 0, 0,
+ 34, 35, 36, 37, 38, 0, 0, 0, 0, 70,
+ 0, 26, 43, 44, 0, 0, 0, 0, 79, 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, 82, 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, 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, 277,
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, 78,
- 0, 0, 0, 46, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 33, 0, 0, 168, 0, 0,
- 0, 34, 35, 36, 37, 38, 0, 0, 0, 0,
- 0, 0, 0, 43, 44, 0, 0, 0, 0, 81,
- 134, 135, 0, 46, 136, 137, 138, 139, 0, 140,
- 169, 170, 141, 142, 143, 182, 0, 0, 0, 0,
- 0, 0, 183, 0, 0, 0, 144, 145, 146, 147,
- 148, 0, 0, 134, 135, 149, 150, 136, 137, 138,
- 139, 0, 140, 0, 0, 141, 142, 143, 184, 0,
- 0, 0, 0, 0, 0, 185, 0, 0, 0, 144,
- 145, 146, 147, 148, 0, 0, 134, 135, 149, 150,
- 136, 137, 138, 139, 0, 140, 0, 0, 141, 142,
- 143, 186, 0, 0, 0, 0, 0, 0, 187, 0,
- 0, 0, 144, 145, 146, 147, 148, 0, 0, 134,
- 135, 149, 150, 136, 137, 138, 139, 0, 140, 0,
- 0, 141, 142, 143, 188, 0, 0, 0, 0, 0,
- 0, 189, 0, 0, 0, 144, 145, 146, 147, 148,
- 0, 0, 134, 135, 149, 150, 136, 137, 138, 139,
- 0, 140, 0, 0, 141, 142, 143, 272, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 144, 145,
- 146, 147, 148, 0, 0, 134, 135, 149, 150, 136,
- 137, 138, 139, 0, 140, 0, 0, 141, 142, 143,
- 273, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 144, 145, 146, 147, 148, 0, 0, 134, 135,
- 149, 150, 136, 137, 138, 139, 0, 140, 0, 0,
- 141, 142, 143, 274, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 144, 145, 146, 147, 148, 0,
- 0, 134, 135, 149, 150, 136, 137, 138, 139, 0,
- 140, 0, 0, 141, 142, 143, 275, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 144, 145, 146,
- 147, 148, 0, 0, 134, 135, 149, 150, 136, 137,
- 138, 139, 0, 140, 0, 0, 141, 142, 143, 0,
- 0, 0, 0, 0, 201, 202, 0, 0, 0, 0,
- 144, 145, 146, 147, 148, 0, 0, 134, 135, 149,
- 150, 136, 137, 138, 139, 0, 140, 0, 0, 141,
- 142, 143, 0, 0, 0, 0, 0, 344, 202, 0,
- 0, 0, 0, 144, 145, 146, 147, 148, 0, 0,
- 134, 135, 149, 150, 136, 137, 138, 139, 0, 140,
- 0, 0, 141, 142, 143, 0, 0, 0, 0, 0,
- 340, 0, 0, 0, 0, 0, 144, 145, 146, 147,
- 148, 0, 0, 134, 135, 149, 150, 136, 137, 138,
- 139, 0, 140, 0, 0, 141, 142, 143, 0, 0,
- 0, 0, 0, 0, 0, 205, 0, 0, 0, 144,
- 145, 146, 147, 148, 0, 0, 134, 135, 149, 150,
- 136, 137, 138, 139, 0, 140, 0, 0, 141, 142,
- 143, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 179, 0, 144, 145, 146, 147, 148, 0, 66, 134,
- 135, 149, 150, 136, 137, 138, 139, 0, 140, 0,
- 0, 141, 142, 143, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 144, 145, 146, 147, 148,
- 0, 0, 134, 135, 149, 150, 136, 137, 138, 139,
- 0, 140, 0, 0, 141, 142, 143, 0, 0, 0,
- 0, 0, 190, 191, 0, 0, 0, 0, 144, 145,
- 146, 147, 148, 0, 0, 134, 135, 149, 150, 136,
- 137, 138, 139, 0, 140, 0, 0, 141, 142, 143,
+ 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, 279, 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, 203, 204, 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, 348, 204, 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, 344,
+ 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, 207, 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, 67, 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, 144, 145, 146, 147, 148, 0, 0, 0, 194,
- 149, 150, 134, 135, 0, 0, 136, 137, 138, 139,
- 0, 140, 0, 0, 141, 142, 143, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 144, 145,
- 146, 147, 148, 0, 0, 0, 0, 149, 150
+ 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, 0, 0, 150, 151
};
static const yytype_int16 yycheck[] =
{
- 0, 4, 0, 32, 7, 8, 9, 56, 46, 12,
- 13, 14, 15, 31, 36, 295, 1, 13, 21, 15,
- 310, 24, 97, 299, 77, 50, 316, 30, 31, 58,
- 33, 34, 35, 36, 37, 38, 58, 34, 76, 315,
- 43, 44, 45, 46, 54, 83, 326, 100, 101, 97,
- 53, 232, 55, 99, 57, 28, 104, 54, 104, 69,
- 64, 242, 47, 28, 13, 14, 69, 28, 74, 99,
- 73, 77, 54, 76, 104, 78, 94, 73, 81, 28,
- 83, 45, 78, 47, 87, 28, 89, 69, 94, 95,
- 108, 99, 99, 28, 100, 101, 104, 104, 101, 97,
- 99, 56, 57, 74, 28, 104, 77, 28, 203, 103,
- 104, 206, 27, 28, 286, 287, 28, 28, 98, 69,
- 91, 92, 93, 94, 95, 104, 98, 130, 128, 100,
- 101, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 133, 152,
- 104, 45, 28, 156, 52, 28, 104, 104, 28, 104,
- 28, 28, 165, 167, 28, 28, 169, 170, 104, 172,
- 173, 32, 175, 176, 178, 54, 179, 32, 28, 182,
- 183, 184, 185, 186, 187, 188, 189, 190, 191, 36,
- 285, 28, 58, 196, 32, 104, 32, 201, 32, 28,
- 32, 332, 205, 298, 295, 128, 315, 31, 303, 304,
- 168, 306, -1, -1, 263, -1, 65, 66, -1, 257,
- 69, 70, 199, 200, -1, 74, -1, 322, 77, 78,
- 79, -1, -1, -1, -1, -1, 239, -1, -1, -1,
- 225, -1, 91, 92, 93, 94, 95, 74, -1, -1,
- 77, 100, 101, -1, 257, -1, -1, -1, 353, 354,
- -1, -1, -1, -1, 313, 92, 93, 94, 95, 272,
- 273, 274, 275, 100, 101, 324, 279, 281, -1, -1,
- -1, -1, -1, -1, 269, -1, 271, 264, -1, 266,
- 293, -1, -1, -1, 298, -1, -1, -1, -1, -1,
- -1, 350, -1, 280, 308, -1, -1, -1, -1, 312,
- -1, -1, -1, -1, -1, 318, -1, 294, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 305, -1,
- -1, -1, -1, 310, 338, -1, 340, 314, 315, -1,
- 344, 345, -1, -1, -1, -1, 323, -1, -1, -1,
- -1, 328, 352, 353, -1, -1, -1, -1, 335, -1,
- 337, -1, 339, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 0, 1, -1, -1, -1, -1, -1, -1,
- -1, 358, 359, 360, 12, 13, 14, 15, -1, 17,
+ 0, 4, 31, 0, 7, 8, 9, 56, 46, 12,
+ 13, 14, 15, 299, 77, 234, 1, 13, 21, 15,
+ 303, 24, 32, 36, 56, 57, 245, 30, 31, 34,
+ 33, 34, 35, 36, 37, 38, 319, 100, 101, 77,
+ 43, 44, 45, 46, 330, 58, 84, 97, 58, 54,
+ 53, 97, 55, 54, 57, 13, 14, 314, 104, 99,
+ 54, 65, 47, 320, 104, 98, 95, 70, 69, 28,
+ 28, 74, 99, 28, 77, 69, 79, 104, 74, 82,
+ 109, 84, 45, 79, 47, 88, 74, 90, 50, 77,
+ 74, 99, 28, 77, 74, 205, 104, 77, 208, 102,
+ 97, 103, 104, 91, 92, 93, 94, 95, 92, 93,
+ 94, 95, 100, 101, 94, 95, 100, 101, 99, 28,
+ 100, 101, 99, 104, 27, 28, 28, 104, 131, 129,
+ 290, 291, 135, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 149, 150, 151, 134,
+ 153, 28, 28, 28, 157, 28, 69, 98, 104, 104,
+ 45, 28, 52, 166, 168, 104, 104, 170, 171, 28,
+ 173, 174, 28, 104, 177, 178, 180, 28, 181, 289,
+ 69, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+ 193, 28, 302, 28, 32, 198, 28, 307, 308, 203,
+ 310, 54, 32, 104, 207, 28, 28, 36, 58, 104,
+ 28, 32, 32, 32, 336, 32, 326, 266, 129, 299,
+ 319, 102, 260, 65, 66, 169, 31, 69, 70, 201,
+ 202, -1, 74, -1, -1, 77, 78, 79, 241, 242,
+ -1, -1, 227, -1, -1, -1, -1, 357, 358, 91,
+ 92, 93, 94, 95, -1, -1, -1, 260, 100, 101,
+ -1, -1, -1, -1, -1, -1, -1, -1, 317, -1,
+ -1, -1, -1, 276, 277, 278, 279, -1, -1, 328,
+ 283, 285, -1, -1, -1, -1, -1, 272, -1, -1,
+ 275, -1, -1, -1, 297, 267, -1, 269, 302, -1,
+ -1, -1, -1, -1, -1, 354, -1, -1, 312, -1,
+ -1, -1, 284, 316, -1, -1, -1, -1, -1, 322,
+ -1, -1, -1, -1, -1, -1, 298, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 309, 342, -1,
+ 344, -1, 314, -1, 348, 349, 318, 319, -1, -1,
+ -1, -1, -1, -1, -1, 327, 356, 357, -1, -1,
+ 332, -1, -1, -1, -1, -1, -1, 339, -1, 341,
+ -1, 343, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 0, 1, -1, -1, -1, -1, -1, -1, -1,
+ 362, 363, 364, 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,
@@ -1160,19 +1176,19 @@ static const yytype_int16 yycheck[] =
-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,
+ 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, -1, -1, -1,
- 37, -1, 39, 40, 41, -1, -1, 44, -1, -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, 59, 60, 61, 62, -1, 64, -1, -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, 92, 93, -1, -1, -1,
- -1, 98, -1, -1, -1, 102, 12, 13, 14, 15,
+ 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, 32, 33, -1, -1,
+ -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,
@@ -1188,117 +1204,108 @@ static const yytype_int16 yycheck[] =
-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,
+ -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,
- -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, -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,
+ 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, -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, 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, -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, 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, -1, -1, -1, -1, 91, 92,
+ -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,
+ 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, 91, 92, 93, 94, 95, -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, 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, 52, 53, -1, -1, -1, -1,
+ 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, -1, -1, -1, -1, 52, 53, -1,
+ 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, -1, -1, -1, -1,
- 52, -1, -1, -1, -1, -1, 91, 92, 93, 94,
+ -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, -1,
- -1, -1, -1, -1, -1, 54, -1, -1, -1, 91,
+ -1, -1, -1, 52, 53, -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,
- 56, -1, 91, 92, 93, 94, 95, -1, 97, 65,
+ 79, -1, -1, -1, -1, -1, 52, 53, -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, 77, 78, 79, -1, -1, -1, -1, -1, 52,
-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,
+ -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, -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,
- -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, 91, 92,
- 93, 94, 95, -1, -1, -1, -1, 100, 101
+ 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, 91, 92, 93,
+ 94, 95, -1, -1, -1, -1, 100, 101
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1311,37 +1318,37 @@ static const yytype_uint8 yystos[] =
61, 62, 64, 73, 80, 81, 82, 83, 84, 87,
88, 89, 90, 92, 93, 98, 102, 106, 111, 112,
113, 114, 115, 121, 122, 123, 128, 129, 130, 131,
- 132, 136, 139, 141, 144, 148, 97, 107, 28, 49,
- 130, 130, 130, 98, 130, 150, 28, 130, 98, 150,
- 130, 98, 150, 140, 50, 28, 133, 38, 43, 45,
- 46, 47, 48, 130, 137, 138, 28, 130, 56, 57,
- 13, 14, 28, 28, 28, 28, 130, 63, 137, 138,
- 28, 135, 130, 130, 130, 130, 130, 130, 28, 134,
- 28, 98, 130, 130, 130, 130, 149, 0, 107, 130,
- 69, 130, 113, 130, 65, 66, 69, 70, 71, 72,
- 74, 77, 78, 79, 91, 92, 93, 94, 95, 100,
- 101, 125, 98, 130, 130, 150, 104, 149, 150, 130,
- 149, 149, 104, 130, 130, 45, 138, 142, 42, 75,
- 76, 28, 54, 69, 130, 54, 69, 52, 143, 56,
- 138, 104, 47, 54, 47, 54, 47, 54, 47, 54,
- 85, 86, 104, 28, 99, 103, 104, 111, 125, 127,
- 130, 52, 53, 108, 126, 54, 107, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 28, 145, 99, 130, 99, 99,
- 28, 130, 125, 28, 131, 130, 130, 130, 130, 54,
- 130, 130, 125, 130, 28, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 28, 99, 104, 130, 107,
- 114, 126, 126, 125, 127, 130, 127, 104, 107, 145,
- 130, 145, 47, 47, 47, 47, 149, 32, 34, 54,
- 113, 126, 126, 28, 104, 147, 107, 107, 130, 130,
- 130, 130, 99, 54, 130, 126, 32, 58, 109, 125,
- 32, 28, 127, 147, 147, 130, 126, 36, 109, 110,
- 118, 119, 124, 125, 127, 117, 118, 120, 124, 32,
- 127, 127, 126, 127, 125, 119, 126, 130, 113, 126,
- 120, 126, 130, 28, 146, 127, 126, 113, 109, 116,
- 52, 126, 32, 32, 52, 108, 104, 126, 32, 126,
- 125, 126, 125, 125, 125, 28, 32, 113, 114, 127,
- 127, 126, 126, 126
+ 132, 133, 137, 140, 142, 145, 149, 97, 107, 28,
+ 49, 131, 131, 131, 98, 131, 151, 28, 131, 98,
+ 151, 131, 98, 151, 141, 50, 28, 134, 38, 43,
+ 45, 46, 47, 48, 131, 138, 139, 28, 131, 56,
+ 57, 13, 14, 28, 28, 28, 28, 131, 63, 138,
+ 139, 28, 136, 131, 131, 131, 131, 131, 131, 28,
+ 135, 28, 98, 131, 131, 131, 131, 150, 0, 107,
+ 131, 69, 131, 113, 131, 65, 66, 69, 70, 71,
+ 72, 74, 77, 78, 79, 91, 92, 93, 94, 95,
+ 100, 101, 125, 98, 131, 131, 151, 104, 150, 151,
+ 131, 150, 150, 104, 131, 131, 45, 139, 143, 42,
+ 75, 76, 28, 54, 69, 130, 131, 54, 69, 52,
+ 144, 56, 139, 104, 47, 54, 47, 54, 47, 54,
+ 47, 54, 85, 86, 104, 28, 99, 103, 104, 111,
+ 125, 127, 131, 52, 53, 108, 126, 54, 107, 131,
+ 131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
+ 131, 131, 131, 131, 131, 131, 28, 146, 99, 131,
+ 99, 99, 28, 131, 125, 28, 132, 131, 131, 131,
+ 131, 69, 54, 131, 131, 125, 131, 28, 131, 131,
+ 131, 131, 131, 131, 131, 131, 131, 131, 28, 99,
+ 104, 131, 107, 114, 126, 126, 125, 127, 131, 127,
+ 104, 107, 146, 131, 131, 146, 47, 47, 47, 47,
+ 150, 32, 34, 54, 113, 126, 126, 28, 104, 148,
+ 107, 107, 131, 131, 131, 131, 99, 54, 131, 126,
+ 32, 58, 109, 125, 32, 28, 127, 148, 148, 131,
+ 126, 36, 109, 110, 118, 119, 124, 125, 127, 117,
+ 118, 120, 124, 32, 127, 127, 126, 127, 125, 119,
+ 126, 131, 113, 126, 120, 126, 131, 28, 147, 127,
+ 126, 113, 109, 116, 52, 126, 32, 32, 52, 108,
+ 104, 126, 32, 126, 125, 126, 125, 125, 125, 28,
+ 32, 113, 114, 127, 127, 126, 126, 126
};
#define yyerrok (yyerrstatus = 0)
@@ -2267,8 +2274,18 @@ yyreduce:
(yyval.code) = (yyvsp[(5) - (5)].code); ;}
break;
- case 26:
-#line 206 "engines/director/lingo/lingo-gr.y"
+ case 21:
+#line 193 "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 27:
+#line 212 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[(3) - (5)].code) - (yyvsp[(1) - (5)].code));
@@ -2279,8 +2296,8 @@ yyreduce:
checkEnd((yyvsp[(5) - (5)].s), "repeat", true); ;}
break;
- case 27:
-#line 219 "engines/director/lingo/lingo-gr.y"
+ case 28:
+#line 225 "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));
@@ -2297,8 +2314,8 @@ yyreduce:
checkEnd((yyvsp[(10) - (10)].s), "repeat", true); ;}
break;
- case 28:
-#line 237 "engines/director/lingo/lingo-gr.y"
+ case 29:
+#line 243 "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));
@@ -2315,8 +2332,8 @@ yyreduce:
checkEnd((yyvsp[(11) - (11)].s), "repeat", true); ;}
break;
- case 29:
-#line 251 "engines/director/lingo/lingo-gr.y"
+ case 30:
+#line 257 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code));
@@ -2324,22 +2341,22 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[(1) - (3)].code) + 1] = end; ;}
break;
- case 30:
-#line 256 "engines/director/lingo/lingo-gr.y"
+ case 31:
+#line 262 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
checkEnd((yyvsp[(6) - (6)].s), "tell", true); ;}
break;
- case 31:
-#line 259 "engines/director/lingo/lingo-gr.y"
+ case 32:
+#line 265 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
;}
break;
- case 32:
-#line 264 "engines/director/lingo/lingo-gr.y"
+ case 33:
+#line 270 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2352,8 +2369,8 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 33:
-#line 274 "engines/director/lingo/lingo-gr.y"
+ case 34:
+#line 280 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2368,8 +2385,8 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 34:
-#line 286 "engines/director/lingo/lingo-gr.y"
+ case 35:
+#line 292 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2384,8 +2401,8 @@ yyreduce:
g_lingo->processIf(0, (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code)); ;}
break;
- case 35:
-#line 298 "engines/director/lingo/lingo-gr.y"
+ case 36:
+#line 304 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2398,8 +2415,8 @@ yyreduce:
g_lingo->processIf(0, (yyvsp[(9) - (9)].code) - (yyvsp[(1) - (9)].code)); ;}
break;
- case 36:
-#line 308 "engines/director/lingo/lingo-gr.y"
+ case 37:
+#line 314 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
@@ -2412,8 +2429,8 @@ yyreduce:
g_lingo->processIf(0, (yyvsp[(10) - (10)].code) - (yyvsp[(1) - (10)].code)); ;}
break;
- case 37:
-#line 318 "engines/director/lingo/lingo-gr.y"
+ case 38:
+#line 324 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
@@ -2426,8 +2443,8 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 38:
-#line 328 "engines/director/lingo/lingo-gr.y"
+ case 39:
+#line 334 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2440,18 +2457,18 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 39:
-#line 340 "engines/director/lingo/lingo-gr.y"
+ case 40:
+#line 346 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = 0; ;}
break;
- case 40:
-#line 341 "engines/director/lingo/lingo-gr.y"
+ case 41:
+#line 347 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
- case 45:
-#line 352 "engines/director/lingo/lingo-gr.y"
+ case 46:
+#line 358 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2460,8 +2477,8 @@ yyreduce:
g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
break;
- case 47:
-#line 361 "engines/director/lingo/lingo-gr.y"
+ case 48:
+#line 367 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2470,8 +2487,8 @@ yyreduce:
g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
break;
- case 48:
-#line 367 "engines/director/lingo/lingo-gr.y"
+ case 49:
+#line 373 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2480,13 +2497,13 @@ yyreduce:
g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
break;
- case 49:
-#line 375 "engines/director/lingo/lingo-gr.y"
+ case 50:
+#line 381 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;}
break;
- case 50:
-#line 378 "engines/director/lingo/lingo-gr.y"
+ case 51:
+#line 384 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
@@ -2494,8 +2511,8 @@ yyreduce:
delete (yyvsp[(3) - (3)].s); ;}
break;
- case 51:
-#line 385 "engines/director/lingo/lingo-gr.y"
+ case 52:
+#line 391 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
@@ -2503,8 +2520,8 @@ yyreduce:
g_lingo->codeLabel(0); ;}
break;
- case 52:
-#line 392 "engines/director/lingo/lingo-gr.y"
+ case 53:
+#line 398 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
@@ -2513,23 +2530,23 @@ yyreduce:
g_lingo->code1(skipEnd); ;}
break;
- case 53:
-#line 400 "engines/director/lingo/lingo-gr.y"
+ case 54:
+#line 406 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
- case 54:
-#line 403 "engines/director/lingo/lingo-gr.y"
+ case 55:
+#line 409 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
- case 55:
-#line 406 "engines/director/lingo/lingo-gr.y"
+ case 56:
+#line 412 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
- case 58:
-#line 411 "engines/director/lingo/lingo-gr.y"
+ case 59:
+#line 417 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_whencode);
g_lingo->code1(STOP);
@@ -2537,82 +2554,87 @@ yyreduce:
delete (yyvsp[(2) - (3)].s); ;}
break;
- case 59:
-#line 417 "engines/director/lingo/lingo-gr.y"
+ case 60:
+#line 423 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_tellcode);
g_lingo->code1(STOP); ;}
break;
- case 60:
-#line 421 "engines/director/lingo/lingo-gr.y"
+ case 61:
+#line 427 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt((yyvsp[(1) - (1)].i)); ;}
break;
- case 61:
-#line 424 "engines/director/lingo/lingo-gr.y"
+ case 62:
+#line 430 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_floatpush);
g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;}
break;
- case 62:
-#line 427 "engines/director/lingo/lingo-gr.y"
+ case 63:
+#line 433 "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 63:
-#line 430 "engines/director/lingo/lingo-gr.y"
+ case 64:
+#line 436 "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 65:
-#line 434 "engines/director/lingo/lingo-gr.y"
+#line 439 "engines/director/lingo/lingo-gr.y"
{
- g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
+ (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 66:
-#line 437 "engines/director/lingo/lingo-gr.y"
+#line 445 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = (yyvsp[(1) - (1)].code); ;}
+ break;
+
+ case 68:
+#line 447 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
+ delete (yyvsp[(1) - (1)].s); ;}
+ break;
+
+ case 69:
+#line 450 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 67:
-#line 440 "engines/director/lingo/lingo-gr.y"
+ case 70:
+#line 453 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
- case 68:
-#line 441 "engines/director/lingo/lingo-gr.y"
+ case 71:
+#line 454 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
break;
- case 69:
-#line 442 "engines/director/lingo/lingo-gr.y"
+ case 72:
+#line 455 "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 70:
-#line 445 "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 71:
-#line 449 "engines/director/lingo/lingo-gr.y"
+ case 73:
+#line 458 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2623,8 +2645,8 @@ yyreduce:
g_lingo->code2(e, f); ;}
break;
- case 72:
-#line 457 "engines/director/lingo/lingo-gr.y"
+ case 74:
+#line 466 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_theentitypush);
inst e = 0, f = 0;
@@ -2633,395 +2655,395 @@ yyreduce:
g_lingo->code2(e, f); ;}
break;
- case 74:
-#line 464 "engines/director/lingo/lingo-gr.y"
+ case 76:
+#line 473 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_add); ;}
break;
- case 75:
-#line 465 "engines/director/lingo/lingo-gr.y"
+ case 77:
+#line 474 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_sub); ;}
break;
- case 76:
-#line 466 "engines/director/lingo/lingo-gr.y"
+ case 78:
+#line 475 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mul); ;}
break;
- case 77:
-#line 467 "engines/director/lingo/lingo-gr.y"
+ case 79:
+#line 476 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_div); ;}
break;
- case 78:
-#line 468 "engines/director/lingo/lingo-gr.y"
+ case 80:
+#line 477 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mod); ;}
break;
- case 79:
-#line 469 "engines/director/lingo/lingo-gr.y"
+ case 81:
+#line 478 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gt); ;}
break;
- case 80:
-#line 470 "engines/director/lingo/lingo-gr.y"
+ case 82:
+#line 479 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lt); ;}
break;
- case 81:
-#line 471 "engines/director/lingo/lingo-gr.y"
+ case 83:
+#line 480 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_eq); ;}
break;
- case 82:
-#line 472 "engines/director/lingo/lingo-gr.y"
+ case 84:
+#line 481 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_neq); ;}
break;
- case 83:
-#line 473 "engines/director/lingo/lingo-gr.y"
+ case 85:
+#line 482 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ge); ;}
break;
- case 84:
-#line 474 "engines/director/lingo/lingo-gr.y"
+ case 86:
+#line 483 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_le); ;}
break;
- case 85:
-#line 475 "engines/director/lingo/lingo-gr.y"
+ case 87:
+#line 484 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_and); ;}
break;
- case 86:
-#line 476 "engines/director/lingo/lingo-gr.y"
+ case 88:
+#line 485 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_or); ;}
break;
- case 87:
-#line 477 "engines/director/lingo/lingo-gr.y"
+ case 89:
+#line 486 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_not); ;}
break;
- case 88:
-#line 478 "engines/director/lingo/lingo-gr.y"
+ case 90:
+#line 487 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ampersand); ;}
break;
- case 89:
-#line 479 "engines/director/lingo/lingo-gr.y"
+ case 91:
+#line 488 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_concat); ;}
break;
- case 90:
-#line 480 "engines/director/lingo/lingo-gr.y"
+ case 92:
+#line 489 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_contains); ;}
break;
- case 91:
-#line 481 "engines/director/lingo/lingo-gr.y"
+ case 93:
+#line 490 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_starts); ;}
break;
- case 92:
-#line 482 "engines/director/lingo/lingo-gr.y"
+ case 94:
+#line 491 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); ;}
break;
- case 93:
-#line 483 "engines/director/lingo/lingo-gr.y"
+ case 95:
+#line 492 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;}
break;
- case 94:
-#line 484 "engines/director/lingo/lingo-gr.y"
+ case 96:
+#line 493 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
- case 95:
-#line 485 "engines/director/lingo/lingo-gr.y"
+ case 97:
+#line 494 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_arraypush); g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;}
break;
- case 96:
-#line 486 "engines/director/lingo/lingo-gr.y"
+ case 98:
+#line 495 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_intersects); ;}
break;
- case 97:
-#line 487 "engines/director/lingo/lingo-gr.y"
+ case 99:
+#line 496 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_within); ;}
break;
- case 98:
-#line 488 "engines/director/lingo/lingo-gr.y"
+ case 100:
+#line 497 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charOf); ;}
break;
- case 99:
-#line 489 "engines/director/lingo/lingo-gr.y"
+ case 101:
+#line 498 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charToOf); ;}
break;
- case 100:
-#line 490 "engines/director/lingo/lingo-gr.y"
+ case 102:
+#line 499 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemOf); ;}
break;
- case 101:
-#line 491 "engines/director/lingo/lingo-gr.y"
+ case 103:
+#line 500 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemToOf); ;}
break;
- case 102:
-#line 492 "engines/director/lingo/lingo-gr.y"
+ case 104:
+#line 501 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineOf); ;}
break;
- case 103:
-#line 493 "engines/director/lingo/lingo-gr.y"
+ case 105:
+#line 502 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineToOf); ;}
break;
- case 104:
-#line 494 "engines/director/lingo/lingo-gr.y"
+ case 106:
+#line 503 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordOf); ;}
break;
- case 105:
-#line 495 "engines/director/lingo/lingo-gr.y"
+ case 107:
+#line 504 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordToOf); ;}
break;
- case 106:
-#line 498 "engines/director/lingo/lingo-gr.y"
+ case 108:
+#line 507 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 107:
-#line 503 "engines/director/lingo/lingo-gr.y"
+ case 109:
+#line 512 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_printtop); ;}
break;
- case 110:
-#line 506 "engines/director/lingo/lingo-gr.y"
+ case 112:
+#line 515 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_exitRepeat); ;}
break;
- case 111:
-#line 507 "engines/director/lingo/lingo-gr.y"
+ case 113:
+#line 516 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_procret); ;}
break;
- case 115:
-#line 511 "engines/director/lingo/lingo-gr.y"
+ case 117:
+#line 520 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
- case 116:
-#line 514 "engines/director/lingo/lingo-gr.y"
+ case 118:
+#line 523 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 117:
-#line 517 "engines/director/lingo/lingo-gr.y"
+ case 119:
+#line 526 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 118:
-#line 520 "engines/director/lingo/lingo-gr.y"
+ case 120:
+#line 529 "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 119:
-#line 524 "engines/director/lingo/lingo-gr.y"
+ case 121:
+#line 533 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
- case 120:
-#line 525 "engines/director/lingo/lingo-gr.y"
+ case 122:
+#line 534 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
break;
- case 121:
-#line 526 "engines/director/lingo/lingo-gr.y"
+ case 123:
+#line 535 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
break;
- case 122:
-#line 527 "engines/director/lingo/lingo-gr.y"
+ case 124:
+#line 536 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
break;
- case 123:
-#line 528 "engines/director/lingo/lingo-gr.y"
+ case 125:
+#line 537 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_open); ;}
break;
- case 124:
-#line 529 "engines/director/lingo/lingo-gr.y"
+ case 126:
+#line 538 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;}
break;
- case 125:
-#line 530 "engines/director/lingo/lingo-gr.y"
+ case 127:
+#line 539 "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 126:
-#line 533 "engines/director/lingo/lingo-gr.y"
+ case 128:
+#line 542 "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 127:
-#line 534 "engines/director/lingo/lingo-gr.y"
+ case 129:
+#line 543 "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 128:
-#line 537 "engines/director/lingo/lingo-gr.y"
+ case 130:
+#line 546 "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 129:
-#line 538 "engines/director/lingo/lingo-gr.y"
+ case 131:
+#line 547 "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 130:
-#line 541 "engines/director/lingo/lingo-gr.y"
+ case 132:
+#line 550 "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 131:
-#line 542 "engines/director/lingo/lingo-gr.y"
+ case 133:
+#line 551 "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 132:
-#line 553 "engines/director/lingo/lingo-gr.y"
+ case 134:
+#line 562 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoloop); ;}
break;
- case 133:
-#line 554 "engines/director/lingo/lingo-gr.y"
+ case 135:
+#line 563 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotonext); ;}
break;
- case 134:
-#line 555 "engines/director/lingo/lingo-gr.y"
+ case 136:
+#line 564 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoprevious); ;}
break;
- case 135:
-#line 556 "engines/director/lingo/lingo-gr.y"
+ case 137:
+#line 565 "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 136:
-#line 560 "engines/director/lingo/lingo-gr.y"
+ case 138:
+#line 569 "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 137:
-#line 564 "engines/director/lingo/lingo-gr.y"
+ case 139:
+#line 573 "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 142:
-#line 578 "engines/director/lingo/lingo-gr.y"
+ case 144:
+#line 587 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_playdone); ;}
break;
- case 143:
-#line 579 "engines/director/lingo/lingo-gr.y"
+ case 145:
+#line 588 "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 144:
-#line 583 "engines/director/lingo/lingo-gr.y"
+ case 146:
+#line 592 "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 145:
-#line 587 "engines/director/lingo/lingo-gr.y"
+ case 147:
+#line 596 "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 146:
-#line 591 "engines/director/lingo/lingo-gr.y"
+ case 148:
+#line 600 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); ;}
break;
- case 147:
-#line 591 "engines/director/lingo/lingo-gr.y"
+ case 149:
+#line 600 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;}
break;
- case 148:
-#line 621 "engines/director/lingo/lingo-gr.y"
+ case 150:
+#line 630 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;}
break;
- case 149:
-#line 622 "engines/director/lingo/lingo-gr.y"
+ case 151:
+#line 631 "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 150:
-#line 626 "engines/director/lingo/lingo-gr.y"
+ case 152:
+#line 635 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;}
break;
- case 151:
-#line 627 "engines/director/lingo/lingo-gr.y"
+ case 153:
+#line 636 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = true; ;}
break;
- case 152:
-#line 628 "engines/director/lingo/lingo-gr.y"
+ case 154:
+#line 637 "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 153:
-#line 632 "engines/director/lingo/lingo-gr.y"
+ case 155:
+#line 641 "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));
@@ -3031,8 +3053,8 @@ yyreduce:
checkEnd((yyvsp[(7) - (8)].s), (yyvsp[(1) - (8)].s)->c_str(), false); ;}
break;
- case 154:
-#line 639 "engines/director/lingo/lingo-gr.y"
+ case 156:
+#line 648 "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));
@@ -3040,38 +3062,38 @@ yyreduce:
g_lingo->_ignoreMe = false; ;}
break;
- case 155:
-#line 645 "engines/director/lingo/lingo-gr.y"
+ case 157:
+#line 654 "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 156:
-#line 647 "engines/director/lingo/lingo-gr.y"
+ case 158:
+#line 656 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
- case 157:
-#line 648 "engines/director/lingo/lingo-gr.y"
+ case 159:
+#line 657 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
break;
- case 158:
-#line 649 "engines/director/lingo/lingo-gr.y"
+ case 160:
+#line 658 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
- case 159:
-#line 650 "engines/director/lingo/lingo-gr.y"
+ case 161:
+#line 659 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
break;
- case 163:
-#line 658 "engines/director/lingo/lingo-gr.y"
+ case 165:
+#line 667 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); ;}
break;
- case 164:
-#line 662 "engines/director/lingo/lingo-gr.y"
+ case 166:
+#line 671 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_call);
g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
@@ -3080,34 +3102,34 @@ yyreduce:
g_lingo->code1(numpar); ;}
break;
- case 165:
-#line 670 "engines/director/lingo/lingo-gr.y"
+ case 167:
+#line 679 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
- case 166:
-#line 671 "engines/director/lingo/lingo-gr.y"
+ case 168:
+#line 680 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
- case 167:
-#line 672 "engines/director/lingo/lingo-gr.y"
+ case 169:
+#line 681 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
- case 168:
-#line 675 "engines/director/lingo/lingo-gr.y"
+ case 170:
+#line 684 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
- case 169:
-#line 676 "engines/director/lingo/lingo-gr.y"
+ case 171:
+#line 685 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
/* Line 1267 of yacc.c. */
-#line 3111 "engines/director/lingo/lingo-gr.cpp"
+#line 3133 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3321,6 +3343,6 @@ yyreturn:
}
-#line 679 "engines/director/lingo/lingo-gr.y"
+#line 688 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 1703cfbf23..53e313dae8 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -104,7 +104,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%token tON tME
%type<code> asgn begin elseif elsestmtoneliner end expr if when repeatwhile
-%type<code> repeatwith stmtlist tell reference
+%type<code> repeatwith stmtlist tell reference simpleexpr
%type<narg> argdef arglist nonemptyarglist
%type<s> on
@@ -190,6 +190,12 @@ asgn: tPUT expr tINTO ID {
g_lingo->codeInt($2[0]);
g_lingo->codeInt($2[1]);
$$ = $5; }
+ | tSET THEENTITYWITHID simpleexpr tEQ 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; }
;
stmtoneliner: macro
@@ -418,7 +424,7 @@ tell: tTELL {
$$ = g_lingo->code1(g_lingo->c_tellcode);
g_lingo->code1(STOP); }
-expr: INT {
+simpleexpr: INT {
$$ = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt($1); }
| FLOAT {
@@ -430,6 +436,13 @@ expr: INT {
| STRING {
$$ = g_lingo->code1(g_lingo->c_stringpush);
g_lingo->codeString($1->c_str()); }
+ | ID {
+ $$ = g_lingo->code1(g_lingo->c_eval);
+ g_lingo->codeString($1->c_str());
+ delete $1; }
+ ;
+
+expr: simpleexpr { $$ = $1; }
| reference
| FBLTINNOARGS {
g_lingo->codeFunc($1, 0);
@@ -442,10 +455,6 @@ expr: INT {
| ID '(' arglist ')' {
$$ = g_lingo->codeFunc($1, $3);
delete $1; }
- | ID {
- $$ = g_lingo->code1(g_lingo->c_eval);
- g_lingo->codeString($1->c_str());
- delete $1; }
| THEENTITY {
$$ = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
diff --git a/engines/director/lingo/tests/the.lingo b/engines/director/lingo/tests/the.lingo
index 8110c9d0ae..5e0432ed5b 100644
--- a/engines/director/lingo/tests/the.lingo
+++ b/engines/director/lingo/tests/the.lingo
@@ -14,3 +14,4 @@ set a = 5
set gravityConst = the value of ( the text of cast A14)
set the hilite of cast A32 to (a = 3)
+set the text of cast A14 = string( gravityConst )