aboutsummaryrefslogtreecommitdiff
path: root/engines/director/lingo
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-22 00:09:12 +0100
committerEugene Sandulenko2019-12-22 00:10:25 +0100
commit4dfc0c53cd1c83475e9735d67c9d933522d8e80d (patch)
tree987b78ca57577aacf376ca9ea40622d5ee4a1734 /engines/director/lingo
parent5574279ccde6bbb54663cd85d3f36b7d4ef0fb68 (diff)
downloadscummvm-rg350-4dfc0c53cd1c83475e9735d67c9d933522d8e80d.tar.gz
scummvm-rg350-4dfc0c53cd1c83475e9735d67c9d933522d8e80d.tar.bz2
scummvm-rg350-4dfc0c53cd1c83475e9735d67c9d933522d8e80d.zip
DIRECTOR: LINGO: Fix 'me' syntax. It is a function
Diffstat (limited to 'engines/director/lingo')
-rw-r--r--engines/director/lingo/lingo-gr.cpp1052
-rw-r--r--engines/director/lingo/lingo-gr.h2
-rw-r--r--engines/director/lingo/lingo-gr.y6
3 files changed, 531 insertions, 529 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 0e43e2feec..99b0a6bc12 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -254,7 +254,7 @@
/* Copy the first part of user declarations. */
-#line 53 "engines/director/lingo/lingo-gr.y"
+#line 52 "engines/director/lingo/lingo-gr.y"
#define FORBIDDEN_SYMBOL_ALLOW_ALL
@@ -305,7 +305,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 83 "engines/director/lingo/lingo-gr.y"
+#line 82 "engines/director/lingo/lingo-gr.y"
{
Common::String *s;
int i;
@@ -542,9 +542,9 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 126
+#define YYFINAL 125
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1526
+#define YYLAST 1538
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 107
@@ -553,7 +553,7 @@ union yyalloc
/* YYNRULES -- Number of rules. */
#define YYNRULES 154
/* YYNRULES -- Number of states. */
-#define YYNSTATES 326
+#define YYNSTATES 325
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -616,8 +616,8 @@ static const yytype_uint16 yyprhs[] =
223, 227, 231, 235, 239, 243, 247, 251, 255, 259,
263, 267, 271, 274, 278, 282, 286, 290, 293, 296,
300, 304, 309, 314, 319, 326, 331, 338, 343, 350,
- 355, 362, 364, 367, 370, 372, 374, 377, 379, 382,
- 385, 388, 390, 393, 396, 398, 401, 406, 413, 418,
+ 355, 362, 367, 374, 376, 379, 382, 384, 386, 389,
+ 391, 394, 397, 400, 402, 405, 408, 410, 413, 418,
421, 425, 427, 431, 433, 437, 439, 443, 446, 449,
452, 455, 459, 462, 465, 467, 471, 474, 477, 480,
484, 487, 488, 492, 493, 502, 505, 506, 514, 523,
@@ -664,12 +664,12 @@ static const yytype_int16 yyrhs[] =
-1, 80, 126, 56, 126, 50, 126, -1, 81, 126,
50, 126, -1, 81, 126, 56, 126, 50, 126, -1,
82, 126, 50, 126, -1, 82, 126, 56, 126, 50,
- 126, -1, 89, -1, 29, 126, -1, 52, 126, -1,
- 132, -1, 135, -1, 40, 53, -1, 40, -1, 42,
- 129, -1, 87, 130, -1, 65, 131, -1, 19, -1,
- 21, 126, -1, 20, 126, -1, 20, -1, 22, 146,
- -1, 89, 102, 30, 103, -1, 89, 102, 30, 106,
- 145, 103, -1, 62, 126, 58, 126, -1, 62, 126,
+ 126, -1, 89, 102, 30, 103, -1, 89, 102, 30,
+ 106, 145, 103, -1, 89, -1, 29, 126, -1, 52,
+ 126, -1, 132, -1, 135, -1, 40, 53, -1, 40,
+ -1, 42, 129, -1, 87, 130, -1, 65, 131, -1,
+ 19, -1, 21, 126, -1, 20, 126, -1, 20, -1,
+ 22, 146, -1, 62, 126, 58, 126, -1, 62, 126,
-1, 23, 30, 145, -1, 30, -1, 129, 106, 30,
-1, 30, -1, 130, 106, 30, -1, 30, -1, 131,
106, 30, -1, 43, 46, -1, 43, 49, -1, 43,
@@ -690,22 +690,22 @@ static const yytype_int16 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 124, 124, 125, 126, 129, 130, 131, 134, 140,
- 143, 144, 145, 151, 158, 164, 171, 177, 185, 186,
- 187, 190, 191, 196, 207, 224, 236, 241, 243, 248,
- 258, 270, 271, 274, 282, 285, 292, 299, 307, 310,
- 313, 314, 315, 318, 324, 328, 331, 334, 337, 340,
- 346, 347, 348, 351, 354, 355, 358, 366, 372, 373,
- 374, 375, 376, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 391, 392, 393,
- 394, 395, 396, 397, 398, 399, 400, 401, 402, 403,
- 404, 405, 408, 413, 414, 415, 416, 417, 418, 419,
- 420, 421, 424, 427, 430, 434, 435, 436, 437, 438,
- 439, 442, 443, 446, 447, 450, 451, 462, 463, 464,
- 465, 469, 473, 479, 480, 483, 484, 487, 488, 492,
- 496, 500, 500, 530, 530, 536, 537, 537, 543, 551,
- 558, 560, 561, 562, 563, 566, 567, 568, 571, 575,
- 583, 584, 585, 588, 589
+ 0, 123, 123, 124, 125, 128, 129, 130, 133, 139,
+ 142, 143, 144, 150, 157, 163, 170, 176, 184, 185,
+ 186, 189, 190, 195, 206, 223, 235, 240, 242, 247,
+ 257, 269, 270, 273, 281, 284, 291, 298, 306, 309,
+ 312, 313, 314, 317, 323, 327, 330, 333, 336, 339,
+ 345, 346, 347, 350, 353, 354, 357, 365, 371, 372,
+ 373, 374, 375, 376, 377, 378, 379, 380, 381, 382,
+ 383, 384, 385, 386, 387, 388, 389, 390, 391, 392,
+ 393, 394, 395, 396, 397, 398, 399, 400, 401, 402,
+ 403, 404, 405, 406, 409, 414, 415, 416, 417, 418,
+ 419, 420, 421, 422, 425, 428, 431, 435, 436, 437,
+ 438, 441, 442, 445, 446, 449, 450, 461, 462, 463,
+ 464, 468, 472, 478, 479, 482, 483, 486, 487, 491,
+ 495, 499, 499, 529, 529, 535, 536, 536, 542, 550,
+ 557, 559, 560, 561, 562, 565, 566, 567, 570, 574,
+ 582, 583, 584, 587, 588
};
#endif
@@ -771,7 +771,7 @@ static const yytype_uint8 yyr1[] =
126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
- 126, 126, 127, 128, 128, 128, 128, 128, 128, 128,
+ 126, 126, 126, 126, 127, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
128, 129, 129, 130, 130, 131, 131, 132, 132, 132,
132, 132, 132, 133, 133, 134, 134, 135, 135, 135,
@@ -792,8 +792,8 @@ static const yytype_uint8 yyr2[] =
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, 1, 2, 2, 1, 1, 2, 1, 2, 2,
- 2, 1, 2, 2, 1, 2, 4, 6, 4, 2,
+ 6, 4, 6, 1, 2, 2, 1, 1, 2, 1,
+ 2, 2, 2, 1, 2, 2, 1, 2, 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, 7, 8, 6,
@@ -806,97 +806,97 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 45, 56, 0, 46, 101, 104, 0, 0,
+ 0, 0, 45, 56, 0, 46, 103, 106, 0, 0,
0, 52, 0, 0, 0, 49, 48, 47, 131, 136,
- 97, 0, 0, 36, 0, 0, 0, 0, 0, 0,
+ 99, 0, 0, 36, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 44,
- 0, 0, 91, 0, 0, 0, 150, 0, 3, 58,
+ 0, 0, 93, 0, 0, 0, 150, 0, 3, 58,
21, 7, 22, 0, 0, 0, 0, 0, 50, 19,
- 51, 20, 94, 95, 6, 38, 18, 4, 49, 0,
- 91, 57, 103, 102, 153, 105, 150, 53, 54, 92,
- 150, 149, 150, 38, 96, 111, 98, 0, 117, 0,
- 118, 0, 119, 124, 120, 122, 133, 93, 0, 34,
- 0, 0, 0, 0, 135, 109, 127, 128, 130, 115,
- 100, 72, 0, 0, 0, 0, 0, 113, 99, 140,
- 0, 77, 78, 0, 151, 0, 1, 5, 39, 0,
- 39, 39, 0, 0, 0, 0, 0, 0, 0, 0,
+ 51, 20, 96, 97, 6, 38, 18, 4, 49, 0,
+ 57, 105, 104, 153, 107, 150, 53, 54, 94, 150,
+ 149, 150, 38, 98, 111, 100, 0, 117, 0, 118,
+ 0, 119, 124, 120, 122, 133, 95, 0, 34, 0,
+ 0, 0, 0, 135, 109, 127, 128, 130, 115, 102,
+ 72, 0, 0, 0, 0, 0, 113, 101, 140, 0,
+ 77, 78, 0, 151, 0, 1, 5, 39, 0, 39,
+ 39, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 141,
+ 150, 0, 0, 110, 151, 0, 132, 141, 0, 123,
+ 126, 0, 121, 38, 0, 0, 0, 35, 0, 0,
+ 50, 0, 0, 0, 43, 0, 129, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 141, 150, 0, 0, 110, 151, 0, 132, 141, 0,
- 123, 126, 0, 121, 38, 0, 0, 0, 35, 0,
- 0, 50, 0, 0, 0, 43, 0, 129, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 79, 80, 0, 2, 40, 39, 0, 26, 0,
- 40, 68, 69, 66, 67, 70, 71, 63, 74, 75,
- 76, 65, 64, 73, 59, 60, 61, 62, 142, 0,
- 154, 55, 0, 112, 125, 141, 8, 9, 10, 11,
- 15, 13, 0, 0, 14, 12, 108, 116, 83, 0,
- 85, 0, 87, 0, 89, 0, 81, 82, 114, 106,
- 150, 152, 39, 0, 40, 28, 39, 148, 0, 148,
- 0, 17, 16, 0, 0, 0, 0, 0, 41, 42,
- 0, 0, 0, 39, 0, 0, 40, 143, 40, 148,
- 84, 86, 88, 90, 107, 23, 0, 39, 31, 27,
- 144, 139, 137, 40, 39, 40, 37, 39, 31, 0,
- 145, 134, 40, 39, 38, 0, 32, 39, 146, 138,
- 39, 0, 40, 29, 0, 0, 0, 24, 39, 40,
- 147, 25, 0, 39, 30, 33
+ 79, 80, 0, 2, 40, 39, 0, 26, 0, 40,
+ 68, 69, 66, 67, 70, 71, 63, 74, 75, 76,
+ 65, 64, 73, 59, 60, 61, 62, 142, 0, 154,
+ 55, 0, 112, 125, 141, 8, 9, 10, 11, 15,
+ 13, 0, 0, 14, 12, 108, 116, 83, 0, 85,
+ 0, 87, 0, 89, 0, 81, 82, 114, 91, 150,
+ 152, 39, 0, 40, 28, 39, 148, 0, 148, 0,
+ 17, 16, 0, 0, 0, 0, 0, 41, 42, 0,
+ 0, 0, 39, 0, 0, 40, 143, 40, 148, 84,
+ 86, 88, 90, 92, 23, 0, 39, 31, 27, 144,
+ 139, 137, 40, 39, 40, 37, 39, 31, 0, 145,
+ 134, 40, 39, 38, 0, 32, 39, 146, 138, 39,
+ 0, 40, 29, 0, 0, 0, 24, 39, 40, 147,
+ 25, 0, 39, 30, 33
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 47, 48, 49, 50, 269, 52, 297, 298, 53,
- 54, 55, 299, 150, 195, 252, 56, 57, 58, 59,
- 60, 61, 86, 118, 110, 62, 94, 95, 63, 82,
- 64, 164, 83, 65, 219, 309, 276, 66, 156, 75
+ -1, 47, 48, 49, 50, 268, 52, 296, 297, 53,
+ 54, 55, 298, 149, 194, 251, 56, 57, 58, 59,
+ 60, 61, 85, 117, 109, 62, 93, 94, 63, 81,
+ 64, 163, 82, 65, 218, 308, 275, 66, 155, 74
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -244
+#define YYPACT_NINF -243
static const yytype_int16 yypact[] =
{
- 302, -84, -244, -244, 893, -244, -244, 893, 893, 893,
- 24, -244, 893, 893, 893, 926, -244, -244, -244, -244,
- 9, 36, 749, -244, 57, 893, 12, -2, 66, 70,
- 893, 832, 71, 893, 893, 893, 893, 893, 893, -244,
- 72, 74, 3, 893, 893, 893, 893, 2, -244, -244,
- -244, -244, -244, 893, 38, 893, 666, 893, -244, 1427,
- -244, -244, -244, -244, -244, -244, -244, -244, 5, 893,
- -244, 1427, 1427, 1427, 1427, 4, 893, 1427, 4, 1427,
- 893, 4, 893, -244, -244, -244, 6, 893, -244, 893,
- -244, 60, -244, 1427, 44, -244, -244, 965, 79, -244,
- -1, 893, 0, 56, -244, 1321, -244, 44, -244, -244,
- 7, -244, 999, 1033, 1067, 1101, 1393, -244, 8, -244,
- 85, -244, -244, 1355, 1427, -7, -244, 393, 1427, 893,
- 1427, -244, 1271, 893, 893, 893, 893, 893, 893, 893,
- 893, 893, 893, 893, 893, 893, 893, 893, 893, 893,
- 86, 893, 965, 893, 11, 1355, -26, 11, 86, 88,
- 1427, 1427, 893, -244, -244, -6, 893, 893, -244, 893,
- 893, 51, 1307, 893, 893, -244, 893, -244, 90, 893,
- 893, 893, 893, 893, 893, 893, 893, 893, 893, 91,
- -22, -244, -244, 893, -244, -244, 1427, 67, -244, 893,
- -244, -51, -51, -51, -51, 141, 141, -244, -38, -51,
- -51, -51, -51, -38, -35, -35, -244, -244, -244, -86,
- 1427, -244, -49, -244, 1427, 86, -244, -244, 1427, 1427,
- 1427, -51, 893, 893, 1427, -51, 1427, -244, 1427, 1135,
- 1427, 1169, 1427, 1203, 1427, 1237, 1427, 1427, -244, -244,
- 893, 1427, 575, 13, -244, 1427, 575, 17, 94, 17,
- -27, -51, 1427, 893, 893, 893, 893, -17, -244, -244,
- 35, 92, 893, 575, 58, 97, -244, -244, -244, 17,
- 1427, 1427, 1427, 1427, -244, -244, 893, 1427, 89, -244,
- -244, 484, 575, -244, 1427, -244, -244, 113, 89, 893,
- 122, 575, -244, 575, -244, 63, -244, 1427, -244, 48,
- 575, 64, -244, -244, 102, 129, 69, -244, 575, -244,
- -244, -244, 77, 575, -244, -244
+ 301, -23, -243, -243, 892, -243, -243, 892, 892, 892,
+ 22, -243, 892, 892, 892, 925, -243, -243, -243, -243,
+ 28, 55, 748, -243, 65, 892, 33, 39, 69, 70,
+ 892, 831, 71, 892, 892, 892, 892, 892, 892, -243,
+ 72, 74, 3, 892, 892, 892, 892, 6, -243, -243,
+ -243, -243, -243, 892, 35, 892, 665, 892, -243, 1426,
+ -243, -243, -243, -243, -243, -243, -243, -243, 4, 892,
+ 1426, 1426, 1426, 1426, 2, 892, 1426, 2, 1426, 892,
+ 2, 892, -243, -243, -243, 5, 892, -243, 892, -243,
+ 61, -243, 1426, 16, -243, -243, 964, 80, -243, -49,
+ 892, 0, 57, -243, 1320, -243, 16, -243, -243, 7,
+ -243, 998, 1032, 1066, 1100, 1392, -243, 8, -243, 85,
+ -243, -243, 1354, 1426, -12, -243, 392, 1426, 892, 1426,
+ -243, 1270, 892, 892, 892, 892, 892, 892, 892, 892,
+ 892, 892, 892, 892, 892, 892, 892, 892, 892, 86,
+ 892, 964, 892, 11, 1354, -89, 11, 86, 88, 1426,
+ 1426, 892, -243, -243, 68, 892, 892, -243, 892, 892,
+ 51, 1306, 892, 892, -243, 892, -243, 90, 892, 892,
+ 892, 892, 892, 892, 892, 892, 892, 892, 91, -33,
+ -243, -243, 892, -243, -243, 1426, 67, -243, 892, -243,
+ -38, -38, -38, -38, 1439, 1439, -243, -51, -38, -38,
+ -38, -38, -51, -36, -36, -243, -243, -243, -81, 1426,
+ -243, -78, -243, 1426, 86, -243, -243, 1426, 1426, 1426,
+ -38, 892, 892, 1426, -38, 1426, -243, 1426, 1134, 1426,
+ 1168, 1426, 1202, 1426, 1236, 1426, 1426, -243, -243, 892,
+ 1426, 574, -13, -243, 1426, 574, 17, 95, 17, -34,
+ -38, 1426, 892, 892, 892, 892, -27, -243, -243, 54,
+ 93, 892, 574, 34, 117, -243, -243, -243, 17, 1426,
+ 1426, 1426, 1426, -243, -243, 892, 1426, 111, -243, -243,
+ 483, 574, -243, 1426, -243, -243, 113, 111, 892, 122,
+ 574, -243, 574, -243, 63, -243, 1426, -243, 48, 574,
+ 75, -243, -243, 101, 128, 76, -243, 574, -243, -243,
+ -243, 82, 574, -243, -243
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -244, -244, 34, -244, 108, 19, -244, -130, -244, -244,
- -244, -244, -244, -82, -40, -3, -244, -244, 73, -4,
- 20, -244, -244, -244, -244, -244, 140, -19, -244, -244,
- -244, -244, -244, -244, -152, -244, -243, -244, -39, 80
+ -243, -243, 37, -243, 103, 1, -243, -137, -243, -243,
+ -243, -243, -243, -80, -40, -3, -243, -243, 84, -4,
+ 9, -243, -243, -243, -243, -243, 139, -19, -243, -243,
+ -243, -243, -243, -243, -144, -243, -242, -243, -31, 73
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -906,38 +906,47 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -6
static const yytype_int16 yytable[] =
{
- 71, 158, 126, 72, 73, 74, 222, 125, 77, 74,
- 79, 74, 108, 100, 101, 257, 278, 67, 93, 51,
- 258, 97, 139, 14, 226, 140, 105, 93, 102, 111,
- 112, 113, 114, 115, 116, 139, 293, 154, 139, 121,
- 122, 123, 124, 157, 145, 146, 147, 148, 149, 128,
- 271, 130, 259, 132, 76, 169, 173, 258, 146, 147,
- 148, 149, 84, 148, 149, 152, 85, 170, 174, 272,
- 98, 99, 124, 260, 279, 163, 155, 221, 124, 258,
- 193, 249, 225, 160, 250, 161, 284, 96, 177, 193,
- 197, 198, 89, 78, 91, 81, 103, 172, 192, 193,
- 104, 109, 117, 127, 119, 120, 129, 151, 162, 168,
- 153, 175, 159, 178, 189, 190, 218, 193, 223, 232,
- 237, 248, 254, 275, 277, 196, 285, 290, 296, 201,
+ 70, 51, 157, 71, 72, 73, 125, 168, 76, 73,
+ 78, 73, 107, 221, 220, 124, 277, 192, 92, 169,
+ 256, 96, 138, 258, 270, 257, 104, 92, 257, 110,
+ 111, 112, 113, 114, 115, 138, 292, 138, 139, 120,
+ 121, 122, 123, 271, 153, 145, 146, 147, 148, 127,
+ 156, 129, 75, 131, 99, 100, 172, 144, 145, 146,
+ 147, 148, 147, 148, 88, 151, 90, 278, 173, 101,
+ 248, 123, 257, 249, 162, 154, 283, 123, 67, 192,
+ 259, 83, 159, 224, 160, 84, 77, 176, 80, 196,
+ 197, 97, 98, 191, 192, 95, 171, 14, 225, 102,
+ 103, 108, 116, 128, 118, 119, 150, 126, 152, 161,
+ 167, 158, 174, 177, 188, 189, 217, 192, 222, 231,
+ 236, 247, 253, 274, 195, 276, 288, 51, 200, 201,
202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- 212, 213, 214, 215, 216, 217, 51, 124, 286, 220,
- 289, 304, 308, 313, 315, 317, 253, 319, 224, 320,
- 321, 194, 228, 229, 131, 230, 231, 324, 306, 234,
- 235, 107, 236, 0, 171, 238, 239, 240, 241, 242,
- 243, 244, 245, 246, 247, 227, 0, 0, 0, 251,
- 0, 0, 0, 0, 0, 255, 0, 256, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 133, 134, 135,
- 136, 267, 270, 0, 139, 0, 274, 140, 141, 142,
- 0, 0, 312, 0, 0, 0, 0, 0, 261, 262,
- 0, 0, 0, 288, 143, 144, 145, 146, 147, 148,
- 149, 0, 0, 0, 0, 0, 124, 295, 0, 0,
- 0, 273, 0, 0, 302, 0, 0, 305, 0, 280,
- 281, 282, 283, 311, 0, 0, 0, 314, 287, 0,
- 316, 0, 0, 291, 0, 292, 0, 0, 322, 0,
- 0, 0, 294, 325, 0, 0, 0, 0, 0, 0,
- 301, 0, 303, 0, 0, 307, 0, 0, 0, 310,
- 0, 0, -5, 1, 0, 0, 0, 0, 0, 318,
- 0, 0, 0, 0, 2, 0, 323, 3, 4, 5,
+ 212, 213, 214, 215, 216, 284, 123, 289, 219, 285,
+ 295, 303, 307, 312, 314, 252, 318, 223, 319, 130,
+ 305, 227, 228, 193, 229, 230, 316, 320, 233, 234,
+ 106, 235, 323, 226, 237, 238, 239, 240, 241, 242,
+ 243, 244, 245, 246, 170, 0, 0, 0, 250, 0,
+ 0, 0, 0, 0, 254, 0, 255, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 269, 0, 0, 0, 273, 0, 0, 266, 0,
+ 0, 0, 0, 311, 0, 0, 0, 260, 261, 0,
+ 0, 0, 287, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 123, 294, 0, 0, 0,
+ 272, 0, 0, 301, 0, 0, 304, 0, 279, 280,
+ 281, 282, 310, 0, 0, 0, 313, 286, 0, 315,
+ 0, 0, 290, 0, 291, 0, 0, 321, 0, 0,
+ 0, 293, 324, 0, 0, 0, 0, 0, 0, 300,
+ 0, 302, 0, 0, 306, 0, 0, 0, 309, 0,
+ 0, -5, 1, 0, 0, 0, 0, 0, 317, 0,
+ 0, 0, 0, 2, 0, 322, 3, 4, 5, 0,
+ 6, 7, 8, 9, 10, 0, 11, 12, 13, 0,
+ 14, 15, 16, 0, 17, 0, 18, 19, 0, 0,
+ 0, 20, 0, 21, 22, 23, 0, 0, 24, 0,
+ 0, 0, 0, 25, 26, 27, 0, 0, 28, 0,
+ 0, 0, 29, 30, 31, 0, 32, 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, 0, 0, 0, 0, 43, 44, 0,
+ 0, 0, -5, 45, 2, 46, 0, 3, 4, 5,
0, 6, 7, 8, 9, 10, 0, 11, 12, 13,
0, 14, 15, 16, 0, 17, 0, 18, 19, 0,
0, 0, 20, 0, 21, 22, 23, 0, 0, 24,
@@ -946,155 +955,156 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
0, 34, 35, 36, 37, 38, 0, 0, 39, 40,
41, 42, 0, 0, 0, 0, 0, 0, 43, 44,
- 0, 0, 0, -5, 45, 2, 46, 0, 3, 4,
+ 0, 0, 0, 0, 45, 2, 46, 0, 3, 4,
5, 0, 6, 7, 8, 9, 10, 0, 11, 12,
- 13, 0, 14, 15, 16, 0, 17, 0, 18, 19,
+ 13, 0, 14, 15, 16, 0, 17, 299, 18, 0,
0, 0, 0, 20, 0, 21, 22, 23, 0, 0,
- 24, 0, 0, 0, 0, 25, 26, 27, 0, 0,
- 28, 0, 0, 0, 29, 30, 31, 0, 32, 0,
+ 0, 0, 0, 0, 0, 25, 26, 27, 0, 0,
+ 28, 0, 0, 0, 0, 30, 31, 0, 32, 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, 0, 0, 0, 0, 43,
- 44, 0, 0, 0, 0, 45, 2, 46, 0, 3,
+ 40, 0, 42, 0, 0, 0, 0, 0, 0, 43,
+ 44, 0, 0, 0, 267, 45, 2, 46, 0, 3,
4, 5, 0, 6, 7, 8, 9, 10, 0, 11,
- 12, 13, 0, 14, 15, 16, 0, 17, 300, 18,
+ 12, 13, 0, 14, 15, 16, 0, 17, 0, 18,
0, 0, 0, 0, 20, 0, 21, 22, 23, 0,
0, 0, 0, 0, 0, 0, 25, 26, 27, 0,
0, 28, 0, 0, 0, 0, 30, 31, 0, 32,
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, 0, 0, 0, 0,
- 43, 44, 0, 0, 0, 268, 45, 2, 46, 0,
+ 43, 44, 0, 0, 0, 267, 45, 2, 46, 0,
3, 4, 5, 0, 6, 7, 8, 9, 10, 0,
11, 12, 13, 0, 14, 15, 16, 0, 17, 0,
- 18, 0, 0, 0, 0, 20, 0, 21, 22, 23,
- 0, 0, 0, 0, 0, 0, 0, 25, 26, 27,
- 0, 0, 28, 0, 0, 0, 0, 30, 31, 0,
+ 18, 0, 0, 0, 0, 20, 0, 21, 22, 0,
+ 0, 0, 0, 0, 0, 0, 0, 25, 0, 27,
+ 0, 0, 0, 0, 0, 0, 0, 30, 31, 0,
32, 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, 0, 0, 0,
- 0, 43, 44, 0, 0, 0, 268, 45, 2, 46,
- 0, 3, 4, 5, 0, 6, 7, 8, 9, 10,
- 0, 11, 12, 13, 0, 14, 15, 16, 0, 17,
- 0, 18, 0, 0, 0, 0, 20, 0, 21, 22,
- 0, 0, 0, 0, 0, 0, 0, 0, 25, 0,
- 27, 0, 0, 0, 0, 0, 0, 0, 30, 31,
- 0, 32, 0, 0, 0, 0, 0, 0, 33, 0,
- 0, 0, 0, 0, 0, 34, 35, 36, 37, 38,
- 0, 0, 0, 40, 0, 42, 0, 0, 0, 0,
- 0, 2, 43, 44, 3, 4, 5, 0, 45, 0,
- 46, 0, 0, 0, 11, 12, 13, 0, 14, 68,
- 16, 0, 17, 0, 0, 0, 0, 0, 0, 0,
- 87, 0, 0, 0, 0, 88, 0, 89, 90, 91,
- 92, 69, 0, 27, 0, 0, 0, 0, 0, 0,
+ 0, 0, 40, 0, 42, 0, 0, 0, 0, 0,
+ 2, 43, 44, 3, 4, 5, 0, 45, 0, 46,
+ 0, 0, 0, 11, 12, 13, 0, 14, 68, 16,
+ 0, 17, 0, 0, 0, 0, 0, 0, 0, 86,
+ 0, 0, 0, 0, 87, 0, 88, 89, 90, 91,
+ 69, 0, 27, 0, 0, 0, 0, 0, 0, 0,
0, 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, 0, 0, 70, 0,
- 0, 0, 0, 0, 2, 43, 44, 3, 4, 5,
- 0, 45, 0, 46, 0, 0, 0, 11, 12, 13,
- 0, 14, 68, 16, 0, 17, 0, 0, 0, 0,
- 0, 0, 0, 87, 0, 0, 0, 0, 0, 0,
- 89, 0, 91, 0, 69, 0, 27, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 106, 0, 0, 0,
- 0, 0, 0, 0, 33, 2, 0, 0, 3, 4,
- 5, 34, 35, 36, 37, 38, 0, 0, 11, 12,
- 13, 70, 14, 68, 16, 0, 17, 0, 43, 44,
- 0, 0, 0, 0, 45, 0, 46, 0, 2, 0,
- 0, 3, 4, 5, 0, 69, 0, 27, 0, 0,
- 0, 11, 12, 13, 0, 14, 68, 16, 0, 17,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
- 0, 0, 34, 35, 36, 37, 38, 0, 69, 0,
- 27, 0, 70, 0, 0, 0, 0, 0, 0, 43,
- 44, 0, 0, 0, 0, 45, 0, 46, 33, 0,
- 0, 0, 0, 0, 0, 34, 35, 36, 37, 38,
- 165, 0, 0, 0, 0, 70, 0, 0, 0, 0,
- 0, 0, 43, 44, 0, 0, 0, 0, 80, 0,
- 46, 133, 134, 135, 136, 137, 138, 0, 139, 166,
- 167, 140, 141, 142, 0, 0, 0, 0, 0, 179,
- 0, 0, 0, 0, 0, 180, 0, 0, 143, 144,
- 145, 146, 147, 148, 149, 133, 134, 135, 136, 137,
- 138, 0, 139, 0, 0, 140, 141, 142, 0, 0,
- 0, 0, 0, 181, 0, 0, 0, 0, 0, 182,
- 0, 0, 143, 144, 145, 146, 147, 148, 149, 133,
- 134, 135, 136, 137, 138, 0, 139, 0, 0, 140,
- 141, 142, 0, 0, 0, 0, 0, 183, 0, 0,
- 0, 0, 0, 184, 0, 0, 143, 144, 145, 146,
- 147, 148, 149, 133, 134, 135, 136, 137, 138, 0,
- 139, 0, 0, 140, 141, 142, 0, 0, 0, 0,
- 0, 185, 0, 0, 0, 0, 0, 186, 0, 0,
- 143, 144, 145, 146, 147, 148, 149, 133, 134, 135,
- 136, 137, 138, 0, 139, 0, 0, 140, 141, 142,
- 0, 0, 0, 0, 0, 263, 0, 0, 0, 0,
- 0, 0, 0, 0, 143, 144, 145, 146, 147, 148,
- 149, 133, 134, 135, 136, 137, 138, 0, 139, 0,
- 0, 140, 141, 142, 0, 0, 0, 0, 0, 264,
- 0, 0, 0, 0, 0, 0, 0, 0, 143, 144,
- 145, 146, 147, 148, 149, 133, 134, 135, 136, 137,
- 138, 0, 139, 0, 0, 140, 141, 142, 0, 0,
- 0, 0, 0, 265, 0, 0, 0, 0, 0, 0,
- 0, 0, 143, 144, 145, 146, 147, 148, 149, 133,
- 134, 135, 136, 137, 138, 0, 139, 0, 0, 140,
- 141, 142, 0, 0, 0, 0, 0, 266, 0, 0,
- 0, 0, 0, 0, 0, 0, 143, 144, 145, 146,
- 147, 148, 149, 133, 134, 135, 136, 137, 138, 0,
- 139, 0, 0, 140, 141, 142, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 199, 0, 0,
- 143, 144, 145, 146, 147, 148, 149, 133, 134, 135,
- 136, 137, 138, 0, 139, 0, 0, 140, 141, 142,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 233, 143, 144, 145, 146, 147, 148,
- 149, 0, 200, 133, 134, 135, 136, 137, 138, 176,
- 139, 0, 0, 140, 141, 142, 0, 133, 134, 135,
- 136, 137, 138, 0, 139, 0, 0, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 0, 0, 0,
- 0, 0, 0, 0, 143, 144, 145, 146, 147, 148,
- 149, 133, 134, 135, 136, 137, 138, 0, 139, 0,
- 0, 140, 141, 142, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 143, 144,
- 145, 146, 147, 148, 149, 0, 0, 0, 191, 133,
- 134, 135, 136, 137, 138, 0, 139, 0, 0, 140,
- 141, 142, 0, 0, 0, 0, 0, 187, 188, 0,
- 0, 0, 0, 0, 0, 0, 143, 144, 145, 146,
- 147, 148, 149, 133, 134, 135, 136, 137, 138, 0,
- 139, 0, 0, 140, 141, 142, 0, 0, 0, 0,
+ 33, 0, 0, 0, 0, 0, 0, 34, 35, 36,
+ 37, 38, 0, 0, 0, 0, 0, 42, 0, 0,
+ 0, 0, 0, 2, 43, 44, 3, 4, 5, 0,
+ 45, 0, 46, 0, 0, 0, 11, 12, 13, 0,
+ 14, 68, 16, 0, 17, 0, 0, 0, 0, 0,
+ 0, 0, 86, 0, 0, 0, 0, 0, 0, 88,
+ 0, 90, 0, 69, 0, 27, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 105, 0, 0, 0, 0,
+ 0, 0, 0, 33, 2, 0, 0, 3, 4, 5,
+ 34, 35, 36, 37, 38, 0, 0, 11, 12, 13,
+ 42, 14, 68, 16, 0, 17, 0, 43, 44, 0,
+ 0, 0, 0, 45, 0, 46, 0, 2, 0, 0,
+ 3, 4, 5, 0, 69, 0, 27, 0, 0, 0,
+ 11, 12, 13, 0, 14, 68, 16, 0, 17, 0,
+ 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 35, 36, 37, 38, 0, 69, 0, 27,
+ 0, 42, 0, 0, 0, 0, 0, 0, 43, 44,
+ 0, 0, 0, 0, 45, 0, 46, 33, 0, 0,
+ 0, 0, 0, 0, 34, 35, 36, 37, 38, 164,
+ 0, 0, 0, 0, 42, 0, 0, 0, 0, 0,
+ 0, 43, 44, 0, 0, 0, 0, 79, 0, 46,
+ 132, 133, 134, 135, 136, 137, 0, 138, 165, 166,
+ 139, 140, 141, 0, 0, 0, 0, 0, 178, 0,
+ 0, 0, 0, 0, 179, 0, 0, 142, 143, 144,
+ 145, 146, 147, 148, 132, 133, 134, 135, 136, 137,
+ 0, 138, 0, 0, 139, 140, 141, 0, 0, 0,
+ 0, 0, 180, 0, 0, 0, 0, 0, 181, 0,
+ 0, 142, 143, 144, 145, 146, 147, 148, 132, 133,
+ 134, 135, 136, 137, 0, 138, 0, 0, 139, 140,
+ 141, 0, 0, 0, 0, 0, 182, 0, 0, 0,
+ 0, 0, 183, 0, 0, 142, 143, 144, 145, 146,
+ 147, 148, 132, 133, 134, 135, 136, 137, 0, 138,
+ 0, 0, 139, 140, 141, 0, 0, 0, 0, 0,
+ 184, 0, 0, 0, 0, 0, 185, 0, 0, 142,
+ 143, 144, 145, 146, 147, 148, 132, 133, 134, 135,
+ 136, 137, 0, 138, 0, 0, 139, 140, 141, 0,
+ 0, 0, 0, 0, 262, 0, 0, 0, 0, 0,
+ 0, 0, 0, 142, 143, 144, 145, 146, 147, 148,
+ 132, 133, 134, 135, 136, 137, 0, 138, 0, 0,
+ 139, 140, 141, 0, 0, 0, 0, 0, 263, 0,
+ 0, 0, 0, 0, 0, 0, 0, 142, 143, 144,
+ 145, 146, 147, 148, 132, 133, 134, 135, 136, 137,
+ 0, 138, 0, 0, 139, 140, 141, 0, 0, 0,
+ 0, 0, 264, 0, 0, 0, 0, 0, 0, 0,
+ 0, 142, 143, 144, 145, 146, 147, 148, 132, 133,
+ 134, 135, 136, 137, 0, 138, 0, 0, 139, 140,
+ 141, 0, 0, 0, 0, 0, 265, 0, 0, 0,
+ 0, 0, 0, 0, 0, 142, 143, 144, 145, 146,
+ 147, 148, 132, 133, 134, 135, 136, 137, 0, 138,
+ 0, 0, 139, 140, 141, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 198, 0, 0, 142,
+ 143, 144, 145, 146, 147, 148, 132, 133, 134, 135,
+ 136, 137, 0, 138, 0, 0, 139, 140, 141, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 143, 144, 145, 146, 147, 148, 149
+ 0, 0, 232, 142, 143, 144, 145, 146, 147, 148,
+ 0, 199, 132, 133, 134, 135, 136, 137, 175, 138,
+ 0, 0, 139, 140, 141, 0, 132, 133, 134, 135,
+ 136, 137, 0, 138, 0, 0, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 0, 0, 0, 0,
+ 0, 0, 0, 142, 143, 144, 145, 146, 147, 148,
+ 132, 133, 134, 135, 136, 137, 0, 138, 0, 0,
+ 139, 140, 141, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 142, 143, 144,
+ 145, 146, 147, 148, 0, 0, 0, 190, 132, 133,
+ 134, 135, 136, 137, 0, 138, 0, 0, 139, 140,
+ 141, 0, 0, 0, 0, 0, 186, 187, 0, 0,
+ 0, 0, 0, 0, 0, 142, 143, 144, 145, 146,
+ 147, 148, 132, 133, 134, 135, 136, 137, 0, 138,
+ 0, 0, 139, 140, 141, 132, 133, 134, 135, 0,
+ 0, 0, 138, 0, 0, 139, 140, 141, 0, 142,
+ 143, 144, 145, 146, 147, 148, 0, 0, 0, 0,
+ 0, 0, 142, 143, 144, 145, 146, 147, 148
};
static const yytype_int16 yycheck[] =
{
- 4, 83, 0, 7, 8, 9, 158, 46, 12, 13,
- 14, 15, 31, 15, 16, 101, 259, 101, 22, 0,
- 106, 25, 73, 29, 30, 76, 30, 31, 30, 33,
- 34, 35, 36, 37, 38, 73, 279, 76, 73, 43,
- 44, 45, 46, 82, 95, 96, 97, 98, 99, 53,
- 37, 55, 101, 57, 30, 56, 56, 106, 96, 97,
- 98, 99, 53, 98, 99, 69, 30, 68, 68, 56,
- 58, 59, 76, 225, 101, 94, 80, 103, 82, 106,
- 106, 103, 164, 87, 106, 89, 103, 30, 107, 106,
- 130, 131, 48, 13, 50, 15, 30, 101, 105, 106,
- 30, 30, 30, 101, 30, 102, 68, 102, 48, 30,
- 106, 55, 106, 106, 106, 30, 30, 106, 30, 68,
- 30, 30, 55, 106, 30, 129, 91, 30, 39, 133,
+ 4, 0, 82, 7, 8, 9, 0, 56, 12, 13,
+ 14, 15, 31, 157, 103, 46, 258, 106, 22, 68,
+ 101, 25, 73, 101, 37, 106, 30, 31, 106, 33,
+ 34, 35, 36, 37, 38, 73, 278, 73, 76, 43,
+ 44, 45, 46, 56, 75, 96, 97, 98, 99, 53,
+ 81, 55, 30, 57, 15, 16, 56, 95, 96, 97,
+ 98, 99, 98, 99, 48, 69, 50, 101, 68, 30,
+ 103, 75, 106, 106, 93, 79, 103, 81, 101, 106,
+ 224, 53, 86, 163, 88, 30, 13, 106, 15, 129,
+ 130, 58, 59, 105, 106, 30, 100, 29, 30, 30,
+ 30, 30, 30, 68, 30, 102, 102, 101, 106, 48,
+ 30, 106, 55, 106, 106, 30, 30, 106, 30, 68,
+ 30, 30, 55, 106, 128, 30, 92, 126, 132, 133,
134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 127, 151, 56, 153,
- 92, 38, 30, 90, 106, 91, 196, 55, 162, 30,
- 91, 127, 166, 167, 56, 169, 170, 90, 298, 173,
- 174, 31, 176, -1, 101, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 165, -1, -1, -1, 193,
- -1, -1, -1, -1, -1, 199, -1, 200, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 66, 67, 68,
- 69, 250, 252, -1, 73, -1, 256, 76, 77, 78,
- -1, -1, 304, -1, -1, -1, -1, -1, 232, 233,
- -1, -1, -1, 273, 93, 94, 95, 96, 97, 98,
- 99, -1, -1, -1, -1, -1, 250, 287, -1, -1,
- -1, 254, -1, -1, 294, -1, -1, 297, -1, 263,
- 264, 265, 266, 303, -1, -1, -1, 307, 272, -1,
- 310, -1, -1, 276, -1, 278, -1, -1, 318, -1,
- -1, -1, 286, 323, -1, -1, -1, -1, -1, -1,
- 293, -1, 295, -1, -1, 299, -1, -1, -1, 302,
- -1, -1, 0, 1, -1, -1, -1, -1, -1, 312,
- -1, -1, -1, -1, 12, -1, 319, 15, 16, 17,
+ 144, 145, 146, 147, 148, 91, 150, 30, 152, 56,
+ 39, 38, 30, 90, 106, 195, 55, 161, 30, 56,
+ 297, 165, 166, 126, 168, 169, 91, 91, 172, 173,
+ 31, 175, 90, 164, 178, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 100, -1, -1, -1, 192, -1,
+ -1, -1, -1, -1, 198, -1, 199, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 251, -1, -1, -1, 255, -1, -1, 249, -1,
+ -1, -1, -1, 303, -1, -1, -1, 231, 232, -1,
+ -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 249, 286, -1, -1, -1,
+ 253, -1, -1, 293, -1, -1, 296, -1, 262, 263,
+ 264, 265, 302, -1, -1, -1, 306, 271, -1, 309,
+ -1, -1, 275, -1, 277, -1, -1, 317, -1, -1,
+ -1, 285, 322, -1, -1, -1, -1, -1, -1, 292,
+ -1, 294, -1, -1, 298, -1, -1, -1, 301, -1,
+ -1, 0, 1, -1, -1, -1, -1, -1, 311, -1,
+ -1, -1, -1, 12, -1, 318, 15, 16, 17, -1,
+ 19, 20, 21, 22, 23, -1, 25, 26, 27, -1,
+ 29, 30, 31, -1, 33, -1, 35, 36, -1, -1,
+ -1, 40, -1, 42, 43, 44, -1, -1, 47, -1,
+ -1, -1, -1, 52, 53, 54, -1, -1, 57, -1,
+ -1, -1, 61, 62, 63, -1, 65, -1, -1, -1,
+ -1, -1, -1, 72, -1, -1, -1, -1, -1, -1,
+ 79, 80, 81, 82, 83, -1, -1, 86, 87, 88,
+ 89, -1, -1, -1, -1, -1, -1, 96, 97, -1,
+ -1, -1, 101, 102, 12, 104, -1, 15, 16, 17,
-1, 19, 20, 21, 22, 23, -1, 25, 26, 27,
-1, 29, 30, 31, -1, 33, -1, 35, 36, -1,
-1, -1, 40, -1, 42, 43, 44, -1, -1, 47,
@@ -1103,18 +1113,18 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, 72, -1, -1, -1, -1, -1,
-1, 79, 80, 81, 82, 83, -1, -1, 86, 87,
88, 89, -1, -1, -1, -1, -1, -1, 96, 97,
- -1, -1, -1, 101, 102, 12, 104, -1, 15, 16,
+ -1, -1, -1, -1, 102, 12, 104, -1, 15, 16,
17, -1, 19, 20, 21, 22, 23, -1, 25, 26,
- 27, -1, 29, 30, 31, -1, 33, -1, 35, 36,
+ 27, -1, 29, 30, 31, -1, 33, 34, 35, -1,
-1, -1, -1, 40, -1, 42, 43, 44, -1, -1,
- 47, -1, -1, -1, -1, 52, 53, 54, -1, -1,
- 57, -1, -1, -1, 61, 62, 63, -1, 65, -1,
+ -1, -1, -1, -1, -1, 52, 53, 54, -1, -1,
+ 57, -1, -1, -1, -1, 62, 63, -1, 65, -1,
-1, -1, -1, -1, -1, 72, -1, -1, -1, -1,
-1, -1, 79, 80, 81, 82, 83, -1, -1, 86,
- 87, 88, 89, -1, -1, -1, -1, -1, -1, 96,
- 97, -1, -1, -1, -1, 102, 12, 104, -1, 15,
+ 87, -1, 89, -1, -1, -1, -1, -1, -1, 96,
+ 97, -1, -1, -1, 101, 102, 12, 104, -1, 15,
16, 17, -1, 19, 20, 21, 22, 23, -1, 25,
- 26, 27, -1, 29, 30, 31, -1, 33, 34, 35,
+ 26, 27, -1, 29, 30, 31, -1, 33, -1, 35,
-1, -1, -1, -1, 40, -1, 42, 43, 44, -1,
-1, -1, -1, -1, -1, -1, 52, 53, 54, -1,
-1, 57, -1, -1, -1, -1, 62, 63, -1, 65,
@@ -1124,98 +1134,90 @@ static const yytype_int16 yycheck[] =
96, 97, -1, -1, -1, 101, 102, 12, 104, -1,
15, 16, 17, -1, 19, 20, 21, 22, 23, -1,
25, 26, 27, -1, 29, 30, 31, -1, 33, -1,
- 35, -1, -1, -1, -1, 40, -1, 42, 43, 44,
- -1, -1, -1, -1, -1, -1, -1, 52, 53, 54,
- -1, -1, 57, -1, -1, -1, -1, 62, 63, -1,
+ 35, -1, -1, -1, -1, 40, -1, 42, 43, -1,
+ -1, -1, -1, -1, -1, -1, -1, 52, -1, 54,
+ -1, -1, -1, -1, -1, -1, -1, 62, 63, -1,
65, -1, -1, -1, -1, -1, -1, 72, -1, -1,
-1, -1, -1, -1, 79, 80, 81, 82, 83, -1,
- -1, 86, 87, -1, 89, -1, -1, -1, -1, -1,
- -1, 96, 97, -1, -1, -1, 101, 102, 12, 104,
- -1, 15, 16, 17, -1, 19, 20, 21, 22, 23,
- -1, 25, 26, 27, -1, 29, 30, 31, -1, 33,
- -1, 35, -1, -1, -1, -1, 40, -1, 42, 43,
- -1, -1, -1, -1, -1, -1, -1, -1, 52, -1,
- 54, -1, -1, -1, -1, -1, -1, -1, 62, 63,
- -1, 65, -1, -1, -1, -1, -1, -1, 72, -1,
- -1, -1, -1, -1, -1, 79, 80, 81, 82, 83,
- -1, -1, -1, 87, -1, 89, -1, -1, -1, -1,
- -1, 12, 96, 97, 15, 16, 17, -1, 102, -1,
- 104, -1, -1, -1, 25, 26, 27, -1, 29, 30,
- 31, -1, 33, -1, -1, -1, -1, -1, -1, -1,
- 41, -1, -1, -1, -1, 46, -1, 48, 49, 50,
- 51, 52, -1, 54, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 72, -1, -1, -1, -1, -1, -1, 79, 80,
- 81, 82, 83, -1, -1, -1, -1, -1, 89, -1,
- -1, -1, -1, -1, 12, 96, 97, 15, 16, 17,
- -1, 102, -1, 104, -1, -1, -1, 25, 26, 27,
- -1, 29, 30, 31, -1, 33, -1, -1, -1, -1,
- -1, -1, -1, 41, -1, -1, -1, -1, -1, -1,
- 48, -1, 50, -1, 52, -1, 54, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 64, -1, -1, -1,
- -1, -1, -1, -1, 72, 12, -1, -1, 15, 16,
- 17, 79, 80, 81, 82, 83, -1, -1, 25, 26,
- 27, 89, 29, 30, 31, -1, 33, -1, 96, 97,
- -1, -1, -1, -1, 102, -1, 104, -1, 12, -1,
- -1, 15, 16, 17, -1, 52, -1, 54, -1, -1,
- -1, 25, 26, 27, -1, 29, 30, 31, -1, 33,
- -1, -1, -1, -1, -1, 72, -1, -1, -1, -1,
- -1, -1, 79, 80, 81, 82, 83, -1, 52, -1,
- 54, -1, 89, -1, -1, -1, -1, -1, -1, 96,
- 97, -1, -1, -1, -1, 102, -1, 104, 72, -1,
- -1, -1, -1, -1, -1, 79, 80, 81, 82, 83,
- 45, -1, -1, -1, -1, 89, -1, -1, -1, -1,
- -1, -1, 96, 97, -1, -1, -1, -1, 102, -1,
- 104, 66, 67, 68, 69, 70, 71, -1, 73, 74,
- 75, 76, 77, 78, -1, -1, -1, -1, -1, 50,
- -1, -1, -1, -1, -1, 56, -1, -1, 93, 94,
- 95, 96, 97, 98, 99, 66, 67, 68, 69, 70,
- 71, -1, 73, -1, -1, 76, 77, 78, -1, -1,
- -1, -1, -1, 50, -1, -1, -1, -1, -1, 56,
- -1, -1, 93, 94, 95, 96, 97, 98, 99, 66,
- 67, 68, 69, 70, 71, -1, 73, -1, -1, 76,
- 77, 78, -1, -1, -1, -1, -1, 50, -1, -1,
- -1, -1, -1, 56, -1, -1, 93, 94, 95, 96,
- 97, 98, 99, 66, 67, 68, 69, 70, 71, -1,
- 73, -1, -1, 76, 77, 78, -1, -1, -1, -1,
- -1, 50, -1, -1, -1, -1, -1, 56, -1, -1,
- 93, 94, 95, 96, 97, 98, 99, 66, 67, 68,
- 69, 70, 71, -1, 73, -1, -1, 76, 77, 78,
- -1, -1, -1, -1, -1, 50, -1, -1, -1, -1,
- -1, -1, -1, -1, 93, 94, 95, 96, 97, 98,
- 99, 66, 67, 68, 69, 70, 71, -1, 73, -1,
- -1, 76, 77, 78, -1, -1, -1, -1, -1, 50,
- -1, -1, -1, -1, -1, -1, -1, -1, 93, 94,
- 95, 96, 97, 98, 99, 66, 67, 68, 69, 70,
- 71, -1, 73, -1, -1, 76, 77, 78, -1, -1,
- -1, -1, -1, 50, -1, -1, -1, -1, -1, -1,
- -1, -1, 93, 94, 95, 96, 97, 98, 99, 66,
- 67, 68, 69, 70, 71, -1, 73, -1, -1, 76,
- 77, 78, -1, -1, -1, -1, -1, 50, -1, -1,
- -1, -1, -1, -1, -1, -1, 93, 94, 95, 96,
- 97, 98, 99, 66, 67, 68, 69, 70, 71, -1,
- 73, -1, -1, 76, 77, 78, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 56, -1, -1,
- 93, 94, 95, 96, 97, 98, 99, 66, 67, 68,
- 69, 70, 71, -1, 73, -1, -1, 76, 77, 78,
+ -1, -1, 87, -1, 89, -1, -1, -1, -1, -1,
+ 12, 96, 97, 15, 16, 17, -1, 102, -1, 104,
+ -1, -1, -1, 25, 26, 27, -1, 29, 30, 31,
+ -1, 33, -1, -1, -1, -1, -1, -1, -1, 41,
+ -1, -1, -1, -1, 46, -1, 48, 49, 50, 51,
+ 52, -1, 54, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 56, 93, 94, 95, 96, 97, 98,
- 99, -1, 101, 66, 67, 68, 69, 70, 71, 58,
- 73, -1, -1, 76, 77, 78, -1, 66, 67, 68,
- 69, 70, 71, -1, 73, -1, -1, 76, 77, 78,
- 93, 94, 95, 96, 97, 98, 99, -1, -1, -1,
- -1, -1, -1, -1, 93, 94, 95, 96, 97, 98,
- 99, 66, 67, 68, 69, 70, 71, -1, 73, -1,
- -1, 76, 77, 78, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 93, 94,
- 95, 96, 97, 98, 99, -1, -1, -1, 103, 66,
- 67, 68, 69, 70, 71, -1, 73, -1, -1, 76,
- 77, 78, -1, -1, -1, -1, -1, 84, 85, -1,
- -1, -1, -1, -1, -1, -1, 93, 94, 95, 96,
- 97, 98, 99, 66, 67, 68, 69, 70, 71, -1,
- 73, -1, -1, 76, 77, 78, -1, -1, -1, -1,
+ 72, -1, -1, -1, -1, -1, -1, 79, 80, 81,
+ 82, 83, -1, -1, -1, -1, -1, 89, -1, -1,
+ -1, -1, -1, 12, 96, 97, 15, 16, 17, -1,
+ 102, -1, 104, -1, -1, -1, 25, 26, 27, -1,
+ 29, 30, 31, -1, 33, -1, -1, -1, -1, -1,
+ -1, -1, 41, -1, -1, -1, -1, -1, -1, 48,
+ -1, 50, -1, 52, -1, 54, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 64, -1, -1, -1, -1,
+ -1, -1, -1, 72, 12, -1, -1, 15, 16, 17,
+ 79, 80, 81, 82, 83, -1, -1, 25, 26, 27,
+ 89, 29, 30, 31, -1, 33, -1, 96, 97, -1,
+ -1, -1, -1, 102, -1, 104, -1, 12, -1, -1,
+ 15, 16, 17, -1, 52, -1, 54, -1, -1, -1,
+ 25, 26, 27, -1, 29, 30, 31, -1, 33, -1,
+ -1, -1, -1, -1, 72, -1, -1, -1, -1, -1,
+ -1, 79, 80, 81, 82, 83, -1, 52, -1, 54,
+ -1, 89, -1, -1, -1, -1, -1, -1, 96, 97,
+ -1, -1, -1, -1, 102, -1, 104, 72, -1, -1,
+ -1, -1, -1, -1, 79, 80, 81, 82, 83, 45,
+ -1, -1, -1, -1, 89, -1, -1, -1, -1, -1,
+ -1, 96, 97, -1, -1, -1, -1, 102, -1, 104,
+ 66, 67, 68, 69, 70, 71, -1, 73, 74, 75,
+ 76, 77, 78, -1, -1, -1, -1, -1, 50, -1,
+ -1, -1, -1, -1, 56, -1, -1, 93, 94, 95,
+ 96, 97, 98, 99, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, -1, -1, -1,
+ -1, -1, 50, -1, -1, -1, -1, -1, 56, -1,
+ -1, 93, 94, 95, 96, 97, 98, 99, 66, 67,
+ 68, 69, 70, 71, -1, 73, -1, -1, 76, 77,
+ 78, -1, -1, -1, -1, -1, 50, -1, -1, -1,
+ -1, -1, 56, -1, -1, 93, 94, 95, 96, 97,
+ 98, 99, 66, 67, 68, 69, 70, 71, -1, 73,
+ -1, -1, 76, 77, 78, -1, -1, -1, -1, -1,
+ 50, -1, -1, -1, -1, -1, 56, -1, -1, 93,
+ 94, 95, 96, 97, 98, 99, 66, 67, 68, 69,
+ 70, 71, -1, 73, -1, -1, 76, 77, 78, -1,
+ -1, -1, -1, -1, 50, -1, -1, -1, -1, -1,
+ -1, -1, -1, 93, 94, 95, 96, 97, 98, 99,
+ 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
+ 76, 77, 78, -1, -1, -1, -1, -1, 50, -1,
+ -1, -1, -1, -1, -1, -1, -1, 93, 94, 95,
+ 96, 97, 98, 99, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, -1, -1, -1,
+ -1, -1, 50, -1, -1, -1, -1, -1, -1, -1,
+ -1, 93, 94, 95, 96, 97, 98, 99, 66, 67,
+ 68, 69, 70, 71, -1, 73, -1, -1, 76, 77,
+ 78, -1, -1, -1, -1, -1, 50, -1, -1, -1,
+ -1, -1, -1, -1, -1, 93, 94, 95, 96, 97,
+ 98, 99, 66, 67, 68, 69, 70, 71, -1, 73,
+ -1, -1, 76, 77, 78, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 56, -1, -1, 93,
+ 94, 95, 96, 97, 98, 99, 66, 67, 68, 69,
+ 70, 71, -1, 73, -1, -1, 76, 77, 78, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 93, 94, 95, 96, 97, 98, 99
+ -1, -1, 56, 93, 94, 95, 96, 97, 98, 99,
+ -1, 101, 66, 67, 68, 69, 70, 71, 58, 73,
+ -1, -1, 76, 77, 78, -1, 66, 67, 68, 69,
+ 70, 71, -1, 73, -1, -1, 76, 77, 78, 93,
+ 94, 95, 96, 97, 98, 99, -1, -1, -1, -1,
+ -1, -1, -1, 93, 94, 95, 96, 97, 98, 99,
+ 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
+ 76, 77, 78, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 93, 94, 95,
+ 96, 97, 98, 99, -1, -1, -1, 103, 66, 67,
+ 68, 69, 70, 71, -1, 73, -1, -1, 76, 77,
+ 78, -1, -1, -1, -1, -1, 84, 85, -1, -1,
+ -1, -1, -1, -1, -1, 93, 94, 95, 96, 97,
+ 98, 99, 66, 67, 68, 69, 70, 71, -1, 73,
+ -1, -1, 76, 77, 78, 66, 67, 68, 69, -1,
+ -1, -1, 73, -1, -1, 76, 77, 78, -1, 93,
+ 94, 95, 96, 97, 98, 99, -1, -1, -1, -1,
+ -1, -1, 93, 94, 95, 96, 97, 98, 99
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1229,32 +1231,32 @@ static const yytype_uint8 yystos[] =
87, 88, 89, 96, 97, 102, 104, 108, 109, 110,
111, 112, 113, 116, 117, 118, 123, 124, 125, 126,
127, 128, 132, 135, 137, 140, 144, 101, 30, 52,
- 89, 126, 126, 126, 126, 146, 30, 126, 146, 126,
- 102, 146, 136, 139, 53, 30, 129, 41, 46, 48,
- 49, 50, 51, 126, 133, 134, 30, 126, 58, 59,
- 15, 16, 30, 30, 30, 126, 64, 133, 134, 30,
- 131, 126, 126, 126, 126, 126, 126, 30, 130, 30,
- 102, 126, 126, 126, 126, 145, 0, 101, 126, 68,
- 126, 111, 126, 66, 67, 68, 69, 70, 71, 73,
- 76, 77, 78, 93, 94, 95, 96, 97, 98, 99,
- 120, 102, 126, 106, 145, 126, 145, 145, 120, 106,
- 126, 126, 48, 134, 138, 45, 74, 75, 30, 56,
- 68, 125, 126, 56, 68, 55, 58, 134, 106, 50,
- 56, 50, 56, 50, 56, 50, 56, 84, 85, 106,
- 30, 103, 105, 106, 109, 121, 126, 121, 121, 56,
- 101, 126, 126, 126, 126, 126, 126, 126, 126, 126,
- 126, 126, 126, 126, 126, 126, 126, 126, 30, 141,
- 126, 103, 141, 30, 126, 120, 30, 127, 126, 126,
- 126, 126, 68, 56, 126, 126, 126, 30, 126, 126,
- 126, 126, 126, 126, 126, 126, 126, 126, 30, 103,
- 106, 126, 122, 121, 55, 126, 122, 101, 106, 101,
- 141, 126, 126, 50, 50, 50, 50, 145, 101, 112,
- 121, 37, 56, 122, 121, 106, 143, 30, 143, 101,
- 126, 126, 126, 126, 103, 91, 56, 126, 121, 92,
- 30, 122, 122, 143, 126, 121, 39, 114, 115, 119,
- 34, 122, 121, 122, 38, 121, 114, 126, 30, 142,
- 122, 121, 120, 90, 121, 106, 121, 91, 122, 55,
- 30, 91, 121, 122, 90, 121
+ 126, 126, 126, 126, 146, 30, 126, 146, 126, 102,
+ 146, 136, 139, 53, 30, 129, 41, 46, 48, 49,
+ 50, 51, 126, 133, 134, 30, 126, 58, 59, 15,
+ 16, 30, 30, 30, 126, 64, 133, 134, 30, 131,
+ 126, 126, 126, 126, 126, 126, 30, 130, 30, 102,
+ 126, 126, 126, 126, 145, 0, 101, 126, 68, 126,
+ 111, 126, 66, 67, 68, 69, 70, 71, 73, 76,
+ 77, 78, 93, 94, 95, 96, 97, 98, 99, 120,
+ 102, 126, 106, 145, 126, 145, 145, 120, 106, 126,
+ 126, 48, 134, 138, 45, 74, 75, 30, 56, 68,
+ 125, 126, 56, 68, 55, 58, 134, 106, 50, 56,
+ 50, 56, 50, 56, 50, 56, 84, 85, 106, 30,
+ 103, 105, 106, 109, 121, 126, 121, 121, 56, 101,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 30, 141, 126,
+ 103, 141, 30, 126, 120, 30, 127, 126, 126, 126,
+ 126, 68, 56, 126, 126, 126, 30, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 30, 103, 106,
+ 126, 122, 121, 55, 126, 122, 101, 106, 101, 141,
+ 126, 126, 50, 50, 50, 50, 145, 101, 112, 121,
+ 37, 56, 122, 121, 106, 143, 30, 143, 101, 126,
+ 126, 126, 126, 103, 91, 56, 126, 121, 92, 30,
+ 122, 122, 143, 126, 121, 39, 114, 115, 119, 34,
+ 122, 121, 122, 38, 121, 114, 126, 30, 142, 122,
+ 121, 120, 90, 121, 106, 121, 91, 122, 55, 30,
+ 91, 121, 122, 90, 121
};
#define yyerrok (yyerrstatus = 0)
@@ -2069,12 +2071,12 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 126 "engines/director/lingo/lingo-gr.y"
+#line 125 "engines/director/lingo/lingo-gr.y"
{ yyerrok; ;}
break;
case 8:
-#line 134 "engines/director/lingo/lingo-gr.y"
+#line 133 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str());
@@ -2084,24 +2086,24 @@ yyreduce:
break;
case 9:
-#line 140 "engines/director/lingo/lingo-gr.y"
+#line 139 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_assign);
(yyval.code) = (yyvsp[(2) - (4)].code); ;}
break;
case 10:
-#line 143 "engines/director/lingo/lingo-gr.y"
+#line 142 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_after); ;}
break;
case 11:
-#line 144 "engines/director/lingo/lingo-gr.y"
+#line 143 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_before); ;}
break;
case 12:
-#line 145 "engines/director/lingo/lingo-gr.y"
+#line 144 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
@@ -2111,7 +2113,7 @@ yyreduce:
break;
case 13:
-#line 151 "engines/director/lingo/lingo-gr.y"
+#line 150 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2122,7 +2124,7 @@ yyreduce:
break;
case 14:
-#line 158 "engines/director/lingo/lingo-gr.y"
+#line 157 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
@@ -2132,7 +2134,7 @@ yyreduce:
break;
case 15:
-#line 164 "engines/director/lingo/lingo-gr.y"
+#line 163 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2143,7 +2145,7 @@ yyreduce:
break;
case 16:
-#line 171 "engines/director/lingo/lingo-gr.y"
+#line 170 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_swap);
g_lingo->code1(g_lingo->c_theentityassign);
@@ -2153,7 +2155,7 @@ yyreduce:
break;
case 17:
-#line 177 "engines/director/lingo/lingo-gr.y"
+#line 176 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_swap);
g_lingo->code1(g_lingo->c_theentityassign);
@@ -2163,7 +2165,7 @@ yyreduce:
break;
case 23:
-#line 196 "engines/director/lingo/lingo-gr.y"
+#line 195 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[(3) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2173,7 +2175,7 @@ yyreduce:
break;
case 24:
-#line 207 "engines/director/lingo/lingo-gr.y"
+#line 206 "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));
@@ -2189,7 +2191,7 @@ yyreduce:
break;
case 25:
-#line 224 "engines/director/lingo/lingo-gr.y"
+#line 223 "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));
@@ -2205,7 +2207,7 @@ yyreduce:
break;
case 26:
-#line 236 "engines/director/lingo/lingo-gr.y"
+#line 235 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code));
@@ -2214,20 +2216,20 @@ yyreduce:
break;
case 27:
-#line 241 "engines/director/lingo/lingo-gr.y"
+#line 240 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented"); ;}
break;
case 28:
-#line 243 "engines/director/lingo/lingo-gr.y"
+#line 242 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
;}
break;
case 29:
-#line 248 "engines/director/lingo/lingo-gr.y"
+#line 247 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(3) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2241,7 +2243,7 @@ yyreduce:
break;
case 30:
-#line 258 "engines/director/lingo/lingo-gr.y"
+#line 257 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(3) - (12)].code) - (yyvsp[(1) - (12)].code));
@@ -2255,7 +2257,7 @@ yyreduce:
break;
case 33:
-#line 274 "engines/director/lingo/lingo-gr.y"
+#line 273 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(3) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2265,12 +2267,12 @@ yyreduce:
break;
case 34:
-#line 282 "engines/director/lingo/lingo-gr.y"
+#line 281 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;}
break;
case 35:
-#line 285 "engines/director/lingo/lingo-gr.y"
+#line 284 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
@@ -2279,7 +2281,7 @@ yyreduce:
break;
case 36:
-#line 292 "engines/director/lingo/lingo-gr.y"
+#line 291 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
@@ -2288,7 +2290,7 @@ yyreduce:
break;
case 37:
-#line 299 "engines/director/lingo/lingo-gr.y"
+#line 298 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
@@ -2298,22 +2300,22 @@ yyreduce:
break;
case 38:
-#line 307 "engines/director/lingo/lingo-gr.y"
+#line 306 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 39:
-#line 310 "engines/director/lingo/lingo-gr.y"
+#line 309 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 40:
-#line 313 "engines/director/lingo/lingo-gr.y"
+#line 312 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 43:
-#line 318 "engines/director/lingo/lingo-gr.y"
+#line 317 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_whencode);
g_lingo->code1(STOP);
@@ -2322,42 +2324,42 @@ yyreduce:
break;
case 44:
-#line 324 "engines/director/lingo/lingo-gr.y"
+#line 323 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_tellcode);
g_lingo->code1(STOP); ;}
break;
case 45:
-#line 328 "engines/director/lingo/lingo-gr.y"
+#line 327 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt((yyvsp[(1) - (1)].i)); ;}
break;
case 46:
-#line 331 "engines/director/lingo/lingo-gr.y"
+#line 330 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_floatpush);
g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;}
break;
case 47:
-#line 334 "engines/director/lingo/lingo-gr.y"
+#line 333 "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 48:
-#line 337 "engines/director/lingo/lingo-gr.y"
+#line 336 "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 49:
-#line 340 "engines/director/lingo/lingo-gr.y"
+#line 339 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_eval);
g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str());
@@ -2365,38 +2367,38 @@ yyreduce:
break;
case 50:
-#line 346 "engines/director/lingo/lingo-gr.y"
+#line 345 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(1) - (1)].code); ;}
break;
case 52:
-#line 348 "engines/director/lingo/lingo-gr.y"
+#line 347 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
case 53:
-#line 351 "engines/director/lingo/lingo-gr.y"
+#line 350 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 54:
-#line 354 "engines/director/lingo/lingo-gr.y"
+#line 353 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
case 55:
-#line 355 "engines/director/lingo/lingo-gr.y"
+#line 354 "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 56:
-#line 358 "engines/director/lingo/lingo-gr.y"
+#line 357 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2408,7 +2410,7 @@ yyreduce:
break;
case 57:
-#line 366 "engines/director/lingo/lingo-gr.y"
+#line 365 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_theentitypush);
inst e = 0, f = 0;
@@ -2418,298 +2420,298 @@ yyreduce:
break;
case 59:
-#line 373 "engines/director/lingo/lingo-gr.y"
+#line 372 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_add); ;}
break;
case 60:
-#line 374 "engines/director/lingo/lingo-gr.y"
+#line 373 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_sub); ;}
break;
case 61:
-#line 375 "engines/director/lingo/lingo-gr.y"
+#line 374 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mul); ;}
break;
case 62:
-#line 376 "engines/director/lingo/lingo-gr.y"
+#line 375 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_div); ;}
break;
case 63:
-#line 377 "engines/director/lingo/lingo-gr.y"
+#line 376 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mod); ;}
break;
case 64:
-#line 378 "engines/director/lingo/lingo-gr.y"
+#line 377 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gt); ;}
break;
case 65:
-#line 379 "engines/director/lingo/lingo-gr.y"
+#line 378 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lt); ;}
break;
case 66:
-#line 380 "engines/director/lingo/lingo-gr.y"
+#line 379 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_eq); ;}
break;
case 67:
-#line 381 "engines/director/lingo/lingo-gr.y"
+#line 380 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_neq); ;}
break;
case 68:
-#line 382 "engines/director/lingo/lingo-gr.y"
+#line 381 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ge); ;}
break;
case 69:
-#line 383 "engines/director/lingo/lingo-gr.y"
+#line 382 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_le); ;}
break;
case 70:
-#line 384 "engines/director/lingo/lingo-gr.y"
+#line 383 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_and); ;}
break;
case 71:
-#line 385 "engines/director/lingo/lingo-gr.y"
+#line 384 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_or); ;}
break;
case 72:
-#line 386 "engines/director/lingo/lingo-gr.y"
+#line 385 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_not); ;}
break;
case 73:
-#line 387 "engines/director/lingo/lingo-gr.y"
+#line 386 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ampersand); ;}
break;
case 74:
-#line 388 "engines/director/lingo/lingo-gr.y"
+#line 387 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_concat); ;}
break;
case 75:
-#line 389 "engines/director/lingo/lingo-gr.y"
+#line 388 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_contains); ;}
break;
case 76:
-#line 390 "engines/director/lingo/lingo-gr.y"
+#line 389 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_starts); ;}
break;
case 77:
-#line 391 "engines/director/lingo/lingo-gr.y"
+#line 390 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); ;}
break;
case 78:
-#line 392 "engines/director/lingo/lingo-gr.y"
+#line 391 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;}
break;
case 79:
-#line 393 "engines/director/lingo/lingo-gr.y"
+#line 392 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
case 80:
-#line 394 "engines/director/lingo/lingo-gr.y"
+#line 393 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_arraypush); g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;}
break;
case 81:
-#line 395 "engines/director/lingo/lingo-gr.y"
+#line 394 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_intersects); ;}
break;
case 82:
-#line 396 "engines/director/lingo/lingo-gr.y"
+#line 395 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_within); ;}
break;
case 83:
-#line 397 "engines/director/lingo/lingo-gr.y"
+#line 396 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charOf); ;}
break;
case 84:
-#line 398 "engines/director/lingo/lingo-gr.y"
+#line 397 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charToOf); ;}
break;
case 85:
-#line 399 "engines/director/lingo/lingo-gr.y"
+#line 398 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemOf); ;}
break;
case 86:
-#line 400 "engines/director/lingo/lingo-gr.y"
+#line 399 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemToOf); ;}
break;
case 87:
-#line 401 "engines/director/lingo/lingo-gr.y"
+#line 400 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineOf); ;}
break;
case 88:
-#line 402 "engines/director/lingo/lingo-gr.y"
+#line 401 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineToOf); ;}
break;
case 89:
-#line 403 "engines/director/lingo/lingo-gr.y"
+#line 402 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordOf); ;}
break;
case 90:
-#line 404 "engines/director/lingo/lingo-gr.y"
+#line 403 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordToOf); ;}
break;
case 91:
+#line 404 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
+ break;
+
+ case 92:
#line 405 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
+ break;
+
+ case 93:
+#line 406 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeMe(nullptr, 0); ;}
break;
- case 92:
-#line 408 "engines/director/lingo/lingo-gr.y"
+ case 94:
+#line 409 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 93:
-#line 413 "engines/director/lingo/lingo-gr.y"
+ case 95:
+#line 414 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_printtop); ;}
break;
- case 96:
-#line 416 "engines/director/lingo/lingo-gr.y"
+ case 98:
+#line 417 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_exitRepeat); ;}
break;
- case 97:
-#line 417 "engines/director/lingo/lingo-gr.y"
+ case 99:
+#line 418 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_procret); ;}
break;
- case 101:
-#line 421 "engines/director/lingo/lingo-gr.y"
+ case 103:
+#line 422 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
- case 102:
-#line 424 "engines/director/lingo/lingo-gr.y"
+ case 104:
+#line 425 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 103:
-#line 427 "engines/director/lingo/lingo-gr.y"
+ case 105:
+#line 428 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 104:
-#line 430 "engines/director/lingo/lingo-gr.y"
+ case 106:
+#line 431 "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 105:
-#line 434 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
- break;
-
- case 106:
-#line 435 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
- break;
-
case 107:
-#line 436 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
+#line 435 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
case 108:
-#line 437 "engines/director/lingo/lingo-gr.y"
+#line 436 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_open); ;}
break;
case 109:
-#line 438 "engines/director/lingo/lingo-gr.y"
+#line 437 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;}
break;
case 110:
-#line 439 "engines/director/lingo/lingo-gr.y"
+#line 438 "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 111:
-#line 442 "engines/director/lingo/lingo-gr.y"
+#line 441 "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 112:
-#line 443 "engines/director/lingo/lingo-gr.y"
+#line 442 "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 113:
-#line 446 "engines/director/lingo/lingo-gr.y"
+#line 445 "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 114:
-#line 447 "engines/director/lingo/lingo-gr.y"
+#line 446 "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 115:
-#line 450 "engines/director/lingo/lingo-gr.y"
+#line 449 "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 116:
-#line 451 "engines/director/lingo/lingo-gr.y"
+#line 450 "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 117:
-#line 462 "engines/director/lingo/lingo-gr.y"
+#line 461 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoloop); ;}
break;
case 118:
-#line 463 "engines/director/lingo/lingo-gr.y"
+#line 462 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotonext); ;}
break;
case 119:
-#line 464 "engines/director/lingo/lingo-gr.y"
+#line 463 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoprevious); ;}
break;
case 120:
-#line 465 "engines/director/lingo/lingo-gr.y"
+#line 464 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
@@ -2717,7 +2719,7 @@ yyreduce:
break;
case 121:
-#line 469 "engines/director/lingo/lingo-gr.y"
+#line 468 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
@@ -2725,7 +2727,7 @@ yyreduce:
break;
case 122:
-#line 473 "engines/director/lingo/lingo-gr.y"
+#line 472 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
@@ -2733,12 +2735,12 @@ yyreduce:
break;
case 127:
-#line 487 "engines/director/lingo/lingo-gr.y"
+#line 486 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_playdone); ;}
break;
case 128:
-#line 488 "engines/director/lingo/lingo-gr.y"
+#line 487 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
@@ -2746,7 +2748,7 @@ yyreduce:
break;
case 129:
-#line 492 "engines/director/lingo/lingo-gr.y"
+#line 491 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
@@ -2754,7 +2756,7 @@ yyreduce:
break;
case 130:
-#line 496 "engines/director/lingo/lingo-gr.y"
+#line 495 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
@@ -2762,24 +2764,24 @@ yyreduce:
break;
case 131:
-#line 500 "engines/director/lingo/lingo-gr.y"
+#line 499 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); ;}
break;
case 132:
-#line 500 "engines/director/lingo/lingo-gr.y"
+#line 499 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;}
break;
case 133:
-#line 530 "engines/director/lingo/lingo-gr.y"
+#line 529 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); ;}
break;
case 134:
-#line 531 "engines/director/lingo/lingo-gr.y"
+#line 530 "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));
@@ -2788,17 +2790,17 @@ yyreduce:
break;
case 135:
-#line 536 "engines/director/lingo/lingo-gr.y"
+#line 535 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;}
break;
case 136:
-#line 537 "engines/director/lingo/lingo-gr.y"
+#line 536 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; ;}
break;
case 137:
-#line 538 "engines/director/lingo/lingo-gr.y"
+#line 537 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_procret);
g_lingo->define(*(yyvsp[(1) - (7)].s), (yyvsp[(3) - (7)].code), (yyvsp[(4) - (7)].narg) + 1, &g_lingo->_currentFactory);
@@ -2807,7 +2809,7 @@ yyreduce:
break;
case 138:
-#line 543 "engines/director/lingo/lingo-gr.y"
+#line 542 "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));
@@ -2819,7 +2821,7 @@ yyreduce:
break;
case 139:
-#line 551 "engines/director/lingo/lingo-gr.y"
+#line 550 "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));
@@ -2829,37 +2831,37 @@ yyreduce:
break;
case 140:
-#line 558 "engines/director/lingo/lingo-gr.y"
+#line 557 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(2) - (2)].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; ;}
break;
case 141:
-#line 560 "engines/director/lingo/lingo-gr.y"
+#line 559 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
case 142:
-#line 561 "engines/director/lingo/lingo-gr.y"
+#line 560 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
break;
case 143:
-#line 562 "engines/director/lingo/lingo-gr.y"
+#line 561 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
case 144:
-#line 563 "engines/director/lingo/lingo-gr.y"
+#line 562 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
break;
case 148:
-#line 571 "engines/director/lingo/lingo-gr.y"
+#line 570 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; ;}
break;
case 149:
-#line 575 "engines/director/lingo/lingo-gr.y"
+#line 574 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_call);
g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
@@ -2869,33 +2871,33 @@ yyreduce:
break;
case 150:
-#line 583 "engines/director/lingo/lingo-gr.y"
+#line 582 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
case 151:
-#line 584 "engines/director/lingo/lingo-gr.y"
+#line 583 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
case 152:
-#line 585 "engines/director/lingo/lingo-gr.y"
+#line 584 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
case 153:
-#line 588 "engines/director/lingo/lingo-gr.y"
+#line 587 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
case 154:
-#line 589 "engines/director/lingo/lingo-gr.y"
+#line 588 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
/* Line 1267 of yacc.c. */
-#line 2899 "engines/director/lingo/lingo-gr.cpp"
+#line 2901 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3109,6 +3111,6 @@ yyreturn:
}
-#line 592 "engines/director/lingo/lingo-gr.y"
+#line 591 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index ddf57fdb8f..8d3bc683c2 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -228,7 +228,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 83 "engines/director/lingo/lingo-gr.y"
+#line 82 "engines/director/lingo/lingo-gr.y"
{
Common::String *s;
int i;
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 93d90703ca..b751a485ef 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -401,7 +401,9 @@ expr: simpleexpr { $$ = $1; }
| tLINE expr tTO expr tOF expr { g_lingo->code1(g_lingo->c_lineToOf); }
| tWORD expr tOF expr { g_lingo->code1(g_lingo->c_wordOf); }
| tWORD expr tTO expr tOF expr { g_lingo->code1(g_lingo->c_wordToOf); }
- | tME { g_lingo->codeMe(nullptr, 0); }
+ | tME '(' ID ')' { g_lingo->codeMe($3, 0); }
+ | tME '(' ID ',' arglist ')' { g_lingo->codeMe($3, $5); }
+ | tME { g_lingo->codeMe(nullptr, 0); }
;
reference: RBLTINONEARG expr {
@@ -431,8 +433,6 @@ proc: tPUT expr { g_lingo->code1(g_lingo->c_printtop); }
g_lingo->codeFunc($1, 1);
delete $1; }
| BLTINARGLIST nonemptyarglist { g_lingo->codeFunc($1, $2); }
- | tME '(' ID ')' { g_lingo->codeMe($3, 0); }
- | tME '(' ID ',' arglist ')' { g_lingo->codeMe($3, $5); }
| tOPEN expr tWITH expr { g_lingo->code1(g_lingo->c_open); }
| tOPEN expr { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); }
| TWOWORDBUILTIN ID arglist { Common::String s(*$1); s += '-'; s += *$2; g_lingo->codeFunc(&s, $3); }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 02:32:14 +0000