[Scummvm-git-logs] scummvm master -> 7816d67128da7d2bc9643e16f60e5ac171ff7b34
sev-
sev at scummvm.org
Wed Jan 15 23:41:48 UTC 2020
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:
437deab5fe DIRECTOR: LINGO: Fixed parser for 'global version'
ad44f47c3e DIRECTOR: LINGO: Added test for 'global version'
7816d67128 MISC: Replaced GPLv2 license text with the latest one
Commit: 437deab5feaa661fc576398156b7f66daf6634bf
https://github.com/scummvm/scummvm/commit/437deab5feaa661fc576398156b7f66daf6634bf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-15T21:24:12+01:00
Commit Message:
DIRECTOR: LINGO: Fixed parser for 'global version'
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 ad8a67f..fa3ca07 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -564,18 +564,18 @@ union yyalloc
#endif /* !YYCOPY_NEEDED */
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 124
+#define YYFINAL 123
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1600
+#define YYLAST 1601
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 98
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 48
+#define YYNNTS 49
/* YYNRULES -- Number of rules. */
-#define YYNRULES 165
+#define YYNRULES 166
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 351
+#define YYNSTATES 352
#define YYUNDEFTOK 2
#define YYMAXUTOK 337
@@ -640,13 +640,13 @@ static const yytype_int16 yyrline[] =
413, 414, 415, 416, 417, 418, 419, 420, 421, 422,
423, 424, 425, 426, 427, 428, 429, 430, 431, 432,
433, 434, 435, 436, 437, 438, 439, 440, 442, 446,
- 447, 448, 449, 450, 451, 452, 453, 454, 457, 460,
- 461, 463, 467, 472, 476, 481, 485, 497, 498, 499,
- 500, 504, 508, 513, 514, 516, 517, 521, 525, 529,
- 529, 559, 559, 559, 566, 567, 567, 574, 584, 592,
- 592, 594, 595, 596, 597, 599, 600, 601, 603, 605,
- 613, 614, 615, 617, 618, 620, 622, 623, 624, 625,
- 627, 628, 630, 631, 633, 637
+ 447, 448, 449, 450, 451, 451, 452, 453, 454, 457,
+ 460, 461, 463, 467, 472, 476, 481, 485, 497, 498,
+ 499, 500, 504, 508, 513, 514, 516, 517, 521, 525,
+ 529, 529, 559, 559, 559, 566, 567, 567, 574, 584,
+ 592, 592, 594, 595, 596, 597, 599, 600, 601, 603,
+ 605, 613, 614, 615, 617, 618, 620, 622, 623, 624,
+ 625, 627, 628, 630, 631, 633, 637
};
#endif
@@ -672,11 +672,11 @@ static const char *const yytname[] =
"stmtoneliner", "stmtonelinerwithif", "stmt", "tellstart", "ifstmt",
"elseifstmtlist", "elseifstmt", "ifoneliner", "repeatwhile",
"repeatwith", "if", "elseif", "begin", "end", "stmtlist", "when",
- "simpleexpr", "expr", "reference", "proc", "globallist", "propertylist",
- "instancelist", "gotofunc", "gotomovie", "playfunc", "$@1", "defn",
- "$@2", "$@3", "$@4", "on", "$@5", "argdef", "endargdef", "argstore",
- "macro", "arglist", "nonemptyarglist", "list", "valuelist", "linearlist",
- "proplist", "proppair", YY_NULLPTR
+ "simpleexpr", "expr", "reference", "proc", "$@1", "globallist",
+ "propertylist", "instancelist", "gotofunc", "gotomovie", "playfunc",
+ "$@2", "defn", "$@3", "$@4", "$@5", "on", "$@6", "argdef", "endargdef",
+ "argstore", "macro", "arglist", "nonemptyarglist", "list", "valuelist",
+ "linearlist", "proplist", "proppair", YY_NULLPTR
};
#endif
@@ -698,7 +698,7 @@ static const yytype_int16 yytoknum[] =
};
# endif
-#define YYPACT_NINF (-264)
+#define YYPACT_NINF (-261)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
@@ -712,42 +712,42 @@ static const yytype_int16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 270, -72, -264, -264, 873, -264, 907, 988, 93, 1022,
- -264, -264, -264, -264, -264, -21, 21, 756, -264, -264,
- 873, 3, 76, 27, 55, 873, 792, 59, 873, 873,
- 873, 873, 873, 873, 873, 62, -264, 873, 873, 873,
- 57, 8, -264, -264, -264, -264, -264, 873, 37, 873,
- 594, -264, 1511, -264, -264, -264, -264, -264, -264, -264,
- -264, -264, -6, 873, 1511, 873, 1511, 19, 873, 19,
- -264, -264, 873, 1511, 28, 873, -264, -264, -264, 30,
- -264, 873, -264, 63, -264, 1074, -264, 77, 1061, 100,
- -264, -8, 93, 11, 79, 84, -264, 1428, -264, 1074,
- -264, -264, 54, -264, 1123, 1156, 1189, 1222, 1478, 1387,
- -264, 56, 130, -264, -264, 1441, 58, 60, -264, -264,
- 66, 64, 65, -264, -264, 351, 1511, 873, 1511, -264,
- -264, 873, 1511, -264, -264, 873, 873, 873, 873, 873,
- 873, 873, 873, 873, 873, 873, 873, 873, 873, 873,
- 873, 873, 142, 873, 1061, 1441, -27, 873, 7, 13,
- 873, 19, 142, 143, 1511, 873, -264, -264, 91, 873,
- 873, -264, 873, 873, 35, 873, 873, 873, -264, 873,
- -264, 153, 873, 873, 873, 873, 873, 873, 873, 873,
- 873, 873, -264, -264, 155, -264, -264, 93, 93, -264,
- 93, 71, -264, -264, 1511, 148, -264, 1511, 170, 170,
- 170, 170, 133, 133, -264, -32, 170, 170, 170, 170,
- -32, -52, -52, -264, -264, -264, -76, -264, 1511, -264,
- -264, 1511, -74, -264, 1511, -264, -264, -264, 1511, 1511,
- 1511, 170, 873, 873, 1511, 170, 1511, 1511, -264, 1511,
- 1255, 1511, 1288, 1511, 1321, 1511, 1354, 1511, 1511, 675,
- -264, -264, -264, -264, -264, 58, 60, -264, 513, 15,
- -264, 159, 105, 185, 105, 142, 1511, 170, 873, 873,
- 873, 873, -264, 513, -264, -264, 126, 161, 873, 513,
- 675, 188, -264, -264, -264, -19, 1511, 1511, 1511, 1511,
- -264, 129, -264, 873, 1511, -264, -264, -264, 432, 513,
- 105, -264, 1511, -264, 88, -20, 191, -264, -264, 513,
- -264, -264, -264, 873, 134, -264, -264, -264, 119, 513,
- 513, 145, -264, 1511, -264, 675, 194, 147, -264, 513,
- 177, -264, -264, -264, 144, -264, 149, -264, 513, -264,
- -264
+ 271, -82, -261, -261, 874, -261, 908, 989, 75, 1023,
+ -261, -261, -261, -261, -261, -29, -261, 757, -261, -261,
+ 874, 44, 85, 26, 37, 874, 793, 39, 874, 874,
+ 874, 874, 874, 874, 874, 56, -261, 874, 874, 874,
+ 61, 7, -261, -261, -261, -261, -261, 874, 22, 874,
+ 595, -261, 1512, -261, -261, -261, -261, -261, -261, -261,
+ -261, -261, -8, 874, 1512, 874, 1512, -6, 874, -6,
+ -261, -261, 874, 1512, 18, 874, -261, -261, 102, -261,
+ 874, -261, 88, -261, 1075, -261, 103, 1062, 108, -261,
+ -7, 75, 15, 104, 107, -261, 1429, -261, 1075, -261,
+ -261, 55, -261, 1124, 1157, 1190, 1223, 1479, 1388, -261,
+ 60, 129, -261, -261, 1442, 62, 65, -261, -261, 67,
+ 63, 70, -261, -261, 352, 1512, 874, 1512, -261, -261,
+ 874, 1512, -261, -261, 874, 874, 874, 874, 874, 874,
+ 874, 874, 874, 874, 874, 874, 874, 874, 874, 874,
+ 874, 146, 874, 1062, 1442, 9, 874, 21, 27, 874,
+ -6, 146, -261, 80, 1512, 874, -261, -261, 89, 874,
+ 874, -261, 874, 874, 16, 874, 874, 874, -261, 874,
+ -261, 155, 874, 874, 874, 874, 874, 874, 874, 874,
+ 874, 874, -261, -261, 156, -261, -261, 75, 75, -261,
+ 75, -5, -261, -261, 1512, 142, -261, 1512, 180, 180,
+ 180, 180, 133, 133, -261, -33, 180, 180, 180, 180,
+ -33, -52, -52, -261, -261, -261, -50, -261, 1512, -261,
+ -261, 1512, 13, 173, 1512, -261, -261, -261, 1512, 1512,
+ 1512, 180, 874, 874, 1512, 180, 1512, 1512, -261, 1512,
+ 1256, 1512, 1289, 1512, 1322, 1512, 1355, 1512, 1512, 676,
+ -261, -261, -261, -261, -261, 62, 65, -261, 514, 10,
+ -261, 153, 109, 185, 109, -261, 146, 1512, 180, 874,
+ 874, 874, 874, -261, 514, -261, -261, 126, 161, 874,
+ 514, 676, 188, -261, -261, -261, 17, 1512, 1512, 1512,
+ 1512, -261, 128, -261, 874, 1512, -261, -261, -261, 433,
+ 514, 109, -261, 1512, -261, 86, -10, 191, -261, -261,
+ 514, -261, -261, -261, 874, 134, -261, -261, -261, 119,
+ 514, 514, 143, -261, 1512, -261, 676, 194, 144, -261,
+ 514, 177, -261, -261, -261, 147, -261, 149, -261, 514,
+ -261, -261
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -755,62 +755,62 @@ static const yytype_int16 yypact[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 52, 63, 0, 53, 150, 150, 0, 56,
- 55, 54, 129, 135, 65, 103, 0, 0, 44, 131,
+ 0, 0, 52, 63, 0, 53, 151, 151, 0, 56,
+ 55, 54, 130, 136, 65, 103, 104, 0, 44, 132,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 139, 0, 0, 0,
- 156, 0, 3, 66, 26, 7, 27, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 140, 0, 0, 0,
+ 157, 0, 3, 66, 26, 7, 27, 0, 0, 0,
0, 58, 20, 59, 21, 100, 101, 6, 46, 19,
- 57, 4, 56, 0, 64, 150, 151, 108, 150, 61,
- 56, 98, 150, 153, 149, 150, 46, 102, 111, 104,
- 117, 0, 118, 0, 119, 120, 122, 0, 99, 0,
- 42, 0, 0, 0, 0, 0, 134, 110, 125, 126,
- 128, 115, 106, 80, 0, 0, 0, 0, 0, 0,
- 113, 105, 0, 85, 86, 0, 55, 54, 157, 160,
- 0, 158, 159, 162, 1, 5, 47, 0, 47, 47,
- 25, 0, 23, 24, 22, 0, 0, 0, 0, 0,
+ 57, 4, 56, 0, 64, 151, 152, 109, 151, 61,
+ 56, 98, 151, 154, 150, 151, 46, 102, 0, 118,
+ 0, 119, 0, 120, 121, 123, 0, 99, 0, 42,
+ 0, 0, 0, 0, 0, 135, 111, 126, 127, 129,
+ 116, 107, 80, 0, 0, 0, 0, 0, 0, 114,
+ 106, 0, 85, 86, 0, 55, 54, 158, 161, 0,
+ 159, 160, 163, 1, 5, 47, 0, 47, 47, 25,
+ 0, 23, 24, 22, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 141, 150, 0, 151, 0, 0, 0, 0,
- 0, 130, 141, 0, 124, 0, 121, 132, 0, 0,
+ 0, 142, 151, 0, 152, 0, 0, 0, 0, 0,
+ 131, 142, 112, 105, 125, 0, 122, 133, 0, 0,
0, 43, 0, 0, 0, 0, 0, 0, 51, 0,
- 127, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 34, 34, 0, 140, 87, 0, 0, 155,
+ 128, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 34, 34, 0, 141, 87, 0, 0, 156,
0, 0, 2, 48, 47, 0, 31, 47, 76, 77,
74, 75, 78, 79, 71, 82, 83, 84, 73, 72,
- 81, 67, 68, 69, 70, 142, 0, 107, 152, 60,
- 62, 154, 0, 112, 123, 46, 8, 9, 10, 11,
- 15, 13, 0, 0, 14, 12, 18, 109, 116, 90,
+ 81, 67, 68, 69, 70, 143, 0, 108, 153, 60,
+ 62, 155, 0, 0, 124, 46, 8, 9, 10, 11,
+ 15, 13, 0, 0, 14, 12, 18, 110, 117, 90,
0, 92, 0, 94, 0, 96, 0, 88, 89, 0,
- 48, 114, 165, 164, 161, 0, 0, 163, 47, 0,
- 48, 0, 148, 0, 148, 141, 16, 17, 0, 0,
- 0, 0, 47, 47, 49, 50, 0, 0, 0, 47,
- 0, 0, 48, 143, 48, 0, 91, 93, 95, 97,
- 33, 0, 28, 0, 47, 37, 47, 144, 138, 136,
- 148, 32, 47, 48, 47, 0, 145, 48, 48, 47,
- 46, 45, 38, 0, 0, 46, 41, 146, 137, 133,
- 47, 0, 48, 47, 35, 0, 0, 0, 29, 47,
- 0, 47, 147, 30, 0, 48, 0, 36, 47, 40,
- 39
+ 48, 115, 166, 165, 162, 0, 0, 164, 47, 0,
+ 48, 0, 149, 0, 149, 113, 142, 16, 17, 0,
+ 0, 0, 0, 47, 47, 49, 50, 0, 0, 0,
+ 47, 0, 0, 48, 144, 48, 0, 91, 93, 95,
+ 97, 33, 0, 28, 0, 47, 37, 47, 145, 139,
+ 137, 149, 32, 47, 48, 47, 0, 146, 48, 48,
+ 47, 46, 45, 38, 0, 0, 46, 41, 147, 138,
+ 134, 47, 0, 48, 47, 35, 0, 0, 0, 29,
+ 47, 0, 47, 148, 30, 0, 48, 0, 36, 47,
+ 40, 39
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -264, -264, 106, -264, -250, -264, 4, 39, -264, -264,
- -264, -264, -264, -264, 180, -264, -75, -79, -229, -264,
- -2, -4, 68, 192, -264, -264, -264, -264, -12, -264,
- -264, -264, -264, -264, -264, -264, -264, -155, -264, -263,
- 193, 102, -264, -264, -264, -264, -264, 40
+ -261, -261, 106, -261, -241, -261, 23, 38, -261, -261,
+ -261, -261, -261, -261, 182, -261, -75, -79, -228, -261,
+ -2, -4, 69, 183, -261, -261, -261, -261, -261, -18,
+ -261, -261, -261, -261, -261, -261, -261, -261, -157, -261,
+ -260, 190, 4, -261, -261, -261, -261, -261, 34
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 41, 42, 43, 44, 129, 285, 259, 46, 314,
- 322, 130, 47, 48, 49, 323, 152, 203, 268, 50,
- 51, 52, 53, 54, 79, 111, 102, 55, 86, 56,
- 75, 57, 87, 235, 76, 58, 112, 226, 328, 292,
- 59, 159, 74, 60, 120, 121, 122, 123
+ -1, 41, 42, 43, 44, 128, 286, 259, 46, 315,
+ 323, 129, 47, 48, 49, 324, 151, 203, 268, 50,
+ 51, 52, 53, 54, 78, 163, 110, 101, 55, 85,
+ 56, 75, 57, 86, 235, 76, 58, 111, 226, 329,
+ 293, 59, 158, 74, 60, 119, 120, 121, 122
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -818,225 +818,217 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 64, 162, 66, 66, 45, 73, 71, 232, 124, 282,
- 325, 294, 141, 85, 100, 272, 88, 274, 273, 61,
- 273, 97, 99, 77, 103, 104, 105, 106, 107, 108,
- 109, 283, 141, 113, 114, 115, 150, 151, 119, 172,
- 306, 289, 78, 126, 287, 128, 132, 317, 95, 205,
- 206, 173, 89, 90, 148, 149, 150, 151, 175, 154,
- 326, 155, 288, 308, 155, 309, 227, 157, 155, 2,
- 176, 66, 310, 166, 5, 273, 96, 164, 70, 116,
- 101, 117, 242, 110, 319, 341, 153, 180, 329, 330,
- 174, 91, 92, 265, 243, 266, 127, 93, 167, 125,
- 229, 157, 165, 339, 94, 2, 230, 157, 67, 69,
- 5, 8, 236, 157, 70, 10, 348, 11, 320, 321,
- 295, 171, 160, 204, 163, 269, 177, 207, 271, 45,
- 178, 208, 209, 210, 211, 212, 213, 214, 215, 216,
- 217, 218, 219, 220, 221, 222, 223, 224, 181, 66,
- 194, 195, 40, 228, 118, 197, 231, 198, 200, 201,
- 275, 234, 199, 225, 233, 238, 239, 156, 240, 241,
- 158, 244, 245, 246, 248, 247, 261, 161, 249, 250,
- 251, 252, 253, 254, 255, 256, 257, 258, 40, 286,
- 135, 136, 137, 138, 270, 262, 263, 141, 264, 291,
- 142, 143, 144, 300, 301, 290, 293, 302, 303, 307,
- 305, 311, 327, 336, 334, 342, 145, 146, 147, 148,
- 149, 150, 151, 345, 347, 313, 338, 315, 343, 349,
- 131, 202, 260, 318, 141, 324, 237, 142, 276, 277,
- 331, 267, 133, 134, 0, 332, 0, 0, 0, 0,
- 335, 337, 0, 0, 340, 147, 148, 149, 150, 151,
- 344, 0, 346, 0, 0, 0, 0, 0, 0, 350,
- -5, 1, 0, 0, 296, 297, 298, 299, 0, 0,
- 0, 0, 2, 0, 304, 3, 4, 5, 6, 7,
- 8, 9, 10, 0, 11, 0, 12, 13, 14, 312,
- 0, 0, 15, 16, 17, 18, 0, 0, 19, 0,
- 0, 0, 0, 20, 21, 22, 0, 0, 23, 333,
- 0, 0, 24, 25, 26, 0, 27, 0, 0, 0,
- 0, 0, 0, 28, 0, 0, 0, 0, 0, 0,
- 29, 30, 31, 32, 33, 0, 0, 34, 35, 36,
- 0, 0, 0, 0, 0, 0, 37, 38, 0, 0,
- 0, -5, 39, 2, 0, 40, 3, 4, 5, 6,
+ 64, 161, 66, 66, 232, 73, 71, 123, 99, 61,
+ 67, 69, 140, 84, 295, 77, 87, 265, 283, 266,
+ 326, 96, 98, 45, 102, 103, 104, 105, 106, 107,
+ 108, 140, 284, 112, 113, 114, 149, 150, 118, 288,
+ 172, 272, 290, 125, 273, 127, 131, 94, 205, 206,
+ 307, 318, 173, 147, 148, 149, 150, 289, 95, 153,
+ 100, 154, 175, 242, 154, 309, 166, 310, 154, 155,
+ 327, 66, 157, 2, 176, 243, 164, 109, 5, 160,
+ 180, 126, 70, 115, 152, 116, 320, 2, 156, 174,
+ 330, 331, 5, 88, 89, 342, 70, 10, 124, 11,
+ 90, 91, 227, 156, 274, 340, 92, 273, 311, 8,
+ 236, 273, 159, 93, 229, 156, 321, 322, 349, 296,
+ 230, 156, 204, 162, 167, 269, 207, 165, 271, 171,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 45, 66, 181,
+ 195, 177, 228, 178, 194, 231, 40, 200, 117, 197,
+ 276, 234, 198, 199, 201, 238, 239, 225, 240, 241,
+ 40, 244, 245, 246, 233, 247, 248, 261, 249, 250,
+ 251, 252, 253, 254, 255, 256, 257, 258, 270, 287,
+ 134, 135, 136, 137, 275, 262, 263, 140, 264, 291,
+ 141, 142, 143, 292, 301, 302, 294, 303, 304, 308,
+ 312, 306, 328, 337, 335, 343, 144, 145, 146, 147,
+ 148, 149, 150, 346, 339, 344, 314, 348, 316, 350,
+ 202, 260, 130, 132, 319, 267, 325, 237, 277, 278,
+ 133, 332, 0, 0, 140, 0, 333, 141, 0, 0,
+ 0, 336, 338, 0, 0, 341, 0, 0, 0, 0,
+ 0, 345, 0, 347, 0, 146, 147, 148, 149, 150,
+ 351, -5, 1, 0, 0, 297, 298, 299, 300, 0,
+ 0, 0, 0, 2, 0, 305, 3, 4, 5, 6,
7, 8, 9, 10, 0, 11, 0, 12, 13, 14,
- 0, 0, 0, 15, 16, 17, 18, 0, 0, 19,
+ 313, 0, 0, 15, 16, 17, 18, 0, 0, 19,
0, 0, 0, 0, 20, 21, 22, 0, 0, 23,
- 0, 0, 0, 24, 25, 26, 0, 27, 0, 0,
+ 334, 0, 0, 24, 25, 26, 0, 27, 0, 0,
0, 0, 0, 0, 28, 0, 0, 0, 0, 0,
0, 29, 30, 31, 32, 33, 0, 0, 34, 35,
36, 0, 0, 0, 0, 0, 0, 37, 38, 0,
- 0, 0, 0, 39, 2, 0, 40, 3, 4, 5,
- 6, 7, 8, 9, 10, 0, 11, 316, 12, 0,
+ 0, 0, -5, 39, 2, 0, 40, 3, 4, 5,
+ 6, 7, 8, 9, 10, 0, 11, 0, 12, 13,
14, 0, 0, 0, 15, 16, 17, 18, 0, 0,
- 0, 0, 0, 0, 0, 20, 21, 22, 0, 0,
- 23, 0, 0, 0, 0, 25, 26, 0, 27, 0,
+ 19, 0, 0, 0, 0, 20, 21, 22, 0, 0,
+ 23, 0, 0, 0, 24, 25, 26, 0, 27, 0,
0, 0, 0, 0, 0, 28, 0, 0, 0, 0,
0, 0, 29, 30, 31, 32, 33, 0, 0, 34,
- 35, 0, 0, 0, 0, 0, 0, 0, 37, 38,
- 0, 0, 0, 284, 39, 2, 0, 40, 3, 4,
- 5, 6, 7, 8, 9, 10, 0, 11, 0, 12,
+ 35, 36, 0, 0, 0, 0, 0, 0, 37, 38,
+ 0, 0, 0, 0, 39, 2, 0, 40, 3, 4,
+ 5, 6, 7, 8, 9, 10, 0, 11, 317, 12,
0, 14, 0, 0, 0, 15, 16, 17, 18, 0,
0, 0, 0, 0, 0, 0, 20, 21, 22, 0,
0, 23, 0, 0, 0, 0, 25, 26, 0, 27,
0, 0, 0, 0, 0, 0, 28, 0, 0, 0,
0, 0, 0, 29, 30, 31, 32, 33, 0, 0,
34, 35, 0, 0, 0, 0, 0, 0, 0, 37,
- 38, 0, 0, 0, 284, 39, 2, 0, 40, 3,
+ 38, 0, 0, 0, 285, 39, 2, 0, 40, 3,
4, 5, 6, 7, 8, 9, 10, 0, 11, 0,
12, 0, 14, 0, 0, 0, 15, 16, 17, 18,
- 0, 0, 0, 0, 0, 0, 0, 20, 0, 22,
- 0, 0, 0, 0, 0, 0, 0, 25, 26, 0,
+ 0, 0, 0, 0, 0, 0, 0, 20, 21, 22,
+ 0, 0, 23, 0, 0, 0, 0, 25, 26, 0,
27, 0, 0, 0, 0, 0, 0, 28, 0, 0,
0, 0, 0, 0, 29, 30, 31, 32, 33, 0,
- 0, 0, 35, 0, 0, 0, 0, 0, 0, 0,
- 37, 38, 0, 0, 0, 0, 39, 2, 0, 40,
+ 0, 34, 35, 0, 0, 0, 0, 0, 0, 0,
+ 37, 38, 0, 0, 0, 285, 39, 2, 0, 40,
3, 4, 5, 6, 7, 8, 9, 10, 0, 11,
0, 12, 0, 14, 0, 0, 0, 15, 16, 17,
- 0, 0, 0, 0, 0, 0, 0, 0, 20, 0,
+ 18, 0, 0, 0, 0, 0, 0, 0, 20, 0,
22, 0, 0, 0, 0, 0, 0, 0, 25, 26,
0, 27, 0, 0, 0, 0, 0, 0, 28, 0,
0, 0, 0, 0, 0, 29, 30, 31, 32, 33,
0, 0, 0, 35, 0, 0, 0, 0, 0, 0,
0, 37, 38, 0, 0, 0, 0, 39, 2, 0,
- 40, 3, 4, 5, 0, 7, 8, 62, 10, 0,
- 11, 0, 0, 0, 14, 0, 0, 0, 0, 0,
- 0, 0, 0, 80, 0, 81, 82, 83, 84, 63,
- 0, 22, 0, 0, 2, 0, 0, 3, 4, 5,
- 0, 7, 8, 62, 10, 0, 11, 0, 0, 28,
- 14, 0, 0, 0, 0, 0, 29, 30, 31, 32,
- 33, 81, 0, 83, 0, 63, 0, 22, 0, 0,
- 0, 0, 37, 38, 0, 0, 0, 98, 39, 0,
- 0, 40, 0, 0, 0, 28, 0, 0, 0, 0,
- 0, 0, 29, 30, 31, 32, 33, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 37, 38,
- 0, 0, 0, 0, 39, 2, 0, 40, 3, 4,
+ 40, 3, 4, 5, 6, 7, 8, 9, 10, 0,
+ 11, 0, 12, 0, 14, 0, 0, 0, 15, 16,
+ 17, 0, 0, 0, 0, 0, 0, 0, 0, 20,
+ 0, 22, 0, 0, 0, 0, 0, 0, 0, 25,
+ 26, 0, 27, 0, 0, 0, 0, 0, 0, 28,
+ 0, 0, 0, 0, 0, 0, 29, 30, 31, 32,
+ 33, 0, 0, 0, 35, 0, 0, 0, 0, 0,
+ 0, 0, 37, 38, 0, 0, 0, 0, 39, 2,
+ 0, 40, 3, 4, 5, 0, 7, 8, 62, 10,
+ 0, 11, 0, 0, 0, 14, 0, 0, 0, 0,
+ 0, 0, 0, 0, 79, 0, 80, 81, 82, 83,
+ 63, 0, 22, 0, 0, 2, 0, 0, 3, 4,
5, 0, 7, 8, 62, 10, 0, 11, 0, 0,
- 0, 14, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 63, 0, 22, 2,
- 0, 0, 3, 4, 5, 0, 7, 8, 62, 10,
- 0, 11, 0, 0, 0, 14, 28, 0, 0, 0,
+ 28, 14, 0, 0, 0, 0, 0, 29, 30, 31,
+ 32, 33, 80, 0, 82, 0, 63, 0, 22, 0,
+ 0, 0, 0, 37, 38, 0, 0, 0, 97, 39,
+ 0, 0, 40, 0, 0, 0, 28, 0, 0, 0,
0, 0, 0, 29, 30, 31, 32, 33, 0, 0,
- 63, 0, 22, 0, 0, 0, 0, 0, 0, 37,
- 38, 0, 0, 0, 0, 39, 0, 0, 40, 0,
- 28, 0, 0, 0, 0, 0, 0, 29, 30, 31,
- 32, 33, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 37, 38, 0, 0, 0, 0, 65,
- 2, 0, 40, 3, 4, 5, 0, 7, 8, 62,
- 10, 0, 11, 0, 0, 0, 14, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 63, 0, 22, 2, 0, 0, 3, 4, 5,
- 0, 7, 8, 62, 10, 0, 11, 0, 0, 0,
- 14, 28, 0, 0, 0, 0, 0, 0, 29, 30,
- 31, 32, 33, 0, 0, 63, 0, 22, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 37,
+ 38, 0, 0, 0, 0, 39, 2, 0, 40, 3,
+ 4, 5, 0, 7, 8, 62, 10, 0, 11, 0,
+ 0, 0, 14, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 63, 0, 22,
+ 2, 0, 0, 3, 4, 5, 0, 7, 8, 62,
+ 10, 0, 11, 0, 0, 0, 14, 28, 0, 0,
+ 0, 0, 0, 0, 29, 30, 31, 32, 33, 0,
+ 0, 63, 0, 22, 0, 0, 0, 0, 0, 0,
+ 37, 38, 0, 0, 0, 0, 39, 0, 0, 40,
+ 0, 28, 0, 0, 0, 0, 0, 0, 29, 30,
+ 31, 32, 33, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 37, 38, 0, 0, 0, 0,
- 68, 0, 0, 40, 0, 28, 0, 0, 0, 0,
- 0, 0, 29, 30, 31, 32, 33, 168, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 37, 38,
- 0, 0, 0, 81, 72, 83, 0, 40, 135, 136,
- 137, 138, 139, 140, 0, 141, 169, 170, 142, 143,
- 144, 135, 136, 137, 138, 139, 140, 0, 141, 0,
- 0, 142, 143, 144, 145, 146, 147, 148, 149, 150,
- 151, 0, 0, 0, 0, 0, 0, 145, 146, 147,
- 148, 149, 150, 151, 182, 0, 0, 0, 0, 0,
- 183, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 135, 136, 137, 138, 139, 140, 0, 141, 0, 0,
- 142, 143, 144, 0, 0, 0, 0, 184, 0, 0,
- 0, 0, 0, 185, 0, 0, 145, 146, 147, 148,
- 149, 150, 151, 135, 136, 137, 138, 139, 140, 0,
- 141, 0, 0, 142, 143, 144, 0, 0, 0, 0,
- 186, 0, 0, 0, 0, 0, 187, 0, 0, 145,
- 146, 147, 148, 149, 150, 151, 135, 136, 137, 138,
- 139, 140, 0, 141, 0, 0, 142, 143, 144, 0,
- 0, 0, 0, 188, 0, 0, 0, 0, 0, 189,
- 0, 0, 145, 146, 147, 148, 149, 150, 151, 135,
- 136, 137, 138, 139, 140, 0, 141, 0, 0, 142,
- 143, 144, 0, 0, 0, 0, 278, 0, 0, 0,
- 0, 0, 0, 0, 0, 145, 146, 147, 148, 149,
- 150, 151, 135, 136, 137, 138, 139, 140, 0, 141,
- 0, 0, 142, 143, 144, 0, 0, 0, 0, 279,
- 0, 0, 0, 0, 0, 0, 0, 0, 145, 146,
- 147, 148, 149, 150, 151, 135, 136, 137, 138, 139,
- 140, 0, 141, 0, 0, 142, 143, 144, 0, 0,
- 0, 0, 280, 0, 0, 0, 0, 0, 0, 0,
- 0, 145, 146, 147, 148, 149, 150, 151, 135, 136,
- 137, 138, 139, 140, 0, 141, 0, 0, 142, 143,
- 144, 0, 0, 0, 0, 281, 0, 0, 0, 0,
- 0, 0, 0, 0, 145, 146, 147, 148, 149, 150,
- 151, 135, 136, 137, 138, 139, 140, 0, 141, 0,
- 0, 142, 143, 144, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 192, 0, 0, 145, 146, 147,
- 148, 149, 150, 151, 135, 136, 137, 138, 139, 140,
- 0, 141, 0, 0, 142, 143, 144, 0, 0, 0,
+ 65, 2, 0, 40, 3, 4, 5, 0, 7, 8,
+ 62, 10, 0, 11, 0, 0, 0, 14, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 145, 146, 147, 148, 149, 150, 151, 179, 193, 0,
- 0, 0, 0, 0, 0, 135, 136, 137, 138, 139,
- 140, 0, 141, 0, 0, 142, 143, 144, 135, 136,
- 137, 138, 139, 140, 0, 141, 0, 0, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 0, 0,
- 0, 0, 0, 0, 145, 146, 147, 148, 149, 150,
- 151, 0, 0, 0, 196, 135, 136, 137, 138, 139,
- 140, 0, 141, 0, 0, 142, 143, 144, 0, 0,
- 0, 0, 0, 190, 191, 0, 0, 0, 0, 0,
- 0, 145, 146, 147, 148, 149, 150, 151, 135, 136,
- 137, 138, 139, 140, 0, 141, 0, 0, 142, 143,
- 144, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 145, 146, 147, 148, 149, 150,
- 151
+ 0, 0, 63, 0, 22, 2, 0, 0, 3, 4,
+ 5, 0, 7, 8, 62, 10, 0, 11, 0, 0,
+ 0, 14, 28, 0, 0, 0, 0, 0, 0, 29,
+ 30, 31, 32, 33, 0, 0, 63, 0, 22, 0,
+ 0, 0, 0, 0, 0, 37, 38, 0, 0, 0,
+ 0, 68, 0, 0, 40, 0, 28, 0, 0, 0,
+ 0, 0, 0, 29, 30, 31, 32, 33, 168, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 37,
+ 38, 0, 0, 0, 80, 72, 82, 0, 40, 134,
+ 135, 136, 137, 138, 139, 0, 140, 169, 170, 141,
+ 142, 143, 134, 135, 136, 137, 138, 139, 0, 140,
+ 0, 0, 141, 142, 143, 144, 145, 146, 147, 148,
+ 149, 150, 0, 0, 0, 0, 0, 0, 144, 145,
+ 146, 147, 148, 149, 150, 182, 0, 0, 0, 0,
+ 0, 183, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 134, 135, 136, 137, 138, 139, 0, 140, 0,
+ 0, 141, 142, 143, 0, 0, 0, 0, 184, 0,
+ 0, 0, 0, 0, 185, 0, 0, 144, 145, 146,
+ 147, 148, 149, 150, 134, 135, 136, 137, 138, 139,
+ 0, 140, 0, 0, 141, 142, 143, 0, 0, 0,
+ 0, 186, 0, 0, 0, 0, 0, 187, 0, 0,
+ 144, 145, 146, 147, 148, 149, 150, 134, 135, 136,
+ 137, 138, 139, 0, 140, 0, 0, 141, 142, 143,
+ 0, 0, 0, 0, 188, 0, 0, 0, 0, 0,
+ 189, 0, 0, 144, 145, 146, 147, 148, 149, 150,
+ 134, 135, 136, 137, 138, 139, 0, 140, 0, 0,
+ 141, 142, 143, 0, 0, 0, 0, 279, 0, 0,
+ 0, 0, 0, 0, 0, 0, 144, 145, 146, 147,
+ 148, 149, 150, 134, 135, 136, 137, 138, 139, 0,
+ 140, 0, 0, 141, 142, 143, 0, 0, 0, 0,
+ 280, 0, 0, 0, 0, 0, 0, 0, 0, 144,
+ 145, 146, 147, 148, 149, 150, 134, 135, 136, 137,
+ 138, 139, 0, 140, 0, 0, 141, 142, 143, 0,
+ 0, 0, 0, 281, 0, 0, 0, 0, 0, 0,
+ 0, 0, 144, 145, 146, 147, 148, 149, 150, 134,
+ 135, 136, 137, 138, 139, 0, 140, 0, 0, 141,
+ 142, 143, 0, 0, 0, 0, 282, 0, 0, 0,
+ 0, 0, 0, 0, 0, 144, 145, 146, 147, 148,
+ 149, 150, 134, 135, 136, 137, 138, 139, 0, 140,
+ 0, 0, 141, 142, 143, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 192, 0, 0, 144, 145,
+ 146, 147, 148, 149, 150, 134, 135, 136, 137, 138,
+ 139, 0, 140, 0, 0, 141, 142, 143, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 144, 145, 146, 147, 148, 149, 150, 179, 193,
+ 0, 0, 0, 0, 0, 0, 134, 135, 136, 137,
+ 138, 139, 0, 140, 0, 0, 141, 142, 143, 134,
+ 135, 136, 137, 138, 139, 0, 140, 0, 0, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 0,
+ 0, 0, 0, 0, 0, 144, 145, 146, 147, 148,
+ 149, 150, 0, 0, 0, 196, 134, 135, 136, 137,
+ 138, 139, 0, 140, 0, 0, 141, 142, 143, 0,
+ 0, 0, 0, 0, 190, 191, 0, 0, 0, 0,
+ 0, 0, 144, 145, 146, 147, 148, 149, 150, 134,
+ 135, 136, 137, 138, 139, 0, 140, 0, 0, 141,
+ 142, 143, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 144, 145, 146, 147, 148,
+ 149, 150
};
static const yytype_int16 yycheck[] =
{
- 4, 76, 6, 7, 0, 9, 8, 162, 0, 259,
- 30, 274, 64, 17, 26, 91, 20, 91, 94, 91,
- 94, 25, 26, 44, 28, 29, 30, 31, 32, 33,
- 34, 260, 64, 37, 38, 39, 88, 89, 40, 47,
- 290, 270, 21, 47, 29, 49, 50, 310, 21, 128,
- 129, 59, 49, 50, 86, 87, 88, 89, 47, 63,
- 80, 65, 47, 292, 68, 294, 93, 94, 72, 12,
- 59, 75, 91, 85, 17, 94, 21, 81, 21, 22,
- 21, 24, 47, 21, 313, 335, 92, 99, 317, 318,
- 92, 15, 16, 22, 59, 24, 59, 21, 21, 91,
- 93, 94, 39, 332, 28, 12, 93, 94, 6, 7,
- 17, 20, 21, 94, 21, 22, 345, 24, 30, 31,
- 275, 21, 94, 127, 94, 204, 47, 131, 207, 125,
- 46, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 94, 153,
- 94, 21, 95, 157, 97, 97, 160, 97, 94, 94,
- 235, 165, 96, 21, 21, 169, 170, 65, 172, 173,
- 68, 175, 176, 177, 21, 179, 21, 75, 182, 183,
- 184, 185, 186, 187, 188, 189, 190, 191, 95, 268,
- 57, 58, 59, 60, 46, 197, 198, 64, 200, 94,
- 67, 68, 69, 282, 283, 46, 21, 81, 47, 21,
- 289, 82, 21, 94, 80, 21, 83, 84, 85, 86,
- 87, 88, 89, 46, 80, 304, 81, 306, 81, 80,
- 50, 125, 193, 312, 64, 314, 168, 67, 242, 243,
- 319, 201, 50, 50, -1, 320, -1, -1, -1, -1,
- 325, 330, -1, -1, 333, 85, 86, 87, 88, 89,
- 339, -1, 341, -1, -1, -1, -1, -1, -1, 348,
- 0, 1, -1, -1, 278, 279, 280, 281, -1, -1,
- -1, -1, 12, -1, 288, 15, 16, 17, 18, 19,
- 20, 21, 22, -1, 24, -1, 26, 27, 28, 303,
- -1, -1, 32, 33, 34, 35, -1, -1, 38, -1,
- -1, -1, -1, 43, 44, 45, -1, -1, 48, 323,
- -1, -1, 52, 53, 54, -1, 56, -1, -1, -1,
- -1, -1, -1, 63, -1, -1, -1, -1, -1, -1,
- 70, 71, 72, 73, 74, -1, -1, 77, 78, 79,
- -1, -1, -1, -1, -1, -1, 86, 87, -1, -1,
- -1, 91, 92, 12, -1, 95, 15, 16, 17, 18,
+ 4, 76, 6, 7, 161, 9, 8, 0, 26, 91,
+ 6, 7, 64, 17, 274, 44, 20, 22, 259, 24,
+ 30, 25, 26, 0, 28, 29, 30, 31, 32, 33,
+ 34, 64, 260, 37, 38, 39, 88, 89, 40, 29,
+ 47, 91, 270, 47, 94, 49, 50, 21, 127, 128,
+ 291, 311, 59, 86, 87, 88, 89, 47, 21, 63,
+ 21, 65, 47, 47, 68, 293, 84, 295, 72, 65,
+ 80, 75, 68, 12, 59, 59, 80, 21, 17, 75,
+ 98, 59, 21, 22, 92, 24, 314, 12, 94, 91,
+ 318, 319, 17, 49, 50, 336, 21, 22, 91, 24,
+ 15, 16, 93, 94, 91, 333, 21, 94, 91, 20,
+ 21, 94, 94, 28, 93, 94, 30, 31, 346, 276,
+ 93, 94, 126, 21, 21, 204, 130, 39, 207, 21,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 124, 152, 94,
+ 21, 47, 156, 46, 94, 159, 95, 94, 97, 97,
+ 235, 165, 97, 96, 94, 169, 170, 21, 172, 173,
+ 95, 175, 176, 177, 94, 179, 21, 21, 182, 183,
+ 184, 185, 186, 187, 188, 189, 190, 191, 46, 268,
+ 57, 58, 59, 60, 21, 197, 198, 64, 200, 46,
+ 67, 68, 69, 94, 283, 284, 21, 81, 47, 21,
+ 82, 290, 21, 94, 80, 21, 83, 84, 85, 86,
+ 87, 88, 89, 46, 81, 81, 305, 80, 307, 80,
+ 124, 193, 50, 50, 313, 201, 315, 168, 242, 243,
+ 50, 320, -1, -1, 64, -1, 321, 67, -1, -1,
+ -1, 326, 331, -1, -1, 334, -1, -1, -1, -1,
+ -1, 340, -1, 342, -1, 85, 86, 87, 88, 89,
+ 349, 0, 1, -1, -1, 279, 280, 281, 282, -1,
+ -1, -1, -1, 12, -1, 289, 15, 16, 17, 18,
19, 20, 21, 22, -1, 24, -1, 26, 27, 28,
- -1, -1, -1, 32, 33, 34, 35, -1, -1, 38,
+ 304, -1, -1, 32, 33, 34, 35, -1, -1, 38,
-1, -1, -1, -1, 43, 44, 45, -1, -1, 48,
- -1, -1, -1, 52, 53, 54, -1, 56, -1, -1,
+ 324, -1, -1, 52, 53, 54, -1, 56, -1, -1,
-1, -1, -1, -1, 63, -1, -1, -1, -1, -1,
-1, 70, 71, 72, 73, 74, -1, -1, 77, 78,
79, -1, -1, -1, -1, -1, -1, 86, 87, -1,
- -1, -1, -1, 92, 12, -1, 95, 15, 16, 17,
- 18, 19, 20, 21, 22, -1, 24, 25, 26, -1,
+ -1, -1, 91, 92, 12, -1, 95, 15, 16, 17,
+ 18, 19, 20, 21, 22, -1, 24, -1, 26, 27,
28, -1, -1, -1, 32, 33, 34, 35, -1, -1,
- -1, -1, -1, -1, -1, 43, 44, 45, -1, -1,
- 48, -1, -1, -1, -1, 53, 54, -1, 56, -1,
+ 38, -1, -1, -1, -1, 43, 44, 45, -1, -1,
+ 48, -1, -1, -1, 52, 53, 54, -1, 56, -1,
-1, -1, -1, -1, -1, 63, -1, -1, -1, -1,
-1, -1, 70, 71, 72, 73, 74, -1, -1, 77,
- 78, -1, -1, -1, -1, -1, -1, -1, 86, 87,
- -1, -1, -1, 91, 92, 12, -1, 95, 15, 16,
- 17, 18, 19, 20, 21, 22, -1, 24, -1, 26,
+ 78, 79, -1, -1, -1, -1, -1, -1, 86, 87,
+ -1, -1, -1, -1, 92, 12, -1, 95, 15, 16,
+ 17, 18, 19, 20, 21, 22, -1, 24, 25, 26,
-1, 28, -1, -1, -1, 32, 33, 34, 35, -1,
-1, -1, -1, -1, -1, -1, 43, 44, 45, -1,
-1, 48, -1, -1, -1, -1, 53, 54, -1, 56,
@@ -1046,104 +1038,112 @@ static const yytype_int16 yycheck[] =
87, -1, -1, -1, 91, 92, 12, -1, 95, 15,
16, 17, 18, 19, 20, 21, 22, -1, 24, -1,
26, -1, 28, -1, -1, -1, 32, 33, 34, 35,
- -1, -1, -1, -1, -1, -1, -1, 43, -1, 45,
- -1, -1, -1, -1, -1, -1, -1, 53, 54, -1,
+ -1, -1, -1, -1, -1, -1, -1, 43, 44, 45,
+ -1, -1, 48, -1, -1, -1, -1, 53, 54, -1,
56, -1, -1, -1, -1, -1, -1, 63, -1, -1,
-1, -1, -1, -1, 70, 71, 72, 73, 74, -1,
- -1, -1, 78, -1, -1, -1, -1, -1, -1, -1,
- 86, 87, -1, -1, -1, -1, 92, 12, -1, 95,
+ -1, 77, 78, -1, -1, -1, -1, -1, -1, -1,
+ 86, 87, -1, -1, -1, 91, 92, 12, -1, 95,
15, 16, 17, 18, 19, 20, 21, 22, -1, 24,
-1, 26, -1, 28, -1, -1, -1, 32, 33, 34,
- -1, -1, -1, -1, -1, -1, -1, -1, 43, -1,
+ 35, -1, -1, -1, -1, -1, -1, -1, 43, -1,
45, -1, -1, -1, -1, -1, -1, -1, 53, 54,
-1, 56, -1, -1, -1, -1, -1, -1, 63, -1,
-1, -1, -1, -1, -1, 70, 71, 72, 73, 74,
-1, -1, -1, 78, -1, -1, -1, -1, -1, -1,
-1, 86, 87, -1, -1, -1, -1, 92, 12, -1,
- 95, 15, 16, 17, -1, 19, 20, 21, 22, -1,
- 24, -1, -1, -1, 28, -1, -1, -1, -1, -1,
- -1, -1, -1, 37, -1, 39, 40, 41, 42, 43,
- -1, 45, -1, -1, 12, -1, -1, 15, 16, 17,
- -1, 19, 20, 21, 22, -1, 24, -1, -1, 63,
- 28, -1, -1, -1, -1, -1, 70, 71, 72, 73,
- 74, 39, -1, 41, -1, 43, -1, 45, -1, -1,
- -1, -1, 86, 87, -1, -1, -1, 55, 92, -1,
- -1, 95, -1, -1, -1, 63, -1, -1, -1, -1,
- -1, -1, 70, 71, 72, 73, 74, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 86, 87,
- -1, -1, -1, -1, 92, 12, -1, 95, 15, 16,
+ 95, 15, 16, 17, 18, 19, 20, 21, 22, -1,
+ 24, -1, 26, -1, 28, -1, -1, -1, 32, 33,
+ 34, -1, -1, -1, -1, -1, -1, -1, -1, 43,
+ -1, 45, -1, -1, -1, -1, -1, -1, -1, 53,
+ 54, -1, 56, -1, -1, -1, -1, -1, -1, 63,
+ -1, -1, -1, -1, -1, -1, 70, 71, 72, 73,
+ 74, -1, -1, -1, 78, -1, -1, -1, -1, -1,
+ -1, -1, 86, 87, -1, -1, -1, -1, 92, 12,
+ -1, 95, 15, 16, 17, -1, 19, 20, 21, 22,
+ -1, 24, -1, -1, -1, 28, -1, -1, -1, -1,
+ -1, -1, -1, -1, 37, -1, 39, 40, 41, 42,
+ 43, -1, 45, -1, -1, 12, -1, -1, 15, 16,
17, -1, 19, 20, 21, 22, -1, 24, -1, -1,
- -1, 28, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 43, -1, 45, 12,
- -1, -1, 15, 16, 17, -1, 19, 20, 21, 22,
- -1, 24, -1, -1, -1, 28, 63, -1, -1, -1,
+ 63, 28, -1, -1, -1, -1, -1, 70, 71, 72,
+ 73, 74, 39, -1, 41, -1, 43, -1, 45, -1,
+ -1, -1, -1, 86, 87, -1, -1, -1, 55, 92,
+ -1, -1, 95, -1, -1, -1, 63, -1, -1, -1,
-1, -1, -1, 70, 71, 72, 73, 74, -1, -1,
- 43, -1, 45, -1, -1, -1, -1, -1, -1, 86,
- 87, -1, -1, -1, -1, 92, -1, -1, 95, -1,
- 63, -1, -1, -1, -1, -1, -1, 70, 71, 72,
- 73, 74, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 86, 87, -1, -1, -1, -1, 92,
- 12, -1, 95, 15, 16, 17, -1, 19, 20, 21,
- 22, -1, 24, -1, -1, -1, 28, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 43, -1, 45, 12, -1, -1, 15, 16, 17,
- -1, 19, 20, 21, 22, -1, 24, -1, -1, -1,
- 28, 63, -1, -1, -1, -1, -1, -1, 70, 71,
- 72, 73, 74, -1, -1, 43, -1, 45, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 86,
+ 87, -1, -1, -1, -1, 92, 12, -1, 95, 15,
+ 16, 17, -1, 19, 20, 21, 22, -1, 24, -1,
+ -1, -1, 28, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 43, -1, 45,
+ 12, -1, -1, 15, 16, 17, -1, 19, 20, 21,
+ 22, -1, 24, -1, -1, -1, 28, 63, -1, -1,
+ -1, -1, -1, -1, 70, 71, 72, 73, 74, -1,
+ -1, 43, -1, 45, -1, -1, -1, -1, -1, -1,
+ 86, 87, -1, -1, -1, -1, 92, -1, -1, 95,
+ -1, 63, -1, -1, -1, -1, -1, -1, 70, 71,
+ 72, 73, 74, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 86, 87, -1, -1, -1, -1,
- 92, -1, -1, 95, -1, 63, -1, -1, -1, -1,
- -1, -1, 70, 71, 72, 73, 74, 36, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 86, 87,
- -1, -1, -1, 39, 92, 41, -1, 95, 57, 58,
- 59, 60, 61, 62, -1, 64, 65, 66, 67, 68,
- 69, 57, 58, 59, 60, 61, 62, -1, 64, -1,
- -1, 67, 68, 69, 83, 84, 85, 86, 87, 88,
- 89, -1, -1, -1, -1, -1, -1, 83, 84, 85,
- 86, 87, 88, 89, 41, -1, -1, -1, -1, -1,
- 47, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 92, 12, -1, 95, 15, 16, 17, -1, 19, 20,
+ 21, 22, -1, 24, -1, -1, -1, 28, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 43, -1, 45, 12, -1, -1, 15, 16,
+ 17, -1, 19, 20, 21, 22, -1, 24, -1, -1,
+ -1, 28, 63, -1, -1, -1, -1, -1, -1, 70,
+ 71, 72, 73, 74, -1, -1, 43, -1, 45, -1,
+ -1, -1, -1, -1, -1, 86, 87, -1, -1, -1,
+ -1, 92, -1, -1, 95, -1, 63, -1, -1, -1,
+ -1, -1, -1, 70, 71, 72, 73, 74, 36, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 86,
+ 87, -1, -1, -1, 39, 92, 41, -1, 95, 57,
+ 58, 59, 60, 61, 62, -1, 64, 65, 66, 67,
+ 68, 69, 57, 58, 59, 60, 61, 62, -1, 64,
+ -1, -1, 67, 68, 69, 83, 84, 85, 86, 87,
+ 88, 89, -1, -1, -1, -1, -1, -1, 83, 84,
+ 85, 86, 87, 88, 89, 41, -1, -1, -1, -1,
+ -1, 47, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 57, 58, 59, 60, 61, 62, -1, 64, -1,
+ -1, 67, 68, 69, -1, -1, -1, -1, 41, -1,
+ -1, -1, -1, -1, 47, -1, -1, 83, 84, 85,
+ 86, 87, 88, 89, 57, 58, 59, 60, 61, 62,
+ -1, 64, -1, -1, 67, 68, 69, -1, -1, -1,
+ -1, 41, -1, -1, -1, -1, -1, 47, -1, -1,
+ 83, 84, 85, 86, 87, 88, 89, 57, 58, 59,
+ 60, 61, 62, -1, 64, -1, -1, 67, 68, 69,
+ -1, -1, -1, -1, 41, -1, -1, -1, -1, -1,
+ 47, -1, -1, 83, 84, 85, 86, 87, 88, 89,
57, 58, 59, 60, 61, 62, -1, 64, -1, -1,
67, 68, 69, -1, -1, -1, -1, 41, -1, -1,
- -1, -1, -1, 47, -1, -1, 83, 84, 85, 86,
+ -1, -1, -1, -1, -1, -1, 83, 84, 85, 86,
87, 88, 89, 57, 58, 59, 60, 61, 62, -1,
64, -1, -1, 67, 68, 69, -1, -1, -1, -1,
- 41, -1, -1, -1, -1, -1, 47, -1, -1, 83,
+ 41, -1, -1, -1, -1, -1, -1, -1, -1, 83,
84, 85, 86, 87, 88, 89, 57, 58, 59, 60,
61, 62, -1, 64, -1, -1, 67, 68, 69, -1,
- -1, -1, -1, 41, -1, -1, -1, -1, -1, 47,
+ -1, -1, -1, 41, -1, -1, -1, -1, -1, -1,
-1, -1, 83, 84, 85, 86, 87, 88, 89, 57,
58, 59, 60, 61, 62, -1, 64, -1, -1, 67,
68, 69, -1, -1, -1, -1, 41, -1, -1, -1,
-1, -1, -1, -1, -1, 83, 84, 85, 86, 87,
88, 89, 57, 58, 59, 60, 61, 62, -1, 64,
- -1, -1, 67, 68, 69, -1, -1, -1, -1, 41,
- -1, -1, -1, -1, -1, -1, -1, -1, 83, 84,
+ -1, -1, 67, 68, 69, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 47, -1, -1, 83, 84,
85, 86, 87, 88, 89, 57, 58, 59, 60, 61,
62, -1, 64, -1, -1, 67, 68, 69, -1, -1,
- -1, -1, 41, -1, -1, -1, -1, -1, -1, -1,
- -1, 83, 84, 85, 86, 87, 88, 89, 57, 58,
- 59, 60, 61, 62, -1, 64, -1, -1, 67, 68,
- 69, -1, -1, -1, -1, 41, -1, -1, -1, -1,
- -1, -1, -1, -1, 83, 84, 85, 86, 87, 88,
- 89, 57, 58, 59, 60, 61, 62, -1, 64, -1,
- -1, 67, 68, 69, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 47, -1, -1, 83, 84, 85,
- 86, 87, 88, 89, 57, 58, 59, 60, 61, 62,
- -1, 64, -1, -1, 67, 68, 69, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 83, 84, 85, 86, 87, 88, 89, 49, 91, -1,
- -1, -1, -1, -1, -1, 57, 58, 59, 60, 61,
- 62, -1, 64, -1, -1, 67, 68, 69, 57, 58,
- 59, 60, 61, 62, -1, 64, -1, -1, 67, 68,
- 69, 83, 84, 85, 86, 87, 88, 89, -1, -1,
- -1, -1, -1, -1, 83, 84, 85, 86, 87, 88,
- 89, -1, -1, -1, 93, 57, 58, 59, 60, 61,
- 62, -1, 64, -1, -1, 67, 68, 69, -1, -1,
- -1, -1, -1, 75, 76, -1, -1, -1, -1, -1,
- -1, 83, 84, 85, 86, 87, 88, 89, 57, 58,
- 59, 60, 61, 62, -1, 64, -1, -1, 67, 68,
- 69, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 83, 84, 85, 86, 87, 88,
- 89
+ -1, 83, 84, 85, 86, 87, 88, 89, 49, 91,
+ -1, -1, -1, -1, -1, -1, 57, 58, 59, 60,
+ 61, 62, -1, 64, -1, -1, 67, 68, 69, 57,
+ 58, 59, 60, 61, 62, -1, 64, -1, -1, 67,
+ 68, 69, 83, 84, 85, 86, 87, 88, 89, -1,
+ -1, -1, -1, -1, -1, 83, 84, 85, 86, 87,
+ 88, 89, -1, -1, -1, 93, 57, 58, 59, 60,
+ 61, 62, -1, 64, -1, -1, 67, 68, 69, -1,
+ -1, -1, -1, -1, 75, 76, -1, -1, -1, -1,
+ -1, -1, 83, 84, 85, 86, 87, 88, 89, 57,
+ 58, 59, 60, 61, 62, -1, 64, -1, -1, 67,
+ 68, 69, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 83, 84, 85, 86, 87,
+ 88, 89
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1155,37 +1155,37 @@ static const yytype_uint8 yystos[] =
43, 44, 45, 48, 52, 53, 54, 56, 63, 70,
71, 72, 73, 74, 77, 78, 79, 86, 87, 92,
95, 99, 100, 101, 102, 104, 106, 110, 111, 112,
- 117, 118, 119, 120, 121, 125, 127, 129, 133, 138,
- 141, 91, 21, 43, 119, 92, 119, 139, 92, 139,
- 21, 118, 92, 119, 140, 128, 132, 44, 21, 122,
- 37, 39, 40, 41, 42, 119, 126, 130, 119, 49,
- 50, 15, 16, 21, 28, 21, 21, 119, 55, 119,
- 126, 21, 124, 119, 119, 119, 119, 119, 119, 119,
- 21, 123, 134, 119, 119, 119, 22, 24, 97, 118,
- 142, 143, 144, 145, 0, 91, 119, 59, 119, 103,
- 109, 112, 119, 121, 138, 57, 58, 59, 60, 61,
- 62, 64, 67, 68, 69, 83, 84, 85, 86, 87,
- 88, 89, 114, 92, 119, 119, 139, 94, 139, 139,
- 94, 139, 114, 94, 119, 39, 126, 21, 36, 65,
+ 117, 118, 119, 120, 121, 126, 128, 130, 134, 139,
+ 142, 91, 21, 43, 119, 92, 119, 140, 92, 140,
+ 21, 118, 92, 119, 141, 129, 133, 44, 122, 37,
+ 39, 40, 41, 42, 119, 127, 131, 119, 49, 50,
+ 15, 16, 21, 28, 21, 21, 119, 55, 119, 127,
+ 21, 125, 119, 119, 119, 119, 119, 119, 119, 21,
+ 124, 135, 119, 119, 119, 22, 24, 97, 118, 143,
+ 144, 145, 146, 0, 91, 119, 59, 119, 103, 109,
+ 112, 119, 121, 139, 57, 58, 59, 60, 61, 62,
+ 64, 67, 68, 69, 83, 84, 85, 86, 87, 88,
+ 89, 114, 92, 119, 119, 140, 94, 140, 140, 94,
+ 140, 114, 21, 123, 119, 39, 127, 21, 36, 65,
66, 21, 47, 59, 118, 47, 59, 47, 46, 49,
- 126, 94, 41, 47, 41, 47, 41, 47, 41, 47,
+ 127, 94, 41, 47, 41, 47, 41, 47, 41, 47,
75, 76, 47, 91, 94, 21, 93, 97, 97, 96,
94, 94, 100, 115, 119, 115, 115, 119, 119, 119,
119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
- 119, 119, 119, 119, 119, 21, 135, 93, 119, 93,
- 93, 119, 135, 21, 119, 131, 21, 120, 119, 119,
+ 119, 119, 119, 119, 119, 21, 136, 93, 119, 93,
+ 93, 119, 136, 94, 119, 132, 21, 120, 119, 119,
119, 119, 47, 59, 119, 119, 119, 119, 21, 119,
119, 119, 119, 119, 119, 119, 119, 119, 119, 105,
- 105, 21, 118, 118, 118, 22, 24, 145, 116, 115,
- 46, 115, 91, 94, 91, 114, 119, 119, 41, 41,
- 41, 41, 102, 116, 91, 104, 115, 29, 47, 116,
- 46, 94, 137, 21, 137, 135, 119, 119, 119, 119,
- 115, 115, 81, 47, 119, 115, 102, 21, 116, 116,
- 91, 82, 119, 115, 107, 115, 25, 137, 115, 116,
- 30, 31, 108, 113, 115, 30, 80, 21, 136, 116,
- 116, 115, 114, 119, 80, 114, 94, 115, 81, 116,
- 115, 102, 21, 81, 115, 46, 115, 80, 116, 80,
- 115
+ 105, 21, 118, 118, 118, 22, 24, 146, 116, 115,
+ 46, 115, 91, 94, 91, 21, 114, 119, 119, 41,
+ 41, 41, 41, 102, 116, 91, 104, 115, 29, 47,
+ 116, 46, 94, 138, 21, 138, 136, 119, 119, 119,
+ 119, 115, 115, 81, 47, 119, 115, 102, 21, 116,
+ 116, 91, 82, 119, 115, 107, 115, 25, 138, 115,
+ 116, 30, 31, 108, 113, 115, 30, 80, 21, 137,
+ 116, 116, 115, 114, 119, 80, 114, 94, 115, 81,
+ 116, 115, 102, 21, 81, 115, 46, 115, 80, 116,
+ 80, 115
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -1201,13 +1201,13 @@ static const yytype_uint8 yyr1[] =
119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
119, 119, 119, 119, 119, 119, 119, 119, 120, 121,
- 121, 121, 121, 121, 121, 121, 121, 121, 121, 121,
- 121, 122, 122, 123, 123, 124, 124, 125, 125, 125,
- 125, 125, 125, 126, 126, 127, 127, 127, 127, 128,
- 127, 130, 131, 129, 129, 132, 129, 129, 129, 134,
- 133, 135, 135, 135, 135, 136, 136, 136, 137, 138,
- 139, 139, 139, 140, 140, 141, 142, 142, 142, 142,
- 143, 143, 144, 144, 145, 145
+ 121, 121, 121, 121, 122, 121, 121, 121, 121, 121,
+ 121, 121, 123, 123, 124, 124, 125, 125, 126, 126,
+ 126, 126, 126, 126, 127, 127, 128, 128, 128, 128,
+ 129, 128, 131, 132, 130, 130, 133, 130, 130, 130,
+ 135, 134, 136, 136, 136, 136, 137, 137, 137, 138,
+ 139, 140, 140, 140, 141, 141, 142, 143, 143, 143,
+ 143, 144, 144, 145, 145, 146, 146
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -1223,13 +1223,13 @@ static const yytype_int8 yyr2[] =
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
2, 3, 3, 3, 3, 2, 2, 3, 4, 4,
4, 6, 4, 6, 4, 6, 4, 6, 2, 2,
- 1, 1, 2, 1, 2, 2, 2, 4, 2, 4,
- 2, 1, 3, 1, 3, 1, 3, 2, 2, 2,
- 2, 3, 2, 3, 2, 2, 2, 3, 2, 0,
- 3, 0, 0, 9, 2, 0, 7, 8, 6, 0,
- 3, 0, 1, 3, 4, 0, 1, 3, 0, 2,
- 0, 1, 3, 1, 3, 3, 0, 1, 1, 1,
- 1, 3, 1, 3, 3, 3
+ 1, 1, 2, 1, 0, 3, 2, 2, 4, 2,
+ 4, 2, 1, 3, 1, 3, 1, 3, 2, 2,
+ 2, 2, 3, 2, 3, 2, 2, 2, 3, 2,
+ 0, 3, 0, 0, 9, 2, 0, 7, 8, 6,
+ 0, 3, 0, 1, 3, 4, 0, 1, 3, 0,
+ 2, 0, 1, 3, 1, 3, 3, 0, 1, 1,
+ 1, 1, 3, 1, 3, 3, 3
};
@@ -1730,7 +1730,7 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
#line 1731 "engines/director/lingo/lingo-gr.cpp"
break;
- case 133: /* on */
+ case 134: /* on */
#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1737 "engines/director/lingo/lingo-gr.cpp"
@@ -2652,194 +2652,206 @@ yyreduce:
#line 2653 "engines/director/lingo/lingo-gr.cpp"
break;
- case 107:
+ case 104:
+#line 451 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_indef = kStateInArgs; }
+#line 2659 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 105:
+#line 451 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_indef = kStateNone; }
+#line 2665 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 108:
#line 454 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2661 "engines/director/lingo/lingo-gr.cpp"
+#line 2673 "engines/director/lingo/lingo-gr.cpp"
break;
- case 108:
+ case 109:
#line 457 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
-#line 2669 "engines/director/lingo/lingo-gr.cpp"
+#line 2681 "engines/director/lingo/lingo-gr.cpp"
break;
- case 109:
+ case 110:
#line 460 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); }
-#line 2675 "engines/director/lingo/lingo-gr.cpp"
+#line 2687 "engines/director/lingo/lingo-gr.cpp"
break;
- case 110:
+ case 111:
#line 461 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); }
-#line 2681 "engines/director/lingo/lingo-gr.cpp"
+#line 2693 "engines/director/lingo/lingo-gr.cpp"
break;
- case 111:
+ case 112:
#line 463 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_global);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2690 "engines/director/lingo/lingo-gr.cpp"
+#line 2702 "engines/director/lingo/lingo-gr.cpp"
break;
- case 112:
+ case 113:
#line 467 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_global);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2699 "engines/director/lingo/lingo-gr.cpp"
+#line 2711 "engines/director/lingo/lingo-gr.cpp"
break;
- case 113:
+ case 114:
#line 472 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_property);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2708 "engines/director/lingo/lingo-gr.cpp"
+#line 2720 "engines/director/lingo/lingo-gr.cpp"
break;
- case 114:
+ case 115:
#line 476 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_property);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2717 "engines/director/lingo/lingo-gr.cpp"
+#line 2729 "engines/director/lingo/lingo-gr.cpp"
break;
- case 115:
+ case 116:
#line 481 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_instance);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2726 "engines/director/lingo/lingo-gr.cpp"
+#line 2738 "engines/director/lingo/lingo-gr.cpp"
break;
- case 116:
+ case 117:
#line 485 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_instance);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2735 "engines/director/lingo/lingo-gr.cpp"
+#line 2747 "engines/director/lingo/lingo-gr.cpp"
break;
- case 117:
+ case 118:
#line 497 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
-#line 2741 "engines/director/lingo/lingo-gr.cpp"
+#line 2753 "engines/director/lingo/lingo-gr.cpp"
break;
- case 118:
+ case 119:
#line 498 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
-#line 2747 "engines/director/lingo/lingo-gr.cpp"
+#line 2759 "engines/director/lingo/lingo-gr.cpp"
break;
- case 119:
+ case 120:
#line 499 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
-#line 2753 "engines/director/lingo/lingo-gr.cpp"
+#line 2765 "engines/director/lingo/lingo-gr.cpp"
break;
- case 120:
+ case 121:
#line 500 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); }
-#line 2762 "engines/director/lingo/lingo-gr.cpp"
+#line 2774 "engines/director/lingo/lingo-gr.cpp"
break;
- case 121:
+ case 122:
#line 504 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); }
-#line 2771 "engines/director/lingo/lingo-gr.cpp"
+#line 2783 "engines/director/lingo/lingo-gr.cpp"
break;
- case 122:
+ case 123:
#line 508 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); }
-#line 2780 "engines/director/lingo/lingo-gr.cpp"
+#line 2792 "engines/director/lingo/lingo-gr.cpp"
break;
- case 125:
+ case 126:
#line 516 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); }
-#line 2786 "engines/director/lingo/lingo-gr.cpp"
+#line 2798 "engines/director/lingo/lingo-gr.cpp"
break;
- case 126:
+ case 127:
#line 517 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); }
-#line 2795 "engines/director/lingo/lingo-gr.cpp"
+#line 2807 "engines/director/lingo/lingo-gr.cpp"
break;
- case 127:
+ case 128:
#line 521 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); }
-#line 2804 "engines/director/lingo/lingo-gr.cpp"
+#line 2816 "engines/director/lingo/lingo-gr.cpp"
break;
- case 128:
+ case 129:
#line 525 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); }
-#line 2813 "engines/director/lingo/lingo-gr.cpp"
+#line 2825 "engines/director/lingo/lingo-gr.cpp"
break;
- case 129:
+ case 130:
#line 529 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
-#line 2819 "engines/director/lingo/lingo-gr.cpp"
+#line 2831 "engines/director/lingo/lingo-gr.cpp"
break;
- case 130:
+ case 131:
#line 529 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg));
delete (yyvsp[-2].s); }
-#line 2828 "engines/director/lingo/lingo-gr.cpp"
+#line 2840 "engines/director/lingo/lingo-gr.cpp"
break;
- case 131:
+ case 132:
#line 559 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2834 "engines/director/lingo/lingo-gr.cpp"
+#line 2846 "engines/director/lingo/lingo-gr.cpp"
break;
- case 132:
+ case 133:
#line 559 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_currentFactory.clear(); }
-#line 2840 "engines/director/lingo/lingo-gr.cpp"
+#line 2852 "engines/director/lingo/lingo-gr.cpp"
break;
- case 133:
+ case 134:
#line 560 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
@@ -2847,22 +2859,22 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2851 "engines/director/lingo/lingo-gr.cpp"
+#line 2863 "engines/director/lingo/lingo-gr.cpp"
break;
- case 134:
+ case 135:
#line 566 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
-#line 2857 "engines/director/lingo/lingo-gr.cpp"
+#line 2869 "engines/director/lingo/lingo-gr.cpp"
break;
- case 135:
+ case 136:
#line 567 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2863 "engines/director/lingo/lingo-gr.cpp"
+#line 2875 "engines/director/lingo/lingo-gr.cpp"
break;
- case 136:
+ case 137:
#line 568 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
@@ -2870,10 +2882,10 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2874 "engines/director/lingo/lingo-gr.cpp"
+#line 2886 "engines/director/lingo/lingo-gr.cpp"
break;
- case 137:
+ case 138:
#line 574 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
@@ -2885,10 +2897,10 @@ yyreduce:
checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false);
delete (yyvsp[-7].s);
delete (yyvsp[-1].s); }
-#line 2889 "engines/director/lingo/lingo-gr.cpp"
+#line 2901 "engines/director/lingo/lingo-gr.cpp"
break;
- case 138:
+ case 139:
#line 584 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
@@ -2897,64 +2909,64 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_ignoreMe = false;
delete (yyvsp[-5].s); }
-#line 2901 "engines/director/lingo/lingo-gr.cpp"
+#line 2913 "engines/director/lingo/lingo-gr.cpp"
break;
- case 139:
+ case 140:
#line 592 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2907 "engines/director/lingo/lingo-gr.cpp"
+#line 2919 "engines/director/lingo/lingo-gr.cpp"
break;
- case 140:
+ case 141:
#line 592 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
-#line 2913 "engines/director/lingo/lingo-gr.cpp"
+#line 2925 "engines/director/lingo/lingo-gr.cpp"
break;
- case 141:
+ case 142:
#line 594 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2919 "engines/director/lingo/lingo-gr.cpp"
+#line 2931 "engines/director/lingo/lingo-gr.cpp"
break;
- case 142:
+ case 143:
#line 595 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
-#line 2925 "engines/director/lingo/lingo-gr.cpp"
+#line 2937 "engines/director/lingo/lingo-gr.cpp"
break;
- case 143:
+ case 144:
#line 596 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
-#line 2931 "engines/director/lingo/lingo-gr.cpp"
+#line 2943 "engines/director/lingo/lingo-gr.cpp"
break;
- case 144:
+ case 145:
#line 597 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
-#line 2937 "engines/director/lingo/lingo-gr.cpp"
+#line 2949 "engines/director/lingo/lingo-gr.cpp"
break;
- case 146:
+ case 147:
#line 600 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 2943 "engines/director/lingo/lingo-gr.cpp"
+#line 2955 "engines/director/lingo/lingo-gr.cpp"
break;
- case 147:
+ case 148:
#line 601 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 2949 "engines/director/lingo/lingo-gr.cpp"
+#line 2961 "engines/director/lingo/lingo-gr.cpp"
break;
- case 148:
+ case 149:
#line 603 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
-#line 2955 "engines/director/lingo/lingo-gr.cpp"
+#line 2967 "engines/director/lingo/lingo-gr.cpp"
break;
- case 149:
+ case 150:
#line 605 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
@@ -2963,113 +2975,113 @@ yyreduce:
WRITE_UINT32(&numpar, (yyvsp[0].narg));
g_lingo->code1(numpar);
delete (yyvsp[-1].s); }
-#line 2967 "engines/director/lingo/lingo-gr.cpp"
+#line 2979 "engines/director/lingo/lingo-gr.cpp"
break;
- case 150:
+ case 151:
#line 613 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2973 "engines/director/lingo/lingo-gr.cpp"
+#line 2985 "engines/director/lingo/lingo-gr.cpp"
break;
- case 151:
+ case 152:
#line 614 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2979 "engines/director/lingo/lingo-gr.cpp"
+#line 2991 "engines/director/lingo/lingo-gr.cpp"
break;
- case 152:
+ case 153:
#line 615 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2985 "engines/director/lingo/lingo-gr.cpp"
+#line 2997 "engines/director/lingo/lingo-gr.cpp"
break;
- case 153:
+ case 154:
#line 617 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2991 "engines/director/lingo/lingo-gr.cpp"
+#line 3003 "engines/director/lingo/lingo-gr.cpp"
break;
- case 154:
+ case 155:
#line 618 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2997 "engines/director/lingo/lingo-gr.cpp"
+#line 3009 "engines/director/lingo/lingo-gr.cpp"
break;
- case 155:
+ case 156:
#line 620 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 3003 "engines/director/lingo/lingo-gr.cpp"
+#line 3015 "engines/director/lingo/lingo-gr.cpp"
break;
- case 156:
+ case 157:
#line 622 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
-#line 3009 "engines/director/lingo/lingo-gr.cpp"
+#line 3021 "engines/director/lingo/lingo-gr.cpp"
break;
- case 157:
+ case 158:
#line 623 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
-#line 3015 "engines/director/lingo/lingo-gr.cpp"
+#line 3027 "engines/director/lingo/lingo-gr.cpp"
break;
- case 158:
+ case 159:
#line 624 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3021 "engines/director/lingo/lingo-gr.cpp"
+#line 3033 "engines/director/lingo/lingo-gr.cpp"
break;
- case 159:
+ case 160:
#line 625 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3027 "engines/director/lingo/lingo-gr.cpp"
+#line 3039 "engines/director/lingo/lingo-gr.cpp"
break;
- case 160:
+ case 161:
#line 627 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3033 "engines/director/lingo/lingo-gr.cpp"
+#line 3045 "engines/director/lingo/lingo-gr.cpp"
break;
- case 161:
+ case 162:
#line 628 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3039 "engines/director/lingo/lingo-gr.cpp"
+#line 3051 "engines/director/lingo/lingo-gr.cpp"
break;
- case 162:
+ case 163:
#line 630 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3045 "engines/director/lingo/lingo-gr.cpp"
+#line 3057 "engines/director/lingo/lingo-gr.cpp"
break;
- case 163:
+ case 164:
#line 631 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3051 "engines/director/lingo/lingo-gr.cpp"
+#line 3063 "engines/director/lingo/lingo-gr.cpp"
break;
- case 164:
+ case 165:
#line 633 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
delete (yyvsp[-2].s); }
-#line 3060 "engines/director/lingo/lingo-gr.cpp"
+#line 3072 "engines/director/lingo/lingo-gr.cpp"
break;
- case 165:
+ case 166:
#line 637 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
delete (yyvsp[-2].s); }
-#line 3069 "engines/director/lingo/lingo-gr.cpp"
+#line 3081 "engines/director/lingo/lingo-gr.cpp"
break;
-#line 3073 "engines/director/lingo/lingo-gr.cpp"
+#line 3085 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 4bdd1f4..dd7b83c 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -448,7 +448,7 @@ proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
| playfunc
| tEXIT tREPEAT { g_lingo->code1(LC::c_exitRepeat); }
| tEXIT { g_lingo->code1(LC::c_procret); }
- | tGLOBAL globallist
+ | tGLOBAL { g_lingo->_indef = kStateInArgs; } globallist { g_lingo->_indef = kStateNone; }
| tPROPERTY propertylist
| tINSTANCE instancelist
| BLTIN '(' arglist ')' {
Commit: ad44f47c3e8984dcf8f29a49c0eb2d5ff1bf43d1
https://github.com/scummvm/scummvm/commit/ad44f47c3e8984dcf8f29a49c0eb2d5ff1bf43d1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-15T21:25:09+01:00
Commit Message:
DIRECTOR: LINGO: Added test for 'global version'
Changed paths:
engines/director/lingo/tests/global.lingo
diff --git a/engines/director/lingo/tests/global.lingo b/engines/director/lingo/tests/global.lingo
index a658a44..30f13ed 100644
--- a/engines/director/lingo/tests/global.lingo
+++ b/engines/director/lingo/tests/global.lingo
@@ -1,3 +1,5 @@
+global version
+
on initPattern
global MaxPattern
set MaxPattern = 65
Commit: 7816d67128da7d2bc9643e16f60e5ac171ff7b34
https://github.com/scummvm/scummvm/commit/7816d67128da7d2bc9643e16f60e5ac171ff7b34
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-16T00:41:13+01:00
Commit Message:
MISC: Replaced GPLv2 license text with the latest one
Changed paths:
COPYING
diff --git a/COPYING b/COPYING
index 00ccfbb..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
- GNU GENERAL PUBLIC LICENSE
+
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
More information about the Scummvm-git-logs
mailing list