aboutsummaryrefslogtreecommitdiff
path: root/engines/director
diff options
context:
space:
mode:
Diffstat (limited to 'engines/director')
-rw-r--r--engines/director/lingo/lingo-gr.cpp1328
-rw-r--r--engines/director/lingo/lingo-gr.y39
2 files changed, 692 insertions, 675 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 5b124aa2ff..870bebf50c 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -540,7 +540,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 127
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1751
+#define YYLAST 1782
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 106
@@ -604,11 +604,11 @@ static const yytype_uint8 yytranslate[] =
static const yytype_uint16 yyprhs[] =
{
0, 0, 3, 7, 9, 12, 14, 16, 18, 20,
- 21, 23, 25, 27, 32, 37, 42, 47, 52, 57,
- 63, 68, 73, 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, 240, 241, 242, 245, 249, 251, 253, 254, 255,
+ 22, 23, 25, 27, 29, 34, 39, 44, 49, 54,
+ 59, 65, 70, 75, 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,
256, 259, 262, 266, 268, 270, 272, 274, 276, 278,
280, 283, 286, 291, 296, 298, 300, 303, 305, 309,
313, 317, 321, 325, 329, 333, 337, 341, 345, 349,
@@ -626,37 +626,37 @@ static const yytype_uint16 yyprhs[] =
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 107, 0, -1, 107, 108, 112, -1, 112, -1, 1,
+ 107, 0, -1, 107, 108, 113, -1, 113, -1, 1,
108, -1, 98, -1, 53, -1, 58, -1, 36, -1,
- -1, 145, -1, 152, -1, 115, -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, 134,
- -1, 136, -1, 114, -1, 116, -1, 125, 122, 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, 114, 130, -1,
- 133, 134, 108, 131, 130, 32, -1, 133, 134, 54,
- 134, -1, 127, 122, 109, 131, 130, 32, -1, 127,
- 122, 109, 131, 130, 110, 131, 130, 32, -1, 127,
- 122, 109, 131, 130, 129, 118, 130, 32, -1, 127,
- 122, 109, 131, 130, 110, 129, 114, 130, -1, 127,
- 122, 52, 129, 114, 130, 119, 130, 117, 130, -1,
- 127, 122, 52, 129, 114, 130, 110, 129, 114, 130,
- -1, 127, 122, 52, 129, 114, 130, -1, -1, 110,
- 129, 114, -1, 118, 121, -1, 121, -1, 119, 120,
- -1, 120, -1, 128, 122, 52, 129, 115, 130, -1,
- 119, -1, 128, 122, 52, 129, 131, 130, -1, 128,
- 122, 53, 129, 131, 130, -1, 123, 134, 124, -1,
+ 52, -1, -1, 145, -1, 152, -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, 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, -1, 131, 108, -1, 131,
- 115, -1, 55, 28, 52, -1, 87, -1, 12, -1,
+ 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, 113, -1, 134, 93, 134, -1, 134,
+ 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,
@@ -697,24 +697,24 @@ static const yytype_int16 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 121, 121, 122, 123, 126, 131, 136, 141, 146,
- 147, 148, 149, 152, 158, 161, 162, 163, 169, 176,
- 182, 188, 195, 203, 204, 207, 208, 213, 226, 244,
- 258, 263, 266, 271, 281, 293, 305, 315, 325, 335,
- 347, 348, 351, 352, 355, 356, 359, 367, 368, 374,
- 382, 385, 388, 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
+ 0, 121, 121, 122, 123, 126, 133, 140, 147, 154,
+ 157, 158, 159, 160, 163, 169, 172, 173, 174, 180,
+ 187, 193, 199, 206, 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
};
#endif
@@ -739,14 +739,14 @@ static const char *const yytname[] =
"tINTERSECTS", "tWITHIN", "tTELL", "tPROPERTY", "tON", "tME", "'='",
"'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "'>'",
"'<'", "'['", "']'", "','", "$accept", "program", "nl", "thennl",
- "nlelse", "nlelsif", "programline", "asgn", "stmtoneliner", "stmt",
- "ifstmt", "elsestmtoneliner", "elseifstmt", "elseifstmtoneliner",
- "elseifstmtoneliner1", "elseifstmt1", "cond", "begincond", "endcond",
- "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
+ "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",
+ "instancelist", "gotofunc", "gotoframe", "gotomovie", "playfunc", "@1",
+ "defn", "@2", "@3", "on", "argdef", "endargdef", "argstore", "macro",
+ "arglist", "nonemptyarglist", 0
};
#endif
@@ -773,10 +773,10 @@ static const yytype_uint16 yytoknum[] =
static const yytype_uint8 yyr1[] =
{
0, 106, 107, 107, 107, 108, 109, 110, 111, 112,
- 112, 112, 112, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 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,
+ 113, 113, 113, 113, 114, 114, 114, 114, 114, 114,
+ 114, 114, 114, 114, 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,
@@ -795,12 +795,12 @@ static const yytype_uint8 yyr1[] =
/* 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, 0,
- 1, 1, 1, 4, 4, 4, 4, 4, 4, 5,
- 4, 4, 5, 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,
- 3, 0, 0, 2, 3, 1, 1, 0, 0, 0,
+ 0, 2, 3, 1, 2, 1, 1, 1, 1, 1,
+ 0, 1, 1, 1, 4, 4, 4, 4, 4, 4,
+ 5, 4, 4, 5, 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, 0,
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,
@@ -825,102 +825,102 @@ static const yytype_uint8 yydefact[] =
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,
- 25, 12, 26, 51, 0, 51, 0, 0, 23, 68,
- 24, 112, 113, 10, 57, 11, 5, 4, 74, 0,
+ 26, 13, 27, 52, 0, 52, 0, 0, 24, 68,
+ 25, 112, 113, 11, 57, 12, 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, 9, 59,
+ 159, 0, 96, 97, 0, 170, 0, 1, 10, 59,
0, 0, 0, 58, 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, 62, 57,
- 0, 148, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 98, 99, 0, 2, 58,
- 52, 58, 57, 6, 59, 30, 0, 59, 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, 50, 0, 0, 58, 32, 58,
- 0, 167, 0, 22, 19, 0, 0, 0, 0, 0,
- 0, 27, 0, 0, 58, 57, 0, 162, 0, 59,
- 167, 167, 103, 105, 107, 109, 126, 0, 58, 39,
- 33, 7, 57, 0, 31, 163, 158, 59, 59, 58,
- 59, 8, 57, 56, 58, 45, 51, 0, 58, 58,
- 47, 43, 51, 164, 153, 156, 59, 58, 0, 44,
- 40, 0, 58, 0, 42, 0, 0, 165, 157, 58,
- 0, 58, 57, 58, 57, 36, 34, 35, 57, 57,
- 0, 0, 28, 38, 0, 37, 0, 59, 59, 166,
- 29, 41, 58, 58, 58, 46, 48, 49
+ 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,
+ 58, 51, 58, 6, 59, 57, 31, 0, 59, 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, 14, 15, 16, 17, 22,
+ 19, 0, 0, 21, 18, 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, 23, 20, 0, 0, 0, 0, 0,
+ 0, 28, 0, 0, 57, 58, 0, 162, 0, 59,
+ 167, 167, 103, 105, 107, 109, 126, 0, 58, 34,
+ 7, 57, 0, 40, 32, 163, 158, 59, 59, 58,
+ 59, 0, 58, 8, 56, 58, 48, 46, 44, 52,
+ 57, 58, 52, 164, 153, 156, 59, 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, 59, 59, 39, 0, 38, 0, 166,
+ 30, 58, 58, 58, 42, 50, 47, 49
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 47, 261, 204, 302, 313, 48, 49, 50, 262,
- 52, 343, 319, 320, 315, 321, 129, 130, 264, 53,
- 54, 55, 316, 152, 205, 199, 56, 57, 58, 59,
+ -1, 47, 262, 204, 301, 314, 179, 48, 49, 50,
+ 263, 52, 348, 315, 316, 317, 318, 129, 130, 53,
+ 54, 55, 322, 152, 206, 200, 56, 57, 58, 59,
60, 86, 119, 111, 61, 94, 95, 62, 83, 63,
- 168, 179, 64, 226, 338, 289, 65, 161, 75
+ 168, 180, 64, 227, 338, 289, 65, 161, 75
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -293
+#define YYPACT_NINF -288
static const yytype_int16 yypact[] =
{
- 358, -74, -293, -293, 1015, -293, -293, 1015, 1015, 1055,
- 29, -293, 1015, 1128, 1015, 1168, -293, -293, -293, 5,
- 39, 901, -293, 41, 1015, 52, 77, 43, 57, 61,
- 1015, 942, 69, 1015, 1015, 1015, 1015, 1015, 1015, -293,
- 71, 105, 58, 1015, 1015, 1015, 1015, 4, -293, -293,
- -293, -293, -293, -293, -8, -293, 818, 1015, 1649, -293,
- -293, -293, -293, -293, -293, -293, -293, -293, 72, 1015,
- 1649, 1649, 1649, 1015, 1649, 63, 1015, 1649, 1015, 63,
- 1649, 1015, 63, 1015, -293, -293, 75, 1015, -293, 1015,
- -293, 129, -293, 1649, -20, -293, -293, 1203, 153, -293,
- -44, 1015, -38, 140, -293, -293, 1543, -293, -20, -293,
- -293, 89, -51, 1237, 1271, 1305, 1339, 1577, -293, 90,
- -293, 169, -51, -51, 1611, 1649, 12, -293, 450, -293,
- 1015, 1015, 66, -293, 794, 1015, 1015, 1015, 1015, 1015,
- 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015,
- 1015, 1015, 170, 1015, 1203, 1611, -2, 1015, 94, 22,
- 1611, 53, 94, 172, 1649, 1649, 1015, -293, -293, 135,
- 1015, 1015, -293, 1015, 1015, 1509, 1015, 1015, -293, -293,
- 1015, -293, 173, 1015, 1015, 1015, 1015, 1015, 1015, 1015,
- 1015, 1015, 1015, 175, 54, -293, -293, 1015, -293, 634,
- 1649, 1649, -293, -293, -293, -293, 1015, -293, 19, 19,
- 19, 19, 259, 259, -51, 1649, 19, 19, 30, -36,
- -36, -51, -51, 1649, 1649, -293, -4, -293, 1649, -293,
- -293, -293, 1649, 170, -293, -293, 1649, 1649, 1649, 1649,
- 1015, 1015, 1649, 1649, 170, 1649, -293, 1649, 1373, 1649,
- 1407, 1649, 1441, 1649, 1475, 1649, 1649, -293, -293, 1015,
- 1649, -293, -293, 174, -293, 27, 818, 634, 1649, 634,
- 179, 103, -4, 1649, 1649, -4, 1015, 1015, 1015, 1015,
- 55, -293, 155, 1015, -293, -27, 180, -293, 185, -293,
- 103, 103, 1649, 1649, 1649, 1649, -293, 1015, 1649, 16,
- -293, -293, 8, 178, -293, -293, 542, -293, -293, 1649,
- -293, -293, -293, -293, 178, -293, -293, 818, 634, 178,
- 178, -293, -293, 187, 634, 634, -293, 634, 818, -293,
- 158, 165, -293, 186, -293, 189, 114, -293, 118, 634,
- 192, -293, -293, -293, -293, -293, -293, -293, -293, -293,
- 191, 193, -293, -293, 818, -293, 726, 726, -293, -293,
- -293, -293, -293, 634, 634, -293, -293, -293
+ 355, -71, -288, -288, 1012, -288, -288, 1012, 1012, 1052,
+ 48, -288, 1012, 1125, 1012, 1165, -288, -288, -288, 16,
+ 74, 898, -288, 83, 1012, 52, 41, 92, 99, 105,
+ 1012, 939, 133, 1012, 1012, 1012, 1012, 1012, 1012, -288,
+ 135, 136, 67, 1012, 1012, 1012, 1012, 5, -288, -288,
+ -288, -288, -288, -288, 77, -288, 815, 1012, 1646, -288,
+ -288, -288, -288, -288, -288, -288, -288, -288, 68, 1012,
+ 1646, 1646, 1646, 1012, 1646, 66, 1012, 1646, 1012, 66,
+ 1646, 1012, 66, 1012, -288, -288, 89, 1012, -288, 1012,
+ -288, 134, -288, 1646, 38, -288, -288, 1200, 153, -288,
+ -39, 1012, -32, 130, -288, -288, 1540, -288, 38, -288,
+ -288, 90, 76, 1234, 1268, 1302, 1336, 1574, -288, 91,
+ -288, 170, 76, 76, 1608, 1646, 14, -288, 447, -288,
+ 1012, 1012, 71, -288, 791, 1012, 1012, 1012, 1012, 1012,
+ 1012, 1012, 1012, 1012, 1012, 1012, 1012, 1012, 1012, 1012,
+ 1012, 1012, 171, 1012, 1200, 1608, -74, 1012, 95, -43,
+ 1608, -35, 95, 174, 1646, 1646, 1012, -288, -288, 127,
+ 1012, 1012, -288, 1012, 1012, 1506, 1012, 1012, -288, -288,
+ -288, 1012, -288, 176, 1012, 1012, 1012, 1012, 1012, 1012,
+ 1012, 1012, 1012, 1012, 179, -4, -288, -288, 1012, -288,
+ 631, 1646, 1646, -288, -288, -288, -288, 1012, -288, -3,
+ -3, -3, -3, 1680, 1680, 76, 1646, -3, -3, 20,
+ 30, 30, 76, 76, 1646, 1646, -288, -38, -288, 1646,
+ -288, -288, -288, 1646, 171, -288, -288, 1646, 1646, 1646,
+ 1646, 1012, 1012, 1646, 1646, 171, 1646, -288, 1646, 1370,
+ 1646, 1404, 1646, 1438, 1646, 1472, 1646, 1646, -288, -288,
+ 1012, 1646, -288, -288, 177, 27, 631, 815, 1646, 631,
+ 182, 106, -38, 1646, 1646, -38, 1012, 1012, 1012, 1012,
+ 12, -288, 159, 1012, -8, -288, 183, -288, 186, -288,
+ 106, 106, 1646, 1646, 1646, 1646, -288, 1012, 1646, -288,
+ -288, 8, 180, -11, -288, -288, 539, -288, -288, 1646,
+ -288, 815, 631, -288, -288, 180, 180, -288, -288, -288,
+ -288, 180, -288, 191, 631, 631, -288, 631, -288, 189,
+ -288, 192, -288, 71, 815, 167, 130, -288, 121, 631,
+ 195, -288, -288, -288, -288, -288, -288, -288, -288, -288,
+ 200, 197, -288, -288, 723, -288, 815, -288, 723, -288,
+ -288, 631, -288, 631, -288, -288, -288, -288
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -293, -293, 17, -293, -282, -293, 98, -293, -55, 0,
- -293, -293, -293, -72, -292, -91, -53, -293, -293, -293,
- -293, -293, -249, -92, 3, -43, -293, -293, -1, 60,
- -293, -293, -293, -293, -293, 199, -16, -293, -293, -293,
- -293, -293, -293, -171, -293, -113, -293, -37, 6
+ -288, -288, 17, -103, -287, -288, -128, 103, -288, -55,
+ 0, -288, -288, -288, -70, -211, -83, -53, -288, -288,
+ -288, -288, -264, -127, 1, -46, -288, -288, -1, 65,
+ -288, -288, -288, -288, -288, 204, -21, -288, -288, -288,
+ -288, -288, -288, -217, -288, -131, -288, -37, 6
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -930,287 +930,301 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -60
static const yytype_int16 yytable[] =
{
- 51, 133, 132, 70, 127, 300, 71, 72, 74, 126,
- 173, 77, 74, 80, 74, 109, 176, 312, 67, 79,
- 93, 82, 329, 97, 66, 89, 142, 91, 329, 106,
- 93, 301, 112, 113, 114, 115, 116, 117, 141, 158,
- -59, 142, 122, 123, 124, 125, 162, 174, 342, -59,
- 150, 151, 311, 177, 322, 84, 134, 76, -59, 148,
- 149, 282, 272, -59, 128, 150, 151, 85, 154, 96,
- 322, 103, 155, 275, 301, 125, 233, 155, 167, 156,
- 160, 283, 125, 131, 159, 104, 164, 244, 165, 105,
- 100, 101, 181, 141, 66, -59, 142, 110, 227, 118,
- 175, 270, 66, 157, 141, 102, -59, 142, 98, 99,
- 266, 145, 146, 147, 148, 149, 196, 197, 202, 203,
- 150, 151, 229, 146, 147, 148, 149, 157, 51, 200,
- 201, 150, 151, 120, 208, 209, 210, 211, 212, 213,
- 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 207, 125, 230, 258, 296, 228, 121, 197, 259,
- 197, 267, 14, 234, 269, 232, 348, 349, 157, 236,
- 237, 153, 238, 239, 166, 242, 243, 307, 308, 245,
- 163, 172, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 256, 178, 303, 182, 193, 260, 194, 225, 197,
- 231, 246, 263, 257, 265, 268, 281, 287, 288, 297,
- 317, 284, 304, 305, 311, 337, 301, 344, 346, 359,
- 328, 347, 280, 350, 352, 360, 198, 314, 334, 235,
- 108, 0, 0, 0, 0, 0, 0, 0, 0, 273,
- 274, 0, 0, 271, 0, 0, 306, 0, 0, 0,
- 354, 0, 356, 0, 0, 0, 357, 358, 125, 318,
- 0, 0, 332, 331, 324, 325, 0, 327, 0, 336,
- 285, 0, 286, 341, 0, 292, 293, 294, 295, 0,
- 0, 0, 298, 339, 0, 0, 0, 299, 0, 290,
- 0, 0, 291, 0, 0, 0, 309, 0, 0, 361,
- 0, 310, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 326, 0, 363, 364, 0, 330, 0, 0,
- 0, 333, 335, 0, 135, 136, 0, 0, 137, 138,
- 340, 0, 0, 141, 0, 345, 142, 143, 144, 0,
- 0, 0, 351, 0, 353, 0, 355, 0, 0, 0,
- 0, 145, 146, 147, 148, 149, 362, 362, -9, 1,
- 150, 151, 0, 0, 0, 365, 366, 367, 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,
- 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, 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, 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,
- 68, 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, 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, 68, 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, 68, 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, 68, 16, 206, 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,
+ 51, 133, 132, 70, 205, 127, 71, 72, 74, 126,
+ 109, 77, 74, 80, 74, 173, 320, 272, 67, 79,
+ 93, 82, 176, 97, 299, 313, 228, 66, 275, 106,
+ 93, 157, 112, 113, 114, 115, 116, 117, 319, 158,
+ -59, 234, 122, 123, 124, 125, 162, 300, 347, -59,
+ 300, 319, 174, 245, 100, 101, 134, 230, -59, 177,
+ 66, 282, 157, -59, 128, 231, 84, 270, 154, 102,
+ 198, 141, 155, 167, 142, 125, 76, 155, 267, 156,
+ 160, 283, 125, 89, 159, 91, 164, 182, 165, 145,
+ 146, 147, 148, 149, 141, -59, 259, 142, 150, 151,
+ 175, 260, 85, 66, 141, 332, -59, 142, 98, 99,
+ 332, 96, 296, 146, 147, 148, 149, 198, 197, 198,
+ 103, 150, 151, 178, 203, 148, 149, 104, 51, 201,
+ 202, 150, 151, 105, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+ 225, 208, 125, 142, 14, 235, 229, 302, 266, 307,
+ 308, 110, 269, 118, 120, 233, 121, 153, 131, 237,
+ 238, 157, 239, 240, 311, 243, 244, 150, 151, 166,
+ 246, 172, 178, 248, 249, 250, 251, 252, 253, 254,
+ 255, 256, 257, 334, 163, 183, 194, 261, 195, 226,
+ 198, 264, 232, 265, 247, 345, 268, 258, 349, 281,
+ 287, 288, 285, 297, 305, 304, 313, 353, 354, 337,
+ 356, 342, 358, 280, 343, 300, 350, 352, 359, 360,
+ 344, 199, 330, 321, 236, 108, 0, 0, 0, 0,
+ 273, 274, 0, 306, 271, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 312, 328, 0, 0, 125,
+ 0, 324, 325, 0, 327, 0, 333, 284, 0, 336,
+ 286, 0, 0, 0, 0, 292, 293, 294, 295, 346,
+ 339, 0, 298, 0, 0, 0, 303, 0, 0, 290,
+ 0, 0, 291, 0, 0, 0, 309, 0, 0, 310,
+ 0, 364, 0, 0, 0, 0, 0, 361, 363, 0,
+ 326, 0, 0, 329, 0, 0, 331, 0, 0, 0,
+ 0, 0, 335, 0, 0, 0, 0, 0, 340, 341,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 351, 0, 0, 0, 0, 0, 0, 355, 0, 357,
+ 0, 0, 0, 0, 362, -10, 1, 0, 362, 0,
+ 0, 0, 365, 366, 367, 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, 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, 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, 68, 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, 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, 68,
+ 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, 68, 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, 68, 16, 207, 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, 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, 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,
+ 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, 45, 14, 68, 16, 46, 17, 0, 0, 0,
+ 13, 73, 14, 68, 16, 46, 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, 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,
- 2, 3, 4, 5, 0, 0, 0, 0, 43, 44,
- 0, 11, 12, 13, 73, 14, 68, 16, 46, 17,
+ 0, 0, 169, 0, 0, 34, 35, 36, 37, 38,
+ 0, 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,
+ 0, 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, 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, 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, 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, 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, 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, 169, 0, 0, 34, 35,
- 36, 37, 38, 0, 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, 0, 183, 0, 0, 0, 0, 0,
- 0, 184, 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, 185, 0,
- 0, 0, 0, 0, 0, 186, 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, 187, 0, 0, 0, 0, 0, 0, 188,
- 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, 189, 0, 0, 0,
- 0, 0, 0, 190, 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,
- 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, 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, 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, 240, 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, 180,
- 241, 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, 191, 192, 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, 195, 150, 151, 135, 136, 0, 0, 137, 138,
- 139, 140, 0, 141, 0, 0, 142, 143, 144, 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,
+ 241, 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, 242, 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,
- 0, 145, 146, 147, 148, 149, 0, 0, 0, 0,
- 150, 151
+ 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, 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
};
static const yytype_int16 yycheck[] =
{
- 0, 56, 55, 4, 0, 32, 7, 8, 9, 46,
- 54, 12, 13, 14, 15, 31, 54, 299, 1, 13,
- 21, 15, 314, 24, 98, 45, 77, 47, 320, 30,
- 31, 58, 33, 34, 35, 36, 37, 38, 74, 76,
- 32, 77, 43, 44, 45, 46, 83, 91, 330, 41,
- 101, 102, 36, 91, 303, 50, 57, 28, 50, 95,
- 96, 34, 233, 55, 47, 101, 102, 28, 69, 28,
- 319, 28, 73, 244, 58, 76, 168, 78, 94, 73,
- 81, 54, 83, 91, 78, 28, 87, 179, 89, 28,
- 13, 14, 108, 74, 98, 87, 77, 28, 100, 28,
- 101, 105, 98, 105, 74, 28, 98, 77, 56, 57,
- 202, 92, 93, 94, 95, 96, 104, 105, 52, 53,
- 101, 102, 100, 93, 94, 95, 96, 105, 128, 130,
+ 0, 56, 55, 4, 132, 0, 7, 8, 9, 46,
+ 31, 12, 13, 14, 15, 54, 303, 234, 1, 13,
+ 21, 15, 54, 24, 32, 36, 100, 98, 245, 30,
+ 31, 105, 33, 34, 35, 36, 37, 38, 302, 76,
+ 32, 168, 43, 44, 45, 46, 83, 58, 335, 41,
+ 58, 315, 91, 180, 13, 14, 57, 100, 50, 91,
+ 98, 34, 105, 55, 47, 100, 50, 105, 69, 28,
+ 105, 74, 73, 94, 77, 76, 28, 78, 205, 73,
+ 81, 54, 83, 45, 78, 47, 87, 108, 89, 92,
+ 93, 94, 95, 96, 74, 87, 100, 77, 101, 102,
+ 101, 105, 28, 98, 74, 316, 98, 77, 56, 57,
+ 321, 28, 100, 93, 94, 95, 96, 105, 104, 105,
+ 28, 101, 102, 52, 53, 95, 96, 28, 128, 130,
131, 101, 102, 28, 135, 136, 137, 138, 139, 140,
141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
- 151, 134, 153, 100, 100, 100, 157, 99, 105, 105,
- 105, 204, 27, 28, 207, 166, 52, 53, 105, 170,
- 171, 99, 173, 174, 45, 176, 177, 290, 291, 180,
- 105, 28, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 52, 285, 105, 105, 197, 28, 28, 105,
- 28, 28, 199, 28, 201, 206, 32, 28, 105, 54,
- 302, 266, 32, 28, 36, 28, 58, 52, 32, 28,
- 312, 32, 259, 105, 32, 32, 128, 299, 319, 169,
- 31, -1, -1, -1, -1, -1, -1, -1, -1, 240,
- 241, -1, -1, 226, -1, -1, 289, -1, -1, -1,
- 342, -1, 344, -1, -1, -1, 348, 349, 259, 302,
- -1, -1, 317, 316, 307, 308, -1, 310, -1, 322,
- 267, -1, 269, 328, -1, 276, 277, 278, 279, -1,
- -1, -1, 283, 326, -1, -1, -1, 284, -1, 272,
- -1, -1, 275, -1, -1, -1, 297, -1, -1, 354,
- -1, 298, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 309, -1, 357, 358, -1, 314, -1, -1,
- -1, 318, 319, -1, 65, 66, -1, -1, 69, 70,
- 327, -1, -1, 74, -1, 332, 77, 78, 79, -1,
- -1, -1, 339, -1, 341, -1, 343, -1, -1, -1,
- -1, 92, 93, 94, 95, 96, 356, 357, 0, 1,
- 101, 102, -1, -1, -1, 362, 363, 364, -1, -1,
- 12, 13, 14, 15, -1, 17, 18, 19, 20, 21,
+ 151, 134, 153, 77, 27, 28, 157, 284, 204, 290,
+ 291, 28, 208, 28, 28, 166, 99, 99, 91, 170,
+ 171, 105, 173, 174, 301, 176, 177, 101, 102, 45,
+ 181, 28, 52, 184, 185, 186, 187, 188, 189, 190,
+ 191, 192, 193, 320, 105, 105, 105, 198, 28, 28,
+ 105, 200, 28, 202, 28, 333, 207, 28, 336, 32,
+ 28, 105, 267, 54, 28, 32, 36, 344, 345, 28,
+ 347, 32, 349, 260, 32, 58, 105, 32, 28, 32,
+ 333, 128, 315, 303, 169, 31, -1, -1, -1, -1,
+ 241, 242, -1, 289, 227, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 301, 311, -1, -1, 260,
+ -1, 307, 308, -1, 310, -1, 319, 266, -1, 322,
+ 269, -1, -1, -1, -1, 276, 277, 278, 279, 334,
+ 326, -1, 283, -1, -1, -1, 285, -1, -1, 272,
+ -1, -1, 275, -1, -1, -1, 297, -1, -1, 298,
+ -1, 356, -1, -1, -1, -1, -1, 353, 354, -1,
+ 309, -1, -1, 312, -1, -1, 315, -1, -1, -1,
+ -1, -1, 321, -1, -1, -1, -1, -1, 327, 328,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 339, -1, -1, -1, -1, -1, -1, 346, -1, 348,
+ -1, -1, -1, -1, 354, 0, 1, -1, 358, -1,
+ -1, -1, 361, 362, 363, -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, -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, 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, -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, 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,
- -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, 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, -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, -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, -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, 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,
+ 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,
@@ -1223,69 +1237,61 @@ static const yytype_int16 yycheck[] =
-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, 42, -1, -1, 80, 81, 82, 83, 84,
+ -1, -1, -1, -1, -1, -1, -1, -1, 93, 94,
+ -1, -1, -1, -1, 99, 65, 66, -1, 103, 69,
+ 70, 71, 72, -1, 74, 75, 76, 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,
+ 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, 69, 70, 71,
+ 72, -1, 74, -1, -1, 77, 78, 79, -1, 47,
-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, 42, -1, -1, 80, 81,
- 82, 83, 84, -1, -1, -1, -1, -1, -1, -1,
- -1, 93, 94, -1, -1, -1, -1, 99, 65, 66,
- -1, 103, 69, 70, 71, 72, -1, 74, 75, 76,
- 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, 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,
- 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,
- -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,
+ 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, -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,
- -1, 92, 93, 94, 95, 96, -1, -1, -1, -1,
- 101, 102
+ 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, -1, -1, -1, 92, 93,
+ 94, 95, 96, -1, -1, 65, 66, 101, 102, 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
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1296,39 +1302,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, 112, 113,
- 114, 115, 116, 125, 126, 127, 132, 133, 134, 135,
+ 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, 122,
- 123, 91, 122, 114, 134, 65, 66, 69, 70, 71,
+ 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, 147,
- 56, 142, 105, 47, 54, 47, 54, 47, 54, 47,
- 54, 85, 86, 105, 28, 100, 104, 105, 112, 131,
- 134, 134, 52, 53, 109, 130, 54, 108, 134, 134,
+ 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,
+ 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, 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, 115, 130, 124, 130, 129, 131, 134, 131,
+ 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, 114, 130, 130, 28, 105, 151,
- 108, 108, 134, 134, 134, 134, 100, 54, 134, 130,
- 32, 58, 110, 129, 32, 28, 131, 151, 151, 134,
- 130, 36, 110, 111, 119, 120, 128, 129, 131, 118,
- 119, 121, 128, 32, 131, 131, 130, 131, 129, 120,
- 130, 122, 114, 130, 121, 130, 122, 28, 150, 131,
- 130, 114, 110, 117, 52, 130, 32, 32, 52, 53,
- 105, 130, 32, 130, 129, 130, 129, 129, 129, 28,
- 32, 114, 115, 131, 131, 130, 130, 130
+ 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
};
#define yyerrok (yyerrstatus = 0)
@@ -2152,35 +2158,44 @@ yyreduce:
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 1;
- ;}
+
+ g_lingo->_inCond = false; ;}
break;
case 6:
-#line 131 "engines/director/lingo/lingo-gr.y"
+#line 133 "engines/director/lingo/lingo-gr.y"
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 1;
- ;}
+
+ g_lingo->_inCond = false; ;}
break;
case 7:
-#line 136 "engines/director/lingo/lingo-gr.y"
+#line 140 "engines/director/lingo/lingo-gr.y"
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 5;
- ;}
+
+ g_lingo->_inCond = false; ;}
break;
case 8:
-#line 141 "engines/director/lingo/lingo-gr.y"
+#line 147 "engines/director/lingo/lingo-gr.y"
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 8;
- ;}
+
+ g_lingo->_inCond = false; ;}
break;
- case 13:
-#line 152 "engines/director/lingo/lingo-gr.y"
+ case 9:
+#line 154 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_inCond = false; ;}
+ break;
+
+ case 14:
+#line 163 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str());
@@ -2189,25 +2204,25 @@ yyreduce:
delete (yyvsp[(4) - (4)].s); ;}
break;
- case 14:
-#line 158 "engines/director/lingo/lingo-gr.y"
+ case 15:
+#line 169 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_assign);
(yyval.code) = (yyvsp[(2) - (4)].code); ;}
break;
- case 15:
-#line 161 "engines/director/lingo/lingo-gr.y"
+ case 16:
+#line 172 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_after); ;}
break;
- case 16:
-#line 162 "engines/director/lingo/lingo-gr.y"
+ case 17:
+#line 173 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_before); ;}
break;
- case 17:
-#line 163 "engines/director/lingo/lingo-gr.y"
+ case 18:
+#line 174 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
@@ -2216,8 +2231,8 @@ yyreduce:
delete (yyvsp[(2) - (4)].s); ;}
break;
- case 18:
-#line 169 "engines/director/lingo/lingo-gr.y"
+ case 19:
+#line 180 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2227,8 +2242,8 @@ yyreduce:
(yyval.code) = (yyvsp[(4) - (4)].code); ;}
break;
- case 19:
-#line 176 "engines/director/lingo/lingo-gr.y"
+ case 20:
+#line 187 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_swap);
g_lingo->code1(g_lingo->c_theentityassign);
@@ -2237,8 +2252,8 @@ yyreduce:
(yyval.code) = (yyvsp[(5) - (5)].code); ;}
break;
- case 20:
-#line 182 "engines/director/lingo/lingo-gr.y"
+ case 21:
+#line 193 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
@@ -2247,8 +2262,8 @@ yyreduce:
delete (yyvsp[(2) - (4)].s); ;}
break;
- case 21:
-#line 188 "engines/director/lingo/lingo-gr.y"
+ case 22:
+#line 199 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2258,8 +2273,8 @@ yyreduce:
(yyval.code) = (yyvsp[(4) - (4)].code); ;}
break;
- case 22:
-#line 195 "engines/director/lingo/lingo-gr.y"
+ case 23:
+#line 206 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_swap);
g_lingo->code1(g_lingo->c_theentityassign);
@@ -2268,8 +2283,8 @@ yyreduce:
(yyval.code) = (yyvsp[(5) - (5)].code); ;}
break;
- case 27:
-#line 213 "engines/director/lingo/lingo-gr.y"
+ case 28:
+#line 224 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[(3) - (5)].code) - (yyvsp[(1) - (5)].code));
@@ -2280,8 +2295,8 @@ yyreduce:
checkEnd((yyvsp[(5) - (5)].s), "repeat", true); ;}
break;
- case 28:
-#line 226 "engines/director/lingo/lingo-gr.y"
+ case 29:
+#line 237 "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));
@@ -2298,8 +2313,8 @@ yyreduce:
checkEnd((yyvsp[(10) - (10)].s), "repeat", true); ;}
break;
- case 29:
-#line 244 "engines/director/lingo/lingo-gr.y"
+ case 30:
+#line 255 "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));
@@ -2316,8 +2331,8 @@ yyreduce:
checkEnd((yyvsp[(11) - (11)].s), "repeat", true); ;}
break;
- case 30:
-#line 258 "engines/director/lingo/lingo-gr.y"
+ case 31:
+#line 269 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code));
@@ -2325,22 +2340,22 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[(1) - (3)].code) + 1] = end; ;}
break;
- case 31:
-#line 263 "engines/director/lingo/lingo-gr.y"
+ case 32:
+#line 274 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
checkEnd((yyvsp[(6) - (6)].s), "tell", true); ;}
break;
- case 32:
-#line 266 "engines/director/lingo/lingo-gr.y"
+ case 33:
+#line 277 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
;}
break;
- case 33:
-#line 271 "engines/director/lingo/lingo-gr.y"
+ case 34:
+#line 282 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2353,8 +2368,8 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 34:
-#line 281 "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));
@@ -2369,8 +2384,8 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 35:
-#line 293 "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));
@@ -2385,8 +2400,8 @@ yyreduce:
g_lingo->processIf(0, (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code)); ;}
break;
- case 36:
-#line 305 "engines/director/lingo/lingo-gr.y"
+ case 37:
+#line 316 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2399,8 +2414,8 @@ yyreduce:
g_lingo->processIf(0, (yyvsp[(9) - (9)].code) - (yyvsp[(1) - (9)].code)); ;}
break;
- case 37:
-#line 315 "engines/director/lingo/lingo-gr.y"
+ case 38:
+#line 326 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
@@ -2413,8 +2428,8 @@ yyreduce:
g_lingo->processIf(0, (yyvsp[(10) - (10)].code) - (yyvsp[(1) - (10)].code)); ;}
break;
- case 38:
-#line 325 "engines/director/lingo/lingo-gr.y"
+ case 39:
+#line 336 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
@@ -2427,8 +2442,8 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 39:
-#line 335 "engines/director/lingo/lingo-gr.y"
+ case 40:
+#line 346 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2441,18 +2456,18 @@ yyreduce:
g_lingo->processIf(0, 0); ;}
break;
- case 40:
-#line 347 "engines/director/lingo/lingo-gr.y"
+ case 41:
+#line 358 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = 0; ;}
break;
- case 41:
-#line 348 "engines/director/lingo/lingo-gr.y"
+ case 42:
+#line 359 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
- case 46:
-#line 359 "engines/director/lingo/lingo-gr.y"
+ case 47:
+#line 370 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2461,8 +2476,8 @@ yyreduce:
g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
break;
- case 48:
-#line 368 "engines/director/lingo/lingo-gr.y"
+ case 49:
+#line 379 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2471,8 +2486,8 @@ yyreduce:
g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
break;
- case 49:
-#line 374 "engines/director/lingo/lingo-gr.y"
+ case 50:
+#line 385 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2481,28 +2496,23 @@ yyreduce:
g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
break;
- case 50:
-#line 382 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(STOP); ;}
- break;
-
case 51:
-#line 385 "engines/director/lingo/lingo-gr.y"
- { g_lingo->_inCond = true; ;}
+#line 393 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(STOP); ;}
break;
case 52:
-#line 388 "engines/director/lingo/lingo-gr.y"
- { g_lingo->_inCond = false; ;}
+#line 396 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_inCond = true; ;}
break;
case 53:
-#line 392 "engines/director/lingo/lingo-gr.y"
+#line 399 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;}
break;
case 54:
-#line 395 "engines/director/lingo/lingo-gr.y"
+#line 402 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
@@ -2511,7 +2521,7 @@ yyreduce:
break;
case 55:
-#line 402 "engines/director/lingo/lingo-gr.y"
+#line 409 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
@@ -2520,7 +2530,7 @@ yyreduce:
break;
case 56:
-#line 409 "engines/director/lingo/lingo-gr.y"
+#line 416 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
@@ -2530,22 +2540,22 @@ yyreduce:
break;
case 57:
-#line 417 "engines/director/lingo/lingo-gr.y"
+#line 424 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 58:
-#line 420 "engines/director/lingo/lingo-gr.y"
+#line 427 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 59:
-#line 423 "engines/director/lingo/lingo-gr.y"
+#line 430 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 62:
-#line 428 "engines/director/lingo/lingo-gr.y"
+#line 435 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_whencode);
g_lingo->code1(STOP);
@@ -2554,73 +2564,73 @@ yyreduce:
break;
case 63:
-#line 434 "engines/director/lingo/lingo-gr.y"
+#line 441 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_tellcode);
g_lingo->code1(STOP); ;}
break;
case 64:
-#line 438 "engines/director/lingo/lingo-gr.y"
+#line 445 "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 441 "engines/director/lingo/lingo-gr.y"
+#line 448 "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 444 "engines/director/lingo/lingo-gr.y"
+#line 451 "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 447 "engines/director/lingo/lingo-gr.y"
+#line 454 "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 451 "engines/director/lingo/lingo-gr.y"
+#line 458 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
case 70:
-#line 454 "engines/director/lingo/lingo-gr.y"
+#line 461 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 71:
-#line 457 "engines/director/lingo/lingo-gr.y"
+#line 464 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
case 72:
-#line 458 "engines/director/lingo/lingo-gr.y"
+#line 465 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
break;
case 73:
-#line 459 "engines/director/lingo/lingo-gr.y"
+#line 466 "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 462 "engines/director/lingo/lingo-gr.y"
+#line 469 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_eval);
g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str());
@@ -2628,7 +2638,7 @@ yyreduce:
break;
case 75:
-#line 466 "engines/director/lingo/lingo-gr.y"
+#line 473 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2640,7 +2650,7 @@ yyreduce:
break;
case 76:
-#line 474 "engines/director/lingo/lingo-gr.y"
+#line 481 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_theentitypush);
inst e = 0, f = 0;
@@ -2650,210 +2660,210 @@ yyreduce:
break;
case 78:
-#line 481 "engines/director/lingo/lingo-gr.y"
+#line 488 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_add); ;}
break;
case 79:
-#line 482 "engines/director/lingo/lingo-gr.y"
+#line 489 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_sub); ;}
break;
case 80:
-#line 483 "engines/director/lingo/lingo-gr.y"
+#line 490 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mul); ;}
break;
case 81:
-#line 484 "engines/director/lingo/lingo-gr.y"
+#line 491 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_div); ;}
break;
case 82:
-#line 485 "engines/director/lingo/lingo-gr.y"
+#line 492 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mod); ;}
break;
case 83:
-#line 486 "engines/director/lingo/lingo-gr.y"
+#line 493 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gt); ;}
break;
case 84:
-#line 487 "engines/director/lingo/lingo-gr.y"
+#line 494 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lt); ;}
break;
case 85:
-#line 488 "engines/director/lingo/lingo-gr.y"
+#line 495 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_eq); ;}
break;
case 86:
-#line 489 "engines/director/lingo/lingo-gr.y"
+#line 496 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_neq); ;}
break;
case 87:
-#line 490 "engines/director/lingo/lingo-gr.y"
+#line 497 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ge); ;}
break;
case 88:
-#line 491 "engines/director/lingo/lingo-gr.y"
+#line 498 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_le); ;}
break;
case 89:
-#line 492 "engines/director/lingo/lingo-gr.y"
+#line 499 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_and); ;}
break;
case 90:
-#line 493 "engines/director/lingo/lingo-gr.y"
+#line 500 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_or); ;}
break;
case 91:
-#line 494 "engines/director/lingo/lingo-gr.y"
+#line 501 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_not); ;}
break;
case 92:
-#line 495 "engines/director/lingo/lingo-gr.y"
+#line 502 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ampersand); ;}
break;
case 93:
-#line 496 "engines/director/lingo/lingo-gr.y"
+#line 503 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_concat); ;}
break;
case 94:
-#line 497 "engines/director/lingo/lingo-gr.y"
+#line 504 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_contains); ;}
break;
case 95:
-#line 498 "engines/director/lingo/lingo-gr.y"
+#line 505 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_starts); ;}
break;
case 96:
-#line 499 "engines/director/lingo/lingo-gr.y"
+#line 506 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); ;}
break;
case 97:
-#line 500 "engines/director/lingo/lingo-gr.y"
+#line 507 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;}
break;
case 98:
-#line 501 "engines/director/lingo/lingo-gr.y"
+#line 508 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
case 99:
-#line 502 "engines/director/lingo/lingo-gr.y"
+#line 509 "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 503 "engines/director/lingo/lingo-gr.y"
+#line 510 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_intersects); ;}
break;
case 101:
-#line 504 "engines/director/lingo/lingo-gr.y"
+#line 511 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_within); ;}
break;
case 102:
-#line 505 "engines/director/lingo/lingo-gr.y"
+#line 512 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charOf); ;}
break;
case 103:
-#line 506 "engines/director/lingo/lingo-gr.y"
+#line 513 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charToOf); ;}
break;
case 104:
-#line 507 "engines/director/lingo/lingo-gr.y"
+#line 514 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemOf); ;}
break;
case 105:
-#line 508 "engines/director/lingo/lingo-gr.y"
+#line 515 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemToOf); ;}
break;
case 106:
-#line 509 "engines/director/lingo/lingo-gr.y"
+#line 516 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineOf); ;}
break;
case 107:
-#line 510 "engines/director/lingo/lingo-gr.y"
+#line 517 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineToOf); ;}
break;
case 108:
-#line 511 "engines/director/lingo/lingo-gr.y"
+#line 518 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordOf); ;}
break;
case 109:
-#line 512 "engines/director/lingo/lingo-gr.y"
+#line 519 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordToOf); ;}
break;
case 110:
-#line 515 "engines/director/lingo/lingo-gr.y"
+#line 522 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 111:
-#line 520 "engines/director/lingo/lingo-gr.y"
+#line 527 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_printtop); ;}
break;
case 114:
-#line 523 "engines/director/lingo/lingo-gr.y"
+#line 530 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_exitRepeat); ;}
break;
case 115:
-#line 524 "engines/director/lingo/lingo-gr.y"
+#line 531 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_procret); ;}
break;
case 119:
-#line 528 "engines/director/lingo/lingo-gr.y"
+#line 535 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
case 120:
-#line 531 "engines/director/lingo/lingo-gr.y"
+#line 538 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 121:
-#line 534 "engines/director/lingo/lingo-gr.y"
+#line 541 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 122:
-#line 537 "engines/director/lingo/lingo-gr.y"
+#line 544 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_voidpush);
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 1);
@@ -2861,87 +2871,87 @@ yyreduce:
break;
case 123:
-#line 541 "engines/director/lingo/lingo-gr.y"
+#line 548 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
case 124:
-#line 542 "engines/director/lingo/lingo-gr.y"
+#line 549 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
break;
case 125:
-#line 543 "engines/director/lingo/lingo-gr.y"
+#line 550 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
break;
case 126:
-#line 544 "engines/director/lingo/lingo-gr.y"
+#line 551 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
break;
case 127:
-#line 545 "engines/director/lingo/lingo-gr.y"
+#line 552 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_open); ;}
break;
case 128:
-#line 546 "engines/director/lingo/lingo-gr.y"
+#line 553 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;}
break;
case 129:
-#line 547 "engines/director/lingo/lingo-gr.y"
+#line 554 "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 550 "engines/director/lingo/lingo-gr.y"
+#line 557 "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 551 "engines/director/lingo/lingo-gr.y"
+#line 558 "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 554 "engines/director/lingo/lingo-gr.y"
+#line 561 "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 555 "engines/director/lingo/lingo-gr.y"
+#line 562 "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 558 "engines/director/lingo/lingo-gr.y"
+#line 565 "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 559 "engines/director/lingo/lingo-gr.y"
+#line 566 "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 570 "engines/director/lingo/lingo-gr.y"
+#line 577 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoloop); ;}
break;
case 137:
-#line 571 "engines/director/lingo/lingo-gr.y"
+#line 578 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotonext); ;}
break;
case 138:
-#line 572 "engines/director/lingo/lingo-gr.y"
+#line 579 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoprevious); ;}
break;
case 139:
-#line 573 "engines/director/lingo/lingo-gr.y"
+#line 580 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
@@ -2949,7 +2959,7 @@ yyreduce:
break;
case 140:
-#line 577 "engines/director/lingo/lingo-gr.y"
+#line 584 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
@@ -2957,7 +2967,7 @@ yyreduce:
break;
case 141:
-#line 581 "engines/director/lingo/lingo-gr.y"
+#line 588 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
@@ -2965,12 +2975,12 @@ yyreduce:
break;
case 146:
-#line 595 "engines/director/lingo/lingo-gr.y"
+#line 602 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_playdone); ;}
break;
case 147:
-#line 596 "engines/director/lingo/lingo-gr.y"
+#line 603 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
@@ -2978,7 +2988,7 @@ yyreduce:
break;
case 148:
-#line 600 "engines/director/lingo/lingo-gr.y"
+#line 607 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
@@ -2986,7 +2996,7 @@ yyreduce:
break;
case 149:
-#line 604 "engines/director/lingo/lingo-gr.y"
+#line 611 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
@@ -2994,24 +3004,24 @@ yyreduce:
break;
case 150:
-#line 608 "engines/director/lingo/lingo-gr.y"
+#line 615 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); ;}
break;
case 151:
-#line 608 "engines/director/lingo/lingo-gr.y"
+#line 615 "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 638 "engines/director/lingo/lingo-gr.y"
+#line 645 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;}
break;
case 153:
-#line 639 "engines/director/lingo/lingo-gr.y"
+#line 646 "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));
@@ -3019,17 +3029,17 @@ yyreduce:
break;
case 154:
-#line 643 "engines/director/lingo/lingo-gr.y"
+#line 650 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;}
break;
case 155:
-#line 644 "engines/director/lingo/lingo-gr.y"
+#line 651 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = true; ;}
break;
case 156:
-#line 645 "engines/director/lingo/lingo-gr.y"
+#line 652 "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);
@@ -3037,7 +3047,7 @@ yyreduce:
break;
case 157:
-#line 649 "engines/director/lingo/lingo-gr.y"
+#line 656 "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));
@@ -3048,7 +3058,7 @@ yyreduce:
break;
case 158:
-#line 656 "engines/director/lingo/lingo-gr.y"
+#line 663 "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));
@@ -3057,37 +3067,37 @@ yyreduce:
break;
case 159:
-#line 662 "engines/director/lingo/lingo-gr.y"
+#line 669 "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 664 "engines/director/lingo/lingo-gr.y"
+#line 671 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
case 161:
-#line 665 "engines/director/lingo/lingo-gr.y"
+#line 672 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
break;
case 162:
-#line 666 "engines/director/lingo/lingo-gr.y"
+#line 673 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
case 163:
-#line 667 "engines/director/lingo/lingo-gr.y"
+#line 674 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
break;
case 167:
-#line 675 "engines/director/lingo/lingo-gr.y"
+#line 682 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); ;}
break;
case 168:
-#line 679 "engines/director/lingo/lingo-gr.y"
+#line 686 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_call);
g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
@@ -3097,33 +3107,33 @@ yyreduce:
break;
case 169:
-#line 687 "engines/director/lingo/lingo-gr.y"
+#line 694 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
case 170:
-#line 688 "engines/director/lingo/lingo-gr.y"
+#line 695 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
case 171:
-#line 689 "engines/director/lingo/lingo-gr.y"
+#line 696 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
case 172:
-#line 692 "engines/director/lingo/lingo-gr.y"
+#line 699 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
case 173:
-#line 693 "engines/director/lingo/lingo-gr.y"
+#line 700 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
/* Line 1267 of yacc.c. */
-#line 3127 "engines/director/lingo/lingo-gr.cpp"
+#line 3137 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3337,6 +3347,6 @@ yyreturn:
}
-#line 696 "engines/director/lingo/lingo-gr.y"
+#line 703 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 8de5e77cd5..74f7b48cf4 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -126,22 +126,33 @@ program: program nl programline
nl: '\n' {
g_lingo->_linenumber++;
g_lingo->_colnumber = 1;
- }
+
+ g_lingo->_inCond = false; }
+ ;
thennl: tTHENNL {
g_lingo->_linenumber++;
g_lingo->_colnumber = 1;
- }
+
+ g_lingo->_inCond = false; }
+ ;
nlelse: tNLELSE {
g_lingo->_linenumber++;
g_lingo->_colnumber = 5;
- }
+
+ g_lingo->_inCond = false; }
+ ;
nlelsif: tNLELSIF {
g_lingo->_linenumber++;
g_lingo->_colnumber = 8;
- }
+
+ g_lingo->_inCond = false; }
+ ;
+
+then: tTHEN { g_lingo->_inCond = false; }
+ ;
programline: /* empty */
| defn
@@ -312,7 +323,7 @@ ifstmt: if cond thennl stmtlist end ENDCLAUSE {
(*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */
g_lingo->processIf(0, $9 - $1); }
- | if cond tTHEN begin stmtoneliner end elseifstmtoneliner end elsestmtoneliner end {
+ | if cond then begin stmtoneliner end elseifstmtoneliner end elsestmtoneliner end {
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, $4 - $1);
WRITE_UINT32(&else1, $6 - $1);
@@ -322,7 +333,7 @@ ifstmt: if cond thennl stmtlist end ENDCLAUSE {
(*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */
g_lingo->processIf(0, $10 - $1); }
- | if cond tTHEN begin stmtoneliner end nlelse begin stmtoneliner end {
+ | if cond then begin stmtoneliner end nlelse begin stmtoneliner end {
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, $4 - $1);
WRITE_UINT32(&else1, $8 - $1);
@@ -332,7 +343,7 @@ ifstmt: if cond thennl stmtlist end ENDCLAUSE {
(*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */
g_lingo->processIf(0, 0); }
- | if cond tTHEN begin stmtoneliner end {
+ | if cond then begin stmtoneliner end {
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, $4 - $1);
WRITE_UINT32(&else1, 0);
@@ -356,7 +367,7 @@ elseifstmtoneliner: elseifstmtoneliner elseifstmtoneliner1
| elseifstmtoneliner1
;
-elseifstmtoneliner1: elseif cond tTHEN begin stmt end {
+elseifstmtoneliner1: elseif cond then begin stmt end {
inst then = 0;
WRITE_UINT32(&then, $4 - $1);
(*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
@@ -365,13 +376,13 @@ elseifstmtoneliner1: elseif cond tTHEN begin stmt end {
;
elseifstmt1: elseifstmtoneliner
- | elseif cond tTHEN begin stmtlist end {
+ | elseif cond then begin stmtlist end {
inst then = 0;
WRITE_UINT32(&then, $5 - $1);
(*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
g_lingo->codeLabel($1); }
- | elseif cond tTHENNL begin stmtlist end {
+ | elseif cond thennl begin stmtlist end {
inst then = 0;
WRITE_UINT32(&then, $5 - $1);
(*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
@@ -379,16 +390,12 @@ elseifstmt1: elseifstmtoneliner
g_lingo->codeLabel($1); }
;
-cond: begincond expr endcond { g_lingo->code1(STOP); }
+cond: begincond expr { g_lingo->code1(STOP); }
;
begincond: /* nothing */ { g_lingo->_inCond = true; }
;
-endcond: /* nothing */ { g_lingo->_inCond = false; }
- ;
-
-
repeatwhile: tREPEAT tWHILE { $$ = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); }
;
@@ -425,7 +432,7 @@ stmtlist: /* nothing */ { $$ = g_lingo->_currentScript->size(); }
| stmtlist stmt
;
-when: tWHEN ID tTHEN {
+when: tWHEN ID then {
$$ = g_lingo->code1(g_lingo->c_whencode);
g_lingo->code1(STOP);
g_lingo->codeString($2->c_str());