aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-07-15 13:25:21 +0200
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commite1b2759d06ddff1b959cc3c86203c73439d01b3c (patch)
treed22ccc470c9dcd7ee0d7f81b1099456bd5084ee9
parent2676e252e45dd82c59b1e69ab177f2d2f9e35957 (diff)
downloadscummvm-rg350-e1b2759d06ddff1b959cc3c86203c73439d01b3c.tar.gz
scummvm-rg350-e1b2759d06ddff1b959cc3c86203c73439d01b3c.tar.bz2
scummvm-rg350-e1b2759d06ddff1b959cc3c86203c73439d01b3c.zip
DIRECTOR: Lingo: Initial code for factory/method definition
Diffstat
-rw-r--r--engines/director/lingo/lingo-codegen.cpp9
-rw-r--r--engines/director/lingo/lingo-gr.cpp678
-rw-r--r--engines/director/lingo/lingo-gr.h54
-rw-r--r--engines/director/lingo/lingo-gr.y15
-rw-r--r--engines/director/lingo/lingo-lex.cpp463
-rw-r--r--engines/director/lingo/lingo-lex.l2
-rw-r--r--engines/director/lingo/lingo.h4
7 files changed, 647 insertions, 578 deletions
diff --git a/engines/director/lingo/lingo-codegen.cpp b/engines/director/lingo/lingo-codegen.cpp
index a7a004e7d9..553213cc33 100644
--- a/engines/director/lingo/lingo-codegen.cpp
+++ b/engines/director/lingo/lingo-codegen.cpp
@@ -123,11 +123,14 @@ void Lingo::cleanLocalVars() {
delete g_lingo->_localvars;
}
-void Lingo::define(Common::String &name, int start, int nargs) {
+void Lingo::define(Common::String &name, int start, int nargs, Common::String *prefix) {
debug(3, "define(\"%s\", %d, %d, %d)", name.c_str(), start, _currentScript->size() - 1, nargs);
Symbol *sym;
+ if (prefix)
+ name = *prefix + "-" + name;
+
if (!_handlers.contains(name)) { // Create variable if it was not defined
sym = new Symbol;
@@ -249,4 +252,8 @@ void Lingo::processIf(int elselabel, int endlabel) {
}
}
+void Lingo::codeFactory(Common::String &name) {
+ _currentFactory = name;
+}
+
}
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index b4fb67a652..035302f73c 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -104,18 +104,20 @@
tWITH = 293,
tWHILE = 294,
tNLELSE = 295,
- tGE = 296,
- tLE = 297,
- tGT = 298,
- tLT = 299,
- tEQ = 300,
- tNEQ = 301,
- tAND = 302,
- tOR = 303,
- tNOT = 304,
- tCONCAT = 305,
- tCONTAINS = 306,
- tSTARTS = 307
+ tFACTORY = 296,
+ tMETHOD = 297,
+ tGE = 298,
+ tLE = 299,
+ tGT = 300,
+ tLT = 301,
+ tEQ = 302,
+ tNEQ = 303,
+ tAND = 304,
+ tOR = 305,
+ tNOT = 306,
+ tCONCAT = 307,
+ tCONTAINS = 308,
+ tSTARTS = 309
};
#endif
/* Tokens. */
@@ -157,18 +159,20 @@
#define tWITH 293
#define tWHILE 294
#define tNLELSE 295
-#define tGE 296
-#define tLE 297
-#define tGT 298
-#define tLT 299
-#define tEQ 300
-#define tNEQ 301
-#define tAND 302
-#define tOR 303
-#define tNOT 304
-#define tCONCAT 305
-#define tCONTAINS 306
-#define tSTARTS 307
+#define tFACTORY 296
+#define tMETHOD 297
+#define tGE 298
+#define tLE 299
+#define tGT 300
+#define tLT 301
+#define tEQ 302
+#define tNEQ 303
+#define tAND 304
+#define tOR 305
+#define tNOT 306
+#define tCONCAT 307
+#define tCONTAINS 308
+#define tSTARTS 309
@@ -225,7 +229,7 @@ typedef union YYSTYPE
int narg; /* number of arguments */
}
/* Line 193 of yacc.c. */
-#line 229 "engines/director/lingo/lingo-gr.cpp"
+#line 233 "engines/director/lingo/lingo-gr.cpp"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -238,7 +242,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 242 "engines/director/lingo/lingo-gr.cpp"
+#line 246 "engines/director/lingo/lingo-gr.cpp"
#ifdef short
# undef short
@@ -451,22 +455,22 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 70
+#define YYFINAL 74
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 639
+#define YYLAST 626
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 66
+#define YYNTOKENS 68
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 33
+#define YYNNTS 34
/* YYNRULES -- Number of rules. */
-#define YYNRULES 112
+#define YYNRULES 115
/* YYNRULES -- Number of states. */
-#define YYNSTATES 237
+#define YYNSTATES 247
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 307
+#define YYMAXUTOK 309
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -475,12 +479,12 @@ union yyalloc
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 59, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 61, 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, 58, 64, 2,
- 60, 61, 56, 54, 65, 55, 2, 57, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 60, 66, 2,
+ 62, 63, 58, 56, 67, 57, 2, 59, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 63, 53, 62, 2, 2, 2, 2, 2, 2, 2,
+ 65, 55, 64, 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, 2,
@@ -504,7 +508,7 @@ static const yytype_uint8 yytranslate[] =
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54
};
#if YYDEBUG
@@ -522,56 +526,57 @@ static const yytype_uint16 yyprhs[] =
283, 287, 291, 295, 298, 302, 306, 310, 314, 317,
320, 324, 327, 330, 333, 335, 337, 340, 342, 346,
349, 352, 355, 358, 362, 365, 369, 372, 375, 377,
- 381, 384, 388, 389, 398, 399, 401, 405, 410, 411,
- 415, 416, 418
+ 381, 384, 388, 389, 398, 401, 402, 411, 412, 414,
+ 418, 423, 424, 428, 429, 431
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 67, 0, -1, 67, 68, 69, -1, 69, -1, 1,
- 59, -1, 59, -1, -1, 93, -1, 88, -1, 97,
- -1, 70, -1, 72, -1, 33, 87, 24, 12, -1,
- 35, 12, 53, 87, -1, 35, 8, 53, 87, -1,
- 35, 9, 87, 53, 87, -1, 35, 12, 37, 87,
- -1, 35, 8, 37, 87, -1, 35, 9, 87, 37,
- 87, -1, 87, -1, 88, -1, 71, -1, 73, -1,
- 80, 60, 79, 61, 86, 85, 18, 34, -1, 81,
- 53, 87, 85, 37, 87, 85, 86, 85, 18, 34,
- -1, 81, 53, 87, 85, 15, 37, 87, 85, 86,
- 85, 18, 34, -1, 82, 79, 36, 68, 86, 85,
- 18, 23, -1, 82, 79, 36, 68, 86, 85, 40,
- 86, 85, 18, 23, -1, 82, 79, 36, 68, 86,
- 85, 84, 75, 85, 18, 23, -1, 82, 79, 36,
- 84, 71, 85, -1, 82, 79, 36, 84, 71, 85,
- 40, 84, 71, 85, -1, 82, 79, 36, 84, 71,
- 85, 76, 85, 74, 85, -1, -1, 40, 84, 71,
- -1, 75, 78, -1, 78, -1, 76, 77, -1, 77,
- -1, 83, 79, 36, 84, 72, 85, -1, 76, -1,
- 83, 79, 36, 86, 85, -1, 87, -1, 87, 53,
- 87, -1, 60, 79, 61, -1, 34, 39, -1, 34,
+ 69, 0, -1, 69, 70, 71, -1, 71, -1, 1,
+ 61, -1, 61, -1, -1, 95, -1, 90, -1, 100,
+ -1, 72, -1, 74, -1, 33, 89, 24, 12, -1,
+ 35, 12, 55, 89, -1, 35, 8, 55, 89, -1,
+ 35, 9, 89, 55, 89, -1, 35, 12, 37, 89,
+ -1, 35, 8, 37, 89, -1, 35, 9, 89, 37,
+ 89, -1, 89, -1, 90, -1, 73, -1, 75, -1,
+ 82, 62, 81, 63, 88, 87, 18, 34, -1, 83,
+ 55, 89, 87, 37, 89, 87, 88, 87, 18, 34,
+ -1, 83, 55, 89, 87, 15, 37, 89, 87, 88,
+ 87, 18, 34, -1, 84, 81, 36, 70, 88, 87,
+ 18, 23, -1, 84, 81, 36, 70, 88, 87, 40,
+ 88, 87, 18, 23, -1, 84, 81, 36, 70, 88,
+ 87, 86, 77, 87, 18, 23, -1, 84, 81, 36,
+ 86, 73, 87, -1, 84, 81, 36, 86, 73, 87,
+ 40, 86, 73, 87, -1, 84, 81, 36, 86, 73,
+ 87, 78, 87, 76, 87, -1, -1, 40, 86, 73,
+ -1, 77, 80, -1, 80, -1, 78, 79, -1, 79,
+ -1, 85, 81, 36, 86, 74, 87, -1, 78, -1,
+ 85, 81, 36, 88, 87, -1, 89, -1, 89, 55,
+ 89, -1, 62, 81, 63, -1, 34, 39, -1, 34,
38, 12, -1, 23, -1, 17, -1, -1, -1, -1,
- 86, 68, -1, 86, 72, -1, 7, -1, 10, -1,
- 13, -1, 11, 60, 98, 61, -1, 12, 60, 98,
- 61, -1, 12, -1, 8, -1, 9, 87, -1, 70,
- -1, 87, 54, 87, -1, 87, 55, 87, -1, 87,
- 56, 87, -1, 87, 57, 87, -1, 87, 62, 87,
- -1, 87, 63, 87, -1, 87, 46, 87, -1, 87,
- 41, 87, -1, 87, 42, 87, -1, 87, 47, 87,
- -1, 87, 48, 87, -1, 49, 87, -1, 87, 64,
- 87, -1, 87, 50, 87, -1, 87, 51, 87, -1,
- 87, 52, 87, -1, 54, 87, -1, 55, 87, -1,
- 60, 87, 61, -1, 27, 13, -1, 28, 12, -1,
- 33, 87, -1, 90, -1, 19, -1, 21, 89, -1,
- 12, -1, 89, 65, 12, -1, 22, 25, -1, 22,
- 30, -1, 22, 32, -1, 22, 91, -1, 22, 91,
- 92, -1, 22, 92, -1, 37, 20, 13, -1, 20,
+ 88, 70, -1, 88, 74, -1, 7, -1, 10, -1,
+ 13, -1, 11, 62, 101, 63, -1, 12, 62, 101,
+ 63, -1, 12, -1, 8, -1, 9, 89, -1, 72,
+ -1, 89, 56, 89, -1, 89, 57, 89, -1, 89,
+ 58, 89, -1, 89, 59, 89, -1, 89, 64, 89,
+ -1, 89, 65, 89, -1, 89, 48, 89, -1, 89,
+ 43, 89, -1, 89, 44, 89, -1, 89, 49, 89,
+ -1, 89, 50, 89, -1, 51, 89, -1, 89, 66,
+ 89, -1, 89, 52, 89, -1, 89, 53, 89, -1,
+ 89, 54, 89, -1, 56, 89, -1, 57, 89, -1,
+ 62, 89, 63, -1, 27, 13, -1, 28, 12, -1,
+ 33, 89, -1, 92, -1, 19, -1, 21, 91, -1,
+ 12, -1, 91, 67, 12, -1, 22, 25, -1, 22,
+ 30, -1, 22, 32, -1, 22, 93, -1, 22, 93,
+ 94, -1, 22, 94, -1, 37, 20, 13, -1, 20,
13, -1, 37, 13, -1, 13, -1, 31, 29, 13,
-1, 29, 13, -1, 37, 29, 13, -1, -1, 26,
- 12, 94, 84, 95, 68, 96, 86, -1, -1, 12,
- -1, 95, 65, 12, -1, 95, 68, 65, 12, -1,
- -1, 12, 84, 98, -1, -1, 87, -1, 98, 65,
- 87, -1
+ 12, 96, 86, 98, 70, 99, 88, -1, 41, 12,
+ -1, -1, 42, 12, 97, 86, 98, 70, 99, 88,
+ -1, -1, 12, -1, 98, 67, 12, -1, 98, 70,
+ 67, 12, -1, -1, 12, 86, 101, -1, -1, 89,
+ -1, 101, 67, 89, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -587,8 +592,8 @@ static const yytype_uint16 yyrline[] =
388, 389, 390, 391, 392, 393, 394, 395, 396, 397,
398, 401, 402, 403, 404, 405, 407, 410, 411, 422,
423, 424, 425, 430, 436, 443, 444, 445, 446, 449,
- 450, 451, 479, 479, 486, 487, 488, 489, 491, 494,
- 502, 503, 504
+ 450, 451, 479, 479, 485, 488, 488, 494, 495, 496,
+ 497, 499, 503, 511, 512, 513
};
#endif
@@ -602,15 +607,16 @@ static const char *const yytname[] =
"HANDLER", "tDOWN", "tELSE", "tNLELSIF", "tEND", "tEXIT", "tFRAME",
"tGLOBAL", "tGO", "tIF", "tINTO", "tLOOP", "tMACRO", "tMCI", "tMCIWAIT",
"tMOVIE", "tNEXT", "tOF", "tPREVIOUS", "tPUT", "tREPEAT", "tSET",
- "tTHEN", "tTO", "tWITH", "tWHILE", "tNLELSE", "tGE", "tLE", "tGT", "tLT",
- "tEQ", "tNEQ", "tAND", "tOR", "tNOT", "tCONCAT", "tCONTAINS", "tSTARTS",
- "'='", "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "'>'",
- "'<'", "'&'", "','", "$accept", "program", "nl", "programline", "asgn",
- "stmtoneliner", "stmt", "ifstmt", "elsestmtoneliner", "elseifstmt",
- "elseifstmtoneliner", "elseifstmtoneliner1", "elseifstmt1", "cond",
- "repeatwhile", "repeatwith", "if", "elseif", "begin", "end", "stmtlist",
- "expr", "func", "globallist", "gotofunc", "gotoframe", "gotomovie",
- "defn", "@1", "argdef", "argstore", "macro", "arglist", 0
+ "tTHEN", "tTO", "tWITH", "tWHILE", "tNLELSE", "tFACTORY", "tMETHOD",
+ "tGE", "tLE", "tGT", "tLT", "tEQ", "tNEQ", "tAND", "tOR", "tNOT",
+ "tCONCAT", "tCONTAINS", "tSTARTS", "'='", "'+'", "'-'", "'*'", "'/'",
+ "'%'", "'\\n'", "'('", "')'", "'>'", "'<'", "'&'", "','", "$accept",
+ "program", "nl", "programline", "asgn", "stmtoneliner", "stmt", "ifstmt",
+ "elsestmtoneliner", "elseifstmt", "elseifstmtoneliner",
+ "elseifstmtoneliner1", "elseifstmt1", "cond", "repeatwhile",
+ "repeatwith", "if", "elseif", "begin", "end", "stmtlist", "expr", "func",
+ "globallist", "gotofunc", "gotoframe", "gotomovie", "defn", "@1", "@2",
+ "argdef", "argstore", "macro", "arglist", 0
};
#endif
@@ -624,26 +630,26 @@ static const yytype_uint16 yytoknum[] =
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 61, 43, 45, 42, 47, 37, 10,
- 40, 41, 62, 60, 38, 44
+ 305, 306, 307, 308, 309, 61, 43, 45, 42, 47,
+ 37, 10, 40, 41, 62, 60, 38, 44
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 66, 67, 67, 67, 68, 69, 69, 69, 69,
- 69, 69, 70, 70, 70, 70, 70, 70, 70, 71,
- 71, 72, 72, 72, 72, 72, 73, 73, 73, 73,
- 73, 73, 74, 74, 75, 75, 76, 76, 77, 78,
- 78, 79, 79, 79, 80, 81, 82, 83, 84, 85,
- 86, 86, 86, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 88, 88, 88, 88, 88, 88, 89, 89, 90,
- 90, 90, 90, 90, 90, 91, 91, 91, 91, 92,
- 92, 92, 94, 93, 95, 95, 95, 95, 96, 97,
- 98, 98, 98
+ 0, 68, 69, 69, 69, 70, 71, 71, 71, 71,
+ 71, 71, 72, 72, 72, 72, 72, 72, 72, 73,
+ 73, 74, 74, 74, 74, 74, 75, 75, 75, 75,
+ 75, 75, 76, 76, 77, 77, 78, 78, 79, 80,
+ 80, 81, 81, 81, 82, 83, 84, 85, 86, 87,
+ 88, 88, 88, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 90, 90, 90, 90, 90, 90, 91, 91, 92,
+ 92, 92, 92, 92, 92, 93, 93, 93, 93, 94,
+ 94, 94, 96, 95, 95, 97, 95, 98, 98, 98,
+ 98, 99, 100, 101, 101, 101
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -659,8 +665,8 @@ static const yytype_uint8 yyr2[] =
3, 3, 3, 2, 3, 3, 3, 3, 2, 2,
3, 2, 2, 2, 1, 1, 2, 1, 3, 2,
2, 2, 2, 3, 2, 3, 2, 2, 1, 3,
- 2, 3, 0, 8, 0, 1, 3, 4, 0, 3,
- 0, 1, 3
+ 2, 3, 0, 8, 2, 0, 8, 0, 1, 3,
+ 4, 0, 3, 0, 1, 3
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -670,24 +676,25 @@ static const yytype_uint8 yydefact[] =
{
0, 0, 53, 59, 0, 54, 0, 48, 55, 85,
0, 0, 46, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 3, 61, 21, 11, 22, 0,
- 0, 0, 19, 8, 84, 7, 9, 4, 58, 0,
- 61, 60, 110, 110, 110, 87, 86, 98, 0, 89,
- 0, 90, 0, 91, 0, 92, 94, 102, 81, 82,
- 83, 0, 44, 0, 0, 0, 73, 78, 79, 0,
- 1, 5, 6, 0, 0, 0, 0, 41, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 111, 0, 0, 109, 0, 96,
- 100, 0, 97, 0, 0, 0, 93, 48, 0, 45,
- 0, 0, 0, 0, 0, 80, 2, 0, 49, 0,
- 0, 48, 0, 69, 70, 68, 71, 72, 75, 76,
- 77, 62, 63, 64, 65, 66, 67, 74, 56, 0,
- 57, 88, 99, 95, 101, 104, 12, 17, 14, 0,
- 0, 16, 13, 50, 0, 43, 50, 0, 42, 112,
- 105, 0, 18, 15, 49, 0, 0, 49, 49, 20,
- 0, 108, 51, 52, 0, 0, 49, 48, 29, 106,
- 0, 50, 0, 49, 50, 0, 50, 0, 47, 48,
- 49, 37, 0, 107, 103, 23, 50, 49, 26, 49,
+ 0, 0, 0, 0, 0, 0, 3, 61, 21, 11,
+ 22, 0, 0, 0, 19, 8, 84, 7, 9, 4,
+ 58, 0, 61, 60, 113, 113, 113, 87, 86, 98,
+ 0, 89, 0, 90, 0, 91, 0, 92, 94, 102,
+ 81, 82, 83, 0, 44, 0, 0, 0, 104, 105,
+ 73, 78, 79, 0, 1, 5, 6, 0, 0, 0,
+ 0, 41, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 114, 0,
+ 0, 112, 0, 96, 100, 0, 97, 0, 0, 0,
+ 93, 48, 0, 45, 0, 0, 0, 0, 0, 48,
+ 80, 2, 0, 49, 0, 0, 48, 0, 69, 70,
+ 68, 71, 72, 75, 76, 77, 62, 63, 64, 65,
+ 66, 67, 74, 56, 0, 57, 88, 99, 95, 101,
+ 107, 12, 17, 14, 0, 0, 16, 13, 107, 50,
+ 0, 43, 50, 0, 42, 115, 108, 0, 18, 15,
+ 0, 49, 0, 0, 49, 49, 20, 0, 111, 111,
+ 51, 52, 0, 0, 49, 48, 29, 109, 0, 50,
+ 50, 0, 49, 50, 0, 50, 0, 47, 48, 49,
+ 37, 0, 110, 103, 106, 23, 50, 49, 26, 49,
49, 39, 35, 0, 0, 36, 32, 0, 49, 0,
0, 34, 0, 0, 49, 48, 49, 48, 0, 0,
0, 0, 48, 30, 0, 31, 0, 0, 24, 27,
@@ -697,50 +704,51 @@ static const yytype_uint8 yydefact[] =
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 23, 172, 24, 40, 26, 173, 28, 216, 200,
- 201, 191, 202, 76, 29, 30, 31, 192, 226, 154,
- 164, 32, 169, 46, 34, 55, 56, 35, 107, 161,
- 181, 36, 95
+ -1, 25, 180, 26, 42, 28, 181, 30, 226, 210,
+ 211, 200, 212, 80, 31, 32, 33, 201, 236, 160,
+ 171, 34, 176, 48, 36, 57, 58, 37, 111, 119,
+ 167, 189, 38, 99
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -172
+#define YYPACT_NINF -178
static const yytype_int16 yypact[] =
{
- 189, -41, -172, -172, 359, -172, -30, 532, -172, -172,
- 28, 150, -172, 43, 47, 52, 359, 11, 49, 359,
- 359, 359, 359, 6, -172, 9, -172, -172, -172, 15,
- 16, 388, 513, -172, -172, -172, -172, -172, 36, 359,
- -172, 513, 359, 359, 359, -172, 32, -172, 86, -172,
- 89, -172, 74, -172, 19, 25, -172, -172, -172, -172,
- 403, 92, -172, -20, 359, -9, 575, 575, 575, 470,
- -172, -172, 243, 388, 359, 388, 69, 494, 359, 359,
- 359, 359, 359, 359, 359, 359, 359, 359, 359, 359,
- 359, 359, 359, 403, 513, -2, 5, 41, 95, -172,
- -172, 96, -172, 97, 98, 79, -172, -172, 100, -172,
- 359, 359, 427, 359, 359, -172, -172, 57, 513, 58,
- 446, 61, 359, 513, 513, 513, 513, 513, 513, 513,
- 513, 556, 556, 575, 575, 513, 513, 513, -172, 359,
- -172, -172, -172, -172, -172, 109, -172, 513, 513, 359,
- 359, 513, 513, -172, -1, -172, -172, 330, 513, 513,
- -172, -38, 513, 513, 272, 93, 359, 272, -172, -172,
- 111, 64, -172, -172, 108, 359, 513, -3, -5, -172,
- 119, -172, 101, 513, -172, 114, -172, 115, -172, -172,
- 115, -172, 388, -172, 272, -172, -172, 272, -172, 272,
- 115, 115, -172, 388, 330, -172, 94, 102, 272, 121,
- 123, -172, 126, 110, -172, -172, -172, -172, 127, 113,
- 125, 128, -7, -172, 330, -172, 301, 120, -172, -172,
- -172, 272, -172, -172, -172, -172, -172
+ 199, -40, -178, -178, 2, -178, -21, 517, -178, -178,
+ 32, 128, -178, 38, 42, 49, 2, 43, 98, 58,
+ 86, 2, 2, 2, 2, 4, -178, 7, -178, -178,
+ -178, 47, 56, 236, 498, -178, -178, -178, -178, -178,
+ 52, 2, -178, 498, 2, 2, 2, -178, 57, -178,
+ 109, -178, 110, -178, 96, -178, 23, 40, -178, -178,
+ -178, -178, 388, 114, -178, -17, 2, -7, -178, -178,
+ 560, 560, 560, 455, -178, -178, 255, 236, 2, 236,
+ 91, 479, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 388, 498, 45,
+ 54, 62, 119, -178, -178, 121, -178, 122, 125, 103,
+ -178, -178, 127, -178, 2, 2, 412, 2, 2, -178,
+ -178, -178, 77, 498, 80, 431, 88, 2, 498, 498,
+ 498, 498, 498, 498, 498, 498, 541, 541, 560, 560,
+ 498, 498, 498, -178, 2, -178, -178, -178, -178, -178,
+ 138, -178, 498, 498, 2, 2, 498, 498, 138, -178,
+ 3, -178, -178, 373, 498, 498, -178, 5, 498, 498,
+ 5, 311, 115, 2, 311, -178, -178, 139, 95, 95,
+ -178, -178, 145, 2, 498, 9, -1, -178, 152, -178,
+ -178, 132, 498, -178, 144, -178, 151, -178, -178, 151,
+ -178, 236, -178, 311, 311, -178, -178, 311, -178, 311,
+ 151, 151, -178, 236, 373, -178, 130, 137, 311, 157,
+ 158, -178, 159, 142, -178, -178, -178, -178, 163, 148,
+ 160, 162, 14, -178, 373, -178, 342, 153, -178, -178,
+ -178, 311, -178, -178, -178, -178, -178
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -172, -172, -21, 77, 8, -153, 0, -172, -172, -172,
- -23, -170, -44, -70, -172, -172, -172, -171, -6, -40,
- -143, 3, 26, -172, -172, -172, 103, -172, -172, -172,
- -172, -172, 30
+ -178, -178, -23, 113, 26, -160, 0, -178, -178, -178,
+ 8, -148, -20, -71, -178, -178, -178, -177, -6, -38,
+ -133, 1, 28, -178, -178, -178, 134, -178, -178, -178,
+ 35, 16, -178, 55
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -750,138 +758,136 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -59
static const yytype_int16 yytable[] =
{
- 27, 44, 72, 117, 168, 119, 70, 41, 25, -10,
- -50, -50, 188, 167, 165, 185, 203, 110, 37, 60,
- 205, 71, 66, 67, 68, 69, 33, 170, 113, 203,
- 42, 205, 102, 111, 77, 189, 166, 186, 194, 103,
- 45, 197, 93, 199, 114, 94, 94, 94, 104, 61,
- 62, 214, -50, 208, 50, 57, 52, 63, 64, 138,
- 58, 65, 105, 139, 59, 71, 140, 112, -10, 74,
- 139, 232, 27, 96, 97, 73, 77, 118, 120, 231,
- 25, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 43, 98, 33, 99,
- 156, 145, 100, 101, 109, 121, 139, 141, 104, 142,
- 143, 144, 146, 147, 148, 157, 151, 152, 153, 155,
- 71, 160, 207, 179, 174, 158, 182, 177, 178, 180,
- 175, 193, 188, 213, 215, 195, 184, 198, 217, 219,
- 171, 220, 159, 196, 221, 227, 222, 228, 229, 116,
- 206, 230, 162, 163, 234, 190, 211, 209, 106, 210,
- 212, 0, 0, 47, 0, 0, 0, 0, 218, 176,
- 48, 187, 0, 0, 223, 49, 225, 0, 183, 50,
- 51, 52, 53, 204, 0, 0, 0, 54, 0, -6,
- 1, 235, 0, 236, 0, 77, 2, 3, 4, 5,
- 6, 7, 8, 0, 0, 0, 77, 0, 9, 224,
+ 29, 46, 76, 175, 74, 43, 122, -10, 124, 2,
+ 3, 4, 5, 6, 40, 8, 197, 62, 172, 213,
+ 114, 39, 70, 71, 72, 73, 27, 194, 35, 174,
+ 117, -50, -50, 213, 81, 41, 106, 18, 115, 198,
+ 173, 44, 97, 107, 47, 98, 98, 98, 118, 195,
+ 59, 215, 108, 21, 224, 60, 203, 204, 22, 23,
+ 207, 61, 209, 215, 24, 75, 75, 116, -10, 52,
+ 68, 54, 177, 218, 242, -50, 29, 109, 81, 123,
+ 125, 63, 64, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 139, 140, 141, 142, 69, 241,
+ 100, 101, 27, 162, 35, 150, 65, 66, 143, 77,
+ 67, 78, 144, 158, 45, 152, 153, 145, 156, 157,
+ 163, 144, 103, 104, 102, 105, 113, 126, 164, 144,
+ 217, 146, 108, 182, 147, 148, 185, 186, 149, 151,
+ 159, 49, 223, 161, 178, 165, 193, 179, 50, 75,
+ 166, 187, 183, 51, 206, 168, 169, 52, 53, 54,
+ 55, 216, 188, 191, 202, 56, 205, 208, 197, 219,
+ 225, 220, 222, 227, 184, 229, 230, 231, 232, 196,
+ 228, 237, 238, 239, 192, 240, 233, 244, 235, 121,
+ 221, 110, 214, 170, 199, 190, 0, 0, 0, -6,
+ 1, 0, 81, 245, 0, 246, 2, 3, 4, 5,
+ 6, 7, 8, 0, 81, 0, 0, 0, 9, 234,
10, 11, 12, 0, 0, 13, 14, 15, 0, 0,
- 0, 0, 16, 17, 18, 0, 233, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 19, 0,
- 0, 0, 0, 20, 21, 0, 0, 0, -6, 22,
- 2, 3, 4, 5, 6, 7, 8, 0, 0, 0,
- 0, 0, 9, 0, 10, 11, 12, 0, 0, 13,
- 14, 15, 0, 0, 0, 0, 16, 17, 18, 2,
- 3, 4, 5, 6, 38, 8, 0, 0, 0, 0,
- 0, 9, 19, 10, 11, 12, 0, 20, 21, 14,
- 15, 0, 0, 22, 0, 16, 17, 18, 2, 3,
- 4, 5, 6, 38, 8, 0, 0, 0, 0, 0,
- 9, 19, 10, 11, 12, 0, 20, 21, 14, 15,
- 0, 71, 22, 0, 16, 17, 18, 2, 3, 4,
- 5, 6, 38, 8, 0, 0, 0, 0, 0, 9,
- 19, 10, 11, 0, 0, 20, 21, 14, 15, 0,
- 0, 22, 0, 16, 0, 18, 2, 3, 4, 5,
- 6, 38, 8, 0, 0, 0, 0, 0, 0, 19,
- 0, 0, 0, 0, 20, 21, 0, 0, 0, 0,
- 22, 0, 39, 0, 18, 2, 3, 4, 5, 6,
- 38, 8, 0, 0, 0, 0, 0, 0, 19, 0,
- 0, 0, 0, 20, 21, 0, 0, 0, 0, 22,
- 0, 39, 0, 18, 0, 0, 0, 108, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 19, 0, 0,
- 0, 0, 20, 21, 78, 79, 0, 0, 75, 80,
- 81, 82, 0, 83, 84, 85, 0, 86, 87, 88,
- 89, 0, 0, 0, 149, 90, 91, 92, 78, 79,
- 0, 0, 0, 80, 81, 82, 0, 83, 84, 85,
- 150, 86, 87, 88, 89, 0, 0, 78, 79, 90,
- 91, 92, 80, 81, 82, 0, 83, 84, 85, 122,
- 86, 87, 88, 89, 0, 0, 0, 115, 90, 91,
- 92, 78, 79, 0, 0, 0, 80, 81, 82, 0,
- 83, 84, 85, 0, 86, 87, 88, 89, 0, 0,
- 0, 115, 90, 91, 92, 78, 79, 0, 0, 0,
- 80, 81, 82, 0, 83, 84, 85, 122, 86, 87,
- 88, 89, 0, 0, 78, 79, 90, 91, 92, 80,
- 81, 82, 0, 83, 84, 85, 0, 86, 87, 88,
- 89, 0, 0, -58, -58, 90, 91, 92, -58, -58,
- -58, 0, -58, -58, -58, 0, 0, 0, -58, -58,
- 0, 0, 43, 0, -58, -58, -58, 78, 79, 0,
- 0, 0, 80, 81, 82, 0, 83, 84, 85, 0,
- 0, 0, 88, 89, 0, 0, 78, 79, 90, 91,
- 92, 80, 81, 82, 0, 83, 84, 85, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 90, 91, 92
+ 0, 0, 16, 17, 18, 0, 243, 0, 0, 0,
+ 19, 20, 0, 2, 3, 4, 5, 6, 40, 8,
+ 21, 0, 0, 0, 0, 22, 23, 0, 0, 0,
+ -6, 24, 2, 3, 4, 5, 6, 7, 8, 41,
+ 0, 18, 0, 0, 9, 0, 10, 11, 12, 0,
+ 0, 13, 14, 15, 0, 0, 0, 21, 16, 17,
+ 18, 0, 22, 23, 0, 0, 19, 20, 79, 0,
+ 0, 0, 0, 0, 0, 0, 21, 0, 0, 0,
+ 0, 22, 23, 0, 0, 0, 0, 24, 2, 3,
+ 4, 5, 6, 40, 8, 0, 0, 0, 0, 0,
+ 9, 0, 10, 11, 12, 0, 0, 0, 14, 15,
+ 0, 0, 0, 0, 16, 17, 18, 0, 0, 2,
+ 3, 4, 5, 6, 40, 8, 0, 0, 0, 0,
+ 0, 9, 21, 10, 11, 12, 0, 22, 23, 14,
+ 15, 0, 75, 24, 0, 16, 17, 18, 0, 0,
+ 2, 3, 4, 5, 6, 40, 8, 0, 0, 0,
+ 0, 0, 9, 21, 10, 11, 0, 0, 22, 23,
+ 14, 15, 0, 0, 24, 0, 16, 0, 18, 0,
+ 0, 0, 112, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 21, 0, 0, 0, 0, 22,
+ 23, 82, 83, 0, 0, 24, 84, 85, 86, 0,
+ 87, 88, 89, 0, 90, 91, 92, 93, 0, 154,
+ 0, 0, 94, 95, 96, 82, 83, 0, 0, 0,
+ 84, 85, 86, 0, 87, 88, 89, 155, 90, 91,
+ 92, 93, 0, 0, 82, 83, 94, 95, 96, 84,
+ 85, 86, 0, 87, 88, 89, 127, 90, 91, 92,
+ 93, 0, 0, 0, 120, 94, 95, 96, 82, 83,
+ 0, 0, 0, 84, 85, 86, 0, 87, 88, 89,
+ 0, 90, 91, 92, 93, 0, 0, 0, 120, 94,
+ 95, 96, 82, 83, 0, 0, 0, 84, 85, 86,
+ 0, 87, 88, 89, 127, 90, 91, 92, 93, 0,
+ 0, 82, 83, 94, 95, 96, 84, 85, 86, 0,
+ 87, 88, 89, 0, 90, 91, 92, 93, 0, 0,
+ -58, -58, 94, 95, 96, -58, -58, -58, 0, -58,
+ -58, -58, 0, 0, 0, -58, -58, 0, 0, 45,
+ 0, -58, -58, -58, 82, 83, 0, 0, 0, 84,
+ 85, 86, 0, 87, 88, 89, 0, 0, 0, 92,
+ 93, 0, 0, 82, 83, 94, 95, 96, 84, 85,
+ 86, 0, 87, 88, 89, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 94, 95, 96
};
static const yytype_int16 yycheck[] =
{
- 0, 7, 23, 73, 157, 75, 0, 4, 0, 0,
- 17, 18, 17, 156, 15, 18, 187, 37, 59, 16,
- 190, 59, 19, 20, 21, 22, 0, 65, 37, 200,
- 60, 201, 13, 53, 31, 40, 37, 40, 181, 20,
- 12, 184, 39, 186, 53, 42, 43, 44, 29, 38,
- 39, 204, 59, 196, 29, 12, 31, 8, 9, 61,
- 13, 12, 37, 65, 12, 59, 61, 64, 59, 53,
- 65, 224, 72, 43, 44, 60, 73, 74, 75, 222,
- 72, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 60, 65, 72, 13,
- 121, 107, 13, 29, 12, 36, 65, 12, 29, 13,
- 13, 13, 12, 110, 111, 121, 113, 114, 61, 61,
- 59, 12, 192, 12, 164, 122, 18, 167, 168, 65,
- 37, 12, 17, 203, 40, 34, 176, 23, 36, 18,
- 161, 18, 139, 183, 18, 18, 36, 34, 23, 72,
- 190, 23, 149, 150, 34, 178, 200, 197, 55, 199,
- 200, -1, -1, 13, -1, -1, -1, -1, 208, 166,
- 20, 177, -1, -1, 214, 25, 216, -1, 175, 29,
- 30, 31, 32, 189, -1, -1, -1, 37, -1, 0,
- 1, 231, -1, 233, -1, 192, 7, 8, 9, 10,
- 11, 12, 13, -1, -1, -1, 203, -1, 19, 215,
+ 0, 7, 25, 163, 0, 4, 77, 0, 79, 7,
+ 8, 9, 10, 11, 12, 13, 17, 16, 15, 196,
+ 37, 61, 21, 22, 23, 24, 0, 18, 0, 162,
+ 37, 17, 18, 210, 33, 33, 13, 35, 55, 40,
+ 37, 62, 41, 20, 12, 44, 45, 46, 55, 40,
+ 12, 199, 29, 51, 214, 13, 189, 190, 56, 57,
+ 193, 12, 195, 211, 62, 61, 61, 66, 61, 29,
+ 12, 31, 67, 206, 234, 61, 76, 37, 77, 78,
+ 79, 38, 39, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 95, 96, 12, 232,
+ 45, 46, 76, 126, 76, 111, 8, 9, 63, 62,
+ 12, 55, 67, 119, 62, 114, 115, 63, 117, 118,
+ 126, 67, 13, 13, 67, 29, 12, 36, 127, 67,
+ 201, 12, 29, 171, 13, 13, 174, 175, 13, 12,
+ 63, 13, 213, 63, 167, 144, 184, 170, 20, 61,
+ 12, 12, 37, 25, 192, 154, 155, 29, 30, 31,
+ 32, 199, 67, 18, 12, 37, 34, 23, 17, 207,
+ 40, 209, 210, 36, 173, 18, 18, 18, 36, 185,
+ 218, 18, 34, 23, 183, 23, 224, 34, 226, 76,
+ 210, 57, 198, 158, 186, 179, -1, -1, -1, 0,
+ 1, -1, 201, 241, -1, 243, 7, 8, 9, 10,
+ 11, 12, 13, -1, 213, -1, -1, -1, 19, 225,
21, 22, 23, -1, -1, 26, 27, 28, -1, -1,
- -1, -1, 33, 34, 35, -1, 226, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 49, -1,
- -1, -1, -1, 54, 55, -1, -1, -1, 59, 60,
- 7, 8, 9, 10, 11, 12, 13, -1, -1, -1,
- -1, -1, 19, -1, 21, 22, 23, -1, -1, 26,
- 27, 28, -1, -1, -1, -1, 33, 34, 35, 7,
- 8, 9, 10, 11, 12, 13, -1, -1, -1, -1,
- -1, 19, 49, 21, 22, 23, -1, 54, 55, 27,
- 28, -1, -1, 60, -1, 33, 34, 35, 7, 8,
+ -1, -1, 33, 34, 35, -1, 236, -1, -1, -1,
+ 41, 42, -1, 7, 8, 9, 10, 11, 12, 13,
+ 51, -1, -1, -1, -1, 56, 57, -1, -1, -1,
+ 61, 62, 7, 8, 9, 10, 11, 12, 13, 33,
+ -1, 35, -1, -1, 19, -1, 21, 22, 23, -1,
+ -1, 26, 27, 28, -1, -1, -1, 51, 33, 34,
+ 35, -1, 56, 57, -1, -1, 41, 42, 62, -1,
+ -1, -1, -1, -1, -1, -1, 51, -1, -1, -1,
+ -1, 56, 57, -1, -1, -1, -1, 62, 7, 8,
9, 10, 11, 12, 13, -1, -1, -1, -1, -1,
- 19, 49, 21, 22, 23, -1, 54, 55, 27, 28,
- -1, 59, 60, -1, 33, 34, 35, 7, 8, 9,
- 10, 11, 12, 13, -1, -1, -1, -1, -1, 19,
- 49, 21, 22, -1, -1, 54, 55, 27, 28, -1,
- -1, 60, -1, 33, -1, 35, 7, 8, 9, 10,
- 11, 12, 13, -1, -1, -1, -1, -1, -1, 49,
- -1, -1, -1, -1, 54, 55, -1, -1, -1, -1,
- 60, -1, 33, -1, 35, 7, 8, 9, 10, 11,
- 12, 13, -1, -1, -1, -1, -1, -1, 49, -1,
- -1, -1, -1, 54, 55, -1, -1, -1, -1, 60,
- -1, 33, -1, 35, -1, -1, -1, 24, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 49, -1, -1,
- -1, -1, 54, 55, 41, 42, -1, -1, 60, 46,
- 47, 48, -1, 50, 51, 52, -1, 54, 55, 56,
- 57, -1, -1, -1, 37, 62, 63, 64, 41, 42,
- -1, -1, -1, 46, 47, 48, -1, 50, 51, 52,
- 53, 54, 55, 56, 57, -1, -1, 41, 42, 62,
- 63, 64, 46, 47, 48, -1, 50, 51, 52, 53,
- 54, 55, 56, 57, -1, -1, -1, 61, 62, 63,
- 64, 41, 42, -1, -1, -1, 46, 47, 48, -1,
- 50, 51, 52, -1, 54, 55, 56, 57, -1, -1,
- -1, 61, 62, 63, 64, 41, 42, -1, -1, -1,
- 46, 47, 48, -1, 50, 51, 52, 53, 54, 55,
- 56, 57, -1, -1, 41, 42, 62, 63, 64, 46,
- 47, 48, -1, 50, 51, 52, -1, 54, 55, 56,
- 57, -1, -1, 41, 42, 62, 63, 64, 46, 47,
- 48, -1, 50, 51, 52, -1, -1, -1, 56, 57,
- -1, -1, 60, -1, 62, 63, 64, 41, 42, -1,
- -1, -1, 46, 47, 48, -1, 50, 51, 52, -1,
- -1, -1, 56, 57, -1, -1, 41, 42, 62, 63,
- 64, 46, 47, 48, -1, 50, 51, 52, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 62, 63, 64
+ 19, -1, 21, 22, 23, -1, -1, -1, 27, 28,
+ -1, -1, -1, -1, 33, 34, 35, -1, -1, 7,
+ 8, 9, 10, 11, 12, 13, -1, -1, -1, -1,
+ -1, 19, 51, 21, 22, 23, -1, 56, 57, 27,
+ 28, -1, 61, 62, -1, 33, 34, 35, -1, -1,
+ 7, 8, 9, 10, 11, 12, 13, -1, -1, -1,
+ -1, -1, 19, 51, 21, 22, -1, -1, 56, 57,
+ 27, 28, -1, -1, 62, -1, 33, -1, 35, -1,
+ -1, -1, 24, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 51, -1, -1, -1, -1, 56,
+ 57, 43, 44, -1, -1, 62, 48, 49, 50, -1,
+ 52, 53, 54, -1, 56, 57, 58, 59, -1, 37,
+ -1, -1, 64, 65, 66, 43, 44, -1, -1, -1,
+ 48, 49, 50, -1, 52, 53, 54, 55, 56, 57,
+ 58, 59, -1, -1, 43, 44, 64, 65, 66, 48,
+ 49, 50, -1, 52, 53, 54, 55, 56, 57, 58,
+ 59, -1, -1, -1, 63, 64, 65, 66, 43, 44,
+ -1, -1, -1, 48, 49, 50, -1, 52, 53, 54,
+ -1, 56, 57, 58, 59, -1, -1, -1, 63, 64,
+ 65, 66, 43, 44, -1, -1, -1, 48, 49, 50,
+ -1, 52, 53, 54, 55, 56, 57, 58, 59, -1,
+ -1, 43, 44, 64, 65, 66, 48, 49, 50, -1,
+ 52, 53, 54, -1, 56, 57, 58, 59, -1, -1,
+ 43, 44, 64, 65, 66, 48, 49, 50, -1, 52,
+ 53, 54, -1, -1, -1, 58, 59, -1, -1, 62,
+ -1, 64, 65, 66, 43, 44, -1, -1, -1, 48,
+ 49, 50, -1, 52, 53, 54, -1, -1, -1, 58,
+ 59, -1, -1, 43, 44, 64, 65, 66, 48, 49,
+ 50, -1, 52, 53, 54, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 64, 65, 66
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -889,29 +895,30 @@ static const yytype_int16 yycheck[] =
static const yytype_uint8 yystos[] =
{
0, 1, 7, 8, 9, 10, 11, 12, 13, 19,
- 21, 22, 23, 26, 27, 28, 33, 34, 35, 49,
- 54, 55, 60, 67, 69, 70, 71, 72, 73, 80,
- 81, 82, 87, 88, 90, 93, 97, 59, 12, 33,
- 70, 87, 60, 60, 84, 12, 89, 13, 20, 25,
- 29, 30, 31, 32, 37, 91, 92, 12, 13, 12,
- 87, 38, 39, 8, 9, 12, 87, 87, 87, 87,
- 0, 59, 68, 60, 53, 60, 79, 87, 41, 42,
- 46, 47, 48, 50, 51, 52, 54, 55, 56, 57,
- 62, 63, 64, 87, 87, 98, 98, 98, 65, 13,
- 13, 29, 13, 20, 29, 37, 92, 94, 24, 12,
- 37, 53, 87, 37, 53, 61, 69, 79, 87, 79,
- 87, 36, 53, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 61, 65,
- 61, 12, 13, 13, 13, 84, 12, 87, 87, 37,
- 53, 87, 87, 61, 85, 61, 68, 84, 87, 87,
- 12, 95, 87, 87, 86, 15, 37, 86, 71, 88,
- 65, 68, 68, 72, 85, 37, 87, 85, 85, 12,
- 65, 96, 18, 87, 85, 18, 40, 84, 17, 40,
- 76, 77, 83, 12, 86, 34, 85, 86, 23, 86,
- 75, 76, 78, 83, 84, 77, 85, 79, 86, 85,
- 85, 78, 85, 79, 71, 40, 74, 36, 85, 18,
- 18, 18, 36, 85, 84, 85, 84, 18, 34, 23,
- 23, 86, 71, 72, 34, 85, 85
+ 21, 22, 23, 26, 27, 28, 33, 34, 35, 41,
+ 42, 51, 56, 57, 62, 69, 71, 72, 73, 74,
+ 75, 82, 83, 84, 89, 90, 92, 95, 100, 61,
+ 12, 33, 72, 89, 62, 62, 86, 12, 91, 13,
+ 20, 25, 29, 30, 31, 32, 37, 93, 94, 12,
+ 13, 12, 89, 38, 39, 8, 9, 12, 12, 12,
+ 89, 89, 89, 89, 0, 61, 70, 62, 55, 62,
+ 81, 89, 43, 44, 48, 49, 50, 52, 53, 54,
+ 56, 57, 58, 59, 64, 65, 66, 89, 89, 101,
+ 101, 101, 67, 13, 13, 29, 13, 20, 29, 37,
+ 94, 96, 24, 12, 37, 55, 89, 37, 55, 97,
+ 63, 71, 81, 89, 81, 89, 36, 55, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 63, 67, 63, 12, 13, 13, 13,
+ 86, 12, 89, 89, 37, 55, 89, 89, 86, 63,
+ 87, 63, 70, 86, 89, 89, 12, 98, 89, 89,
+ 98, 88, 15, 37, 88, 73, 90, 67, 70, 70,
+ 70, 74, 87, 37, 89, 87, 87, 12, 67, 99,
+ 99, 18, 89, 87, 18, 40, 86, 17, 40, 78,
+ 79, 85, 12, 88, 88, 34, 87, 88, 23, 88,
+ 77, 78, 80, 85, 86, 79, 87, 81, 88, 87,
+ 87, 80, 87, 81, 73, 40, 76, 36, 87, 18,
+ 18, 18, 36, 87, 86, 87, 86, 18, 34, 23,
+ 23, 88, 73, 74, 34, 87, 87
};
#define yyerrok (yyerrstatus = 0)
@@ -2327,32 +2334,53 @@ yyreduce:
break;
case 104:
-#line 486 "engines/director/lingo/lingo-gr.y"
- { (yyval.narg) = 0; ;}
+#line 485 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->codeFactory(*(yyvsp[(2) - (2)].s));
+ ;}
break;
case 105:
-#line 487 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
+#line 488 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->_indef = true; ;}
break;
case 106:
-#line 488 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+#line 489 "engines/director/lingo/lingo-gr.y"
+ {
+ g_lingo->code2(g_lingo->c_constpush, (inst)0); // Push fake value on stack
+ g_lingo->code1(g_lingo->c_procret);
+ g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg), &g_lingo->_currentFactory);
+ g_lingo->_indef = false; ;}
break;
case 107:
-#line 489 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
+#line 494 "engines/director/lingo/lingo-gr.y"
+ { (yyval.narg) = 0; ;}
break;
case 108:
-#line 491 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeArgStore(); ;}
+#line 495 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;}
break;
case 109:
-#line 494 "engines/director/lingo/lingo-gr.y"
+#line 496 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
+ break;
+
+ case 110:
+#line 497 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;}
+ break;
+
+ case 111:
+#line 499 "engines/director/lingo/lingo-gr.y"
+ { g_lingo->codeArgStore(); ;}
+ break;
+
+ case 112:
+#line 503 "engines/director/lingo/lingo-gr.y"
{
g_lingo->code1(g_lingo->c_call);
g_lingo->codeString((yyvsp[(1) - (3)].s)->c_str());
@@ -2361,24 +2389,24 @@ yyreduce:
g_lingo->code1(numpar); ;}
break;
- case 110:
-#line 502 "engines/director/lingo/lingo-gr.y"
+ case 113:
+#line 511 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 0; ;}
break;
- case 111:
-#line 503 "engines/director/lingo/lingo-gr.y"
+ case 114:
+#line 512 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = 1; ;}
break;
- case 112:
-#line 504 "engines/director/lingo/lingo-gr.y"
+ case 115:
+#line 513 "engines/director/lingo/lingo-gr.y"
{ (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;}
break;
/* Line 1267 of yacc.c. */
-#line 2382 "engines/director/lingo/lingo-gr.cpp"
+#line 2410 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2592,6 +2620,6 @@ yyreturn:
}
-#line 507 "engines/director/lingo/lingo-gr.y"
+#line 516 "engines/director/lingo/lingo-gr.y"
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 2841e615ba..9ef3b17e7f 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -77,18 +77,20 @@
tWITH = 293,
tWHILE = 294,
tNLELSE = 295,
- tGE = 296,
- tLE = 297,
- tGT = 298,
- tLT = 299,
- tEQ = 300,
- tNEQ = 301,
- tAND = 302,
- tOR = 303,
- tNOT = 304,
- tCONCAT = 305,
- tCONTAINS = 306,
- tSTARTS = 307
+ tFACTORY = 296,
+ tMETHOD = 297,
+ tGE = 298,
+ tLE = 299,
+ tGT = 300,
+ tLT = 301,
+ tEQ = 302,
+ tNEQ = 303,
+ tAND = 304,
+ tOR = 305,
+ tNOT = 306,
+ tCONCAT = 307,
+ tCONTAINS = 308,
+ tSTARTS = 309
};
#endif
/* Tokens. */
@@ -130,18 +132,20 @@
#define tWITH 293
#define tWHILE 294
#define tNLELSE 295
-#define tGE 296
-#define tLE 297
-#define tGT 298
-#define tLT 299
-#define tEQ 300
-#define tNEQ 301
-#define tAND 302
-#define tOR 303
-#define tNOT 304
-#define tCONCAT 305
-#define tCONTAINS 306
-#define tSTARTS 307
+#define tFACTORY 296
+#define tMETHOD 297
+#define tGE 298
+#define tLE 299
+#define tGT 300
+#define tLT 301
+#define tEQ 302
+#define tNEQ 303
+#define tAND 304
+#define tOR 305
+#define tNOT 306
+#define tCONCAT 307
+#define tCONTAINS 308
+#define tSTARTS 309
@@ -158,7 +162,7 @@ typedef union YYSTYPE
int narg; /* number of arguments */
}
/* Line 1529 of yacc.c. */
-#line 162 "engines/director/lingo/lingo-gr.hpp"
+#line 166 "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 9a374d0d0d..9bdb29ed39 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -82,7 +82,7 @@ void yyerror(char *s) {
%token<s> BLTIN ID STRING HANDLER
%token tDOWN tELSE tNLELSIF tEND tEXIT tFRAME tGLOBAL tGO tIF tINTO tLOOP tMACRO
%token tMCI tMCIWAIT tMOVIE tNEXT tOF tPREVIOUS tPUT tREPEAT tSET tTHEN tTO
-%token tWITH tWHILE tNLELSE
+%token tWITH tWHILE tNLELSE tFACTORY tMETHOD
%token tGE tLE tGT tLT tEQ tNEQ tAND tOR tNOT
%token tCONCAT tCONTAINS tSTARTS
@@ -477,12 +477,20 @@ gotomovie: tOF tMOVIE STRING { $$ = $3; }
// See also:
// on keyword
defn: tMACRO ID { g_lingo->_indef = true; }
- begin argdef nl argstore stmtlist {
+ begin argdef nl argstore stmtlist {
g_lingo->code2(g_lingo->c_constpush, (inst)0); // Push fake value on stack
g_lingo->code1(g_lingo->c_procret);
g_lingo->define(*$2, $4, $5);
g_lingo->_indef = false; }
- ;
+ | tFACTORY ID {
+ g_lingo->codeFactory(*$2);
+ }
+ | tMETHOD ID { g_lingo->_indef = true; }
+ begin argdef nl argstore stmtlist {
+ g_lingo->code2(g_lingo->c_constpush, (inst)0); // Push fake value on stack
+ g_lingo->code1(g_lingo->c_procret);
+ g_lingo->define(*$2, $4, $5, &g_lingo->_currentFactory);
+ g_lingo->_indef = false; } ;
argdef: /* nothing */ { $$ = 0; }
| ID { g_lingo->codeArg($1); $$ = 1; }
| argdef ',' ID { g_lingo->codeArg($3); $$ = $1 + 1; }
@@ -491,6 +499,7 @@ argdef: /* nothing */ { $$ = 0; }
argstore: /* nothing */ { g_lingo->codeArgStore(); }
;
+
macro: ID begin arglist {
g_lingo->code1(g_lingo->c_call);
g_lingo->codeString($1->c_str());
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index b40ca07fcb..111574c6e9 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -364,8 +364,8 @@ static void yy_fatal_error (yyconst char msg[] );
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 48
-#define YY_END_OF_BUFFER 49
+#define YY_NUM_RULES 50
+#define YY_END_OF_BUFFER 51
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -373,25 +373,26 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[159] =
+static yyconst flex_int16_t yy_accept[170] =
{ 0,
- 0, 0, 49, 47, 3, 45, 45, 47, 47, 44,
- 44, 44, 43, 44, 44, 41, 41, 41, 41, 41,
- 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
- 41, 41, 2, 2, 3, 45, 0, 0, 45, 0,
- 0, 46, 40, 1, 42, 43, 39, 37, 38, 41,
- 41, 41, 41, 41, 41, 41, 41, 41, 15, 7,
- 41, 41, 41, 41, 41, 41, 41, 24, 25, 41,
- 41, 41, 41, 41, 41, 34, 41, 41, 2, 2,
- 0, 1, 42, 4, 41, 41, 41, 11, 41, 41,
- 41, 41, 41, 41, 19, 41, 41, 23, 41, 27,
-
- 41, 29, 41, 41, 41, 41, 0, 41, 6, 10,
- 12, 41, 41, 16, 17, 41, 41, 41, 22, 41,
- 41, 41, 0, 33, 41, 35, 9, 41, 13, 41,
- 18, 41, 21, 41, 41, 41, 32, 36, 0, 41,
- 14, 41, 41, 28, 30, 0, 0, 41, 20, 41,
- 0, 8, 5, 26, 0, 0, 31, 0
+ 0, 0, 51, 49, 3, 47, 47, 49, 49, 46,
+ 46, 46, 45, 46, 46, 43, 43, 43, 43, 43,
+ 43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
+ 43, 43, 2, 2, 3, 47, 0, 0, 47, 0,
+ 0, 48, 42, 1, 44, 45, 41, 39, 40, 43,
+ 43, 43, 43, 43, 43, 43, 43, 43, 43, 16,
+ 7, 43, 43, 43, 43, 43, 43, 43, 43, 26,
+ 27, 43, 43, 43, 43, 43, 43, 36, 43, 43,
+ 2, 2, 0, 1, 44, 4, 43, 43, 43, 11,
+ 43, 43, 43, 43, 43, 43, 43, 20, 43, 43,
+
+ 43, 25, 43, 29, 43, 31, 43, 43, 43, 43,
+ 0, 43, 6, 10, 13, 43, 43, 43, 17, 18,
+ 43, 43, 43, 43, 24, 43, 43, 43, 0, 35,
+ 43, 37, 9, 43, 43, 14, 43, 19, 43, 43,
+ 23, 43, 43, 43, 34, 38, 0, 43, 43, 15,
+ 43, 22, 43, 30, 32, 0, 0, 43, 12, 21,
+ 43, 0, 8, 5, 28, 0, 0, 33, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -404,12 +405,12 @@ static yyconst flex_int32_t yy_ec[256] =
11, 11, 11, 11, 11, 11, 11, 7, 1, 12,
13, 14, 1, 1, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 24, 25, 26, 27, 28, 29,
- 24, 30, 31, 32, 33, 34, 35, 36, 24, 24,
- 1, 1, 1, 7, 37, 1, 38, 39, 40, 41,
+ 24, 30, 31, 32, 33, 34, 35, 36, 37, 24,
+ 1, 1, 1, 7, 38, 1, 39, 40, 41, 42,
- 42, 43, 44, 45, 46, 24, 24, 47, 48, 49,
- 50, 51, 24, 52, 53, 54, 55, 56, 57, 58,
- 24, 24, 1, 1, 1, 1, 1, 1, 1, 1,
+ 43, 44, 45, 46, 47, 24, 24, 48, 49, 50,
+ 51, 52, 24, 53, 54, 55, 56, 57, 58, 59,
+ 60, 24, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -426,166 +427,172 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[59] =
+static yyconst flex_int32_t yy_meta[61] =
{ 0,
1, 2, 3, 4, 2, 1, 1, 1, 1, 1,
5, 1, 1, 1, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 5, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 6, 5, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6
} ;
-static yyconst flex_int16_t yy_base[164] =
+static yyconst flex_int16_t yy_base[175] =
{ 0,
- 0, 57, 188, 395, 61, 65, 69, 73, 153, 395,
- 137, 91, 50, 66, 85, 54, 0, 54, 55, 65,
- 56, 66, 75, 59, 82, 87, 97, 95, 77, 102,
- 108, 116, 161, 165, 169, 138, 173, 141, 177, 101,
- 87, 395, 395, 0, 78, 141, 395, 395, 395, 0,
- 113, 106, 100, 153, 167, 163, 172, 161, 0, 0,
- 158, 163, 175, 170, 161, 162, 167, 0, 0, 181,
- 170, 174, 172, 190, 188, 0, 191, 186, 229, 239,
- 196, 0, 74, 0, 197, 208, 203, 0, 204, 212,
- 223, 218, 218, 218, 215, 229, 222, 0, 221, 0,
-
- 237, 0, 229, 259, 238, 243, 247, 252, 0, 0,
- 0, 252, 258, 0, 0, 250, 259, 261, 0, 259,
- 268, 255, 192, 0, 265, 0, 290, 268, 0, 268,
- 0, 275, 0, 273, 270, 273, 308, 0, 314, 284,
- 0, 280, 284, 0, 0, 320, 298, 289, 0, 296,
- 308, 395, 0, 0, 327, 333, 338, 395, 370, 372,
- 378, 383, 388
+ 0, 59, 356, 417, 63, 67, 71, 75, 346, 417,
+ 343, 181, 52, 68, 132, 56, 0, 56, 57, 67,
+ 72, 68, 68, 69, 112, 70, 79, 103, 81, 103,
+ 106, 115, 139, 145, 162, 101, 166, 170, 174, 135,
+ 133, 417, 417, 0, 90, 163, 417, 417, 417, 0,
+ 112, 153, 146, 151, 166, 162, 169, 172, 163, 0,
+ 0, 160, 167, 171, 173, 166, 165, 164, 169, 0,
+ 0, 183, 174, 178, 184, 204, 206, 0, 204, 199,
+ 230, 242, 205, 0, 80, 0, 205, 211, 209, 0,
+ 208, 209, 216, 232, 222, 224, 225, 221, 235, 235,
+
+ 230, 0, 232, 0, 248, 0, 239, 266, 249, 248,
+ 256, 262, 0, 0, 0, 252, 264, 269, 0, 0,
+ 258, 272, 262, 269, 0, 272, 281, 266, 192, 0,
+ 281, 0, 300, 281, 276, 0, 285, 0, 291, 297,
+ 0, 289, 286, 291, 321, 0, 325, 304, 295, 0,
+ 302, 0, 302, 0, 0, 341, 305, 305, 0, 0,
+ 306, 322, 417, 0, 0, 342, 348, 359, 417, 392,
+ 394, 400, 405, 410
} ;
-static yyconst flex_int16_t yy_def[164] =
+static yyconst flex_int16_t yy_def[175] =
{ 0,
- 158, 1, 158, 158, 158, 158, 158, 158, 159, 158,
- 158, 158, 158, 158, 158, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 158, 158, 158, 158, 158, 158, 158, 158,
- 159, 158, 158, 161, 158, 158, 158, 158, 158, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 158, 158,
- 158, 161, 158, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
-
- 160, 160, 160, 160, 160, 160, 158, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 160, 160, 160, 160,
- 160, 160, 162, 160, 160, 160, 158, 160, 160, 160,
- 160, 160, 160, 160, 160, 160, 162, 160, 158, 160,
- 160, 160, 160, 160, 160, 158, 158, 160, 160, 160,
- 158, 158, 160, 160, 158, 163, 163, 0, 158, 158,
- 158, 158, 158
+ 169, 1, 169, 169, 169, 169, 169, 169, 170, 169,
+ 169, 169, 169, 169, 169, 171, 171, 171, 171, 171,
+ 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+ 171, 171, 169, 169, 169, 169, 169, 169, 169, 169,
+ 170, 169, 169, 172, 169, 169, 169, 169, 169, 171,
+ 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+ 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+ 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+ 169, 169, 169, 172, 169, 171, 171, 171, 171, 171,
+ 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+
+ 171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+ 169, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+ 171, 171, 171, 171, 171, 171, 171, 171, 173, 171,
+ 171, 171, 169, 171, 171, 171, 171, 171, 171, 171,
+ 171, 171, 171, 171, 173, 171, 169, 171, 171, 171,
+ 171, 171, 171, 171, 171, 169, 169, 171, 171, 171,
+ 171, 169, 169, 171, 171, 169, 174, 174, 0, 169,
+ 169, 169, 169, 169
} ;
-static yyconst flex_int16_t yy_nxt[454] =
+static yyconst flex_int16_t yy_nxt[478] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 12, 4,
13, 14, 10, 15, 16, 17, 18, 19, 20, 21,
22, 17, 23, 17, 24, 25, 26, 27, 28, 29,
- 30, 31, 17, 17, 32, 17, 17, 16, 17, 18,
- 19, 20, 21, 22, 17, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 17, 17, 32, 17, 33, 45,
- 46, 34, 35, 36, 36, 37, 38, 39, 39, 38,
- 38, 39, 39, 38, 37, 36, 36, 37, 47, 48,
- 51, 52, 53, 40, 83, 57, 62, 40, 83, 54,
- 58, 55, 42, 59, 60, 72, 63, 49, 64, 44,
-
- 56, 61, 51, 52, 53, 66, 40, 57, 62, 65,
- 40, 54, 58, 55, 67, 59, 68, 60, 72, 63,
- 73, 64, 56, 61, 70, 81, 69, 71, 66, 75,
- 84, 65, 85, 74, 86, 76, 67, 77, 78, 68,
- 36, 36, 38, 73, 43, 38, 70, 81, 69, 71,
- 45, 46, 75, 84, 85, 74, 86, 76, 42, 40,
- 77, 78, 79, 36, 36, 80, 80, 36, 36, 80,
- 35, 36, 36, 37, 37, 36, 36, 37, 38, 39,
- 39, 38, 40, 87, 88, 89, 90, 158, 91, 92,
- 93, 94, 95, 123, 96, 40, 123, 97, 98, 99,
-
- 158, 100, 101, 102, 103, 87, 104, 88, 89, 90,
- 91, 92, 93, 105, 94, 95, 96, 106, 40, 97,
- 98, 110, 99, 100, 101, 102, 107, 103, 108, 104,
- 79, 36, 36, 80, 109, 111, 105, 112, 113, 106,
- 80, 36, 36, 80, 110, 114, 115, 116, 107, 117,
- 108, 118, 158, 119, 120, 121, 109, 111, 122, 112,
- 123, 113, 125, 123, 126, 127, 128, 114, 115, 116,
- 129, 117, 130, 132, 118, 119, 120, 131, 121, 133,
- 122, 134, 135, 138, 125, 124, 136, 126, 127, 128,
- 140, 139, 141, 129, 139, 130, 132, 142, 158, 131,
-
- 143, 144, 133, 145, 134, 135, 138, 124, 136, 146,
- 148, 149, 146, 140, 141, 139, 150, 152, 139, 153,
- 142, 146, 143, 144, 146, 145, 154, 155, 156, 158,
- 158, 156, 148, 149, 156, 158, 147, 156, 150, 158,
- 152, 153, 158, 158, 158, 158, 158, 151, 154, 158,
- 155, 158, 158, 158, 158, 158, 158, 158, 158, 147,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 151,
- 41, 41, 158, 41, 41, 41, 50, 50, 82, 82,
- 158, 158, 82, 82, 137, 158, 158, 158, 137, 157,
- 158, 158, 158, 157, 3, 158, 158, 158, 158, 158,
-
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158
+ 30, 31, 17, 17, 32, 17, 17, 17, 16, 17,
+ 18, 19, 20, 21, 22, 17, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 17, 17, 32, 17, 17,
+ 33, 45, 46, 34, 35, 36, 36, 37, 38, 39,
+ 39, 38, 38, 39, 39, 38, 37, 36, 36, 37,
+ 47, 48, 51, 52, 53, 40, 57, 61, 68, 40,
+ 85, 54, 59, 55, 62, 60, 63, 69, 70, 74,
+
+ 85, 58, 56, 36, 36, 51, 52, 53, 71, 40,
+ 57, 61, 68, 40, 54, 59, 55, 62, 60, 63,
+ 69, 75, 70, 74, 58, 56, 64, 77, 65, 86,
+ 66, 71, 72, 78, 76, 73, 79, 80, 42, 67,
+ 81, 36, 36, 82, 49, 75, 82, 36, 36, 82,
+ 64, 77, 65, 86, 66, 72, 78, 76, 73, 83,
+ 79, 80, 67, 35, 36, 36, 37, 37, 36, 36,
+ 37, 38, 45, 46, 38, 38, 39, 39, 38, 87,
+ 88, 89, 83, 90, 91, 92, 93, 97, 40, 44,
+ 94, 95, 40, 129, 96, 98, 129, 99, 100, 101,
+
+ 102, 103, 87, 88, 89, 104, 105, 90, 91, 92,
+ 93, 97, 40, 94, 95, 106, 40, 96, 107, 98,
+ 99, 100, 101, 102, 108, 103, 109, 114, 104, 105,
+ 110, 81, 36, 36, 82, 111, 112, 113, 106, 115,
+ 116, 117, 107, 82, 36, 36, 82, 118, 108, 119,
+ 109, 114, 120, 110, 121, 122, 123, 124, 111, 112,
+ 113, 125, 115, 116, 117, 126, 127, 129, 128, 132,
+ 129, 118, 119, 131, 133, 120, 134, 121, 122, 135,
+ 123, 124, 136, 137, 125, 138, 139, 141, 126, 140,
+ 127, 128, 130, 132, 142, 143, 131, 144, 133, 146,
+
+ 134, 147, 135, 148, 147, 149, 136, 137, 138, 150,
+ 139, 141, 140, 151, 152, 130, 153, 154, 142, 143,
+ 144, 155, 156, 146, 163, 156, 147, 148, 149, 147,
+ 158, 159, 150, 160, 161, 164, 165, 151, 152, 153,
+ 154, 166, 156, 167, 155, 156, 167, 157, 163, 167,
+ 43, 42, 167, 158, 159, 169, 160, 161, 164, 165,
+ 169, 169, 169, 169, 169, 166, 169, 169, 162, 169,
+ 169, 157, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 162, 41, 41, 169, 41, 41, 41, 50, 50,
+
+ 84, 84, 169, 169, 84, 84, 145, 169, 169, 169,
+ 145, 168, 169, 169, 169, 168, 3, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169
} ;
-static yyconst flex_int16_t yy_chk[454] =
+static yyconst flex_int16_t yy_chk[478] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 13,
- 13, 2, 5, 5, 5, 5, 6, 6, 6, 6,
- 7, 7, 7, 7, 8, 8, 8, 8, 14, 14,
- 16, 18, 19, 6, 83, 21, 24, 7, 45, 20,
- 22, 20, 41, 22, 23, 29, 25, 15, 25, 12,
-
- 20, 23, 16, 18, 19, 26, 6, 21, 24, 25,
- 7, 20, 22, 20, 26, 22, 27, 23, 29, 25,
- 30, 25, 20, 23, 28, 40, 27, 28, 26, 31,
- 51, 25, 52, 30, 53, 31, 26, 32, 32, 27,
- 36, 36, 38, 30, 11, 38, 28, 40, 27, 28,
- 46, 46, 31, 51, 52, 30, 53, 31, 9, 38,
- 32, 32, 33, 33, 33, 33, 34, 34, 34, 34,
- 35, 35, 35, 35, 37, 37, 37, 37, 39, 39,
- 39, 39, 38, 54, 55, 56, 57, 3, 58, 61,
- 62, 63, 64, 123, 65, 39, 123, 66, 67, 70,
-
- 0, 71, 72, 73, 74, 54, 75, 55, 56, 57,
- 58, 61, 62, 77, 63, 64, 65, 78, 39, 66,
- 67, 87, 70, 71, 72, 73, 81, 74, 85, 75,
- 79, 79, 79, 79, 86, 89, 77, 90, 91, 78,
- 80, 80, 80, 80, 87, 92, 93, 94, 81, 95,
- 85, 96, 0, 97, 99, 101, 86, 89, 103, 90,
- 104, 91, 105, 104, 106, 107, 108, 92, 93, 94,
- 112, 95, 113, 117, 96, 97, 99, 116, 101, 118,
- 103, 120, 121, 125, 105, 104, 122, 106, 107, 108,
- 128, 127, 130, 112, 127, 113, 117, 132, 0, 116,
-
- 134, 135, 118, 136, 120, 121, 125, 104, 122, 137,
- 140, 142, 137, 128, 130, 139, 143, 147, 139, 148,
- 132, 146, 134, 135, 146, 136, 150, 151, 155, 0,
- 0, 155, 140, 142, 156, 0, 139, 156, 143, 157,
- 147, 148, 157, 0, 0, 0, 0, 146, 150, 0,
- 151, 0, 0, 0, 0, 0, 0, 0, 0, 139,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 146,
- 159, 159, 0, 159, 159, 159, 160, 160, 161, 161,
- 0, 0, 161, 161, 162, 0, 0, 0, 162, 163,
- 0, 0, 0, 163, 158, 158, 158, 158, 158, 158,
-
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158, 158, 158, 158, 158, 158, 158, 158,
- 158, 158, 158
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 2, 13, 13, 2, 5, 5, 5, 5, 6, 6,
+ 6, 6, 7, 7, 7, 7, 8, 8, 8, 8,
+ 14, 14, 16, 18, 19, 6, 21, 23, 26, 7,
+ 85, 20, 22, 20, 23, 22, 24, 26, 27, 29,
+
+ 45, 21, 20, 36, 36, 16, 18, 19, 27, 6,
+ 21, 23, 26, 7, 20, 22, 20, 23, 22, 24,
+ 26, 30, 27, 29, 21, 20, 25, 31, 25, 51,
+ 25, 27, 28, 31, 30, 28, 32, 32, 41, 25,
+ 33, 33, 33, 33, 15, 30, 34, 34, 34, 34,
+ 25, 31, 25, 51, 25, 28, 31, 30, 28, 40,
+ 32, 32, 25, 35, 35, 35, 35, 37, 37, 37,
+ 37, 38, 46, 46, 38, 39, 39, 39, 39, 52,
+ 53, 54, 40, 55, 56, 57, 58, 64, 38, 12,
+ 59, 62, 39, 129, 63, 65, 129, 66, 67, 68,
+
+ 69, 72, 52, 53, 54, 73, 74, 55, 56, 57,
+ 58, 64, 38, 59, 62, 75, 39, 63, 76, 65,
+ 66, 67, 68, 69, 77, 72, 79, 89, 73, 74,
+ 80, 81, 81, 81, 81, 83, 87, 88, 75, 91,
+ 92, 93, 76, 82, 82, 82, 82, 94, 77, 95,
+ 79, 89, 96, 80, 97, 98, 99, 100, 83, 87,
+ 88, 101, 91, 92, 93, 103, 105, 108, 107, 110,
+ 108, 94, 95, 109, 111, 96, 112, 97, 98, 116,
+ 99, 100, 117, 118, 101, 121, 122, 124, 103, 123,
+ 105, 107, 108, 110, 126, 127, 109, 128, 111, 131,
+
+ 112, 133, 116, 134, 133, 135, 117, 118, 121, 137,
+ 122, 124, 123, 139, 140, 108, 142, 143, 126, 127,
+ 128, 144, 145, 131, 157, 145, 147, 134, 135, 147,
+ 148, 149, 137, 151, 153, 158, 161, 139, 140, 142,
+ 143, 162, 156, 166, 144, 156, 166, 147, 157, 167,
+ 11, 9, 167, 148, 149, 3, 151, 153, 158, 161,
+ 168, 0, 0, 168, 0, 162, 0, 0, 156, 0,
+ 0, 147, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 156, 170, 170, 0, 170, 170, 170, 171, 171,
+
+ 172, 172, 0, 0, 172, 172, 173, 0, 0, 0,
+ 173, 174, 0, 0, 0, 174, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169
} ;
static yy_state_type yy_last_accepting_state;
@@ -650,7 +657,7 @@ static void countnl() {
g_lingo->_colnumber = strlen(p);
}
-#line 654 "engines/director/lingo/lingo-lex.cpp"
+#line 661 "engines/director/lingo/lingo-lex.cpp"
#define INITIAL 0
@@ -838,7 +845,7 @@ YY_DECL
#line 60 "engines/director/lingo/lingo-lex.l"
-#line 842 "engines/director/lingo/lingo-lex.cpp"
+#line 849 "engines/director/lingo/lingo-lex.cpp"
if ( !(yy_init) )
{
@@ -892,13 +899,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 159 )
+ if ( yy_current_state >= 170 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 395 );
+ while ( yy_base[yy_current_state] != 417 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -982,101 +989,111 @@ YY_RULE_SETUP
case 12:
YY_RULE_SETUP
#line 74 "engines/director/lingo/lingo-lex.l"
-{ count(); return tEXIT; }
+{ count(); return tFACTORY; }
YY_BREAK
case 13:
YY_RULE_SETUP
#line 75 "engines/director/lingo/lingo-lex.l"
-{ count(); return tFRAME; }
+{ count(); return tEXIT; }
YY_BREAK
case 14:
YY_RULE_SETUP
#line 76 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGLOBAL; }
+{ count(); return tFRAME; }
YY_BREAK
case 15:
YY_RULE_SETUP
#line 77 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGO; }
+{ count(); return tGLOBAL; }
YY_BREAK
case 16:
YY_RULE_SETUP
#line 78 "engines/director/lingo/lingo-lex.l"
-{ count(); return tINTO; }
+{ count(); return tGO; }
YY_BREAK
case 17:
YY_RULE_SETUP
#line 79 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLOOP; }
+{ count(); return tINTO; }
YY_BREAK
case 18:
YY_RULE_SETUP
#line 80 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMACRO; }
+{ count(); return tLOOP; }
YY_BREAK
case 19:
YY_RULE_SETUP
#line 81 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMCI; }
+{ count(); return tMACRO; }
YY_BREAK
case 20:
YY_RULE_SETUP
#line 82 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMCIWAIT; }
+{ count(); return tMCI; }
YY_BREAK
case 21:
YY_RULE_SETUP
#line 83 "engines/director/lingo/lingo-lex.l"
-{ count(); return tMOVIE; }
+{ count(); return tMCIWAIT; }
YY_BREAK
case 22:
YY_RULE_SETUP
#line 84 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEXT; }
+{ count(); return tMETHOD; }
YY_BREAK
case 23:
YY_RULE_SETUP
#line 85 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNOT; }
+{ count(); return tMOVIE; }
YY_BREAK
case 24:
YY_RULE_SETUP
#line 86 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOF; }
+{ count(); return tNEXT; }
YY_BREAK
case 25:
YY_RULE_SETUP
#line 87 "engines/director/lingo/lingo-lex.l"
-{ count(); return tOR; }
+{ count(); return tNOT; }
YY_BREAK
case 26:
YY_RULE_SETUP
#line 88 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPREVIOUS; }
+{ count(); return tOF; }
YY_BREAK
case 27:
YY_RULE_SETUP
#line 89 "engines/director/lingo/lingo-lex.l"
-{ count(); return tPUT; }
+{ count(); return tOR; }
YY_BREAK
case 28:
YY_RULE_SETUP
#line 90 "engines/director/lingo/lingo-lex.l"
-{ count(); return tREPEAT; }
+{ count(); return tPREVIOUS; }
YY_BREAK
case 29:
YY_RULE_SETUP
#line 91 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSET; }
+{ count(); return tPUT; }
YY_BREAK
case 30:
YY_RULE_SETUP
#line 92 "engines/director/lingo/lingo-lex.l"
-{ count(); return tSTARTS; }
+{ count(); return tREPEAT; }
YY_BREAK
case 31:
YY_RULE_SETUP
#line 93 "engines/director/lingo/lingo-lex.l"
+{ count(); return tSET; }
+ YY_BREAK
+case 32:
+YY_RULE_SETUP
+#line 94 "engines/director/lingo/lingo-lex.l"
+{ count(); return tSTARTS; }
+ YY_BREAK
+case 33:
+YY_RULE_SETUP
+#line 95 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1118,9 +1135,9 @@ YY_RULE_SETUP
error("Unhandled the entity %s", ptr);
}
YY_BREAK
-case 32:
+case 34:
YY_RULE_SETUP
-#line 133 "engines/director/lingo/lingo-lex.l"
+#line 135 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1141,49 +1158,49 @@ YY_RULE_SETUP
error("Unhandled the entity %s", ptr);
}
YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 152 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTHEN; }
- YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 153 "engines/director/lingo/lingo-lex.l"
-{ count(); return tTO; }
- YY_BREAK
case 35:
YY_RULE_SETUP
#line 154 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWITH; }
+{ count(); return tTHEN; }
YY_BREAK
case 36:
YY_RULE_SETUP
#line 155 "engines/director/lingo/lingo-lex.l"
-{ count(); return tWHILE; }
+{ count(); return tTO; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 157 "engines/director/lingo/lingo-lex.l"
-{ count(); return tNEQ; }
+#line 156 "engines/director/lingo/lingo-lex.l"
+{ count(); return tWITH; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 158 "engines/director/lingo/lingo-lex.l"
-{ count(); return tGE; }
+#line 157 "engines/director/lingo/lingo-lex.l"
+{ count(); return tWHILE; }
YY_BREAK
case 39:
YY_RULE_SETUP
#line 159 "engines/director/lingo/lingo-lex.l"
-{ count(); return tLE; }
+{ count(); return tNEQ; }
YY_BREAK
case 40:
YY_RULE_SETUP
#line 160 "engines/director/lingo/lingo-lex.l"
-{ count(); return tCONCAT; }
+{ count(); return tGE; }
YY_BREAK
case 41:
YY_RULE_SETUP
+#line 161 "engines/director/lingo/lingo-lex.l"
+{ count(); return tLE; }
+ YY_BREAK
+case 42:
+YY_RULE_SETUP
#line 162 "engines/director/lingo/lingo-lex.l"
+{ count(); return tCONCAT; }
+ YY_BREAK
+case 43:
+YY_RULE_SETUP
+#line 164 "engines/director/lingo/lingo-lex.l"
{
count();
yylval.s = new Common::String(yytext);
@@ -1194,43 +1211,43 @@ YY_RULE_SETUP
return ID;
}
YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 171 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.f = atof(yytext); return FLOAT; }
- YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 172 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
- YY_BREAK
case 44:
YY_RULE_SETUP
#line 173 "engines/director/lingo/lingo-lex.l"
-{ count(); return *yytext; }
+{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 45:
-/* rule 45 can match eol */
YY_RULE_SETUP
#line 174 "engines/director/lingo/lingo-lex.l"
-{ return '\n'; }
+{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 46:
YY_RULE_SETUP
#line 175 "engines/director/lingo/lingo-lex.l"
-{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
+{ count(); return *yytext; }
YY_BREAK
case 47:
+/* rule 47 can match eol */
YY_RULE_SETUP
#line 176 "engines/director/lingo/lingo-lex.l"
-
+{ return '\n'; }
YY_BREAK
case 48:
YY_RULE_SETUP
+#line 177 "engines/director/lingo/lingo-lex.l"
+{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
+ YY_BREAK
+case 49:
+YY_RULE_SETUP
#line 178 "engines/director/lingo/lingo-lex.l"
+
+ YY_BREAK
+case 50:
+YY_RULE_SETUP
+#line 180 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1234 "engines/director/lingo/lingo-lex.cpp"
+#line 1251 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1523,7 +1540,7 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 159 )
+ if ( yy_current_state >= 170 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1551,11 +1568,11 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 159 )
+ if ( yy_current_state >= 170 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 158);
+ yy_is_jam = (yy_current_state == 169);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -2230,7 +2247,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 178 "engines/director/lingo/lingo-lex.l"
+#line 180 "engines/director/lingo/lingo-lex.l"
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 9113ac39ee..dd1fbace94 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -71,6 +71,7 @@ whitespace [\t ]
(?i:[\n\r]+[\t ]*else) { countnl(); return tNLELSE; }
(?i:else) { count(); return tELSE; }
(?i:end) { count(); return tEND; }
+(?i:factory) { count(); return tFACTORY; }
(?i:exit) { count(); return tEXIT; }
(?i:frame) { count(); return tFRAME; }
(?i:global) { count(); return tGLOBAL; }
@@ -80,6 +81,7 @@ whitespace [\t ]
(?i:macro) { count(); return tMACRO; }
(?i:mci) { count(); return tMCI; }
(?i:mciwait) { count(); return tMCIWAIT; }
+(?i:method) { count(); return tMETHOD; }
(?i:movie) { count(); return tMOVIE; }
(?i:next) { count(); return tNEXT; }
(?i:not) { count(); return tNOT; }
diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h
index 462b14d6b6..953e90bc7e 100644
--- a/engines/director/lingo/lingo.h
+++ b/engines/director/lingo/lingo.h
@@ -159,7 +159,7 @@ public:
void popContext();
Symbol *lookupVar(const char *name, bool create = true, bool putInGlobalList = false);
void cleanLocalVars();
- void define(Common::String &s, int start, int nargs);
+ void define(Common::String &s, int start, int nargs, Common::String *prefix = NULL);
void processIf(int elselabel, int endlabel);
int alignTypes(Datum &d1, Datum &d2);
@@ -183,6 +183,7 @@ public:
int codeId(Common::String &s);
int codeId_(Common::String &s);
int codeFloat(double f);
+ void codeFactory(Common::String &s);
static void c_xpop();
static void c_printtop();
@@ -288,6 +289,7 @@ public:
bool _hadError;
bool _inFactory;
+ Common::String _currentFactory;
private:
int parse(const char *code);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 19:50:52 +0000