[Scummvm-git-logs] scummvm master -> fe5ffcea67be71243536bbd069950cd607a21437
sev-
sev at scummvm.org
Mon Dec 2 17:58:44 UTC 2019
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
fe5ffcea67 DIRECTOR: LINGO: Simplify grammar a bit
Commit: fe5ffcea67be71243536bbd069950cd607a21437
https://github.com/scummvm/scummvm/commit/fe5ffcea67be71243536bbd069950cd607a21437
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-02T18:58:34+01:00
Commit Message:
DIRECTOR: LINGO: Simplify grammar a bit
Changed paths:
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.y
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index eb7bea7..5b124aa 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -540,7 +540,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 127
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1807
+#define YYLAST 1751
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 106
@@ -549,7 +549,7 @@ union yyalloc
/* YYNRULES -- Number of rules. */
#define YYNRULES 173
/* YYNRULES -- Number of states. */
-#define YYNSTATES 369
+#define YYNSTATES 368
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -609,18 +609,18 @@ static const yytype_uint16 yyprhs[] =
116, 120, 127, 132, 139, 149, 159, 169, 180, 191,
198, 199, 203, 206, 208, 211, 213, 220, 222, 229,
236, 240, 241, 242, 245, 249, 251, 253, 254, 255,
- 257, 260, 263, 267, 269, 271, 273, 275, 277, 279,
- 281, 284, 287, 292, 297, 299, 301, 304, 306, 310,
- 314, 318, 322, 326, 330, 334, 338, 342, 346, 350,
- 354, 358, 361, 365, 369, 373, 377, 380, 383, 387,
- 391, 396, 401, 406, 413, 418, 425, 430, 437, 442,
- 449, 452, 455, 457, 459, 462, 464, 467, 470, 473,
- 475, 478, 481, 483, 486, 491, 496, 503, 508, 511,
- 515, 517, 521, 523, 527, 529, 533, 536, 539, 542,
- 545, 549, 552, 555, 557, 561, 564, 567, 570, 574,
- 577, 578, 582, 583, 592, 595, 596, 605, 614, 621,
- 624, 625, 627, 631, 636, 637, 639, 643, 644, 647,
- 648, 650, 654, 656
+ 256, 259, 262, 266, 268, 270, 272, 274, 276, 278,
+ 280, 283, 286, 291, 296, 298, 300, 303, 305, 309,
+ 313, 317, 321, 325, 329, 333, 337, 341, 345, 349,
+ 353, 357, 360, 364, 368, 372, 376, 379, 382, 386,
+ 390, 395, 400, 405, 412, 417, 424, 429, 436, 441,
+ 448, 451, 454, 456, 458, 461, 463, 466, 469, 472,
+ 474, 477, 480, 482, 485, 490, 495, 502, 507, 510,
+ 514, 516, 520, 522, 526, 528, 532, 535, 538, 541,
+ 544, 548, 551, 554, 556, 560, 563, 566, 569, 573,
+ 576, 577, 581, 582, 591, 594, 595, 604, 613, 620,
+ 623, 624, 626, 630, 635, 636, 638, 642, 643, 646,
+ 647, 649, 653, 655
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -651,47 +651,47 @@ static const yytype_int16 yyrhs[] =
119, -1, 128, 122, 52, 129, 131, 130, -1, 128,
122, 53, 129, 131, 130, -1, 123, 134, 124, -1,
-1, -1, 50, 57, -1, 50, 56, 28, -1, 41,
- -1, 111, -1, -1, -1, 129, -1, 131, 108, -1,
- 131, 115, -1, 55, 28, 52, -1, 87, -1, 12,
- -1, 15, -1, 31, -1, 29, -1, 135, -1, 23,
- -1, 24, 134, -1, 25, 154, -1, 25, 99, 154,
- 100, -1, 28, 99, 153, 100, -1, 28, -1, 13,
- -1, 14, 134, -1, 113, -1, 134, 93, 134, -1,
- 134, 94, 134, -1, 134, 95, 134, -1, 134, 96,
- 134, -1, 134, 74, 134, -1, 134, 101, 134, -1,
- 134, 102, 134, -1, 134, 69, 134, -1, 134, 70,
- 134, -1, 134, 65, 134, -1, 134, 66, 134, -1,
- 134, 71, 134, -1, 134, 72, 134, -1, 73, 134,
- -1, 134, 92, 134, -1, 134, 77, 134, -1, 134,
- 78, 134, -1, 134, 79, 134, -1, 93, 134, -1,
- 94, 134, -1, 99, 134, 100, -1, 103, 153, 104,
- -1, 84, 134, 85, 134, -1, 84, 134, 86, 134,
- -1, 80, 134, 47, 134, -1, 80, 134, 54, 134,
- 47, 134, -1, 81, 134, 47, 134, -1, 81, 134,
- 54, 134, 47, 134, -1, 82, 134, 47, 134, -1,
- 82, 134, 54, 134, 47, 134, -1, 83, 134, 47,
- 134, -1, 83, 134, 54, 134, 47, 134, -1, 27,
- 134, -1, 49, 134, -1, 140, -1, 143, -1, 37,
- 50, -1, 37, -1, 39, 137, -1, 88, 138, -1,
- 64, 139, -1, 17, -1, 19, 134, -1, 18, 134,
- -1, 18, -1, 20, 154, -1, 20, 99, 154, 100,
- -1, 90, 99, 28, 100, -1, 90, 99, 28, 105,
- 153, 100, -1, 61, 134, 56, 134, -1, 61, 134,
- -1, 21, 28, 153, -1, 28, -1, 137, 105, 28,
- -1, 28, -1, 138, 105, 28, -1, 28, -1, 139,
- 105, 28, -1, 40, 43, -1, 40, 46, -1, 40,
- 48, -1, 40, 141, -1, 40, 141, 142, -1, 40,
- 142, -1, 38, 134, -1, 134, -1, 47, 45, 134,
- -1, 45, 134, -1, 62, 63, -1, 62, 141, -1,
- 62, 141, 142, -1, 62, 142, -1, -1, 33, 144,
- 153, -1, -1, 44, 28, 146, 129, 149, 108, 151,
- 131, -1, 59, 28, -1, -1, 60, 28, 147, 129,
- 149, 108, 151, 131, -1, 148, 129, 149, 108, 151,
- 131, 32, 150, -1, 148, 129, 149, 108, 151, 131,
- -1, 89, 28, -1, -1, 28, -1, 149, 105, 28,
- -1, 149, 108, 105, 28, -1, -1, 28, -1, 150,
- 105, 28, -1, -1, 28, 154, -1, -1, 134, -1,
- 153, 105, 134, -1, 134, -1, 154, 105, 134, -1
+ -1, 111, -1, -1, -1, -1, 131, 108, -1, 131,
+ 115, -1, 55, 28, 52, -1, 87, -1, 12, -1,
+ 15, -1, 31, -1, 29, -1, 135, -1, 23, -1,
+ 24, 134, -1, 25, 154, -1, 25, 99, 154, 100,
+ -1, 28, 99, 153, 100, -1, 28, -1, 13, -1,
+ 14, 134, -1, 113, -1, 134, 93, 134, -1, 134,
+ 94, 134, -1, 134, 95, 134, -1, 134, 96, 134,
+ -1, 134, 74, 134, -1, 134, 101, 134, -1, 134,
+ 102, 134, -1, 134, 69, 134, -1, 134, 70, 134,
+ -1, 134, 65, 134, -1, 134, 66, 134, -1, 134,
+ 71, 134, -1, 134, 72, 134, -1, 73, 134, -1,
+ 134, 92, 134, -1, 134, 77, 134, -1, 134, 78,
+ 134, -1, 134, 79, 134, -1, 93, 134, -1, 94,
+ 134, -1, 99, 134, 100, -1, 103, 153, 104, -1,
+ 84, 134, 85, 134, -1, 84, 134, 86, 134, -1,
+ 80, 134, 47, 134, -1, 80, 134, 54, 134, 47,
+ 134, -1, 81, 134, 47, 134, -1, 81, 134, 54,
+ 134, 47, 134, -1, 82, 134, 47, 134, -1, 82,
+ 134, 54, 134, 47, 134, -1, 83, 134, 47, 134,
+ -1, 83, 134, 54, 134, 47, 134, -1, 27, 134,
+ -1, 49, 134, -1, 140, -1, 143, -1, 37, 50,
+ -1, 37, -1, 39, 137, -1, 88, 138, -1, 64,
+ 139, -1, 17, -1, 19, 134, -1, 18, 134, -1,
+ 18, -1, 20, 154, -1, 20, 99, 154, 100, -1,
+ 90, 99, 28, 100, -1, 90, 99, 28, 105, 153,
+ 100, -1, 61, 134, 56, 134, -1, 61, 134, -1,
+ 21, 28, 153, -1, 28, -1, 137, 105, 28, -1,
+ 28, -1, 138, 105, 28, -1, 28, -1, 139, 105,
+ 28, -1, 40, 43, -1, 40, 46, -1, 40, 48,
+ -1, 40, 141, -1, 40, 141, 142, -1, 40, 142,
+ -1, 38, 134, -1, 134, -1, 47, 45, 134, -1,
+ 45, 134, -1, 62, 63, -1, 62, 141, -1, 62,
+ 141, 142, -1, 62, 142, -1, -1, 33, 144, 153,
+ -1, -1, 44, 28, 146, 129, 149, 108, 151, 131,
+ -1, 59, 28, -1, -1, 60, 28, 147, 129, 149,
+ 108, 151, 131, -1, 148, 129, 149, 108, 151, 131,
+ 32, 150, -1, 148, 129, 149, 108, 151, 131, -1,
+ 89, 28, -1, -1, 28, -1, 149, 105, 28, -1,
+ 149, 108, 105, 28, -1, -1, 28, -1, 150, 105,
+ 28, -1, -1, 28, 154, -1, -1, 134, -1, 153,
+ 105, 134, -1, 134, -1, 154, 105, 134, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -800,7 +800,7 @@ static const yytype_uint8 yyr2[] =
4, 4, 5, 1, 1, 1, 1, 5, 10, 11,
3, 6, 4, 6, 9, 9, 9, 10, 10, 6,
0, 3, 2, 1, 2, 1, 6, 1, 6, 6,
- 3, 0, 0, 2, 3, 1, 1, 0, 0, 1,
+ 3, 0, 0, 2, 3, 1, 1, 0, 0, 0,
2, 2, 3, 1, 1, 1, 1, 1, 1, 1,
2, 2, 4, 4, 1, 1, 2, 1, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
@@ -832,144 +832,151 @@ static const yytype_uint8 yydefact[] =
137, 0, 138, 143, 139, 141, 152, 111, 0, 53,
0, 0, 0, 0, 154, 155, 128, 146, 147, 149,
134, 118, 91, 0, 0, 0, 0, 0, 132, 117,
- 159, 0, 96, 97, 0, 170, 0, 1, 9, 57,
+ 159, 0, 96, 97, 0, 170, 0, 1, 9, 59,
0, 0, 0, 58, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 160, 169, 0, 172, 0, 0, 129, 0,
170, 0, 151, 0, 142, 145, 0, 140, 57, 0,
0, 0, 54, 0, 0, 0, 0, 0, 62, 57,
0, 148, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 98, 99, 0, 2, 59,
- 58, 52, 58, 57, 6, 57, 30, 0, 57, 87,
- 88, 85, 86, 89, 90, 82, 93, 94, 95, 92,
- 78, 79, 80, 81, 83, 84, 161, 0, 124, 173,
- 72, 73, 131, 144, 160, 13, 14, 15, 16, 21,
- 18, 0, 0, 20, 17, 160, 127, 135, 102, 0,
- 104, 0, 106, 0, 108, 0, 100, 101, 133, 125,
- 169, 171, 60, 61, 0, 50, 0, 0, 58, 32,
- 58, 0, 167, 0, 22, 19, 0, 0, 0, 0,
- 0, 0, 27, 0, 0, 58, 57, 0, 162, 0,
- 57, 167, 167, 103, 105, 107, 109, 126, 0, 58,
- 39, 33, 7, 57, 0, 31, 163, 158, 57, 57,
- 58, 57, 8, 57, 56, 58, 45, 51, 59, 58,
- 58, 47, 43, 51, 164, 153, 156, 57, 58, 0,
- 44, 40, 0, 58, 0, 42, 0, 0, 165, 157,
- 58, 0, 58, 57, 58, 57, 36, 34, 35, 57,
- 57, 0, 0, 28, 38, 0, 37, 0, 57, 57,
- 166, 29, 41, 58, 58, 58, 46, 48, 49
+ 0, 0, 0, 0, 0, 98, 99, 0, 2, 58,
+ 52, 58, 57, 6, 59, 30, 0, 59, 87, 88,
+ 85, 86, 89, 90, 82, 93, 94, 95, 92, 78,
+ 79, 80, 81, 83, 84, 161, 0, 124, 173, 72,
+ 73, 131, 144, 160, 13, 14, 15, 16, 21, 18,
+ 0, 0, 20, 17, 160, 127, 135, 102, 0, 104,
+ 0, 106, 0, 108, 0, 100, 101, 133, 125, 169,
+ 171, 60, 61, 0, 50, 0, 0, 58, 32, 58,
+ 0, 167, 0, 22, 19, 0, 0, 0, 0, 0,
+ 0, 27, 0, 0, 58, 57, 0, 162, 0, 59,
+ 167, 167, 103, 105, 107, 109, 126, 0, 58, 39,
+ 33, 7, 57, 0, 31, 163, 158, 59, 59, 58,
+ 59, 8, 57, 56, 58, 45, 51, 0, 58, 58,
+ 47, 43, 51, 164, 153, 156, 59, 58, 0, 44,
+ 40, 0, 58, 0, 42, 0, 0, 165, 157, 58,
+ 0, 58, 57, 58, 57, 36, 34, 35, 57, 57,
+ 0, 0, 28, 38, 0, 37, 0, 59, 59, 166,
+ 29, 41, 58, 58, 58, 46, 48, 49
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 47, 262, 205, 303, 314, 48, 49, 50, 263,
- 52, 344, 320, 321, 316, 322, 129, 130, 265, 53,
- 54, 55, 317, 199, 206, 200, 56, 57, 58, 59,
+ -1, 47, 261, 204, 302, 313, 48, 49, 50, 262,
+ 52, 343, 319, 320, 315, 321, 129, 130, 264, 53,
+ 54, 55, 316, 152, 205, 199, 56, 57, 58, 59,
60, 86, 119, 111, 61, 94, 95, 62, 83, 63,
- 168, 179, 64, 227, 339, 290, 65, 161, 75
+ 168, 179, 64, 226, 338, 289, 65, 161, 75
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -285
+#define YYPACT_NINF -293
static const yytype_int16 yypact[] =
{
- 380, -71, -285, -285, 1037, -285, -285, 1037, 1037, 1077,
- 10, -285, 1037, 1150, 1037, 1190, -285, -285, -285, 20,
- 46, 923, -285, 57, 1037, 34, 41, 66, 73, 98,
- 1037, 964, 99, 1037, 1037, 1037, 1037, 1037, 1037, -285,
- 103, 104, 54, 1037, 1037, 1037, 1037, 4, -285, -285,
- -285, -285, -285, -285, 42, -285, 840, 1037, 1671, -285,
- -285, -285, -285, -285, -285, -285, -285, -285, 55, 1037,
- 1671, 1671, 1671, 1037, 1671, 50, 1037, 1671, 1037, 50,
- 1671, 1037, 50, 1037, -285, -285, 53, 1037, -285, 1037,
- -285, 114, -285, 1671, 52, -285, -285, 1225, 132, -285,
- -39, 1037, -32, 109, -285, -285, 1565, -285, 52, -285,
- -285, 58, -52, 1259, 1293, 1327, 1361, 1599, -285, 59,
- -285, 134, -52, -52, 1633, 1671, 1, -285, 472, -285,
- 1037, 1037, 51, -285, 816, 1037, 1037, 1037, 1037, 1037,
- 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037, 1037,
- 1037, 1037, 138, 1037, 1225, 1633, -40, 1037, 62, -38,
- 1633, -34, 62, 143, 1671, 1671, 1037, -285, -285, 91,
- 1037, 1037, -285, 1037, 1037, 1531, 1037, 1037, -285, -285,
- 1037, -285, 146, 1037, 1037, 1037, 1037, 1037, 1037, 1037,
- 1037, 1037, 1037, 149, -24, -285, -285, 1037, -285, -285,
- 656, 1671, 1671, -285, -285, -285, -285, 1037, -285, 15,
- 15, 15, 15, 1705, 1705, -52, 1671, 15, 15, 19,
- 120, 120, -52, -52, 1671, 1671, -285, -47, -285, 1671,
- -285, -285, -285, 1671, 138, -285, -285, 1671, 1671, 1671,
- 1671, 1037, 1037, 1671, 1671, 138, 1671, -285, 1671, 1395,
- 1671, 1429, 1671, 1463, 1671, 1497, 1671, 1671, -285, -285,
- 1037, 1671, -285, -285, 163, -285, 7, 840, 656, 1671,
- 656, 150, 76, -47, 1671, 1671, -47, 1037, 1037, 1037,
- 1037, -22, -285, 148, 1037, -285, -27, 168, -285, 175,
- -285, 76, 76, 1671, 1671, 1671, 1671, -285, 1037, 1671,
- -10, -285, -285, -285, 169, -285, -285, 564, -285, -285,
- 1671, -285, -285, -285, -285, 169, -285, -285, 840, 656,
- 169, 169, -285, -285, 176, 656, 656, -285, 656, 840,
- -285, 151, 155, -285, 178, -285, 179, 70, -285, 108,
- 656, 182, -285, -285, -285, -285, -285, -285, -285, -285,
- -285, 180, 186, -285, -285, 840, -285, 748, 748, -285,
- -285, -285, -285, -285, 656, 656, -285, -285, -285
+ 358, -74, -293, -293, 1015, -293, -293, 1015, 1015, 1055,
+ 29, -293, 1015, 1128, 1015, 1168, -293, -293, -293, 5,
+ 39, 901, -293, 41, 1015, 52, 77, 43, 57, 61,
+ 1015, 942, 69, 1015, 1015, 1015, 1015, 1015, 1015, -293,
+ 71, 105, 58, 1015, 1015, 1015, 1015, 4, -293, -293,
+ -293, -293, -293, -293, -8, -293, 818, 1015, 1649, -293,
+ -293, -293, -293, -293, -293, -293, -293, -293, 72, 1015,
+ 1649, 1649, 1649, 1015, 1649, 63, 1015, 1649, 1015, 63,
+ 1649, 1015, 63, 1015, -293, -293, 75, 1015, -293, 1015,
+ -293, 129, -293, 1649, -20, -293, -293, 1203, 153, -293,
+ -44, 1015, -38, 140, -293, -293, 1543, -293, -20, -293,
+ -293, 89, -51, 1237, 1271, 1305, 1339, 1577, -293, 90,
+ -293, 169, -51, -51, 1611, 1649, 12, -293, 450, -293,
+ 1015, 1015, 66, -293, 794, 1015, 1015, 1015, 1015, 1015,
+ 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015,
+ 1015, 1015, 170, 1015, 1203, 1611, -2, 1015, 94, 22,
+ 1611, 53, 94, 172, 1649, 1649, 1015, -293, -293, 135,
+ 1015, 1015, -293, 1015, 1015, 1509, 1015, 1015, -293, -293,
+ 1015, -293, 173, 1015, 1015, 1015, 1015, 1015, 1015, 1015,
+ 1015, 1015, 1015, 175, 54, -293, -293, 1015, -293, 634,
+ 1649, 1649, -293, -293, -293, -293, 1015, -293, 19, 19,
+ 19, 19, 259, 259, -51, 1649, 19, 19, 30, -36,
+ -36, -51, -51, 1649, 1649, -293, -4, -293, 1649, -293,
+ -293, -293, 1649, 170, -293, -293, 1649, 1649, 1649, 1649,
+ 1015, 1015, 1649, 1649, 170, 1649, -293, 1649, 1373, 1649,
+ 1407, 1649, 1441, 1649, 1475, 1649, 1649, -293, -293, 1015,
+ 1649, -293, -293, 174, -293, 27, 818, 634, 1649, 634,
+ 179, 103, -4, 1649, 1649, -4, 1015, 1015, 1015, 1015,
+ 55, -293, 155, 1015, -293, -27, 180, -293, 185, -293,
+ 103, 103, 1649, 1649, 1649, 1649, -293, 1015, 1649, 16,
+ -293, -293, 8, 178, -293, -293, 542, -293, -293, 1649,
+ -293, -293, -293, -293, 178, -293, -293, 818, 634, 178,
+ 178, -293, -293, 187, 634, 634, -293, 634, 818, -293,
+ 158, 165, -293, 186, -293, 189, 114, -293, 118, 634,
+ 192, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+ 191, 193, -293, -293, 818, -293, 726, 726, -293, -293,
+ -293, -293, -293, 634, 634, -293, -293, -293
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -285, -285, 17, -285, -284, -285, 92, -285, -55, 0,
- -285, -285, -285, -81, -258, -96, -53, -285, -285, -285,
- -285, -285, -280, -11, 26, -110, -285, -285, -1, 56,
- -285, -285, -285, -285, -285, 196, -21, -285, -285, -285,
- -285, -285, -285, -217, -285, -167, -285, -37, 6
+ -293, -293, 17, -293, -282, -293, 98, -293, -55, 0,
+ -293, -293, -293, -72, -292, -91, -53, -293, -293, -293,
+ -293, -293, -249, -92, 3, -43, -293, -293, -1, 60,
+ -293, -293, -293, -293, -293, 199, -16, -293, -293, -293,
+ -293, -293, -293, -171, -293, -113, -293, -37, 6
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -10
+#define YYTABLE_NINF -60
static const yytype_int16 yytable[] =
{
- 51, 133, 132, 70, 127, 301, 71, 72, 74, 126,
- 109, 77, 74, 80, 74, 173, 313, 273, 67, 79,
- 93, 82, 176, 97, 323, 142, 312, 66, 276, 106,
- 93, 302, 112, 113, 114, 115, 116, 117, 76, 158,
- 323, 283, 122, 123, 124, 125, 162, 343, 302, 150,
- 151, 66, 174, 152, 100, 101, 134, 330, 271, 177,
- 228, 284, 230, 330, 128, 157, 231, 157, 154, 102,
- 84, 197, 155, 167, 85, 125, 259, 155, 297, 156,
- 160, 260, 125, 197, 159, 96, 164, 181, 165, 141,
- 98, 99, 142, 141, 103, 268, 142, 89, 270, 91,
- 175, 104, 66, 203, 204, 196, 197, 145, 146, 147,
- 148, 149, 146, 147, 148, 149, 150, 151, 14, 235,
- 150, 151, 349, 350, 308, 309, 105, 110, 51, 201,
- 202, 118, 120, 131, 209, 210, 211, 212, 213, 214,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 208, 125, 121, 153, 157, 229, 234, 163, 166,
- 172, 178, 194, 182, 193, 233, 226, 197, 245, 237,
- 238, 232, 239, 240, 247, 243, 244, 258, 288, 246,
- 307, 289, 248, 249, 250, 251, 252, 253, 254, 255,
- 256, 257, 267, 319, 141, 282, 261, 142, 325, 326,
- 305, 328, 298, 306, 338, 312, 269, 345, 360, 302,
- 347, 348, 285, 351, 353, 148, 149, 340, 361, 315,
- 198, 150, 151, 281, 335, 236, 264, 108, 266, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 274, 275, 0, 0, 272, 0, 0, 0, 364, 365,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 125,
- 0, 0, 0, 333, 332, 0, 0, 0, 0, 0,
- 337, 0, 0, 0, 342, 304, 293, 294, 295, 296,
- 0, 0, 0, 299, 0, 0, 0, 0, 0, 0,
- 291, 0, 318, 292, 286, 0, 287, 310, 0, 0,
- 362, 0, 329, 0, 0, 0, 0, 0, 0, 0,
- 0, 300, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 311, 0, 0, 0, 0,
- 0, 0, 355, 0, 357, 0, 327, 0, 358, 359,
- 0, 331, 0, 0, 0, 334, 336, 0, 0, 0,
- 0, 0, 0, 0, 341, 0, 0, 363, 363, 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,
+ 51, 133, 132, 70, 127, 300, 71, 72, 74, 126,
+ 173, 77, 74, 80, 74, 109, 176, 312, 67, 79,
+ 93, 82, 329, 97, 66, 89, 142, 91, 329, 106,
+ 93, 301, 112, 113, 114, 115, 116, 117, 141, 158,
+ -59, 142, 122, 123, 124, 125, 162, 174, 342, -59,
+ 150, 151, 311, 177, 322, 84, 134, 76, -59, 148,
+ 149, 282, 272, -59, 128, 150, 151, 85, 154, 96,
+ 322, 103, 155, 275, 301, 125, 233, 155, 167, 156,
+ 160, 283, 125, 131, 159, 104, 164, 244, 165, 105,
+ 100, 101, 181, 141, 66, -59, 142, 110, 227, 118,
+ 175, 270, 66, 157, 141, 102, -59, 142, 98, 99,
+ 266, 145, 146, 147, 148, 149, 196, 197, 202, 203,
+ 150, 151, 229, 146, 147, 148, 149, 157, 51, 200,
+ 201, 150, 151, 120, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 207, 125, 230, 258, 296, 228, 121, 197, 259,
+ 197, 267, 14, 234, 269, 232, 348, 349, 157, 236,
+ 237, 153, 238, 239, 166, 242, 243, 307, 308, 245,
+ 163, 172, 247, 248, 249, 250, 251, 252, 253, 254,
+ 255, 256, 178, 303, 182, 193, 260, 194, 225, 197,
+ 231, 246, 263, 257, 265, 268, 281, 287, 288, 297,
+ 317, 284, 304, 305, 311, 337, 301, 344, 346, 359,
+ 328, 347, 280, 350, 352, 360, 198, 314, 334, 235,
+ 108, 0, 0, 0, 0, 0, 0, 0, 0, 273,
+ 274, 0, 0, 271, 0, 0, 306, 0, 0, 0,
+ 354, 0, 356, 0, 0, 0, 357, 358, 125, 318,
+ 0, 0, 332, 331, 324, 325, 0, 327, 0, 336,
+ 285, 0, 286, 341, 0, 292, 293, 294, 295, 0,
+ 0, 0, 298, 339, 0, 0, 0, 299, 0, 290,
+ 0, 0, 291, 0, 0, 0, 309, 0, 0, 361,
+ 0, 310, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 326, 0, 363, 364, 0, 330, 0, 0,
+ 0, 333, 335, 0, 135, 136, 0, 0, 137, 138,
+ 340, 0, 0, 141, 0, 345, 142, 143, 144, 0,
+ 0, 0, 351, 0, 353, 0, 355, 0, 0, 0,
+ 0, 145, 146, 147, 148, 149, 362, 362, -9, 1,
+ 150, 151, 0, 0, 0, 365, 366, 367, 0, 0,
+ 2, 3, 4, 5, 0, 6, 7, 8, 9, 10,
+ 0, 11, 12, 13, 0, 14, 15, 16, 0, 17,
+ 0, 18, 0, 0, 0, 19, 0, 20, 21, 22,
+ 0, 0, 23, 0, 0, 0, 0, 24, 25, 26,
+ 0, 0, 0, 27, 0, 0, 0, 28, 29, 30,
+ 31, 0, 32, 0, 0, 0, 0, 0, 0, 0,
+ 0, 33, 0, 0, 0, 0, 0, 0, 34, 35,
+ 36, 37, 38, 0, 0, 39, 40, 41, 42, 0,
+ 0, 43, 44, 0, 0, 0, -9, 45, 0, 0,
+ 0, 46, 2, 3, 4, 5, 0, 6, 7, 8,
9, 10, 0, 11, 12, 13, 0, 14, 15, 16,
0, 17, 0, 18, 0, 0, 0, 19, 0, 20,
21, 22, 0, 0, 23, 0, 0, 0, 0, 24,
@@ -977,19 +984,19 @@ static const yytype_int16 yytable[] =
29, 30, 31, 0, 32, 0, 0, 0, 0, 0,
0, 0, 0, 33, 0, 0, 0, 0, 0, 0,
34, 35, 36, 37, 38, 0, 0, 39, 40, 41,
- 42, 0, 0, 43, 44, 0, 0, 0, -9, 45,
+ 42, 0, 0, 43, 44, 0, 0, 0, 0, 45,
0, 0, 0, 46, 2, 3, 4, 5, 0, 6,
7, 8, 9, 10, 0, 11, 12, 13, 0, 14,
- 15, 16, 0, 17, 0, 18, 0, 0, 0, 19,
- 0, 20, 21, 22, 0, 0, 23, 0, 0, 0,
+ 68, 16, 0, 17, 323, 18, 0, 0, 0, 19,
+ 0, 20, 21, 22, 0, 0, 0, 0, 0, 0,
0, 24, 25, 26, 0, 0, 0, 27, 0, 0,
- 0, 28, 29, 30, 31, 0, 32, 0, 0, 0,
+ 0, 0, 0, 30, 31, 0, 32, 0, 0, 0,
0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
0, 0, 34, 35, 36, 37, 38, 0, 0, 39,
- 40, 41, 42, 0, 0, 43, 44, 0, 0, 0,
- 0, 45, 0, 0, 0, 46, 2, 3, 4, 5,
+ 40, 0, 42, 0, 0, 43, 44, 0, 0, 0,
+ 66, 45, 0, 0, 0, 46, 2, 3, 4, 5,
0, 6, 7, 8, 9, 10, 0, 11, 12, 13,
- 0, 14, 68, 16, 0, 17, 324, 18, 0, 0,
+ 0, 14, 68, 16, 0, 17, 0, 18, 0, 0,
0, 19, 0, 20, 21, 22, 0, 0, 0, 0,
0, 0, 0, 24, 25, 26, 0, 0, 0, 27,
0, 0, 0, 0, 0, 30, 31, 0, 32, 0,
@@ -1005,156 +1012,151 @@ static const yytype_int16 yytable[] =
32, 0, 0, 0, 0, 0, 0, 0, 0, 33,
0, 0, 0, 0, 0, 0, 34, 35, 36, 37,
38, 0, 0, 39, 40, 0, 42, 0, 0, 43,
- 44, 0, 0, 0, 66, 45, 0, 0, 0, 46,
+ 44, 0, 0, 0, 0, 45, 0, 0, 0, 46,
2, 3, 4, 5, 0, 6, 7, 8, 9, 10,
+ 0, 11, 12, 13, 0, 14, 68, 16, 206, 17,
+ 0, 18, 0, 0, 0, 19, 0, 20, 21, 135,
+ 136, 0, 0, 137, 138, 139, 140, 24, 141, 26,
+ 0, 142, 143, 144, 0, 0, 0, 0, 0, 30,
+ 31, 0, 32, 0, 0, 0, 145, 146, 147, 148,
+ 149, 33, 66, 0, 0, 150, 151, 0, 34, 35,
+ 36, 37, 38, 0, 0, 0, 40, 0, 42, 0,
+ 0, 43, 44, 2, 3, 4, 5, 45, 0, 0,
+ 0, 46, 0, 0, 11, 12, 13, 0, 14, 68,
+ 16, 0, 17, 0, 0, 0, 0, 0, 0, 87,
+ 0, 0, 0, 0, 88, 0, 89, 90, 91, 92,
+ 69, 0, 26, 0, 2, 3, 4, 5, 0, 0,
+ 0, 0, 0, 0, 0, 11, 12, 13, 0, 14,
+ 68, 16, 0, 17, 33, 0, 0, 0, 0, 0,
+ 87, 34, 35, 36, 37, 38, 0, 89, 0, 91,
+ 0, 69, 0, 26, 43, 44, 0, 0, 0, 0,
+ 45, 0, 0, 0, 46, 107, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
+ 0, 0, 34, 35, 36, 37, 38, 2, 3, 4,
+ 5, 0, 0, 0, 0, 43, 44, 0, 11, 12,
+ 13, 45, 14, 68, 16, 46, 17, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 69, 0, 26, 2, 3, 4,
+ 5, 0, 0, 0, 0, 0, 0, 0, 11, 12,
+ 13, 0, 14, 68, 16, 0, 17, 0, 33, 0,
+ 0, 0, 0, 0, 0, 34, 35, 36, 37, 38,
+ 0, 0, 0, 0, 69, 0, 26, 0, 43, 44,
+ 0, 0, 0, 0, 45, 0, 0, 0, 46, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 33, 0,
+ 0, 0, 0, 0, 0, 34, 35, 36, 37, 38,
+ 2, 3, 4, 5, 0, 0, 0, 0, 43, 44,
+ 0, 11, 12, 13, 73, 14, 68, 16, 46, 17,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 69, 0, 26,
+ 2, 3, 4, 5, 0, 0, 0, 0, 0, 0,
0, 11, 12, 13, 0, 14, 68, 16, 0, 17,
- 0, 18, 0, 0, 0, 19, 0, 20, 21, 22,
- 0, 0, 0, 0, 0, 0, 0, 24, 25, 26,
- 0, 0, 0, 27, 0, 0, 0, 0, 0, 30,
- 31, 0, 32, 0, 0, 0, 0, 0, 0, 0,
0, 33, 0, 0, 0, 0, 0, 0, 34, 35,
- 36, 37, 38, 0, 0, 39, 40, 0, 42, 0,
- 0, 43, 44, 0, 0, 0, 0, 45, 0, 0,
- 0, 46, 2, 3, 4, 5, 0, 6, 7, 8,
- 9, 10, 0, 11, 12, 13, 0, 14, 68, 16,
- 207, 17, 0, 18, 0, 0, 0, 19, 0, 20,
- 21, 135, 136, 0, 0, 137, 138, 139, 140, 24,
- 141, 26, 0, 142, 143, 144, 0, 0, 0, 0,
- 0, 30, 31, 0, 32, 0, 0, 0, 145, 146,
- 147, 148, 149, 33, 66, 0, 0, 150, 151, 0,
- 34, 35, 36, 37, 38, 0, 0, 0, 40, 0,
- 42, 0, 0, 43, 44, 2, 3, 4, 5, 45,
- 0, 0, 0, 46, 0, 0, 11, 12, 13, 0,
- 14, 68, 16, 0, 17, 0, 0, 0, 0, 0,
- 0, 87, 0, 0, 0, 0, 88, 0, 89, 90,
- 91, 92, 69, 0, 26, 0, 2, 3, 4, 5,
- 0, 0, 0, 0, 0, 0, 0, 11, 12, 13,
- 0, 14, 68, 16, 0, 17, 33, 0, 0, 0,
- 0, 0, 87, 34, 35, 36, 37, 38, 0, 89,
- 0, 91, 0, 69, 0, 26, 43, 44, 0, 0,
- 0, 0, 45, 0, 0, 0, 46, 107, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 33, 0, 0,
- 0, 0, 0, 0, 34, 35, 36, 37, 38, 2,
- 3, 4, 5, 0, 0, 0, 0, 43, 44, 0,
- 11, 12, 13, 45, 14, 68, 16, 46, 17, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 69, 0, 26, 2,
- 3, 4, 5, 0, 0, 0, 0, 0, 0, 0,
- 11, 12, 13, 0, 14, 68, 16, 0, 17, 0,
- 33, 0, 0, 0, 0, 0, 0, 34, 35, 36,
- 37, 38, 0, 0, 0, 0, 69, 0, 26, 0,
- 43, 44, 0, 0, 0, 0, 45, 0, 0, 0,
- 46, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 33, 0, 0, 0, 0, 0, 0, 34, 35, 36,
- 37, 38, 2, 3, 4, 5, 0, 0, 0, 0,
- 43, 44, 0, 11, 12, 13, 73, 14, 68, 16,
- 46, 17, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 69,
- 0, 26, 2, 3, 4, 5, 0, 0, 0, 0,
- 0, 0, 0, 11, 12, 13, 0, 14, 68, 16,
- 0, 17, 0, 33, 0, 0, 0, 0, 0, 0,
- 34, 35, 36, 37, 38, 0, 0, 0, 0, 69,
- 0, 26, 0, 43, 44, 0, 0, 0, 0, 78,
- 0, 0, 0, 46, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 33, 0, 0, 0, 169, 0, 0,
- 34, 35, 36, 37, 38, 0, 0, 0, 0, 0,
- 0, 0, 0, 43, 44, 0, 0, 0, 0, 81,
- 135, 136, 0, 46, 137, 138, 139, 140, 0, 141,
- 170, 171, 142, 143, 144, 0, 183, 0, 0, 0,
- 0, 0, 0, 184, 0, 0, 0, 145, 146, 147,
- 148, 149, 0, 0, 135, 136, 150, 151, 137, 138,
- 139, 140, 0, 141, 0, 0, 142, 143, 144, 0,
- 185, 0, 0, 0, 0, 0, 0, 186, 0, 0,
- 0, 145, 146, 147, 148, 149, 0, 0, 135, 136,
- 150, 151, 137, 138, 139, 140, 0, 141, 0, 0,
- 142, 143, 144, 0, 187, 0, 0, 0, 0, 0,
- 0, 188, 0, 0, 0, 145, 146, 147, 148, 149,
+ 36, 37, 38, 0, 0, 0, 0, 69, 0, 26,
+ 0, 43, 44, 0, 0, 0, 0, 78, 0, 0,
+ 0, 46, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 33, 0, 0, 0, 169, 0, 0, 34, 35,
+ 36, 37, 38, 0, 0, 0, 0, 0, 0, 0,
+ 0, 43, 44, 0, 0, 0, 0, 81, 135, 136,
+ 0, 46, 137, 138, 139, 140, 0, 141, 170, 171,
+ 142, 143, 144, 0, 183, 0, 0, 0, 0, 0,
+ 0, 184, 0, 0, 0, 145, 146, 147, 148, 149,
0, 0, 135, 136, 150, 151, 137, 138, 139, 140,
- 0, 141, 0, 0, 142, 143, 144, 0, 189, 0,
- 0, 0, 0, 0, 0, 190, 0, 0, 0, 145,
+ 0, 141, 0, 0, 142, 143, 144, 0, 185, 0,
+ 0, 0, 0, 0, 0, 186, 0, 0, 0, 145,
146, 147, 148, 149, 0, 0, 135, 136, 150, 151,
137, 138, 139, 140, 0, 141, 0, 0, 142, 143,
- 144, 0, 277, 0, 0, 0, 0, 0, 0, 0,
+ 144, 0, 187, 0, 0, 0, 0, 0, 0, 188,
0, 0, 0, 145, 146, 147, 148, 149, 0, 0,
135, 136, 150, 151, 137, 138, 139, 140, 0, 141,
- 0, 0, 142, 143, 144, 0, 278, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 145, 146, 147,
+ 0, 0, 142, 143, 144, 0, 189, 0, 0, 0,
+ 0, 0, 0, 190, 0, 0, 0, 145, 146, 147,
148, 149, 0, 0, 135, 136, 150, 151, 137, 138,
139, 140, 0, 141, 0, 0, 142, 143, 144, 0,
- 279, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 276, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 145, 146, 147, 148, 149, 0, 0, 135, 136,
150, 151, 137, 138, 139, 140, 0, 141, 0, 0,
- 142, 143, 144, 0, 280, 0, 0, 0, 0, 0,
+ 142, 143, 144, 0, 277, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 145, 146, 147, 148, 149,
0, 0, 135, 136, 150, 151, 137, 138, 139, 140,
- 0, 141, 0, 0, 142, 143, 144, 0, 0, 0,
- 0, 0, 0, 0, 0, 241, 0, 0, 0, 145,
+ 0, 141, 0, 0, 142, 143, 144, 0, 278, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 145,
146, 147, 148, 149, 0, 0, 135, 136, 150, 151,
137, 138, 139, 140, 0, 141, 0, 0, 142, 143,
- 144, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 180, 242, 145, 146, 147, 148, 149, 0, 0,
+ 144, 0, 279, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 145, 146, 147, 148, 149, 0, 0,
135, 136, 150, 151, 137, 138, 139, 140, 0, 141,
0, 0, 142, 143, 144, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 145, 146, 147,
+ 0, 0, 0, 240, 0, 0, 0, 145, 146, 147,
148, 149, 0, 0, 135, 136, 150, 151, 137, 138,
139, 140, 0, 141, 0, 0, 142, 143, 144, 0,
- 0, 0, 0, 0, 191, 192, 0, 0, 0, 0,
- 0, 145, 146, 147, 148, 149, 0, 0, 135, 136,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 180,
+ 241, 145, 146, 147, 148, 149, 0, 0, 135, 136,
150, 151, 137, 138, 139, 140, 0, 141, 0, 0,
142, 143, 144, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 145, 146, 147, 148, 149,
- 0, 0, 0, 195, 150, 151, 135, 136, 0, 0,
+ 0, 0, 135, 136, 150, 151, 137, 138, 139, 140,
+ 0, 141, 0, 0, 142, 143, 144, 0, 0, 0,
+ 0, 0, 191, 192, 0, 0, 0, 0, 0, 145,
+ 146, 147, 148, 149, 0, 0, 135, 136, 150, 151,
137, 138, 139, 140, 0, 141, 0, 0, 142, 143,
144, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 145, 146, 147, 148, 149, 0, 0,
- 135, 136, 150, 151, 137, 138, 0, 0, 0, 141,
- 0, 0, 142, 143, 144, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 145, 146, 147,
- 148, 149, 0, 0, 0, 0, 150, 151
+ 0, 195, 150, 151, 135, 136, 0, 0, 137, 138,
+ 139, 140, 0, 141, 0, 0, 142, 143, 144, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 145, 146, 147, 148, 149, 0, 0, 0, 0,
+ 150, 151
};
static const yytype_int16 yycheck[] =
{
0, 56, 55, 4, 0, 32, 7, 8, 9, 46,
- 31, 12, 13, 14, 15, 54, 300, 234, 1, 13,
- 21, 15, 54, 24, 304, 77, 36, 98, 245, 30,
- 31, 58, 33, 34, 35, 36, 37, 38, 28, 76,
- 320, 34, 43, 44, 45, 46, 83, 331, 58, 101,
- 102, 98, 91, 64, 13, 14, 57, 315, 105, 91,
- 100, 54, 100, 321, 47, 105, 100, 105, 69, 28,
- 50, 105, 73, 94, 28, 76, 100, 78, 100, 73,
- 81, 105, 83, 105, 78, 28, 87, 108, 89, 74,
- 56, 57, 77, 74, 28, 205, 77, 45, 208, 47,
- 101, 28, 98, 52, 53, 104, 105, 92, 93, 94,
- 95, 96, 93, 94, 95, 96, 101, 102, 27, 28,
- 101, 102, 52, 53, 291, 292, 28, 28, 128, 130,
- 131, 28, 28, 91, 135, 136, 137, 138, 139, 140,
+ 54, 12, 13, 14, 15, 31, 54, 299, 1, 13,
+ 21, 15, 314, 24, 98, 45, 77, 47, 320, 30,
+ 31, 58, 33, 34, 35, 36, 37, 38, 74, 76,
+ 32, 77, 43, 44, 45, 46, 83, 91, 330, 41,
+ 101, 102, 36, 91, 303, 50, 57, 28, 50, 95,
+ 96, 34, 233, 55, 47, 101, 102, 28, 69, 28,
+ 319, 28, 73, 244, 58, 76, 168, 78, 94, 73,
+ 81, 54, 83, 91, 78, 28, 87, 179, 89, 28,
+ 13, 14, 108, 74, 98, 87, 77, 28, 100, 28,
+ 101, 105, 98, 105, 74, 28, 98, 77, 56, 57,
+ 202, 92, 93, 94, 95, 96, 104, 105, 52, 53,
+ 101, 102, 100, 93, 94, 95, 96, 105, 128, 130,
+ 131, 101, 102, 28, 135, 136, 137, 138, 139, 140,
141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
- 151, 134, 153, 99, 99, 105, 157, 168, 105, 45,
- 28, 52, 28, 105, 105, 166, 28, 105, 179, 170,
- 171, 28, 173, 174, 28, 176, 177, 28, 28, 180,
- 290, 105, 183, 184, 185, 186, 187, 188, 189, 190,
- 191, 192, 203, 303, 74, 32, 197, 77, 308, 309,
- 32, 311, 54, 28, 28, 36, 207, 52, 28, 58,
- 32, 32, 267, 105, 32, 95, 96, 327, 32, 300,
- 128, 101, 102, 260, 320, 169, 200, 31, 202, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 241, 242, -1, -1, 227, -1, -1, -1, 358, 359,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 260,
- -1, -1, -1, 318, 317, -1, -1, -1, -1, -1,
- 323, -1, -1, -1, 329, 286, 277, 278, 279, 280,
- -1, -1, -1, 284, -1, -1, -1, -1, -1, -1,
- 273, -1, 303, 276, 268, -1, 270, 298, -1, -1,
- 355, -1, 313, -1, -1, -1, -1, -1, -1, -1,
- -1, 285, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 299, -1, -1, -1, -1,
- -1, -1, 343, -1, 345, -1, 310, -1, 349, 350,
- -1, 315, -1, -1, -1, 319, 320, -1, -1, -1,
- -1, -1, -1, -1, 328, -1, -1, 357, 358, 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,
+ 151, 134, 153, 100, 100, 100, 157, 99, 105, 105,
+ 105, 204, 27, 28, 207, 166, 52, 53, 105, 170,
+ 171, 99, 173, 174, 45, 176, 177, 290, 291, 180,
+ 105, 28, 183, 184, 185, 186, 187, 188, 189, 190,
+ 191, 192, 52, 285, 105, 105, 197, 28, 28, 105,
+ 28, 28, 199, 28, 201, 206, 32, 28, 105, 54,
+ 302, 266, 32, 28, 36, 28, 58, 52, 32, 28,
+ 312, 32, 259, 105, 32, 32, 128, 299, 319, 169,
+ 31, -1, -1, -1, -1, -1, -1, -1, -1, 240,
+ 241, -1, -1, 226, -1, -1, 289, -1, -1, -1,
+ 342, -1, 344, -1, -1, -1, 348, 349, 259, 302,
+ -1, -1, 317, 316, 307, 308, -1, 310, -1, 322,
+ 267, -1, 269, 328, -1, 276, 277, 278, 279, -1,
+ -1, -1, 283, 326, -1, -1, -1, 284, -1, 272,
+ -1, -1, 275, -1, -1, -1, 297, -1, -1, 354,
+ -1, 298, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 309, -1, 357, 358, -1, 314, -1, -1,
+ -1, 318, 319, -1, 65, 66, -1, -1, 69, 70,
+ 327, -1, -1, 74, -1, 332, 77, 78, 79, -1,
+ -1, -1, 339, -1, 341, -1, 343, -1, -1, -1,
+ -1, 92, 93, 94, 95, 96, 356, 357, 0, 1,
+ 101, 102, -1, -1, -1, 362, 363, 364, -1, -1,
+ 12, 13, 14, 15, -1, 17, 18, 19, 20, 21,
+ -1, 23, 24, 25, -1, 27, 28, 29, -1, 31,
+ -1, 33, -1, -1, -1, 37, -1, 39, 40, 41,
+ -1, -1, 44, -1, -1, -1, -1, 49, 50, 51,
+ -1, -1, -1, 55, -1, -1, -1, 59, 60, 61,
+ 62, -1, 64, -1, -1, -1, -1, -1, -1, -1,
+ -1, 73, -1, -1, -1, -1, -1, -1, 80, 81,
+ 82, 83, 84, -1, -1, 87, 88, 89, 90, -1,
+ -1, 93, 94, -1, -1, -1, 98, 99, -1, -1,
+ -1, 103, 12, 13, 14, 15, -1, 17, 18, 19,
20, 21, -1, 23, 24, 25, -1, 27, 28, 29,
-1, 31, -1, 33, -1, -1, -1, 37, -1, 39,
40, 41, -1, -1, 44, -1, -1, -1, -1, 49,
@@ -1162,19 +1164,19 @@ static const yytype_int16 yycheck[] =
60, 61, 62, -1, 64, -1, -1, -1, -1, -1,
-1, -1, -1, 73, -1, -1, -1, -1, -1, -1,
80, 81, 82, 83, 84, -1, -1, 87, 88, 89,
- 90, -1, -1, 93, 94, -1, -1, -1, 98, 99,
+ 90, -1, -1, 93, 94, -1, -1, -1, -1, 99,
-1, -1, -1, 103, 12, 13, 14, 15, -1, 17,
18, 19, 20, 21, -1, 23, 24, 25, -1, 27,
- 28, 29, -1, 31, -1, 33, -1, -1, -1, 37,
- -1, 39, 40, 41, -1, -1, 44, -1, -1, -1,
+ 28, 29, -1, 31, 32, 33, -1, -1, -1, 37,
+ -1, 39, 40, 41, -1, -1, -1, -1, -1, -1,
-1, 49, 50, 51, -1, -1, -1, 55, -1, -1,
- -1, 59, 60, 61, 62, -1, 64, -1, -1, -1,
+ -1, -1, -1, 61, 62, -1, 64, -1, -1, -1,
-1, -1, -1, -1, -1, 73, -1, -1, -1, -1,
-1, -1, 80, 81, 82, 83, 84, -1, -1, 87,
- 88, 89, 90, -1, -1, 93, 94, -1, -1, -1,
- -1, 99, -1, -1, -1, 103, 12, 13, 14, 15,
+ 88, -1, 90, -1, -1, 93, 94, -1, -1, -1,
+ 98, 99, -1, -1, -1, 103, 12, 13, 14, 15,
-1, 17, 18, 19, 20, 21, -1, 23, 24, 25,
- -1, 27, 28, 29, -1, 31, 32, 33, -1, -1,
+ -1, 27, 28, 29, -1, 31, -1, 33, -1, -1,
-1, 37, -1, 39, 40, 41, -1, -1, -1, -1,
-1, -1, -1, 49, 50, 51, -1, -1, -1, 55,
-1, -1, -1, -1, -1, 61, 62, -1, 64, -1,
@@ -1190,68 +1192,52 @@ static const yytype_int16 yycheck[] =
64, -1, -1, -1, -1, -1, -1, -1, -1, 73,
-1, -1, -1, -1, -1, -1, 80, 81, 82, 83,
84, -1, -1, 87, 88, -1, 90, -1, -1, 93,
- 94, -1, -1, -1, 98, 99, -1, -1, -1, 103,
+ 94, -1, -1, -1, -1, 99, -1, -1, -1, 103,
12, 13, 14, 15, -1, 17, 18, 19, 20, 21,
+ -1, 23, 24, 25, -1, 27, 28, 29, 54, 31,
+ -1, 33, -1, -1, -1, 37, -1, 39, 40, 65,
+ 66, -1, -1, 69, 70, 71, 72, 49, 74, 51,
+ -1, 77, 78, 79, -1, -1, -1, -1, -1, 61,
+ 62, -1, 64, -1, -1, -1, 92, 93, 94, 95,
+ 96, 73, 98, -1, -1, 101, 102, -1, 80, 81,
+ 82, 83, 84, -1, -1, -1, 88, -1, 90, -1,
+ -1, 93, 94, 12, 13, 14, 15, 99, -1, -1,
+ -1, 103, -1, -1, 23, 24, 25, -1, 27, 28,
+ 29, -1, 31, -1, -1, -1, -1, -1, -1, 38,
+ -1, -1, -1, -1, 43, -1, 45, 46, 47, 48,
+ 49, -1, 51, -1, 12, 13, 14, 15, -1, -1,
+ -1, -1, -1, -1, -1, 23, 24, 25, -1, 27,
+ 28, 29, -1, 31, 73, -1, -1, -1, -1, -1,
+ 38, 80, 81, 82, 83, 84, -1, 45, -1, 47,
+ -1, 49, -1, 51, 93, 94, -1, -1, -1, -1,
+ 99, -1, -1, -1, 103, 63, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 73, -1, -1, -1, -1,
+ -1, -1, 80, 81, 82, 83, 84, 12, 13, 14,
+ 15, -1, -1, -1, -1, 93, 94, -1, 23, 24,
+ 25, 99, 27, 28, 29, 103, 31, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 49, -1, 51, 12, 13, 14,
+ 15, -1, -1, -1, -1, -1, -1, -1, 23, 24,
+ 25, -1, 27, 28, 29, -1, 31, -1, 73, -1,
+ -1, -1, -1, -1, -1, 80, 81, 82, 83, 84,
+ -1, -1, -1, -1, 49, -1, 51, -1, 93, 94,
+ -1, -1, -1, -1, 99, -1, -1, -1, 103, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 73, -1,
+ -1, -1, -1, -1, -1, 80, 81, 82, 83, 84,
+ 12, 13, 14, 15, -1, -1, -1, -1, 93, 94,
+ -1, 23, 24, 25, 99, 27, 28, 29, 103, 31,
+ -1, -1, -1, -1, -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, 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,
+ 82, 83, 84, -1, -1, -1, -1, 49, -1, 51,
-1, 93, 94, -1, -1, -1, -1, 99, -1, -1,
- -1, 103, 12, 13, 14, 15, -1, 17, 18, 19,
- 20, 21, -1, 23, 24, 25, -1, 27, 28, 29,
- 54, 31, -1, 33, -1, -1, -1, 37, -1, 39,
- 40, 65, 66, -1, -1, 69, 70, 71, 72, 49,
- 74, 51, -1, 77, 78, 79, -1, -1, -1, -1,
- -1, 61, 62, -1, 64, -1, -1, -1, 92, 93,
- 94, 95, 96, 73, 98, -1, -1, 101, 102, -1,
- 80, 81, 82, 83, 84, -1, -1, -1, 88, -1,
- 90, -1, -1, 93, 94, 12, 13, 14, 15, 99,
- -1, -1, -1, 103, -1, -1, 23, 24, 25, -1,
- 27, 28, 29, -1, 31, -1, -1, -1, -1, -1,
- -1, 38, -1, -1, -1, -1, 43, -1, 45, 46,
- 47, 48, 49, -1, 51, -1, 12, 13, 14, 15,
- -1, -1, -1, -1, -1, -1, -1, 23, 24, 25,
- -1, 27, 28, 29, -1, 31, 73, -1, -1, -1,
- -1, -1, 38, 80, 81, 82, 83, 84, -1, 45,
- -1, 47, -1, 49, -1, 51, 93, 94, -1, -1,
- -1, -1, 99, -1, -1, -1, 103, 63, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 73, -1, -1,
- -1, -1, -1, -1, 80, 81, 82, 83, 84, 12,
- 13, 14, 15, -1, -1, -1, -1, 93, 94, -1,
- 23, 24, 25, 99, 27, 28, 29, 103, 31, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 49, -1, 51, 12,
- 13, 14, 15, -1, -1, -1, -1, -1, -1, -1,
- 23, 24, 25, -1, 27, 28, 29, -1, 31, -1,
- 73, -1, -1, -1, -1, -1, -1, 80, 81, 82,
- 83, 84, -1, -1, -1, -1, 49, -1, 51, -1,
- 93, 94, -1, -1, -1, -1, 99, -1, -1, -1,
- 103, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 73, -1, -1, -1, -1, -1, -1, 80, 81, 82,
- 83, 84, 12, 13, 14, 15, -1, -1, -1, -1,
- 93, 94, -1, 23, 24, 25, 99, 27, 28, 29,
- 103, 31, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 49,
- -1, 51, 12, 13, 14, 15, -1, -1, -1, -1,
- -1, -1, -1, 23, 24, 25, -1, 27, 28, 29,
- -1, 31, -1, 73, -1, -1, -1, -1, -1, -1,
- 80, 81, 82, 83, 84, -1, -1, -1, -1, 49,
- -1, 51, -1, 93, 94, -1, -1, -1, -1, 99,
- -1, -1, -1, 103, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 73, -1, -1, -1, 42, -1, -1,
- 80, 81, 82, 83, 84, -1, -1, -1, -1, -1,
- -1, -1, -1, 93, 94, -1, -1, -1, -1, 99,
- 65, 66, -1, 103, 69, 70, 71, 72, -1, 74,
- 75, 76, 77, 78, 79, -1, 47, -1, -1, -1,
- -1, -1, -1, 54, -1, -1, -1, 92, 93, 94,
- 95, 96, -1, -1, 65, 66, 101, 102, 69, 70,
- 71, 72, -1, 74, -1, -1, 77, 78, 79, -1,
- 47, -1, -1, -1, -1, -1, -1, 54, -1, -1,
- -1, 92, 93, 94, 95, 96, -1, -1, 65, 66,
- 101, 102, 69, 70, 71, 72, -1, 74, -1, -1,
+ -1, 103, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 73, -1, -1, -1, 42, -1, -1, 80, 81,
+ 82, 83, 84, -1, -1, -1, -1, -1, -1, -1,
+ -1, 93, 94, -1, -1, -1, -1, 99, 65, 66,
+ -1, 103, 69, 70, 71, 72, -1, 74, 75, 76,
77, 78, 79, -1, 47, -1, -1, -1, -1, -1,
-1, 54, -1, -1, -1, 92, 93, 94, 95, 96,
-1, -1, 65, 66, 101, 102, 69, 70, 71, 72,
@@ -1259,11 +1245,11 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, 54, -1, -1, -1, 92,
93, 94, 95, 96, -1, -1, 65, 66, 101, 102,
69, 70, 71, 72, -1, 74, -1, -1, 77, 78,
- 79, -1, 47, -1, -1, -1, -1, -1, -1, -1,
+ 79, -1, 47, -1, -1, -1, -1, -1, -1, 54,
-1, -1, -1, 92, 93, 94, 95, 96, -1, -1,
65, 66, 101, 102, 69, 70, 71, 72, -1, 74,
-1, -1, 77, 78, 79, -1, 47, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ -1, -1, -1, 54, -1, -1, -1, 92, 93, 94,
95, 96, -1, -1, 65, 66, 101, 102, 69, 70,
71, 72, -1, 74, -1, -1, 77, 78, 79, -1,
47, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1272,30 +1258,34 @@ static const yytype_int16 yycheck[] =
77, 78, 79, -1, 47, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 92, 93, 94, 95, 96,
-1, -1, 65, 66, 101, 102, 69, 70, 71, 72,
- -1, 74, -1, -1, 77, 78, 79, -1, -1, -1,
- -1, -1, -1, -1, -1, 54, -1, -1, -1, 92,
+ -1, 74, -1, -1, 77, 78, 79, -1, 47, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 92,
93, 94, 95, 96, -1, -1, 65, 66, 101, 102,
69, 70, 71, 72, -1, 74, -1, -1, 77, 78,
- 79, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 56, 91, 92, 93, 94, 95, 96, -1, -1,
+ 79, -1, 47, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 92, 93, 94, 95, 96, -1, -1,
65, 66, 101, 102, 69, 70, 71, 72, -1, 74,
-1, -1, 77, 78, 79, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ -1, -1, -1, 54, -1, -1, -1, 92, 93, 94,
95, 96, -1, -1, 65, 66, 101, 102, 69, 70,
71, 72, -1, 74, -1, -1, 77, 78, 79, -1,
- -1, -1, -1, -1, 85, 86, -1, -1, -1, -1,
- -1, 92, 93, 94, 95, 96, -1, -1, 65, 66,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 56,
+ 91, 92, 93, 94, 95, 96, -1, -1, 65, 66,
101, 102, 69, 70, 71, 72, -1, 74, -1, -1,
77, 78, 79, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 92, 93, 94, 95, 96,
- -1, -1, -1, 100, 101, 102, 65, 66, -1, -1,
+ -1, -1, 65, 66, 101, 102, 69, 70, 71, 72,
+ -1, 74, -1, -1, 77, 78, 79, -1, -1, -1,
+ -1, -1, 85, 86, -1, -1, -1, -1, -1, 92,
+ 93, 94, 95, 96, -1, -1, 65, 66, 101, 102,
69, 70, 71, 72, -1, 74, -1, -1, 77, 78,
79, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 92, 93, 94, 95, 96, -1, -1,
- 65, 66, 101, 102, 69, 70, -1, -1, -1, 74,
- -1, -1, 77, 78, 79, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 92, 93, 94,
- 95, 96, -1, -1, -1, -1, 101, 102
+ -1, 100, 101, 102, 65, 66, -1, -1, 69, 70,
+ 71, 72, -1, 74, -1, -1, 77, 78, 79, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 92, 93, 94, 95, 96, -1, -1, -1, -1,
+ 101, 102
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1321,24 +1311,24 @@ static const yytype_uint8 yystos[] =
134, 153, 153, 105, 134, 134, 45, 142, 146, 42,
75, 76, 28, 54, 91, 134, 54, 91, 52, 147,
56, 142, 105, 47, 54, 47, 54, 47, 54, 47,
- 54, 85, 86, 105, 28, 100, 104, 105, 112, 129,
- 131, 134, 134, 52, 53, 109, 130, 54, 108, 134,
+ 54, 85, 86, 105, 28, 100, 104, 105, 112, 131,
+ 134, 134, 52, 53, 109, 130, 54, 108, 134, 134,
134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
- 134, 134, 134, 134, 134, 134, 28, 149, 100, 134,
- 100, 100, 28, 134, 129, 28, 135, 134, 134, 134,
- 134, 54, 91, 134, 134, 129, 134, 28, 134, 134,
- 134, 134, 134, 134, 134, 134, 134, 134, 28, 100,
- 105, 134, 108, 115, 130, 124, 130, 129, 131, 134,
- 131, 105, 108, 149, 134, 134, 149, 47, 47, 47,
- 47, 153, 32, 34, 54, 114, 130, 130, 28, 105,
- 151, 108, 108, 134, 134, 134, 134, 100, 54, 134,
- 130, 32, 58, 110, 129, 32, 28, 131, 151, 151,
- 134, 130, 36, 110, 111, 119, 120, 128, 129, 131,
- 118, 119, 121, 128, 32, 131, 131, 130, 131, 129,
- 120, 130, 122, 114, 130, 121, 130, 122, 28, 150,
- 131, 130, 114, 110, 117, 52, 130, 32, 32, 52,
- 53, 105, 130, 32, 130, 129, 130, 129, 129, 129,
- 28, 32, 114, 115, 131, 131, 130, 130, 130
+ 134, 134, 134, 134, 134, 28, 149, 100, 134, 100,
+ 100, 28, 134, 129, 28, 135, 134, 134, 134, 134,
+ 54, 91, 134, 134, 129, 134, 28, 134, 134, 134,
+ 134, 134, 134, 134, 134, 134, 134, 28, 100, 105,
+ 134, 108, 115, 130, 124, 130, 129, 131, 134, 131,
+ 105, 108, 149, 134, 134, 149, 47, 47, 47, 47,
+ 153, 32, 34, 54, 114, 130, 130, 28, 105, 151,
+ 108, 108, 134, 134, 134, 134, 100, 54, 134, 130,
+ 32, 58, 110, 129, 32, 28, 131, 151, 151, 134,
+ 130, 36, 110, 111, 119, 120, 128, 129, 131, 118,
+ 119, 121, 128, 32, 131, 131, 130, 131, 129, 120,
+ 130, 122, 114, 130, 121, 130, 122, 28, 150, 131,
+ 130, 114, 110, 117, 52, 130, 32, 32, 52, 53,
+ 105, 130, 32, 130, 129, 130, 129, 129, 129, 28,
+ 32, 114, 115, 131, 131, 130, 130, 130
};
#define yyerrok (yyerrstatus = 0)
@@ -3133,7 +3123,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 3137 "engines/director/lingo/lingo-gr.cpp"
+#line 3127 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 0e3f728..8de5e77 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -420,7 +420,7 @@ begin: /* nothing */ { $$ = g_lingo->_currentScript->size(); }
end: /* nothing */ { g_lingo->code1(STOP); $$ = g_lingo->_currentScript->size(); }
;
-stmtlist: begin { $$ = g_lingo->_currentScript->size(); }
+stmtlist: /* nothing */ { $$ = g_lingo->_currentScript->size(); }
| stmtlist nl
| stmtlist stmt
;
More information about the Scummvm-git-logs
mailing list