[Scummvm-git-logs] scummvm master -> b2cb41580e7caf7e56a0bb60afce785605f76ae0
sev-
sev at scummvm.org
Sat Jan 4 23:56:43 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b2cb41580e DIRECTOR: LINGO: Fix grammar for 'the entities' with id
Commit: b2cb41580e7caf7e56a0bb60afce785605f76ae0
https://github.com/scummvm/scummvm/commit/b2cb41580e7caf7e56a0bb60afce785605f76ae0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-05T00:56:11+01:00
Commit Message:
DIRECTOR: LINGO: Fix grammar for 'the entities' with id
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 d444854..0eaeab1 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -552,7 +552,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 126
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1638
+#define YYLAST 1598
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 107
@@ -561,7 +561,7 @@ union yyalloc
/* YYNRULES -- Number of rules. */
#define YYNRULES 160
/* YYNRULES -- Number of states. */
-#define YYNSTATES 343
+#define YYNSTATES 342
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -642,7 +642,7 @@ static const yytype_int16 yyrhs[] =
30, -1, 52, 128, 45, 129, -1, 52, 128, 74,
128, -1, 52, 128, 75, 128, -1, 54, 30, 68,
128, -1, 54, 15, 68, 128, -1, 54, 30, 56,
- 128, -1, 54, 15, 56, 128, -1, 54, 16, 128,
+ 128, -1, 54, 15, 56, 128, -1, 54, 16, 127,
56, 128, -1, 54, 16, 127, 68, 128, -1, 54,
37, 56, 128, -1, 145, -1, 128, -1, 130, -1,
145, -1, 128, -1, 130, -1, 117, -1, 111, -1,
@@ -661,7 +661,7 @@ static const yytype_int16 yyrhs[] =
113, -1, 57, 30, 55, -1, 86, -1, 12, -1,
17, -1, 33, -1, 31, -1, 30, -1, 127, -1,
129, -1, 25, -1, 26, 128, -1, 27, 146, -1,
- 30, 102, 146, 103, -1, 15, -1, 16, 128, -1,
+ 30, 102, 146, 103, -1, 15, -1, 16, 127, -1,
37, -1, 110, -1, 128, 96, 128, -1, 128, 97,
128, -1, 128, 98, 128, -1, 128, 99, 128, -1,
128, 73, 128, -1, 128, 94, 128, -1, 128, 93,
@@ -828,7 +828,7 @@ static const yytype_uint8 yydefact[] =
51, 0, 0, 101, 0, 0, 0, 156, 0, 3,
66, 26, 7, 27, 0, 0, 0, 0, 0, 57,
20, 58, 21, 104, 105, 6, 45, 19, 4, 56,
- 0, 64, 113, 112, 157, 115, 156, 60, 61, 56,
+ 64, 56, 0, 113, 112, 157, 115, 156, 60, 61,
102, 156, 159, 155, 156, 45, 106, 119, 108, 125,
0, 126, 0, 127, 128, 130, 139, 103, 0, 41,
0, 0, 0, 0, 0, 141, 117, 133, 134, 136,
@@ -838,33 +838,33 @@ static const yytype_uint8 yydefact[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 147, 156, 0, 0, 118,
157, 0, 0, 138, 147, 0, 132, 0, 129, 45,
- 0, 0, 0, 42, 0, 0, 57, 0, 0, 0,
- 0, 50, 0, 135, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 87, 88, 2,
- 47, 46, 0, 31, 46, 0, 47, 76, 77, 74,
- 75, 78, 79, 71, 82, 83, 84, 73, 72, 81,
- 67, 68, 69, 70, 148, 0, 158, 62, 160, 0,
- 120, 131, 147, 8, 9, 10, 11, 15, 13, 0,
- 0, 14, 12, 18, 116, 124, 91, 0, 93, 0,
- 95, 0, 97, 0, 89, 90, 122, 99, 156, 46,
- 0, 47, 0, 33, 46, 154, 0, 154, 0, 17,
- 16, 0, 0, 0, 0, 0, 48, 49, 0, 0,
- 0, 46, 0, 0, 0, 47, 149, 47, 154, 92,
- 94, 96, 98, 100, 28, 0, 46, 36, 46, 32,
- 150, 145, 143, 47, 46, 47, 44, 46, 36, 0,
- 0, 151, 140, 47, 46, 45, 0, 37, 46, 45,
- 40, 152, 144, 46, 0, 47, 34, 0, 0, 0,
- 0, 29, 46, 47, 46, 153, 30, 0, 46, 0,
- 35, 38, 39
+ 0, 0, 0, 42, 0, 0, 0, 0, 0, 0,
+ 50, 0, 135, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 87, 88, 2, 47,
+ 46, 0, 31, 46, 0, 47, 76, 77, 74, 75,
+ 78, 79, 71, 82, 83, 84, 73, 72, 81, 67,
+ 68, 69, 70, 148, 0, 158, 62, 160, 0, 120,
+ 131, 147, 8, 9, 10, 11, 15, 13, 0, 0,
+ 14, 12, 18, 116, 124, 91, 0, 93, 0, 95,
+ 0, 97, 0, 89, 90, 122, 99, 156, 46, 0,
+ 47, 0, 33, 46, 154, 0, 154, 0, 16, 17,
+ 0, 0, 0, 0, 0, 48, 49, 0, 0, 0,
+ 46, 0, 0, 0, 47, 149, 47, 154, 92, 94,
+ 96, 98, 100, 28, 0, 46, 36, 46, 32, 150,
+ 145, 143, 47, 46, 47, 44, 46, 36, 0, 0,
+ 151, 140, 47, 46, 45, 0, 37, 46, 45, 40,
+ 152, 144, 46, 0, 47, 34, 0, 0, 0, 0,
+ 29, 46, 47, 46, 153, 30, 0, 46, 0, 35,
+ 38, 39
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 48, 49, 50, 51, 131, 277, 53, 307, 308,
- 132, 54, 55, 56, 309, 155, 200, 259, 57, 58,
+ -1, 48, 49, 50, 51, 131, 276, 53, 306, 307,
+ 132, 54, 55, 56, 308, 155, 199, 258, 57, 58,
59, 60, 61, 62, 88, 119, 111, 63, 95, 64,
- 84, 65, 169, 85, 66, 225, 322, 285, 67, 161,
+ 84, 65, 169, 85, 66, 224, 321, 284, 67, 161,
83
};
@@ -873,50 +873,50 @@ static const yytype_int16 yydefgoto[] =
#define YYPACT_NINF -268
static const yytype_int16 yypact[] =
{
- 316, -42, -268, -268, 976, -268, -268, 976, 976, 976,
- 21, -268, 976, 976, 57, 1009, -268, -268, -268, -268,
- -268, 15, 40, 854, -268, 55, 976, -38, 41, 64,
- 71, 976, 915, 80, 976, 976, 976, 976, 976, 976,
- -268, 81, 82, 11, 976, 976, 976, 976, 2, -268,
- -268, -268, -268, -268, 976, 46, 976, 680, 976, -268,
- 1526, -268, -268, -268, -268, -268, -268, -268, -268, 13,
- 976, 1526, 1526, 1526, 1526, 10, 976, 1526, 10, -268,
- -268, 976, 1526, 12, 976, -268, -268, -268, 14, -268,
- 976, -268, 69, -268, 1062, -268, -268, 1048, 89, -268,
- -31, 976, 36, 65, 72, -268, 1420, -268, 1062, -268,
- -268, 18, -268, 1098, 1132, 1166, 1200, 1492, -268, 20,
- -268, 100, -268, -268, 1454, 3, -268, 407, 1526, 976,
- 1526, -268, -268, 976, 1526, -268, -268, 1370, 976, 976,
- 976, 976, 976, 976, 976, 976, 976, 976, 976, 976,
- 976, 976, 976, 976, 976, 101, 976, 1048, 976, 10,
- 1454, -27, 976, 10, 101, 102, 1526, 976, -268, -268,
- 77, 976, 976, -268, 976, 976, 83, 1406, 976, 976,
- 976, -268, 976, -268, 103, 976, 976, 976, 976, 976,
- 976, 976, 976, 976, 976, 125, -10, -268, -268, -268,
- -268, 1526, 104, -268, 1526, 976, -268, -50, -50, -50,
- -50, 1539, 1539, -268, -34, -50, -50, -50, -50, -34,
- -15, -15, -268, -268, -268, -77, 1526, -268, 1526, -46,
- -268, 1526, 101, -268, -268, 1526, 1526, 1526, -50, 976,
- 976, 1526, -50, 1526, 1526, -268, 1526, 1234, 1526, 1268,
- 1526, 1302, 1526, 1336, 1526, 1526, -268, -268, 976, 589,
- -20, -268, 105, 1526, 589, 50, 127, 50, -6, -50,
- 1526, 976, 976, 976, 976, -1, -268, -268, 70, 106,
- 976, 589, 771, 73, 134, -268, -268, -268, 50, 1526,
- 1526, 1526, 1526, -268, -268, 976, 1526, 126, -268, -268,
- -268, 498, 589, -268, 1526, -268, -268, 130, 126, 976,
- -23, 142, 589, -268, 589, -268, 90, -268, 1526, -268,
- -268, -268, 67, 589, 107, -268, -268, 136, 771, 162,
- 108, -268, 589, -268, -268, -268, -268, 110, 589, 112,
- -268, -268, -268
+ 312, -79, -268, -268, 73, -268, -268, 972, 972, 972,
+ 5, -268, 972, 972, 73, 1005, -268, -268, -268, -268,
+ -268, -36, 46, 850, -268, 62, 972, -13, 65, 71,
+ 79, 972, 911, 81, 972, 972, 972, 972, 972, 972,
+ -268, 82, 83, -76, 972, 972, 972, 972, 9, -268,
+ -268, -268, -268, -268, 972, 47, 972, 676, 972, -268,
+ 1486, -268, -268, -268, -268, -268, -268, -268, -268, -268,
+ -268, 12, 972, 1486, 1486, 1486, 10, 972, 1486, 10,
+ -268, 972, 1486, 11, 972, -268, -268, -268, 17, -268,
+ 972, -268, 76, -268, 1058, -268, -268, 1044, 88, -268,
+ -14, 73, 7, 69, 72, -268, 1380, -268, 1058, -268,
+ -268, 22, -268, 1094, 1128, 1162, 1196, 1452, -268, 23,
+ -268, 100, -268, -268, 1414, -44, -268, 403, 1486, 972,
+ 1486, -268, -268, 972, 1486, -268, -268, 1366, 972, 972,
+ 972, 972, 972, 972, 972, 972, 972, 972, 972, 972,
+ 972, 972, 972, 972, 972, 120, 972, 1044, 972, 10,
+ 1414, -88, 972, 10, 120, 122, 1486, 972, -268, -268,
+ 70, 972, 972, -268, 972, 972, 26, 972, 972, 972,
+ -268, 972, -268, 123, 972, 972, 972, 972, 972, 972,
+ 972, 972, 972, 972, 124, -10, -268, -268, -268, -268,
+ 1486, 101, -268, 1486, 972, -268, -40, -40, -40, -40,
+ 1499, 1499, -268, -30, -40, -40, -40, -40, -30, -1,
+ -1, -268, -268, -268, -53, 1486, -268, 1486, -17, -268,
+ 1486, 120, -268, -268, 1486, 1486, 1486, -40, 972, 972,
+ 1486, -40, 1486, 1486, -268, 1486, 1230, 1486, 1264, 1486,
+ 1298, 1486, 1332, 1486, 1486, -268, -268, 972, 585, -4,
+ -268, 102, 1486, 585, 52, 129, 52, -15, 1486, -40,
+ 972, 972, 972, 972, 2, -268, -268, 75, 105, 972,
+ 585, 767, 77, 132, -268, -268, -268, 52, 1486, 1486,
+ 1486, 1486, -268, -268, 972, 1486, 133, -268, -268, -268,
+ 494, 585, -268, 1486, -268, -268, 136, 133, 972, -26,
+ 157, 585, -268, 585, -268, 98, -268, 1486, -268, -268,
+ -268, 57, 585, 99, -268, -268, 138, 767, 161, 103,
+ -268, 585, -268, -268, -268, -268, 106, 585, 108, -268,
+ -268, -268
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -268, -268, 76, -268, -267, -268, 1, -268, -114, -268,
- -268, -268, -268, 147, -268, -78, -8, -108, -268, -268,
- -2, -4, 37, 149, -268, -268, -268, -268, -19, -268,
- -268, -268, -268, -268, -268, -150, -268, -250, 151, -3,
+ -268, -268, 68, -268, -267, -268, 21, -268, -108, -268,
+ -268, -268, -268, 144, -268, -81, -11, -84, -268, -268,
+ 6, -7, 33, 147, -268, -268, -268, -268, -21, -268,
+ -268, -268, -268, -268, -268, -152, -268, -243, 148, -6,
-268
};
@@ -927,132 +927,135 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -6
static const yytype_int16 yytable[] =
{
- 71, 52, 126, 72, 73, 74, 75, 164, 77, 74,
- 78, 82, 80, 109, 229, 298, 319, 287, 279, 94,
- 98, 99, 97, 144, 265, 174, 145, 106, 108, 266,
- 112, 113, 114, 115, 116, 117, 280, 175, 303, 144,
- 122, 123, 124, 74, 125, 150, 151, 152, 153, 154,
- 128, 76, 130, 134, 137, 267, 100, 101, 144, 68,
- 266, 334, 151, 152, 153, 154, 157, 320, 86, 2,
- 87, 102, 74, 159, 5, 168, 227, 160, 103, 158,
- 74, 163, 268, 153, 154, 96, 166, 79, 16, 183,
- 17, 232, 178, 257, 104, 288, 258, 177, 264, 176,
- 266, 105, 293, 127, 179, 158, 14, 233, 198, 158,
- 110, 118, 120, 121, 129, 156, 158, 167, 162, 173,
- 165, 180, 202, 203, 184, 201, 195, 181, 52, 204,
- 196, 224, 230, 245, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
- 223, 239, 74, 281, 226, 256, 284, 286, 228, 261,
- 282, 294, 295, 231, 300, 299, 306, 235, 236, 315,
- 237, 238, 321, 329, 241, 242, 243, 301, 244, 302,
- 326, 246, 247, 248, 249, 250, 251, 252, 253, 254,
- 255, 333, 335, 260, 317, 312, 262, 314, 331, 336,
- 340, 263, 342, 199, 133, 323, 135, 234, 136, 0,
- 0, 0, 0, 0, 0, 0, 0, 332, 0, 0,
- 0, 0, 0, 0, 0, 338, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 269, 270, 325, 0, 0,
- 0, 328, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 278, 0, 0, 74, 275, 283, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 289, 290, 291,
- 292, 0, 0, 297, 0, 0, 296, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 305, 0,
- 310, 304, 0, 0, 0, 0, 313, 0, 0, 316,
- 0, 0, 0, 0, 0, 318, 324, 0, 0, 0,
- 327, 0, 0, 0, 0, 330, -5, 1, 0, 0,
- 0, 0, 0, 0, 337, 0, 339, 0, 2, 0,
- 341, 3, 4, 5, 0, 6, 7, 8, 9, 10,
+ 73, 74, 75, 76, 164, 78, 75, 79, 82, 126,
+ 70, 109, 228, 318, 297, 226, 94, 86, 158, 97,
+ 80, 52, 68, 286, 106, 108, 121, 112, 113, 114,
+ 115, 116, 117, 144, 278, 77, 145, 122, 123, 124,
+ 75, 125, 174, 144, 302, 98, 99, 128, 264, 130,
+ 134, 137, 279, 265, 175, 150, 151, 152, 153, 154,
+ 333, 197, 158, 177, 319, 157, 151, 152, 153, 154,
+ 75, 159, 144, 168, 160, 178, 87, 75, 163, 267,
+ 100, 101, 238, 166, 266, 2, 287, 182, 231, 265,
+ 5, 265, 96, 256, 239, 102, 257, 153, 154, 14,
+ 232, 104, 103, 69, 16, 292, 17, 176, 158, 105,
+ 127, 110, 118, 120, 156, 129, 158, 162, 173, 201,
+ 202, 263, 200, 165, 167, 179, 203, 180, 183, 194,
+ 195, 206, 207, 208, 209, 210, 211, 212, 213, 214,
+ 215, 216, 217, 218, 219, 220, 221, 222, 52, 75,
+ 223, 225, 229, 244, 255, 227, 260, 281, 283, 285,
+ 230, 294, 299, 328, 234, 235, 293, 236, 237, 298,
+ 240, 241, 242, 305, 243, 314, 280, 245, 246, 247,
+ 248, 249, 250, 251, 252, 253, 254, 320, 325, 259,
+ 330, 334, 261, 332, 335, 198, 339, 262, 341, 316,
+ 300, 133, 301, 233, 135, 136, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 311, 0,
+ 313, 0, 0, 0, 0, 0, 0, 0, 322, 0,
+ 0, 268, 269, 324, 0, 0, 0, 327, 0, 0,
+ 331, 0, 0, 0, 0, 0, 0, 277, 337, 0,
+ 75, 274, 282, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 288, 289, 290, 291, 0, 0, 296,
+ 0, 0, 295, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 304, 0, 309, 303, 0, 0,
+ 0, 0, 312, 0, 0, 315, 0, 0, 0, 0,
+ 0, 317, 323, 0, 0, 0, 326, 0, 0, 0,
+ 0, 329, -5, 1, 0, 0, 0, 0, 0, 0,
+ 336, 0, 338, 0, 2, 0, 340, 3, 4, 5,
+ 0, 6, 7, 8, 9, 10, 0, 11, 12, 13,
+ 0, 14, 15, 16, 0, 17, 0, 18, 19, 20,
+ 0, 0, 0, 21, 22, 23, 24, 0, 0, 25,
+ 0, 0, 0, 0, 26, 27, 28, 0, 0, 29,
+ 0, 0, 0, 30, 31, 32, 0, 33, 0, 0,
+ 0, 0, 0, 0, 34, 0, 0, 0, 0, 0,
+ 0, 35, 36, 37, 38, 39, 0, 0, 40, 41,
+ 42, 43, 0, 0, 0, 0, 0, 0, 44, 45,
+ 0, 0, 0, -5, 46, 2, 47, 0, 3, 4,
+ 5, 0, 6, 7, 8, 9, 10, 0, 11, 12,
+ 13, 0, 14, 15, 16, 0, 17, 0, 18, 19,
+ 20, 0, 0, 0, 21, 22, 23, 24, 0, 0,
+ 25, 0, 0, 0, 0, 26, 27, 28, 0, 0,
+ 29, 0, 0, 0, 30, 31, 32, 0, 33, 0,
+ 0, 0, 0, 0, 0, 34, 0, 0, 0, 0,
+ 0, 0, 35, 36, 37, 38, 39, 0, 0, 40,
+ 41, 42, 43, 0, 0, 0, 0, 0, 0, 44,
+ 45, 0, 0, 0, 0, 46, 2, 47, 0, 3,
+ 4, 5, 0, 6, 7, 8, 9, 10, 0, 11,
+ 12, 13, 0, 14, 15, 16, 0, 17, 310, 18,
+ 0, 20, 0, 0, 0, 21, 22, 23, 24, 0,
+ 0, 0, 0, 0, 0, 0, 26, 27, 28, 0,
+ 0, 29, 0, 0, 0, 0, 31, 32, 0, 33,
+ 0, 0, 0, 0, 0, 0, 34, 0, 0, 0,
+ 0, 0, 0, 35, 36, 37, 38, 39, 0, 0,
+ 40, 41, 0, 43, 0, 0, 0, 0, 0, 0,
+ 44, 45, 0, 0, 0, 275, 46, 2, 47, 0,
+ 3, 4, 5, 0, 6, 7, 8, 9, 10, 0,
+ 11, 12, 13, 0, 14, 15, 16, 0, 17, 0,
+ 18, 0, 20, 0, 0, 0, 21, 22, 23, 24,
+ 0, 0, 0, 0, 0, 0, 0, 26, 27, 28,
+ 0, 0, 29, 0, 0, 0, 0, 31, 32, 0,
+ 33, 0, 0, 0, 0, 0, 0, 34, 0, 0,
+ 0, 0, 0, 0, 35, 36, 37, 38, 39, 0,
+ 0, 40, 41, 0, 43, 0, 0, 0, 0, 0,
+ 0, 44, 45, 0, 0, 0, 275, 46, 2, 47,
+ 0, 3, 4, 5, 0, 6, 7, 8, 9, 10,
0, 11, 12, 13, 0, 14, 15, 16, 0, 17,
- 0, 18, 19, 20, 0, 0, 0, 21, 22, 23,
- 24, 0, 0, 25, 0, 0, 0, 0, 26, 27,
- 28, 0, 0, 29, 0, 0, 0, 30, 31, 32,
+ 0, 18, 0, 20, 0, 0, 0, 21, 22, 23,
+ 24, 0, 0, 0, 0, 0, 0, 0, 26, 0,
+ 28, 0, 0, 0, 0, 0, 0, 0, 31, 32,
0, 33, 0, 0, 0, 0, 0, 0, 34, 0,
0, 0, 0, 0, 0, 35, 36, 37, 38, 39,
- 0, 0, 40, 41, 42, 43, 0, 0, 0, 0,
- 0, 0, 44, 45, 0, 0, 0, -5, 46, 2,
+ 0, 0, 0, 41, 0, 43, 0, 0, 0, 0,
+ 0, 0, 44, 45, 0, 0, 0, 0, 46, 2,
47, 0, 3, 4, 5, 0, 6, 7, 8, 9,
10, 0, 11, 12, 13, 0, 14, 15, 16, 0,
- 17, 0, 18, 19, 20, 0, 0, 0, 21, 22,
- 23, 24, 0, 0, 25, 0, 0, 0, 0, 26,
- 27, 28, 0, 0, 29, 0, 0, 0, 30, 31,
+ 17, 0, 18, 0, 20, 0, 0, 0, 21, 22,
+ 23, 0, 0, 0, 0, 0, 0, 0, 0, 26,
+ 0, 28, 0, 0, 0, 0, 0, 0, 0, 31,
32, 0, 33, 0, 0, 0, 0, 0, 0, 34,
0, 0, 0, 0, 0, 0, 35, 36, 37, 38,
- 39, 0, 0, 40, 41, 42, 43, 0, 0, 0,
- 0, 0, 0, 44, 45, 0, 0, 0, 0, 46,
- 2, 47, 0, 3, 4, 5, 0, 6, 7, 8,
- 9, 10, 0, 11, 12, 13, 0, 14, 15, 16,
- 0, 17, 311, 18, 0, 20, 0, 0, 0, 21,
- 22, 23, 24, 0, 0, 0, 0, 0, 0, 0,
- 26, 27, 28, 0, 0, 29, 0, 0, 0, 0,
- 31, 32, 0, 33, 0, 0, 0, 0, 0, 0,
- 34, 0, 0, 0, 0, 0, 0, 35, 36, 37,
- 38, 39, 0, 0, 40, 41, 0, 43, 0, 0,
- 0, 0, 0, 0, 44, 45, 0, 0, 0, 276,
- 46, 2, 47, 0, 3, 4, 5, 0, 6, 7,
- 8, 9, 10, 0, 11, 12, 13, 0, 14, 15,
- 16, 0, 17, 0, 18, 0, 20, 0, 0, 0,
- 21, 22, 23, 24, 0, 0, 0, 0, 0, 0,
- 0, 26, 27, 28, 0, 0, 29, 0, 0, 0,
- 0, 31, 32, 0, 33, 0, 0, 0, 0, 0,
- 0, 34, 0, 0, 0, 0, 0, 0, 35, 36,
- 37, 38, 39, 0, 0, 40, 41, 0, 43, 0,
- 0, 0, 0, 0, 0, 44, 45, 0, 0, 0,
- 276, 46, 2, 47, 0, 3, 4, 5, 0, 6,
- 7, 8, 9, 10, 0, 11, 12, 13, 0, 14,
- 15, 16, 0, 17, 0, 18, 0, 20, 0, 0,
- 0, 21, 22, 23, 24, 0, 0, 0, 0, 0,
- 0, 0, 26, 0, 28, 0, 0, 0, 0, 0,
- 0, 0, 31, 32, 0, 33, 0, 0, 0, 0,
- 0, 0, 34, 0, 0, 0, 0, 0, 0, 35,
- 36, 37, 38, 39, 0, 0, 0, 41, 0, 43,
- 0, 0, 0, 0, 0, 0, 44, 45, 0, 0,
- 0, 0, 46, 2, 47, 0, 3, 4, 5, 0,
- 6, 7, 8, 9, 10, 0, 11, 12, 13, 0,
- 14, 15, 16, 0, 17, 0, 18, 0, 20, 0,
- 0, 0, 21, 22, 23, 0, 0, 0, 0, 0,
- 0, 0, 0, 26, 0, 28, 0, 0, 0, 0,
- 0, 0, 0, 31, 32, 0, 33, 0, 0, 0,
- 0, 0, 0, 34, 0, 0, 0, 0, 0, 0,
- 35, 36, 37, 38, 39, 0, 0, 0, 41, 0,
- 43, 0, 0, 0, 0, 0, 2, 44, 45, 3,
- 4, 5, 0, 46, 0, 47, 0, 0, 0, 11,
- 12, 13, 0, 14, 69, 16, 0, 17, 0, 0,
- 0, 20, 0, 0, 0, 0, 0, 0, 0, 0,
- 89, 0, 90, 91, 92, 93, 70, 0, 28, 0,
+ 39, 0, 0, 0, 41, 0, 43, 0, 0, 0,
+ 0, 0, 2, 44, 45, 3, 4, 5, 0, 46,
+ 0, 47, 0, 0, 0, 11, 12, 13, 0, 14,
+ 71, 16, 0, 17, 0, 0, 0, 20, 0, 0,
+ 0, 0, 0, 0, 0, 0, 89, 0, 90, 91,
+ 92, 93, 72, 0, 28, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 34, 2, 0, 0,
- 3, 4, 5, 35, 36, 37, 38, 39, 0, 0,
- 11, 12, 13, 43, 14, 69, 16, 0, 17, 0,
- 44, 45, 20, 0, 0, 0, 46, 0, 47, 0,
- 0, 0, 0, 90, 0, 92, 0, 70, 0, 28,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 107,
- 0, 0, 0, 0, 0, 0, 0, 34, 2, 0,
- 0, 3, 4, 5, 35, 36, 37, 38, 39, 0,
- 0, 11, 12, 13, 43, 14, 69, 16, 0, 17,
- 0, 44, 45, 20, 0, 0, 0, 46, 0, 47,
- 0, 2, 0, 0, 3, 4, 5, 0, 70, 0,
- 28, 0, 0, 0, 11, 12, 13, 0, 14, 69,
- 16, 0, 17, 0, 0, 0, 20, 0, 34, 0,
- 0, 0, 0, 0, 0, 35, 36, 37, 38, 39,
- 0, 70, 0, 28, 0, 43, 0, 0, 0, 0,
- 0, 0, 44, 45, 0, 0, 0, 0, 46, 0,
- 47, 34, 0, 0, 0, 0, 0, 0, 35, 36,
- 37, 38, 39, 170, 0, 0, 0, 0, 43, 0,
- 0, 0, 0, 0, 0, 44, 45, 0, 0, 0,
- 90, 81, 92, 47, 138, 139, 140, 141, 142, 143,
- 0, 144, 171, 172, 145, 146, 147, 0, 138, 139,
- 140, 141, 142, 143, 0, 144, 0, 0, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 185, 0,
- 0, 0, 0, 0, 186, 148, 149, 150, 151, 152,
- 153, 154, 0, 0, 138, 139, 140, 141, 142, 143,
+ 0, 0, 34, 2, 0, 0, 3, 4, 5, 35,
+ 36, 37, 38, 39, 0, 0, 11, 12, 13, 43,
+ 14, 71, 16, 0, 17, 0, 44, 45, 20, 0,
+ 0, 0, 46, 0, 47, 0, 0, 0, 0, 90,
+ 0, 92, 0, 72, 0, 28, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 107, 0, 0, 0, 0,
+ 0, 0, 0, 34, 2, 0, 0, 3, 4, 5,
+ 35, 36, 37, 38, 39, 0, 0, 11, 12, 13,
+ 43, 14, 71, 16, 0, 17, 0, 44, 45, 20,
+ 0, 0, 0, 46, 0, 47, 0, 2, 0, 0,
+ 3, 4, 5, 0, 72, 0, 28, 0, 0, 0,
+ 11, 12, 13, 0, 14, 71, 16, 0, 17, 0,
+ 0, 0, 20, 0, 34, 0, 0, 0, 0, 0,
+ 0, 35, 36, 37, 38, 39, 0, 72, 0, 28,
+ 0, 43, 0, 0, 0, 0, 0, 0, 44, 45,
+ 0, 0, 0, 0, 46, 0, 47, 34, 0, 0,
+ 0, 0, 0, 0, 35, 36, 37, 38, 39, 170,
+ 0, 0, 0, 0, 43, 0, 0, 0, 0, 0,
+ 0, 44, 45, 0, 0, 0, 90, 81, 92, 47,
+ 138, 139, 140, 141, 142, 143, 0, 144, 171, 172,
+ 145, 146, 147, 0, 138, 139, 140, 141, 142, 143,
+ 0, 144, 0, 0, 145, 146, 147, 148, 149, 150,
+ 151, 152, 153, 154, 184, 0, 0, 0, 0, 0,
+ 185, 148, 149, 150, 151, 152, 153, 154, 0, 0,
+ 138, 139, 140, 141, 142, 143, 0, 144, 0, 0,
+ 145, 146, 147, 0, 0, 0, 0, 0, 186, 0,
+ 0, 0, 0, 0, 187, 0, 0, 148, 149, 150,
+ 151, 152, 153, 154, 138, 139, 140, 141, 142, 143,
0, 144, 0, 0, 145, 146, 147, 0, 0, 0,
- 0, 0, 187, 0, 0, 0, 0, 0, 188, 0,
+ 0, 0, 188, 0, 0, 0, 0, 0, 189, 0,
0, 148, 149, 150, 151, 152, 153, 154, 138, 139,
140, 141, 142, 143, 0, 144, 0, 0, 145, 146,
- 147, 0, 0, 0, 0, 0, 189, 0, 0, 0,
- 0, 0, 190, 0, 0, 148, 149, 150, 151, 152,
+ 147, 0, 0, 0, 0, 0, 190, 0, 0, 0,
+ 0, 0, 191, 0, 0, 148, 149, 150, 151, 152,
153, 154, 138, 139, 140, 141, 142, 143, 0, 144,
0, 0, 145, 146, 147, 0, 0, 0, 0, 0,
- 191, 0, 0, 0, 0, 0, 192, 0, 0, 148,
+ 270, 0, 0, 0, 0, 0, 0, 0, 0, 148,
149, 150, 151, 152, 153, 154, 138, 139, 140, 141,
142, 143, 0, 144, 0, 0, 145, 146, 147, 0,
0, 0, 0, 0, 271, 0, 0, 0, 0, 0,
@@ -1065,26 +1068,19 @@ static const yytype_int16 yytable[] =
0, 0, 273, 0, 0, 0, 0, 0, 0, 0,
0, 148, 149, 150, 151, 152, 153, 154, 138, 139,
140, 141, 142, 143, 0, 144, 0, 0, 145, 146,
- 147, 0, 0, 0, 0, 0, 274, 0, 0, 0,
- 0, 0, 0, 0, 0, 148, 149, 150, 151, 152,
- 153, 154, 138, 139, 140, 141, 142, 143, 0, 144,
- 0, 0, 145, 146, 147, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 205, 0, 0, 148,
- 149, 150, 151, 152, 153, 154, 138, 139, 140, 141,
- 142, 143, 0, 144, 0, 0, 145, 146, 147, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 240, 148, 149, 150, 151, 152, 153, 154,
- 0, 206, 138, 139, 140, 141, 142, 143, 182, 144,
+ 147, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 204, 0, 0, 148, 149, 150, 151, 152,
+ 153, 154, 138, 139, 140, 141, 142, 143, 181, 144,
0, 0, 145, 146, 147, 0, 138, 139, 140, 141,
142, 143, 0, 144, 0, 0, 145, 146, 147, 148,
- 149, 150, 151, 152, 153, 154, 0, 0, 0, 0,
+ 149, 150, 151, 152, 153, 154, 0, 205, 0, 0,
0, 0, 0, 148, 149, 150, 151, 152, 153, 154,
138, 139, 140, 141, 142, 143, 0, 144, 0, 0,
145, 146, 147, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 148, 149, 150,
- 151, 152, 153, 154, 0, 0, 0, 197, 138, 139,
+ 151, 152, 153, 154, 0, 0, 0, 196, 138, 139,
140, 141, 142, 143, 0, 144, 0, 0, 145, 146,
- 147, 0, 0, 0, 0, 0, 193, 194, 0, 0,
+ 147, 0, 0, 0, 0, 0, 192, 193, 0, 0,
0, 0, 0, 0, 0, 148, 149, 150, 151, 152,
153, 154, 138, 139, 140, 141, 142, 143, 0, 144,
0, 0, 145, 146, 147, 138, 139, 140, 141, 0,
@@ -1095,123 +1091,126 @@ static const yytype_int16 yytable[] =
static const yytype_int16 yycheck[] =
{
- 4, 0, 0, 7, 8, 9, 9, 85, 12, 13,
- 13, 15, 14, 32, 164, 282, 39, 267, 38, 23,
- 58, 59, 26, 73, 101, 56, 76, 31, 32, 106,
- 34, 35, 36, 37, 38, 39, 56, 68, 288, 73,
- 44, 45, 46, 47, 47, 95, 96, 97, 98, 99,
- 54, 30, 56, 57, 58, 101, 15, 16, 73, 101,
- 106, 328, 96, 97, 98, 99, 70, 90, 53, 12,
- 30, 30, 76, 76, 17, 94, 103, 81, 37, 106,
- 84, 84, 232, 98, 99, 30, 90, 30, 31, 108,
- 33, 169, 56, 103, 30, 101, 106, 101, 206, 101,
- 106, 30, 103, 101, 68, 106, 29, 30, 105, 106,
- 30, 30, 30, 102, 68, 102, 106, 48, 106, 30,
- 106, 56, 130, 131, 106, 129, 106, 55, 127, 133,
- 30, 30, 30, 30, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 68, 156, 261, 158, 30, 106, 30, 162, 55,
- 55, 91, 56, 167, 30, 92, 40, 171, 172, 39,
- 174, 175, 30, 106, 178, 179, 180, 285, 182, 287,
- 90, 185, 186, 187, 188, 189, 190, 191, 192, 193,
- 194, 55, 30, 201, 308, 303, 204, 305, 91, 91,
- 90, 205, 90, 127, 57, 313, 57, 170, 57, -1,
- -1, -1, -1, -1, -1, -1, -1, 325, -1, -1,
- -1, -1, -1, -1, -1, 333, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 239, 240, 315, -1, -1,
- -1, 319, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 259, -1, -1, 258, 258, 264, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 271, 272, 273,
- 274, -1, -1, 281, -1, -1, 280, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 296, -1,
- 298, 295, -1, -1, -1, -1, 304, -1, -1, 307,
- -1, -1, -1, -1, -1, 309, 314, -1, -1, -1,
- 318, -1, -1, -1, -1, 323, 0, 1, -1, -1,
- -1, -1, -1, -1, 332, -1, 334, -1, 12, -1,
- 338, 15, 16, 17, -1, 19, 20, 21, 22, 23,
+ 7, 8, 9, 9, 85, 12, 13, 13, 15, 0,
+ 4, 32, 164, 39, 281, 103, 23, 53, 106, 26,
+ 14, 0, 101, 266, 31, 32, 102, 34, 35, 36,
+ 37, 38, 39, 73, 38, 30, 76, 44, 45, 46,
+ 47, 47, 56, 73, 287, 58, 59, 54, 101, 56,
+ 57, 58, 56, 106, 68, 95, 96, 97, 98, 99,
+ 327, 105, 106, 56, 90, 72, 96, 97, 98, 99,
+ 77, 77, 73, 94, 81, 68, 30, 84, 84, 231,
+ 15, 16, 56, 90, 101, 12, 101, 108, 169, 106,
+ 17, 106, 30, 103, 68, 30, 106, 98, 99, 29,
+ 30, 30, 37, 30, 31, 103, 33, 101, 106, 30,
+ 101, 30, 30, 30, 102, 68, 106, 106, 30, 130,
+ 131, 205, 129, 106, 48, 56, 133, 55, 106, 106,
+ 30, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 153, 154, 127, 156,
+ 30, 158, 30, 30, 30, 162, 55, 55, 106, 30,
+ 167, 56, 30, 106, 171, 172, 91, 174, 175, 92,
+ 177, 178, 179, 40, 181, 39, 260, 184, 185, 186,
+ 187, 188, 189, 190, 191, 192, 193, 30, 90, 200,
+ 91, 30, 203, 55, 91, 127, 90, 204, 90, 307,
+ 284, 57, 286, 170, 57, 57, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 302, -1,
+ 304, -1, -1, -1, -1, -1, -1, -1, 312, -1,
+ -1, 238, 239, 314, -1, -1, -1, 318, -1, -1,
+ 324, -1, -1, -1, -1, -1, -1, 258, 332, -1,
+ 257, 257, 263, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 270, 271, 272, 273, -1, -1, 280,
+ -1, -1, 279, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 295, -1, 297, 294, -1, -1,
+ -1, -1, 303, -1, -1, 306, -1, -1, -1, -1,
+ -1, 308, 313, -1, -1, -1, 317, -1, -1, -1,
+ -1, 322, 0, 1, -1, -1, -1, -1, -1, -1,
+ 331, -1, 333, -1, 12, -1, 337, 15, 16, 17,
+ -1, 19, 20, 21, 22, 23, -1, 25, 26, 27,
+ -1, 29, 30, 31, -1, 33, -1, 35, 36, 37,
+ -1, -1, -1, 41, 42, 43, 44, -1, -1, 47,
+ -1, -1, -1, -1, 52, 53, 54, -1, -1, 57,
+ -1, -1, -1, 61, 62, 63, -1, 65, -1, -1,
+ -1, -1, -1, -1, 72, -1, -1, -1, -1, -1,
+ -1, 79, 80, 81, 82, 83, -1, -1, 86, 87,
+ 88, 89, -1, -1, -1, -1, -1, -1, 96, 97,
+ -1, -1, -1, 101, 102, 12, 104, -1, 15, 16,
+ 17, -1, 19, 20, 21, 22, 23, -1, 25, 26,
+ 27, -1, 29, 30, 31, -1, 33, -1, 35, 36,
+ 37, -1, -1, -1, 41, 42, 43, 44, -1, -1,
+ 47, -1, -1, -1, -1, 52, 53, 54, -1, -1,
+ 57, -1, -1, -1, 61, 62, 63, -1, 65, -1,
+ -1, -1, -1, -1, -1, 72, -1, -1, -1, -1,
+ -1, -1, 79, 80, 81, 82, 83, -1, -1, 86,
+ 87, 88, 89, -1, -1, -1, -1, -1, -1, 96,
+ 97, -1, -1, -1, -1, 102, 12, 104, -1, 15,
+ 16, 17, -1, 19, 20, 21, 22, 23, -1, 25,
+ 26, 27, -1, 29, 30, 31, -1, 33, 34, 35,
+ -1, 37, -1, -1, -1, 41, 42, 43, 44, -1,
+ -1, -1, -1, -1, -1, -1, 52, 53, 54, -1,
+ -1, 57, -1, -1, -1, -1, 62, 63, -1, 65,
+ -1, -1, -1, -1, -1, -1, 72, -1, -1, -1,
+ -1, -1, -1, 79, 80, 81, 82, 83, -1, -1,
+ 86, 87, -1, 89, -1, -1, -1, -1, -1, -1,
+ 96, 97, -1, -1, -1, 101, 102, 12, 104, -1,
+ 15, 16, 17, -1, 19, 20, 21, 22, 23, -1,
+ 25, 26, 27, -1, 29, 30, 31, -1, 33, -1,
+ 35, -1, 37, -1, -1, -1, 41, 42, 43, 44,
+ -1, -1, -1, -1, -1, -1, -1, 52, 53, 54,
+ -1, -1, 57, -1, -1, -1, -1, 62, 63, -1,
+ 65, -1, -1, -1, -1, -1, -1, 72, -1, -1,
+ -1, -1, -1, -1, 79, 80, 81, 82, 83, -1,
+ -1, 86, 87, -1, 89, -1, -1, -1, -1, -1,
+ -1, 96, 97, -1, -1, -1, 101, 102, 12, 104,
+ -1, 15, 16, 17, -1, 19, 20, 21, 22, 23,
-1, 25, 26, 27, -1, 29, 30, 31, -1, 33,
- -1, 35, 36, 37, -1, -1, -1, 41, 42, 43,
- 44, -1, -1, 47, -1, -1, -1, -1, 52, 53,
- 54, -1, -1, 57, -1, -1, -1, 61, 62, 63,
+ -1, 35, -1, 37, -1, -1, -1, 41, 42, 43,
+ 44, -1, -1, -1, -1, -1, -1, -1, 52, -1,
+ 54, -1, -1, -1, -1, -1, -1, -1, 62, 63,
-1, 65, -1, -1, -1, -1, -1, -1, 72, -1,
-1, -1, -1, -1, -1, 79, 80, 81, 82, 83,
- -1, -1, 86, 87, 88, 89, -1, -1, -1, -1,
- -1, -1, 96, 97, -1, -1, -1, 101, 102, 12,
+ -1, -1, -1, 87, -1, 89, -1, -1, -1, -1,
+ -1, -1, 96, 97, -1, -1, -1, -1, 102, 12,
104, -1, 15, 16, 17, -1, 19, 20, 21, 22,
23, -1, 25, 26, 27, -1, 29, 30, 31, -1,
- 33, -1, 35, 36, 37, -1, -1, -1, 41, 42,
- 43, 44, -1, -1, 47, -1, -1, -1, -1, 52,
- 53, 54, -1, -1, 57, -1, -1, -1, 61, 62,
+ 33, -1, 35, -1, 37, -1, -1, -1, 41, 42,
+ 43, -1, -1, -1, -1, -1, -1, -1, -1, 52,
+ -1, 54, -1, -1, -1, -1, -1, -1, -1, 62,
63, -1, 65, -1, -1, -1, -1, -1, -1, 72,
-1, -1, -1, -1, -1, -1, 79, 80, 81, 82,
- 83, -1, -1, 86, 87, 88, 89, -1, -1, -1,
- -1, -1, -1, 96, 97, -1, -1, -1, -1, 102,
- 12, 104, -1, 15, 16, 17, -1, 19, 20, 21,
- 22, 23, -1, 25, 26, 27, -1, 29, 30, 31,
- -1, 33, 34, 35, -1, 37, -1, -1, -1, 41,
- 42, 43, 44, -1, -1, -1, -1, -1, -1, -1,
- 52, 53, 54, -1, -1, 57, -1, -1, -1, -1,
- 62, 63, -1, 65, -1, -1, -1, -1, -1, -1,
- 72, -1, -1, -1, -1, -1, -1, 79, 80, 81,
- 82, 83, -1, -1, 86, 87, -1, 89, -1, -1,
- -1, -1, -1, -1, 96, 97, -1, -1, -1, 101,
- 102, 12, 104, -1, 15, 16, 17, -1, 19, 20,
- 21, 22, 23, -1, 25, 26, 27, -1, 29, 30,
- 31, -1, 33, -1, 35, -1, 37, -1, -1, -1,
- 41, 42, 43, 44, -1, -1, -1, -1, -1, -1,
- -1, 52, 53, 54, -1, -1, 57, -1, -1, -1,
- -1, 62, 63, -1, 65, -1, -1, -1, -1, -1,
- -1, 72, -1, -1, -1, -1, -1, -1, 79, 80,
- 81, 82, 83, -1, -1, 86, 87, -1, 89, -1,
- -1, -1, -1, -1, -1, 96, 97, -1, -1, -1,
- 101, 102, 12, 104, -1, 15, 16, 17, -1, 19,
- 20, 21, 22, 23, -1, 25, 26, 27, -1, 29,
- 30, 31, -1, 33, -1, 35, -1, 37, -1, -1,
- -1, 41, 42, 43, 44, -1, -1, -1, -1, -1,
- -1, -1, 52, -1, 54, -1, -1, -1, -1, -1,
- -1, -1, 62, 63, -1, 65, -1, -1, -1, -1,
- -1, -1, 72, -1, -1, -1, -1, -1, -1, 79,
- 80, 81, 82, 83, -1, -1, -1, 87, -1, 89,
- -1, -1, -1, -1, -1, -1, 96, 97, -1, -1,
- -1, -1, 102, 12, 104, -1, 15, 16, 17, -1,
- 19, 20, 21, 22, 23, -1, 25, 26, 27, -1,
- 29, 30, 31, -1, 33, -1, 35, -1, 37, -1,
- -1, -1, 41, 42, 43, -1, -1, -1, -1, -1,
- -1, -1, -1, 52, -1, 54, -1, -1, -1, -1,
- -1, -1, -1, 62, 63, -1, 65, -1, -1, -1,
- -1, -1, -1, 72, -1, -1, -1, -1, -1, -1,
- 79, 80, 81, 82, 83, -1, -1, -1, 87, -1,
- 89, -1, -1, -1, -1, -1, 12, 96, 97, 15,
- 16, 17, -1, 102, -1, 104, -1, -1, -1, 25,
- 26, 27, -1, 29, 30, 31, -1, 33, -1, -1,
- -1, 37, -1, -1, -1, -1, -1, -1, -1, -1,
- 46, -1, 48, 49, 50, 51, 52, -1, 54, -1,
+ 83, -1, -1, -1, 87, -1, 89, -1, -1, -1,
+ -1, -1, 12, 96, 97, 15, 16, 17, -1, 102,
+ -1, 104, -1, -1, -1, 25, 26, 27, -1, 29,
+ 30, 31, -1, 33, -1, -1, -1, 37, -1, -1,
+ -1, -1, -1, -1, -1, -1, 46, -1, 48, 49,
+ 50, 51, 52, -1, 54, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 72, 12, -1, -1,
- 15, 16, 17, 79, 80, 81, 82, 83, -1, -1,
- 25, 26, 27, 89, 29, 30, 31, -1, 33, -1,
- 96, 97, 37, -1, -1, -1, 102, -1, 104, -1,
- -1, -1, -1, 48, -1, 50, -1, 52, -1, 54,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 64,
- -1, -1, -1, -1, -1, -1, -1, 72, 12, -1,
- -1, 15, 16, 17, 79, 80, 81, 82, 83, -1,
- -1, 25, 26, 27, 89, 29, 30, 31, -1, 33,
- -1, 96, 97, 37, -1, -1, -1, 102, -1, 104,
- -1, 12, -1, -1, 15, 16, 17, -1, 52, -1,
- 54, -1, -1, -1, 25, 26, 27, -1, 29, 30,
- 31, -1, 33, -1, -1, -1, 37, -1, 72, -1,
- -1, -1, -1, -1, -1, 79, 80, 81, 82, 83,
- -1, 52, -1, 54, -1, 89, -1, -1, -1, -1,
- -1, -1, 96, 97, -1, -1, -1, -1, 102, -1,
- 104, 72, -1, -1, -1, -1, -1, -1, 79, 80,
- 81, 82, 83, 45, -1, -1, -1, -1, 89, -1,
- -1, -1, -1, -1, -1, 96, 97, -1, -1, -1,
- 48, 102, 50, 104, 66, 67, 68, 69, 70, 71,
- -1, 73, 74, 75, 76, 77, 78, -1, 66, 67,
- 68, 69, 70, 71, -1, 73, -1, -1, 76, 77,
- 78, 93, 94, 95, 96, 97, 98, 99, 50, -1,
- -1, -1, -1, -1, 56, 93, 94, 95, 96, 97,
- 98, 99, -1, -1, 66, 67, 68, 69, 70, 71,
+ -1, -1, 72, 12, -1, -1, 15, 16, 17, 79,
+ 80, 81, 82, 83, -1, -1, 25, 26, 27, 89,
+ 29, 30, 31, -1, 33, -1, 96, 97, 37, -1,
+ -1, -1, 102, -1, 104, -1, -1, -1, -1, 48,
+ -1, 50, -1, 52, -1, 54, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 64, -1, -1, -1, -1,
+ -1, -1, -1, 72, 12, -1, -1, 15, 16, 17,
+ 79, 80, 81, 82, 83, -1, -1, 25, 26, 27,
+ 89, 29, 30, 31, -1, 33, -1, 96, 97, 37,
+ -1, -1, -1, 102, -1, 104, -1, 12, -1, -1,
+ 15, 16, 17, -1, 52, -1, 54, -1, -1, -1,
+ 25, 26, 27, -1, 29, 30, 31, -1, 33, -1,
+ -1, -1, 37, -1, 72, -1, -1, -1, -1, -1,
+ -1, 79, 80, 81, 82, 83, -1, 52, -1, 54,
+ -1, 89, -1, -1, -1, -1, -1, -1, 96, 97,
+ -1, -1, -1, -1, 102, -1, 104, 72, -1, -1,
+ -1, -1, -1, -1, 79, 80, 81, 82, 83, 45,
+ -1, -1, -1, -1, 89, -1, -1, -1, -1, -1,
+ -1, 96, 97, -1, -1, -1, 48, 102, 50, 104,
+ 66, 67, 68, 69, 70, 71, -1, 73, 74, 75,
+ 76, 77, 78, -1, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, 93, 94, 95,
+ 96, 97, 98, 99, 50, -1, -1, -1, -1, -1,
+ 56, 93, 94, 95, 96, 97, 98, 99, -1, -1,
+ 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
+ 76, 77, 78, -1, -1, -1, -1, -1, 50, -1,
+ -1, -1, -1, -1, 56, -1, -1, 93, 94, 95,
+ 96, 97, 98, 99, 66, 67, 68, 69, 70, 71,
-1, 73, -1, -1, 76, 77, 78, -1, -1, -1,
-1, -1, 50, -1, -1, -1, -1, -1, 56, -1,
-1, 93, 94, 95, 96, 97, 98, 99, 66, 67,
@@ -1220,7 +1219,7 @@ static const yytype_int16 yycheck[] =
-1, -1, 56, -1, -1, 93, 94, 95, 96, 97,
98, 99, 66, 67, 68, 69, 70, 71, -1, 73,
-1, -1, 76, 77, 78, -1, -1, -1, -1, -1,
- 50, -1, -1, -1, -1, -1, 56, -1, -1, 93,
+ 50, -1, -1, -1, -1, -1, -1, -1, -1, 93,
94, 95, 96, 97, 98, 99, 66, 67, 68, 69,
70, 71, -1, 73, -1, -1, 76, 77, 78, -1,
-1, -1, -1, -1, 50, -1, -1, -1, -1, -1,
@@ -1233,19 +1232,12 @@ static const yytype_int16 yycheck[] =
-1, -1, 50, -1, -1, -1, -1, -1, -1, -1,
-1, 93, 94, 95, 96, 97, 98, 99, 66, 67,
68, 69, 70, 71, -1, 73, -1, -1, 76, 77,
- 78, -1, -1, -1, -1, -1, 50, -1, -1, -1,
- -1, -1, -1, -1, -1, 93, 94, 95, 96, 97,
- 98, 99, 66, 67, 68, 69, 70, 71, -1, 73,
- -1, -1, 76, 77, 78, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 56, -1, -1, 93,
- 94, 95, 96, 97, 98, 99, 66, 67, 68, 69,
- 70, 71, -1, 73, -1, -1, 76, 77, 78, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 56, 93, 94, 95, 96, 97, 98, 99,
- -1, 101, 66, 67, 68, 69, 70, 71, 58, 73,
+ 78, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 56, -1, -1, 93, 94, 95, 96, 97,
+ 98, 99, 66, 67, 68, 69, 70, 71, 58, 73,
-1, -1, 76, 77, 78, -1, 66, 67, 68, 69,
70, 71, -1, 73, -1, -1, 76, 77, 78, 93,
- 94, 95, 96, 97, 98, 99, -1, -1, -1, -1,
+ 94, 95, 96, 97, 98, 99, -1, 101, -1, -1,
-1, -1, -1, 93, 94, 95, 96, 97, 98, 99,
66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
76, 77, 78, -1, -1, -1, -1, -1, -1, -1,
@@ -1272,7 +1264,7 @@ static const yytype_uint8 yystos[] =
86, 87, 88, 89, 96, 97, 102, 104, 108, 109,
110, 111, 113, 114, 118, 119, 120, 125, 126, 127,
128, 129, 130, 134, 136, 138, 141, 145, 101, 30,
- 52, 128, 128, 128, 128, 146, 30, 128, 146, 30,
+ 127, 30, 52, 128, 128, 128, 146, 30, 128, 146,
127, 102, 128, 147, 137, 140, 53, 30, 131, 46,
48, 49, 50, 51, 128, 135, 30, 128, 58, 59,
15, 16, 30, 37, 30, 30, 128, 64, 128, 135,
@@ -1282,24 +1274,24 @@ static const yytype_uint8 yystos[] =
68, 69, 70, 71, 73, 76, 77, 78, 93, 94,
95, 96, 97, 98, 99, 122, 102, 128, 106, 146,
128, 146, 106, 146, 122, 106, 128, 48, 135, 139,
- 45, 74, 75, 30, 56, 68, 127, 128, 56, 68,
- 56, 55, 58, 135, 106, 50, 56, 50, 56, 50,
- 56, 50, 56, 84, 85, 106, 30, 103, 105, 109,
- 123, 128, 123, 123, 128, 56, 101, 128, 128, 128,
+ 45, 74, 75, 30, 56, 68, 127, 56, 68, 56,
+ 55, 58, 135, 106, 50, 56, 50, 56, 50, 56,
+ 50, 56, 84, 85, 106, 30, 103, 105, 109, 123,
+ 128, 123, 123, 128, 56, 101, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 30, 142, 128, 103, 128, 142,
- 30, 128, 122, 30, 129, 128, 128, 128, 128, 68,
- 56, 128, 128, 128, 128, 30, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 30, 103, 106, 124,
- 123, 55, 123, 128, 124, 101, 106, 101, 142, 128,
- 128, 50, 50, 50, 50, 146, 101, 113, 123, 38,
- 56, 124, 55, 123, 106, 144, 30, 144, 101, 128,
- 128, 128, 128, 103, 91, 56, 128, 123, 111, 92,
- 30, 124, 124, 144, 128, 123, 40, 115, 116, 121,
- 123, 34, 124, 123, 124, 39, 123, 115, 128, 39,
- 90, 30, 143, 124, 123, 122, 90, 123, 122, 106,
- 123, 91, 124, 55, 111, 30, 91, 123, 124, 123,
- 90, 123, 90
+ 128, 128, 128, 30, 142, 128, 103, 128, 142, 30,
+ 128, 122, 30, 129, 128, 128, 128, 128, 56, 68,
+ 128, 128, 128, 128, 30, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 30, 103, 106, 124, 123,
+ 55, 123, 128, 124, 101, 106, 101, 142, 128, 128,
+ 50, 50, 50, 50, 146, 101, 113, 123, 38, 56,
+ 124, 55, 123, 106, 144, 30, 144, 101, 128, 128,
+ 128, 128, 103, 91, 56, 128, 123, 111, 92, 30,
+ 124, 124, 144, 128, 123, 40, 115, 116, 121, 123,
+ 34, 124, 123, 124, 39, 123, 115, 128, 39, 90,
+ 30, 143, 124, 123, 122, 90, 123, 122, 106, 123,
+ 91, 124, 55, 111, 30, 91, 123, 124, 123, 90,
+ 123, 90
};
#define yyerrok (yyerrstatus = 0)
@@ -2985,7 +2977,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 2989 "engines/director/lingo/lingo-gr.cpp"
+#line 2981 "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 a818cf4..668c52f 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -176,7 +176,7 @@ asgn: tPUT expr tINTO ID {
g_lingo->codeInt($2[0]);
g_lingo->codeInt($2[1]);
$$ = $4; }
- | tSET THEENTITYWITHID expr tTO expr {
+ | tSET THEENTITYWITHID simpleexpr tTO expr {
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt($2[0]);
@@ -405,7 +405,7 @@ expr: simpleexpr { $$ = $1; }
WRITE_UINT32(&e, $1[0]);
WRITE_UINT32(&f, $1[1]);
g_lingo->code2(e, f); }
- | THEENTITYWITHID expr {
+ | THEENTITYWITHID simpleexpr {
$$ = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, $1[0]);
More information about the Scummvm-git-logs
mailing list