[Scummvm-git-logs] scummvm master -> 490cbe018f048658fb687ef7ad82499671ca50a9
sev-
sev at scummvm.org
Wed Apr 15 16:54:53 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
490cbe018f DIRECTOR: LINGO: Added PCELL Datum type
Commit: 490cbe018f048658fb687ef7ad82499671ca50a9
https://github.com/scummvm/scummvm/commit/490cbe018f048658fb687ef7ad82499671ca50a9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-15T18:54:34+02:00
Commit Message:
DIRECTOR: LINGO: Added PCELL Datum type
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 af87b55c6e..23102d9e3b 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -155,80 +155,81 @@ extern int yydebug;
OBJECT = 265,
REFERENCE = 266,
LEXERROR = 267,
- INT = 268,
- ARGC = 269,
- ARGCNORET = 270,
- THEENTITY = 271,
- THEENTITYWITHID = 272,
- THEMENUITEMENTITY = 273,
- THEMENUITEMSENTITY = 274,
- FLOAT = 275,
- BLTIN = 276,
- FBLTIN = 277,
- RBLTIN = 278,
- ID = 279,
- STRING = 280,
- HANDLER = 281,
- SYMBOL = 282,
- ENDCLAUSE = 283,
- tPLAYACCEL = 284,
- tMETHOD = 285,
- THEOBJECTFIELD = 286,
- THEOBJECTREF = 287,
- tDOWN = 288,
- tELSE = 289,
- tELSIF = 290,
- tEXIT = 291,
- tGLOBAL = 292,
- tGO = 293,
- tIF = 294,
- tIN = 295,
- tINTO = 296,
- tLOOP = 297,
- tMACRO = 298,
- tMOVIE = 299,
- tNEXT = 300,
- tOF = 301,
- tPREVIOUS = 302,
- tPUT = 303,
- tREPEAT = 304,
- tSET = 305,
- tTHEN = 306,
- tTO = 307,
- tWHEN = 308,
- tWITH = 309,
- tWHILE = 310,
- tNLELSE = 311,
- tFACTORY = 312,
- tOPEN = 313,
- tPLAY = 314,
- tINSTANCE = 315,
- tGE = 316,
- tLE = 317,
- tEQ = 318,
- tNEQ = 319,
- tAND = 320,
- tOR = 321,
- tNOT = 322,
- tMOD = 323,
- tAFTER = 324,
- tBEFORE = 325,
- tCONCAT = 326,
- tCONTAINS = 327,
- tSTARTS = 328,
- tCHAR = 329,
- tITEM = 330,
- tLINE = 331,
- tWORD = 332,
- tSPRITE = 333,
- tINTERSECTS = 334,
- tWITHIN = 335,
- tTELL = 336,
- tPROPERTY = 337,
- tON = 338,
- tENDIF = 339,
- tENDREPEAT = 340,
- tENDTELL = 341
+ PCELL = 268,
+ INT = 269,
+ ARGC = 270,
+ ARGCNORET = 271,
+ THEENTITY = 272,
+ THEENTITYWITHID = 273,
+ THEMENUITEMENTITY = 274,
+ THEMENUITEMSENTITY = 275,
+ FLOAT = 276,
+ BLTIN = 277,
+ FBLTIN = 278,
+ RBLTIN = 279,
+ ID = 280,
+ STRING = 281,
+ HANDLER = 282,
+ SYMBOL = 283,
+ ENDCLAUSE = 284,
+ tPLAYACCEL = 285,
+ tMETHOD = 286,
+ THEOBJECTFIELD = 287,
+ THEOBJECTREF = 288,
+ tDOWN = 289,
+ tELSE = 290,
+ tELSIF = 291,
+ tEXIT = 292,
+ tGLOBAL = 293,
+ tGO = 294,
+ tIF = 295,
+ tIN = 296,
+ tINTO = 297,
+ tLOOP = 298,
+ tMACRO = 299,
+ tMOVIE = 300,
+ tNEXT = 301,
+ tOF = 302,
+ tPREVIOUS = 303,
+ tPUT = 304,
+ tREPEAT = 305,
+ tSET = 306,
+ tTHEN = 307,
+ tTO = 308,
+ tWHEN = 309,
+ tWITH = 310,
+ tWHILE = 311,
+ tNLELSE = 312,
+ tFACTORY = 313,
+ tOPEN = 314,
+ tPLAY = 315,
+ tINSTANCE = 316,
+ tGE = 317,
+ tLE = 318,
+ tEQ = 319,
+ tNEQ = 320,
+ tAND = 321,
+ tOR = 322,
+ tNOT = 323,
+ tMOD = 324,
+ tAFTER = 325,
+ tBEFORE = 326,
+ tCONCAT = 327,
+ tCONTAINS = 328,
+ tSTARTS = 329,
+ tCHAR = 330,
+ tITEM = 331,
+ tLINE = 332,
+ tWORD = 333,
+ tSPRITE = 334,
+ tINTERSECTS = 335,
+ tWITHIN = 336,
+ tTELL = 337,
+ tPROPERTY = 338,
+ tON = 339,
+ tENDIF = 340,
+ tENDREPEAT = 341,
+ tENDTELL = 342
};
#endif
@@ -256,7 +257,7 @@ union YYSTYPE
Common::String *field;
} objectref;
-#line 260 "engines/director/lingo/lingo-gr.cpp"
+#line 261 "engines/director/lingo/lingo-gr.cpp"
};
typedef union YYSTYPE YYSTYPE;
@@ -575,10 +576,10 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 127
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1755
+#define YYLAST 1768
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 102
+#define YYNTOKENS 103
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 51
/* YYNRULES -- Number of rules. */
@@ -587,7 +588,7 @@ union yyalloc
#define YYNSTATES 376
#define YYUNDEFTOK 2
-#define YYMAXUTOK 341
+#define YYMAXUTOK 342
/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
@@ -600,15 +601,15 @@ union yyalloc
static const yytype_int8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 95, 2, 2, 2, 2, 2, 2, 2, 2, 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, 94, 89, 2,
- 96, 97, 92, 90, 98, 91, 2, 93, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 101, 2,
- 87, 2, 88, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 95, 90, 2,
+ 97, 98, 93, 91, 99, 92, 2, 94, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 102, 2,
+ 88, 2, 89, 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, 99, 2, 100, 2, 2, 2, 2, 2, 2,
+ 2, 100, 2, 101, 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 +634,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
+ 85, 86, 87
};
#if YYDEBUG
@@ -667,28 +668,28 @@ static const yytype_int16 yyrline[] =
static const char *const yytname[] =
{
"$end", "error", "$undefined", "UNARY", "CASTREF", "VOID", "VAR",
- "POINT", "RECT", "ARRAY", "OBJECT", "REFERENCE", "LEXERROR", "INT",
- "ARGC", "ARGCNORET", "THEENTITY", "THEENTITYWITHID", "THEMENUITEMENTITY",
- "THEMENUITEMSENTITY", "FLOAT", "BLTIN", "FBLTIN", "RBLTIN", "ID",
- "STRING", "HANDLER", "SYMBOL", "ENDCLAUSE", "tPLAYACCEL", "tMETHOD",
- "THEOBJECTFIELD", "THEOBJECTREF", "tDOWN", "tELSE", "tELSIF", "tEXIT",
- "tGLOBAL", "tGO", "tIF", "tIN", "tINTO", "tLOOP", "tMACRO", "tMOVIE",
- "tNEXT", "tOF", "tPREVIOUS", "tPUT", "tREPEAT", "tSET", "tTHEN", "tTO",
- "tWHEN", "tWITH", "tWHILE", "tNLELSE", "tFACTORY", "tOPEN", "tPLAY",
- "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", "tellstart", "ifstmt",
- "elseifstmtlist", "elseifstmt", "ifoneliner", "repeatwhile",
- "repeatwith", "if", "elseif", "begin", "end", "stmtlist", "when",
- "simpleexpr", "expr", "chunkexpr", "reference", "proc", "$@1", "$@2",
- "globallist", "propertylist", "instancelist", "gotofunc", "gotomovie",
- "playfunc", "$@3", "defn", "$@4", "$@5", "$@6", "on", "$@7", "argdef",
- "endargdef", "argstore", "macro", "arglist", "nonemptyarglist", "list",
- "valuelist", "linearlist", "proplist", "proppair", YY_NULLPTR
+ "POINT", "RECT", "ARRAY", "OBJECT", "REFERENCE", "LEXERROR", "PCELL",
+ "INT", "ARGC", "ARGCNORET", "THEENTITY", "THEENTITYWITHID",
+ "THEMENUITEMENTITY", "THEMENUITEMSENTITY", "FLOAT", "BLTIN", "FBLTIN",
+ "RBLTIN", "ID", "STRING", "HANDLER", "SYMBOL", "ENDCLAUSE", "tPLAYACCEL",
+ "tMETHOD", "THEOBJECTFIELD", "THEOBJECTREF", "tDOWN", "tELSE", "tELSIF",
+ "tEXIT", "tGLOBAL", "tGO", "tIF", "tIN", "tINTO", "tLOOP", "tMACRO",
+ "tMOVIE", "tNEXT", "tOF", "tPREVIOUS", "tPUT", "tREPEAT", "tSET",
+ "tTHEN", "tTO", "tWHEN", "tWITH", "tWHILE", "tNLELSE", "tFACTORY",
+ "tOPEN", "tPLAY", "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",
+ "tellstart", "ifstmt", "elseifstmtlist", "elseifstmt", "ifoneliner",
+ "repeatwhile", "repeatwith", "if", "elseif", "begin", "end", "stmtlist",
+ "when", "simpleexpr", "expr", "chunkexpr", "reference", "proc", "$@1",
+ "$@2", "globallist", "propertylist", "instancelist", "gotofunc",
+ "gotomovie", "playfunc", "$@3", "defn", "$@4", "$@5", "$@6", "on", "$@7",
+ "argdef", "endargdef", "argstore", "macro", "arglist", "nonemptyarglist",
+ "list", "valuelist", "linearlist", "proplist", "proppair", YY_NULLPTR
};
#endif
@@ -705,13 +706,13 @@ 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, 60, 62, 38,
- 43, 45, 42, 47, 37, 10, 40, 41, 44, 91,
- 93, 58
+ 335, 336, 337, 338, 339, 340, 341, 342, 60, 62,
+ 38, 43, 45, 42, 47, 37, 10, 40, 41, 44,
+ 91, 93, 58
};
# endif
-#define YYPACT_NINF (-272)
+#define YYPACT_NINF (-274)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
@@ -725,44 +726,44 @@ static const yytype_int16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 312, -78, -272, -272, 24, -272, 1042, 1123, 24, 1161,
- -272, -272, -272, -272, -272, -272, -26, -272, 885, -272,
- -272, 19, 1004, -23, 203, 54, 56, 1242, 923, 61,
- 1242, 1242, 1242, 1242, 1242, 1242, 1242, -272, -272, 1242,
- 1242, 1242, 393, 9, -272, -272, -272, -272, -272, 1242,
- -2, 1242, 723, -272, 1662, -272, -272, -272, -272, -272,
- -272, -272, -272, -272, -272, -272, -272, -5, 1004, 1242,
- 1662, 3, 1242, 3, -272, 1242, 1662, 23, 1242, -272,
- -272, 81, -272, 1242, -272, 78, -272, 1234, -272, 100,
- -272, 101, 385, 102, -272, -11, 24, 24, 7, 76,
- 79, -272, 1559, 1234, -272, -272, 33, -272, 1282, 1315,
- 1348, 1381, 1629, 1546, 126, 128, -272, -272, 1592, 52,
- 53, -272, 1662, 57, 58, 62, -272, -272, 480, 1662,
- -272, -272, 1662, -272, -272, 1242, 1662, -272, -272, 1242,
- 1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242,
- 1242, 1242, 1242, 1242, 1242, 1242, 137, 1242, 385, 1592,
- -24, 1242, 2, 13, 1242, 3, 137, -272, 64, 1662,
- 1242, -272, -272, 24, 32, 1242, 1242, -272, 1242, 1242,
- 8, 117, 1242, 1242, 1242, -272, 1242, -272, 141, 1242,
- 1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242, 1242, -272,
- -272, -272, 68, -272, -272, 24, 24, -272, 1242, -14,
- -272, -272, 1242, 1242, 123, -272, 1662, 125, 125, 125,
- 125, 25, 25, -272, 107, 125, 125, 125, 125, 107,
- -28, -28, -272, -272, -272, -48, -272, 1662, -272, -272,
- 1662, -16, 144, 1662, -272, 140, -272, -272, 1662, 1662,
- 1662, 125, 1242, 1242, 170, 1662, 125, 1662, 1662, -272,
- 1662, 1414, 1662, 1447, 1662, 1480, 1662, 1513, 1662, 1662,
- 804, -272, 171, -272, -272, 1662, 52, 53, -272, 642,
- 1662, 1662, -272, 150, 106, 181, 106, -272, 137, 1242,
- 1662, 125, 24, 1242, 1242, 1242, 1242, -272, 642, -272,
- -272, -272, 124, -272, -13, 642, 804, 189, -272, -272,
- -272, -3, 1662, 173, 1662, 1662, 1662, 1662, -272, 142,
- -272, 642, 174, 1242, -272, -272, -272, 561, 642, 106,
- 1242, -272, 145, 1242, 1662, 85, -27, 205, -272, 1662,
- -272, 1662, -272, -272, -272, -272, 1242, 147, -272, -272,
- -272, 134, 642, -272, 642, -272, 1662, -272, 804, 209,
- 642, 151, 642, 184, -272, -272, 152, -272, 155, -272,
- 159, -272, -272, 642, -272, -272
+ 311, -85, -274, -274, 23, -274, 1041, 1122, 23, 1160,
+ -274, -274, -274, -274, -274, -274, -31, -274, 884, -274,
+ -274, -18, 1003, 45, 96, 22, 34, 1241, 922, 40,
+ 1241, 1241, 1241, 1241, 1241, 1241, 1241, -274, -274, 1241,
+ 1241, 1241, 392, 8, -274, -274, -274, -274, -274, 1241,
+ -26, 1241, 722, -274, 1661, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -27, 1003, 1241,
+ 1661, -17, 1241, -17, -274, 1241, 1661, -13, 1241, -274,
+ -274, 48, -274, 1241, -274, 50, -274, 1233, -274, 80,
+ -274, 91, 384, 97, -274, -12, 23, 23, 7, 73,
+ 98, -274, 1558, 1233, -274, -274, 54, -274, 1281, 1314,
+ 1347, 1380, 1628, 1545, 127, 129, -274, -274, 1591, 55,
+ 58, -274, 1661, 60, 57, 63, -274, -274, 479, 1661,
+ -274, -274, 1661, -274, -274, 1241, 1661, -274, -274, 1241,
+ 1241, 1241, 1241, 1241, 1241, 1241, 1241, 1241, 1241, 1241,
+ 1241, 1241, 1241, 1241, 1241, 1241, 138, 1241, 384, 1591,
+ 19, 1241, 21, 26, 1241, -17, 138, -274, 66, 1661,
+ 1241, -274, -274, 23, 15, 1241, 1241, -274, 1241, 1241,
+ 14, 119, 1241, 1241, 1241, -274, 1241, -274, 143, 1241,
+ 1241, 1241, 1241, 1241, 1241, 1241, 1241, 1241, 1241, -274,
+ -274, -274, 75, -274, -274, 23, 23, -274, 1241, 53,
+ -274, -274, 1241, 1241, 123, -274, 1661, 16, 16, 16,
+ 16, 1674, 1674, -274, 5, 16, 16, 16, 16, 5,
+ 18, 18, -274, -274, -274, -76, -274, 1661, -274, -274,
+ 1661, -41, 156, 1661, -274, 151, -274, -274, 1661, 1661,
+ 1661, 16, 1241, 1241, 169, 1661, 16, 1661, 1661, -274,
+ 1661, 1413, 1661, 1446, 1661, 1479, 1661, 1512, 1661, 1661,
+ 803, -274, 170, -274, -274, 1661, 55, 58, -274, 641,
+ 1661, 1661, -274, 144, 99, 172, 99, -274, 138, 1241,
+ 1661, 16, 23, 1241, 1241, 1241, 1241, -274, 641, -274,
+ -274, -274, 113, -274, -3, 641, 803, 175, -274, -274,
+ -274, -35, 1661, 148, 1661, 1661, 1661, 1661, -274, 117,
+ -274, 641, 152, 1241, -274, -274, -274, 560, 641, 99,
+ 1241, -274, 128, 1241, 1661, 95, -28, 184, -274, 1661,
+ -274, 1661, -274, -274, -274, -274, 1241, 130, -274, -274,
+ -274, 114, 641, -274, 641, -274, 1661, -274, 803, 191,
+ 641, 131, 641, 166, -274, -274, 133, -274, 135, -274,
+ 136, -274, -274, 641, -274, -274
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -813,12 +814,12 @@ static const yytype_uint8 yydefact[] =
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -272, -272, 116, -272, -264, -272, 4, 45, -272, -272,
- -272, -272, -272, -272, 197, -272, -77, -57, -100, -272,
- 6, -6, -272, 77, 198, -272, -272, -272, -272, -272,
- -272, -20, -272, -272, -272, -272, -272, -272, -272, -272,
- -161, -272, -271, 200, 12, -272, -272, -272, -272, -272,
- 47
+ -274, -274, 100, -274, -264, -274, 4, 25, -274, -274,
+ -274, -274, -274, -274, 174, -274, -77, -57, -100, -274,
+ 6, -6, -274, 56, 177, -274, -274, -274, -274, -274,
+ -274, -19, -274, -274, -274, -274, -274, -274, -274, -274,
+ -161, -274, -273, 179, 11, -274, -274, -274, -274, -274,
+ 24
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -837,38 +838,38 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 70, 70, 166, 76, 47, 241, 297, 348, 104, 127,
- 66, 276, 87, 277, 74, 310, 92, 64, 71, 73,
- 322, 102, 103, 80, 107, 108, 109, 110, 111, 112,
- 113, 93, 94, 116, 117, 118, 122, 2, 130, 323,
- 145, 178, 325, 129, 5, 132, 136, 284, 65, 10,
- 285, 11, 179, 212, 213, 8, 246, 349, 338, 182,
- 252, 131, 158, 159, 154, 155, 159, 171, 90, 159,
- 183, 253, 70, 236, 161, 214, 215, 169, 100, 286,
- 101, 160, 285, 187, 162, 105, 139, 140, 141, 142,
- 165, 157, 329, 145, 364, 285, 146, 147, 148, 238,
- 161, 161, 180, 181, 128, 167, 31, 32, 33, 34,
- 239, 161, 149, 150, 151, 152, 153, 154, 155, 343,
- 344, 164, 170, 42, 172, 173, 177, 311, 184, 216,
- 185, 188, 47, 217, 218, 219, 220, 221, 222, 223,
+ 70, 70, 166, 76, 47, 241, 297, 348, 127, 104,
+ 66, 64, 87, 310, 74, 130, 92, 71, 73, 80,
+ 284, 102, 103, 285, 107, 108, 109, 110, 111, 112,
+ 113, 322, 90, 116, 117, 118, 122, 2, 131, 8,
+ 246, 178, 325, 129, 5, 132, 136, 100, 65, 10,
+ 323, 11, 179, 212, 213, 286, 338, 349, 285, 101,
+ 182, 329, 158, 159, 285, 105, 159, 252, 171, 159,
+ 157, 183, 70, 167, 145, 214, 215, 169, 253, 276,
+ 160, 277, 161, 162, 187, 145, 164, 145, 146, 165,
+ 31, 32, 33, 34, 364, 170, 152, 153, 154, 155,
+ 93, 94, 180, 181, 128, 172, 151, 152, 153, 154,
+ 155, 154, 155, 95, 96, 97, 173, 236, 161, 238,
+ 161, 98, 177, 42, 239, 161, 184, 311, 99, 216,
+ 343, 344, 47, 217, 218, 219, 220, 221, 222, 223,
224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
- 201, 70, 203, 205, 206, 237, 208, 207, 240, 283,
- 209, 234, 242, 254, 243, 259, 272, 288, 287, 248,
- 249, 298, 250, 251, 282, 145, 255, 256, 257, 245,
- 258, 289, 305, 260, 261, 262, 263, 264, 265, 266,
- 267, 268, 269, 145, 292, 299, 146, 152, 153, 154,
- 155, 306, 275, 321, 307, 309, 280, 281, 327, 320,
- 328, 273, 274, 326, 151, 152, 153, 154, 155, 95,
- 96, 97, 302, 303, 304, 330, 333, 98, 331, 350,
- 340, 357, 359, 365, 99, 369, 367, 371, 352, 372,
- 318, 319, 354, 374, 210, 271, 290, 291, 324, 135,
- 137, 247, 138, 360, 0, 362, 278, 0, 0, 0,
+ 185, 70, 201, 188, 203, 237, 208, 205, 240, 283,
+ 206, 207, 209, 234, 243, 242, 254, 288, 259, 248,
+ 249, 298, 250, 251, 272, 282, 255, 256, 257, 245,
+ 258, 287, 305, 260, 261, 262, 263, 264, 265, 266,
+ 267, 268, 269, 289, 292, 299, 306, 309, 307, 320,
+ 326, 330, 275, 321, 331, 333, 280, 281, 327, 350,
+ 328, 273, 274, 359, 340, 357, 365, 367, 369, 371,
+ 372, 374, 302, 303, 304, 271, 135, 0, 210, 137,
+ 247, 138, 0, 278, 0, 0, 0, 0, 352, 0,
+ 318, 319, 354, 0, 0, 0, 290, 291, 324, 0,
+ 0, 0, 0, 360, 0, 362, 0, 0, 0, 0,
0, 0, 0, 0, 332, 0, 355, 0, 336, 373,
0, 358, 0, 0, 0, 0, 0, 342, 347, 0,
0, 0, 0, 312, 353, 0, 0, 314, 315, 316,
317, 0, 0, 0, 0, 0, 0, 361, 313, 363,
0, 0, 0, 366, 0, 368, 0, 370, 0, 0,
- 0, 0, -5, 1, 0, 0, 375, 334, 0, 0,
+ 0, -5, 1, 0, 0, 0, 375, 334, 0, 0,
0, 0, 0, 0, 339, 2, 0, 341, 3, 4,
0, 0, 5, 6, 7, 8, 9, 10, 0, 11,
356, 12, 13, 14, 15, 0, 0, 0, 16, 17,
@@ -1010,256 +1011,258 @@ static const yytype_int16 yytable[] =
146, 147, 148, 0, 0, 0, 0, 0, 197, 198,
0, 0, 0, 0, 0, 0, 149, 150, 151, 152,
153, 154, 155, 139, 140, 141, 142, 143, 144, 0,
- 145, 0, 0, 146, 147, 148, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 149,
- 150, 151, 152, 153, 154, 155
+ 145, 0, 0, 146, 147, 148, 139, 140, 141, 142,
+ 0, 0, 0, 145, 0, 0, 146, 147, 148, 149,
+ 150, 151, 152, 153, 154, 155, 0, 0, 0, 0,
+ 0, 0, 149, 150, 151, 152, 153, 154, 155
};
static const yytype_int16 yycheck[] =
{
- 6, 7, 79, 9, 0, 166, 270, 34, 28, 0,
- 4, 25, 18, 27, 8, 286, 22, 95, 6, 7,
- 33, 27, 28, 49, 30, 31, 32, 33, 34, 35,
- 36, 54, 55, 39, 40, 41, 42, 13, 40, 52,
- 68, 52, 306, 49, 20, 51, 52, 95, 24, 25,
- 98, 27, 63, 130, 131, 23, 24, 84, 329, 52,
- 52, 63, 68, 69, 92, 93, 72, 87, 49, 75,
- 63, 63, 78, 97, 98, 132, 133, 83, 24, 95,
- 24, 69, 98, 103, 72, 24, 61, 62, 63, 64,
- 78, 96, 95, 68, 358, 98, 71, 72, 73, 97,
- 98, 98, 96, 97, 95, 24, 74, 75, 76, 77,
- 97, 98, 87, 88, 89, 90, 91, 92, 93, 34,
- 35, 98, 44, 99, 24, 24, 24, 288, 52, 135,
- 51, 98, 128, 139, 140, 141, 142, 143, 144, 145,
+ 6, 7, 79, 9, 0, 166, 270, 35, 0, 28,
+ 4, 96, 18, 286, 8, 41, 22, 6, 7, 50,
+ 96, 27, 28, 99, 30, 31, 32, 33, 34, 35,
+ 36, 34, 50, 39, 40, 41, 42, 14, 64, 24,
+ 25, 53, 306, 49, 21, 51, 52, 25, 25, 26,
+ 53, 28, 64, 130, 131, 96, 329, 85, 99, 25,
+ 53, 96, 68, 69, 99, 25, 72, 53, 87, 75,
+ 97, 64, 78, 25, 69, 132, 133, 83, 64, 26,
+ 69, 28, 99, 72, 103, 69, 99, 69, 72, 78,
+ 75, 76, 77, 78, 358, 45, 91, 92, 93, 94,
+ 55, 56, 96, 97, 96, 25, 90, 91, 92, 93,
+ 94, 93, 94, 17, 18, 19, 25, 98, 99, 98,
+ 99, 25, 25, 100, 98, 99, 53, 288, 32, 135,
+ 35, 36, 128, 139, 140, 141, 142, 143, 144, 145,
146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
- 24, 157, 24, 101, 101, 161, 98, 100, 164, 216,
- 98, 24, 98, 46, 170, 24, 98, 244, 24, 175,
- 176, 271, 178, 179, 51, 68, 182, 183, 184, 173,
- 186, 41, 282, 189, 190, 191, 192, 193, 194, 195,
- 196, 197, 198, 68, 24, 24, 71, 90, 91, 92,
- 93, 51, 208, 303, 98, 24, 212, 213, 308, 85,
- 310, 205, 206, 24, 89, 90, 91, 92, 93, 16,
- 17, 18, 279, 280, 281, 52, 52, 24, 86, 24,
- 85, 84, 98, 24, 31, 51, 85, 85, 338, 84,
- 297, 298, 342, 84, 128, 200, 252, 253, 305, 52,
- 52, 174, 52, 353, -1, 355, 209, -1, -1, -1,
+ 52, 157, 25, 99, 25, 161, 99, 102, 164, 216,
+ 102, 101, 99, 25, 170, 99, 47, 244, 25, 175,
+ 176, 271, 178, 179, 99, 52, 182, 183, 184, 173,
+ 186, 25, 282, 189, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 42, 25, 25, 52, 25, 99, 86,
+ 25, 53, 208, 303, 87, 53, 212, 213, 308, 25,
+ 310, 205, 206, 99, 86, 85, 25, 86, 52, 86,
+ 85, 85, 279, 280, 281, 200, 52, -1, 128, 52,
+ 174, 52, -1, 209, -1, -1, -1, -1, 338, -1,
+ 297, 298, 342, -1, -1, -1, 252, 253, 305, -1,
+ -1, -1, -1, 353, -1, 355, -1, -1, -1, -1,
-1, -1, -1, -1, 321, -1, 343, -1, 325, 369,
-1, 348, -1, -1, -1, -1, -1, 334, 335, -1,
-1, -1, -1, 289, 341, -1, -1, 293, 294, 295,
296, -1, -1, -1, -1, -1, -1, 354, 292, 356,
-1, -1, -1, 360, -1, 362, -1, 364, -1, -1,
- -1, -1, 0, 1, -1, -1, 373, 323, -1, -1,
- -1, -1, -1, -1, 330, 13, -1, 333, 16, 17,
- -1, -1, 20, 21, 22, 23, 24, 25, -1, 27,
- 346, 29, 30, 31, 32, -1, -1, -1, 36, 37,
- 38, 39, -1, -1, -1, 43, -1, 45, -1, -1,
- 48, 49, 50, -1, -1, 53, -1, -1, -1, 57,
- 58, 59, 60, -1, -1, -1, -1, -1, -1, 67,
- -1, -1, -1, -1, -1, -1, 74, 75, 76, 77,
- 78, -1, -1, 81, 82, 83, -1, -1, -1, -1,
- -1, -1, 90, 91, -1, -1, 13, 95, 96, 16,
- 17, 99, -1, 20, -1, 22, 23, 24, 25, -1,
- 27, -1, -1, -1, 31, 32, 41, -1, -1, -1,
+ -1, 0, 1, -1, -1, -1, 373, 323, -1, -1,
+ -1, -1, -1, -1, 330, 14, -1, 333, 17, 18,
+ -1, -1, 21, 22, 23, 24, 25, 26, -1, 28,
+ 346, 30, 31, 32, 33, -1, -1, -1, 37, 38,
+ 39, 40, -1, -1, -1, 44, -1, 46, -1, -1,
+ 49, 50, 51, -1, -1, 54, -1, -1, -1, 58,
+ 59, 60, 61, -1, -1, -1, -1, -1, -1, 68,
+ -1, -1, -1, -1, -1, -1, 75, 76, 77, 78,
+ 79, -1, -1, 82, 83, 84, -1, -1, -1, -1,
+ -1, -1, 91, 92, -1, -1, 14, 96, 97, 17,
+ 18, 100, -1, 21, -1, 23, 24, 25, 26, -1,
+ 28, -1, -1, -1, 32, 33, 42, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 48, -1, 50, -1, -1, 61, 62, 63, 64,
- 65, 66, -1, 68, 69, 70, 71, 72, 73, -1,
- 67, -1, -1, -1, -1, -1, -1, 74, 75, 76,
- 77, 78, 87, 88, 89, 90, 91, 92, 93, -1,
- -1, -1, -1, 90, 91, -1, -1, -1, -1, 96,
- -1, -1, 99, 13, 101, -1, 16, 17, -1, -1,
- 20, 21, 22, 23, 24, 25, -1, 27, -1, 29,
- 30, 31, 32, -1, -1, -1, 36, 37, 38, 39,
- -1, -1, -1, 43, -1, 45, -1, -1, 48, 49,
- 50, -1, -1, 53, -1, -1, -1, 57, 58, 59,
- 60, -1, -1, -1, -1, -1, -1, 67, -1, -1,
- -1, -1, -1, -1, 74, 75, 76, 77, 78, -1,
- -1, 81, 82, 83, -1, -1, -1, -1, -1, -1,
- 90, 91, -1, -1, 13, -1, 96, 16, 17, 99,
- -1, 20, 21, 22, 23, 24, 25, -1, 27, 28,
- 29, -1, 31, 32, -1, -1, -1, 36, 37, 38,
- 39, -1, -1, -1, -1, -1, 45, -1, -1, 48,
- 49, 50, -1, -1, 53, -1, -1, -1, -1, 58,
- 59, 60, -1, -1, -1, -1, -1, -1, 67, -1,
- -1, -1, -1, -1, -1, 74, 75, 76, 77, 78,
- -1, -1, 81, 82, -1, -1, -1, -1, -1, -1,
- -1, 90, 91, -1, -1, 13, 95, 96, 16, 17,
- 99, -1, 20, 21, 22, 23, 24, 25, -1, 27,
- -1, 29, -1, 31, 32, -1, -1, -1, 36, 37,
- 38, 39, -1, -1, -1, -1, -1, 45, -1, -1,
- 48, 49, 50, -1, -1, 53, -1, -1, -1, -1,
- 58, 59, 60, -1, -1, -1, -1, -1, -1, 67,
- -1, -1, -1, -1, -1, -1, 74, 75, 76, 77,
- 78, -1, -1, 81, 82, -1, -1, -1, -1, -1,
- -1, -1, 90, 91, -1, -1, 13, 95, 96, 16,
- 17, 99, -1, 20, 21, 22, 23, 24, 25, -1,
- 27, -1, 29, -1, 31, 32, -1, -1, -1, 36,
+ -1, 49, -1, 51, -1, -1, 62, 63, 64, 65,
+ 66, 67, -1, 69, 70, 71, 72, 73, 74, -1,
+ 68, -1, -1, -1, -1, -1, -1, 75, 76, 77,
+ 78, 79, 88, 89, 90, 91, 92, 93, 94, -1,
+ -1, -1, -1, 91, 92, -1, -1, -1, -1, 97,
+ -1, -1, 100, 14, 102, -1, 17, 18, -1, -1,
+ 21, 22, 23, 24, 25, 26, -1, 28, -1, 30,
+ 31, 32, 33, -1, -1, -1, 37, 38, 39, 40,
+ -1, -1, -1, 44, -1, 46, -1, -1, 49, 50,
+ 51, -1, -1, 54, -1, -1, -1, 58, 59, 60,
+ 61, -1, -1, -1, -1, -1, -1, 68, -1, -1,
+ -1, -1, -1, -1, 75, 76, 77, 78, 79, -1,
+ -1, 82, 83, 84, -1, -1, -1, -1, -1, -1,
+ 91, 92, -1, -1, 14, -1, 97, 17, 18, 100,
+ -1, 21, 22, 23, 24, 25, 26, -1, 28, 29,
+ 30, -1, 32, 33, -1, -1, -1, 37, 38, 39,
+ 40, -1, -1, -1, -1, -1, 46, -1, -1, 49,
+ 50, 51, -1, -1, 54, -1, -1, -1, -1, 59,
+ 60, 61, -1, -1, -1, -1, -1, -1, 68, -1,
+ -1, -1, -1, -1, -1, 75, 76, 77, 78, 79,
+ -1, -1, 82, 83, -1, -1, -1, -1, -1, -1,
+ -1, 91, 92, -1, -1, 14, 96, 97, 17, 18,
+ 100, -1, 21, 22, 23, 24, 25, 26, -1, 28,
+ -1, 30, -1, 32, 33, -1, -1, -1, 37, 38,
+ 39, 40, -1, -1, -1, -1, -1, 46, -1, -1,
+ 49, 50, 51, -1, -1, 54, -1, -1, -1, -1,
+ 59, 60, 61, -1, -1, -1, -1, -1, -1, 68,
+ -1, -1, -1, -1, -1, -1, 75, 76, 77, 78,
+ 79, -1, -1, 82, 83, -1, -1, -1, -1, -1,
+ -1, -1, 91, 92, -1, -1, 14, 96, 97, 17,
+ 18, 100, -1, 21, 22, 23, 24, 25, 26, -1,
+ 28, -1, 30, -1, 32, 33, -1, -1, -1, 37,
+ 38, 39, 40, -1, -1, -1, -1, -1, -1, -1,
+ -1, 49, -1, 51, -1, -1, -1, -1, -1, -1,
+ -1, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+ 68, -1, -1, -1, -1, -1, -1, 75, 76, 77,
+ 78, 79, -1, -1, -1, 83, -1, -1, -1, -1,
+ -1, -1, -1, 91, 92, -1, -1, 14, -1, 97,
+ 17, 18, 100, -1, 21, 22, 23, 24, 25, 26,
+ -1, 28, -1, 30, -1, 32, 33, -1, -1, -1,
37, 38, 39, -1, -1, -1, -1, -1, -1, -1,
- -1, 48, -1, 50, -1, -1, -1, -1, -1, -1,
- -1, 58, 59, 60, -1, -1, -1, -1, -1, -1,
- 67, -1, -1, -1, -1, -1, -1, 74, 75, 76,
- 77, 78, -1, -1, -1, 82, -1, -1, -1, -1,
- -1, -1, -1, 90, 91, -1, -1, 13, -1, 96,
- 16, 17, 99, -1, 20, 21, 22, 23, 24, 25,
- -1, 27, -1, 29, -1, 31, 32, -1, -1, -1,
- 36, 37, 38, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, -1, 50, -1, -1, -1, -1, -1,
- -1, -1, 58, 59, 60, -1, -1, -1, -1, -1,
- -1, 67, -1, -1, -1, -1, -1, -1, 74, 75,
- 76, 77, 78, -1, -1, -1, 82, -1, -1, -1,
- -1, -1, -1, -1, 90, 91, -1, -1, 13, -1,
- 96, 16, 17, 99, -1, 20, -1, 22, 23, 24,
- 25, -1, 27, -1, -1, -1, 31, 32, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 42, -1, 44,
- 45, 46, 47, 48, -1, 50, 13, -1, -1, 16,
- 17, -1, -1, 20, -1, 22, 23, 24, 25, -1,
- 27, -1, 67, -1, 31, 32, -1, -1, -1, 74,
- 75, 76, 77, 78, -1, -1, -1, 44, -1, 46,
- -1, 48, -1, 50, -1, 90, 91, -1, -1, -1,
- -1, 96, -1, -1, 99, -1, -1, -1, -1, -1,
- 67, -1, -1, -1, -1, -1, -1, 74, 75, 76,
- 77, 78, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 90, 91, -1, -1, 13, -1, 96,
- 16, 17, 99, 19, 20, -1, 22, 23, 24, 25,
- -1, 27, -1, -1, -1, 31, 32, -1, -1, -1,
+ -1, -1, 49, -1, 51, -1, -1, -1, -1, -1,
+ -1, -1, 59, 60, 61, -1, -1, -1, -1, -1,
+ -1, 68, -1, -1, -1, -1, -1, -1, 75, 76,
+ 77, 78, 79, -1, -1, -1, 83, -1, -1, -1,
+ -1, -1, -1, -1, 91, 92, -1, -1, 14, -1,
+ 97, 17, 18, 100, -1, 21, -1, 23, 24, 25,
+ 26, -1, 28, -1, -1, -1, 32, 33, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 43, -1, 45,
+ 46, 47, 48, 49, -1, 51, 14, -1, -1, 17,
+ 18, -1, -1, 21, -1, 23, 24, 25, 26, -1,
+ 28, -1, 68, -1, 32, 33, -1, -1, -1, 75,
+ 76, 77, 78, 79, -1, -1, -1, 45, -1, 47,
+ -1, 49, -1, 51, -1, 91, 92, -1, -1, -1,
+ -1, 97, -1, -1, 100, -1, -1, -1, -1, -1,
+ 68, -1, -1, -1, -1, -1, -1, 75, 76, 77,
+ 78, 79, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 91, 92, -1, -1, 14, -1, 97,
+ 17, 18, 100, 20, 21, -1, 23, 24, 25, 26,
+ -1, 28, -1, -1, -1, 32, 33, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 48, -1, 50, 13, -1, -1, 16, 17,
- -1, -1, 20, -1, 22, 23, 24, 25, -1, 27,
- -1, 67, -1, 31, 32, -1, -1, -1, 74, 75,
- 76, 77, 78, -1, -1, -1, -1, -1, -1, -1,
- 48, -1, 50, -1, 90, 91, -1, -1, -1, -1,
- 96, -1, -1, 99, -1, -1, -1, -1, -1, 67,
- -1, -1, -1, -1, -1, -1, 74, 75, 76, 77,
- 78, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 90, 91, -1, -1, 13, -1, 96, 16,
- 17, 99, -1, 20, -1, 22, 23, 24, 25, -1,
- 27, -1, -1, -1, 31, 32, -1, -1, -1, -1,
+ -1, -1, 49, -1, 51, 14, -1, -1, 17, 18,
+ -1, -1, 21, -1, 23, 24, 25, 26, -1, 28,
+ -1, 68, -1, 32, 33, -1, -1, -1, 75, 76,
+ 77, 78, 79, -1, -1, -1, -1, -1, -1, -1,
+ 49, -1, 51, -1, 91, 92, -1, -1, -1, -1,
+ 97, -1, -1, 100, -1, -1, -1, -1, -1, 68,
+ -1, -1, -1, -1, -1, -1, 75, 76, 77, 78,
+ 79, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 91, 92, -1, -1, 14, -1, 97, 17,
+ 18, 100, -1, 21, -1, 23, 24, 25, 26, -1,
+ 28, -1, -1, -1, 32, 33, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 48, -1, 50, 13, -1, -1, 16, 17, -1,
- -1, 20, -1, 22, 23, 24, 25, -1, 27, -1,
- 67, -1, 31, 32, -1, -1, -1, 74, 75, 76,
- 77, 78, -1, -1, -1, -1, -1, -1, -1, 48,
- -1, 50, -1, 90, 91, -1, -1, -1, -1, 96,
- -1, -1, 99, -1, -1, -1, -1, -1, 67, -1,
- -1, -1, -1, -1, -1, 74, 75, 76, 77, 78,
+ -1, 49, -1, 51, 14, -1, -1, 17, 18, -1,
+ -1, 21, -1, 23, 24, 25, 26, -1, 28, -1,
+ 68, -1, 32, 33, -1, -1, -1, 75, 76, 77,
+ 78, 79, -1, -1, -1, -1, -1, -1, -1, 49,
+ -1, 51, -1, 91, 92, -1, -1, -1, -1, 97,
+ -1, -1, 100, -1, -1, -1, -1, -1, 68, -1,
+ -1, -1, -1, -1, -1, 75, 76, 77, 78, 79,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 90, 91, -1, -1, 13, -1, 96, 16, 17,
- 99, -1, 20, -1, 22, 23, 24, 25, -1, 27,
- -1, -1, -1, 31, 32, -1, -1, -1, 44, -1,
- 46, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 48, -1, 50, -1, -1, 61, 62, 63, 64, 65,
- 66, -1, 68, -1, -1, 71, 72, 73, -1, 67,
- -1, -1, -1, -1, -1, -1, 74, 75, 76, 77,
- 78, 87, 88, 89, 90, 91, 92, 93, 46, -1,
- -1, -1, 90, 91, 52, -1, -1, -1, 96, -1,
- -1, 99, -1, 61, 62, 63, 64, 65, 66, -1,
- 68, -1, -1, 71, 72, 73, -1, -1, -1, -1,
- -1, 46, -1, -1, -1, -1, -1, 52, -1, 87,
- 88, 89, 90, 91, 92, 93, 61, 62, 63, 64,
- 65, 66, -1, 68, -1, -1, 71, 72, 73, -1,
- -1, -1, -1, -1, 46, -1, -1, -1, -1, -1,
- 52, -1, 87, 88, 89, 90, 91, 92, 93, 61,
- 62, 63, 64, 65, 66, -1, 68, -1, -1, 71,
- 72, 73, -1, -1, -1, -1, -1, 46, -1, -1,
- -1, -1, -1, 52, -1, 87, 88, 89, 90, 91,
- 92, 93, 61, 62, 63, 64, 65, 66, -1, 68,
- -1, -1, 71, 72, 73, -1, -1, -1, -1, -1,
- 46, -1, -1, -1, -1, -1, -1, -1, 87, 88,
- 89, 90, 91, 92, 93, 61, 62, 63, 64, 65,
- 66, -1, 68, -1, -1, 71, 72, 73, -1, -1,
- -1, -1, -1, 46, -1, -1, -1, -1, -1, -1,
- -1, 87, 88, 89, 90, 91, 92, 93, 61, 62,
- 63, 64, 65, 66, -1, 68, -1, -1, 71, 72,
- 73, -1, -1, -1, -1, -1, 46, -1, -1, -1,
- -1, -1, -1, -1, 87, 88, 89, 90, 91, 92,
- 93, 61, 62, 63, 64, 65, 66, -1, 68, -1,
- -1, 71, 72, 73, -1, -1, -1, -1, -1, 46,
- -1, -1, -1, -1, -1, -1, -1, 87, 88, 89,
- 90, 91, 92, 93, 61, 62, 63, 64, 65, 66,
- -1, 68, -1, -1, 71, 72, 73, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 52, -1,
- 87, 88, 89, 90, 91, 92, 93, 61, 62, 63,
- 64, 65, 66, 54, 68, -1, -1, 71, 72, 73,
- 61, 62, 63, 64, 65, 66, -1, 68, -1, -1,
- 71, 72, 73, 87, 88, 89, 90, 91, 92, 93,
- -1, 95, -1, -1, -1, -1, 87, 88, 89, 90,
- 91, 92, 93, 61, 62, 63, 64, 65, 66, -1,
- 68, -1, -1, 71, 72, 73, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 87,
- 88, 89, 90, 91, 92, 93, -1, -1, -1, 97,
- 61, 62, 63, 64, 65, 66, -1, 68, -1, -1,
- 71, 72, 73, -1, -1, -1, -1, -1, 79, 80,
- -1, -1, -1, -1, -1, -1, 87, 88, 89, 90,
- 91, 92, 93, 61, 62, 63, 64, 65, 66, -1,
- 68, -1, -1, 71, 72, 73, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 87,
- 88, 89, 90, 91, 92, 93
+ -1, 91, 92, -1, -1, 14, -1, 97, 17, 18,
+ 100, -1, 21, -1, 23, 24, 25, 26, -1, 28,
+ -1, -1, -1, 32, 33, -1, -1, -1, 45, -1,
+ 47, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 49, -1, 51, -1, -1, 62, 63, 64, 65, 66,
+ 67, -1, 69, -1, -1, 72, 73, 74, -1, 68,
+ -1, -1, -1, -1, -1, -1, 75, 76, 77, 78,
+ 79, 88, 89, 90, 91, 92, 93, 94, 47, -1,
+ -1, -1, 91, 92, 53, -1, -1, -1, 97, -1,
+ -1, 100, -1, 62, 63, 64, 65, 66, 67, -1,
+ 69, -1, -1, 72, 73, 74, -1, -1, -1, -1,
+ -1, 47, -1, -1, -1, -1, -1, 53, -1, 88,
+ 89, 90, 91, 92, 93, 94, 62, 63, 64, 65,
+ 66, 67, -1, 69, -1, -1, 72, 73, 74, -1,
+ -1, -1, -1, -1, 47, -1, -1, -1, -1, -1,
+ 53, -1, 88, 89, 90, 91, 92, 93, 94, 62,
+ 63, 64, 65, 66, 67, -1, 69, -1, -1, 72,
+ 73, 74, -1, -1, -1, -1, -1, 47, -1, -1,
+ -1, -1, -1, 53, -1, 88, 89, 90, 91, 92,
+ 93, 94, 62, 63, 64, 65, 66, 67, -1, 69,
+ -1, -1, 72, 73, 74, -1, -1, -1, -1, -1,
+ 47, -1, -1, -1, -1, -1, -1, -1, 88, 89,
+ 90, 91, 92, 93, 94, 62, 63, 64, 65, 66,
+ 67, -1, 69, -1, -1, 72, 73, 74, -1, -1,
+ -1, -1, -1, 47, -1, -1, -1, -1, -1, -1,
+ -1, 88, 89, 90, 91, 92, 93, 94, 62, 63,
+ 64, 65, 66, 67, -1, 69, -1, -1, 72, 73,
+ 74, -1, -1, -1, -1, -1, 47, -1, -1, -1,
+ -1, -1, -1, -1, 88, 89, 90, 91, 92, 93,
+ 94, 62, 63, 64, 65, 66, 67, -1, 69, -1,
+ -1, 72, 73, 74, -1, -1, -1, -1, -1, 47,
+ -1, -1, -1, -1, -1, -1, -1, 88, 89, 90,
+ 91, 92, 93, 94, 62, 63, 64, 65, 66, 67,
+ -1, 69, -1, -1, 72, 73, 74, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 53, -1,
+ 88, 89, 90, 91, 92, 93, 94, 62, 63, 64,
+ 65, 66, 67, 55, 69, -1, -1, 72, 73, 74,
+ 62, 63, 64, 65, 66, 67, -1, 69, -1, -1,
+ 72, 73, 74, 88, 89, 90, 91, 92, 93, 94,
+ -1, 96, -1, -1, -1, -1, 88, 89, 90, 91,
+ 92, 93, 94, 62, 63, 64, 65, 66, 67, -1,
+ 69, -1, -1, 72, 73, 74, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 88,
+ 89, 90, 91, 92, 93, 94, -1, -1, -1, 98,
+ 62, 63, 64, 65, 66, 67, -1, 69, -1, -1,
+ 72, 73, 74, -1, -1, -1, -1, -1, 80, 81,
+ -1, -1, -1, -1, -1, -1, 88, 89, 90, 91,
+ 92, 93, 94, 62, 63, 64, 65, 66, 67, -1,
+ 69, -1, -1, 72, 73, 74, 62, 63, 64, 65,
+ -1, -1, -1, 69, -1, -1, 72, 73, 74, 88,
+ 89, 90, 91, 92, 93, 94, -1, -1, -1, -1,
+ -1, -1, 88, 89, 90, 91, 92, 93, 94
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 1, 13, 16, 17, 20, 21, 22, 23, 24,
- 25, 27, 29, 30, 31, 32, 36, 37, 38, 39,
- 43, 45, 48, 49, 50, 53, 57, 58, 59, 60,
- 67, 74, 75, 76, 77, 78, 81, 82, 83, 90,
- 91, 96, 99, 103, 104, 105, 106, 108, 110, 114,
- 115, 116, 121, 122, 123, 124, 125, 126, 132, 134,
- 136, 140, 145, 148, 95, 24, 122, 24, 48, 96,
- 123, 146, 96, 146, 122, 96, 123, 147, 135, 139,
- 49, 127, 42, 44, 45, 46, 47, 123, 133, 137,
- 49, 19, 123, 54, 55, 16, 17, 18, 24, 31,
- 24, 24, 123, 123, 133, 24, 131, 123, 123, 123,
- 123, 123, 123, 123, 128, 141, 123, 123, 123, 25,
- 27, 101, 123, 149, 150, 151, 152, 0, 95, 123,
- 40, 63, 123, 107, 113, 116, 123, 126, 145, 61,
- 62, 63, 64, 65, 66, 68, 71, 72, 73, 87,
- 88, 89, 90, 91, 92, 93, 118, 96, 123, 123,
- 146, 98, 146, 146, 98, 146, 118, 24, 129, 123,
- 44, 133, 24, 24, 41, 69, 70, 24, 52, 63,
- 122, 122, 52, 63, 52, 51, 54, 133, 98, 46,
- 52, 46, 52, 46, 52, 46, 52, 79, 80, 52,
- 95, 24, 130, 24, 97, 101, 101, 100, 98, 98,
- 104, 119, 118, 118, 119, 119, 123, 123, 123, 123,
- 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
- 123, 123, 123, 123, 24, 142, 97, 123, 97, 97,
- 123, 142, 98, 123, 138, 122, 24, 125, 123, 123,
- 123, 123, 52, 63, 46, 123, 123, 123, 123, 24,
- 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
- 109, 109, 98, 122, 122, 123, 25, 27, 152, 120,
- 123, 123, 51, 119, 95, 98, 95, 24, 118, 41,
- 123, 123, 24, 46, 46, 46, 46, 106, 120, 24,
- 95, 108, 119, 119, 119, 120, 51, 98, 144, 24,
- 144, 142, 123, 122, 123, 123, 123, 123, 119, 119,
- 85, 120, 33, 52, 119, 106, 24, 120, 120, 95,
- 52, 86, 119, 52, 123, 111, 119, 28, 144, 123,
- 85, 123, 119, 34, 35, 112, 117, 119, 34, 84,
- 24, 143, 120, 119, 120, 118, 123, 84, 118, 98,
- 120, 119, 120, 119, 106, 24, 119, 85, 119, 51,
- 119, 85, 84, 120, 84, 119
+ 0, 1, 14, 17, 18, 21, 22, 23, 24, 25,
+ 26, 28, 30, 31, 32, 33, 37, 38, 39, 40,
+ 44, 46, 49, 50, 51, 54, 58, 59, 60, 61,
+ 68, 75, 76, 77, 78, 79, 82, 83, 84, 91,
+ 92, 97, 100, 104, 105, 106, 107, 109, 111, 115,
+ 116, 117, 122, 123, 124, 125, 126, 127, 133, 135,
+ 137, 141, 146, 149, 96, 25, 123, 25, 49, 97,
+ 124, 147, 97, 147, 123, 97, 124, 148, 136, 140,
+ 50, 128, 43, 45, 46, 47, 48, 124, 134, 138,
+ 50, 20, 124, 55, 56, 17, 18, 19, 25, 32,
+ 25, 25, 124, 124, 134, 25, 132, 124, 124, 124,
+ 124, 124, 124, 124, 129, 142, 124, 124, 124, 26,
+ 28, 102, 124, 150, 151, 152, 153, 0, 96, 124,
+ 41, 64, 124, 108, 114, 117, 124, 127, 146, 62,
+ 63, 64, 65, 66, 67, 69, 72, 73, 74, 88,
+ 89, 90, 91, 92, 93, 94, 119, 97, 124, 124,
+ 147, 99, 147, 147, 99, 147, 119, 25, 130, 124,
+ 45, 134, 25, 25, 42, 70, 71, 25, 53, 64,
+ 123, 123, 53, 64, 53, 52, 55, 134, 99, 47,
+ 53, 47, 53, 47, 53, 47, 53, 80, 81, 53,
+ 96, 25, 131, 25, 98, 102, 102, 101, 99, 99,
+ 105, 120, 119, 119, 120, 120, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 25, 143, 98, 124, 98, 98,
+ 124, 143, 99, 124, 139, 123, 25, 126, 124, 124,
+ 124, 124, 53, 64, 47, 124, 124, 124, 124, 25,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 110, 110, 99, 123, 123, 124, 26, 28, 153, 121,
+ 124, 124, 52, 120, 96, 99, 96, 25, 119, 42,
+ 124, 124, 25, 47, 47, 47, 47, 107, 121, 25,
+ 96, 109, 120, 120, 120, 121, 52, 99, 145, 25,
+ 145, 143, 124, 123, 124, 124, 124, 124, 120, 120,
+ 86, 121, 34, 53, 120, 107, 25, 121, 121, 96,
+ 53, 87, 120, 53, 124, 112, 120, 29, 145, 124,
+ 86, 124, 120, 35, 36, 113, 118, 120, 35, 85,
+ 25, 144, 121, 120, 121, 119, 124, 85, 119, 99,
+ 121, 120, 121, 120, 107, 25, 120, 86, 120, 52,
+ 120, 86, 85, 121, 85, 120
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 102, 103, 103, 103, 104, 104, 104, 105, 105,
- 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
- 105, 106, 106, 106, 107, 107, 107, 107, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 109, 110,
- 110, 111, 111, 112, 113, 113, 114, 115, 116, 117,
- 118, 119, 120, 120, 120, 121, 122, 122, 122, 122,
- 122, 122, 123, 123, 123, 123, 123, 123, 123, 123,
- 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
- 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
- 123, 123, 123, 123, 123, 124, 124, 124, 124, 124,
- 124, 124, 124, 125, 125, 126, 126, 126, 126, 126,
- 127, 126, 128, 126, 126, 126, 126, 126, 126, 129,
- 129, 130, 130, 131, 131, 132, 132, 132, 132, 132,
- 132, 133, 133, 134, 134, 134, 135, 134, 137, 138,
- 136, 136, 139, 136, 136, 136, 141, 140, 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, 103, 104, 104, 104, 105, 105, 105, 106, 106,
+ 106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
+ 106, 107, 107, 107, 108, 108, 108, 108, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 110, 111,
+ 111, 112, 112, 113, 114, 114, 115, 116, 117, 118,
+ 119, 120, 121, 121, 121, 122, 123, 123, 123, 123,
+ 123, 123, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 124, 124, 124, 124, 124,
+ 124, 124, 124, 124, 124, 125, 125, 125, 125, 125,
+ 125, 125, 125, 126, 126, 127, 127, 127, 127, 127,
+ 128, 127, 129, 127, 127, 127, 127, 127, 127, 130,
+ 130, 131, 131, 132, 132, 133, 133, 133, 133, 133,
+ 133, 134, 134, 135, 135, 135, 136, 135, 138, 139,
+ 137, 137, 140, 137, 137, 137, 142, 141, 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
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -1717,76 +1720,76 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
switch (yytype)
{
- case 21: /* BLTIN */
+ case 22: /* BLTIN */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1724 "engines/director/lingo/lingo-gr.cpp"
+#line 1727 "engines/director/lingo/lingo-gr.cpp"
break;
- case 22: /* FBLTIN */
+ case 23: /* FBLTIN */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1730 "engines/director/lingo/lingo-gr.cpp"
+#line 1733 "engines/director/lingo/lingo-gr.cpp"
break;
- case 23: /* RBLTIN */
+ case 24: /* RBLTIN */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1736 "engines/director/lingo/lingo-gr.cpp"
+#line 1739 "engines/director/lingo/lingo-gr.cpp"
break;
- case 24: /* ID */
+ case 25: /* ID */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1742 "engines/director/lingo/lingo-gr.cpp"
+#line 1745 "engines/director/lingo/lingo-gr.cpp"
break;
- case 25: /* STRING */
+ case 26: /* STRING */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1748 "engines/director/lingo/lingo-gr.cpp"
+#line 1751 "engines/director/lingo/lingo-gr.cpp"
break;
- case 26: /* HANDLER */
+ case 27: /* HANDLER */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1754 "engines/director/lingo/lingo-gr.cpp"
+#line 1757 "engines/director/lingo/lingo-gr.cpp"
break;
- case 27: /* SYMBOL */
+ case 28: /* SYMBOL */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1760 "engines/director/lingo/lingo-gr.cpp"
+#line 1763 "engines/director/lingo/lingo-gr.cpp"
break;
- case 28: /* ENDCLAUSE */
+ case 29: /* ENDCLAUSE */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1766 "engines/director/lingo/lingo-gr.cpp"
+#line 1769 "engines/director/lingo/lingo-gr.cpp"
break;
- case 29: /* tPLAYACCEL */
+ case 30: /* tPLAYACCEL */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1772 "engines/director/lingo/lingo-gr.cpp"
+#line 1775 "engines/director/lingo/lingo-gr.cpp"
break;
- case 30: /* tMETHOD */
+ case 31: /* tMETHOD */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1778 "engines/director/lingo/lingo-gr.cpp"
+#line 1781 "engines/director/lingo/lingo-gr.cpp"
break;
- case 31: /* THEOBJECTFIELD */
+ case 32: /* THEOBJECTFIELD */
#line 136 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).objectfield).os; }
-#line 1784 "engines/director/lingo/lingo-gr.cpp"
+#line 1787 "engines/director/lingo/lingo-gr.cpp"
break;
- case 140: /* on */
+ case 141: /* on */
#line 135 "engines/director/lingo/lingo-gr.y"
{ delete ((*yyvaluep).s); }
-#line 1790 "engines/director/lingo/lingo-gr.cpp"
+#line 1793 "engines/director/lingo/lingo-gr.cpp"
break;
default:
@@ -2056,7 +2059,7 @@ yyreduce:
case 4:
#line 142 "engines/director/lingo/lingo-gr.y"
{ yyerrok; }
-#line 2060 "engines/director/lingo/lingo-gr.cpp"
+#line 2063 "engines/director/lingo/lingo-gr.cpp"
break;
case 8:
@@ -2067,7 +2070,7 @@ yyreduce:
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code);
delete (yyvsp[0].s); }
-#line 2071 "engines/director/lingo/lingo-gr.cpp"
+#line 2074 "engines/director/lingo/lingo-gr.cpp"
break;
case 9:
@@ -2075,7 +2078,7 @@ yyreduce:
{
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[-2].code); }
-#line 2079 "engines/director/lingo/lingo-gr.cpp"
+#line 2082 "engines/director/lingo/lingo-gr.cpp"
break;
case 10:
@@ -2091,19 +2094,19 @@ yyreduce:
g_lingo->codeInt((yyvsp[-4].e)[0]);
g_lingo->codeInt((yyvsp[-4].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2095 "engines/director/lingo/lingo-gr.cpp"
+#line 2098 "engines/director/lingo/lingo-gr.cpp"
break;
case 11:
#line 169 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_after); }
-#line 2101 "engines/director/lingo/lingo-gr.cpp"
+#line 2104 "engines/director/lingo/lingo-gr.cpp"
break;
case 12:
#line 170 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_before); }
-#line 2107 "engines/director/lingo/lingo-gr.cpp"
+#line 2110 "engines/director/lingo/lingo-gr.cpp"
break;
case 13:
@@ -2114,7 +2117,7 @@ yyreduce:
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2118 "engines/director/lingo/lingo-gr.cpp"
+#line 2121 "engines/director/lingo/lingo-gr.cpp"
break;
case 14:
@@ -2126,7 +2129,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2130 "engines/director/lingo/lingo-gr.cpp"
+#line 2133 "engines/director/lingo/lingo-gr.cpp"
break;
case 15:
@@ -2137,7 +2140,7 @@ yyreduce:
g_lingo->code1(LC::c_assign);
(yyval.code) = (yyvsp[0].code);
delete (yyvsp[-2].s); }
-#line 2141 "engines/director/lingo/lingo-gr.cpp"
+#line 2144 "engines/director/lingo/lingo-gr.cpp"
break;
case 16:
@@ -2149,7 +2152,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].e)[0]);
g_lingo->codeInt((yyvsp[-2].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2153 "engines/director/lingo/lingo-gr.cpp"
+#line 2156 "engines/director/lingo/lingo-gr.cpp"
break;
case 17:
@@ -2160,7 +2163,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2164 "engines/director/lingo/lingo-gr.cpp"
+#line 2167 "engines/director/lingo/lingo-gr.cpp"
break;
case 18:
@@ -2171,7 +2174,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-3].e)[0]);
g_lingo->codeInt((yyvsp[-3].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2175 "engines/director/lingo/lingo-gr.cpp"
+#line 2178 "engines/director/lingo/lingo-gr.cpp"
break;
case 19:
@@ -2187,7 +2190,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-6].e)[0]);
g_lingo->codeInt((yyvsp[-6].e)[1]);
(yyval.code) = (yyvsp[0].code); }
-#line 2191 "engines/director/lingo/lingo-gr.cpp"
+#line 2194 "engines/director/lingo/lingo-gr.cpp"
break;
case 20:
@@ -2198,7 +2201,7 @@ yyreduce:
g_lingo->codeInt((yyvsp[-2].objectfield).oe);
delete (yyvsp[-2].objectfield).os;
(yyval.code) = (yyvsp[0].code); }
-#line 2202 "engines/director/lingo/lingo-gr.cpp"
+#line 2205 "engines/director/lingo/lingo-gr.cpp"
break;
case 30:
@@ -2209,7 +2212,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 2213 "engines/director/lingo/lingo-gr.cpp"
+#line 2216 "engines/director/lingo/lingo-gr.cpp"
break;
case 31:
@@ -2226,7 +2229,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 2230 "engines/director/lingo/lingo-gr.cpp"
+#line 2233 "engines/director/lingo/lingo-gr.cpp"
break;
case 32:
@@ -2243,7 +2246,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 4] = inc; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-11].code) + 5] = end; }
-#line 2247 "engines/director/lingo/lingo-gr.cpp"
+#line 2250 "engines/director/lingo/lingo-gr.cpp"
break;
case 33:
@@ -2258,14 +2261,14 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-7].code) + 3] = body; /* body of loop */
(*g_lingo->_currentScript)[(yyvsp[-7].code) + 4] = 0; /* increment */
(*g_lingo->_currentScript)[(yyvsp[-7].code) + 5] = end; }
-#line 2262 "engines/director/lingo/lingo-gr.cpp"
+#line 2265 "engines/director/lingo/lingo-gr.cpp"
break;
case 34:
#line 294 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(LC::c_nextRepeat); }
-#line 2269 "engines/director/lingo/lingo-gr.cpp"
+#line 2272 "engines/director/lingo/lingo-gr.cpp"
break;
case 35:
@@ -2275,7 +2278,7 @@ yyreduce:
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
g_lingo->code1(STOP);
(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
-#line 2279 "engines/director/lingo/lingo-gr.cpp"
+#line 2282 "engines/director/lingo/lingo-gr.cpp"
break;
case 36:
@@ -2284,7 +2287,7 @@ yyreduce:
inst end;
WRITE_UINT32(&end, (yyvsp[-1].code) - (yyvsp[-3].code));
(*g_lingo->_currentScript)[(yyvsp[-3].code) + 1] = end; }
-#line 2288 "engines/director/lingo/lingo-gr.cpp"
+#line 2291 "engines/director/lingo/lingo-gr.cpp"
break;
case 37:
@@ -2293,7 +2296,7 @@ yyreduce:
inst end;
WRITE_UINT32(&end, (yyvsp[0].code) - (yyvsp[-2].code));
(*g_lingo->_currentScript)[(yyvsp[-2].code) + 1] = end; }
-#line 2297 "engines/director/lingo/lingo-gr.cpp"
+#line 2300 "engines/director/lingo/lingo-gr.cpp"
break;
case 38:
@@ -2301,7 +2304,7 @@ yyreduce:
{
(yyval.code) = g_lingo->code1(LC::c_tellcode);
g_lingo->code1(STOP); }
-#line 2305 "engines/director/lingo/lingo-gr.cpp"
+#line 2308 "engines/director/lingo/lingo-gr.cpp"
break;
case 39:
@@ -2316,7 +2319,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 2320 "engines/director/lingo/lingo-gr.cpp"
+#line 2323 "engines/director/lingo/lingo-gr.cpp"
break;
case 40:
@@ -2331,7 +2334,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 2335 "engines/director/lingo/lingo-gr.cpp"
+#line 2338 "engines/director/lingo/lingo-gr.cpp"
break;
case 43:
@@ -2342,7 +2345,7 @@ yyreduce:
(*g_lingo->_currentScript)[(yyvsp[-5].code) + 1] = then; /* thenpart */
g_lingo->codeLabel((yyvsp[-5].code)); }
-#line 2346 "engines/director/lingo/lingo-gr.cpp"
+#line 2349 "engines/director/lingo/lingo-gr.cpp"
break;
case 44:
@@ -2357,7 +2360,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 2361 "engines/director/lingo/lingo-gr.cpp"
+#line 2364 "engines/director/lingo/lingo-gr.cpp"
break;
case 45:
@@ -2372,13 +2375,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 2376 "engines/director/lingo/lingo-gr.cpp"
+#line 2379 "engines/director/lingo/lingo-gr.cpp"
break;
case 46:
#line 366 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code3(LC::c_repeatwhilecode, STOP, STOP); }
-#line 2382 "engines/director/lingo/lingo-gr.cpp"
+#line 2385 "engines/director/lingo/lingo-gr.cpp"
break;
case 47:
@@ -2388,7 +2391,7 @@ yyreduce:
g_lingo->code3(STOP, STOP, STOP);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2392 "engines/director/lingo/lingo-gr.cpp"
+#line 2395 "engines/director/lingo/lingo-gr.cpp"
break;
case 48:
@@ -2398,7 +2401,7 @@ yyreduce:
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(0); // Do not skip end
g_lingo->codeLabel(0); }
-#line 2402 "engines/director/lingo/lingo-gr.cpp"
+#line 2405 "engines/director/lingo/lingo-gr.cpp"
break;
case 49:
@@ -2409,25 +2412,25 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_ifcode);
g_lingo->code3(STOP, STOP, STOP);
g_lingo->code1(skipEnd); }
-#line 2413 "engines/director/lingo/lingo-gr.cpp"
+#line 2416 "engines/director/lingo/lingo-gr.cpp"
break;
case 50:
#line 387 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2419 "engines/director/lingo/lingo-gr.cpp"
+#line 2422 "engines/director/lingo/lingo-gr.cpp"
break;
case 51:
#line 389 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2425 "engines/director/lingo/lingo-gr.cpp"
+#line 2428 "engines/director/lingo/lingo-gr.cpp"
break;
case 52:
#line 391 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->_currentScript->size(); }
-#line 2431 "engines/director/lingo/lingo-gr.cpp"
+#line 2434 "engines/director/lingo/lingo-gr.cpp"
break;
case 55:
@@ -2437,7 +2440,7 @@ yyreduce:
g_lingo->code1(STOP);
g_lingo->codeString((yyvsp[-1].s)->c_str());
delete (yyvsp[-1].s); }
-#line 2441 "engines/director/lingo/lingo-gr.cpp"
+#line 2444 "engines/director/lingo/lingo-gr.cpp"
break;
case 56:
@@ -2445,7 +2448,7 @@ yyreduce:
{
(yyval.code) = g_lingo->code1(LC::c_intpush);
g_lingo->codeInt((yyvsp[0].i)); }
-#line 2449 "engines/director/lingo/lingo-gr.cpp"
+#line 2452 "engines/director/lingo/lingo-gr.cpp"
break;
case 57:
@@ -2453,7 +2456,7 @@ yyreduce:
{
(yyval.code) = g_lingo->code1(LC::c_floatpush);
g_lingo->codeFloat((yyvsp[0].f)); }
-#line 2457 "engines/director/lingo/lingo-gr.cpp"
+#line 2460 "engines/director/lingo/lingo-gr.cpp"
break;
case 58:
@@ -2462,7 +2465,7 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2466 "engines/director/lingo/lingo-gr.cpp"
+#line 2469 "engines/director/lingo/lingo-gr.cpp"
break;
case 59:
@@ -2471,7 +2474,7 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2475 "engines/director/lingo/lingo-gr.cpp"
+#line 2478 "engines/director/lingo/lingo-gr.cpp"
break;
case 60:
@@ -2480,13 +2483,13 @@ yyreduce:
(yyval.code) = g_lingo->code1(LC::c_eval);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2484 "engines/director/lingo/lingo-gr.cpp"
+#line 2487 "engines/director/lingo/lingo-gr.cpp"
break;
case 62:
#line 421 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2490 "engines/director/lingo/lingo-gr.cpp"
+#line 2493 "engines/director/lingo/lingo-gr.cpp"
break;
case 64:
@@ -2494,7 +2497,7 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2498 "engines/director/lingo/lingo-gr.cpp"
+#line 2501 "engines/director/lingo/lingo-gr.cpp"
break;
case 65:
@@ -2502,7 +2505,7 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
-#line 2506 "engines/director/lingo/lingo-gr.cpp"
+#line 2509 "engines/director/lingo/lingo-gr.cpp"
break;
case 66:
@@ -2510,7 +2513,7 @@ yyreduce:
{
(yyval.code) = g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2514 "engines/director/lingo/lingo-gr.cpp"
+#line 2517 "engines/director/lingo/lingo-gr.cpp"
break;
case 67:
@@ -2523,7 +2526,7 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[0].e)[0]);
WRITE_UINT32(&f, (yyvsp[0].e)[1]);
g_lingo->code2(e, f); }
-#line 2527 "engines/director/lingo/lingo-gr.cpp"
+#line 2530 "engines/director/lingo/lingo-gr.cpp"
break;
case 68:
@@ -2534,7 +2537,7 @@ yyreduce:
WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
WRITE_UINT32(&f, (yyvsp[-1].e)[1]);
g_lingo->code2(e, f); }
-#line 2538 "engines/director/lingo/lingo-gr.cpp"
+#line 2541 "engines/director/lingo/lingo-gr.cpp"
break;
case 69:
@@ -2544,7 +2547,7 @@ yyreduce:
g_lingo->codeString((yyvsp[0].objectfield).os->c_str());
g_lingo->codeInt((yyvsp[0].objectfield).oe);
delete (yyvsp[0].objectfield).os; }
-#line 2548 "engines/director/lingo/lingo-gr.cpp"
+#line 2551 "engines/director/lingo/lingo-gr.cpp"
break;
case 70:
@@ -2555,193 +2558,193 @@ yyreduce:
g_lingo->codeString((yyvsp[0].objectref).field->c_str());
delete (yyvsp[0].objectref).obj;
delete (yyvsp[0].objectref).field; }
-#line 2559 "engines/director/lingo/lingo-gr.cpp"
+#line 2562 "engines/director/lingo/lingo-gr.cpp"
break;
case 72:
#line 458 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_add); }
-#line 2565 "engines/director/lingo/lingo-gr.cpp"
+#line 2568 "engines/director/lingo/lingo-gr.cpp"
break;
case 73:
#line 459 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_sub); }
-#line 2571 "engines/director/lingo/lingo-gr.cpp"
+#line 2574 "engines/director/lingo/lingo-gr.cpp"
break;
case 74:
#line 460 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mul); }
-#line 2577 "engines/director/lingo/lingo-gr.cpp"
+#line 2580 "engines/director/lingo/lingo-gr.cpp"
break;
case 75:
#line 461 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_div); }
-#line 2583 "engines/director/lingo/lingo-gr.cpp"
+#line 2586 "engines/director/lingo/lingo-gr.cpp"
break;
case 76:
#line 462 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_mod); }
-#line 2589 "engines/director/lingo/lingo-gr.cpp"
+#line 2592 "engines/director/lingo/lingo-gr.cpp"
break;
case 77:
#line 463 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gt); }
-#line 2595 "engines/director/lingo/lingo-gr.cpp"
+#line 2598 "engines/director/lingo/lingo-gr.cpp"
break;
case 78:
#line 464 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lt); }
-#line 2601 "engines/director/lingo/lingo-gr.cpp"
+#line 2604 "engines/director/lingo/lingo-gr.cpp"
break;
case 79:
#line 465 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_eq); }
-#line 2607 "engines/director/lingo/lingo-gr.cpp"
+#line 2610 "engines/director/lingo/lingo-gr.cpp"
break;
case 80:
#line 466 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_neq); }
-#line 2613 "engines/director/lingo/lingo-gr.cpp"
+#line 2616 "engines/director/lingo/lingo-gr.cpp"
break;
case 81:
#line 467 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ge); }
-#line 2619 "engines/director/lingo/lingo-gr.cpp"
+#line 2622 "engines/director/lingo/lingo-gr.cpp"
break;
case 82:
#line 468 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_le); }
-#line 2625 "engines/director/lingo/lingo-gr.cpp"
+#line 2628 "engines/director/lingo/lingo-gr.cpp"
break;
case 83:
#line 469 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_and); }
-#line 2631 "engines/director/lingo/lingo-gr.cpp"
+#line 2634 "engines/director/lingo/lingo-gr.cpp"
break;
case 84:
#line 470 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_or); }
-#line 2637 "engines/director/lingo/lingo-gr.cpp"
+#line 2640 "engines/director/lingo/lingo-gr.cpp"
break;
case 85:
#line 471 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_not); }
-#line 2643 "engines/director/lingo/lingo-gr.cpp"
+#line 2646 "engines/director/lingo/lingo-gr.cpp"
break;
case 86:
#line 472 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_ampersand); }
-#line 2649 "engines/director/lingo/lingo-gr.cpp"
+#line 2652 "engines/director/lingo/lingo-gr.cpp"
break;
case 87:
#line 473 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_concat); }
-#line 2655 "engines/director/lingo/lingo-gr.cpp"
+#line 2658 "engines/director/lingo/lingo-gr.cpp"
break;
case 88:
#line 474 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_contains); }
-#line 2661 "engines/director/lingo/lingo-gr.cpp"
+#line 2664 "engines/director/lingo/lingo-gr.cpp"
break;
case 89:
#line 475 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_starts); }
-#line 2667 "engines/director/lingo/lingo-gr.cpp"
+#line 2670 "engines/director/lingo/lingo-gr.cpp"
break;
case 90:
#line 476 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); }
-#line 2673 "engines/director/lingo/lingo-gr.cpp"
+#line 2676 "engines/director/lingo/lingo-gr.cpp"
break;
case 91:
#line 477 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[0].code); g_lingo->code1(LC::c_negate); }
-#line 2679 "engines/director/lingo/lingo-gr.cpp"
+#line 2682 "engines/director/lingo/lingo-gr.cpp"
break;
case 92:
#line 478 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 2685 "engines/director/lingo/lingo-gr.cpp"
+#line 2688 "engines/director/lingo/lingo-gr.cpp"
break;
case 93:
#line 479 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_intersects); }
-#line 2691 "engines/director/lingo/lingo-gr.cpp"
+#line 2694 "engines/director/lingo/lingo-gr.cpp"
break;
case 94:
#line 480 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_within); }
-#line 2697 "engines/director/lingo/lingo-gr.cpp"
+#line 2700 "engines/director/lingo/lingo-gr.cpp"
break;
case 95:
#line 482 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charOf); }
-#line 2703 "engines/director/lingo/lingo-gr.cpp"
+#line 2706 "engines/director/lingo/lingo-gr.cpp"
break;
case 96:
#line 483 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_charToOf); }
-#line 2709 "engines/director/lingo/lingo-gr.cpp"
+#line 2712 "engines/director/lingo/lingo-gr.cpp"
break;
case 97:
#line 484 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemOf); }
-#line 2715 "engines/director/lingo/lingo-gr.cpp"
+#line 2718 "engines/director/lingo/lingo-gr.cpp"
break;
case 98:
#line 485 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_itemToOf); }
-#line 2721 "engines/director/lingo/lingo-gr.cpp"
+#line 2724 "engines/director/lingo/lingo-gr.cpp"
break;
case 99:
#line 486 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineOf); }
-#line 2727 "engines/director/lingo/lingo-gr.cpp"
+#line 2730 "engines/director/lingo/lingo-gr.cpp"
break;
case 100:
#line 487 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_lineToOf); }
-#line 2733 "engines/director/lingo/lingo-gr.cpp"
+#line 2736 "engines/director/lingo/lingo-gr.cpp"
break;
case 101:
#line 488 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordOf); }
-#line 2739 "engines/director/lingo/lingo-gr.cpp"
+#line 2742 "engines/director/lingo/lingo-gr.cpp"
break;
case 102:
#line 489 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_wordToOf); }
-#line 2745 "engines/director/lingo/lingo-gr.cpp"
+#line 2748 "engines/director/lingo/lingo-gr.cpp"
break;
case 103:
@@ -2749,49 +2752,49 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-1].s), 1);
delete (yyvsp[-1].s); }
-#line 2753 "engines/director/lingo/lingo-gr.cpp"
+#line 2756 "engines/director/lingo/lingo-gr.cpp"
break;
case 105:
#line 496 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_printtop); }
-#line 2759 "engines/director/lingo/lingo-gr.cpp"
+#line 2762 "engines/director/lingo/lingo-gr.cpp"
break;
case 108:
#line 499 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_exitRepeat); }
-#line 2765 "engines/director/lingo/lingo-gr.cpp"
+#line 2768 "engines/director/lingo/lingo-gr.cpp"
break;
case 109:
#line 500 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_procret); }
-#line 2771 "engines/director/lingo/lingo-gr.cpp"
+#line 2774 "engines/director/lingo/lingo-gr.cpp"
break;
case 110:
#line 501 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2777 "engines/director/lingo/lingo-gr.cpp"
+#line 2780 "engines/director/lingo/lingo-gr.cpp"
break;
case 111:
#line 501 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateNone; }
-#line 2783 "engines/director/lingo/lingo-gr.cpp"
+#line 2786 "engines/director/lingo/lingo-gr.cpp"
break;
case 112:
#line 502 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2789 "engines/director/lingo/lingo-gr.cpp"
+#line 2792 "engines/director/lingo/lingo-gr.cpp"
break;
case 113:
#line 502 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateNone; }
-#line 2795 "engines/director/lingo/lingo-gr.cpp"
+#line 2798 "engines/director/lingo/lingo-gr.cpp"
break;
case 115:
@@ -2799,7 +2802,7 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-3].s), (yyvsp[-1].narg));
delete (yyvsp[-3].s); }
-#line 2803 "engines/director/lingo/lingo-gr.cpp"
+#line 2806 "engines/director/lingo/lingo-gr.cpp"
break;
case 116:
@@ -2807,19 +2810,19 @@ yyreduce:
{
g_lingo->codeFunc((yyvsp[-1].s), (yyvsp[0].narg));
delete (yyvsp[-1].s); }
-#line 2811 "engines/director/lingo/lingo-gr.cpp"
+#line 2814 "engines/director/lingo/lingo-gr.cpp"
break;
case 117:
#line 510 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_open); }
-#line 2817 "engines/director/lingo/lingo-gr.cpp"
+#line 2820 "engines/director/lingo/lingo-gr.cpp"
break;
case 118:
#line 511 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code2(LC::c_voidpush, LC::c_open); }
-#line 2823 "engines/director/lingo/lingo-gr.cpp"
+#line 2826 "engines/director/lingo/lingo-gr.cpp"
break;
case 119:
@@ -2828,7 +2831,7 @@ yyreduce:
g_lingo->code1(LC::c_global);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2832 "engines/director/lingo/lingo-gr.cpp"
+#line 2835 "engines/director/lingo/lingo-gr.cpp"
break;
case 120:
@@ -2837,7 +2840,7 @@ yyreduce:
g_lingo->code1(LC::c_global);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2841 "engines/director/lingo/lingo-gr.cpp"
+#line 2844 "engines/director/lingo/lingo-gr.cpp"
break;
case 121:
@@ -2846,7 +2849,7 @@ yyreduce:
g_lingo->code1(LC::c_property);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2850 "engines/director/lingo/lingo-gr.cpp"
+#line 2853 "engines/director/lingo/lingo-gr.cpp"
break;
case 122:
@@ -2855,7 +2858,7 @@ yyreduce:
g_lingo->code1(LC::c_property);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2859 "engines/director/lingo/lingo-gr.cpp"
+#line 2862 "engines/director/lingo/lingo-gr.cpp"
break;
case 123:
@@ -2864,7 +2867,7 @@ yyreduce:
g_lingo->code1(LC::c_instance);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2868 "engines/director/lingo/lingo-gr.cpp"
+#line 2871 "engines/director/lingo/lingo-gr.cpp"
break;
case 124:
@@ -2873,25 +2876,25 @@ yyreduce:
g_lingo->code1(LC::c_instance);
g_lingo->codeString((yyvsp[0].s)->c_str());
delete (yyvsp[0].s); }
-#line 2877 "engines/director/lingo/lingo-gr.cpp"
+#line 2880 "engines/director/lingo/lingo-gr.cpp"
break;
case 125:
#line 547 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoloop); }
-#line 2883 "engines/director/lingo/lingo-gr.cpp"
+#line 2886 "engines/director/lingo/lingo-gr.cpp"
break;
case 126:
#line 548 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotonext); }
-#line 2889 "engines/director/lingo/lingo-gr.cpp"
+#line 2892 "engines/director/lingo/lingo-gr.cpp"
break;
case 127:
#line 549 "engines/director/lingo/lingo-gr.y"
{ g_lingo->code1(LC::c_gotoprevious); }
-#line 2895 "engines/director/lingo/lingo-gr.cpp"
+#line 2898 "engines/director/lingo/lingo-gr.cpp"
break;
case 128:
@@ -2900,7 +2903,7 @@ yyreduce:
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_goto); }
-#line 2904 "engines/director/lingo/lingo-gr.cpp"
+#line 2907 "engines/director/lingo/lingo-gr.cpp"
break;
case 129:
@@ -2909,7 +2912,7 @@ yyreduce:
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_goto); }
-#line 2913 "engines/director/lingo/lingo-gr.cpp"
+#line 2916 "engines/director/lingo/lingo-gr.cpp"
break;
case 130:
@@ -2918,7 +2921,7 @@ yyreduce:
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_goto); }
-#line 2922 "engines/director/lingo/lingo-gr.cpp"
+#line 2925 "engines/director/lingo/lingo-gr.cpp"
break;
case 133:
@@ -2927,7 +2930,7 @@ yyreduce:
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(1);
g_lingo->code1(LC::c_play); }
-#line 2931 "engines/director/lingo/lingo-gr.cpp"
+#line 2934 "engines/director/lingo/lingo-gr.cpp"
break;
case 134:
@@ -2936,7 +2939,7 @@ yyreduce:
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(3);
g_lingo->code1(LC::c_play); }
-#line 2940 "engines/director/lingo/lingo-gr.cpp"
+#line 2943 "engines/director/lingo/lingo-gr.cpp"
break;
case 135:
@@ -2945,13 +2948,13 @@ yyreduce:
g_lingo->code1(LC::c_intpush);
g_lingo->codeInt(2);
g_lingo->code1(LC::c_play); }
-#line 2949 "engines/director/lingo/lingo-gr.cpp"
+#line 2952 "engines/director/lingo/lingo-gr.cpp"
break;
case 136:
#line 578 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeSetImmediate(true); }
-#line 2955 "engines/director/lingo/lingo-gr.cpp"
+#line 2958 "engines/director/lingo/lingo-gr.cpp"
break;
case 137:
@@ -2960,19 +2963,19 @@ yyreduce:
g_lingo->codeSetImmediate(false);
g_lingo->codeFunc((yyvsp[-2].s), (yyvsp[0].narg));
delete (yyvsp[-2].s); }
-#line 2964 "engines/director/lingo/lingo-gr.cpp"
+#line 2967 "engines/director/lingo/lingo-gr.cpp"
break;
case 138:
#line 608 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2970 "engines/director/lingo/lingo-gr.cpp"
+#line 2973 "engines/director/lingo/lingo-gr.cpp"
break;
case 139:
#line 608 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_currentFactory.clear(); }
-#line 2976 "engines/director/lingo/lingo-gr.cpp"
+#line 2979 "engines/director/lingo/lingo-gr.cpp"
break;
case 140:
@@ -2983,19 +2986,19 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 2987 "engines/director/lingo/lingo-gr.cpp"
+#line 2990 "engines/director/lingo/lingo-gr.cpp"
break;
case 141:
#line 615 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeFactory(*(yyvsp[0].s)); delete (yyvsp[0].s); }
-#line 2993 "engines/director/lingo/lingo-gr.cpp"
+#line 2996 "engines/director/lingo/lingo-gr.cpp"
break;
case 142:
#line 616 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 2999 "engines/director/lingo/lingo-gr.cpp"
+#line 3002 "engines/director/lingo/lingo-gr.cpp"
break;
case 143:
@@ -3006,7 +3009,7 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_indef = kStateNone;
delete (yyvsp[-6].s); }
-#line 3010 "engines/director/lingo/lingo-gr.cpp"
+#line 3013 "engines/director/lingo/lingo-gr.cpp"
break;
case 144:
@@ -3021,7 +3024,7 @@ yyreduce:
checkEnd((yyvsp[-1].s), (yyvsp[-7].s)->c_str(), false);
delete (yyvsp[-7].s);
delete (yyvsp[-1].s); }
-#line 3025 "engines/director/lingo/lingo-gr.cpp"
+#line 3028 "engines/director/lingo/lingo-gr.cpp"
break;
case 145:
@@ -3033,61 +3036,61 @@ yyreduce:
g_lingo->clearArgStack();
g_lingo->_ignoreMe = false;
delete (yyvsp[-5].s); }
-#line 3037 "engines/director/lingo/lingo-gr.cpp"
+#line 3040 "engines/director/lingo/lingo-gr.cpp"
break;
case 146:
#line 641 "engines/director/lingo/lingo-gr.y"
{ g_lingo->_indef = kStateInArgs; }
-#line 3043 "engines/director/lingo/lingo-gr.cpp"
+#line 3046 "engines/director/lingo/lingo-gr.cpp"
break;
case 147:
#line 641 "engines/director/lingo/lingo-gr.y"
{ (yyval.s) = (yyvsp[0].s); g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; }
-#line 3049 "engines/director/lingo/lingo-gr.cpp"
+#line 3052 "engines/director/lingo/lingo-gr.cpp"
break;
case 148:
#line 643 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 3055 "engines/director/lingo/lingo-gr.cpp"
+#line 3058 "engines/director/lingo/lingo-gr.cpp"
break;
case 149:
#line 644 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = 1; delete (yyvsp[0].s); }
-#line 3061 "engines/director/lingo/lingo-gr.cpp"
+#line 3064 "engines/director/lingo/lingo-gr.cpp"
break;
case 150:
#line 645 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-2].narg) + 1; delete (yyvsp[0].s); }
-#line 3067 "engines/director/lingo/lingo-gr.cpp"
+#line 3070 "engines/director/lingo/lingo-gr.cpp"
break;
case 151:
#line 646 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArg((yyvsp[0].s)); (yyval.narg) = (yyvsp[-3].narg) + 1; delete (yyvsp[0].s); }
-#line 3073 "engines/director/lingo/lingo-gr.cpp"
+#line 3076 "engines/director/lingo/lingo-gr.cpp"
break;
case 153:
#line 649 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 3079 "engines/director/lingo/lingo-gr.cpp"
+#line 3082 "engines/director/lingo/lingo-gr.cpp"
break;
case 154:
#line 650 "engines/director/lingo/lingo-gr.y"
{ delete (yyvsp[0].s); }
-#line 3085 "engines/director/lingo/lingo-gr.cpp"
+#line 3088 "engines/director/lingo/lingo-gr.cpp"
break;
case 155:
#line 652 "engines/director/lingo/lingo-gr.y"
{ g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; }
-#line 3091 "engines/director/lingo/lingo-gr.cpp"
+#line 3094 "engines/director/lingo/lingo-gr.cpp"
break;
case 156:
@@ -3099,91 +3102,91 @@ yyreduce:
WRITE_UINT32(&numpar, (yyvsp[0].narg));
g_lingo->code1(numpar);
delete (yyvsp[-1].s); }
-#line 3103 "engines/director/lingo/lingo-gr.cpp"
+#line 3106 "engines/director/lingo/lingo-gr.cpp"
break;
case 157:
#line 662 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; }
-#line 3109 "engines/director/lingo/lingo-gr.cpp"
+#line 3112 "engines/director/lingo/lingo-gr.cpp"
break;
case 158:
#line 663 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3115 "engines/director/lingo/lingo-gr.cpp"
+#line 3118 "engines/director/lingo/lingo-gr.cpp"
break;
case 159:
#line 664 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3121 "engines/director/lingo/lingo-gr.cpp"
+#line 3124 "engines/director/lingo/lingo-gr.cpp"
break;
case 160:
#line 666 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3127 "engines/director/lingo/lingo-gr.cpp"
+#line 3130 "engines/director/lingo/lingo-gr.cpp"
break;
case 161:
#line 667 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3133 "engines/director/lingo/lingo-gr.cpp"
+#line 3136 "engines/director/lingo/lingo-gr.cpp"
break;
case 162:
#line 669 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = (yyvsp[-1].code); }
-#line 3139 "engines/director/lingo/lingo-gr.cpp"
+#line 3142 "engines/director/lingo/lingo-gr.cpp"
break;
case 163:
#line 671 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_arraypush, 0); }
-#line 3145 "engines/director/lingo/lingo-gr.cpp"
+#line 3148 "engines/director/lingo/lingo-gr.cpp"
break;
case 164:
#line 672 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code2(LC::c_proparraypush, 0); }
-#line 3151 "engines/director/lingo/lingo-gr.cpp"
+#line 3154 "engines/director/lingo/lingo-gr.cpp"
break;
case 165:
#line 673 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_arraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3157 "engines/director/lingo/lingo-gr.cpp"
+#line 3160 "engines/director/lingo/lingo-gr.cpp"
break;
case 166:
#line 674 "engines/director/lingo/lingo-gr.y"
{ (yyval.code) = g_lingo->code1(LC::c_proparraypush); (yyval.code) = g_lingo->codeInt((yyvsp[0].narg)); }
-#line 3163 "engines/director/lingo/lingo-gr.cpp"
+#line 3166 "engines/director/lingo/lingo-gr.cpp"
break;
case 167:
#line 676 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3169 "engines/director/lingo/lingo-gr.cpp"
+#line 3172 "engines/director/lingo/lingo-gr.cpp"
break;
case 168:
#line 677 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3175 "engines/director/lingo/lingo-gr.cpp"
+#line 3178 "engines/director/lingo/lingo-gr.cpp"
break;
case 169:
#line 679 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; }
-#line 3181 "engines/director/lingo/lingo-gr.cpp"
+#line 3184 "engines/director/lingo/lingo-gr.cpp"
break;
case 170:
#line 680 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[-2].narg) + 1; }
-#line 3187 "engines/director/lingo/lingo-gr.cpp"
+#line 3190 "engines/director/lingo/lingo-gr.cpp"
break;
case 171:
@@ -3192,7 +3195,7 @@ yyreduce:
g_lingo->code1(LC::c_symbolpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
delete (yyvsp[-2].s); }
-#line 3196 "engines/director/lingo/lingo-gr.cpp"
+#line 3199 "engines/director/lingo/lingo-gr.cpp"
break;
case 172:
@@ -3201,11 +3204,11 @@ yyreduce:
g_lingo->code1(LC::c_stringpush);
g_lingo->codeString((yyvsp[-2].s)->c_str());
delete (yyvsp[-2].s); }
-#line 3205 "engines/director/lingo/lingo-gr.cpp"
+#line 3208 "engines/director/lingo/lingo-gr.cpp"
break;
-#line 3209 "engines/director/lingo/lingo-gr.cpp"
+#line 3212 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index ee4304493b..3ca76a89e7 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -59,80 +59,81 @@ extern int yydebug;
OBJECT = 265,
REFERENCE = 266,
LEXERROR = 267,
- INT = 268,
- ARGC = 269,
- ARGCNORET = 270,
- THEENTITY = 271,
- THEENTITYWITHID = 272,
- THEMENUITEMENTITY = 273,
- THEMENUITEMSENTITY = 274,
- FLOAT = 275,
- BLTIN = 276,
- FBLTIN = 277,
- RBLTIN = 278,
- ID = 279,
- STRING = 280,
- HANDLER = 281,
- SYMBOL = 282,
- ENDCLAUSE = 283,
- tPLAYACCEL = 284,
- tMETHOD = 285,
- THEOBJECTFIELD = 286,
- THEOBJECTREF = 287,
- tDOWN = 288,
- tELSE = 289,
- tELSIF = 290,
- tEXIT = 291,
- tGLOBAL = 292,
- tGO = 293,
- tIF = 294,
- tIN = 295,
- tINTO = 296,
- tLOOP = 297,
- tMACRO = 298,
- tMOVIE = 299,
- tNEXT = 300,
- tOF = 301,
- tPREVIOUS = 302,
- tPUT = 303,
- tREPEAT = 304,
- tSET = 305,
- tTHEN = 306,
- tTO = 307,
- tWHEN = 308,
- tWITH = 309,
- tWHILE = 310,
- tNLELSE = 311,
- tFACTORY = 312,
- tOPEN = 313,
- tPLAY = 314,
- tINSTANCE = 315,
- tGE = 316,
- tLE = 317,
- tEQ = 318,
- tNEQ = 319,
- tAND = 320,
- tOR = 321,
- tNOT = 322,
- tMOD = 323,
- tAFTER = 324,
- tBEFORE = 325,
- tCONCAT = 326,
- tCONTAINS = 327,
- tSTARTS = 328,
- tCHAR = 329,
- tITEM = 330,
- tLINE = 331,
- tWORD = 332,
- tSPRITE = 333,
- tINTERSECTS = 334,
- tWITHIN = 335,
- tTELL = 336,
- tPROPERTY = 337,
- tON = 338,
- tENDIF = 339,
- tENDREPEAT = 340,
- tENDTELL = 341
+ PCELL = 268,
+ INT = 269,
+ ARGC = 270,
+ ARGCNORET = 271,
+ THEENTITY = 272,
+ THEENTITYWITHID = 273,
+ THEMENUITEMENTITY = 274,
+ THEMENUITEMSENTITY = 275,
+ FLOAT = 276,
+ BLTIN = 277,
+ FBLTIN = 278,
+ RBLTIN = 279,
+ ID = 280,
+ STRING = 281,
+ HANDLER = 282,
+ SYMBOL = 283,
+ ENDCLAUSE = 284,
+ tPLAYACCEL = 285,
+ tMETHOD = 286,
+ THEOBJECTFIELD = 287,
+ THEOBJECTREF = 288,
+ tDOWN = 289,
+ tELSE = 290,
+ tELSIF = 291,
+ tEXIT = 292,
+ tGLOBAL = 293,
+ tGO = 294,
+ tIF = 295,
+ tIN = 296,
+ tINTO = 297,
+ tLOOP = 298,
+ tMACRO = 299,
+ tMOVIE = 300,
+ tNEXT = 301,
+ tOF = 302,
+ tPREVIOUS = 303,
+ tPUT = 304,
+ tREPEAT = 305,
+ tSET = 306,
+ tTHEN = 307,
+ tTO = 308,
+ tWHEN = 309,
+ tWITH = 310,
+ tWHILE = 311,
+ tNLELSE = 312,
+ tFACTORY = 313,
+ tOPEN = 314,
+ tPLAY = 315,
+ tINSTANCE = 316,
+ tGE = 317,
+ tLE = 318,
+ tEQ = 319,
+ tNEQ = 320,
+ tAND = 321,
+ tOR = 322,
+ tNOT = 323,
+ tMOD = 324,
+ tAFTER = 325,
+ tBEFORE = 326,
+ tCONCAT = 327,
+ tCONTAINS = 328,
+ tSTARTS = 329,
+ tCHAR = 330,
+ tITEM = 331,
+ tLINE = 332,
+ tWORD = 333,
+ tSPRITE = 334,
+ tINTERSECTS = 335,
+ tWITHIN = 336,
+ tTELL = 337,
+ tPROPERTY = 338,
+ tON = 339,
+ tENDIF = 340,
+ tENDREPEAT = 341,
+ tENDTELL = 342
};
#endif
@@ -160,7 +161,7 @@ union YYSTYPE
Common::String *field;
} objectref;
-#line 164 "engines/director/lingo/lingo-gr.h"
+#line 165 "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 1d8c829cae..30794aff0a 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 UNARY
-%token CASTREF VOID VAR POINT RECT ARRAY OBJECT REFERENCE LEXERROR
+%token CASTREF VOID VAR POINT RECT ARRAY OBJECT REFERENCE LEXERROR PCELL
%token<i> INT ARGC ARGCNORET
%token<e> THEENTITY THEENTITYWITHID THEMENUITEMENTITY THEMENUITEMSENTITY
%token<f> FLOAT
More information about the Scummvm-git-logs
mailing list