aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-30 23:12:33 +0100
committerEugene Sandulenko2019-12-30 23:12:33 +0100
commit62530d25c9ab58061754d557d2a7f20e134c6db6 (patch)
treefbe435c9bb235c948d54debb341fb2b0a34e3a6a /engines
parent46fa20619e2d004ce63422ca97e01678903f5948 (diff)
downloadscummvm-rg350-62530d25c9ab58061754d557d2a7f20e134c6db6.tar.gz
scummvm-rg350-62530d25c9ab58061754d557d2a7f20e134c6db6.tar.bz2
scummvm-rg350-62530d25c9ab58061754d557d2a7f20e134c6db6.zip
DIRECTOR: LINGO: Fix grammar for built-ins with empty arglist
Diffstat (limited to 'engines')
-rw-r--r--engines/director/lingo/lingo-gr.cpp346
-rw-r--r--engines/director/lingo/lingo-gr.y4
2 files changed, 173 insertions, 177 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index cea85112a3..bab077a4af 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -551,7 +551,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 125
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1624
+#define YYLAST 1602
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 107
@@ -658,7 +658,7 @@ static const yytype_int16 yyrhs[] =
-1, 40, -1, -1, -1, -1, 124, 101, -1, 124,
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, 147, -1,
+ 129, -1, 25, -1, 26, 128, -1, 27, 146, -1,
30, 102, 146, 103, -1, 15, -1, 16, 128, -1,
110, -1, 128, 96, 128, -1, 128, 97, 128, -1,
128, 98, 128, -1, 128, 99, 128, -1, 128, 73,
@@ -679,7 +679,7 @@ static const yytype_int16 yyrhs[] =
127, -1, 52, 128, -1, 134, -1, 136, -1, 41,
53, -1, 41, -1, 42, 131, -1, 87, 132, -1,
65, 133, -1, 19, -1, 21, 128, -1, 20, 128,
- -1, 20, -1, 22, 147, -1, 62, 128, 58, 128,
+ -1, 20, -1, 22, 146, -1, 62, 128, 58, 128,
-1, 62, 128, -1, 23, 30, 146, -1, 30, -1,
131, 106, 30, -1, 30, -1, 132, 106, 30, -1,
30, -1, 133, 106, 30, -1, 43, 46, -1, 43,
@@ -816,32 +816,32 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 52, 63, 0, 53, 110, 113, 0, 0,
- 0, 59, 0, 0, 0, 56, 55, 54, 136, 141,
+ 0, 0, 52, 63, 0, 53, 110, 113, 0, 155,
+ 0, 59, 0, 155, 0, 56, 55, 54, 136, 141,
106, 0, 0, 43, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 51,
0, 0, 100, 0, 0, 0, 155, 0, 3, 65,
26, 7, 27, 0, 0, 0, 0, 0, 57, 20,
58, 21, 103, 104, 6, 45, 19, 4, 56, 0,
- 64, 112, 111, 158, 114, 155, 60, 61, 56, 101,
- 155, 154, 155, 45, 105, 118, 107, 124, 0, 125,
- 0, 126, 127, 129, 138, 102, 0, 41, 0, 0,
- 0, 0, 0, 140, 116, 132, 133, 135, 122, 109,
- 79, 0, 0, 0, 0, 0, 120, 108, 145, 0,
- 84, 85, 0, 156, 0, 1, 5, 46, 0, 46,
+ 64, 112, 111, 156, 114, 155, 60, 61, 56, 101,
+ 155, 158, 154, 155, 45, 105, 118, 107, 124, 0,
+ 125, 0, 126, 127, 129, 138, 102, 0, 41, 0,
+ 0, 0, 0, 0, 140, 116, 132, 133, 135, 122,
+ 109, 79, 0, 0, 0, 0, 0, 120, 108, 145,
+ 0, 84, 85, 0, 0, 1, 5, 46, 0, 46,
46, 25, 0, 23, 24, 22, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 146, 155, 0, 0, 117, 156,
- 0, 137, 146, 0, 131, 0, 128, 45, 0, 0,
- 0, 42, 0, 0, 57, 0, 0, 0, 0, 50,
- 0, 134, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 86, 87, 0, 2, 47,
+ 0, 0, 137, 146, 0, 131, 0, 128, 45, 0,
+ 0, 0, 42, 0, 0, 57, 0, 0, 0, 0,
+ 50, 0, 134, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 86, 87, 2, 47,
46, 0, 31, 46, 0, 47, 75, 76, 73, 74,
77, 78, 70, 81, 82, 83, 72, 71, 80, 66,
- 67, 68, 69, 147, 0, 159, 62, 0, 119, 130,
- 146, 8, 9, 10, 11, 15, 13, 0, 0, 14,
- 12, 18, 115, 123, 90, 0, 92, 0, 94, 0,
- 96, 0, 88, 89, 121, 98, 155, 157, 46, 0,
+ 67, 68, 69, 147, 0, 157, 62, 159, 0, 119,
+ 130, 146, 8, 9, 10, 11, 15, 13, 0, 0,
+ 14, 12, 18, 115, 123, 90, 0, 92, 0, 94,
+ 0, 96, 0, 88, 89, 121, 98, 155, 46, 0,
47, 0, 33, 46, 153, 0, 153, 0, 17, 16,
0, 0, 0, 0, 0, 48, 49, 0, 0, 0,
46, 0, 0, 0, 47, 148, 47, 153, 91, 93,
@@ -858,9 +858,9 @@ static const yytype_int16 yydefgoto[] =
{
-1, 47, 48, 49, 50, 130, 276, 52, 306, 307,
131, 53, 54, 55, 308, 154, 199, 258, 56, 57,
- 58, 59, 60, 61, 86, 117, 109, 62, 93, 63,
- 82, 64, 167, 83, 65, 224, 321, 284, 66, 160,
- 74
+ 58, 59, 60, 61, 87, 118, 110, 62, 94, 63,
+ 83, 64, 168, 84, 65, 224, 321, 284, 66, 160,
+ 82
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -869,50 +869,50 @@ static const yytype_int16 yydefgoto[] =
static const yytype_int16 yypact[] =
{
315, -77, -266, -266, 975, -266, -266, 975, 975, 975,
- -11, -266, 975, 975, 42, 1008, -266, -266, -266, -266,
- -3, 30, 853, -266, 38, 975, 46, 40, 57, 64,
- 975, 914, 69, 975, 975, 975, 975, 975, 975, -266,
- 80, 81, 10, 975, 975, 975, 975, 2, -266, -266,
- -266, -266, -266, 975, 45, 975, 679, 975, -266, 1525,
- -266, -266, -266, -266, -266, -266, -266, -266, 12, 975,
- 1525, 1525, 1525, 1525, 9, 975, 1525, 9, -266, -266,
- 975, 9, 975, -266, -266, -266, 13, -266, 975, -266,
- 68, -266, 1061, -266, -266, 1047, 88, -266, 1, 975,
- 11, 61, 65, -266, 1419, -266, 1061, -266, -266, 17,
- -266, 1097, 1131, 1165, 1199, 1491, -266, 19, -266, 96,
- -266, -266, 1453, 1525, 3, -266, 406, 1525, 975, 1525,
- -266, -266, 975, 1525, -266, -266, 1369, 975, 975, 975,
+ 20, -266, 975, 975, 57, 1008, -266, -266, -266, -266,
+ 14, 24, 853, -266, 48, 975, 33, 40, 54, 74,
+ 975, 914, 77, 975, 975, 975, 975, 975, 975, -266,
+ 81, 82, 11, 975, 975, 975, 975, 7, -266, -266,
+ -266, -266, -266, 975, 46, 975, 679, 975, -266, 1490,
+ -266, -266, -266, -266, -266, -266, -266, -266, 13, 975,
+ 1490, 1490, 1490, 1490, 10, 975, 1490, 10, -266, -266,
+ 975, 1490, 12, 975, -266, -266, -266, 17, -266, 975,
+ -266, 69, -266, 1061, -266, -266, 1047, 89, -266, 25,
+ 975, 27, 64, 70, -266, 144, -266, 1061, -266, -266,
+ 23, -266, 1097, 1131, 1165, 1199, 1456, -266, 26, -266,
+ 96, -266, -266, 1418, -5, -266, 406, 1490, 975, 1490,
+ -266, -266, 975, 1490, -266, -266, 1369, 975, 975, 975,
975, 975, 975, 975, 975, 975, 975, 975, 975, 975,
- 975, 975, 975, 975, 97, 975, 1047, 975, 23, 1453,
- -23, 23, 97, 100, 1525, 975, -266, -266, 77, 975,
- 975, -266, 975, 975, 63, 1405, 975, 975, 975, -266,
- 975, -266, 120, 975, 975, 975, 975, 975, 975, 975,
- 975, 975, 975, 122, -10, -266, -266, 975, -266, -266,
- 1525, 99, -266, 1525, 975, -266, -51, -51, -51, -51,
- 130, 130, -266, -7, -51, -51, -51, -51, -7, -35,
- -35, -266, -266, -266, -86, 1525, -266, -78, -266, 1525,
- 97, -266, -266, 1525, 1525, 1525, -51, 975, 975, 1525,
- -51, 1525, 1525, -266, 1525, 1233, 1525, 1267, 1525, 1301,
- 1525, 1335, 1525, 1525, -266, -266, 975, 1525, 588, -21,
- -266, 101, 1525, 588, 49, 127, 49, -20, -51, 1525,
- 975, 975, 975, 975, -5, -266, -266, 67, 103, 975,
- 588, 770, 70, 133, -266, -266, -266, 49, 1525, 1525,
- 1525, 1525, -266, -266, 975, 1525, 131, -266, -266, -266,
- 497, 588, -266, 1525, -266, -266, 121, 131, 975, -29,
- 137, 588, -266, 588, -266, 85, -266, 1525, -266, -266,
- -266, 71, 588, 79, -266, -266, 123, 770, 159, 110,
- -266, 588, -266, -266, -266, -266, 104, 588, 112, -266,
+ 975, 975, 975, 975, 100, 975, 1047, 975, 10, 1418,
+ -86, 975, 10, 100, 101, 1490, 975, -266, -266, 80,
+ 975, 975, -266, 975, 975, 86, 1405, 975, 975, 975,
+ -266, 975, -266, 120, 975, 975, 975, 975, 975, 975,
+ 975, 975, 975, 975, 125, -1, -266, -266, -266, -266,
+ 1490, 103, -266, 1490, 975, -266, -51, -51, -51, -51,
+ 1503, 1503, -266, -38, -51, -51, -51, -51, -38, -35,
+ -35, -266, -266, -266, -78, 1490, -266, 1490, -33, -266,
+ 1490, 100, -266, -266, 1490, 1490, 1490, -51, 975, 975,
+ 1490, -51, 1490, 1490, -266, 1490, 1233, 1490, 1267, 1490,
+ 1301, 1490, 1335, 1490, 1490, -266, -266, 975, 588, -19,
+ -266, 104, 1490, 588, 50, 130, 50, -7, -51, 1490,
+ 975, 975, 975, 975, 0, -266, -266, 72, 105, 975,
+ 588, 770, 73, 134, -266, -266, -266, 50, 1490, 1490,
+ 1490, 1490, -266, -266, 975, 1490, 128, -266, -266, -266,
+ 497, 588, -266, 1490, -266, -266, 132, 128, 975, -24,
+ 142, 588, -266, 588, -266, 107, -266, 1490, -266, -266,
+ -266, 84, 588, 88, -266, -266, 136, 770, 163, 108,
+ -266, 588, -266, -266, -266, -266, 111, 588, 113, -266,
-266, -266
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -266, -266, 78, -266, -265, -266, 6, -266, -117, -266,
- -266, -266, -266, 135, -266, -82, -8, -41, -266, -266,
- -2, -4, 37, 153, -266, -266, -266, -266, -18, -266,
- -266, -266, -266, -266, -266, -148, -266, -229, 154, -39,
- 87
+ -266, -266, 79, -266, -265, -266, 1, -266, -109, -266,
+ -266, -266, -266, 150, -266, -82, -8, -108, -266, -266,
+ -2, -4, 38, 152, -266, -266, -266, -266, -18, -266,
+ -266, -266, -266, -266, -266, -149, -266, -230, 153, -3,
+ -266
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -922,36 +922,36 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -6
static const yytype_int16 yytable[] =
{
- 70, 162, 125, 71, 72, 73, 51, 124, 76, 73,
- 318, 73, 79, 107, 227, 264, 297, 278, 92, 75,
- 265, 95, 143, 266, 67, 144, 104, 106, 265, 110,
- 111, 112, 113, 114, 115, 279, 158, 286, 143, 120,
- 121, 122, 123, 161, 149, 150, 151, 152, 153, 127,
- 84, 129, 133, 136, 2, 98, 99, 172, 302, 5,
- 85, 319, 333, 152, 153, 156, 143, 176, 94, 173,
- 100, 123, 78, 16, 166, 17, 159, 101, 123, 177,
- 226, 287, 267, 197, 164, 230, 265, 102, 181, 150,
- 151, 152, 153, 255, 103, 175, 256, 174, 292, 108,
- 77, 197, 81, 126, 96, 97, 14, 231, 196, 197,
- 116, 118, 119, 128, 155, 157, 165, 178, 171, 163,
- 179, 201, 202, 182, 200, 193, 194, 223, 203, 197,
- 228, 237, 51, 206, 207, 208, 209, 210, 211, 212,
+ 70, 51, 163, 71, 72, 73, 74, 125, 76, 73,
+ 77, 81, 79, 108, 228, 318, 297, 226, 93, 278,
+ 157, 96, 143, 264, 67, 144, 105, 107, 265, 111,
+ 112, 113, 114, 115, 116, 143, 286, 279, 143, 121,
+ 122, 123, 73, 124, 149, 150, 151, 152, 153, 127,
+ 75, 129, 133, 136, 86, 99, 100, 302, 150, 151,
+ 152, 153, 333, 152, 153, 156, 319, 85, 266, 2,
+ 101, 73, 158, 265, 5, 167, 159, 102, 95, 73,
+ 162, 173, 267, 177, 103, 165, 231, 78, 16, 182,
+ 17, 97, 98, 174, 287, 178, 176, 263, 175, 265,
+ 197, 157, 256, 292, 104, 257, 157, 109, 126, 14,
+ 232, 117, 119, 120, 128, 155, 157, 166, 161, 172,
+ 179, 201, 202, 164, 200, 180, 195, 51, 203, 183,
+ 223, 229, 194, 206, 207, 208, 209, 210, 211, 212,
213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
- 243, 123, 254, 225, 260, 283, 281, 285, 293, 294,
- 314, 229, 298, 299, 263, 233, 234, 320, 235, 236,
- 330, 305, 239, 240, 241, 325, 242, 328, 332, 244,
- 245, 246, 247, 248, 249, 250, 251, 252, 253, 334,
- 316, 132, 259, 257, 339, 261, 137, 138, 139, 140,
- 262, 335, 341, 143, 198, 232, 144, 145, 146, 134,
- 135, 0, 0, 0, 0, 0, 0, 274, 0, 280,
- 0, 0, 0, 147, 148, 149, 150, 151, 152, 153,
- 0, 0, 324, 268, 269, 0, 327, 0, 0, 0,
- 0, 0, 0, 300, 0, 301, 0, 0, 0, 0,
- 277, 0, 123, 0, 0, 282, 0, 0, 0, 0,
- 0, 311, 0, 313, 0, 0, 288, 289, 290, 291,
- 0, 322, 296, 0, 0, 295, 0, 0, 0, 0,
- 0, 0, 0, 331, 0, 0, 0, 304, 0, 309,
- 303, 337, 0, 0, 0, 312, 0, 0, 315, 0,
+ 244, 73, 280, 225, 238, 255, 283, 227, 260, 281,
+ 285, 294, 230, 293, 299, 298, 234, 235, 305, 236,
+ 237, 314, 320, 240, 241, 242, 300, 243, 301, 330,
+ 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+ 328, 332, 259, 334, 311, 261, 313, 325, 316, 335,
+ 262, 339, 181, 341, 322, 198, 132, 233, 134, 135,
+ 137, 138, 139, 140, 141, 142, 331, 143, 0, 0,
+ 144, 145, 146, 0, 337, 0, 0, 0, 0, 0,
+ 0, 0, 324, 0, 268, 269, 327, 147, 148, 149,
+ 150, 151, 152, 153, 0, 0, 0, 0, 0, 0,
+ 277, 0, 0, 73, 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,
@@ -1011,15 +1011,15 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 2, 43, 44, 3, 4,
5, 0, 45, 0, 46, 0, 0, 0, 11, 12,
13, 0, 14, 68, 16, 0, 17, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 87,
- 0, 88, 89, 90, 91, 69, 0, 27, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 88,
+ 0, 89, 90, 91, 92, 69, 0, 27, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 33, 2, 0, 0, 3,
4, 5, 34, 35, 36, 37, 38, 0, 0, 11,
12, 13, 42, 14, 68, 16, 0, 17, 0, 43,
44, 0, 0, 0, 0, 45, 0, 46, 0, 0,
- 0, 0, 88, 0, 90, 0, 69, 0, 27, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 105, 0,
+ 0, 0, 89, 0, 91, 0, 69, 0, 27, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 106, 0,
0, 0, 0, 0, 0, 0, 33, 2, 0, 0,
3, 4, 5, 34, 35, 36, 37, 38, 0, 0,
11, 12, 13, 42, 14, 68, 16, 0, 17, 0,
@@ -1031,23 +1031,23 @@ static const yytype_int16 yytable[] =
69, 0, 27, 0, 42, 0, 0, 0, 0, 0,
0, 43, 44, 0, 0, 0, 0, 45, 0, 46,
33, 0, 0, 0, 0, 0, 0, 34, 35, 36,
- 37, 38, 168, 0, 0, 0, 0, 42, 0, 0,
- 0, 0, 0, 0, 43, 44, 0, 0, 0, 88,
- 80, 90, 46, 137, 138, 139, 140, 141, 142, 0,
- 143, 169, 170, 144, 145, 146, 0, 137, 138, 139,
+ 37, 38, 169, 0, 0, 0, 0, 42, 0, 0,
+ 0, 0, 0, 0, 43, 44, 0, 0, 0, 89,
+ 80, 91, 46, 137, 138, 139, 140, 141, 142, 0,
+ 143, 170, 171, 144, 145, 146, 0, 137, 138, 139,
140, 141, 142, 0, 143, 0, 0, 144, 145, 146,
- 147, 148, 149, 150, 151, 152, 153, 183, 0, 0,
- 0, 0, 0, 184, 147, 148, 149, 150, 151, 152,
+ 147, 148, 149, 150, 151, 152, 153, 184, 0, 0,
+ 0, 0, 0, 185, 147, 148, 149, 150, 151, 152,
153, 0, 0, 137, 138, 139, 140, 141, 142, 0,
143, 0, 0, 144, 145, 146, 0, 0, 0, 0,
- 0, 185, 0, 0, 0, 0, 0, 186, 0, 0,
+ 0, 186, 0, 0, 0, 0, 0, 187, 0, 0,
147, 148, 149, 150, 151, 152, 153, 137, 138, 139,
140, 141, 142, 0, 143, 0, 0, 144, 145, 146,
- 0, 0, 0, 0, 0, 187, 0, 0, 0, 0,
- 0, 188, 0, 0, 147, 148, 149, 150, 151, 152,
+ 0, 0, 0, 0, 0, 188, 0, 0, 0, 0,
+ 0, 189, 0, 0, 147, 148, 149, 150, 151, 152,
153, 137, 138, 139, 140, 141, 142, 0, 143, 0,
- 0, 144, 145, 146, 0, 0, 0, 0, 0, 189,
- 0, 0, 0, 0, 0, 190, 0, 0, 147, 148,
+ 0, 144, 145, 146, 0, 0, 0, 0, 0, 190,
+ 0, 0, 0, 0, 0, 191, 0, 0, 147, 148,
149, 150, 151, 152, 153, 137, 138, 139, 140, 141,
142, 0, 143, 0, 0, 144, 145, 146, 0, 0,
0, 0, 0, 270, 0, 0, 0, 0, 0, 0,
@@ -1068,57 +1068,55 @@ static const yytype_int16 yytable[] =
149, 150, 151, 152, 153, 137, 138, 139, 140, 141,
142, 0, 143, 0, 0, 144, 145, 146, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 238, 147, 148, 149, 150, 151, 152, 153, 0,
- 205, 137, 138, 139, 140, 141, 142, 180, 143, 0,
- 0, 144, 145, 146, 0, 137, 138, 139, 140, 141,
- 142, 0, 143, 0, 0, 144, 145, 146, 147, 148,
+ 0, 239, 147, 148, 149, 150, 151, 152, 153, 0,
+ 205, 137, 138, 139, 140, 141, 142, 0, 143, 0,
+ 0, 144, 145, 146, 137, 138, 139, 140, 141, 142,
+ 0, 143, 0, 0, 144, 145, 146, 0, 147, 148,
149, 150, 151, 152, 153, 0, 0, 0, 0, 0,
- 0, 0, 147, 148, 149, 150, 151, 152, 153, 137,
- 138, 139, 140, 141, 142, 0, 143, 0, 0, 144,
- 145, 146, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 147, 148, 149, 150, 151, 152, 153, 0, 0,
+ 0, 196, 137, 138, 139, 140, 141, 142, 0, 143,
+ 0, 0, 144, 145, 146, 0, 0, 0, 0, 0,
+ 192, 193, 0, 0, 0, 0, 0, 0, 0, 147,
+ 148, 149, 150, 151, 152, 153, 137, 138, 139, 140,
+ 141, 142, 0, 143, 0, 0, 144, 145, 146, 137,
+ 138, 139, 140, 0, 0, 0, 143, 0, 0, 144,
+ 145, 146, 0, 147, 148, 149, 150, 151, 152, 153,
0, 0, 0, 0, 0, 0, 147, 148, 149, 150,
- 151, 152, 153, 0, 0, 0, 195, 137, 138, 139,
- 140, 141, 142, 0, 143, 0, 0, 144, 145, 146,
- 0, 0, 0, 0, 0, 191, 192, 0, 0, 0,
- 0, 0, 0, 0, 147, 148, 149, 150, 151, 152,
- 153, 137, 138, 139, 140, 141, 142, 0, 143, 0,
- 0, 144, 145, 146, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 147, 148,
- 149, 150, 151, 152, 153
+ 151, 152, 153
};
static const yytype_int16 yycheck[] =
{
- 4, 83, 0, 7, 8, 9, 0, 46, 12, 13,
- 39, 15, 14, 31, 162, 101, 281, 38, 22, 30,
+ 4, 0, 84, 7, 8, 9, 9, 0, 12, 13,
+ 13, 15, 14, 31, 163, 39, 281, 103, 22, 38,
106, 25, 73, 101, 101, 76, 30, 31, 106, 33,
- 34, 35, 36, 37, 38, 56, 75, 266, 73, 43,
- 44, 45, 46, 82, 95, 96, 97, 98, 99, 53,
- 53, 55, 56, 57, 12, 15, 16, 56, 287, 17,
- 30, 90, 327, 98, 99, 69, 73, 56, 30, 68,
- 30, 75, 30, 31, 92, 33, 80, 37, 82, 68,
- 103, 101, 230, 106, 88, 167, 106, 30, 106, 96,
- 97, 98, 99, 103, 30, 99, 106, 99, 103, 30,
- 13, 106, 15, 101, 58, 59, 29, 30, 105, 106,
- 30, 30, 102, 68, 102, 106, 48, 56, 30, 106,
- 55, 129, 130, 106, 128, 106, 30, 30, 132, 106,
- 30, 68, 126, 137, 138, 139, 140, 141, 142, 143,
+ 34, 35, 36, 37, 38, 73, 266, 56, 73, 43,
+ 44, 45, 46, 46, 95, 96, 97, 98, 99, 53,
+ 30, 55, 56, 57, 30, 15, 16, 287, 96, 97,
+ 98, 99, 327, 98, 99, 69, 90, 53, 101, 12,
+ 30, 75, 75, 106, 17, 93, 80, 37, 30, 83,
+ 83, 56, 231, 56, 30, 89, 168, 30, 31, 107,
+ 33, 58, 59, 68, 101, 68, 100, 205, 100, 106,
+ 105, 106, 103, 103, 30, 106, 106, 30, 101, 29,
+ 30, 30, 30, 102, 68, 102, 106, 48, 106, 30,
+ 56, 129, 130, 106, 128, 55, 30, 126, 132, 106,
+ 30, 30, 106, 137, 138, 139, 140, 141, 142, 143,
144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 30, 155, 30, 157, 55, 106, 55, 30, 91, 56,
- 39, 165, 92, 30, 205, 169, 170, 30, 172, 173,
- 91, 40, 176, 177, 178, 90, 180, 106, 55, 183,
- 184, 185, 186, 187, 188, 189, 190, 191, 192, 30,
- 307, 56, 200, 197, 90, 203, 66, 67, 68, 69,
- 204, 91, 90, 73, 126, 168, 76, 77, 78, 56,
- 56, -1, -1, -1, -1, -1, -1, 256, -1, 260,
- -1, -1, -1, 93, 94, 95, 96, 97, 98, 99,
- -1, -1, 314, 237, 238, -1, 318, -1, -1, -1,
- -1, -1, -1, 284, -1, 286, -1, -1, -1, -1,
- 258, -1, 256, -1, -1, 263, -1, -1, -1, -1,
- -1, 302, -1, 304, -1, -1, 270, 271, 272, 273,
- -1, 312, 280, -1, -1, 279, -1, -1, -1, -1,
- -1, -1, -1, 324, -1, -1, -1, 295, -1, 297,
- 294, 332, -1, -1, -1, 303, -1, -1, 306, -1,
+ 30, 155, 260, 157, 68, 30, 106, 161, 55, 55,
+ 30, 56, 166, 91, 30, 92, 170, 171, 40, 173,
+ 174, 39, 30, 177, 178, 179, 284, 181, 286, 91,
+ 184, 185, 186, 187, 188, 189, 190, 191, 192, 193,
+ 106, 55, 200, 30, 302, 203, 304, 90, 307, 91,
+ 204, 90, 58, 90, 312, 126, 56, 169, 56, 56,
+ 66, 67, 68, 69, 70, 71, 324, 73, -1, -1,
+ 76, 77, 78, -1, 332, -1, -1, -1, -1, -1,
+ -1, -1, 314, -1, 238, 239, 318, 93, 94, 95,
+ 96, 97, 98, 99, -1, -1, -1, -1, -1, -1,
+ 258, -1, -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,
@@ -1236,22 +1234,20 @@ static const yytype_int16 yycheck[] =
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, -1,
- -1, 76, 77, 78, -1, 66, 67, 68, 69, 70,
- 71, -1, 73, -1, -1, 76, 77, 78, 93, 94,
+ 101, 66, 67, 68, 69, 70, 71, -1, 73, -1,
+ -1, 76, 77, 78, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, -1, 93, 94,
95, 96, 97, 98, 99, -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, 93, 94, 95, 96, 97, 98, 99, -1, -1,
+ -1, 103, 66, 67, 68, 69, 70, 71, -1, 73,
+ -1, -1, 76, 77, 78, -1, -1, -1, -1, -1,
+ 84, 85, -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, 66,
+ 67, 68, 69, -1, -1, -1, 73, -1, -1, 76,
+ 77, 78, -1, 93, 94, 95, 96, 97, 98, 99,
-1, -1, -1, -1, -1, -1, 93, 94, 95, 96,
- 97, 98, 99, -1, -1, -1, 103, 66, 67, 68,
- 69, 70, 71, -1, 73, -1, -1, 76, 77, 78,
- -1, -1, -1, -1, -1, 84, 85, -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, -1, -1, -1, 93, 94,
- 95, 96, 97, 98, 99
+ 97, 98, 99
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1265,25 +1261,25 @@ static const yytype_uint8 yystos[] =
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, 147, 30, 128, 147, 30, 127,
- 102, 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, 30, 133,
- 128, 128, 128, 128, 128, 128, 30, 132, 30, 102,
- 128, 128, 128, 128, 146, 0, 101, 128, 68, 128,
+ 128, 128, 128, 128, 146, 30, 128, 146, 30, 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, 30,
+ 133, 128, 128, 128, 128, 128, 128, 30, 132, 30,
+ 102, 128, 128, 128, 146, 0, 101, 128, 68, 128,
112, 117, 120, 128, 130, 145, 128, 66, 67, 68,
69, 70, 71, 73, 76, 77, 78, 93, 94, 95,
96, 97, 98, 99, 122, 102, 128, 106, 146, 128,
- 146, 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, 106, 109, 123,
+ 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, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 30, 142, 128, 103, 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, 128, 124, 123,
+ 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,
@@ -2970,7 +2966,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 2974 "engines/director/lingo/lingo-gr.cpp"
+#line 2970 "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 73ced14898..a3591bb86b 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -392,7 +392,7 @@ expr: simpleexpr { $$ = $1; }
| FBLTINONEARG expr {
g_lingo->codeFunc($1, 1);
delete $1; }
- | FBLTINARGLIST nonemptyarglist { g_lingo->codeFunc($1, $2); }
+ | FBLTINARGLIST arglist { g_lingo->codeFunc($1, $2); }
| ID '(' arglist ')' {
$$ = g_lingo->codeFunc($1, $3);
delete $1; }
@@ -474,7 +474,7 @@ proc: tPUT expr { g_lingo->code1(g_lingo->c_printtop); }
g_lingo->code1(g_lingo->c_voidpush);
g_lingo->codeFunc($1, 1);
delete $1; }
- | BLTINARGLIST nonemptyarglist { g_lingo->codeFunc($1, $2); }
+ | BLTINARGLIST arglist { g_lingo->codeFunc($1, $2); }
| tOPEN expr tWITH expr { g_lingo->code1(g_lingo->c_open); }
| tOPEN expr { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); }
| TWOWORDBUILTIN ID arglist { Common::String s(*$1); s += '-'; s += *$2; g_lingo->codeFunc(&s, $3); }
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-22 02:05:28 +0000