[Scummvm-git-logs] scummvm master -> 1f1a1946642f08bffbeb40f77838388448d8d61b
sev-
sev at scummvm.org
Mon Dec 2 22:22:48 UTC 2019
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
07e615c31b DIRECTOR: LINGO: Fix splitting of the script by definitions
823e7c8569 DIRECTOR: LINGO: Implemented passing 'me' as an object reference
1f1a194664 DIRECTOR: LINGO: Made event handler names case insensitive
Commit: 07e615c31b0243942738ad5b138127e7ea9d9709
https://github.com/scummvm/scummvm/commit/07e615c31b0243942738ad5b138127e7ea9d9709
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-02T23:22:26+01:00
Commit Message:
DIRECTOR: LINGO: Fix splitting of the script by definitions
Changed paths:
engines/director/lingo/lingo.cpp
diff --git a/engines/director/lingo/lingo.cpp b/engines/director/lingo/lingo.cpp
index 36a7a11..dd0041d 100644
--- a/engines/director/lingo/lingo.cpp
+++ b/engines/director/lingo/lingo.cpp
@@ -93,22 +93,22 @@ const char *Lingo::findNextDefinition(const char *s) {
if (!*res)
return NULL;
- if (!strncmp(res, "macro ", 6)) {
+ if (!scumm_strnicmp(res, "macro ", 6)) {
debugC(1, kDebugLingoCompile, "findNextDefinition(): See 'macros ' construct");
return res;
}
- if (!strncmp(res, "on ", 3)) {
+ if (!scumm_strnicmp(res, "on ", 3)) {
debugC(1, kDebugLingoCompile, "findNextDefinition(): See 'on ' construct");
return res;
}
- if (!strncmp(res, "factory ", 8)) {
+ if (!scumm_strnicmp(res, "factory ", 8)) {
debugC(1, kDebugLingoCompile, "findNextDefinition(): See 'factory ' construct");
return res;
}
- if (!strncmp(res, "method ", 7)) {
+ if (!scumm_strnicmp(res, "method ", 7)) {
debugC(1, kDebugLingoCompile, "findNextDefinition(): See 'method ' construct");
return res;
}
@@ -163,9 +163,9 @@ void Lingo::addCode(const char *code, ScriptType type, uint16 id) {
do {
Common::String chunk(begin, end);
- if (chunk.hasPrefix("factory") || chunk.hasPrefix("method"))
+ if (chunk.hasPrefixIgnoreCase("factory") || chunk.hasPrefixIgnoreCase("method"))
_inFactory = true;
- else if (chunk.hasPrefix("macro") || chunk.hasPrefix("on"))
+ else if (chunk.hasPrefixIgnoreCase("macro") || chunk.hasPrefixIgnoreCase("on"))
_inFactory = false;
else
_inFactory = false;
Commit: 823e7c856960faf5dd3ed409a179aea0ec22f2d2
https://github.com/scummvm/scummvm/commit/823e7c856960faf5dd3ed409a179aea0ec22f2d2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-02T23:22:26+01:00
Commit Message:
DIRECTOR: LINGO: Implemented passing 'me' as an object reference
Changed paths:
engines/director/lingo/lingo-code.cpp
engines/director/lingo/lingo-codegen.cpp
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.y
engines/director/lingo/lingo.h
engines/director/lingo/tests/factory.lingo
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index fd00205..ff274fd 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -1241,6 +1241,18 @@ void Lingo::c_instance() {
warning("STUB: c_instance(%s)", name.c_str());
}
+void Lingo::c_factory() {
+ Common::String name(g_lingo->readString());
+ Datum d;
+
+ warning("STUB: c_factory(%s)", name.c_str());
+
+ d.type = OBJECT;
+ d.u.s = new Common::String(name);
+
+ g_lingo->push(d);
+}
+
void Lingo::c_open() {
Datum d2 = g_lingo->pop();
Datum d1 = g_lingo->pop();
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index d9a55c8..16560ef 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -358,6 +358,14 @@ int Lingo::codeFunc(Common::String *s, int numpar) {
}
int Lingo::codeMe(Common::String *method, int numpar) {
+ // Check if need to encode reference to the factory
+ if (method == nullptr) {
+ int ret = g_lingo->code1(g_lingo->c_factory);
+ g_lingo->codeString(g_lingo->_currentFactory.c_str());
+
+ return ret;
+ }
+
int ret = g_lingo->code1(g_lingo->c_call);
Common::String m(g_lingo->_currentFactory);
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index a74e1a0..d126eb5 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -538,18 +538,18 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 128
+#define YYFINAL 129
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1857
+#define YYLAST 1870
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 105
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 47
/* YYNRULES -- Number of rules. */
-#define YYNRULES 171
+#define YYNRULES 172
/* YYNRULES -- Number of states. */
-#define YYNSTATES 368
+#define YYNSTATES 369
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -613,14 +613,14 @@ static const yytype_uint16 yyprhs[] =
282, 285, 290, 295, 297, 300, 302, 306, 310, 314,
318, 322, 326, 330, 334, 338, 342, 346, 350, 354,
357, 361, 365, 369, 373, 376, 379, 383, 387, 392,
- 397, 402, 409, 414, 421, 426, 433, 438, 445, 448,
- 451, 453, 455, 458, 460, 463, 466, 469, 471, 474,
- 477, 479, 482, 487, 492, 499, 504, 507, 511, 513,
- 517, 519, 523, 525, 529, 532, 535, 538, 541, 545,
- 548, 551, 553, 557, 560, 563, 566, 570, 573, 574,
- 578, 579, 588, 591, 592, 601, 610, 617, 620, 621,
- 623, 627, 632, 633, 635, 639, 640, 643, 644, 646,
- 650, 652
+ 397, 402, 409, 414, 421, 426, 433, 438, 445, 447,
+ 450, 453, 455, 457, 460, 462, 465, 468, 471, 473,
+ 476, 479, 481, 484, 489, 494, 501, 506, 509, 513,
+ 515, 519, 521, 525, 527, 531, 534, 537, 540, 543,
+ 547, 550, 553, 555, 559, 562, 565, 568, 572, 575,
+ 576, 580, 581, 590, 593, 594, 603, 612, 619, 622,
+ 623, 625, 629, 634, 635, 637, 641, 642, 645, 646,
+ 648, 652, 654
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -670,28 +670,28 @@ static const yytype_int16 yyrhs[] =
131, 47, 131, -1, 81, 131, 54, 131, 47, 131,
-1, 82, 131, 47, 131, -1, 82, 131, 54, 131,
47, 131, -1, 83, 131, 47, 131, -1, 83, 131,
- 54, 131, 47, 131, -1, 27, 131, -1, 49, 131,
- -1, 137, -1, 140, -1, 37, 50, -1, 37, -1,
- 39, 134, -1, 88, 135, -1, 64, 136, -1, 17,
- -1, 19, 131, -1, 18, 131, -1, 18, -1, 20,
- 151, -1, 20, 98, 151, 99, -1, 90, 98, 28,
- 99, -1, 90, 98, 28, 104, 150, 99, -1, 61,
- 131, 56, 131, -1, 61, 131, -1, 21, 28, 150,
- -1, 28, -1, 134, 104, 28, -1, 28, -1, 135,
- 104, 28, -1, 28, -1, 136, 104, 28, -1, 40,
- 43, -1, 40, 46, -1, 40, 48, -1, 40, 138,
- -1, 40, 138, 139, -1, 40, 139, -1, 38, 131,
- -1, 131, -1, 47, 45, 131, -1, 45, 131, -1,
- 62, 63, -1, 62, 138, -1, 62, 138, 139, -1,
- 62, 139, -1, -1, 33, 141, 150, -1, -1, 44,
- 28, 143, 125, 146, 107, 148, 127, -1, 59, 28,
- -1, -1, 60, 28, 144, 125, 146, 107, 148, 127,
- -1, 145, 125, 146, 107, 148, 127, 32, 147, -1,
- 145, 125, 146, 107, 148, 127, -1, 89, 28, -1,
- -1, 28, -1, 146, 104, 28, -1, 146, 107, 104,
- 28, -1, -1, 28, -1, 147, 104, 28, -1, -1,
- 28, 151, -1, -1, 131, -1, 150, 104, 131, -1,
- 131, -1, 151, 104, 131, -1
+ 54, 131, 47, 131, -1, 90, -1, 27, 131, -1,
+ 49, 131, -1, 137, -1, 140, -1, 37, 50, -1,
+ 37, -1, 39, 134, -1, 88, 135, -1, 64, 136,
+ -1, 17, -1, 19, 131, -1, 18, 131, -1, 18,
+ -1, 20, 151, -1, 20, 98, 151, 99, -1, 90,
+ 98, 28, 99, -1, 90, 98, 28, 104, 150, 99,
+ -1, 61, 131, 56, 131, -1, 61, 131, -1, 21,
+ 28, 150, -1, 28, -1, 134, 104, 28, -1, 28,
+ -1, 135, 104, 28, -1, 28, -1, 136, 104, 28,
+ -1, 40, 43, -1, 40, 46, -1, 40, 48, -1,
+ 40, 138, -1, 40, 138, 139, -1, 40, 139, -1,
+ 38, 131, -1, 131, -1, 47, 45, 131, -1, 45,
+ 131, -1, 62, 63, -1, 62, 138, -1, 62, 138,
+ 139, -1, 62, 139, -1, -1, 33, 141, 150, -1,
+ -1, 44, 28, 143, 125, 146, 107, 148, 127, -1,
+ 59, 28, -1, -1, 60, 28, 144, 125, 146, 107,
+ 148, 127, -1, 145, 125, 146, 107, 148, 127, 32,
+ 147, -1, 145, 125, 146, 107, 148, 127, -1, 89,
+ 28, -1, -1, 28, -1, 146, 104, 28, -1, 146,
+ 107, 104, 28, -1, -1, 28, -1, 147, 104, 28,
+ -1, -1, 28, 151, -1, -1, 131, -1, 150, 104,
+ 131, -1, 131, -1, 151, 104, 131, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -707,14 +707,14 @@ static const yytype_uint16 yyrline[] =
453, 454, 455, 458, 466, 472, 473, 474, 475, 476,
477, 478, 479, 480, 481, 482, 483, 484, 485, 486,
487, 488, 489, 490, 491, 492, 493, 494, 495, 496,
- 497, 498, 499, 500, 501, 502, 503, 504, 507, 512,
- 513, 514, 515, 516, 517, 518, 519, 520, 523, 526,
- 529, 533, 534, 535, 536, 537, 538, 539, 542, 543,
- 546, 547, 550, 551, 562, 563, 564, 565, 569, 573,
- 579, 580, 583, 584, 587, 588, 592, 596, 600, 600,
- 630, 630, 635, 636, 636, 641, 648, 654, 656, 657,
- 658, 659, 662, 663, 664, 667, 671, 679, 680, 681,
- 684, 685
+ 497, 498, 499, 500, 501, 502, 503, 504, 505, 508,
+ 513, 514, 515, 516, 517, 518, 519, 520, 521, 524,
+ 527, 530, 534, 535, 536, 537, 538, 539, 540, 543,
+ 544, 547, 548, 551, 552, 563, 564, 565, 566, 570,
+ 574, 580, 581, 584, 585, 588, 589, 593, 597, 601,
+ 601, 631, 631, 636, 637, 637, 642, 649, 655, 657,
+ 658, 659, 660, 663, 664, 665, 668, 672, 680, 681,
+ 682, 685, 686
};
#endif
@@ -782,14 +782,14 @@ static const yytype_uint8 yyr1[] =
131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 131, 131, 132, 133,
+ 131, 131, 131, 131, 131, 131, 131, 131, 131, 132,
133, 133, 133, 133, 133, 133, 133, 133, 133, 133,
- 133, 133, 133, 133, 133, 133, 133, 133, 134, 134,
- 135, 135, 136, 136, 137, 137, 137, 137, 137, 137,
- 138, 138, 139, 139, 140, 140, 140, 140, 141, 140,
- 143, 142, 142, 144, 142, 142, 142, 145, 146, 146,
- 146, 146, 147, 147, 147, 148, 149, 150, 150, 150,
- 151, 151
+ 133, 133, 133, 133, 133, 133, 133, 133, 133, 134,
+ 134, 135, 135, 136, 136, 137, 137, 137, 137, 137,
+ 137, 138, 138, 139, 139, 140, 140, 140, 140, 141,
+ 140, 143, 142, 142, 144, 142, 142, 142, 145, 146,
+ 146, 146, 146, 147, 147, 147, 148, 149, 150, 150,
+ 150, 151, 151
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -805,14 +805,14 @@ static const yytype_uint8 yyr2[] =
2, 4, 4, 1, 2, 1, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 2,
3, 3, 3, 3, 2, 2, 3, 3, 4, 4,
- 4, 6, 4, 6, 4, 6, 4, 6, 2, 2,
- 1, 1, 2, 1, 2, 2, 2, 1, 2, 2,
- 1, 2, 4, 4, 6, 4, 2, 3, 1, 3,
- 1, 3, 1, 3, 2, 2, 2, 2, 3, 2,
- 2, 1, 3, 2, 2, 2, 3, 2, 0, 3,
- 0, 8, 2, 0, 8, 8, 6, 2, 0, 1,
- 3, 4, 0, 1, 3, 0, 2, 0, 1, 3,
- 1, 3
+ 4, 6, 4, 6, 4, 6, 4, 6, 1, 2,
+ 2, 1, 1, 2, 1, 2, 2, 2, 1, 2,
+ 2, 1, 2, 4, 4, 6, 4, 2, 3, 1,
+ 3, 1, 3, 1, 3, 2, 2, 2, 2, 3,
+ 2, 2, 1, 3, 2, 2, 2, 3, 2, 0,
+ 3, 0, 8, 2, 0, 8, 8, 6, 2, 0,
+ 1, 3, 4, 0, 1, 3, 0, 2, 0, 1,
+ 3, 1, 3
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -820,107 +820,107 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 61, 73, 0, 62, 117, 120, 0, 0,
- 0, 68, 0, 0, 0, 65, 64, 63, 148, 113,
+ 0, 0, 61, 73, 0, 62, 118, 121, 0, 0,
+ 0, 68, 0, 0, 0, 65, 64, 63, 149, 114,
0, 0, 52, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 60,
- 0, 0, 0, 0, 0, 0, 167, 0, 3, 75,
+ 0, 0, 108, 0, 0, 0, 168, 0, 3, 75,
25, 11, 26, 0, 0, 0, 0, 0, 66, 23,
- 67, 24, 110, 111, 10, 54, 22, 5, 4, 65,
- 0, 74, 119, 118, 0, 170, 121, 167, 69, 0,
- 70, 108, 167, 166, 167, 112, 128, 114, 0, 134,
- 0, 135, 0, 136, 141, 137, 139, 150, 109, 0,
- 50, 0, 0, 0, 0, 152, 153, 126, 144, 145,
- 147, 132, 116, 89, 0, 0, 0, 0, 0, 130,
- 115, 157, 0, 94, 95, 0, 168, 0, 1, 9,
- 54, 0, 0, 55, 0, 0, 0, 0, 0, 0,
+ 67, 24, 111, 112, 10, 54, 22, 5, 4, 65,
+ 0, 108, 74, 120, 119, 0, 171, 122, 168, 69,
+ 0, 70, 109, 168, 167, 168, 113, 129, 115, 0,
+ 135, 0, 136, 0, 137, 142, 138, 140, 151, 110,
+ 0, 50, 0, 0, 0, 0, 153, 154, 127, 145,
+ 146, 148, 133, 117, 89, 0, 0, 0, 0, 0,
+ 131, 116, 158, 0, 94, 95, 0, 169, 0, 1,
+ 9, 54, 0, 0, 55, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 158, 167, 0, 170, 0, 0, 127, 0,
- 168, 0, 149, 0, 140, 143, 0, 138, 54, 0,
- 0, 0, 51, 0, 0, 66, 0, 0, 0, 59,
- 54, 0, 146, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 96, 97, 0, 2,
- 56, 55, 55, 54, 6, 54, 30, 0, 54, 85,
- 86, 83, 84, 87, 88, 80, 91, 92, 93, 90,
- 76, 77, 78, 79, 81, 82, 159, 0, 122, 171,
- 71, 72, 129, 142, 158, 12, 13, 14, 15, 19,
- 17, 0, 0, 18, 16, 158, 125, 133, 100, 0,
- 102, 0, 104, 0, 106, 0, 98, 99, 131, 123,
- 167, 169, 57, 58, 0, 0, 0, 55, 32, 55,
- 0, 165, 0, 21, 20, 0, 0, 0, 0, 0,
- 0, 27, 0, 0, 55, 54, 0, 160, 0, 54,
- 165, 165, 101, 103, 105, 107, 124, 0, 55, 39,
- 33, 7, 54, 0, 31, 161, 156, 54, 54, 55,
- 54, 8, 54, 53, 55, 45, 0, 56, 55, 55,
- 47, 43, 0, 162, 151, 154, 54, 55, 0, 44,
- 40, 0, 55, 0, 42, 0, 0, 163, 155, 55,
- 0, 55, 54, 55, 54, 36, 34, 35, 54, 54,
- 0, 0, 28, 38, 0, 37, 0, 54, 54, 164,
- 29, 41, 55, 55, 55, 46, 48, 49
+ 0, 0, 0, 159, 168, 0, 171, 0, 0, 128,
+ 0, 169, 0, 150, 0, 141, 144, 0, 139, 54,
+ 0, 0, 0, 51, 0, 0, 66, 0, 0, 0,
+ 59, 54, 0, 147, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 96, 97, 0,
+ 2, 56, 55, 55, 54, 6, 54, 30, 0, 54,
+ 85, 86, 83, 84, 87, 88, 80, 91, 92, 93,
+ 90, 76, 77, 78, 79, 81, 82, 160, 0, 123,
+ 172, 71, 72, 130, 143, 159, 12, 13, 14, 15,
+ 19, 17, 0, 0, 18, 16, 159, 126, 134, 100,
+ 0, 102, 0, 104, 0, 106, 0, 98, 99, 132,
+ 124, 168, 170, 57, 58, 0, 0, 0, 55, 32,
+ 55, 0, 166, 0, 21, 20, 0, 0, 0, 0,
+ 0, 0, 27, 0, 0, 55, 54, 0, 161, 0,
+ 54, 166, 166, 101, 103, 105, 107, 125, 0, 55,
+ 39, 33, 7, 54, 0, 31, 162, 157, 54, 54,
+ 55, 54, 8, 54, 53, 55, 45, 0, 56, 55,
+ 55, 47, 43, 0, 163, 152, 155, 54, 55, 0,
+ 44, 40, 0, 55, 0, 42, 0, 0, 164, 156,
+ 55, 0, 55, 54, 55, 54, 36, 34, 35, 54,
+ 54, 0, 0, 28, 38, 0, 37, 0, 54, 54,
+ 165, 29, 41, 55, 55, 55, 46, 48, 49
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 47, 262, 205, 302, 313, 48, 49, 50, 263,
- 52, 343, 319, 320, 315, 321, 53, 54, 55, 316,
- 200, 206, 201, 56, 57, 58, 59, 60, 61, 87,
- 120, 112, 62, 95, 96, 63, 84, 64, 168, 180,
- 65, 227, 338, 289, 66, 161, 76
+ -1, 47, 263, 206, 303, 314, 48, 49, 50, 264,
+ 52, 344, 320, 321, 316, 322, 53, 54, 55, 317,
+ 201, 207, 202, 56, 57, 58, 59, 60, 61, 88,
+ 121, 113, 62, 96, 97, 63, 85, 64, 169, 181,
+ 65, 228, 339, 290, 66, 162, 77
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -287
+#define YYPACT_NINF -283
static const yytype_int16 yypact[] =
{
- 381, -50, -287, -287, 1034, -287, -287, 1034, 1034, 1074,
- 41, -287, 1034, 1150, 1034, 1190, -287, -287, -287, 38,
- 45, 918, -287, 64, 1034, -32, 42, 91, 98, 123,
- 1034, 958, 124, 1034, 1034, 1034, 1034, 1034, 1034, -287,
- 125, 127, -33, 1034, 1034, 1034, 1034, 3, -287, -287,
- -287, -287, -287, 1034, 87, 1034, 836, 1034, -287, 1756,
- -287, -287, -287, -287, -287, -287, -287, -287, -287, 59,
- 1034, 1756, 1756, 1756, 1034, 1756, 54, 1034, 1756, 1034,
- 54, 1756, 1034, 54, 1034, -287, -287, 55, 1034, -287,
- 1034, -287, 115, -287, 1756, 37, -287, -287, 1224, 133,
- -287, -1, 1034, 6, 110, -287, -287, 1653, -287, 37,
- -287, -287, 61, -63, 1257, 1290, 1323, 1356, 1686, -287,
- 62, -287, 141, -63, -63, 1719, 1756, -2, -287, 472,
- 1756, 1034, 1521, -287, 1620, 1034, 1034, 1034, 1034, 1034,
- 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034, 1034,
- 1034, 1034, 144, 1034, 1224, 1719, -40, 1034, 69, -27,
- 1719, -8, 69, 149, 1756, 1756, 1034, -287, -287, 97,
- 1034, 1034, -287, 1034, 1034, 111, 812, 1034, 1034, -287,
- -287, 1034, -287, 163, 1034, 1034, 1034, 1034, 1034, 1034,
- 1034, 1034, 1034, 1034, 165, 19, -287, -287, 1034, -287,
- -287, 654, 1756, -287, -287, -287, -287, 1034, -287, 12,
- 12, 12, 12, 158, 158, -63, 1756, 12, 12, 16,
- 20, 20, -63, -63, 1756, 1756, -287, -46, -287, 1756,
- -287, -287, -287, 1756, 144, -287, -287, 1756, 1756, 1756,
- 12, 1034, 1034, 1756, 12, 144, 1756, -287, 1756, 1389,
- 1756, 1422, 1756, 1455, 1756, 1488, 1756, 1756, -287, -287,
- 1034, 1756, -287, -287, 162, -5, 836, 654, 1756, 654,
- 168, 99, -46, 12, 1756, -46, 1034, 1034, 1034, 1034,
- 23, -287, 147, 1034, -287, -10, 170, -287, 177, -287,
- 99, 99, 1756, 1756, 1756, 1756, -287, 1034, 1756, -13,
- -287, -287, -287, 171, -287, -287, 563, -287, -287, 1756,
- -287, -287, -287, -287, 171, -287, 1034, 836, 654, 171,
- 171, -287, 1034, 178, 654, 654, -287, 654, 836, -287,
- 150, 1587, -287, 179, -287, 180, 1554, -287, 105, 654,
- 181, -287, -287, -287, -287, -287, -287, -287, -287, -287,
- 182, 183, -287, -287, 836, -287, 745, 745, -287, -287,
- -287, -287, -287, 654, 654, -287, -287, -287
+ 382, -58, -283, -283, 1041, -283, -283, 1041, 1041, 1081,
+ 63, -283, 1041, 1163, 1041, 1203, -283, -283, -283, 45,
+ 69, 919, -283, 76, 1041, -33, 35, 79, 82, 84,
+ 1041, 959, 92, 1041, 1041, 1041, 1041, 1041, 1041, -283,
+ 103, 104, 54, 1041, 1041, 1041, 1041, 8, -283, -283,
+ -283, -283, -283, 1041, 85, 1041, 837, 1041, -283, 1769,
+ -283, -283, -283, -283, -283, -283, -283, -283, -283, 55,
+ 1041, -283, 1769, 1769, 1769, 1041, 1769, 52, 1041, 1769,
+ 1041, 52, 1769, 1041, 52, 1041, -283, -283, 53, 1041,
+ -283, 1041, -283, 113, -283, 1769, 38, -283, -283, 1237,
+ 131, -283, -9, 1041, 5, 108, -283, -283, 1666, -283,
+ 38, -283, -283, 57, -75, 1270, 1303, 1336, 1369, 1699,
+ -283, 58, -283, 135, -75, -75, 1732, 1769, -46, -283,
+ 473, 1769, 1041, 1534, -283, 1633, 1041, 1041, 1041, 1041,
+ 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1041, 1041,
+ 1041, 1041, 1041, 138, 1041, 1237, 1732, -31, 1041, 66,
+ 7, 1732, 9, 66, 139, 1769, 1769, 1041, -283, -283,
+ 95, 1041, 1041, -283, 1041, 1041, 105, 813, 1041, 1041,
+ -283, -283, 1041, -283, 145, 1041, 1041, 1041, 1041, 1041,
+ 1041, 1041, 1041, 1041, 1041, 150, 10, -283, -283, 1041,
+ -283, -283, 655, 1769, -283, -283, -283, -283, 1041, -283,
+ 120, 120, 120, 120, 24, 24, -75, 1769, 120, 120,
+ 132, -30, -30, -75, -75, 1769, 1769, -283, -28, -283,
+ 1769, -283, -283, -283, 1769, 138, -283, -283, 1769, 1769,
+ 1769, 120, 1041, 1041, 1769, 120, 138, 1769, -283, 1769,
+ 1402, 1769, 1435, 1769, 1468, 1769, 1501, 1769, 1769, -283,
+ -283, 1041, 1769, -283, -283, 149, 2, 837, 655, 1769,
+ 655, 164, 91, -28, 120, 1769, -28, 1041, 1041, 1041,
+ 1041, 22, -283, 148, 1041, -283, -29, 171, -283, 176,
+ -283, 91, 91, 1769, 1769, 1769, 1769, -283, 1041, 1769,
+ -21, -283, -283, -283, 172, -283, -283, 564, -283, -283,
+ 1769, -283, -283, -283, -283, 172, -283, 1041, 837, 655,
+ 172, 172, -283, 1041, 179, 655, 655, -283, 655, 837,
+ -283, 152, 1600, -283, 184, -283, 187, 1567, -283, 118,
+ 655, 191, -283, -283, -283, -283, -283, -283, -283, -283,
+ -283, 200, 202, -283, -283, 837, -283, 746, 746, -283,
+ -283, -283, -283, -283, 655, 655, -283, -283, -283
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -287, -287, 15, -122, -286, -287, 89, -287, -49, 0,
- -287, -287, -287, -80, -257, -99, -287, -287, -287, -283,
- -4, 28, -110, -287, -287, 119, -3, 56, -287, -287,
- -287, -287, -287, 195, -29, -287, -287, -287, -287, -287,
- -287, -219, -287, -160, -287, -38, 4
+ -283, -283, 15, -102, -280, -283, 106, -283, -49, 0,
+ -283, -283, -283, -63, -234, -82, -283, -283, -283, -282,
+ -4, 28, -110, -283, -283, 141, -3, 71, -283, -283,
+ -283, -283, -283, 211, -18, -283, -283, -283, -283, -283,
+ -283, -180, -283, -164, -283, -32, 4
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -930,55 +930,46 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -10
static const yytype_int16 yytable[] =
{
- 51, 71, 110, 128, 72, 73, 75, 133, 127, 78,
- 75, 81, 75, 312, 142, 272, 68, 80, 94, 83,
- 322, 98, 300, 311, 99, 100, 275, 107, 94, 282,
- 113, 114, 115, 116, 117, 118, 322, 150, 151, 158,
- 123, 124, 125, 126, 342, 301, 162, 67, 301, 283,
- 130, 67, 132, 173, 134, 101, 102, 329, 270, 228,
- 177, 152, 129, 329, 157, 122, 167, 154, 174, 77,
- 103, 155, 230, 86, 126, 178, 155, 157, 156, 160,
- 182, 126, 90, 159, 92, 164, 141, 165, 85, 142,
- 141, 231, 97, 142, 141, 267, 198, 142, 269, 176,
- 67, 197, 198, 145, 146, 147, 148, 149, 146, 147,
- 148, 149, 150, 151, 148, 149, 150, 151, 259, 104,
- 150, 151, 296, 260, 14, 235, 105, 198, 202, 51,
- 307, 308, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 225, 208,
- 126, 106, 111, 119, 229, 121, 131, 153, 157, 163,
- 166, 172, 179, 233, 234, 183, 194, 237, 238, 195,
- 239, 240, 226, 198, 243, 244, 245, 232, 246, 306,
- 241, 248, 249, 250, 251, 252, 253, 254, 255, 256,
- 257, 247, 318, 258, 281, 261, 287, 324, 325, 266,
- 327, 297, 304, 288, 268, 305, 337, 311, 301, 350,
- 359, 346, 347, 352, 349, 360, 339, 284, 199, 314,
- 334, 175, 280, 135, 136, 236, 109, 137, 138, 264,
- 265, 0, 141, 0, 0, 142, 143, 144, 273, 274,
- 0, 0, 271, 0, 0, 0, 0, 363, 364, 145,
- 146, 147, 148, 149, 0, 0, 0, 126, 150, 151,
- 0, 0, 0, 0, 0, 0, 0, 0, 332, 0,
- 0, 0, 0, 292, 293, 294, 295, 0, 0, 341,
- 298, 303, 0, 0, 0, 0, 0, 290, 0, 0,
- 291, 0, 0, 0, 309, 285, 0, 286, 317, 0,
- 0, 0, 0, 0, 0, 361, 0, 0, 328, 0,
- 0, 0, 299, 331, 0, 0, 0, 0, 0, 336,
- 0, 0, 0, 0, 0, 0, 310, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 326, 354, 0,
- 356, 0, 330, 0, 357, 358, 333, 335, 0, 0,
- 0, 0, 0, 0, 0, 340, 362, 362, 0, 0,
- 345, 0, 0, 0, 0, 0, 0, 351, 0, 353,
- 0, 355, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, -9, 1, 0, 0, 0, 0, 0, 0, 0,
- 365, 366, 367, 2, 3, 4, 5, 0, 6, 7,
- 8, 9, 10, 0, 11, 12, 13, 0, 14, 15,
- 16, 0, 17, 0, 18, 0, 0, 0, 19, 0,
- 20, 21, 22, 0, 0, 23, 0, 0, 0, 0,
- 24, 25, 26, 0, 0, 0, 27, 0, 0, 0,
- 28, 29, 30, 31, 0, 32, 0, 0, 0, 0,
- 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
- 0, 34, 35, 36, 37, 38, 0, 0, 39, 40,
- 41, 42, 0, 43, 44, 0, 0, 0, -9, 45,
- 0, 0, 0, 46, 2, 3, 4, 5, 0, 6,
+ 51, 72, 143, 301, 73, 74, 76, 134, 129, 79,
+ 76, 82, 76, 111, 128, 312, 68, 81, 95, 84,
+ 313, 99, 323, 100, 101, 151, 152, 108, 95, 302,
+ 114, 115, 116, 117, 118, 119, 283, 302, 323, 67,
+ 124, 125, 126, 127, 142, 174, 159, 143, 102, 103,
+ 131, 343, 133, 163, 135, 273, 284, 198, 199, 178,
+ 175, 153, 130, 104, 149, 150, 276, 155, 229, 67,
+ 151, 152, 156, 158, 179, 127, 271, 156, 168, 157,
+ 161, 330, 127, 91, 160, 93, 165, 330, 166, 136,
+ 137, 78, 183, 138, 139, 86, 268, 87, 142, 270,
+ 177, 143, 144, 145, 98, 67, 231, 105, 232, 260,
+ 106, 158, 107, 199, 261, 146, 147, 148, 149, 150,
+ 112, 297, 14, 236, 151, 152, 199, 308, 309, 203,
+ 51, 120, 122, 210, 211, 212, 213, 214, 215, 216,
+ 217, 218, 219, 220, 221, 222, 223, 224, 225, 226,
+ 209, 127, 123, 154, 132, 230, 158, 164, 167, 173,
+ 180, 184, 195, 196, 234, 235, 227, 233, 238, 239,
+ 199, 240, 241, 248, 242, 244, 245, 246, 259, 247,
+ 307, 282, 249, 250, 251, 252, 253, 254, 255, 256,
+ 257, 258, 288, 319, 142, 289, 262, 143, 325, 326,
+ 267, 328, 298, 305, 306, 269, 142, 338, 312, 143,
+ 302, 146, 147, 148, 149, 150, 347, 340, 285, 348,
+ 151, 152, 351, 353, 147, 148, 149, 150, 360, 281,
+ 265, 266, 151, 152, 361, 350, 200, 315, 335, 274,
+ 275, 237, 110, 272, 176, 0, 0, 0, 364, 365,
+ 0, 0, 0, 0, 0, 0, 0, 0, 127, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 333,
+ 0, 0, 0, 0, 293, 294, 295, 296, 0, 0,
+ 342, 299, 304, 0, 0, 0, 0, 0, 291, 0,
+ 0, 292, 0, 0, 0, 310, 286, 0, 287, 318,
+ 0, 0, 0, 0, 0, 0, 362, 0, 0, 329,
+ 0, 0, 0, 300, 332, 0, 0, 0, 0, 0,
+ 337, 0, 0, 0, 0, 0, 0, 311, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 327, 355,
+ 0, 357, 0, 331, 0, 358, 359, 334, 336, 0,
+ 0, 0, 0, 0, 0, 0, 341, 363, 363, 0,
+ 0, 346, 0, 0, 0, 0, 0, 0, 352, 0,
+ 354, 0, 356, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, -9, 1, 0, 0, 0, 0, 0, 0,
+ 0, 366, 367, 368, 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,
@@ -986,19 +977,19 @@ static const yytype_int16 yytable[] =
0, 28, 29, 30, 31, 0, 32, 0, 0, 0,
0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
0, 0, 34, 35, 36, 37, 38, 0, 0, 39,
- 40, 41, 42, 0, 43, 44, 0, 0, 0, 0,
+ 40, 41, 42, 0, 43, 44, 0, 0, 0, -9,
45, 0, 0, 0, 46, 2, 3, 4, 5, 0,
6, 7, 8, 9, 10, 0, 11, 12, 13, 0,
- 14, 15, 16, 0, 17, 323, 18, 0, 0, 0,
- 19, 0, 20, 21, 22, 0, 0, 0, 0, 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, 0, 0, 30, 31, 0, 32, 0, 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, 0, 42, 0, 43, 44, 0, 0, 0,
- 67, 45, 0, 0, 0, 46, 2, 3, 4, 5,
+ 39, 40, 41, 42, 0, 43, 44, 0, 0, 0,
+ 0, 45, 0, 0, 0, 46, 2, 3, 4, 5,
0, 6, 7, 8, 9, 10, 0, 11, 12, 13,
- 0, 14, 15, 16, 0, 17, 0, 18, 0, 0,
+ 0, 14, 15, 16, 0, 17, 324, 18, 0, 0,
0, 19, 0, 20, 21, 22, 0, 0, 0, 0,
0, 0, 0, 24, 25, 26, 0, 0, 0, 27,
0, 0, 0, 0, 0, 30, 31, 0, 32, 0,
@@ -1014,161 +1005,163 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 33, 0,
0, 0, 0, 0, 0, 34, 35, 36, 37, 38,
0, 0, 39, 40, 0, 42, 0, 43, 44, 0,
- 0, 0, 0, 45, 0, 0, 0, 46, 2, 3,
+ 0, 0, 67, 45, 0, 0, 0, 46, 2, 3,
4, 5, 0, 6, 7, 8, 9, 10, 0, 11,
- 12, 13, 0, 14, 15, 16, 242, 17, 0, 18,
- 0, 0, 0, 19, 0, 20, 21, 135, 136, 0,
- 0, 137, 138, 139, 140, 24, 141, 26, 0, 142,
- 143, 144, 0, 0, 0, 0, 0, 30, 31, 0,
- 32, 0, 0, 145, 146, 147, 148, 149, 0, 33,
- 0, 0, 150, 151, 0, 0, 34, 35, 36, 37,
- 38, 0, 0, 0, 40, 0, 42, 0, 43, 44,
- 2, 3, 4, 5, 45, 0, 0, 0, 46, 0,
- 0, 11, 12, 13, 0, 14, 69, 16, 0, 17,
- 0, 0, 0, 0, 0, 0, 88, 0, 0, 0,
- 0, 89, 0, 90, 91, 92, 93, 70, 0, 26,
- 2, 3, 4, 5, 0, 0, 0, 0, 0, 0,
- 0, 11, 12, 13, 0, 14, 69, 16, 0, 17,
- 0, 33, 0, 0, 0, 0, 88, 0, 34, 35,
- 36, 37, 38, 90, 0, 92, 0, 70, 0, 26,
- 43, 44, 0, 0, 0, 0, 45, 0, 0, 0,
- 46, 108, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 33, 0, 0, 0, 0, 0, 0, 34, 35,
- 36, 37, 38, 0, 0, 0, 2, 3, 4, 5,
- 43, 44, 0, 0, 0, 0, 45, 11, 12, 13,
- 46, 14, 69, 16, 0, 17, 0, 0, 0, 0,
+ 12, 13, 0, 14, 15, 16, 0, 17, 0, 18,
+ 0, 0, 0, 19, 0, 20, 21, 22, 0, 0,
+ 0, 0, 0, 0, 0, 24, 25, 26, 0, 0,
+ 0, 27, 0, 0, 0, 0, 0, 30, 31, 0,
+ 32, 0, 0, 0, 0, 0, 0, 0, 0, 33,
+ 0, 0, 0, 0, 0, 0, 34, 35, 36, 37,
+ 38, 0, 0, 39, 40, 0, 42, 0, 43, 44,
+ 0, 0, 0, 0, 45, 0, 0, 0, 46, 2,
+ 3, 4, 5, 0, 6, 7, 8, 9, 10, 0,
+ 11, 12, 13, 0, 14, 15, 16, 243, 17, 0,
+ 18, 0, 0, 0, 19, 0, 20, 21, 136, 137,
+ 0, 0, 138, 139, 140, 141, 24, 142, 26, 0,
+ 143, 144, 145, 0, 0, 0, 0, 0, 30, 31,
+ 0, 32, 0, 0, 146, 147, 148, 149, 150, 0,
+ 33, 0, 0, 151, 152, 0, 0, 34, 35, 36,
+ 37, 38, 0, 0, 0, 40, 0, 42, 0, 43,
+ 44, 2, 3, 4, 5, 45, 0, 0, 0, 46,
+ 0, 0, 11, 12, 13, 0, 14, 69, 16, 0,
+ 17, 0, 0, 0, 0, 0, 0, 89, 0, 0,
+ 0, 0, 90, 0, 91, 92, 93, 94, 70, 0,
+ 26, 2, 3, 4, 5, 0, 0, 0, 0, 0,
+ 0, 0, 11, 12, 13, 0, 14, 69, 16, 0,
+ 17, 0, 33, 0, 0, 0, 0, 89, 0, 34,
+ 35, 36, 37, 38, 91, 0, 93, 0, 70, 71,
+ 26, 43, 44, 0, 0, 0, 0, 45, 0, 0,
+ 0, 46, 109, 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, 71,
+ 0, 43, 44, 2, 3, 4, 5, 45, 0, 0,
+ 0, 46, 0, 0, 11, 12, 13, 0, 14, 69,
+ 16, 0, 17, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 70, 0, 26, 2, 3, 4, 5,
- 0, 0, 0, 0, 0, 0, 0, 11, 12, 13,
- 0, 14, 69, 16, 0, 17, 0, 33, 0, 0,
- 0, 0, 0, 0, 34, 35, 36, 37, 38, 0,
- 0, 0, 0, 70, 0, 26, 43, 44, 0, 0,
- 0, 0, 45, 0, 0, 0, 46, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 33, 0, 0,
- 0, 0, 0, 0, 34, 35, 36, 37, 38, 0,
- 0, 0, 2, 3, 4, 5, 43, 44, 0, 0,
- 0, 0, 74, 11, 12, 13, 46, 14, 69, 16,
- 0, 17, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 70,
- 0, 26, 2, 3, 4, 5, 0, 0, 0, 0,
- 0, 0, 0, 11, 12, 13, 0, 14, 69, 16,
- 0, 17, 0, 33, 0, 0, 0, 0, 0, 0,
- 34, 35, 36, 37, 38, 0, 0, 0, 0, 70,
- 0, 26, 43, 44, 0, 0, 0, 0, 79, 0,
- 0, 0, 46, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 33, 0, 0, 169, 0, 0, 0,
- 34, 35, 36, 37, 38, 0, 0, 0, 0, 0,
- 0, 0, 43, 44, 0, 0, 0, 0, 82, 135,
- 136, 0, 46, 137, 138, 139, 140, 0, 141, 170,
- 171, 142, 143, 144, 184, 0, 0, 0, 0, 0,
- 0, 185, 0, 0, 0, 145, 146, 147, 148, 149,
- 0, 0, 135, 136, 150, 151, 137, 138, 139, 140,
- 0, 141, 0, 0, 142, 143, 144, 186, 0, 0,
- 0, 0, 0, 0, 187, 0, 0, 0, 145, 146,
- 147, 148, 149, 0, 0, 135, 136, 150, 151, 137,
- 138, 139, 140, 0, 141, 0, 0, 142, 143, 144,
- 188, 0, 0, 0, 0, 0, 0, 189, 0, 0,
- 0, 145, 146, 147, 148, 149, 0, 0, 135, 136,
- 150, 151, 137, 138, 139, 140, 0, 141, 0, 0,
- 142, 143, 144, 190, 0, 0, 0, 0, 0, 0,
- 191, 0, 0, 0, 145, 146, 147, 148, 149, 0,
- 0, 135, 136, 150, 151, 137, 138, 139, 140, 0,
- 141, 0, 0, 142, 143, 144, 276, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 145, 146, 147,
- 148, 149, 0, 0, 135, 136, 150, 151, 137, 138,
- 139, 140, 0, 141, 0, 0, 142, 143, 144, 277,
+ 70, 0, 26, 2, 3, 4, 5, 0, 0, 0,
+ 0, 0, 0, 0, 11, 12, 13, 0, 14, 69,
+ 16, 0, 17, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 35, 36, 37, 38, 0, 0, 0, 0,
+ 70, 71, 26, 43, 44, 0, 0, 0, 0, 45,
+ 0, 0, 0, 46, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 35, 36, 37, 38, 0, 0, 0, 0,
+ 0, 71, 0, 43, 44, 2, 3, 4, 5, 75,
+ 0, 0, 0, 46, 0, 0, 11, 12, 13, 0,
+ 14, 69, 16, 0, 17, 0, 0, 0, 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, 278, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 145, 146, 147, 148, 149, 0, 0,
- 135, 136, 150, 151, 137, 138, 139, 140, 0, 141,
- 0, 0, 142, 143, 144, 279, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 145, 146, 147, 148,
- 149, 0, 0, 135, 136, 150, 151, 137, 138, 139,
- 140, 0, 141, 0, 0, 142, 143, 144, 0, 0,
- 0, 0, 0, 203, 204, 0, 0, 0, 0, 145,
- 146, 147, 148, 149, 0, 0, 135, 136, 150, 151,
- 137, 138, 139, 140, 0, 141, 0, 0, 142, 143,
- 144, 0, 0, 0, 0, 0, 348, 204, 0, 0,
- 0, 0, 145, 146, 147, 148, 149, 0, 0, 135,
- 136, 150, 151, 137, 138, 139, 140, 0, 141, 0,
- 0, 142, 143, 144, 0, 0, 0, 0, 0, 344,
- 0, 0, 0, 0, 0, 145, 146, 147, 148, 149,
- 0, 0, 135, 136, 150, 151, 137, 138, 139, 140,
- 0, 141, 0, 0, 142, 143, 144, 0, 0, 0,
- 0, 0, 0, 0, 207, 0, 0, 0, 145, 146,
- 147, 148, 149, 0, 0, 135, 136, 150, 151, 137,
- 138, 139, 140, 0, 141, 0, 0, 142, 143, 144,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 181,
- 0, 145, 146, 147, 148, 149, 0, 67, 135, 136,
- 150, 151, 137, 138, 139, 140, 0, 141, 0, 0,
- 142, 143, 144, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 145, 146, 147, 148, 149, 0,
- 0, 135, 136, 150, 151, 137, 138, 139, 140, 0,
- 141, 0, 0, 142, 143, 144, 0, 0, 0, 0,
- 0, 192, 193, 0, 0, 0, 0, 145, 146, 147,
- 148, 149, 0, 0, 135, 136, 150, 151, 137, 138,
- 139, 140, 0, 141, 0, 0, 142, 143, 144, 0,
+ 0, 0, 70, 0, 26, 2, 3, 4, 5, 0,
+ 0, 0, 0, 0, 0, 0, 11, 12, 13, 0,
+ 14, 69, 16, 0, 17, 0, 33, 0, 0, 0,
+ 0, 0, 0, 34, 35, 36, 37, 38, 0, 0,
+ 0, 0, 70, 71, 26, 43, 44, 0, 0, 0,
+ 0, 80, 0, 0, 0, 46, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 33, 0, 0, 170,
+ 0, 0, 0, 34, 35, 36, 37, 38, 0, 0,
+ 0, 0, 0, 71, 0, 43, 44, 0, 0, 0,
+ 0, 83, 136, 137, 0, 46, 138, 139, 140, 141,
+ 0, 142, 171, 172, 143, 144, 145, 185, 0, 0,
+ 0, 0, 0, 0, 186, 0, 0, 0, 146, 147,
+ 148, 149, 150, 0, 0, 136, 137, 151, 152, 138,
+ 139, 140, 141, 0, 142, 0, 0, 143, 144, 145,
+ 187, 0, 0, 0, 0, 0, 0, 188, 0, 0,
+ 0, 146, 147, 148, 149, 150, 0, 0, 136, 137,
+ 151, 152, 138, 139, 140, 141, 0, 142, 0, 0,
+ 143, 144, 145, 189, 0, 0, 0, 0, 0, 0,
+ 190, 0, 0, 0, 146, 147, 148, 149, 150, 0,
+ 0, 136, 137, 151, 152, 138, 139, 140, 141, 0,
+ 142, 0, 0, 143, 144, 145, 191, 0, 0, 0,
+ 0, 0, 0, 192, 0, 0, 0, 146, 147, 148,
+ 149, 150, 0, 0, 136, 137, 151, 152, 138, 139,
+ 140, 141, 0, 142, 0, 0, 143, 144, 145, 277,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 146, 147, 148, 149, 150, 0, 0, 136, 137, 151,
+ 152, 138, 139, 140, 141, 0, 142, 0, 0, 143,
+ 144, 145, 278, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 146, 147, 148, 149, 150, 0, 0,
+ 136, 137, 151, 152, 138, 139, 140, 141, 0, 142,
+ 0, 0, 143, 144, 145, 279, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 146, 147, 148, 149,
+ 150, 0, 0, 136, 137, 151, 152, 138, 139, 140,
+ 141, 0, 142, 0, 0, 143, 144, 145, 280, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 146,
+ 147, 148, 149, 150, 0, 0, 136, 137, 151, 152,
+ 138, 139, 140, 141, 0, 142, 0, 0, 143, 144,
+ 145, 0, 0, 0, 0, 0, 204, 205, 0, 0,
+ 0, 0, 146, 147, 148, 149, 150, 0, 0, 136,
+ 137, 151, 152, 138, 139, 140, 141, 0, 142, 0,
+ 0, 143, 144, 145, 0, 0, 0, 0, 0, 349,
+ 205, 0, 0, 0, 0, 146, 147, 148, 149, 150,
+ 0, 0, 136, 137, 151, 152, 138, 139, 140, 141,
+ 0, 142, 0, 0, 143, 144, 145, 0, 0, 0,
+ 0, 0, 345, 0, 0, 0, 0, 0, 146, 147,
+ 148, 149, 150, 0, 0, 136, 137, 151, 152, 138,
+ 139, 140, 141, 0, 142, 0, 0, 143, 144, 145,
+ 0, 0, 0, 0, 0, 0, 0, 208, 0, 0,
+ 0, 146, 147, 148, 149, 150, 0, 0, 136, 137,
+ 151, 152, 138, 139, 140, 141, 0, 142, 0, 0,
+ 143, 144, 145, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 182, 0, 146, 147, 148, 149, 150, 0,
+ 67, 136, 137, 151, 152, 138, 139, 140, 141, 0,
+ 142, 0, 0, 143, 144, 145, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 146, 147, 148,
+ 149, 150, 0, 0, 136, 137, 151, 152, 138, 139,
+ 140, 141, 0, 142, 0, 0, 143, 144, 145, 0,
+ 0, 0, 0, 0, 193, 194, 0, 0, 0, 0,
+ 146, 147, 148, 149, 150, 0, 0, 136, 137, 151,
+ 152, 138, 139, 140, 141, 0, 142, 0, 0, 143,
+ 144, 145, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 146, 147, 148, 149, 150, 0, 0,
+ 0, 197, 151, 152, 136, 137, 0, 0, 138, 139,
+ 140, 141, 0, 142, 0, 0, 143, 144, 145, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 145, 146, 147, 148, 149, 0, 0, 0, 196, 150,
- 151, 135, 136, 0, 0, 137, 138, 139, 140, 0,
- 141, 0, 0, 142, 143, 144, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 145, 146, 147,
- 148, 149, 0, 0, 0, 0, 150, 151
+ 146, 147, 148, 149, 150, 0, 0, 0, 0, 151,
+ 152
};
static const yytype_int16 yycheck[] =
{
- 0, 4, 31, 0, 7, 8, 9, 56, 46, 12,
- 13, 14, 15, 299, 77, 234, 1, 13, 21, 15,
- 303, 24, 32, 36, 56, 57, 245, 30, 31, 34,
- 33, 34, 35, 36, 37, 38, 319, 100, 101, 77,
- 43, 44, 45, 46, 330, 58, 84, 97, 58, 54,
- 53, 97, 55, 54, 57, 13, 14, 314, 104, 99,
- 54, 65, 47, 320, 104, 98, 95, 70, 69, 28,
- 28, 74, 99, 28, 77, 69, 79, 104, 74, 82,
- 109, 84, 45, 79, 47, 88, 74, 90, 50, 77,
- 74, 99, 28, 77, 74, 205, 104, 77, 208, 102,
- 97, 103, 104, 91, 92, 93, 94, 95, 92, 93,
- 94, 95, 100, 101, 94, 95, 100, 101, 99, 28,
- 100, 101, 99, 104, 27, 28, 28, 104, 131, 129,
- 290, 291, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 144, 145, 146, 147, 148, 149, 150, 151, 134,
- 153, 28, 28, 28, 157, 28, 69, 98, 104, 104,
- 45, 28, 52, 166, 168, 104, 104, 170, 171, 28,
- 173, 174, 28, 104, 177, 178, 180, 28, 181, 289,
- 69, 184, 185, 186, 187, 188, 189, 190, 191, 192,
- 193, 28, 302, 28, 32, 198, 28, 307, 308, 203,
- 310, 54, 32, 104, 207, 28, 28, 36, 58, 104,
- 28, 32, 32, 32, 336, 32, 326, 266, 129, 299,
- 319, 102, 260, 65, 66, 169, 31, 69, 70, 201,
- 202, -1, 74, -1, -1, 77, 78, 79, 241, 242,
- -1, -1, 227, -1, -1, -1, -1, 357, 358, 91,
- 92, 93, 94, 95, -1, -1, -1, 260, 100, 101,
- -1, -1, -1, -1, -1, -1, -1, -1, 317, -1,
- -1, -1, -1, 276, 277, 278, 279, -1, -1, 328,
- 283, 285, -1, -1, -1, -1, -1, 272, -1, -1,
- 275, -1, -1, -1, 297, 267, -1, 269, 302, -1,
- -1, -1, -1, -1, -1, 354, -1, -1, 312, -1,
- -1, -1, 284, 316, -1, -1, -1, -1, -1, 322,
- -1, -1, -1, -1, -1, -1, 298, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 309, 342, -1,
- 344, -1, 314, -1, 348, 349, 318, 319, -1, -1,
- -1, -1, -1, -1, -1, 327, 356, 357, -1, -1,
- 332, -1, -1, -1, -1, -1, -1, 339, -1, 341,
- -1, 343, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 0, 1, -1, -1, -1, -1, -1, -1, -1,
- 362, 363, 364, 12, 13, 14, 15, -1, 17, 18,
- 19, 20, 21, -1, 23, 24, 25, -1, 27, 28,
- 29, -1, 31, -1, 33, -1, -1, -1, 37, -1,
- 39, 40, 41, -1, -1, 44, -1, -1, -1, -1,
- 49, 50, 51, -1, -1, -1, 55, -1, -1, -1,
- 59, 60, 61, 62, -1, 64, -1, -1, -1, -1,
- -1, -1, -1, -1, 73, -1, -1, -1, -1, -1,
- -1, 80, 81, 82, 83, 84, -1, -1, 87, 88,
- 89, 90, -1, 92, 93, -1, -1, -1, 97, 98,
- -1, -1, -1, 102, 12, 13, 14, 15, -1, 17,
+ 0, 4, 77, 32, 7, 8, 9, 56, 0, 12,
+ 13, 14, 15, 31, 46, 36, 1, 13, 21, 15,
+ 300, 24, 304, 56, 57, 100, 101, 30, 31, 58,
+ 33, 34, 35, 36, 37, 38, 34, 58, 320, 97,
+ 43, 44, 45, 46, 74, 54, 78, 77, 13, 14,
+ 53, 331, 55, 85, 57, 235, 54, 103, 104, 54,
+ 69, 65, 47, 28, 94, 95, 246, 70, 99, 97,
+ 100, 101, 75, 104, 69, 78, 104, 80, 96, 75,
+ 83, 315, 85, 45, 80, 47, 89, 321, 91, 65,
+ 66, 28, 110, 69, 70, 50, 206, 28, 74, 209,
+ 103, 77, 78, 79, 28, 97, 99, 28, 99, 99,
+ 28, 104, 28, 104, 104, 91, 92, 93, 94, 95,
+ 28, 99, 27, 28, 100, 101, 104, 291, 292, 132,
+ 130, 28, 28, 136, 137, 138, 139, 140, 141, 142,
+ 143, 144, 145, 146, 147, 148, 149, 150, 151, 152,
+ 135, 154, 98, 98, 69, 158, 104, 104, 45, 28,
+ 52, 104, 104, 28, 167, 169, 28, 28, 171, 172,
+ 104, 174, 175, 28, 69, 178, 179, 181, 28, 182,
+ 290, 32, 185, 186, 187, 188, 189, 190, 191, 192,
+ 193, 194, 28, 303, 74, 104, 199, 77, 308, 309,
+ 204, 311, 54, 32, 28, 208, 74, 28, 36, 77,
+ 58, 91, 92, 93, 94, 95, 32, 327, 267, 32,
+ 100, 101, 104, 32, 92, 93, 94, 95, 28, 261,
+ 202, 203, 100, 101, 32, 337, 130, 300, 320, 242,
+ 243, 170, 31, 228, 103, -1, -1, -1, 358, 359,
+ -1, -1, -1, -1, -1, -1, -1, -1, 261, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 318,
+ -1, -1, -1, -1, 277, 278, 279, 280, -1, -1,
+ 329, 284, 286, -1, -1, -1, -1, -1, 273, -1,
+ -1, 276, -1, -1, -1, 298, 268, -1, 270, 303,
+ -1, -1, -1, -1, -1, -1, 355, -1, -1, 313,
+ -1, -1, -1, 285, 317, -1, -1, -1, -1, -1,
+ 323, -1, -1, -1, -1, -1, -1, 299, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 310, 343,
+ -1, 345, -1, 315, -1, 349, 350, 319, 320, -1,
+ -1, -1, -1, -1, -1, -1, 328, 357, 358, -1,
+ -1, 333, -1, -1, -1, -1, -1, -1, 340, -1,
+ 342, -1, 344, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 0, 1, -1, -1, -1, -1, -1, -1,
+ -1, 363, 364, 365, 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,
@@ -1176,19 +1169,19 @@ static const yytype_int16 yycheck[] =
-1, 59, 60, 61, 62, -1, 64, -1, -1, -1,
-1, -1, -1, -1, -1, 73, -1, -1, -1, -1,
-1, -1, 80, 81, 82, 83, 84, -1, -1, 87,
- 88, 89, 90, -1, 92, 93, -1, -1, -1, -1,
+ 88, 89, 90, -1, 92, 93, -1, -1, -1, 97,
98, -1, -1, -1, 102, 12, 13, 14, 15, -1,
17, 18, 19, 20, 21, -1, 23, 24, 25, -1,
- 27, 28, 29, -1, 31, 32, 33, -1, -1, -1,
- 37, -1, 39, 40, 41, -1, -1, -1, -1, -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, -1, -1, 61, 62, -1, 64, -1, -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, -1, 90, -1, 92, 93, -1, -1, -1,
- 97, 98, -1, -1, -1, 102, 12, 13, 14, 15,
+ 87, 88, 89, 90, -1, 92, 93, -1, -1, -1,
+ -1, 98, -1, -1, -1, 102, 12, 13, 14, 15,
-1, 17, 18, 19, 20, 21, -1, 23, 24, 25,
- -1, 27, 28, 29, -1, 31, -1, 33, -1, -1,
+ -1, 27, 28, 29, -1, 31, 32, 33, -1, -1,
-1, 37, -1, 39, 40, 41, -1, -1, -1, -1,
-1, -1, -1, 49, 50, 51, -1, -1, -1, 55,
-1, -1, -1, -1, -1, 61, 62, -1, 64, -1,
@@ -1204,56 +1197,63 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, 73, -1,
-1, -1, -1, -1, -1, 80, 81, 82, 83, 84,
-1, -1, 87, 88, -1, 90, -1, 92, 93, -1,
- -1, -1, -1, 98, -1, -1, -1, 102, 12, 13,
+ -1, -1, 97, 98, -1, -1, -1, 102, 12, 13,
14, 15, -1, 17, 18, 19, 20, 21, -1, 23,
- 24, 25, -1, 27, 28, 29, 54, 31, -1, 33,
- -1, -1, -1, 37, -1, 39, 40, 65, 66, -1,
- -1, 69, 70, 71, 72, 49, 74, 51, -1, 77,
- 78, 79, -1, -1, -1, -1, -1, 61, 62, -1,
- 64, -1, -1, 91, 92, 93, 94, 95, -1, 73,
- -1, -1, 100, 101, -1, -1, 80, 81, 82, 83,
- 84, -1, -1, -1, 88, -1, 90, -1, 92, 93,
- 12, 13, 14, 15, 98, -1, -1, -1, 102, -1,
- -1, 23, 24, 25, -1, 27, 28, 29, -1, 31,
- -1, -1, -1, -1, -1, -1, 38, -1, -1, -1,
- -1, 43, -1, 45, 46, 47, 48, 49, -1, 51,
- 12, 13, 14, 15, -1, -1, -1, -1, -1, -1,
- -1, 23, 24, 25, -1, 27, 28, 29, -1, 31,
- -1, 73, -1, -1, -1, -1, 38, -1, 80, 81,
- 82, 83, 84, 45, -1, 47, -1, 49, -1, 51,
- 92, 93, -1, -1, -1, -1, 98, -1, -1, -1,
- 102, 63, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 73, -1, -1, -1, -1, -1, -1, 80, 81,
- 82, 83, 84, -1, -1, -1, 12, 13, 14, 15,
- 92, 93, -1, -1, -1, -1, 98, 23, 24, 25,
- 102, 27, 28, 29, -1, 31, -1, -1, -1, -1,
+ 24, 25, -1, 27, 28, 29, -1, 31, -1, 33,
+ -1, -1, -1, 37, -1, 39, 40, 41, -1, -1,
+ -1, -1, -1, -1, -1, 49, 50, 51, -1, -1,
+ -1, 55, -1, -1, -1, -1, -1, 61, 62, -1,
+ 64, -1, -1, -1, -1, -1, -1, -1, -1, 73,
+ -1, -1, -1, -1, -1, -1, 80, 81, 82, 83,
+ 84, -1, -1, 87, 88, -1, 90, -1, 92, 93,
+ -1, -1, -1, -1, 98, -1, -1, -1, 102, 12,
+ 13, 14, 15, -1, 17, 18, 19, 20, 21, -1,
+ 23, 24, 25, -1, 27, 28, 29, 54, 31, -1,
+ 33, -1, -1, -1, 37, -1, 39, 40, 65, 66,
+ -1, -1, 69, 70, 71, 72, 49, 74, 51, -1,
+ 77, 78, 79, -1, -1, -1, -1, -1, 61, 62,
+ -1, 64, -1, -1, 91, 92, 93, 94, 95, -1,
+ 73, -1, -1, 100, 101, -1, -1, 80, 81, 82,
+ 83, 84, -1, -1, -1, 88, -1, 90, -1, 92,
+ 93, 12, 13, 14, 15, 98, -1, -1, -1, 102,
+ -1, -1, 23, 24, 25, -1, 27, 28, 29, -1,
+ 31, -1, -1, -1, -1, -1, -1, 38, -1, -1,
+ -1, -1, 43, -1, 45, 46, 47, 48, 49, -1,
+ 51, 12, 13, 14, 15, -1, -1, -1, -1, -1,
+ -1, -1, 23, 24, 25, -1, 27, 28, 29, -1,
+ 31, -1, 73, -1, -1, -1, -1, 38, -1, 80,
+ 81, 82, 83, 84, 45, -1, 47, -1, 49, 90,
+ 51, 92, 93, -1, -1, -1, -1, 98, -1, -1,
+ -1, 102, 63, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 73, -1, -1, -1, -1, -1, -1, 80,
+ 81, 82, 83, 84, -1, -1, -1, -1, -1, 90,
+ -1, 92, 93, 12, 13, 14, 15, 98, -1, -1,
+ -1, 102, -1, -1, 23, 24, 25, -1, 27, 28,
+ 29, -1, 31, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 49, -1, 51, 12, 13, 14, 15,
- -1, -1, -1, -1, -1, -1, -1, 23, 24, 25,
- -1, 27, 28, 29, -1, 31, -1, 73, -1, -1,
- -1, -1, -1, -1, 80, 81, 82, 83, 84, -1,
- -1, -1, -1, 49, -1, 51, 92, 93, -1, -1,
- -1, -1, 98, -1, -1, -1, 102, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 73, -1, -1,
- -1, -1, -1, -1, 80, 81, 82, 83, 84, -1,
- -1, -1, 12, 13, 14, 15, 92, 93, -1, -1,
- -1, -1, 98, 23, 24, 25, 102, 27, 28, 29,
- -1, 31, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 49,
- -1, 51, 12, 13, 14, 15, -1, -1, -1, -1,
- -1, -1, -1, 23, 24, 25, -1, 27, 28, 29,
- -1, 31, -1, 73, -1, -1, -1, -1, -1, -1,
- 80, 81, 82, 83, 84, -1, -1, -1, -1, 49,
- -1, 51, 92, 93, -1, -1, -1, -1, 98, -1,
- -1, -1, 102, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 73, -1, -1, 42, -1, -1, -1,
- 80, 81, 82, 83, 84, -1, -1, -1, -1, -1,
- -1, -1, 92, 93, -1, -1, -1, -1, 98, 65,
- 66, -1, 102, 69, 70, 71, 72, -1, 74, 75,
- 76, 77, 78, 79, 47, -1, -1, -1, -1, -1,
- -1, 54, -1, -1, -1, 91, 92, 93, 94, 95,
- -1, -1, 65, 66, 100, 101, 69, 70, 71, 72,
- -1, 74, -1, -1, 77, 78, 79, 47, -1, -1,
+ 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, 90, 51, 92, 93, -1, -1, -1, -1, 98,
+ -1, -1, -1, 102, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 73, -1, -1, -1, -1, -1,
+ -1, 80, 81, 82, 83, 84, -1, -1, -1, -1,
+ -1, 90, -1, 92, 93, 12, 13, 14, 15, 98,
+ -1, -1, -1, 102, -1, -1, 23, 24, 25, -1,
+ 27, 28, 29, -1, 31, -1, -1, -1, -1, -1,
+ -1, -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, 90, 51, 92, 93, -1, -1, -1,
+ -1, 98, -1, -1, -1, 102, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 73, -1, -1, 42,
+ -1, -1, -1, 80, 81, 82, 83, 84, -1, -1,
+ -1, -1, -1, 90, -1, 92, 93, -1, -1, -1,
+ -1, 98, 65, 66, -1, 102, 69, 70, 71, 72,
+ -1, 74, 75, 76, 77, 78, 79, 47, -1, -1,
-1, -1, -1, -1, 54, -1, -1, -1, 91, 92,
93, 94, 95, -1, -1, 65, 66, 100, 101, 69,
70, 71, 72, -1, 74, -1, -1, 77, 78, 79,
@@ -1264,7 +1264,7 @@ static const yytype_int16 yycheck[] =
54, -1, -1, -1, 91, 92, 93, 94, 95, -1,
-1, 65, 66, 100, 101, 69, 70, 71, 72, -1,
74, -1, -1, 77, 78, 79, 47, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 91, 92, 93,
+ -1, -1, -1, 54, -1, -1, -1, 91, 92, 93,
94, 95, -1, -1, 65, 66, 100, 101, 69, 70,
71, 72, -1, 74, -1, -1, 77, 78, 79, 47,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1276,36 +1276,40 @@ static const yytype_int16 yycheck[] =
-1, -1, 77, 78, 79, 47, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 91, 92, 93, 94,
95, -1, -1, 65, 66, 100, 101, 69, 70, 71,
- 72, -1, 74, -1, -1, 77, 78, 79, -1, -1,
- -1, -1, -1, 52, 53, -1, -1, -1, -1, 91,
+ 72, -1, 74, -1, -1, 77, 78, 79, 47, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 91,
92, 93, 94, 95, -1, -1, 65, 66, 100, 101,
69, 70, 71, 72, -1, 74, -1, -1, 77, 78,
79, -1, -1, -1, -1, -1, 52, 53, -1, -1,
-1, -1, 91, 92, 93, 94, 95, -1, -1, 65,
66, 100, 101, 69, 70, 71, 72, -1, 74, -1,
-1, 77, 78, 79, -1, -1, -1, -1, -1, 52,
- -1, -1, -1, -1, -1, 91, 92, 93, 94, 95,
+ 53, -1, -1, -1, -1, 91, 92, 93, 94, 95,
-1, -1, 65, 66, 100, 101, 69, 70, 71, 72,
-1, 74, -1, -1, 77, 78, 79, -1, -1, -1,
- -1, -1, -1, -1, 54, -1, -1, -1, 91, 92,
+ -1, -1, 52, -1, -1, -1, -1, -1, 91, 92,
93, 94, 95, -1, -1, 65, 66, 100, 101, 69,
70, 71, 72, -1, 74, -1, -1, 77, 78, 79,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 56,
- -1, 91, 92, 93, 94, 95, -1, 97, 65, 66,
+ -1, -1, -1, -1, -1, -1, -1, 54, -1, -1,
+ -1, 91, 92, 93, 94, 95, -1, -1, 65, 66,
100, 101, 69, 70, 71, 72, -1, 74, -1, -1,
77, 78, 79, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 91, 92, 93, 94, 95, -1,
- -1, 65, 66, 100, 101, 69, 70, 71, 72, -1,
+ -1, -1, 56, -1, 91, 92, 93, 94, 95, -1,
+ 97, 65, 66, 100, 101, 69, 70, 71, 72, -1,
74, -1, -1, 77, 78, 79, -1, -1, -1, -1,
- -1, 85, 86, -1, -1, -1, -1, 91, 92, 93,
+ -1, -1, -1, -1, -1, -1, -1, 91, 92, 93,
94, 95, -1, -1, 65, 66, 100, 101, 69, 70,
71, 72, -1, 74, -1, -1, 77, 78, 79, -1,
+ -1, -1, -1, -1, 85, 86, -1, -1, -1, -1,
+ 91, 92, 93, 94, 95, -1, -1, 65, 66, 100,
+ 101, 69, 70, 71, 72, -1, 74, -1, -1, 77,
+ 78, 79, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 91, 92, 93, 94, 95, -1, -1,
+ -1, 99, 100, 101, 65, 66, -1, -1, 69, 70,
+ 71, 72, -1, 74, -1, -1, 77, 78, 79, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 91, 92, 93, 94, 95, -1, -1, -1, 99, 100,
- 101, 65, 66, -1, -1, 69, 70, 71, 72, -1,
- 74, -1, -1, 77, 78, 79, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 91, 92, 93,
- 94, 95, -1, -1, -1, -1, 100, 101
+ 91, 92, 93, 94, 95, -1, -1, -1, -1, 100,
+ 101
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1319,36 +1323,36 @@ static const yytype_uint8 yystos[] =
88, 89, 90, 92, 93, 98, 102, 106, 111, 112,
113, 114, 115, 121, 122, 123, 128, 129, 130, 131,
132, 133, 137, 140, 142, 145, 149, 97, 107, 28,
- 49, 131, 131, 131, 98, 131, 151, 28, 131, 98,
- 151, 131, 98, 151, 141, 50, 28, 134, 38, 43,
- 45, 46, 47, 48, 131, 138, 139, 28, 131, 56,
- 57, 13, 14, 28, 28, 28, 28, 131, 63, 138,
- 139, 28, 136, 131, 131, 131, 131, 131, 131, 28,
- 135, 28, 98, 131, 131, 131, 131, 150, 0, 107,
- 131, 69, 131, 113, 131, 65, 66, 69, 70, 71,
- 72, 74, 77, 78, 79, 91, 92, 93, 94, 95,
- 100, 101, 125, 98, 131, 131, 151, 104, 150, 151,
- 131, 150, 150, 104, 131, 131, 45, 139, 143, 42,
- 75, 76, 28, 54, 69, 130, 131, 54, 69, 52,
- 144, 56, 139, 104, 47, 54, 47, 54, 47, 54,
- 47, 54, 85, 86, 104, 28, 99, 103, 104, 111,
- 125, 127, 131, 52, 53, 108, 126, 54, 107, 131,
+ 49, 90, 131, 131, 131, 98, 131, 151, 28, 131,
+ 98, 151, 131, 98, 151, 141, 50, 28, 134, 38,
+ 43, 45, 46, 47, 48, 131, 138, 139, 28, 131,
+ 56, 57, 13, 14, 28, 28, 28, 28, 131, 63,
+ 138, 139, 28, 136, 131, 131, 131, 131, 131, 131,
+ 28, 135, 28, 98, 131, 131, 131, 131, 150, 0,
+ 107, 131, 69, 131, 113, 131, 65, 66, 69, 70,
+ 71, 72, 74, 77, 78, 79, 91, 92, 93, 94,
+ 95, 100, 101, 125, 98, 131, 131, 151, 104, 150,
+ 151, 131, 150, 150, 104, 131, 131, 45, 139, 143,
+ 42, 75, 76, 28, 54, 69, 130, 131, 54, 69,
+ 52, 144, 56, 139, 104, 47, 54, 47, 54, 47,
+ 54, 47, 54, 85, 86, 104, 28, 99, 103, 104,
+ 111, 125, 127, 131, 52, 53, 108, 126, 54, 107,
131, 131, 131, 131, 131, 131, 131, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 28, 146, 99, 131,
- 99, 99, 28, 131, 125, 28, 132, 131, 131, 131,
- 131, 69, 54, 131, 131, 125, 131, 28, 131, 131,
- 131, 131, 131, 131, 131, 131, 131, 131, 28, 99,
- 104, 131, 107, 114, 126, 126, 125, 127, 131, 127,
- 104, 107, 146, 131, 131, 146, 47, 47, 47, 47,
- 150, 32, 34, 54, 113, 126, 126, 28, 104, 148,
- 107, 107, 131, 131, 131, 131, 99, 54, 131, 126,
- 32, 58, 109, 125, 32, 28, 127, 148, 148, 131,
- 126, 36, 109, 110, 118, 119, 124, 125, 127, 117,
- 118, 120, 124, 32, 127, 127, 126, 127, 125, 119,
- 126, 131, 113, 126, 120, 126, 131, 28, 147, 127,
- 126, 113, 109, 116, 52, 126, 32, 32, 52, 108,
- 104, 126, 32, 126, 125, 126, 125, 125, 125, 28,
- 32, 113, 114, 127, 127, 126, 126, 126
+ 131, 131, 131, 131, 131, 131, 131, 28, 146, 99,
+ 131, 99, 99, 28, 131, 125, 28, 132, 131, 131,
+ 131, 131, 69, 54, 131, 131, 125, 131, 28, 131,
+ 131, 131, 131, 131, 131, 131, 131, 131, 131, 28,
+ 99, 104, 131, 107, 114, 126, 126, 125, 127, 131,
+ 127, 104, 107, 146, 131, 131, 146, 47, 47, 47,
+ 47, 150, 32, 34, 54, 113, 126, 126, 28, 104,
+ 148, 107, 107, 131, 131, 131, 131, 99, 54, 131,
+ 126, 32, 58, 109, 125, 32, 28, 127, 148, 148,
+ 131, 126, 36, 109, 110, 118, 119, 124, 125, 127,
+ 117, 118, 120, 124, 32, 127, 127, 126, 127, 125,
+ 119, 126, 131, 113, 126, 120, 126, 131, 28, 147,
+ 127, 126, 113, 109, 116, 52, 126, 32, 32, 52,
+ 108, 104, 126, 32, 126, 125, 126, 125, 125, 125,
+ 28, 32, 113, 114, 127, 127, 126, 126, 126
};
#define yyerrok (yyerrstatus = 0)
@@ -2816,234 +2820,239 @@ yyreduce:
break;
case 108:
-#line 507 "engines/director/lingo/lingo-gr.y"
+#line 505 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeMe(0, 0); ;}
+ break;
+
+ case 109:
+#line 508 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 109:
-#line 512 "engines/director/lingo/lingo-gr.y"
+ case 110:
+#line 513 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_printtop); ;}
break;
- case 112:
-#line 515 "engines/director/lingo/lingo-gr.y"
+ case 113:
+#line 516 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_exitRepeat); ;}
break;
- case 113:
-#line 516 "engines/director/lingo/lingo-gr.y"
+ case 114:
+#line 517 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_procret); ;}
break;
- case 117:
-#line 520 "engines/director/lingo/lingo-gr.y"
+ case 118:
+#line 521 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
- case 118:
-#line 523 "engines/director/lingo/lingo-gr.y"
+ case 119:
+#line 524 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 119:
-#line 526 "engines/director/lingo/lingo-gr.y"
+ case 120:
+#line 527 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 120:
-#line 529 "engines/director/lingo/lingo-gr.y"
+ case 121:
+#line 530 "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 121:
-#line 533 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
- break;
-
case 122:
#line 534 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
+ { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
case 123:
#line 535 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
+ { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
break;
case 124:
#line 536 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
+ { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
break;
case 125:
#line 537 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_open); ;}
+ { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
break;
case 126:
#line 538 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;}
+ { g_lingo->code1(g_lingo->c_open); ;}
break;
case 127:
#line 539 "engines/director/lingo/lingo-gr.y"
- { Common::String s(*(yyvsp[(1) - (3)].s)); s += '-'; s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;}
+ { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;}
break;
case 128:
-#line 542 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 540 "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 129:
#line 543 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+ { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
case 130:
-#line 546 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 544 "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 131:
#line 547 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+ { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
case 132:
-#line 550 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 548 "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 133:
#line 551 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+ { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
case 134:
-#line 562 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_gotoloop); ;}
+#line 552 "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 135:
#line 563 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_gotonext); ;}
+ { g_lingo->code1(g_lingo->c_gotoloop); ;}
break;
case 136:
#line 564 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(g_lingo->c_gotoprevious); ;}
+ { g_lingo->code1(g_lingo->c_gotonext); ;}
break;
case 137:
#line 565 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(g_lingo->c_gotoprevious); ;}
+ break;
+
+ case 138:
+#line 566 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(g_lingo->c_goto); ;}
break;
- case 138:
-#line 569 "engines/director/lingo/lingo-gr.y"
+ case 139:
+#line 570 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(g_lingo->c_goto); ;}
break;
- case 139:
-#line 573 "engines/director/lingo/lingo-gr.y"
+ case 140:
+#line 574 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(g_lingo->c_goto); ;}
break;
- case 144:
-#line 587 "engines/director/lingo/lingo-gr.y"
+ case 145:
+#line 588 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_playdone); ;}
break;
- case 145:
-#line 588 "engines/director/lingo/lingo-gr.y"
+ case 146:
+#line 589 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(g_lingo->c_play); ;}
break;
- case 146:
-#line 592 "engines/director/lingo/lingo-gr.y"
+ case 147:
+#line 593 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(g_lingo->c_play); ;}
break;
- case 147:
-#line 596 "engines/director/lingo/lingo-gr.y"
+ case 148:
+#line 597 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(g_lingo->c_play); ;}
break;
- case 148:
-#line 600 "engines/director/lingo/lingo-gr.y"
+ case 149:
+#line 601 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); ;}
break;
- case 149:
-#line 600 "engines/director/lingo/lingo-gr.y"
+ case 150:
+#line 601 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;}
break;
- case 150:
-#line 630 "engines/director/lingo/lingo-gr.y"
+ case 151:
+#line 631 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;}
break;
- case 151:
-#line 631 "engines/director/lingo/lingo-gr.y"
+ case 152:
+#line 632 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_procret);
g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg));
g_lingo->_indef = false; ;}
break;
- case 152:
-#line 635 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;}
- break;
-
case 153:
#line 636 "engines/director/lingo/lingo-gr.y"
- { g_lingo->_indef = true; ;}
+ { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;}
break;
case 154:
#line 637 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_indef = true; ;}
+ break;
+
+ case 155:
+#line 638 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_procret);
g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg) + 1, &g_lingo->_currentFactory);
g_lingo->_indef = false; ;}
break;
- case 155:
-#line 641 "engines/director/lingo/lingo-gr.y"
+ case 156:
+#line 642 "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));
@@ -3053,8 +3062,8 @@ yyreduce:
checkEnd((yyvsp[(7) - (8)].s), (yyvsp[(1) - (8)].s)->c_str(), false); ;}
break;
- case 156:
-#line 648 "engines/director/lingo/lingo-gr.y"
+ case 157:
+#line 649 "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));
@@ -3062,38 +3071,38 @@ yyreduce:
g_lingo->_ignoreMe = false; ;}
break;
- case 157:
-#line 654 "engines/director/lingo/lingo-gr.y"
- { (yyval.s) = (yyvsp[(2) - (2)].s); g_lingo->_indef = true; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; ;}
- break;
-
case 158:
-#line 656 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 0; ;}
+#line 655 "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 159:
#line 657 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
+ { (yyval.narg) = 0; ;}
break;
case 160:
#line 658 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+ { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
break;
case 161:
#line 659 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+ break;
+
+ case 162:
+#line 660 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
break;
- case 165:
-#line 667 "engines/director/lingo/lingo-gr.y"
+ case 166:
+#line 668 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); ;}
break;
- case 166:
-#line 671 "engines/director/lingo/lingo-gr.y"
+ case 167:
+#line 672 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_call);
g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
@@ -3102,34 +3111,34 @@ yyreduce:
g_lingo->code1(numpar); ;}
break;
- case 167:
-#line 679 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 0; ;}
- break;
-
case 168:
#line 680 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 1; ;}
+ { (yyval.narg) = 0; ;}
break;
case 169:
#line 681 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+ { (yyval.narg) = 1; ;}
break;
case 170:
-#line 684 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 1; ;}
+#line 682 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
case 171:
#line 685 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 1; ;}
+ break;
+
+ case 172:
+#line 686 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
/* Line 1267 of yacc.c. */
-#line 3133 "engines/director/lingo/lingo-gr.cpp"
+#line 3142 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3343,6 +3352,6 @@ yyreturn:
}
-#line 688 "engines/director/lingo/lingo-gr.y"
+#line 689 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 53e313d..52ff7e5 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -502,6 +502,7 @@ 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); }
;
reference: RBLTINONEARG expr {
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 443536d..9311c52 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -332,6 +332,7 @@ public:
static void c_gotoprevious();
static void c_global();
static void c_instance();
+ static void c_factory();
static void c_property();
static void c_play();
diff --git a/engines/director/lingo/tests/factory.lingo b/engines/director/lingo/tests/factory.lingo
index 388d2c3..978858f 100644
--- a/engines/director/lingo/tests/factory.lingo
+++ b/engines/director/lingo/tests/factory.lingo
@@ -11,8 +11,10 @@ method mNew
when keydown then aim1(mExit)
set the locv of sprite 24 to 540
method mMove x, y
+ global aimCopy
set the locH of sprite 15 to x
set the locV of sprite 15 to y-250
+ aimCopy = me
method mAtFrame
dontpassevent
me(mMove, the mouseH, the mouseV)
Commit: 1f1a1946642f08bffbeb40f77838388448d8d61b
https://github.com/scummvm/scummvm/commit/1f1a1946642f08bffbeb40f77838388448d8d61b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-02T23:22:26+01:00
Commit Message:
DIRECTOR: LINGO: Made event handler names case insensitive
Changed paths:
engines/director/lingo/lingo.h
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 9311c52..67a8ad9 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -592,7 +592,7 @@ private:
Datum pop(void);
Common::HashMap<uint32, const char *> _eventHandlerTypes;
- Common::HashMap<Common::String, uint32> _eventHandlerTypeIds;
+ Common::HashMap<Common::String, uint32, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _eventHandlerTypeIds;
Common::HashMap<Common::String, Audio::AudioStream *> _audioAliases;
ScriptContextHash _scriptContexts[kMaxScriptType + 1];
More information about the Scummvm-git-logs
mailing list