[Scummvm-git-logs] scummvm master -> 06280dd40336d23ef5c2366fec32fa29048427d8
sev-
sev at scummvm.org
Tue Jan 14 17:21:35 UTC 2020
This automated email contains information about 12 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e0328665f7 DIRECTOR: LINGO: Fixed grappamr for entities with ids
a798549311 DIRECTOR: LINGO: Added test for 'the entities' with id
8fedec7cda DIRECTOR: LINGO: Changed semantics of 'me' keyword. Now it serves as a defined method
26ea12076a DIRECTOR: LINGO: Made bison 3.5 as a requirement
d1ff248900 DIRECTOR: LINGO: Switched to named references in the grammar
716075ec29 DIRECTOR: LINGO: Plug memory leaks in parser
cbbd4b0976 DIRECTOR: LINGO: Replace parser header file with bison 3.5 one
cf8abd20bc DIRECTOR: LINGO: Added destructors to the discarded symbols in parser
3d4bffe784 DIRECTOR: LINGO: Plugged more memory leaks in parser
ef72a41082 DIRECTOR: LINGO: Specified bison output files in the grammar file
f9ea2ec28a DIRECTOR: LINGO: Removed obsolete TWOWORDBUILTIN from the grammar
06280dd403 DIRECTOR: LINGO: Simplified grammar
Commit: e0328665f796e9c0bb5cc71a734321120b75277f
https://github.com/scummvm/scummvm/commit/e0328665f796e9c0bb5cc71a734321120b75277f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:52+01:00
Commit Message:
DIRECTOR: LINGO: Fixed grappamr for entities with ids
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 d9894d5..d52e6fa 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 134
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1589
+#define YYLAST 1558
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 108
@@ -663,7 +663,7 @@ static const yytype_int16 yyrhs[] =
17, -1, 33, -1, 31, -1, 30, -1, 149, -1,
128, -1, 130, -1, 25, -1, 26, 129, -1, 27,
147, -1, 30, 102, 147, 103, -1, 15, -1, 16,
- 128, -1, 37, -1, 111, -1, 129, 96, 129, -1,
+ 129, -1, 37, -1, 111, -1, 129, 96, 129, -1,
129, 97, 129, -1, 129, 98, 129, -1, 129, 99,
129, -1, 129, 73, 129, -1, 129, 94, 129, -1,
129, 93, 129, -1, 129, 68, 129, -1, 129, 69,
@@ -836,8 +836,8 @@ static const yytype_uint8 yydefact[] =
51, 0, 0, 101, 0, 0, 0, 162, 0, 3,
67, 26, 7, 27, 0, 0, 0, 0, 0, 58,
20, 59, 21, 104, 105, 6, 45, 19, 57, 4,
- 56, 65, 56, 0, 113, 112, 157, 115, 156, 61,
- 62, 102, 156, 159, 155, 156, 45, 106, 119, 108,
+ 56, 0, 65, 113, 112, 157, 115, 156, 61, 62,
+ 56, 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, 123, 110, 81, 0, 0, 0, 0, 0, 121,
@@ -879,55 +879,55 @@ static const yytype_int16 yydefgoto[] =
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -282
+#define YYPACT_NINF -286
static const yytype_int16 yypact[] =
{
- 330, -55, -282, -282, 28, -282, -282, 990, 990, 990,
- 35, -282, 990, 990, 28, 1024, -282, -282, -282, -282,
- -282, 3, 47, 868, -282, 52, 990, 15, 168, 55,
- 62, 990, 929, 71, 990, 990, 990, 990, 990, 990,
- -282, 79, 81, 18, 990, 990, 990, 24, 11, -282,
- -282, -282, -282, -282, 990, 60, 990, 694, 990, -282,
- 1490, -282, -282, -282, -282, -282, -282, -282, -282, -282,
- -282, -282, 30, 990, 1490, 1490, 1490, 54, 990, 1490,
- 54, -282, 990, 1490, 58, 990, -282, -282, -282, 61,
- -282, 990, -282, 116, -282, 1064, -282, -282, 161, 136,
- -282, -34, 28, -8, 111, 114, -282, 1384, -282, 1064,
- -282, -282, 66, -282, 1098, 1132, 1166, 1200, 1456, -282,
- 70, -282, 147, -282, -282, 1418, 74, 89, -282, -282,
- 93, 97, 98, -282, -282, 421, 1490, 990, 1490, -282,
- -282, 990, 1490, -282, -282, 1370, 990, 990, 990, 990,
- 990, 990, 990, 990, 990, 990, 990, 990, 990, 990,
- 990, 990, 990, 174, 990, 161, 990, 54, 1418, 1,
- 990, 54, 174, 177, 1490, 990, -282, -282, 77, 990,
- 990, -282, 990, 990, -4, 990, 990, 990, -282, 990,
- -282, 178, 990, 990, 990, 990, 990, 990, 990, 990,
- 990, 990, 180, 32, -282, 28, 28, -282, 28, 50,
- -282, -282, 1490, 162, -282, 1490, 990, -282, 26, 26,
- 26, 26, 20, 20, -282, -29, 26, 26, 26, 26,
- -29, -56, -56, -282, -282, -282, -78, 1490, -282, 1490,
- -10, -282, 1490, 174, -282, -282, 1490, 1490, 1490, 26,
- 990, 990, 1490, 26, 1490, 1490, -282, 1490, 1234, 1490,
- 1268, 1490, 1302, 1490, 1336, 1490, 1490, -282, -282, 990,
- -282, -282, -282, 74, 89, -282, 603, -23, -282, 163,
- 1490, 603, 112, 189, 112, -1, 1490, 26, 990, 990,
- 990, 990, 34, -282, -282, 130, 166, 990, 603, 785,
- 131, 194, -282, -282, -282, 112, 1490, 1490, 1490, 1490,
- -282, -282, 990, 1490, -282, -282, -282, -282, 512, 603,
- -282, 1490, -282, 121, -27, 195, 603, -282, 603, -282,
- -282, -282, 990, 150, -282, -282, -282, 122, 603, 151,
- -282, 1490, -282, 785, 211, 154, -282, 603, 193, -282,
- -282, -282, 159, -282, 160, -282, 603, -282, -282
+ 333, -76, -286, -286, 993, -286, -286, 993, 993, 993,
+ -14, -286, 993, 993, 26, 1027, -286, -286, -286, -286,
+ -286, 11, 25, 871, -286, 46, 993, -38, 32, 50,
+ 74, 993, 932, 102, 993, 993, 993, 993, 993, 993,
+ -286, 106, 109, -57, 993, 993, 993, 6, 2, -286,
+ -286, -286, -286, -286, 993, 72, 993, 697, 993, -286,
+ 1459, -286, -286, -286, -286, -286, -286, -286, -286, -286,
+ 39, 993, 1459, 1459, 1459, 1459, 57, 993, 1459, 57,
+ -286, -286, 993, 1459, 59, 993, -286, -286, -286, 60,
+ -286, 993, -286, 117, -286, 29, -286, -286, 1067, 137,
+ -286, -39, 26, -7, 112, 114, -286, 1353, -286, 29,
+ -286, -286, 66, -286, 160, 1101, 1135, 1169, 1425, -286,
+ 68, -286, 143, -286, -286, 1387, 67, 70, -286, -286,
+ 78, 76, 82, -286, -286, 424, 1459, 993, 1459, -286,
+ -286, 993, 1459, -286, -286, 1339, 993, 993, 993, 993,
+ 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,
+ 993, 993, 993, 157, 993, 1067, 993, 57, 1387, -10,
+ 993, 57, 157, 168, 1459, 993, -286, -286, 86, 993,
+ 993, -286, 993, 993, 7, 993, 993, 993, -286, 993,
+ -286, 170, 993, 993, 993, 993, 993, 993, 993, 993,
+ 993, 993, 171, 15, -286, 26, 26, -286, 26, 77,
+ -286, -286, 1459, 147, -286, 1459, 993, -286, 305, 305,
+ 305, 305, 202, 202, -286, -8, 305, 305, 305, 305,
+ -8, -13, -13, -286, -286, -286, -33, 1459, -286, 1459,
+ 8, -286, 1459, 157, -286, -286, 1459, 1459, 1459, 305,
+ 993, 993, 1459, 305, 1459, 1459, -286, 1459, 1203, 1459,
+ 1237, 1459, 1271, 1459, 1305, 1459, 1459, -286, -286, 993,
+ -286, -286, -286, 67, 70, -286, 606, -12, -286, 153,
+ 1459, 606, 105, 181, 105, 13, 1459, 305, 993, 993,
+ 993, 993, 17, -286, -286, 122, 158, 993, 606, 788,
+ 123, 187, -286, -286, -286, 105, 1459, 1459, 1459, 1459,
+ -286, -286, 993, 1459, -286, -286, -286, -286, 515, 606,
+ -286, 1459, -286, 95, -24, 188, 606, -286, 606, -286,
+ -286, -286, 993, 129, -286, -286, -286, 116, 606, 130,
+ -286, 1459, -286, 788, 192, 133, -286, 606, 177, -286,
+ -286, -286, 144, -286, 145, -286, 606, -286, -286
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -282, -282, 118, -282, -281, -282, 21, -282, -282, -282,
- -282, -282, -282, 204, -282, -82, -12, -107, -282, -282,
- 6, -7, 73, 208, -282, -282, -282, -282, -19, -282,
- -282, -282, -282, -282, -282, -163, -282, -270, 209, -6,
- -282, -282, -282, -282, -282, 59
+ -286, -286, 104, -286, -285, -286, 24, -286, -286, -286,
+ -286, -286, -286, 183, -286, -85, -9, -79, -286, -286,
+ -1, -4, 64, 193, -286, -286, -286, -286, -25, -286,
+ -286, -286, -286, -286, -286, -160, -286, -233, 194, -3,
+ -286, -286, -286, -286, -286, 36
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -937,328 +937,322 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -6
static const yytype_int16 yytable[] =
{
- 74, 75, 76, 77, 172, 79, 76, 80, 83, 240,
- 71, 134, 334, 110, 304, 296, 95, 152, 315, 98,
- 81, 52, 182, 282, 107, 109, 283, 113, 114, 115,
- 116, 117, 118, 297, 183, 320, 2, 123, 124, 125,
- 2, 5, 161, 162, 152, 5, 69, 136, 185, 138,
- 142, 145, 250, 129, 70, 126, 87, 127, 70, 16,
- 186, 17, 349, 335, 251, 78, 165, 159, 160, 161,
- 162, 76, 167, 99, 100, 168, 176, 88, 76, 171,
- 285, 273, 97, 274, 174, 105, 146, 147, 148, 149,
- 190, 284, 106, 152, 283, 243, 153, 154, 155, 152,
- 305, 111, 153, 283, 238, 166, 14, 244, 184, 119,
- 281, 121, 135, 156, 157, 158, 159, 160, 161, 162,
- 122, 158, 159, 160, 161, 162, 213, 214, 137, 47,
- 212, 128, 164, 47, 215, 268, 269, 310, 166, 218,
- 219, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- 229, 230, 231, 232, 233, 234, 52, 76, 166, 237,
- 329, 330, 170, 239, 175, 173, 181, 187, 242, 188,
- 191, 298, 246, 247, 202, 248, 249, 203, 252, 253,
- 254, 205, 255, 101, 102, 257, 258, 259, 260, 261,
- 262, 263, 264, 265, 266, 318, 206, 319, 103, 207,
- 277, 208, 209, 279, 235, 104, 178, 241, 256, 280,
- 267, 270, 271, 326, 272, 328, 301, 278, 299, 303,
- 338, 311, 312, 316, 317, 336, 344, 146, 147, 148,
- 149, 150, 151, 347, 152, 179, 180, 153, 154, 155,
- 342, 350, 346, 286, 287, 351, 356, 340, 353, 355,
- 357, 245, 343, 210, 156, 157, 158, 159, 160, 161,
- 162, 141, 76, 292, 295, 143, 144, 0, 275, 300,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 306, 307, 308, 309, 0, 314, 0, 0, 0,
- 313, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 322, 0, 324, 0, 321, 0, 0, 0, 327,
- 0, 333, 0, 0, 0, 0, 339, 0, 0, 0,
- 0, 0, 0, 0, 0, 341, 345, 0, 0, 348,
- -5, 1, 0, 0, 0, 352, 0, 354, 0, 0,
- 0, 0, 2, 0, 358, 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, 0, 47, 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, 0, 47, 3, 4, 5,
- 0, 6, 7, 8, 9, 10, 0, 11, 12, 13,
- 0, 14, 15, 16, 0, 17, 325, 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, 293, 46, 2, 0, 47, 3, 4,
+ 72, 172, 134, 73, 74, 75, 76, 110, 78, 75,
+ 79, 83, 240, 81, 315, 334, 77, 182, 2, 95,
+ 99, 100, 98, 5, 52, 69, 296, 107, 109, 183,
+ 113, 114, 115, 116, 117, 118, 80, 126, 2, 127,
+ 123, 124, 125, 5, 297, 122, 129, 101, 102, 185,
+ 136, 304, 138, 142, 145, 88, 80, 16, 349, 17,
+ 152, 186, 103, 250, 87, 152, 335, 165, 282, 104,
+ 176, 283, 320, 75, 167, 251, 97, 91, 168, 93,
+ 105, 75, 171, 285, 190, 161, 162, 174, 159, 160,
+ 161, 162, 243, 238, 166, 146, 147, 148, 149, 150,
+ 151, 184, 152, 135, 106, 153, 154, 155, 273, 284,
+ 274, 47, 283, 128, 305, 14, 244, 283, 268, 269,
+ 310, 166, 156, 157, 158, 159, 160, 161, 162, 213,
+ 214, 47, 111, 212, 329, 330, 119, 215, 281, 121,
+ 137, 164, 218, 219, 220, 221, 222, 223, 224, 225,
+ 226, 227, 228, 229, 230, 231, 232, 233, 234, 52,
+ 75, 166, 237, 170, 173, 175, 239, 181, 187, 188,
+ 191, 242, 202, 203, 205, 246, 247, 206, 248, 249,
+ 208, 252, 253, 254, 207, 255, 209, 235, 257, 258,
+ 259, 260, 261, 262, 263, 264, 265, 266, 241, 298,
+ 256, 267, 278, 277, 270, 271, 279, 272, 299, 301,
+ 192, 303, 280, 311, 312, 316, 193, 317, 336, 342,
+ 344, 346, 350, 318, 351, 319, 146, 147, 148, 149,
+ 150, 151, 353, 152, 355, 357, 153, 154, 155, 210,
+ 141, 326, 245, 328, 340, 275, 286, 287, 338, 343,
+ 143, 144, 0, 156, 157, 158, 159, 160, 161, 162,
+ 0, 347, 0, 0, 0, 75, 292, 295, 146, 147,
+ 148, 149, 300, 0, 356, 152, 0, 0, 153, 154,
+ 155, 0, 0, 0, 306, 307, 308, 309, 0, 314,
+ 0, 0, 0, 313, 0, 156, 157, 158, 159, 160,
+ 161, 162, 0, 0, 322, 0, 324, 0, 321, 0,
+ 0, 0, 327, 0, 333, 0, 0, 0, 0, 339,
+ 0, 0, 0, 0, 0, 0, 0, 0, 341, 345,
+ 0, 0, 348, -5, 1, 0, 0, 0, 352, 0,
+ 354, 0, 0, 0, 0, 2, 0, 358, 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,
+ 13, 0, 14, 15, 16, 0, 17, 0, 18, 19,
+ 20, 0, 0, 0, 21, 22, 23, 24, 152, 0,
+ 25, 153, 0, 0, 0, 26, 27, 28, 0, 0,
+ 29, 0, 0, 0, 30, 31, 32, 0, 33, 0,
+ 158, 159, 160, 161, 162, 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, 293, 46, 2, 0, 47, 3,
+ 41, 42, 43, 0, 0, 0, 0, 0, 0, 44,
+ 45, 0, 0, 0, -5, 46, 2, 0, 47, 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,
+ 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,
- 0, 41, 0, 43, 0, 0, 0, 0, 0, 0,
+ 40, 41, 42, 43, 0, 0, 0, 0, 0, 0,
44, 45, 0, 0, 0, 0, 46, 2, 0, 47,
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,
+ 11, 12, 13, 0, 14, 15, 16, 0, 17, 325,
+ 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, 0, 41, 0, 43, 0, 0, 0, 0, 0,
- 2, 44, 45, 3, 4, 5, 0, 46, 0, 0,
- 47, 0, 0, 11, 12, 13, 0, 14, 72, 16,
- 0, 17, 0, 0, 0, 20, 0, 0, 0, 0,
- 0, 0, 0, 0, 90, 0, 91, 92, 93, 94,
- 73, 0, 28, 0, 0, 0, 0, 0, 0, 0,
+ 0, 40, 41, 0, 43, 0, 0, 0, 0, 0,
+ 0, 44, 45, 0, 0, 0, 293, 46, 2, 0,
+ 47, 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, 293, 46, 2,
+ 0, 47, 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, 0, 47, 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, 0, 47, 0, 0, 11, 12, 13, 0,
+ 14, 70, 16, 0, 17, 0, 0, 0, 20, 0,
+ 0, 0, 0, 0, 0, 0, 0, 90, 0, 91,
+ 92, 93, 94, 71, 0, 28, 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, 72,
- 16, 0, 17, 0, 44, 45, 20, 0, 0, 0,
- 46, 0, 0, 47, 0, 0, 0, 91, 0, 93,
- 0, 73, 0, 28, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 108, 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,
- 72, 16, 0, 17, 0, 44, 45, 20, 0, 0,
- 0, 46, 0, 0, 47, 0, 2, 0, 0, 3,
- 4, 5, 73, 0, 28, 0, 0, 0, 0, 11,
- 12, 13, 0, 14, 72, 16, 0, 17, 0, 0,
- 0, 20, 34, 0, 0, 0, 0, 0, 0, 35,
- 36, 37, 38, 39, 0, 0, 73, 0, 28, 43,
- 0, 0, 0, 0, 0, 0, 44, 45, 0, 0,
- 0, 0, 46, 0, 0, 47, 34, 0, 0, 0,
- 0, 0, 0, 35, 36, 37, 38, 39, 0, 0,
- 0, 0, 91, 43, 93, 0, 0, 0, 0, 0,
- 44, 45, 0, 0, 0, 0, 82, 0, 0, 47,
- 146, 147, 148, 149, 150, 151, 0, 152, 0, 0,
- 153, 154, 155, 0, 0, 0, 0, 0, 192, 0,
- 0, 0, 0, 0, 193, 0, 0, 156, 157, 158,
- 159, 160, 161, 162, 146, 147, 148, 149, 150, 151,
- 0, 152, 0, 0, 153, 154, 155, 0, 0, 0,
- 0, 0, 194, 0, 0, 0, 0, 0, 195, 0,
- 0, 156, 157, 158, 159, 160, 161, 162, 146, 147,
- 148, 149, 150, 151, 0, 152, 0, 0, 153, 154,
- 155, 0, 0, 0, 0, 0, 196, 0, 0, 0,
- 0, 0, 197, 0, 0, 156, 157, 158, 159, 160,
- 161, 162, 146, 147, 148, 149, 150, 151, 0, 152,
- 0, 0, 153, 154, 155, 0, 0, 0, 0, 0,
- 198, 0, 0, 0, 0, 0, 199, 0, 0, 156,
- 157, 158, 159, 160, 161, 162, 146, 147, 148, 149,
- 150, 151, 0, 152, 0, 0, 153, 154, 155, 0,
- 0, 0, 0, 0, 288, 0, 0, 0, 0, 0,
- 0, 0, 0, 156, 157, 158, 159, 160, 161, 162,
- 146, 147, 148, 149, 150, 151, 0, 152, 0, 0,
- 153, 154, 155, 0, 0, 0, 0, 0, 289, 0,
- 0, 0, 0, 0, 0, 0, 0, 156, 157, 158,
- 159, 160, 161, 162, 146, 147, 148, 149, 150, 151,
- 0, 152, 0, 0, 153, 154, 155, 0, 0, 0,
- 0, 0, 290, 0, 0, 0, 0, 0, 0, 0,
- 0, 156, 157, 158, 159, 160, 161, 162, 146, 147,
- 148, 149, 150, 151, 0, 152, 0, 0, 153, 154,
- 155, 0, 0, 0, 0, 0, 291, 0, 0, 0,
- 0, 0, 0, 0, 0, 156, 157, 158, 159, 160,
- 161, 162, 146, 147, 148, 149, 150, 151, 0, 152,
- 0, 0, 153, 154, 155, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 216, 0, 0, 156,
- 157, 158, 159, 160, 161, 162, 146, 147, 148, 149,
- 150, 151, 189, 152, 0, 0, 153, 154, 155, 0,
- 146, 147, 148, 149, 150, 151, 0, 152, 0, 0,
- 153, 154, 155, 156, 157, 158, 159, 160, 161, 162,
- 0, 217, 0, 0, 0, 0, 0, 156, 157, 158,
- 159, 160, 161, 162, 146, 147, 148, 149, 150, 151,
- 0, 152, 0, 0, 153, 154, 155, 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, 70, 16, 0, 17, 0, 44, 45, 20,
+ 0, 0, 0, 46, 0, 0, 47, 0, 0, 0,
+ 91, 0, 93, 0, 71, 0, 28, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 108, 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, 70, 16, 0, 17, 0, 44, 45,
+ 20, 0, 0, 0, 46, 0, 0, 47, 0, 2,
+ 0, 0, 3, 4, 5, 71, 0, 28, 0, 0,
+ 0, 0, 11, 12, 13, 0, 14, 70, 16, 0,
+ 17, 0, 0, 0, 20, 34, 0, 0, 0, 0,
+ 0, 0, 35, 36, 37, 38, 39, 0, 0, 71,
+ 0, 28, 43, 0, 0, 0, 0, 0, 0, 44,
+ 45, 0, 0, 0, 0, 46, 0, 0, 47, 34,
+ 0, 0, 0, 0, 0, 0, 35, 36, 37, 38,
+ 39, 0, 178, 0, 0, 0, 43, 0, 0, 0,
+ 0, 0, 0, 44, 45, 0, 0, 0, 0, 82,
+ 0, 0, 47, 146, 147, 148, 149, 150, 151, 0,
+ 152, 179, 180, 153, 154, 155, 0, 0, 0, 0,
+ 0, 194, 0, 0, 0, 0, 0, 195, 0, 0,
+ 156, 157, 158, 159, 160, 161, 162, 146, 147, 148,
+ 149, 150, 151, 0, 152, 0, 0, 153, 154, 155,
+ 0, 0, 0, 0, 0, 196, 0, 0, 0, 0,
+ 0, 197, 0, 0, 156, 157, 158, 159, 160, 161,
+ 162, 146, 147, 148, 149, 150, 151, 0, 152, 0,
+ 0, 153, 154, 155, 0, 0, 0, 0, 0, 198,
+ 0, 0, 0, 0, 0, 199, 0, 0, 156, 157,
+ 158, 159, 160, 161, 162, 146, 147, 148, 149, 150,
+ 151, 0, 152, 0, 0, 153, 154, 155, 0, 0,
+ 0, 0, 0, 288, 0, 0, 0, 0, 0, 0,
+ 0, 0, 156, 157, 158, 159, 160, 161, 162, 146,
+ 147, 148, 149, 150, 151, 0, 152, 0, 0, 153,
+ 154, 155, 0, 0, 0, 0, 0, 289, 0, 0,
+ 0, 0, 0, 0, 0, 0, 156, 157, 158, 159,
+ 160, 161, 162, 146, 147, 148, 149, 150, 151, 0,
+ 152, 0, 0, 153, 154, 155, 0, 0, 0, 0,
+ 0, 290, 0, 0, 0, 0, 0, 0, 0, 0,
+ 156, 157, 158, 159, 160, 161, 162, 146, 147, 148,
+ 149, 150, 151, 0, 152, 0, 0, 153, 154, 155,
+ 0, 0, 0, 0, 0, 291, 0, 0, 0, 0,
+ 0, 0, 0, 0, 156, 157, 158, 159, 160, 161,
+ 162, 146, 147, 148, 149, 150, 151, 0, 152, 0,
+ 0, 153, 154, 155, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 216, 0, 0, 156, 157,
+ 158, 159, 160, 161, 162, 146, 147, 148, 149, 150,
+ 151, 189, 152, 0, 0, 153, 154, 155, 0, 146,
+ 147, 148, 149, 150, 151, 0, 152, 0, 0, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 0,
+ 217, 0, 0, 0, 0, 0, 156, 157, 158, 159,
+ 160, 161, 162, 146, 147, 148, 149, 150, 151, 0,
+ 152, 0, 0, 153, 154, 155, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 156, 157, 158, 159, 160, 161, 162, 0, 0,
- 0, 204, 146, 147, 148, 149, 150, 151, 0, 152,
- 0, 0, 153, 154, 155, 0, 0, 0, 0, 0,
- 200, 201, 0, 0, 0, 0, 0, 0, 0, 156,
- 157, 158, 159, 160, 161, 162, 146, 147, 148, 149,
- 150, 151, 0, 152, 0, 0, 153, 154, 155, 0,
+ 156, 157, 158, 159, 160, 161, 162, 0, 0, 0,
+ 204, 146, 147, 148, 149, 150, 151, 0, 152, 0,
+ 0, 153, 154, 155, 0, 0, 0, 0, 0, 200,
+ 201, 0, 0, 0, 0, 0, 0, 0, 156, 157,
+ 158, 159, 160, 161, 162, 146, 147, 148, 149, 150,
+ 151, 0, 152, 0, 0, 153, 154, 155, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 156, 157, 158, 159, 160, 161, 162
+ 0, 0, 156, 157, 158, 159, 160, 161, 162
};
static const yytype_int16 yycheck[] =
{
- 7, 8, 9, 9, 86, 12, 13, 13, 15, 172,
- 4, 0, 39, 32, 284, 38, 23, 73, 299, 26,
- 14, 0, 56, 101, 31, 32, 104, 34, 35, 36,
- 37, 38, 39, 56, 68, 305, 12, 44, 45, 46,
- 12, 17, 98, 99, 73, 17, 101, 54, 56, 56,
- 57, 58, 56, 47, 30, 31, 53, 33, 30, 31,
- 68, 33, 343, 90, 68, 30, 73, 96, 97, 98,
- 99, 78, 78, 58, 59, 82, 95, 30, 85, 85,
- 243, 31, 30, 33, 91, 30, 66, 67, 68, 69,
- 109, 101, 30, 73, 104, 177, 76, 77, 78, 73,
- 101, 30, 76, 104, 103, 104, 29, 30, 102, 30,
- 217, 30, 101, 93, 94, 95, 96, 97, 98, 99,
- 102, 95, 96, 97, 98, 99, 138, 139, 68, 105,
- 137, 107, 102, 105, 141, 103, 104, 103, 104, 146,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 157, 158, 159, 160, 161, 162, 135, 164, 104, 166,
- 39, 40, 104, 170, 48, 104, 30, 56, 175, 55,
- 104, 278, 179, 180, 104, 182, 183, 30, 185, 186,
- 187, 107, 189, 15, 16, 192, 193, 194, 195, 196,
- 197, 198, 199, 200, 201, 302, 107, 304, 30, 106,
- 212, 104, 104, 215, 30, 37, 45, 30, 30, 216,
- 30, 205, 206, 320, 208, 322, 104, 55, 55, 30,
- 327, 91, 56, 92, 30, 30, 104, 66, 67, 68,
- 69, 70, 71, 340, 73, 74, 75, 76, 77, 78,
- 90, 30, 91, 250, 251, 91, 353, 329, 55, 90,
- 90, 178, 334, 135, 93, 94, 95, 96, 97, 98,
- 99, 57, 269, 269, 276, 57, 57, -1, 209, 281,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 288, 289, 290, 291, -1, 298, -1, -1, -1,
- 297, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 313, -1, 315, -1, 312, -1, -1, -1, 321,
- -1, 323, -1, -1, -1, -1, 328, -1, -1, -1,
- -1, -1, -1, -1, -1, 332, 338, -1, -1, 341,
- 0, 1, -1, -1, -1, 347, -1, 349, -1, -1,
- -1, -1, 12, -1, 356, 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, -1, 105, 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, -1, 105, 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, -1, 105, 15, 16,
+ 4, 86, 0, 7, 8, 9, 9, 32, 12, 13,
+ 13, 15, 172, 14, 299, 39, 30, 56, 12, 23,
+ 58, 59, 26, 17, 0, 101, 38, 31, 32, 68,
+ 34, 35, 36, 37, 38, 39, 30, 31, 12, 33,
+ 44, 45, 46, 17, 56, 102, 47, 15, 16, 56,
+ 54, 284, 56, 57, 58, 30, 30, 31, 343, 33,
+ 73, 68, 30, 56, 53, 73, 90, 71, 101, 37,
+ 95, 104, 305, 77, 77, 68, 30, 48, 82, 50,
+ 30, 85, 85, 243, 109, 98, 99, 91, 96, 97,
+ 98, 99, 177, 103, 104, 66, 67, 68, 69, 70,
+ 71, 102, 73, 101, 30, 76, 77, 78, 31, 101,
+ 33, 105, 104, 107, 101, 29, 30, 104, 103, 104,
+ 103, 104, 93, 94, 95, 96, 97, 98, 99, 138,
+ 139, 105, 30, 137, 39, 40, 30, 141, 217, 30,
+ 68, 102, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 161, 162, 135,
+ 164, 104, 166, 104, 104, 48, 170, 30, 56, 55,
+ 104, 175, 104, 30, 107, 179, 180, 107, 182, 183,
+ 104, 185, 186, 187, 106, 189, 104, 30, 192, 193,
+ 194, 195, 196, 197, 198, 199, 200, 201, 30, 278,
+ 30, 30, 55, 212, 205, 206, 215, 208, 55, 104,
+ 50, 30, 216, 91, 56, 92, 56, 30, 30, 90,
+ 104, 91, 30, 302, 91, 304, 66, 67, 68, 69,
+ 70, 71, 55, 73, 90, 90, 76, 77, 78, 135,
+ 57, 320, 178, 322, 329, 209, 250, 251, 327, 334,
+ 57, 57, -1, 93, 94, 95, 96, 97, 98, 99,
+ -1, 340, -1, -1, -1, 269, 269, 276, 66, 67,
+ 68, 69, 281, -1, 353, 73, -1, -1, 76, 77,
+ 78, -1, -1, -1, 288, 289, 290, 291, -1, 298,
+ -1, -1, -1, 297, -1, 93, 94, 95, 96, 97,
+ 98, 99, -1, -1, 313, -1, 315, -1, 312, -1,
+ -1, -1, 321, -1, 323, -1, -1, -1, -1, 328,
+ -1, -1, -1, -1, -1, -1, -1, -1, 332, 338,
+ -1, -1, 341, 0, 1, -1, -1, -1, 347, -1,
+ 349, -1, -1, -1, -1, 12, -1, 356, 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,
+ 27, -1, 29, 30, 31, -1, 33, -1, 35, 36,
+ 37, -1, -1, -1, 41, 42, 43, 44, 73, -1,
+ 47, 76, -1, -1, -1, 52, 53, 54, -1, -1,
+ 57, -1, -1, -1, 61, 62, 63, -1, 65, -1,
+ 95, 96, 97, 98, 99, 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,
+ 87, 88, 89, -1, -1, -1, -1, -1, -1, 96,
97, -1, -1, -1, 101, 102, 12, -1, 105, 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,
+ 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,
- -1, 87, -1, 89, -1, -1, -1, -1, -1, -1,
+ 86, 87, 88, 89, -1, -1, -1, -1, -1, -1,
96, 97, -1, -1, -1, -1, 102, 12, -1, 105,
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,
+ 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, -1, 87, -1, 89, -1, -1, -1, -1, -1,
- 12, 96, 97, 15, 16, 17, -1, 102, -1, -1,
- 105, -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,
+ -1, 86, 87, -1, 89, -1, -1, -1, -1, -1,
+ -1, 96, 97, -1, -1, -1, 101, 102, 12, -1,
+ 105, 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,
+ -1, 105, 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, -1, 105, 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, -1, 105, -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,
- 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, -1, 105, -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, -1, 105, -1, 12, -1, -1, 15,
- 16, 17, 52, -1, 54, -1, -1, -1, -1, 25,
- 26, 27, -1, 29, 30, 31, -1, 33, -1, -1,
- -1, 37, 72, -1, -1, -1, -1, -1, -1, 79,
- 80, 81, 82, 83, -1, -1, 52, -1, 54, 89,
- -1, -1, -1, -1, -1, -1, 96, 97, -1, -1,
- -1, -1, 102, -1, -1, 105, 72, -1, -1, -1,
- -1, -1, -1, 79, 80, 81, 82, 83, -1, -1,
- -1, -1, 48, 89, 50, -1, -1, -1, -1, -1,
- 96, 97, -1, -1, -1, -1, 102, -1, -1, 105,
- 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,
- 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, 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, 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, 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, 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, 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, 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, -1, 105, -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, -1, 105, -1, 12,
+ -1, -1, 15, 16, 17, 52, -1, 54, -1, -1,
+ -1, -1, 25, 26, 27, -1, 29, 30, 31, -1,
+ 33, -1, -1, -1, 37, 72, -1, -1, -1, -1,
+ -1, -1, 79, 80, 81, 82, 83, -1, -1, 52,
+ -1, 54, 89, -1, -1, -1, -1, -1, -1, 96,
+ 97, -1, -1, -1, -1, 102, -1, -1, 105, 72,
+ -1, -1, -1, -1, -1, -1, 79, 80, 81, 82,
+ 83, -1, 45, -1, -1, -1, 89, -1, -1, -1,
+ -1, -1, -1, 96, 97, -1, -1, -1, -1, 102,
+ -1, -1, 105, 66, 67, 68, 69, 70, 71, -1,
+ 73, 74, 75, 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, 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, -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, 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, 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,
+ 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, -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, -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, -1, 93, 94, 95, 96, 97, 98, 99
+ -1, -1, 93, 94, 95, 96, 97, 98, 99
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1272,8 +1266,8 @@ static const yytype_uint8 yystos[] =
86, 87, 88, 89, 96, 97, 102, 105, 109, 110,
111, 112, 114, 115, 119, 120, 121, 126, 127, 128,
129, 130, 131, 135, 137, 139, 142, 146, 149, 101,
- 30, 128, 30, 52, 129, 129, 129, 147, 30, 129,
- 147, 128, 102, 129, 148, 138, 141, 53, 30, 132,
+ 30, 52, 129, 129, 129, 129, 147, 30, 129, 147,
+ 30, 128, 102, 129, 148, 138, 141, 53, 30, 132,
46, 48, 49, 50, 51, 129, 136, 30, 129, 58,
59, 15, 16, 30, 37, 30, 30, 129, 64, 129,
136, 30, 134, 129, 129, 129, 129, 129, 129, 30,
@@ -3040,7 +3034,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 3044 "engines/director/lingo/lingo-gr.cpp"
+#line 3038 "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 ba6286b..cf70e6e 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -406,7 +406,7 @@ expr: simpleexpr { $$ = $1; }
WRITE_UINT32(&e, $1[0]);
WRITE_UINT32(&f, $1[1]);
g_lingo->code2(e, f); }
- | THEENTITYWITHID simpleexpr {
+ | THEENTITYWITHID expr {
$$ = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, $1[0]);
Commit: a7985493114f076552efb5b174b64d41010edc03
https://github.com/scummvm/scummvm/commit/a7985493114f076552efb5b174b64d41010edc03
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:52+01:00
Commit Message:
DIRECTOR: LINGO: Added test for 'the entities' with id
Changed paths:
engines/director/lingo/tests/the.lingo
diff --git a/engines/director/lingo/tests/the.lingo b/engines/director/lingo/tests/the.lingo
index bdb56b5..e03f447 100644
--- a/engines/director/lingo/tests/the.lingo
+++ b/engines/director/lingo/tests/the.lingo
@@ -28,3 +28,5 @@ set the bottom of x to originV + (the number of lines in someText) * 16
set the bottom of x to originV + (the number of words in someText) * 16
put the number of words of field 1 into field 5
+
+set h = the locH of sprite pSprite + pChangeH
Commit: 8fedec7cdaf57ae64fe6482d70171698052a8dde
https://github.com/scummvm/scummvm/commit/8fedec7cdaf57ae64fe6482d70171698052a8dde
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:52+01:00
Commit Message:
DIRECTOR: LINGO: Changed semantics of 'me' keyword. Now it serves as a defined method
Changed paths:
engines/director/lingo/lingo-builtins.cpp
engines/director/lingo/lingo-builtins.h
engines/director/lingo/lingo-code.cpp
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.h
engines/director/lingo/lingo-gr.y
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index e02ac63..c5f05a0 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -221,7 +221,7 @@ static struct BuiltinProto {
// References
{ "cast", LB::b_cast, 1, 1, false, 4, RBLTIN }, // D4 f
{ "field", LB::b_field, 1, 1, false, 3, RBLTIN }, // D3 f
- { "me", LB::b_me, -1,0, false, 3, BLTIN }, // D3
+// { "me", LB::b_me, -1,0, false, 3, FBLTIN }, // D3 // works as normal ID, see c_varpush
{ "script", LB::b_script, 1, 1, false, 4, RBLTIN }, // D4 f
{ "window", LB::b_window, 1, 1, false, 4, RBLTIN }, // D4 f
// Chunk operations
@@ -1751,12 +1751,6 @@ void LB::b_field(int nargs) {
g_lingo->push(d);
}
-void LB::b_me(int nargs) {
- g_lingo->printSTUBWithArglist("me", nargs);
-
- g_lingo->dropStack(nargs);
-}
-
void LB::b_script(int nargs) {
Datum d = g_lingo->pop();
diff --git a/engines/director/lingo/lingo-builtins.h b/engines/director/lingo/lingo-builtins.h
index 9cc6e19..06bac60 100644
--- a/engines/director/lingo/lingo-builtins.h
+++ b/engines/director/lingo/lingo-builtins.h
@@ -196,7 +196,6 @@ namespace LB {
void b_cast(int nargs);
void b_field(int nargs);
- void b_me(int nargs);
void b_script(int nargs);
void b_numberofchars(int nargs);
diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp
index e8e47fd..5eb51c5 100644
--- a/engines/director/lingo/lingo-code.cpp
+++ b/engines/director/lingo/lingo-code.cpp
@@ -320,6 +320,10 @@ void LC::c_varpush() {
return;
}
+ if (name.equalsIgnoreCase("me")) {
+ warning("c_varpush: ME");
+ }
+
if (g_lingo->getHandler(name) != NULL) {
d.type = HANDLER;
d.u.s = new Common::String(name);
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index d52e6fa..9d6dd22 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -152,10 +152,9 @@
tTELL = 341,
tPROPERTY = 342,
tON = 343,
- tME = 344,
- tENDIF = 345,
- tENDREPEAT = 346,
- tENDTELL = 347
+ tENDIF = 344,
+ tENDREPEAT = 345,
+ tENDTELL = 346
};
#endif
/* Tokens. */
@@ -245,10 +244,9 @@
#define tTELL 341
#define tPROPERTY 342
#define tON 343
-#define tME 344
-#define tENDIF 345
-#define tENDREPEAT 346
-#define tENDTELL 347
+#define tENDIF 344
+#define tENDREPEAT 345
+#define tENDTELL 346
@@ -324,7 +322,7 @@ typedef union YYSTYPE
} objectfield;
}
/* Line 193 of yacc.c. */
-#line 328 "engines/director/lingo/lingo-gr.cpp"
+#line 326 "engines/director/lingo/lingo-gr.cpp"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -337,7 +335,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 341 "engines/director/lingo/lingo-gr.cpp"
+#line 339 "engines/director/lingo/lingo-gr.cpp"
#ifdef short
# undef short
@@ -550,22 +548,22 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 134
+#define YYFINAL 132
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1558
+#define YYLAST 1584
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 108
+#define YYNTOKENS 107
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 46
/* YYNRULES -- Number of rules. */
-#define YYNRULES 171
+#define YYNRULES 168
/* YYNRULES -- Number of states. */
-#define YYNSTATES 359
+#define YYNSTATES 352
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 347
+#define YYMAXUTOK 346
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -574,15 +572,15 @@ union yyalloc
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 101, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 100, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 100, 95, 2,
- 102, 103, 98, 96, 104, 97, 2, 99, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 107, 2,
- 93, 2, 94, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 99, 94, 2,
+ 101, 102, 97, 95, 103, 96, 2, 98, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 106, 2,
+ 92, 2, 93, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 105, 2, 106, 2, 2, 2, 2, 2, 2,
+ 2, 104, 2, 105, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -607,7 +605,7 @@ static const yytype_uint8 yytranslate[] =
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92
+ 85, 86, 87, 88, 89, 90, 91
};
#if YYDEBUG
@@ -625,82 +623,80 @@ static const yytype_uint16 yyprhs[] =
264, 268, 272, 276, 280, 284, 288, 292, 296, 300,
304, 308, 311, 315, 319, 323, 327, 330, 333, 337,
342, 347, 352, 359, 364, 371, 376, 383, 388, 395,
- 400, 407, 409, 412, 415, 417, 419, 422, 424, 427,
- 430, 433, 435, 438, 441, 443, 446, 451, 454, 458,
- 460, 464, 466, 470, 472, 476, 479, 482, 485, 488,
- 492, 495, 499, 502, 505, 508, 512, 515, 516, 520,
- 521, 530, 533, 534, 542, 551, 558, 561, 562, 564,
- 568, 573, 574, 576, 580, 581, 584, 585, 587, 591,
- 593, 597, 601, 602, 604, 606, 608, 610, 614, 616,
- 620, 624
+ 398, 401, 403, 405, 408, 410, 413, 416, 419, 421,
+ 424, 427, 429, 432, 437, 440, 444, 446, 450, 452,
+ 456, 458, 462, 465, 468, 471, 474, 478, 481, 485,
+ 488, 491, 494, 498, 501, 502, 506, 507, 516, 519,
+ 520, 528, 537, 544, 547, 548, 550, 554, 559, 560,
+ 562, 566, 567, 570, 571, 573, 577, 579, 583, 587,
+ 588, 590, 592, 594, 596, 600, 602, 606, 610
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 109, 0, -1, 109, 101, 110, -1, 110, -1, 1,
- 101, -1, -1, 139, -1, 114, -1, 52, 129, 45,
- 30, -1, 52, 129, 45, 130, -1, 52, 129, 74,
- 129, -1, 52, 129, 75, 129, -1, 54, 30, 68,
- 129, -1, 54, 15, 68, 129, -1, 54, 30, 56,
- 129, -1, 54, 15, 56, 129, -1, 54, 16, 128,
- 56, 129, -1, 54, 16, 128, 68, 129, -1, 54,
- 37, 56, 129, -1, 146, -1, 129, -1, 131, -1,
- 146, -1, 129, -1, 131, -1, 118, -1, 112, -1,
- 115, -1, 119, 129, 124, 125, 124, 91, -1, 120,
- 68, 129, 124, 56, 129, 124, 125, 124, 91, -1,
- 120, 68, 129, 124, 38, 56, 129, 124, 125, 124,
- 91, -1, 126, 113, 124, -1, 127, 129, 101, 125,
- 124, 92, -1, 127, 129, 56, 129, -1, 121, 129,
- 124, 55, 125, 124, 116, 124, 90, -1, 121, 129,
- 124, 55, 125, 124, 116, 39, 123, 125, 124, 90,
- -1, -1, 116, 117, -1, 122, 129, 124, 55, 125,
- 124, -1, 121, 129, 124, 55, 112, 124, 39, 123,
- 112, 124, 90, -1, 121, 129, 124, 55, 112, 124,
- 90, -1, 53, 59, -1, 53, 58, 30, -1, 44,
- -1, 40, -1, -1, -1, -1, 125, 101, -1, 125,
- 114, -1, 57, 30, 55, -1, 86, -1, 12, -1,
- 17, -1, 33, -1, 31, -1, 30, -1, 149, -1,
- 128, -1, 130, -1, 25, -1, 26, 129, -1, 27,
- 147, -1, 30, 102, 147, 103, -1, 15, -1, 16,
- 129, -1, 37, -1, 111, -1, 129, 96, 129, -1,
- 129, 97, 129, -1, 129, 98, 129, -1, 129, 99,
- 129, -1, 129, 73, 129, -1, 129, 94, 129, -1,
- 129, 93, 129, -1, 129, 68, 129, -1, 129, 69,
- 129, -1, 129, 66, 129, -1, 129, 67, 129, -1,
- 129, 70, 129, -1, 129, 71, 129, -1, 72, 129,
- -1, 129, 95, 129, -1, 129, 76, 129, -1, 129,
- 77, 129, -1, 129, 78, 129, -1, 96, 129, -1,
- 97, 129, -1, 102, 129, 103, -1, 83, 129, 84,
- 129, -1, 83, 129, 85, 129, -1, 79, 129, 50,
- 129, -1, 79, 129, 56, 129, 50, 129, -1, 80,
- 129, 50, 129, -1, 80, 129, 56, 129, 50, 129,
- -1, 81, 129, 50, 129, -1, 81, 129, 56, 129,
- 50, 129, -1, 82, 129, 50, 129, -1, 82, 129,
- 56, 129, 50, 129, -1, 89, 102, 30, 103, -1,
- 89, 102, 30, 104, 147, 103, -1, 89, -1, 29,
- 128, -1, 52, 129, -1, 135, -1, 137, -1, 41,
- 53, -1, 41, -1, 42, 132, -1, 87, 133, -1,
- 65, 134, -1, 19, -1, 21, 129, -1, 20, 129,
- -1, 20, -1, 22, 147, -1, 62, 129, 58, 129,
- -1, 62, 129, -1, 23, 30, 147, -1, 30, -1,
- 132, 104, 30, -1, 30, -1, 133, 104, 30, -1,
- 30, -1, 134, 104, 30, -1, 43, 46, -1, 43,
- 49, -1, 43, 51, -1, 43, 129, -1, 43, 129,
- 136, -1, 43, 136, -1, 50, 48, 129, -1, 48,
- 129, -1, 63, 64, -1, 63, 129, -1, 63, 129,
- 136, -1, 63, 136, -1, -1, 35, 138, 147, -1,
- -1, 47, 30, 140, 123, 143, 101, 145, 125, -1,
- 61, 30, -1, -1, 36, 141, 123, 143, 101, 145,
- 125, -1, 142, 123, 143, 101, 145, 125, 34, 144,
- -1, 142, 123, 143, 101, 145, 125, -1, 88, 30,
- -1, -1, 30, -1, 143, 104, 30, -1, 143, 101,
- 104, 30, -1, -1, 30, -1, 144, 104, 30, -1,
- -1, 30, 148, -1, -1, 129, -1, 147, 104, 129,
- -1, 129, -1, 148, 104, 129, -1, 105, 150, 106,
- -1, -1, 107, -1, 151, -1, 152, -1, 128, -1,
- 151, 104, 128, -1, 153, -1, 152, 104, 153, -1,
- 33, 107, 128, -1, 31, 107, 128, -1
+ 108, 0, -1, 108, 100, 109, -1, 109, -1, 1,
+ 100, -1, -1, 138, -1, 113, -1, 52, 128, 45,
+ 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, 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,
+ 114, -1, 118, 128, 123, 124, 123, 90, -1, 119,
+ 68, 128, 123, 56, 128, 123, 124, 123, 90, -1,
+ 119, 68, 128, 123, 38, 56, 128, 123, 124, 123,
+ 90, -1, 125, 112, 123, -1, 126, 128, 100, 124,
+ 123, 91, -1, 126, 128, 56, 128, -1, 120, 128,
+ 123, 55, 124, 123, 115, 123, 89, -1, 120, 128,
+ 123, 55, 124, 123, 115, 39, 122, 124, 123, 89,
+ -1, -1, 115, 116, -1, 121, 128, 123, 55, 124,
+ 123, -1, 120, 128, 123, 55, 111, 123, 39, 122,
+ 111, 123, 89, -1, 120, 128, 123, 55, 111, 123,
+ 89, -1, 53, 59, -1, 53, 58, 30, -1, 44,
+ -1, 40, -1, -1, -1, -1, 124, 100, -1, 124,
+ 113, -1, 57, 30, 55, -1, 86, -1, 12, -1,
+ 17, -1, 33, -1, 31, -1, 30, -1, 148, -1,
+ 127, -1, 129, -1, 25, -1, 26, 128, -1, 27,
+ 146, -1, 30, 101, 146, 102, -1, 15, -1, 16,
+ 128, -1, 37, -1, 110, -1, 128, 95, 128, -1,
+ 128, 96, 128, -1, 128, 97, 128, -1, 128, 98,
+ 128, -1, 128, 73, 128, -1, 128, 93, 128, -1,
+ 128, 92, 128, -1, 128, 68, 128, -1, 128, 69,
+ 128, -1, 128, 66, 128, -1, 128, 67, 128, -1,
+ 128, 70, 128, -1, 128, 71, 128, -1, 72, 128,
+ -1, 128, 94, 128, -1, 128, 76, 128, -1, 128,
+ 77, 128, -1, 128, 78, 128, -1, 95, 128, -1,
+ 96, 128, -1, 101, 128, 102, -1, 83, 128, 84,
+ 128, -1, 83, 128, 85, 128, -1, 79, 128, 50,
+ 128, -1, 79, 128, 56, 128, 50, 128, -1, 80,
+ 128, 50, 128, -1, 80, 128, 56, 128, 50, 128,
+ -1, 81, 128, 50, 128, -1, 81, 128, 56, 128,
+ 50, 128, -1, 82, 128, 50, 128, -1, 82, 128,
+ 56, 128, 50, 128, -1, 29, 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,
+ 146, -1, 62, 128, 58, 128, -1, 62, 128, -1,
+ 23, 30, 146, -1, 30, -1, 131, 103, 30, -1,
+ 30, -1, 132, 103, 30, -1, 30, -1, 133, 103,
+ 30, -1, 43, 46, -1, 43, 49, -1, 43, 51,
+ -1, 43, 128, -1, 43, 128, 135, -1, 43, 135,
+ -1, 50, 48, 128, -1, 48, 128, -1, 63, 64,
+ -1, 63, 128, -1, 63, 128, 135, -1, 63, 135,
+ -1, -1, 35, 137, 146, -1, -1, 47, 30, 139,
+ 122, 142, 100, 144, 124, -1, 61, 30, -1, -1,
+ 36, 140, 122, 142, 100, 144, 124, -1, 141, 122,
+ 142, 100, 144, 124, 34, 143, -1, 141, 122, 142,
+ 100, 144, 124, -1, 88, 30, -1, -1, 30, -1,
+ 142, 103, 30, -1, 142, 100, 103, 30, -1, -1,
+ 30, -1, 143, 103, 30, -1, -1, 30, 147, -1,
+ -1, 128, -1, 146, 103, 128, -1, 128, -1, 147,
+ 103, 128, -1, 104, 149, 105, -1, -1, 106, -1,
+ 150, -1, 151, -1, 127, -1, 150, 103, 127, -1,
+ 152, -1, 151, 103, 152, -1, 33, 106, 127, -1,
+ 31, 106, 127, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -715,15 +711,14 @@ static const yytype_uint16 yyrline[] =
391, 394, 397, 398, 401, 409, 415, 419, 420, 421,
422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
432, 433, 434, 435, 436, 437, 438, 439, 440, 441,
- 442, 443, 444, 445, 446, 447, 448, 449, 450, 451,
- 452, 453, 456, 461, 462, 463, 464, 465, 466, 467,
- 468, 469, 472, 475, 478, 482, 483, 484, 485, 488,
- 489, 492, 493, 496, 497, 508, 509, 510, 511, 515,
- 519, 525, 526, 529, 530, 534, 538, 542, 542, 572,
- 572, 578, 579, 579, 585, 593, 600, 602, 603, 604,
- 605, 608, 609, 610, 613, 616, 624, 625, 626, 629,
- 630, 633, 636, 637, 638, 639, 642, 643, 646, 647,
- 650, 653
+ 442, 443, 444, 445, 446, 447, 448, 449, 450, 453,
+ 458, 459, 460, 461, 462, 463, 464, 465, 466, 469,
+ 472, 475, 479, 480, 481, 482, 485, 486, 489, 490,
+ 493, 494, 505, 506, 507, 508, 512, 516, 522, 523,
+ 526, 527, 531, 535, 539, 539, 569, 569, 575, 576,
+ 576, 582, 590, 597, 599, 600, 601, 602, 605, 606,
+ 607, 610, 613, 621, 622, 623, 626, 627, 630, 633,
+ 634, 635, 636, 639, 640, 643, 644, 647, 650
};
#endif
@@ -745,7 +740,7 @@ static const char *const yytname[] =
"tFACTORY", "tOPEN", "tPLAY", "tDONE", "tINSTANCE", "tGE", "tLE", "tEQ",
"tNEQ", "tAND", "tOR", "tNOT", "tMOD", "tAFTER", "tBEFORE", "tCONCAT",
"tCONTAINS", "tSTARTS", "tCHAR", "tITEM", "tLINE", "tWORD", "tSPRITE",
- "tINTERSECTS", "tWITHIN", "tTELL", "tPROPERTY", "tON", "tME", "tENDIF",
+ "tINTERSECTS", "tWITHIN", "tTELL", "tPROPERTY", "tON", "tENDIF",
"tENDREPEAT", "tENDTELL", "'<'", "'>'", "'&'", "'+'", "'-'", "'*'",
"'/'", "'%'", "'\\n'", "'('", "')'", "','", "'['", "']'", "':'",
"$accept", "program", "programline", "asgn", "stmtoneliner",
@@ -773,32 +768,31 @@ static const yytype_uint16 yytoknum[] =
315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 60, 62, 38, 43, 45, 42, 47,
- 37, 10, 40, 41, 44, 91, 93, 58
+ 345, 346, 60, 62, 38, 43, 45, 42, 47, 37,
+ 10, 40, 41, 44, 91, 93, 58
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 108, 109, 109, 109, 110, 110, 110, 111, 111,
- 111, 111, 111, 111, 111, 111, 111, 111, 111, 112,
- 112, 112, 113, 113, 113, 113, 114, 114, 114, 114,
- 114, 114, 114, 114, 115, 115, 116, 116, 117, 118,
- 118, 119, 120, 121, 122, 123, 124, 125, 125, 125,
- 126, 127, 128, 128, 128, 128, 128, 128, 129, 129,
- 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
- 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
- 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
- 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
- 129, 129, 130, 131, 131, 131, 131, 131, 131, 131,
- 131, 131, 131, 131, 131, 131, 131, 131, 131, 132,
- 132, 133, 133, 134, 134, 135, 135, 135, 135, 135,
- 135, 136, 136, 137, 137, 137, 137, 138, 137, 140,
- 139, 139, 141, 139, 139, 139, 142, 143, 143, 143,
- 143, 144, 144, 144, 145, 146, 147, 147, 147, 148,
- 148, 149, 150, 150, 150, 150, 151, 151, 152, 152,
- 153, 153
+ 0, 107, 108, 108, 108, 109, 109, 109, 110, 110,
+ 110, 110, 110, 110, 110, 110, 110, 110, 110, 111,
+ 111, 111, 112, 112, 112, 112, 113, 113, 113, 113,
+ 113, 113, 113, 113, 114, 114, 115, 115, 116, 117,
+ 117, 118, 119, 120, 121, 122, 123, 124, 124, 124,
+ 125, 126, 127, 127, 127, 127, 127, 127, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 129,
+ 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
+ 130, 130, 130, 130, 130, 130, 131, 131, 132, 132,
+ 133, 133, 134, 134, 134, 134, 134, 134, 135, 135,
+ 136, 136, 136, 136, 137, 136, 139, 138, 138, 140,
+ 138, 138, 138, 141, 142, 142, 142, 142, 143, 143,
+ 143, 144, 145, 146, 146, 146, 147, 147, 148, 149,
+ 149, 149, 149, 150, 150, 151, 151, 152, 152
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -813,15 +807,14 @@ static const yytype_uint8 yyr2[] =
1, 2, 2, 4, 1, 2, 1, 1, 3, 3,
3, 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, 4,
- 6, 1, 2, 2, 1, 1, 2, 1, 2, 2,
- 2, 1, 2, 2, 1, 2, 4, 2, 3, 1,
- 3, 1, 3, 1, 3, 2, 2, 2, 2, 3,
- 2, 3, 2, 2, 2, 3, 2, 0, 3, 0,
- 8, 2, 0, 7, 8, 6, 2, 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
+ 4, 4, 6, 4, 6, 4, 6, 4, 6, 2,
+ 2, 1, 1, 2, 1, 2, 2, 2, 1, 2,
+ 2, 1, 2, 4, 2, 3, 1, 3, 1, 3,
+ 1, 3, 2, 2, 2, 2, 3, 2, 3, 2,
+ 2, 2, 3, 2, 0, 3, 0, 8, 2, 0,
+ 7, 8, 6, 2, 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
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -829,105 +822,105 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 52, 64, 0, 53, 111, 114, 0, 156,
- 0, 60, 0, 156, 0, 56, 55, 54, 137, 142,
- 66, 107, 0, 0, 43, 0, 0, 0, 0, 0,
+ 0, 0, 52, 64, 0, 53, 108, 111, 0, 153,
+ 0, 60, 0, 153, 0, 56, 55, 54, 134, 139,
+ 66, 104, 0, 0, 43, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 51, 0, 0, 101, 0, 0, 0, 162, 0, 3,
- 67, 26, 7, 27, 0, 0, 0, 0, 0, 58,
- 20, 59, 21, 104, 105, 6, 45, 19, 57, 4,
- 56, 0, 65, 113, 112, 157, 115, 156, 61, 62,
- 56, 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, 123, 110, 81, 0, 0, 0, 0, 0, 121,
- 109, 146, 0, 86, 87, 0, 55, 54, 163, 166,
- 0, 164, 165, 168, 1, 5, 46, 0, 46, 46,
- 25, 0, 23, 24, 22, 0, 0, 0, 0, 0,
+ 51, 0, 0, 0, 0, 0, 159, 0, 3, 67,
+ 26, 7, 27, 0, 0, 0, 0, 0, 58, 20,
+ 59, 21, 101, 102, 6, 45, 19, 57, 4, 56,
+ 0, 65, 110, 109, 154, 112, 153, 61, 62, 56,
+ 99, 153, 156, 152, 153, 45, 103, 116, 105, 122,
+ 0, 123, 0, 124, 125, 127, 136, 100, 0, 41,
+ 0, 0, 0, 0, 0, 138, 114, 130, 131, 133,
+ 120, 107, 81, 0, 0, 0, 0, 0, 118, 106,
+ 143, 86, 87, 0, 55, 54, 160, 163, 0, 161,
+ 162, 165, 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, 0, 0, 147, 156, 0, 0, 118, 157, 0,
- 0, 138, 147, 0, 132, 0, 129, 45, 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, 88, 0, 0, 161, 0, 0,
- 2, 47, 46, 0, 31, 46, 0, 47, 77, 78,
- 75, 76, 79, 80, 72, 83, 84, 85, 74, 73,
- 82, 68, 69, 70, 71, 148, 0, 158, 63, 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,
- 171, 170, 167, 0, 0, 169, 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, 46, 0, 151, 140, 47, 46, 45,
- 44, 37, 0, 0, 45, 40, 152, 144, 46, 0,
- 47, 46, 34, 0, 0, 0, 29, 46, 0, 46,
- 153, 30, 0, 47, 0, 35, 46, 39, 38
+ 0, 144, 153, 0, 0, 115, 154, 0, 0, 135,
+ 144, 0, 129, 0, 126, 45, 0, 0, 0, 42,
+ 0, 0, 0, 0, 0, 0, 50, 0, 132, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 88, 0, 0, 158, 0, 0, 2, 47, 46,
+ 0, 31, 46, 0, 47, 77, 78, 75, 76, 79,
+ 80, 72, 83, 84, 85, 74, 73, 82, 68, 69,
+ 70, 71, 145, 0, 155, 63, 157, 0, 117, 128,
+ 144, 8, 9, 10, 11, 15, 13, 0, 0, 14,
+ 12, 18, 113, 121, 91, 0, 93, 0, 95, 0,
+ 97, 0, 89, 90, 119, 168, 167, 164, 0, 0,
+ 166, 46, 0, 47, 0, 33, 46, 151, 0, 151,
+ 0, 16, 17, 0, 0, 0, 0, 48, 49, 0,
+ 0, 0, 46, 0, 0, 0, 47, 146, 47, 151,
+ 92, 94, 96, 98, 28, 0, 46, 36, 46, 32,
+ 147, 142, 140, 47, 46, 47, 46, 0, 148, 137,
+ 47, 46, 45, 44, 37, 0, 0, 45, 40, 149,
+ 141, 46, 0, 47, 46, 34, 0, 0, 0, 29,
+ 46, 0, 46, 150, 30, 0, 47, 0, 35, 46,
+ 39, 38
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 48, 49, 50, 51, 139, 294, 53, 323, 331,
- 140, 54, 55, 56, 332, 163, 211, 276, 57, 58,
- 59, 60, 61, 62, 89, 120, 112, 63, 96, 64,
- 85, 65, 177, 86, 66, 236, 337, 302, 67, 169,
- 84, 68, 130, 131, 132, 133
+ -1, 47, 48, 49, 50, 137, 288, 52, 316, 324,
+ 138, 53, 54, 55, 325, 161, 208, 271, 56, 57,
+ 58, 59, 60, 61, 88, 119, 111, 62, 95, 63,
+ 84, 64, 175, 85, 65, 233, 330, 296, 66, 167,
+ 83, 67, 128, 129, 130, 131
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -286
+#define YYPACT_NINF -279
static const yytype_int16 yypact[] =
{
- 333, -76, -286, -286, 993, -286, -286, 993, 993, 993,
- -14, -286, 993, 993, 26, 1027, -286, -286, -286, -286,
- -286, 11, 25, 871, -286, 46, 993, -38, 32, 50,
- 74, 993, 932, 102, 993, 993, 993, 993, 993, 993,
- -286, 106, 109, -57, 993, 993, 993, 6, 2, -286,
- -286, -286, -286, -286, 993, 72, 993, 697, 993, -286,
- 1459, -286, -286, -286, -286, -286, -286, -286, -286, -286,
- 39, 993, 1459, 1459, 1459, 1459, 57, 993, 1459, 57,
- -286, -286, 993, 1459, 59, 993, -286, -286, -286, 60,
- -286, 993, -286, 117, -286, 29, -286, -286, 1067, 137,
- -286, -39, 26, -7, 112, 114, -286, 1353, -286, 29,
- -286, -286, 66, -286, 160, 1101, 1135, 1169, 1425, -286,
- 68, -286, 143, -286, -286, 1387, 67, 70, -286, -286,
- 78, 76, 82, -286, -286, 424, 1459, 993, 1459, -286,
- -286, 993, 1459, -286, -286, 1339, 993, 993, 993, 993,
- 993, 993, 993, 993, 993, 993, 993, 993, 993, 993,
- 993, 993, 993, 157, 993, 1067, 993, 57, 1387, -10,
- 993, 57, 157, 168, 1459, 993, -286, -286, 86, 993,
- 993, -286, 993, 993, 7, 993, 993, 993, -286, 993,
- -286, 170, 993, 993, 993, 993, 993, 993, 993, 993,
- 993, 993, 171, 15, -286, 26, 26, -286, 26, 77,
- -286, -286, 1459, 147, -286, 1459, 993, -286, 305, 305,
- 305, 305, 202, 202, -286, -8, 305, 305, 305, 305,
- -8, -13, -13, -286, -286, -286, -33, 1459, -286, 1459,
- 8, -286, 1459, 157, -286, -286, 1459, 1459, 1459, 305,
- 993, 993, 1459, 305, 1459, 1459, -286, 1459, 1203, 1459,
- 1237, 1459, 1271, 1459, 1305, 1459, 1459, -286, -286, 993,
- -286, -286, -286, 67, 70, -286, 606, -12, -286, 153,
- 1459, 606, 105, 181, 105, 13, 1459, 305, 993, 993,
- 993, 993, 17, -286, -286, 122, 158, 993, 606, 788,
- 123, 187, -286, -286, -286, 105, 1459, 1459, 1459, 1459,
- -286, -286, 993, 1459, -286, -286, -286, -286, 515, 606,
- -286, 1459, -286, 95, -24, 188, 606, -286, 606, -286,
- -286, -286, 993, 129, -286, -286, -286, 116, 606, 130,
- -286, 1459, -286, 788, 192, 133, -286, 606, 177, -286,
- -286, -286, 144, -286, 145, -286, 606, -286, -286
+ 297, -82, -279, -279, 951, -279, -279, 951, 951, 951,
+ -5, -279, 951, 951, 64, 984, -279, -279, -279, -279,
+ -279, -3, 16, 829, -279, 35, 951, 46, 48, 39,
+ 49, 951, 890, 68, 951, 951, 951, 951, 951, 951,
+ -279, 71, 81, 951, 951, 951, 12, 2, -279, -279,
+ -279, -279, -279, 951, 44, 951, 657, 951, -279, 1473,
+ -279, -279, -279, -279, -279, -279, -279, -279, -279, 13,
+ 951, 1473, 1473, 1473, 1473, 10, 951, 1473, 10, -279,
+ -279, 951, 1473, 14, 951, -279, -279, -279, 17, -279,
+ 951, -279, 67, -279, 1036, -279, -279, 1023, 89, -279,
+ -42, 64, -1, 65, 74, -279, 1390, -279, 1036, -279,
+ -279, 27, -279, 1085, 1118, 1151, 1184, 1440, -279, 29,
+ -279, -279, -279, 1403, 31, 32, -279, -279, 28, 33,
+ 36, -279, -279, 387, 1473, 951, 1473, -279, -279, 951,
+ 1473, -279, -279, 1349, 951, 951, 951, 951, 951, 951,
+ 951, 951, 951, 951, 951, 951, 951, 951, 951, 951,
+ 951, 92, 951, 1023, 951, 10, 1403, -14, 951, 10,
+ 92, 127, 1473, 951, -279, -279, 78, 951, 951, -279,
+ 951, 951, 19, 951, 951, 951, -279, 951, -279, 129,
+ 951, 951, 951, 951, 951, 951, 951, 951, 951, 951,
+ 131, -279, 64, 64, -279, 64, 23, -279, -279, 1473,
+ 107, -279, 1473, 951, -279, 30, 30, 30, 30, 1486,
+ 1486, -279, -36, 30, 30, 30, 30, -36, -50, -50,
+ -279, -279, -279, -30, 1473, -279, 1473, -29, -279, 1473,
+ 92, -279, -279, 1473, 1473, 1473, 30, 951, 951, 1473,
+ 30, 1473, 1473, -279, 1473, 1217, 1473, 1250, 1473, 1283,
+ 1473, 1316, 1473, 1473, -279, -279, -279, -279, 31, 32,
+ -279, 567, -18, -279, 110, 1473, 567, 69, 137, 69,
+ -7, 1473, 30, 951, 951, 951, 951, -279, -279, 80,
+ 115, 951, 567, 747, 84, 148, -279, -279, -279, 69,
+ 1473, 1473, 1473, 1473, -279, 951, 1473, -279, -279, -279,
+ -279, 477, 567, -279, 1473, -279, 70, -32, 154, 567,
+ -279, 567, -279, -279, -279, 951, 96, -279, -279, -279,
+ 93, 567, 108, -279, 1473, -279, 747, 167, 109, -279,
+ 567, 147, -279, -279, -279, 117, -279, 119, -279, 567,
+ -279, -279
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -286, -286, 104, -286, -285, -286, 24, -286, -286, -286,
- -286, -286, -286, 183, -286, -85, -9, -79, -286, -286,
- -1, -4, 64, 193, -286, -286, -286, -286, -25, -286,
- -286, -286, -286, -286, -286, -160, -286, -233, 194, -3,
- -286, -286, -286, -286, -286, 36
+ -279, -279, 77, -279, -278, -279, 1, -279, -279, -279,
+ -279, -279, -279, 155, -279, -75, -46, -91, -279, -279,
+ -2, -4, 37, 156, -279, -279, -279, -279, -26, -279,
+ -279, -279, -279, -279, -279, -157, -279, -263, 158, 8,
+ -279, -279, -279, -279, -279, 9
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -937,322 +930,328 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -6
static const yytype_int16 yytable[] =
{
- 72, 172, 134, 73, 74, 75, 76, 110, 78, 75,
- 79, 83, 240, 81, 315, 334, 77, 182, 2, 95,
- 99, 100, 98, 5, 52, 69, 296, 107, 109, 183,
- 113, 114, 115, 116, 117, 118, 80, 126, 2, 127,
- 123, 124, 125, 5, 297, 122, 129, 101, 102, 185,
- 136, 304, 138, 142, 145, 88, 80, 16, 349, 17,
- 152, 186, 103, 250, 87, 152, 335, 165, 282, 104,
- 176, 283, 320, 75, 167, 251, 97, 91, 168, 93,
- 105, 75, 171, 285, 190, 161, 162, 174, 159, 160,
- 161, 162, 243, 238, 166, 146, 147, 148, 149, 150,
- 151, 184, 152, 135, 106, 153, 154, 155, 273, 284,
- 274, 47, 283, 128, 305, 14, 244, 283, 268, 269,
- 310, 166, 156, 157, 158, 159, 160, 161, 162, 213,
- 214, 47, 111, 212, 329, 330, 119, 215, 281, 121,
- 137, 164, 218, 219, 220, 221, 222, 223, 224, 225,
- 226, 227, 228, 229, 230, 231, 232, 233, 234, 52,
- 75, 166, 237, 170, 173, 175, 239, 181, 187, 188,
- 191, 242, 202, 203, 205, 246, 247, 206, 248, 249,
- 208, 252, 253, 254, 207, 255, 209, 235, 257, 258,
- 259, 260, 261, 262, 263, 264, 265, 266, 241, 298,
- 256, 267, 278, 277, 270, 271, 279, 272, 299, 301,
- 192, 303, 280, 311, 312, 316, 193, 317, 336, 342,
- 344, 346, 350, 318, 351, 319, 146, 147, 148, 149,
- 150, 151, 353, 152, 355, 357, 153, 154, 155, 210,
- 141, 326, 245, 328, 340, 275, 286, 287, 338, 343,
- 143, 144, 0, 156, 157, 158, 159, 160, 161, 162,
- 0, 347, 0, 0, 0, 75, 292, 295, 146, 147,
- 148, 149, 300, 0, 356, 152, 0, 0, 153, 154,
- 155, 0, 0, 0, 306, 307, 308, 309, 0, 314,
- 0, 0, 0, 313, 0, 156, 157, 158, 159, 160,
- 161, 162, 0, 0, 322, 0, 324, 0, 321, 0,
- 0, 0, 327, 0, 333, 0, 0, 0, 0, 339,
- 0, 0, 0, 0, 0, 0, 0, 0, 341, 345,
- 0, 0, 348, -5, 1, 0, 0, 0, 352, 0,
- 354, 0, 0, 0, 0, 2, 0, 358, 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, 152, 0,
- 25, 153, 0, 0, 0, 26, 27, 28, 0, 0,
- 29, 0, 0, 0, 30, 31, 32, 0, 33, 0,
- 158, 159, 160, 161, 162, 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, 47, 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, 0, 47,
- 3, 4, 5, 0, 6, 7, 8, 9, 10, 0,
- 11, 12, 13, 0, 14, 15, 16, 0, 17, 325,
- 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, 293, 46, 2, 0,
- 47, 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, 293, 46, 2,
- 0, 47, 3, 4, 5, 0, 6, 7, 8, 9,
+ 71, 51, 132, 72, 73, 74, 109, 327, 77, 74,
+ 170, 82, 80, 237, 180, 308, 298, 75, 68, 94,
+ 290, 78, 97, 150, 2, 76, 181, 106, 108, 5,
+ 112, 113, 114, 115, 116, 117, 313, 150, 291, 121,
+ 122, 123, 79, 124, 127, 125, 87, 159, 160, 134,
+ 86, 136, 140, 143, 268, 183, 269, 328, 342, 157,
+ 158, 159, 160, 100, 101, 96, 163, 184, 174, 104,
+ 277, 279, 74, 278, 278, 247, 2, 166, 102, 105,
+ 74, 5, 188, 280, 165, 103, 172, 248, 235, 164,
+ 210, 211, 169, 299, 79, 16, 278, 17, 110, 182,
+ 240, 118, 133, 150, 98, 99, 151, 14, 241, 322,
+ 323, 120, 135, 164, 162, 173, 46, 168, 126, 179,
+ 171, 185, 232, 276, 156, 157, 158, 159, 160, 186,
+ 189, 209, 200, 204, 51, 212, 205, 202, 203, 206,
+ 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+ 225, 226, 227, 228, 229, 230, 231, 238, 74, 253,
+ 234, 264, 273, 272, 236, 293, 274, 297, 46, 239,
+ 304, 305, 295, 243, 244, 309, 245, 246, 310, 249,
+ 250, 251, 292, 252, 329, 335, 254, 255, 256, 257,
+ 258, 259, 260, 261, 262, 263, 337, 343, 339, 344,
+ 265, 266, 346, 267, 0, 311, 348, 312, 350, 275,
+ 207, 139, 141, 242, 142, 270, 0, 0, 0, 0,
+ 0, 0, 319, 0, 321, 289, 0, 0, 0, 331,
+ 294, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 340, 281, 282, 0, 307, 333, 0, 0,
+ 0, 0, 336, 0, 0, 349, 0, 0, 0, 0,
+ 315, 0, 317, 0, 0, 0, 0, 0, 320, 0,
+ 326, 0, 0, 0, 0, 332, 0, 0, 0, 300,
+ 301, 302, 303, 0, 0, 338, 0, 306, 341, 0,
+ 0, 0, 0, 0, 345, 0, 347, -5, 1, 0,
+ 0, 314, 0, 351, 0, 0, 0, 0, 0, 2,
+ 0, 0, 3, 4, 5, 0, 6, 7, 8, 9,
+ 10, 334, 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, 0, 0, 0, 0,
+ 0, 0, 43, 44, 0, 0, 0, -5, 45, 2,
+ 0, 46, 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, 0, 0, 0, 0,
+ 0, 0, 43, 44, 0, 0, 0, 0, 45, 2,
+ 0, 46, 3, 4, 5, 0, 6, 7, 8, 9,
+ 10, 0, 11, 12, 13, 0, 14, 15, 16, 0,
+ 17, 318, 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, 0, 0, 0, 0,
+ 0, 0, 43, 44, 0, 0, 0, 287, 45, 2,
+ 0, 46, 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, 0, 0, 0, 0,
+ 0, 0, 43, 44, 0, 0, 0, 287, 45, 2,
+ 0, 46, 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, 0, 47, 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, 0, 47, 0, 0, 11, 12, 13, 0,
- 14, 70, 16, 0, 17, 0, 0, 0, 20, 0,
- 0, 0, 0, 0, 0, 0, 0, 90, 0, 91,
- 92, 93, 94, 71, 0, 28, 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, 70, 16, 0, 17, 0, 44, 45, 20,
- 0, 0, 0, 46, 0, 0, 47, 0, 0, 0,
- 91, 0, 93, 0, 71, 0, 28, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 108, 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, 70, 16, 0, 17, 0, 44, 45,
- 20, 0, 0, 0, 46, 0, 0, 47, 0, 2,
- 0, 0, 3, 4, 5, 71, 0, 28, 0, 0,
- 0, 0, 11, 12, 13, 0, 14, 70, 16, 0,
- 17, 0, 0, 0, 20, 34, 0, 0, 0, 0,
- 0, 0, 35, 36, 37, 38, 39, 0, 0, 71,
- 0, 28, 43, 0, 0, 0, 0, 0, 0, 44,
- 45, 0, 0, 0, 0, 46, 0, 0, 47, 34,
+ 39, 0, 0, 0, 41, 0, 0, 0, 0, 0,
+ 0, 0, 43, 44, 0, 0, 0, 0, 45, 2,
+ 0, 46, 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, 178, 0, 0, 0, 43, 0, 0, 0,
- 0, 0, 0, 44, 45, 0, 0, 0, 0, 82,
- 0, 0, 47, 146, 147, 148, 149, 150, 151, 0,
- 152, 179, 180, 153, 154, 155, 0, 0, 0, 0,
- 0, 194, 0, 0, 0, 0, 0, 195, 0, 0,
- 156, 157, 158, 159, 160, 161, 162, 146, 147, 148,
- 149, 150, 151, 0, 152, 0, 0, 153, 154, 155,
- 0, 0, 0, 0, 0, 196, 0, 0, 0, 0,
- 0, 197, 0, 0, 156, 157, 158, 159, 160, 161,
- 162, 146, 147, 148, 149, 150, 151, 0, 152, 0,
- 0, 153, 154, 155, 0, 0, 0, 0, 0, 198,
- 0, 0, 0, 0, 0, 199, 0, 0, 156, 157,
- 158, 159, 160, 161, 162, 146, 147, 148, 149, 150,
- 151, 0, 152, 0, 0, 153, 154, 155, 0, 0,
- 0, 0, 0, 288, 0, 0, 0, 0, 0, 0,
- 0, 0, 156, 157, 158, 159, 160, 161, 162, 146,
- 147, 148, 149, 150, 151, 0, 152, 0, 0, 153,
- 154, 155, 0, 0, 0, 0, 0, 289, 0, 0,
- 0, 0, 0, 0, 0, 0, 156, 157, 158, 159,
- 160, 161, 162, 146, 147, 148, 149, 150, 151, 0,
- 152, 0, 0, 153, 154, 155, 0, 0, 0, 0,
- 0, 290, 0, 0, 0, 0, 0, 0, 0, 0,
- 156, 157, 158, 159, 160, 161, 162, 146, 147, 148,
- 149, 150, 151, 0, 152, 0, 0, 153, 154, 155,
- 0, 0, 0, 0, 0, 291, 0, 0, 0, 0,
- 0, 0, 0, 0, 156, 157, 158, 159, 160, 161,
- 162, 146, 147, 148, 149, 150, 151, 0, 152, 0,
- 0, 153, 154, 155, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 216, 0, 0, 156, 157,
- 158, 159, 160, 161, 162, 146, 147, 148, 149, 150,
- 151, 189, 152, 0, 0, 153, 154, 155, 0, 146,
- 147, 148, 149, 150, 151, 0, 152, 0, 0, 153,
- 154, 155, 156, 157, 158, 159, 160, 161, 162, 0,
- 217, 0, 0, 0, 0, 0, 156, 157, 158, 159,
- 160, 161, 162, 146, 147, 148, 149, 150, 151, 0,
- 152, 0, 0, 153, 154, 155, 0, 0, 0, 0,
+ 39, 0, 0, 0, 41, 0, 0, 0, 0, 0,
+ 0, 2, 43, 44, 3, 4, 5, 0, 45, 0,
+ 0, 46, 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, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 156, 157, 158, 159, 160, 161, 162, 0, 0, 0,
- 204, 146, 147, 148, 149, 150, 151, 0, 152, 0,
- 0, 153, 154, 155, 0, 0, 0, 0, 0, 200,
- 201, 0, 0, 0, 0, 0, 0, 0, 156, 157,
- 158, 159, 160, 161, 162, 146, 147, 148, 149, 150,
- 151, 0, 152, 0, 0, 153, 154, 155, 0, 0,
+ 0, 34, 2, 0, 0, 3, 4, 5, 35, 36,
+ 37, 38, 39, 0, 0, 11, 12, 13, 0, 14,
+ 69, 16, 0, 17, 43, 44, 0, 20, 0, 0,
+ 45, 0, 0, 46, 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, 0,
+ 14, 69, 16, 0, 17, 43, 44, 0, 20, 0,
+ 0, 45, 0, 0, 46, 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,
+ 0, 0, 0, 0, 0, 0, 43, 44, 0, 0,
+ 0, 0, 45, 0, 0, 46, 34, 0, 0, 0,
+ 0, 0, 0, 35, 36, 37, 38, 39, 176, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 43,
+ 44, 0, 0, 0, 90, 81, 92, 0, 46, 144,
+ 145, 146, 147, 148, 149, 0, 150, 177, 178, 151,
+ 152, 153, 144, 145, 146, 147, 148, 149, 0, 150,
+ 0, 0, 151, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 0, 0, 0, 0, 0, 0, 154, 155,
+ 156, 157, 158, 159, 160, 190, 0, 0, 0, 0,
+ 0, 191, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 144, 145, 146, 147, 148, 149, 0, 150, 0,
+ 0, 151, 152, 153, 0, 0, 0, 0, 192, 0,
+ 0, 0, 0, 0, 193, 0, 0, 154, 155, 156,
+ 157, 158, 159, 160, 144, 145, 146, 147, 148, 149,
+ 0, 150, 0, 0, 151, 152, 153, 0, 0, 0,
+ 0, 194, 0, 0, 0, 0, 0, 195, 0, 0,
+ 154, 155, 156, 157, 158, 159, 160, 144, 145, 146,
+ 147, 148, 149, 0, 150, 0, 0, 151, 152, 153,
+ 0, 0, 0, 0, 196, 0, 0, 0, 0, 0,
+ 197, 0, 0, 154, 155, 156, 157, 158, 159, 160,
+ 144, 145, 146, 147, 148, 149, 0, 150, 0, 0,
+ 151, 152, 153, 0, 0, 0, 0, 283, 0, 0,
+ 0, 0, 0, 0, 0, 0, 154, 155, 156, 157,
+ 158, 159, 160, 144, 145, 146, 147, 148, 149, 0,
+ 150, 0, 0, 151, 152, 153, 0, 0, 0, 0,
+ 284, 0, 0, 0, 0, 0, 0, 0, 0, 154,
+ 155, 156, 157, 158, 159, 160, 144, 145, 146, 147,
+ 148, 149, 0, 150, 0, 0, 151, 152, 153, 0,
+ 0, 0, 0, 285, 0, 0, 0, 0, 0, 0,
+ 0, 0, 154, 155, 156, 157, 158, 159, 160, 144,
+ 145, 146, 147, 148, 149, 0, 150, 0, 0, 151,
+ 152, 153, 0, 0, 0, 0, 286, 0, 0, 0,
+ 0, 0, 0, 0, 0, 154, 155, 156, 157, 158,
+ 159, 160, 144, 145, 146, 147, 148, 149, 0, 150,
+ 0, 0, 151, 152, 153, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 213, 0, 0, 154, 155,
+ 156, 157, 158, 159, 160, 144, 145, 146, 147, 148,
+ 149, 0, 150, 0, 0, 151, 152, 153, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 156, 157, 158, 159, 160, 161, 162
+ 0, 154, 155, 156, 157, 158, 159, 160, 187, 214,
+ 0, 0, 0, 0, 0, 0, 144, 145, 146, 147,
+ 148, 149, 0, 150, 0, 0, 151, 152, 153, 144,
+ 145, 146, 147, 148, 149, 0, 150, 0, 0, 151,
+ 152, 153, 154, 155, 156, 157, 158, 159, 160, 0,
+ 0, 0, 0, 0, 0, 154, 155, 156, 157, 158,
+ 159, 160, 0, 0, 0, 201, 144, 145, 146, 147,
+ 148, 149, 0, 150, 0, 0, 151, 152, 153, 0,
+ 0, 0, 0, 0, 198, 199, 0, 0, 0, 0,
+ 0, 0, 154, 155, 156, 157, 158, 159, 160, 144,
+ 145, 146, 147, 148, 149, 0, 150, 0, 0, 151,
+ 152, 153, 144, 145, 146, 147, 0, 0, 0, 150,
+ 0, 0, 151, 152, 153, 154, 155, 156, 157, 158,
+ 159, 160, 0, 0, 0, 0, 0, 0, 154, 155,
+ 156, 157, 158, 159, 160
};
static const yytype_int16 yycheck[] =
{
- 4, 86, 0, 7, 8, 9, 9, 32, 12, 13,
- 13, 15, 172, 14, 299, 39, 30, 56, 12, 23,
- 58, 59, 26, 17, 0, 101, 38, 31, 32, 68,
- 34, 35, 36, 37, 38, 39, 30, 31, 12, 33,
- 44, 45, 46, 17, 56, 102, 47, 15, 16, 56,
- 54, 284, 56, 57, 58, 30, 30, 31, 343, 33,
- 73, 68, 30, 56, 53, 73, 90, 71, 101, 37,
- 95, 104, 305, 77, 77, 68, 30, 48, 82, 50,
- 30, 85, 85, 243, 109, 98, 99, 91, 96, 97,
- 98, 99, 177, 103, 104, 66, 67, 68, 69, 70,
- 71, 102, 73, 101, 30, 76, 77, 78, 31, 101,
- 33, 105, 104, 107, 101, 29, 30, 104, 103, 104,
- 103, 104, 93, 94, 95, 96, 97, 98, 99, 138,
- 139, 105, 30, 137, 39, 40, 30, 141, 217, 30,
- 68, 102, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 157, 158, 159, 160, 161, 162, 135,
- 164, 104, 166, 104, 104, 48, 170, 30, 56, 55,
- 104, 175, 104, 30, 107, 179, 180, 107, 182, 183,
- 104, 185, 186, 187, 106, 189, 104, 30, 192, 193,
- 194, 195, 196, 197, 198, 199, 200, 201, 30, 278,
- 30, 30, 55, 212, 205, 206, 215, 208, 55, 104,
- 50, 30, 216, 91, 56, 92, 56, 30, 30, 90,
- 104, 91, 30, 302, 91, 304, 66, 67, 68, 69,
- 70, 71, 55, 73, 90, 90, 76, 77, 78, 135,
- 57, 320, 178, 322, 329, 209, 250, 251, 327, 334,
- 57, 57, -1, 93, 94, 95, 96, 97, 98, 99,
- -1, 340, -1, -1, -1, 269, 269, 276, 66, 67,
- 68, 69, 281, -1, 353, 73, -1, -1, 76, 77,
- 78, -1, -1, -1, 288, 289, 290, 291, -1, 298,
- -1, -1, -1, 297, -1, 93, 94, 95, 96, 97,
- 98, 99, -1, -1, 313, -1, 315, -1, 312, -1,
- -1, -1, 321, -1, 323, -1, -1, -1, -1, 328,
- -1, -1, -1, -1, -1, -1, -1, -1, 332, 338,
- -1, -1, 341, 0, 1, -1, -1, -1, 347, -1,
- 349, -1, -1, -1, -1, 12, -1, 356, 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, 73, -1,
- 47, 76, -1, -1, -1, 52, 53, 54, -1, -1,
- 57, -1, -1, -1, 61, 62, 63, -1, 65, -1,
- 95, 96, 97, 98, 99, 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, 105, 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, -1, 105,
- 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, -1,
- 105, 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,
- -1, 105, 15, 16, 17, -1, 19, 20, 21, 22,
+ 4, 0, 0, 7, 8, 9, 32, 39, 12, 13,
+ 85, 15, 14, 170, 56, 293, 279, 9, 100, 23,
+ 38, 13, 26, 73, 12, 30, 68, 31, 32, 17,
+ 34, 35, 36, 37, 38, 39, 299, 73, 56, 43,
+ 44, 45, 30, 31, 46, 33, 30, 97, 98, 53,
+ 53, 55, 56, 57, 31, 56, 33, 89, 336, 95,
+ 96, 97, 98, 15, 16, 30, 70, 68, 94, 30,
+ 100, 100, 76, 103, 103, 56, 12, 81, 30, 30,
+ 84, 17, 108, 240, 76, 37, 90, 68, 102, 103,
+ 136, 137, 84, 100, 30, 31, 103, 33, 30, 101,
+ 175, 30, 100, 73, 58, 59, 76, 29, 30, 39,
+ 40, 30, 68, 103, 101, 48, 104, 103, 106, 30,
+ 103, 56, 30, 214, 94, 95, 96, 97, 98, 55,
+ 103, 135, 103, 105, 133, 139, 103, 106, 106, 103,
+ 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
+ 154, 155, 156, 157, 158, 159, 160, 30, 162, 30,
+ 164, 30, 55, 209, 168, 55, 212, 30, 104, 173,
+ 90, 56, 103, 177, 178, 91, 180, 181, 30, 183,
+ 184, 185, 273, 187, 30, 89, 190, 191, 192, 193,
+ 194, 195, 196, 197, 198, 199, 103, 30, 90, 90,
+ 202, 203, 55, 205, -1, 296, 89, 298, 89, 213,
+ 133, 56, 56, 176, 56, 206, -1, -1, -1, -1,
+ -1, -1, 313, -1, 315, 271, -1, -1, -1, 320,
+ 276, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 333, 247, 248, -1, 292, 322, -1, -1,
+ -1, -1, 327, -1, -1, 346, -1, -1, -1, -1,
+ 306, -1, 308, -1, -1, -1, -1, -1, 314, -1,
+ 316, -1, -1, -1, -1, 321, -1, -1, -1, 283,
+ 284, 285, 286, -1, -1, 331, -1, 291, 334, -1,
+ -1, -1, -1, -1, 340, -1, 342, 0, 1, -1,
+ -1, 305, -1, 349, -1, -1, -1, -1, -1, 12,
+ -1, -1, 15, 16, 17, -1, 19, 20, 21, 22,
+ 23, 325, 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, -1, -1, -1, -1,
+ -1, -1, 95, 96, -1, -1, -1, 100, 101, 12,
+ -1, 104, 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, -1, -1, -1, -1,
+ -1, -1, 95, 96, -1, -1, -1, -1, 101, 12,
+ -1, 104, 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, -1, -1, -1, -1,
+ -1, -1, 95, 96, -1, -1, -1, 100, 101, 12,
+ -1, 104, 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, -1, -1, -1, -1,
+ -1, -1, 95, 96, -1, -1, -1, 100, 101, 12,
+ -1, 104, 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, -1, 105, 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, -1, 105, -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, 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, -1, 105, -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, -1, 105, -1, 12,
- -1, -1, 15, 16, 17, 52, -1, 54, -1, -1,
- -1, -1, 25, 26, 27, -1, 29, 30, 31, -1,
- 33, -1, -1, -1, 37, 72, -1, -1, -1, -1,
- -1, -1, 79, 80, 81, 82, 83, -1, -1, 52,
- -1, 54, 89, -1, -1, -1, -1, -1, -1, 96,
- 97, -1, -1, -1, -1, 102, -1, -1, 105, 72,
+ 83, -1, -1, -1, 87, -1, -1, -1, -1, -1,
+ -1, -1, 95, 96, -1, -1, -1, -1, 101, 12,
+ -1, 104, 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, 45, -1, -1, -1, 89, -1, -1, -1,
- -1, -1, -1, 96, 97, -1, -1, -1, -1, 102,
- -1, -1, 105, 66, 67, 68, 69, 70, 71, -1,
- 73, 74, 75, 76, 77, 78, -1, -1, -1, -1,
+ 83, -1, -1, -1, 87, -1, -1, -1, -1, -1,
+ -1, 12, 95, 96, 15, 16, 17, -1, 101, -1,
+ -1, 104, -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, 72, 12, -1, -1, 15, 16, 17, 79, 80,
+ 81, 82, 83, -1, -1, 25, 26, 27, -1, 29,
+ 30, 31, -1, 33, 95, 96, -1, 37, -1, -1,
+ 101, -1, -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, -1,
+ 29, 30, 31, -1, 33, 95, 96, -1, 37, -1,
+ -1, 101, -1, -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,
+ -1, -1, -1, -1, -1, -1, 95, 96, -1, -1,
+ -1, -1, 101, -1, -1, 104, 72, -1, -1, -1,
+ -1, -1, -1, 79, 80, 81, 82, 83, 45, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 95,
+ 96, -1, -1, -1, 48, 101, 50, -1, 104, 66,
+ 67, 68, 69, 70, 71, -1, 73, 74, 75, 76,
+ 77, 78, 66, 67, 68, 69, 70, 71, -1, 73,
+ -1, -1, 76, 77, 78, 92, 93, 94, 95, 96,
+ 97, 98, -1, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, 96, 97, 98, 50, -1, -1, -1, -1,
+ -1, 56, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 66, 67, 68, 69, 70, 71, -1, 73, -1,
+ -1, 76, 77, 78, -1, -1, -1, -1, 50, -1,
+ -1, -1, -1, -1, 56, -1, -1, 92, 93, 94,
+ 95, 96, 97, 98, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, -1, -1, -1,
-1, 50, -1, -1, -1, -1, -1, 56, -1, -1,
- 93, 94, 95, 96, 97, 98, 99, 66, 67, 68,
+ 92, 93, 94, 95, 96, 97, 98, 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, 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, 50, -1, -1,
- -1, -1, -1, -1, -1, -1, 93, 94, 95, 96,
- 97, 98, 99, 66, 67, 68, 69, 70, 71, -1,
+ -1, -1, -1, -1, 50, -1, -1, -1, -1, -1,
+ 56, -1, -1, 92, 93, 94, 95, 96, 97, 98,
+ 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
+ 76, 77, 78, -1, -1, -1, -1, 50, -1, -1,
+ -1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
+ 96, 97, 98, 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, 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, 58, 73, -1, -1, 76, 77, 78, -1, 66,
+ 50, -1, -1, -1, -1, -1, -1, -1, -1, 92,
+ 93, 94, 95, 96, 97, 98, 66, 67, 68, 69,
+ 70, 71, -1, 73, -1, -1, 76, 77, 78, -1,
+ -1, -1, -1, 50, -1, -1, -1, -1, -1, -1,
+ -1, -1, 92, 93, 94, 95, 96, 97, 98, 66,
67, 68, 69, 70, 71, -1, 73, -1, -1, 76,
- 77, 78, 93, 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, -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,
+ 77, 78, -1, -1, -1, -1, 50, -1, -1, -1,
+ -1, -1, -1, -1, -1, 92, 93, 94, 95, 96,
+ 97, 98, 66, 67, 68, 69, 70, 71, -1, 73,
+ -1, -1, 76, 77, 78, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 56, -1, -1, 92, 93,
+ 94, 95, 96, 97, 98, 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
+ -1, 92, 93, 94, 95, 96, 97, 98, 58, 100,
+ -1, -1, -1, -1, -1, -1, 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, 92, 93, 94, 95, 96, 97, 98, -1,
+ -1, -1, -1, -1, -1, 92, 93, 94, 95, 96,
+ 97, 98, -1, -1, -1, 102, 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, 92, 93, 94, 95, 96, 97, 98, 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, 92, 93, 94, 95, 96,
+ 97, 98, -1, -1, -1, -1, -1, -1, 92, 93,
+ 94, 95, 96, 97, 98
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1263,38 +1262,38 @@ static const yytype_uint8 yystos[] =
23, 25, 26, 27, 29, 30, 31, 33, 35, 36,
37, 41, 42, 43, 44, 47, 52, 53, 54, 57,
61, 62, 63, 65, 72, 79, 80, 81, 82, 83,
- 86, 87, 88, 89, 96, 97, 102, 105, 109, 110,
- 111, 112, 114, 115, 119, 120, 121, 126, 127, 128,
- 129, 130, 131, 135, 137, 139, 142, 146, 149, 101,
- 30, 52, 129, 129, 129, 129, 147, 30, 129, 147,
- 30, 128, 102, 129, 148, 138, 141, 53, 30, 132,
- 46, 48, 49, 50, 51, 129, 136, 30, 129, 58,
- 59, 15, 16, 30, 37, 30, 30, 129, 64, 129,
- 136, 30, 134, 129, 129, 129, 129, 129, 129, 30,
- 133, 30, 102, 129, 129, 129, 31, 33, 107, 128,
- 150, 151, 152, 153, 0, 101, 129, 68, 129, 113,
- 118, 121, 129, 131, 146, 129, 66, 67, 68, 69,
- 70, 71, 73, 76, 77, 78, 93, 94, 95, 96,
- 97, 98, 99, 123, 102, 129, 104, 147, 129, 147,
- 104, 147, 123, 104, 129, 48, 136, 140, 45, 74,
- 75, 30, 56, 68, 128, 56, 68, 56, 55, 58,
- 136, 104, 50, 56, 50, 56, 50, 56, 50, 56,
- 84, 85, 104, 30, 103, 107, 107, 106, 104, 104,
- 110, 124, 129, 124, 124, 129, 56, 101, 129, 129,
- 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
- 129, 129, 129, 129, 129, 30, 143, 129, 103, 129,
- 143, 30, 129, 123, 30, 130, 129, 129, 129, 129,
- 56, 68, 129, 129, 129, 129, 30, 129, 129, 129,
- 129, 129, 129, 129, 129, 129, 129, 30, 103, 104,
- 128, 128, 128, 31, 33, 153, 125, 124, 55, 124,
- 129, 125, 101, 104, 101, 143, 129, 129, 50, 50,
- 50, 50, 147, 101, 114, 124, 38, 56, 125, 55,
- 124, 104, 145, 30, 145, 101, 129, 129, 129, 129,
- 103, 91, 56, 129, 124, 112, 92, 30, 125, 125,
- 145, 129, 124, 116, 124, 34, 125, 124, 125, 39,
- 40, 117, 122, 124, 39, 90, 30, 144, 125, 124,
- 123, 129, 90, 123, 104, 124, 91, 125, 124, 112,
- 30, 91, 124, 55, 124, 90, 125, 90, 124
+ 86, 87, 88, 95, 96, 101, 104, 108, 109, 110,
+ 111, 113, 114, 118, 119, 120, 125, 126, 127, 128,
+ 129, 130, 134, 136, 138, 141, 145, 148, 100, 30,
+ 52, 128, 128, 128, 128, 146, 30, 128, 146, 30,
+ 127, 101, 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, 128, 128, 128, 31, 33, 106, 127, 149, 150,
+ 151, 152, 0, 100, 128, 68, 128, 112, 117, 120,
+ 128, 130, 145, 128, 66, 67, 68, 69, 70, 71,
+ 73, 76, 77, 78, 92, 93, 94, 95, 96, 97,
+ 98, 122, 101, 128, 103, 146, 128, 146, 103, 146,
+ 122, 103, 128, 48, 135, 139, 45, 74, 75, 30,
+ 56, 68, 127, 56, 68, 56, 55, 58, 135, 103,
+ 50, 56, 50, 56, 50, 56, 50, 56, 84, 85,
+ 103, 102, 106, 106, 105, 103, 103, 109, 123, 128,
+ 123, 123, 128, 56, 100, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 30, 142, 128, 102, 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, 127, 127, 127, 31, 33,
+ 152, 124, 123, 55, 123, 128, 124, 100, 103, 100,
+ 142, 128, 128, 50, 50, 50, 50, 100, 113, 123,
+ 38, 56, 124, 55, 123, 103, 144, 30, 144, 100,
+ 128, 128, 128, 128, 90, 56, 128, 123, 111, 91,
+ 30, 124, 124, 144, 128, 123, 115, 123, 34, 124,
+ 123, 124, 39, 40, 116, 121, 123, 39, 89, 30,
+ 143, 124, 123, 122, 128, 89, 122, 103, 123, 90,
+ 124, 123, 111, 30, 90, 123, 55, 123, 89, 124,
+ 89, 123
};
#define yyerrok (yyerrstatus = 0)
@@ -2658,208 +2657,193 @@ yyreduce:
break;
case 99:
-#line 451 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;}
- break;
-
- case 100:
-#line 452 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;}
- break;
-
- case 101:
#line 453 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe(nullptr, 0); ;}
- break;
-
- case 102:
-#line 456 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 103:
-#line 461 "engines/director/lingo/lingo-gr.y"
+ case 100:
+#line 458 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); ;}
break;
- case 106:
-#line 464 "engines/director/lingo/lingo-gr.y"
+ case 103:
+#line 461 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); ;}
break;
- case 107:
-#line 465 "engines/director/lingo/lingo-gr.y"
+ case 104:
+#line 462 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); ;}
break;
- case 111:
-#line 469 "engines/director/lingo/lingo-gr.y"
+ case 108:
+#line 466 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
delete (yyvsp[(1) - (1)].s); ;}
break;
- case 112:
-#line 472 "engines/director/lingo/lingo-gr.y"
+ case 109:
+#line 469 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 113:
-#line 475 "engines/director/lingo/lingo-gr.y"
+ case 110:
+#line 472 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
delete (yyvsp[(1) - (2)].s); ;}
break;
- case 114:
-#line 478 "engines/director/lingo/lingo-gr.y"
+ case 111:
+#line 475 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_voidpush);
g_lingo->codeFunc((yyvsp[(1) - (1)].s), 1);
delete (yyvsp[(1) - (1)].s); ;}
break;
- case 115:
-#line 482 "engines/director/lingo/lingo-gr.y"
+ case 112:
+#line 479 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
break;
- case 116:
-#line 483 "engines/director/lingo/lingo-gr.y"
+ case 113:
+#line 480 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); ;}
break;
- case 117:
-#line 484 "engines/director/lingo/lingo-gr.y"
+ case 114:
+#line 481 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); ;}
break;
- case 118:
-#line 485 "engines/director/lingo/lingo-gr.y"
+ case 115:
+#line 482 "engines/director/lingo/lingo-gr.y"
{ Common::String s(*(yyvsp[(1) - (3)].s)); s += '-'; s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;}
break;
- case 119:
-#line 488 "engines/director/lingo/lingo-gr.y"
+ case 116:
+#line 485 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
- case 120:
-#line 489 "engines/director/lingo/lingo-gr.y"
+ case 117:
+#line 486 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_global); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
break;
- case 121:
-#line 492 "engines/director/lingo/lingo-gr.y"
+ case 118:
+#line 489 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
- case 122:
-#line 493 "engines/director/lingo/lingo-gr.y"
+ case 119:
+#line 490 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_property); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
break;
- case 123:
-#line 496 "engines/director/lingo/lingo-gr.y"
+ case 120:
+#line 493 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
break;
- case 124:
-#line 497 "engines/director/lingo/lingo-gr.y"
+ case 121:
+#line 494 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_instance); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
break;
- case 125:
-#line 508 "engines/director/lingo/lingo-gr.y"
+ case 122:
+#line 505 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); ;}
break;
- case 126:
-#line 509 "engines/director/lingo/lingo-gr.y"
+ case 123:
+#line 506 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); ;}
break;
- case 127:
-#line 510 "engines/director/lingo/lingo-gr.y"
+ case 124:
+#line 507 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); ;}
break;
- case 128:
-#line 511 "engines/director/lingo/lingo-gr.y"
+ case 125:
+#line 508 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); ;}
break;
- case 129:
-#line 515 "engines/director/lingo/lingo-gr.y"
+ case 126:
+#line 512 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); ;}
break;
- case 130:
-#line 519 "engines/director/lingo/lingo-gr.y"
+ case 127:
+#line 516 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); ;}
break;
- case 133:
-#line 529 "engines/director/lingo/lingo-gr.y"
+ case 130:
+#line 526 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); ;}
break;
- case 134:
-#line 530 "engines/director/lingo/lingo-gr.y"
+ case 131:
+#line 527 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); ;}
break;
- case 135:
-#line 534 "engines/director/lingo/lingo-gr.y"
+ case 132:
+#line 531 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); ;}
break;
- case 136:
-#line 538 "engines/director/lingo/lingo-gr.y"
+ case 133:
+#line 535 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); ;}
break;
- case 137:
-#line 542 "engines/director/lingo/lingo-gr.y"
+ case 134:
+#line 539 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); ;}
break;
- case 138:
-#line 542 "engines/director/lingo/lingo-gr.y"
+ case 135:
+#line 539 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;}
break;
- case 139:
-#line 572 "engines/director/lingo/lingo-gr.y"
+ case 136:
+#line 569 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); ;}
break;
- case 140:
-#line 573 "engines/director/lingo/lingo-gr.y"
+ case 137:
+#line 570 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg));
@@ -2867,18 +2851,18 @@ yyreduce:
g_lingo->_indef = kStateNone; ;}
break;
- case 141:
-#line 578 "engines/director/lingo/lingo-gr.y"
+ case 138:
+#line 575 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;}
break;
- case 142:
-#line 579 "engines/director/lingo/lingo-gr.y"
+ case 139:
+#line 576 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; ;}
break;
- case 143:
-#line 580 "engines/director/lingo/lingo-gr.y"
+ case 140:
+#line 577 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[(1) - (7)].s), (yyvsp[(3) - (7)].code), (yyvsp[(4) - (7)].narg) + 1, &g_lingo->_currentFactory);
@@ -2886,8 +2870,8 @@ yyreduce:
g_lingo->_indef = kStateNone; ;}
break;
- case 144:
-#line 585 "engines/director/lingo/lingo-gr.y"
+ case 141:
+#line 582 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[(1) - (8)].s), (yyvsp[(2) - (8)].code), (yyvsp[(3) - (8)].narg));
@@ -2898,8 +2882,8 @@ yyreduce:
checkEnd((yyvsp[(7) - (8)].s), (yyvsp[(1) - (8)].s)->c_str(), false); ;}
break;
- case 145:
-#line 593 "engines/director/lingo/lingo-gr.y"
+ case 142:
+#line 590 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[(1) - (6)].s), (yyvsp[(2) - (6)].code), (yyvsp[(3) - (6)].narg));
@@ -2908,38 +2892,38 @@ yyreduce:
g_lingo->_ignoreMe = false; ;}
break;
- case 146:
-#line 600 "engines/director/lingo/lingo-gr.y"
+ case 143:
+#line 597 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[(2) - (2)].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; ;}
break;
- case 147:
-#line 602 "engines/director/lingo/lingo-gr.y"
+ case 144:
+#line 599 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
- case 148:
-#line 603 "engines/director/lingo/lingo-gr.y"
+ case 145:
+#line 600 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
break;
- case 149:
-#line 604 "engines/director/lingo/lingo-gr.y"
+ case 146:
+#line 601 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
- case 150:
-#line 605 "engines/director/lingo/lingo-gr.y"
+ case 147:
+#line 602 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
break;
- case 154:
-#line 613 "engines/director/lingo/lingo-gr.y"
+ case 151:
+#line 610 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; ;}
break;
- case 155:
-#line 616 "engines/director/lingo/lingo-gr.y"
+ case 152:
+#line 613 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
@@ -2948,85 +2932,85 @@ yyreduce:
g_lingo->code1(numpar); ;}
break;
- case 156:
-#line 624 "engines/director/lingo/lingo-gr.y"
+ case 153:
+#line 621 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
- case 157:
-#line 625 "engines/director/lingo/lingo-gr.y"
+ case 154:
+#line 622 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
- case 158:
-#line 626 "engines/director/lingo/lingo-gr.y"
+ case 155:
+#line 623 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
- case 159:
-#line 629 "engines/director/lingo/lingo-gr.y"
+ case 156:
+#line 626 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
- case 160:
-#line 630 "engines/director/lingo/lingo-gr.y"
+ case 157:
+#line 627 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
- case 161:
-#line 633 "engines/director/lingo/lingo-gr.y"
+ case 158:
+#line 630 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[(2) - (3)].code); ;}
break;
- case 162:
-#line 636 "engines/director/lingo/lingo-gr.y"
+ case 159:
+#line 633 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); ;}
break;
- case 163:
-#line 637 "engines/director/lingo/lingo-gr.y"
+ case 160:
+#line 634 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); ;}
break;
- case 164:
-#line 638 "engines/director/lingo/lingo-gr.y"
+ case 161:
+#line 635 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[(1) - (1)].narg)); ;}
break;
- case 165:
-#line 639 "engines/director/lingo/lingo-gr.y"
+ case 162:
+#line 636 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[(1) - (1)].narg)); ;}
break;
- case 166:
-#line 642 "engines/director/lingo/lingo-gr.y"
+ case 163:
+#line 639 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
- case 167:
-#line 643 "engines/director/lingo/lingo-gr.y"
+ case 164:
+#line 640 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
- case 168:
-#line 646 "engines/director/lingo/lingo-gr.y"
+ case 165:
+#line 643 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
- case 169:
-#line 647 "engines/director/lingo/lingo-gr.y"
+ case 166:
+#line 644 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
- case 170:
-#line 650 "engines/director/lingo/lingo-gr.y"
+ case 167:
+#line 647 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[(1) - (3)].s)->c_str()); ;}
break;
- case 171:
-#line 653 "engines/director/lingo/lingo-gr.y"
+ case 168:
+#line 650 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[(1) - (3)].s)->c_str()); ;}
@@ -3034,7 +3018,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 3038 "engines/director/lingo/lingo-gr.cpp"
+#line 3022 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3248,6 +3232,6 @@ yyreturn:
}
-#line 659 "engines/director/lingo/lingo-gr.y"
+#line 656 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index d73b6f4..7c6d4c0 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -125,10 +125,9 @@
tTELL = 341,
tPROPERTY = 342,
tON = 343,
- tME = 344,
- tENDIF = 345,
- tENDREPEAT = 346,
- tENDTELL = 347
+ tENDIF = 344,
+ tENDREPEAT = 345,
+ tENDTELL = 346
};
#endif
/* Tokens. */
@@ -218,10 +217,9 @@
#define tTELL 341
#define tPROPERTY 342
#define tON 343
-#define tME 344
-#define tENDIF 345
-#define tENDREPEAT 346
-#define tENDTELL 347
+#define tENDIF 344
+#define tENDREPEAT 345
+#define tENDTELL 346
@@ -244,7 +242,7 @@ typedef union YYSTYPE
} objectfield;
}
/* Line 1529 of yacc.c. */
-#line 248 "engines/director/lingo/lingo-gr.hpp"
+#line 246 "engines/director/lingo/lingo-gr.hpp"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index cf70e6e..c4b11e2 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -113,7 +113,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%token tGE tLE tEQ tNEQ tAND tOR tNOT tMOD
%token tAFTER tBEFORE tCONCAT tCONTAINS tSTARTS tCHAR tITEM tLINE tWORD
%token tSPRITE tINTERSECTS tWITHIN tTELL tPROPERTY
-%token tON tME tENDIF tENDREPEAT tENDTELL
+%token tON tENDIF tENDREPEAT tENDTELL
%type<code> asgn begin elseif end expr if when repeatwhile
%type<code> repeatwith stmtlist tell reference simpleexpr list valuelist
@@ -448,9 +448,6 @@ expr: simpleexpr { $$ = $1; }
| tLINE expr tTO expr tOF expr { g_lingo->code1(LC::c_lineToOf); }
| tWORD expr tOF expr { g_lingo->code1(LC::c_wordOf); }
| tWORD expr tTO expr tOF expr { g_lingo->code1(LC::c_wordToOf); }
- | tME '(' ID ')' { g_lingo->codeMe($3, 0); }
- | tME '(' ID ',' arglist ')' { g_lingo->codeMe($3, $5); }
- | tME { g_lingo->codeMe(nullptr, 0); }
;
reference: RBLTINONEARG simpleexpr {
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 8c192ad..e17202b 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -1604,12 +1604,6 @@ YY_RULE_SETUP
if (g_lingo->_twoWordBuiltins.contains(yytext))
return TWOWORDBUILTIN;
- // Special treatment of 'me'. First parameter is method name
- if (!g_lingo->_currentFactory.empty()) {
- if (yylval.s->equalsIgnoreCase("me"))
- return tME;
- }
-
if (g_lingo->_builtins.contains(yytext)) {
int type = g_lingo->_builtins[yytext]->type;
if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) {
@@ -1642,41 +1636,41 @@ YY_RULE_SETUP
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 376 "engines/director/lingo/lingo-lex.l"
+#line 370 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 377 "engines/director/lingo/lingo-lex.l"
+#line 371 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 378 "engines/director/lingo/lingo-lex.l"
+#line 372 "engines/director/lingo/lingo-lex.l"
{ count(); return *yytext; }
YY_BREAK
case 72:
/* rule 72 can match eol */
YY_RULE_SETUP
-#line 379 "engines/director/lingo/lingo-lex.l"
+#line 373 "engines/director/lingo/lingo-lex.l"
{ count(); return '\n'; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 380 "engines/director/lingo/lingo-lex.l"
+#line 374 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 381 "engines/director/lingo/lingo-lex.l"
+#line 375 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 383 "engines/director/lingo/lingo-lex.l"
+#line 377 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1680 "engines/director/lingo/lingo-lex.cpp"
+#line 1674 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2636,7 +2630,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 383 "engines/director/lingo/lingo-lex.l"
+#line 377 "engines/director/lingo/lingo-lex.l"
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index cb07b80..4570f63 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -338,12 +338,6 @@ whitespace [\t ]
if (g_lingo->_twoWordBuiltins.contains(yytext))
return TWOWORDBUILTIN;
- // Special treatment of 'me'. First parameter is method name
- if (!g_lingo->_currentFactory.empty()) {
- if (yylval.s->equalsIgnoreCase("me"))
- return tME;
- }
-
if (g_lingo->_builtins.contains(yytext)) {
int type = g_lingo->_builtins[yytext]->type;
if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) {
Commit: 26ea12076ae2415bc8caac1f49486bb48d033f79
https://github.com/scummvm/scummvm/commit/26ea12076ae2415bc8caac1f49486bb48d033f79
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:52+01:00
Commit Message:
DIRECTOR: LINGO: Made bison 3.5 as a requirement
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 9d6dd22..c992a7d 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3. */
+/* A Bison parser, made by GNU Bison 3.5. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -43,11 +41,14 @@
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
/* Identify Bison output. */
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "3.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -55,204 +56,17 @@
/* Pure parsers. */
#define YYPURE 0
-/* Using locations. */
-#define YYLSP_NEEDED 0
+/* Push parsers. */
+#define YYPUSH 0
+
+/* Pull parsers. */
+#define YYPULL 1
-/* Tokens. */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- UNARY = 258,
- CASTREF = 259,
- VOID = 260,
- VAR = 261,
- POINT = 262,
- RECT = 263,
- ARRAY = 264,
- OBJECT = 265,
- REFERENCE = 266,
- INT = 267,
- ARGC = 268,
- ARGCNORET = 269,
- THEENTITY = 270,
- THEENTITYWITHID = 271,
- FLOAT = 272,
- BLTIN = 273,
- BLTINNOARGS = 274,
- BLTINNOARGSORONE = 275,
- BLTINONEARG = 276,
- BLTINARGLIST = 277,
- TWOWORDBUILTIN = 278,
- FBLTIN = 279,
- FBLTINNOARGS = 280,
- FBLTINONEARG = 281,
- FBLTINARGLIST = 282,
- RBLTIN = 283,
- RBLTINONEARG = 284,
- ID = 285,
- STRING = 286,
- HANDLER = 287,
- SYMBOL = 288,
- ENDCLAUSE = 289,
- tPLAYACCEL = 290,
- tMETHOD = 291,
- THEOBJECTFIELD = 292,
- tDOWN = 293,
- tELSE = 294,
- tELSIF = 295,
- tEXIT = 296,
- tGLOBAL = 297,
- tGO = 298,
- tIF = 299,
- tINTO = 300,
- tLOOP = 301,
- tMACRO = 302,
- tMOVIE = 303,
- tNEXT = 304,
- tOF = 305,
- tPREVIOUS = 306,
- tPUT = 307,
- tREPEAT = 308,
- tSET = 309,
- tTHEN = 310,
- tTO = 311,
- tWHEN = 312,
- tWITH = 313,
- tWHILE = 314,
- tNLELSE = 315,
- tFACTORY = 316,
- tOPEN = 317,
- tPLAY = 318,
- tDONE = 319,
- tINSTANCE = 320,
- tGE = 321,
- tLE = 322,
- tEQ = 323,
- tNEQ = 324,
- tAND = 325,
- tOR = 326,
- tNOT = 327,
- tMOD = 328,
- tAFTER = 329,
- tBEFORE = 330,
- tCONCAT = 331,
- tCONTAINS = 332,
- tSTARTS = 333,
- tCHAR = 334,
- tITEM = 335,
- tLINE = 336,
- tWORD = 337,
- tSPRITE = 338,
- tINTERSECTS = 339,
- tWITHIN = 340,
- tTELL = 341,
- tPROPERTY = 342,
- tON = 343,
- tENDIF = 344,
- tENDREPEAT = 345,
- tENDTELL = 346
- };
-#endif
-/* Tokens. */
-#define UNARY 258
-#define CASTREF 259
-#define VOID 260
-#define VAR 261
-#define POINT 262
-#define RECT 263
-#define ARRAY 264
-#define OBJECT 265
-#define REFERENCE 266
-#define INT 267
-#define ARGC 268
-#define ARGCNORET 269
-#define THEENTITY 270
-#define THEENTITYWITHID 271
-#define FLOAT 272
-#define BLTIN 273
-#define BLTINNOARGS 274
-#define BLTINNOARGSORONE 275
-#define BLTINONEARG 276
-#define BLTINARGLIST 277
-#define TWOWORDBUILTIN 278
-#define FBLTIN 279
-#define FBLTINNOARGS 280
-#define FBLTINONEARG 281
-#define FBLTINARGLIST 282
-#define RBLTIN 283
-#define RBLTINONEARG 284
-#define ID 285
-#define STRING 286
-#define HANDLER 287
-#define SYMBOL 288
-#define ENDCLAUSE 289
-#define tPLAYACCEL 290
-#define tMETHOD 291
-#define THEOBJECTFIELD 292
-#define tDOWN 293
-#define tELSE 294
-#define tELSIF 295
-#define tEXIT 296
-#define tGLOBAL 297
-#define tGO 298
-#define tIF 299
-#define tINTO 300
-#define tLOOP 301
-#define tMACRO 302
-#define tMOVIE 303
-#define tNEXT 304
-#define tOF 305
-#define tPREVIOUS 306
-#define tPUT 307
-#define tREPEAT 308
-#define tSET 309
-#define tTHEN 310
-#define tTO 311
-#define tWHEN 312
-#define tWITH 313
-#define tWHILE 314
-#define tNLELSE 315
-#define tFACTORY 316
-#define tOPEN 317
-#define tPLAY 318
-#define tDONE 319
-#define tINSTANCE 320
-#define tGE 321
-#define tLE 322
-#define tEQ 323
-#define tNEQ 324
-#define tAND 325
-#define tOR 326
-#define tNOT 327
-#define tMOD 328
-#define tAFTER 329
-#define tBEFORE 330
-#define tCONCAT 331
-#define tCONTAINS 332
-#define tSTARTS 333
-#define tCHAR 334
-#define tITEM 335
-#define tLINE 336
-#define tWORD 337
-#define tSPRITE 338
-#define tINTERSECTS 339
-#define tWITHIN 340
-#define tTELL 341
-#define tPROPERTY 342
-#define tON 343
-#define tENDIF 344
-#define tENDREPEAT 345
-#define tENDTELL 346
-
-
-
-
-/* Copy the first part of user declarations. */
-#line 52 "engines/director/lingo/lingo-gr.y"
+
+/* First part of user prologue. */
+#line 54 "engines/director/lingo/lingo-gr.y"
#define FORBIDDEN_SYMBOL_ALLOW_ALL
@@ -285,11 +99,28 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
}
+#line 103 "engines/director/lingo/lingo-gr.cpp"
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+# ifndef YY_CAST
+# ifdef __cplusplus
+# define YY_CAST(Type, Val) static_cast<Type> (Val)
+# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val)
+# else
+# define YY_CAST(Type, Val) ((Type) (Val))
+# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val))
+# endif
+# endif
+# ifndef YY_NULLPTR
+# if defined __cplusplus
+# if 201103L <= __cplusplus
+# define YY_NULLPTR nullptr
+# else
+# define YY_NULLPTR 0
+# endif
+# else
+# define YY_NULLPTR ((void*)0)
+# endif
+# endif
/* Enabling verbose error messages. */
#ifdef YYERROR_VERBOSE
@@ -299,15 +130,121 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
# define YYERROR_VERBOSE 0
#endif
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* Use api.header.include to #include this header
+ instead of duplicating it here. */
+#ifndef YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+# define YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+/* Debug traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ enum yytokentype
+ {
+ UNARY = 258,
+ CASTREF = 259,
+ VOID = 260,
+ VAR = 261,
+ POINT = 262,
+ RECT = 263,
+ ARRAY = 264,
+ OBJECT = 265,
+ REFERENCE = 266,
+ INT = 267,
+ ARGC = 268,
+ ARGCNORET = 269,
+ THEENTITY = 270,
+ THEENTITYWITHID = 271,
+ FLOAT = 272,
+ BLTIN = 273,
+ BLTINNOARGS = 274,
+ BLTINNOARGSORONE = 275,
+ BLTINONEARG = 276,
+ BLTINARGLIST = 277,
+ TWOWORDBUILTIN = 278,
+ FBLTIN = 279,
+ FBLTINNOARGS = 280,
+ FBLTINONEARG = 281,
+ FBLTINARGLIST = 282,
+ RBLTIN = 283,
+ RBLTINONEARG = 284,
+ ID = 285,
+ STRING = 286,
+ HANDLER = 287,
+ SYMBOL = 288,
+ ENDCLAUSE = 289,
+ tPLAYACCEL = 290,
+ tMETHOD = 291,
+ THEOBJECTFIELD = 292,
+ tDOWN = 293,
+ tELSE = 294,
+ tELSIF = 295,
+ tEXIT = 296,
+ tGLOBAL = 297,
+ tGO = 298,
+ tIF = 299,
+ tINTO = 300,
+ tLOOP = 301,
+ tMACRO = 302,
+ tMOVIE = 303,
+ tNEXT = 304,
+ tOF = 305,
+ tPREVIOUS = 306,
+ tPUT = 307,
+ tREPEAT = 308,
+ tSET = 309,
+ tTHEN = 310,
+ tTO = 311,
+ tWHEN = 312,
+ tWITH = 313,
+ tWHILE = 314,
+ tNLELSE = 315,
+ tFACTORY = 316,
+ tOPEN = 317,
+ tPLAY = 318,
+ tDONE = 319,
+ tINSTANCE = 320,
+ tGE = 321,
+ tLE = 322,
+ tEQ = 323,
+ tNEQ = 324,
+ tAND = 325,
+ tOR = 326,
+ tNOT = 327,
+ tMOD = 328,
+ tAFTER = 329,
+ tBEFORE = 330,
+ tCONCAT = 331,
+ tCONTAINS = 332,
+ tSTARTS = 333,
+ tCHAR = 334,
+ tITEM = 335,
+ tLINE = 336,
+ tWORD = 337,
+ tSPRITE = 338,
+ tINTERSECTS = 339,
+ tWITHIN = 340,
+ tTELL = 341,
+ tPROPERTY = 342,
+ tON = 343,
+ tENDIF = 344,
+ tENDREPEAT = 345,
+ tENDTELL = 346
+ };
#endif
+/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 85 "engines/director/lingo/lingo-gr.y"
+union YYSTYPE
{
+#line 87 "engines/director/lingo/lingo-gr.y"
+
Common::String *s;
int i;
double f;
@@ -320,52 +257,97 @@ typedef union YYSTYPE
Common::String *s;
int e;
} objectfield;
-}
-/* Line 193 of yacc.c. */
-#line 326 "engines/director/lingo/lingo-gr.cpp"
- YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 262 "engines/director/lingo/lingo-gr.cpp"
+
+};
+typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
#endif
+extern YYSTYPE yylval;
+
+int yyparse (void);
-/* Copy the second part of user declarations. */
+#endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED */
-/* Line 216 of yacc.c. */
-#line 339 "engines/director/lingo/lingo-gr.cpp"
#ifdef short
# undef short
#endif
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
+/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure
+ <limits.h> and (if available) <stdint.h> are included
+ so that the code can choose integer types of a good width. */
+
+#ifndef __PTRDIFF_MAX__
+# include <limits.h> /* INFRINGES ON USER NAME SPACE */
+# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
+# include <stdint.h> /* INFRINGES ON USER NAME SPACE */
+# define YY_STDINT_H
+# endif
#endif
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+/* Narrow types that promote to a signed type and that can represent a
+ signed or unsigned integer of at least N bits. In tables they can
+ save space and decrease cache pressure. Promoting to a signed type
+ helps avoid bugs in integer arithmetic. */
+
+#ifdef __INT_LEAST8_MAX__
+typedef __INT_LEAST8_TYPE__ yytype_int8;
+#elif defined YY_STDINT_H
+typedef int_least8_t yytype_int8;
+#else
typedef signed char yytype_int8;
+#endif
+
+#ifdef __INT_LEAST16_MAX__
+typedef __INT_LEAST16_TYPE__ yytype_int16;
+#elif defined YY_STDINT_H
+typedef int_least16_t yytype_int16;
#else
-typedef short int yytype_int8;
+typedef short yytype_int16;
#endif
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
+#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST8_TYPE__ yytype_uint8;
+#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \
+ && UINT_LEAST8_MAX <= INT_MAX)
+typedef uint_least8_t yytype_uint8;
+#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX
+typedef unsigned char yytype_uint8;
#else
-typedef unsigned short int yytype_uint16;
+typedef short yytype_uint8;
#endif
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
+#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__
+typedef __UINT_LEAST16_TYPE__ yytype_uint16;
+#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \
+ && UINT_LEAST16_MAX <= INT_MAX)
+typedef uint_least16_t yytype_uint16;
+#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX
+typedef unsigned short yytype_uint16;
#else
-typedef short int yytype_int16;
+typedef int yytype_uint16;
+#endif
+
+#ifndef YYPTRDIFF_T
+# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__
+# define YYPTRDIFF_T __PTRDIFF_TYPE__
+# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__
+# elif defined PTRDIFF_MAX
+# ifndef ptrdiff_t
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# endif
+# define YYPTRDIFF_T ptrdiff_t
+# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX
+# else
+# define YYPTRDIFF_T long
+# define YYPTRDIFF_MAXIMUM LONG_MAX
+# endif
#endif
#ifndef YYSIZE_T
@@ -373,54 +355,97 @@ typedef short int yytype_int16;
# define YYSIZE_T __SIZE_TYPE__
# elif defined size_t
# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
-# define YYSIZE_T unsigned int
+# define YYSIZE_T unsigned
# endif
#endif
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#define YYSIZE_MAXIMUM \
+ YY_CAST (YYPTRDIFF_T, \
+ (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \
+ ? YYPTRDIFF_MAXIMUM \
+ : YY_CAST (YYSIZE_T, -1)))
+
+#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X))
+
+/* Stored state numbers (used for stacks). */
+typedef yytype_int16 yy_state_t;
+
+/* State numbers in computations. */
+typedef int yy_state_fast_t;
#ifndef YY_
# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-# define YY_(msgid) dgettext ("bison-runtime", msgid)
+# define YY_(Msgid) dgettext ("bison-runtime", Msgid)
# endif
# endif
# ifndef YY_
-# define YY_(msgid) msgid
+# define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__)
+# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+# define YY_ATTRIBUTE_PURE
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__)
+# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__))
+# else
+# define YY_ATTRIBUTE_UNUSED
# endif
#endif
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
#else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
#endif
-/* Identity function, used to suppress warnings about constant conditions. */
-#ifndef lint
-# define YYID(n) (n)
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized. */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+ _Pragma ("GCC diagnostic pop")
#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int i)
-#else
-static int
-YYID (i)
- int i;
+# define YY_INITIAL_VALUE(Value) Value
#endif
-{
- return i;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
#endif
+#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__
+# define YY_IGNORE_USELESS_CAST_BEGIN \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"")
+# define YY_IGNORE_USELESS_CAST_END \
+ _Pragma ("GCC diagnostic pop")
+#endif
+#ifndef YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_BEGIN
+# define YY_IGNORE_USELESS_CAST_END
+#endif
+
+
+#define YY_ASSERT(E) ((void) (0 && (E)))
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -438,11 +463,11 @@ YYID (i)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+ /* Use EXIT_SUCCESS as a witness for stdlib.h. */
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -450,8 +475,8 @@ YYID (i)
# endif
# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+ /* Pacify GCC's 'empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# ifndef YYSTACK_ALLOC_MAXIMUM
/* The OS might guarantee only one guard page at the bottom of the stack,
and a page size can be as small as 4096 bytes. So we cannot safely
@@ -465,25 +490,23 @@ YYID (i)
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined malloc && ! defined EXIT_SUCCESS
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined free && ! defined EXIT_SUCCESS
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
@@ -493,60 +516,64 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
{
- yytype_int16 yyss;
- YYSTYPE yyvs;
- };
+ yy_state_t yyss_alloc;
+ YYSTYPE yyvs_alloc;
+};
/* The size of the maximum gap between one aligned stack and the next. */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1)
/* The size of an array large to enough to hold all stacks, each with
N elements. */
# define YYSTACK_BYTES(N) \
- ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1
/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
- while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYPTRDIFF_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / YYSIZEOF (*yyptr); \
+ } \
+ while (0)
#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(Dst, Src, Count) \
+ __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src)))
+# else
+# define YYCOPY(Dst, Src, Count) \
+ do \
+ { \
+ YYPTRDIFF_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (Dst)[yyi] = (Src)[yyi]; \
+ } \
+ while (0)
+# endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 132
/* YYLAST -- Last index in YYTABLE. */
@@ -558,18 +585,21 @@ union yyalloc
#define YYNNTS 46
/* YYNRULES -- Number of rules. */
#define YYNRULES 168
-/* YYNRULES -- Number of states. */
+/* YYNSTATES -- Number of states. */
#define YYNSTATES 352
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 346
-#define YYTRANSLATE(YYX) \
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
-static const yytype_uint8 yytranslate[] =
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, with out-of-bounds checking. */
+#define YYTRANSLATE(YYX) \
+ (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex. */
+static const yytype_int8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
100, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -609,120 +639,30 @@ static const yytype_uint8 yytranslate[] =
};
#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint16 yyprhs[] =
+ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
+static const yytype_int16 yyrline[] =
{
- 0, 0, 3, 7, 9, 12, 13, 15, 17, 22,
- 27, 32, 37, 42, 47, 52, 57, 63, 69, 74,
- 76, 78, 80, 82, 84, 86, 88, 90, 92, 99,
- 110, 122, 126, 133, 138, 148, 161, 162, 165, 172,
- 184, 192, 195, 199, 201, 203, 204, 205, 206, 209,
- 212, 216, 218, 220, 222, 224, 226, 228, 230, 232,
- 234, 236, 239, 242, 247, 249, 252, 254, 256, 260,
- 264, 268, 272, 276, 280, 284, 288, 292, 296, 300,
- 304, 308, 311, 315, 319, 323, 327, 330, 333, 337,
- 342, 347, 352, 359, 364, 371, 376, 383, 388, 395,
- 398, 401, 403, 405, 408, 410, 413, 416, 419, 421,
- 424, 427, 429, 432, 437, 440, 444, 446, 450, 452,
- 456, 458, 462, 465, 468, 471, 474, 478, 481, 485,
- 488, 491, 494, 498, 501, 502, 506, 507, 516, 519,
- 520, 528, 537, 544, 547, 548, 550, 554, 559, 560,
- 562, 566, 567, 570, 571, 573, 577, 579, 583, 587,
- 588, 590, 592, 594, 596, 600, 602, 606, 610
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int16 yyrhs[] =
-{
- 108, 0, -1, 108, 100, 109, -1, 109, -1, 1,
- 100, -1, -1, 138, -1, 113, -1, 52, 128, 45,
- 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, 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,
- 114, -1, 118, 128, 123, 124, 123, 90, -1, 119,
- 68, 128, 123, 56, 128, 123, 124, 123, 90, -1,
- 119, 68, 128, 123, 38, 56, 128, 123, 124, 123,
- 90, -1, 125, 112, 123, -1, 126, 128, 100, 124,
- 123, 91, -1, 126, 128, 56, 128, -1, 120, 128,
- 123, 55, 124, 123, 115, 123, 89, -1, 120, 128,
- 123, 55, 124, 123, 115, 39, 122, 124, 123, 89,
- -1, -1, 115, 116, -1, 121, 128, 123, 55, 124,
- 123, -1, 120, 128, 123, 55, 111, 123, 39, 122,
- 111, 123, 89, -1, 120, 128, 123, 55, 111, 123,
- 89, -1, 53, 59, -1, 53, 58, 30, -1, 44,
- -1, 40, -1, -1, -1, -1, 124, 100, -1, 124,
- 113, -1, 57, 30, 55, -1, 86, -1, 12, -1,
- 17, -1, 33, -1, 31, -1, 30, -1, 148, -1,
- 127, -1, 129, -1, 25, -1, 26, 128, -1, 27,
- 146, -1, 30, 101, 146, 102, -1, 15, -1, 16,
- 128, -1, 37, -1, 110, -1, 128, 95, 128, -1,
- 128, 96, 128, -1, 128, 97, 128, -1, 128, 98,
- 128, -1, 128, 73, 128, -1, 128, 93, 128, -1,
- 128, 92, 128, -1, 128, 68, 128, -1, 128, 69,
- 128, -1, 128, 66, 128, -1, 128, 67, 128, -1,
- 128, 70, 128, -1, 128, 71, 128, -1, 72, 128,
- -1, 128, 94, 128, -1, 128, 76, 128, -1, 128,
- 77, 128, -1, 128, 78, 128, -1, 95, 128, -1,
- 96, 128, -1, 101, 128, 102, -1, 83, 128, 84,
- 128, -1, 83, 128, 85, 128, -1, 79, 128, 50,
- 128, -1, 79, 128, 56, 128, 50, 128, -1, 80,
- 128, 50, 128, -1, 80, 128, 56, 128, 50, 128,
- -1, 81, 128, 50, 128, -1, 81, 128, 56, 128,
- 50, 128, -1, 82, 128, 50, 128, -1, 82, 128,
- 56, 128, 50, 128, -1, 29, 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,
- 146, -1, 62, 128, 58, 128, -1, 62, 128, -1,
- 23, 30, 146, -1, 30, -1, 131, 103, 30, -1,
- 30, -1, 132, 103, 30, -1, 30, -1, 133, 103,
- 30, -1, 43, 46, -1, 43, 49, -1, 43, 51,
- -1, 43, 128, -1, 43, 128, 135, -1, 43, 135,
- -1, 50, 48, 128, -1, 48, 128, -1, 63, 64,
- -1, 63, 128, -1, 63, 128, 135, -1, 63, 135,
- -1, -1, 35, 137, 146, -1, -1, 47, 30, 139,
- 122, 142, 100, 144, 124, -1, 61, 30, -1, -1,
- 36, 140, 122, 142, 100, 144, 124, -1, 141, 122,
- 142, 100, 144, 124, 34, 143, -1, 141, 122, 142,
- 100, 144, 124, -1, 88, 30, -1, -1, 30, -1,
- 142, 103, 30, -1, 142, 100, 103, 30, -1, -1,
- 30, -1, 143, 103, 30, -1, -1, 30, 147, -1,
- -1, 128, -1, 146, 103, 128, -1, 128, -1, 147,
- 103, 128, -1, 104, 149, 105, -1, -1, 106, -1,
- 150, -1, 151, -1, 127, -1, 150, 103, 127, -1,
- 152, -1, 151, 103, 152, -1, 33, 106, 127, -1,
- 31, 106, 127, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const yytype_uint16 yyrline[] =
-{
- 0, 132, 132, 133, 134, 137, 138, 139, 142, 148,
- 151, 152, 153, 159, 166, 172, 179, 185, 191, 198,
- 199, 200, 203, 204, 205, 206, 209, 210, 215, 226,
- 243, 255, 260, 262, 267, 277, 289, 290, 293, 301,
- 311, 324, 327, 334, 341, 349, 352, 355, 356, 357,
- 360, 366, 370, 373, 376, 379, 382, 386, 389, 390,
- 391, 394, 397, 398, 401, 409, 415, 419, 420, 421,
- 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
- 432, 433, 434, 435, 436, 437, 438, 439, 440, 441,
- 442, 443, 444, 445, 446, 447, 448, 449, 450, 453,
- 458, 459, 460, 461, 462, 463, 464, 465, 466, 469,
- 472, 475, 479, 480, 481, 482, 485, 486, 489, 490,
- 493, 494, 505, 506, 507, 508, 512, 516, 522, 523,
- 526, 527, 531, 535, 539, 539, 569, 569, 575, 576,
- 576, 582, 590, 597, 599, 600, 601, 602, 605, 606,
- 607, 610, 613, 621, 622, 623, 626, 627, 630, 633,
- 634, 635, 636, 639, 640, 643, 644, 647, 650
+ 0, 134, 134, 135, 136, 139, 140, 141, 144, 150,
+ 153, 154, 155, 161, 168, 174, 181, 187, 193, 200,
+ 201, 202, 205, 206, 207, 208, 211, 212, 217, 228,
+ 245, 257, 262, 264, 269, 279, 291, 292, 295, 303,
+ 313, 326, 329, 336, 343, 351, 354, 357, 358, 359,
+ 362, 368, 372, 375, 378, 381, 384, 388, 391, 392,
+ 393, 396, 399, 400, 403, 411, 417, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 432, 433,
+ 434, 435, 436, 437, 438, 439, 440, 441, 442, 443,
+ 444, 445, 446, 447, 448, 449, 450, 451, 452, 455,
+ 460, 461, 462, 463, 464, 465, 466, 467, 468, 471,
+ 474, 477, 481, 482, 483, 484, 487, 488, 491, 492,
+ 495, 496, 507, 508, 509, 510, 514, 518, 524, 525,
+ 528, 529, 533, 537, 541, 541, 571, 571, 577, 578,
+ 578, 584, 592, 599, 601, 602, 603, 604, 607, 608,
+ 609, 612, 615, 623, 624, 625, 628, 629, 632, 635,
+ 636, 637, 638, 641, 642, 645, 646, 649, 652
};
#endif
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
@@ -748,16 +688,16 @@ static const char *const yytname[] =
"ifoneliner", "repeatwhile", "repeatwith", "if", "elseif", "begin",
"end", "stmtlist", "when", "tell", "simpleexpr", "expr", "reference",
"proc", "globallist", "propertylist", "instancelist", "gotofunc",
- "gotomovie", "playfunc", "@1", "defn", "@2", "@3", "on", "argdef",
+ "gotomovie", "playfunc", "$@1", "defn", "$@2", "$@3", "on", "argdef",
"endargdef", "argstore", "macro", "arglist", "nonemptyarglist", "list",
- "valuelist", "linearlist", "proplist", "proppair", 0
+ "valuelist", "linearlist", "proplist", "proppair", YY_NULLPTR
};
#endif
# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
-static const yytype_uint16 yytoknum[] =
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+ (internal) symbol number NUM (which must be that of a token). */
+static const yytype_int16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
@@ -773,106 +713,18 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1[] =
-{
- 0, 107, 108, 108, 108, 109, 109, 109, 110, 110,
- 110, 110, 110, 110, 110, 110, 110, 110, 110, 111,
- 111, 111, 112, 112, 112, 112, 113, 113, 113, 113,
- 113, 113, 113, 113, 114, 114, 115, 115, 116, 117,
- 117, 118, 119, 120, 121, 122, 123, 124, 124, 124,
- 125, 126, 127, 127, 127, 127, 127, 127, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 129,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 131, 131, 132, 132,
- 133, 133, 134, 134, 134, 134, 134, 134, 135, 135,
- 136, 136, 136, 136, 137, 136, 139, 138, 138, 140,
- 138, 138, 138, 141, 142, 142, 142, 142, 143, 143,
- 143, 144, 145, 146, 146, 146, 147, 147, 148, 149,
- 149, 149, 149, 150, 150, 151, 151, 152, 152
-};
+#define YYPACT_NINF (-279)
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
-{
- 0, 2, 3, 1, 2, 0, 1, 1, 4, 4,
- 4, 4, 4, 4, 4, 4, 5, 5, 4, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 6, 10,
- 11, 3, 6, 4, 9, 12, 0, 2, 6, 11,
- 7, 2, 3, 1, 1, 0, 0, 0, 2, 2,
- 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 4, 1, 2, 1, 1, 3, 3,
- 3, 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, 1, 2,
- 2, 1, 2, 4, 2, 3, 1, 3, 1, 3,
- 1, 3, 2, 2, 2, 2, 3, 2, 3, 2,
- 2, 2, 3, 2, 0, 3, 0, 8, 2, 0,
- 7, 8, 6, 2, 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
-};
+#define yypact_value_is_default(Yyn) \
+ ((Yyn) == YYPACT_NINF)
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
-static const yytype_uint8 yydefact[] =
-{
- 0, 0, 52, 64, 0, 53, 108, 111, 0, 153,
- 0, 60, 0, 153, 0, 56, 55, 54, 134, 139,
- 66, 104, 0, 0, 43, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 51, 0, 0, 0, 0, 0, 159, 0, 3, 67,
- 26, 7, 27, 0, 0, 0, 0, 0, 58, 20,
- 59, 21, 101, 102, 6, 45, 19, 57, 4, 56,
- 0, 65, 110, 109, 154, 112, 153, 61, 62, 56,
- 99, 153, 156, 152, 153, 45, 103, 116, 105, 122,
- 0, 123, 0, 124, 125, 127, 136, 100, 0, 41,
- 0, 0, 0, 0, 0, 138, 114, 130, 131, 133,
- 120, 107, 81, 0, 0, 0, 0, 0, 118, 106,
- 143, 86, 87, 0, 55, 54, 160, 163, 0, 161,
- 162, 165, 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, 144, 153, 0, 0, 115, 154, 0, 0, 135,
- 144, 0, 129, 0, 126, 45, 0, 0, 0, 42,
- 0, 0, 0, 0, 0, 0, 50, 0, 132, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 88, 0, 0, 158, 0, 0, 2, 47, 46,
- 0, 31, 46, 0, 47, 77, 78, 75, 76, 79,
- 80, 72, 83, 84, 85, 74, 73, 82, 68, 69,
- 70, 71, 145, 0, 155, 63, 157, 0, 117, 128,
- 144, 8, 9, 10, 11, 15, 13, 0, 0, 14,
- 12, 18, 113, 121, 91, 0, 93, 0, 95, 0,
- 97, 0, 89, 90, 119, 168, 167, 164, 0, 0,
- 166, 46, 0, 47, 0, 33, 46, 151, 0, 151,
- 0, 16, 17, 0, 0, 0, 0, 48, 49, 0,
- 0, 0, 46, 0, 0, 0, 47, 146, 47, 151,
- 92, 94, 96, 98, 28, 0, 46, 36, 46, 32,
- 147, 142, 140, 47, 46, 47, 46, 0, 148, 137,
- 47, 46, 45, 44, 37, 0, 0, 45, 40, 149,
- 141, 46, 0, 47, 46, 34, 0, 0, 0, 29,
- 46, 0, 46, 150, 30, 0, 47, 0, 35, 46,
- 39, 38
-};
+#define YYTABLE_NINF (-6)
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int16 yydefgoto[] =
-{
- -1, 47, 48, 49, 50, 137, 288, 52, 316, 324,
- 138, 53, 54, 55, 325, 161, 208, 271, 56, 57,
- 58, 59, 60, 61, 88, 119, 111, 62, 95, 63,
- 84, 64, 175, 85, 65, 233, 330, 296, 66, 167,
- 83, 67, 128, 129, 130, 131
-};
+#define yytable_value_is_error(Yyn) \
+ 0
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -279
+ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
static const yytype_int16 yypact[] =
{
297, -82, -279, -279, 951, -279, -279, 951, 951, 951,
@@ -913,7 +765,50 @@ static const yytype_int16 yypact[] =
-279, -279
};
-/* YYPGOTO[NTERM-NUM]. */
+ /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE does not specify something else to do. Zero
+ means the default is an error. */
+static const yytype_uint8 yydefact[] =
+{
+ 0, 0, 52, 64, 0, 53, 108, 111, 0, 153,
+ 0, 60, 0, 153, 0, 56, 55, 54, 134, 139,
+ 66, 104, 0, 0, 43, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 51, 0, 0, 0, 0, 0, 159, 0, 3, 67,
+ 26, 7, 27, 0, 0, 0, 0, 0, 58, 20,
+ 59, 21, 101, 102, 6, 45, 19, 57, 4, 56,
+ 0, 65, 110, 109, 154, 112, 153, 61, 62, 56,
+ 99, 153, 156, 152, 153, 45, 103, 116, 105, 122,
+ 0, 123, 0, 124, 125, 127, 136, 100, 0, 41,
+ 0, 0, 0, 0, 0, 138, 114, 130, 131, 133,
+ 120, 107, 81, 0, 0, 0, 0, 0, 118, 106,
+ 143, 86, 87, 0, 55, 54, 160, 163, 0, 161,
+ 162, 165, 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, 144, 153, 0, 0, 115, 154, 0, 0, 135,
+ 144, 0, 129, 0, 126, 45, 0, 0, 0, 42,
+ 0, 0, 0, 0, 0, 0, 50, 0, 132, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 88, 0, 0, 158, 0, 0, 2, 47, 46,
+ 0, 31, 46, 0, 47, 77, 78, 75, 76, 79,
+ 80, 72, 83, 84, 85, 74, 73, 82, 68, 69,
+ 70, 71, 145, 0, 155, 63, 157, 0, 117, 128,
+ 144, 8, 9, 10, 11, 15, 13, 0, 0, 14,
+ 12, 18, 113, 121, 91, 0, 93, 0, 95, 0,
+ 97, 0, 89, 90, 119, 168, 167, 164, 0, 0,
+ 166, 46, 0, 47, 0, 33, 46, 151, 0, 151,
+ 0, 16, 17, 0, 0, 0, 0, 48, 49, 0,
+ 0, 0, 46, 0, 0, 0, 47, 146, 47, 151,
+ 92, 94, 96, 98, 28, 0, 46, 36, 46, 32,
+ 147, 142, 140, 47, 46, 47, 46, 0, 148, 137,
+ 47, 46, 45, 44, 37, 0, 0, 45, 40, 149,
+ 141, 46, 0, 47, 46, 34, 0, 0, 0, 29,
+ 46, 0, 46, 150, 30, 0, 47, 0, 35, 46,
+ 39, 38
+};
+
+ /* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
-279, -279, 77, -279, -278, -279, 1, -279, -279, -279,
@@ -923,11 +818,19 @@ static const yytype_int16 yypgoto[] =
-279, -279, -279, -279, -279, 9
};
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -6
+ /* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int16 yydefgoto[] =
+{
+ -1, 47, 48, 49, 50, 137, 288, 52, 316, 324,
+ 138, 53, 54, 55, 325, 161, 208, 271, 56, 57,
+ 58, 59, 60, 61, 88, 119, 111, 62, 95, 63,
+ 84, 64, 175, 85, 65, 233, 330, 296, 66, 167,
+ 83, 67, 128, 129, 130, 131
+};
+
+ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule whose
+ number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
71, 51, 132, 72, 73, 74, 109, 327, 77, 74,
@@ -1254,8 +1157,8 @@ static const yytype_int16 yycheck[] =
94, 95, 96, 97, 98
};
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
+ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
0, 1, 12, 15, 16, 17, 19, 20, 21, 22,
@@ -1296,95 +1199,85 @@ static const yytype_uint8 yystos[] =
89, 123
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
-
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
-
-
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint8 yyr1[] =
+{
+ 0, 107, 108, 108, 108, 109, 109, 109, 110, 110,
+ 110, 110, 110, 110, 110, 110, 110, 110, 110, 111,
+ 111, 111, 112, 112, 112, 112, 113, 113, 113, 113,
+ 113, 113, 113, 113, 114, 114, 115, 115, 116, 117,
+ 117, 118, 119, 120, 121, 122, 123, 124, 124, 124,
+ 125, 126, 127, 127, 127, 127, 127, 127, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
+ 128, 128, 128, 128, 128, 128, 128, 128, 128, 129,
+ 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
+ 130, 130, 130, 130, 130, 130, 131, 131, 132, 132,
+ 133, 133, 134, 134, 134, 134, 134, 134, 135, 135,
+ 136, 136, 136, 136, 137, 136, 139, 138, 138, 140,
+ 138, 138, 138, 141, 142, 142, 142, 142, 143, 143,
+ 143, 144, 145, 146, 146, 146, 147, 147, 148, 149,
+ 149, 149, 149, 150, 150, 151, 151, 152, 152
+};
-#define YYFAIL goto yyerrlab
+ /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
+static const yytype_int8 yyr2[] =
+{
+ 0, 2, 3, 1, 2, 0, 1, 1, 4, 4,
+ 4, 4, 4, 4, 4, 4, 5, 5, 4, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 6, 10,
+ 11, 3, 6, 4, 9, 12, 0, 2, 6, 11,
+ 7, 2, 3, 1, 1, 0, 0, 0, 2, 2,
+ 3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 2, 2, 4, 1, 2, 1, 1, 3, 3,
+ 3, 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, 1, 2,
+ 2, 1, 2, 4, 2, 3, 1, 3, 1, 3,
+ 1, 3, 2, 2, 2, 2, 3, 2, 3, 2,
+ 2, 2, 3, 2, 0, 3, 0, 8, 2, 0,
+ 7, 8, 6, 2, 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
+};
-#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY && yylen == 1) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
- YYPOPSTACK (1); \
- goto yybackup; \
- } \
- else \
- { \
- yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
-while (YYID (0))
-
-
-#define YYTERROR 1
-#define YYERRCODE 256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
- If N is 0, then set CURRENT to the empty location which ends
- the previous symbol: RHS[0] (always defined). */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
- if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
- while (YYID (0))
-#endif
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
+#define YYRECOVERING() (!!yyerrstatus)
+#define YYBACKUP(Token, Value) \
+ do \
+ if (yychar == YYEMPTY) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (yylen); \
+ yystate = *yyssp; \
+ goto yybackup; \
+ } \
+ else \
+ { \
+ yyerror (YY_("syntax error: cannot back up")); \
+ YYERROR; \
+ } \
+ while (0)
+
+/* Error token number */
+#define YYTERROR 1
+#define YYERRCODE 256
-/* YYLEX -- calling `yylex' with the right arguments. */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
/* Enable debugging if requested. */
#if YYDEBUG
@@ -1394,80 +1287,63 @@ while (YYID (0))
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
-} while (YYID (0))
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value); \
- YYFPRINTF (stderr, "\n"); \
- } \
-} while (YYID (0))
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (0)
+
+
+/*-----------------------------------.
+| Print this symbol's value on YYO. |
+`-----------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
{
+ FILE *yyoutput = yyo;
+ YYUSE (yyoutput);
if (!yyvaluep)
return;
# ifdef YYPRINT
if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
- YYUSE (yyoutput);
+ YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
- switch (yytype)
- {
- default:
- break;
- }
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+ YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO. |
+`---------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
-#endif
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep)
{
- if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+ YYFPRINTF (yyo, "%s %s (",
+ yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
- yy_symbol_value_print (yyoutput, yytype, yyvaluep);
- YYFPRINTF (yyoutput, ")");
+ yy_symbol_value_print (yyo, yytype, yyvaluep);
+ YYFPRINTF (yyo, ")");
}
/*------------------------------------------------------------------.
@@ -1475,66 +1351,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
| TOP (included). |
`------------------------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-#else
-static void
-yy_stack_print (bottom, top)
- yytype_int16 *bottom;
- yytype_int16 *top;
-#endif
+yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop)
{
YYFPRINTF (stderr, "Stack now");
- for (; bottom <= top; ++bottom)
- YYFPRINTF (stderr, " %d", *bottom);
+ for (; yybottom <= yytop; yybottom++)
+ {
+ int yybot = *yybottom;
+ YYFPRINTF (stderr, " %d", yybot);
+ }
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
+} while (0)
/*------------------------------------------------.
| Report that the YYRULE is going to be reduced. |
`------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
static void
-yy_reduce_print (yyvsp, yyrule)
- YYSTYPE *yyvsp;
- int yyrule;
-#endif
+yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule)
{
+ int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
- unsigned long int yylno = yyrline[yyrule];
- YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n",
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- fprintf (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- );
- fprintf (stderr, "\n");
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
+ yy_symbol_print (stderr,
+ yystos[yyssp[yyi + 1 - yynrhs]],
+ &yyvsp[(yyi + 1) - (yynrhs)]
+ );
+ YYFPRINTF (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
- yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
/* Nonzero means print parse trace. It is left uninitialized so that
multiple parsers can coexist. */
@@ -1548,7 +1412,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -1563,26 +1427,18 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-
#if YYERROR_VERBOSE
# ifndef yystrlen
# if defined __GLIBC__ && defined _STRING_H
-# define yystrlen strlen
+# define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S)))
# else
/* Return the length of YYSTR. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
+static YYPTRDIFF_T
yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
- const char *yystr;
-#endif
{
- YYSIZE_T yylen;
+ YYPTRDIFF_T yylen;
for (yylen = 0; yystr[yylen]; yylen++)
continue;
return yylen;
@@ -1596,16 +1452,8 @@ yystrlen (yystr)
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
YYDEST. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static char *
yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
{
char *yyd = yydest;
const char *yys = yysrc;
@@ -1626,408 +1474,392 @@ yystpcpy (yydest, yysrc)
backslash-backslash). YYSTR is taken from yytname. If YYRES is
null, do not copy; instead, return the length of what the result
would have been. */
-static YYSIZE_T
+static YYPTRDIFF_T
yytnamerr (char *yyres, const char *yystr)
{
if (*yystr == '"')
{
- YYSIZE_T yyn = 0;
+ YYPTRDIFF_T yyn = 0;
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ else
+ goto append;
+
+ append:
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
- if (! yyres)
+ if (yyres)
+ return yystpcpy (yyres, yystr) - yyres;
+ else
return yystrlen (yystr);
-
- return yystpcpy (yyres, yystr) - yyres;
}
# endif
-/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
- including the terminating null byte. If YYRESULT is null, do not
- copy anything; just return the number of bytes that would be
- copied. As a special case, return 0 if an ordinary "syntax error"
- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
- size calculation. */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
+
+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
+ yy_state_t *yyssp, int yytoken)
{
- int yyn = yypact[yystate];
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = YY_NULLPTR;
+ /* Arguments of yyformat: reported tokens (one for the "unexpected",
+ one per "expected"). */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Actual size of YYARG. */
+ int yycount = 0;
+ /* Cumulated lengths of YYARG. */
+ YYPTRDIFF_T yysize = 0;
+
+ /* There are many possibilities here to consider:
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+ tokens because there are none.
+ - The only way there can be no lookahead present (in yychar) is if
+ this state is a consistent state with a default action. Thus,
+ detecting the absence of a lookahead is sufficient to determine
+ that there is no unexpected or expected token to report. In that
+ case, just report a simple "syntax error".
+ - Don't assume there isn't a lookahead just because this state is a
+ consistent state with a default action. There might have been a
+ previous inconsistent state, consistent state with a non-default
+ action, or user semantic action that manipulated yychar.
+ - Of course, the expected token list depends on states to have
+ correct lookahead information, and it depends on the parser not
+ to perform extra reductions after fetching a lookahead from the
+ scanner and before detecting a syntax error. Thus, state merging
+ (from LALR or IELR) and default reductions corrupt the expected
+ token list. However, the list is correct for canonical LR with
+ one exception: it will still contain any token that will not be
+ accepted due to an error action in a later state.
+ */
+ if (yytoken != YYEMPTY)
+ {
+ int yyn = yypact[*yyssp];
+ YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+ yysize = yysize0;
+ yyarg[yycount++] = yytname[yytoken];
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yyx;
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ {
+ YYPTRDIFF_T yysize1
+ = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
+ return 2;
+ }
+ }
+ }
+ }
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
- {
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- int yysize_overflow = 0;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- int yyx;
-
-# if 0
- /* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
- YY_("syntax error, unexpected %s");
- YY_("syntax error, unexpected %s, expecting %s");
- YY_("syntax error, unexpected %s, expecting %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
- char *yyfmt;
- char const *yyf;
- static char const yyunexpected[] = "syntax error, unexpected %s";
- static char const yyexpecting[] = ", expecting %s";
- static char const yyor[] = " or %s";
- char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
- char const *yyprefix = yyexpecting;
-
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
-
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
-
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
+ switch (yycount)
+ {
+# define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ default: /* Avoid compiler warnings. */
+ YYCASE_(0, YY_("syntax error"));
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+ }
+
+ {
+ /* Don't count the "%s"s in the final size, but reserve room for
+ the terminator. */
+ YYPTRDIFF_T yysize1 = yysize + (yystrlen (yyformat) - 2 * yycount) + 1;
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
yysize = yysize1;
+ else
+ return 2;
+ }
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
-
- if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
- return yysize;
+ if (*yymsg_alloc < yysize)
+ {
+ *yymsg_alloc = 2 * yysize;
+ if (! (yysize <= *yymsg_alloc
+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+ return 1;
}
+
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ {
+ char *yyp = *yymsg;
+ int yyi = 0;
+ while ((*yyp = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
+ }
+ else
+ {
+ ++yyp;
+ ++yyformat;
+ }
+ }
+ return 0;
}
#endif /* YYERROR_VERBOSE */
-
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
`-----------------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
-#endif
{
YYUSE (yyvaluep);
-
if (!yymsg)
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
- switch (yytype)
- {
-
- default:
- break;
- }
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+ YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
-
-
-/* Prevent warnings from -Wmissing-prototypes. */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-/* The look-ahead symbol. */
+/* The lookahead symbol. */
int yychar;
-/* The semantic value of the look-ahead symbol. */
+/* The semantic value of the lookahead symbol. */
YYSTYPE yylval;
-
/* Number of syntax errors so far. */
int yynerrs;
-
/*----------.
| yyparse. |
`----------*/
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
int
yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
{
-
- int yystate;
- int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Look-ahead token as an internal (translated) token number. */
- int yytoken = 0;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
- /* Three stacks and their tools:
- `yyss': related to states,
- `yyvs': related to semantic values,
- `yyls': related to locations.
-
- Refer to the stacks thru separate pointers, to allow yyoverflow
- to reallocate them elsewhere. */
+ yy_state_fast_t yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- /* The state stack. */
- yytype_int16 yyssa[YYINITDEPTH];
- yytype_int16 *yyss = yyssa;
- yytype_int16 *yyssp;
+ /* The stacks and their tools:
+ 'yyss': related to states.
+ 'yyvs': related to semantic values.
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ Refer to the stacks through separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+ /* The state stack. */
+ yy_state_t yyssa[YYINITDEPTH];
+ yy_state_t *yyss;
+ yy_state_t *yyssp;
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
-
- YYSIZE_T yystacksize = YYINITDEPTH;
+ YYPTRDIFF_T yystacksize;
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken = 0;
/* The variables used to return semantic value and location from the
action routines. */
YYSTYPE yyval;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char yymsgbuf[128];
+ char *yymsg = yymsgbuf;
+ YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
+ yyssp = yyss = yyssa;
+ yyvsp = yyvs = yyvsa;
+ yystacksize = YYINITDEPTH;
+
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
-
- /* Initialize stack pointers.
- Waste one element of value and location stack
- so that they stay on the same level as the state stack.
- The wasted elements are never initialized. */
-
- yyssp = yyss;
- yyvsp = yyvs;
-
+ yychar = YYEMPTY; /* Cause a token to be read. */
goto yysetstate;
+
/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
+| yynewstate -- push a new state, which is found in yystate. |
`------------------------------------------------------------*/
- yynewstate:
+yynewstate:
/* In all cases, when you get here, the value and location stacks
have just been pushed. So pushing a state here evens the stacks. */
yyssp++;
- yysetstate:
- *yyssp = yystate;
+
+/*--------------------------------------------------------------------.
+| yysetstate -- set current state (the top of the stack) to yystate. |
+`--------------------------------------------------------------------*/
+yysetstate:
+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
+ YY_IGNORE_USELESS_CAST_BEGIN
+ *yyssp = YY_CAST (yy_state_t, yystate);
+ YY_IGNORE_USELESS_CAST_END
if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+ goto yyexhaustedlab;
+#else
{
/* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
+ YYPTRDIFF_T yysize = yyssp - yyss + 1;
-#ifdef yyoverflow
+# if defined yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
-
-
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
-
- &yystacksize);
-
- yyss = yyss1;
- yyvs = yyvs1;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ yy_state_t *yyss1 = yyss;
+ YYSTYPE *yyvs1 = yyvs;
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * YYSIZEOF (*yyssp),
+ &yyvs1, yysize * YYSIZEOF (*yyvsp),
+ &yystacksize);
+ yyss = yyss1;
+ yyvs = yyvs1;
}
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
-# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ yy_state_t *yyss1 = yyss;
+ union yyalloc *yyptr =
+ YY_CAST (union yyalloc *,
+ YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+# undef YYSTACK_RELOCATE
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
-#endif /* no yyoverflow */
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
-
- YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ YY_IGNORE_USELESS_CAST_BEGIN
+ YYDPRINTF ((stderr, "Stack size increased to %ld\n",
+ YY_CAST (long, yystacksize)));
+ YY_IGNORE_USELESS_CAST_END
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
goto yybackup;
+
/*-----------.
| yybackup. |
`-----------*/
yybackup:
-
/* Do appropriate processing given the current state. Read a
- look-ahead token if we need one and don't already have one. */
+ lookahead token if we need one and don't already have one. */
- /* First try to decide what to do without reference to look-ahead token. */
+ /* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
- /* Not known => get a look-ahead token if don't already have one. */
+ /* Not known => get a lookahead token if don't already have one. */
- /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
+ yychar = yylex ();
}
if (yychar <= YYEOF)
@@ -2049,30 +1881,26 @@ yybackup:
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ if (yytable_value_is_error (yyn))
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
/* Count tokens shifted since error; after three, turn off error
status. */
if (yyerrstatus)
yyerrstatus--;
- /* Shift the look-ahead token. */
+ /* Shift the lookahead token. */
YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
- /* Discard the shifted token unless it is eof. */
- if (yychar != YYEOF)
- yychar = YYEMPTY;
-
yystate = yyn;
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
+ /* Discard the shifted token. */
+ yychar = YYEMPTY;
goto yynewstate;
@@ -2087,14 +1915,14 @@ yydefault:
/*-----------------------------.
-| yyreduce -- Do a reduction. |
+| yyreduce -- do a reduction. |
`-----------------------------*/
yyreduce:
/* yyn is the number of a rule to reduce with. */
yylen = yyr2[yyn];
/* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
+ '$$ = $1'.
Otherwise, the following line sets YYVAL to garbage.
This behavior is undocumented and Bison
@@ -2107,920 +1935,1067 @@ yyreduce:
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
- case 4:
-#line 134 "engines/director/lingo/lingo-gr.y"
- { yyerrok; ;}
+ case 4:
+#line 136 "engines/director/lingo/lingo-gr.y"
+ { yyerrok; }
+#line 1942 "engines/director/lingo/lingo-gr.cpp"
break;
case 8:
-#line 142 "engines/director/lingo/lingo-gr.y"
- {
+#line 144 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_varpush);
- g_lingo->codeString((yyvsp[(4) - (4)].s)->c_str());
+ g_lingo->codeString((yyvsp[0].s)->c_str());
g_lingo->code1(LC::c_assign);
- (yyval.code) = (yyvsp[(2) - (4)].code);
- delete (yyvsp[(4) - (4)].s); ;}
+ (yyval.code) = (yyvsp[-2].code);
+ delete (yyvsp[0].s); }
+#line 1953 "engines/director/lingo/lingo-gr.cpp"
break;
case 9:
-#line 148 "engines/director/lingo/lingo-gr.y"
- {
+#line 150 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_assign);
- (yyval.code) = (yyvsp[(2) - (4)].code); ;}
+ (yyval.code) = (yyvsp[-2].code); }
+#line 1961 "engines/director/lingo/lingo-gr.cpp"
break;
case 10:
-#line 151 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->code1(LC::c_after); ;}
+#line 153 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->code1(LC::c_after); }
+#line 1967 "engines/director/lingo/lingo-gr.cpp"
break;
case 11:
-#line 152 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->code1(LC::c_before); ;}
+#line 154 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->code1(LC::c_before); }
+#line 1973 "engines/director/lingo/lingo-gr.cpp"
break;
case 12:
-#line 153 "engines/director/lingo/lingo-gr.y"
- {
+#line 155 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_varpush);
- g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
+ g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
- (yyval.code) = (yyvsp[(4) - (4)].code);
- delete (yyvsp[(2) - (4)].s); ;}
+ (yyval.code) = (yyvsp[0].code);
+ delete (yyvsp[-2].s); }
+#line 1984 "engines/director/lingo/lingo-gr.cpp"
break;
case 13:
-#line 159 "engines/director/lingo/lingo-gr.y"
- {
+#line 161 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt((yyvsp[(2) - (4)].e)[0]);
- g_lingo->codeInt((yyvsp[(2) - (4)].e)[1]);
- (yyval.code) = (yyvsp[(4) - (4)].code); ;}
+ g_lingo->codeInt((yyvsp[-2].e)[0]);
+ g_lingo->codeInt((yyvsp[-2].e)[1]);
+ (yyval.code) = (yyvsp[0].code); }
+#line 1996 "engines/director/lingo/lingo-gr.cpp"
break;
case 14:
-#line 166 "engines/director/lingo/lingo-gr.y"
- {
+#line 168 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_varpush);
- g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str());
+ g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
- (yyval.code) = (yyvsp[(4) - (4)].code);
- delete (yyvsp[(2) - (4)].s); ;}
+ (yyval.code) = (yyvsp[0].code);
+ delete (yyvsp[-2].s); }
+#line 2007 "engines/director/lingo/lingo-gr.cpp"
break;
case 15:
-#line 172 "engines/director/lingo/lingo-gr.y"
- {
+#line 174 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt((yyvsp[(2) - (4)].e)[0]);
- g_lingo->codeInt((yyvsp[(2) - (4)].e)[1]);
- (yyval.code) = (yyvsp[(4) - (4)].code); ;}
+ g_lingo->codeInt((yyvsp[-2].e)[0]);
+ g_lingo->codeInt((yyvsp[-2].e)[1]);
+ (yyval.code) = (yyvsp[0].code); }
+#line 2019 "engines/director/lingo/lingo-gr.cpp"
break;
case 16:
-#line 179 "engines/director/lingo/lingo-gr.y"
- {
+#line 181 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt((yyvsp[(2) - (5)].e)[0]);
- g_lingo->codeInt((yyvsp[(2) - (5)].e)[1]);
- (yyval.code) = (yyvsp[(5) - (5)].code); ;}
+ g_lingo->codeInt((yyvsp[-3].e)[0]);
+ g_lingo->codeInt((yyvsp[-3].e)[1]);
+ (yyval.code) = (yyvsp[0].code); }
+#line 2030 "engines/director/lingo/lingo-gr.cpp"
break;
case 17:
-#line 185 "engines/director/lingo/lingo-gr.y"
- {
+#line 187 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt((yyvsp[(2) - (5)].e)[0]);
- g_lingo->codeInt((yyvsp[(2) - (5)].e)[1]);
- (yyval.code) = (yyvsp[(5) - (5)].code); ;}
+ g_lingo->codeInt((yyvsp[-3].e)[0]);
+ g_lingo->codeInt((yyvsp[-3].e)[1]);
+ (yyval.code) = (yyvsp[0].code); }
+#line 2041 "engines/director/lingo/lingo-gr.cpp"
break;
case 18:
-#line 191 "engines/director/lingo/lingo-gr.y"
- {
+#line 193 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_objectfieldassign);
- g_lingo->codeString((yyvsp[(2) - (4)].objectfield).s->c_str());
- g_lingo->codeInt((yyvsp[(2) - (4)].objectfield).e);
- (yyval.code) = (yyvsp[(4) - (4)].code); ;}
+ g_lingo->codeString((yyvsp[-2].objectfield).s->c_str());
+ g_lingo->codeInt((yyvsp[-2].objectfield).e);
+ (yyval.code) = (yyvsp[0].code); }
+#line 2051 "engines/director/lingo/lingo-gr.cpp"
break;
case 28:
-#line 215 "engines/director/lingo/lingo-gr.y"
- {
+#line 217 "engines/director/lingo/lingo-gr.y"
+ {
inst body = 0, end = 0;
- WRITE_UINT32(&body, (yyvsp[(3) - (6)].code) - (yyvsp[(1) - (6)].code));
- WRITE_UINT32(&end, (yyvsp[(5) - (6)].code) - (yyvsp[(1) - (6)].code));
- (*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 1] = body; /* body of loop */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 2] = end; ;}
+ WRITE_UINT32(&body, (yyvsp[-3].code) - (yyvsp[-5].code));
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
+ (*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = body; /* body of loop */
+ (*g_lingo->_currentScript)[(yyvsp[-5].code) + 2] = end; }
+#line 2062 "engines/director/lingo/lingo-gr.cpp"
break;
case 29:
-#line 226 "engines/director/lingo/lingo-gr.y"
- {
+#line 228 "engines/director/lingo/lingo-gr.y"
+ {
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
- WRITE_UINT32(&init, (yyvsp[(3) - (10)].code) - (yyvsp[(1) - (10)].code));
- WRITE_UINT32(&finish, (yyvsp[(6) - (10)].code) - (yyvsp[(1) - (10)].code));
- WRITE_UINT32(&body, (yyvsp[(8) - (10)].code) - (yyvsp[(1) - (10)].code));
- WRITE_UINT32(&end, (yyvsp[(9) - (10)].code) - (yyvsp[(1) - (10)].code));
+ WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
+ WRITE_UINT32(&finish, (yyvsp[-4].code) - (yyvsp[-9].code));
+ WRITE_UINT32(&body, (yyvsp[-2].code) - (yyvsp[-9].code));
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-9].code));
WRITE_UINT32(&inc, 1);
- (*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 1] = init; /* initial count value */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 2] = finish;/* final count value */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 3] = body; /* body of loop */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 4] = inc; /* increment */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 5] = end; ;}
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 1] = init; /* initial count value */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 2] = finish;/* final count value */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end; }
+#line 2079 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
-#line 243 "engines/director/lingo/lingo-gr.y"
- {
+#line 245 "engines/director/lingo/lingo-gr.y"
+ {
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
- WRITE_UINT32(&init, (yyvsp[(3) - (11)].code) - (yyvsp[(1) - (11)].code));
- WRITE_UINT32(&finish, (yyvsp[(7) - (11)].code) - (yyvsp[(1) - (11)].code));
- WRITE_UINT32(&body, (yyvsp[(9) - (11)].code) - (yyvsp[(1) - (11)].code));
- WRITE_UINT32(&end, (yyvsp[(10) - (11)].code) - (yyvsp[(1) - (11)].code));
+ WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
+ WRITE_UINT32(&finish, (yyvsp[-4].code) - (yyvsp[-10].code));
+ WRITE_UINT32(&body, (yyvsp[-2].code) - (yyvsp[-10].code));
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-10].code));
WRITE_UINT32(&inc, (uint32)-1);
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 1] = init; /* initial count value */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 2] = finish;/* final count value */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 3] = body; /* body of loop */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 4] = inc; /* increment */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 5] = end; ;}
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 1] = init; /* initial count value */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 2] = finish;/* final count value */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end; }
+#line 2096 "engines/director/lingo/lingo-gr.cpp"
break;
case 31:
-#line 255 "engines/director/lingo/lingo-gr.y"
- {
+#line 257 "engines/director/lingo/lingo-gr.y"
+ {
inst end = 0;
- WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code));
+ WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
g_lingo->code1(STOP);
- (*g_lingo->_currentScript)[(yyvsp[(1) - (3)].code) + 1] = end; ;}
+ (*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
+#line 2106 "engines/director/lingo/lingo-gr.cpp"
break;
case 32:
-#line 260 "engines/director/lingo/lingo-gr.y"
- {
- warning("STUB: TELL is not implemented"); ;}
+#line 262 "engines/director/lingo/lingo-gr.y"
+ {
+ warning("STUB: TELL is not implemented"); }
+#line 2113 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
-#line 262 "engines/director/lingo/lingo-gr.y"
- {
+#line 264 "engines/director/lingo/lingo-gr.y"
+ {
warning("STUB: TELL is not implemented");
- ;}
+ }
+#line 2121 "engines/director/lingo/lingo-gr.cpp"
break;
case 34:
-#line 267 "engines/director/lingo/lingo-gr.y"
- {
+#line 269 "engines/director/lingo/lingo-gr.y"
+ {
inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, (yyvsp[(3) - (9)].code) - (yyvsp[(1) - (9)].code));
- WRITE_UINT32(&else1, (yyvsp[(6) - (9)].code) - (yyvsp[(1) - (9)].code));
- WRITE_UINT32(&end, (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code));
- (*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (9)].code) + 3] = end; /* end, if cond fails */
+ WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-8].code));
+ WRITE_UINT32(&else1, (yyvsp[-3].code) - (yyvsp[-8].code));
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-8].code));
+ (*g_lingo->_currentScript)[(yyvsp[-8].code) + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[(yyvsp[-8].code) + 2] = else1; /* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end; /* end, if cond fails */
- g_lingo->processIf((yyvsp[(1) - (9)].code), (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code), 0); ;}
+ g_lingo->processIf((yyvsp[-8].code), (yyvsp[-1].code) - (yyvsp[-8].code), 0); }
+#line 2136 "engines/director/lingo/lingo-gr.cpp"
break;
case 35:
-#line 277 "engines/director/lingo/lingo-gr.y"
- {
+#line 279 "engines/director/lingo/lingo-gr.y"
+ {
inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, (yyvsp[(3) - (12)].code) - (yyvsp[(1) - (12)].code));
- WRITE_UINT32(&else1, (yyvsp[(6) - (12)].code) - (yyvsp[(1) - (12)].code));
- WRITE_UINT32(&end, (yyvsp[(11) - (12)].code) - (yyvsp[(1) - (12)].code));
- (*g_lingo->_currentScript)[(yyvsp[(1) - (12)].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (12)].code) + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (12)].code) + 3] = end; /* end, if cond fails */
+ WRITE_UINT32(&then, (yyvsp[-9].code) - (yyvsp[-11].code));
+ WRITE_UINT32(&else1, (yyvsp[-6].code) - (yyvsp[-11].code));
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-11].code));
+ (*g_lingo->_currentScript)[(yyvsp[-11].code) + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[(yyvsp[-11].code) + 2] = else1; /* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = end; /* end, if cond fails */
- g_lingo->processIf((yyvsp[(1) - (12)].code), (yyvsp[(11) - (12)].code) - (yyvsp[(1) - (12)].code), (yyvsp[(9) - (12)].code) - (yyvsp[(1) - (12)].code)); ;}
+ g_lingo->processIf((yyvsp[-11].code), (yyvsp[-1].code) - (yyvsp[-11].code), (yyvsp[-3].code) - (yyvsp[-11].code)); }
+#line 2151 "engines/director/lingo/lingo-gr.cpp"
break;
case 38:
-#line 293 "engines/director/lingo/lingo-gr.y"
- {
+#line 295 "engines/director/lingo/lingo-gr.y"
+ {
inst then = 0;
- WRITE_UINT32(&then, (yyvsp[(3) - (6)].code) - (yyvsp[(1) - (6)].code));
- (*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 1] = then; /* thenpart */
+ WRITE_UINT32(&then, (yyvsp[-3].code) - (yyvsp[-5].code));
+ (*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
- g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
+ g_lingo->codeLabel((yyvsp[-5].code)); }
+#line 2162 "engines/director/lingo/lingo-gr.cpp"
break;
case 39:
-#line 301 "engines/director/lingo/lingo-gr.y"
- {
+#line 303 "engines/director/lingo/lingo-gr.y"
+ {
inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, (yyvsp[(3) - (11)].code) - (yyvsp[(1) - (11)].code));
- WRITE_UINT32(&else1, (yyvsp[(6) - (11)].code) - (yyvsp[(1) - (11)].code));
- WRITE_UINT32(&end, (yyvsp[(10) - (11)].code) - (yyvsp[(1) - (11)].code));
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 3] = end; /* end, if cond fails */
+ WRITE_UINT32(&then, (yyvsp[-8].code) - (yyvsp[-10].code));
+ WRITE_UINT32(&else1, (yyvsp[-5].code) - (yyvsp[-10].code));
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-10].code));
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 2] = else1; /* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = end; /* end, if cond fails */
- g_lingo->processIf((yyvsp[(1) - (11)].code), (yyvsp[(10) - (11)].code) - (yyvsp[(1) - (11)].code), (yyvsp[(8) - (11)].code) - (yyvsp[(1) - (11)].code)); ;}
+ g_lingo->processIf((yyvsp[-10].code), (yyvsp[-1].code) - (yyvsp[-10].code), (yyvsp[-3].code) - (yyvsp[-10].code)); }
+#line 2177 "engines/director/lingo/lingo-gr.cpp"
break;
case 40:
-#line 311 "engines/director/lingo/lingo-gr.y"
- {
+#line 313 "engines/director/lingo/lingo-gr.y"
+ {
inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, (yyvsp[(3) - (7)].code) - (yyvsp[(1) - (7)].code));
+ WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
WRITE_UINT32(&else1, 0);
- WRITE_UINT32(&end, (yyvsp[(6) - (7)].code) - (yyvsp[(1) - (7)].code));
- (*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 3] = end; /* end, if cond fails */
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-6].code));
+ (*g_lingo->_currentScript)[(yyvsp[-6].code) + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[(yyvsp[-6].code) + 2] = else1; /* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
- g_lingo->processIf((yyvsp[(1) - (7)].code), (yyvsp[(6) - (7)].code) - (yyvsp[(1) - (7)].code), (yyvsp[(6) - (7)].code) - (yyvsp[(1) - (7)].code)); ;}
+ g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
+#line 2192 "engines/director/lingo/lingo-gr.cpp"
break;
case 41:
-#line 324 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); ;}
+#line 326 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
+#line 2198 "engines/director/lingo/lingo-gr.cpp"
break;
case 42:
-#line 327 "engines/director/lingo/lingo-gr.y"
- {
+#line 329 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code3(LC::c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
- g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str());
- delete (yyvsp[(3) - (3)].s); ;}
+ g_lingo->codeString((yyvsp[0].s)->c_str());
+ delete (yyvsp[0].s); }
+#line 2208 "engines/director/lingo/lingo-gr.cpp"
break;
case 43:
-#line 334 "engines/director/lingo/lingo-gr.y"
- {
+#line 336 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(0); // Do not skip end
- g_lingo->codeLabel(0); ;}
+ g_lingo->codeLabel(0); }
+#line 2218 "engines/director/lingo/lingo-gr.cpp"
break;
case 44:
-#line 341 "engines/director/lingo/lingo-gr.y"
- {
+#line 343 "engines/director/lingo/lingo-gr.y"
+ {
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
- g_lingo->code1(skipEnd); ;}
+ g_lingo->code1(skipEnd); }
+#line 2229 "engines/director/lingo/lingo-gr.cpp"
break;
case 45:
-#line 349 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->_currentScript->size(); ;}
+#line 351 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->_currentScript->size(); }
+#line 2235 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
-#line 352 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;}
+#line 354 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
+#line 2241 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
-#line 355 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->_currentScript->size(); ;}
+#line 357 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->_currentScript->size(); }
+#line 2247 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
-#line 360 "engines/director/lingo/lingo-gr.y"
- {
+#line 362 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_whencode);
g_lingo->code1(STOP);
- g_lingo->codeString((yyvsp[(2) - (3)].s)->c_str());
- delete (yyvsp[(2) - (3)].s); ;}
+ g_lingo->codeString((yyvsp[-1].s)->c_str());
+ delete (yyvsp[-1].s); }
+#line 2257 "engines/director/lingo/lingo-gr.cpp"
break;
case 51:
-#line 366 "engines/director/lingo/lingo-gr.y"
- {
+#line 368 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_tellcode);
- g_lingo->code1(STOP); ;}
+ g_lingo->code1(STOP); }
+#line 2265 "engines/director/lingo/lingo-gr.cpp"
break;
case 52:
-#line 370 "engines/director/lingo/lingo-gr.y"
- {
+#line 372 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_intpush);
- g_lingo->codeInt((yyvsp[(1) - (1)].i)); ;}
+ g_lingo->codeInt((yyvsp[0].i)); }
+#line 2273 "engines/director/lingo/lingo-gr.cpp"
break;
case 53:
-#line 373 "engines/director/lingo/lingo-gr.y"
- {
+#line 375 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_floatpush);
- g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;}
+ g_lingo->codeFloat((yyvsp[0].f)); }
+#line 2281 "engines/director/lingo/lingo-gr.cpp"
break;
case 54:
-#line 376 "engines/director/lingo/lingo-gr.y"
- { // D3
+#line 378 "engines/director/lingo/lingo-gr.y"
+ { // D3
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;}
+ g_lingo->codeString((yyvsp[0].s)->c_str()); }
+#line 2289 "engines/director/lingo/lingo-gr.cpp"
break;
case 55:
-#line 379 "engines/director/lingo/lingo-gr.y"
- {
+#line 381 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;}
+ g_lingo->codeString((yyvsp[0].s)->c_str()); }
+#line 2297 "engines/director/lingo/lingo-gr.cpp"
break;
case 56:
-#line 382 "engines/director/lingo/lingo-gr.y"
- {
+#line 384 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_eval);
- g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str());
- delete (yyvsp[(1) - (1)].s); ;}
+ g_lingo->codeString((yyvsp[0].s)->c_str());
+ delete (yyvsp[0].s); }
+#line 2306 "engines/director/lingo/lingo-gr.cpp"
break;
case 58:
-#line 389 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = (yyvsp[(1) - (1)].code); ;}
+#line 391 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = (yyvsp[0].code); }
+#line 2312 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
-#line 391 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
- delete (yyvsp[(1) - (1)].s); ;}
+#line 393 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[0].s), 0);
+ delete (yyvsp[0].s); }
+#line 2320 "engines/director/lingo/lingo-gr.cpp"
break;
case 61:
-#line 394 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
- delete (yyvsp[(1) - (2)].s); ;}
+#line 396 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[-1].s), 1);
+ delete (yyvsp[-1].s); }
+#line 2328 "engines/director/lingo/lingo-gr.cpp"
break;
case 62:
-#line 397 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
+#line 399 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
+#line 2334 "engines/director/lingo/lingo-gr.cpp"
break;
case 63:
-#line 398 "engines/director/lingo/lingo-gr.y"
- {
- (yyval.code) = g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg));
- delete (yyvsp[(1) - (4)].s); ;}
+#line 400 "engines/director/lingo/lingo-gr.y"
+ {
+ (yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
+ delete (yyvsp[-3].s); }
+#line 2342 "engines/director/lingo/lingo-gr.cpp"
break;
case 64:
-#line 401 "engines/director/lingo/lingo-gr.y"
- {
+#line 403 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
- WRITE_UINT32(&e, (yyvsp[(1) - (1)].e)[0]);
- WRITE_UINT32(&f, (yyvsp[(1) - (1)].e)[1]);
- g_lingo->code2(e, f); ;}
+ WRITE_UINT32(&e, (yyvsp[0].e)[0]);
+ WRITE_UINT32(&f, (yyvsp[0].e)[1]);
+ g_lingo->code2(e, f); }
+#line 2355 "engines/director/lingo/lingo-gr.cpp"
break;
case 65:
-#line 409 "engines/director/lingo/lingo-gr.y"
- {
+#line 411 "engines/director/lingo/lingo-gr.y"
+ {
(yyval.code) = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
- WRITE_UINT32(&e, (yyvsp[(1) - (2)].e)[0]);
- WRITE_UINT32(&f, (yyvsp[(1) - (2)].e)[1]);
- g_lingo->code2(e, f); ;}
+ WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
+ WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
+ g_lingo->code2(e, f); }
+#line 2366 "engines/director/lingo/lingo-gr.cpp"
break;
case 66:
-#line 415 "engines/director/lingo/lingo-gr.y"
- {
+#line 417 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_objectfieldpush);
- g_lingo->codeString((yyvsp[(1) - (1)].objectfield).s->c_str());
- g_lingo->codeInt((yyvsp[(1) - (1)].objectfield).e); ;}
+ g_lingo->codeString((yyvsp[0].objectfield).s->c_str());
+ g_lingo->codeInt((yyvsp[0].objectfield).e); }
+#line 2375 "engines/director/lingo/lingo-gr.cpp"
break;
case 68:
-#line 420 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_add); ;}
+#line 422 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_add); }
+#line 2381 "engines/director/lingo/lingo-gr.cpp"
break;
case 69:
-#line 421 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_sub); ;}
+#line 423 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_sub); }
+#line 2387 "engines/director/lingo/lingo-gr.cpp"
break;
case 70:
-#line 422 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_mul); ;}
+#line 424 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_mul); }
+#line 2393 "engines/director/lingo/lingo-gr.cpp"
break;
case 71:
-#line 423 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_div); ;}
+#line 425 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_div); }
+#line 2399 "engines/director/lingo/lingo-gr.cpp"
break;
case 72:
-#line 424 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_mod); ;}
+#line 426 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_mod); }
+#line 2405 "engines/director/lingo/lingo-gr.cpp"
break;
case 73:
-#line 425 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_gt); ;}
+#line 427 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_gt); }
+#line 2411 "engines/director/lingo/lingo-gr.cpp"
break;
case 74:
-#line 426 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_lt); ;}
+#line 428 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_lt); }
+#line 2417 "engines/director/lingo/lingo-gr.cpp"
break;
case 75:
-#line 427 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_eq); ;}
+#line 429 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_eq); }
+#line 2423 "engines/director/lingo/lingo-gr.cpp"
break;
case 76:
-#line 428 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_neq); ;}
+#line 430 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_neq); }
+#line 2429 "engines/director/lingo/lingo-gr.cpp"
break;
case 77:
-#line 429 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_ge); ;}
+#line 431 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_ge); }
+#line 2435 "engines/director/lingo/lingo-gr.cpp"
break;
case 78:
-#line 430 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_le); ;}
+#line 432 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_le); }
+#line 2441 "engines/director/lingo/lingo-gr.cpp"
break;
case 79:
-#line 431 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_and); ;}
+#line 433 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_and); }
+#line 2447 "engines/director/lingo/lingo-gr.cpp"
break;
case 80:
-#line 432 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_or); ;}
+#line 434 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_or); }
+#line 2453 "engines/director/lingo/lingo-gr.cpp"
break;
case 81:
-#line 433 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_not); ;}
+#line 435 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_not); }
+#line 2459 "engines/director/lingo/lingo-gr.cpp"
break;
case 82:
-#line 434 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_ampersand); ;}
+#line 436 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_ampersand); }
+#line 2465 "engines/director/lingo/lingo-gr.cpp"
break;
case 83:
-#line 435 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_concat); ;}
+#line 437 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_concat); }
+#line 2471 "engines/director/lingo/lingo-gr.cpp"
break;
case 84:
-#line 436 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_contains); ;}
+#line 438 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_contains); }
+#line 2477 "engines/director/lingo/lingo-gr.cpp"
break;
case 85:
-#line 437 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_starts); ;}
+#line 439 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_starts); }
+#line 2483 "engines/director/lingo/lingo-gr.cpp"
break;
case 86:
-#line 438 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = (yyvsp[(2) - (2)].code); ;}
+#line 440 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = (yyvsp[0].code); }
+#line 2489 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
-#line 439 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(LC::c_negate); ;}
+#line 441 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
+#line 2495 "engines/director/lingo/lingo-gr.cpp"
break;
case 88:
-#line 440 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = (yyvsp[(2) - (3)].code); ;}
+#line 442 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = (yyvsp[-1].code); }
+#line 2501 "engines/director/lingo/lingo-gr.cpp"
break;
case 89:
-#line 441 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_intersects); ;}
+#line 443 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_intersects); }
+#line 2507 "engines/director/lingo/lingo-gr.cpp"
break;
case 90:
-#line 442 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_within); ;}
+#line 444 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_within); }
+#line 2513 "engines/director/lingo/lingo-gr.cpp"
break;
case 91:
-#line 443 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_charOf); ;}
+#line 445 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_charOf); }
+#line 2519 "engines/director/lingo/lingo-gr.cpp"
break;
case 92:
-#line 444 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_charToOf); ;}
+#line 446 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_charToOf); }
+#line 2525 "engines/director/lingo/lingo-gr.cpp"
break;
case 93:
-#line 445 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_itemOf); ;}
+#line 447 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_itemOf); }
+#line 2531 "engines/director/lingo/lingo-gr.cpp"
break;
case 94:
-#line 446 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_itemToOf); ;}
+#line 448 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_itemToOf); }
+#line 2537 "engines/director/lingo/lingo-gr.cpp"
break;
case 95:
-#line 447 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_lineOf); ;}
+#line 449 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_lineOf); }
+#line 2543 "engines/director/lingo/lingo-gr.cpp"
break;
case 96:
-#line 448 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_lineToOf); ;}
+#line 450 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_lineToOf); }
+#line 2549 "engines/director/lingo/lingo-gr.cpp"
break;
case 97:
-#line 449 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_wordOf); ;}
+#line 451 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_wordOf); }
+#line 2555 "engines/director/lingo/lingo-gr.cpp"
break;
case 98:
-#line 450 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_wordToOf); ;}
+#line 452 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_wordToOf); }
+#line 2561 "engines/director/lingo/lingo-gr.cpp"
break;
case 99:
-#line 453 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
- delete (yyvsp[(1) - (2)].s); ;}
+#line 455 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[-1].s), 1);
+ delete (yyvsp[-1].s); }
+#line 2569 "engines/director/lingo/lingo-gr.cpp"
break;
case 100:
-#line 458 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_printtop); ;}
+#line 460 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_printtop); }
+#line 2575 "engines/director/lingo/lingo-gr.cpp"
break;
case 103:
-#line 461 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_exitRepeat); ;}
+#line 463 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_exitRepeat); }
+#line 2581 "engines/director/lingo/lingo-gr.cpp"
break;
case 104:
-#line 462 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_procret); ;}
+#line 464 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_procret); }
+#line 2587 "engines/director/lingo/lingo-gr.cpp"
break;
case 108:
-#line 466 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0);
- delete (yyvsp[(1) - (1)].s); ;}
+#line 468 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[0].s), 0);
+ delete (yyvsp[0].s); }
+#line 2595 "engines/director/lingo/lingo-gr.cpp"
break;
case 109:
-#line 469 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
- delete (yyvsp[(1) - (2)].s); ;}
+#line 471 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[-1].s), 1);
+ delete (yyvsp[-1].s); }
+#line 2603 "engines/director/lingo/lingo-gr.cpp"
break;
case 110:
-#line 472 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1);
- delete (yyvsp[(1) - (2)].s); ;}
+#line 474 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[-1].s), 1);
+ delete (yyvsp[-1].s); }
+#line 2611 "engines/director/lingo/lingo-gr.cpp"
break;
case 111:
-#line 475 "engines/director/lingo/lingo-gr.y"
- {
+#line 477 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_voidpush);
- g_lingo->codeFunc((yyvsp[(1) - (1)].s), 1);
- delete (yyvsp[(1) - (1)].s); ;}
+ g_lingo->codeFunc((yyvsp[0].s), 1);
+ delete (yyvsp[0].s); }
+#line 2620 "engines/director/lingo/lingo-gr.cpp"
break;
case 112:
-#line 479 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;}
+#line 481 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
+#line 2626 "engines/director/lingo/lingo-gr.cpp"
break;
case 113:
-#line 480 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_open); ;}
+#line 482 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_open); }
+#line 2632 "engines/director/lingo/lingo-gr.cpp"
break;
case 114:
-#line 481 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code2(LC::c_voidpush, LC::c_open); ;}
+#line 483 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code2(LC::c_voidpush, LC::c_open); }
+#line 2638 "engines/director/lingo/lingo-gr.cpp"
break;
case 115:
-#line 482 "engines/director/lingo/lingo-gr.y"
- { Common::String s(*(yyvsp[(1) - (3)].s)); s += '-'; s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;}
+#line 484 "engines/director/lingo/lingo-gr.y"
+ { Common::String s(*(yyvsp[-2].s)); s += '-'; s += *(yyvsp[-1].s); g_lingo->codeFunc(&s, (yyvsp[0].narg)); }
+#line 2644 "engines/director/lingo/lingo-gr.cpp"
break;
case 116:
-#line 485 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 487 "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 2650 "engines/director/lingo/lingo-gr.cpp"
break;
case 117:
-#line 486 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_global); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+#line 488 "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 2656 "engines/director/lingo/lingo-gr.cpp"
break;
case 118:
-#line 489 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 491 "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 2662 "engines/director/lingo/lingo-gr.cpp"
break;
case 119:
-#line 490 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_property); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+#line 492 "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 2668 "engines/director/lingo/lingo-gr.cpp"
break;
case 120:
-#line 493 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;}
+#line 495 "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 2674 "engines/director/lingo/lingo-gr.cpp"
break;
case 121:
-#line 494 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_instance); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;}
+#line 496 "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 2680 "engines/director/lingo/lingo-gr.cpp"
break;
case 122:
-#line 505 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_gotoloop); ;}
+#line 507 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_gotoloop); }
+#line 2686 "engines/director/lingo/lingo-gr.cpp"
break;
case 123:
-#line 506 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_gotonext); ;}
+#line 508 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_gotonext); }
+#line 2692 "engines/director/lingo/lingo-gr.cpp"
break;
case 124:
-#line 507 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_gotoprevious); ;}
+#line 509 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_gotoprevious); }
+#line 2698 "engines/director/lingo/lingo-gr.cpp"
break;
case 125:
-#line 508 "engines/director/lingo/lingo-gr.y"
- {
+#line 510 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
- g_lingo->code1(LC::c_goto); ;}
+ g_lingo->code1(LC::c_goto); }
+#line 2707 "engines/director/lingo/lingo-gr.cpp"
break;
case 126:
-#line 512 "engines/director/lingo/lingo-gr.y"
- {
+#line 514 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
- g_lingo->code1(LC::c_goto); ;}
+ g_lingo->code1(LC::c_goto); }
+#line 2716 "engines/director/lingo/lingo-gr.cpp"
break;
case 127:
-#line 516 "engines/director/lingo/lingo-gr.y"
- {
+#line 518 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
- g_lingo->code1(LC::c_goto); ;}
+ g_lingo->code1(LC::c_goto); }
+#line 2725 "engines/director/lingo/lingo-gr.cpp"
break;
case 130:
-#line 526 "engines/director/lingo/lingo-gr.y"
- { g_lingo->code1(LC::c_playdone); ;}
+#line 528 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->code1(LC::c_playdone); }
+#line 2731 "engines/director/lingo/lingo-gr.cpp"
break;
case 131:
-#line 527 "engines/director/lingo/lingo-gr.y"
- {
+#line 529 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
- g_lingo->code1(LC::c_play); ;}
+ g_lingo->code1(LC::c_play); }
+#line 2740 "engines/director/lingo/lingo-gr.cpp"
break;
case 132:
-#line 531 "engines/director/lingo/lingo-gr.y"
- {
+#line 533 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
- g_lingo->code1(LC::c_play); ;}
+ g_lingo->code1(LC::c_play); }
+#line 2749 "engines/director/lingo/lingo-gr.cpp"
break;
case 133:
-#line 535 "engines/director/lingo/lingo-gr.y"
- {
+#line 537 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
- g_lingo->code1(LC::c_play); ;}
+ g_lingo->code1(LC::c_play); }
+#line 2758 "engines/director/lingo/lingo-gr.cpp"
break;
case 134:
-#line 539 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeSetImmediate(true); ;}
+#line 541 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeSetImmediate(true); }
+#line 2764 "engines/director/lingo/lingo-gr.cpp"
break;
case 135:
-#line 539 "engines/director/lingo/lingo-gr.y"
- {
+#line 541 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->codeSetImmediate(false);
- g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;}
+ g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg)); }
+#line 2772 "engines/director/lingo/lingo-gr.cpp"
break;
case 136:
-#line 569 "engines/director/lingo/lingo-gr.y"
- { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); ;}
+#line 571 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
+#line 2778 "engines/director/lingo/lingo-gr.cpp"
break;
case 137:
-#line 570 "engines/director/lingo/lingo-gr.y"
- {
+#line 572 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_procret);
- g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg));
+ g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->clearArgStack();
- g_lingo->_indef = kStateNone; ;}
+ g_lingo->_indef = kStateNone; }
+#line 2788 "engines/director/lingo/lingo-gr.cpp"
break;
case 138:
-#line 575 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;}
+#line 577 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeFactory(*(yyvsp[0].s)); }
+#line 2794 "engines/director/lingo/lingo-gr.cpp"
break;
case 139:
-#line 576 "engines/director/lingo/lingo-gr.y"
- { g_lingo->_indef = kStateInArgs; ;}
+#line 578 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_indef = kStateInArgs; }
+#line 2800 "engines/director/lingo/lingo-gr.cpp"
break;
case 140:
-#line 577 "engines/director/lingo/lingo-gr.y"
- {
+#line 579 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_procret);
- g_lingo->define(*(yyvsp[(1) - (7)].s), (yyvsp[(3) - (7)].code), (yyvsp[(4) - (7)].narg) + 1, &g_lingo->_currentFactory);
+ g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
- g_lingo->_indef = kStateNone; ;}
+ g_lingo->_indef = kStateNone; }
+#line 2810 "engines/director/lingo/lingo-gr.cpp"
break;
case 141:
-#line 582 "engines/director/lingo/lingo-gr.y"
- { // D3
+#line 584 "engines/director/lingo/lingo-gr.y"
+ { // D3
g_lingo->code1(LC::c_procret);
- g_lingo->define(*(yyvsp[(1) - (8)].s), (yyvsp[(2) - (8)].code), (yyvsp[(3) - (8)].narg));
+ g_lingo->define(*(yyvsp[-7].s), (yyvsp[-6].code), (yyvsp[-5].narg));
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
g_lingo->_ignoreMe = false;
- checkEnd((yyvsp[(7) - (8)].s), (yyvsp[(1) - (8)].s)->c_str(), false); ;}
+ checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false); }
+#line 2823 "engines/director/lingo/lingo-gr.cpp"
break;
case 142:
-#line 590 "engines/director/lingo/lingo-gr.y"
- { // D4. No 'end' clause
+#line 592 "engines/director/lingo/lingo-gr.y"
+ { // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
- g_lingo->define(*(yyvsp[(1) - (6)].s), (yyvsp[(2) - (6)].code), (yyvsp[(3) - (6)].narg));
+ g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->_indef = kStateNone;
g_lingo->clearArgStack();
- g_lingo->_ignoreMe = false; ;}
+ g_lingo->_ignoreMe = false; }
+#line 2834 "engines/director/lingo/lingo-gr.cpp"
break;
case 143:
-#line 597 "engines/director/lingo/lingo-gr.y"
- { (yyval.s) = (yyvsp[(2) - (2)].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; ;}
+#line 599 "engines/director/lingo/lingo-gr.y"
+ { (yyval.s) = (yyvsp[0].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
+#line 2840 "engines/director/lingo/lingo-gr.cpp"
break;
case 144:
-#line 599 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 0; ;}
+#line 601 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 0; }
+#line 2846 "engines/director/lingo/lingo-gr.cpp"
break;
case 145:
-#line 600 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
+#line 602 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; }
+#line 2852 "engines/director/lingo/lingo-gr.cpp"
break;
case 146:
-#line 601 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 603 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2858 "engines/director/lingo/lingo-gr.cpp"
break;
case 147:
-#line 602 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
+#line 604 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; }
+#line 2864 "engines/director/lingo/lingo-gr.cpp"
break;
case 151:
-#line 610 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; ;}
+#line 612 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
+#line 2870 "engines/director/lingo/lingo-gr.cpp"
break;
case 152:
-#line 613 "engines/director/lingo/lingo-gr.y"
- {
+#line 615 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_call);
- g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str());
+ g_lingo->codeString((yyvsp[-1].s)->c_str());
inst numpar = 0;
- WRITE_UINT32(&numpar, (yyvsp[(2) - (2)].narg));
- g_lingo->code1(numpar); ;}
+ WRITE_UINT32(&numpar, (yyvsp[0].narg));
+ g_lingo->code1(numpar); }
+#line 2881 "engines/director/lingo/lingo-gr.cpp"
break;
case 153:
-#line 621 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 0; ;}
+#line 623 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 0; }
+#line 2887 "engines/director/lingo/lingo-gr.cpp"
break;
case 154:
-#line 622 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 1; ;}
+#line 624 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 1; }
+#line 2893 "engines/director/lingo/lingo-gr.cpp"
break;
case 155:
-#line 623 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 625 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2899 "engines/director/lingo/lingo-gr.cpp"
break;
case 156:
-#line 626 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 1; ;}
+#line 628 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 1; }
+#line 2905 "engines/director/lingo/lingo-gr.cpp"
break;
case 157:
-#line 627 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 629 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2911 "engines/director/lingo/lingo-gr.cpp"
break;
case 158:
-#line 630 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = (yyvsp[(2) - (3)].code); ;}
+#line 632 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = (yyvsp[-1].code); }
+#line 2917 "engines/director/lingo/lingo-gr.cpp"
break;
case 159:
-#line 633 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); ;}
+#line 635 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
+#line 2923 "engines/director/lingo/lingo-gr.cpp"
break;
case 160:
-#line 634 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); ;}
+#line 636 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
+#line 2929 "engines/director/lingo/lingo-gr.cpp"
break;
case 161:
-#line 635 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[(1) - (1)].narg)); ;}
+#line 637 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
+#line 2935 "engines/director/lingo/lingo-gr.cpp"
break;
case 162:
-#line 636 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[(1) - (1)].narg)); ;}
+#line 638 "engines/director/lingo/lingo-gr.y"
+ { (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
+#line 2941 "engines/director/lingo/lingo-gr.cpp"
break;
case 163:
-#line 639 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 1; ;}
+#line 641 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 1; }
+#line 2947 "engines/director/lingo/lingo-gr.cpp"
break;
case 164:
-#line 640 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 642 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2953 "engines/director/lingo/lingo-gr.cpp"
break;
case 165:
-#line 643 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 1; ;}
+#line 645 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 1; }
+#line 2959 "engines/director/lingo/lingo-gr.cpp"
break;
case 166:
-#line 644 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 646 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = (yyvsp[-2].narg) + 1; }
+#line 2965 "engines/director/lingo/lingo-gr.cpp"
break;
case 167:
-#line 647 "engines/director/lingo/lingo-gr.y"
- {
+#line 649 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString((yyvsp[(1) - (3)].s)->c_str()); ;}
+ g_lingo->codeString((yyvsp[-2].s)->c_str()); }
+#line 2973 "engines/director/lingo/lingo-gr.cpp"
break;
case 168:
-#line 650 "engines/director/lingo/lingo-gr.y"
- {
+#line 652 "engines/director/lingo/lingo-gr.y"
+ {
g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString((yyvsp[(1) - (3)].s)->c_str()); ;}
+ g_lingo->codeString((yyvsp[-2].s)->c_str()); }
+#line 2981 "engines/director/lingo/lingo-gr.cpp"
break;
-/* Line 1267 of yacc.c. */
-#line 3022 "engines/director/lingo/lingo-gr.cpp"
+#line 2985 "engines/director/lingo/lingo-gr.cpp"
+
default: break;
}
+ /* User semantic actions sometimes alter yychar, and that requires
+ that yytoken be updated with the new translation. We take the
+ approach of translating immediately before every use of yytoken.
+ One alternative is translating here after every semantic action,
+ but that translation would be missed if the semantic action invokes
+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
+ incorrect destructor might then be invoked immediately. In the
+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
+ to an incorrect destructor call or verbose syntax error message
+ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen);
@@ -3029,26 +3004,28 @@ yyreduce:
*++yyvsp = yyval;
-
- /* Now `shift' the result of the reduction. Determine what state
+ /* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
-
- yyn = yyr1[yyn];
-
- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
- yystate = yytable[yystate];
- else
- yystate = yydefgoto[yyn - YYNTOKENS];
+ {
+ const int yylhs = yyr1[yyn] - YYNTOKENS;
+ const int yyi = yypgoto[yylhs] + *yyssp;
+ yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+ ? yytable[yyi]
+ : yydefgoto[yylhs]);
+ }
goto yynewstate;
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error. |
+`--------------------------------------*/
yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
/* If not already recovering from an error, report this error. */
if (!yyerrstatus)
{
@@ -3056,37 +3033,36 @@ yyerrlab:
#if ! YYERROR_VERBOSE
yyerror (YY_("syntax error"));
#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+ yyssp, yytoken)
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (yymsg);
- }
- else
- {
- yyerror (YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ char const *yymsgp = YY_("syntax error");
+ int yysyntax_error_status;
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ if (yysyntax_error_status == 0)
+ yymsgp = yymsg;
+ else if (yysyntax_error_status == 1)
+ {
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc)));
+ if (!yymsg)
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ yysyntax_error_status = 2;
+ }
+ else
+ {
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ yymsgp = yymsg;
+ }
+ }
+ yyerror (yymsgp);
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
}
+# undef YYSYNTAX_ERROR
#endif
}
@@ -3094,24 +3070,24 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse look-ahead token after an
- error, discard it. */
+ /* If just tried and failed to reuse lookahead token after an
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval);
+ yychar = YYEMPTY;
+ }
}
- /* Else will try to reuse look-ahead token after shifting the error
+ /* Else will try to reuse lookahead token after shifting the error
token. */
goto yyerrlab1;
@@ -3120,14 +3096,12 @@ yyerrlab:
| yyerrorlab -- error raised explicitly by YYERROR. |
`---------------------------------------------------*/
yyerrorlab:
+ /* Pacify compilers when the user code never invokes YYERROR and the
+ label yyerrorlab therefore never appears in user code. */
+ if (0)
+ YYERROR;
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
- goto yyerrorlab;
-
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
yylen = 0;
@@ -3140,38 +3114,37 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ if (!yypact_value_is_default (yyn))
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp);
+ yystos[yystate], yyvsp);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
*++yyvsp = yylval;
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
/* Shift the error token. */
@@ -3188,6 +3161,7 @@ yyacceptlab:
yyresult = 0;
goto yyreturn;
+
/*-----------------------------------.
| yyabortlab -- YYABORT comes here. |
`-----------------------------------*/
@@ -3195,7 +3169,8 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+
+#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -3205,18 +3180,27 @@ yyexhaustedlab:
/* Fall through. */
#endif
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result. |
+`-----------------------------------------------------*/
yyreturn:
- if (yychar != YYEOF && yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval);
- /* Do not reclaim the symbols of the rule which action triggered
+ if (yychar != YYEMPTY)
+ {
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval);
+ }
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
YY_STACK_PRINT (yyss, yyssp);
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[*yyssp], yyvsp);
YYPOPSTACK (1);
}
#ifndef yyoverflow
@@ -3227,11 +3211,7 @@ yyreturn:
if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg);
#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
+ return yyresult;
}
-
-
-#line 656 "engines/director/lingo/lingo-gr.y"
-
+#line 658 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index c4b11e2..55eea27 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -46,6 +46,8 @@
%debug
+%require "3.5"
+
// %glr-parser
// %defines "engines/director/lingo/lingo-gr.h"
Commit: d1ff248900aabc11de42e75d78cdaefbad6d5056
https://github.com/scummvm/scummvm/commit/d1ff248900aabc11de42e75d78cdaefbad6d5056
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:52+01:00
Commit Message:
DIRECTOR: LINGO: Switched to named references in the grammar
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 c992a7d..08592ce 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -2052,7 +2052,7 @@ yyreduce:
case 28:
#line 217 "engines/director/lingo/lingo-gr.y"
- {
+ {
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[-3].code) - (yyvsp[-5].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
@@ -2063,34 +2063,34 @@ yyreduce:
case 29:
#line 228 "engines/director/lingo/lingo-gr.y"
- {
+ {
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
WRITE_UINT32(&finish, (yyvsp[-4].code) - (yyvsp[-9].code));
WRITE_UINT32(&body, (yyvsp[-2].code) - (yyvsp[-9].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-9].code));
WRITE_UINT32(&inc, 1);
- (*g_lingo->_currentScript)[(yyvsp[-9].code) + 1] = init; /* initial count value */
- (*g_lingo->_currentScript)[(yyvsp[-9].code) + 2] = finish;/* final count value */
- (*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
- (*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 1] = init; /* initial count value */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 2] = finish; /* final count value */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
+ (*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end; }
#line 2079 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
#line 245 "engines/director/lingo/lingo-gr.y"
- {
+ {
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
WRITE_UINT32(&finish, (yyvsp[-4].code) - (yyvsp[-10].code));
WRITE_UINT32(&body, (yyvsp[-2].code) - (yyvsp[-10].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-10].code));
WRITE_UINT32(&inc, (uint32)-1);
- (*g_lingo->_currentScript)[(yyvsp[-10].code) + 1] = init; /* initial count value */
- (*g_lingo->_currentScript)[(yyvsp[-10].code) + 2] = finish;/* final count value */
- (*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
- (*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 1] = init; /* initial count value */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 2] = finish; /* final count value */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end; }
#line 2096 "engines/director/lingo/lingo-gr.cpp"
break;
@@ -2122,13 +2122,13 @@ yyreduce:
case 34:
#line 269 "engines/director/lingo/lingo-gr.y"
- {
+ {
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-8].code));
WRITE_UINT32(&else1, (yyvsp[-3].code) - (yyvsp[-8].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-8].code));
(*g_lingo->_currentScript)[(yyvsp[-8].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[-8].code) + 2] = else1; /* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-8].code) + 2] = else1;/* elsepart */
(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-8].code), (yyvsp[-1].code) - (yyvsp[-8].code), 0); }
@@ -2137,13 +2137,13 @@ yyreduce:
case 35:
#line 279 "engines/director/lingo/lingo-gr.y"
- {
+ {
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-9].code) - (yyvsp[-11].code));
WRITE_UINT32(&else1, (yyvsp[-6].code) - (yyvsp[-11].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-11].code));
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[-11].code) + 2] = else1; /* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-11].code) + 2] = else1;/* elsepart */
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-11].code), (yyvsp[-1].code) - (yyvsp[-11].code), (yyvsp[-3].code) - (yyvsp[-11].code)); }
@@ -2152,7 +2152,7 @@ yyreduce:
case 38:
#line 295 "engines/director/lingo/lingo-gr.y"
- {
+ {
inst then = 0;
WRITE_UINT32(&then, (yyvsp[-3].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
@@ -2163,13 +2163,13 @@ yyreduce:
case 39:
#line 303 "engines/director/lingo/lingo-gr.y"
- {
+ {
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-8].code) - (yyvsp[-10].code));
WRITE_UINT32(&else1, (yyvsp[-5].code) - (yyvsp[-10].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-10].code));
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[-10].code) + 2] = else1; /* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-10].code) + 2] = else1;/* elsepart */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-10].code), (yyvsp[-1].code) - (yyvsp[-10].code), (yyvsp[-3].code) - (yyvsp[-10].code)); }
@@ -2178,16 +2178,16 @@ yyreduce:
case 40:
#line 313 "engines/director/lingo/lingo-gr.y"
- {
- inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
- WRITE_UINT32(&else1, 0);
- WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-6].code));
- (*g_lingo->_currentScript)[(yyvsp[-6].code) + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[(yyvsp[-6].code) + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
-
- g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
+ {
+ inst then = 0, else1 = 0, end = 0;
+ WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
+ WRITE_UINT32(&else1, 0);
+ WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-6].code));
+ (*g_lingo->_currentScript)[(yyvsp[-6].code) + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[(yyvsp[-6].code) + 2] = else1;/* elsepart */
+ (*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
+
+ g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
#line 2192 "engines/director/lingo/lingo-gr.cpp"
break;
@@ -2484,13 +2484,13 @@ yyreduce:
case 86:
#line 440 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = (yyvsp[0].code); }
+ { (yyval.code) = (yyvsp[0].code); }
#line 2489 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
#line 441 "engines/director/lingo/lingo-gr.y"
- { (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
+ { (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
#line 2495 "engines/director/lingo/lingo-gr.cpp"
break;
@@ -2975,8 +2975,8 @@ yyreduce:
case 168:
#line 652 "engines/director/lingo/lingo-gr.y"
{
- g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString((yyvsp[-2].s)->c_str()); }
+ g_lingo->code1(LC::c_stringpush);
+ g_lingo->codeString((yyvsp[-2].s)->c_str()); }
#line 2981 "engines/director/lingo/lingo-gr.cpp"
break;
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 55eea27..e243d90 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -143,58 +143,58 @@ programline: /* empty */
asgn: tPUT expr tINTO ID {
g_lingo->code1(LC::c_varpush);
- g_lingo->codeString($4->c_str());
+ g_lingo->codeString($ID->c_str());
g_lingo->code1(LC::c_assign);
- $$ = $2;
- delete $4; }
+ $$ = $expr;
+ delete $ID; }
| tPUT expr tINTO reference {
g_lingo->code1(LC::c_assign);
- $$ = $2; }
+ $$ = $expr; }
| tPUT expr tAFTER expr { $$ = g_lingo->code1(LC::c_after); } // D3
| tPUT expr tBEFORE expr { $$ = g_lingo->code1(LC::c_before); } // D3
| tSET ID tEQ expr {
g_lingo->code1(LC::c_varpush);
- g_lingo->codeString($2->c_str());
+ g_lingo->codeString($ID->c_str());
g_lingo->code1(LC::c_assign);
- $$ = $4;
- delete $2; }
+ $$ = $expr;
+ delete $ID; }
| tSET THEENTITY tEQ expr {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt($2[0]);
- g_lingo->codeInt($2[1]);
- $$ = $4; }
+ g_lingo->codeInt($THEENTITY[0]);
+ g_lingo->codeInt($THEENTITY[1]);
+ $$ = $expr; }
| tSET ID tTO expr {
g_lingo->code1(LC::c_varpush);
- g_lingo->codeString($2->c_str());
+ g_lingo->codeString($ID->c_str());
g_lingo->code1(LC::c_assign);
- $$ = $4;
- delete $2; }
+ $$ = $expr;
+ delete $ID; }
| tSET THEENTITY tTO expr {
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt($2[0]);
- g_lingo->codeInt($2[1]);
- $$ = $4; }
+ g_lingo->codeInt($THEENTITY[0]);
+ g_lingo->codeInt($THEENTITY[1]);
+ $$ = $expr; }
| tSET THEENTITYWITHID simpleexpr tTO expr {
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt($2[0]);
- g_lingo->codeInt($2[1]);
- $$ = $5; }
+ g_lingo->codeInt($THEENTITYWITHID[0]);
+ g_lingo->codeInt($THEENTITYWITHID[1]);
+ $$ = $expr; }
| tSET THEENTITYWITHID simpleexpr tEQ expr {
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
- g_lingo->codeInt($2[0]);
- g_lingo->codeInt($2[1]);
- $$ = $5; }
+ g_lingo->codeInt($THEENTITYWITHID[0]);
+ g_lingo->codeInt($THEENTITYWITHID[1]);
+ $$ = $expr; }
| tSET THEOBJECTFIELD tTO expr {
g_lingo->code1(LC::c_objectfieldassign);
- g_lingo->codeString($2.s->c_str());
- g_lingo->codeInt($2.e);
- $$ = $4; }
+ g_lingo->codeString($THEOBJECTFIELD.s->c_str());
+ g_lingo->codeInt($THEOBJECTFIELD.e);
+ $$ = $expr; }
;
stmtoneliner: macro
@@ -214,51 +214,51 @@ stmt: stmtoneliner
// statements
// end repeat
//
- | repeatwhile expr end stmtlist end tENDREPEAT {
+ | repeatwhile expr end[body] stmtlist end[end2] tENDREPEAT {
inst body = 0, end = 0;
- WRITE_UINT32(&body, $3 - $1);
- WRITE_UINT32(&end, $5 - $1);
- (*g_lingo->_currentScript)[$1 + 1] = body; /* body of loop */
- (*g_lingo->_currentScript)[$1 + 2] = end; } /* end, if cond fails */
+ WRITE_UINT32(&body, $body - $repeatwhile);
+ WRITE_UINT32(&end, $end2 - $repeatwhile);
+ (*g_lingo->_currentScript)[$repeatwhile + 1] = body; /* body of loop */
+ (*g_lingo->_currentScript)[$repeatwhile + 2] = end; } /* end, if cond fails */
;
// repeat with index = start to end
// statements
// end repeat
//
- | repeatwith tEQ expr end tTO expr end stmtlist end tENDREPEAT {
+ | repeatwith tEQ expr[init] end tTO expr[finish] end stmtlist end[end3] tENDREPEAT {
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
- WRITE_UINT32(&init, $3 - $1);
- WRITE_UINT32(&finish, $6 - $1);
- WRITE_UINT32(&body, $8 - $1);
- WRITE_UINT32(&end, $9 - $1);
+ WRITE_UINT32(&init, $init - $repeatwith);
+ WRITE_UINT32(&finish, $finish - $repeatwith);
+ WRITE_UINT32(&body, $stmtlist - $repeatwith);
+ WRITE_UINT32(&end, $end3 - $repeatwith);
WRITE_UINT32(&inc, 1);
- (*g_lingo->_currentScript)[$1 + 1] = init; /* initial count value */
- (*g_lingo->_currentScript)[$1 + 2] = finish;/* final count value */
- (*g_lingo->_currentScript)[$1 + 3] = body; /* body of loop */
- (*g_lingo->_currentScript)[$1 + 4] = inc; /* increment */
- (*g_lingo->_currentScript)[$1 + 5] = end; } /* end, if cond fails */
+ (*g_lingo->_currentScript)[$repeatwith + 1] = init; /* initial count value */
+ (*g_lingo->_currentScript)[$repeatwith + 2] = finish; /* final count value */
+ (*g_lingo->_currentScript)[$repeatwith + 3] = body; /* body of loop */
+ (*g_lingo->_currentScript)[$repeatwith + 4] = inc; /* increment */
+ (*g_lingo->_currentScript)[$repeatwith + 5] = end; } /* end, if cond fails */
// repeat with index = high down to low
// statements
// end repeat
//
- | repeatwith tEQ expr end tDOWN tTO expr end stmtlist end tENDREPEAT {
+ | repeatwith tEQ expr[init] end tDOWN tTO expr[finish] end stmtlist end[end3] tENDREPEAT {
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
- WRITE_UINT32(&init, $3 - $1);
- WRITE_UINT32(&finish, $7 - $1);
- WRITE_UINT32(&body, $9 - $1);
- WRITE_UINT32(&end, $10 - $1);
+ WRITE_UINT32(&init, $init - $repeatwith);
+ WRITE_UINT32(&finish, $finish - $repeatwith);
+ WRITE_UINT32(&body, $stmtlist - $repeatwith);
+ WRITE_UINT32(&end, $end3 - $repeatwith);
WRITE_UINT32(&inc, (uint32)-1);
- (*g_lingo->_currentScript)[$1 + 1] = init; /* initial count value */
- (*g_lingo->_currentScript)[$1 + 2] = finish;/* final count value */
- (*g_lingo->_currentScript)[$1 + 3] = body; /* body of loop */
- (*g_lingo->_currentScript)[$1 + 4] = inc; /* increment */
- (*g_lingo->_currentScript)[$1 + 5] = end; } /* end, if cond fails */
+ (*g_lingo->_currentScript)[$repeatwith + 1] = init; /* initial count value */
+ (*g_lingo->_currentScript)[$repeatwith + 2] = finish; /* final count value */
+ (*g_lingo->_currentScript)[$repeatwith + 3] = body; /* body of loop */
+ (*g_lingo->_currentScript)[$repeatwith + 4] = inc; /* increment */
+ (*g_lingo->_currentScript)[$repeatwith + 5] = end; } /* end, if cond fails */
| when stmtonelinerwithif end {
inst end = 0;
- WRITE_UINT32(&end, $3 - $1);
+ WRITE_UINT32(&end, $end - $when);
g_lingo->code1(STOP);
- (*g_lingo->_currentScript)[$1 + 1] = end; }
+ (*g_lingo->_currentScript)[$when + 1] = end; }
| tell expr '\n' stmtlist end tENDTELL {
warning("STUB: TELL is not implemented"); }
| tell expr tTO expr {
@@ -266,60 +266,60 @@ stmt: stmtoneliner
}
;
-ifstmt: if expr end tTHEN stmtlist end elseifstmtlist end tENDIF {
+ifstmt: if expr end[endexpr] tTHEN stmtlist end[else1] elseifstmtlist end[end3] tENDIF {
inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, $3 - $1);
- WRITE_UINT32(&else1, $6 - $1);
- WRITE_UINT32(&end, $8 - $1);
- (*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[$1 + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */
-
- g_lingo->processIf($1, $8 - $1, 0); }
- | if expr end tTHEN stmtlist end elseifstmtlist tELSE begin stmtlist end tENDIF {
+ WRITE_UINT32(&then, $endexpr - $if);
+ WRITE_UINT32(&else1, $else1 - $if);
+ WRITE_UINT32(&end, $end3 - $if);
+ (*g_lingo->_currentScript)[$if + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[$if + 2] = else1;/* elsepart */
+ (*g_lingo->_currentScript)[$if + 3] = end; /* end, if cond fails */
+
+ g_lingo->processIf($if, $end3 - $if, 0); }
+ | if expr end[endexpr] tTHEN stmtlist end[else1] elseifstmtlist tELSE begin stmtlist end[end3] tENDIF {
inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, $3 - $1);
- WRITE_UINT32(&else1, $6 - $1);
- WRITE_UINT32(&end, $11 - $1);
- (*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[$1 + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */
+ WRITE_UINT32(&then, $endexpr - $if);
+ WRITE_UINT32(&else1, $else1 - $if);
+ WRITE_UINT32(&end, $end3 - $if);
+ (*g_lingo->_currentScript)[$if + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[$if + 2] = else1;/* elsepart */
+ (*g_lingo->_currentScript)[$if + 3] = end; /* end, if cond fails */
- g_lingo->processIf($1, $11 - $1, $9 - $1); }
+ g_lingo->processIf($if, $end3 - $if, $begin - $if); }
;
elseifstmtlist: /* nothing */
| elseifstmtlist elseifstmt
;
-elseifstmt: elseif expr end tTHEN stmtlist end {
+elseifstmt: elseif expr end[endexpr] tTHEN stmtlist end {
inst then = 0;
- WRITE_UINT32(&then, $3 - $1);
- (*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
+ WRITE_UINT32(&then, $endexpr - $elseif);
+ (*g_lingo->_currentScript)[$elseif + 1] = then; /* thenpart */
- g_lingo->codeLabel($1); }
+ g_lingo->codeLabel($elseif); }
;
-ifoneliner: if expr end tTHEN stmtoneliner end tELSE begin stmtoneliner end tENDIF {
+ifoneliner: if expr end[endexpr] tTHEN stmtoneliner end[else1] tELSE begin stmtoneliner end[end3] tENDIF {
inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, $3 - $1);
- WRITE_UINT32(&else1, $6 - $1);
- WRITE_UINT32(&end, $10 - $1);
- (*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[$1 + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */
-
- g_lingo->processIf($1, $10 - $1, $8 - $1); }
- | if expr end tTHEN stmtoneliner end tENDIF {
- inst then = 0, else1 = 0, end = 0;
- WRITE_UINT32(&then, $3 - $1);
- WRITE_UINT32(&else1, 0);
- WRITE_UINT32(&end, $6 - $1);
- (*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */
- (*g_lingo->_currentScript)[$1 + 2] = else1; /* elsepart */
- (*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */
+ WRITE_UINT32(&then, $endexpr - $if);
+ WRITE_UINT32(&else1, $else1 - $if);
+ WRITE_UINT32(&end, $end3 - $if);
+ (*g_lingo->_currentScript)[$if + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[$if + 2] = else1;/* elsepart */
+ (*g_lingo->_currentScript)[$if + 3] = end; /* end, if cond fails */
+
+ g_lingo->processIf($if, $end3 - $if, $begin - $if); }
+ | if expr end[endexpr] tTHEN stmtoneliner end[end3] tENDIF {
+ inst then = 0, else1 = 0, end = 0;
+ WRITE_UINT32(&then, $endexpr - $if);
+ WRITE_UINT32(&else1, 0);
+ WRITE_UINT32(&end, $end3 - $if);
+ (*g_lingo->_currentScript)[$if + 1] = then; /* thenpart */
+ (*g_lingo->_currentScript)[$if + 2] = else1;/* elsepart */
+ (*g_lingo->_currentScript)[$if + 3] = end; /* end, if cond fails */
- g_lingo->processIf($1, $6 - $1, $6 - $1); }
+ g_lingo->processIf($if, $end3 - $if, $end3 - $if); }
;
@@ -329,8 +329,8 @@ repeatwhile: tREPEAT tWHILE { $$ = g_lingo->code3(LC::c_repeatwhilecode, STOP,
repeatwith: tREPEAT tWITH ID {
$$ = g_lingo->code3(LC::c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
- g_lingo->codeString($3->c_str());
- delete $3; }
+ g_lingo->codeString($ID->c_str());
+ delete $ID; }
;
if: tIF {
@@ -362,8 +362,8 @@ stmtlist: { $$ = g_lingo->_currentScript->size(); }
when: tWHEN ID tTHEN {
$$ = g_lingo->code1(LC::c_whencode);
g_lingo->code1(STOP);
- g_lingo->codeString($2->c_str());
- delete $2; }
+ g_lingo->codeString($ID->c_str());
+ delete $ID; }
tell: tTELL {
$$ = g_lingo->code1(LC::c_tellcode);
@@ -371,53 +371,53 @@ tell: tTELL {
simpleexpr: INT {
$$ = g_lingo->code1(LC::c_intpush);
- g_lingo->codeInt($1); }
+ g_lingo->codeInt($INT); }
| FLOAT {
$$ = g_lingo->code1(LC::c_floatpush);
- g_lingo->codeFloat($1); }
+ g_lingo->codeFloat($FLOAT); }
| SYMBOL { // D3
$$ = g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString($1->c_str()); }
+ g_lingo->codeString($SYMBOL->c_str()); }
| STRING {
$$ = g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString($1->c_str()); }
+ g_lingo->codeString($STRING->c_str()); }
| ID {
$$ = g_lingo->code1(LC::c_eval);
- g_lingo->codeString($1->c_str());
- delete $1; }
+ g_lingo->codeString($ID->c_str());
+ delete $ID; }
| list
;
-expr: simpleexpr { $$ = $1; }
+expr: simpleexpr { $$ = $simpleexpr; }
| reference
| FBLTINNOARGS {
- g_lingo->codeFunc($1, 0);
- delete $1; }
+ g_lingo->codeFunc($FBLTINNOARGS, 0);
+ delete $FBLTINNOARGS; }
| FBLTINONEARG expr {
- g_lingo->codeFunc($1, 1);
- delete $1; }
- | FBLTINARGLIST arglist { g_lingo->codeFunc($1, $2); }
+ g_lingo->codeFunc($FBLTINONEARG, 1);
+ delete $FBLTINONEARG; }
+ | FBLTINARGLIST arglist { g_lingo->codeFunc($FBLTINARGLIST, $arglist); }
| ID '(' arglist ')' {
- $$ = g_lingo->codeFunc($1, $3);
- delete $1; }
+ $$ = g_lingo->codeFunc($ID, $arglist);
+ delete $ID; }
| THEENTITY {
$$ = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
- WRITE_UINT32(&e, $1[0]);
- WRITE_UINT32(&f, $1[1]);
+ WRITE_UINT32(&e, $THEENTITY[0]);
+ WRITE_UINT32(&f, $THEENTITY[1]);
g_lingo->code2(e, f); }
| THEENTITYWITHID expr {
$$ = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
- WRITE_UINT32(&e, $1[0]);
- WRITE_UINT32(&f, $1[1]);
+ WRITE_UINT32(&e, $THEENTITYWITHID[0]);
+ WRITE_UINT32(&f, $THEENTITYWITHID[1]);
g_lingo->code2(e, f); }
| THEOBJECTFIELD {
g_lingo->code1(LC::c_objectfieldpush);
- g_lingo->codeString($1.s->c_str());
- g_lingo->codeInt($1.e); }
+ g_lingo->codeString($THEOBJECTFIELD.s->c_str());
+ g_lingo->codeInt($THEOBJECTFIELD.e); }
| asgn
| expr '+' expr { g_lingo->code1(LC::c_add); }
| expr '-' expr { g_lingo->code1(LC::c_sub); }
@@ -437,9 +437,9 @@ expr: simpleexpr { $$ = $1; }
| expr tCONCAT expr { g_lingo->code1(LC::c_concat); }
| expr tCONTAINS expr { g_lingo->code1(LC::c_contains); }
| expr tSTARTS expr { g_lingo->code1(LC::c_starts); }
- | '+' expr %prec UNARY { $$ = $2; }
- | '-' expr %prec UNARY { $$ = $2; g_lingo->code1(LC::c_negate); }
- | '(' expr ')' { $$ = $2; }
+ | '+' expr[arg] %prec UNARY{ $$ = $arg; }
+ | '-' expr[arg] %prec UNARY{ $$ = $arg; g_lingo->code1(LC::c_negate); }
+ | '(' expr[arg] ')' { $$ = $arg; }
| tSPRITE expr tINTERSECTS expr { g_lingo->code1(LC::c_intersects); }
| tSPRITE expr tWITHIN expr { g_lingo->code1(LC::c_within); }
| tCHAR expr tOF expr { g_lingo->code1(LC::c_charOf); }
@@ -453,8 +453,8 @@ expr: simpleexpr { $$ = $1; }
;
reference: RBLTINONEARG simpleexpr {
- g_lingo->codeFunc($1, 1);
- delete $1; }
+ g_lingo->codeFunc($RBLTINONEARG, 1);
+ delete $RBLTINONEARG; }
;
proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
@@ -466,22 +466,22 @@ proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
| tPROPERTY propertylist
| tINSTANCE instancelist
| BLTINNOARGS {
- g_lingo->codeFunc($1, 0);
- delete $1; }
+ g_lingo->codeFunc($BLTINNOARGS, 0);
+ delete $BLTINNOARGS; }
| BLTINONEARG expr {
- g_lingo->codeFunc($1, 1);
- delete $1; }
+ g_lingo->codeFunc($BLTINONEARG, 1);
+ delete $BLTINONEARG; }
| BLTINNOARGSORONE expr {
- g_lingo->codeFunc($1, 1);
- delete $1; }
+ g_lingo->codeFunc($BLTINNOARGSORONE, 1);
+ delete $BLTINNOARGSORONE; }
| BLTINNOARGSORONE {
g_lingo->code1(LC::c_voidpush);
- g_lingo->codeFunc($1, 1);
- delete $1; }
- | BLTINARGLIST arglist { g_lingo->codeFunc($1, $2); }
+ g_lingo->codeFunc($BLTINNOARGSORONE, 1);
+ delete $BLTINNOARGSORONE; }
+ | BLTINARGLIST arglist { g_lingo->codeFunc($BLTINARGLIST, $arglist); }
| tOPEN expr tWITH expr { g_lingo->code1(LC::c_open); }
| tOPEN expr { g_lingo->code2(LC::c_voidpush, LC::c_open); }
- | TWOWORDBUILTIN ID arglist { Common::String s(*$1); s += '-'; s += *$2; g_lingo->codeFunc(&s, $3); }
+ | TWOWORDBUILTIN ID arglist { Common::String s(*$TWOWORDBUILTIN); s += '-'; s += *$ID; g_lingo->codeFunc(&s, $arglist); }
;
globallist: ID { g_lingo->code1(LC::c_global); g_lingo->codeString($1->c_str()); delete $1; }
@@ -571,37 +571,37 @@ playfunc: tPLAY tDONE { g_lingo->code1(LC::c_playdone); }
defn: tMACRO ID { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
begin argdef '\n' argstore stmtlist {
g_lingo->code1(LC::c_procret);
- g_lingo->define(*$2, $4, $5);
+ g_lingo->define(*$ID, $begin, $argdef);
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone; }
| tFACTORY ID { g_lingo->codeFactory(*$2); }
| tMETHOD { g_lingo->_indef = kStateInArgs; }
begin argdef '\n' argstore stmtlist {
g_lingo->code1(LC::c_procret);
- g_lingo->define(*$1, $3, $4 + 1, &g_lingo->_currentFactory);
+ g_lingo->define(*$tMETHOD, $begin, $argdef + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone; }
| on begin argdef '\n' argstore stmtlist ENDCLAUSE endargdef { // D3
g_lingo->code1(LC::c_procret);
- g_lingo->define(*$1, $2, $3);
+ g_lingo->define(*$on, $begin, $argdef);
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
g_lingo->_ignoreMe = false;
- checkEnd($7, $1->c_str(), false); }
+ checkEnd($ENDCLAUSE, $on->c_str(), false); }
| on begin argdef '\n' argstore stmtlist { // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
- g_lingo->define(*$1, $2, $3);
+ g_lingo->define(*$on, $begin, $argdef);
g_lingo->_indef = kStateNone;
g_lingo->clearArgStack();
g_lingo->_ignoreMe = false; }
-on: tON ID { $$ = $2; g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
+on: tON ID { $$ = $ID; g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
argdef: /* nothing */ { $$ = 0; }
- | ID { g_lingo->codeArg($1); $$ = 1; }
- | argdef ',' ID { g_lingo->codeArg($3); $$ = $1 + 1; }
- | argdef '\n' ',' ID { g_lingo->codeArg($4); $$ = $1 + 1; }
+ | ID { g_lingo->codeArg($ID); $$ = 1; }
+ | argdef ',' ID { g_lingo->codeArg($ID); $$ = $1 + 1; }
+ | argdef '\n' ',' ID { g_lingo->codeArg($ID); $$ = $1 + 1; }
;
endargdef: /* nothing */
@@ -614,9 +614,9 @@ argstore: /* nothing */ { g_lingo->codeArgStore(); g_lingo->_indef = kStateIn
macro: ID nonemptyarglist {
g_lingo->code1(LC::c_call);
- g_lingo->codeString($1->c_str());
+ g_lingo->codeString($ID->c_str());
inst numpar = 0;
- WRITE_UINT32(&numpar, $2);
+ WRITE_UINT32(&numpar, $nonemptyarglist);
g_lingo->code1(numpar); }
;
@@ -629,13 +629,13 @@ nonemptyarglist: expr { $$ = 1; }
| nonemptyarglist ',' expr { $$ = $1 + 1; }
;
-list: '[' valuelist ']' { $$ = $2; }
+list: '[' valuelist ']' { $$ = $valuelist; }
;
valuelist: /* nothing */ { $$ = g_lingo->code2(LC::c_arraypush, 0); }
| ':' { $$ = g_lingo->code2(LC::c_proparraypush, 0); }
- | linearlist { $$ = g_lingo->code1(LC::c_arraypush); $$ = g_lingo->codeInt($1); }
- | proplist { $$ = g_lingo->code1(LC::c_proparraypush); $$ = g_lingo->codeInt($1); }
+ | linearlist { $$ = g_lingo->code1(LC::c_arraypush); $$ = g_lingo->codeInt($linearlist); }
+ | proplist { $$ = g_lingo->code1(LC::c_proparraypush); $$ = g_lingo->codeInt($proplist); }
;
linearlist: simpleexpr { $$ = 1; }
@@ -648,10 +648,10 @@ proplist: proppair { $$ = 1; }
proppair: SYMBOL ':' simpleexpr {
g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString($1->c_str()); }
+ g_lingo->codeString($SYMBOL->c_str()); }
| STRING ':' simpleexpr {
- g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString($1->c_str()); }
+ g_lingo->code1(LC::c_stringpush);
+ g_lingo->codeString($STRING->c_str()); }
;
Commit: 716075ec296d0c6b0718b93b58c3153f4d98a002
https://github.com/scummvm/scummvm/commit/716075ec296d0c6b0718b93b58c3153f4d98a002
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:53+01:00
Commit Message:
DIRECTOR: LINGO: Plug memory leaks in parser
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 08592ce..28ab386 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -643,22 +643,22 @@ static const yytype_int8 yytranslate[] =
static const yytype_int16 yyrline[] =
{
0, 134, 134, 135, 136, 139, 140, 141, 144, 150,
- 153, 154, 155, 161, 168, 174, 181, 187, 193, 200,
- 201, 202, 205, 206, 207, 208, 211, 212, 217, 228,
- 245, 257, 262, 264, 269, 279, 291, 292, 295, 303,
- 313, 326, 329, 336, 343, 351, 354, 357, 358, 359,
- 362, 368, 372, 375, 378, 381, 384, 388, 391, 392,
- 393, 396, 399, 400, 403, 411, 417, 421, 422, 423,
- 424, 425, 426, 427, 428, 429, 430, 431, 432, 433,
- 434, 435, 436, 437, 438, 439, 440, 441, 442, 443,
- 444, 445, 446, 447, 448, 449, 450, 451, 452, 455,
- 460, 461, 462, 463, 464, 465, 466, 467, 468, 471,
- 474, 477, 481, 482, 483, 484, 487, 488, 491, 492,
- 495, 496, 507, 508, 509, 510, 514, 518, 524, 525,
- 528, 529, 533, 537, 541, 541, 571, 571, 577, 578,
- 578, 584, 592, 599, 601, 602, 603, 604, 607, 608,
- 609, 612, 615, 623, 624, 625, 628, 629, 632, 635,
- 636, 637, 638, 641, 642, 645, 646, 649, 652
+ 153, 154, 155, 161, 168, 174, 181, 187, 193, 201,
+ 202, 203, 206, 207, 208, 209, 212, 213, 218, 229,
+ 246, 258, 263, 265, 270, 280, 292, 293, 296, 304,
+ 314, 327, 330, 337, 344, 352, 355, 358, 359, 360,
+ 363, 369, 373, 376, 379, 383, 387, 391, 394, 395,
+ 396, 399, 402, 403, 406, 414, 420, 425, 426, 427,
+ 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,
+ 438, 439, 440, 441, 442, 443, 444, 445, 446, 447,
+ 448, 449, 450, 451, 452, 453, 454, 455, 456, 459,
+ 464, 465, 466, 467, 468, 469, 470, 471, 472, 475,
+ 478, 481, 485, 486, 487, 488, 491, 492, 495, 496,
+ 499, 500, 511, 512, 513, 514, 518, 522, 528, 529,
+ 532, 533, 537, 541, 545, 545, 575, 575, 582, 583,
+ 583, 589, 598, 606, 608, 609, 610, 611, 614, 615,
+ 616, 619, 622, 631, 632, 633, 636, 637, 640, 643,
+ 644, 645, 646, 649, 650, 653, 654, 657, 661
};
#endif
@@ -2046,23 +2046,24 @@ yyreduce:
g_lingo->code1(LC::c_objectfieldassign);
g_lingo->codeString((yyvsp[-2].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[-2].objectfield).e);
+ delete (yyvsp[-2].objectfield).s;
(yyval.code) = (yyvsp[0].code); }
-#line 2051 "engines/director/lingo/lingo-gr.cpp"
+#line 2052 "engines/director/lingo/lingo-gr.cpp"
break;
case 28:
-#line 217 "engines/director/lingo/lingo-gr.y"
+#line 218 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[-3].code) - (yyvsp[-5].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 2] = end; }
-#line 2062 "engines/director/lingo/lingo-gr.cpp"
+#line 2063 "engines/director/lingo/lingo-gr.cpp"
break;
case 29:
-#line 228 "engines/director/lingo/lingo-gr.y"
+#line 229 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
@@ -2075,11 +2076,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end; }
-#line 2079 "engines/director/lingo/lingo-gr.cpp"
+#line 2080 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
-#line 245 "engines/director/lingo/lingo-gr.y"
+#line 246 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2092,36 +2093,36 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end; }
-#line 2096 "engines/director/lingo/lingo-gr.cpp"
+#line 2097 "engines/director/lingo/lingo-gr.cpp"
break;
case 31:
-#line 257 "engines/director/lingo/lingo-gr.y"
+#line 258 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
g_lingo->code1(STOP);
(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
-#line 2106 "engines/director/lingo/lingo-gr.cpp"
+#line 2107 "engines/director/lingo/lingo-gr.cpp"
break;
case 32:
-#line 262 "engines/director/lingo/lingo-gr.y"
+#line 263 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented"); }
-#line 2113 "engines/director/lingo/lingo-gr.cpp"
+#line 2114 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
-#line 264 "engines/director/lingo/lingo-gr.y"
+#line 265 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
}
-#line 2121 "engines/director/lingo/lingo-gr.cpp"
+#line 2122 "engines/director/lingo/lingo-gr.cpp"
break;
case 34:
-#line 269 "engines/director/lingo/lingo-gr.y"
+#line 270 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-8].code));
@@ -2132,11 +2133,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-8].code), (yyvsp[-1].code) - (yyvsp[-8].code), 0); }
-#line 2136 "engines/director/lingo/lingo-gr.cpp"
+#line 2137 "engines/director/lingo/lingo-gr.cpp"
break;
case 35:
-#line 279 "engines/director/lingo/lingo-gr.y"
+#line 280 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-9].code) - (yyvsp[-11].code));
@@ -2147,22 +2148,22 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-11].code), (yyvsp[-1].code) - (yyvsp[-11].code), (yyvsp[-3].code) - (yyvsp[-11].code)); }
-#line 2151 "engines/director/lingo/lingo-gr.cpp"
+#line 2152 "engines/director/lingo/lingo-gr.cpp"
break;
case 38:
-#line 295 "engines/director/lingo/lingo-gr.y"
+#line 296 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[-3].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
g_lingo->codeLabel((yyvsp[-5].code)); }
-#line 2162 "engines/director/lingo/lingo-gr.cpp"
+#line 2163 "engines/director/lingo/lingo-gr.cpp"
break;
case 39:
-#line 303 "engines/director/lingo/lingo-gr.y"
+#line 304 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2173,11 +2174,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-10].code), (yyvsp[-1].code) - (yyvsp[-10].code), (yyvsp[-3].code) - (yyvsp[-10].code)); }
-#line 2177 "engines/director/lingo/lingo-gr.cpp"
+#line 2178 "engines/director/lingo/lingo-gr.cpp"
break;
case 40:
-#line 313 "engines/director/lingo/lingo-gr.y"
+#line 314 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
@@ -2188,161 +2189,163 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
-#line 2192 "engines/director/lingo/lingo-gr.cpp"
+#line 2193 "engines/director/lingo/lingo-gr.cpp"
break;
case 41:
-#line 326 "engines/director/lingo/lingo-gr.y"
+#line 327 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
-#line 2198 "engines/director/lingo/lingo-gr.cpp"
+#line 2199 "engines/director/lingo/lingo-gr.cpp"
break;
case 42:
-#line 329 "engines/director/lingo/lingo-gr.y"
+#line 330 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(LC::c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2208 "engines/director/lingo/lingo-gr.cpp"
+#line 2209 "engines/director/lingo/lingo-gr.cpp"
break;
case 43:
-#line 336 "engines/director/lingo/lingo-gr.y"
+#line 337 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(0); // Do not skip end
g_lingo->codeLabel(0); }
-#line 2218 "engines/director/lingo/lingo-gr.cpp"
+#line 2219 "engines/director/lingo/lingo-gr.cpp"
break;
case 44:
-#line 343 "engines/director/lingo/lingo-gr.y"
+#line 344 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(skipEnd); }
-#line 2229 "engines/director/lingo/lingo-gr.cpp"
+#line 2230 "engines/director/lingo/lingo-gr.cpp"
break;
case 45:
-#line 351 "engines/director/lingo/lingo-gr.y"
+#line 352 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2235 "engines/director/lingo/lingo-gr.cpp"
+#line 2236 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
-#line 354 "engines/director/lingo/lingo-gr.y"
+#line 355 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2241 "engines/director/lingo/lingo-gr.cpp"
+#line 2242 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
-#line 357 "engines/director/lingo/lingo-gr.y"
+#line 358 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2247 "engines/director/lingo/lingo-gr.cpp"
+#line 2248 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
-#line 362 "engines/director/lingo/lingo-gr.y"
+#line 363 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_whencode);
g_lingo->code1(STOP);
g_lingo->codeString((yyvsp[-1].s)->c_str());
delete (yyvsp[-1].s); }
-#line 2257 "engines/director/lingo/lingo-gr.cpp"
+#line 2258 "engines/director/lingo/lingo-gr.cpp"
break;
case 51:
-#line 368 "engines/director/lingo/lingo-gr.y"
+#line 369 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_tellcode);
g_lingo->code1(STOP); }
-#line 2265 "engines/director/lingo/lingo-gr.cpp"
+#line 2266 "engines/director/lingo/lingo-gr.cpp"
break;
case 52:
-#line 372 "engines/director/lingo/lingo-gr.y"
+#line 373 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt((yyvsp[0].i)); }
-#line 2273 "engines/director/lingo/lingo-gr.cpp"
+#line 2274 "engines/director/lingo/lingo-gr.cpp"
break;
case 53:
-#line 375 "engines/director/lingo/lingo-gr.y"
+#line 376 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_floatpush);
g_lingo->codeFloat((yyvsp[0].f)); }
-#line 2281 "engines/director/lingo/lingo-gr.cpp"
+#line 2282 "engines/director/lingo/lingo-gr.cpp"
break;
case 54:
-#line 378 "engines/director/lingo/lingo-gr.y"
+#line 379 "engines/director/lingo/lingo-gr.y"
{ // D3
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString((yyvsp[0].s)->c_str()); }
-#line 2289 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->codeString((yyvsp[0].s)->c_str());
+ delete (yyvsp[0].s); }
+#line 2291 "engines/director/lingo/lingo-gr.cpp"
break;
case 55:
-#line 381 "engines/director/lingo/lingo-gr.y"
+#line 383 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString((yyvsp[0].s)->c_str()); }
-#line 2297 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->codeString((yyvsp[0].s)->c_str());
+ delete (yyvsp[0].s); }
+#line 2300 "engines/director/lingo/lingo-gr.cpp"
break;
case 56:
-#line 384 "engines/director/lingo/lingo-gr.y"
+#line 387 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_eval);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2306 "engines/director/lingo/lingo-gr.cpp"
+#line 2309 "engines/director/lingo/lingo-gr.cpp"
break;
case 58:
-#line 391 "engines/director/lingo/lingo-gr.y"
+#line 394 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2312 "engines/director/lingo/lingo-gr.cpp"
+#line 2315 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
-#line 393 "engines/director/lingo/lingo-gr.y"
+#line 396 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2320 "engines/director/lingo/lingo-gr.cpp"
+#line 2323 "engines/director/lingo/lingo-gr.cpp"
break;
case 61:
-#line 396 "engines/director/lingo/lingo-gr.y"
+#line 399 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2328 "engines/director/lingo/lingo-gr.cpp"
+#line 2331 "engines/director/lingo/lingo-gr.cpp"
break;
case 62:
-#line 399 "engines/director/lingo/lingo-gr.y"
+#line 402 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
-#line 2334 "engines/director/lingo/lingo-gr.cpp"
+#line 2337 "engines/director/lingo/lingo-gr.cpp"
break;
case 63:
-#line 400 "engines/director/lingo/lingo-gr.y"
+#line 403 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2342 "engines/director/lingo/lingo-gr.cpp"
+#line 2345 "engines/director/lingo/lingo-gr.cpp"
break;
case 64:
-#line 403 "engines/director/lingo/lingo-gr.y"
+#line 406 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2351,466 +2354,468 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[0].e)[0]);
WRITE_UINT32(&f, (yyvsp[0].e)[1]);
g_lingo->code2(e, f); }
-#line 2355 "engines/director/lingo/lingo-gr.cpp"
+#line 2358 "engines/director/lingo/lingo-gr.cpp"
break;
case 65:
-#line 411 "engines/director/lingo/lingo-gr.y"
+#line 414 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
g_lingo->code2(e, f); }
-#line 2366 "engines/director/lingo/lingo-gr.cpp"
+#line 2369 "engines/director/lingo/lingo-gr.cpp"
break;
case 66:
-#line 417 "engines/director/lingo/lingo-gr.y"
+#line 420 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldpush);
g_lingo->codeString((yyvsp[0].objectfield).s->c_str());
- g_lingo->codeInt((yyvsp[0].objectfield).e); }
-#line 2375 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->codeInt((yyvsp[0].objectfield).e);
+ delete (yyvsp[0].objectfield).s; }
+#line 2379 "engines/director/lingo/lingo-gr.cpp"
break;
case 68:
-#line 422 "engines/director/lingo/lingo-gr.y"
+#line 426 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_add); }
-#line 2381 "engines/director/lingo/lingo-gr.cpp"
+#line 2385 "engines/director/lingo/lingo-gr.cpp"
break;
case 69:
-#line 423 "engines/director/lingo/lingo-gr.y"
+#line 427 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_sub); }
-#line 2387 "engines/director/lingo/lingo-gr.cpp"
+#line 2391 "engines/director/lingo/lingo-gr.cpp"
break;
case 70:
-#line 424 "engines/director/lingo/lingo-gr.y"
+#line 428 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mul); }
-#line 2393 "engines/director/lingo/lingo-gr.cpp"
+#line 2397 "engines/director/lingo/lingo-gr.cpp"
break;
case 71:
-#line 425 "engines/director/lingo/lingo-gr.y"
+#line 429 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_div); }
-#line 2399 "engines/director/lingo/lingo-gr.cpp"
+#line 2403 "engines/director/lingo/lingo-gr.cpp"
break;
case 72:
-#line 426 "engines/director/lingo/lingo-gr.y"
+#line 430 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mod); }
-#line 2405 "engines/director/lingo/lingo-gr.cpp"
+#line 2409 "engines/director/lingo/lingo-gr.cpp"
break;
case 73:
-#line 427 "engines/director/lingo/lingo-gr.y"
+#line 431 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gt); }
-#line 2411 "engines/director/lingo/lingo-gr.cpp"
+#line 2415 "engines/director/lingo/lingo-gr.cpp"
break;
case 74:
-#line 428 "engines/director/lingo/lingo-gr.y"
+#line 432 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lt); }
-#line 2417 "engines/director/lingo/lingo-gr.cpp"
+#line 2421 "engines/director/lingo/lingo-gr.cpp"
break;
case 75:
-#line 429 "engines/director/lingo/lingo-gr.y"
+#line 433 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_eq); }
-#line 2423 "engines/director/lingo/lingo-gr.cpp"
+#line 2427 "engines/director/lingo/lingo-gr.cpp"
break;
case 76:
-#line 430 "engines/director/lingo/lingo-gr.y"
+#line 434 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_neq); }
-#line 2429 "engines/director/lingo/lingo-gr.cpp"
+#line 2433 "engines/director/lingo/lingo-gr.cpp"
break;
case 77:
-#line 431 "engines/director/lingo/lingo-gr.y"
+#line 435 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ge); }
-#line 2435 "engines/director/lingo/lingo-gr.cpp"
+#line 2439 "engines/director/lingo/lingo-gr.cpp"
break;
case 78:
-#line 432 "engines/director/lingo/lingo-gr.y"
+#line 436 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_le); }
-#line 2441 "engines/director/lingo/lingo-gr.cpp"
+#line 2445 "engines/director/lingo/lingo-gr.cpp"
break;
case 79:
-#line 433 "engines/director/lingo/lingo-gr.y"
+#line 437 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_and); }
-#line 2447 "engines/director/lingo/lingo-gr.cpp"
+#line 2451 "engines/director/lingo/lingo-gr.cpp"
break;
case 80:
-#line 434 "engines/director/lingo/lingo-gr.y"
+#line 438 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_or); }
-#line 2453 "engines/director/lingo/lingo-gr.cpp"
+#line 2457 "engines/director/lingo/lingo-gr.cpp"
break;
case 81:
-#line 435 "engines/director/lingo/lingo-gr.y"
+#line 439 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_not); }
-#line 2459 "engines/director/lingo/lingo-gr.cpp"
+#line 2463 "engines/director/lingo/lingo-gr.cpp"
break;
case 82:
-#line 436 "engines/director/lingo/lingo-gr.y"
+#line 440 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ampersand); }
-#line 2465 "engines/director/lingo/lingo-gr.cpp"
+#line 2469 "engines/director/lingo/lingo-gr.cpp"
break;
case 83:
-#line 437 "engines/director/lingo/lingo-gr.y"
+#line 441 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_concat); }
-#line 2471 "engines/director/lingo/lingo-gr.cpp"
+#line 2475 "engines/director/lingo/lingo-gr.cpp"
break;
case 84:
-#line 438 "engines/director/lingo/lingo-gr.y"
+#line 442 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_contains); }
-#line 2477 "engines/director/lingo/lingo-gr.cpp"
+#line 2481 "engines/director/lingo/lingo-gr.cpp"
break;
case 85:
-#line 439 "engines/director/lingo/lingo-gr.y"
+#line 443 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_starts); }
-#line 2483 "engines/director/lingo/lingo-gr.cpp"
+#line 2487 "engines/director/lingo/lingo-gr.cpp"
break;
case 86:
-#line 440 "engines/director/lingo/lingo-gr.y"
+#line 444 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2489 "engines/director/lingo/lingo-gr.cpp"
+#line 2493 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
-#line 441 "engines/director/lingo/lingo-gr.y"
+#line 445 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
-#line 2495 "engines/director/lingo/lingo-gr.cpp"
+#line 2499 "engines/director/lingo/lingo-gr.cpp"
break;
case 88:
-#line 442 "engines/director/lingo/lingo-gr.y"
+#line 446 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2501 "engines/director/lingo/lingo-gr.cpp"
+#line 2505 "engines/director/lingo/lingo-gr.cpp"
break;
case 89:
-#line 443 "engines/director/lingo/lingo-gr.y"
+#line 447 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_intersects); }
-#line 2507 "engines/director/lingo/lingo-gr.cpp"
+#line 2511 "engines/director/lingo/lingo-gr.cpp"
break;
case 90:
-#line 444 "engines/director/lingo/lingo-gr.y"
+#line 448 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_within); }
-#line 2513 "engines/director/lingo/lingo-gr.cpp"
+#line 2517 "engines/director/lingo/lingo-gr.cpp"
break;
case 91:
-#line 445 "engines/director/lingo/lingo-gr.y"
+#line 449 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charOf); }
-#line 2519 "engines/director/lingo/lingo-gr.cpp"
+#line 2523 "engines/director/lingo/lingo-gr.cpp"
break;
case 92:
-#line 446 "engines/director/lingo/lingo-gr.y"
+#line 450 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charToOf); }
-#line 2525 "engines/director/lingo/lingo-gr.cpp"
+#line 2529 "engines/director/lingo/lingo-gr.cpp"
break;
case 93:
-#line 447 "engines/director/lingo/lingo-gr.y"
+#line 451 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemOf); }
-#line 2531 "engines/director/lingo/lingo-gr.cpp"
+#line 2535 "engines/director/lingo/lingo-gr.cpp"
break;
case 94:
-#line 448 "engines/director/lingo/lingo-gr.y"
+#line 452 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemToOf); }
-#line 2537 "engines/director/lingo/lingo-gr.cpp"
+#line 2541 "engines/director/lingo/lingo-gr.cpp"
break;
case 95:
-#line 449 "engines/director/lingo/lingo-gr.y"
+#line 453 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineOf); }
-#line 2543 "engines/director/lingo/lingo-gr.cpp"
+#line 2547 "engines/director/lingo/lingo-gr.cpp"
break;
case 96:
-#line 450 "engines/director/lingo/lingo-gr.y"
+#line 454 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineToOf); }
-#line 2549 "engines/director/lingo/lingo-gr.cpp"
+#line 2553 "engines/director/lingo/lingo-gr.cpp"
break;
case 97:
-#line 451 "engines/director/lingo/lingo-gr.y"
+#line 455 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordOf); }
-#line 2555 "engines/director/lingo/lingo-gr.cpp"
+#line 2559 "engines/director/lingo/lingo-gr.cpp"
break;
case 98:
-#line 452 "engines/director/lingo/lingo-gr.y"
+#line 456 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordToOf); }
-#line 2561 "engines/director/lingo/lingo-gr.cpp"
+#line 2565 "engines/director/lingo/lingo-gr.cpp"
break;
case 99:
-#line 455 "engines/director/lingo/lingo-gr.y"
+#line 459 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2569 "engines/director/lingo/lingo-gr.cpp"
+#line 2573 "engines/director/lingo/lingo-gr.cpp"
break;
case 100:
-#line 460 "engines/director/lingo/lingo-gr.y"
+#line 464 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); }
-#line 2575 "engines/director/lingo/lingo-gr.cpp"
+#line 2579 "engines/director/lingo/lingo-gr.cpp"
break;
case 103:
-#line 463 "engines/director/lingo/lingo-gr.y"
+#line 467 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); }
-#line 2581 "engines/director/lingo/lingo-gr.cpp"
+#line 2585 "engines/director/lingo/lingo-gr.cpp"
break;
case 104:
-#line 464 "engines/director/lingo/lingo-gr.y"
+#line 468 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); }
-#line 2587 "engines/director/lingo/lingo-gr.cpp"
+#line 2591 "engines/director/lingo/lingo-gr.cpp"
break;
case 108:
-#line 468 "engines/director/lingo/lingo-gr.y"
+#line 472 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2595 "engines/director/lingo/lingo-gr.cpp"
+#line 2599 "engines/director/lingo/lingo-gr.cpp"
break;
case 109:
-#line 471 "engines/director/lingo/lingo-gr.y"
+#line 475 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2603 "engines/director/lingo/lingo-gr.cpp"
+#line 2607 "engines/director/lingo/lingo-gr.cpp"
break;
case 110:
-#line 474 "engines/director/lingo/lingo-gr.y"
+#line 478 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2611 "engines/director/lingo/lingo-gr.cpp"
+#line 2615 "engines/director/lingo/lingo-gr.cpp"
break;
case 111:
-#line 477 "engines/director/lingo/lingo-gr.y"
+#line 481 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_voidpush);
g_lingo->codeFunc((yyvsp[0].s), 1);
delete (yyvsp[0].s); }
-#line 2620 "engines/director/lingo/lingo-gr.cpp"
+#line 2624 "engines/director/lingo/lingo-gr.cpp"
break;
case 112:
-#line 481 "engines/director/lingo/lingo-gr.y"
+#line 485 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
-#line 2626 "engines/director/lingo/lingo-gr.cpp"
+#line 2630 "engines/director/lingo/lingo-gr.cpp"
break;
case 113:
-#line 482 "engines/director/lingo/lingo-gr.y"
+#line 486 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); }
-#line 2632 "engines/director/lingo/lingo-gr.cpp"
+#line 2636 "engines/director/lingo/lingo-gr.cpp"
break;
case 114:
-#line 483 "engines/director/lingo/lingo-gr.y"
+#line 487 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); }
-#line 2638 "engines/director/lingo/lingo-gr.cpp"
+#line 2642 "engines/director/lingo/lingo-gr.cpp"
break;
case 115:
-#line 484 "engines/director/lingo/lingo-gr.y"
- { Common::String s(*(yyvsp[-2].s)); s += '-'; s += *(yyvsp[-1].s); g_lingo->codeFunc(&s, (yyvsp[0].narg)); }
-#line 2644 "engines/director/lingo/lingo-gr.cpp"
+#line 488 "engines/director/lingo/lingo-gr.y"
+ { Common::String s(*(yyvsp[-2].s)); s += '-'; s += *(yyvsp[-1].s); g_lingo->codeFunc(&s, (yyvsp[0].narg)); delete (yyvsp[-1].s); }
+#line 2648 "engines/director/lingo/lingo-gr.cpp"
break;
case 116:
-#line 487 "engines/director/lingo/lingo-gr.y"
+#line 491 "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 2650 "engines/director/lingo/lingo-gr.cpp"
+#line 2654 "engines/director/lingo/lingo-gr.cpp"
break;
case 117:
-#line 488 "engines/director/lingo/lingo-gr.y"
+#line 492 "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 2656 "engines/director/lingo/lingo-gr.cpp"
+#line 2660 "engines/director/lingo/lingo-gr.cpp"
break;
case 118:
-#line 491 "engines/director/lingo/lingo-gr.y"
+#line 495 "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 2662 "engines/director/lingo/lingo-gr.cpp"
+#line 2666 "engines/director/lingo/lingo-gr.cpp"
break;
case 119:
-#line 492 "engines/director/lingo/lingo-gr.y"
+#line 496 "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 2668 "engines/director/lingo/lingo-gr.cpp"
+#line 2672 "engines/director/lingo/lingo-gr.cpp"
break;
case 120:
-#line 495 "engines/director/lingo/lingo-gr.y"
+#line 499 "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 2674 "engines/director/lingo/lingo-gr.cpp"
+#line 2678 "engines/director/lingo/lingo-gr.cpp"
break;
case 121:
-#line 496 "engines/director/lingo/lingo-gr.y"
+#line 500 "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 2680 "engines/director/lingo/lingo-gr.cpp"
+#line 2684 "engines/director/lingo/lingo-gr.cpp"
break;
case 122:
-#line 507 "engines/director/lingo/lingo-gr.y"
+#line 511 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
-#line 2686 "engines/director/lingo/lingo-gr.cpp"
+#line 2690 "engines/director/lingo/lingo-gr.cpp"
break;
case 123:
-#line 508 "engines/director/lingo/lingo-gr.y"
+#line 512 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
-#line 2692 "engines/director/lingo/lingo-gr.cpp"
+#line 2696 "engines/director/lingo/lingo-gr.cpp"
break;
case 124:
-#line 509 "engines/director/lingo/lingo-gr.y"
+#line 513 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
-#line 2698 "engines/director/lingo/lingo-gr.cpp"
+#line 2702 "engines/director/lingo/lingo-gr.cpp"
break;
case 125:
-#line 510 "engines/director/lingo/lingo-gr.y"
+#line 514 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); }
-#line 2707 "engines/director/lingo/lingo-gr.cpp"
+#line 2711 "engines/director/lingo/lingo-gr.cpp"
break;
case 126:
-#line 514 "engines/director/lingo/lingo-gr.y"
+#line 518 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); }
-#line 2716 "engines/director/lingo/lingo-gr.cpp"
+#line 2720 "engines/director/lingo/lingo-gr.cpp"
break;
case 127:
-#line 518 "engines/director/lingo/lingo-gr.y"
+#line 522 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); }
-#line 2725 "engines/director/lingo/lingo-gr.cpp"
+#line 2729 "engines/director/lingo/lingo-gr.cpp"
break;
case 130:
-#line 528 "engines/director/lingo/lingo-gr.y"
+#line 532 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); }
-#line 2731 "engines/director/lingo/lingo-gr.cpp"
+#line 2735 "engines/director/lingo/lingo-gr.cpp"
break;
case 131:
-#line 529 "engines/director/lingo/lingo-gr.y"
+#line 533 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); }
-#line 2740 "engines/director/lingo/lingo-gr.cpp"
+#line 2744 "engines/director/lingo/lingo-gr.cpp"
break;
case 132:
-#line 533 "engines/director/lingo/lingo-gr.y"
+#line 537 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); }
-#line 2749 "engines/director/lingo/lingo-gr.cpp"
+#line 2753 "engines/director/lingo/lingo-gr.cpp"
break;
case 133:
-#line 537 "engines/director/lingo/lingo-gr.y"
+#line 541 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); }
-#line 2758 "engines/director/lingo/lingo-gr.cpp"
+#line 2762 "engines/director/lingo/lingo-gr.cpp"
break;
case 134:
-#line 541 "engines/director/lingo/lingo-gr.y"
+#line 545 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
-#line 2764 "engines/director/lingo/lingo-gr.cpp"
+#line 2768 "engines/director/lingo/lingo-gr.cpp"
break;
case 135:
-#line 541 "engines/director/lingo/lingo-gr.y"
+#line 545 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg)); }
-#line 2772 "engines/director/lingo/lingo-gr.cpp"
+#line 2776 "engines/director/lingo/lingo-gr.cpp"
break;
case 136:
-#line 571 "engines/director/lingo/lingo-gr.y"
+#line 575 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
-#line 2778 "engines/director/lingo/lingo-gr.cpp"
+#line 2782 "engines/director/lingo/lingo-gr.cpp"
break;
case 137:
-#line 572 "engines/director/lingo/lingo-gr.y"
+#line 576 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->clearArgStack();
- g_lingo->_indef = kStateNone; }
-#line 2788 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->_indef = kStateNone;
+ delete (yyvsp[-6].s); }
+#line 2793 "engines/director/lingo/lingo-gr.cpp"
break;
case 138:
-#line 577 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFactory(*(yyvsp[0].s)); }
-#line 2794 "engines/director/lingo/lingo-gr.cpp"
+#line 582 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
+#line 2799 "engines/director/lingo/lingo-gr.cpp"
break;
case 139:
-#line 578 "engines/director/lingo/lingo-gr.y"
+#line 583 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2800 "engines/director/lingo/lingo-gr.cpp"
+#line 2805 "engines/director/lingo/lingo-gr.cpp"
break;
case 140:
-#line 579 "engines/director/lingo/lingo-gr.y"
+#line 584 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone; }
-#line 2810 "engines/director/lingo/lingo-gr.cpp"
+#line 2815 "engines/director/lingo/lingo-gr.cpp"
break;
case 141:
-#line 584 "engines/director/lingo/lingo-gr.y"
+#line 589 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-7].s), (yyvsp[-6].code), (yyvsp[-5].narg));
@@ -2818,170 +2823,187 @@ yyreduce:
g_lingo->_indef = kStateNone;
g_lingo->_ignoreMe = false;
- checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false); }
-#line 2823 "engines/director/lingo/lingo-gr.cpp"
+ checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false);
+ delete (yyvsp[-7].s); }
+#line 2829 "engines/director/lingo/lingo-gr.cpp"
break;
case 142:
-#line 592 "engines/director/lingo/lingo-gr.y"
+#line 598 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->_indef = kStateNone;
g_lingo->clearArgStack();
- g_lingo->_ignoreMe = false; }
-#line 2834 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->_ignoreMe = false;
+ delete (yyvsp[-5].s); }
+#line 2841 "engines/director/lingo/lingo-gr.cpp"
break;
case 143:
-#line 599 "engines/director/lingo/lingo-gr.y"
+#line 606 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
-#line 2840 "engines/director/lingo/lingo-gr.cpp"
+#line 2847 "engines/director/lingo/lingo-gr.cpp"
break;
case 144:
-#line 601 "engines/director/lingo/lingo-gr.y"
+#line 608 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2846 "engines/director/lingo/lingo-gr.cpp"
+#line 2853 "engines/director/lingo/lingo-gr.cpp"
break;
case 145:
-#line 602 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; }
-#line 2852 "engines/director/lingo/lingo-gr.cpp"
+#line 609 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
+#line 2859 "engines/director/lingo/lingo-gr.cpp"
break;
case 146:
-#line 603 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2858 "engines/director/lingo/lingo-gr.cpp"
+#line 610 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
+#line 2865 "engines/director/lingo/lingo-gr.cpp"
break;
case 147:
-#line 604 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; }
-#line 2864 "engines/director/lingo/lingo-gr.cpp"
+#line 611 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
+#line 2871 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 149:
+#line 615 "engines/director/lingo/lingo-gr.y"
+ { delete (yyvsp[0].s); }
+#line 2877 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 150:
+#line 616 "engines/director/lingo/lingo-gr.y"
+ { delete (yyvsp[0].s); }
+#line 2883 "engines/director/lingo/lingo-gr.cpp"
break;
case 151:
-#line 612 "engines/director/lingo/lingo-gr.y"
+#line 619 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
-#line 2870 "engines/director/lingo/lingo-gr.cpp"
+#line 2889 "engines/director/lingo/lingo-gr.cpp"
break;
case 152:
-#line 615 "engines/director/lingo/lingo-gr.y"
+#line 622 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
g_lingo->codeString((yyvsp[-1].s)->c_str());
inst numpar = 0;
WRITE_UINT32(&numpar, (yyvsp[0].narg));
- g_lingo->code1(numpar); }
-#line 2881 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->code1(numpar);
+ delete (yyvsp[-1].s); }
+#line 2901 "engines/director/lingo/lingo-gr.cpp"
break;
case 153:
-#line 623 "engines/director/lingo/lingo-gr.y"
+#line 631 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2887 "engines/director/lingo/lingo-gr.cpp"
+#line 2907 "engines/director/lingo/lingo-gr.cpp"
break;
case 154:
-#line 624 "engines/director/lingo/lingo-gr.y"
+#line 632 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2893 "engines/director/lingo/lingo-gr.cpp"
+#line 2913 "engines/director/lingo/lingo-gr.cpp"
break;
case 155:
-#line 625 "engines/director/lingo/lingo-gr.y"
+#line 633 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2899 "engines/director/lingo/lingo-gr.cpp"
+#line 2919 "engines/director/lingo/lingo-gr.cpp"
break;
case 156:
-#line 628 "engines/director/lingo/lingo-gr.y"
+#line 636 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2905 "engines/director/lingo/lingo-gr.cpp"
+#line 2925 "engines/director/lingo/lingo-gr.cpp"
break;
case 157:
-#line 629 "engines/director/lingo/lingo-gr.y"
+#line 637 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2911 "engines/director/lingo/lingo-gr.cpp"
+#line 2931 "engines/director/lingo/lingo-gr.cpp"
break;
case 158:
-#line 632 "engines/director/lingo/lingo-gr.y"
+#line 640 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2917 "engines/director/lingo/lingo-gr.cpp"
+#line 2937 "engines/director/lingo/lingo-gr.cpp"
break;
case 159:
-#line 635 "engines/director/lingo/lingo-gr.y"
+#line 643 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
-#line 2923 "engines/director/lingo/lingo-gr.cpp"
+#line 2943 "engines/director/lingo/lingo-gr.cpp"
break;
case 160:
-#line 636 "engines/director/lingo/lingo-gr.y"
+#line 644 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
-#line 2929 "engines/director/lingo/lingo-gr.cpp"
+#line 2949 "engines/director/lingo/lingo-gr.cpp"
break;
case 161:
-#line 637 "engines/director/lingo/lingo-gr.y"
+#line 645 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 2935 "engines/director/lingo/lingo-gr.cpp"
+#line 2955 "engines/director/lingo/lingo-gr.cpp"
break;
case 162:
-#line 638 "engines/director/lingo/lingo-gr.y"
+#line 646 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 2941 "engines/director/lingo/lingo-gr.cpp"
+#line 2961 "engines/director/lingo/lingo-gr.cpp"
break;
case 163:
-#line 641 "engines/director/lingo/lingo-gr.y"
+#line 649 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2947 "engines/director/lingo/lingo-gr.cpp"
+#line 2967 "engines/director/lingo/lingo-gr.cpp"
break;
case 164:
-#line 642 "engines/director/lingo/lingo-gr.y"
+#line 650 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2953 "engines/director/lingo/lingo-gr.cpp"
+#line 2973 "engines/director/lingo/lingo-gr.cpp"
break;
case 165:
-#line 645 "engines/director/lingo/lingo-gr.y"
+#line 653 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2959 "engines/director/lingo/lingo-gr.cpp"
+#line 2979 "engines/director/lingo/lingo-gr.cpp"
break;
case 166:
-#line 646 "engines/director/lingo/lingo-gr.y"
+#line 654 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2965 "engines/director/lingo/lingo-gr.cpp"
+#line 2985 "engines/director/lingo/lingo-gr.cpp"
break;
case 167:
-#line 649 "engines/director/lingo/lingo-gr.y"
+#line 657 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString((yyvsp[-2].s)->c_str()); }
-#line 2973 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->codeString((yyvsp[-2].s)->c_str());
+ delete (yyvsp[-2].s); }
+#line 2994 "engines/director/lingo/lingo-gr.cpp"
break;
case 168:
-#line 652 "engines/director/lingo/lingo-gr.y"
+#line 661 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString((yyvsp[-2].s)->c_str()); }
-#line 2981 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->codeString((yyvsp[-2].s)->c_str());
+ delete (yyvsp[-2].s); }
+#line 3003 "engines/director/lingo/lingo-gr.cpp"
break;
-#line 2985 "engines/director/lingo/lingo-gr.cpp"
+#line 3007 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
@@ -3213,5 +3235,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 658 "engines/director/lingo/lingo-gr.y"
+#line 668 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index e243d90..438345a 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -194,6 +194,7 @@ asgn: tPUT expr tINTO ID {
g_lingo->code1(LC::c_objectfieldassign);
g_lingo->codeString($THEOBJECTFIELD.s->c_str());
g_lingo->codeInt($THEOBJECTFIELD.e);
+ delete $THEOBJECTFIELD.s;
$$ = $expr; }
;
@@ -377,10 +378,12 @@ simpleexpr: INT {
g_lingo->codeFloat($FLOAT); }
| SYMBOL { // D3
$$ = g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString($SYMBOL->c_str()); }
+ g_lingo->codeString($SYMBOL->c_str());
+ delete $SYMBOL; }
| STRING {
$$ = g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString($STRING->c_str()); }
+ g_lingo->codeString($STRING->c_str());
+ delete $STRING; }
| ID {
$$ = g_lingo->code1(LC::c_eval);
g_lingo->codeString($ID->c_str());
@@ -417,7 +420,8 @@ expr: simpleexpr { $$ = $simpleexpr; }
| THEOBJECTFIELD {
g_lingo->code1(LC::c_objectfieldpush);
g_lingo->codeString($THEOBJECTFIELD.s->c_str());
- g_lingo->codeInt($THEOBJECTFIELD.e); }
+ g_lingo->codeInt($THEOBJECTFIELD.e);
+ delete $THEOBJECTFIELD.s; }
| asgn
| expr '+' expr { g_lingo->code1(LC::c_add); }
| expr '-' expr { g_lingo->code1(LC::c_sub); }
@@ -481,19 +485,19 @@ proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
| BLTINARGLIST arglist { g_lingo->codeFunc($BLTINARGLIST, $arglist); }
| tOPEN expr tWITH expr { g_lingo->code1(LC::c_open); }
| tOPEN expr { g_lingo->code2(LC::c_voidpush, LC::c_open); }
- | TWOWORDBUILTIN ID arglist { Common::String s(*$TWOWORDBUILTIN); s += '-'; s += *$ID; g_lingo->codeFunc(&s, $arglist); }
+ | TWOWORDBUILTIN ID arglist { Common::String s(*$TWOWORDBUILTIN); s += '-'; s += *$ID; g_lingo->codeFunc(&s, $arglist); delete $ID; }
;
-globallist: ID { g_lingo->code1(LC::c_global); g_lingo->codeString($1->c_str()); delete $1; }
- | globallist ',' ID { g_lingo->code1(LC::c_global); g_lingo->codeString($3->c_str()); delete $3; }
+globallist: ID { g_lingo->code1(LC::c_global); g_lingo->codeString($1->c_str()); delete $ID; }
+ | globallist ',' ID { g_lingo->code1(LC::c_global); g_lingo->codeString($3->c_str()); delete $ID; }
;
-propertylist: ID { g_lingo->code1(LC::c_property); g_lingo->codeString($1->c_str()); delete $1; }
- | propertylist ',' ID { g_lingo->code1(LC::c_property); g_lingo->codeString($3->c_str()); delete $3; }
+propertylist: ID { g_lingo->code1(LC::c_property); g_lingo->codeString($1->c_str()); delete $ID; }
+ | propertylist ',' ID { g_lingo->code1(LC::c_property); g_lingo->codeString($3->c_str()); delete $ID; }
;
-instancelist: ID { g_lingo->code1(LC::c_instance); g_lingo->codeString($1->c_str()); delete $1; }
- | instancelist ',' ID { g_lingo->code1(LC::c_instance); g_lingo->codeString($3->c_str()); delete $3; }
+instancelist: ID { g_lingo->code1(LC::c_instance); g_lingo->codeString($1->c_str()); delete $ID; }
+ | instancelist ',' ID { g_lingo->code1(LC::c_instance); g_lingo->codeString($3->c_str()); delete $ID; }
;
// go {to} {frame} whichFrame {of movie whichMovie}
@@ -573,8 +577,9 @@ defn: tMACRO ID { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear
g_lingo->code1(LC::c_procret);
g_lingo->define(*$ID, $begin, $argdef);
g_lingo->clearArgStack();
- g_lingo->_indef = kStateNone; }
- | tFACTORY ID { g_lingo->codeFactory(*$2); }
+ g_lingo->_indef = kStateNone;
+ delete $ID; }
+ | tFACTORY ID { g_lingo->codeFactory(*$2); delete $ID; }
| tMETHOD { g_lingo->_indef = kStateInArgs; }
begin argdef '\n' argstore stmtlist {
g_lingo->code1(LC::c_procret);
@@ -588,25 +593,27 @@ defn: tMACRO ID { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear
g_lingo->_indef = kStateNone;
g_lingo->_ignoreMe = false;
- checkEnd($ENDCLAUSE, $on->c_str(), false); }
+ checkEnd($ENDCLAUSE, $on->c_str(), false);
+ delete $on; }
| on begin argdef '\n' argstore stmtlist { // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*$on, $begin, $argdef);
g_lingo->_indef = kStateNone;
g_lingo->clearArgStack();
- g_lingo->_ignoreMe = false; }
+ g_lingo->_ignoreMe = false;
+ delete $on; }
on: tON ID { $$ = $ID; g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
argdef: /* nothing */ { $$ = 0; }
- | ID { g_lingo->codeArg($ID); $$ = 1; }
- | argdef ',' ID { g_lingo->codeArg($ID); $$ = $1 + 1; }
- | argdef '\n' ',' ID { g_lingo->codeArg($ID); $$ = $1 + 1; }
+ | ID { g_lingo->codeArg($ID); $$ = 1; delete $ID; }
+ | argdef ',' ID { g_lingo->codeArg($ID); $$ = $1 + 1; delete $ID; }
+ | argdef '\n' ',' ID { g_lingo->codeArg($ID); $$ = $1 + 1; delete $ID; }
;
endargdef: /* nothing */
- | ID
- | endargdef ',' ID
+ | ID { delete $ID; }
+ | endargdef ',' ID { delete $ID; }
;
argstore: /* nothing */ { g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
@@ -617,7 +624,8 @@ macro: ID nonemptyarglist {
g_lingo->codeString($ID->c_str());
inst numpar = 0;
WRITE_UINT32(&numpar, $nonemptyarglist);
- g_lingo->code1(numpar); }
+ g_lingo->code1(numpar);
+ delete $ID; }
;
arglist: /* nothing */ { $$ = 0; }
@@ -648,10 +656,12 @@ proplist: proppair { $$ = 1; }
proppair: SYMBOL ':' simpleexpr {
g_lingo->code1(LC::c_symbolpush);
- g_lingo->codeString($SYMBOL->c_str()); }
+ g_lingo->codeString($SYMBOL->c_str());
+ delete $SYMBOL; }
| STRING ':' simpleexpr {
g_lingo->code1(LC::c_stringpush);
- g_lingo->codeString($STRING->c_str()); }
+ g_lingo->codeString($STRING->c_str());
+ delete $STRING; }
;
Commit: cbbd4b0976ff1dfa66e381841766bd233f4d2609
https://github.com/scummvm/scummvm/commit/cbbd4b0976ff1dfa66e381841766bd233f4d2609
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:53+01:00
Commit Message:
DIRECTOR: LINGO: Replace parser header file with bison 3.5 one
Changed paths:
engines/director/lingo/lingo-gr.h
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 7c6d4c0..90f2430 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -1,14 +1,14 @@
-/* A Bison parser, made by GNU Bison 2.3. */
+/* A Bison parser, made by GNU Bison 3.5. */
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +16,7 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work
@@ -33,201 +31,122 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-/* Tokens. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
+#ifndef YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+# define YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+/* Debug traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- UNARY = 258,
- CASTREF = 259,
- VOID = 260,
- VAR = 261,
- POINT = 262,
- RECT = 263,
- ARRAY = 264,
- OBJECT = 265,
- REFERENCE = 266,
- INT = 267,
- ARGC = 268,
- ARGCNORET = 269,
- THEENTITY = 270,
- THEENTITYWITHID = 271,
- FLOAT = 272,
- BLTIN = 273,
- BLTINNOARGS = 274,
- BLTINNOARGSORONE = 275,
- BLTINONEARG = 276,
- BLTINARGLIST = 277,
- TWOWORDBUILTIN = 278,
- FBLTIN = 279,
- FBLTINNOARGS = 280,
- FBLTINONEARG = 281,
- FBLTINARGLIST = 282,
- RBLTIN = 283,
- RBLTINONEARG = 284,
- ID = 285,
- STRING = 286,
- HANDLER = 287,
- SYMBOL = 288,
- ENDCLAUSE = 289,
- tPLAYACCEL = 290,
- tMETHOD = 291,
- THEOBJECTFIELD = 292,
- tDOWN = 293,
- tELSE = 294,
- tELSIF = 295,
- tEXIT = 296,
- tGLOBAL = 297,
- tGO = 298,
- tIF = 299,
- tINTO = 300,
- tLOOP = 301,
- tMACRO = 302,
- tMOVIE = 303,
- tNEXT = 304,
- tOF = 305,
- tPREVIOUS = 306,
- tPUT = 307,
- tREPEAT = 308,
- tSET = 309,
- tTHEN = 310,
- tTO = 311,
- tWHEN = 312,
- tWITH = 313,
- tWHILE = 314,
- tNLELSE = 315,
- tFACTORY = 316,
- tOPEN = 317,
- tPLAY = 318,
- tDONE = 319,
- tINSTANCE = 320,
- tGE = 321,
- tLE = 322,
- tEQ = 323,
- tNEQ = 324,
- tAND = 325,
- tOR = 326,
- tNOT = 327,
- tMOD = 328,
- tAFTER = 329,
- tBEFORE = 330,
- tCONCAT = 331,
- tCONTAINS = 332,
- tSTARTS = 333,
- tCHAR = 334,
- tITEM = 335,
- tLINE = 336,
- tWORD = 337,
- tSPRITE = 338,
- tINTERSECTS = 339,
- tWITHIN = 340,
- tTELL = 341,
- tPROPERTY = 342,
- tON = 343,
- tENDIF = 344,
- tENDREPEAT = 345,
- tENDTELL = 346
- };
+ enum yytokentype
+ {
+ UNARY = 258,
+ CASTREF = 259,
+ VOID = 260,
+ VAR = 261,
+ POINT = 262,
+ RECT = 263,
+ ARRAY = 264,
+ OBJECT = 265,
+ REFERENCE = 266,
+ INT = 267,
+ ARGC = 268,
+ ARGCNORET = 269,
+ THEENTITY = 270,
+ THEENTITYWITHID = 271,
+ FLOAT = 272,
+ BLTIN = 273,
+ BLTINNOARGS = 274,
+ BLTINNOARGSORONE = 275,
+ BLTINONEARG = 276,
+ BLTINARGLIST = 277,
+ TWOWORDBUILTIN = 278,
+ FBLTIN = 279,
+ FBLTINNOARGS = 280,
+ FBLTINONEARG = 281,
+ FBLTINARGLIST = 282,
+ RBLTIN = 283,
+ RBLTINONEARG = 284,
+ ID = 285,
+ STRING = 286,
+ HANDLER = 287,
+ SYMBOL = 288,
+ ENDCLAUSE = 289,
+ tPLAYACCEL = 290,
+ tMETHOD = 291,
+ THEOBJECTFIELD = 292,
+ tDOWN = 293,
+ tELSE = 294,
+ tELSIF = 295,
+ tEXIT = 296,
+ tGLOBAL = 297,
+ tGO = 298,
+ tIF = 299,
+ tINTO = 300,
+ tLOOP = 301,
+ tMACRO = 302,
+ tMOVIE = 303,
+ tNEXT = 304,
+ tOF = 305,
+ tPREVIOUS = 306,
+ tPUT = 307,
+ tREPEAT = 308,
+ tSET = 309,
+ tTHEN = 310,
+ tTO = 311,
+ tWHEN = 312,
+ tWITH = 313,
+ tWHILE = 314,
+ tNLELSE = 315,
+ tFACTORY = 316,
+ tOPEN = 317,
+ tPLAY = 318,
+ tDONE = 319,
+ tINSTANCE = 320,
+ tGE = 321,
+ tLE = 322,
+ tEQ = 323,
+ tNEQ = 324,
+ tAND = 325,
+ tOR = 326,
+ tNOT = 327,
+ tMOD = 328,
+ tAFTER = 329,
+ tBEFORE = 330,
+ tCONCAT = 331,
+ tCONTAINS = 332,
+ tSTARTS = 333,
+ tCHAR = 334,
+ tITEM = 335,
+ tLINE = 336,
+ tWORD = 337,
+ tSPRITE = 338,
+ tINTERSECTS = 339,
+ tWITHIN = 340,
+ tTELL = 341,
+ tPROPERTY = 342,
+ tON = 343,
+ tENDIF = 344,
+ tENDREPEAT = 345,
+ tENDTELL = 346
+ };
#endif
-/* Tokens. */
-#define UNARY 258
-#define CASTREF 259
-#define VOID 260
-#define VAR 261
-#define POINT 262
-#define RECT 263
-#define ARRAY 264
-#define OBJECT 265
-#define REFERENCE 266
-#define INT 267
-#define ARGC 268
-#define ARGCNORET 269
-#define THEENTITY 270
-#define THEENTITYWITHID 271
-#define FLOAT 272
-#define BLTIN 273
-#define BLTINNOARGS 274
-#define BLTINNOARGSORONE 275
-#define BLTINONEARG 276
-#define BLTINARGLIST 277
-#define TWOWORDBUILTIN 278
-#define FBLTIN 279
-#define FBLTINNOARGS 280
-#define FBLTINONEARG 281
-#define FBLTINARGLIST 282
-#define RBLTIN 283
-#define RBLTINONEARG 284
-#define ID 285
-#define STRING 286
-#define HANDLER 287
-#define SYMBOL 288
-#define ENDCLAUSE 289
-#define tPLAYACCEL 290
-#define tMETHOD 291
-#define THEOBJECTFIELD 292
-#define tDOWN 293
-#define tELSE 294
-#define tELSIF 295
-#define tEXIT 296
-#define tGLOBAL 297
-#define tGO 298
-#define tIF 299
-#define tINTO 300
-#define tLOOP 301
-#define tMACRO 302
-#define tMOVIE 303
-#define tNEXT 304
-#define tOF 305
-#define tPREVIOUS 306
-#define tPUT 307
-#define tREPEAT 308
-#define tSET 309
-#define tTHEN 310
-#define tTO 311
-#define tWHEN 312
-#define tWITH 313
-#define tWHILE 314
-#define tNLELSE 315
-#define tFACTORY 316
-#define tOPEN 317
-#define tPLAY 318
-#define tDONE 319
-#define tINSTANCE 320
-#define tGE 321
-#define tLE 322
-#define tEQ 323
-#define tNEQ 324
-#define tAND 325
-#define tOR 326
-#define tNOT 327
-#define tMOD 328
-#define tAFTER 329
-#define tBEFORE 330
-#define tCONCAT 331
-#define tCONTAINS 332
-#define tSTARTS 333
-#define tCHAR 334
-#define tITEM 335
-#define tLINE 336
-#define tWORD 337
-#define tSPRITE 338
-#define tINTERSECTS 339
-#define tWITHIN 340
-#define tTELL 341
-#define tPROPERTY 342
-#define tON 343
-#define tENDIF 344
-#define tENDREPEAT 345
-#define tENDTELL 346
-
-
-
+/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 85 "engines/director/lingo/lingo-gr.y"
+union YYSTYPE
{
+#line 87 "engines/director/lingo/lingo-gr.y"
+
Common::String *s;
int i;
double f;
@@ -240,14 +159,18 @@ typedef union YYSTYPE
Common::String *s;
int e;
} objectfield;
-}
-/* Line 1529 of yacc.c. */
-#line 246 "engines/director/lingo/lingo-gr.hpp"
- YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 164 "engines/director/lingo/lingo-gr.hpp"
+
+};
+typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
#endif
+
extern YYSTYPE yylval;
+int yyparse (void);
+
+#endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED */
Commit: cf8abd20bc015573c1f7b885b0f04718e0460e9c
https://github.com/scummvm/scummvm/commit/cf8abd20bc015573c1f7b885b0f04718e0460e9c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:53+01:00
Commit Message:
DIRECTOR: LINGO: Added destructors to the discarded symbols in parser
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 28ab386..0ae6883 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -642,23 +642,23 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 134, 134, 135, 136, 139, 140, 141, 144, 150,
- 153, 154, 155, 161, 168, 174, 181, 187, 193, 201,
- 202, 203, 206, 207, 208, 209, 212, 213, 218, 229,
- 246, 258, 263, 265, 270, 280, 292, 293, 296, 304,
- 314, 327, 330, 337, 344, 352, 355, 358, 359, 360,
- 363, 369, 373, 376, 379, 383, 387, 391, 394, 395,
- 396, 399, 402, 403, 406, 414, 420, 425, 426, 427,
- 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,
- 438, 439, 440, 441, 442, 443, 444, 445, 446, 447,
- 448, 449, 450, 451, 452, 453, 454, 455, 456, 459,
- 464, 465, 466, 467, 468, 469, 470, 471, 472, 475,
- 478, 481, 485, 486, 487, 488, 491, 492, 495, 496,
- 499, 500, 511, 512, 513, 514, 518, 522, 528, 529,
- 532, 533, 537, 541, 545, 545, 575, 575, 582, 583,
- 583, 589, 598, 606, 608, 609, 610, 611, 614, 615,
- 616, 619, 622, 631, 632, 633, 636, 637, 640, 643,
- 644, 645, 646, 649, 650, 653, 654, 657, 661
+ 0, 137, 137, 138, 139, 142, 143, 144, 147, 153,
+ 156, 157, 158, 164, 171, 177, 184, 190, 196, 204,
+ 205, 206, 209, 210, 211, 212, 215, 216, 221, 232,
+ 249, 261, 266, 268, 273, 283, 295, 296, 299, 307,
+ 317, 330, 333, 340, 347, 355, 358, 361, 362, 363,
+ 366, 372, 376, 379, 382, 386, 390, 394, 397, 398,
+ 399, 402, 405, 406, 409, 417, 423, 428, 429, 430,
+ 431, 432, 433, 434, 435, 436, 437, 438, 439, 440,
+ 441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
+ 451, 452, 453, 454, 455, 456, 457, 458, 459, 462,
+ 467, 468, 469, 470, 471, 472, 473, 474, 475, 478,
+ 481, 484, 488, 489, 490, 491, 494, 495, 498, 499,
+ 502, 503, 514, 515, 516, 517, 521, 525, 531, 532,
+ 535, 536, 540, 544, 548, 548, 578, 578, 585, 586,
+ 586, 592, 601, 609, 611, 612, 613, 614, 617, 618,
+ 619, 622, 625, 634, 635, 636, 639, 640, 643, 646,
+ 647, 648, 649, 652, 653, 656, 657, 660, 664
};
#endif
@@ -1673,7 +1673,137 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
- YYUSE (yytype);
+ switch (yytype)
+ {
+ case 18: /* BLTIN */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1682 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 19: /* BLTINNOARGS */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1688 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 20: /* BLTINNOARGSORONE */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1694 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 21: /* BLTINONEARG */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1700 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 22: /* BLTINARGLIST */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1706 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 23: /* TWOWORDBUILTIN */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1712 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 24: /* FBLTIN */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1718 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 25: /* FBLTINNOARGS */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1724 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 26: /* FBLTINONEARG */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1730 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 27: /* FBLTINARGLIST */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1736 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 28: /* RBLTIN */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1742 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 29: /* RBLTINONEARG */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1748 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 30: /* ID */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1754 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 31: /* STRING */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1760 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 32: /* HANDLER */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1766 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 33: /* SYMBOL */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1772 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 34: /* ENDCLAUSE */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1778 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 35: /* tPLAYACCEL */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1784 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 36: /* tMETHOD */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1790 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 37: /* THEOBJECTFIELD */
+#line 133 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).objectfield).s; }
+#line 1796 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ case 141: /* on */
+#line 132 "engines/director/lingo/lingo-gr.y"
+ { delete ((*yyvaluep).s); }
+#line 1802 "engines/director/lingo/lingo-gr.cpp"
+ break;
+
+ default:
+ break;
+ }
YY_IGNORE_MAYBE_UNINITIALIZED_END
}
@@ -1936,55 +2066,55 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 136 "engines/director/lingo/lingo-gr.y"
+#line 139 "engines/director/lingo/lingo-gr.y"
{ yyerrok; }
-#line 1942 "engines/director/lingo/lingo-gr.cpp"
+#line 2072 "engines/director/lingo/lingo-gr.cpp"
break;
case 8:
-#line 144 "engines/director/lingo/lingo-gr.y"
+#line 147 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code);
delete (yyvsp[0].s); }
-#line 1953 "engines/director/lingo/lingo-gr.cpp"
+#line 2083 "engines/director/lingo/lingo-gr.cpp"
break;
case 9:
-#line 150 "engines/director/lingo/lingo-gr.y"
+#line 153 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code); }
-#line 1961 "engines/director/lingo/lingo-gr.cpp"
+#line 2091 "engines/director/lingo/lingo-gr.cpp"
break;
case 10:
-#line 153 "engines/director/lingo/lingo-gr.y"
+#line 156 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_after); }
-#line 1967 "engines/director/lingo/lingo-gr.cpp"
+#line 2097 "engines/director/lingo/lingo-gr.cpp"
break;
case 11:
-#line 154 "engines/director/lingo/lingo-gr.y"
+#line 157 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_before); }
-#line 1973 "engines/director/lingo/lingo-gr.cpp"
+#line 2103 "engines/director/lingo/lingo-gr.cpp"
break;
case 12:
-#line 155 "engines/director/lingo/lingo-gr.y"
+#line 158 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 1984 "engines/director/lingo/lingo-gr.cpp"
+#line 2114 "engines/director/lingo/lingo-gr.cpp"
break;
case 13:
-#line 161 "engines/director/lingo/lingo-gr.y"
+#line 164 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -1992,22 +2122,22 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 1996 "engines/director/lingo/lingo-gr.cpp"
+#line 2126 "engines/director/lingo/lingo-gr.cpp"
break;
case 14:
-#line 168 "engines/director/lingo/lingo-gr.y"
+#line 171 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2007 "engines/director/lingo/lingo-gr.cpp"
+#line 2137 "engines/director/lingo/lingo-gr.cpp"
break;
case 15:
-#line 174 "engines/director/lingo/lingo-gr.y"
+#line 177 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2015,55 +2145,55 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2019 "engines/director/lingo/lingo-gr.cpp"
+#line 2149 "engines/director/lingo/lingo-gr.cpp"
break;
case 16:
-#line 181 "engines/director/lingo/lingo-gr.y"
+#line 184 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2030 "engines/director/lingo/lingo-gr.cpp"
+#line 2160 "engines/director/lingo/lingo-gr.cpp"
break;
case 17:
-#line 187 "engines/director/lingo/lingo-gr.y"
+#line 190 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2041 "engines/director/lingo/lingo-gr.cpp"
+#line 2171 "engines/director/lingo/lingo-gr.cpp"
break;
case 18:
-#line 193 "engines/director/lingo/lingo-gr.y"
+#line 196 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldassign);
g_lingo->codeString((yyvsp[-2].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[-2].objectfield).e);
delete (yyvsp[-2].objectfield).s;
(yyval.code) = (yyvsp[0].code); }
-#line 2052 "engines/director/lingo/lingo-gr.cpp"
+#line 2182 "engines/director/lingo/lingo-gr.cpp"
break;
case 28:
-#line 218 "engines/director/lingo/lingo-gr.y"
+#line 221 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[-3].code) - (yyvsp[-5].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 2] = end; }
-#line 2063 "engines/director/lingo/lingo-gr.cpp"
+#line 2193 "engines/director/lingo/lingo-gr.cpp"
break;
case 29:
-#line 229 "engines/director/lingo/lingo-gr.y"
+#line 232 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
@@ -2076,11 +2206,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end; }
-#line 2080 "engines/director/lingo/lingo-gr.cpp"
+#line 2210 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
-#line 246 "engines/director/lingo/lingo-gr.y"
+#line 249 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2093,36 +2223,36 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end; }
-#line 2097 "engines/director/lingo/lingo-gr.cpp"
+#line 2227 "engines/director/lingo/lingo-gr.cpp"
break;
case 31:
-#line 258 "engines/director/lingo/lingo-gr.y"
+#line 261 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
g_lingo->code1(STOP);
(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
-#line 2107 "engines/director/lingo/lingo-gr.cpp"
+#line 2237 "engines/director/lingo/lingo-gr.cpp"
break;
case 32:
-#line 263 "engines/director/lingo/lingo-gr.y"
+#line 266 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented"); }
-#line 2114 "engines/director/lingo/lingo-gr.cpp"
+#line 2244 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
-#line 265 "engines/director/lingo/lingo-gr.y"
+#line 268 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
}
-#line 2122 "engines/director/lingo/lingo-gr.cpp"
+#line 2252 "engines/director/lingo/lingo-gr.cpp"
break;
case 34:
-#line 270 "engines/director/lingo/lingo-gr.y"
+#line 273 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-8].code));
@@ -2133,11 +2263,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-8].code), (yyvsp[-1].code) - (yyvsp[-8].code), 0); }
-#line 2137 "engines/director/lingo/lingo-gr.cpp"
+#line 2267 "engines/director/lingo/lingo-gr.cpp"
break;
case 35:
-#line 280 "engines/director/lingo/lingo-gr.y"
+#line 283 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-9].code) - (yyvsp[-11].code));
@@ -2148,22 +2278,22 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-11].code), (yyvsp[-1].code) - (yyvsp[-11].code), (yyvsp[-3].code) - (yyvsp[-11].code)); }
-#line 2152 "engines/director/lingo/lingo-gr.cpp"
+#line 2282 "engines/director/lingo/lingo-gr.cpp"
break;
case 38:
-#line 296 "engines/director/lingo/lingo-gr.y"
+#line 299 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[-3].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
g_lingo->codeLabel((yyvsp[-5].code)); }
-#line 2163 "engines/director/lingo/lingo-gr.cpp"
+#line 2293 "engines/director/lingo/lingo-gr.cpp"
break;
case 39:
-#line 304 "engines/director/lingo/lingo-gr.y"
+#line 307 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2174,11 +2304,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-10].code), (yyvsp[-1].code) - (yyvsp[-10].code), (yyvsp[-3].code) - (yyvsp[-10].code)); }
-#line 2178 "engines/director/lingo/lingo-gr.cpp"
+#line 2308 "engines/director/lingo/lingo-gr.cpp"
break;
case 40:
-#line 314 "engines/director/lingo/lingo-gr.y"
+#line 317 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
@@ -2189,163 +2319,163 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
-#line 2193 "engines/director/lingo/lingo-gr.cpp"
+#line 2323 "engines/director/lingo/lingo-gr.cpp"
break;
case 41:
-#line 327 "engines/director/lingo/lingo-gr.y"
+#line 330 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
-#line 2199 "engines/director/lingo/lingo-gr.cpp"
+#line 2329 "engines/director/lingo/lingo-gr.cpp"
break;
case 42:
-#line 330 "engines/director/lingo/lingo-gr.y"
+#line 333 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(LC::c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2209 "engines/director/lingo/lingo-gr.cpp"
+#line 2339 "engines/director/lingo/lingo-gr.cpp"
break;
case 43:
-#line 337 "engines/director/lingo/lingo-gr.y"
+#line 340 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(0); // Do not skip end
g_lingo->codeLabel(0); }
-#line 2219 "engines/director/lingo/lingo-gr.cpp"
+#line 2349 "engines/director/lingo/lingo-gr.cpp"
break;
case 44:
-#line 344 "engines/director/lingo/lingo-gr.y"
+#line 347 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(skipEnd); }
-#line 2230 "engines/director/lingo/lingo-gr.cpp"
+#line 2360 "engines/director/lingo/lingo-gr.cpp"
break;
case 45:
-#line 352 "engines/director/lingo/lingo-gr.y"
+#line 355 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2236 "engines/director/lingo/lingo-gr.cpp"
+#line 2366 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
-#line 355 "engines/director/lingo/lingo-gr.y"
+#line 358 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2242 "engines/director/lingo/lingo-gr.cpp"
+#line 2372 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
-#line 358 "engines/director/lingo/lingo-gr.y"
+#line 361 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2248 "engines/director/lingo/lingo-gr.cpp"
+#line 2378 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
-#line 363 "engines/director/lingo/lingo-gr.y"
+#line 366 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_whencode);
g_lingo->code1(STOP);
g_lingo->codeString((yyvsp[-1].s)->c_str());
delete (yyvsp[-1].s); }
-#line 2258 "engines/director/lingo/lingo-gr.cpp"
+#line 2388 "engines/director/lingo/lingo-gr.cpp"
break;
case 51:
-#line 369 "engines/director/lingo/lingo-gr.y"
+#line 372 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_tellcode);
g_lingo->code1(STOP); }
-#line 2266 "engines/director/lingo/lingo-gr.cpp"
+#line 2396 "engines/director/lingo/lingo-gr.cpp"
break;
case 52:
-#line 373 "engines/director/lingo/lingo-gr.y"
+#line 376 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt((yyvsp[0].i)); }
-#line 2274 "engines/director/lingo/lingo-gr.cpp"
+#line 2404 "engines/director/lingo/lingo-gr.cpp"
break;
case 53:
-#line 376 "engines/director/lingo/lingo-gr.y"
+#line 379 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_floatpush);
g_lingo->codeFloat((yyvsp[0].f)); }
-#line 2282 "engines/director/lingo/lingo-gr.cpp"
+#line 2412 "engines/director/lingo/lingo-gr.cpp"
break;
case 54:
-#line 379 "engines/director/lingo/lingo-gr.y"
+#line 382 "engines/director/lingo/lingo-gr.y"
{ // D3
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2291 "engines/director/lingo/lingo-gr.cpp"
+#line 2421 "engines/director/lingo/lingo-gr.cpp"
break;
case 55:
-#line 383 "engines/director/lingo/lingo-gr.y"
+#line 386 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2300 "engines/director/lingo/lingo-gr.cpp"
+#line 2430 "engines/director/lingo/lingo-gr.cpp"
break;
case 56:
-#line 387 "engines/director/lingo/lingo-gr.y"
+#line 390 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_eval);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2309 "engines/director/lingo/lingo-gr.cpp"
+#line 2439 "engines/director/lingo/lingo-gr.cpp"
break;
case 58:
-#line 394 "engines/director/lingo/lingo-gr.y"
+#line 397 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2315 "engines/director/lingo/lingo-gr.cpp"
+#line 2445 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
-#line 396 "engines/director/lingo/lingo-gr.y"
+#line 399 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2323 "engines/director/lingo/lingo-gr.cpp"
+#line 2453 "engines/director/lingo/lingo-gr.cpp"
break;
case 61:
-#line 399 "engines/director/lingo/lingo-gr.y"
+#line 402 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2331 "engines/director/lingo/lingo-gr.cpp"
+#line 2461 "engines/director/lingo/lingo-gr.cpp"
break;
case 62:
-#line 402 "engines/director/lingo/lingo-gr.y"
+#line 405 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
-#line 2337 "engines/director/lingo/lingo-gr.cpp"
+#line 2467 "engines/director/lingo/lingo-gr.cpp"
break;
case 63:
-#line 403 "engines/director/lingo/lingo-gr.y"
+#line 406 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2345 "engines/director/lingo/lingo-gr.cpp"
+#line 2475 "engines/director/lingo/lingo-gr.cpp"
break;
case 64:
-#line 406 "engines/director/lingo/lingo-gr.y"
+#line 409 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2354,468 +2484,468 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[0].e)[0]);
WRITE_UINT32(&f, (yyvsp[0].e)[1]);
g_lingo->code2(e, f); }
-#line 2358 "engines/director/lingo/lingo-gr.cpp"
+#line 2488 "engines/director/lingo/lingo-gr.cpp"
break;
case 65:
-#line 414 "engines/director/lingo/lingo-gr.y"
+#line 417 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
g_lingo->code2(e, f); }
-#line 2369 "engines/director/lingo/lingo-gr.cpp"
+#line 2499 "engines/director/lingo/lingo-gr.cpp"
break;
case 66:
-#line 420 "engines/director/lingo/lingo-gr.y"
+#line 423 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldpush);
g_lingo->codeString((yyvsp[0].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[0].objectfield).e);
delete (yyvsp[0].objectfield).s; }
-#line 2379 "engines/director/lingo/lingo-gr.cpp"
+#line 2509 "engines/director/lingo/lingo-gr.cpp"
break;
case 68:
-#line 426 "engines/director/lingo/lingo-gr.y"
+#line 429 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_add); }
-#line 2385 "engines/director/lingo/lingo-gr.cpp"
+#line 2515 "engines/director/lingo/lingo-gr.cpp"
break;
case 69:
-#line 427 "engines/director/lingo/lingo-gr.y"
+#line 430 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_sub); }
-#line 2391 "engines/director/lingo/lingo-gr.cpp"
+#line 2521 "engines/director/lingo/lingo-gr.cpp"
break;
case 70:
-#line 428 "engines/director/lingo/lingo-gr.y"
+#line 431 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mul); }
-#line 2397 "engines/director/lingo/lingo-gr.cpp"
+#line 2527 "engines/director/lingo/lingo-gr.cpp"
break;
case 71:
-#line 429 "engines/director/lingo/lingo-gr.y"
+#line 432 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_div); }
-#line 2403 "engines/director/lingo/lingo-gr.cpp"
+#line 2533 "engines/director/lingo/lingo-gr.cpp"
break;
case 72:
-#line 430 "engines/director/lingo/lingo-gr.y"
+#line 433 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mod); }
-#line 2409 "engines/director/lingo/lingo-gr.cpp"
+#line 2539 "engines/director/lingo/lingo-gr.cpp"
break;
case 73:
-#line 431 "engines/director/lingo/lingo-gr.y"
+#line 434 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gt); }
-#line 2415 "engines/director/lingo/lingo-gr.cpp"
+#line 2545 "engines/director/lingo/lingo-gr.cpp"
break;
case 74:
-#line 432 "engines/director/lingo/lingo-gr.y"
+#line 435 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lt); }
-#line 2421 "engines/director/lingo/lingo-gr.cpp"
+#line 2551 "engines/director/lingo/lingo-gr.cpp"
break;
case 75:
-#line 433 "engines/director/lingo/lingo-gr.y"
+#line 436 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_eq); }
-#line 2427 "engines/director/lingo/lingo-gr.cpp"
+#line 2557 "engines/director/lingo/lingo-gr.cpp"
break;
case 76:
-#line 434 "engines/director/lingo/lingo-gr.y"
+#line 437 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_neq); }
-#line 2433 "engines/director/lingo/lingo-gr.cpp"
+#line 2563 "engines/director/lingo/lingo-gr.cpp"
break;
case 77:
-#line 435 "engines/director/lingo/lingo-gr.y"
+#line 438 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ge); }
-#line 2439 "engines/director/lingo/lingo-gr.cpp"
+#line 2569 "engines/director/lingo/lingo-gr.cpp"
break;
case 78:
-#line 436 "engines/director/lingo/lingo-gr.y"
+#line 439 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_le); }
-#line 2445 "engines/director/lingo/lingo-gr.cpp"
+#line 2575 "engines/director/lingo/lingo-gr.cpp"
break;
case 79:
-#line 437 "engines/director/lingo/lingo-gr.y"
+#line 440 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_and); }
-#line 2451 "engines/director/lingo/lingo-gr.cpp"
+#line 2581 "engines/director/lingo/lingo-gr.cpp"
break;
case 80:
-#line 438 "engines/director/lingo/lingo-gr.y"
+#line 441 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_or); }
-#line 2457 "engines/director/lingo/lingo-gr.cpp"
+#line 2587 "engines/director/lingo/lingo-gr.cpp"
break;
case 81:
-#line 439 "engines/director/lingo/lingo-gr.y"
+#line 442 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_not); }
-#line 2463 "engines/director/lingo/lingo-gr.cpp"
+#line 2593 "engines/director/lingo/lingo-gr.cpp"
break;
case 82:
-#line 440 "engines/director/lingo/lingo-gr.y"
+#line 443 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ampersand); }
-#line 2469 "engines/director/lingo/lingo-gr.cpp"
+#line 2599 "engines/director/lingo/lingo-gr.cpp"
break;
case 83:
-#line 441 "engines/director/lingo/lingo-gr.y"
+#line 444 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_concat); }
-#line 2475 "engines/director/lingo/lingo-gr.cpp"
+#line 2605 "engines/director/lingo/lingo-gr.cpp"
break;
case 84:
-#line 442 "engines/director/lingo/lingo-gr.y"
+#line 445 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_contains); }
-#line 2481 "engines/director/lingo/lingo-gr.cpp"
+#line 2611 "engines/director/lingo/lingo-gr.cpp"
break;
case 85:
-#line 443 "engines/director/lingo/lingo-gr.y"
+#line 446 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_starts); }
-#line 2487 "engines/director/lingo/lingo-gr.cpp"
+#line 2617 "engines/director/lingo/lingo-gr.cpp"
break;
case 86:
-#line 444 "engines/director/lingo/lingo-gr.y"
+#line 447 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2493 "engines/director/lingo/lingo-gr.cpp"
+#line 2623 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
-#line 445 "engines/director/lingo/lingo-gr.y"
+#line 448 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
-#line 2499 "engines/director/lingo/lingo-gr.cpp"
+#line 2629 "engines/director/lingo/lingo-gr.cpp"
break;
case 88:
-#line 446 "engines/director/lingo/lingo-gr.y"
+#line 449 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2505 "engines/director/lingo/lingo-gr.cpp"
+#line 2635 "engines/director/lingo/lingo-gr.cpp"
break;
case 89:
-#line 447 "engines/director/lingo/lingo-gr.y"
+#line 450 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_intersects); }
-#line 2511 "engines/director/lingo/lingo-gr.cpp"
+#line 2641 "engines/director/lingo/lingo-gr.cpp"
break;
case 90:
-#line 448 "engines/director/lingo/lingo-gr.y"
+#line 451 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_within); }
-#line 2517 "engines/director/lingo/lingo-gr.cpp"
+#line 2647 "engines/director/lingo/lingo-gr.cpp"
break;
case 91:
-#line 449 "engines/director/lingo/lingo-gr.y"
+#line 452 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charOf); }
-#line 2523 "engines/director/lingo/lingo-gr.cpp"
+#line 2653 "engines/director/lingo/lingo-gr.cpp"
break;
case 92:
-#line 450 "engines/director/lingo/lingo-gr.y"
+#line 453 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charToOf); }
-#line 2529 "engines/director/lingo/lingo-gr.cpp"
+#line 2659 "engines/director/lingo/lingo-gr.cpp"
break;
case 93:
-#line 451 "engines/director/lingo/lingo-gr.y"
+#line 454 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemOf); }
-#line 2535 "engines/director/lingo/lingo-gr.cpp"
+#line 2665 "engines/director/lingo/lingo-gr.cpp"
break;
case 94:
-#line 452 "engines/director/lingo/lingo-gr.y"
+#line 455 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemToOf); }
-#line 2541 "engines/director/lingo/lingo-gr.cpp"
+#line 2671 "engines/director/lingo/lingo-gr.cpp"
break;
case 95:
-#line 453 "engines/director/lingo/lingo-gr.y"
+#line 456 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineOf); }
-#line 2547 "engines/director/lingo/lingo-gr.cpp"
+#line 2677 "engines/director/lingo/lingo-gr.cpp"
break;
case 96:
-#line 454 "engines/director/lingo/lingo-gr.y"
+#line 457 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineToOf); }
-#line 2553 "engines/director/lingo/lingo-gr.cpp"
+#line 2683 "engines/director/lingo/lingo-gr.cpp"
break;
case 97:
-#line 455 "engines/director/lingo/lingo-gr.y"
+#line 458 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordOf); }
-#line 2559 "engines/director/lingo/lingo-gr.cpp"
+#line 2689 "engines/director/lingo/lingo-gr.cpp"
break;
case 98:
-#line 456 "engines/director/lingo/lingo-gr.y"
+#line 459 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordToOf); }
-#line 2565 "engines/director/lingo/lingo-gr.cpp"
+#line 2695 "engines/director/lingo/lingo-gr.cpp"
break;
case 99:
-#line 459 "engines/director/lingo/lingo-gr.y"
+#line 462 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2573 "engines/director/lingo/lingo-gr.cpp"
+#line 2703 "engines/director/lingo/lingo-gr.cpp"
break;
case 100:
-#line 464 "engines/director/lingo/lingo-gr.y"
+#line 467 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); }
-#line 2579 "engines/director/lingo/lingo-gr.cpp"
+#line 2709 "engines/director/lingo/lingo-gr.cpp"
break;
case 103:
-#line 467 "engines/director/lingo/lingo-gr.y"
+#line 470 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); }
-#line 2585 "engines/director/lingo/lingo-gr.cpp"
+#line 2715 "engines/director/lingo/lingo-gr.cpp"
break;
case 104:
-#line 468 "engines/director/lingo/lingo-gr.y"
+#line 471 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); }
-#line 2591 "engines/director/lingo/lingo-gr.cpp"
+#line 2721 "engines/director/lingo/lingo-gr.cpp"
break;
case 108:
-#line 472 "engines/director/lingo/lingo-gr.y"
+#line 475 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2599 "engines/director/lingo/lingo-gr.cpp"
+#line 2729 "engines/director/lingo/lingo-gr.cpp"
break;
case 109:
-#line 475 "engines/director/lingo/lingo-gr.y"
+#line 478 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2607 "engines/director/lingo/lingo-gr.cpp"
+#line 2737 "engines/director/lingo/lingo-gr.cpp"
break;
case 110:
-#line 478 "engines/director/lingo/lingo-gr.y"
+#line 481 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2615 "engines/director/lingo/lingo-gr.cpp"
+#line 2745 "engines/director/lingo/lingo-gr.cpp"
break;
case 111:
-#line 481 "engines/director/lingo/lingo-gr.y"
+#line 484 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_voidpush);
g_lingo->codeFunc((yyvsp[0].s), 1);
delete (yyvsp[0].s); }
-#line 2624 "engines/director/lingo/lingo-gr.cpp"
+#line 2754 "engines/director/lingo/lingo-gr.cpp"
break;
case 112:
-#line 485 "engines/director/lingo/lingo-gr.y"
+#line 488 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
-#line 2630 "engines/director/lingo/lingo-gr.cpp"
+#line 2760 "engines/director/lingo/lingo-gr.cpp"
break;
case 113:
-#line 486 "engines/director/lingo/lingo-gr.y"
+#line 489 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); }
-#line 2636 "engines/director/lingo/lingo-gr.cpp"
+#line 2766 "engines/director/lingo/lingo-gr.cpp"
break;
case 114:
-#line 487 "engines/director/lingo/lingo-gr.y"
+#line 490 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); }
-#line 2642 "engines/director/lingo/lingo-gr.cpp"
+#line 2772 "engines/director/lingo/lingo-gr.cpp"
break;
case 115:
-#line 488 "engines/director/lingo/lingo-gr.y"
+#line 491 "engines/director/lingo/lingo-gr.y"
{ Common::String s(*(yyvsp[-2].s)); s += '-'; s += *(yyvsp[-1].s); g_lingo->codeFunc(&s, (yyvsp[0].narg)); delete (yyvsp[-1].s); }
-#line 2648 "engines/director/lingo/lingo-gr.cpp"
+#line 2778 "engines/director/lingo/lingo-gr.cpp"
break;
case 116:
-#line 491 "engines/director/lingo/lingo-gr.y"
+#line 494 "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 2654 "engines/director/lingo/lingo-gr.cpp"
+#line 2784 "engines/director/lingo/lingo-gr.cpp"
break;
case 117:
-#line 492 "engines/director/lingo/lingo-gr.y"
+#line 495 "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 2660 "engines/director/lingo/lingo-gr.cpp"
+#line 2790 "engines/director/lingo/lingo-gr.cpp"
break;
case 118:
-#line 495 "engines/director/lingo/lingo-gr.y"
+#line 498 "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 2666 "engines/director/lingo/lingo-gr.cpp"
+#line 2796 "engines/director/lingo/lingo-gr.cpp"
break;
case 119:
-#line 496 "engines/director/lingo/lingo-gr.y"
+#line 499 "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 2672 "engines/director/lingo/lingo-gr.cpp"
+#line 2802 "engines/director/lingo/lingo-gr.cpp"
break;
case 120:
-#line 499 "engines/director/lingo/lingo-gr.y"
+#line 502 "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 2678 "engines/director/lingo/lingo-gr.cpp"
+#line 2808 "engines/director/lingo/lingo-gr.cpp"
break;
case 121:
-#line 500 "engines/director/lingo/lingo-gr.y"
+#line 503 "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 2684 "engines/director/lingo/lingo-gr.cpp"
+#line 2814 "engines/director/lingo/lingo-gr.cpp"
break;
case 122:
-#line 511 "engines/director/lingo/lingo-gr.y"
+#line 514 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
-#line 2690 "engines/director/lingo/lingo-gr.cpp"
+#line 2820 "engines/director/lingo/lingo-gr.cpp"
break;
case 123:
-#line 512 "engines/director/lingo/lingo-gr.y"
+#line 515 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
-#line 2696 "engines/director/lingo/lingo-gr.cpp"
+#line 2826 "engines/director/lingo/lingo-gr.cpp"
break;
case 124:
-#line 513 "engines/director/lingo/lingo-gr.y"
+#line 516 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
-#line 2702 "engines/director/lingo/lingo-gr.cpp"
+#line 2832 "engines/director/lingo/lingo-gr.cpp"
break;
case 125:
-#line 514 "engines/director/lingo/lingo-gr.y"
+#line 517 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); }
-#line 2711 "engines/director/lingo/lingo-gr.cpp"
+#line 2841 "engines/director/lingo/lingo-gr.cpp"
break;
case 126:
-#line 518 "engines/director/lingo/lingo-gr.y"
+#line 521 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); }
-#line 2720 "engines/director/lingo/lingo-gr.cpp"
+#line 2850 "engines/director/lingo/lingo-gr.cpp"
break;
case 127:
-#line 522 "engines/director/lingo/lingo-gr.y"
+#line 525 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); }
-#line 2729 "engines/director/lingo/lingo-gr.cpp"
+#line 2859 "engines/director/lingo/lingo-gr.cpp"
break;
case 130:
-#line 532 "engines/director/lingo/lingo-gr.y"
+#line 535 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); }
-#line 2735 "engines/director/lingo/lingo-gr.cpp"
+#line 2865 "engines/director/lingo/lingo-gr.cpp"
break;
case 131:
-#line 533 "engines/director/lingo/lingo-gr.y"
+#line 536 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); }
-#line 2744 "engines/director/lingo/lingo-gr.cpp"
+#line 2874 "engines/director/lingo/lingo-gr.cpp"
break;
case 132:
-#line 537 "engines/director/lingo/lingo-gr.y"
+#line 540 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); }
-#line 2753 "engines/director/lingo/lingo-gr.cpp"
+#line 2883 "engines/director/lingo/lingo-gr.cpp"
break;
case 133:
-#line 541 "engines/director/lingo/lingo-gr.y"
+#line 544 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); }
-#line 2762 "engines/director/lingo/lingo-gr.cpp"
+#line 2892 "engines/director/lingo/lingo-gr.cpp"
break;
case 134:
-#line 545 "engines/director/lingo/lingo-gr.y"
+#line 548 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
-#line 2768 "engines/director/lingo/lingo-gr.cpp"
+#line 2898 "engines/director/lingo/lingo-gr.cpp"
break;
case 135:
-#line 545 "engines/director/lingo/lingo-gr.y"
+#line 548 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg)); }
-#line 2776 "engines/director/lingo/lingo-gr.cpp"
+#line 2906 "engines/director/lingo/lingo-gr.cpp"
break;
case 136:
-#line 575 "engines/director/lingo/lingo-gr.y"
+#line 578 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
-#line 2782 "engines/director/lingo/lingo-gr.cpp"
+#line 2912 "engines/director/lingo/lingo-gr.cpp"
break;
case 137:
-#line 576 "engines/director/lingo/lingo-gr.y"
+#line 579 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2793 "engines/director/lingo/lingo-gr.cpp"
+#line 2923 "engines/director/lingo/lingo-gr.cpp"
break;
case 138:
-#line 582 "engines/director/lingo/lingo-gr.y"
+#line 585 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
-#line 2799 "engines/director/lingo/lingo-gr.cpp"
+#line 2929 "engines/director/lingo/lingo-gr.cpp"
break;
case 139:
-#line 583 "engines/director/lingo/lingo-gr.y"
+#line 586 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2805 "engines/director/lingo/lingo-gr.cpp"
+#line 2935 "engines/director/lingo/lingo-gr.cpp"
break;
case 140:
-#line 584 "engines/director/lingo/lingo-gr.y"
+#line 587 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone; }
-#line 2815 "engines/director/lingo/lingo-gr.cpp"
+#line 2945 "engines/director/lingo/lingo-gr.cpp"
break;
case 141:
-#line 589 "engines/director/lingo/lingo-gr.y"
+#line 592 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-7].s), (yyvsp[-6].code), (yyvsp[-5].narg));
@@ -2825,11 +2955,11 @@ yyreduce:
checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false);
delete (yyvsp[-7].s); }
-#line 2829 "engines/director/lingo/lingo-gr.cpp"
+#line 2959 "engines/director/lingo/lingo-gr.cpp"
break;
case 142:
-#line 598 "engines/director/lingo/lingo-gr.y"
+#line 601 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
@@ -2837,59 +2967,59 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_ignoreMe = false;
delete (yyvsp[-5].s); }
-#line 2841 "engines/director/lingo/lingo-gr.cpp"
+#line 2971 "engines/director/lingo/lingo-gr.cpp"
break;
case 143:
-#line 606 "engines/director/lingo/lingo-gr.y"
+#line 609 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
-#line 2847 "engines/director/lingo/lingo-gr.cpp"
+#line 2977 "engines/director/lingo/lingo-gr.cpp"
break;
case 144:
-#line 608 "engines/director/lingo/lingo-gr.y"
+#line 611 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2853 "engines/director/lingo/lingo-gr.cpp"
+#line 2983 "engines/director/lingo/lingo-gr.cpp"
break;
case 145:
-#line 609 "engines/director/lingo/lingo-gr.y"
+#line 612 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
-#line 2859 "engines/director/lingo/lingo-gr.cpp"
+#line 2989 "engines/director/lingo/lingo-gr.cpp"
break;
case 146:
-#line 610 "engines/director/lingo/lingo-gr.y"
+#line 613 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
-#line 2865 "engines/director/lingo/lingo-gr.cpp"
+#line 2995 "engines/director/lingo/lingo-gr.cpp"
break;
case 147:
-#line 611 "engines/director/lingo/lingo-gr.y"
+#line 614 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
-#line 2871 "engines/director/lingo/lingo-gr.cpp"
+#line 3001 "engines/director/lingo/lingo-gr.cpp"
break;
case 149:
-#line 615 "engines/director/lingo/lingo-gr.y"
+#line 618 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 2877 "engines/director/lingo/lingo-gr.cpp"
+#line 3007 "engines/director/lingo/lingo-gr.cpp"
break;
case 150:
-#line 616 "engines/director/lingo/lingo-gr.y"
+#line 619 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 2883 "engines/director/lingo/lingo-gr.cpp"
+#line 3013 "engines/director/lingo/lingo-gr.cpp"
break;
case 151:
-#line 619 "engines/director/lingo/lingo-gr.y"
+#line 622 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
-#line 2889 "engines/director/lingo/lingo-gr.cpp"
+#line 3019 "engines/director/lingo/lingo-gr.cpp"
break;
case 152:
-#line 622 "engines/director/lingo/lingo-gr.y"
+#line 625 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
g_lingo->codeString((yyvsp[-1].s)->c_str());
@@ -2897,113 +3027,113 @@ yyreduce:
WRITE_UINT32(&numpar, (yyvsp[0].narg));
g_lingo->code1(numpar);
delete (yyvsp[-1].s); }
-#line 2901 "engines/director/lingo/lingo-gr.cpp"
+#line 3031 "engines/director/lingo/lingo-gr.cpp"
break;
case 153:
-#line 631 "engines/director/lingo/lingo-gr.y"
+#line 634 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2907 "engines/director/lingo/lingo-gr.cpp"
+#line 3037 "engines/director/lingo/lingo-gr.cpp"
break;
case 154:
-#line 632 "engines/director/lingo/lingo-gr.y"
+#line 635 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2913 "engines/director/lingo/lingo-gr.cpp"
+#line 3043 "engines/director/lingo/lingo-gr.cpp"
break;
case 155:
-#line 633 "engines/director/lingo/lingo-gr.y"
+#line 636 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2919 "engines/director/lingo/lingo-gr.cpp"
+#line 3049 "engines/director/lingo/lingo-gr.cpp"
break;
case 156:
-#line 636 "engines/director/lingo/lingo-gr.y"
+#line 639 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2925 "engines/director/lingo/lingo-gr.cpp"
+#line 3055 "engines/director/lingo/lingo-gr.cpp"
break;
case 157:
-#line 637 "engines/director/lingo/lingo-gr.y"
+#line 640 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2931 "engines/director/lingo/lingo-gr.cpp"
+#line 3061 "engines/director/lingo/lingo-gr.cpp"
break;
case 158:
-#line 640 "engines/director/lingo/lingo-gr.y"
+#line 643 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2937 "engines/director/lingo/lingo-gr.cpp"
+#line 3067 "engines/director/lingo/lingo-gr.cpp"
break;
case 159:
-#line 643 "engines/director/lingo/lingo-gr.y"
+#line 646 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
-#line 2943 "engines/director/lingo/lingo-gr.cpp"
+#line 3073 "engines/director/lingo/lingo-gr.cpp"
break;
case 160:
-#line 644 "engines/director/lingo/lingo-gr.y"
+#line 647 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
-#line 2949 "engines/director/lingo/lingo-gr.cpp"
+#line 3079 "engines/director/lingo/lingo-gr.cpp"
break;
case 161:
-#line 645 "engines/director/lingo/lingo-gr.y"
+#line 648 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 2955 "engines/director/lingo/lingo-gr.cpp"
+#line 3085 "engines/director/lingo/lingo-gr.cpp"
break;
case 162:
-#line 646 "engines/director/lingo/lingo-gr.y"
+#line 649 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 2961 "engines/director/lingo/lingo-gr.cpp"
+#line 3091 "engines/director/lingo/lingo-gr.cpp"
break;
case 163:
-#line 649 "engines/director/lingo/lingo-gr.y"
+#line 652 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2967 "engines/director/lingo/lingo-gr.cpp"
+#line 3097 "engines/director/lingo/lingo-gr.cpp"
break;
case 164:
-#line 650 "engines/director/lingo/lingo-gr.y"
+#line 653 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2973 "engines/director/lingo/lingo-gr.cpp"
+#line 3103 "engines/director/lingo/lingo-gr.cpp"
break;
case 165:
-#line 653 "engines/director/lingo/lingo-gr.y"
+#line 656 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 2979 "engines/director/lingo/lingo-gr.cpp"
+#line 3109 "engines/director/lingo/lingo-gr.cpp"
break;
case 166:
-#line 654 "engines/director/lingo/lingo-gr.y"
+#line 657 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 2985 "engines/director/lingo/lingo-gr.cpp"
+#line 3115 "engines/director/lingo/lingo-gr.cpp"
break;
case 167:
-#line 657 "engines/director/lingo/lingo-gr.y"
+#line 660 "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 2994 "engines/director/lingo/lingo-gr.cpp"
+#line 3124 "engines/director/lingo/lingo-gr.cpp"
break;
case 168:
-#line 661 "engines/director/lingo/lingo-gr.y"
+#line 664 "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 3003 "engines/director/lingo/lingo-gr.cpp"
+#line 3133 "engines/director/lingo/lingo-gr.cpp"
break;
-#line 3007 "engines/director/lingo/lingo-gr.cpp"
+#line 3137 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
@@ -3235,5 +3365,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 668 "engines/director/lingo/lingo-gr.y"
+#line 671 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 438345a..d6161d4 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -129,6 +129,9 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%left '*' '/' '%' tMOD
%right UNARY
+%destructor { delete $$; } <s>
+%destructor { delete $$.s; } <objectfield>
+
%%
program: program '\n' programline
Commit: 3d4bffe784fe7720f77dc96cb07867a61454b231
https://github.com/scummvm/scummvm/commit/3d4bffe784fe7720f77dc96cb07867a61454b231
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T17:41:53+01:00
Commit Message:
DIRECTOR: LINGO: Plugged more memory leaks in parser
Changed paths:
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.h
engines/director/lingo/lingo-gr.y
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 0ae6883..8cce417 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -94,12 +94,10 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
yyerror(err.c_str());
}
}
-
- delete token;
}
-#line 103 "engines/director/lingo/lingo-gr.cpp"
+#line 101 "engines/director/lingo/lingo-gr.cpp"
# ifndef YY_CAST
# ifdef __cplusplus
@@ -243,7 +241,7 @@ extern int yydebug;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
{
-#line 87 "engines/director/lingo/lingo-gr.y"
+#line 85 "engines/director/lingo/lingo-gr.y"
Common::String *s;
int i;
@@ -258,7 +256,7 @@ union YYSTYPE
int e;
} objectfield;
-#line 262 "engines/director/lingo/lingo-gr.cpp"
+#line 260 "engines/director/lingo/lingo-gr.cpp"
};
typedef union YYSTYPE YYSTYPE;
@@ -642,23 +640,23 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 137, 137, 138, 139, 142, 143, 144, 147, 153,
- 156, 157, 158, 164, 171, 177, 184, 190, 196, 204,
- 205, 206, 209, 210, 211, 212, 215, 216, 221, 232,
- 249, 261, 266, 268, 273, 283, 295, 296, 299, 307,
- 317, 330, 333, 340, 347, 355, 358, 361, 362, 363,
- 366, 372, 376, 379, 382, 386, 390, 394, 397, 398,
- 399, 402, 405, 406, 409, 417, 423, 428, 429, 430,
- 431, 432, 433, 434, 435, 436, 437, 438, 439, 440,
- 441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
- 451, 452, 453, 454, 455, 456, 457, 458, 459, 462,
- 467, 468, 469, 470, 471, 472, 473, 474, 475, 478,
- 481, 484, 488, 489, 490, 491, 494, 495, 498, 499,
- 502, 503, 514, 515, 516, 517, 521, 525, 531, 532,
- 535, 536, 540, 544, 548, 548, 578, 578, 585, 586,
- 586, 592, 601, 609, 611, 612, 613, 614, 617, 618,
- 619, 622, 625, 634, 635, 636, 639, 640, 643, 646,
- 647, 648, 649, 652, 653, 656, 657, 660, 664
+ 0, 135, 135, 136, 137, 140, 141, 142, 145, 151,
+ 154, 155, 156, 162, 169, 175, 182, 188, 194, 202,
+ 203, 204, 207, 208, 209, 210, 213, 214, 219, 230,
+ 247, 259, 264, 266, 271, 281, 293, 294, 297, 305,
+ 315, 328, 331, 338, 345, 353, 356, 359, 360, 361,
+ 364, 370, 374, 377, 380, 384, 388, 392, 395, 396,
+ 397, 400, 403, 405, 408, 416, 422, 427, 428, 429,
+ 430, 431, 432, 433, 434, 435, 436, 437, 438, 439,
+ 440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
+ 450, 451, 452, 453, 454, 455, 456, 457, 458, 461,
+ 466, 467, 468, 469, 470, 471, 472, 473, 474, 477,
+ 480, 483, 487, 489, 490, 491, 499, 500, 503, 504,
+ 507, 508, 519, 520, 521, 522, 526, 530, 536, 537,
+ 540, 541, 545, 549, 553, 553, 584, 584, 591, 592,
+ 592, 599, 609, 617, 619, 620, 621, 622, 625, 626,
+ 627, 630, 633, 642, 643, 644, 647, 648, 651, 654,
+ 655, 656, 657, 660, 661, 664, 665, 668, 672
};
#endif
@@ -1676,129 +1674,129 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
switch (yytype)
{
case 18: /* BLTIN */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1682 "engines/director/lingo/lingo-gr.cpp"
+#line 1680 "engines/director/lingo/lingo-gr.cpp"
break;
case 19: /* BLTINNOARGS */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1688 "engines/director/lingo/lingo-gr.cpp"
+#line 1686 "engines/director/lingo/lingo-gr.cpp"
break;
case 20: /* BLTINNOARGSORONE */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1694 "engines/director/lingo/lingo-gr.cpp"
+#line 1692 "engines/director/lingo/lingo-gr.cpp"
break;
case 21: /* BLTINONEARG */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1700 "engines/director/lingo/lingo-gr.cpp"
+#line 1698 "engines/director/lingo/lingo-gr.cpp"
break;
case 22: /* BLTINARGLIST */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1706 "engines/director/lingo/lingo-gr.cpp"
+#line 1704 "engines/director/lingo/lingo-gr.cpp"
break;
case 23: /* TWOWORDBUILTIN */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1712 "engines/director/lingo/lingo-gr.cpp"
+#line 1710 "engines/director/lingo/lingo-gr.cpp"
break;
case 24: /* FBLTIN */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1718 "engines/director/lingo/lingo-gr.cpp"
+#line 1716 "engines/director/lingo/lingo-gr.cpp"
break;
case 25: /* FBLTINNOARGS */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1724 "engines/director/lingo/lingo-gr.cpp"
+#line 1722 "engines/director/lingo/lingo-gr.cpp"
break;
case 26: /* FBLTINONEARG */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1730 "engines/director/lingo/lingo-gr.cpp"
+#line 1728 "engines/director/lingo/lingo-gr.cpp"
break;
case 27: /* FBLTINARGLIST */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1736 "engines/director/lingo/lingo-gr.cpp"
+#line 1734 "engines/director/lingo/lingo-gr.cpp"
break;
case 28: /* RBLTIN */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1742 "engines/director/lingo/lingo-gr.cpp"
+#line 1740 "engines/director/lingo/lingo-gr.cpp"
break;
case 29: /* RBLTINONEARG */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1748 "engines/director/lingo/lingo-gr.cpp"
+#line 1746 "engines/director/lingo/lingo-gr.cpp"
break;
case 30: /* ID */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1754 "engines/director/lingo/lingo-gr.cpp"
+#line 1752 "engines/director/lingo/lingo-gr.cpp"
break;
case 31: /* STRING */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1760 "engines/director/lingo/lingo-gr.cpp"
+#line 1758 "engines/director/lingo/lingo-gr.cpp"
break;
case 32: /* HANDLER */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1766 "engines/director/lingo/lingo-gr.cpp"
+#line 1764 "engines/director/lingo/lingo-gr.cpp"
break;
case 33: /* SYMBOL */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1772 "engines/director/lingo/lingo-gr.cpp"
+#line 1770 "engines/director/lingo/lingo-gr.cpp"
break;
case 34: /* ENDCLAUSE */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1778 "engines/director/lingo/lingo-gr.cpp"
+#line 1776 "engines/director/lingo/lingo-gr.cpp"
break;
case 35: /* tPLAYACCEL */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1784 "engines/director/lingo/lingo-gr.cpp"
+#line 1782 "engines/director/lingo/lingo-gr.cpp"
break;
case 36: /* tMETHOD */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1790 "engines/director/lingo/lingo-gr.cpp"
+#line 1788 "engines/director/lingo/lingo-gr.cpp"
break;
case 37: /* THEOBJECTFIELD */
-#line 133 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).objectfield).s; }
-#line 1796 "engines/director/lingo/lingo-gr.cpp"
+#line 1794 "engines/director/lingo/lingo-gr.cpp"
break;
case 141: /* on */
-#line 132 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1802 "engines/director/lingo/lingo-gr.cpp"
+#line 1800 "engines/director/lingo/lingo-gr.cpp"
break;
default:
@@ -2066,55 +2064,55 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 139 "engines/director/lingo/lingo-gr.y"
+#line 137 "engines/director/lingo/lingo-gr.y"
{ yyerrok; }
-#line 2072 "engines/director/lingo/lingo-gr.cpp"
+#line 2070 "engines/director/lingo/lingo-gr.cpp"
break;
case 8:
-#line 147 "engines/director/lingo/lingo-gr.y"
+#line 145 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code);
delete (yyvsp[0].s); }
-#line 2083 "engines/director/lingo/lingo-gr.cpp"
+#line 2081 "engines/director/lingo/lingo-gr.cpp"
break;
case 9:
-#line 153 "engines/director/lingo/lingo-gr.y"
+#line 151 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code); }
-#line 2091 "engines/director/lingo/lingo-gr.cpp"
+#line 2089 "engines/director/lingo/lingo-gr.cpp"
break;
case 10:
-#line 156 "engines/director/lingo/lingo-gr.y"
+#line 154 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_after); }
-#line 2097 "engines/director/lingo/lingo-gr.cpp"
+#line 2095 "engines/director/lingo/lingo-gr.cpp"
break;
case 11:
-#line 157 "engines/director/lingo/lingo-gr.y"
+#line 155 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_before); }
-#line 2103 "engines/director/lingo/lingo-gr.cpp"
+#line 2101 "engines/director/lingo/lingo-gr.cpp"
break;
case 12:
-#line 158 "engines/director/lingo/lingo-gr.y"
+#line 156 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2114 "engines/director/lingo/lingo-gr.cpp"
+#line 2112 "engines/director/lingo/lingo-gr.cpp"
break;
case 13:
-#line 164 "engines/director/lingo/lingo-gr.y"
+#line 162 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2122,22 +2120,22 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2126 "engines/director/lingo/lingo-gr.cpp"
+#line 2124 "engines/director/lingo/lingo-gr.cpp"
break;
case 14:
-#line 171 "engines/director/lingo/lingo-gr.y"
+#line 169 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2137 "engines/director/lingo/lingo-gr.cpp"
+#line 2135 "engines/director/lingo/lingo-gr.cpp"
break;
case 15:
-#line 177 "engines/director/lingo/lingo-gr.y"
+#line 175 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2145,55 +2143,55 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2149 "engines/director/lingo/lingo-gr.cpp"
+#line 2147 "engines/director/lingo/lingo-gr.cpp"
break;
case 16:
-#line 184 "engines/director/lingo/lingo-gr.y"
+#line 182 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2160 "engines/director/lingo/lingo-gr.cpp"
+#line 2158 "engines/director/lingo/lingo-gr.cpp"
break;
case 17:
-#line 190 "engines/director/lingo/lingo-gr.y"
+#line 188 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2171 "engines/director/lingo/lingo-gr.cpp"
+#line 2169 "engines/director/lingo/lingo-gr.cpp"
break;
case 18:
-#line 196 "engines/director/lingo/lingo-gr.y"
+#line 194 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldassign);
g_lingo->codeString((yyvsp[-2].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[-2].objectfield).e);
delete (yyvsp[-2].objectfield).s;
(yyval.code) = (yyvsp[0].code); }
-#line 2182 "engines/director/lingo/lingo-gr.cpp"
+#line 2180 "engines/director/lingo/lingo-gr.cpp"
break;
case 28:
-#line 221 "engines/director/lingo/lingo-gr.y"
+#line 219 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[-3].code) - (yyvsp[-5].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 2] = end; }
-#line 2193 "engines/director/lingo/lingo-gr.cpp"
+#line 2191 "engines/director/lingo/lingo-gr.cpp"
break;
case 29:
-#line 232 "engines/director/lingo/lingo-gr.y"
+#line 230 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
@@ -2206,11 +2204,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end; }
-#line 2210 "engines/director/lingo/lingo-gr.cpp"
+#line 2208 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
-#line 249 "engines/director/lingo/lingo-gr.y"
+#line 247 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2223,36 +2221,36 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end; }
-#line 2227 "engines/director/lingo/lingo-gr.cpp"
+#line 2225 "engines/director/lingo/lingo-gr.cpp"
break;
case 31:
-#line 261 "engines/director/lingo/lingo-gr.y"
+#line 259 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
g_lingo->code1(STOP);
(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
-#line 2237 "engines/director/lingo/lingo-gr.cpp"
+#line 2235 "engines/director/lingo/lingo-gr.cpp"
break;
case 32:
-#line 266 "engines/director/lingo/lingo-gr.y"
+#line 264 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented"); }
-#line 2244 "engines/director/lingo/lingo-gr.cpp"
+#line 2242 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
-#line 268 "engines/director/lingo/lingo-gr.y"
+#line 266 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
}
-#line 2252 "engines/director/lingo/lingo-gr.cpp"
+#line 2250 "engines/director/lingo/lingo-gr.cpp"
break;
case 34:
-#line 273 "engines/director/lingo/lingo-gr.y"
+#line 271 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-8].code));
@@ -2263,11 +2261,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-8].code), (yyvsp[-1].code) - (yyvsp[-8].code), 0); }
-#line 2267 "engines/director/lingo/lingo-gr.cpp"
+#line 2265 "engines/director/lingo/lingo-gr.cpp"
break;
case 35:
-#line 283 "engines/director/lingo/lingo-gr.y"
+#line 281 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-9].code) - (yyvsp[-11].code));
@@ -2278,22 +2276,22 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-11].code), (yyvsp[-1].code) - (yyvsp[-11].code), (yyvsp[-3].code) - (yyvsp[-11].code)); }
-#line 2282 "engines/director/lingo/lingo-gr.cpp"
+#line 2280 "engines/director/lingo/lingo-gr.cpp"
break;
case 38:
-#line 299 "engines/director/lingo/lingo-gr.y"
+#line 297 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[-3].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
g_lingo->codeLabel((yyvsp[-5].code)); }
-#line 2293 "engines/director/lingo/lingo-gr.cpp"
+#line 2291 "engines/director/lingo/lingo-gr.cpp"
break;
case 39:
-#line 307 "engines/director/lingo/lingo-gr.y"
+#line 305 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2304,11 +2302,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-10].code), (yyvsp[-1].code) - (yyvsp[-10].code), (yyvsp[-3].code) - (yyvsp[-10].code)); }
-#line 2308 "engines/director/lingo/lingo-gr.cpp"
+#line 2306 "engines/director/lingo/lingo-gr.cpp"
break;
case 40:
-#line 317 "engines/director/lingo/lingo-gr.y"
+#line 315 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
@@ -2319,163 +2317,164 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
-#line 2323 "engines/director/lingo/lingo-gr.cpp"
+#line 2321 "engines/director/lingo/lingo-gr.cpp"
break;
case 41:
-#line 330 "engines/director/lingo/lingo-gr.y"
+#line 328 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
-#line 2329 "engines/director/lingo/lingo-gr.cpp"
+#line 2327 "engines/director/lingo/lingo-gr.cpp"
break;
case 42:
-#line 333 "engines/director/lingo/lingo-gr.y"
+#line 331 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(LC::c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2339 "engines/director/lingo/lingo-gr.cpp"
+#line 2337 "engines/director/lingo/lingo-gr.cpp"
break;
case 43:
-#line 340 "engines/director/lingo/lingo-gr.y"
+#line 338 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(0); // Do not skip end
g_lingo->codeLabel(0); }
-#line 2349 "engines/director/lingo/lingo-gr.cpp"
+#line 2347 "engines/director/lingo/lingo-gr.cpp"
break;
case 44:
-#line 347 "engines/director/lingo/lingo-gr.y"
+#line 345 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(skipEnd); }
-#line 2360 "engines/director/lingo/lingo-gr.cpp"
+#line 2358 "engines/director/lingo/lingo-gr.cpp"
break;
case 45:
-#line 355 "engines/director/lingo/lingo-gr.y"
+#line 353 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2366 "engines/director/lingo/lingo-gr.cpp"
+#line 2364 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
-#line 358 "engines/director/lingo/lingo-gr.y"
+#line 356 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2372 "engines/director/lingo/lingo-gr.cpp"
+#line 2370 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
-#line 361 "engines/director/lingo/lingo-gr.y"
+#line 359 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2378 "engines/director/lingo/lingo-gr.cpp"
+#line 2376 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
-#line 366 "engines/director/lingo/lingo-gr.y"
+#line 364 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_whencode);
g_lingo->code1(STOP);
g_lingo->codeString((yyvsp[-1].s)->c_str());
delete (yyvsp[-1].s); }
-#line 2388 "engines/director/lingo/lingo-gr.cpp"
+#line 2386 "engines/director/lingo/lingo-gr.cpp"
break;
case 51:
-#line 372 "engines/director/lingo/lingo-gr.y"
+#line 370 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_tellcode);
g_lingo->code1(STOP); }
-#line 2396 "engines/director/lingo/lingo-gr.cpp"
+#line 2394 "engines/director/lingo/lingo-gr.cpp"
break;
case 52:
-#line 376 "engines/director/lingo/lingo-gr.y"
+#line 374 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt((yyvsp[0].i)); }
-#line 2404 "engines/director/lingo/lingo-gr.cpp"
+#line 2402 "engines/director/lingo/lingo-gr.cpp"
break;
case 53:
-#line 379 "engines/director/lingo/lingo-gr.y"
+#line 377 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_floatpush);
g_lingo->codeFloat((yyvsp[0].f)); }
-#line 2412 "engines/director/lingo/lingo-gr.cpp"
+#line 2410 "engines/director/lingo/lingo-gr.cpp"
break;
case 54:
-#line 382 "engines/director/lingo/lingo-gr.y"
+#line 380 "engines/director/lingo/lingo-gr.y"
{ // D3
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2421 "engines/director/lingo/lingo-gr.cpp"
+#line 2419 "engines/director/lingo/lingo-gr.cpp"
break;
case 55:
-#line 386 "engines/director/lingo/lingo-gr.y"
+#line 384 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2430 "engines/director/lingo/lingo-gr.cpp"
+#line 2428 "engines/director/lingo/lingo-gr.cpp"
break;
case 56:
-#line 390 "engines/director/lingo/lingo-gr.y"
+#line 388 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_eval);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2439 "engines/director/lingo/lingo-gr.cpp"
+#line 2437 "engines/director/lingo/lingo-gr.cpp"
break;
case 58:
-#line 397 "engines/director/lingo/lingo-gr.y"
+#line 395 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2445 "engines/director/lingo/lingo-gr.cpp"
+#line 2443 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
-#line 399 "engines/director/lingo/lingo-gr.y"
+#line 397 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2453 "engines/director/lingo/lingo-gr.cpp"
+#line 2451 "engines/director/lingo/lingo-gr.cpp"
break;
case 61:
-#line 402 "engines/director/lingo/lingo-gr.y"
+#line 400 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2461 "engines/director/lingo/lingo-gr.cpp"
+#line 2459 "engines/director/lingo/lingo-gr.cpp"
break;
case 62:
-#line 405 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
-#line 2467 "engines/director/lingo/lingo-gr.cpp"
+#line 403 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
+ delete (yyvsp[-1].s); }
+#line 2466 "engines/director/lingo/lingo-gr.cpp"
break;
case 63:
-#line 406 "engines/director/lingo/lingo-gr.y"
+#line 405 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2475 "engines/director/lingo/lingo-gr.cpp"
+#line 2474 "engines/director/lingo/lingo-gr.cpp"
break;
case 64:
-#line 409 "engines/director/lingo/lingo-gr.y"
+#line 408 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2484,278 +2483,279 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[0].e)[0]);
WRITE_UINT32(&f, (yyvsp[0].e)[1]);
g_lingo->code2(e, f); }
-#line 2488 "engines/director/lingo/lingo-gr.cpp"
+#line 2487 "engines/director/lingo/lingo-gr.cpp"
break;
case 65:
-#line 417 "engines/director/lingo/lingo-gr.y"
+#line 416 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
g_lingo->code2(e, f); }
-#line 2499 "engines/director/lingo/lingo-gr.cpp"
+#line 2498 "engines/director/lingo/lingo-gr.cpp"
break;
case 66:
-#line 423 "engines/director/lingo/lingo-gr.y"
+#line 422 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldpush);
g_lingo->codeString((yyvsp[0].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[0].objectfield).e);
delete (yyvsp[0].objectfield).s; }
-#line 2509 "engines/director/lingo/lingo-gr.cpp"
+#line 2508 "engines/director/lingo/lingo-gr.cpp"
break;
case 68:
-#line 429 "engines/director/lingo/lingo-gr.y"
+#line 428 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_add); }
-#line 2515 "engines/director/lingo/lingo-gr.cpp"
+#line 2514 "engines/director/lingo/lingo-gr.cpp"
break;
case 69:
-#line 430 "engines/director/lingo/lingo-gr.y"
+#line 429 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_sub); }
-#line 2521 "engines/director/lingo/lingo-gr.cpp"
+#line 2520 "engines/director/lingo/lingo-gr.cpp"
break;
case 70:
-#line 431 "engines/director/lingo/lingo-gr.y"
+#line 430 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mul); }
-#line 2527 "engines/director/lingo/lingo-gr.cpp"
+#line 2526 "engines/director/lingo/lingo-gr.cpp"
break;
case 71:
-#line 432 "engines/director/lingo/lingo-gr.y"
+#line 431 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_div); }
-#line 2533 "engines/director/lingo/lingo-gr.cpp"
+#line 2532 "engines/director/lingo/lingo-gr.cpp"
break;
case 72:
-#line 433 "engines/director/lingo/lingo-gr.y"
+#line 432 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mod); }
-#line 2539 "engines/director/lingo/lingo-gr.cpp"
+#line 2538 "engines/director/lingo/lingo-gr.cpp"
break;
case 73:
-#line 434 "engines/director/lingo/lingo-gr.y"
+#line 433 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gt); }
-#line 2545 "engines/director/lingo/lingo-gr.cpp"
+#line 2544 "engines/director/lingo/lingo-gr.cpp"
break;
case 74:
-#line 435 "engines/director/lingo/lingo-gr.y"
+#line 434 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lt); }
-#line 2551 "engines/director/lingo/lingo-gr.cpp"
+#line 2550 "engines/director/lingo/lingo-gr.cpp"
break;
case 75:
-#line 436 "engines/director/lingo/lingo-gr.y"
+#line 435 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_eq); }
-#line 2557 "engines/director/lingo/lingo-gr.cpp"
+#line 2556 "engines/director/lingo/lingo-gr.cpp"
break;
case 76:
-#line 437 "engines/director/lingo/lingo-gr.y"
+#line 436 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_neq); }
-#line 2563 "engines/director/lingo/lingo-gr.cpp"
+#line 2562 "engines/director/lingo/lingo-gr.cpp"
break;
case 77:
-#line 438 "engines/director/lingo/lingo-gr.y"
+#line 437 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ge); }
-#line 2569 "engines/director/lingo/lingo-gr.cpp"
+#line 2568 "engines/director/lingo/lingo-gr.cpp"
break;
case 78:
-#line 439 "engines/director/lingo/lingo-gr.y"
+#line 438 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_le); }
-#line 2575 "engines/director/lingo/lingo-gr.cpp"
+#line 2574 "engines/director/lingo/lingo-gr.cpp"
break;
case 79:
-#line 440 "engines/director/lingo/lingo-gr.y"
+#line 439 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_and); }
-#line 2581 "engines/director/lingo/lingo-gr.cpp"
+#line 2580 "engines/director/lingo/lingo-gr.cpp"
break;
case 80:
-#line 441 "engines/director/lingo/lingo-gr.y"
+#line 440 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_or); }
-#line 2587 "engines/director/lingo/lingo-gr.cpp"
+#line 2586 "engines/director/lingo/lingo-gr.cpp"
break;
case 81:
-#line 442 "engines/director/lingo/lingo-gr.y"
+#line 441 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_not); }
-#line 2593 "engines/director/lingo/lingo-gr.cpp"
+#line 2592 "engines/director/lingo/lingo-gr.cpp"
break;
case 82:
-#line 443 "engines/director/lingo/lingo-gr.y"
+#line 442 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ampersand); }
-#line 2599 "engines/director/lingo/lingo-gr.cpp"
+#line 2598 "engines/director/lingo/lingo-gr.cpp"
break;
case 83:
-#line 444 "engines/director/lingo/lingo-gr.y"
+#line 443 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_concat); }
-#line 2605 "engines/director/lingo/lingo-gr.cpp"
+#line 2604 "engines/director/lingo/lingo-gr.cpp"
break;
case 84:
-#line 445 "engines/director/lingo/lingo-gr.y"
+#line 444 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_contains); }
-#line 2611 "engines/director/lingo/lingo-gr.cpp"
+#line 2610 "engines/director/lingo/lingo-gr.cpp"
break;
case 85:
-#line 446 "engines/director/lingo/lingo-gr.y"
+#line 445 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_starts); }
-#line 2617 "engines/director/lingo/lingo-gr.cpp"
+#line 2616 "engines/director/lingo/lingo-gr.cpp"
break;
case 86:
-#line 447 "engines/director/lingo/lingo-gr.y"
+#line 446 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2623 "engines/director/lingo/lingo-gr.cpp"
+#line 2622 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
-#line 448 "engines/director/lingo/lingo-gr.y"
+#line 447 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
-#line 2629 "engines/director/lingo/lingo-gr.cpp"
+#line 2628 "engines/director/lingo/lingo-gr.cpp"
break;
case 88:
-#line 449 "engines/director/lingo/lingo-gr.y"
+#line 448 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2635 "engines/director/lingo/lingo-gr.cpp"
+#line 2634 "engines/director/lingo/lingo-gr.cpp"
break;
case 89:
-#line 450 "engines/director/lingo/lingo-gr.y"
+#line 449 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_intersects); }
-#line 2641 "engines/director/lingo/lingo-gr.cpp"
+#line 2640 "engines/director/lingo/lingo-gr.cpp"
break;
case 90:
-#line 451 "engines/director/lingo/lingo-gr.y"
+#line 450 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_within); }
-#line 2647 "engines/director/lingo/lingo-gr.cpp"
+#line 2646 "engines/director/lingo/lingo-gr.cpp"
break;
case 91:
-#line 452 "engines/director/lingo/lingo-gr.y"
+#line 451 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charOf); }
-#line 2653 "engines/director/lingo/lingo-gr.cpp"
+#line 2652 "engines/director/lingo/lingo-gr.cpp"
break;
case 92:
-#line 453 "engines/director/lingo/lingo-gr.y"
+#line 452 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charToOf); }
-#line 2659 "engines/director/lingo/lingo-gr.cpp"
+#line 2658 "engines/director/lingo/lingo-gr.cpp"
break;
case 93:
-#line 454 "engines/director/lingo/lingo-gr.y"
+#line 453 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemOf); }
-#line 2665 "engines/director/lingo/lingo-gr.cpp"
+#line 2664 "engines/director/lingo/lingo-gr.cpp"
break;
case 94:
-#line 455 "engines/director/lingo/lingo-gr.y"
+#line 454 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemToOf); }
-#line 2671 "engines/director/lingo/lingo-gr.cpp"
+#line 2670 "engines/director/lingo/lingo-gr.cpp"
break;
case 95:
-#line 456 "engines/director/lingo/lingo-gr.y"
+#line 455 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineOf); }
-#line 2677 "engines/director/lingo/lingo-gr.cpp"
+#line 2676 "engines/director/lingo/lingo-gr.cpp"
break;
case 96:
-#line 457 "engines/director/lingo/lingo-gr.y"
+#line 456 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineToOf); }
-#line 2683 "engines/director/lingo/lingo-gr.cpp"
+#line 2682 "engines/director/lingo/lingo-gr.cpp"
break;
case 97:
-#line 458 "engines/director/lingo/lingo-gr.y"
+#line 457 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordOf); }
-#line 2689 "engines/director/lingo/lingo-gr.cpp"
+#line 2688 "engines/director/lingo/lingo-gr.cpp"
break;
case 98:
-#line 459 "engines/director/lingo/lingo-gr.y"
+#line 458 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordToOf); }
-#line 2695 "engines/director/lingo/lingo-gr.cpp"
+#line 2694 "engines/director/lingo/lingo-gr.cpp"
break;
case 99:
-#line 462 "engines/director/lingo/lingo-gr.y"
+#line 461 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2703 "engines/director/lingo/lingo-gr.cpp"
+#line 2702 "engines/director/lingo/lingo-gr.cpp"
break;
case 100:
-#line 467 "engines/director/lingo/lingo-gr.y"
+#line 466 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); }
-#line 2709 "engines/director/lingo/lingo-gr.cpp"
+#line 2708 "engines/director/lingo/lingo-gr.cpp"
break;
case 103:
-#line 470 "engines/director/lingo/lingo-gr.y"
+#line 469 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); }
-#line 2715 "engines/director/lingo/lingo-gr.cpp"
+#line 2714 "engines/director/lingo/lingo-gr.cpp"
break;
case 104:
-#line 471 "engines/director/lingo/lingo-gr.y"
+#line 470 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); }
-#line 2721 "engines/director/lingo/lingo-gr.cpp"
+#line 2720 "engines/director/lingo/lingo-gr.cpp"
break;
case 108:
-#line 475 "engines/director/lingo/lingo-gr.y"
+#line 474 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2729 "engines/director/lingo/lingo-gr.cpp"
+#line 2728 "engines/director/lingo/lingo-gr.cpp"
break;
case 109:
-#line 478 "engines/director/lingo/lingo-gr.y"
+#line 477 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2737 "engines/director/lingo/lingo-gr.cpp"
+#line 2736 "engines/director/lingo/lingo-gr.cpp"
break;
case 110:
-#line 481 "engines/director/lingo/lingo-gr.y"
+#line 480 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2745 "engines/director/lingo/lingo-gr.cpp"
+#line 2744 "engines/director/lingo/lingo-gr.cpp"
break;
case 111:
-#line 484 "engines/director/lingo/lingo-gr.y"
+#line 483 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_voidpush);
g_lingo->codeFunc((yyvsp[0].s), 1);
delete (yyvsp[0].s); }
-#line 2754 "engines/director/lingo/lingo-gr.cpp"
+#line 2753 "engines/director/lingo/lingo-gr.cpp"
break;
case 112:
-#line 488 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg)); }
+#line 487 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
+ delete (yyvsp[-1].s); }
#line 2760 "engines/director/lingo/lingo-gr.cpp"
break;
@@ -2773,179 +2773,186 @@ yyreduce:
case 115:
#line 491 "engines/director/lingo/lingo-gr.y"
- { Common::String s(*(yyvsp[-2].s)); s += '-'; s += *(yyvsp[-1].s); g_lingo->codeFunc(&s, (yyvsp[0].narg)); delete (yyvsp[-1].s); }
-#line 2778 "engines/director/lingo/lingo-gr.cpp"
+ {
+ Common::String s(*(yyvsp[-2].s));
+ s += '-'; s += *(yyvsp[-1].s);
+ g_lingo->codeFunc(&s, (yyvsp[0].narg));
+ delete (yyvsp[-1].s);
+ delete (yyvsp[-2].s); }
+#line 2783 "engines/director/lingo/lingo-gr.cpp"
break;
case 116:
-#line 494 "engines/director/lingo/lingo-gr.y"
+#line 499 "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 2784 "engines/director/lingo/lingo-gr.cpp"
+#line 2789 "engines/director/lingo/lingo-gr.cpp"
break;
case 117:
-#line 495 "engines/director/lingo/lingo-gr.y"
+#line 500 "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 2790 "engines/director/lingo/lingo-gr.cpp"
+#line 2795 "engines/director/lingo/lingo-gr.cpp"
break;
case 118:
-#line 498 "engines/director/lingo/lingo-gr.y"
+#line 503 "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 2796 "engines/director/lingo/lingo-gr.cpp"
+#line 2801 "engines/director/lingo/lingo-gr.cpp"
break;
case 119:
-#line 499 "engines/director/lingo/lingo-gr.y"
+#line 504 "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 2802 "engines/director/lingo/lingo-gr.cpp"
+#line 2807 "engines/director/lingo/lingo-gr.cpp"
break;
case 120:
-#line 502 "engines/director/lingo/lingo-gr.y"
+#line 507 "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 2808 "engines/director/lingo/lingo-gr.cpp"
+#line 2813 "engines/director/lingo/lingo-gr.cpp"
break;
case 121:
-#line 503 "engines/director/lingo/lingo-gr.y"
+#line 508 "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 2814 "engines/director/lingo/lingo-gr.cpp"
+#line 2819 "engines/director/lingo/lingo-gr.cpp"
break;
case 122:
-#line 514 "engines/director/lingo/lingo-gr.y"
+#line 519 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
-#line 2820 "engines/director/lingo/lingo-gr.cpp"
+#line 2825 "engines/director/lingo/lingo-gr.cpp"
break;
case 123:
-#line 515 "engines/director/lingo/lingo-gr.y"
+#line 520 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
-#line 2826 "engines/director/lingo/lingo-gr.cpp"
+#line 2831 "engines/director/lingo/lingo-gr.cpp"
break;
case 124:
-#line 516 "engines/director/lingo/lingo-gr.y"
+#line 521 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
-#line 2832 "engines/director/lingo/lingo-gr.cpp"
+#line 2837 "engines/director/lingo/lingo-gr.cpp"
break;
case 125:
-#line 517 "engines/director/lingo/lingo-gr.y"
+#line 522 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); }
-#line 2841 "engines/director/lingo/lingo-gr.cpp"
+#line 2846 "engines/director/lingo/lingo-gr.cpp"
break;
case 126:
-#line 521 "engines/director/lingo/lingo-gr.y"
+#line 526 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); }
-#line 2850 "engines/director/lingo/lingo-gr.cpp"
+#line 2855 "engines/director/lingo/lingo-gr.cpp"
break;
case 127:
-#line 525 "engines/director/lingo/lingo-gr.y"
+#line 530 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); }
-#line 2859 "engines/director/lingo/lingo-gr.cpp"
+#line 2864 "engines/director/lingo/lingo-gr.cpp"
break;
case 130:
-#line 535 "engines/director/lingo/lingo-gr.y"
+#line 540 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); }
-#line 2865 "engines/director/lingo/lingo-gr.cpp"
+#line 2870 "engines/director/lingo/lingo-gr.cpp"
break;
case 131:
-#line 536 "engines/director/lingo/lingo-gr.y"
+#line 541 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); }
-#line 2874 "engines/director/lingo/lingo-gr.cpp"
+#line 2879 "engines/director/lingo/lingo-gr.cpp"
break;
case 132:
-#line 540 "engines/director/lingo/lingo-gr.y"
+#line 545 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); }
-#line 2883 "engines/director/lingo/lingo-gr.cpp"
+#line 2888 "engines/director/lingo/lingo-gr.cpp"
break;
case 133:
-#line 544 "engines/director/lingo/lingo-gr.y"
+#line 549 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); }
-#line 2892 "engines/director/lingo/lingo-gr.cpp"
+#line 2897 "engines/director/lingo/lingo-gr.cpp"
break;
case 134:
-#line 548 "engines/director/lingo/lingo-gr.y"
+#line 553 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
-#line 2898 "engines/director/lingo/lingo-gr.cpp"
+#line 2903 "engines/director/lingo/lingo-gr.cpp"
break;
case 135:
-#line 548 "engines/director/lingo/lingo-gr.y"
+#line 553 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
- g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg)); }
-#line 2906 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg));
+ delete (yyvsp[-2].s); }
+#line 2912 "engines/director/lingo/lingo-gr.cpp"
break;
case 136:
-#line 578 "engines/director/lingo/lingo-gr.y"
+#line 584 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
-#line 2912 "engines/director/lingo/lingo-gr.cpp"
+#line 2918 "engines/director/lingo/lingo-gr.cpp"
break;
case 137:
-#line 579 "engines/director/lingo/lingo-gr.y"
+#line 585 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2923 "engines/director/lingo/lingo-gr.cpp"
+#line 2929 "engines/director/lingo/lingo-gr.cpp"
break;
case 138:
-#line 585 "engines/director/lingo/lingo-gr.y"
+#line 591 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
-#line 2929 "engines/director/lingo/lingo-gr.cpp"
+#line 2935 "engines/director/lingo/lingo-gr.cpp"
break;
case 139:
-#line 586 "engines/director/lingo/lingo-gr.y"
+#line 592 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2935 "engines/director/lingo/lingo-gr.cpp"
+#line 2941 "engines/director/lingo/lingo-gr.cpp"
break;
case 140:
-#line 587 "engines/director/lingo/lingo-gr.y"
+#line 593 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
- g_lingo->_indef = kStateNone; }
-#line 2945 "engines/director/lingo/lingo-gr.cpp"
+ g_lingo->_indef = kStateNone;
+ delete (yyvsp[-6].s); }
+#line 2952 "engines/director/lingo/lingo-gr.cpp"
break;
case 141:
-#line 592 "engines/director/lingo/lingo-gr.y"
+#line 599 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-7].s), (yyvsp[-6].code), (yyvsp[-5].narg));
@@ -2954,12 +2961,13 @@ yyreduce:
g_lingo->_ignoreMe = false;
checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false);
- delete (yyvsp[-7].s); }
-#line 2959 "engines/director/lingo/lingo-gr.cpp"
+ delete (yyvsp[-7].s);
+ delete (yyvsp[-1].s); }
+#line 2967 "engines/director/lingo/lingo-gr.cpp"
break;
case 142:
-#line 601 "engines/director/lingo/lingo-gr.y"
+#line 609 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
@@ -2967,59 +2975,59 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_ignoreMe = false;
delete (yyvsp[-5].s); }
-#line 2971 "engines/director/lingo/lingo-gr.cpp"
+#line 2979 "engines/director/lingo/lingo-gr.cpp"
break;
case 143:
-#line 609 "engines/director/lingo/lingo-gr.y"
+#line 617 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
-#line 2977 "engines/director/lingo/lingo-gr.cpp"
+#line 2985 "engines/director/lingo/lingo-gr.cpp"
break;
case 144:
-#line 611 "engines/director/lingo/lingo-gr.y"
+#line 619 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2983 "engines/director/lingo/lingo-gr.cpp"
+#line 2991 "engines/director/lingo/lingo-gr.cpp"
break;
case 145:
-#line 612 "engines/director/lingo/lingo-gr.y"
+#line 620 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
-#line 2989 "engines/director/lingo/lingo-gr.cpp"
+#line 2997 "engines/director/lingo/lingo-gr.cpp"
break;
case 146:
-#line 613 "engines/director/lingo/lingo-gr.y"
+#line 621 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
-#line 2995 "engines/director/lingo/lingo-gr.cpp"
+#line 3003 "engines/director/lingo/lingo-gr.cpp"
break;
case 147:
-#line 614 "engines/director/lingo/lingo-gr.y"
+#line 622 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
-#line 3001 "engines/director/lingo/lingo-gr.cpp"
+#line 3009 "engines/director/lingo/lingo-gr.cpp"
break;
case 149:
-#line 618 "engines/director/lingo/lingo-gr.y"
+#line 626 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 3007 "engines/director/lingo/lingo-gr.cpp"
+#line 3015 "engines/director/lingo/lingo-gr.cpp"
break;
case 150:
-#line 619 "engines/director/lingo/lingo-gr.y"
+#line 627 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 3013 "engines/director/lingo/lingo-gr.cpp"
+#line 3021 "engines/director/lingo/lingo-gr.cpp"
break;
case 151:
-#line 622 "engines/director/lingo/lingo-gr.y"
+#line 630 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
-#line 3019 "engines/director/lingo/lingo-gr.cpp"
+#line 3027 "engines/director/lingo/lingo-gr.cpp"
break;
case 152:
-#line 625 "engines/director/lingo/lingo-gr.y"
+#line 633 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
g_lingo->codeString((yyvsp[-1].s)->c_str());
@@ -3027,113 +3035,113 @@ yyreduce:
WRITE_UINT32(&numpar, (yyvsp[0].narg));
g_lingo->code1(numpar);
delete (yyvsp[-1].s); }
-#line 3031 "engines/director/lingo/lingo-gr.cpp"
+#line 3039 "engines/director/lingo/lingo-gr.cpp"
break;
case 153:
-#line 634 "engines/director/lingo/lingo-gr.y"
+#line 642 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 3037 "engines/director/lingo/lingo-gr.cpp"
+#line 3045 "engines/director/lingo/lingo-gr.cpp"
break;
case 154:
-#line 635 "engines/director/lingo/lingo-gr.y"
+#line 643 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3043 "engines/director/lingo/lingo-gr.cpp"
+#line 3051 "engines/director/lingo/lingo-gr.cpp"
break;
case 155:
-#line 636 "engines/director/lingo/lingo-gr.y"
+#line 644 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3049 "engines/director/lingo/lingo-gr.cpp"
+#line 3057 "engines/director/lingo/lingo-gr.cpp"
break;
case 156:
-#line 639 "engines/director/lingo/lingo-gr.y"
+#line 647 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3055 "engines/director/lingo/lingo-gr.cpp"
+#line 3063 "engines/director/lingo/lingo-gr.cpp"
break;
case 157:
-#line 640 "engines/director/lingo/lingo-gr.y"
+#line 648 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3061 "engines/director/lingo/lingo-gr.cpp"
+#line 3069 "engines/director/lingo/lingo-gr.cpp"
break;
case 158:
-#line 643 "engines/director/lingo/lingo-gr.y"
+#line 651 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 3067 "engines/director/lingo/lingo-gr.cpp"
+#line 3075 "engines/director/lingo/lingo-gr.cpp"
break;
case 159:
-#line 646 "engines/director/lingo/lingo-gr.y"
+#line 654 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
-#line 3073 "engines/director/lingo/lingo-gr.cpp"
+#line 3081 "engines/director/lingo/lingo-gr.cpp"
break;
case 160:
-#line 647 "engines/director/lingo/lingo-gr.y"
+#line 655 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
-#line 3079 "engines/director/lingo/lingo-gr.cpp"
+#line 3087 "engines/director/lingo/lingo-gr.cpp"
break;
case 161:
-#line 648 "engines/director/lingo/lingo-gr.y"
+#line 656 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3085 "engines/director/lingo/lingo-gr.cpp"
+#line 3093 "engines/director/lingo/lingo-gr.cpp"
break;
case 162:
-#line 649 "engines/director/lingo/lingo-gr.y"
+#line 657 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3091 "engines/director/lingo/lingo-gr.cpp"
+#line 3099 "engines/director/lingo/lingo-gr.cpp"
break;
case 163:
-#line 652 "engines/director/lingo/lingo-gr.y"
+#line 660 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3097 "engines/director/lingo/lingo-gr.cpp"
+#line 3105 "engines/director/lingo/lingo-gr.cpp"
break;
case 164:
-#line 653 "engines/director/lingo/lingo-gr.y"
+#line 661 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3103 "engines/director/lingo/lingo-gr.cpp"
+#line 3111 "engines/director/lingo/lingo-gr.cpp"
break;
case 165:
-#line 656 "engines/director/lingo/lingo-gr.y"
+#line 664 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3109 "engines/director/lingo/lingo-gr.cpp"
+#line 3117 "engines/director/lingo/lingo-gr.cpp"
break;
case 166:
-#line 657 "engines/director/lingo/lingo-gr.y"
+#line 665 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3115 "engines/director/lingo/lingo-gr.cpp"
+#line 3123 "engines/director/lingo/lingo-gr.cpp"
break;
case 167:
-#line 660 "engines/director/lingo/lingo-gr.y"
+#line 668 "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 3124 "engines/director/lingo/lingo-gr.cpp"
+#line 3132 "engines/director/lingo/lingo-gr.cpp"
break;
case 168:
-#line 664 "engines/director/lingo/lingo-gr.y"
+#line 672 "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 3133 "engines/director/lingo/lingo-gr.cpp"
+#line 3141 "engines/director/lingo/lingo-gr.cpp"
break;
-#line 3137 "engines/director/lingo/lingo-gr.cpp"
+#line 3145 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
@@ -3365,5 +3373,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 671 "engines/director/lingo/lingo-gr.y"
+#line 679 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 90f2430..312986c 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -145,7 +145,7 @@ extern int yydebug;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
{
-#line 87 "engines/director/lingo/lingo-gr.y"
+#line 85 "engines/director/lingo/lingo-gr.y"
Common::String *s;
int i;
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index d6161d4..71077a6 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -78,8 +78,6 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
yyerror(err.c_str());
}
}
-
- delete token;
}
%}
@@ -402,7 +400,8 @@ expr: simpleexpr { $$ = $simpleexpr; }
| FBLTINONEARG expr {
g_lingo->codeFunc($FBLTINONEARG, 1);
delete $FBLTINONEARG; }
- | FBLTINARGLIST arglist { g_lingo->codeFunc($FBLTINARGLIST, $arglist); }
+ | FBLTINARGLIST arglist { g_lingo->codeFunc($FBLTINARGLIST, $arglist);
+ delete $FBLTINARGLIST; }
| ID '(' arglist ')' {
$$ = g_lingo->codeFunc($ID, $arglist);
delete $ID; }
@@ -485,10 +484,16 @@ proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
g_lingo->code1(LC::c_voidpush);
g_lingo->codeFunc($BLTINNOARGSORONE, 1);
delete $BLTINNOARGSORONE; }
- | BLTINARGLIST arglist { g_lingo->codeFunc($BLTINARGLIST, $arglist); }
+ | BLTINARGLIST arglist { g_lingo->codeFunc($BLTINARGLIST, $arglist);
+ delete $BLTINARGLIST; }
| tOPEN expr tWITH expr { g_lingo->code1(LC::c_open); }
| tOPEN expr { g_lingo->code2(LC::c_voidpush, LC::c_open); }
- | TWOWORDBUILTIN ID arglist { Common::String s(*$TWOWORDBUILTIN); s += '-'; s += *$ID; g_lingo->codeFunc(&s, $arglist); delete $ID; }
+ | TWOWORDBUILTIN ID arglist {
+ Common::String s(*$TWOWORDBUILTIN);
+ s += '-'; s += *$ID;
+ g_lingo->codeFunc(&s, $arglist);
+ delete $ID;
+ delete $TWOWORDBUILTIN; }
;
globallist: ID { g_lingo->code1(LC::c_global); g_lingo->codeString($1->c_str()); delete $ID; }
@@ -547,7 +552,8 @@ playfunc: tPLAY tDONE { g_lingo->code1(LC::c_playdone); }
g_lingo->code1(LC::c_play); }
| tPLAYACCEL { g_lingo->codeSetImmediate(true); } arglist {
g_lingo->codeSetImmediate(false);
- g_lingo->codeFunc($1, $3); }
+ g_lingo->codeFunc($tPLAYACCEL, $arglist);
+ delete $tPLAYACCEL; }
;
// macro
@@ -588,7 +594,8 @@ defn: tMACRO ID { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear
g_lingo->code1(LC::c_procret);
g_lingo->define(*$tMETHOD, $begin, $argdef + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
- g_lingo->_indef = kStateNone; }
+ g_lingo->_indef = kStateNone;
+ delete $tMETHOD; }
| on begin argdef '\n' argstore stmtlist ENDCLAUSE endargdef { // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*$on, $begin, $argdef);
@@ -597,7 +604,8 @@ defn: tMACRO ID { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear
g_lingo->_ignoreMe = false;
checkEnd($ENDCLAUSE, $on->c_str(), false);
- delete $on; }
+ delete $on;
+ delete $ENDCLAUSE; }
| on begin argdef '\n' argstore stmtlist { // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*$on, $begin, $argdef);
Commit: ef72a410825c11349192137df248b023ce90ae06
https://github.com/scummvm/scummvm/commit/ef72a410825c11349192137df248b023ce90ae06
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T18:03:51+01:00
Commit Message:
DIRECTOR: LINGO: Specified bison output files in the grammar file
Changed paths:
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.h
engines/director/lingo/lingo-gr.y
engines/director/module.mk
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 8cce417..c458776 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -66,7 +66,7 @@
/* First part of user prologue. */
-#line 54 "engines/director/lingo/lingo-gr.y"
+#line 55 "engines/director/lingo/lingo-gr.y"
#define FORBIDDEN_SYMBOL_ALLOW_ALL
@@ -130,8 +130,8 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
/* Use api.header.include to #include this header
instead of duplicating it here. */
-#ifndef YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
-# define YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+#ifndef YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_H_INCLUDED
+# define YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_H_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
@@ -241,7 +241,7 @@ extern int yydebug;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
{
-#line 85 "engines/director/lingo/lingo-gr.y"
+#line 86 "engines/director/lingo/lingo-gr.y"
Common::String *s;
int i;
@@ -269,7 +269,7 @@ extern YYSTYPE yylval;
int yyparse (void);
-#endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED */
+#endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_H_INCLUDED */
@@ -640,23 +640,23 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 135, 135, 136, 137, 140, 141, 142, 145, 151,
- 154, 155, 156, 162, 169, 175, 182, 188, 194, 202,
- 203, 204, 207, 208, 209, 210, 213, 214, 219, 230,
- 247, 259, 264, 266, 271, 281, 293, 294, 297, 305,
- 315, 328, 331, 338, 345, 353, 356, 359, 360, 361,
- 364, 370, 374, 377, 380, 384, 388, 392, 395, 396,
- 397, 400, 403, 405, 408, 416, 422, 427, 428, 429,
- 430, 431, 432, 433, 434, 435, 436, 437, 438, 439,
- 440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
- 450, 451, 452, 453, 454, 455, 456, 457, 458, 461,
- 466, 467, 468, 469, 470, 471, 472, 473, 474, 477,
- 480, 483, 487, 489, 490, 491, 499, 500, 503, 504,
- 507, 508, 519, 520, 521, 522, 526, 530, 536, 537,
- 540, 541, 545, 549, 553, 553, 584, 584, 591, 592,
- 592, 599, 609, 617, 619, 620, 621, 622, 625, 626,
- 627, 630, 633, 642, 643, 644, 647, 648, 651, 654,
- 655, 656, 657, 660, 661, 664, 665, 668, 672
+ 0, 136, 136, 137, 138, 141, 142, 143, 146, 152,
+ 155, 156, 157, 163, 170, 176, 183, 189, 195, 203,
+ 204, 205, 208, 209, 210, 211, 214, 215, 220, 231,
+ 248, 260, 265, 267, 272, 282, 294, 295, 298, 306,
+ 316, 329, 332, 339, 346, 354, 357, 360, 361, 362,
+ 365, 371, 375, 378, 381, 385, 389, 393, 396, 397,
+ 398, 401, 404, 406, 409, 417, 423, 428, 429, 430,
+ 431, 432, 433, 434, 435, 436, 437, 438, 439, 440,
+ 441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
+ 451, 452, 453, 454, 455, 456, 457, 458, 459, 462,
+ 467, 468, 469, 470, 471, 472, 473, 474, 475, 478,
+ 481, 484, 488, 490, 491, 492, 500, 501, 504, 505,
+ 508, 509, 520, 521, 522, 523, 527, 531, 537, 538,
+ 541, 542, 546, 550, 554, 554, 585, 585, 592, 593,
+ 593, 600, 610, 618, 620, 621, 622, 623, 626, 627,
+ 628, 631, 634, 643, 644, 645, 648, 649, 652, 655,
+ 656, 657, 658, 661, 662, 665, 666, 669, 673
};
#endif
@@ -1674,127 +1674,127 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
switch (yytype)
{
case 18: /* BLTIN */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1680 "engines/director/lingo/lingo-gr.cpp"
break;
case 19: /* BLTINNOARGS */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1686 "engines/director/lingo/lingo-gr.cpp"
break;
case 20: /* BLTINNOARGSORONE */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1692 "engines/director/lingo/lingo-gr.cpp"
break;
case 21: /* BLTINONEARG */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1698 "engines/director/lingo/lingo-gr.cpp"
break;
case 22: /* BLTINARGLIST */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1704 "engines/director/lingo/lingo-gr.cpp"
break;
case 23: /* TWOWORDBUILTIN */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1710 "engines/director/lingo/lingo-gr.cpp"
break;
case 24: /* FBLTIN */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1716 "engines/director/lingo/lingo-gr.cpp"
break;
case 25: /* FBLTINNOARGS */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1722 "engines/director/lingo/lingo-gr.cpp"
break;
case 26: /* FBLTINONEARG */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1728 "engines/director/lingo/lingo-gr.cpp"
break;
case 27: /* FBLTINARGLIST */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1734 "engines/director/lingo/lingo-gr.cpp"
break;
case 28: /* RBLTIN */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1740 "engines/director/lingo/lingo-gr.cpp"
break;
case 29: /* RBLTINONEARG */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1746 "engines/director/lingo/lingo-gr.cpp"
break;
case 30: /* ID */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1752 "engines/director/lingo/lingo-gr.cpp"
break;
case 31: /* STRING */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1758 "engines/director/lingo/lingo-gr.cpp"
break;
case 32: /* HANDLER */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1764 "engines/director/lingo/lingo-gr.cpp"
break;
case 33: /* SYMBOL */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1770 "engines/director/lingo/lingo-gr.cpp"
break;
case 34: /* ENDCLAUSE */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1776 "engines/director/lingo/lingo-gr.cpp"
break;
case 35: /* tPLAYACCEL */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1782 "engines/director/lingo/lingo-gr.cpp"
break;
case 36: /* tMETHOD */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1788 "engines/director/lingo/lingo-gr.cpp"
break;
case 37: /* THEOBJECTFIELD */
-#line 131 "engines/director/lingo/lingo-gr.y"
+#line 132 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).objectfield).s; }
#line 1794 "engines/director/lingo/lingo-gr.cpp"
break;
case 141: /* on */
-#line 130 "engines/director/lingo/lingo-gr.y"
+#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
#line 1800 "engines/director/lingo/lingo-gr.cpp"
break;
@@ -2064,13 +2064,13 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 137 "engines/director/lingo/lingo-gr.y"
+#line 138 "engines/director/lingo/lingo-gr.y"
{ yyerrok; }
#line 2070 "engines/director/lingo/lingo-gr.cpp"
break;
case 8:
-#line 145 "engines/director/lingo/lingo-gr.y"
+#line 146 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
@@ -2081,7 +2081,7 @@ yyreduce:
break;
case 9:
-#line 151 "engines/director/lingo/lingo-gr.y"
+#line 152 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code); }
@@ -2089,19 +2089,19 @@ yyreduce:
break;
case 10:
-#line 154 "engines/director/lingo/lingo-gr.y"
+#line 155 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_after); }
#line 2095 "engines/director/lingo/lingo-gr.cpp"
break;
case 11:
-#line 155 "engines/director/lingo/lingo-gr.y"
+#line 156 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_before); }
#line 2101 "engines/director/lingo/lingo-gr.cpp"
break;
case 12:
-#line 156 "engines/director/lingo/lingo-gr.y"
+#line 157 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
@@ -2112,7 +2112,7 @@ yyreduce:
break;
case 13:
-#line 162 "engines/director/lingo/lingo-gr.y"
+#line 163 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2124,7 +2124,7 @@ yyreduce:
break;
case 14:
-#line 169 "engines/director/lingo/lingo-gr.y"
+#line 170 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
@@ -2135,7 +2135,7 @@ yyreduce:
break;
case 15:
-#line 175 "engines/director/lingo/lingo-gr.y"
+#line 176 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2147,7 +2147,7 @@ yyreduce:
break;
case 16:
-#line 182 "engines/director/lingo/lingo-gr.y"
+#line 183 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
@@ -2158,7 +2158,7 @@ yyreduce:
break;
case 17:
-#line 188 "engines/director/lingo/lingo-gr.y"
+#line 189 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
@@ -2169,7 +2169,7 @@ yyreduce:
break;
case 18:
-#line 194 "engines/director/lingo/lingo-gr.y"
+#line 195 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldassign);
g_lingo->codeString((yyvsp[-2].objectfield).s->c_str());
@@ -2180,7 +2180,7 @@ yyreduce:
break;
case 28:
-#line 219 "engines/director/lingo/lingo-gr.y"
+#line 220 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[-3].code) - (yyvsp[-5].code));
@@ -2191,7 +2191,7 @@ yyreduce:
break;
case 29:
-#line 230 "engines/director/lingo/lingo-gr.y"
+#line 231 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
@@ -2208,7 +2208,7 @@ yyreduce:
break;
case 30:
-#line 247 "engines/director/lingo/lingo-gr.y"
+#line 248 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2225,7 +2225,7 @@ yyreduce:
break;
case 31:
-#line 259 "engines/director/lingo/lingo-gr.y"
+#line 260 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
@@ -2235,14 +2235,14 @@ yyreduce:
break;
case 32:
-#line 264 "engines/director/lingo/lingo-gr.y"
+#line 265 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented"); }
#line 2242 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
-#line 266 "engines/director/lingo/lingo-gr.y"
+#line 267 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
}
@@ -2250,7 +2250,7 @@ yyreduce:
break;
case 34:
-#line 271 "engines/director/lingo/lingo-gr.y"
+#line 272 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-8].code));
@@ -2265,7 +2265,7 @@ yyreduce:
break;
case 35:
-#line 281 "engines/director/lingo/lingo-gr.y"
+#line 282 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-9].code) - (yyvsp[-11].code));
@@ -2280,7 +2280,7 @@ yyreduce:
break;
case 38:
-#line 297 "engines/director/lingo/lingo-gr.y"
+#line 298 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[-3].code) - (yyvsp[-5].code));
@@ -2291,7 +2291,7 @@ yyreduce:
break;
case 39:
-#line 305 "engines/director/lingo/lingo-gr.y"
+#line 306 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2306,7 +2306,7 @@ yyreduce:
break;
case 40:
-#line 315 "engines/director/lingo/lingo-gr.y"
+#line 316 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
@@ -2321,13 +2321,13 @@ yyreduce:
break;
case 41:
-#line 328 "engines/director/lingo/lingo-gr.y"
+#line 329 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
#line 2327 "engines/director/lingo/lingo-gr.cpp"
break;
case 42:
-#line 331 "engines/director/lingo/lingo-gr.y"
+#line 332 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(LC::c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
@@ -2337,7 +2337,7 @@ yyreduce:
break;
case 43:
-#line 338 "engines/director/lingo/lingo-gr.y"
+#line 339 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
@@ -2347,7 +2347,7 @@ yyreduce:
break;
case 44:
-#line 345 "engines/director/lingo/lingo-gr.y"
+#line 346 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
@@ -2358,25 +2358,25 @@ yyreduce:
break;
case 45:
-#line 353 "engines/director/lingo/lingo-gr.y"
+#line 354 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
#line 2364 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
-#line 356 "engines/director/lingo/lingo-gr.y"
+#line 357 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
#line 2370 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
-#line 359 "engines/director/lingo/lingo-gr.y"
+#line 360 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
#line 2376 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
-#line 364 "engines/director/lingo/lingo-gr.y"
+#line 365 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_whencode);
g_lingo->code1(STOP);
@@ -2386,7 +2386,7 @@ yyreduce:
break;
case 51:
-#line 370 "engines/director/lingo/lingo-gr.y"
+#line 371 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_tellcode);
g_lingo->code1(STOP); }
@@ -2394,7 +2394,7 @@ yyreduce:
break;
case 52:
-#line 374 "engines/director/lingo/lingo-gr.y"
+#line 375 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt((yyvsp[0].i)); }
@@ -2402,7 +2402,7 @@ yyreduce:
break;
case 53:
-#line 377 "engines/director/lingo/lingo-gr.y"
+#line 378 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_floatpush);
g_lingo->codeFloat((yyvsp[0].f)); }
@@ -2410,7 +2410,7 @@ yyreduce:
break;
case 54:
-#line 380 "engines/director/lingo/lingo-gr.y"
+#line 381 "engines/director/lingo/lingo-gr.y"
{ // D3
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
@@ -2419,7 +2419,7 @@ yyreduce:
break;
case 55:
-#line 384 "engines/director/lingo/lingo-gr.y"
+#line 385 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
@@ -2428,7 +2428,7 @@ yyreduce:
break;
case 56:
-#line 388 "engines/director/lingo/lingo-gr.y"
+#line 389 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_eval);
g_lingo->codeString((yyvsp[0].s)->c_str());
@@ -2437,13 +2437,13 @@ yyreduce:
break;
case 58:
-#line 395 "engines/director/lingo/lingo-gr.y"
+#line 396 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
#line 2443 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
-#line 397 "engines/director/lingo/lingo-gr.y"
+#line 398 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
@@ -2451,7 +2451,7 @@ yyreduce:
break;
case 61:
-#line 400 "engines/director/lingo/lingo-gr.y"
+#line 401 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
@@ -2459,14 +2459,14 @@ yyreduce:
break;
case 62:
-#line 403 "engines/director/lingo/lingo-gr.y"
+#line 404 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
#line 2466 "engines/director/lingo/lingo-gr.cpp"
break;
case 63:
-#line 405 "engines/director/lingo/lingo-gr.y"
+#line 406 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
@@ -2474,7 +2474,7 @@ yyreduce:
break;
case 64:
-#line 408 "engines/director/lingo/lingo-gr.y"
+#line 409 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2487,7 +2487,7 @@ yyreduce:
break;
case 65:
-#line 416 "engines/director/lingo/lingo-gr.y"
+#line 417 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
@@ -2498,7 +2498,7 @@ yyreduce:
break;
case 66:
-#line 422 "engines/director/lingo/lingo-gr.y"
+#line 423 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldpush);
g_lingo->codeString((yyvsp[0].objectfield).s->c_str());
@@ -2508,193 +2508,193 @@ yyreduce:
break;
case 68:
-#line 428 "engines/director/lingo/lingo-gr.y"
+#line 429 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_add); }
#line 2514 "engines/director/lingo/lingo-gr.cpp"
break;
case 69:
-#line 429 "engines/director/lingo/lingo-gr.y"
+#line 430 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_sub); }
#line 2520 "engines/director/lingo/lingo-gr.cpp"
break;
case 70:
-#line 430 "engines/director/lingo/lingo-gr.y"
+#line 431 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mul); }
#line 2526 "engines/director/lingo/lingo-gr.cpp"
break;
case 71:
-#line 431 "engines/director/lingo/lingo-gr.y"
+#line 432 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_div); }
#line 2532 "engines/director/lingo/lingo-gr.cpp"
break;
case 72:
-#line 432 "engines/director/lingo/lingo-gr.y"
+#line 433 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mod); }
#line 2538 "engines/director/lingo/lingo-gr.cpp"
break;
case 73:
-#line 433 "engines/director/lingo/lingo-gr.y"
+#line 434 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gt); }
#line 2544 "engines/director/lingo/lingo-gr.cpp"
break;
case 74:
-#line 434 "engines/director/lingo/lingo-gr.y"
+#line 435 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lt); }
#line 2550 "engines/director/lingo/lingo-gr.cpp"
break;
case 75:
-#line 435 "engines/director/lingo/lingo-gr.y"
+#line 436 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_eq); }
#line 2556 "engines/director/lingo/lingo-gr.cpp"
break;
case 76:
-#line 436 "engines/director/lingo/lingo-gr.y"
+#line 437 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_neq); }
#line 2562 "engines/director/lingo/lingo-gr.cpp"
break;
case 77:
-#line 437 "engines/director/lingo/lingo-gr.y"
+#line 438 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ge); }
#line 2568 "engines/director/lingo/lingo-gr.cpp"
break;
case 78:
-#line 438 "engines/director/lingo/lingo-gr.y"
+#line 439 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_le); }
#line 2574 "engines/director/lingo/lingo-gr.cpp"
break;
case 79:
-#line 439 "engines/director/lingo/lingo-gr.y"
+#line 440 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_and); }
#line 2580 "engines/director/lingo/lingo-gr.cpp"
break;
case 80:
-#line 440 "engines/director/lingo/lingo-gr.y"
+#line 441 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_or); }
#line 2586 "engines/director/lingo/lingo-gr.cpp"
break;
case 81:
-#line 441 "engines/director/lingo/lingo-gr.y"
+#line 442 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_not); }
#line 2592 "engines/director/lingo/lingo-gr.cpp"
break;
case 82:
-#line 442 "engines/director/lingo/lingo-gr.y"
+#line 443 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ampersand); }
#line 2598 "engines/director/lingo/lingo-gr.cpp"
break;
case 83:
-#line 443 "engines/director/lingo/lingo-gr.y"
+#line 444 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_concat); }
#line 2604 "engines/director/lingo/lingo-gr.cpp"
break;
case 84:
-#line 444 "engines/director/lingo/lingo-gr.y"
+#line 445 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_contains); }
#line 2610 "engines/director/lingo/lingo-gr.cpp"
break;
case 85:
-#line 445 "engines/director/lingo/lingo-gr.y"
+#line 446 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_starts); }
#line 2616 "engines/director/lingo/lingo-gr.cpp"
break;
case 86:
-#line 446 "engines/director/lingo/lingo-gr.y"
+#line 447 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
#line 2622 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
-#line 447 "engines/director/lingo/lingo-gr.y"
+#line 448 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
#line 2628 "engines/director/lingo/lingo-gr.cpp"
break;
case 88:
-#line 448 "engines/director/lingo/lingo-gr.y"
+#line 449 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
#line 2634 "engines/director/lingo/lingo-gr.cpp"
break;
case 89:
-#line 449 "engines/director/lingo/lingo-gr.y"
+#line 450 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_intersects); }
#line 2640 "engines/director/lingo/lingo-gr.cpp"
break;
case 90:
-#line 450 "engines/director/lingo/lingo-gr.y"
+#line 451 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_within); }
#line 2646 "engines/director/lingo/lingo-gr.cpp"
break;
case 91:
-#line 451 "engines/director/lingo/lingo-gr.y"
+#line 452 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charOf); }
#line 2652 "engines/director/lingo/lingo-gr.cpp"
break;
case 92:
-#line 452 "engines/director/lingo/lingo-gr.y"
+#line 453 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charToOf); }
#line 2658 "engines/director/lingo/lingo-gr.cpp"
break;
case 93:
-#line 453 "engines/director/lingo/lingo-gr.y"
+#line 454 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemOf); }
#line 2664 "engines/director/lingo/lingo-gr.cpp"
break;
case 94:
-#line 454 "engines/director/lingo/lingo-gr.y"
+#line 455 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemToOf); }
#line 2670 "engines/director/lingo/lingo-gr.cpp"
break;
case 95:
-#line 455 "engines/director/lingo/lingo-gr.y"
+#line 456 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineOf); }
#line 2676 "engines/director/lingo/lingo-gr.cpp"
break;
case 96:
-#line 456 "engines/director/lingo/lingo-gr.y"
+#line 457 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineToOf); }
#line 2682 "engines/director/lingo/lingo-gr.cpp"
break;
case 97:
-#line 457 "engines/director/lingo/lingo-gr.y"
+#line 458 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordOf); }
#line 2688 "engines/director/lingo/lingo-gr.cpp"
break;
case 98:
-#line 458 "engines/director/lingo/lingo-gr.y"
+#line 459 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordToOf); }
#line 2694 "engines/director/lingo/lingo-gr.cpp"
break;
case 99:
-#line 461 "engines/director/lingo/lingo-gr.y"
+#line 462 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
@@ -2702,25 +2702,25 @@ yyreduce:
break;
case 100:
-#line 466 "engines/director/lingo/lingo-gr.y"
+#line 467 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); }
#line 2708 "engines/director/lingo/lingo-gr.cpp"
break;
case 103:
-#line 469 "engines/director/lingo/lingo-gr.y"
+#line 470 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); }
#line 2714 "engines/director/lingo/lingo-gr.cpp"
break;
case 104:
-#line 470 "engines/director/lingo/lingo-gr.y"
+#line 471 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); }
#line 2720 "engines/director/lingo/lingo-gr.cpp"
break;
case 108:
-#line 474 "engines/director/lingo/lingo-gr.y"
+#line 475 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
@@ -2728,7 +2728,7 @@ yyreduce:
break;
case 109:
-#line 477 "engines/director/lingo/lingo-gr.y"
+#line 478 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
@@ -2736,7 +2736,7 @@ yyreduce:
break;
case 110:
-#line 480 "engines/director/lingo/lingo-gr.y"
+#line 481 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
@@ -2744,7 +2744,7 @@ yyreduce:
break;
case 111:
-#line 483 "engines/director/lingo/lingo-gr.y"
+#line 484 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_voidpush);
g_lingo->codeFunc((yyvsp[0].s), 1);
@@ -2753,26 +2753,26 @@ yyreduce:
break;
case 112:
-#line 487 "engines/director/lingo/lingo-gr.y"
+#line 488 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
#line 2760 "engines/director/lingo/lingo-gr.cpp"
break;
case 113:
-#line 489 "engines/director/lingo/lingo-gr.y"
+#line 490 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); }
#line 2766 "engines/director/lingo/lingo-gr.cpp"
break;
case 114:
-#line 490 "engines/director/lingo/lingo-gr.y"
+#line 491 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); }
#line 2772 "engines/director/lingo/lingo-gr.cpp"
break;
case 115:
-#line 491 "engines/director/lingo/lingo-gr.y"
+#line 492 "engines/director/lingo/lingo-gr.y"
{
Common::String s(*(yyvsp[-2].s));
s += '-'; s += *(yyvsp[-1].s);
@@ -2783,61 +2783,61 @@ yyreduce:
break;
case 116:
-#line 499 "engines/director/lingo/lingo-gr.y"
+#line 500 "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 2789 "engines/director/lingo/lingo-gr.cpp"
break;
case 117:
-#line 500 "engines/director/lingo/lingo-gr.y"
+#line 501 "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 2795 "engines/director/lingo/lingo-gr.cpp"
break;
case 118:
-#line 503 "engines/director/lingo/lingo-gr.y"
+#line 504 "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 2801 "engines/director/lingo/lingo-gr.cpp"
break;
case 119:
-#line 504 "engines/director/lingo/lingo-gr.y"
+#line 505 "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 2807 "engines/director/lingo/lingo-gr.cpp"
break;
case 120:
-#line 507 "engines/director/lingo/lingo-gr.y"
+#line 508 "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 2813 "engines/director/lingo/lingo-gr.cpp"
break;
case 121:
-#line 508 "engines/director/lingo/lingo-gr.y"
+#line 509 "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 2819 "engines/director/lingo/lingo-gr.cpp"
break;
case 122:
-#line 519 "engines/director/lingo/lingo-gr.y"
+#line 520 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
#line 2825 "engines/director/lingo/lingo-gr.cpp"
break;
case 123:
-#line 520 "engines/director/lingo/lingo-gr.y"
+#line 521 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
#line 2831 "engines/director/lingo/lingo-gr.cpp"
break;
case 124:
-#line 521 "engines/director/lingo/lingo-gr.y"
+#line 522 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
#line 2837 "engines/director/lingo/lingo-gr.cpp"
break;
case 125:
-#line 522 "engines/director/lingo/lingo-gr.y"
+#line 523 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
@@ -2846,7 +2846,7 @@ yyreduce:
break;
case 126:
-#line 526 "engines/director/lingo/lingo-gr.y"
+#line 527 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
@@ -2855,7 +2855,7 @@ yyreduce:
break;
case 127:
-#line 530 "engines/director/lingo/lingo-gr.y"
+#line 531 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
@@ -2864,13 +2864,13 @@ yyreduce:
break;
case 130:
-#line 540 "engines/director/lingo/lingo-gr.y"
+#line 541 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); }
#line 2870 "engines/director/lingo/lingo-gr.cpp"
break;
case 131:
-#line 541 "engines/director/lingo/lingo-gr.y"
+#line 542 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
@@ -2879,7 +2879,7 @@ yyreduce:
break;
case 132:
-#line 545 "engines/director/lingo/lingo-gr.y"
+#line 546 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
@@ -2888,7 +2888,7 @@ yyreduce:
break;
case 133:
-#line 549 "engines/director/lingo/lingo-gr.y"
+#line 550 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
@@ -2897,13 +2897,13 @@ yyreduce:
break;
case 134:
-#line 553 "engines/director/lingo/lingo-gr.y"
+#line 554 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
#line 2903 "engines/director/lingo/lingo-gr.cpp"
break;
case 135:
-#line 553 "engines/director/lingo/lingo-gr.y"
+#line 554 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg));
@@ -2912,13 +2912,13 @@ yyreduce:
break;
case 136:
-#line 584 "engines/director/lingo/lingo-gr.y"
+#line 585 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
#line 2918 "engines/director/lingo/lingo-gr.cpp"
break;
case 137:
-#line 585 "engines/director/lingo/lingo-gr.y"
+#line 586 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
@@ -2929,19 +2929,19 @@ yyreduce:
break;
case 138:
-#line 591 "engines/director/lingo/lingo-gr.y"
+#line 592 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
#line 2935 "engines/director/lingo/lingo-gr.cpp"
break;
case 139:
-#line 592 "engines/director/lingo/lingo-gr.y"
+#line 593 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
#line 2941 "engines/director/lingo/lingo-gr.cpp"
break;
case 140:
-#line 593 "engines/director/lingo/lingo-gr.y"
+#line 594 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
@@ -2952,7 +2952,7 @@ yyreduce:
break;
case 141:
-#line 599 "engines/director/lingo/lingo-gr.y"
+#line 600 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-7].s), (yyvsp[-6].code), (yyvsp[-5].narg));
@@ -2967,7 +2967,7 @@ yyreduce:
break;
case 142:
-#line 609 "engines/director/lingo/lingo-gr.y"
+#line 610 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
@@ -2979,55 +2979,55 @@ yyreduce:
break;
case 143:
-#line 617 "engines/director/lingo/lingo-gr.y"
+#line 618 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
#line 2985 "engines/director/lingo/lingo-gr.cpp"
break;
case 144:
-#line 619 "engines/director/lingo/lingo-gr.y"
+#line 620 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
#line 2991 "engines/director/lingo/lingo-gr.cpp"
break;
case 145:
-#line 620 "engines/director/lingo/lingo-gr.y"
+#line 621 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
#line 2997 "engines/director/lingo/lingo-gr.cpp"
break;
case 146:
-#line 621 "engines/director/lingo/lingo-gr.y"
+#line 622 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
#line 3003 "engines/director/lingo/lingo-gr.cpp"
break;
case 147:
-#line 622 "engines/director/lingo/lingo-gr.y"
+#line 623 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
#line 3009 "engines/director/lingo/lingo-gr.cpp"
break;
case 149:
-#line 626 "engines/director/lingo/lingo-gr.y"
+#line 627 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
#line 3015 "engines/director/lingo/lingo-gr.cpp"
break;
case 150:
-#line 627 "engines/director/lingo/lingo-gr.y"
+#line 628 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
#line 3021 "engines/director/lingo/lingo-gr.cpp"
break;
case 151:
-#line 630 "engines/director/lingo/lingo-gr.y"
+#line 631 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
#line 3027 "engines/director/lingo/lingo-gr.cpp"
break;
case 152:
-#line 633 "engines/director/lingo/lingo-gr.y"
+#line 634 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
g_lingo->codeString((yyvsp[-1].s)->c_str());
@@ -3039,91 +3039,91 @@ yyreduce:
break;
case 153:
-#line 642 "engines/director/lingo/lingo-gr.y"
+#line 643 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
#line 3045 "engines/director/lingo/lingo-gr.cpp"
break;
case 154:
-#line 643 "engines/director/lingo/lingo-gr.y"
+#line 644 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
#line 3051 "engines/director/lingo/lingo-gr.cpp"
break;
case 155:
-#line 644 "engines/director/lingo/lingo-gr.y"
+#line 645 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
#line 3057 "engines/director/lingo/lingo-gr.cpp"
break;
case 156:
-#line 647 "engines/director/lingo/lingo-gr.y"
+#line 648 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
#line 3063 "engines/director/lingo/lingo-gr.cpp"
break;
case 157:
-#line 648 "engines/director/lingo/lingo-gr.y"
+#line 649 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
#line 3069 "engines/director/lingo/lingo-gr.cpp"
break;
case 158:
-#line 651 "engines/director/lingo/lingo-gr.y"
+#line 652 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
#line 3075 "engines/director/lingo/lingo-gr.cpp"
break;
case 159:
-#line 654 "engines/director/lingo/lingo-gr.y"
+#line 655 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
#line 3081 "engines/director/lingo/lingo-gr.cpp"
break;
case 160:
-#line 655 "engines/director/lingo/lingo-gr.y"
+#line 656 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
#line 3087 "engines/director/lingo/lingo-gr.cpp"
break;
case 161:
-#line 656 "engines/director/lingo/lingo-gr.y"
+#line 657 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
#line 3093 "engines/director/lingo/lingo-gr.cpp"
break;
case 162:
-#line 657 "engines/director/lingo/lingo-gr.y"
+#line 658 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
#line 3099 "engines/director/lingo/lingo-gr.cpp"
break;
case 163:
-#line 660 "engines/director/lingo/lingo-gr.y"
+#line 661 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
#line 3105 "engines/director/lingo/lingo-gr.cpp"
break;
case 164:
-#line 661 "engines/director/lingo/lingo-gr.y"
+#line 662 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
#line 3111 "engines/director/lingo/lingo-gr.cpp"
break;
case 165:
-#line 664 "engines/director/lingo/lingo-gr.y"
+#line 665 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
#line 3117 "engines/director/lingo/lingo-gr.cpp"
break;
case 166:
-#line 665 "engines/director/lingo/lingo-gr.y"
+#line 666 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
#line 3123 "engines/director/lingo/lingo-gr.cpp"
break;
case 167:
-#line 668 "engines/director/lingo/lingo-gr.y"
+#line 669 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
@@ -3132,7 +3132,7 @@ yyreduce:
break;
case 168:
-#line 672 "engines/director/lingo/lingo-gr.y"
+#line 673 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
@@ -3373,5 +3373,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 679 "engines/director/lingo/lingo-gr.y"
+#line 680 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 312986c..fd0af3a 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -34,8 +34,8 @@
/* Undocumented macros, especially those whose name start with YY_,
are private implementation details. Do not rely on them. */
-#ifndef YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
-# define YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED
+#ifndef YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_H_INCLUDED
+# define YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_H_INCLUDED
/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 1
@@ -145,7 +145,7 @@ extern int yydebug;
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
union YYSTYPE
{
-#line 85 "engines/director/lingo/lingo-gr.y"
+#line 86 "engines/director/lingo/lingo-gr.y"
Common::String *s;
int i;
@@ -160,7 +160,7 @@ union YYSTYPE
int e;
} objectfield;
-#line 164 "engines/director/lingo/lingo-gr.hpp"
+#line 164 "engines/director/lingo/lingo-gr.h"
};
typedef union YYSTYPE YYSTYPE;
@@ -173,4 +173,4 @@ extern YYSTYPE yylval;
int yyparse (void);
-#endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_HPP_INCLUDED */
+#endif /* !YY_YY_ENGINES_DIRECTOR_LINGO_LINGO_GR_H_INCLUDED */
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 71077a6..3440a4f 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -47,9 +47,10 @@
%debug
%require "3.5"
+%defines "engines/director/lingo/lingo-gr.h"
+%output "engines/director/lingo/lingo-gr.cpp"
// %glr-parser
-// %defines "engines/director/lingo/lingo-gr.h"
%{
#define FORBIDDEN_SYMBOL_ALLOW_ALL
diff --git a/engines/director/module.mk b/engines/director/module.mk
index 06ceae0..ebe575b 100644
--- a/engines/director/module.mk
+++ b/engines/director/module.mk
@@ -31,8 +31,7 @@ MODULE_OBJS = \
director-grammar:
flex -o engines/director/lingo/lingo-lex.cpp engines/director/lingo/lingo-lex.l
- bison -dv -o engines/director/lingo/lingo-gr.cpp engines/director/lingo/lingo-gr.y
- mv engines/director/lingo/lingo-gr.hpp engines/director/lingo/lingo-gr.h
+ bison -dv engines/director/lingo/lingo-gr.y
# This module can be built as a plugin
ifeq ($(ENABLE_DIRECTOR), DYNAMIC_PLUGIN)
Commit: f9ea2ec28a87362ccf0d34950d54ed862d0d5adb
https://github.com/scummvm/scummvm/commit/f9ea2ec28a87362ccf0d34950d54ed862d0d5adb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T18:07:50+01:00
Commit Message:
DIRECTOR: LINGO: Removed obsolete TWOWORDBUILTIN from the grammar
Changed paths:
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.h
engines/director/lingo/lingo-gr.y
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index c458776..39739f3 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -165,75 +165,74 @@ extern int yydebug;
BLTINNOARGSORONE = 275,
BLTINONEARG = 276,
BLTINARGLIST = 277,
- TWOWORDBUILTIN = 278,
- FBLTIN = 279,
- FBLTINNOARGS = 280,
- FBLTINONEARG = 281,
- FBLTINARGLIST = 282,
- RBLTIN = 283,
- RBLTINONEARG = 284,
- ID = 285,
- STRING = 286,
- HANDLER = 287,
- SYMBOL = 288,
- ENDCLAUSE = 289,
- tPLAYACCEL = 290,
- tMETHOD = 291,
- THEOBJECTFIELD = 292,
- tDOWN = 293,
- tELSE = 294,
- tELSIF = 295,
- tEXIT = 296,
- tGLOBAL = 297,
- tGO = 298,
- tIF = 299,
- tINTO = 300,
- tLOOP = 301,
- tMACRO = 302,
- tMOVIE = 303,
- tNEXT = 304,
- tOF = 305,
- tPREVIOUS = 306,
- tPUT = 307,
- tREPEAT = 308,
- tSET = 309,
- tTHEN = 310,
- tTO = 311,
- tWHEN = 312,
- tWITH = 313,
- tWHILE = 314,
- tNLELSE = 315,
- tFACTORY = 316,
- tOPEN = 317,
- tPLAY = 318,
- tDONE = 319,
- tINSTANCE = 320,
- tGE = 321,
- tLE = 322,
- tEQ = 323,
- tNEQ = 324,
- tAND = 325,
- tOR = 326,
- tNOT = 327,
- tMOD = 328,
- tAFTER = 329,
- tBEFORE = 330,
- tCONCAT = 331,
- tCONTAINS = 332,
- tSTARTS = 333,
- tCHAR = 334,
- tITEM = 335,
- tLINE = 336,
- tWORD = 337,
- tSPRITE = 338,
- tINTERSECTS = 339,
- tWITHIN = 340,
- tTELL = 341,
- tPROPERTY = 342,
- tON = 343,
- tENDIF = 344,
- tENDREPEAT = 345,
- tENDTELL = 346
+ FBLTIN = 278,
+ FBLTINNOARGS = 279,
+ FBLTINONEARG = 280,
+ FBLTINARGLIST = 281,
+ RBLTIN = 282,
+ RBLTINONEARG = 283,
+ ID = 284,
+ STRING = 285,
+ HANDLER = 286,
+ SYMBOL = 287,
+ ENDCLAUSE = 288,
+ tPLAYACCEL = 289,
+ tMETHOD = 290,
+ THEOBJECTFIELD = 291,
+ tDOWN = 292,
+ tELSE = 293,
+ tELSIF = 294,
+ tEXIT = 295,
+ tGLOBAL = 296,
+ tGO = 297,
+ tIF = 298,
+ tINTO = 299,
+ tLOOP = 300,
+ tMACRO = 301,
+ tMOVIE = 302,
+ tNEXT = 303,
+ tOF = 304,
+ tPREVIOUS = 305,
+ tPUT = 306,
+ tREPEAT = 307,
+ tSET = 308,
+ tTHEN = 309,
+ tTO = 310,
+ tWHEN = 311,
+ tWITH = 312,
+ tWHILE = 313,
+ tNLELSE = 314,
+ tFACTORY = 315,
+ tOPEN = 316,
+ tPLAY = 317,
+ tDONE = 318,
+ tINSTANCE = 319,
+ tGE = 320,
+ tLE = 321,
+ tEQ = 322,
+ tNEQ = 323,
+ tAND = 324,
+ tOR = 325,
+ tNOT = 326,
+ tMOD = 327,
+ tAFTER = 328,
+ tBEFORE = 329,
+ tCONCAT = 330,
+ tCONTAINS = 331,
+ tSTARTS = 332,
+ tCHAR = 333,
+ tITEM = 334,
+ tLINE = 335,
+ tWORD = 336,
+ tSPRITE = 337,
+ tINTERSECTS = 338,
+ tWITHIN = 339,
+ tTELL = 340,
+ tPROPERTY = 341,
+ tON = 342,
+ tENDIF = 343,
+ tENDREPEAT = 344,
+ tENDTELL = 345
};
#endif
@@ -256,7 +255,7 @@ union YYSTYPE
int e;
} objectfield;
-#line 260 "engines/director/lingo/lingo-gr.cpp"
+#line 259 "engines/director/lingo/lingo-gr.cpp"
};
typedef union YYSTYPE YYSTYPE;
@@ -573,21 +572,21 @@ union yyalloc
#endif /* !YYCOPY_NEEDED */
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 132
+#define YYFINAL 130
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1584
+#define YYLAST 1513
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 107
+#define YYNTOKENS 106
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 46
/* YYNRULES -- Number of rules. */
-#define YYNRULES 168
+#define YYNRULES 167
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 352
+#define YYNSTATES 349
#define YYUNDEFTOK 2
-#define YYMAXUTOK 346
+#define YYMAXUTOK 345
/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -600,15 +599,15 @@ union yyalloc
static const yytype_int8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 100, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 99, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 99, 94, 2,
- 101, 102, 97, 95, 103, 96, 2, 98, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 106, 2,
- 92, 2, 93, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 98, 93, 2,
+ 100, 101, 96, 94, 102, 95, 2, 97, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 105, 2,
+ 91, 2, 92, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 104, 2, 105, 2, 2, 2, 2, 2, 2,
+ 2, 103, 2, 104, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -633,7 +632,7 @@ static const yytype_int8 yytranslate[] =
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91
+ 85, 86, 87, 88, 89, 90
};
#if YYDEBUG
@@ -651,12 +650,12 @@ static const yytype_int16 yyrline[] =
441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
451, 452, 453, 454, 455, 456, 457, 458, 459, 462,
467, 468, 469, 470, 471, 472, 473, 474, 475, 478,
- 481, 484, 488, 490, 491, 492, 500, 501, 504, 505,
- 508, 509, 520, 521, 522, 523, 527, 531, 537, 538,
- 541, 542, 546, 550, 554, 554, 585, 585, 592, 593,
- 593, 600, 610, 618, 620, 621, 622, 623, 626, 627,
- 628, 631, 634, 643, 644, 645, 648, 649, 652, 655,
- 656, 657, 658, 661, 662, 665, 666, 669, 673
+ 481, 484, 488, 490, 491, 494, 495, 498, 499, 502,
+ 503, 514, 515, 516, 517, 521, 525, 531, 532, 535,
+ 536, 540, 544, 548, 548, 579, 579, 586, 587, 587,
+ 594, 604, 612, 614, 615, 616, 617, 620, 621, 622,
+ 625, 628, 637, 638, 639, 642, 643, 646, 649, 650,
+ 651, 652, 655, 656, 659, 660, 663, 667
};
#endif
@@ -669,26 +668,25 @@ static const char *const yytname[] =
"POINT", "RECT", "ARRAY", "OBJECT", "REFERENCE", "INT", "ARGC",
"ARGCNORET", "THEENTITY", "THEENTITYWITHID", "FLOAT", "BLTIN",
"BLTINNOARGS", "BLTINNOARGSORONE", "BLTINONEARG", "BLTINARGLIST",
- "TWOWORDBUILTIN", "FBLTIN", "FBLTINNOARGS", "FBLTINONEARG",
- "FBLTINARGLIST", "RBLTIN", "RBLTINONEARG", "ID", "STRING", "HANDLER",
- "SYMBOL", "ENDCLAUSE", "tPLAYACCEL", "tMETHOD", "THEOBJECTFIELD",
- "tDOWN", "tELSE", "tELSIF", "tEXIT", "tGLOBAL", "tGO", "tIF", "tINTO",
- "tLOOP", "tMACRO", "tMOVIE", "tNEXT", "tOF", "tPREVIOUS", "tPUT",
- "tREPEAT", "tSET", "tTHEN", "tTO", "tWHEN", "tWITH", "tWHILE", "tNLELSE",
- "tFACTORY", "tOPEN", "tPLAY", "tDONE", "tINSTANCE", "tGE", "tLE", "tEQ",
- "tNEQ", "tAND", "tOR", "tNOT", "tMOD", "tAFTER", "tBEFORE", "tCONCAT",
- "tCONTAINS", "tSTARTS", "tCHAR", "tITEM", "tLINE", "tWORD", "tSPRITE",
- "tINTERSECTS", "tWITHIN", "tTELL", "tPROPERTY", "tON", "tENDIF",
- "tENDREPEAT", "tENDTELL", "'<'", "'>'", "'&'", "'+'", "'-'", "'*'",
- "'/'", "'%'", "'\\n'", "'('", "')'", "','", "'['", "']'", "':'",
- "$accept", "program", "programline", "asgn", "stmtoneliner",
- "stmtonelinerwithif", "stmt", "ifstmt", "elseifstmtlist", "elseifstmt",
- "ifoneliner", "repeatwhile", "repeatwith", "if", "elseif", "begin",
- "end", "stmtlist", "when", "tell", "simpleexpr", "expr", "reference",
- "proc", "globallist", "propertylist", "instancelist", "gotofunc",
- "gotomovie", "playfunc", "$@1", "defn", "$@2", "$@3", "on", "argdef",
- "endargdef", "argstore", "macro", "arglist", "nonemptyarglist", "list",
- "valuelist", "linearlist", "proplist", "proppair", YY_NULLPTR
+ "FBLTIN", "FBLTINNOARGS", "FBLTINONEARG", "FBLTINARGLIST", "RBLTIN",
+ "RBLTINONEARG", "ID", "STRING", "HANDLER", "SYMBOL", "ENDCLAUSE",
+ "tPLAYACCEL", "tMETHOD", "THEOBJECTFIELD", "tDOWN", "tELSE", "tELSIF",
+ "tEXIT", "tGLOBAL", "tGO", "tIF", "tINTO", "tLOOP", "tMACRO", "tMOVIE",
+ "tNEXT", "tOF", "tPREVIOUS", "tPUT", "tREPEAT", "tSET", "tTHEN", "tTO",
+ "tWHEN", "tWITH", "tWHILE", "tNLELSE", "tFACTORY", "tOPEN", "tPLAY",
+ "tDONE", "tINSTANCE", "tGE", "tLE", "tEQ", "tNEQ", "tAND", "tOR", "tNOT",
+ "tMOD", "tAFTER", "tBEFORE", "tCONCAT", "tCONTAINS", "tSTARTS", "tCHAR",
+ "tITEM", "tLINE", "tWORD", "tSPRITE", "tINTERSECTS", "tWITHIN", "tTELL",
+ "tPROPERTY", "tON", "tENDIF", "tENDREPEAT", "tENDTELL", "'<'", "'>'",
+ "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "','",
+ "'['", "']'", "':'", "$accept", "program", "programline", "asgn",
+ "stmtoneliner", "stmtonelinerwithif", "stmt", "ifstmt", "elseifstmtlist",
+ "elseifstmt", "ifoneliner", "repeatwhile", "repeatwith", "if", "elseif",
+ "begin", "end", "stmtlist", "when", "tell", "simpleexpr", "expr",
+ "reference", "proc", "globallist", "propertylist", "instancelist",
+ "gotofunc", "gotomovie", "playfunc", "$@1", "defn", "$@2", "$@3", "on",
+ "argdef", "endargdef", "argstore", "macro", "arglist", "nonemptyarglist",
+ "list", "valuelist", "linearlist", "proplist", "proppair", YY_NULLPTR
};
#endif
@@ -706,12 +704,12 @@ static const yytype_int16 yytoknum[] =
315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 60, 62, 38, 43, 45, 42, 47, 37,
- 10, 40, 41, 44, 91, 93, 58
+ 345, 60, 62, 38, 43, 45, 42, 47, 37, 10,
+ 40, 41, 44, 91, 93, 58
};
# endif
-#define YYPACT_NINF (-279)
+#define YYPACT_NINF (-271)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
@@ -725,42 +723,41 @@ static const yytype_int16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 297, -82, -279, -279, 951, -279, -279, 951, 951, 951,
- -5, -279, 951, 951, 64, 984, -279, -279, -279, -279,
- -279, -3, 16, 829, -279, 35, 951, 46, 48, 39,
- 49, 951, 890, 68, 951, 951, 951, 951, 951, 951,
- -279, 71, 81, 951, 951, 951, 12, 2, -279, -279,
- -279, -279, -279, 951, 44, 951, 657, 951, -279, 1473,
- -279, -279, -279, -279, -279, -279, -279, -279, -279, 13,
- 951, 1473, 1473, 1473, 1473, 10, 951, 1473, 10, -279,
- -279, 951, 1473, 14, 951, -279, -279, -279, 17, -279,
- 951, -279, 67, -279, 1036, -279, -279, 1023, 89, -279,
- -42, 64, -1, 65, 74, -279, 1390, -279, 1036, -279,
- -279, 27, -279, 1085, 1118, 1151, 1184, 1440, -279, 29,
- -279, -279, -279, 1403, 31, 32, -279, -279, 28, 33,
- 36, -279, -279, 387, 1473, 951, 1473, -279, -279, 951,
- 1473, -279, -279, 1349, 951, 951, 951, 951, 951, 951,
- 951, 951, 951, 951, 951, 951, 951, 951, 951, 951,
- 951, 92, 951, 1023, 951, 10, 1403, -14, 951, 10,
- 92, 127, 1473, 951, -279, -279, 78, 951, 951, -279,
- 951, 951, 19, 951, 951, 951, -279, 951, -279, 129,
- 951, 951, 951, 951, 951, 951, 951, 951, 951, 951,
- 131, -279, 64, 64, -279, 64, 23, -279, -279, 1473,
- 107, -279, 1473, 951, -279, 30, 30, 30, 30, 1486,
- 1486, -279, -36, 30, 30, 30, 30, -36, -50, -50,
- -279, -279, -279, -30, 1473, -279, 1473, -29, -279, 1473,
- 92, -279, -279, 1473, 1473, 1473, 30, 951, 951, 1473,
- 30, 1473, 1473, -279, 1473, 1217, 1473, 1250, 1473, 1283,
- 1473, 1316, 1473, 1473, -279, -279, -279, -279, 31, 32,
- -279, 567, -18, -279, 110, 1473, 567, 69, 137, 69,
- -7, 1473, 30, 951, 951, 951, 951, -279, -279, 80,
- 115, 951, 567, 747, 84, 148, -279, -279, -279, 69,
- 1473, 1473, 1473, 1473, -279, 951, 1473, -279, -279, -279,
- -279, 477, 567, -279, 1473, -279, 70, -32, 154, 567,
- -279, 567, -279, -279, -279, 951, 96, -279, -279, -279,
- 93, 567, 108, -279, 1473, -279, 747, 167, 109, -279,
- 567, 147, -279, -279, -279, 117, -279, 119, -279, 567,
- -279, -279
+ 285, -80, -271, -271, 911, -271, -271, 911, 911, 911,
+ -271, 911, 911, 32, 971, -271, -271, -271, -271, -271,
+ -28, 12, 811, -271, 29, 911, 50, 7, 53, 58,
+ 911, 871, 97, 911, 911, 911, 911, 911, 911, -271,
+ 103, 107, 911, 911, 911, 25, 2, -271, -271, -271,
+ -271, -271, 911, 88, 911, 641, 911, -271, 1403, -271,
+ -271, -271, -271, -271, -271, -271, -271, -271, -27, 911,
+ 1403, 1403, 1403, 1403, 55, 1403, 55, -271, -271, 911,
+ 1403, 63, 911, -271, -271, -271, 65, -271, 911, -271,
+ 121, -271, 1015, -271, -271, 964, 140, -271, 47, 32,
+ 51, 117, 127, -271, 1320, -271, 1015, -271, -271, 73,
+ -271, 28, 1048, 1081, 1114, 1370, -271, 77, -271, -271,
+ -271, 1333, 89, 90, -271, -271, 78, 94, 95, -271,
+ -271, 374, 1403, 911, 1403, -271, -271, 911, 1403, -271,
+ -271, 1279, 911, 911, 911, 911, 911, 911, 911, 911,
+ 911, 911, 911, 911, 911, 911, 911, 911, 911, 172,
+ 911, 964, 911, 1333, 15, 911, 55, 172, 174, 1403,
+ 911, -271, -271, 131, 911, 911, -271, 911, 911, 60,
+ 911, 911, 911, -271, 911, -271, 175, 911, 911, 911,
+ 911, 911, 911, 911, 911, 911, 911, 176, -271, 32,
+ 32, -271, 32, 44, -271, -271, 1403, 153, -271, 1403,
+ 911, -271, 16, 16, 16, 16, 1416, 1416, -271, -26,
+ 16, 16, 16, 16, -26, -16, -16, -271, -271, -271,
+ -85, 1403, -271, 1403, -74, -271, 1403, 172, -271, -271,
+ 1403, 1403, 1403, 16, 911, 911, 1403, 16, 1403, 1403,
+ -271, 1403, 1147, 1403, 1180, 1403, 1213, 1403, 1246, 1403,
+ 1403, -271, -271, -271, -271, 89, 90, -271, 552, -2,
+ -271, 154, 1403, 552, 108, 180, 108, -10, 1403, 16,
+ 911, 911, 911, 911, -271, -271, 122, 157, 911, 552,
+ 730, 123, 186, -271, -271, -271, 108, 1403, 1403, 1403,
+ 1403, -271, 911, 1403, -271, -271, -271, -271, 463, 552,
+ -271, 1403, -271, 125, -22, 187, 552, -271, 552, -271,
+ -271, -271, 911, 129, -271, -271, -271, 116, 552, 130,
+ -271, 1403, -271, 730, 191, 133, -271, 552, 169, -271,
+ -271, -271, 136, -271, 137, -271, 552, -271, -271
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -768,62 +765,61 @@ static const yytype_int16 yypact[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 52, 64, 0, 53, 108, 111, 0, 153,
- 0, 60, 0, 153, 0, 56, 55, 54, 134, 139,
- 66, 104, 0, 0, 43, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 51, 0, 0, 0, 0, 0, 159, 0, 3, 67,
- 26, 7, 27, 0, 0, 0, 0, 0, 58, 20,
- 59, 21, 101, 102, 6, 45, 19, 57, 4, 56,
- 0, 65, 110, 109, 154, 112, 153, 61, 62, 56,
- 99, 153, 156, 152, 153, 45, 103, 116, 105, 122,
- 0, 123, 0, 124, 125, 127, 136, 100, 0, 41,
- 0, 0, 0, 0, 0, 138, 114, 130, 131, 133,
- 120, 107, 81, 0, 0, 0, 0, 0, 118, 106,
- 143, 86, 87, 0, 55, 54, 160, 163, 0, 161,
- 162, 165, 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, 144, 153, 0, 0, 115, 154, 0, 0, 135,
- 144, 0, 129, 0, 126, 45, 0, 0, 0, 42,
- 0, 0, 0, 0, 0, 0, 50, 0, 132, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 88, 0, 0, 158, 0, 0, 2, 47, 46,
- 0, 31, 46, 0, 47, 77, 78, 75, 76, 79,
- 80, 72, 83, 84, 85, 74, 73, 82, 68, 69,
- 70, 71, 145, 0, 155, 63, 157, 0, 117, 128,
- 144, 8, 9, 10, 11, 15, 13, 0, 0, 14,
- 12, 18, 113, 121, 91, 0, 93, 0, 95, 0,
- 97, 0, 89, 90, 119, 168, 167, 164, 0, 0,
- 166, 46, 0, 47, 0, 33, 46, 151, 0, 151,
- 0, 16, 17, 0, 0, 0, 0, 48, 49, 0,
- 0, 0, 46, 0, 0, 0, 47, 146, 47, 151,
- 92, 94, 96, 98, 28, 0, 46, 36, 46, 32,
- 147, 142, 140, 47, 46, 47, 46, 0, 148, 137,
- 47, 46, 45, 44, 37, 0, 0, 45, 40, 149,
- 141, 46, 0, 47, 46, 34, 0, 0, 0, 29,
- 46, 0, 46, 150, 30, 0, 47, 0, 35, 46,
- 39, 38
+ 0, 0, 52, 64, 0, 53, 108, 111, 0, 152,
+ 60, 0, 152, 0, 56, 55, 54, 133, 138, 66,
+ 104, 0, 0, 43, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 51,
+ 0, 0, 0, 0, 0, 158, 0, 3, 67, 26,
+ 7, 27, 0, 0, 0, 0, 0, 58, 20, 59,
+ 21, 101, 102, 6, 45, 19, 57, 4, 56, 0,
+ 65, 110, 109, 153, 112, 61, 62, 56, 99, 152,
+ 155, 151, 152, 45, 103, 115, 105, 121, 0, 122,
+ 0, 123, 124, 126, 135, 100, 0, 41, 0, 0,
+ 0, 0, 0, 137, 114, 129, 130, 132, 119, 107,
+ 81, 0, 0, 0, 0, 0, 117, 106, 142, 86,
+ 87, 0, 55, 54, 159, 162, 0, 160, 161, 164,
+ 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, 143,
+ 152, 0, 0, 153, 0, 0, 134, 143, 0, 128,
+ 0, 125, 45, 0, 0, 0, 42, 0, 0, 0,
+ 0, 0, 0, 50, 0, 131, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 88, 0,
+ 0, 157, 0, 0, 2, 47, 46, 0, 31, 46,
+ 0, 47, 77, 78, 75, 76, 79, 80, 72, 83,
+ 84, 85, 74, 73, 82, 68, 69, 70, 71, 144,
+ 0, 154, 63, 156, 0, 116, 127, 143, 8, 9,
+ 10, 11, 15, 13, 0, 0, 14, 12, 18, 113,
+ 120, 91, 0, 93, 0, 95, 0, 97, 0, 89,
+ 90, 118, 167, 166, 163, 0, 0, 165, 46, 0,
+ 47, 0, 33, 46, 150, 0, 150, 0, 16, 17,
+ 0, 0, 0, 0, 48, 49, 0, 0, 0, 46,
+ 0, 0, 0, 47, 145, 47, 150, 92, 94, 96,
+ 98, 28, 0, 46, 36, 46, 32, 146, 141, 139,
+ 47, 46, 47, 46, 0, 147, 136, 47, 46, 45,
+ 44, 37, 0, 0, 45, 40, 148, 140, 46, 0,
+ 47, 46, 34, 0, 0, 0, 29, 46, 0, 46,
+ 149, 30, 0, 47, 0, 35, 46, 39, 38
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -279, -279, 77, -279, -278, -279, 1, -279, -279, -279,
- -279, -279, -279, 155, -279, -75, -46, -91, -279, -279,
- -2, -4, 37, 156, -279, -279, -279, -279, -26, -279,
- -279, -279, -279, -279, -279, -157, -279, -263, 158, 8,
- -279, -279, -279, -279, -279, 9
+ -271, -271, 96, -271, -270, -271, 6, -271, -271, -271,
+ -271, -271, -271, 171, -271, -82, -75, -49, -271, -271,
+ 0, -4, 56, 177, -271, -271, -271, -271, -20, -271,
+ -271, -271, -271, -271, -271, -158, -271, -229, 178, 3,
+ -271, -271, -271, -271, -271, 31
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 47, 48, 49, 50, 137, 288, 52, 316, 324,
- 138, 53, 54, 55, 325, 161, 208, 271, 56, 57,
- 58, 59, 60, 61, 88, 119, 111, 62, 95, 63,
- 84, 64, 175, 85, 65, 233, 330, 296, 66, 167,
- 83, 67, 128, 129, 130, 131
+ -1, 46, 47, 48, 49, 135, 285, 51, 313, 321,
+ 136, 52, 53, 54, 322, 159, 205, 268, 55, 56,
+ 57, 58, 59, 60, 86, 117, 109, 61, 93, 62,
+ 82, 63, 172, 83, 64, 230, 327, 293, 65, 164,
+ 81, 66, 126, 127, 128, 129
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -831,328 +827,314 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 71, 51, 132, 72, 73, 74, 109, 327, 77, 74,
- 170, 82, 80, 237, 180, 308, 298, 75, 68, 94,
- 290, 78, 97, 150, 2, 76, 181, 106, 108, 5,
- 112, 113, 114, 115, 116, 117, 313, 150, 291, 121,
- 122, 123, 79, 124, 127, 125, 87, 159, 160, 134,
- 86, 136, 140, 143, 268, 183, 269, 328, 342, 157,
- 158, 159, 160, 100, 101, 96, 163, 184, 174, 104,
- 277, 279, 74, 278, 278, 247, 2, 166, 102, 105,
- 74, 5, 188, 280, 165, 103, 172, 248, 235, 164,
- 210, 211, 169, 299, 79, 16, 278, 17, 110, 182,
- 240, 118, 133, 150, 98, 99, 151, 14, 241, 322,
- 323, 120, 135, 164, 162, 173, 46, 168, 126, 179,
- 171, 185, 232, 276, 156, 157, 158, 159, 160, 186,
- 189, 209, 200, 204, 51, 212, 205, 202, 203, 206,
- 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
- 225, 226, 227, 228, 229, 230, 231, 238, 74, 253,
- 234, 264, 273, 272, 236, 293, 274, 297, 46, 239,
- 304, 305, 295, 243, 244, 309, 245, 246, 310, 249,
- 250, 251, 292, 252, 329, 335, 254, 255, 256, 257,
- 258, 259, 260, 261, 262, 263, 337, 343, 339, 344,
- 265, 266, 346, 267, 0, 311, 348, 312, 350, 275,
- 207, 139, 141, 242, 142, 270, 0, 0, 0, 0,
- 0, 0, 319, 0, 321, 289, 0, 0, 0, 331,
- 294, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 340, 281, 282, 0, 307, 333, 0, 0,
- 0, 0, 336, 0, 0, 349, 0, 0, 0, 0,
- 315, 0, 317, 0, 0, 0, 0, 0, 320, 0,
- 326, 0, 0, 0, 0, 332, 0, 0, 0, 300,
- 301, 302, 303, 0, 0, 338, 0, 306, 341, 0,
- 0, 0, 0, 0, 345, 0, 347, -5, 1, 0,
- 0, 314, 0, 351, 0, 0, 0, 0, 0, 2,
- 0, 0, 3, 4, 5, 0, 6, 7, 8, 9,
- 10, 334, 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, 0, 0, 0, 0,
- 0, 0, 43, 44, 0, 0, 0, -5, 45, 2,
- 0, 46, 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, 0, 0, 0, 0,
- 0, 0, 43, 44, 0, 0, 0, 0, 45, 2,
- 0, 46, 3, 4, 5, 0, 6, 7, 8, 9,
- 10, 0, 11, 12, 13, 0, 14, 15, 16, 0,
- 17, 318, 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, 0, 0, 0, 0,
- 0, 0, 43, 44, 0, 0, 0, 287, 45, 2,
- 0, 46, 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, 0, 0, 0, 0,
- 0, 0, 43, 44, 0, 0, 0, 287, 45, 2,
- 0, 46, 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, 0, 0, 0, 0,
- 0, 0, 43, 44, 0, 0, 0, 0, 45, 2,
- 0, 46, 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, 0, 0, 0, 0,
- 0, 2, 43, 44, 3, 4, 5, 0, 45, 0,
- 0, 46, 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, 0, 0, 0, 0, 0,
+ 70, 167, 130, 71, 72, 73, 50, 75, 73, 234,
+ 80, 107, 74, 78, 274, 76, 324, 275, 92, 67,
+ 305, 95, 98, 99, 84, 276, 104, 106, 275, 110,
+ 111, 112, 113, 114, 115, 287, 100, 2, 119, 120,
+ 121, 85, 5, 101, 2, 125, 148, 295, 132, 5,
+ 134, 138, 141, 288, 77, 122, 148, 123, 94, 207,
+ 208, 77, 15, 339, 16, 161, 325, 310, 155, 156,
+ 157, 158, 171, 160, 265, 163, 266, 187, 73, 277,
+ 157, 158, 102, 188, 169, 166, 185, 103, 148, 296,
+ 237, 149, 275, 142, 143, 144, 145, 146, 147, 179,
+ 148, 131, 177, 149, 150, 151, 180, 96, 97, 154,
+ 155, 156, 157, 158, 178, 244, 232, 162, 181, 152,
+ 153, 154, 155, 156, 157, 158, 108, 245, 45, 206,
+ 124, 269, 116, 209, 271, 45, 118, 50, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 133, 73, 162, 231, 13,
+ 238, 233, 273, 319, 320, 165, 236, 168, 170, 176,
+ 240, 241, 182, 242, 243, 186, 246, 247, 248, 197,
+ 249, 183, 201, 251, 252, 253, 254, 255, 256, 257,
+ 258, 259, 260, 286, 199, 200, 202, 203, 291, 262,
+ 263, 229, 264, 235, 250, 261, 272, 270, 290, 294,
+ 292, 301, 302, 306, 304, 307, 326, 332, 334, 336,
+ 340, 289, 341, 343, 345, 347, 137, 204, 312, 239,
+ 314, 0, 139, 140, 267, 0, 317, 330, 323, 0,
+ 278, 279, 333, 329, 308, 0, 309, 0, 0, 0,
+ 0, 0, 0, 335, 0, 0, 338, 0, 0, 0,
+ 0, 316, 342, 318, 344, 0, 0, 0, 328, 0,
+ 0, 348, 0, 0, 0, 0, 297, 298, 299, 300,
+ 0, 337, 0, 0, 303, -5, 1, 0, 0, 0,
+ 0, 0, 0, 0, 346, 0, 0, 2, 311, 0,
+ 3, 4, 5, 0, 6, 7, 8, 9, 0, 10,
+ 11, 12, 0, 13, 14, 15, 0, 16, 331, 17,
+ 18, 19, 0, 0, 0, 20, 21, 22, 23, 0,
+ 0, 24, 0, 0, 0, 0, 25, 26, 27, 0,
+ 0, 28, 0, 0, 0, 29, 30, 31, 0, 32,
+ 0, 0, 0, 0, 0, 0, 33, 0, 0, 0,
+ 0, 0, 0, 34, 35, 36, 37, 38, 0, 0,
+ 39, 40, 41, 0, 0, 0, 0, 0, 0, 42,
+ 43, 0, 0, 0, -5, 44, 2, 0, 45, 3,
+ 4, 5, 0, 6, 7, 8, 9, 0, 10, 11,
+ 12, 0, 13, 14, 15, 0, 16, 0, 17, 18,
+ 19, 0, 0, 0, 20, 21, 22, 23, 0, 0,
+ 24, 0, 0, 0, 0, 25, 26, 27, 0, 0,
+ 28, 0, 0, 0, 29, 30, 31, 0, 32, 0,
+ 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
+ 0, 0, 34, 35, 36, 37, 38, 0, 0, 39,
+ 40, 41, 0, 0, 0, 0, 0, 0, 42, 43,
+ 0, 0, 0, 0, 44, 2, 0, 45, 3, 4,
+ 5, 0, 6, 7, 8, 9, 0, 10, 11, 12,
+ 0, 13, 14, 15, 0, 16, 315, 17, 0, 19,
+ 0, 0, 0, 20, 21, 22, 23, 0, 0, 0,
+ 0, 0, 0, 0, 25, 26, 27, 0, 0, 28,
+ 0, 0, 0, 0, 30, 31, 0, 32, 0, 0,
+ 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 35, 36, 37, 38, 0, 0, 39, 40,
+ 0, 0, 0, 0, 0, 0, 0, 42, 43, 0,
+ 0, 0, 284, 44, 2, 0, 45, 3, 4, 5,
+ 0, 6, 7, 8, 9, 0, 10, 11, 12, 0,
+ 13, 14, 15, 0, 16, 0, 17, 0, 19, 0,
+ 0, 0, 20, 21, 22, 23, 0, 0, 0, 0,
+ 0, 0, 0, 25, 26, 27, 0, 0, 28, 0,
+ 0, 0, 0, 30, 31, 0, 32, 0, 0, 0,
+ 0, 0, 0, 33, 0, 0, 0, 0, 0, 0,
+ 34, 35, 36, 37, 38, 0, 0, 39, 40, 0,
+ 0, 0, 0, 0, 0, 0, 42, 43, 0, 0,
+ 0, 284, 44, 2, 0, 45, 3, 4, 5, 0,
+ 6, 7, 8, 9, 0, 10, 11, 12, 0, 13,
+ 14, 15, 0, 16, 0, 17, 0, 19, 0, 0,
+ 0, 20, 21, 22, 23, 0, 0, 0, 0, 0,
+ 0, 0, 25, 0, 27, 0, 0, 0, 0, 0,
+ 0, 0, 30, 31, 0, 32, 0, 0, 0, 0,
+ 0, 0, 33, 0, 0, 0, 0, 0, 0, 34,
+ 35, 36, 37, 38, 0, 0, 0, 40, 0, 0,
+ 0, 0, 0, 0, 0, 42, 43, 0, 0, 0,
+ 0, 44, 2, 0, 45, 3, 4, 5, 0, 6,
+ 7, 8, 9, 0, 10, 11, 12, 0, 13, 14,
+ 15, 0, 16, 0, 17, 0, 19, 0, 0, 0,
+ 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
+ 0, 25, 0, 27, 0, 0, 0, 0, 0, 0,
+ 0, 30, 31, 0, 32, 0, 0, 0, 0, 0,
+ 0, 33, 0, 0, 0, 0, 0, 0, 34, 35,
+ 36, 37, 38, 0, 0, 0, 40, 0, 0, 0,
+ 0, 0, 0, 2, 42, 43, 3, 4, 5, 0,
+ 44, 0, 0, 45, 0, 10, 11, 12, 0, 13,
+ 68, 15, 0, 16, 0, 0, 0, 19, 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, 0, 0, 0, 0,
- 0, 34, 2, 0, 0, 3, 4, 5, 35, 36,
- 37, 38, 39, 0, 0, 11, 12, 13, 0, 14,
- 69, 16, 0, 17, 43, 44, 0, 20, 0, 0,
- 45, 0, 0, 46, 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, 0,
- 14, 69, 16, 0, 17, 43, 44, 0, 20, 0,
- 0, 45, 0, 0, 46, 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,
- 0, 0, 0, 0, 0, 0, 43, 44, 0, 0,
- 0, 0, 45, 0, 0, 46, 34, 0, 0, 0,
- 0, 0, 0, 35, 36, 37, 38, 39, 176, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 43,
- 44, 0, 0, 0, 90, 81, 92, 0, 46, 144,
- 145, 146, 147, 148, 149, 0, 150, 177, 178, 151,
- 152, 153, 144, 145, 146, 147, 148, 149, 0, 150,
- 0, 0, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 0, 0, 0, 0, 0, 0, 154, 155,
- 156, 157, 158, 159, 160, 190, 0, 0, 0, 0,
- 0, 191, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 144, 145, 146, 147, 148, 149, 0, 150, 0,
- 0, 151, 152, 153, 0, 0, 0, 0, 192, 0,
- 0, 0, 0, 0, 193, 0, 0, 154, 155, 156,
- 157, 158, 159, 160, 144, 145, 146, 147, 148, 149,
- 0, 150, 0, 0, 151, 152, 153, 0, 0, 0,
- 0, 194, 0, 0, 0, 0, 0, 195, 0, 0,
- 154, 155, 156, 157, 158, 159, 160, 144, 145, 146,
- 147, 148, 149, 0, 150, 0, 0, 151, 152, 153,
- 0, 0, 0, 0, 196, 0, 0, 0, 0, 0,
- 197, 0, 0, 154, 155, 156, 157, 158, 159, 160,
- 144, 145, 146, 147, 148, 149, 0, 150, 0, 0,
- 151, 152, 153, 0, 0, 0, 0, 283, 0, 0,
- 0, 0, 0, 0, 0, 0, 154, 155, 156, 157,
- 158, 159, 160, 144, 145, 146, 147, 148, 149, 0,
- 150, 0, 0, 151, 152, 153, 0, 0, 0, 0,
- 284, 0, 0, 0, 0, 0, 0, 0, 0, 154,
- 155, 156, 157, 158, 159, 160, 144, 145, 146, 147,
- 148, 149, 0, 150, 0, 0, 151, 152, 153, 0,
- 0, 0, 0, 285, 0, 0, 0, 0, 0, 0,
- 0, 0, 154, 155, 156, 157, 158, 159, 160, 144,
- 145, 146, 147, 148, 149, 0, 150, 0, 0, 151,
- 152, 153, 0, 0, 0, 0, 286, 0, 0, 0,
- 0, 0, 0, 0, 0, 154, 155, 156, 157, 158,
- 159, 160, 144, 145, 146, 147, 148, 149, 0, 150,
- 0, 0, 151, 152, 153, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 213, 0, 0, 154, 155,
- 156, 157, 158, 159, 160, 144, 145, 146, 147, 148,
- 149, 0, 150, 0, 0, 151, 152, 153, 0, 0,
+ 0, 0, 33, 2, 0, 0, 3, 4, 5, 34,
+ 35, 36, 37, 38, 0, 10, 11, 12, 0, 13,
+ 68, 15, 0, 16, 0, 42, 43, 19, 0, 0,
+ 0, 44, 0, 0, 45, 0, 0, 0, 88, 0,
+ 90, 0, 69, 2, 27, 0, 3, 4, 5, 0,
+ 0, 0, 0, 0, 105, 10, 11, 12, 0, 13,
+ 68, 15, 33, 16, 0, 0, 0, 19, 0, 34,
+ 35, 36, 37, 38, 0, 0, 0, 0, 0, 0,
+ 0, 0, 69, 0, 27, 42, 43, 0, 0, 0,
+ 0, 44, 0, 0, 45, 0, 0, 0, 0, 0,
+ 0, 0, 33, 2, 0, 0, 3, 4, 5, 34,
+ 35, 36, 37, 38, 0, 10, 11, 12, 0, 13,
+ 68, 15, 0, 16, 0, 42, 43, 19, 173, 0,
+ 0, 44, 0, 0, 45, 0, 0, 0, 0, 0,
+ 0, 0, 69, 0, 27, 0, 0, 0, 0, 142,
+ 143, 144, 145, 146, 147, 0, 148, 174, 175, 149,
+ 150, 151, 33, 0, 0, 0, 0, 0, 0, 34,
+ 35, 36, 37, 38, 0, 152, 153, 154, 155, 156,
+ 157, 158, 88, 0, 90, 42, 43, 0, 0, 0,
+ 0, 79, 0, 0, 45, 0, 0, 0, 0, 0,
+ 142, 143, 144, 145, 146, 147, 0, 148, 0, 0,
+ 149, 150, 151, 0, 0, 0, 0, 189, 0, 0,
+ 0, 0, 0, 190, 0, 0, 152, 153, 154, 155,
+ 156, 157, 158, 142, 143, 144, 145, 146, 147, 0,
+ 148, 0, 0, 149, 150, 151, 0, 0, 0, 0,
+ 191, 0, 0, 0, 0, 0, 192, 0, 0, 152,
+ 153, 154, 155, 156, 157, 158, 142, 143, 144, 145,
+ 146, 147, 0, 148, 0, 0, 149, 150, 151, 0,
+ 0, 0, 0, 193, 0, 0, 0, 0, 0, 194,
+ 0, 0, 152, 153, 154, 155, 156, 157, 158, 142,
+ 143, 144, 145, 146, 147, 0, 148, 0, 0, 149,
+ 150, 151, 0, 0, 0, 0, 280, 0, 0, 0,
+ 0, 0, 0, 0, 0, 152, 153, 154, 155, 156,
+ 157, 158, 142, 143, 144, 145, 146, 147, 0, 148,
+ 0, 0, 149, 150, 151, 0, 0, 0, 0, 281,
+ 0, 0, 0, 0, 0, 0, 0, 0, 152, 153,
+ 154, 155, 156, 157, 158, 142, 143, 144, 145, 146,
+ 147, 0, 148, 0, 0, 149, 150, 151, 0, 0,
+ 0, 0, 282, 0, 0, 0, 0, 0, 0, 0,
+ 0, 152, 153, 154, 155, 156, 157, 158, 142, 143,
+ 144, 145, 146, 147, 0, 148, 0, 0, 149, 150,
+ 151, 0, 0, 0, 0, 283, 0, 0, 0, 0,
+ 0, 0, 0, 0, 152, 153, 154, 155, 156, 157,
+ 158, 142, 143, 144, 145, 146, 147, 0, 148, 0,
+ 0, 149, 150, 151, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 210, 0, 0, 152, 153, 154,
+ 155, 156, 157, 158, 142, 143, 144, 145, 146, 147,
+ 0, 148, 0, 0, 149, 150, 151, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 154, 155, 156, 157, 158, 159, 160, 187, 214,
- 0, 0, 0, 0, 0, 0, 144, 145, 146, 147,
- 148, 149, 0, 150, 0, 0, 151, 152, 153, 144,
- 145, 146, 147, 148, 149, 0, 150, 0, 0, 151,
- 152, 153, 154, 155, 156, 157, 158, 159, 160, 0,
- 0, 0, 0, 0, 0, 154, 155, 156, 157, 158,
- 159, 160, 0, 0, 0, 201, 144, 145, 146, 147,
- 148, 149, 0, 150, 0, 0, 151, 152, 153, 0,
- 0, 0, 0, 0, 198, 199, 0, 0, 0, 0,
- 0, 0, 154, 155, 156, 157, 158, 159, 160, 144,
- 145, 146, 147, 148, 149, 0, 150, 0, 0, 151,
- 152, 153, 144, 145, 146, 147, 0, 0, 0, 150,
- 0, 0, 151, 152, 153, 154, 155, 156, 157, 158,
- 159, 160, 0, 0, 0, 0, 0, 0, 154, 155,
- 156, 157, 158, 159, 160
+ 152, 153, 154, 155, 156, 157, 158, 184, 211, 0,
+ 0, 0, 0, 0, 0, 142, 143, 144, 145, 146,
+ 147, 0, 148, 0, 0, 149, 150, 151, 142, 143,
+ 144, 145, 146, 147, 0, 148, 0, 0, 149, 150,
+ 151, 152, 153, 154, 155, 156, 157, 158, 0, 0,
+ 0, 0, 0, 0, 152, 153, 154, 155, 156, 157,
+ 158, 0, 0, 0, 198, 142, 143, 144, 145, 146,
+ 147, 0, 148, 0, 0, 149, 150, 151, 0, 0,
+ 0, 0, 0, 195, 196, 0, 0, 0, 0, 0,
+ 0, 152, 153, 154, 155, 156, 157, 158, 142, 143,
+ 144, 145, 146, 147, 0, 148, 0, 0, 149, 150,
+ 151, 142, 143, 144, 145, 0, 0, 0, 148, 0,
+ 0, 149, 150, 151, 152, 153, 154, 155, 156, 157,
+ 158, 0, 0, 0, 0, 0, 0, 152, 153, 154,
+ 155, 156, 157, 158
};
static const yytype_int16 yycheck[] =
{
- 4, 0, 0, 7, 8, 9, 32, 39, 12, 13,
- 85, 15, 14, 170, 56, 293, 279, 9, 100, 23,
- 38, 13, 26, 73, 12, 30, 68, 31, 32, 17,
- 34, 35, 36, 37, 38, 39, 299, 73, 56, 43,
- 44, 45, 30, 31, 46, 33, 30, 97, 98, 53,
- 53, 55, 56, 57, 31, 56, 33, 89, 336, 95,
- 96, 97, 98, 15, 16, 30, 70, 68, 94, 30,
- 100, 100, 76, 103, 103, 56, 12, 81, 30, 30,
- 84, 17, 108, 240, 76, 37, 90, 68, 102, 103,
- 136, 137, 84, 100, 30, 31, 103, 33, 30, 101,
- 175, 30, 100, 73, 58, 59, 76, 29, 30, 39,
- 40, 30, 68, 103, 101, 48, 104, 103, 106, 30,
- 103, 56, 30, 214, 94, 95, 96, 97, 98, 55,
- 103, 135, 103, 105, 133, 139, 103, 106, 106, 103,
+ 4, 83, 0, 7, 8, 9, 0, 11, 12, 167,
+ 14, 31, 9, 13, 99, 12, 38, 102, 22, 99,
+ 290, 25, 15, 16, 52, 99, 30, 31, 102, 33,
+ 34, 35, 36, 37, 38, 37, 29, 12, 42, 43,
+ 44, 29, 17, 36, 12, 45, 72, 276, 52, 17,
+ 54, 55, 56, 55, 29, 30, 72, 32, 29, 134,
+ 135, 29, 30, 333, 32, 69, 88, 296, 94, 95,
+ 96, 97, 92, 100, 30, 79, 32, 49, 82, 237,
+ 96, 97, 29, 55, 88, 82, 106, 29, 72, 99,
+ 172, 75, 102, 65, 66, 67, 68, 69, 70, 99,
+ 72, 99, 55, 75, 76, 77, 55, 57, 58, 93,
+ 94, 95, 96, 97, 67, 55, 101, 102, 67, 91,
+ 92, 93, 94, 95, 96, 97, 29, 67, 103, 133,
+ 105, 206, 29, 137, 209, 103, 29, 131, 142, 143,
144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 157, 158, 159, 160, 30, 162, 30,
- 164, 30, 55, 209, 168, 55, 212, 30, 104, 173,
- 90, 56, 103, 177, 178, 91, 180, 181, 30, 183,
- 184, 185, 273, 187, 30, 89, 190, 191, 192, 193,
- 194, 195, 196, 197, 198, 199, 103, 30, 90, 90,
- 202, 203, 55, 205, -1, 296, 89, 298, 89, 213,
- 133, 56, 56, 176, 56, 206, -1, -1, -1, -1,
- -1, -1, 313, -1, 315, 271, -1, -1, -1, 320,
- 276, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 333, 247, 248, -1, 292, 322, -1, -1,
- -1, -1, 327, -1, -1, 346, -1, -1, -1, -1,
- 306, -1, 308, -1, -1, -1, -1, -1, 314, -1,
- 316, -1, -1, -1, -1, 321, -1, -1, -1, 283,
- 284, 285, 286, -1, -1, 331, -1, 291, 334, -1,
- -1, -1, -1, -1, 340, -1, 342, 0, 1, -1,
- -1, 305, -1, 349, -1, -1, -1, -1, -1, 12,
- -1, -1, 15, 16, 17, -1, 19, 20, 21, 22,
- 23, 325, 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, -1, -1, -1, -1,
- -1, -1, 95, 96, -1, -1, -1, 100, 101, 12,
- -1, 104, 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, -1, -1, -1, -1,
- -1, -1, 95, 96, -1, -1, -1, -1, 101, 12,
- -1, 104, 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, -1, -1, -1, -1,
- -1, -1, 95, 96, -1, -1, -1, 100, 101, 12,
- -1, 104, 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, -1, -1, -1, -1,
- -1, -1, 95, 96, -1, -1, -1, 100, 101, 12,
- -1, 104, 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, -1, -1, -1, -1,
- -1, -1, 95, 96, -1, -1, -1, -1, 101, 12,
- -1, 104, 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, -1, -1, -1, -1,
- -1, 12, 95, 96, 15, 16, 17, -1, 101, -1,
- -1, 104, -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,
+ 154, 155, 156, 157, 158, 67, 160, 102, 162, 28,
+ 29, 165, 211, 38, 39, 102, 170, 102, 47, 29,
+ 174, 175, 55, 177, 178, 102, 180, 181, 182, 102,
+ 184, 54, 104, 187, 188, 189, 190, 191, 192, 193,
+ 194, 195, 196, 268, 105, 105, 102, 102, 273, 199,
+ 200, 29, 202, 29, 29, 29, 210, 54, 54, 29,
+ 102, 89, 55, 90, 289, 29, 29, 88, 102, 89,
+ 29, 270, 89, 54, 88, 88, 55, 131, 303, 173,
+ 305, -1, 55, 55, 203, -1, 311, 319, 313, -1,
+ 244, 245, 324, 318, 293, -1, 295, -1, -1, -1,
+ -1, -1, -1, 328, -1, -1, 331, -1, -1, -1,
+ -1, 310, 337, 312, 339, -1, -1, -1, 317, -1,
+ -1, 346, -1, -1, -1, -1, 280, 281, 282, 283,
+ -1, 330, -1, -1, 288, 0, 1, -1, -1, -1,
+ -1, -1, -1, -1, 343, -1, -1, 12, 302, -1,
+ 15, 16, 17, -1, 19, 20, 21, 22, -1, 24,
+ 25, 26, -1, 28, 29, 30, -1, 32, 322, 34,
+ 35, 36, -1, -1, -1, 40, 41, 42, 43, -1,
+ -1, 46, -1, -1, -1, -1, 51, 52, 53, -1,
+ -1, 56, -1, -1, -1, 60, 61, 62, -1, 64,
+ -1, -1, -1, -1, -1, -1, 71, -1, -1, -1,
+ -1, -1, -1, 78, 79, 80, 81, 82, -1, -1,
+ 85, 86, 87, -1, -1, -1, -1, -1, -1, 94,
+ 95, -1, -1, -1, 99, 100, 12, -1, 103, 15,
+ 16, 17, -1, 19, 20, 21, 22, -1, 24, 25,
+ 26, -1, 28, 29, 30, -1, 32, -1, 34, 35,
+ 36, -1, -1, -1, 40, 41, 42, 43, -1, -1,
+ 46, -1, -1, -1, -1, 51, 52, 53, -1, -1,
+ 56, -1, -1, -1, 60, 61, 62, -1, 64, -1,
+ -1, -1, -1, -1, -1, 71, -1, -1, -1, -1,
+ -1, -1, 78, 79, 80, 81, 82, -1, -1, 85,
+ 86, 87, -1, -1, -1, -1, -1, -1, 94, 95,
+ -1, -1, -1, -1, 100, 12, -1, 103, 15, 16,
+ 17, -1, 19, 20, 21, 22, -1, 24, 25, 26,
+ -1, 28, 29, 30, -1, 32, 33, 34, -1, 36,
+ -1, -1, -1, 40, 41, 42, 43, -1, -1, -1,
+ -1, -1, -1, -1, 51, 52, 53, -1, -1, 56,
+ -1, -1, -1, -1, 61, 62, -1, 64, -1, -1,
+ -1, -1, -1, -1, 71, -1, -1, -1, -1, -1,
+ -1, 78, 79, 80, 81, 82, -1, -1, 85, 86,
+ -1, -1, -1, -1, -1, -1, -1, 94, 95, -1,
+ -1, -1, 99, 100, 12, -1, 103, 15, 16, 17,
+ -1, 19, 20, 21, 22, -1, 24, 25, 26, -1,
+ 28, 29, 30, -1, 32, -1, 34, -1, 36, -1,
+ -1, -1, 40, 41, 42, 43, -1, -1, -1, -1,
+ -1, -1, -1, 51, 52, 53, -1, -1, 56, -1,
+ -1, -1, -1, 61, 62, -1, 64, -1, -1, -1,
+ -1, -1, -1, 71, -1, -1, -1, -1, -1, -1,
+ 78, 79, 80, 81, 82, -1, -1, 85, 86, -1,
+ -1, -1, -1, -1, -1, -1, 94, 95, -1, -1,
+ -1, 99, 100, 12, -1, 103, 15, 16, 17, -1,
+ 19, 20, 21, 22, -1, 24, 25, 26, -1, 28,
+ 29, 30, -1, 32, -1, 34, -1, 36, -1, -1,
+ -1, 40, 41, 42, 43, -1, -1, -1, -1, -1,
+ -1, -1, 51, -1, 53, -1, -1, -1, -1, -1,
+ -1, -1, 61, 62, -1, 64, -1, -1, -1, -1,
+ -1, -1, 71, -1, -1, -1, -1, -1, -1, 78,
+ 79, 80, 81, 82, -1, -1, -1, 86, -1, -1,
+ -1, -1, -1, -1, -1, 94, 95, -1, -1, -1,
+ -1, 100, 12, -1, 103, 15, 16, 17, -1, 19,
+ 20, 21, 22, -1, 24, 25, 26, -1, 28, 29,
+ 30, -1, 32, -1, 34, -1, 36, -1, -1, -1,
+ 40, 41, 42, -1, -1, -1, -1, -1, -1, -1,
+ -1, 51, -1, 53, -1, -1, -1, -1, -1, -1,
+ -1, 61, 62, -1, 64, -1, -1, -1, -1, -1,
+ -1, 71, -1, -1, -1, -1, -1, -1, 78, 79,
+ 80, 81, 82, -1, -1, -1, 86, -1, -1, -1,
+ -1, -1, -1, 12, 94, 95, 15, 16, 17, -1,
+ 100, -1, -1, 103, -1, 24, 25, 26, -1, 28,
+ 29, 30, -1, 32, -1, -1, -1, 36, -1, -1,
+ -1, -1, -1, -1, -1, -1, 45, -1, 47, 48,
+ 49, 50, 51, -1, 53, -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, -1, 29,
- 30, 31, -1, 33, 95, 96, -1, 37, -1, -1,
- 101, -1, -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, -1,
- 29, 30, 31, -1, 33, 95, 96, -1, 37, -1,
- -1, 101, -1, -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,
- -1, -1, -1, -1, -1, -1, 95, 96, -1, -1,
- -1, -1, 101, -1, -1, 104, 72, -1, -1, -1,
- -1, -1, -1, 79, 80, 81, 82, 83, 45, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 95,
- 96, -1, -1, -1, 48, 101, 50, -1, 104, 66,
- 67, 68, 69, 70, 71, -1, 73, 74, 75, 76,
- 77, 78, 66, 67, 68, 69, 70, 71, -1, 73,
- -1, -1, 76, 77, 78, 92, 93, 94, 95, 96,
- 97, 98, -1, -1, -1, -1, -1, -1, 92, 93,
- 94, 95, 96, 97, 98, 50, -1, -1, -1, -1,
- -1, 56, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 66, 67, 68, 69, 70, 71, -1, 73, -1,
- -1, 76, 77, 78, -1, -1, -1, -1, 50, -1,
- -1, -1, -1, -1, 56, -1, -1, 92, 93, 94,
- 95, 96, 97, 98, 66, 67, 68, 69, 70, 71,
- -1, 73, -1, -1, 76, 77, 78, -1, -1, -1,
- -1, 50, -1, -1, -1, -1, -1, 56, -1, -1,
- 92, 93, 94, 95, 96, 97, 98, 66, 67, 68,
- 69, 70, 71, -1, 73, -1, -1, 76, 77, 78,
- -1, -1, -1, -1, 50, -1, -1, -1, -1, -1,
- 56, -1, -1, 92, 93, 94, 95, 96, 97, 98,
- 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
- 76, 77, 78, -1, -1, -1, -1, 50, -1, -1,
- -1, -1, -1, -1, -1, -1, 92, 93, 94, 95,
- 96, 97, 98, 66, 67, 68, 69, 70, 71, -1,
- 73, -1, -1, 76, 77, 78, -1, -1, -1, -1,
- 50, -1, -1, -1, -1, -1, -1, -1, -1, 92,
- 93, 94, 95, 96, 97, 98, 66, 67, 68, 69,
- 70, 71, -1, 73, -1, -1, 76, 77, 78, -1,
- -1, -1, -1, 50, -1, -1, -1, -1, -1, -1,
- -1, -1, 92, 93, 94, 95, 96, 97, 98, 66,
- 67, 68, 69, 70, 71, -1, 73, -1, -1, 76,
- 77, 78, -1, -1, -1, -1, 50, -1, -1, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, 96,
- 97, 98, 66, 67, 68, 69, 70, 71, -1, 73,
- -1, -1, 76, 77, 78, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 56, -1, -1, 92, 93,
- 94, 95, 96, 97, 98, 66, 67, 68, 69, 70,
- 71, -1, 73, -1, -1, 76, 77, 78, -1, -1,
+ -1, -1, 71, 12, -1, -1, 15, 16, 17, 78,
+ 79, 80, 81, 82, -1, 24, 25, 26, -1, 28,
+ 29, 30, -1, 32, -1, 94, 95, 36, -1, -1,
+ -1, 100, -1, -1, 103, -1, -1, -1, 47, -1,
+ 49, -1, 51, 12, 53, -1, 15, 16, 17, -1,
+ -1, -1, -1, -1, 63, 24, 25, 26, -1, 28,
+ 29, 30, 71, 32, -1, -1, -1, 36, -1, 78,
+ 79, 80, 81, 82, -1, -1, -1, -1, -1, -1,
+ -1, -1, 51, -1, 53, 94, 95, -1, -1, -1,
+ -1, 100, -1, -1, 103, -1, -1, -1, -1, -1,
+ -1, -1, 71, 12, -1, -1, 15, 16, 17, 78,
+ 79, 80, 81, 82, -1, 24, 25, 26, -1, 28,
+ 29, 30, -1, 32, -1, 94, 95, 36, 44, -1,
+ -1, 100, -1, -1, 103, -1, -1, -1, -1, -1,
+ -1, -1, 51, -1, 53, -1, -1, -1, -1, 65,
+ 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
+ 76, 77, 71, -1, -1, -1, -1, -1, -1, 78,
+ 79, 80, 81, 82, -1, 91, 92, 93, 94, 95,
+ 96, 97, 47, -1, 49, 94, 95, -1, -1, -1,
+ -1, 100, -1, -1, 103, -1, -1, -1, -1, -1,
+ 65, 66, 67, 68, 69, 70, -1, 72, -1, -1,
+ 75, 76, 77, -1, -1, -1, -1, 49, -1, -1,
+ -1, -1, -1, 55, -1, -1, 91, 92, 93, 94,
+ 95, 96, 97, 65, 66, 67, 68, 69, 70, -1,
+ 72, -1, -1, 75, 76, 77, -1, -1, -1, -1,
+ 49, -1, -1, -1, -1, -1, 55, -1, -1, 91,
+ 92, 93, 94, 95, 96, 97, 65, 66, 67, 68,
+ 69, 70, -1, 72, -1, -1, 75, 76, 77, -1,
+ -1, -1, -1, 49, -1, -1, -1, -1, -1, 55,
+ -1, -1, 91, 92, 93, 94, 95, 96, 97, 65,
+ 66, 67, 68, 69, 70, -1, 72, -1, -1, 75,
+ 76, 77, -1, -1, -1, -1, 49, -1, -1, -1,
+ -1, -1, -1, -1, -1, 91, 92, 93, 94, 95,
+ 96, 97, 65, 66, 67, 68, 69, 70, -1, 72,
+ -1, -1, 75, 76, 77, -1, -1, -1, -1, 49,
+ -1, -1, -1, -1, -1, -1, -1, -1, 91, 92,
+ 93, 94, 95, 96, 97, 65, 66, 67, 68, 69,
+ 70, -1, 72, -1, -1, 75, 76, 77, -1, -1,
+ -1, -1, 49, -1, -1, -1, -1, -1, -1, -1,
+ -1, 91, 92, 93, 94, 95, 96, 97, 65, 66,
+ 67, 68, 69, 70, -1, 72, -1, -1, 75, 76,
+ 77, -1, -1, -1, -1, 49, -1, -1, -1, -1,
+ -1, -1, -1, -1, 91, 92, 93, 94, 95, 96,
+ 97, 65, 66, 67, 68, 69, 70, -1, 72, -1,
+ -1, 75, 76, 77, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 55, -1, -1, 91, 92, 93,
+ 94, 95, 96, 97, 65, 66, 67, 68, 69, 70,
+ -1, 72, -1, -1, 75, 76, 77, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 92, 93, 94, 95, 96, 97, 98, 58, 100,
- -1, -1, -1, -1, -1, -1, 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, 92, 93, 94, 95, 96, 97, 98, -1,
- -1, -1, -1, -1, -1, 92, 93, 94, 95, 96,
- 97, 98, -1, -1, -1, 102, 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, 92, 93, 94, 95, 96, 97, 98, 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, 92, 93, 94, 95, 96,
- 97, 98, -1, -1, -1, -1, -1, -1, 92, 93,
- 94, 95, 96, 97, 98
+ 91, 92, 93, 94, 95, 96, 97, 57, 99, -1,
+ -1, -1, -1, -1, -1, 65, 66, 67, 68, 69,
+ 70, -1, 72, -1, -1, 75, 76, 77, 65, 66,
+ 67, 68, 69, 70, -1, 72, -1, -1, 75, 76,
+ 77, 91, 92, 93, 94, 95, 96, 97, -1, -1,
+ -1, -1, -1, -1, 91, 92, 93, 94, 95, 96,
+ 97, -1, -1, -1, 101, 65, 66, 67, 68, 69,
+ 70, -1, 72, -1, -1, 75, 76, 77, -1, -1,
+ -1, -1, -1, 83, 84, -1, -1, -1, -1, -1,
+ -1, 91, 92, 93, 94, 95, 96, 97, 65, 66,
+ 67, 68, 69, 70, -1, 72, -1, -1, 75, 76,
+ 77, 65, 66, 67, 68, -1, -1, -1, 72, -1,
+ -1, 75, 76, 77, 91, 92, 93, 94, 95, 96,
+ 97, -1, -1, -1, -1, -1, -1, 91, 92, 93,
+ 94, 95, 96, 97
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1160,63 +1142,62 @@ static const yytype_int16 yycheck[] =
static const yytype_uint8 yystos[] =
{
0, 1, 12, 15, 16, 17, 19, 20, 21, 22,
- 23, 25, 26, 27, 29, 30, 31, 33, 35, 36,
- 37, 41, 42, 43, 44, 47, 52, 53, 54, 57,
- 61, 62, 63, 65, 72, 79, 80, 81, 82, 83,
- 86, 87, 88, 95, 96, 101, 104, 108, 109, 110,
- 111, 113, 114, 118, 119, 120, 125, 126, 127, 128,
- 129, 130, 134, 136, 138, 141, 145, 148, 100, 30,
- 52, 128, 128, 128, 128, 146, 30, 128, 146, 30,
- 127, 101, 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, 128, 128, 128, 31, 33, 106, 127, 149, 150,
- 151, 152, 0, 100, 128, 68, 128, 112, 117, 120,
- 128, 130, 145, 128, 66, 67, 68, 69, 70, 71,
- 73, 76, 77, 78, 92, 93, 94, 95, 96, 97,
- 98, 122, 101, 128, 103, 146, 128, 146, 103, 146,
- 122, 103, 128, 48, 135, 139, 45, 74, 75, 30,
- 56, 68, 127, 56, 68, 56, 55, 58, 135, 103,
- 50, 56, 50, 56, 50, 56, 50, 56, 84, 85,
- 103, 102, 106, 106, 105, 103, 103, 109, 123, 128,
- 123, 123, 128, 56, 100, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 30, 142, 128, 102, 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, 127, 127, 127, 31, 33,
- 152, 124, 123, 55, 123, 128, 124, 100, 103, 100,
- 142, 128, 128, 50, 50, 50, 50, 100, 113, 123,
- 38, 56, 124, 55, 123, 103, 144, 30, 144, 100,
- 128, 128, 128, 128, 90, 56, 128, 123, 111, 91,
- 30, 124, 124, 144, 128, 123, 115, 123, 34, 124,
- 123, 124, 39, 40, 116, 121, 123, 39, 89, 30,
- 143, 124, 123, 122, 128, 89, 122, 103, 123, 90,
- 124, 123, 111, 30, 90, 123, 55, 123, 89, 124,
- 89, 123
+ 24, 25, 26, 28, 29, 30, 32, 34, 35, 36,
+ 40, 41, 42, 43, 46, 51, 52, 53, 56, 60,
+ 61, 62, 64, 71, 78, 79, 80, 81, 82, 85,
+ 86, 87, 94, 95, 100, 103, 107, 108, 109, 110,
+ 112, 113, 117, 118, 119, 124, 125, 126, 127, 128,
+ 129, 133, 135, 137, 140, 144, 147, 99, 29, 51,
+ 127, 127, 127, 127, 145, 127, 145, 29, 126, 100,
+ 127, 146, 136, 139, 52, 29, 130, 45, 47, 48,
+ 49, 50, 127, 134, 29, 127, 57, 58, 15, 16,
+ 29, 36, 29, 29, 127, 63, 127, 134, 29, 132,
+ 127, 127, 127, 127, 127, 127, 29, 131, 29, 127,
+ 127, 127, 30, 32, 105, 126, 148, 149, 150, 151,
+ 0, 99, 127, 67, 127, 111, 116, 119, 127, 129,
+ 144, 127, 65, 66, 67, 68, 69, 70, 72, 75,
+ 76, 77, 91, 92, 93, 94, 95, 96, 97, 121,
+ 100, 127, 102, 127, 145, 102, 145, 121, 102, 127,
+ 47, 134, 138, 44, 73, 74, 29, 55, 67, 126,
+ 55, 67, 55, 54, 57, 134, 102, 49, 55, 49,
+ 55, 49, 55, 49, 55, 83, 84, 102, 101, 105,
+ 105, 104, 102, 102, 108, 122, 127, 122, 122, 127,
+ 55, 99, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 29,
+ 141, 127, 101, 127, 141, 29, 127, 121, 29, 128,
+ 127, 127, 127, 127, 55, 67, 127, 127, 127, 127,
+ 29, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 29, 126, 126, 126, 30, 32, 151, 123, 122,
+ 54, 122, 127, 123, 99, 102, 99, 141, 127, 127,
+ 49, 49, 49, 49, 99, 112, 122, 37, 55, 123,
+ 54, 122, 102, 143, 29, 143, 99, 127, 127, 127,
+ 127, 89, 55, 127, 122, 110, 90, 29, 123, 123,
+ 143, 127, 122, 114, 122, 33, 123, 122, 123, 38,
+ 39, 115, 120, 122, 38, 88, 29, 142, 123, 122,
+ 121, 127, 88, 121, 102, 122, 89, 123, 122, 110,
+ 29, 89, 122, 54, 122, 88, 123, 88, 122
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 107, 108, 108, 108, 109, 109, 109, 110, 110,
- 110, 110, 110, 110, 110, 110, 110, 110, 110, 111,
- 111, 111, 112, 112, 112, 112, 113, 113, 113, 113,
- 113, 113, 113, 113, 114, 114, 115, 115, 116, 117,
- 117, 118, 119, 120, 121, 122, 123, 124, 124, 124,
- 125, 126, 127, 127, 127, 127, 127, 127, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 129,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 131, 131, 132, 132,
- 133, 133, 134, 134, 134, 134, 134, 134, 135, 135,
- 136, 136, 136, 136, 137, 136, 139, 138, 138, 140,
- 138, 138, 138, 141, 142, 142, 142, 142, 143, 143,
- 143, 144, 145, 146, 146, 146, 147, 147, 148, 149,
- 149, 149, 149, 150, 150, 151, 151, 152, 152
+ 0, 106, 107, 107, 107, 108, 108, 108, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 110,
+ 110, 110, 111, 111, 111, 111, 112, 112, 112, 112,
+ 112, 112, 112, 112, 113, 113, 114, 114, 115, 116,
+ 116, 117, 118, 119, 120, 121, 122, 123, 123, 123,
+ 124, 125, 126, 126, 126, 126, 126, 126, 127, 127,
+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
+ 127, 127, 127, 127, 127, 127, 127, 127, 127, 128,
+ 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+ 129, 129, 129, 129, 129, 130, 130, 131, 131, 132,
+ 132, 133, 133, 133, 133, 133, 133, 134, 134, 135,
+ 135, 135, 135, 136, 135, 138, 137, 137, 139, 137,
+ 137, 137, 140, 141, 141, 141, 141, 142, 142, 142,
+ 143, 144, 145, 145, 145, 146, 146, 147, 148, 148,
+ 148, 148, 149, 149, 150, 150, 151, 151
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -1233,12 +1214,12 @@ static const yytype_int8 yyr2[] =
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, 1, 2,
- 2, 1, 2, 4, 2, 3, 1, 3, 1, 3,
- 1, 3, 2, 2, 2, 2, 3, 2, 3, 2,
- 2, 2, 3, 2, 0, 3, 0, 8, 2, 0,
- 7, 8, 6, 2, 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
+ 2, 1, 2, 4, 2, 1, 3, 1, 3, 1,
+ 3, 2, 2, 2, 2, 3, 2, 3, 2, 2,
+ 2, 3, 2, 0, 3, 0, 8, 2, 0, 7,
+ 8, 6, 2, 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
};
@@ -1676,127 +1657,121 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
case 18: /* BLTIN */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1680 "engines/director/lingo/lingo-gr.cpp"
+#line 1661 "engines/director/lingo/lingo-gr.cpp"
break;
case 19: /* BLTINNOARGS */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1686 "engines/director/lingo/lingo-gr.cpp"
+#line 1667 "engines/director/lingo/lingo-gr.cpp"
break;
case 20: /* BLTINNOARGSORONE */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1692 "engines/director/lingo/lingo-gr.cpp"
+#line 1673 "engines/director/lingo/lingo-gr.cpp"
break;
case 21: /* BLTINONEARG */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1698 "engines/director/lingo/lingo-gr.cpp"
+#line 1679 "engines/director/lingo/lingo-gr.cpp"
break;
case 22: /* BLTINARGLIST */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1704 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 23: /* TWOWORDBUILTIN */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1710 "engines/director/lingo/lingo-gr.cpp"
+#line 1685 "engines/director/lingo/lingo-gr.cpp"
break;
- case 24: /* FBLTIN */
+ case 23: /* FBLTIN */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1716 "engines/director/lingo/lingo-gr.cpp"
+#line 1691 "engines/director/lingo/lingo-gr.cpp"
break;
- case 25: /* FBLTINNOARGS */
+ case 24: /* FBLTINNOARGS */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1722 "engines/director/lingo/lingo-gr.cpp"
+#line 1697 "engines/director/lingo/lingo-gr.cpp"
break;
- case 26: /* FBLTINONEARG */
+ case 25: /* FBLTINONEARG */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1728 "engines/director/lingo/lingo-gr.cpp"
+#line 1703 "engines/director/lingo/lingo-gr.cpp"
break;
- case 27: /* FBLTINARGLIST */
+ case 26: /* FBLTINARGLIST */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1734 "engines/director/lingo/lingo-gr.cpp"
+#line 1709 "engines/director/lingo/lingo-gr.cpp"
break;
- case 28: /* RBLTIN */
+ case 27: /* RBLTIN */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1740 "engines/director/lingo/lingo-gr.cpp"
+#line 1715 "engines/director/lingo/lingo-gr.cpp"
break;
- case 29: /* RBLTINONEARG */
+ case 28: /* RBLTINONEARG */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1746 "engines/director/lingo/lingo-gr.cpp"
+#line 1721 "engines/director/lingo/lingo-gr.cpp"
break;
- case 30: /* ID */
+ case 29: /* ID */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1752 "engines/director/lingo/lingo-gr.cpp"
+#line 1727 "engines/director/lingo/lingo-gr.cpp"
break;
- case 31: /* STRING */
+ case 30: /* STRING */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1758 "engines/director/lingo/lingo-gr.cpp"
+#line 1733 "engines/director/lingo/lingo-gr.cpp"
break;
- case 32: /* HANDLER */
+ case 31: /* HANDLER */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1764 "engines/director/lingo/lingo-gr.cpp"
+#line 1739 "engines/director/lingo/lingo-gr.cpp"
break;
- case 33: /* SYMBOL */
+ case 32: /* SYMBOL */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1770 "engines/director/lingo/lingo-gr.cpp"
+#line 1745 "engines/director/lingo/lingo-gr.cpp"
break;
- case 34: /* ENDCLAUSE */
+ case 33: /* ENDCLAUSE */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1776 "engines/director/lingo/lingo-gr.cpp"
+#line 1751 "engines/director/lingo/lingo-gr.cpp"
break;
- case 35: /* tPLAYACCEL */
+ case 34: /* tPLAYACCEL */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1782 "engines/director/lingo/lingo-gr.cpp"
+#line 1757 "engines/director/lingo/lingo-gr.cpp"
break;
- case 36: /* tMETHOD */
+ case 35: /* tMETHOD */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1788 "engines/director/lingo/lingo-gr.cpp"
+#line 1763 "engines/director/lingo/lingo-gr.cpp"
break;
- case 37: /* THEOBJECTFIELD */
+ case 36: /* THEOBJECTFIELD */
#line 132 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).objectfield).s; }
-#line 1794 "engines/director/lingo/lingo-gr.cpp"
+#line 1769 "engines/director/lingo/lingo-gr.cpp"
break;
- case 141: /* on */
+ case 140: /* on */
#line 131 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1800 "engines/director/lingo/lingo-gr.cpp"
+#line 1775 "engines/director/lingo/lingo-gr.cpp"
break;
default:
@@ -2066,7 +2041,7 @@ yyreduce:
case 4:
#line 138 "engines/director/lingo/lingo-gr.y"
{ yyerrok; }
-#line 2070 "engines/director/lingo/lingo-gr.cpp"
+#line 2045 "engines/director/lingo/lingo-gr.cpp"
break;
case 8:
@@ -2077,7 +2052,7 @@ yyreduce:
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code);
delete (yyvsp[0].s); }
-#line 2081 "engines/director/lingo/lingo-gr.cpp"
+#line 2056 "engines/director/lingo/lingo-gr.cpp"
break;
case 9:
@@ -2085,19 +2060,19 @@ yyreduce:
{
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code); }
-#line 2089 "engines/director/lingo/lingo-gr.cpp"
+#line 2064 "engines/director/lingo/lingo-gr.cpp"
break;
case 10:
#line 155 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_after); }
-#line 2095 "engines/director/lingo/lingo-gr.cpp"
+#line 2070 "engines/director/lingo/lingo-gr.cpp"
break;
case 11:
#line 156 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_before); }
-#line 2101 "engines/director/lingo/lingo-gr.cpp"
+#line 2076 "engines/director/lingo/lingo-gr.cpp"
break;
case 12:
@@ -2108,7 +2083,7 @@ yyreduce:
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2112 "engines/director/lingo/lingo-gr.cpp"
+#line 2087 "engines/director/lingo/lingo-gr.cpp"
break;
case 13:
@@ -2120,7 +2095,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2124 "engines/director/lingo/lingo-gr.cpp"
+#line 2099 "engines/director/lingo/lingo-gr.cpp"
break;
case 14:
@@ -2131,7 +2106,7 @@ yyreduce:
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2135 "engines/director/lingo/lingo-gr.cpp"
+#line 2110 "engines/director/lingo/lingo-gr.cpp"
break;
case 15:
@@ -2143,7 +2118,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2147 "engines/director/lingo/lingo-gr.cpp"
+#line 2122 "engines/director/lingo/lingo-gr.cpp"
break;
case 16:
@@ -2154,7 +2129,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2158 "engines/director/lingo/lingo-gr.cpp"
+#line 2133 "engines/director/lingo/lingo-gr.cpp"
break;
case 17:
@@ -2165,7 +2140,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2169 "engines/director/lingo/lingo-gr.cpp"
+#line 2144 "engines/director/lingo/lingo-gr.cpp"
break;
case 18:
@@ -2176,7 +2151,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].objectfield).e);
delete (yyvsp[-2].objectfield).s;
(yyval.code) = (yyvsp[0].code); }
-#line 2180 "engines/director/lingo/lingo-gr.cpp"
+#line 2155 "engines/director/lingo/lingo-gr.cpp"
break;
case 28:
@@ -2187,7 +2162,7 @@ yyreduce:
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 2] = end; }
-#line 2191 "engines/director/lingo/lingo-gr.cpp"
+#line 2166 "engines/director/lingo/lingo-gr.cpp"
break;
case 29:
@@ -2204,7 +2179,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end; }
-#line 2208 "engines/director/lingo/lingo-gr.cpp"
+#line 2183 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
@@ -2221,7 +2196,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end; }
-#line 2225 "engines/director/lingo/lingo-gr.cpp"
+#line 2200 "engines/director/lingo/lingo-gr.cpp"
break;
case 31:
@@ -2231,14 +2206,14 @@ yyreduce:
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
g_lingo->code1(STOP);
(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
-#line 2235 "engines/director/lingo/lingo-gr.cpp"
+#line 2210 "engines/director/lingo/lingo-gr.cpp"
break;
case 32:
#line 265 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented"); }
-#line 2242 "engines/director/lingo/lingo-gr.cpp"
+#line 2217 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
@@ -2246,7 +2221,7 @@ yyreduce:
{
warning("STUB: TELL is not implemented");
}
-#line 2250 "engines/director/lingo/lingo-gr.cpp"
+#line 2225 "engines/director/lingo/lingo-gr.cpp"
break;
case 34:
@@ -2261,7 +2236,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-8].code), (yyvsp[-1].code) - (yyvsp[-8].code), 0); }
-#line 2265 "engines/director/lingo/lingo-gr.cpp"
+#line 2240 "engines/director/lingo/lingo-gr.cpp"
break;
case 35:
@@ -2276,7 +2251,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-11].code), (yyvsp[-1].code) - (yyvsp[-11].code), (yyvsp[-3].code) - (yyvsp[-11].code)); }
-#line 2280 "engines/director/lingo/lingo-gr.cpp"
+#line 2255 "engines/director/lingo/lingo-gr.cpp"
break;
case 38:
@@ -2287,7 +2262,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
g_lingo->codeLabel((yyvsp[-5].code)); }
-#line 2291 "engines/director/lingo/lingo-gr.cpp"
+#line 2266 "engines/director/lingo/lingo-gr.cpp"
break;
case 39:
@@ -2302,7 +2277,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-10].code), (yyvsp[-1].code) - (yyvsp[-10].code), (yyvsp[-3].code) - (yyvsp[-10].code)); }
-#line 2306 "engines/director/lingo/lingo-gr.cpp"
+#line 2281 "engines/director/lingo/lingo-gr.cpp"
break;
case 40:
@@ -2317,13 +2292,13 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
-#line 2321 "engines/director/lingo/lingo-gr.cpp"
+#line 2296 "engines/director/lingo/lingo-gr.cpp"
break;
case 41:
#line 329 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
-#line 2327 "engines/director/lingo/lingo-gr.cpp"
+#line 2302 "engines/director/lingo/lingo-gr.cpp"
break;
case 42:
@@ -2333,7 +2308,7 @@ yyreduce:
g_lingo->code3(STOP, STOP, STOP);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2337 "engines/director/lingo/lingo-gr.cpp"
+#line 2312 "engines/director/lingo/lingo-gr.cpp"
break;
case 43:
@@ -2343,7 +2318,7 @@ yyreduce:
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(0); // Do not skip end
g_lingo->codeLabel(0); }
-#line 2347 "engines/director/lingo/lingo-gr.cpp"
+#line 2322 "engines/director/lingo/lingo-gr.cpp"
break;
case 44:
@@ -2354,25 +2329,25 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(skipEnd); }
-#line 2358 "engines/director/lingo/lingo-gr.cpp"
+#line 2333 "engines/director/lingo/lingo-gr.cpp"
break;
case 45:
#line 354 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2364 "engines/director/lingo/lingo-gr.cpp"
+#line 2339 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
#line 357 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2370 "engines/director/lingo/lingo-gr.cpp"
+#line 2345 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
#line 360 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2376 "engines/director/lingo/lingo-gr.cpp"
+#line 2351 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
@@ -2382,7 +2357,7 @@ yyreduce:
g_lingo->code1(STOP);
g_lingo->codeString((yyvsp[-1].s)->c_str());
delete (yyvsp[-1].s); }
-#line 2386 "engines/director/lingo/lingo-gr.cpp"
+#line 2361 "engines/director/lingo/lingo-gr.cpp"
break;
case 51:
@@ -2390,7 +2365,7 @@ yyreduce:
{
(yyval.code) = g_lingo->code1(LC::c_tellcode);
g_lingo->code1(STOP); }
-#line 2394 "engines/director/lingo/lingo-gr.cpp"
+#line 2369 "engines/director/lingo/lingo-gr.cpp"
break;
case 52:
@@ -2398,7 +2373,7 @@ yyreduce:
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt((yyvsp[0].i)); }
-#line 2402 "engines/director/lingo/lingo-gr.cpp"
+#line 2377 "engines/director/lingo/lingo-gr.cpp"
break;
case 53:
@@ -2406,7 +2381,7 @@ yyreduce:
{
(yyval.code) = g_lingo->code1(LC::c_floatpush);
g_lingo->codeFloat((yyvsp[0].f)); }
-#line 2410 "engines/director/lingo/lingo-gr.cpp"
+#line 2385 "engines/director/lingo/lingo-gr.cpp"
break;
case 54:
@@ -2415,7 +2390,7 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2419 "engines/director/lingo/lingo-gr.cpp"
+#line 2394 "engines/director/lingo/lingo-gr.cpp"
break;
case 55:
@@ -2424,7 +2399,7 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2428 "engines/director/lingo/lingo-gr.cpp"
+#line 2403 "engines/director/lingo/lingo-gr.cpp"
break;
case 56:
@@ -2433,13 +2408,13 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_eval);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2437 "engines/director/lingo/lingo-gr.cpp"
+#line 2412 "engines/director/lingo/lingo-gr.cpp"
break;
case 58:
#line 396 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2443 "engines/director/lingo/lingo-gr.cpp"
+#line 2418 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
@@ -2447,7 +2422,7 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2451 "engines/director/lingo/lingo-gr.cpp"
+#line 2426 "engines/director/lingo/lingo-gr.cpp"
break;
case 61:
@@ -2455,14 +2430,14 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2459 "engines/director/lingo/lingo-gr.cpp"
+#line 2434 "engines/director/lingo/lingo-gr.cpp"
break;
case 62:
#line 404 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
-#line 2466 "engines/director/lingo/lingo-gr.cpp"
+#line 2441 "engines/director/lingo/lingo-gr.cpp"
break;
case 63:
@@ -2470,7 +2445,7 @@ yyreduce:
{
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2474 "engines/director/lingo/lingo-gr.cpp"
+#line 2449 "engines/director/lingo/lingo-gr.cpp"
break;
case 64:
@@ -2483,7 +2458,7 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[0].e)[0]);
WRITE_UINT32(&f, (yyvsp[0].e)[1]);
g_lingo->code2(e, f); }
-#line 2487 "engines/director/lingo/lingo-gr.cpp"
+#line 2462 "engines/director/lingo/lingo-gr.cpp"
break;
case 65:
@@ -2494,7 +2469,7 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
g_lingo->code2(e, f); }
-#line 2498 "engines/director/lingo/lingo-gr.cpp"
+#line 2473 "engines/director/lingo/lingo-gr.cpp"
break;
case 66:
@@ -2504,193 +2479,193 @@ yyreduce:
g_lingo->codeString((yyvsp[0].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[0].objectfield).e);
delete (yyvsp[0].objectfield).s; }
-#line 2508 "engines/director/lingo/lingo-gr.cpp"
+#line 2483 "engines/director/lingo/lingo-gr.cpp"
break;
case 68:
#line 429 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_add); }
-#line 2514 "engines/director/lingo/lingo-gr.cpp"
+#line 2489 "engines/director/lingo/lingo-gr.cpp"
break;
case 69:
#line 430 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_sub); }
-#line 2520 "engines/director/lingo/lingo-gr.cpp"
+#line 2495 "engines/director/lingo/lingo-gr.cpp"
break;
case 70:
#line 431 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mul); }
-#line 2526 "engines/director/lingo/lingo-gr.cpp"
+#line 2501 "engines/director/lingo/lingo-gr.cpp"
break;
case 71:
#line 432 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_div); }
-#line 2532 "engines/director/lingo/lingo-gr.cpp"
+#line 2507 "engines/director/lingo/lingo-gr.cpp"
break;
case 72:
#line 433 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mod); }
-#line 2538 "engines/director/lingo/lingo-gr.cpp"
+#line 2513 "engines/director/lingo/lingo-gr.cpp"
break;
case 73:
#line 434 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gt); }
-#line 2544 "engines/director/lingo/lingo-gr.cpp"
+#line 2519 "engines/director/lingo/lingo-gr.cpp"
break;
case 74:
#line 435 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lt); }
-#line 2550 "engines/director/lingo/lingo-gr.cpp"
+#line 2525 "engines/director/lingo/lingo-gr.cpp"
break;
case 75:
#line 436 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_eq); }
-#line 2556 "engines/director/lingo/lingo-gr.cpp"
+#line 2531 "engines/director/lingo/lingo-gr.cpp"
break;
case 76:
#line 437 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_neq); }
-#line 2562 "engines/director/lingo/lingo-gr.cpp"
+#line 2537 "engines/director/lingo/lingo-gr.cpp"
break;
case 77:
#line 438 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ge); }
-#line 2568 "engines/director/lingo/lingo-gr.cpp"
+#line 2543 "engines/director/lingo/lingo-gr.cpp"
break;
case 78:
#line 439 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_le); }
-#line 2574 "engines/director/lingo/lingo-gr.cpp"
+#line 2549 "engines/director/lingo/lingo-gr.cpp"
break;
case 79:
#line 440 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_and); }
-#line 2580 "engines/director/lingo/lingo-gr.cpp"
+#line 2555 "engines/director/lingo/lingo-gr.cpp"
break;
case 80:
#line 441 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_or); }
-#line 2586 "engines/director/lingo/lingo-gr.cpp"
+#line 2561 "engines/director/lingo/lingo-gr.cpp"
break;
case 81:
#line 442 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_not); }
-#line 2592 "engines/director/lingo/lingo-gr.cpp"
+#line 2567 "engines/director/lingo/lingo-gr.cpp"
break;
case 82:
#line 443 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ampersand); }
-#line 2598 "engines/director/lingo/lingo-gr.cpp"
+#line 2573 "engines/director/lingo/lingo-gr.cpp"
break;
case 83:
#line 444 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_concat); }
-#line 2604 "engines/director/lingo/lingo-gr.cpp"
+#line 2579 "engines/director/lingo/lingo-gr.cpp"
break;
case 84:
#line 445 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_contains); }
-#line 2610 "engines/director/lingo/lingo-gr.cpp"
+#line 2585 "engines/director/lingo/lingo-gr.cpp"
break;
case 85:
#line 446 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_starts); }
-#line 2616 "engines/director/lingo/lingo-gr.cpp"
+#line 2591 "engines/director/lingo/lingo-gr.cpp"
break;
case 86:
#line 447 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2622 "engines/director/lingo/lingo-gr.cpp"
+#line 2597 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
#line 448 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
-#line 2628 "engines/director/lingo/lingo-gr.cpp"
+#line 2603 "engines/director/lingo/lingo-gr.cpp"
break;
case 88:
#line 449 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2634 "engines/director/lingo/lingo-gr.cpp"
+#line 2609 "engines/director/lingo/lingo-gr.cpp"
break;
case 89:
#line 450 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_intersects); }
-#line 2640 "engines/director/lingo/lingo-gr.cpp"
+#line 2615 "engines/director/lingo/lingo-gr.cpp"
break;
case 90:
#line 451 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_within); }
-#line 2646 "engines/director/lingo/lingo-gr.cpp"
+#line 2621 "engines/director/lingo/lingo-gr.cpp"
break;
case 91:
#line 452 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charOf); }
-#line 2652 "engines/director/lingo/lingo-gr.cpp"
+#line 2627 "engines/director/lingo/lingo-gr.cpp"
break;
case 92:
#line 453 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charToOf); }
-#line 2658 "engines/director/lingo/lingo-gr.cpp"
+#line 2633 "engines/director/lingo/lingo-gr.cpp"
break;
case 93:
#line 454 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemOf); }
-#line 2664 "engines/director/lingo/lingo-gr.cpp"
+#line 2639 "engines/director/lingo/lingo-gr.cpp"
break;
case 94:
#line 455 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemToOf); }
-#line 2670 "engines/director/lingo/lingo-gr.cpp"
+#line 2645 "engines/director/lingo/lingo-gr.cpp"
break;
case 95:
#line 456 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineOf); }
-#line 2676 "engines/director/lingo/lingo-gr.cpp"
+#line 2651 "engines/director/lingo/lingo-gr.cpp"
break;
case 96:
#line 457 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineToOf); }
-#line 2682 "engines/director/lingo/lingo-gr.cpp"
+#line 2657 "engines/director/lingo/lingo-gr.cpp"
break;
case 97:
#line 458 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordOf); }
-#line 2688 "engines/director/lingo/lingo-gr.cpp"
+#line 2663 "engines/director/lingo/lingo-gr.cpp"
break;
case 98:
#line 459 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordToOf); }
-#line 2694 "engines/director/lingo/lingo-gr.cpp"
+#line 2669 "engines/director/lingo/lingo-gr.cpp"
break;
case 99:
@@ -2698,25 +2673,25 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2702 "engines/director/lingo/lingo-gr.cpp"
+#line 2677 "engines/director/lingo/lingo-gr.cpp"
break;
case 100:
#line 467 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); }
-#line 2708 "engines/director/lingo/lingo-gr.cpp"
+#line 2683 "engines/director/lingo/lingo-gr.cpp"
break;
case 103:
#line 470 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); }
-#line 2714 "engines/director/lingo/lingo-gr.cpp"
+#line 2689 "engines/director/lingo/lingo-gr.cpp"
break;
case 104:
#line 471 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); }
-#line 2720 "engines/director/lingo/lingo-gr.cpp"
+#line 2695 "engines/director/lingo/lingo-gr.cpp"
break;
case 108:
@@ -2724,7 +2699,7 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[0].s), 0);
delete (yyvsp[0].s); }
-#line 2728 "engines/director/lingo/lingo-gr.cpp"
+#line 2703 "engines/director/lingo/lingo-gr.cpp"
break;
case 109:
@@ -2732,7 +2707,7 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2736 "engines/director/lingo/lingo-gr.cpp"
+#line 2711 "engines/director/lingo/lingo-gr.cpp"
break;
case 110:
@@ -2740,7 +2715,7 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2744 "engines/director/lingo/lingo-gr.cpp"
+#line 2719 "engines/director/lingo/lingo-gr.cpp"
break;
case 111:
@@ -2749,210 +2724,199 @@ yyreduce:
g_lingo->code1(LC::c_voidpush);
g_lingo->codeFunc((yyvsp[0].s), 1);
delete (yyvsp[0].s); }
-#line 2753 "engines/director/lingo/lingo-gr.cpp"
+#line 2728 "engines/director/lingo/lingo-gr.cpp"
break;
case 112:
#line 488 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
-#line 2760 "engines/director/lingo/lingo-gr.cpp"
+#line 2735 "engines/director/lingo/lingo-gr.cpp"
break;
case 113:
#line 490 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); }
-#line 2766 "engines/director/lingo/lingo-gr.cpp"
+#line 2741 "engines/director/lingo/lingo-gr.cpp"
break;
case 114:
#line 491 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); }
-#line 2772 "engines/director/lingo/lingo-gr.cpp"
+#line 2747 "engines/director/lingo/lingo-gr.cpp"
break;
case 115:
-#line 492 "engines/director/lingo/lingo-gr.y"
- {
- Common::String s(*(yyvsp[-2].s));
- s += '-'; s += *(yyvsp[-1].s);
- g_lingo->codeFunc(&s, (yyvsp[0].narg));
- delete (yyvsp[-1].s);
- delete (yyvsp[-2].s); }
-#line 2783 "engines/director/lingo/lingo-gr.cpp"
+#line 494 "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 2753 "engines/director/lingo/lingo-gr.cpp"
break;
case 116:
-#line 500 "engines/director/lingo/lingo-gr.y"
+#line 495 "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 2789 "engines/director/lingo/lingo-gr.cpp"
+#line 2759 "engines/director/lingo/lingo-gr.cpp"
break;
case 117:
-#line 501 "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 2795 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 118:
-#line 504 "engines/director/lingo/lingo-gr.y"
+#line 498 "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 2801 "engines/director/lingo/lingo-gr.cpp"
+#line 2765 "engines/director/lingo/lingo-gr.cpp"
break;
- case 119:
-#line 505 "engines/director/lingo/lingo-gr.y"
+ case 118:
+#line 499 "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 2807 "engines/director/lingo/lingo-gr.cpp"
+#line 2771 "engines/director/lingo/lingo-gr.cpp"
break;
- case 120:
-#line 508 "engines/director/lingo/lingo-gr.y"
+ case 119:
+#line 502 "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 2813 "engines/director/lingo/lingo-gr.cpp"
+#line 2777 "engines/director/lingo/lingo-gr.cpp"
break;
- case 121:
-#line 509 "engines/director/lingo/lingo-gr.y"
+ case 120:
+#line 503 "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 2819 "engines/director/lingo/lingo-gr.cpp"
+#line 2783 "engines/director/lingo/lingo-gr.cpp"
break;
- case 122:
-#line 520 "engines/director/lingo/lingo-gr.y"
+ case 121:
+#line 514 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
-#line 2825 "engines/director/lingo/lingo-gr.cpp"
+#line 2789 "engines/director/lingo/lingo-gr.cpp"
break;
- case 123:
-#line 521 "engines/director/lingo/lingo-gr.y"
+ case 122:
+#line 515 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
-#line 2831 "engines/director/lingo/lingo-gr.cpp"
+#line 2795 "engines/director/lingo/lingo-gr.cpp"
break;
- case 124:
-#line 522 "engines/director/lingo/lingo-gr.y"
+ case 123:
+#line 516 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
-#line 2837 "engines/director/lingo/lingo-gr.cpp"
+#line 2801 "engines/director/lingo/lingo-gr.cpp"
break;
- case 125:
-#line 523 "engines/director/lingo/lingo-gr.y"
+ case 124:
+#line 517 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); }
-#line 2846 "engines/director/lingo/lingo-gr.cpp"
+#line 2810 "engines/director/lingo/lingo-gr.cpp"
break;
- case 126:
-#line 527 "engines/director/lingo/lingo-gr.y"
+ case 125:
+#line 521 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); }
-#line 2855 "engines/director/lingo/lingo-gr.cpp"
+#line 2819 "engines/director/lingo/lingo-gr.cpp"
break;
- case 127:
-#line 531 "engines/director/lingo/lingo-gr.y"
+ case 126:
+#line 525 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); }
-#line 2864 "engines/director/lingo/lingo-gr.cpp"
+#line 2828 "engines/director/lingo/lingo-gr.cpp"
break;
- case 130:
-#line 541 "engines/director/lingo/lingo-gr.y"
+ case 129:
+#line 535 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); }
-#line 2870 "engines/director/lingo/lingo-gr.cpp"
+#line 2834 "engines/director/lingo/lingo-gr.cpp"
break;
- case 131:
-#line 542 "engines/director/lingo/lingo-gr.y"
+ case 130:
+#line 536 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); }
-#line 2879 "engines/director/lingo/lingo-gr.cpp"
+#line 2843 "engines/director/lingo/lingo-gr.cpp"
break;
- case 132:
-#line 546 "engines/director/lingo/lingo-gr.y"
+ case 131:
+#line 540 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); }
-#line 2888 "engines/director/lingo/lingo-gr.cpp"
+#line 2852 "engines/director/lingo/lingo-gr.cpp"
break;
- case 133:
-#line 550 "engines/director/lingo/lingo-gr.y"
+ case 132:
+#line 544 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); }
-#line 2897 "engines/director/lingo/lingo-gr.cpp"
+#line 2861 "engines/director/lingo/lingo-gr.cpp"
break;
- case 134:
-#line 554 "engines/director/lingo/lingo-gr.y"
+ case 133:
+#line 548 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
-#line 2903 "engines/director/lingo/lingo-gr.cpp"
+#line 2867 "engines/director/lingo/lingo-gr.cpp"
break;
- case 135:
-#line 554 "engines/director/lingo/lingo-gr.y"
+ case 134:
+#line 548 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg));
delete (yyvsp[-2].s); }
-#line 2912 "engines/director/lingo/lingo-gr.cpp"
+#line 2876 "engines/director/lingo/lingo-gr.cpp"
break;
- case 136:
-#line 585 "engines/director/lingo/lingo-gr.y"
+ case 135:
+#line 579 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
-#line 2918 "engines/director/lingo/lingo-gr.cpp"
+#line 2882 "engines/director/lingo/lingo-gr.cpp"
break;
- case 137:
-#line 586 "engines/director/lingo/lingo-gr.y"
+ case 136:
+#line 580 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2929 "engines/director/lingo/lingo-gr.cpp"
+#line 2893 "engines/director/lingo/lingo-gr.cpp"
break;
- case 138:
-#line 592 "engines/director/lingo/lingo-gr.y"
+ case 137:
+#line 586 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
-#line 2935 "engines/director/lingo/lingo-gr.cpp"
+#line 2899 "engines/director/lingo/lingo-gr.cpp"
break;
- case 139:
-#line 593 "engines/director/lingo/lingo-gr.y"
+ case 138:
+#line 587 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2941 "engines/director/lingo/lingo-gr.cpp"
+#line 2905 "engines/director/lingo/lingo-gr.cpp"
break;
- case 140:
-#line 594 "engines/director/lingo/lingo-gr.y"
+ case 139:
+#line 588 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2952 "engines/director/lingo/lingo-gr.cpp"
+#line 2916 "engines/director/lingo/lingo-gr.cpp"
break;
- case 141:
-#line 600 "engines/director/lingo/lingo-gr.y"
+ case 140:
+#line 594 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-7].s), (yyvsp[-6].code), (yyvsp[-5].narg));
@@ -2963,11 +2927,11 @@ yyreduce:
checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false);
delete (yyvsp[-7].s);
delete (yyvsp[-1].s); }
-#line 2967 "engines/director/lingo/lingo-gr.cpp"
+#line 2931 "engines/director/lingo/lingo-gr.cpp"
break;
- case 142:
-#line 610 "engines/director/lingo/lingo-gr.y"
+ case 141:
+#line 604 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
@@ -2975,59 +2939,59 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_ignoreMe = false;
delete (yyvsp[-5].s); }
-#line 2979 "engines/director/lingo/lingo-gr.cpp"
+#line 2943 "engines/director/lingo/lingo-gr.cpp"
break;
- case 143:
-#line 618 "engines/director/lingo/lingo-gr.y"
+ case 142:
+#line 612 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
-#line 2985 "engines/director/lingo/lingo-gr.cpp"
+#line 2949 "engines/director/lingo/lingo-gr.cpp"
break;
- case 144:
-#line 620 "engines/director/lingo/lingo-gr.y"
+ case 143:
+#line 614 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2991 "engines/director/lingo/lingo-gr.cpp"
+#line 2955 "engines/director/lingo/lingo-gr.cpp"
break;
- case 145:
-#line 621 "engines/director/lingo/lingo-gr.y"
+ case 144:
+#line 615 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
-#line 2997 "engines/director/lingo/lingo-gr.cpp"
+#line 2961 "engines/director/lingo/lingo-gr.cpp"
break;
- case 146:
-#line 622 "engines/director/lingo/lingo-gr.y"
+ case 145:
+#line 616 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
-#line 3003 "engines/director/lingo/lingo-gr.cpp"
+#line 2967 "engines/director/lingo/lingo-gr.cpp"
break;
- case 147:
-#line 623 "engines/director/lingo/lingo-gr.y"
+ case 146:
+#line 617 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
-#line 3009 "engines/director/lingo/lingo-gr.cpp"
+#line 2973 "engines/director/lingo/lingo-gr.cpp"
break;
- case 149:
-#line 627 "engines/director/lingo/lingo-gr.y"
+ case 148:
+#line 621 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 3015 "engines/director/lingo/lingo-gr.cpp"
+#line 2979 "engines/director/lingo/lingo-gr.cpp"
break;
- case 150:
-#line 628 "engines/director/lingo/lingo-gr.y"
+ case 149:
+#line 622 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 3021 "engines/director/lingo/lingo-gr.cpp"
+#line 2985 "engines/director/lingo/lingo-gr.cpp"
break;
- case 151:
-#line 631 "engines/director/lingo/lingo-gr.y"
+ case 150:
+#line 625 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
-#line 3027 "engines/director/lingo/lingo-gr.cpp"
+#line 2991 "engines/director/lingo/lingo-gr.cpp"
break;
- case 152:
-#line 634 "engines/director/lingo/lingo-gr.y"
+ case 151:
+#line 628 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
g_lingo->codeString((yyvsp[-1].s)->c_str());
@@ -3035,113 +2999,113 @@ yyreduce:
WRITE_UINT32(&numpar, (yyvsp[0].narg));
g_lingo->code1(numpar);
delete (yyvsp[-1].s); }
-#line 3039 "engines/director/lingo/lingo-gr.cpp"
+#line 3003 "engines/director/lingo/lingo-gr.cpp"
break;
- case 153:
-#line 643 "engines/director/lingo/lingo-gr.y"
+ case 152:
+#line 637 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 3045 "engines/director/lingo/lingo-gr.cpp"
+#line 3009 "engines/director/lingo/lingo-gr.cpp"
break;
- case 154:
-#line 644 "engines/director/lingo/lingo-gr.y"
+ case 153:
+#line 638 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3051 "engines/director/lingo/lingo-gr.cpp"
+#line 3015 "engines/director/lingo/lingo-gr.cpp"
break;
- case 155:
-#line 645 "engines/director/lingo/lingo-gr.y"
+ case 154:
+#line 639 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3057 "engines/director/lingo/lingo-gr.cpp"
+#line 3021 "engines/director/lingo/lingo-gr.cpp"
break;
- case 156:
-#line 648 "engines/director/lingo/lingo-gr.y"
+ case 155:
+#line 642 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3063 "engines/director/lingo/lingo-gr.cpp"
+#line 3027 "engines/director/lingo/lingo-gr.cpp"
break;
- case 157:
-#line 649 "engines/director/lingo/lingo-gr.y"
+ case 156:
+#line 643 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3069 "engines/director/lingo/lingo-gr.cpp"
+#line 3033 "engines/director/lingo/lingo-gr.cpp"
break;
- case 158:
-#line 652 "engines/director/lingo/lingo-gr.y"
+ case 157:
+#line 646 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 3075 "engines/director/lingo/lingo-gr.cpp"
+#line 3039 "engines/director/lingo/lingo-gr.cpp"
break;
- case 159:
-#line 655 "engines/director/lingo/lingo-gr.y"
+ case 158:
+#line 649 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
-#line 3081 "engines/director/lingo/lingo-gr.cpp"
+#line 3045 "engines/director/lingo/lingo-gr.cpp"
break;
- case 160:
-#line 656 "engines/director/lingo/lingo-gr.y"
+ case 159:
+#line 650 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
-#line 3087 "engines/director/lingo/lingo-gr.cpp"
+#line 3051 "engines/director/lingo/lingo-gr.cpp"
break;
- case 161:
-#line 657 "engines/director/lingo/lingo-gr.y"
+ case 160:
+#line 651 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3093 "engines/director/lingo/lingo-gr.cpp"
+#line 3057 "engines/director/lingo/lingo-gr.cpp"
break;
- case 162:
-#line 658 "engines/director/lingo/lingo-gr.y"
+ case 161:
+#line 652 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3099 "engines/director/lingo/lingo-gr.cpp"
+#line 3063 "engines/director/lingo/lingo-gr.cpp"
break;
- case 163:
-#line 661 "engines/director/lingo/lingo-gr.y"
+ case 162:
+#line 655 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3105 "engines/director/lingo/lingo-gr.cpp"
+#line 3069 "engines/director/lingo/lingo-gr.cpp"
break;
- case 164:
-#line 662 "engines/director/lingo/lingo-gr.y"
+ case 163:
+#line 656 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3111 "engines/director/lingo/lingo-gr.cpp"
+#line 3075 "engines/director/lingo/lingo-gr.cpp"
break;
- case 165:
-#line 665 "engines/director/lingo/lingo-gr.y"
+ case 164:
+#line 659 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3117 "engines/director/lingo/lingo-gr.cpp"
+#line 3081 "engines/director/lingo/lingo-gr.cpp"
break;
- case 166:
-#line 666 "engines/director/lingo/lingo-gr.y"
+ case 165:
+#line 660 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3123 "engines/director/lingo/lingo-gr.cpp"
+#line 3087 "engines/director/lingo/lingo-gr.cpp"
break;
- case 167:
-#line 669 "engines/director/lingo/lingo-gr.y"
+ case 166:
+#line 663 "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 3132 "engines/director/lingo/lingo-gr.cpp"
+#line 3096 "engines/director/lingo/lingo-gr.cpp"
break;
- case 168:
-#line 673 "engines/director/lingo/lingo-gr.y"
+ case 167:
+#line 667 "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 3141 "engines/director/lingo/lingo-gr.cpp"
+#line 3105 "engines/director/lingo/lingo-gr.cpp"
break;
-#line 3145 "engines/director/lingo/lingo-gr.cpp"
+#line 3109 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
@@ -3373,5 +3337,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 680 "engines/director/lingo/lingo-gr.y"
+#line 674 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index fd0af3a..5fac83a 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -69,75 +69,74 @@ extern int yydebug;
BLTINNOARGSORONE = 275,
BLTINONEARG = 276,
BLTINARGLIST = 277,
- TWOWORDBUILTIN = 278,
- FBLTIN = 279,
- FBLTINNOARGS = 280,
- FBLTINONEARG = 281,
- FBLTINARGLIST = 282,
- RBLTIN = 283,
- RBLTINONEARG = 284,
- ID = 285,
- STRING = 286,
- HANDLER = 287,
- SYMBOL = 288,
- ENDCLAUSE = 289,
- tPLAYACCEL = 290,
- tMETHOD = 291,
- THEOBJECTFIELD = 292,
- tDOWN = 293,
- tELSE = 294,
- tELSIF = 295,
- tEXIT = 296,
- tGLOBAL = 297,
- tGO = 298,
- tIF = 299,
- tINTO = 300,
- tLOOP = 301,
- tMACRO = 302,
- tMOVIE = 303,
- tNEXT = 304,
- tOF = 305,
- tPREVIOUS = 306,
- tPUT = 307,
- tREPEAT = 308,
- tSET = 309,
- tTHEN = 310,
- tTO = 311,
- tWHEN = 312,
- tWITH = 313,
- tWHILE = 314,
- tNLELSE = 315,
- tFACTORY = 316,
- tOPEN = 317,
- tPLAY = 318,
- tDONE = 319,
- tINSTANCE = 320,
- tGE = 321,
- tLE = 322,
- tEQ = 323,
- tNEQ = 324,
- tAND = 325,
- tOR = 326,
- tNOT = 327,
- tMOD = 328,
- tAFTER = 329,
- tBEFORE = 330,
- tCONCAT = 331,
- tCONTAINS = 332,
- tSTARTS = 333,
- tCHAR = 334,
- tITEM = 335,
- tLINE = 336,
- tWORD = 337,
- tSPRITE = 338,
- tINTERSECTS = 339,
- tWITHIN = 340,
- tTELL = 341,
- tPROPERTY = 342,
- tON = 343,
- tENDIF = 344,
- tENDREPEAT = 345,
- tENDTELL = 346
+ FBLTIN = 278,
+ FBLTINNOARGS = 279,
+ FBLTINONEARG = 280,
+ FBLTINARGLIST = 281,
+ RBLTIN = 282,
+ RBLTINONEARG = 283,
+ ID = 284,
+ STRING = 285,
+ HANDLER = 286,
+ SYMBOL = 287,
+ ENDCLAUSE = 288,
+ tPLAYACCEL = 289,
+ tMETHOD = 290,
+ THEOBJECTFIELD = 291,
+ tDOWN = 292,
+ tELSE = 293,
+ tELSIF = 294,
+ tEXIT = 295,
+ tGLOBAL = 296,
+ tGO = 297,
+ tIF = 298,
+ tINTO = 299,
+ tLOOP = 300,
+ tMACRO = 301,
+ tMOVIE = 302,
+ tNEXT = 303,
+ tOF = 304,
+ tPREVIOUS = 305,
+ tPUT = 306,
+ tREPEAT = 307,
+ tSET = 308,
+ tTHEN = 309,
+ tTO = 310,
+ tWHEN = 311,
+ tWITH = 312,
+ tWHILE = 313,
+ tNLELSE = 314,
+ tFACTORY = 315,
+ tOPEN = 316,
+ tPLAY = 317,
+ tDONE = 318,
+ tINSTANCE = 319,
+ tGE = 320,
+ tLE = 321,
+ tEQ = 322,
+ tNEQ = 323,
+ tAND = 324,
+ tOR = 325,
+ tNOT = 326,
+ tMOD = 327,
+ tAFTER = 328,
+ tBEFORE = 329,
+ tCONCAT = 330,
+ tCONTAINS = 331,
+ tSTARTS = 332,
+ tCHAR = 333,
+ tITEM = 334,
+ tLINE = 335,
+ tWORD = 336,
+ tSPRITE = 337,
+ tINTERSECTS = 338,
+ tWITHIN = 339,
+ tTELL = 340,
+ tPROPERTY = 341,
+ tON = 342,
+ tENDIF = 343,
+ tENDREPEAT = 344,
+ tENDTELL = 345
};
#endif
@@ -160,7 +159,7 @@ union YYSTYPE
int e;
} objectfield;
-#line 164 "engines/director/lingo/lingo-gr.h"
+#line 163 "engines/director/lingo/lingo-gr.h"
};
typedef union YYSTYPE YYSTYPE;
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 3440a4f..cbbc64d 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -103,7 +103,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%token<i> INT ARGC ARGCNORET
%token<e> THEENTITY THEENTITYWITHID
%token<f> FLOAT
-%token<s> BLTIN BLTINNOARGS BLTINNOARGSORONE BLTINONEARG BLTINARGLIST TWOWORDBUILTIN
+%token<s> BLTIN BLTINNOARGS BLTINNOARGSORONE BLTINONEARG BLTINARGLIST
%token<s> FBLTIN FBLTINNOARGS FBLTINONEARG FBLTINARGLIST RBLTIN RBLTINONEARG
%token<s> ID STRING HANDLER SYMBOL
%token<s> ENDCLAUSE tPLAYACCEL tMETHOD
@@ -489,12 +489,6 @@ proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
delete $BLTINARGLIST; }
| tOPEN expr tWITH expr { g_lingo->code1(LC::c_open); }
| tOPEN expr { g_lingo->code2(LC::c_voidpush, LC::c_open); }
- | TWOWORDBUILTIN ID arglist {
- Common::String s(*$TWOWORDBUILTIN);
- s += '-'; s += *$ID;
- g_lingo->codeFunc(&s, $arglist);
- delete $ID;
- delete $TWOWORDBUILTIN; }
;
globallist: ID { g_lingo->code1(LC::c_global); g_lingo->codeString($1->c_str()); delete $ID; }
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index e17202b..0f7055c 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -1601,9 +1601,6 @@ YY_RULE_SETUP
if (g_lingo->isInArgStack(yylval.s))
return ID;
- if (g_lingo->_twoWordBuiltins.contains(yytext))
- return TWOWORDBUILTIN;
-
if (g_lingo->_builtins.contains(yytext)) {
int type = g_lingo->_builtins[yytext]->type;
if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) {
@@ -1636,41 +1633,41 @@ YY_RULE_SETUP
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 370 "engines/director/lingo/lingo-lex.l"
+#line 367 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 371 "engines/director/lingo/lingo-lex.l"
+#line 368 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 372 "engines/director/lingo/lingo-lex.l"
+#line 369 "engines/director/lingo/lingo-lex.l"
{ count(); return *yytext; }
YY_BREAK
case 72:
/* rule 72 can match eol */
YY_RULE_SETUP
-#line 373 "engines/director/lingo/lingo-lex.l"
+#line 370 "engines/director/lingo/lingo-lex.l"
{ count(); return '\n'; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 374 "engines/director/lingo/lingo-lex.l"
+#line 371 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 375 "engines/director/lingo/lingo-lex.l"
+#line 372 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 377 "engines/director/lingo/lingo-lex.l"
+#line 374 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1674 "engines/director/lingo/lingo-lex.cpp"
+#line 1671 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2630,7 +2627,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 377 "engines/director/lingo/lingo-lex.l"
+#line 374 "engines/director/lingo/lingo-lex.l"
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 4570f63..793898b 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -335,9 +335,6 @@ whitespace [\t ]
if (g_lingo->isInArgStack(yylval.s))
return ID;
- if (g_lingo->_twoWordBuiltins.contains(yytext))
- return TWOWORDBUILTIN;
-
if (g_lingo->_builtins.contains(yytext)) {
int type = g_lingo->_builtins[yytext]->type;
if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) {
Commit: 06280dd40336d23ef5c2366fec32fa29048427d8
https://github.com/scummvm/scummvm/commit/06280dd40336d23ef5c2366fec32fa29048427d8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-14T18:19:55+01:00
Commit Message:
DIRECTOR: LINGO: Simplified grammar
Changed paths:
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.h
engines/director/lingo/lingo-gr.y
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 39739f3..f9c1b00 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -161,78 +161,70 @@ extern int yydebug;
THEENTITYWITHID = 271,
FLOAT = 272,
BLTIN = 273,
- BLTINNOARGS = 274,
- BLTINNOARGSORONE = 275,
- BLTINONEARG = 276,
- BLTINARGLIST = 277,
- FBLTIN = 278,
- FBLTINNOARGS = 279,
- FBLTINONEARG = 280,
- FBLTINARGLIST = 281,
- RBLTIN = 282,
- RBLTINONEARG = 283,
- ID = 284,
- STRING = 285,
- HANDLER = 286,
- SYMBOL = 287,
- ENDCLAUSE = 288,
- tPLAYACCEL = 289,
- tMETHOD = 290,
- THEOBJECTFIELD = 291,
- tDOWN = 292,
- tELSE = 293,
- tELSIF = 294,
- tEXIT = 295,
- tGLOBAL = 296,
- tGO = 297,
- tIF = 298,
- tINTO = 299,
- tLOOP = 300,
- tMACRO = 301,
- tMOVIE = 302,
- tNEXT = 303,
- tOF = 304,
- tPREVIOUS = 305,
- tPUT = 306,
- tREPEAT = 307,
- tSET = 308,
- tTHEN = 309,
- tTO = 310,
- tWHEN = 311,
- tWITH = 312,
- tWHILE = 313,
- tNLELSE = 314,
- tFACTORY = 315,
- tOPEN = 316,
- tPLAY = 317,
- tDONE = 318,
- tINSTANCE = 319,
- tGE = 320,
- tLE = 321,
- tEQ = 322,
- tNEQ = 323,
- tAND = 324,
- tOR = 325,
- tNOT = 326,
- tMOD = 327,
- tAFTER = 328,
- tBEFORE = 329,
- tCONCAT = 330,
- tCONTAINS = 331,
- tSTARTS = 332,
- tCHAR = 333,
- tITEM = 334,
- tLINE = 335,
- tWORD = 336,
- tSPRITE = 337,
- tINTERSECTS = 338,
- tWITHIN = 339,
- tTELL = 340,
- tPROPERTY = 341,
- tON = 342,
- tENDIF = 343,
- tENDREPEAT = 344,
- tENDTELL = 345
+ FBLTIN = 274,
+ RBLTIN = 275,
+ ID = 276,
+ STRING = 277,
+ HANDLER = 278,
+ SYMBOL = 279,
+ ENDCLAUSE = 280,
+ tPLAYACCEL = 281,
+ tMETHOD = 282,
+ THEOBJECTFIELD = 283,
+ tDOWN = 284,
+ tELSE = 285,
+ tELSIF = 286,
+ tEXIT = 287,
+ tGLOBAL = 288,
+ tGO = 289,
+ tIF = 290,
+ tINTO = 291,
+ tLOOP = 292,
+ tMACRO = 293,
+ tMOVIE = 294,
+ tNEXT = 295,
+ tOF = 296,
+ tPREVIOUS = 297,
+ tPUT = 298,
+ tREPEAT = 299,
+ tSET = 300,
+ tTHEN = 301,
+ tTO = 302,
+ tWHEN = 303,
+ tWITH = 304,
+ tWHILE = 305,
+ tNLELSE = 306,
+ tFACTORY = 307,
+ tOPEN = 308,
+ tPLAY = 309,
+ tDONE = 310,
+ tINSTANCE = 311,
+ tGE = 312,
+ tLE = 313,
+ tEQ = 314,
+ tNEQ = 315,
+ tAND = 316,
+ tOR = 317,
+ tNOT = 318,
+ tMOD = 319,
+ tAFTER = 320,
+ tBEFORE = 321,
+ tCONCAT = 322,
+ tCONTAINS = 323,
+ tSTARTS = 324,
+ tCHAR = 325,
+ tITEM = 326,
+ tLINE = 327,
+ tWORD = 328,
+ tSPRITE = 329,
+ tINTERSECTS = 330,
+ tWITHIN = 331,
+ tTELL = 332,
+ tPROPERTY = 333,
+ tON = 334,
+ tENDIF = 335,
+ tENDREPEAT = 336,
+ tENDTELL = 337
};
#endif
@@ -255,7 +247,7 @@ union YYSTYPE
int e;
} objectfield;
-#line 259 "engines/director/lingo/lingo-gr.cpp"
+#line 251 "engines/director/lingo/lingo-gr.cpp"
};
typedef union YYSTYPE YYSTYPE;
@@ -572,21 +564,21 @@ union yyalloc
#endif /* !YYCOPY_NEEDED */
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 130
+#define YYFINAL 122
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1513
+#define YYLAST 1507
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 106
+#define YYNTOKENS 98
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 46
/* YYNRULES -- Number of rules. */
-#define YYNRULES 167
+#define YYNRULES 161
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 349
+#define YYNSTATES 341
#define YYUNDEFTOK 2
-#define YYMAXUTOK 345
+#define YYMAXUTOK 337
/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -599,15 +591,15 @@ union yyalloc
static const yytype_int8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 99, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 91, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 98, 93, 2,
- 100, 101, 96, 94, 102, 95, 2, 97, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 105, 2,
- 91, 2, 92, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 90, 85, 2,
+ 92, 93, 88, 86, 94, 87, 2, 89, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 97, 2,
+ 83, 2, 84, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 103, 2, 104, 2, 2, 2, 2, 2, 2,
+ 2, 95, 2, 96, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -631,31 +623,30 @@ static const yytype_int8 yytranslate[] =
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90
+ 75, 76, 77, 78, 79, 80, 81, 82
};
#if YYDEBUG
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 136, 136, 137, 138, 141, 142, 143, 146, 152,
- 155, 156, 157, 163, 170, 176, 183, 189, 195, 203,
- 204, 205, 208, 209, 210, 211, 214, 215, 220, 231,
- 248, 260, 265, 267, 272, 282, 294, 295, 298, 306,
- 316, 329, 332, 339, 346, 354, 357, 360, 361, 362,
- 365, 371, 375, 378, 381, 385, 389, 393, 396, 397,
- 398, 401, 404, 406, 409, 417, 423, 428, 429, 430,
- 431, 432, 433, 434, 435, 436, 437, 438, 439, 440,
- 441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
- 451, 452, 453, 454, 455, 456, 457, 458, 459, 462,
- 467, 468, 469, 470, 471, 472, 473, 474, 475, 478,
- 481, 484, 488, 490, 491, 494, 495, 498, 499, 502,
- 503, 514, 515, 516, 517, 521, 525, 531, 532, 535,
- 536, 540, 544, 548, 548, 579, 579, 586, 587, 587,
- 594, 604, 612, 614, 615, 616, 617, 620, 621, 622,
- 625, 628, 637, 638, 639, 642, 643, 646, 649, 650,
- 651, 652, 655, 656, 659, 660, 663, 667
+ 0, 135, 135, 136, 137, 140, 141, 142, 145, 151,
+ 154, 155, 156, 162, 169, 175, 182, 188, 194, 202,
+ 203, 204, 207, 208, 209, 210, 213, 214, 219, 230,
+ 247, 259, 264, 266, 271, 281, 293, 294, 297, 305,
+ 315, 328, 331, 338, 345, 353, 356, 359, 360, 361,
+ 364, 370, 374, 377, 380, 384, 388, 392, 395, 396,
+ 397, 400, 403, 411, 417, 422, 423, 424, 425, 426,
+ 427, 428, 429, 430, 431, 432, 433, 434, 435, 436,
+ 437, 438, 439, 440, 441, 442, 443, 444, 445, 446,
+ 447, 448, 449, 450, 451, 452, 453, 456, 461, 462,
+ 463, 464, 465, 466, 467, 468, 469, 472, 473, 476,
+ 477, 480, 481, 484, 485, 496, 497, 498, 499, 503,
+ 507, 513, 514, 517, 518, 522, 526, 530, 530, 561,
+ 561, 568, 569, 569, 576, 586, 594, 596, 597, 598,
+ 599, 602, 603, 604, 607, 610, 619, 620, 621, 624,
+ 625, 628, 631, 632, 633, 634, 637, 638, 641, 642,
+ 645, 649
};
#endif
@@ -666,17 +657,15 @@ static const char *const yytname[] =
{
"$end", "error", "$undefined", "UNARY", "CASTREF", "VOID", "VAR",
"POINT", "RECT", "ARRAY", "OBJECT", "REFERENCE", "INT", "ARGC",
- "ARGCNORET", "THEENTITY", "THEENTITYWITHID", "FLOAT", "BLTIN",
- "BLTINNOARGS", "BLTINNOARGSORONE", "BLTINONEARG", "BLTINARGLIST",
- "FBLTIN", "FBLTINNOARGS", "FBLTINONEARG", "FBLTINARGLIST", "RBLTIN",
- "RBLTINONEARG", "ID", "STRING", "HANDLER", "SYMBOL", "ENDCLAUSE",
- "tPLAYACCEL", "tMETHOD", "THEOBJECTFIELD", "tDOWN", "tELSE", "tELSIF",
- "tEXIT", "tGLOBAL", "tGO", "tIF", "tINTO", "tLOOP", "tMACRO", "tMOVIE",
- "tNEXT", "tOF", "tPREVIOUS", "tPUT", "tREPEAT", "tSET", "tTHEN", "tTO",
- "tWHEN", "tWITH", "tWHILE", "tNLELSE", "tFACTORY", "tOPEN", "tPLAY",
- "tDONE", "tINSTANCE", "tGE", "tLE", "tEQ", "tNEQ", "tAND", "tOR", "tNOT",
- "tMOD", "tAFTER", "tBEFORE", "tCONCAT", "tCONTAINS", "tSTARTS", "tCHAR",
- "tITEM", "tLINE", "tWORD", "tSPRITE", "tINTERSECTS", "tWITHIN", "tTELL",
+ "ARGCNORET", "THEENTITY", "THEENTITYWITHID", "FLOAT", "BLTIN", "FBLTIN",
+ "RBLTIN", "ID", "STRING", "HANDLER", "SYMBOL", "ENDCLAUSE", "tPLAYACCEL",
+ "tMETHOD", "THEOBJECTFIELD", "tDOWN", "tELSE", "tELSIF", "tEXIT",
+ "tGLOBAL", "tGO", "tIF", "tINTO", "tLOOP", "tMACRO", "tMOVIE", "tNEXT",
+ "tOF", "tPREVIOUS", "tPUT", "tREPEAT", "tSET", "tTHEN", "tTO", "tWHEN",
+ "tWITH", "tWHILE", "tNLELSE", "tFACTORY", "tOPEN", "tPLAY", "tDONE",
+ "tINSTANCE", "tGE", "tLE", "tEQ", "tNEQ", "tAND", "tOR", "tNOT", "tMOD",
+ "tAFTER", "tBEFORE", "tCONCAT", "tCONTAINS", "tSTARTS", "tCHAR", "tITEM",
+ "tLINE", "tWORD", "tSPRITE", "tINTERSECTS", "tWITHIN", "tTELL",
"tPROPERTY", "tON", "tENDIF", "tENDREPEAT", "tENDTELL", "'<'", "'>'",
"'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "','",
"'['", "']'", "':'", "$accept", "program", "programline", "asgn",
@@ -703,13 +692,12 @@ static const yytype_int16 yytoknum[] =
305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
- 335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
- 345, 60, 62, 38, 43, 45, 42, 47, 37, 10,
- 40, 41, 44, 91, 93, 58
+ 335, 336, 337, 60, 62, 38, 43, 45, 42, 47,
+ 37, 10, 40, 41, 44, 91, 93, 58
};
# endif
-#define YYPACT_NINF (-271)
+#define YYPACT_NINF (-272)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
@@ -723,41 +711,41 @@ static const yytype_int16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 285, -80, -271, -271, 911, -271, -271, 911, 911, 911,
- -271, 911, 911, 32, 971, -271, -271, -271, -271, -271,
- -28, 12, 811, -271, 29, 911, 50, 7, 53, 58,
- 911, 871, 97, 911, 911, 911, 911, 911, 911, -271,
- 103, 107, 911, 911, 911, 25, 2, -271, -271, -271,
- -271, -271, 911, 88, 911, 641, 911, -271, 1403, -271,
- -271, -271, -271, -271, -271, -271, -271, -271, -27, 911,
- 1403, 1403, 1403, 1403, 55, 1403, 55, -271, -271, 911,
- 1403, 63, 911, -271, -271, -271, 65, -271, 911, -271,
- 121, -271, 1015, -271, -271, 964, 140, -271, 47, 32,
- 51, 117, 127, -271, 1320, -271, 1015, -271, -271, 73,
- -271, 28, 1048, 1081, 1114, 1370, -271, 77, -271, -271,
- -271, 1333, 89, 90, -271, -271, 78, 94, 95, -271,
- -271, 374, 1403, 911, 1403, -271, -271, 911, 1403, -271,
- -271, 1279, 911, 911, 911, 911, 911, 911, 911, 911,
- 911, 911, 911, 911, 911, 911, 911, 911, 911, 172,
- 911, 964, 911, 1333, 15, 911, 55, 172, 174, 1403,
- 911, -271, -271, 131, 911, 911, -271, 911, 911, 60,
- 911, 911, 911, -271, 911, -271, 175, 911, 911, 911,
- 911, 911, 911, 911, 911, 911, 911, 176, -271, 32,
- 32, -271, 32, 44, -271, -271, 1403, 153, -271, 1403,
- 911, -271, 16, 16, 16, 16, 1416, 1416, -271, -26,
- 16, 16, 16, 16, -26, -16, -16, -271, -271, -271,
- -85, 1403, -271, 1403, -74, -271, 1403, 172, -271, -271,
- 1403, 1403, 1403, 16, 911, 911, 1403, 16, 1403, 1403,
- -271, 1403, 1147, 1403, 1180, 1403, 1213, 1403, 1246, 1403,
- 1403, -271, -271, -271, -271, 89, 90, -271, 552, -2,
- -271, 154, 1403, 552, 108, 180, 108, -10, 1403, 16,
- 911, 911, 911, 911, -271, -271, 122, 157, 911, 552,
- 730, 123, 186, -271, -271, -271, 108, 1403, 1403, 1403,
- 1403, -271, 911, 1403, -271, -271, -271, -271, 463, 552,
- -271, 1403, -271, 125, -22, 187, 552, -271, 552, -271,
- -271, -271, 911, 129, -271, -271, -271, 116, 552, 130,
- -271, 1403, -271, 730, 191, 133, -271, 552, 169, -271,
- -271, -271, 136, -271, 137, -271, 552, -271, -271
+ 279, -82, -272, -272, 882, -272, 882, 882, 65, 916,
+ -272, -272, -272, -272, -272, 22, 23, 765, -272, 67,
+ 882, -35, 84, 71, 72, 882, 801, 75, 882, 882,
+ 882, 882, 882, 882, -272, 80, 81, 882, 882, 882,
+ 57, 6, -272, -272, -272, -272, -272, 882, 44, 882,
+ 603, 882, -272, 1405, -272, -272, -272, -272, -272, -272,
+ -272, -272, -272, 12, 882, 1405, 1405, 13, 13, -272,
+ -272, 882, 1405, 15, 882, -272, -272, -272, 16, -272,
+ 882, -272, 74, -272, 968, -272, -272, 955, 85, -272,
+ -17, 65, -9, 64, 68, -272, 1322, -272, 968, -272,
+ -272, 28, -272, 1017, 1050, 1083, 1116, 1372, -272, 30,
+ -272, -272, -272, 1335, 32, 50, -272, -272, 55, 34,
+ 61, -272, -272, 360, 1405, 882, 1405, -272, -272, 882,
+ 1405, -272, -272, 1281, 882, 882, 882, 882, 882, 882,
+ 882, 882, 882, 882, 882, 882, 882, 882, 882, 882,
+ 882, 128, 882, 955, 882, 1335, -45, 882, 13, 128,
+ 135, 1405, 882, -272, -272, 38, 882, 882, -272, 882,
+ 882, -6, 882, 882, 882, -272, 882, -272, 136, 882,
+ 882, 882, 882, 882, 882, 882, 882, 882, 882, 138,
+ -272, 65, 65, -272, 65, 49, -272, -272, 1405, 115,
+ -272, 1405, 882, -272, 31, 31, 31, 31, 1418, 1418,
+ -272, -25, 31, 31, 31, 31, -25, -33, -33, -272,
+ -272, -272, -71, 1405, -272, 1405, -26, -272, 1405, 128,
+ -272, -272, 1405, 1405, 1405, 31, 882, 882, 1405, 31,
+ 1405, 1405, -272, 1405, 1149, 1405, 1182, 1405, 1215, 1405,
+ 1248, 1405, 1405, -272, -272, -272, -272, 32, 50, -272,
+ 522, -10, -272, 118, 1405, 522, 73, 150, 73, -19,
+ 1405, 31, 882, 882, 882, 882, -272, -272, 92, 139,
+ 882, 522, 684, 105, 167, -272, -272, -272, 73, 1405,
+ 1405, 1405, 1405, -272, 882, 1405, -272, -272, -272, -272,
+ 441, 522, -272, 1405, -272, 53, -23, 168, 522, -272,
+ 522, -272, -272, -272, 882, 113, -272, -272, -272, 101,
+ 522, 119, -272, 1405, -272, 684, 175, 120, -272, 522,
+ 156, -272, -272, -272, 123, -272, 124, -272, 522, -272,
+ -272
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -765,61 +753,61 @@ static const yytype_int16 yypact[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 0, 52, 64, 0, 53, 108, 111, 0, 152,
- 60, 0, 152, 0, 56, 55, 54, 133, 138, 66,
- 104, 0, 0, 43, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 51,
- 0, 0, 0, 0, 0, 158, 0, 3, 67, 26,
- 7, 27, 0, 0, 0, 0, 0, 58, 20, 59,
- 21, 101, 102, 6, 45, 19, 57, 4, 56, 0,
- 65, 110, 109, 153, 112, 61, 62, 56, 99, 152,
- 155, 151, 152, 45, 103, 115, 105, 121, 0, 122,
- 0, 123, 124, 126, 135, 100, 0, 41, 0, 0,
- 0, 0, 0, 137, 114, 129, 130, 132, 119, 107,
- 81, 0, 0, 0, 0, 0, 117, 106, 142, 86,
- 87, 0, 55, 54, 159, 162, 0, 160, 161, 164,
- 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, 143,
- 152, 0, 0, 153, 0, 0, 134, 143, 0, 128,
- 0, 125, 45, 0, 0, 0, 42, 0, 0, 0,
- 0, 0, 0, 50, 0, 131, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 88, 0,
- 0, 157, 0, 0, 2, 47, 46, 0, 31, 46,
- 0, 47, 77, 78, 75, 76, 79, 80, 72, 83,
- 84, 85, 74, 73, 82, 68, 69, 70, 71, 144,
- 0, 154, 63, 156, 0, 116, 127, 143, 8, 9,
- 10, 11, 15, 13, 0, 0, 14, 12, 18, 113,
- 120, 91, 0, 93, 0, 95, 0, 97, 0, 89,
- 90, 118, 167, 166, 163, 0, 0, 165, 46, 0,
- 47, 0, 33, 46, 150, 0, 150, 0, 16, 17,
- 0, 0, 0, 0, 48, 49, 0, 0, 0, 46,
- 0, 0, 0, 47, 145, 47, 150, 92, 94, 96,
- 98, 28, 0, 46, 36, 46, 32, 146, 141, 139,
- 47, 46, 47, 46, 0, 147, 136, 47, 46, 45,
- 44, 37, 0, 0, 45, 40, 148, 140, 46, 0,
- 47, 46, 34, 0, 0, 0, 29, 46, 0, 46,
- 149, 30, 0, 47, 0, 35, 46, 39, 38
+ 0, 0, 52, 62, 0, 53, 146, 146, 0, 56,
+ 55, 54, 127, 132, 64, 102, 0, 0, 43, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 51, 0, 0, 0, 0, 0,
+ 152, 0, 3, 65, 26, 7, 27, 0, 0, 0,
+ 0, 0, 58, 20, 59, 21, 99, 100, 6, 45,
+ 19, 57, 4, 56, 0, 63, 147, 106, 60, 56,
+ 97, 146, 149, 145, 146, 45, 101, 109, 103, 115,
+ 0, 116, 0, 117, 118, 120, 129, 98, 0, 41,
+ 0, 0, 0, 0, 0, 131, 108, 123, 124, 126,
+ 113, 105, 79, 0, 0, 0, 0, 0, 111, 104,
+ 136, 84, 85, 0, 55, 54, 153, 156, 0, 154,
+ 155, 158, 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, 137, 146, 0, 0, 147, 0, 0, 128, 137,
+ 0, 122, 0, 119, 45, 0, 0, 0, 42, 0,
+ 0, 0, 0, 0, 0, 50, 0, 125, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 86, 0, 0, 151, 0, 0, 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, 138, 0, 148, 61, 150, 0, 110, 121, 137,
+ 8, 9, 10, 11, 15, 13, 0, 0, 14, 12,
+ 18, 107, 114, 89, 0, 91, 0, 93, 0, 95,
+ 0, 87, 88, 112, 161, 160, 157, 0, 0, 159,
+ 46, 0, 47, 0, 33, 46, 144, 0, 144, 0,
+ 16, 17, 0, 0, 0, 0, 48, 49, 0, 0,
+ 0, 46, 0, 0, 0, 47, 139, 47, 144, 90,
+ 92, 94, 96, 28, 0, 46, 36, 46, 32, 140,
+ 135, 133, 47, 46, 47, 46, 0, 141, 130, 47,
+ 46, 45, 44, 37, 0, 0, 45, 40, 142, 134,
+ 46, 0, 47, 46, 34, 0, 0, 0, 29, 46,
+ 0, 46, 143, 30, 0, 47, 0, 35, 46, 39,
+ 38
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -271, -271, 96, -271, -270, -271, 6, -271, -271, -271,
- -271, -271, -271, 171, -271, -82, -75, -49, -271, -271,
- 0, -4, 56, 177, -271, -271, -271, -271, -20, -271,
- -271, -271, -271, -271, -271, -158, -271, -229, 178, 3,
- -271, -271, -271, -271, -271, 31
+ -272, -272, 82, -272, -271, -272, 4, -272, -272, -272,
+ -272, -272, -272, 157, -272, -74, -75, -88, -272, -272,
+ 0, -4, 43, 159, -272, -272, -272, -272, 10, -272,
+ -272, -272, -272, -272, -272, -149, -272, -256, 160, 11,
+ -272, -272, -272, -272, -272, 17
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 46, 47, 48, 49, 135, 285, 51, 313, 321,
- 136, 52, 53, 54, 322, 159, 205, 268, 55, 56,
- 57, 58, 59, 60, 86, 117, 109, 61, 93, 62,
- 82, 63, 172, 83, 64, 230, 327, 293, 65, 164,
- 81, 66, 126, 127, 128, 129
+ -1, 41, 42, 43, 44, 127, 277, 46, 305, 313,
+ 128, 47, 48, 49, 314, 151, 197, 260, 50, 51,
+ 52, 53, 54, 55, 78, 109, 101, 56, 85, 57,
+ 74, 58, 164, 75, 59, 222, 319, 285, 60, 156,
+ 73, 61, 118, 119, 120, 121
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -827,377 +815,375 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 70, 167, 130, 71, 72, 73, 50, 75, 73, 234,
- 80, 107, 74, 78, 274, 76, 324, 275, 92, 67,
- 305, 95, 98, 99, 84, 276, 104, 106, 275, 110,
- 111, 112, 113, 114, 115, 287, 100, 2, 119, 120,
- 121, 85, 5, 101, 2, 125, 148, 295, 132, 5,
- 134, 138, 141, 288, 77, 122, 148, 123, 94, 207,
- 208, 77, 15, 339, 16, 161, 325, 310, 155, 156,
- 157, 158, 171, 160, 265, 163, 266, 187, 73, 277,
- 157, 158, 102, 188, 169, 166, 185, 103, 148, 296,
- 237, 149, 275, 142, 143, 144, 145, 146, 147, 179,
- 148, 131, 177, 149, 150, 151, 180, 96, 97, 154,
- 155, 156, 157, 158, 178, 244, 232, 162, 181, 152,
- 153, 154, 155, 156, 157, 158, 108, 245, 45, 206,
- 124, 269, 116, 209, 271, 45, 118, 50, 212, 213,
- 214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
- 224, 225, 226, 227, 228, 133, 73, 162, 231, 13,
- 238, 233, 273, 319, 320, 165, 236, 168, 170, 176,
- 240, 241, 182, 242, 243, 186, 246, 247, 248, 197,
- 249, 183, 201, 251, 252, 253, 254, 255, 256, 257,
- 258, 259, 260, 286, 199, 200, 202, 203, 291, 262,
- 263, 229, 264, 235, 250, 261, 272, 270, 290, 294,
- 292, 301, 302, 306, 304, 307, 326, 332, 334, 336,
- 340, 289, 341, 343, 345, 347, 137, 204, 312, 239,
- 314, 0, 139, 140, 267, 0, 317, 330, 323, 0,
- 278, 279, 333, 329, 308, 0, 309, 0, 0, 0,
- 0, 0, 0, 335, 0, 0, 338, 0, 0, 0,
- 0, 316, 342, 318, 344, 0, 0, 0, 328, 0,
- 0, 348, 0, 0, 0, 0, 297, 298, 299, 300,
- 0, 337, 0, 0, 303, -5, 1, 0, 0, 0,
- 0, 0, 0, 0, 346, 0, 0, 2, 311, 0,
- 3, 4, 5, 0, 6, 7, 8, 9, 0, 10,
- 11, 12, 0, 13, 14, 15, 0, 16, 331, 17,
- 18, 19, 0, 0, 0, 20, 21, 22, 23, 0,
- 0, 24, 0, 0, 0, 0, 25, 26, 27, 0,
- 0, 28, 0, 0, 0, 29, 30, 31, 0, 32,
- 0, 0, 0, 0, 0, 0, 33, 0, 0, 0,
- 0, 0, 0, 34, 35, 36, 37, 38, 0, 0,
- 39, 40, 41, 0, 0, 0, 0, 0, 0, 42,
- 43, 0, 0, 0, -5, 44, 2, 0, 45, 3,
- 4, 5, 0, 6, 7, 8, 9, 0, 10, 11,
- 12, 0, 13, 14, 15, 0, 16, 0, 17, 18,
- 19, 0, 0, 0, 20, 21, 22, 23, 0, 0,
- 24, 0, 0, 0, 0, 25, 26, 27, 0, 0,
- 28, 0, 0, 0, 29, 30, 31, 0, 32, 0,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
- 0, 0, 34, 35, 36, 37, 38, 0, 0, 39,
- 40, 41, 0, 0, 0, 0, 0, 0, 42, 43,
- 0, 0, 0, 0, 44, 2, 0, 45, 3, 4,
- 5, 0, 6, 7, 8, 9, 0, 10, 11, 12,
- 0, 13, 14, 15, 0, 16, 315, 17, 0, 19,
- 0, 0, 0, 20, 21, 22, 23, 0, 0, 0,
- 0, 0, 0, 0, 25, 26, 27, 0, 0, 28,
- 0, 0, 0, 0, 30, 31, 0, 32, 0, 0,
- 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
- 0, 34, 35, 36, 37, 38, 0, 0, 39, 40,
- 0, 0, 0, 0, 0, 0, 0, 42, 43, 0,
- 0, 0, 284, 44, 2, 0, 45, 3, 4, 5,
- 0, 6, 7, 8, 9, 0, 10, 11, 12, 0,
- 13, 14, 15, 0, 16, 0, 17, 0, 19, 0,
- 0, 0, 20, 21, 22, 23, 0, 0, 0, 0,
- 0, 0, 0, 25, 26, 27, 0, 0, 28, 0,
- 0, 0, 0, 30, 31, 0, 32, 0, 0, 0,
- 0, 0, 0, 33, 0, 0, 0, 0, 0, 0,
- 34, 35, 36, 37, 38, 0, 0, 39, 40, 0,
- 0, 0, 0, 0, 0, 0, 42, 43, 0, 0,
- 0, 284, 44, 2, 0, 45, 3, 4, 5, 0,
- 6, 7, 8, 9, 0, 10, 11, 12, 0, 13,
- 14, 15, 0, 16, 0, 17, 0, 19, 0, 0,
- 0, 20, 21, 22, 23, 0, 0, 0, 0, 0,
- 0, 0, 25, 0, 27, 0, 0, 0, 0, 0,
- 0, 0, 30, 31, 0, 32, 0, 0, 0, 0,
- 0, 0, 33, 0, 0, 0, 0, 0, 0, 34,
- 35, 36, 37, 38, 0, 0, 0, 40, 0, 0,
- 0, 0, 0, 0, 0, 42, 43, 0, 0, 0,
- 0, 44, 2, 0, 45, 3, 4, 5, 0, 6,
- 7, 8, 9, 0, 10, 11, 12, 0, 13, 14,
- 15, 0, 16, 0, 17, 0, 19, 0, 0, 0,
- 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
- 0, 25, 0, 27, 0, 0, 0, 0, 0, 0,
- 0, 30, 31, 0, 32, 0, 0, 0, 0, 0,
- 0, 33, 0, 0, 0, 0, 0, 0, 34, 35,
- 36, 37, 38, 0, 0, 0, 40, 0, 0, 0,
- 0, 0, 0, 2, 42, 43, 3, 4, 5, 0,
- 44, 0, 0, 45, 0, 10, 11, 12, 0, 13,
- 68, 15, 0, 16, 0, 0, 0, 19, 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, 0, 0, 0, 0,
- 0, 0, 33, 2, 0, 0, 3, 4, 5, 34,
- 35, 36, 37, 38, 0, 10, 11, 12, 0, 13,
- 68, 15, 0, 16, 0, 42, 43, 19, 0, 0,
- 0, 44, 0, 0, 45, 0, 0, 0, 88, 0,
- 90, 0, 69, 2, 27, 0, 3, 4, 5, 0,
- 0, 0, 0, 0, 105, 10, 11, 12, 0, 13,
- 68, 15, 33, 16, 0, 0, 0, 19, 0, 34,
- 35, 36, 37, 38, 0, 0, 0, 0, 0, 0,
- 0, 0, 69, 0, 27, 42, 43, 0, 0, 0,
- 0, 44, 0, 0, 45, 0, 0, 0, 0, 0,
- 0, 0, 33, 2, 0, 0, 3, 4, 5, 34,
- 35, 36, 37, 38, 0, 10, 11, 12, 0, 13,
- 68, 15, 0, 16, 0, 42, 43, 19, 173, 0,
- 0, 44, 0, 0, 45, 0, 0, 0, 0, 0,
- 0, 0, 69, 0, 27, 0, 0, 0, 0, 142,
- 143, 144, 145, 146, 147, 0, 148, 174, 175, 149,
- 150, 151, 33, 0, 0, 0, 0, 0, 0, 34,
- 35, 36, 37, 38, 0, 152, 153, 154, 155, 156,
- 157, 158, 88, 0, 90, 42, 43, 0, 0, 0,
- 0, 79, 0, 0, 45, 0, 0, 0, 0, 0,
- 142, 143, 144, 145, 146, 147, 0, 148, 0, 0,
- 149, 150, 151, 0, 0, 0, 0, 189, 0, 0,
- 0, 0, 0, 190, 0, 0, 152, 153, 154, 155,
- 156, 157, 158, 142, 143, 144, 145, 146, 147, 0,
- 148, 0, 0, 149, 150, 151, 0, 0, 0, 0,
- 191, 0, 0, 0, 0, 0, 192, 0, 0, 152,
- 153, 154, 155, 156, 157, 158, 142, 143, 144, 145,
- 146, 147, 0, 148, 0, 0, 149, 150, 151, 0,
- 0, 0, 0, 193, 0, 0, 0, 0, 0, 194,
- 0, 0, 152, 153, 154, 155, 156, 157, 158, 142,
- 143, 144, 145, 146, 147, 0, 148, 0, 0, 149,
- 150, 151, 0, 0, 0, 0, 280, 0, 0, 0,
- 0, 0, 0, 0, 0, 152, 153, 154, 155, 156,
- 157, 158, 142, 143, 144, 145, 146, 147, 0, 148,
- 0, 0, 149, 150, 151, 0, 0, 0, 0, 281,
- 0, 0, 0, 0, 0, 0, 0, 0, 152, 153,
- 154, 155, 156, 157, 158, 142, 143, 144, 145, 146,
- 147, 0, 148, 0, 0, 149, 150, 151, 0, 0,
- 0, 0, 282, 0, 0, 0, 0, 0, 0, 0,
- 0, 152, 153, 154, 155, 156, 157, 158, 142, 143,
- 144, 145, 146, 147, 0, 148, 0, 0, 149, 150,
- 151, 0, 0, 0, 0, 283, 0, 0, 0, 0,
- 0, 0, 0, 0, 152, 153, 154, 155, 156, 157,
- 158, 142, 143, 144, 145, 146, 147, 0, 148, 0,
- 0, 149, 150, 151, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 210, 0, 0, 152, 153, 154,
- 155, 156, 157, 158, 142, 143, 144, 145, 146, 147,
- 0, 148, 0, 0, 149, 150, 151, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 152, 153, 154, 155, 156, 157, 158, 184, 211, 0,
- 0, 0, 0, 0, 0, 142, 143, 144, 145, 146,
- 147, 0, 148, 0, 0, 149, 150, 151, 142, 143,
- 144, 145, 146, 147, 0, 148, 0, 0, 149, 150,
- 151, 152, 153, 154, 155, 156, 157, 158, 0, 0,
- 0, 0, 0, 0, 152, 153, 154, 155, 156, 157,
- 158, 0, 0, 0, 198, 142, 143, 144, 145, 146,
- 147, 0, 148, 0, 0, 149, 150, 151, 0, 0,
- 0, 0, 0, 195, 196, 0, 0, 0, 0, 0,
- 0, 152, 153, 154, 155, 156, 157, 158, 142, 143,
- 144, 145, 146, 147, 0, 148, 0, 0, 149, 150,
- 151, 142, 143, 144, 145, 0, 0, 0, 148, 0,
- 0, 149, 150, 151, 152, 153, 154, 155, 156, 157,
- 158, 0, 0, 0, 0, 0, 0, 152, 153, 154,
- 155, 156, 157, 158
+ 65, 159, 66, 66, 45, 72, 122, 316, 70, 62,
+ 226, 297, 287, 84, 88, 89, 87, 67, 68, 279,
+ 266, 96, 98, 267, 102, 103, 104, 105, 106, 107,
+ 169, 140, 302, 111, 112, 113, 99, 280, 172, 140,
+ 117, 236, 170, 124, 77, 126, 130, 133, 224, 154,
+ 173, 199, 200, 237, 331, 149, 150, 317, 8, 230,
+ 153, 147, 148, 149, 150, 268, 76, 155, 267, 2,
+ 66, 257, 288, 258, 5, 267, 161, 2, 69, 114,
+ 269, 115, 5, 311, 312, 158, 69, 10, 86, 11,
+ 229, 171, 94, 95, 163, 140, 100, 123, 141, 90,
+ 91, 108, 110, 125, 152, 92, 168, 154, 177, 157,
+ 160, 174, 93, 162, 175, 265, 146, 147, 148, 149,
+ 150, 198, 178, 261, 189, 201, 263, 45, 194, 191,
+ 204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 218, 219, 220, 192, 66, 221,
+ 223, 193, 40, 225, 116, 195, 227, 242, 228, 253,
+ 40, 262, 232, 233, 282, 234, 235, 284, 238, 239,
+ 240, 286, 241, 293, 281, 243, 244, 245, 246, 247,
+ 248, 249, 250, 251, 252, 278, 294, 298, 299, 318,
+ 283, 254, 255, 324, 256, 326, 332, 300, 264, 301,
+ 328, 333, 335, 337, 339, 196, 296, 129, 231, 131,
+ 132, 0, 259, 0, 308, 0, 310, 0, 0, 0,
+ 304, 320, 306, 0, 0, 0, 0, 0, 309, 0,
+ 315, 0, 270, 271, 329, 321, 0, 322, 0, 0,
+ 0, 0, 325, 0, 0, 327, 0, 338, 330, 0,
+ 0, 0, 0, 0, 334, 0, 336, 0, 0, 0,
+ 0, 0, 0, 340, 0, 0, 0, 0, 289, 290,
+ 291, 292, 0, 0, 0, 0, 295, 0, 0, -5,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 303, 2, 0, 0, 3, 4, 5, 6, 7, 8,
+ 9, 10, 0, 11, 0, 12, 13, 14, 0, 0,
+ 323, 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, 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, 7,
+ 8, 9, 10, 0, 11, 0, 12, 13, 14, 0,
+ 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, 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, 307, 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, 276, 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, 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, 276, 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, 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, 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, 63, 10, 0, 11,
+ 0, 0, 0, 14, 0, 0, 0, 0, 0, 0,
+ 0, 0, 79, 0, 80, 81, 82, 83, 64, 0,
+ 22, 0, 0, 2, 0, 0, 3, 4, 5, 0,
+ 7, 8, 63, 10, 0, 11, 0, 0, 28, 14,
+ 0, 0, 0, 0, 0, 29, 30, 31, 32, 33,
+ 80, 0, 82, 0, 64, 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, 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, 63, 10, 0, 11, 0, 0, 0,
+ 14, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 64, 0, 22, 2, 0,
+ 0, 3, 4, 5, 0, 7, 8, 63, 10, 0,
+ 11, 0, 0, 0, 14, 28, 0, 0, 0, 0,
+ 0, 0, 29, 30, 31, 32, 33, 0, 0, 64,
+ 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, 165, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 37, 38, 0, 0, 0, 80, 71, 82,
+ 0, 40, 134, 135, 136, 137, 138, 139, 0, 140,
+ 166, 167, 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, 179, 0,
+ 0, 0, 0, 0, 180, 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, 181, 0, 0, 0, 0, 0, 182, 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, 183, 0, 0, 0, 0, 0,
+ 184, 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, 185, 0, 0,
+ 0, 0, 0, 186, 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,
+ 272, 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, 273, 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, 274, 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, 275,
+ 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, 202, 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, 176, 203, 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, 190, 134,
+ 135, 136, 137, 138, 139, 0, 140, 0, 0, 141,
+ 142, 143, 0, 0, 0, 0, 0, 187, 188, 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, 134, 135, 136, 137, 0,
+ 0, 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
};
static const yytype_int16 yycheck[] =
{
- 4, 83, 0, 7, 8, 9, 0, 11, 12, 167,
- 14, 31, 9, 13, 99, 12, 38, 102, 22, 99,
- 290, 25, 15, 16, 52, 99, 30, 31, 102, 33,
- 34, 35, 36, 37, 38, 37, 29, 12, 42, 43,
- 44, 29, 17, 36, 12, 45, 72, 276, 52, 17,
- 54, 55, 56, 55, 29, 30, 72, 32, 29, 134,
- 135, 29, 30, 333, 32, 69, 88, 296, 94, 95,
- 96, 97, 92, 100, 30, 79, 32, 49, 82, 237,
- 96, 97, 29, 55, 88, 82, 106, 29, 72, 99,
- 172, 75, 102, 65, 66, 67, 68, 69, 70, 99,
- 72, 99, 55, 75, 76, 77, 55, 57, 58, 93,
- 94, 95, 96, 97, 67, 55, 101, 102, 67, 91,
- 92, 93, 94, 95, 96, 97, 29, 67, 103, 133,
- 105, 206, 29, 137, 209, 103, 29, 131, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 157, 158, 67, 160, 102, 162, 28,
- 29, 165, 211, 38, 39, 102, 170, 102, 47, 29,
- 174, 175, 55, 177, 178, 102, 180, 181, 182, 102,
- 184, 54, 104, 187, 188, 189, 190, 191, 192, 193,
- 194, 195, 196, 268, 105, 105, 102, 102, 273, 199,
- 200, 29, 202, 29, 29, 29, 210, 54, 54, 29,
- 102, 89, 55, 90, 289, 29, 29, 88, 102, 89,
- 29, 270, 89, 54, 88, 88, 55, 131, 303, 173,
- 305, -1, 55, 55, 203, -1, 311, 319, 313, -1,
- 244, 245, 324, 318, 293, -1, 295, -1, -1, -1,
- -1, -1, -1, 328, -1, -1, 331, -1, -1, -1,
- -1, 310, 337, 312, 339, -1, -1, -1, 317, -1,
- -1, 346, -1, -1, -1, -1, 280, 281, 282, 283,
- -1, 330, -1, -1, 288, 0, 1, -1, -1, -1,
- -1, -1, -1, -1, 343, -1, -1, 12, 302, -1,
- 15, 16, 17, -1, 19, 20, 21, 22, -1, 24,
- 25, 26, -1, 28, 29, 30, -1, 32, 322, 34,
- 35, 36, -1, -1, -1, 40, 41, 42, 43, -1,
- -1, 46, -1, -1, -1, -1, 51, 52, 53, -1,
- -1, 56, -1, -1, -1, 60, 61, 62, -1, 64,
- -1, -1, -1, -1, -1, -1, 71, -1, -1, -1,
- -1, -1, -1, 78, 79, 80, 81, 82, -1, -1,
- 85, 86, 87, -1, -1, -1, -1, -1, -1, 94,
- 95, -1, -1, -1, 99, 100, 12, -1, 103, 15,
- 16, 17, -1, 19, 20, 21, 22, -1, 24, 25,
- 26, -1, 28, 29, 30, -1, 32, -1, 34, 35,
- 36, -1, -1, -1, 40, 41, 42, 43, -1, -1,
- 46, -1, -1, -1, -1, 51, 52, 53, -1, -1,
- 56, -1, -1, -1, 60, 61, 62, -1, 64, -1,
- -1, -1, -1, -1, -1, 71, -1, -1, -1, -1,
- -1, -1, 78, 79, 80, 81, 82, -1, -1, 85,
- 86, 87, -1, -1, -1, -1, -1, -1, 94, 95,
- -1, -1, -1, -1, 100, 12, -1, 103, 15, 16,
- 17, -1, 19, 20, 21, 22, -1, 24, 25, 26,
- -1, 28, 29, 30, -1, 32, 33, 34, -1, 36,
- -1, -1, -1, 40, 41, 42, 43, -1, -1, -1,
- -1, -1, -1, -1, 51, 52, 53, -1, -1, 56,
- -1, -1, -1, -1, 61, 62, -1, 64, -1, -1,
- -1, -1, -1, -1, 71, -1, -1, -1, -1, -1,
- -1, 78, 79, 80, 81, 82, -1, -1, 85, 86,
- -1, -1, -1, -1, -1, -1, -1, 94, 95, -1,
- -1, -1, 99, 100, 12, -1, 103, 15, 16, 17,
- -1, 19, 20, 21, 22, -1, 24, 25, 26, -1,
- 28, 29, 30, -1, 32, -1, 34, -1, 36, -1,
- -1, -1, 40, 41, 42, 43, -1, -1, -1, -1,
- -1, -1, -1, 51, 52, 53, -1, -1, 56, -1,
- -1, -1, -1, 61, 62, -1, 64, -1, -1, -1,
- -1, -1, -1, 71, -1, -1, -1, -1, -1, -1,
- 78, 79, 80, 81, 82, -1, -1, 85, 86, -1,
- -1, -1, -1, -1, -1, -1, 94, 95, -1, -1,
- -1, 99, 100, 12, -1, 103, 15, 16, 17, -1,
+ 4, 75, 6, 7, 0, 9, 0, 30, 8, 91,
+ 159, 282, 268, 17, 49, 50, 20, 6, 7, 29,
+ 91, 25, 26, 94, 28, 29, 30, 31, 32, 33,
+ 47, 64, 288, 37, 38, 39, 26, 47, 47, 64,
+ 40, 47, 59, 47, 21, 49, 50, 51, 93, 94,
+ 59, 126, 127, 59, 325, 88, 89, 80, 20, 21,
+ 64, 86, 87, 88, 89, 91, 44, 71, 94, 12,
+ 74, 22, 91, 24, 17, 94, 80, 12, 21, 22,
+ 229, 24, 17, 30, 31, 74, 21, 22, 21, 24,
+ 164, 91, 21, 21, 84, 64, 21, 91, 67, 15,
+ 16, 21, 21, 59, 92, 21, 21, 94, 98, 94,
+ 94, 47, 28, 39, 46, 203, 85, 86, 87, 88,
+ 89, 125, 94, 198, 94, 129, 201, 123, 94, 97,
+ 134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
+ 144, 145, 146, 147, 148, 149, 150, 97, 152, 21,
+ 154, 96, 95, 157, 97, 94, 21, 21, 162, 21,
+ 95, 46, 166, 167, 46, 169, 170, 94, 172, 173,
+ 174, 21, 176, 81, 262, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 260, 47, 82, 21, 21,
+ 265, 191, 192, 80, 194, 94, 21, 285, 202, 287,
+ 81, 81, 46, 80, 80, 123, 281, 50, 165, 50,
+ 50, -1, 195, -1, 302, -1, 304, -1, -1, -1,
+ 295, 309, 297, -1, -1, -1, -1, -1, 303, -1,
+ 305, -1, 236, 237, 322, 310, -1, 311, -1, -1,
+ -1, -1, 316, -1, -1, 320, -1, 335, 323, -1,
+ -1, -1, -1, -1, 329, -1, 331, -1, -1, -1,
+ -1, -1, -1, 338, -1, -1, -1, -1, 272, 273,
+ 274, 275, -1, -1, -1, -1, 280, -1, -1, 0,
+ 1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 294, 12, -1, -1, 15, 16, 17, 18, 19, 20,
+ 21, 22, -1, 24, -1, 26, 27, 28, -1, -1,
+ 314, 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, -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, 19,
+ 20, 21, 22, -1, 24, -1, 26, 27, 28, -1,
+ -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, -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, 28,
- 29, 30, -1, 32, -1, 34, -1, 36, -1, -1,
- -1, 40, 41, 42, 43, -1, -1, -1, -1, -1,
- -1, -1, 51, -1, 53, -1, -1, -1, -1, -1,
- -1, -1, 61, 62, -1, 64, -1, -1, -1, -1,
- -1, -1, 71, -1, -1, -1, -1, -1, -1, 78,
- 79, 80, 81, 82, -1, -1, -1, 86, -1, -1,
- -1, -1, -1, -1, -1, 94, 95, -1, -1, -1,
- -1, 100, 12, -1, 103, 15, 16, 17, -1, 19,
- 20, 21, 22, -1, 24, 25, 26, -1, 28, 29,
- 30, -1, 32, -1, 34, -1, 36, -1, -1, -1,
- 40, 41, 42, -1, -1, -1, -1, -1, -1, -1,
- -1, 51, -1, 53, -1, -1, -1, -1, -1, -1,
- -1, 61, 62, -1, 64, -1, -1, -1, -1, -1,
- -1, 71, -1, -1, -1, -1, -1, -1, 78, 79,
- 80, 81, 82, -1, -1, -1, 86, -1, -1, -1,
- -1, -1, -1, 12, 94, 95, 15, 16, 17, -1,
- 100, -1, -1, 103, -1, 24, 25, 26, -1, 28,
- 29, 30, -1, 32, -1, -1, -1, 36, -1, -1,
- -1, -1, -1, -1, -1, -1, 45, -1, 47, 48,
- 49, 50, 51, -1, 53, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 71, 12, -1, -1, 15, 16, 17, 78,
- 79, 80, 81, 82, -1, 24, 25, 26, -1, 28,
- 29, 30, -1, 32, -1, 94, 95, 36, -1, -1,
- -1, 100, -1, -1, 103, -1, -1, -1, 47, -1,
- 49, -1, 51, 12, 53, -1, 15, 16, 17, -1,
- -1, -1, -1, -1, 63, 24, 25, 26, -1, 28,
- 29, 30, 71, 32, -1, -1, -1, 36, -1, 78,
- 79, 80, 81, 82, -1, -1, -1, -1, -1, -1,
- -1, -1, 51, -1, 53, 94, 95, -1, -1, -1,
- -1, 100, -1, -1, 103, -1, -1, -1, -1, -1,
- -1, -1, 71, 12, -1, -1, 15, 16, 17, 78,
- 79, 80, 81, 82, -1, 24, 25, 26, -1, 28,
- 29, 30, -1, 32, -1, 94, 95, 36, 44, -1,
- -1, 100, -1, -1, 103, -1, -1, -1, -1, -1,
- -1, -1, 51, -1, 53, -1, -1, -1, -1, 65,
- 66, 67, 68, 69, 70, -1, 72, 73, 74, 75,
- 76, 77, 71, -1, -1, -1, -1, -1, -1, 78,
- 79, 80, 81, 82, -1, 91, 92, 93, 94, 95,
- 96, 97, 47, -1, 49, 94, 95, -1, -1, -1,
- -1, 100, -1, -1, 103, -1, -1, -1, -1, -1,
- 65, 66, 67, 68, 69, 70, -1, 72, -1, -1,
- 75, 76, 77, -1, -1, -1, -1, 49, -1, -1,
- -1, -1, -1, 55, -1, -1, 91, 92, 93, 94,
- 95, 96, 97, 65, 66, 67, 68, 69, 70, -1,
- 72, -1, -1, 75, 76, 77, -1, -1, -1, -1,
- 49, -1, -1, -1, -1, -1, 55, -1, -1, 91,
- 92, 93, 94, 95, 96, 97, 65, 66, 67, 68,
- 69, 70, -1, 72, -1, -1, 75, 76, 77, -1,
- -1, -1, -1, 49, -1, -1, -1, -1, -1, 55,
- -1, -1, 91, 92, 93, 94, 95, 96, 97, 65,
- 66, 67, 68, 69, 70, -1, 72, -1, -1, 75,
- 76, 77, -1, -1, -1, -1, 49, -1, -1, -1,
- -1, -1, -1, -1, -1, 91, 92, 93, 94, 95,
- 96, 97, 65, 66, 67, 68, 69, 70, -1, 72,
- -1, -1, 75, 76, 77, -1, -1, -1, -1, 49,
- -1, -1, -1, -1, -1, -1, -1, -1, 91, 92,
- 93, 94, 95, 96, 97, 65, 66, 67, 68, 69,
- 70, -1, 72, -1, -1, 75, 76, 77, -1, -1,
- -1, -1, 49, -1, -1, -1, -1, -1, -1, -1,
- -1, 91, 92, 93, 94, 95, 96, 97, 65, 66,
- 67, 68, 69, 70, -1, 72, -1, -1, 75, 76,
- 77, -1, -1, -1, -1, 49, -1, -1, -1, -1,
- -1, -1, -1, -1, 91, 92, 93, 94, 95, 96,
- 97, 65, 66, 67, 68, 69, 70, -1, 72, -1,
- -1, 75, 76, 77, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 55, -1, -1, 91, 92, 93,
- 94, 95, 96, 97, 65, 66, 67, 68, 69, 70,
- -1, 72, -1, -1, 75, 76, 77, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 91, 92, 93, 94, 95, 96, 97, 57, 99, -1,
- -1, -1, -1, -1, -1, 65, 66, 67, 68, 69,
- 70, -1, 72, -1, -1, 75, 76, 77, 65, 66,
- 67, 68, 69, 70, -1, 72, -1, -1, 75, 76,
- 77, 91, 92, 93, 94, 95, 96, 97, -1, -1,
- -1, -1, -1, -1, 91, 92, 93, 94, 95, 96,
- 97, -1, -1, -1, 101, 65, 66, 67, 68, 69,
- 70, -1, 72, -1, -1, 75, 76, 77, -1, -1,
- -1, -1, -1, 83, 84, -1, -1, -1, -1, -1,
- -1, 91, 92, 93, 94, 95, 96, 97, 65, 66,
- 67, 68, 69, 70, -1, 72, -1, -1, 75, 76,
- 77, 65, 66, 67, 68, -1, -1, -1, 72, -1,
- -1, 75, 76, 77, 91, 92, 93, 94, 95, 96,
- 97, -1, -1, -1, -1, -1, -1, 91, 92, 93,
- 94, 95, 96, 97
+ -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, -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, -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, -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,
+ -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, 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, 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, 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, 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, -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, 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, 57, 58, 59, 60, -1,
+ -1, -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
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 1, 12, 15, 16, 17, 19, 20, 21, 22,
- 24, 25, 26, 28, 29, 30, 32, 34, 35, 36,
- 40, 41, 42, 43, 46, 51, 52, 53, 56, 60,
- 61, 62, 64, 71, 78, 79, 80, 81, 82, 85,
- 86, 87, 94, 95, 100, 103, 107, 108, 109, 110,
- 112, 113, 117, 118, 119, 124, 125, 126, 127, 128,
- 129, 133, 135, 137, 140, 144, 147, 99, 29, 51,
- 127, 127, 127, 127, 145, 127, 145, 29, 126, 100,
- 127, 146, 136, 139, 52, 29, 130, 45, 47, 48,
- 49, 50, 127, 134, 29, 127, 57, 58, 15, 16,
- 29, 36, 29, 29, 127, 63, 127, 134, 29, 132,
- 127, 127, 127, 127, 127, 127, 29, 131, 29, 127,
- 127, 127, 30, 32, 105, 126, 148, 149, 150, 151,
- 0, 99, 127, 67, 127, 111, 116, 119, 127, 129,
- 144, 127, 65, 66, 67, 68, 69, 70, 72, 75,
- 76, 77, 91, 92, 93, 94, 95, 96, 97, 121,
- 100, 127, 102, 127, 145, 102, 145, 121, 102, 127,
- 47, 134, 138, 44, 73, 74, 29, 55, 67, 126,
- 55, 67, 55, 54, 57, 134, 102, 49, 55, 49,
- 55, 49, 55, 49, 55, 83, 84, 102, 101, 105,
- 105, 104, 102, 102, 108, 122, 127, 122, 122, 127,
- 55, 99, 127, 127, 127, 127, 127, 127, 127, 127,
- 127, 127, 127, 127, 127, 127, 127, 127, 127, 29,
- 141, 127, 101, 127, 141, 29, 127, 121, 29, 128,
- 127, 127, 127, 127, 55, 67, 127, 127, 127, 127,
- 29, 127, 127, 127, 127, 127, 127, 127, 127, 127,
- 127, 29, 126, 126, 126, 30, 32, 151, 123, 122,
- 54, 122, 127, 123, 99, 102, 99, 141, 127, 127,
- 49, 49, 49, 49, 99, 112, 122, 37, 55, 123,
- 54, 122, 102, 143, 29, 143, 99, 127, 127, 127,
- 127, 89, 55, 127, 122, 110, 90, 29, 123, 123,
- 143, 127, 122, 114, 122, 33, 123, 122, 123, 38,
- 39, 115, 120, 122, 38, 88, 29, 142, 123, 122,
- 121, 127, 88, 121, 102, 122, 89, 123, 122, 110,
- 29, 89, 122, 54, 122, 88, 123, 88, 122
+ 0, 1, 12, 15, 16, 17, 18, 19, 20, 21,
+ 22, 24, 26, 27, 28, 32, 33, 34, 35, 38,
+ 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, 105, 109, 110, 111,
+ 116, 117, 118, 119, 120, 121, 125, 127, 129, 132,
+ 136, 139, 91, 21, 43, 119, 119, 137, 137, 21,
+ 118, 92, 119, 138, 128, 131, 44, 21, 122, 37,
+ 39, 40, 41, 42, 119, 126, 21, 119, 49, 50,
+ 15, 16, 21, 28, 21, 21, 119, 55, 119, 126,
+ 21, 124, 119, 119, 119, 119, 119, 119, 21, 123,
+ 21, 119, 119, 119, 22, 24, 97, 118, 140, 141,
+ 142, 143, 0, 91, 119, 59, 119, 103, 108, 111,
+ 119, 121, 136, 119, 57, 58, 59, 60, 61, 62,
+ 64, 67, 68, 69, 83, 84, 85, 86, 87, 88,
+ 89, 113, 92, 119, 94, 119, 137, 94, 137, 113,
+ 94, 119, 39, 126, 130, 36, 65, 66, 21, 47,
+ 59, 118, 47, 59, 47, 46, 49, 126, 94, 41,
+ 47, 41, 47, 41, 47, 41, 47, 75, 76, 94,
+ 93, 97, 97, 96, 94, 94, 100, 114, 119, 114,
+ 114, 119, 47, 91, 119, 119, 119, 119, 119, 119,
+ 119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
+ 119, 21, 133, 119, 93, 119, 133, 21, 119, 113,
+ 21, 120, 119, 119, 119, 119, 47, 59, 119, 119,
+ 119, 119, 21, 119, 119, 119, 119, 119, 119, 119,
+ 119, 119, 119, 21, 118, 118, 118, 22, 24, 143,
+ 115, 114, 46, 114, 119, 115, 91, 94, 91, 133,
+ 119, 119, 41, 41, 41, 41, 91, 104, 114, 29,
+ 47, 115, 46, 114, 94, 135, 21, 135, 91, 119,
+ 119, 119, 119, 81, 47, 119, 114, 102, 82, 21,
+ 115, 115, 135, 119, 114, 106, 114, 25, 115, 114,
+ 115, 30, 31, 107, 112, 114, 30, 80, 21, 134,
+ 115, 114, 113, 119, 80, 113, 94, 114, 81, 115,
+ 114, 102, 21, 81, 114, 46, 114, 80, 115, 80,
+ 114
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 106, 107, 107, 107, 108, 108, 108, 109, 109,
- 109, 109, 109, 109, 109, 109, 109, 109, 109, 110,
- 110, 110, 111, 111, 111, 111, 112, 112, 112, 112,
- 112, 112, 112, 112, 113, 113, 114, 114, 115, 116,
- 116, 117, 118, 119, 120, 121, 122, 123, 123, 123,
- 124, 125, 126, 126, 126, 126, 126, 126, 127, 127,
- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
- 127, 127, 127, 127, 127, 127, 127, 127, 127, 127,
- 127, 127, 127, 127, 127, 127, 127, 127, 127, 128,
- 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
- 129, 129, 129, 129, 129, 130, 130, 131, 131, 132,
- 132, 133, 133, 133, 133, 133, 133, 134, 134, 135,
- 135, 135, 135, 136, 135, 138, 137, 137, 139, 137,
- 137, 137, 140, 141, 141, 141, 141, 142, 142, 142,
- 143, 144, 145, 145, 145, 146, 146, 147, 148, 148,
- 148, 148, 149, 149, 150, 150, 151, 151
+ 0, 98, 99, 99, 99, 100, 100, 100, 101, 101,
+ 101, 101, 101, 101, 101, 101, 101, 101, 101, 102,
+ 102, 102, 103, 103, 103, 103, 104, 104, 104, 104,
+ 104, 104, 104, 104, 105, 105, 106, 106, 107, 108,
+ 108, 109, 110, 111, 112, 113, 114, 115, 115, 115,
+ 116, 117, 118, 118, 118, 118, 118, 118, 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, 119, 119, 119, 119,
+ 119, 119, 119, 119, 119, 119, 119, 120, 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,
+ 129, 129, 131, 129, 129, 129, 132, 133, 133, 133,
+ 133, 134, 134, 134, 135, 136, 137, 137, 137, 138,
+ 138, 139, 140, 140, 140, 140, 141, 141, 142, 142,
+ 143, 143
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -1209,17 +1195,17 @@ static const yytype_int8 yyr2[] =
11, 3, 6, 4, 9, 12, 0, 2, 6, 11,
7, 2, 3, 1, 1, 0, 0, 0, 2, 2,
3, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 2, 4, 1, 2, 1, 1, 3, 3,
- 3, 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, 1, 2,
- 2, 1, 2, 4, 2, 1, 3, 1, 3, 1,
- 3, 2, 2, 2, 2, 3, 2, 3, 2, 2,
- 2, 3, 2, 0, 3, 0, 8, 2, 0, 7,
- 8, 6, 2, 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
+ 2, 4, 1, 2, 1, 1, 3, 3, 3, 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, 2, 4, 2, 1,
+ 3, 1, 3, 1, 3, 2, 2, 2, 2, 3,
+ 2, 3, 2, 2, 2, 3, 2, 0, 3, 0,
+ 8, 2, 0, 7, 8, 6, 2, 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
};
@@ -1655,123 +1641,75 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
switch (yytype)
{
case 18: /* BLTIN */
-#line 131 "engines/director/lingo/lingo-gr.y"
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1661 "engines/director/lingo/lingo-gr.cpp"
+#line 1647 "engines/director/lingo/lingo-gr.cpp"
break;
- case 19: /* BLTINNOARGS */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 19: /* FBLTIN */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1667 "engines/director/lingo/lingo-gr.cpp"
+#line 1653 "engines/director/lingo/lingo-gr.cpp"
break;
- case 20: /* BLTINNOARGSORONE */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 20: /* RBLTIN */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1673 "engines/director/lingo/lingo-gr.cpp"
+#line 1659 "engines/director/lingo/lingo-gr.cpp"
break;
- case 21: /* BLTINONEARG */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 21: /* ID */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1679 "engines/director/lingo/lingo-gr.cpp"
+#line 1665 "engines/director/lingo/lingo-gr.cpp"
break;
- case 22: /* BLTINARGLIST */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 22: /* STRING */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1685 "engines/director/lingo/lingo-gr.cpp"
+#line 1671 "engines/director/lingo/lingo-gr.cpp"
break;
- case 23: /* FBLTIN */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 23: /* HANDLER */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1691 "engines/director/lingo/lingo-gr.cpp"
+#line 1677 "engines/director/lingo/lingo-gr.cpp"
break;
- case 24: /* FBLTINNOARGS */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 24: /* SYMBOL */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1697 "engines/director/lingo/lingo-gr.cpp"
+#line 1683 "engines/director/lingo/lingo-gr.cpp"
break;
- case 25: /* FBLTINONEARG */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 25: /* ENDCLAUSE */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1703 "engines/director/lingo/lingo-gr.cpp"
+#line 1689 "engines/director/lingo/lingo-gr.cpp"
break;
- case 26: /* FBLTINARGLIST */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 26: /* tPLAYACCEL */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1709 "engines/director/lingo/lingo-gr.cpp"
+#line 1695 "engines/director/lingo/lingo-gr.cpp"
break;
- case 27: /* RBLTIN */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1715 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 28: /* RBLTINONEARG */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1721 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 29: /* ID */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1727 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 30: /* STRING */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1733 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 31: /* HANDLER */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1739 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 32: /* SYMBOL */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1745 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 33: /* ENDCLAUSE */
-#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1751 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 34: /* tPLAYACCEL */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 27: /* tMETHOD */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1757 "engines/director/lingo/lingo-gr.cpp"
+#line 1701 "engines/director/lingo/lingo-gr.cpp"
break;
- case 35: /* tMETHOD */
+ case 28: /* THEOBJECTFIELD */
#line 131 "engines/director/lingo/lingo-gr.y"
- { delete ((*yyvaluep).s); }
-#line 1763 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 36: /* THEOBJECTFIELD */
-#line 132 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).objectfield).s; }
-#line 1769 "engines/director/lingo/lingo-gr.cpp"
+#line 1707 "engines/director/lingo/lingo-gr.cpp"
break;
- case 140: /* on */
-#line 131 "engines/director/lingo/lingo-gr.y"
+ case 132: /* on */
+#line 130 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1775 "engines/director/lingo/lingo-gr.cpp"
+#line 1713 "engines/director/lingo/lingo-gr.cpp"
break;
default:
@@ -2039,55 +1977,55 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 138 "engines/director/lingo/lingo-gr.y"
+#line 137 "engines/director/lingo/lingo-gr.y"
{ yyerrok; }
-#line 2045 "engines/director/lingo/lingo-gr.cpp"
+#line 1983 "engines/director/lingo/lingo-gr.cpp"
break;
case 8:
-#line 146 "engines/director/lingo/lingo-gr.y"
+#line 145 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code);
delete (yyvsp[0].s); }
-#line 2056 "engines/director/lingo/lingo-gr.cpp"
+#line 1994 "engines/director/lingo/lingo-gr.cpp"
break;
case 9:
-#line 152 "engines/director/lingo/lingo-gr.y"
+#line 151 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code); }
-#line 2064 "engines/director/lingo/lingo-gr.cpp"
+#line 2002 "engines/director/lingo/lingo-gr.cpp"
break;
case 10:
-#line 155 "engines/director/lingo/lingo-gr.y"
+#line 154 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_after); }
-#line 2070 "engines/director/lingo/lingo-gr.cpp"
+#line 2008 "engines/director/lingo/lingo-gr.cpp"
break;
case 11:
-#line 156 "engines/director/lingo/lingo-gr.y"
+#line 155 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_before); }
-#line 2076 "engines/director/lingo/lingo-gr.cpp"
+#line 2014 "engines/director/lingo/lingo-gr.cpp"
break;
case 12:
-#line 157 "engines/director/lingo/lingo-gr.y"
+#line 156 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2087 "engines/director/lingo/lingo-gr.cpp"
+#line 2025 "engines/director/lingo/lingo-gr.cpp"
break;
case 13:
-#line 163 "engines/director/lingo/lingo-gr.y"
+#line 162 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2095,22 +2033,22 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2099 "engines/director/lingo/lingo-gr.cpp"
+#line 2037 "engines/director/lingo/lingo-gr.cpp"
break;
case 14:
-#line 170 "engines/director/lingo/lingo-gr.y"
+#line 169 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_varpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2110 "engines/director/lingo/lingo-gr.cpp"
+#line 2048 "engines/director/lingo/lingo-gr.cpp"
break;
case 15:
-#line 176 "engines/director/lingo/lingo-gr.y"
+#line 175 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2118,55 +2056,55 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2122 "engines/director/lingo/lingo-gr.cpp"
+#line 2060 "engines/director/lingo/lingo-gr.cpp"
break;
case 16:
-#line 183 "engines/director/lingo/lingo-gr.y"
+#line 182 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2133 "engines/director/lingo/lingo-gr.cpp"
+#line 2071 "engines/director/lingo/lingo-gr.cpp"
break;
case 17:
-#line 189 "engines/director/lingo/lingo-gr.y"
+#line 188 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_swap);
g_lingo->code1(LC::c_theentityassign);
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2144 "engines/director/lingo/lingo-gr.cpp"
+#line 2082 "engines/director/lingo/lingo-gr.cpp"
break;
case 18:
-#line 195 "engines/director/lingo/lingo-gr.y"
+#line 194 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldassign);
g_lingo->codeString((yyvsp[-2].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[-2].objectfield).e);
delete (yyvsp[-2].objectfield).s;
(yyval.code) = (yyvsp[0].code); }
-#line 2155 "engines/director/lingo/lingo-gr.cpp"
+#line 2093 "engines/director/lingo/lingo-gr.cpp"
break;
case 28:
-#line 220 "engines/director/lingo/lingo-gr.y"
+#line 219 "engines/director/lingo/lingo-gr.y"
{
inst body = 0, end = 0;
WRITE_UINT32(&body, (yyvsp[-3].code) - (yyvsp[-5].code));
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 2] = end; }
-#line 2166 "engines/director/lingo/lingo-gr.cpp"
+#line 2104 "engines/director/lingo/lingo-gr.cpp"
break;
case 29:
-#line 231 "engines/director/lingo/lingo-gr.y"
+#line 230 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-7].code) - (yyvsp[-9].code));
@@ -2179,11 +2117,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-9].code) + 5] = end; }
-#line 2183 "engines/director/lingo/lingo-gr.cpp"
+#line 2121 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
-#line 248 "engines/director/lingo/lingo-gr.y"
+#line 247 "engines/director/lingo/lingo-gr.y"
{
inst init = 0, finish = 0, body = 0, end = 0, inc = 0;
WRITE_UINT32(&init, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2196,36 +2134,36 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 5] = end; }
-#line 2200 "engines/director/lingo/lingo-gr.cpp"
+#line 2138 "engines/director/lingo/lingo-gr.cpp"
break;
case 31:
-#line 260 "engines/director/lingo/lingo-gr.y"
+#line 259 "engines/director/lingo/lingo-gr.y"
{
inst end = 0;
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
g_lingo->code1(STOP);
(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
-#line 2210 "engines/director/lingo/lingo-gr.cpp"
+#line 2148 "engines/director/lingo/lingo-gr.cpp"
break;
case 32:
-#line 265 "engines/director/lingo/lingo-gr.y"
+#line 264 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented"); }
-#line 2217 "engines/director/lingo/lingo-gr.cpp"
+#line 2155 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
-#line 267 "engines/director/lingo/lingo-gr.y"
+#line 266 "engines/director/lingo/lingo-gr.y"
{
warning("STUB: TELL is not implemented");
}
-#line 2225 "engines/director/lingo/lingo-gr.cpp"
+#line 2163 "engines/director/lingo/lingo-gr.cpp"
break;
case 34:
-#line 272 "engines/director/lingo/lingo-gr.y"
+#line 271 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-6].code) - (yyvsp[-8].code));
@@ -2236,11 +2174,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-8].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-8].code), (yyvsp[-1].code) - (yyvsp[-8].code), 0); }
-#line 2240 "engines/director/lingo/lingo-gr.cpp"
+#line 2178 "engines/director/lingo/lingo-gr.cpp"
break;
case 35:
-#line 282 "engines/director/lingo/lingo-gr.y"
+#line 281 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-9].code) - (yyvsp[-11].code));
@@ -2251,22 +2189,22 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-11].code), (yyvsp[-1].code) - (yyvsp[-11].code), (yyvsp[-3].code) - (yyvsp[-11].code)); }
-#line 2255 "engines/director/lingo/lingo-gr.cpp"
+#line 2193 "engines/director/lingo/lingo-gr.cpp"
break;
case 38:
-#line 298 "engines/director/lingo/lingo-gr.y"
+#line 297 "engines/director/lingo/lingo-gr.y"
{
inst then = 0;
WRITE_UINT32(&then, (yyvsp[-3].code) - (yyvsp[-5].code));
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
g_lingo->codeLabel((yyvsp[-5].code)); }
-#line 2266 "engines/director/lingo/lingo-gr.cpp"
+#line 2204 "engines/director/lingo/lingo-gr.cpp"
break;
case 39:
-#line 306 "engines/director/lingo/lingo-gr.y"
+#line 305 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-8].code) - (yyvsp[-10].code));
@@ -2277,11 +2215,11 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-10].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-10].code), (yyvsp[-1].code) - (yyvsp[-10].code), (yyvsp[-3].code) - (yyvsp[-10].code)); }
-#line 2281 "engines/director/lingo/lingo-gr.cpp"
+#line 2219 "engines/director/lingo/lingo-gr.cpp"
break;
case 40:
-#line 316 "engines/director/lingo/lingo-gr.y"
+#line 315 "engines/director/lingo/lingo-gr.y"
{
inst then = 0, else1 = 0, end = 0;
WRITE_UINT32(&then, (yyvsp[-4].code) - (yyvsp[-6].code));
@@ -2292,164 +2230,149 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-6].code) + 3] = end; /* end, if cond fails */
g_lingo->processIf((yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code), (yyvsp[-1].code) - (yyvsp[-6].code)); }
-#line 2296 "engines/director/lingo/lingo-gr.cpp"
+#line 2234 "engines/director/lingo/lingo-gr.cpp"
break;
case 41:
-#line 329 "engines/director/lingo/lingo-gr.y"
+#line 328 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
-#line 2302 "engines/director/lingo/lingo-gr.cpp"
+#line 2240 "engines/director/lingo/lingo-gr.cpp"
break;
case 42:
-#line 332 "engines/director/lingo/lingo-gr.y"
+#line 331 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code3(LC::c_repeatwithcode, STOP, STOP);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2312 "engines/director/lingo/lingo-gr.cpp"
+#line 2250 "engines/director/lingo/lingo-gr.cpp"
break;
case 43:
-#line 339 "engines/director/lingo/lingo-gr.y"
+#line 338 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(0); // Do not skip end
g_lingo->codeLabel(0); }
-#line 2322 "engines/director/lingo/lingo-gr.cpp"
+#line 2260 "engines/director/lingo/lingo-gr.cpp"
break;
case 44:
-#line 346 "engines/director/lingo/lingo-gr.y"
+#line 345 "engines/director/lingo/lingo-gr.y"
{
inst skipEnd;
WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(skipEnd); }
-#line 2333 "engines/director/lingo/lingo-gr.cpp"
+#line 2271 "engines/director/lingo/lingo-gr.cpp"
break;
case 45:
-#line 354 "engines/director/lingo/lingo-gr.y"
+#line 353 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2339 "engines/director/lingo/lingo-gr.cpp"
+#line 2277 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
-#line 357 "engines/director/lingo/lingo-gr.y"
+#line 356 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2345 "engines/director/lingo/lingo-gr.cpp"
+#line 2283 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
-#line 360 "engines/director/lingo/lingo-gr.y"
+#line 359 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2351 "engines/director/lingo/lingo-gr.cpp"
+#line 2289 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
-#line 365 "engines/director/lingo/lingo-gr.y"
+#line 364 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_whencode);
g_lingo->code1(STOP);
g_lingo->codeString((yyvsp[-1].s)->c_str());
delete (yyvsp[-1].s); }
-#line 2361 "engines/director/lingo/lingo-gr.cpp"
+#line 2299 "engines/director/lingo/lingo-gr.cpp"
break;
case 51:
-#line 371 "engines/director/lingo/lingo-gr.y"
+#line 370 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_tellcode);
g_lingo->code1(STOP); }
-#line 2369 "engines/director/lingo/lingo-gr.cpp"
+#line 2307 "engines/director/lingo/lingo-gr.cpp"
break;
case 52:
-#line 375 "engines/director/lingo/lingo-gr.y"
+#line 374 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt((yyvsp[0].i)); }
-#line 2377 "engines/director/lingo/lingo-gr.cpp"
+#line 2315 "engines/director/lingo/lingo-gr.cpp"
break;
case 53:
-#line 378 "engines/director/lingo/lingo-gr.y"
+#line 377 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_floatpush);
g_lingo->codeFloat((yyvsp[0].f)); }
-#line 2385 "engines/director/lingo/lingo-gr.cpp"
+#line 2323 "engines/director/lingo/lingo-gr.cpp"
break;
case 54:
-#line 381 "engines/director/lingo/lingo-gr.y"
+#line 380 "engines/director/lingo/lingo-gr.y"
{ // D3
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2394 "engines/director/lingo/lingo-gr.cpp"
+#line 2332 "engines/director/lingo/lingo-gr.cpp"
break;
case 55:
-#line 385 "engines/director/lingo/lingo-gr.y"
+#line 384 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2403 "engines/director/lingo/lingo-gr.cpp"
+#line 2341 "engines/director/lingo/lingo-gr.cpp"
break;
case 56:
-#line 389 "engines/director/lingo/lingo-gr.y"
+#line 388 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_eval);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2412 "engines/director/lingo/lingo-gr.cpp"
+#line 2350 "engines/director/lingo/lingo-gr.cpp"
break;
case 58:
-#line 396 "engines/director/lingo/lingo-gr.y"
+#line 395 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2418 "engines/director/lingo/lingo-gr.cpp"
+#line 2356 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
-#line 398 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[0].s), 0);
- delete (yyvsp[0].s); }
-#line 2426 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 61:
-#line 401 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[-1].s), 1);
- delete (yyvsp[-1].s); }
-#line 2434 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 62:
-#line 404 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
+#line 397 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
-#line 2441 "engines/director/lingo/lingo-gr.cpp"
+#line 2364 "engines/director/lingo/lingo-gr.cpp"
break;
- case 63:
-#line 406 "engines/director/lingo/lingo-gr.y"
+ case 61:
+#line 400 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2449 "engines/director/lingo/lingo-gr.cpp"
+#line 2372 "engines/director/lingo/lingo-gr.cpp"
break;
- case 64:
-#line 409 "engines/director/lingo/lingo-gr.y"
+ case 62:
+#line 403 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(0); // Put dummy id
@@ -2458,465 +2381,433 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[0].e)[0]);
WRITE_UINT32(&f, (yyvsp[0].e)[1]);
g_lingo->code2(e, f); }
-#line 2462 "engines/director/lingo/lingo-gr.cpp"
+#line 2385 "engines/director/lingo/lingo-gr.cpp"
break;
- case 65:
-#line 417 "engines/director/lingo/lingo-gr.y"
+ case 63:
+#line 411 "engines/director/lingo/lingo-gr.y"
{
(yyval.code) = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
g_lingo->code2(e, f); }
-#line 2473 "engines/director/lingo/lingo-gr.cpp"
+#line 2396 "engines/director/lingo/lingo-gr.cpp"
break;
- case 66:
-#line 423 "engines/director/lingo/lingo-gr.y"
+ case 64:
+#line 417 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_objectfieldpush);
g_lingo->codeString((yyvsp[0].objectfield).s->c_str());
g_lingo->codeInt((yyvsp[0].objectfield).e);
delete (yyvsp[0].objectfield).s; }
-#line 2483 "engines/director/lingo/lingo-gr.cpp"
+#line 2406 "engines/director/lingo/lingo-gr.cpp"
break;
- case 68:
-#line 429 "engines/director/lingo/lingo-gr.y"
+ case 66:
+#line 423 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_add); }
-#line 2489 "engines/director/lingo/lingo-gr.cpp"
+#line 2412 "engines/director/lingo/lingo-gr.cpp"
break;
- case 69:
-#line 430 "engines/director/lingo/lingo-gr.y"
+ case 67:
+#line 424 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_sub); }
-#line 2495 "engines/director/lingo/lingo-gr.cpp"
+#line 2418 "engines/director/lingo/lingo-gr.cpp"
break;
- case 70:
-#line 431 "engines/director/lingo/lingo-gr.y"
+ case 68:
+#line 425 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mul); }
-#line 2501 "engines/director/lingo/lingo-gr.cpp"
+#line 2424 "engines/director/lingo/lingo-gr.cpp"
break;
- case 71:
-#line 432 "engines/director/lingo/lingo-gr.y"
+ case 69:
+#line 426 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_div); }
-#line 2507 "engines/director/lingo/lingo-gr.cpp"
+#line 2430 "engines/director/lingo/lingo-gr.cpp"
break;
- case 72:
-#line 433 "engines/director/lingo/lingo-gr.y"
+ case 70:
+#line 427 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mod); }
-#line 2513 "engines/director/lingo/lingo-gr.cpp"
+#line 2436 "engines/director/lingo/lingo-gr.cpp"
break;
- case 73:
-#line 434 "engines/director/lingo/lingo-gr.y"
+ case 71:
+#line 428 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gt); }
-#line 2519 "engines/director/lingo/lingo-gr.cpp"
+#line 2442 "engines/director/lingo/lingo-gr.cpp"
break;
- case 74:
-#line 435 "engines/director/lingo/lingo-gr.y"
+ case 72:
+#line 429 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lt); }
-#line 2525 "engines/director/lingo/lingo-gr.cpp"
+#line 2448 "engines/director/lingo/lingo-gr.cpp"
break;
- case 75:
-#line 436 "engines/director/lingo/lingo-gr.y"
+ case 73:
+#line 430 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_eq); }
-#line 2531 "engines/director/lingo/lingo-gr.cpp"
+#line 2454 "engines/director/lingo/lingo-gr.cpp"
break;
- case 76:
-#line 437 "engines/director/lingo/lingo-gr.y"
+ case 74:
+#line 431 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_neq); }
-#line 2537 "engines/director/lingo/lingo-gr.cpp"
+#line 2460 "engines/director/lingo/lingo-gr.cpp"
break;
- case 77:
-#line 438 "engines/director/lingo/lingo-gr.y"
+ case 75:
+#line 432 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ge); }
-#line 2543 "engines/director/lingo/lingo-gr.cpp"
+#line 2466 "engines/director/lingo/lingo-gr.cpp"
break;
- case 78:
-#line 439 "engines/director/lingo/lingo-gr.y"
+ case 76:
+#line 433 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_le); }
-#line 2549 "engines/director/lingo/lingo-gr.cpp"
+#line 2472 "engines/director/lingo/lingo-gr.cpp"
break;
- case 79:
-#line 440 "engines/director/lingo/lingo-gr.y"
+ case 77:
+#line 434 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_and); }
-#line 2555 "engines/director/lingo/lingo-gr.cpp"
+#line 2478 "engines/director/lingo/lingo-gr.cpp"
break;
- case 80:
-#line 441 "engines/director/lingo/lingo-gr.y"
+ case 78:
+#line 435 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_or); }
-#line 2561 "engines/director/lingo/lingo-gr.cpp"
+#line 2484 "engines/director/lingo/lingo-gr.cpp"
break;
- case 81:
-#line 442 "engines/director/lingo/lingo-gr.y"
+ case 79:
+#line 436 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_not); }
-#line 2567 "engines/director/lingo/lingo-gr.cpp"
+#line 2490 "engines/director/lingo/lingo-gr.cpp"
break;
- case 82:
-#line 443 "engines/director/lingo/lingo-gr.y"
+ case 80:
+#line 437 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ampersand); }
-#line 2573 "engines/director/lingo/lingo-gr.cpp"
+#line 2496 "engines/director/lingo/lingo-gr.cpp"
break;
- case 83:
-#line 444 "engines/director/lingo/lingo-gr.y"
+ case 81:
+#line 438 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_concat); }
-#line 2579 "engines/director/lingo/lingo-gr.cpp"
+#line 2502 "engines/director/lingo/lingo-gr.cpp"
break;
- case 84:
-#line 445 "engines/director/lingo/lingo-gr.y"
+ case 82:
+#line 439 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_contains); }
-#line 2585 "engines/director/lingo/lingo-gr.cpp"
+#line 2508 "engines/director/lingo/lingo-gr.cpp"
break;
- case 85:
-#line 446 "engines/director/lingo/lingo-gr.y"
+ case 83:
+#line 440 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_starts); }
-#line 2591 "engines/director/lingo/lingo-gr.cpp"
+#line 2514 "engines/director/lingo/lingo-gr.cpp"
break;
- case 86:
-#line 447 "engines/director/lingo/lingo-gr.y"
+ case 84:
+#line 441 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2597 "engines/director/lingo/lingo-gr.cpp"
+#line 2520 "engines/director/lingo/lingo-gr.cpp"
break;
- case 87:
-#line 448 "engines/director/lingo/lingo-gr.y"
+ case 85:
+#line 442 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
-#line 2603 "engines/director/lingo/lingo-gr.cpp"
+#line 2526 "engines/director/lingo/lingo-gr.cpp"
break;
- case 88:
-#line 449 "engines/director/lingo/lingo-gr.y"
+ case 86:
+#line 443 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2609 "engines/director/lingo/lingo-gr.cpp"
+#line 2532 "engines/director/lingo/lingo-gr.cpp"
break;
- case 89:
-#line 450 "engines/director/lingo/lingo-gr.y"
+ case 87:
+#line 444 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_intersects); }
-#line 2615 "engines/director/lingo/lingo-gr.cpp"
+#line 2538 "engines/director/lingo/lingo-gr.cpp"
break;
- case 90:
-#line 451 "engines/director/lingo/lingo-gr.y"
+ case 88:
+#line 445 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_within); }
-#line 2621 "engines/director/lingo/lingo-gr.cpp"
+#line 2544 "engines/director/lingo/lingo-gr.cpp"
break;
- case 91:
-#line 452 "engines/director/lingo/lingo-gr.y"
+ case 89:
+#line 446 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charOf); }
-#line 2627 "engines/director/lingo/lingo-gr.cpp"
+#line 2550 "engines/director/lingo/lingo-gr.cpp"
break;
- case 92:
-#line 453 "engines/director/lingo/lingo-gr.y"
+ case 90:
+#line 447 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charToOf); }
-#line 2633 "engines/director/lingo/lingo-gr.cpp"
+#line 2556 "engines/director/lingo/lingo-gr.cpp"
break;
- case 93:
-#line 454 "engines/director/lingo/lingo-gr.y"
+ case 91:
+#line 448 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemOf); }
-#line 2639 "engines/director/lingo/lingo-gr.cpp"
+#line 2562 "engines/director/lingo/lingo-gr.cpp"
break;
- case 94:
-#line 455 "engines/director/lingo/lingo-gr.y"
+ case 92:
+#line 449 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemToOf); }
-#line 2645 "engines/director/lingo/lingo-gr.cpp"
+#line 2568 "engines/director/lingo/lingo-gr.cpp"
break;
- case 95:
-#line 456 "engines/director/lingo/lingo-gr.y"
+ case 93:
+#line 450 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineOf); }
-#line 2651 "engines/director/lingo/lingo-gr.cpp"
+#line 2574 "engines/director/lingo/lingo-gr.cpp"
break;
- case 96:
-#line 457 "engines/director/lingo/lingo-gr.y"
+ case 94:
+#line 451 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineToOf); }
-#line 2657 "engines/director/lingo/lingo-gr.cpp"
+#line 2580 "engines/director/lingo/lingo-gr.cpp"
break;
- case 97:
-#line 458 "engines/director/lingo/lingo-gr.y"
+ case 95:
+#line 452 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordOf); }
-#line 2663 "engines/director/lingo/lingo-gr.cpp"
+#line 2586 "engines/director/lingo/lingo-gr.cpp"
break;
- case 98:
-#line 459 "engines/director/lingo/lingo-gr.y"
+ case 96:
+#line 453 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordToOf); }
-#line 2669 "engines/director/lingo/lingo-gr.cpp"
+#line 2592 "engines/director/lingo/lingo-gr.cpp"
break;
- case 99:
-#line 462 "engines/director/lingo/lingo-gr.y"
+ case 97:
+#line 456 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2677 "engines/director/lingo/lingo-gr.cpp"
+#line 2600 "engines/director/lingo/lingo-gr.cpp"
break;
- case 100:
-#line 467 "engines/director/lingo/lingo-gr.y"
+ case 98:
+#line 461 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); }
-#line 2683 "engines/director/lingo/lingo-gr.cpp"
+#line 2606 "engines/director/lingo/lingo-gr.cpp"
break;
- case 103:
-#line 470 "engines/director/lingo/lingo-gr.y"
+ case 101:
+#line 464 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); }
-#line 2689 "engines/director/lingo/lingo-gr.cpp"
+#line 2612 "engines/director/lingo/lingo-gr.cpp"
break;
- case 104:
-#line 471 "engines/director/lingo/lingo-gr.y"
+ case 102:
+#line 465 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); }
-#line 2695 "engines/director/lingo/lingo-gr.cpp"
+#line 2618 "engines/director/lingo/lingo-gr.cpp"
break;
- case 108:
-#line 475 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[0].s), 0);
- delete (yyvsp[0].s); }
-#line 2703 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 109:
-#line 478 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[-1].s), 1);
- delete (yyvsp[-1].s); }
-#line 2711 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 110:
-#line 481 "engines/director/lingo/lingo-gr.y"
- {
- g_lingo->codeFunc((yyvsp[-1].s), 1);
- delete (yyvsp[-1].s); }
-#line 2719 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 111:
-#line 484 "engines/director/lingo/lingo-gr.y"
+ case 106:
+#line 469 "engines/director/lingo/lingo-gr.y"
{
- g_lingo->code1(LC::c_voidpush);
- g_lingo->codeFunc((yyvsp[0].s), 1);
- delete (yyvsp[0].s); }
-#line 2728 "engines/director/lingo/lingo-gr.cpp"
- break;
-
- case 112:
-#line 488 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
+ g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
-#line 2735 "engines/director/lingo/lingo-gr.cpp"
+#line 2626 "engines/director/lingo/lingo-gr.cpp"
break;
- case 113:
-#line 490 "engines/director/lingo/lingo-gr.y"
+ case 107:
+#line 472 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); }
-#line 2741 "engines/director/lingo/lingo-gr.cpp"
+#line 2632 "engines/director/lingo/lingo-gr.cpp"
break;
- case 114:
-#line 491 "engines/director/lingo/lingo-gr.y"
+ case 108:
+#line 473 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); }
-#line 2747 "engines/director/lingo/lingo-gr.cpp"
+#line 2638 "engines/director/lingo/lingo-gr.cpp"
break;
- case 115:
-#line 494 "engines/director/lingo/lingo-gr.y"
+ case 109:
+#line 476 "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 2753 "engines/director/lingo/lingo-gr.cpp"
+#line 2644 "engines/director/lingo/lingo-gr.cpp"
break;
- case 116:
-#line 495 "engines/director/lingo/lingo-gr.y"
+ case 110:
+#line 477 "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 2759 "engines/director/lingo/lingo-gr.cpp"
+#line 2650 "engines/director/lingo/lingo-gr.cpp"
break;
- case 117:
-#line 498 "engines/director/lingo/lingo-gr.y"
+ case 111:
+#line 480 "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 2765 "engines/director/lingo/lingo-gr.cpp"
+#line 2656 "engines/director/lingo/lingo-gr.cpp"
break;
- case 118:
-#line 499 "engines/director/lingo/lingo-gr.y"
+ case 112:
+#line 481 "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 2771 "engines/director/lingo/lingo-gr.cpp"
+#line 2662 "engines/director/lingo/lingo-gr.cpp"
break;
- case 119:
-#line 502 "engines/director/lingo/lingo-gr.y"
+ case 113:
+#line 484 "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 2777 "engines/director/lingo/lingo-gr.cpp"
+#line 2668 "engines/director/lingo/lingo-gr.cpp"
break;
- case 120:
-#line 503 "engines/director/lingo/lingo-gr.y"
+ case 114:
+#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 2783 "engines/director/lingo/lingo-gr.cpp"
+#line 2674 "engines/director/lingo/lingo-gr.cpp"
break;
- case 121:
-#line 514 "engines/director/lingo/lingo-gr.y"
+ case 115:
+#line 496 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
-#line 2789 "engines/director/lingo/lingo-gr.cpp"
+#line 2680 "engines/director/lingo/lingo-gr.cpp"
break;
- case 122:
-#line 515 "engines/director/lingo/lingo-gr.y"
+ case 116:
+#line 497 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
-#line 2795 "engines/director/lingo/lingo-gr.cpp"
+#line 2686 "engines/director/lingo/lingo-gr.cpp"
break;
- case 123:
-#line 516 "engines/director/lingo/lingo-gr.y"
+ case 117:
+#line 498 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
-#line 2801 "engines/director/lingo/lingo-gr.cpp"
+#line 2692 "engines/director/lingo/lingo-gr.cpp"
break;
- case 124:
-#line 517 "engines/director/lingo/lingo-gr.y"
+ case 118:
+#line 499 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); }
-#line 2810 "engines/director/lingo/lingo-gr.cpp"
+#line 2701 "engines/director/lingo/lingo-gr.cpp"
break;
- case 125:
-#line 521 "engines/director/lingo/lingo-gr.y"
+ case 119:
+#line 503 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); }
-#line 2819 "engines/director/lingo/lingo-gr.cpp"
+#line 2710 "engines/director/lingo/lingo-gr.cpp"
break;
- case 126:
-#line 525 "engines/director/lingo/lingo-gr.y"
+ case 120:
+#line 507 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); }
-#line 2828 "engines/director/lingo/lingo-gr.cpp"
+#line 2719 "engines/director/lingo/lingo-gr.cpp"
break;
- case 129:
-#line 535 "engines/director/lingo/lingo-gr.y"
+ case 123:
+#line 517 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_playdone); }
-#line 2834 "engines/director/lingo/lingo-gr.cpp"
+#line 2725 "engines/director/lingo/lingo-gr.cpp"
break;
- case 130:
-#line 536 "engines/director/lingo/lingo-gr.y"
+ case 124:
+#line 518 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); }
-#line 2843 "engines/director/lingo/lingo-gr.cpp"
+#line 2734 "engines/director/lingo/lingo-gr.cpp"
break;
- case 131:
-#line 540 "engines/director/lingo/lingo-gr.y"
+ case 125:
+#line 522 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); }
-#line 2852 "engines/director/lingo/lingo-gr.cpp"
+#line 2743 "engines/director/lingo/lingo-gr.cpp"
break;
- case 132:
-#line 544 "engines/director/lingo/lingo-gr.y"
+ case 126:
+#line 526 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); }
-#line 2861 "engines/director/lingo/lingo-gr.cpp"
+#line 2752 "engines/director/lingo/lingo-gr.cpp"
break;
- case 133:
-#line 548 "engines/director/lingo/lingo-gr.y"
+ case 127:
+#line 530 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
-#line 2867 "engines/director/lingo/lingo-gr.cpp"
+#line 2758 "engines/director/lingo/lingo-gr.cpp"
break;
- case 134:
-#line 548 "engines/director/lingo/lingo-gr.y"
+ case 128:
+#line 530 "engines/director/lingo/lingo-gr.y"
{
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg));
delete (yyvsp[-2].s); }
-#line 2876 "engines/director/lingo/lingo-gr.cpp"
+#line 2767 "engines/director/lingo/lingo-gr.cpp"
break;
- case 135:
-#line 579 "engines/director/lingo/lingo-gr.y"
+ case 129:
+#line 561 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); }
-#line 2882 "engines/director/lingo/lingo-gr.cpp"
+#line 2773 "engines/director/lingo/lingo-gr.cpp"
break;
- case 136:
-#line 580 "engines/director/lingo/lingo-gr.y"
+ case 130:
+#line 562 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg));
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2893 "engines/director/lingo/lingo-gr.cpp"
+#line 2784 "engines/director/lingo/lingo-gr.cpp"
break;
- case 137:
-#line 586 "engines/director/lingo/lingo-gr.y"
+ case 131:
+#line 568 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
-#line 2899 "engines/director/lingo/lingo-gr.cpp"
+#line 2790 "engines/director/lingo/lingo-gr.cpp"
break;
- case 138:
-#line 587 "engines/director/lingo/lingo-gr.y"
+ case 132:
+#line 569 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2905 "engines/director/lingo/lingo-gr.cpp"
+#line 2796 "engines/director/lingo/lingo-gr.cpp"
break;
- case 139:
-#line 588 "engines/director/lingo/lingo-gr.y"
+ case 133:
+#line 570 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-6].s), (yyvsp[-4].code), (yyvsp[-3].narg) + 1, &g_lingo->_currentFactory);
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2916 "engines/director/lingo/lingo-gr.cpp"
+#line 2807 "engines/director/lingo/lingo-gr.cpp"
break;
- case 140:
-#line 594 "engines/director/lingo/lingo-gr.y"
+ case 134:
+#line 576 "engines/director/lingo/lingo-gr.y"
{ // D3
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-7].s), (yyvsp[-6].code), (yyvsp[-5].narg));
@@ -2927,11 +2818,11 @@ yyreduce:
checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false);
delete (yyvsp[-7].s);
delete (yyvsp[-1].s); }
-#line 2931 "engines/director/lingo/lingo-gr.cpp"
+#line 2822 "engines/director/lingo/lingo-gr.cpp"
break;
- case 141:
-#line 604 "engines/director/lingo/lingo-gr.y"
+ case 135:
+#line 586 "engines/director/lingo/lingo-gr.y"
{ // D4. No 'end' clause
g_lingo->code1(LC::c_procret);
g_lingo->define(*(yyvsp[-5].s), (yyvsp[-4].code), (yyvsp[-3].narg));
@@ -2939,59 +2830,59 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_ignoreMe = false;
delete (yyvsp[-5].s); }
-#line 2943 "engines/director/lingo/lingo-gr.cpp"
+#line 2834 "engines/director/lingo/lingo-gr.cpp"
break;
- case 142:
-#line 612 "engines/director/lingo/lingo-gr.y"
+ case 136:
+#line 594 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
-#line 2949 "engines/director/lingo/lingo-gr.cpp"
+#line 2840 "engines/director/lingo/lingo-gr.cpp"
break;
- case 143:
-#line 614 "engines/director/lingo/lingo-gr.y"
+ case 137:
+#line 596 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 2955 "engines/director/lingo/lingo-gr.cpp"
+#line 2846 "engines/director/lingo/lingo-gr.cpp"
break;
- case 144:
-#line 615 "engines/director/lingo/lingo-gr.y"
+ case 138:
+#line 597 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
-#line 2961 "engines/director/lingo/lingo-gr.cpp"
+#line 2852 "engines/director/lingo/lingo-gr.cpp"
break;
- case 145:
-#line 616 "engines/director/lingo/lingo-gr.y"
+ case 139:
+#line 598 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
-#line 2967 "engines/director/lingo/lingo-gr.cpp"
+#line 2858 "engines/director/lingo/lingo-gr.cpp"
break;
- case 146:
-#line 617 "engines/director/lingo/lingo-gr.y"
+ case 140:
+#line 599 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
-#line 2973 "engines/director/lingo/lingo-gr.cpp"
+#line 2864 "engines/director/lingo/lingo-gr.cpp"
break;
- case 148:
-#line 621 "engines/director/lingo/lingo-gr.y"
+ case 142:
+#line 603 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 2979 "engines/director/lingo/lingo-gr.cpp"
+#line 2870 "engines/director/lingo/lingo-gr.cpp"
break;
- case 149:
-#line 622 "engines/director/lingo/lingo-gr.y"
+ case 143:
+#line 604 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 2985 "engines/director/lingo/lingo-gr.cpp"
+#line 2876 "engines/director/lingo/lingo-gr.cpp"
break;
- case 150:
-#line 625 "engines/director/lingo/lingo-gr.y"
+ case 144:
+#line 607 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
-#line 2991 "engines/director/lingo/lingo-gr.cpp"
+#line 2882 "engines/director/lingo/lingo-gr.cpp"
break;
- case 151:
-#line 628 "engines/director/lingo/lingo-gr.y"
+ case 145:
+#line 610 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_call);
g_lingo->codeString((yyvsp[-1].s)->c_str());
@@ -2999,113 +2890,113 @@ yyreduce:
WRITE_UINT32(&numpar, (yyvsp[0].narg));
g_lingo->code1(numpar);
delete (yyvsp[-1].s); }
-#line 3003 "engines/director/lingo/lingo-gr.cpp"
+#line 2894 "engines/director/lingo/lingo-gr.cpp"
break;
- case 152:
-#line 637 "engines/director/lingo/lingo-gr.y"
+ case 146:
+#line 619 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 3009 "engines/director/lingo/lingo-gr.cpp"
+#line 2900 "engines/director/lingo/lingo-gr.cpp"
break;
- case 153:
-#line 638 "engines/director/lingo/lingo-gr.y"
+ case 147:
+#line 620 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3015 "engines/director/lingo/lingo-gr.cpp"
+#line 2906 "engines/director/lingo/lingo-gr.cpp"
break;
- case 154:
-#line 639 "engines/director/lingo/lingo-gr.y"
+ case 148:
+#line 621 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3021 "engines/director/lingo/lingo-gr.cpp"
+#line 2912 "engines/director/lingo/lingo-gr.cpp"
break;
- case 155:
-#line 642 "engines/director/lingo/lingo-gr.y"
+ case 149:
+#line 624 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3027 "engines/director/lingo/lingo-gr.cpp"
+#line 2918 "engines/director/lingo/lingo-gr.cpp"
break;
- case 156:
-#line 643 "engines/director/lingo/lingo-gr.y"
+ case 150:
+#line 625 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3033 "engines/director/lingo/lingo-gr.cpp"
+#line 2924 "engines/director/lingo/lingo-gr.cpp"
break;
- case 157:
-#line 646 "engines/director/lingo/lingo-gr.y"
+ case 151:
+#line 628 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 3039 "engines/director/lingo/lingo-gr.cpp"
+#line 2930 "engines/director/lingo/lingo-gr.cpp"
break;
- case 158:
-#line 649 "engines/director/lingo/lingo-gr.y"
+ case 152:
+#line 631 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
-#line 3045 "engines/director/lingo/lingo-gr.cpp"
+#line 2936 "engines/director/lingo/lingo-gr.cpp"
break;
- case 159:
-#line 650 "engines/director/lingo/lingo-gr.y"
+ case 153:
+#line 632 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
-#line 3051 "engines/director/lingo/lingo-gr.cpp"
+#line 2942 "engines/director/lingo/lingo-gr.cpp"
break;
- case 160:
-#line 651 "engines/director/lingo/lingo-gr.y"
+ case 154:
+#line 633 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3057 "engines/director/lingo/lingo-gr.cpp"
+#line 2948 "engines/director/lingo/lingo-gr.cpp"
break;
- case 161:
-#line 652 "engines/director/lingo/lingo-gr.y"
+ case 155:
+#line 634 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3063 "engines/director/lingo/lingo-gr.cpp"
+#line 2954 "engines/director/lingo/lingo-gr.cpp"
break;
- case 162:
-#line 655 "engines/director/lingo/lingo-gr.y"
+ case 156:
+#line 637 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3069 "engines/director/lingo/lingo-gr.cpp"
+#line 2960 "engines/director/lingo/lingo-gr.cpp"
break;
- case 163:
-#line 656 "engines/director/lingo/lingo-gr.y"
+ case 157:
+#line 638 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3075 "engines/director/lingo/lingo-gr.cpp"
+#line 2966 "engines/director/lingo/lingo-gr.cpp"
break;
- case 164:
-#line 659 "engines/director/lingo/lingo-gr.y"
+ case 158:
+#line 641 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3081 "engines/director/lingo/lingo-gr.cpp"
+#line 2972 "engines/director/lingo/lingo-gr.cpp"
break;
- case 165:
-#line 660 "engines/director/lingo/lingo-gr.y"
+ case 159:
+#line 642 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3087 "engines/director/lingo/lingo-gr.cpp"
+#line 2978 "engines/director/lingo/lingo-gr.cpp"
break;
- case 166:
-#line 663 "engines/director/lingo/lingo-gr.y"
+ case 160:
+#line 645 "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 3096 "engines/director/lingo/lingo-gr.cpp"
+#line 2987 "engines/director/lingo/lingo-gr.cpp"
break;
- case 167:
-#line 667 "engines/director/lingo/lingo-gr.y"
+ case 161:
+#line 649 "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 3105 "engines/director/lingo/lingo-gr.cpp"
+#line 2996 "engines/director/lingo/lingo-gr.cpp"
break;
-#line 3109 "engines/director/lingo/lingo-gr.cpp"
+#line 3000 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
@@ -3337,5 +3228,5 @@ yyreturn:
#endif
return yyresult;
}
-#line 674 "engines/director/lingo/lingo-gr.y"
+#line 656 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 5fac83a..7af5e3e 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -65,78 +65,70 @@ extern int yydebug;
THEENTITYWITHID = 271,
FLOAT = 272,
BLTIN = 273,
- BLTINNOARGS = 274,
- BLTINNOARGSORONE = 275,
- BLTINONEARG = 276,
- BLTINARGLIST = 277,
- FBLTIN = 278,
- FBLTINNOARGS = 279,
- FBLTINONEARG = 280,
- FBLTINARGLIST = 281,
- RBLTIN = 282,
- RBLTINONEARG = 283,
- ID = 284,
- STRING = 285,
- HANDLER = 286,
- SYMBOL = 287,
- ENDCLAUSE = 288,
- tPLAYACCEL = 289,
- tMETHOD = 290,
- THEOBJECTFIELD = 291,
- tDOWN = 292,
- tELSE = 293,
- tELSIF = 294,
- tEXIT = 295,
- tGLOBAL = 296,
- tGO = 297,
- tIF = 298,
- tINTO = 299,
- tLOOP = 300,
- tMACRO = 301,
- tMOVIE = 302,
- tNEXT = 303,
- tOF = 304,
- tPREVIOUS = 305,
- tPUT = 306,
- tREPEAT = 307,
- tSET = 308,
- tTHEN = 309,
- tTO = 310,
- tWHEN = 311,
- tWITH = 312,
- tWHILE = 313,
- tNLELSE = 314,
- tFACTORY = 315,
- tOPEN = 316,
- tPLAY = 317,
- tDONE = 318,
- tINSTANCE = 319,
- tGE = 320,
- tLE = 321,
- tEQ = 322,
- tNEQ = 323,
- tAND = 324,
- tOR = 325,
- tNOT = 326,
- tMOD = 327,
- tAFTER = 328,
- tBEFORE = 329,
- tCONCAT = 330,
- tCONTAINS = 331,
- tSTARTS = 332,
- tCHAR = 333,
- tITEM = 334,
- tLINE = 335,
- tWORD = 336,
- tSPRITE = 337,
- tINTERSECTS = 338,
- tWITHIN = 339,
- tTELL = 340,
- tPROPERTY = 341,
- tON = 342,
- tENDIF = 343,
- tENDREPEAT = 344,
- tENDTELL = 345
+ FBLTIN = 274,
+ RBLTIN = 275,
+ ID = 276,
+ STRING = 277,
+ HANDLER = 278,
+ SYMBOL = 279,
+ ENDCLAUSE = 280,
+ tPLAYACCEL = 281,
+ tMETHOD = 282,
+ THEOBJECTFIELD = 283,
+ tDOWN = 284,
+ tELSE = 285,
+ tELSIF = 286,
+ tEXIT = 287,
+ tGLOBAL = 288,
+ tGO = 289,
+ tIF = 290,
+ tINTO = 291,
+ tLOOP = 292,
+ tMACRO = 293,
+ tMOVIE = 294,
+ tNEXT = 295,
+ tOF = 296,
+ tPREVIOUS = 297,
+ tPUT = 298,
+ tREPEAT = 299,
+ tSET = 300,
+ tTHEN = 301,
+ tTO = 302,
+ tWHEN = 303,
+ tWITH = 304,
+ tWHILE = 305,
+ tNLELSE = 306,
+ tFACTORY = 307,
+ tOPEN = 308,
+ tPLAY = 309,
+ tDONE = 310,
+ tINSTANCE = 311,
+ tGE = 312,
+ tLE = 313,
+ tEQ = 314,
+ tNEQ = 315,
+ tAND = 316,
+ tOR = 317,
+ tNOT = 318,
+ tMOD = 319,
+ tAFTER = 320,
+ tBEFORE = 321,
+ tCONCAT = 322,
+ tCONTAINS = 323,
+ tSTARTS = 324,
+ tCHAR = 325,
+ tITEM = 326,
+ tLINE = 327,
+ tWORD = 328,
+ tSPRITE = 329,
+ tINTERSECTS = 330,
+ tWITHIN = 331,
+ tTELL = 332,
+ tPROPERTY = 333,
+ tON = 334,
+ tENDIF = 335,
+ tENDREPEAT = 336,
+ tENDTELL = 337
};
#endif
@@ -159,7 +151,7 @@ union YYSTYPE
int e;
} objectfield;
-#line 163 "engines/director/lingo/lingo-gr.h"
+#line 155 "engines/director/lingo/lingo-gr.h"
};
typedef union YYSTYPE YYSTYPE;
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index cbbc64d..3ba4aa2 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -103,8 +103,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%token<i> INT ARGC ARGCNORET
%token<e> THEENTITY THEENTITYWITHID
%token<f> FLOAT
-%token<s> BLTIN BLTINNOARGS BLTINNOARGSORONE BLTINONEARG BLTINARGLIST
-%token<s> FBLTIN FBLTINNOARGS FBLTINONEARG FBLTINARGLIST RBLTIN RBLTINONEARG
+%token<s> BLTIN FBLTIN RBLTIN
%token<s> ID STRING HANDLER SYMBOL
%token<s> ENDCLAUSE tPLAYACCEL tMETHOD
%token<objectfield> THEOBJECTFIELD
@@ -395,14 +394,9 @@ simpleexpr: INT {
expr: simpleexpr { $$ = $simpleexpr; }
| reference
- | FBLTINNOARGS {
- g_lingo->codeFunc($FBLTINNOARGS, 0);
- delete $FBLTINNOARGS; }
- | FBLTINONEARG expr {
- g_lingo->codeFunc($FBLTINONEARG, 1);
- delete $FBLTINONEARG; }
- | FBLTINARGLIST arglist { g_lingo->codeFunc($FBLTINARGLIST, $arglist);
- delete $FBLTINARGLIST; }
+ | FBLTIN arglist {
+ g_lingo->codeFunc($FBLTIN, $arglist);
+ delete $FBLTIN; }
| ID '(' arglist ')' {
$$ = g_lingo->codeFunc($ID, $arglist);
delete $ID; }
@@ -459,9 +453,9 @@ expr: simpleexpr { $$ = $simpleexpr; }
| tWORD expr tTO expr tOF expr { g_lingo->code1(LC::c_wordToOf); }
;
-reference: RBLTINONEARG simpleexpr {
- g_lingo->codeFunc($RBLTINONEARG, 1);
- delete $RBLTINONEARG; }
+reference: RBLTIN simpleexpr {
+ g_lingo->codeFunc($RBLTIN, 1);
+ delete $RBLTIN; }
;
proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
@@ -472,21 +466,9 @@ proc: tPUT expr { g_lingo->code1(LC::c_printtop); }
| tGLOBAL globallist
| tPROPERTY propertylist
| tINSTANCE instancelist
- | BLTINNOARGS {
- g_lingo->codeFunc($BLTINNOARGS, 0);
- delete $BLTINNOARGS; }
- | BLTINONEARG expr {
- g_lingo->codeFunc($BLTINONEARG, 1);
- delete $BLTINONEARG; }
- | BLTINNOARGSORONE expr {
- g_lingo->codeFunc($BLTINNOARGSORONE, 1);
- delete $BLTINNOARGSORONE; }
- | BLTINNOARGSORONE {
- g_lingo->code1(LC::c_voidpush);
- g_lingo->codeFunc($BLTINNOARGSORONE, 1);
- delete $BLTINNOARGSORONE; }
- | BLTINARGLIST arglist { g_lingo->codeFunc($BLTINARGLIST, $arglist);
- delete $BLTINARGLIST; }
+ | BLTIN arglist {
+ g_lingo->codeFunc($BLTIN, $arglist);
+ delete $BLTIN; }
| tOPEN expr tWITH expr { g_lingo->code1(LC::c_open); }
| tOPEN expr { g_lingo->code2(LC::c_voidpush, LC::c_open); }
;
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 0f7055c..7d2574a 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -1372,7 +1372,7 @@ YY_RULE_SETUP
yylval.s = new Common::String("value");
- return FBLTINONEARG;
+ return FBLTIN;
}
YY_BREAK
case 51:
@@ -1397,7 +1397,7 @@ YY_RULE_SETUP
yylval.s = new Common::String(Common::String::format("numberOf%s", field.c_str()));
if (g_lingo->_builtins.contains(*yylval.s))
- return FBLTINONEARG;
+ return FBLTIN;
else
error("LEXER: Unhandled chunk expression '%s'", yylval.s->c_str());
}
@@ -1608,23 +1608,10 @@ YY_RULE_SETUP
if (g_lingo->_builtins[yytext]->nargs != 1 || g_lingo->_builtins[yytext]->maxArgs != 1)
error("Incorrectly set RBLTIN %s", yytext);
- return RBLTINONEARG;
- }
- if (g_lingo->_builtins[yytext]->nargs == 0) {
- if (g_lingo->_builtins[yytext]->maxArgs == 0)
- return type == BLTIN ? BLTINNOARGS : FBLTINNOARGS;
- else if (g_lingo->_builtins[yytext]->maxArgs == 1)
- return BLTINNOARGSORONE;
- else
- return type == BLTIN ? BLTINARGLIST : FBLTINARGLIST;
- } else if (g_lingo->_builtins[yytext]->nargs == 1 &&
- g_lingo->_builtins[yytext]->maxArgs == 1) {
- return type == BLTIN ? BLTINONEARG : FBLTINONEARG;
- } else if (g_lingo->_builtins[yytext]->nargs == -1) {
- return type == BLTIN ? BLTINARGLIST : FBLTINARGLIST;
- } else {
- return type == BLTIN ? BLTINARGLIST : FBLTINARGLIST;
+ return RBLTIN;
}
+
+ return type;
}
}
@@ -1633,41 +1620,41 @@ YY_RULE_SETUP
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 367 "engines/director/lingo/lingo-lex.l"
+#line 354 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 368 "engines/director/lingo/lingo-lex.l"
+#line 355 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 369 "engines/director/lingo/lingo-lex.l"
+#line 356 "engines/director/lingo/lingo-lex.l"
{ count(); return *yytext; }
YY_BREAK
case 72:
/* rule 72 can match eol */
YY_RULE_SETUP
-#line 370 "engines/director/lingo/lingo-lex.l"
+#line 357 "engines/director/lingo/lingo-lex.l"
{ count(); return '\n'; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 371 "engines/director/lingo/lingo-lex.l"
+#line 358 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 372 "engines/director/lingo/lingo-lex.l"
+#line 359 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 374 "engines/director/lingo/lingo-lex.l"
+#line 361 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1671 "engines/director/lingo/lingo-lex.cpp"
+#line 1658 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2627,7 +2614,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 374 "engines/director/lingo/lingo-lex.l"
+#line 361 "engines/director/lingo/lingo-lex.l"
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 793898b..836dfd2 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -176,7 +176,7 @@ whitespace [\t ]
yylval.s = new Common::String("value");
- return FBLTINONEARG;
+ return FBLTIN;
}
(?i:the[ \t]+number[\t ]+of[\t ]+[[:alpha:]]+[\t ](in|of)) {
count();
@@ -197,7 +197,7 @@ whitespace [\t ]
yylval.s = new Common::String(Common::String::format("numberOf%s", field.c_str()));
if (g_lingo->_builtins.contains(*yylval.s))
- return FBLTINONEARG;
+ return FBLTIN;
else
error("LEXER: Unhandled chunk expression '%s'", yylval.s->c_str());
}
@@ -342,23 +342,10 @@ whitespace [\t ]
if (g_lingo->_builtins[yytext]->nargs != 1 || g_lingo->_builtins[yytext]->maxArgs != 1)
error("Incorrectly set RBLTIN %s", yytext);
- return RBLTINONEARG;
- }
- if (g_lingo->_builtins[yytext]->nargs == 0) {
- if (g_lingo->_builtins[yytext]->maxArgs == 0)
- return type == BLTIN ? BLTINNOARGS : FBLTINNOARGS;
- else if (g_lingo->_builtins[yytext]->maxArgs == 1)
- return BLTINNOARGSORONE;
- else
- return type == BLTIN ? BLTINARGLIST : FBLTINARGLIST;
- } else if (g_lingo->_builtins[yytext]->nargs == 1 &&
- g_lingo->_builtins[yytext]->maxArgs == 1) {
- return type == BLTIN ? BLTINONEARG : FBLTINONEARG;
- } else if (g_lingo->_builtins[yytext]->nargs == -1) {
- return type == BLTIN ? BLTINARGLIST : FBLTINARGLIST;
- } else {
- return type == BLTIN ? BLTINARGLIST : FBLTINARGLIST;
+ return RBLTIN;
}
+
+ return type;
}
}
More information about the Scummvm-git-logs
mailing list