[Scummvm-git-logs] scummvm master -> cbc22ce2db8316cc91fe3fc8624760cb1ae3bead
sev-
sev at scummvm.org
Wed Nov 27 16:55:42 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:
b4f088c1dd DIRECTOR: LINGO: Fix grammar reduce/reduce conflicts
364d442bf0 DIRECTOR: LINGO: Fix warning
cbc22ce2db DIRECTOR: LINGO: JANITORIAL: Split long code line
Commit: b4f088c1dd20f55cd3c415482ff0a66fca1f9a63
https://github.com/scummvm/scummvm/commit/b4f088c1dd20f55cd3c415482ff0a66fca1f9a63
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-27T17:50:36+01:00
Commit Message:
DIRECTOR: LINGO: Fix grammar reduce/reduce conflicts
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 d20c5a2..e7961dc 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 1813
+#define YYLAST 1834
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 106
@@ -549,7 +549,7 @@ union yyalloc
/* YYNRULES -- Number of rules. */
#define YYNRULES 168
/* YYNRULES -- Number of states. */
-#define YYNSTATES 364
+#define YYNSTATES 365
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -608,18 +608,18 @@ static const yytype_uint16 yyprhs[] =
63, 68, 73, 79, 81, 83, 85, 87, 95, 106,
118, 122, 129, 134, 141, 151, 161, 171, 178, 189,
200, 201, 205, 208, 210, 213, 215, 222, 224, 231,
- 233, 237, 241, 244, 248, 250, 252, 253, 254, 255,
- 258, 261, 265, 267, 269, 271, 273, 275, 277, 279,
- 282, 285, 290, 295, 297, 299, 302, 304, 308, 312,
- 316, 320, 324, 328, 332, 336, 340, 344, 348, 352,
- 355, 359, 363, 367, 371, 374, 377, 381, 385, 390,
- 395, 400, 407, 412, 419, 424, 431, 436, 443, 446,
- 449, 451, 453, 456, 458, 461, 464, 467, 469, 472,
- 475, 477, 480, 485, 490, 497, 502, 505, 509, 511,
- 515, 517, 521, 523, 527, 530, 533, 536, 539, 543,
- 546, 549, 551, 555, 558, 561, 564, 568, 571, 572,
- 576, 577, 586, 589, 590, 599, 607, 614, 617, 618,
- 620, 624, 629, 630, 633, 634, 636, 640, 642
+ 233, 237, 241, 244, 248, 250, 252, 253, 254, 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,
+ 356, 360, 364, 368, 372, 375, 378, 382, 386, 391,
+ 396, 401, 408, 413, 420, 425, 432, 437, 444, 447,
+ 450, 452, 454, 457, 459, 462, 465, 468, 470, 473,
+ 476, 478, 481, 486, 491, 498, 503, 506, 510, 512,
+ 516, 518, 522, 524, 528, 531, 534, 537, 540, 544,
+ 547, 550, 552, 556, 559, 562, 565, 569, 572, 573,
+ 577, 578, 587, 590, 591, 600, 608, 615, 618, 619,
+ 621, 625, 630, 631, 634, 635, 637, 641, 643
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -650,46 +650,46 @@ static const yytype_int16 yyrhs[] =
128, -1, 119, -1, 126, 122, 52, 127, 129, 128,
-1, 132, -1, 132, 91, 132, -1, 99, 122, 100,
-1, 50, 57, -1, 50, 56, 28, -1, 41, -1,
- 111, -1, -1, -1, -1, 129, 108, -1, 129, 115,
- -1, 55, 28, 52, -1, 87, -1, 12, -1, 15,
- -1, 31, -1, 29, -1, 133, -1, 23, -1, 24,
- 132, -1, 25, 151, -1, 25, 99, 151, 100, -1,
- 28, 99, 150, 100, -1, 28, -1, 13, -1, 14,
- 132, -1, 113, -1, 132, 93, 132, -1, 132, 94,
- 132, -1, 132, 95, 132, -1, 132, 96, 132, -1,
- 132, 74, 132, -1, 132, 101, 132, -1, 132, 102,
- 132, -1, 132, 70, 132, -1, 132, 65, 132, -1,
- 132, 66, 132, -1, 132, 71, 132, -1, 132, 72,
- 132, -1, 73, 132, -1, 132, 92, 132, -1, 132,
- 77, 132, -1, 132, 78, 132, -1, 132, 79, 132,
- -1, 93, 132, -1, 94, 132, -1, 99, 132, 100,
- -1, 103, 150, 104, -1, 84, 132, 85, 132, -1,
- 84, 132, 86, 132, -1, 80, 132, 47, 132, -1,
- 80, 132, 54, 132, 47, 132, -1, 81, 132, 47,
- 132, -1, 81, 132, 54, 132, 47, 132, -1, 82,
- 132, 47, 132, -1, 82, 132, 54, 132, 47, 132,
- -1, 83, 132, 47, 132, -1, 83, 132, 54, 132,
- 47, 132, -1, 27, 132, -1, 49, 132, -1, 138,
- -1, 141, -1, 37, 50, -1, 37, -1, 39, 135,
- -1, 88, 136, -1, 64, 137, -1, 17, -1, 19,
- 132, -1, 18, 132, -1, 18, -1, 20, 151, -1,
- 20, 99, 151, 100, -1, 90, 99, 28, 100, -1,
- 90, 99, 28, 105, 150, 100, -1, 61, 132, 56,
- 132, -1, 61, 132, -1, 21, 28, 150, -1, 28,
- -1, 135, 105, 28, -1, 28, -1, 136, 105, 28,
- -1, 28, -1, 137, 105, 28, -1, 40, 43, -1,
- 40, 46, -1, 40, 48, -1, 40, 139, -1, 40,
- 139, 140, -1, 40, 140, -1, 38, 132, -1, 132,
- -1, 47, 45, 132, -1, 45, 132, -1, 62, 63,
- -1, 62, 139, -1, 62, 139, 140, -1, 62, 140,
- -1, -1, 33, 142, 150, -1, -1, 44, 28, 144,
- 127, 147, 108, 148, 129, -1, 59, 28, -1, -1,
- 60, 28, 145, 127, 147, 108, 148, 129, -1, 146,
- 127, 147, 108, 148, 129, 32, -1, 146, 127, 147,
- 108, 148, 129, -1, 89, 28, -1, -1, 28, -1,
- 147, 105, 28, -1, 147, 108, 105, 28, -1, -1,
- 28, 151, -1, -1, 132, -1, 150, 105, 132, -1,
- 132, -1, 151, 105, 132, -1
+ 111, -1, -1, -1, 127, -1, 129, 108, -1, 129,
+ 115, -1, 55, 28, 52, -1, 87, -1, 12, -1,
+ 15, -1, 31, -1, 29, -1, 133, -1, 23, -1,
+ 24, 132, -1, 25, 151, -1, 25, 99, 151, 100,
+ -1, 28, 99, 150, 100, -1, 28, -1, 13, -1,
+ 14, 132, -1, 113, -1, 132, 93, 132, -1, 132,
+ 94, 132, -1, 132, 95, 132, -1, 132, 96, 132,
+ -1, 132, 74, 132, -1, 132, 101, 132, -1, 132,
+ 102, 132, -1, 132, 70, 132, -1, 132, 65, 132,
+ -1, 132, 66, 132, -1, 132, 71, 132, -1, 132,
+ 72, 132, -1, 73, 132, -1, 132, 92, 132, -1,
+ 132, 77, 132, -1, 132, 78, 132, -1, 132, 79,
+ 132, -1, 93, 132, -1, 94, 132, -1, 99, 132,
+ 100, -1, 103, 150, 104, -1, 84, 132, 85, 132,
+ -1, 84, 132, 86, 132, -1, 80, 132, 47, 132,
+ -1, 80, 132, 54, 132, 47, 132, -1, 81, 132,
+ 47, 132, -1, 81, 132, 54, 132, 47, 132, -1,
+ 82, 132, 47, 132, -1, 82, 132, 54, 132, 47,
+ 132, -1, 83, 132, 47, 132, -1, 83, 132, 54,
+ 132, 47, 132, -1, 27, 132, -1, 49, 132, -1,
+ 138, -1, 141, -1, 37, 50, -1, 37, -1, 39,
+ 135, -1, 88, 136, -1, 64, 137, -1, 17, -1,
+ 19, 132, -1, 18, 132, -1, 18, -1, 20, 151,
+ -1, 20, 99, 151, 100, -1, 90, 99, 28, 100,
+ -1, 90, 99, 28, 105, 150, 100, -1, 61, 132,
+ 56, 132, -1, 61, 132, -1, 21, 28, 150, -1,
+ 28, -1, 135, 105, 28, -1, 28, -1, 136, 105,
+ 28, -1, 28, -1, 137, 105, 28, -1, 40, 43,
+ -1, 40, 46, -1, 40, 48, -1, 40, 139, -1,
+ 40, 139, 140, -1, 40, 140, -1, 38, 132, -1,
+ 132, -1, 47, 45, 132, -1, 45, 132, -1, 62,
+ 63, -1, 62, 139, -1, 62, 139, 140, -1, 62,
+ 140, -1, -1, 33, 142, 150, -1, -1, 44, 28,
+ 144, 127, 147, 108, 148, 129, -1, 59, 28, -1,
+ -1, 60, 28, 145, 127, 147, 108, 148, 129, -1,
+ 146, 127, 147, 108, 148, 129, 32, -1, 146, 127,
+ 147, 108, 148, 129, -1, 89, 28, -1, -1, 28,
+ -1, 147, 105, 28, -1, 147, 108, 105, 28, -1,
+ -1, 28, 151, -1, -1, 132, -1, 150, 105, 132,
+ -1, 132, -1, 151, 105, 132, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -796,7 +796,7 @@ static const yytype_uint8 yyr2[] =
4, 4, 5, 1, 1, 1, 1, 7, 10, 11,
3, 6, 4, 6, 9, 9, 9, 6, 10, 10,
0, 3, 2, 1, 2, 1, 6, 1, 6, 1,
- 3, 3, 2, 3, 1, 1, 0, 0, 0, 2,
+ 3, 3, 2, 3, 1, 1, 0, 0, 1, 2,
2, 3, 1, 1, 1, 1, 1, 1, 1, 2,
2, 4, 4, 1, 1, 2, 1, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 2,
@@ -835,135 +835,136 @@ static const yytype_uint8 yydefact[] =
0, 0, 53, 0, 0, 0, 0, 0, 61, 56,
0, 146, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 96, 97, 0, 2, 0,
- 57, 0, 0, 56, 6, 58, 0, 30, 0, 58,
+ 57, 0, 0, 56, 6, 56, 0, 30, 0, 56,
85, 86, 84, 87, 88, 81, 91, 92, 93, 90,
77, 78, 79, 80, 82, 83, 159, 0, 122, 168,
71, 72, 129, 142, 158, 13, 14, 15, 16, 21,
18, 0, 0, 20, 17, 158, 125, 133, 100, 0,
102, 0, 104, 0, 106, 0, 98, 99, 131, 123,
- 164, 166, 58, 0, 51, 0, 57, 50, 32, 57,
- 0, 162, 0, 22, 19, 0, 0, 0, 0, 0,
- 0, 57, 0, 0, 57, 59, 60, 56, 0, 160,
- 0, 58, 162, 162, 101, 103, 105, 107, 124, 0,
- 0, 57, 37, 33, 7, 56, 0, 31, 161, 156,
- 58, 58, 27, 57, 58, 8, 56, 55, 57, 45,
- 0, 0, 57, 57, 47, 43, 0, 155, 151, 154,
- 58, 57, 0, 44, 40, 0, 57, 0, 42, 0,
- 0, 57, 0, 57, 56, 57, 56, 36, 34, 35,
- 56, 0, 28, 38, 0, 39, 0, 58, 29, 41,
- 57, 57, 46, 48
+ 164, 166, 56, 0, 51, 0, 58, 57, 50, 32,
+ 57, 0, 162, 0, 22, 19, 0, 0, 0, 0,
+ 0, 0, 57, 0, 0, 57, 59, 60, 56, 0,
+ 160, 0, 56, 162, 162, 101, 103, 105, 107, 124,
+ 0, 0, 57, 37, 33, 7, 56, 0, 31, 161,
+ 156, 56, 56, 27, 57, 56, 8, 56, 55, 57,
+ 45, 0, 58, 57, 57, 47, 43, 0, 155, 151,
+ 154, 56, 57, 0, 44, 40, 0, 57, 0, 42,
+ 0, 0, 57, 0, 57, 56, 57, 56, 36, 34,
+ 35, 56, 0, 28, 38, 0, 39, 0, 56, 29,
+ 41, 57, 57, 46, 48
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 47, 285, 205, 305, 317, 48, 49, 50, 286,
- 52, 345, 323, 324, 319, 325, 132, 53, 54, 55,
- 320, 152, 207, 266, 56, 57, 58, 59, 60, 86,
+ -1, 47, 286, 205, 306, 318, 48, 49, 50, 287,
+ 52, 346, 324, 325, 320, 326, 132, 53, 54, 55,
+ 321, 266, 207, 267, 56, 57, 58, 59, 60, 86,
119, 111, 61, 94, 95, 62, 83, 63, 168, 179,
- 64, 227, 291, 65, 161, 75
+ 64, 227, 292, 65, 161, 75
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -285
+#define YYPACT_NINF -277
static const yytype_int16 yypact[] =
{
- 369, -87, -285, -285, 1026, -285, -285, 1026, 1026, 1066,
- 27, -285, 1026, 1139, 1026, 1179, -285, -285, -285, -21,
- 39, 912, -285, 43, 1026, 77, 67, 59, 61, 69,
- 1026, 953, 73, 1026, 1026, 1026, 1026, 1026, 1026, -285,
- 76, 85, -40, 1026, 1026, 1026, 1026, 2, -285, -285,
- -285, -285, -285, 20, 34, 1252, 829, 1026, 1711, -285,
- -285, -285, -285, -285, -285, -285, -285, -285, 28, 1026,
- 1711, 1711, 1711, 1026, 1711, 17, 1026, 1711, 1026, 17,
- 1711, 1026, 17, 1026, -285, -285, 24, 1026, -285, 1026,
- -285, 112, -285, 1711, 38, -285, -285, 1282, 133, -285,
- -42, 1026, -37, 110, -285, -285, 1546, -285, 38, -285,
- -285, 58, -29, 252, 1315, 1348, 1381, 1579, -285, 60,
- -285, 136, -29, -29, 1645, 1711, 31, -285, 461, 1252,
- 1026, 1252, 23, 1678, -285, 805, 1026, 1026, 1026, 1026,
- 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026, 1026,
- 1026, 1026, 138, 1026, 1282, 1645, 3, 1026, 63, 5,
- 1645, 6, 63, 141, 1711, 1711, 1026, -285, -285, 128,
- 1026, 1026, -285, 1026, 1026, 1513, 1026, 1026, -285, -285,
- 1026, -285, 142, 1026, 1026, 1026, 1026, 1026, 1026, 1026,
- 1026, 1026, 1026, 151, 7, -285, -285, 1026, -285, 80,
- 1711, 82, 1612, -285, -285, -285, 1026, -285, 1026, -285,
- 22, 22, 22, -29, -29, -29, 1711, 22, 22, 155,
- 238, 238, -29, -29, 1711, 1711, -285, -45, -285, 1711,
- -285, -285, -285, 1711, 138, -285, -285, 1711, 1711, 1711,
- 1711, 1026, 1026, 1711, 1711, 138, 1711, -285, 1711, 1221,
- 1711, 1414, 1711, 1447, 1711, 1480, 1711, 1711, -285, -285,
- 1026, 1711, -285, -27, -285, 829, 645, 1711, 1711, 645,
- 167, 78, -45, 1711, 1711, -45, 1026, 1026, 1026, 1026,
- 21, 645, 143, 1026, -285, -285, -285, -28, 164, -285,
- 171, -285, 78, 78, 1711, 1711, 1711, 1711, -285, 168,
- 1026, 1711, -16, -285, -285, 11, 165, -285, -285, 553,
- -285, -285, -285, 1711, -285, -285, -285, -285, 165, -285,
- 1252, 829, 645, 165, 165, -285, 1252, -285, 645, 645,
- -285, 645, 829, -285, 145, 152, -285, 174, -285, 176,
- 158, 645, 179, -285, -285, -285, -285, -285, -285, -285,
- -285, 181, -285, -285, 829, -285, 737, 737, -285, -285,
- -285, 645, -285, -285
+ 379, -97, -277, -277, 1036, -277, -277, 1036, 1036, 1076,
+ 14, -277, 1036, 1149, 1036, 1189, -277, -277, -277, 13,
+ 43, 922, -277, 69, 1036, 12, 48, 72, 75, 90,
+ 1036, 963, 93, 1036, 1036, 1036, 1036, 1036, 1036, -277,
+ 94, 95, 30, 1036, 1036, 1036, 1036, 7, -277, -277,
+ -277, -277, -277, 35, 36, 1262, 839, 1036, 1732, -277,
+ -277, -277, -277, -277, -277, -277, -277, -277, 37, 1036,
+ 1732, 1732, 1732, 1036, 1732, 50, 1036, 1732, 1036, 50,
+ 1732, 1036, 50, 1036, -277, -277, 51, 1036, -277, 1036,
+ -277, 112, -277, 1732, 46, -277, -277, 155, 133, -277,
+ -37, 1036, -36, 110, -277, -277, 1567, -277, 46, -277,
+ -277, 58, -49, 1303, 1336, 1369, 1402, 1600, -277, 59,
+ -277, 137, -49, -49, 1666, 1732, 2, -277, 471, 1262,
+ 1036, 1262, 57, 1699, -277, 815, 1036, 1036, 1036, 1036,
+ 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
+ 1036, 1036, 138, 1036, 155, 1666, -33, 1036, 63, -22,
+ 1666, -20, 63, 141, 1732, 1732, 1036, -277, -277, 84,
+ 1036, 1036, -277, 1036, 1036, 1534, 1036, 1036, -277, -277,
+ 1036, -277, 142, 1036, 1036, 1036, 1036, 1036, 1036, 1036,
+ 1036, 1036, 1036, 145, -13, -277, -277, 1036, -277, 76,
+ 1732, 79, 1633, -277, -277, -277, 1036, -277, 1036, -277,
+ 243, 243, 243, -49, -49, -49, 1732, 243, 243, 282,
+ 24, 24, -49, -49, 1732, 1732, -277, -32, -277, 1732,
+ -277, -277, -277, 1732, 138, -277, -277, 1732, 1732, 1732,
+ 1732, 1036, 1036, 1732, 1732, 138, 1732, -277, 1732, 1231,
+ 1732, 1435, 1732, 1468, 1732, 1501, 1732, 1732, -277, -277,
+ 1036, 1732, -277, -5, -277, 839, -277, 655, 1732, 1732,
+ 655, 152, 77, -32, 1732, 1732, -32, 1036, 1036, 1036,
+ 1036, -1, 655, 129, 1036, -277, -277, -277, -8, 163,
+ -277, 168, -277, 77, 77, 1732, 1732, 1732, 1732, -277,
+ 167, 1036, 1732, -10, -277, -277, -277, 165, -277, -277,
+ 563, -277, -277, -277, 1732, -277, -277, -277, -277, 165,
+ -277, 1262, 839, 655, 165, 165, -277, 1262, -277, 655,
+ 655, -277, 655, 839, -277, 144, 151, -277, 172, -277,
+ 173, 154, 655, 176, -277, -277, -277, -277, -277, -277,
+ -277, -277, 178, -277, -277, 839, -277, 747, 747, -277,
+ -277, -277, 655, -277, -277
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -285, -285, 18, -285, -284, -285, 86, -285, -50, 0,
- -285, -285, -285, -82, -255, -100, -108, -285, -285, -285,
- -282, -111, 19, -89, -285, -285, 1, 55, -285, -285,
- -285, -285, -285, 197, -30, -285, -285, -285, -285, -285,
- -285, -183, -133, -285, -43, 13
+ -277, -277, 18, -277, -276, -277, 83, -277, -50, 0,
+ -277, -277, -277, -91, -268, -111, -127, -277, -277, -277,
+ -264, -44, 28, -198, -277, -277, 1, 45, -277, -277,
+ -277, -277, -277, 185, -19, -277, -277, -277, -277, -277,
+ -277, -204, -178, -277, -43, 8
};
/* 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 -59
+#define YYTABLE_NINF -10
static const yytype_int16 yytable[] =
{
- 51, 109, 127, 126, 303, 70, 134, 282, 71, 72,
- 74, 66, 173, 77, 74, 80, 74, 176, 316, 67,
- 315, 199, 93, 201, 326, 97, 79, 283, 82, 84,
- 304, 106, 93, 158, 112, 113, 114, 115, 116, 117,
- 162, 326, 304, -58, 122, 123, 124, 125, 142, 174,
- 344, 272, -58, 66, 177, 76, 133, 234, 135, 121,
- 270, -58, 275, 333, 167, 128, -58, 85, 245, 333,
- 154, 96, 150, 151, 155, 203, 204, 125, 181, 155,
- 100, 101, 160, 89, 125, 91, 156, 103, 164, 104,
- 165, 159, 265, 139, 140, 102, 141, 105, -58, 142,
- 66, 110, 175, 228, 118, 230, 231, 259, 157, -58,
- 157, 197, 260, 120, 145, 146, 147, 148, 149, 129,
- 269, 298, 157, 150, 151, 130, 197, 153, 51, 163,
- 133, 200, 202, 98, 99, 196, 197, 210, 211, 212,
+ 51, 66, 199, 126, 201, 70, 134, 127, 71, 72,
+ 74, 270, 109, 77, 74, 80, 74, 173, 176, 67,
+ 152, 79, 93, 82, 304, 97, 316, 317, 142, 283,
+ 273, 106, 93, 158, 112, 113, 114, 115, 116, 117,
+ 162, 276, 76, 327, 122, 123, 124, 125, 305, 284,
+ 305, 334, 150, 151, 174, 177, 133, 334, 135, 345,
+ 327, 100, 101, 84, 282, 128, 66, 228, 98, 99,
+ 154, 85, 157, 271, 155, 167, 102, 125, 230, 155,
+ 231, 156, 160, 157, 125, 197, 159, 259, 164, 181,
+ 165, 89, 260, 91, 310, 139, 140, 96, 141, 299,
+ 103, 142, 175, 104, 197, 66, 196, 197, 323, 203,
+ 204, 14, 235, 329, 330, 311, 312, 332, 105, 148,
+ 149, 110, 118, 120, 234, 150, 151, 130, 51, 121,
+ 133, 200, 202, 342, 129, 245, 153, 210, 211, 212,
213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
- 223, 224, 225, 209, 125, 14, 235, 166, 229, 310,
- 311, 172, 178, 182, 194, 193, 226, 233, 197, 232,
- 247, 237, 238, 281, 239, 240, 306, 243, 244, 258,
- 262, 246, 264, 290, 248, 249, 250, 251, 252, 253,
- 254, 255, 256, 257, 321, 289, 307, 300, 261, 308,
- 312, 315, 309, 304, 346, 332, 348, 267, 349, 268,
- 350, 352, 335, 358, 198, 284, 322, 280, 340, 263,
- 318, 328, 329, 338, 236, 331, 139, 140, 108, 141,
- 0, 0, 142, 354, 0, 356, 0, 0, 0, 357,
- 0, 341, 273, 274, 0, 271, 0, 0, 146, 147,
+ 223, 224, 225, 209, 125, 157, 163, 166, 229, 265,
+ 362, 172, 178, 182, 193, 194, 226, 233, 197, 232,
+ 247, 237, 238, 258, 239, 240, 262, 243, 244, 264,
+ 290, 246, 291, 301, 248, 249, 250, 251, 252, 253,
+ 254, 255, 256, 257, 336, 308, 309, 169, 261, 313,
+ 341, 316, 305, 347, 349, 350, 351, 268, 353, 269,
+ 359, 198, 319, 339, 236, 285, 108, 281, 0, 0,
+ 136, 137, 0, 0, 0, 138, 139, 140, 263, 141,
+ 170, 171, 142, 143, 144, 0, 0, 0, 0, 0,
+ 0, 0, 274, 275, 307, 272, 0, 145, 146, 147,
148, 149, 0, 0, 0, 0, 150, 151, 0, 0,
- 0, 125, 0, 0, 0, 0, 0, 0, 361, 0,
- 0, 336, 0, 0, 0, 0, 0, 294, 295, 296,
- 297, 0, 343, 0, 301, 287, 0, 0, 288, 0,
- 292, 0, 0, 293, 0, 0, 0, 0, 0, 183,
- 299, 313, 0, 302, 359, 0, 184, 0, 0, 139,
- 140, 0, 141, 0, 0, 142, 0, 136, 137, 0,
- 314, 133, 138, 139, 140, 0, 141, 133, 0, 142,
- 143, 144, 330, 148, 149, 0, 0, 334, 0, 150,
- 151, 337, 339, 0, 145, 146, 147, 148, 149, 0,
- 342, 0, 0, 150, 151, 347, 360, 360, 0, 0,
- 351, 0, 353, 0, 355, 0, 0, 0, 0, -9,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 362,
- 363, 2, 3, 4, 5, 0, 6, 7, 8, 9,
+ 0, 125, 322, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 337, 333, 0, 0, 0, 0, 295, 296,
+ 297, 298, 0, 344, 0, 302, 0, 0, 0, 0,
+ 0, 293, 0, 0, 294, 288, 0, 0, 289, 0,
+ 0, 355, 314, 357, 0, 360, 0, 358, 0, 0,
+ 300, 0, 0, 303, 139, 140, 0, 141, 0, 0,
+ 142, 0, 133, 0, 0, 0, 0, 0, 133, 0,
+ 315, 0, 0, 0, 0, 145, 146, 147, 148, 149,
+ 0, 0, 331, 0, 150, 151, 0, 335, 0, 0,
+ 0, 338, 340, 139, 140, 0, 141, 361, 361, 142,
+ 343, 0, 0, 0, 0, 348, 0, 0, 0, 0,
+ 352, 0, 354, 0, 356, 146, 147, 148, 149, -9,
+ 1, 0, 0, 150, 151, 0, 0, 0, 0, 363,
+ 364, 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,
@@ -983,7 +984,7 @@ static const yytype_int16 yytable[] =
41, 42, 0, 0, 43, 44, 0, 0, 0, 0,
45, 0, 0, 0, 46, 2, 3, 4, 5, 0,
6, 7, 8, 9, 10, 0, 11, 12, 13, 0,
- 14, 68, 16, 0, 17, 327, 18, 0, 0, 0,
+ 14, 68, 16, 0, 17, 328, 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,
@@ -1051,105 +1052,107 @@ static const yytype_int16 yytable[] =
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, 0, 0, 0, 34,
- 35, 36, 37, 38, 2, 3, 4, 5, 276, 0,
+ 35, 36, 37, 38, 2, 3, 4, 5, 277, 0,
0, 0, 43, 44, 0, 11, 12, 13, 81, 14,
68, 16, 46, 17, 0, 0, 136, 137, 0, 0,
0, 138, 139, 140, 0, 141, 0, 0, 142, 143,
144, 69, 0, 26, 0, 0, 0, 0, 0, 0,
0, 0, 0, 145, 146, 147, 148, 149, 0, 0,
- 0, 0, 150, 151, 169, 33, 0, 0, 0, 0,
+ 0, 0, 150, 151, 0, 33, 0, 0, 0, 0,
0, 0, 34, 35, 36, 37, 38, 0, 0, 0,
- 0, 0, 0, 0, 0, 43, 44, 136, 137, 0,
- 0, 131, 138, 139, 140, 46, 141, 170, 171, 142,
- 143, 144, 185, 0, 0, 0, 0, 0, 0, 186,
+ 183, 0, 0, 0, 0, 43, 44, 184, 0, 0,
+ 0, 131, 0, 0, 0, 46, 0, 0, 136, 137,
+ 0, 0, 0, 138, 139, 140, 0, 141, 0, 0,
+ 142, 143, 144, 185, 0, 0, 0, 0, 0, 0,
+ 186, 0, 0, 0, 0, 145, 146, 147, 148, 149,
+ 0, 136, 137, 0, 150, 151, 138, 139, 140, 0,
+ 141, 0, 0, 142, 143, 144, 187, 0, 0, 0,
+ 0, 0, 0, 188, 0, 0, 0, 0, 145, 146,
+ 147, 148, 149, 0, 136, 137, 0, 150, 151, 138,
+ 139, 140, 0, 141, 0, 0, 142, 143, 144, 189,
+ 0, 0, 0, 0, 0, 0, 190, 0, 0, 0,
+ 0, 145, 146, 147, 148, 149, 0, 136, 137, 0,
+ 150, 151, 138, 139, 140, 0, 141, 0, 0, 142,
+ 143, 144, 278, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 145, 146, 147, 148, 149, 0,
136, 137, 0, 150, 151, 138, 139, 140, 0, 141,
- 0, 0, 142, 143, 144, 187, 0, 0, 0, 0,
- 0, 0, 188, 0, 0, 0, 0, 145, 146, 147,
+ 0, 0, 142, 143, 144, 279, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 145, 146, 147,
148, 149, 0, 136, 137, 0, 150, 151, 138, 139,
- 140, 0, 141, 0, 0, 142, 143, 144, 189, 0,
- 0, 0, 0, 0, 0, 190, 0, 0, 0, 0,
+ 140, 0, 141, 0, 0, 142, 143, 144, 280, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
145, 146, 147, 148, 149, 0, 136, 137, 0, 150,
151, 138, 139, 140, 0, 141, 0, 0, 142, 143,
- 144, 277, 0, 0, 0, 0, 0, 0, 0, 0,
+ 144, 0, 0, 0, 0, 0, 0, 0, 241, 0,
0, 0, 0, 145, 146, 147, 148, 149, 0, 136,
137, 0, 150, 151, 138, 139, 140, 0, 141, 0,
- 0, 142, 143, 144, 278, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 145, 146, 147, 148,
+ 0, 142, 143, 144, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 180, 0, 242, 145, 146, 147, 148,
149, 0, 136, 137, 0, 150, 151, 138, 139, 140,
- 0, 141, 0, 0, 142, 143, 144, 279, 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, 136, 137, 0, 150, 151,
138, 139, 140, 0, 141, 0, 0, 142, 143, 144,
- 0, 0, 0, 0, 0, 0, 0, 241, 0, 0,
+ 0, 0, 0, 0, 0, 191, 192, 0, 0, 0,
0, 0, 145, 146, 147, 148, 149, 0, 136, 137,
0, 150, 151, 138, 139, 140, 0, 141, 0, 0,
142, 143, 144, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 180, 0, 242, 145, 146, 147, 148, 149,
- 0, 136, 137, 0, 150, 151, 138, 139, 140, 0,
+ 0, 0, 0, 0, 206, 145, 146, 147, 148, 149,
+ 0, 136, 137, 195, 150, 151, 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, 136, 137, 0, 150, 151, 138,
+ 147, 148, 149, 0, 136, 137, 195, 150, 151, 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, 136, 137, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 206, 145, 146, 147, 148, 149, 0, 136, 137, 0,
150, 151, 138, 139, 140, 0, 141, 0, 0, 142,
143, 144, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 206, 145, 146, 147, 148, 149, 0,
- 136, 137, 195, 150, 151, 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, 136, 137, 195, 150, 151, 138, 139,
- 140, 0, 141, 0, 0, 142, 143, 144, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 206,
- 145, 146, 147, 148, 149, 0, 136, 137, 0, 150,
- 151, 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
+ 0, 0, 0, 0, 145, 146, 147, 148, 149, 0,
+ 0, 0, 0, 150, 151
};
static const yytype_int16 yycheck[] =
{
- 0, 31, 0, 46, 32, 4, 56, 34, 7, 8,
- 9, 98, 54, 12, 13, 14, 15, 54, 302, 1,
- 36, 129, 21, 131, 306, 24, 13, 54, 15, 50,
- 58, 30, 31, 76, 33, 34, 35, 36, 37, 38,
- 83, 323, 58, 32, 43, 44, 45, 46, 77, 91,
- 334, 234, 41, 98, 91, 28, 55, 168, 57, 99,
- 105, 50, 245, 318, 94, 47, 55, 28, 179, 324,
- 69, 28, 101, 102, 73, 52, 53, 76, 108, 78,
- 13, 14, 81, 45, 83, 47, 73, 28, 87, 28,
- 89, 78, 203, 71, 72, 28, 74, 28, 87, 77,
- 98, 28, 101, 100, 28, 100, 100, 100, 105, 98,
- 105, 105, 105, 28, 92, 93, 94, 95, 96, 99,
- 209, 100, 105, 101, 102, 91, 105, 99, 128, 105,
- 129, 130, 131, 56, 57, 104, 105, 136, 137, 138,
+ 0, 98, 129, 46, 131, 4, 56, 0, 7, 8,
+ 9, 209, 31, 12, 13, 14, 15, 54, 54, 1,
+ 64, 13, 21, 15, 32, 24, 36, 303, 77, 34,
+ 234, 30, 31, 76, 33, 34, 35, 36, 37, 38,
+ 83, 245, 28, 307, 43, 44, 45, 46, 58, 54,
+ 58, 319, 101, 102, 91, 91, 55, 325, 57, 335,
+ 324, 13, 14, 50, 262, 47, 98, 100, 56, 57,
+ 69, 28, 105, 105, 73, 94, 28, 76, 100, 78,
+ 100, 73, 81, 105, 83, 105, 78, 100, 87, 108,
+ 89, 45, 105, 47, 292, 71, 72, 28, 74, 100,
+ 28, 77, 101, 28, 105, 98, 104, 105, 306, 52,
+ 53, 27, 28, 311, 312, 293, 294, 315, 28, 95,
+ 96, 28, 28, 28, 168, 101, 102, 91, 128, 99,
+ 129, 130, 131, 331, 99, 179, 99, 136, 137, 138,
139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
- 149, 150, 151, 135, 153, 27, 28, 45, 157, 292,
- 293, 28, 52, 105, 28, 105, 28, 166, 105, 28,
- 28, 170, 171, 262, 173, 174, 287, 176, 177, 28,
- 100, 180, 100, 105, 183, 184, 185, 186, 187, 188,
- 189, 190, 191, 192, 305, 28, 32, 54, 197, 28,
- 32, 36, 291, 58, 52, 316, 32, 206, 32, 208,
- 52, 32, 320, 32, 128, 265, 305, 260, 326, 200,
- 302, 310, 311, 323, 169, 314, 71, 72, 31, 74,
- -1, -1, 77, 344, -1, 346, -1, -1, -1, 350,
- -1, 330, 241, 242, -1, 227, -1, -1, 93, 94,
+ 149, 150, 151, 135, 153, 105, 105, 45, 157, 203,
+ 358, 28, 52, 105, 105, 28, 28, 166, 105, 28,
+ 28, 170, 171, 28, 173, 174, 100, 176, 177, 100,
+ 28, 180, 105, 54, 183, 184, 185, 186, 187, 188,
+ 189, 190, 191, 192, 321, 32, 28, 42, 197, 32,
+ 327, 36, 58, 52, 32, 32, 52, 206, 32, 208,
+ 32, 128, 303, 324, 169, 265, 31, 260, -1, -1,
+ 65, 66, -1, -1, -1, 70, 71, 72, 200, 74,
+ 75, 76, 77, 78, 79, -1, -1, -1, -1, -1,
+ -1, -1, 241, 242, 288, 227, -1, 92, 93, 94,
95, 96, -1, -1, -1, -1, 101, 102, -1, -1,
- -1, 260, -1, -1, -1, -1, -1, -1, 357, -1,
- -1, 321, -1, -1, -1, -1, -1, 276, 277, 278,
- 279, -1, 332, -1, 283, 266, -1, -1, 269, -1,
- 272, -1, -1, 275, -1, -1, -1, -1, -1, 47,
- 281, 300, -1, 284, 354, -1, 54, -1, -1, 71,
- 72, -1, 74, -1, -1, 77, -1, 65, 66, -1,
- 301, 320, 70, 71, 72, -1, 74, 326, -1, 77,
- 78, 79, 313, 95, 96, -1, -1, 318, -1, 101,
- 102, 322, 323, -1, 92, 93, 94, 95, 96, -1,
- 331, -1, -1, 101, 102, 336, 356, 357, -1, -1,
- 341, -1, 343, -1, 345, -1, -1, -1, -1, 0,
- 1, -1, -1, -1, -1, -1, -1, -1, -1, 360,
- 361, 12, 13, 14, 15, -1, 17, 18, 19, 20,
+ -1, 260, 306, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 322, 317, -1, -1, -1, -1, 277, 278,
+ 279, 280, -1, 333, -1, 284, -1, -1, -1, -1,
+ -1, 273, -1, -1, 276, 267, -1, -1, 270, -1,
+ -1, 345, 301, 347, -1, 355, -1, 351, -1, -1,
+ 282, -1, -1, 285, 71, 72, -1, 74, -1, -1,
+ 77, -1, 321, -1, -1, -1, -1, -1, 327, -1,
+ 302, -1, -1, -1, -1, 92, 93, 94, 95, 96,
+ -1, -1, 314, -1, 101, 102, -1, 319, -1, -1,
+ -1, 323, 324, 71, 72, -1, 74, 357, 358, 77,
+ 332, -1, -1, -1, -1, 337, -1, -1, -1, -1,
+ 342, -1, 344, -1, 346, 93, 94, 95, 96, 0,
+ 1, -1, -1, 101, 102, -1, -1, -1, -1, 361,
+ 362, 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,
@@ -1243,56 +1246,57 @@ static const yytype_int16 yycheck[] =
-1, 70, 71, 72, -1, 74, -1, -1, 77, 78,
79, 49, -1, 51, -1, -1, -1, -1, -1, -1,
-1, -1, -1, 92, 93, 94, 95, 96, -1, -1,
- -1, -1, 101, 102, 42, 73, -1, -1, -1, -1,
+ -1, -1, 101, 102, -1, 73, -1, -1, -1, -1,
-1, -1, 80, 81, 82, 83, 84, -1, -1, -1,
- -1, -1, -1, -1, -1, 93, 94, 65, 66, -1,
- -1, 99, 70, 71, 72, 103, 74, 75, 76, 77,
- 78, 79, 47, -1, -1, -1, -1, -1, -1, 54,
+ 47, -1, -1, -1, -1, 93, 94, 54, -1, -1,
+ -1, 99, -1, -1, -1, 103, -1, -1, 65, 66,
+ -1, -1, -1, 70, 71, 72, -1, 74, -1, -1,
+ 77, 78, 79, 47, -1, -1, -1, -1, -1, -1,
+ 54, -1, -1, -1, -1, 92, 93, 94, 95, 96,
+ -1, 65, 66, -1, 101, 102, 70, 71, 72, -1,
+ 74, -1, -1, 77, 78, 79, 47, -1, -1, -1,
+ -1, -1, -1, 54, -1, -1, -1, -1, 92, 93,
+ 94, 95, 96, -1, 65, 66, -1, 101, 102, 70,
+ 71, 72, -1, 74, -1, -1, 77, 78, 79, 47,
+ -1, -1, -1, -1, -1, -1, 54, -1, -1, -1,
+ -1, 92, 93, 94, 95, 96, -1, 65, 66, -1,
+ 101, 102, 70, 71, 72, -1, 74, -1, -1, 77,
+ 78, 79, 47, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 92, 93, 94, 95, 96, -1,
65, 66, -1, 101, 102, 70, 71, 72, -1, 74,
-1, -1, 77, 78, 79, 47, -1, -1, -1, -1,
- -1, -1, 54, -1, -1, -1, -1, 92, 93, 94,
+ -1, -1, -1, -1, -1, -1, -1, 92, 93, 94,
95, 96, -1, 65, 66, -1, 101, 102, 70, 71,
72, -1, 74, -1, -1, 77, 78, 79, 47, -1,
- -1, -1, -1, -1, -1, 54, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
92, 93, 94, 95, 96, -1, 65, 66, -1, 101,
102, 70, 71, 72, -1, 74, -1, -1, 77, 78,
- 79, 47, -1, -1, -1, -1, -1, -1, -1, -1,
+ 79, -1, -1, -1, -1, -1, -1, -1, 54, -1,
-1, -1, -1, 92, 93, 94, 95, 96, -1, 65,
66, -1, 101, 102, 70, 71, 72, -1, 74, -1,
- -1, 77, 78, 79, 47, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
+ -1, 77, 78, 79, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 56, -1, 91, 92, 93, 94, 95,
96, -1, 65, 66, -1, 101, 102, 70, 71, 72,
- -1, 74, -1, -1, 77, 78, 79, 47, -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, 65, 66, -1, 101, 102,
70, 71, 72, -1, 74, -1, -1, 77, 78, 79,
- -1, -1, -1, -1, -1, -1, -1, 54, -1, -1,
+ -1, -1, -1, -1, -1, 85, 86, -1, -1, -1,
-1, -1, 92, 93, 94, 95, 96, -1, 65, 66,
-1, 101, 102, 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, 96,
- -1, 65, 66, -1, 101, 102, 70, 71, 72, -1,
+ -1, -1, -1, -1, 91, 92, 93, 94, 95, 96,
+ -1, 65, 66, 100, 101, 102, 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, 65, 66, -1, 101, 102, 70,
+ 94, 95, 96, -1, 65, 66, 100, 101, 102, 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, 65, 66, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 91, 92, 93, 94, 95, 96, -1, 65, 66, -1,
101, 102, 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, 96, -1,
- 65, 66, 100, 101, 102, 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, 65, 66, 100, 101, 102, 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, 96, -1, 65, 66, -1, 101,
- 102, 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
+ -1, -1, -1, -1, 92, 93, 94, 95, 96, -1,
+ -1, -1, -1, 101, 102
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1325,17 +1329,17 @@ static const yytype_uint8 yystos[] =
100, 100, 28, 132, 127, 28, 133, 132, 132, 132,
132, 54, 91, 132, 132, 127, 132, 28, 132, 132,
132, 132, 132, 132, 132, 132, 132, 132, 28, 100,
- 105, 132, 100, 128, 100, 127, 129, 132, 132, 129,
- 105, 108, 147, 132, 132, 147, 47, 47, 47, 47,
- 150, 129, 34, 54, 114, 108, 115, 128, 128, 28,
- 105, 148, 108, 108, 132, 132, 132, 132, 100, 128,
- 54, 132, 128, 32, 58, 110, 127, 32, 28, 129,
- 148, 148, 32, 132, 128, 36, 110, 111, 119, 120,
- 126, 127, 129, 118, 119, 121, 126, 32, 129, 129,
- 128, 129, 127, 120, 128, 122, 114, 128, 121, 128,
- 122, 129, 128, 114, 110, 117, 52, 128, 32, 32,
- 52, 128, 32, 128, 127, 128, 127, 127, 32, 114,
- 115, 129, 128, 128
+ 105, 132, 100, 128, 100, 127, 127, 129, 132, 132,
+ 129, 105, 108, 147, 132, 132, 147, 47, 47, 47,
+ 47, 150, 129, 34, 54, 114, 108, 115, 128, 128,
+ 28, 105, 148, 108, 108, 132, 132, 132, 132, 100,
+ 128, 54, 132, 128, 32, 58, 110, 127, 32, 28,
+ 129, 148, 148, 32, 132, 128, 36, 110, 111, 119,
+ 120, 126, 127, 129, 118, 119, 121, 126, 32, 129,
+ 129, 128, 129, 127, 120, 128, 122, 114, 128, 121,
+ 128, 122, 129, 128, 114, 110, 117, 52, 128, 32,
+ 32, 52, 128, 32, 128, 127, 128, 127, 127, 32,
+ 114, 115, 129, 128, 128
};
#define yyerrok (yyerrstatus = 0)
@@ -3115,7 +3119,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 3119 "engines/director/lingo/lingo-gr.cpp"
+#line 3123 "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 84c1550..1fb3c0c 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -408,7 +408,7 @@ begin: /* nothing */ { $$ = g_lingo->_currentScript->size(); }
end: /* nothing */ { g_lingo->code1(STOP); $$ = g_lingo->_currentScript->size(); }
;
-stmtlist: /* nothing */ { $$ = g_lingo->_currentScript->size(); }
+stmtlist: begin { $$ = g_lingo->_currentScript->size(); }
| stmtlist nl
| stmtlist stmt
;
Commit: 364d442bf022dfe639f485639beced9732ce882c
https://github.com/scummvm/scummvm/commit/364d442bf022dfe639f485639beced9732ce882c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-27T17:54:35+01:00
Commit Message:
DIRECTOR: LINGO: Fix warning
Changed paths:
engines/director/lingo/lingo-gr.y
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 1fb3c0c..bf36a7f 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -103,7 +103,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%token tSPRITE tINTERSECTS tWITHIN tTELL tPROPERTY
%token tON tME
-%type<code> asgn begin elseif elsestmtoneliner end expr if when repeatwhile repeatwith stmtlist tell
+%type<code> asgn begin elseif elsestmtoneliner end expr if when repeatwhile repeatwith stmtlist tell reference
%type<narg> argdef arglist nonemptyarglist
%type<s> on
Commit: cbc22ce2db8316cc91fe3fc8624760cb1ae3bead
https://github.com/scummvm/scummvm/commit/cbc22ce2db8316cc91fe3fc8624760cb1ae3bead
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-27T17:55:07+01:00
Commit Message:
DIRECTOR: LINGO: JANITORIAL: Split long code line
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 e7961dc..4cc746e 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -695,23 +695,23 @@ static const yytype_int16 yyrhs[] =
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 119, 119, 120, 121, 124, 129, 134, 139, 144,
- 145, 146, 147, 150, 156, 159, 160, 161, 167, 174,
- 180, 186, 193, 201, 202, 205, 206, 211, 224, 242,
- 256, 262, 265, 270, 280, 292, 304, 314, 324, 334,
- 346, 347, 350, 351, 354, 355, 358, 366, 367, 375,
- 376, 377, 380, 383, 390, 397, 405, 408, 411, 412,
- 413, 416, 422, 426, 429, 432, 435, 438, 439, 442,
- 445, 446, 447, 450, 454, 462, 468, 469, 470, 471,
- 472, 473, 474, 475, 476, 477, 478, 479, 480, 481,
- 482, 483, 484, 485, 486, 487, 488, 489, 490, 491,
- 492, 493, 494, 495, 496, 497, 498, 499, 502, 507,
- 508, 509, 510, 511, 512, 513, 514, 515, 518, 521,
- 524, 528, 529, 530, 531, 532, 533, 534, 537, 538,
- 541, 542, 545, 546, 557, 558, 559, 560, 564, 568,
- 574, 575, 578, 579, 582, 583, 587, 591, 595, 595,
- 625, 625, 630, 633, 633, 638, 646, 653, 655, 656,
- 657, 658, 661, 665, 673, 674, 675, 678, 679
+ 0, 120, 120, 121, 122, 125, 130, 135, 140, 145,
+ 146, 147, 148, 151, 157, 160, 161, 162, 168, 175,
+ 181, 187, 194, 202, 203, 206, 207, 212, 225, 243,
+ 257, 263, 266, 271, 281, 293, 305, 315, 325, 335,
+ 347, 348, 351, 352, 355, 356, 359, 367, 368, 376,
+ 377, 378, 381, 384, 391, 398, 406, 409, 412, 413,
+ 414, 417, 423, 427, 430, 433, 436, 439, 440, 443,
+ 446, 447, 448, 451, 455, 463, 469, 470, 471, 472,
+ 473, 474, 475, 476, 477, 478, 479, 480, 481, 482,
+ 483, 484, 485, 486, 487, 488, 489, 490, 491, 492,
+ 493, 494, 495, 496, 497, 498, 499, 500, 503, 508,
+ 509, 510, 511, 512, 513, 514, 515, 516, 519, 522,
+ 525, 529, 530, 531, 532, 533, 534, 535, 538, 539,
+ 542, 543, 546, 547, 558, 559, 560, 561, 565, 569,
+ 575, 576, 579, 580, 583, 584, 588, 592, 596, 596,
+ 626, 626, 631, 634, 634, 639, 647, 654, 656, 657,
+ 658, 659, 662, 666, 674, 675, 676, 679, 680
};
#endif
@@ -2154,12 +2154,12 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 121 "engines/director/lingo/lingo-gr.y"
+#line 122 "engines/director/lingo/lingo-gr.y"
{ yyerrok; ;}
break;
case 5:
-#line 124 "engines/director/lingo/lingo-gr.y"
+#line 125 "engines/director/lingo/lingo-gr.y"
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 1;
@@ -2167,7 +2167,7 @@ yyreduce:
break;
case 6:
-#line 129 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 1;
@@ -2175,7 +2175,7 @@ yyreduce:
break;
case 7:
-#line 134 "engines/director/lingo/lingo-gr.y"
+#line 135 "engines/director/lingo/lingo-gr.y"
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 5;
@@ -2183,7 +2183,7 @@ yyreduce:
break;
case 8:
-#line 139 "engines/director/lingo/lingo-gr.y"
+#line 140 "engines/director/lingo/lingo-gr.y"
{
g_lingo->_linenumber++;
g_lingo->_colnumber = 8;
@@ -2191,7 +2191,7 @@ yyreduce:
break;
case 13:
-#line 150 "engines/director/lingo/lingo-gr.y"
+#line 151 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str());
@@ -2201,24 +2201,24 @@ yyreduce:
break;
case 14:
-#line 156 "engines/director/lingo/lingo-gr.y"
+#line 157 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_assign);
(yyval.code) = (yyvsp[(2) - (4)].code); ;}
break;
case 15:
-#line 159 "engines/director/lingo/lingo-gr.y"
+#line 160 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_after); ;}
break;
case 16:
-#line 160 "engines/director/lingo/lingo-gr.y"
+#line 161 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_before); ;}
break;
case 17:
-#line 161 "engines/director/lingo/lingo-gr.y"
+#line 162 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
@@ -2228,7 +2228,7 @@ yyreduce:
break;
case 18:
-#line 167 "engines/director/lingo/lingo-gr.y"
+#line 168 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2239,7 +2239,7 @@ yyreduce:
break;
case 19:
-#line 174 "engines/director/lingo/lingo-gr.y"
+#line 175 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_swap);
g_lingo->code1(g_lingo->c_theentityassign);
@@ -2249,7 +2249,7 @@ yyreduce:
break;
case 20:
-#line 180 "engines/director/lingo/lingo-gr.y"
+#line 181 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_varpush);
g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
@@ -2259,7 +2259,7 @@ yyreduce:
break;
case 21:
-#line 186 "engines/director/lingo/lingo-gr.y"
+#line 187 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2270,7 +2270,7 @@ yyreduce:
break;
case 22:
-#line 193 "engines/director/lingo/lingo-gr.y"
+#line 194 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_swap);
g_lingo->code1(g_lingo->c_theentityassign);
@@ -2280,7 +2280,7 @@ yyreduce:
break;
case 27:
-#line 211 "engines/director/lingo/lingo-gr.y"
+#line 212 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[(5) - (7)].code) - (yyvsp[(1) - (7)].code));
@@ -2292,7 +2292,7 @@ yyreduce:
break;
case 28:
-#line 224 "engines/director/lingo/lingo-gr.y"
+#line 225 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[(3) - (10)].code) - (yyvsp[(1) - (10)].code));
@@ -2310,7 +2310,7 @@ yyreduce:
break;
case 29:
-#line 242 "engines/director/lingo/lingo-gr.y"
+#line 243 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[(3) - (11)].code) - (yyvsp[(1) - (11)].code));
@@ -2328,7 +2328,7 @@ yyreduce:
break;
case 30:
-#line 256 "engines/director/lingo/lingo-gr.y"
+#line 257 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code));
@@ -2338,21 +2338,21 @@ yyreduce:
break;
case 31:
-#line 262 "engines/director/lingo/lingo-gr.y"
+#line 263 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
checkEnd((yyvsp[(6) - (6)].s), "tell", true); ;}
break;
case 32:
-#line 265 "engines/director/lingo/lingo-gr.y"
+#line 266 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
;}
break;
case 33:
-#line 270 "engines/director/lingo/lingo-gr.y"
+#line 271 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2366,7 +2366,7 @@ yyreduce:
break;
case 34:
-#line 280 "engines/director/lingo/lingo-gr.y"
+#line 281 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2382,7 +2382,7 @@ yyreduce:
break;
case 35:
-#line 292 "engines/director/lingo/lingo-gr.y"
+#line 293 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2398,7 +2398,7 @@ yyreduce:
break;
case 36:
-#line 304 "engines/director/lingo/lingo-gr.y"
+#line 305 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (9)].code) - (yyvsp[(1) - (9)].code));
@@ -2412,7 +2412,7 @@ yyreduce:
break;
case 37:
-#line 314 "engines/director/lingo/lingo-gr.y"
+#line 315 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2426,7 +2426,7 @@ yyreduce:
break;
case 38:
-#line 324 "engines/director/lingo/lingo-gr.y"
+#line 325 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
@@ -2440,7 +2440,7 @@ yyreduce:
break;
case 39:
-#line 334 "engines/director/lingo/lingo-gr.y"
+#line 335 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (10)].code) - (yyvsp[(1) - (10)].code));
@@ -2454,17 +2454,17 @@ yyreduce:
break;
case 40:
-#line 346 "engines/director/lingo/lingo-gr.y"
+#line 347 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = 0; ;}
break;
case 41:
-#line 347 "engines/director/lingo/lingo-gr.y"
+#line 348 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
case 46:
-#line 358 "engines/director/lingo/lingo-gr.y"
+#line 359 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(4) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2474,7 +2474,7 @@ yyreduce:
break;
case 48:
-#line 367 "engines/director/lingo/lingo-gr.y"
+#line 368 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
@@ -2484,22 +2484,22 @@ yyreduce:
break;
case 49:
-#line 375 "engines/director/lingo/lingo-gr.y"
+#line 376 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); ;}
break;
case 50:
-#line 376 "engines/director/lingo/lingo-gr.y"
+#line 377 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(g_lingo->c_eq, STOP); ;}
break;
case 52:
-#line 380 "engines/director/lingo/lingo-gr.y"
+#line 381 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;}
break;
case 53:
-#line 383 "engines/director/lingo/lingo-gr.y"
+#line 384 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
@@ -2508,7 +2508,7 @@ yyreduce:
break;
case 54:
-#line 390 "engines/director/lingo/lingo-gr.y"
+#line 391 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
@@ -2517,7 +2517,7 @@ yyreduce:
break;
case 55:
-#line 397 "engines/director/lingo/lingo-gr.y"
+#line 398 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
@@ -2527,22 +2527,22 @@ yyreduce:
break;
case 56:
-#line 405 "engines/director/lingo/lingo-gr.y"
+#line 406 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 57:
-#line 408 "engines/director/lingo/lingo-gr.y"
+#line 409 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 58:
-#line 411 "engines/director/lingo/lingo-gr.y"
+#line 412 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); ;}
break;
case 61:
-#line 416 "engines/director/lingo/lingo-gr.y"
+#line 417 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_whencode);
g_lingo->code1(STOP);
@@ -2551,73 +2551,73 @@ yyreduce:
break;
case 62:
-#line 422 "engines/director/lingo/lingo-gr.y"
+#line 423 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_tellcode);
g_lingo->code1(STOP); ;}
break;
case 63:
-#line 426 "engines/director/lingo/lingo-gr.y"
+#line 427 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt((yyvsp[(1) - (1)].i)); ;}
break;
case 64:
-#line 429 "engines/director/lingo/lingo-gr.y"
+#line 430 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_floatpush);
g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;}
break;
case 65:
-#line 432 "engines/director/lingo/lingo-gr.y"
+#line 433 "engines/director/lingo/lingo-gr.y"
{ // D3
(yyval.code) = g_lingo->code1(g_lingo->c_symbolpush);
g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;}
break;
case 66:
-#line 435 "engines/director/lingo/lingo-gr.y"
+#line 436 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_stringpush);
g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;}
break;
case 68:
-#line 439 "engines/director/lingo/lingo-gr.y"
+#line 440 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
case 69:
-#line 442 "engines/director/lingo/lingo-gr.y"
+#line 443 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 70:
-#line 445 "engines/director/lingo/lingo-gr.y"
+#line 446 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
case 71:
-#line 446 "engines/director/lingo/lingo-gr.y"
+#line 447 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
break;
case 72:
-#line 447 "engines/director/lingo/lingo-gr.y"
+#line 448 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg));
delete (yyvsp[(1) - (4)].s); ;}
break;
case 73:
-#line 450 "engines/director/lingo/lingo-gr.y"
+#line 451 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_eval);
g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str());
@@ -2625,7 +2625,7 @@ yyreduce:
break;
case 74:
-#line 454 "engines/director/lingo/lingo-gr.y"
+#line 455 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2637,7 +2637,7 @@ yyreduce:
break;
case 75:
-#line 462 "engines/director/lingo/lingo-gr.y"
+#line 463 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(g_lingo->c_theentitypush);
inst e = 0, f = 0;
@@ -2647,205 +2647,205 @@ yyreduce:
break;
case 77:
-#line 469 "engines/director/lingo/lingo-gr.y"
+#line 470 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_add); ;}
break;
case 78:
-#line 470 "engines/director/lingo/lingo-gr.y"
+#line 471 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_sub); ;}
break;
case 79:
-#line 471 "engines/director/lingo/lingo-gr.y"
+#line 472 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mul); ;}
break;
case 80:
-#line 472 "engines/director/lingo/lingo-gr.y"
+#line 473 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_div); ;}
break;
case 81:
-#line 473 "engines/director/lingo/lingo-gr.y"
+#line 474 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_mod); ;}
break;
case 82:
-#line 474 "engines/director/lingo/lingo-gr.y"
+#line 475 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gt); ;}
break;
case 83:
-#line 475 "engines/director/lingo/lingo-gr.y"
+#line 476 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lt); ;}
break;
case 84:
-#line 476 "engines/director/lingo/lingo-gr.y"
+#line 477 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_neq); ;}
break;
case 85:
-#line 477 "engines/director/lingo/lingo-gr.y"
+#line 478 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ge); ;}
break;
case 86:
-#line 478 "engines/director/lingo/lingo-gr.y"
+#line 479 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_le); ;}
break;
case 87:
-#line 479 "engines/director/lingo/lingo-gr.y"
+#line 480 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_and); ;}
break;
case 88:
-#line 480 "engines/director/lingo/lingo-gr.y"
+#line 481 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_or); ;}
break;
case 89:
-#line 481 "engines/director/lingo/lingo-gr.y"
+#line 482 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_not); ;}
break;
case 90:
-#line 482 "engines/director/lingo/lingo-gr.y"
+#line 483 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_ampersand); ;}
break;
case 91:
-#line 483 "engines/director/lingo/lingo-gr.y"
+#line 484 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_concat); ;}
break;
case 92:
-#line 484 "engines/director/lingo/lingo-gr.y"
+#line 485 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_contains); ;}
break;
case 93:
-#line 485 "engines/director/lingo/lingo-gr.y"
+#line 486 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_starts); ;}
break;
case 94:
-#line 486 "engines/director/lingo/lingo-gr.y"
+#line 487 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); ;}
break;
case 95:
-#line 487 "engines/director/lingo/lingo-gr.y"
+#line 488 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;}
break;
case 96:
-#line 488 "engines/director/lingo/lingo-gr.y"
+#line 489 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
case 97:
-#line 489 "engines/director/lingo/lingo-gr.y"
+#line 490 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(g_lingo->c_arraypush); g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;}
break;
case 98:
-#line 490 "engines/director/lingo/lingo-gr.y"
+#line 491 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_intersects); ;}
break;
case 99:
-#line 491 "engines/director/lingo/lingo-gr.y"
+#line 492 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_within); ;}
break;
case 100:
-#line 492 "engines/director/lingo/lingo-gr.y"
+#line 493 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charOf); ;}
break;
case 101:
-#line 493 "engines/director/lingo/lingo-gr.y"
+#line 494 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_charToOf); ;}
break;
case 102:
-#line 494 "engines/director/lingo/lingo-gr.y"
+#line 495 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemOf); ;}
break;
case 103:
-#line 495 "engines/director/lingo/lingo-gr.y"
+#line 496 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_itemToOf); ;}
break;
case 104:
-#line 496 "engines/director/lingo/lingo-gr.y"
+#line 497 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineOf); ;}
break;
case 105:
-#line 497 "engines/director/lingo/lingo-gr.y"
+#line 498 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_lineToOf); ;}
break;
case 106:
-#line 498 "engines/director/lingo/lingo-gr.y"
+#line 499 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordOf); ;}
break;
case 107:
-#line 499 "engines/director/lingo/lingo-gr.y"
+#line 500 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_wordToOf); ;}
break;
case 108:
-#line 502 "engines/director/lingo/lingo-gr.y"
+#line 503 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 109:
-#line 507 "engines/director/lingo/lingo-gr.y"
+#line 508 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_printtop); ;}
break;
case 112:
-#line 510 "engines/director/lingo/lingo-gr.y"
+#line 511 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_exitRepeat); ;}
break;
case 113:
-#line 511 "engines/director/lingo/lingo-gr.y"
+#line 512 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_procret); ;}
break;
case 117:
-#line 515 "engines/director/lingo/lingo-gr.y"
+#line 516 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
case 118:
-#line 518 "engines/director/lingo/lingo-gr.y"
+#line 519 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 119:
-#line 521 "engines/director/lingo/lingo-gr.y"
+#line 522 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
case 120:
-#line 524 "engines/director/lingo/lingo-gr.y"
+#line 525 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_voidpush);
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 1);
@@ -2853,87 +2853,87 @@ yyreduce:
break;
case 121:
-#line 528 "engines/director/lingo/lingo-gr.y"
+#line 529 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
case 122:
-#line 529 "engines/director/lingo/lingo-gr.y"
+#line 530 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;}
break;
case 123:
-#line 530 "engines/director/lingo/lingo-gr.y"
+#line 531 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
break;
case 124:
-#line 531 "engines/director/lingo/lingo-gr.y"
+#line 532 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
break;
case 125:
-#line 532 "engines/director/lingo/lingo-gr.y"
+#line 533 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_open); ;}
break;
case 126:
-#line 533 "engines/director/lingo/lingo-gr.y"
+#line 534 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;}
break;
case 127:
-#line 534 "engines/director/lingo/lingo-gr.y"
+#line 535 "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 128:
-#line 537 "engines/director/lingo/lingo-gr.y"
+#line 538 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
case 129:
-#line 538 "engines/director/lingo/lingo-gr.y"
+#line 539 "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 130:
-#line 541 "engines/director/lingo/lingo-gr.y"
+#line 542 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
case 131:
-#line 542 "engines/director/lingo/lingo-gr.y"
+#line 543 "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 132:
-#line 545 "engines/director/lingo/lingo-gr.y"
+#line 546 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
case 133:
-#line 546 "engines/director/lingo/lingo-gr.y"
+#line 547 "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 134:
-#line 557 "engines/director/lingo/lingo-gr.y"
+#line 558 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoloop); ;}
break;
case 135:
-#line 558 "engines/director/lingo/lingo-gr.y"
+#line 559 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotonext); ;}
break;
case 136:
-#line 559 "engines/director/lingo/lingo-gr.y"
+#line 560 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_gotoprevious); ;}
break;
case 137:
-#line 560 "engines/director/lingo/lingo-gr.y"
+#line 561 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
@@ -2941,7 +2941,7 @@ yyreduce:
break;
case 138:
-#line 564 "engines/director/lingo/lingo-gr.y"
+#line 565 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
@@ -2949,7 +2949,7 @@ yyreduce:
break;
case 139:
-#line 568 "engines/director/lingo/lingo-gr.y"
+#line 569 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
@@ -2957,12 +2957,12 @@ yyreduce:
break;
case 144:
-#line 582 "engines/director/lingo/lingo-gr.y"
+#line 583 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(g_lingo->c_playdone); ;}
break;
case 145:
-#line 583 "engines/director/lingo/lingo-gr.y"
+#line 584 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(1);
@@ -2970,7 +2970,7 @@ yyreduce:
break;
case 146:
-#line 587 "engines/director/lingo/lingo-gr.y"
+#line 588 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(3);
@@ -2978,7 +2978,7 @@ yyreduce:
break;
case 147:
-#line 591 "engines/director/lingo/lingo-gr.y"
+#line 592 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_intpush);
g_lingo->codeInt(2);
@@ -2986,24 +2986,24 @@ yyreduce:
break;
case 148:
-#line 595 "engines/director/lingo/lingo-gr.y"
+#line 596 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); ;}
break;
case 149:
-#line 595 "engines/director/lingo/lingo-gr.y"
+#line 596 "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 625 "engines/director/lingo/lingo-gr.y"
+#line 626 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;}
break;
case 151:
-#line 626 "engines/director/lingo/lingo-gr.y"
+#line 627 "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));
@@ -3011,19 +3011,19 @@ yyreduce:
break;
case 152:
-#line 630 "engines/director/lingo/lingo-gr.y"
+#line 631 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFactory(*(yyvsp[(2) - (2)].s));
;}
break;
case 153:
-#line 633 "engines/director/lingo/lingo-gr.y"
+#line 634 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = true; ;}
break;
case 154:
-#line 634 "engines/director/lingo/lingo-gr.y"
+#line 635 "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);
@@ -3031,7 +3031,7 @@ yyreduce:
break;
case 155:
-#line 638 "engines/director/lingo/lingo-gr.y"
+#line 639 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(g_lingo->c_procret);
g_lingo->define(*(yyvsp[(1) - (7)].s), (yyvsp[(2) - (7)].code), (yyvsp[(3) - (7)].narg));
@@ -3043,7 +3043,7 @@ yyreduce:
break;
case 156:
-#line 646 "engines/director/lingo/lingo-gr.y"
+#line 647 "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));
@@ -3053,37 +3053,37 @@ yyreduce:
break;
case 157:
-#line 653 "engines/director/lingo/lingo-gr.y"
+#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 655 "engines/director/lingo/lingo-gr.y"
+#line 656 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
case 159:
-#line 656 "engines/director/lingo/lingo-gr.y"
+#line 657 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
break;
case 160:
-#line 657 "engines/director/lingo/lingo-gr.y"
+#line 658 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
case 161:
-#line 658 "engines/director/lingo/lingo-gr.y"
+#line 659 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
break;
case 162:
-#line 661 "engines/director/lingo/lingo-gr.y"
+#line 662 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); ;}
break;
case 163:
-#line 665 "engines/director/lingo/lingo-gr.y"
+#line 666 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_call);
g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
@@ -3093,27 +3093,27 @@ yyreduce:
break;
case 164:
-#line 673 "engines/director/lingo/lingo-gr.y"
+#line 674 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
case 165:
-#line 674 "engines/director/lingo/lingo-gr.y"
+#line 675 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
case 166:
-#line 675 "engines/director/lingo/lingo-gr.y"
+#line 676 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
case 167:
-#line 678 "engines/director/lingo/lingo-gr.y"
+#line 679 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
case 168:
-#line 679 "engines/director/lingo/lingo-gr.y"
+#line 680 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
@@ -3333,6 +3333,6 @@ yyreturn:
}
-#line 682 "engines/director/lingo/lingo-gr.y"
+#line 683 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index bf36a7f..6953d54 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -103,7 +103,8 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%token tSPRITE tINTERSECTS tWITHIN tTELL tPROPERTY
%token tON tME
-%type<code> asgn begin elseif elsestmtoneliner end expr if when repeatwhile repeatwith stmtlist tell reference
+%type<code> asgn begin elseif elsestmtoneliner end expr if when repeatwhile
+%type<code> repeatwith stmtlist tell reference
%type<narg> argdef arglist nonemptyarglist
%type<s> on
More information about the Scummvm-git-logs
mailing list