diff options
| author | Eugene Sandulenko | 2017-01-10 01:02:22 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-10 01:02:56 +0100 |
| commit | 677dd99bdb564b86c93657fb0e8c3cf1cd5f612d (patch) | |
| tree | b127bf8e2743f9c183c231224a3c3d3a0d19fc7e | |
| parent | 525f916b2d645076797e4e8f713b4e4d16e3e4f1 (diff) | |
| download | scummvm-rg350-677dd99bdb564b86c93657fb0e8c3cf1cd5f612d.tar.gz scummvm-rg350-677dd99bdb564b86c93657fb0e8c3cf1cd5f612d.tar.bz2 scummvm-rg350-677dd99bdb564b86c93657fb0e8c3cf1cd5f612d.zip | |
DIRECTOR: Lingo: Added stubs for D3 Text-related syntax
| -rw-r--r-- | engines/director/lingo/lingo-builtins.cpp | 22 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-code.cpp | 63 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-gr.cpp | 1150 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-gr.h | 28 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-gr.y | 8 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 562 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-lex.l | 3 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-the.cpp | 20 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-the.h | 16 | ||||
| -rw-r--r-- | engines/director/lingo/lingo.h | 8 |
10 files changed, 1080 insertions, 800 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index 30936c6fa8..52f840db3c 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -48,6 +48,8 @@ static struct BuiltinProto { // String { "chars", Lingo::b_chars, 3, 3, true }, // D2 { "charToNum", Lingo::b_charToNum, 1, 1, true }, // D2 + { "delete", Lingo::b_delete, 1, 1, true }, // D3 + { "hilite", Lingo::b_hilite, 1, 1, true }, // D3 { "length", Lingo::b_length, 1, 1, true }, // D2 { "numToChar", Lingo::b_numToChar, 1, 1, true }, // D2 { "offset", Lingo::b_offset, 2, 2, true }, // D2 @@ -353,6 +355,26 @@ void Lingo::b_charToNum(int nargs) { g_lingo->push(d); } +void Lingo::b_delete(int nargs) { + Datum d = g_lingo->pop(); + + d.toInt(); + + warning("STUB: b_delete"); + + g_lingo->push(Datum((char)d.u.i)); +} + +void Lingo::b_hilite(int nargs) { + Datum d = g_lingo->pop(); + + d.toInt(); + + warning("STUB: b_hilite"); + + g_lingo->push(Datum((char)d.u.i)); +} + void Lingo::b_length(int nargs) { Datum d = g_lingo->pop(); diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp index 4f4a2b3be1..675f7ef8ca 100644 --- a/engines/director/lingo/lingo-code.cpp +++ b/engines/director/lingo/lingo-code.cpp @@ -83,6 +83,12 @@ static struct FuncDescr { { Lingo::c_within, "c_within", "" }, { Lingo::c_charOf, "c_charOf", "" }, // D3 { Lingo::c_charToOf, "c_charToOf", "" }, // D3 + { Lingo::c_itemOf, "c_itemOf", "" }, // D3 + { Lingo::c_itemToOf, "c_itemToOf", "" }, // D3 + { Lingo::c_lineOf, "c_lineOf", "" }, // D3 + { Lingo::c_lineToOf, "c_lineToOf", "" }, // D3 + { Lingo::c_wordOf, "c_wordOf", "" }, // D3 + { Lingo::c_wordToOf, "c_wordToOf", "" }, // D3 { Lingo::c_and, "c_and", "" }, { Lingo::c_or, "c_or", "" }, { Lingo::c_not, "c_not", "" }, @@ -606,6 +612,63 @@ void Lingo::c_charToOf() { g_lingo->push(d1); } +void Lingo::c_itemOf() { + Datum d2 = g_lingo->pop(); + Datum d1 = g_lingo->pop(); + + warning("STUB: c_itemOf: %d %d", d1.u.i, d2.u.i); + + g_lingo->push(d1); +} + +void Lingo::c_itemToOf() { + Datum d3 = g_lingo->pop(); + Datum d2 = g_lingo->pop(); + Datum d1 = g_lingo->pop(); + + warning("STUB: c_itemToOf: %d %d %d", d1.u.i, d2.u.i, d3.u.i); + + g_lingo->push(d1); +} + +void Lingo::c_lineOf() { + Datum d2 = g_lingo->pop(); + Datum d1 = g_lingo->pop(); + + warning("STUB: c_lineOf: %d %d", d1.u.i, d2.u.i); + + g_lingo->push(d1); +} + +void Lingo::c_lineToOf() { + Datum d3 = g_lingo->pop(); + Datum d2 = g_lingo->pop(); + Datum d1 = g_lingo->pop(); + + warning("STUB: c_lineToOf: %d %d %d", d1.u.i, d2.u.i, d3.u.i); + + g_lingo->push(d1); +} + +void Lingo::c_wordOf() { + Datum d2 = g_lingo->pop(); + Datum d1 = g_lingo->pop(); + + warning("STUB: c_wordOf: %d %d", d1.u.i, d2.u.i); + + g_lingo->push(d1); +} + +void Lingo::c_wordToOf() { + Datum d3 = g_lingo->pop(); + Datum d2 = g_lingo->pop(); + Datum d1 = g_lingo->pop(); + + warning("STUB: c_wordToOf: %d %d %d", d1.u.i, d2.u.i, d3.u.i); + + g_lingo->push(d1); +} + void Lingo::c_and() { Datum d2 = g_lingo->pop(); Datum d1 = g_lingo->pop(); diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index d5c57790ae..138686cf74 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -135,11 +135,14 @@ tCONTAINS = 324, tSTARTS = 325, tCHAR = 326, - tSPRITE = 327, - tINTERSECTS = 328, - tWITHIN = 329, - tON = 330, - tSOUND = 331 + tITEM = 327, + tLINE = 328, + tWORD = 329, + tSPRITE = 330, + tINTERSECTS = 331, + tWITHIN = 332, + tON = 333, + tSOUND = 334 }; #endif /* Tokens. */ @@ -212,11 +215,14 @@ #define tCONTAINS 324 #define tSTARTS 325 #define tCHAR 326 -#define tSPRITE 327 -#define tINTERSECTS 328 -#define tWITHIN 329 -#define tON 330 -#define tSOUND 331 +#define tITEM 327 +#define tLINE 328 +#define tWORD 329 +#define tSPRITE 330 +#define tINTERSECTS 331 +#define tWITHIN 332 +#define tON 333 +#define tSOUND 334 @@ -274,7 +280,7 @@ typedef union YYSTYPE Common::Array<double> *arr; } /* Line 193 of yacc.c. */ -#line 278 "engines/director/lingo/lingo-gr.cpp" +#line 284 "engines/director/lingo/lingo-gr.cpp" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -287,7 +293,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 291 "engines/director/lingo/lingo-gr.cpp" +#line 297 "engines/director/lingo/lingo-gr.cpp" #ifdef short # undef short @@ -500,22 +506,22 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 99 +#define YYFINAL 105 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1191 +#define YYLAST 1550 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 90 +#define YYNTOKENS 93 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 39 /* YYNRULES -- Number of rules. */ -#define YYNRULES 140 +#define YYNRULES 146 /* YYNRULES -- Number of states. */ -#define YYNSTATES 297 +#define YYNSTATES 321 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 331 +#define YYMAXUTOK 334 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -524,12 +530,12 @@ union yyalloc static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 84, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 87, 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, 83, 78, 2, - 85, 86, 81, 79, 89, 80, 2, 82, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 86, 81, 2, + 88, 89, 84, 82, 92, 83, 2, 85, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 88, 77, 87, 2, 2, 2, 2, 2, 2, 2, + 91, 80, 90, 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, @@ -556,7 +562,7 @@ static const yytype_uint8 yytranslate[] = 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76 + 75, 76, 77, 78, 79 }; #if YYDEBUG @@ -573,70 +579,74 @@ static const yytype_uint16 yyprhs[] = 250, 252, 254, 259, 261, 263, 266, 268, 272, 276, 280, 284, 288, 292, 296, 300, 304, 308, 312, 316, 319, 323, 327, 331, 335, 339, 342, 345, 349, 354, - 359, 364, 371, 374, 376, 378, 381, 383, 386, 389, - 392, 395, 397, 400, 405, 408, 412, 414, 418, 420, - 424, 427, 430, 433, 436, 440, 443, 446, 448, 452, - 455, 458, 461, 465, 468, 469, 478, 481, 482, 491, - 492, 493, 504, 505, 507, 511, 516, 517, 521, 522, - 524 + 359, 364, 371, 376, 383, 388, 395, 400, 407, 410, + 412, 414, 417, 419, 422, 425, 428, 431, 433, 436, + 441, 444, 448, 450, 454, 456, 460, 463, 466, 469, + 472, 476, 479, 482, 484, 488, 491, 494, 497, 501, + 504, 505, 514, 517, 518, 527, 528, 529, 540, 541, + 543, 547, 552, 553, 557, 558, 560 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 91, 0, -1, 91, 92, 93, -1, 93, -1, 1, - 92, -1, 84, -1, -1, 120, -1, 113, -1, 127, - -1, 94, -1, 96, -1, 40, 112, 33, 20, -1, - 40, 112, 66, 112, -1, 40, 112, 67, 112, -1, - 42, 20, 77, 112, -1, 42, 12, 77, 112, -1, - 42, 13, 112, 77, 112, -1, 42, 20, 44, 112, - -1, 42, 12, 44, 112, -1, 42, 13, 112, 44, - 112, -1, 112, -1, 113, -1, 95, -1, 97, -1, - 104, 85, 103, 86, 110, 109, 27, 41, -1, 105, - 77, 112, 109, 44, 112, 109, 110, 109, 27, 41, - -1, 105, 77, 112, 109, 24, 44, 112, 109, 110, - 109, 27, 41, -1, 111, 112, 109, -1, 106, 103, - 43, 92, 110, 109, 27, 32, -1, 106, 103, 43, - 92, 110, 109, 48, 110, 109, 27, 32, -1, 106, - 103, 43, 92, 110, 109, 108, 99, 109, 27, 32, - -1, 106, 103, 43, 108, 95, 109, -1, 106, 103, - 43, 108, 95, 109, 48, 108, 95, 109, -1, 106, - 103, 43, 108, 95, 109, 100, 109, 98, 109, -1, - -1, 48, 108, 95, -1, 99, 102, -1, 102, -1, - 100, 101, -1, 101, -1, 107, 103, 43, 108, 96, - 109, -1, 100, -1, 107, 103, 43, 110, 109, -1, - 112, -1, 112, 77, 112, -1, 85, 103, 86, -1, + 94, 0, -1, 94, 95, 96, -1, 96, -1, 1, + 95, -1, 87, -1, -1, 123, -1, 116, -1, 130, + -1, 97, -1, 99, -1, 40, 115, 33, 20, -1, + 40, 115, 66, 115, -1, 40, 115, 67, 115, -1, + 42, 20, 80, 115, -1, 42, 12, 80, 115, -1, + 42, 13, 115, 80, 115, -1, 42, 20, 44, 115, + -1, 42, 12, 44, 115, -1, 42, 13, 115, 44, + 115, -1, 115, -1, 116, -1, 98, -1, 100, -1, + 107, 88, 106, 89, 113, 112, 27, 41, -1, 108, + 80, 115, 112, 44, 115, 112, 113, 112, 27, 41, + -1, 108, 80, 115, 112, 24, 44, 115, 112, 113, + 112, 27, 41, -1, 114, 115, 112, -1, 109, 106, + 43, 95, 113, 112, 27, 32, -1, 109, 106, 43, + 95, 113, 112, 48, 113, 112, 27, 32, -1, 109, + 106, 43, 95, 113, 112, 111, 102, 112, 27, 32, + -1, 109, 106, 43, 111, 98, 112, -1, 109, 106, + 43, 111, 98, 112, 48, 111, 98, 112, -1, 109, + 106, 43, 111, 98, 112, 103, 112, 101, 112, -1, + -1, 48, 111, 98, -1, 102, 105, -1, 105, -1, + 103, 104, -1, 104, -1, 110, 106, 43, 111, 99, + 112, -1, 103, -1, 110, 106, 43, 113, 112, -1, + 115, -1, 115, 80, 115, -1, 88, 106, 89, -1, 41, 47, -1, 41, 46, 20, -1, 32, -1, 26, - -1, -1, -1, -1, 110, 92, -1, 110, 96, -1, + -1, -1, -1, -1, 113, 95, -1, 113, 99, -1, 45, 20, 43, -1, 11, -1, 14, -1, 23, -1, - 21, -1, 16, -1, 20, 85, 128, 86, -1, 20, - -1, 12, -1, 13, 112, -1, 94, -1, 112, 79, - 112, -1, 112, 80, 112, -1, 112, 81, 112, -1, - 112, 82, 112, -1, 112, 65, 112, -1, 112, 87, - 112, -1, 112, 88, 112, -1, 112, 61, 112, -1, - 112, 56, 112, -1, 112, 57, 112, -1, 112, 62, - 112, -1, 112, 63, 112, -1, 64, 112, -1, 112, - 78, 112, -1, 112, 66, 112, -1, 112, 68, 112, - -1, 112, 69, 112, -1, 112, 70, 112, -1, 79, - 112, -1, 80, 112, -1, 85, 112, 86, -1, 72, - 112, 73, 112, -1, 72, 112, 74, 112, -1, 71, - 112, 38, 112, -1, 71, 112, 44, 112, 38, 112, - -1, 40, 112, -1, 116, -1, 119, -1, 28, 41, - -1, 28, -1, 30, 114, -1, 55, 115, -1, 18, - 112, -1, 17, 112, -1, 17, -1, 19, 128, -1, - 51, 112, 46, 112, -1, 51, 112, -1, 76, 20, - 128, -1, 20, -1, 114, 89, 20, -1, 20, -1, - 115, 89, 20, -1, 31, 34, -1, 31, 37, -1, - 31, 39, -1, 31, 117, -1, 31, 117, 118, -1, - 31, 118, -1, 29, 112, -1, 112, -1, 38, 36, - 112, -1, 36, 112, -1, 52, 53, -1, 52, 117, - -1, 52, 117, 118, -1, 52, 118, -1, -1, 35, - 20, 121, 108, 125, 92, 126, 110, -1, 49, 20, - -1, -1, 50, 20, 122, 108, 125, 92, 126, 110, - -1, -1, -1, 75, 20, 123, 108, 124, 125, 92, - 126, 110, 27, -1, -1, 20, -1, 125, 89, 20, - -1, 125, 92, 89, 20, -1, -1, 20, 108, 128, - -1, -1, 112, -1, 128, 89, 112, -1 + 21, -1, 16, -1, 20, 88, 131, 89, -1, 20, + -1, 12, -1, 13, 115, -1, 97, -1, 115, 82, + 115, -1, 115, 83, 115, -1, 115, 84, 115, -1, + 115, 85, 115, -1, 115, 65, 115, -1, 115, 90, + 115, -1, 115, 91, 115, -1, 115, 61, 115, -1, + 115, 56, 115, -1, 115, 57, 115, -1, 115, 62, + 115, -1, 115, 63, 115, -1, 64, 115, -1, 115, + 81, 115, -1, 115, 66, 115, -1, 115, 68, 115, + -1, 115, 69, 115, -1, 115, 70, 115, -1, 82, + 115, -1, 83, 115, -1, 88, 115, 89, -1, 75, + 115, 76, 115, -1, 75, 115, 77, 115, -1, 71, + 115, 38, 115, -1, 71, 115, 44, 115, 38, 115, + -1, 72, 115, 38, 115, -1, 72, 115, 44, 115, + 38, 115, -1, 73, 115, 38, 115, -1, 73, 115, + 44, 115, 38, 115, -1, 74, 115, 38, 115, -1, + 74, 115, 44, 115, 38, 115, -1, 40, 115, -1, + 119, -1, 122, -1, 28, 41, -1, 28, -1, 30, + 117, -1, 55, 118, -1, 18, 115, -1, 17, 115, + -1, 17, -1, 19, 131, -1, 51, 115, 46, 115, + -1, 51, 115, -1, 79, 20, 131, -1, 20, -1, + 117, 92, 20, -1, 20, -1, 118, 92, 20, -1, + 31, 34, -1, 31, 37, -1, 31, 39, -1, 31, + 120, -1, 31, 120, 121, -1, 31, 121, -1, 29, + 115, -1, 115, -1, 38, 36, 115, -1, 36, 115, + -1, 52, 53, -1, 52, 120, -1, 52, 120, 121, + -1, 52, 121, -1, -1, 35, 20, 124, 111, 128, + 95, 129, 113, -1, 49, 20, -1, -1, 50, 20, + 125, 111, 128, 95, 129, 113, -1, -1, -1, 78, + 20, 126, 111, 127, 128, 95, 129, 113, 27, -1, + -1, 20, -1, 128, 92, 20, -1, 128, 95, 92, + 20, -1, -1, 20, 111, 131, -1, -1, 115, -1, + 131, 92, 115, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -651,12 +661,12 @@ static const yytype_uint16 yyrline[] = 365, 368, 371, 374, 378, 385, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, - 415, 416, 419, 420, 421, 422, 423, 425, 426, 427, - 430, 433, 436, 437, 438, 439, 442, 443, 446, 447, - 458, 459, 460, 461, 464, 467, 472, 473, 476, 477, - 480, 481, 484, 487, 517, 517, 523, 526, 526, 531, - 532, 531, 544, 545, 546, 547, 549, 553, 561, 562, - 563 + 415, 416, 417, 418, 419, 420, 421, 422, 425, 426, + 427, 428, 429, 431, 432, 433, 436, 439, 442, 443, + 444, 445, 448, 449, 452, 453, 464, 465, 466, 467, + 470, 473, 478, 479, 482, 483, 486, 487, 490, 493, + 523, 523, 529, 532, 532, 537, 538, 537, 550, 551, + 552, 553, 555, 559, 567, 568, 569 }; #endif @@ -675,11 +685,11 @@ static const char *const yytname[] = "tWHILE", "tNLELSE", "tFACTORY", "tMETHOD", "tOPEN", "tPLAY", "tDONE", "tPLAYACCEL", "tINSTANCE", "tGE", "tLE", "tGT", "tLT", "tEQ", "tNEQ", "tAND", "tOR", "tNOT", "tMOD", "tAFTER", "tBEFORE", "tCONCAT", - "tCONTAINS", "tSTARTS", "tCHAR", "tSPRITE", "tINTERSECTS", "tWITHIN", - "tON", "tSOUND", "'='", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", - "'\\n'", "'('", "')'", "'>'", "'<'", "','", "$accept", "program", "nl", - "programline", "asgn", "stmtoneliner", "stmt", "ifstmt", - "elsestmtoneliner", "elseifstmt", "elseifstmtoneliner", + "tCONTAINS", "tSTARTS", "tCHAR", "tITEM", "tLINE", "tWORD", "tSPRITE", + "tINTERSECTS", "tWITHIN", "tON", "tSOUND", "'='", "'&'", "'+'", "'-'", + "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "'>'", "'<'", "','", + "$accept", "program", "nl", "programline", "asgn", "stmtoneliner", + "stmt", "ifstmt", "elsestmtoneliner", "elseifstmt", "elseifstmtoneliner", "elseifstmtoneliner1", "elseifstmt1", "cond", "repeatwhile", "repeatwith", "if", "elseif", "begin", "end", "stmtlist", "when", "expr", "func", "globallist", "instancelist", "gotofunc", "gotoframe", @@ -700,29 +710,30 @@ static const yytype_uint16 yytoknum[] = 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 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, 61, 38, 43, - 45, 42, 47, 37, 10, 40, 41, 62, 60, 44 + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, + 61, 38, 43, 45, 42, 47, 37, 10, 40, 41, + 62, 60, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 90, 91, 91, 91, 92, 93, 93, 93, 93, - 93, 93, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 95, 95, 96, 96, 96, 96, 96, 96, 97, - 97, 97, 97, 97, 97, 98, 98, 99, 99, 100, - 100, 101, 102, 102, 103, 103, 103, 104, 105, 106, - 107, 108, 109, 110, 110, 110, 111, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 114, 114, 115, 115, - 116, 116, 116, 116, 116, 116, 117, 117, 118, 118, - 119, 119, 119, 119, 121, 120, 120, 122, 120, 123, - 124, 120, 125, 125, 125, 125, 126, 127, 128, 128, - 128 + 0, 93, 94, 94, 94, 95, 96, 96, 96, 96, + 96, 96, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 98, 98, 99, 99, 99, 99, 99, 99, 100, + 100, 100, 100, 100, 100, 101, 101, 102, 102, 103, + 103, 104, 105, 105, 106, 106, 106, 107, 108, 109, + 110, 111, 112, 113, 113, 113, 114, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 116, 116, + 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, + 116, 116, 117, 117, 118, 118, 119, 119, 119, 119, + 119, 119, 120, 120, 121, 121, 122, 122, 122, 122, + 124, 123, 123, 125, 123, 126, 127, 123, 128, 128, + 128, 128, 129, 130, 131, 131, 131 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -737,12 +748,12 @@ static const yytype_uint8 yyr2[] = 1, 1, 4, 1, 1, 2, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 3, 3, 3, 3, 2, 2, 3, 4, 4, - 4, 6, 2, 1, 1, 2, 1, 2, 2, 2, - 2, 1, 2, 4, 2, 3, 1, 3, 1, 3, - 2, 2, 2, 2, 3, 2, 2, 1, 3, 2, - 2, 2, 3, 2, 0, 8, 2, 0, 8, 0, - 0, 10, 0, 1, 3, 4, 0, 3, 0, 1, - 3 + 4, 6, 4, 6, 4, 6, 4, 6, 2, 1, + 1, 2, 1, 2, 2, 2, 2, 1, 2, 4, + 2, 3, 1, 3, 1, 3, 2, 2, 2, 2, + 3, 2, 2, 1, 3, 2, 2, 2, 3, 2, + 0, 8, 2, 0, 8, 0, 0, 10, 0, 1, + 3, 4, 0, 3, 0, 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -750,91 +761,97 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 57, 64, 0, 58, 61, 101, 0, 138, - 51, 60, 59, 96, 0, 0, 49, 0, 0, 0, + 0, 0, 57, 64, 0, 58, 61, 107, 0, 144, + 51, 60, 59, 102, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 3, 66, 23, 11, - 24, 0, 0, 0, 0, 21, 8, 93, 94, 7, - 9, 5, 4, 63, 0, 66, 65, 100, 99, 139, - 102, 138, 138, 95, 106, 97, 0, 110, 0, 111, - 0, 112, 117, 113, 115, 124, 92, 0, 47, 0, - 0, 0, 0, 126, 127, 104, 120, 121, 123, 108, - 98, 79, 0, 0, 129, 138, 85, 86, 0, 1, - 6, 0, 0, 0, 0, 44, 52, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, + 66, 23, 11, 24, 0, 0, 0, 0, 21, 8, + 99, 100, 7, 9, 5, 4, 63, 0, 66, 65, + 106, 105, 145, 108, 144, 144, 101, 112, 103, 0, + 116, 0, 117, 0, 118, 123, 119, 121, 130, 98, + 0, 47, 0, 0, 0, 0, 132, 133, 110, 126, + 127, 129, 114, 104, 79, 0, 0, 0, 0, 0, + 135, 144, 85, 86, 0, 1, 6, 0, 0, 0, + 0, 44, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 137, 0, 116, - 119, 0, 114, 51, 0, 0, 0, 48, 0, 0, - 0, 0, 0, 56, 51, 0, 122, 0, 0, 0, - 0, 0, 51, 105, 87, 2, 0, 52, 0, 0, - 51, 0, 28, 75, 76, 74, 77, 78, 71, 81, - 82, 83, 84, 80, 67, 68, 69, 70, 72, 73, - 140, 62, 107, 118, 132, 12, 13, 14, 19, 16, - 0, 0, 18, 15, 132, 103, 109, 90, 0, 88, - 89, 130, 53, 0, 46, 53, 0, 45, 133, 0, - 20, 17, 0, 0, 132, 52, 0, 0, 52, 52, - 22, 0, 136, 136, 91, 0, 54, 55, 0, 0, - 52, 51, 32, 134, 0, 53, 53, 136, 0, 52, - 53, 0, 53, 0, 50, 51, 52, 40, 0, 135, - 125, 128, 53, 25, 53, 52, 29, 52, 52, 42, - 38, 0, 0, 39, 35, 0, 0, 52, 0, 0, - 37, 0, 0, 52, 51, 52, 51, 131, 0, 0, - 0, 0, 51, 33, 0, 34, 0, 0, 26, 30, - 31, 52, 36, 52, 27, 43, 41 + 0, 0, 0, 143, 0, 122, 125, 0, 120, 51, + 0, 0, 0, 48, 0, 0, 0, 0, 0, 56, + 51, 0, 128, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 51, 111, 87, 2, 0, 52, + 0, 0, 51, 0, 28, 75, 76, 74, 77, 78, + 71, 81, 82, 83, 84, 80, 67, 68, 69, 70, + 72, 73, 146, 62, 113, 124, 138, 12, 13, 14, + 19, 16, 0, 0, 18, 15, 138, 109, 115, 90, + 0, 92, 0, 94, 0, 96, 0, 88, 89, 136, + 53, 0, 46, 53, 0, 45, 139, 0, 20, 17, + 0, 0, 0, 0, 0, 138, 52, 0, 0, 52, + 52, 22, 0, 142, 142, 91, 93, 95, 97, 0, + 54, 55, 0, 0, 52, 51, 32, 140, 0, 53, + 53, 142, 0, 52, 53, 0, 53, 0, 50, 51, + 52, 40, 0, 141, 131, 134, 53, 25, 53, 52, + 29, 52, 52, 42, 38, 0, 0, 39, 35, 0, + 0, 52, 0, 0, 37, 0, 0, 52, 51, 52, + 51, 137, 0, 0, 0, 0, 51, 33, 0, 34, + 0, 0, 26, 30, 31, 52, 36, 52, 27, 43, + 41 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 35, 226, 36, 55, 38, 227, 40, 275, 258, - 259, 247, 260, 104, 41, 42, 43, 248, 286, 162, - 215, 44, 45, 220, 65, 90, 47, 73, 74, 48, - 49, 133, 144, 152, 214, 209, 235, 50, 60 + -1, 38, 250, 39, 58, 41, 251, 43, 299, 282, + 283, 271, 284, 110, 44, 45, 46, 272, 310, 174, + 236, 47, 48, 241, 68, 93, 50, 76, 77, 51, + 52, 139, 150, 164, 235, 227, 259, 53, 63 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -228 +#define YYPACT_NINF -244 static const yytype_int16 yypact[] = { - 261, -53, -228, -228, 760, -228, -228, 760, 760, 760, - 1103, -228, -228, 9, 32, 680, -228, 33, 760, -17, - 94, 38, 41, 44, 760, 726, 50, 760, 760, 760, - 53, 58, 760, 760, 760, 4, -228, 5, -228, -228, - -228, -8, 6, 796, 760, 1075, -228, -228, -228, -228, - -228, -228, -228, -1, 760, -228, 1075, 1075, 1075, 1075, - -3, 760, 760, -228, -228, 8, 760, -228, 760, -228, - 63, -228, 1075, 31, -228, -228, 817, 74, -228, -38, - 760, -33, 61, -228, -228, 935, -228, 31, -228, -228, - 16, -52, 850, 963, -228, 760, -52, -52, 1019, -228, - 336, 796, 760, 796, 67, 1047, 1075, 760, 760, 760, - 760, 760, 760, 760, 760, 760, 760, 760, 760, 760, - 760, 760, 760, 760, 817, 760, -61, -3, 96, 1075, - 1075, 760, -228, -228, 101, 760, 760, -228, 760, 760, - 907, 760, 760, -228, -228, 760, -228, 106, 760, 760, - 760, 760, -228, -3, -228, -228, 42, 1075, 43, 991, - -53, 760, -228, 387, 387, 387, -52, -52, -52, 1075, - 1075, 387, 387, 57, 30, 30, -52, -52, 1075, 1075, - 1075, -228, -228, 1075, 110, -228, 1075, 1075, 1075, 1075, - 760, 760, 1075, 1075, 110, 1075, -228, 1075, 879, 1075, - 1075, -228, -228, -7, -228, -228, 626, 1075, -228, -62, - 1075, 1075, -62, 760, 110, 481, 87, 760, 481, -228, - -228, 113, 45, 45, 1075, -62, -228, -228, 114, 760, - 1075, -6, 12, -228, 120, -228, -228, 45, 105, 1075, - -228, 115, -228, 126, -228, -228, 126, -228, 796, -228, - 481, 481, -228, -228, -228, 481, -228, 481, 126, 126, - -228, 796, 626, -228, 125, 132, 406, 481, 149, 150, - -228, 152, 137, -228, -228, -228, -228, -228, 154, 112, - 155, 159, -18, -228, 626, -228, 556, 158, -228, -228, - -228, 481, -228, -228, -228, -228, -228 + 300, -52, -244, -244, 862, -244, -244, 862, 862, 862, + 1459, -244, -244, -5, 17, 753, -244, 34, 862, -17, + 13, 38, 46, 54, 862, 826, 55, 862, 862, 862, + 862, 862, 862, 58, 65, 862, 862, 862, 3, -244, + 5, -244, -244, -244, -16, 6, 899, 862, 1428, -244, + -244, -244, -244, -244, -244, -244, 7, 862, -244, 1428, + 1428, 1428, 1428, 8, 862, 862, -244, -244, 9, 862, + -244, 862, -244, 60, -244, 1428, 26, -244, -244, 923, + 74, -244, -30, 862, -28, 59, -244, -244, 1273, -244, + 26, -244, -244, 11, -49, 959, 995, 1031, 1067, 1304, + -244, 862, -49, -49, 1366, -244, 378, 899, 862, 899, + 61, 1397, 1428, 862, 862, 862, 862, 862, 862, 862, + 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + 923, 862, -58, 8, 77, 1428, 1428, 862, -244, -244, + 85, 862, 862, -244, 862, 862, 1242, 862, 862, -244, + -244, 862, -244, 87, 862, 862, 862, 862, 862, 862, + 862, 862, 862, 862, -244, 8, -244, -244, 22, 1428, + 23, 1335, -52, 862, -244, 166, 166, 166, -49, -49, + -49, 1428, 1428, 166, 166, 715, 203, 203, -49, -49, + 1428, 1428, 1428, -244, -244, 1428, 93, -244, 1428, 1428, + 1428, 1428, 862, 862, 1428, 1428, 93, 1428, -244, 1428, + 1103, 1428, 1139, 1428, 1175, 1428, 1211, 1428, 1428, -244, + -244, -1, -244, -244, 680, 1428, -244, -60, 1428, 1428, + -60, 862, 862, 862, 862, 93, 529, 70, 862, 529, + -244, -244, 95, 27, 27, 1428, 1428, 1428, 1428, -60, + -244, -244, 91, 862, 1428, 1, -8, -244, 100, -244, + -244, 27, 81, 1428, -244, 92, -244, 99, -244, -244, + 99, -244, 899, -244, 529, 529, -244, -244, -244, 529, + -244, 529, 99, 99, -244, 899, 680, -244, 78, 84, + 451, 529, 101, 102, -244, 104, 89, -244, -244, -244, + -244, -244, 106, 96, 107, 108, -14, -244, 680, -244, + 607, 97, -244, -244, -244, 529, -244, -244, -244, -244, + -244 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -228, -228, 14, 100, 2, -199, 0, -228, -228, -228, - -31, -227, -56, -77, -228, -228, -228, -225, -9, -25, - -195, -228, 47, 3, -228, -228, -228, 178, -5, -228, - -228, -228, -228, -228, -228, -171, -189, -228, -49 + -244, -244, 10, 28, 2, -217, 0, -244, -244, -244, + -120, -215, -140, -87, -244, -244, -244, -243, -9, -18, + -213, -244, 52, 4, -244, -244, -244, 118, -19, -244, + -244, -244, -244, -244, -244, -191, -223, -244, -56 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -844,250 +861,322 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -64 static const yytype_int16 yytable[] = { - 39, 62, 37, 46, 99, -10, 138, 219, -53, -53, - 218, 141, 126, 127, 113, 52, 114, 216, 261, 263, - 88, 241, 51, 212, 156, 181, 158, 221, 125, 77, - 78, 51, 263, 261, 236, 122, 123, 217, 244, 139, - 250, 251, 242, 225, 142, 255, 153, 257, 252, 100, - 63, 56, 64, 75, 57, 58, 59, 266, 82, 267, - 245, 83, 72, 273, 84, 76, -53, 68, 132, 70, - 89, 85, 72, 94, 91, 92, 93, 101, 95, 96, - 97, 98, 146, 102, 61, 292, 125, 291, 51, -10, - 105, 106, 110, 111, 137, 112, 113, 128, 114, 131, - 39, 124, 37, 46, 143, 147, 79, 80, 59, 59, - 160, 120, 121, 129, 81, 130, 182, 122, 123, 110, - 111, 185, 112, 113, 184, 114, 196, 140, 202, 204, - 208, 229, 203, 233, 234, 194, 118, 119, 120, 121, - 249, 238, 59, 201, 122, 123, 253, 256, 105, 157, - 159, 206, 244, 288, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, - 179, 265, 180, 274, 205, 276, 279, 280, 183, 281, - 282, 287, 186, 187, 272, 188, 189, 289, 192, 193, - 228, 290, 195, 231, 232, 197, 198, 199, 200, 294, - 155, 246, 270, 87, 0, 240, 0, 0, 207, 0, - 0, 0, 0, 0, 254, 0, 0, 0, 0, 0, - 0, 264, 243, 222, 0, 0, 223, 0, 0, 0, - 268, 0, 269, 271, 0, 0, 262, 210, 211, 237, - 0, 0, 278, 0, 0, 0, 0, 0, 283, 0, - 285, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 224, -6, 1, 0, 230, 284, 295, 0, 296, 0, - 0, 0, 2, 3, 4, 5, 239, 6, 7, 8, - 9, 10, 11, 0, 12, 0, 293, 0, 0, 13, - 0, 14, 15, 16, 0, 105, 17, 0, 0, 0, - 0, 18, 19, 20, 0, 0, 21, 0, 105, 0, - 22, 23, 24, 25, 0, 0, 26, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 0, 0, 30, 31, 0, 0, - 32, 33, 0, 0, 0, -6, 34, 2, 3, 4, - 5, 0, 6, 7, 8, 9, 10, 11, 0, 12, - 0, 0, 0, 0, 13, 0, 14, 15, 16, 0, - 0, 17, 0, 0, 0, 0, 18, 19, 20, 0, - 0, 21, 0, 0, 0, 22, 23, 24, 25, 0, - 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 0, 0, 0, 0, 0, 0, 28, 29, 0, - 0, 30, 31, 0, 0, 32, 33, 2, 3, 4, - 5, 34, 6, 7, 8, 9, 53, 11, 0, 12, - 0, 0, 0, 277, 13, 0, 14, 15, 16, 0, - 0, 0, 0, 0, 0, 0, 18, 19, 20, 110, - 111, 21, 112, 113, 0, 114, 0, 24, 25, 0, - 0, 26, 0, 0, 0, 117, 118, 119, 120, 121, - 27, 0, 0, 0, 122, 123, 0, 28, 29, 0, - 0, 0, 31, 0, 0, 32, 33, 0, 0, 0, - 51, 34, 2, 3, 4, 5, 0, 6, 7, 8, - 9, 53, 11, 0, 12, 0, 0, 0, 0, 13, + 42, 65, 40, 105, 49, -10, 91, 240, 132, 133, + 239, 55, -53, -53, 144, 230, 147, 119, 268, 120, + 168, 260, 170, 237, 285, 82, 83, 54, 265, 80, + 81, 193, 242, 84, 131, 54, 66, 67, 276, 285, + 269, 128, 129, 238, 249, 165, 274, 275, 106, 266, + 145, 279, 148, 281, 78, 287, 59, 138, 85, 60, + 61, 62, 71, 290, 73, 291, 86, 75, 287, 297, + 79, 152, 107, -53, 87, 92, 88, 75, 100, 94, + 95, 96, 97, 98, 99, 101, 108, 102, 103, 104, + 54, 316, -10, 315, 143, 64, 137, 194, 111, 112, + 131, 134, 149, 153, 172, 197, 42, 208, 40, 130, + 49, 220, 222, 226, 253, 257, 62, 62, 262, 258, + 273, 135, 277, 136, 280, 268, 298, 300, 303, 304, + 196, 305, 306, 311, 167, 146, 270, 312, 318, 313, + 314, 206, 294, 90, 0, 0, 0, 0, 0, 0, + 0, 221, 0, 62, 0, 219, 0, 0, 0, 111, + 169, 171, 0, 224, 0, 175, 176, 177, 178, 179, + 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, + 190, 191, 223, 192, 0, 289, 0, 0, 0, 195, + 0, 0, 0, 198, 199, 0, 200, 201, 296, 204, + 205, 0, 0, 207, 0, 0, 209, 210, 211, 212, + 213, 214, 215, 216, 217, 218, 0, 0, 252, 0, + 0, 255, 256, 0, 0, 225, 0, 0, 116, 117, + 0, 118, 119, 0, 120, 0, 264, 243, 0, 0, + 244, 0, 0, 0, 0, 278, 267, 123, 124, 125, + 126, 127, 288, 0, 228, 229, 128, 129, 0, 261, + 286, 292, 0, 293, 295, 116, 117, 0, 118, 119, + 0, 120, 0, 302, 0, 0, 0, 0, 0, 307, + 0, 309, 0, 245, 246, 247, 248, 126, 127, 308, + 254, 0, 0, 128, 129, 0, 0, 319, 0, 320, + -6, 1, 0, 0, 0, 263, 0, 0, 0, 0, + 317, 2, 3, 4, 5, 0, 6, 7, 8, 9, + 10, 11, 0, 12, 111, 0, 0, 0, 13, 0, + 14, 15, 16, 0, 0, 17, 0, 111, 0, 0, + 18, 19, 20, 0, 0, 21, 0, 0, 0, 22, + 23, 24, 25, 0, 0, 26, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, + 0, 28, 29, 30, 31, 32, 0, 0, 33, 34, + 0, 0, 35, 36, 0, 0, 0, -6, 37, 2, + 3, 4, 5, 0, 6, 7, 8, 9, 10, 11, + 0, 12, 0, 0, 0, 0, 13, 0, 14, 15, + 16, 0, 0, 17, 0, 0, 0, 0, 18, 19, + 20, 0, 0, 21, 0, 0, 0, 22, 23, 24, + 25, 0, 0, 26, 0, 0, 0, 0, 0, 0, + 0, 0, 27, 0, 0, 0, 0, 0, 0, 28, + 29, 30, 31, 32, 0, 0, 33, 34, 0, 0, + 35, 36, 2, 3, 4, 5, 37, 6, 7, 8, + 9, 56, 11, 0, 12, 0, 0, 0, 301, 13, 0, 14, 15, 16, 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, 0, 0, 21, 0, 0, 0, 0, 0, 24, 25, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, - 0, 0, 28, 29, 0, 0, 0, 31, 0, 0, - 32, 33, 0, 0, 0, 51, 34, 2, 3, 4, - 5, 0, 6, 7, 8, 9, 53, 11, 0, 12, - 0, 0, 0, 0, 13, 0, 14, 15, 16, 0, - 0, 0, 0, 0, 0, 0, 18, 19, 20, 0, - 0, 21, 0, 0, 0, 0, 0, 24, 25, 0, - 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 0, 0, 0, 0, 0, 0, 28, 29, 0, - 0, 0, 31, 0, 0, 32, 33, 2, 3, 4, - 5, 34, 6, 7, 8, 9, 53, 11, 0, 12, - 0, 0, 0, 0, 13, 0, 14, 15, 0, 0, - 0, 0, 0, 0, 0, 0, 18, 0, 20, 0, - 0, 0, 0, 0, 0, 0, 0, 24, 25, 0, - 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 2, 3, 4, 5, 0, 6, 28, 29, 0, - 53, 11, 31, 12, 0, 32, 33, 0, 0, 66, - 0, 34, 0, 0, 67, 0, 68, 69, 70, 71, - 54, 0, 20, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 3, 4, - 5, 0, 6, 0, 27, 0, 53, 11, 0, 12, - 0, 28, 29, 0, 0, 66, 0, 0, 0, 32, - 33, 0, 68, 0, 70, 34, 54, 0, 20, 0, - 0, 2, 3, 4, 5, 0, 6, 0, 0, 86, - 53, 11, 0, 12, 0, 0, 0, 0, 0, 0, - 27, 0, 0, 0, 0, 0, 0, 28, 29, 0, - 54, 0, 20, 0, 0, 32, 33, 2, 3, 4, - 5, 34, 6, 0, 0, 0, 53, 11, 0, 12, + 0, 0, 28, 29, 30, 31, 32, 0, 0, 0, + 34, 0, 0, 35, 36, 0, 0, 0, 54, 37, + 2, 3, 4, 5, 0, 6, 7, 8, 9, 56, + 11, 0, 12, 0, 0, 0, 0, 13, 0, 14, + 15, 16, 0, 0, 0, 0, 0, 0, 0, 18, + 19, 20, 0, 0, 21, 0, 0, 0, 0, 0, + 24, 25, 0, 0, 26, 0, 0, 0, 0, 0, + 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, + 28, 29, 30, 31, 32, 0, 0, 0, 34, 0, + 0, 35, 36, 0, 0, 0, 54, 37, 2, 3, + 4, 5, 0, 6, 7, 8, 9, 56, 11, 0, + 12, 0, 0, 0, 0, 13, 0, 14, 15, 16, + 0, 0, 0, 0, 0, 0, 0, 18, 19, 20, + 0, 0, 21, 0, 0, 0, 0, 0, 24, 25, + 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, + 0, 27, 0, 0, 0, 0, 0, 0, 28, 29, + 30, 31, 32, 0, 0, 0, 34, 0, 0, 35, + 36, 2, 3, 4, 5, 37, 6, 7, 8, 9, + 56, 11, 0, 12, 0, 0, 0, 0, 13, 0, + 14, 15, 0, 0, 0, 0, 0, 0, 0, 0, + 18, 0, 20, 0, 0, 0, 0, 0, 0, 0, + 0, 24, 25, 0, 0, 26, 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 0, 0, - 0, 28, 29, 0, 0, 0, 54, 0, 20, 32, - 33, 0, 0, 0, 0, 34, 0, 0, 0, 0, - 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 27, 0, 0, 0, 0, 0, 0, 28, 29, 0, - 0, 0, 0, 107, 108, 32, 33, 0, 109, 110, - 111, 103, 112, 135, 136, 114, 115, 116, 148, 0, - 0, 0, 0, 0, 149, 117, 118, 119, 120, 121, - 0, 0, 0, 0, 122, 123, 107, 108, 0, 0, - 0, 109, 110, 111, 0, 112, 113, 213, 114, 115, - 116, 0, 0, 0, 0, 0, 0, 0, 117, 118, - 119, 120, 121, 0, 0, 107, 108, 122, 123, 0, - 109, 110, 111, 0, 112, 113, 0, 114, 115, 116, - 0, 190, 0, 0, 0, 0, 0, 117, 118, 119, - 120, 121, 0, 107, 108, 0, 122, 123, 109, 110, - 111, 0, 112, 113, 0, 114, 115, 116, 0, 0, - 0, 145, 0, 0, 191, 117, 118, 119, 120, 121, - 0, 107, 108, 0, 122, 123, 109, 110, 111, 0, - 112, 113, 0, 114, 115, 116, 0, 0, 0, 0, - 0, 0, 0, 117, 118, 119, 120, 121, 0, 107, - 108, 0, 122, 123, 109, 110, 111, 0, 112, 113, - 0, 114, 115, 116, 0, 0, 150, 151, 0, 0, - 0, 117, 118, 119, 120, 121, 0, 107, 108, 0, - 122, 123, 109, 110, 111, 0, 112, 113, 0, 114, - 115, 116, 0, 0, 0, 0, 0, 0, 161, 117, - 118, 119, 120, 121, 0, 107, 108, 154, 122, 123, - 109, 110, 111, 0, 112, 113, 0, 114, 115, 116, - 0, 0, 0, 0, 0, 0, 0, 117, 118, 119, - 120, 121, 0, 107, 108, 154, 122, 123, 109, 110, - 111, 0, 112, 113, 0, 114, 115, 116, 0, 0, - 0, 0, 0, 0, 161, 117, 118, 119, 120, 121, - 0, 107, 108, 0, 122, 123, 109, 110, 111, 0, - 112, 113, 0, 114, 115, 116, 0, 0, 0, 0, - 0, 0, 0, 117, 118, 119, 120, 121, 0, -63, - -63, 0, 122, 123, -63, -63, -63, 0, -63, -63, - 0, -63, -63, -63, 0, 0, 0, 0, 0, 0, - 0, -63, 0, 0, -63, -63, 0, 0, 61, 0, - -63, -63 + 0, 28, 29, 30, 31, 32, 0, 0, 0, 34, + 0, 0, 35, 36, 2, 3, 4, 5, 37, 6, + 0, 0, 0, 56, 11, 0, 12, 116, 117, 0, + 118, 119, 69, 120, 0, 0, 0, 70, 0, 71, + 72, 73, 74, 57, 0, 20, 0, 124, 125, 126, + 127, 0, 0, 0, 0, 128, 129, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 0, 0, 0, 0, 28, 29, 30, 31, 32, 0, + 0, 0, 0, 0, 0, 35, 36, 2, 3, 4, + 5, 37, 6, 0, 0, 0, 56, 11, 0, 12, + 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, + 0, 0, 71, 0, 73, 0, 57, 0, 20, 0, + 0, 0, 0, 2, 3, 4, 5, 0, 6, 89, + 0, 0, 56, 11, 0, 12, 0, 0, 0, 0, + 27, 0, 0, 0, 0, 0, 0, 28, 29, 30, + 31, 32, 57, 0, 20, 0, 0, 0, 35, 36, + 2, 3, 4, 5, 37, 6, 0, 0, 0, 56, + 11, 0, 12, 0, 0, 0, 27, 0, 0, 0, + 0, 0, 0, 28, 29, 30, 31, 32, 0, 57, + 0, 20, 0, 0, 35, 36, 0, 0, 0, 0, + 37, 0, 0, 0, 0, 0, 140, 0, 0, 0, + 0, 0, 0, 27, 0, 0, 0, 0, 0, 0, + 28, 29, 30, 31, 32, 0, 0, 0, 0, 113, + 114, 35, 36, 0, 115, 116, 117, 109, 118, 141, + 142, 120, 121, 122, 0, 0, 0, 154, 0, 0, + 0, 0, 0, 155, 123, 124, 125, 126, 127, 0, + 0, 0, 0, 128, 129, 113, 114, 0, 0, 0, + 115, 116, 117, 0, 118, 119, 0, 120, 121, 122, + 0, 0, 0, 156, 0, 0, 0, 0, 0, 157, + 123, 124, 125, 126, 127, 0, 0, 0, 0, 128, + 129, 113, 114, 0, 0, 0, 115, 116, 117, 0, + 118, 119, 0, 120, 121, 122, 0, 0, 0, 158, + 0, 0, 0, 0, 0, 159, 123, 124, 125, 126, + 127, 0, 0, 0, 0, 128, 129, 113, 114, 0, + 0, 0, 115, 116, 117, 0, 118, 119, 0, 120, + 121, 122, 0, 0, 0, 160, 0, 0, 0, 0, + 0, 161, 123, 124, 125, 126, 127, 0, 0, 0, + 0, 128, 129, 113, 114, 0, 0, 0, 115, 116, + 117, 0, 118, 119, 0, 120, 121, 122, 0, 0, + 0, 231, 0, 0, 0, 0, 0, 0, 123, 124, + 125, 126, 127, 0, 0, 0, 0, 128, 129, 113, + 114, 0, 0, 0, 115, 116, 117, 0, 118, 119, + 0, 120, 121, 122, 0, 0, 0, 232, 0, 0, + 0, 0, 0, 0, 123, 124, 125, 126, 127, 0, + 0, 0, 0, 128, 129, 113, 114, 0, 0, 0, + 115, 116, 117, 0, 118, 119, 0, 120, 121, 122, + 0, 0, 0, 233, 0, 0, 0, 0, 0, 0, + 123, 124, 125, 126, 127, 0, 0, 0, 0, 128, + 129, 113, 114, 0, 0, 0, 115, 116, 117, 0, + 118, 119, 0, 120, 121, 122, 0, 0, 0, 234, + 0, 0, 0, 0, 0, 0, 123, 124, 125, 126, + 127, 0, 0, 0, 0, 128, 129, 113, 114, 0, + 0, 0, 115, 116, 117, 0, 118, 119, 0, 120, + 121, 122, 0, 0, 0, 0, 202, 0, 0, 0, + 0, 0, 123, 124, 125, 126, 127, 0, 113, 114, + 0, 128, 129, 115, 116, 117, 0, 118, 119, 0, + 120, 121, 122, 0, 0, 0, 0, 0, 0, 151, + 0, 0, 203, 123, 124, 125, 126, 127, 0, 113, + 114, 0, 128, 129, 115, 116, 117, 0, 118, 119, + 0, 120, 121, 122, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 123, 124, 125, 126, 127, 0, + 113, 114, 0, 128, 129, 115, 116, 117, 0, 118, + 119, 0, 120, 121, 122, 0, 0, 0, 0, 0, + 162, 163, 0, 0, 0, 123, 124, 125, 126, 127, + 0, 113, 114, 0, 128, 129, 115, 116, 117, 0, + 118, 119, 0, 120, 121, 122, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 173, 123, 124, 125, 126, + 127, 0, 113, 114, 166, 128, 129, 115, 116, 117, + 0, 118, 119, 0, 120, 121, 122, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 123, 124, 125, + 126, 127, 0, 113, 114, 166, 128, 129, 115, 116, + 117, 0, 118, 119, 0, 120, 121, 122, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 173, 123, 124, + 125, 126, 127, 0, 113, 114, 0, 128, 129, 115, + 116, 117, 0, 118, 119, 0, 120, 121, 122, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, + 124, 125, 126, 127, 0, -63, -63, 0, 128, 129, + -63, -63, -63, 0, -63, -63, 0, -63, -63, -63, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + -63, 0, 0, -63, -63, 0, 0, 64, 0, -63, + -63 }; static const yytype_int16 yycheck[] = { - 0, 10, 0, 0, 0, 0, 44, 206, 26, 27, - 205, 44, 61, 62, 66, 1, 68, 24, 243, 246, - 25, 27, 84, 194, 101, 86, 103, 89, 89, 46, - 47, 84, 259, 258, 223, 87, 88, 44, 26, 77, - 235, 236, 48, 214, 77, 240, 95, 242, 237, 35, - 41, 4, 20, 20, 7, 8, 9, 252, 20, 254, - 48, 20, 15, 262, 20, 18, 84, 36, 73, 38, - 20, 24, 25, 20, 27, 28, 29, 85, 20, 32, - 33, 34, 87, 77, 85, 284, 89, 282, 84, 84, - 43, 44, 62, 63, 20, 65, 66, 89, 68, 36, - 100, 54, 100, 100, 43, 89, 12, 13, 61, 62, - 43, 81, 82, 66, 20, 68, 20, 87, 88, 62, - 63, 20, 65, 66, 133, 68, 20, 80, 86, 86, - 20, 44, 157, 20, 89, 144, 79, 80, 81, 82, - 20, 27, 95, 152, 87, 88, 41, 32, 101, 102, - 103, 160, 26, 41, 107, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, - 123, 248, 125, 48, 160, 43, 27, 27, 131, 27, - 43, 27, 135, 136, 261, 138, 139, 32, 141, 142, - 215, 32, 145, 218, 219, 148, 149, 150, 151, 41, - 100, 232, 258, 25, -1, 230, -1, -1, 161, -1, - -1, -1, -1, -1, 239, -1, -1, -1, -1, -1, - -1, 246, 231, 209, -1, -1, 212, -1, -1, -1, - 255, -1, 257, 258, -1, -1, 245, 190, 191, 225, - -1, -1, 267, -1, -1, -1, -1, -1, 273, -1, - 275, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 213, 0, 1, -1, 217, 274, 291, -1, 293, -1, - -1, -1, 11, 12, 13, 14, 229, 16, 17, 18, - 19, 20, 21, -1, 23, -1, 286, -1, -1, 28, - -1, 30, 31, 32, -1, 248, 35, -1, -1, -1, - -1, 40, 41, 42, -1, -1, 45, -1, 261, -1, - 49, 50, 51, 52, -1, -1, 55, -1, -1, -1, - -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, - -1, -1, 71, 72, -1, -1, 75, 76, -1, -1, - 79, 80, -1, -1, -1, 84, 85, 11, 12, 13, - 14, -1, 16, 17, 18, 19, 20, 21, -1, 23, - -1, -1, -1, -1, 28, -1, 30, 31, 32, -1, - -1, 35, -1, -1, -1, -1, 40, 41, 42, -1, - -1, 45, -1, -1, -1, 49, 50, 51, 52, -1, - -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, - 64, -1, -1, -1, -1, -1, -1, 71, 72, -1, - -1, 75, 76, -1, -1, 79, 80, 11, 12, 13, - 14, 85, 16, 17, 18, 19, 20, 21, -1, 23, - -1, -1, -1, 27, 28, -1, 30, 31, 32, -1, - -1, -1, -1, -1, -1, -1, 40, 41, 42, 62, - 63, 45, 65, 66, -1, 68, -1, 51, 52, -1, - -1, 55, -1, -1, -1, 78, 79, 80, 81, 82, - 64, -1, -1, -1, 87, 88, -1, 71, 72, -1, - -1, -1, 76, -1, -1, 79, 80, -1, -1, -1, - 84, 85, 11, 12, 13, 14, -1, 16, 17, 18, - 19, 20, 21, -1, 23, -1, -1, -1, -1, 28, + 0, 10, 0, 0, 0, 0, 25, 224, 64, 65, + 223, 1, 26, 27, 44, 206, 44, 66, 26, 68, + 107, 244, 109, 24, 267, 12, 13, 87, 27, 46, + 47, 89, 92, 20, 92, 87, 41, 20, 261, 282, + 48, 90, 91, 44, 235, 101, 259, 260, 38, 48, + 80, 264, 80, 266, 20, 270, 4, 76, 20, 7, + 8, 9, 36, 276, 38, 278, 20, 15, 283, 286, + 18, 90, 88, 87, 20, 20, 24, 25, 20, 27, + 28, 29, 30, 31, 32, 20, 80, 35, 36, 37, + 87, 308, 87, 306, 20, 88, 36, 20, 46, 47, + 92, 92, 43, 92, 43, 20, 106, 20, 106, 57, + 106, 89, 89, 20, 44, 20, 64, 65, 27, 92, + 20, 69, 41, 71, 32, 26, 48, 43, 27, 27, + 139, 27, 43, 27, 106, 83, 256, 41, 41, 32, + 32, 150, 282, 25, -1, -1, -1, -1, -1, -1, + -1, 169, -1, 101, -1, 164, -1, -1, -1, 107, + 108, 109, -1, 172, -1, 113, 114, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, 129, 172, 131, -1, 272, -1, -1, -1, 137, + -1, -1, -1, 141, 142, -1, 144, 145, 285, 147, + 148, -1, -1, 151, -1, -1, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, -1, -1, 236, -1, + -1, 239, 240, -1, -1, 173, -1, -1, 62, 63, + -1, 65, 66, -1, 68, -1, 254, 227, -1, -1, + 230, -1, -1, -1, -1, 263, 255, 81, 82, 83, + 84, 85, 270, -1, 202, 203, 90, 91, -1, 249, + 269, 279, -1, 281, 282, 62, 63, -1, 65, 66, + -1, 68, -1, 291, -1, -1, -1, -1, -1, 297, + -1, 299, -1, 231, 232, 233, 234, 84, 85, 298, + 238, -1, -1, 90, 91, -1, -1, 315, -1, 317, + 0, 1, -1, -1, -1, 253, -1, -1, -1, -1, + 310, 11, 12, 13, 14, -1, 16, 17, 18, 19, + 20, 21, -1, 23, 272, -1, -1, -1, 28, -1, + 30, 31, 32, -1, -1, 35, -1, 285, -1, -1, + 40, 41, 42, -1, -1, 45, -1, -1, -1, 49, + 50, 51, 52, -1, -1, 55, -1, -1, -1, -1, + -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, + -1, 71, 72, 73, 74, 75, -1, -1, 78, 79, + -1, -1, 82, 83, -1, -1, -1, 87, 88, 11, + 12, 13, 14, -1, 16, 17, 18, 19, 20, 21, + -1, 23, -1, -1, -1, -1, 28, -1, 30, 31, + 32, -1, -1, 35, -1, -1, -1, -1, 40, 41, + 42, -1, -1, 45, -1, -1, -1, 49, 50, 51, + 52, -1, -1, 55, -1, -1, -1, -1, -1, -1, + -1, -1, 64, -1, -1, -1, -1, -1, -1, 71, + 72, 73, 74, 75, -1, -1, 78, 79, -1, -1, + 82, 83, 11, 12, 13, 14, 88, 16, 17, 18, + 19, 20, 21, -1, 23, -1, -1, -1, 27, 28, -1, 30, 31, 32, -1, -1, -1, -1, -1, -1, -1, 40, 41, 42, -1, -1, 45, -1, -1, -1, -1, -1, 51, 52, -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, - -1, -1, 71, 72, -1, -1, -1, 76, -1, -1, - 79, 80, -1, -1, -1, 84, 85, 11, 12, 13, - 14, -1, 16, 17, 18, 19, 20, 21, -1, 23, - -1, -1, -1, -1, 28, -1, 30, 31, 32, -1, - -1, -1, -1, -1, -1, -1, 40, 41, 42, -1, - -1, 45, -1, -1, -1, -1, -1, 51, 52, -1, - -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, - 64, -1, -1, -1, -1, -1, -1, 71, 72, -1, - -1, -1, 76, -1, -1, 79, 80, 11, 12, 13, - 14, 85, 16, 17, 18, 19, 20, 21, -1, 23, - -1, -1, -1, -1, 28, -1, 30, 31, -1, -1, - -1, -1, -1, -1, -1, -1, 40, -1, 42, -1, - -1, -1, -1, -1, -1, -1, -1, 51, 52, -1, - -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, - 64, 11, 12, 13, 14, -1, 16, 71, 72, -1, - 20, 21, 76, 23, -1, 79, 80, -1, -1, 29, - -1, 85, -1, -1, 34, -1, 36, 37, 38, 39, + -1, -1, 71, 72, 73, 74, 75, -1, -1, -1, + 79, -1, -1, 82, 83, -1, -1, -1, 87, 88, + 11, 12, 13, 14, -1, 16, 17, 18, 19, 20, + 21, -1, 23, -1, -1, -1, -1, 28, -1, 30, + 31, 32, -1, -1, -1, -1, -1, -1, -1, 40, + 41, 42, -1, -1, 45, -1, -1, -1, -1, -1, + 51, 52, -1, -1, 55, -1, -1, -1, -1, -1, + -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, + 71, 72, 73, 74, 75, -1, -1, -1, 79, -1, + -1, 82, 83, -1, -1, -1, 87, 88, 11, 12, + 13, 14, -1, 16, 17, 18, 19, 20, 21, -1, + 23, -1, -1, -1, -1, 28, -1, 30, 31, 32, + -1, -1, -1, -1, -1, -1, -1, 40, 41, 42, + -1, -1, 45, -1, -1, -1, -1, -1, 51, 52, + -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, + -1, 64, -1, -1, -1, -1, -1, -1, 71, 72, + 73, 74, 75, -1, -1, -1, 79, -1, -1, 82, + 83, 11, 12, 13, 14, 88, 16, 17, 18, 19, + 20, 21, -1, 23, -1, -1, -1, -1, 28, -1, + 30, 31, -1, -1, -1, -1, -1, -1, -1, -1, 40, -1, 42, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 11, 12, 13, - 14, -1, 16, -1, 64, -1, 20, 21, -1, 23, - -1, 71, 72, -1, -1, 29, -1, -1, -1, 79, - 80, -1, 36, -1, 38, 85, 40, -1, 42, -1, - -1, 11, 12, 13, 14, -1, 16, -1, -1, 53, - 20, 21, -1, 23, -1, -1, -1, -1, -1, -1, - 64, -1, -1, -1, -1, -1, -1, 71, 72, -1, - 40, -1, 42, -1, -1, 79, 80, 11, 12, 13, - 14, 85, 16, -1, -1, -1, 20, 21, -1, 23, + -1, 51, 52, -1, -1, 55, -1, -1, -1, -1, -1, -1, -1, -1, 64, -1, -1, -1, -1, -1, - -1, 71, 72, -1, -1, -1, 40, -1, 42, 79, - 80, -1, -1, -1, -1, 85, -1, -1, -1, -1, - 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 64, -1, -1, -1, -1, -1, -1, 71, 72, -1, - -1, -1, -1, 56, 57, 79, 80, -1, 61, 62, - 63, 85, 65, 66, 67, 68, 69, 70, 38, -1, - -1, -1, -1, -1, 44, 78, 79, 80, 81, 82, - -1, -1, -1, -1, 87, 88, 56, 57, -1, -1, - -1, 61, 62, 63, -1, 65, 66, 38, 68, 69, - 70, -1, -1, -1, -1, -1, -1, -1, 78, 79, - 80, 81, 82, -1, -1, 56, 57, 87, 88, -1, + -1, 71, 72, 73, 74, 75, -1, -1, -1, 79, + -1, -1, 82, 83, 11, 12, 13, 14, 88, 16, + -1, -1, -1, 20, 21, -1, 23, 62, 63, -1, + 65, 66, 29, 68, -1, -1, -1, 34, -1, 36, + 37, 38, 39, 40, -1, 42, -1, 82, 83, 84, + 85, -1, -1, -1, -1, 90, 91, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 64, -1, -1, + -1, -1, -1, -1, 71, 72, 73, 74, 75, -1, + -1, -1, -1, -1, -1, 82, 83, 11, 12, 13, + 14, 88, 16, -1, -1, -1, 20, 21, -1, 23, + -1, -1, -1, -1, -1, 29, -1, -1, -1, -1, + -1, -1, 36, -1, 38, -1, 40, -1, 42, -1, + -1, -1, -1, 11, 12, 13, 14, -1, 16, 53, + -1, -1, 20, 21, -1, 23, -1, -1, -1, -1, + 64, -1, -1, -1, -1, -1, -1, 71, 72, 73, + 74, 75, 40, -1, 42, -1, -1, -1, 82, 83, + 11, 12, 13, 14, 88, 16, -1, -1, -1, 20, + 21, -1, 23, -1, -1, -1, 64, -1, -1, -1, + -1, -1, -1, 71, 72, 73, 74, 75, -1, 40, + -1, 42, -1, -1, 82, 83, -1, -1, -1, -1, + 88, -1, -1, -1, -1, -1, 33, -1, -1, -1, + -1, -1, -1, 64, -1, -1, -1, -1, -1, -1, + 71, 72, 73, 74, 75, -1, -1, -1, -1, 56, + 57, 82, 83, -1, 61, 62, 63, 88, 65, 66, + 67, 68, 69, 70, -1, -1, -1, 38, -1, -1, + -1, -1, -1, 44, 81, 82, 83, 84, 85, -1, + -1, -1, -1, 90, 91, 56, 57, -1, -1, -1, 61, 62, 63, -1, 65, 66, -1, 68, 69, 70, - -1, 44, -1, -1, -1, -1, -1, 78, 79, 80, - 81, 82, -1, 56, 57, -1, 87, 88, 61, 62, + -1, -1, -1, 38, -1, -1, -1, -1, -1, 44, + 81, 82, 83, 84, 85, -1, -1, -1, -1, 90, + 91, 56, 57, -1, -1, -1, 61, 62, 63, -1, + 65, 66, -1, 68, 69, 70, -1, -1, -1, 38, + -1, -1, -1, -1, -1, 44, 81, 82, 83, 84, + 85, -1, -1, -1, -1, 90, 91, 56, 57, -1, + -1, -1, 61, 62, 63, -1, 65, 66, -1, 68, + 69, 70, -1, -1, -1, 38, -1, -1, -1, -1, + -1, 44, 81, 82, 83, 84, 85, -1, -1, -1, + -1, 90, 91, 56, 57, -1, -1, -1, 61, 62, 63, -1, 65, 66, -1, 68, 69, 70, -1, -1, - -1, 46, -1, -1, 77, 78, 79, 80, 81, 82, - -1, 56, 57, -1, 87, 88, 61, 62, 63, -1, - 65, 66, -1, 68, 69, 70, -1, -1, -1, -1, - -1, -1, -1, 78, 79, 80, 81, 82, -1, 56, - 57, -1, 87, 88, 61, 62, 63, -1, 65, 66, - -1, 68, 69, 70, -1, -1, 73, 74, -1, -1, - -1, 78, 79, 80, 81, 82, -1, 56, 57, -1, - 87, 88, 61, 62, 63, -1, 65, 66, -1, 68, - 69, 70, -1, -1, -1, -1, -1, -1, 77, 78, - 79, 80, 81, 82, -1, 56, 57, 86, 87, 88, + -1, 38, -1, -1, -1, -1, -1, -1, 81, 82, + 83, 84, 85, -1, -1, -1, -1, 90, 91, 56, + 57, -1, -1, -1, 61, 62, 63, -1, 65, 66, + -1, 68, 69, 70, -1, -1, -1, 38, -1, -1, + -1, -1, -1, -1, 81, 82, 83, 84, 85, -1, + -1, -1, -1, 90, 91, 56, 57, -1, -1, -1, 61, 62, 63, -1, 65, 66, -1, 68, 69, 70, - -1, -1, -1, -1, -1, -1, -1, 78, 79, 80, - 81, 82, -1, 56, 57, 86, 87, 88, 61, 62, - 63, -1, 65, 66, -1, 68, 69, 70, -1, -1, - -1, -1, -1, -1, 77, 78, 79, 80, 81, 82, - -1, 56, 57, -1, 87, 88, 61, 62, 63, -1, - 65, 66, -1, 68, 69, 70, -1, -1, -1, -1, - -1, -1, -1, 78, 79, 80, 81, 82, -1, 56, - 57, -1, 87, 88, 61, 62, 63, -1, 65, 66, + -1, -1, -1, 38, -1, -1, -1, -1, -1, -1, + 81, 82, 83, 84, 85, -1, -1, -1, -1, 90, + 91, 56, 57, -1, -1, -1, 61, 62, 63, -1, + 65, 66, -1, 68, 69, 70, -1, -1, -1, 38, + -1, -1, -1, -1, -1, -1, 81, 82, 83, 84, + 85, -1, -1, -1, -1, 90, 91, 56, 57, -1, + -1, -1, 61, 62, 63, -1, 65, 66, -1, 68, + 69, 70, -1, -1, -1, -1, 44, -1, -1, -1, + -1, -1, 81, 82, 83, 84, 85, -1, 56, 57, + -1, 90, 91, 61, 62, 63, -1, 65, 66, -1, + 68, 69, 70, -1, -1, -1, -1, -1, -1, 46, + -1, -1, 80, 81, 82, 83, 84, 85, -1, 56, + 57, -1, 90, 91, 61, 62, 63, -1, 65, 66, -1, 68, 69, 70, -1, -1, -1, -1, -1, -1, - -1, 78, -1, -1, 81, 82, -1, -1, 85, -1, - 87, 88 + -1, -1, -1, -1, 81, 82, 83, 84, 85, -1, + 56, 57, -1, 90, 91, 61, 62, 63, -1, 65, + 66, -1, 68, 69, 70, -1, -1, -1, -1, -1, + 76, 77, -1, -1, -1, 81, 82, 83, 84, 85, + -1, 56, 57, -1, 90, 91, 61, 62, 63, -1, + 65, 66, -1, 68, 69, 70, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 80, 81, 82, 83, 84, + 85, -1, 56, 57, 89, 90, 91, 61, 62, 63, + -1, 65, 66, -1, 68, 69, 70, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 81, 82, 83, + 84, 85, -1, 56, 57, 89, 90, 91, 61, 62, + 63, -1, 65, 66, -1, 68, 69, 70, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 80, 81, 82, + 83, 84, 85, -1, 56, 57, -1, 90, 91, 61, + 62, 63, -1, 65, 66, -1, 68, 69, 70, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, + 82, 83, 84, 85, -1, 56, 57, -1, 90, 91, + 61, 62, 63, -1, 65, 66, -1, 68, 69, 70, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 81, -1, -1, 84, 85, -1, -1, 88, -1, 90, + 91 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1097,33 +1186,36 @@ static const yytype_uint8 yystos[] = 0, 1, 11, 12, 13, 14, 16, 17, 18, 19, 20, 21, 23, 28, 30, 31, 32, 35, 40, 41, 42, 45, 49, 50, 51, 52, 55, 64, 71, 72, - 75, 76, 79, 80, 85, 91, 93, 94, 95, 96, - 97, 104, 105, 106, 111, 112, 113, 116, 119, 120, - 127, 84, 92, 20, 40, 94, 112, 112, 112, 112, - 128, 85, 108, 41, 20, 114, 29, 34, 36, 37, - 38, 39, 112, 117, 118, 20, 112, 46, 47, 12, - 13, 20, 20, 20, 20, 112, 53, 117, 118, 20, - 115, 112, 112, 112, 20, 20, 112, 112, 112, 0, - 92, 85, 77, 85, 103, 112, 112, 56, 57, 61, - 62, 63, 65, 66, 68, 69, 70, 78, 79, 80, - 81, 82, 87, 88, 112, 89, 128, 128, 89, 112, - 112, 36, 118, 121, 33, 66, 67, 20, 44, 77, - 112, 44, 77, 43, 122, 46, 118, 89, 38, 44, - 73, 74, 123, 128, 86, 93, 103, 112, 103, 112, - 43, 77, 109, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 86, 20, 112, 108, 20, 112, 112, 112, 112, - 44, 77, 112, 112, 108, 112, 20, 112, 112, 112, - 112, 108, 86, 109, 86, 92, 108, 112, 20, 125, - 112, 112, 125, 38, 124, 110, 24, 44, 110, 95, - 113, 89, 92, 92, 112, 125, 92, 96, 109, 44, - 112, 109, 109, 20, 89, 126, 126, 92, 27, 112, - 109, 27, 48, 108, 26, 48, 100, 101, 107, 20, - 110, 110, 126, 41, 109, 110, 32, 110, 99, 100, - 102, 107, 108, 101, 109, 103, 110, 110, 109, 109, - 102, 109, 103, 95, 48, 98, 43, 27, 109, 27, - 27, 27, 43, 109, 108, 109, 108, 27, 41, 32, - 32, 110, 95, 96, 41, 109, 109 + 73, 74, 75, 78, 79, 82, 83, 88, 94, 96, + 97, 98, 99, 100, 107, 108, 109, 114, 115, 116, + 119, 122, 123, 130, 87, 95, 20, 40, 97, 115, + 115, 115, 115, 131, 88, 111, 41, 20, 117, 29, + 34, 36, 37, 38, 39, 115, 120, 121, 20, 115, + 46, 47, 12, 13, 20, 20, 20, 20, 115, 53, + 120, 121, 20, 118, 115, 115, 115, 115, 115, 115, + 20, 20, 115, 115, 115, 0, 95, 88, 80, 88, + 106, 115, 115, 56, 57, 61, 62, 63, 65, 66, + 68, 69, 70, 81, 82, 83, 84, 85, 90, 91, + 115, 92, 131, 131, 92, 115, 115, 36, 121, 124, + 33, 66, 67, 20, 44, 80, 115, 44, 80, 43, + 125, 46, 121, 92, 38, 44, 38, 44, 38, 44, + 38, 44, 76, 77, 126, 131, 89, 96, 106, 115, + 106, 115, 43, 80, 112, 115, 115, 115, 115, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 115, 115, 89, 20, 115, 111, 20, 115, 115, + 115, 115, 44, 80, 115, 115, 111, 115, 20, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 111, + 89, 112, 89, 95, 111, 115, 20, 128, 115, 115, + 128, 38, 38, 38, 38, 127, 113, 24, 44, 113, + 98, 116, 92, 95, 95, 115, 115, 115, 115, 128, + 95, 99, 112, 44, 115, 112, 112, 20, 92, 129, + 129, 95, 27, 115, 112, 27, 48, 111, 26, 48, + 103, 104, 110, 20, 113, 113, 129, 41, 112, 113, + 32, 113, 102, 103, 105, 110, 111, 104, 112, 106, + 113, 113, 112, 112, 105, 112, 106, 98, 48, 101, + 43, 27, 112, 27, 27, 27, 43, 112, 111, 112, + 111, 27, 41, 32, 32, 113, 98, 99, 41, 112, + 112 }; #define yyerrok (yyerrstatus = 0) @@ -2471,151 +2563,181 @@ yyreduce: break; case 92: +#line 417 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(g_lingo->c_itemOf); ;} + break; + + case 93: +#line 418 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(g_lingo->c_itemToOf); ;} + break; + + case 94: #line 419 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_printtop); ;} + { g_lingo->code1(g_lingo->c_lineOf); ;} break; case 95: +#line 420 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(g_lingo->c_lineToOf); ;} + break; + + case 96: +#line 421 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(g_lingo->c_wordOf); ;} + break; + + case 97: #line 422 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(g_lingo->c_wordToOf); ;} + break; + + case 98: +#line 425 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(g_lingo->c_printtop); ;} + break; + + case 101: +#line 428 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_exitRepeat); ;} break; - case 96: -#line 423 "engines/director/lingo/lingo-gr.y" + case 102: +#line 429 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); ;} break; - case 99: -#line 427 "engines/director/lingo/lingo-gr.y" + case 105: +#line 433 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->_handlers[*(yyvsp[(1) - (2)].s)]->u.func); delete (yyvsp[(1) - (2)].s); ;} break; - case 100: -#line 430 "engines/director/lingo/lingo-gr.y" + case 106: +#line 436 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->_handlers[*(yyvsp[(1) - (2)].s)]->u.func); delete (yyvsp[(1) - (2)].s); ;} break; - case 101: -#line 433 "engines/director/lingo/lingo-gr.y" + case 107: +#line 439 "engines/director/lingo/lingo-gr.y" { g_lingo->code2(g_lingo->c_voidpush, g_lingo->_handlers[*(yyvsp[(1) - (1)].s)]->u.func); delete (yyvsp[(1) - (1)].s); ;} break; - case 102: -#line 436 "engines/director/lingo/lingo-gr.y" + case 108: +#line 442 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; - case 103: -#line 437 "engines/director/lingo/lingo-gr.y" + case 109: +#line 443 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_open); ;} break; - case 104: -#line 438 "engines/director/lingo/lingo-gr.y" + case 110: +#line 444 "engines/director/lingo/lingo-gr.y" { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;} break; - case 105: -#line 439 "engines/director/lingo/lingo-gr.y" + case 111: +#line 445 "engines/director/lingo/lingo-gr.y" { Common::String s("sound-"); s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;} break; - case 106: -#line 442 "engines/director/lingo/lingo-gr.y" + case 112: +#line 448 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 107: -#line 443 "engines/director/lingo/lingo-gr.y" + case 113: +#line 449 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; - case 108: -#line 446 "engines/director/lingo/lingo-gr.y" + case 114: +#line 452 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 109: -#line 447 "engines/director/lingo/lingo-gr.y" + case 115: +#line 453 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; - case 110: -#line 458 "engines/director/lingo/lingo-gr.y" + case 116: +#line 464 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoloop); ;} break; - case 111: -#line 459 "engines/director/lingo/lingo-gr.y" + case 117: +#line 465 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotonext); ;} break; - case 112: -#line 460 "engines/director/lingo/lingo-gr.y" + case 118: +#line 466 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoprevious); ;} break; - case 113: -#line 461 "engines/director/lingo/lingo-gr.y" + case 119: +#line 467 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(1); g_lingo->code1(g_lingo->c_goto); ;} break; - case 114: -#line 464 "engines/director/lingo/lingo-gr.y" + case 120: +#line 470 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(3); g_lingo->code1(g_lingo->c_goto); ;} break; - case 115: -#line 467 "engines/director/lingo/lingo-gr.y" + case 121: +#line 473 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(2); g_lingo->code1(g_lingo->c_goto); ;} break; - case 120: -#line 480 "engines/director/lingo/lingo-gr.y" + case 126: +#line 486 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_playdone); ;} break; - case 121: -#line 481 "engines/director/lingo/lingo-gr.y" + case 127: +#line 487 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(1); g_lingo->code1(g_lingo->c_play); ;} break; - case 122: -#line 484 "engines/director/lingo/lingo-gr.y" + case 128: +#line 490 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(3); g_lingo->code1(g_lingo->c_play); ;} break; - case 123: -#line 487 "engines/director/lingo/lingo-gr.y" + case 129: +#line 493 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(2); g_lingo->code1(g_lingo->c_play); ;} break; - case 124: -#line 517 "engines/director/lingo/lingo-gr.y" + case 130: +#line 523 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;} break; - case 125: -#line 518 "engines/director/lingo/lingo-gr.y" + case 131: +#line 524 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); @@ -2623,38 +2745,38 @@ yyreduce: g_lingo->_indef = false; ;} break; - case 126: -#line 523 "engines/director/lingo/lingo-gr.y" + case 132: +#line 529 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;} break; - case 127: -#line 526 "engines/director/lingo/lingo-gr.y" + case 133: +#line 532 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; ;} break; - case 128: -#line 527 "engines/director/lingo/lingo-gr.y" + case 134: +#line 533 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(2) - (8)].s), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].narg) + 1, &g_lingo->_currentFactory); g_lingo->_indef = false; ;} break; - case 129: -#line 531 "engines/director/lingo/lingo-gr.y" + case 135: +#line 537 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;} break; - case 130: -#line 532 "engines/director/lingo/lingo-gr.y" + case 136: +#line 538 "engines/director/lingo/lingo-gr.y" { g_lingo->_ignoreMe = true; ;} break; - case 131: -#line 532 "engines/director/lingo/lingo-gr.y" + case 137: +#line 538 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); @@ -2668,33 +2790,33 @@ yyreduce: ;} break; - case 132: -#line 544 "engines/director/lingo/lingo-gr.y" + case 138: +#line 550 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 133: -#line 545 "engines/director/lingo/lingo-gr.y" + case 139: +#line 551 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;} break; - case 134: -#line 546 "engines/director/lingo/lingo-gr.y" + case 140: +#line 552 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; - case 135: -#line 547 "engines/director/lingo/lingo-gr.y" + case 141: +#line 553 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;} break; - case 136: -#line 549 "engines/director/lingo/lingo-gr.y" + case 142: +#line 555 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArgStore(); ;} break; - case 137: -#line 553 "engines/director/lingo/lingo-gr.y" + case 143: +#line 559 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_call); g_lingo->codeString((yyvsp[(1) - (3)].s)->c_str()); @@ -2703,24 +2825,24 @@ yyreduce: g_lingo->code1(numpar); ;} break; - case 138: -#line 561 "engines/director/lingo/lingo-gr.y" + case 144: +#line 567 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 139: -#line 562 "engines/director/lingo/lingo-gr.y" + case 145: +#line 568 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 140: -#line 563 "engines/director/lingo/lingo-gr.y" + case 146: +#line 569 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; /* Line 1267 of yacc.c. */ -#line 2724 "engines/director/lingo/lingo-gr.cpp" +#line 2846 "engines/director/lingo/lingo-gr.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2934,6 +3056,6 @@ yyreturn: } -#line 566 "engines/director/lingo/lingo-gr.y" +#line 572 "engines/director/lingo/lingo-gr.y" diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h index 11d2db10bc..27cfd6e9b3 100644 --- a/engines/director/lingo/lingo-gr.h +++ b/engines/director/lingo/lingo-gr.h @@ -108,11 +108,14 @@ tCONTAINS = 324, tSTARTS = 325, tCHAR = 326, - tSPRITE = 327, - tINTERSECTS = 328, - tWITHIN = 329, - tON = 330, - tSOUND = 331 + tITEM = 327, + tLINE = 328, + tWORD = 329, + tSPRITE = 330, + tINTERSECTS = 331, + tWITHIN = 332, + tON = 333, + tSOUND = 334 }; #endif /* Tokens. */ @@ -185,11 +188,14 @@ #define tCONTAINS 324 #define tSTARTS 325 #define tCHAR 326 -#define tSPRITE 327 -#define tINTERSECTS 328 -#define tWITHIN 329 -#define tON 330 -#define tSOUND 331 +#define tITEM 327 +#define tLINE 328 +#define tWORD 329 +#define tSPRITE 330 +#define tINTERSECTS 331 +#define tWITHIN 332 +#define tON 333 +#define tSOUND 334 @@ -207,7 +213,7 @@ typedef union YYSTYPE Common::Array<double> *arr; } /* Line 1529 of yacc.c. */ -#line 211 "engines/director/lingo/lingo-gr.hpp" +#line 217 "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 4b2af27fa1..a148a9c6a7 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -87,7 +87,7 @@ void yyerror(const char *s) { %token tMOVIE tNEXT tOF tPREVIOUS tPUT tREPEAT tSET tTHEN tTO tWHEN %token tWITH tWHILE tNLELSE tFACTORY tMETHOD tOPEN tPLAY tDONE tPLAYACCEL tINSTANCE %token tGE tLE tGT tLT tEQ tNEQ tAND tOR tNOT tMOD -%token tAFTER tBEFORE tCONCAT tCONTAINS tSTARTS tCHAR +%token tAFTER tBEFORE tCONCAT tCONTAINS tSTARTS tCHAR tITEM tLINE tWORD %token tSPRITE tINTERSECTS tWITHIN %token tON tSOUND @@ -414,6 +414,12 @@ expr: INT { $$ = g_lingo->codeConst($1); } | tSPRITE expr tWITHIN expr { g_lingo->code1(g_lingo->c_within); } | tCHAR expr tOF expr { g_lingo->code1(g_lingo->c_charOf); } | tCHAR expr tTO expr tOF expr { g_lingo->code1(g_lingo->c_charToOf); } + | tITEM expr tOF expr { g_lingo->code1(g_lingo->c_itemOf); } + | tITEM expr tTO expr tOF expr { g_lingo->code1(g_lingo->c_itemToOf); } + | tLINE expr tOF expr { g_lingo->code1(g_lingo->c_lineOf); } + | tLINE expr tTO expr tOF expr { g_lingo->code1(g_lingo->c_lineToOf); } + | tWORD expr tOF expr { g_lingo->code1(g_lingo->c_wordOf); } + | tWORD expr tTO expr tOF expr { g_lingo->code1(g_lingo->c_wordToOf); } ; func: tPUT expr { g_lingo->code1(g_lingo->c_printtop); } diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 54cf786f77..6a2861c3dd 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 65 -#define YY_END_OF_BUFFER 66 +#define YY_NUM_RULES 68 +#define YY_END_OF_BUFFER 69 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -373,33 +373,34 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[227] = +static yyconst flex_int16_t yy_accept[236] = { 0, - 0, 0, 66, 64, 3, 62, 62, 64, 64, 64, - 61, 61, 61, 60, 61, 61, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 2, 2, 3, 62, 0, 0, - 0, 0, 0, 63, 4, 57, 1, 59, 60, 56, - 54, 55, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 58, 58, 22, 12, 58, 58, 58, - 58, 58, 58, 58, 33, 34, 58, 36, 58, 58, - 58, 58, 58, 58, 58, 58, 58, 48, 58, 58, - 2, 2, 0, 4, 1, 59, 58, 6, 58, 58, - - 58, 58, 58, 58, 16, 58, 58, 58, 58, 0, - 58, 58, 58, 58, 58, 29, 58, 58, 32, 58, - 58, 58, 39, 58, 41, 58, 58, 58, 58, 58, - 58, 58, 0, 58, 58, 8, 58, 10, 11, 15, - 18, 58, 58, 58, 0, 58, 58, 25, 26, 58, - 58, 58, 31, 35, 37, 58, 58, 58, 58, 58, - 0, 47, 52, 58, 50, 14, 5, 58, 58, 58, - 19, 58, 21, 58, 58, 27, 58, 30, 58, 58, - 42, 58, 58, 46, 46, 53, 58, 0, 7, 58, - 58, 20, 58, 58, 28, 58, 40, 49, 43, 0, - - 46, 51, 0, 58, 17, 58, 58, 58, 0, 46, - 13, 9, 23, 58, 38, 0, 46, 58, 0, 0, - 24, 45, 0, 0, 44, 0 + 0, 0, 69, 67, 3, 65, 65, 67, 67, 67, + 64, 64, 64, 63, 64, 64, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 2, 2, 3, 65, 0, 0, + 0, 0, 0, 66, 4, 60, 1, 62, 63, 59, + 57, 58, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 22, 12, 61, 61, 61, + 61, 61, 61, 61, 61, 61, 35, 36, 61, 38, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 50, + 61, 61, 61, 2, 2, 0, 4, 1, 62, 61, + + 6, 61, 61, 61, 61, 61, 61, 16, 61, 61, + 61, 61, 0, 61, 61, 61, 61, 61, 61, 61, + 31, 61, 61, 34, 61, 61, 61, 41, 61, 43, + 61, 61, 61, 61, 61, 61, 61, 61, 0, 61, + 61, 8, 61, 10, 11, 15, 18, 61, 61, 61, + 0, 61, 61, 25, 26, 27, 28, 61, 61, 61, + 33, 37, 39, 61, 61, 61, 61, 61, 0, 49, + 54, 61, 52, 56, 14, 5, 61, 61, 61, 19, + 61, 21, 61, 61, 29, 61, 32, 61, 61, 44, + 61, 61, 48, 48, 55, 61, 0, 7, 61, 61, + + 20, 61, 61, 30, 61, 42, 51, 45, 0, 48, + 53, 0, 61, 17, 61, 61, 61, 0, 48, 13, + 9, 23, 61, 40, 0, 48, 61, 0, 0, 24, + 47, 0, 0, 46, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -445,67 +446,69 @@ static yyconst flex_int32_t yy_meta[64] = 5, 5, 5 } ; -static yyconst flex_int16_t yy_base[234] = +static yyconst flex_int16_t yy_base[243] = { 0, - 0, 62, 228, 553, 66, 70, 74, 78, 205, 0, - 553, 161, 156, 54, 70, 135, 65, 67, 68, 60, - 70, 86, 75, 0, 78, 76, 94, 111, 113, 118, - 106, 128, 123, 131, 185, 189, 193, 553, 197, 158, - 202, 83, 132, 553, 0, 553, 0, 95, 125, 553, - 553, 553, 0, 127, 164, 163, 194, 184, 187, 180, - 197, 193, 200, 203, 185, 90, 0, 192, 192, 209, - 195, 215, 192, 197, 0, 0, 212, 0, 217, 220, - 212, 226, 226, 226, 230, 247, 244, 0, 247, 232, - 274, 295, 236, 0, 0, 76, 261, 0, 254, 255, - - 257, 274, 273, 275, 0, 268, 269, 277, 288, 307, - 274, 293, 280, 284, 291, 0, 293, 287, 0, 295, - 285, 293, 0, 298, 0, 303, 309, 303, 347, 308, - 311, 321, 331, 318, 322, 0, 340, 0, 0, 0, - 0, 333, 337, 347, 337, 348, 335, 0, 0, 339, - 341, 351, 0, 0, 0, 348, 357, 358, 345, 346, - 382, 0, 0, 363, 361, 98, 0, 373, 371, 368, - 0, 375, 553, 377, 373, 0, 388, 0, 380, 377, - 0, 392, 381, 170, 411, 0, 389, 421, 0, 391, - 383, 0, 409, 408, 0, 396, 0, 0, 0, 442, - - 446, 0, 413, 403, 0, 420, 431, 423, 429, 452, - 553, 0, 0, 424, 0, 218, 459, 430, 467, 471, - 0, 479, 446, 483, 488, 553, 524, 526, 529, 532, - 538, 543, 547 + 0, 62, 201, 569, 66, 70, 74, 78, 193, 0, + 569, 184, 182, 54, 70, 158, 65, 67, 68, 60, + 70, 86, 75, 0, 102, 85, 117, 106, 135, 118, + 79, 149, 118, 161, 193, 213, 217, 569, 221, 225, + 229, 79, 139, 569, 0, 569, 0, 98, 95, 569, + 569, 569, 0, 97, 120, 136, 145, 121, 176, 119, + 156, 156, 193, 213, 159, 90, 0, 205, 215, 212, + 212, 224, 210, 233, 209, 214, 0, 0, 230, 0, + 235, 233, 221, 226, 223, 223, 227, 245, 246, 0, + 264, 239, 255, 296, 300, 257, 0, 0, 76, 265, + + 0, 263, 262, 261, 276, 278, 287, 0, 278, 281, + 290, 291, 318, 288, 305, 297, 306, 299, 299, 312, + 0, 313, 306, 0, 314, 304, 308, 0, 318, 0, + 317, 323, 317, 352, 331, 335, 333, 346, 350, 342, + 343, 0, 355, 0, 0, 0, 0, 348, 358, 366, + 355, 370, 356, 0, 0, 0, 0, 360, 362, 372, + 0, 0, 0, 369, 378, 378, 366, 368, 404, 0, + 0, 385, 386, 0, 98, 0, 394, 392, 388, 0, + 395, 569, 395, 392, 0, 408, 0, 400, 397, 0, + 412, 401, 138, 431, 0, 412, 441, 0, 414, 409, + + 0, 420, 430, 0, 419, 0, 0, 0, 454, 465, + 0, 430, 427, 0, 448, 451, 438, 452, 472, 569, + 0, 0, 445, 0, 241, 480, 447, 486, 487, 0, + 494, 466, 500, 506, 569, 540, 542, 545, 548, 554, + 559, 563 } ; -static yyconst flex_int16_t yy_def[234] = +static yyconst flex_int16_t yy_def[243] = { 0, - 226, 1, 226, 226, 226, 226, 226, 226, 227, 228, - 226, 226, 226, 226, 226, 226, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 226, 226, 226, 226, 226, 226, - 226, 226, 227, 226, 230, 226, 231, 226, 226, 226, - 226, 226, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 226, 226, 226, 230, 231, 226, 229, 229, 229, 229, - - 229, 229, 229, 229, 229, 229, 229, 229, 229, 226, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 226, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 226, 229, 229, 229, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 229, - 232, 229, 229, 229, 229, 226, 229, 229, 229, 229, - 229, 229, 226, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 229, 232, 232, 229, 229, 226, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, 229, 226, - - 232, 229, 226, 229, 229, 229, 229, 229, 226, 232, - 226, 229, 229, 229, 229, 226, 232, 229, 233, 226, - 229, 233, 226, 226, 233, 0, 226, 226, 226, 226, - 226, 226, 226 + 235, 1, 235, 235, 235, 235, 235, 235, 236, 237, + 235, 235, 235, 235, 235, 235, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 235, 235, 235, 235, 235, 235, + 235, 235, 236, 235, 239, 235, 240, 235, 235, 235, + 235, 235, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 235, 235, 235, 239, 240, 235, 238, + + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 235, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 235, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 235, 238, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 238, 238, 238, 238, 238, 238, 241, 238, + 238, 238, 238, 238, 235, 238, 238, 238, 238, 238, + 238, 235, 238, 238, 238, 238, 238, 238, 238, 238, + 238, 238, 241, 241, 238, 238, 235, 238, 238, 238, + + 238, 238, 238, 238, 238, 238, 238, 238, 235, 241, + 238, 235, 238, 238, 238, 238, 238, 235, 241, 235, + 238, 238, 238, 238, 235, 241, 238, 242, 235, 238, + 242, 235, 235, 242, 0, 235, 235, 235, 235, 235, + 235, 235 } ; -static yyconst flex_int16_t yy_nxt[617] = +static yyconst flex_int16_t yy_nxt[633] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 4, 14, 15, 11, 16, 17, 18, 19, 20, 21, @@ -515,69 +518,71 @@ static yyconst flex_int16_t yy_nxt[617] = 27, 28, 29, 30, 24, 31, 32, 33, 24, 24, 34, 24, 24, 35, 48, 49, 36, 37, 38, 38, 39, 40, 41, 41, 40, 40, 41, 41, 40, 39, - 38, 38, 39, 50, 51, 54, 56, 96, 59, 42, - 57, 110, 55, 42, 110, 60, 58, 61, 67, 188, + 38, 38, 39, 50, 51, 54, 56, 99, 59, 42, + 57, 113, 55, 42, 113, 60, 58, 61, 84, 197, - 65, 63, 188, 66, 69, 68, 96, 62, 93, 70, + 65, 63, 197, 66, 96, 48, 49, 62, 70, 99, 54, 56, 59, 71, 42, 57, 55, 64, 42, 60, - 58, 61, 72, 67, 65, 82, 63, 66, 69, 68, - 73, 62, 93, 75, 70, 48, 49, 44, 71, 74, - 76, 64, 77, 79, 78, 87, 72, 83, 52, 80, - 82, 88, 81, 89, 90, 73, 84, 85, 75, 40, - 97, 86, 40, 74, 76, 47, 77, 79, 78, 46, - 87, 200, 83, 80, 200, 88, 81, 42, 89, 90, - 84, 85, 98, 99, 97, 86, 91, 38, 38, 92, - 92, 38, 38, 92, 37, 38, 38, 39, 39, 38, - - 38, 39, 42, 40, 41, 41, 40, 98, 99, 100, - 44, 101, 104, 109, 102, 105, 106, 107, 108, 219, - 113, 42, 219, 103, 111, 112, 114, 226, 115, 118, - 119, 120, 121, 116, 100, 101, 104, 109, 102, 122, - 105, 106, 107, 108, 113, 123, 42, 103, 111, 112, - 117, 114, 115, 118, 119, 124, 120, 121, 116, 125, - 126, 127, 128, 129, 122, 132, 130, 226, 133, 123, - 131, 226, 226, 226, 117, 91, 38, 38, 92, 124, - 134, 226, 135, 125, 126, 127, 136, 128, 129, 132, - 137, 130, 133, 138, 140, 131, 92, 38, 38, 92, - - 139, 141, 142, 143, 144, 134, 135, 146, 110, 149, - 136, 110, 147, 151, 137, 150, 152, 157, 138, 140, - 153, 148, 154, 155, 139, 141, 142, 143, 156, 144, - 158, 146, 159, 149, 160, 163, 164, 147, 151, 150, - 145, 152, 157, 165, 153, 148, 154, 155, 161, 167, - 166, 161, 156, 168, 158, 169, 171, 159, 160, 163, - 164, 170, 172, 174, 145, 173, 175, 176, 165, 177, - 178, 179, 180, 167, 162, 166, 181, 168, 182, 183, - 169, 171, 186, 161, 187, 170, 161, 172, 174, 173, - 175, 176, 189, 177, 190, 178, 179, 180, 162, 191, - - 192, 181, 182, 183, 193, 194, 195, 186, 196, 187, - 197, 198, 200, 199, 185, 200, 202, 189, 204, 190, - 226, 205, 188, 191, 192, 188, 206, 207, 193, 194, - 208, 195, 196, 211, 197, 212, 198, 199, 185, 213, - 202, 201, 204, 200, 203, 205, 200, 200, 214, 216, - 200, 206, 207, 200, 208, 215, 200, 218, 211, 212, - 220, 226, 221, 220, 213, 201, 224, 226, 219, 203, - 209, 219, 220, 214, 216, 220, 226, 210, 226, 215, - 226, 218, 226, 226, 225, 217, 221, 225, 226, 225, - 226, 224, 225, 226, 209, 226, 226, 226, 226, 223, - - 226, 210, 226, 226, 226, 226, 226, 226, 226, 217, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 223, 43, 43, 226, 43, 43, 43, - 45, 45, 53, 53, 53, 94, 94, 94, 95, 95, - 226, 95, 95, 95, 184, 226, 226, 184, 222, 226, - 226, 222, 3, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226 + 58, 61, 67, 84, 65, 75, 63, 66, 96, 68, + 100, 62, 72, 70, 76, 69, 73, 71, 101, 209, + 89, 64, 209, 81, 44, 74, 90, 67, 104, 82, + 75, 107, 83, 68, 100, 77, 102, 72, 76, 69, + 103, 73, 78, 101, 79, 89, 80, 81, 85, 74, + 90, 52, 104, 82, 108, 107, 83, 86, 87, 109, + 77, 102, 88, 91, 92, 103, 78, 112, 79, 93, + 80, 47, 46, 85, 94, 38, 38, 95, 44, 108, + + 235, 86, 87, 105, 109, 235, 88, 235, 91, 92, + 110, 112, 106, 93, 95, 38, 38, 95, 37, 38, + 38, 39, 39, 38, 38, 39, 40, 105, 111, 40, + 40, 41, 41, 40, 116, 110, 106, 114, 115, 117, + 118, 119, 228, 120, 42, 228, 123, 124, 42, 125, + 126, 121, 127, 111, 128, 129, 130, 131, 132, 116, + 133, 114, 115, 117, 118, 134, 119, 120, 122, 42, + 123, 124, 137, 42, 125, 126, 121, 127, 128, 129, + 130, 131, 132, 135, 140, 133, 138, 136, 235, 139, + 134, 141, 122, 142, 143, 144, 137, 94, 38, 38, + + 95, 95, 38, 38, 95, 145, 146, 150, 135, 140, + 138, 147, 136, 139, 148, 141, 149, 142, 143, 113, + 144, 152, 113, 155, 153, 156, 235, 235, 157, 145, + 158, 146, 150, 154, 159, 147, 160, 165, 148, 161, + 149, 162, 163, 164, 166, 152, 167, 155, 168, 153, + 156, 151, 157, 169, 158, 173, 169, 154, 171, 159, + 172, 160, 165, 161, 174, 162, 163, 164, 166, 175, + 178, 167, 168, 176, 177, 151, 179, 180, 235, 170, + 173, 181, 171, 182, 172, 183, 235, 184, 185, 174, + 186, 187, 188, 189, 175, 178, 190, 176, 177, 191, + + 179, 192, 180, 170, 195, 169, 181, 182, 169, 196, + 183, 184, 185, 198, 186, 199, 187, 188, 189, 200, + 201, 190, 202, 191, 203, 192, 204, 235, 205, 195, + 206, 207, 209, 208, 196, 209, 194, 215, 198, 211, + 199, 213, 197, 200, 201, 197, 202, 214, 203, 216, + 220, 204, 205, 217, 206, 209, 207, 208, 209, 221, + 194, 210, 215, 211, 212, 213, 209, 222, 223, 209, + 224, 214, 225, 209, 216, 220, 209, 217, 227, 230, + 235, 229, 218, 221, 229, 210, 233, 228, 229, 212, + 228, 229, 222, 223, 224, 235, 219, 225, 235, 235, + + 235, 234, 227, 230, 234, 226, 218, 234, 235, 235, + 234, 233, 235, 235, 235, 232, 235, 235, 235, 235, + 219, 235, 235, 235, 235, 235, 235, 235, 235, 226, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 232, + 43, 43, 235, 43, 43, 43, 45, 45, 53, 53, + 53, 97, 97, 97, 98, 98, 235, 98, 98, 98, + 193, 235, 235, 193, 231, 235, 235, 231, 3, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235 } ; -static yyconst flex_int16_t yy_chk[617] = +static yyconst flex_int16_t yy_chk[633] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -587,66 +592,68 @@ static yyconst flex_int16_t yy_chk[617] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 14, 14, 2, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, - 8, 8, 8, 15, 15, 17, 18, 96, 20, 6, - 19, 66, 17, 7, 66, 21, 19, 21, 25, 166, - - 23, 22, 166, 23, 26, 25, 48, 21, 42, 27, - 17, 18, 20, 27, 6, 19, 17, 22, 7, 21, - 19, 21, 27, 25, 23, 31, 22, 23, 26, 25, - 28, 21, 42, 29, 27, 49, 49, 43, 27, 28, - 29, 22, 29, 30, 29, 33, 27, 32, 16, 30, - 31, 33, 30, 34, 34, 28, 32, 32, 29, 40, - 54, 32, 40, 28, 29, 13, 29, 30, 29, 12, - 33, 184, 32, 30, 184, 33, 30, 40, 34, 34, - 32, 32, 55, 56, 54, 32, 35, 35, 35, 35, - 36, 36, 36, 36, 37, 37, 37, 37, 39, 39, - - 39, 39, 40, 41, 41, 41, 41, 55, 56, 57, - 9, 58, 60, 65, 59, 61, 62, 63, 64, 216, - 69, 41, 216, 59, 68, 68, 70, 3, 71, 73, - 74, 77, 79, 72, 57, 58, 60, 65, 59, 80, - 61, 62, 63, 64, 69, 81, 41, 59, 68, 68, - 72, 70, 71, 73, 74, 82, 77, 79, 72, 83, - 84, 85, 86, 87, 80, 90, 89, 0, 93, 81, - 89, 0, 0, 0, 72, 91, 91, 91, 91, 82, - 97, 0, 99, 83, 84, 85, 100, 86, 87, 90, - 101, 89, 93, 102, 104, 89, 92, 92, 92, 92, - - 103, 106, 107, 108, 109, 97, 99, 111, 110, 113, - 100, 110, 112, 115, 101, 114, 117, 124, 102, 104, - 118, 112, 120, 121, 103, 106, 107, 108, 122, 109, - 126, 111, 127, 113, 128, 130, 131, 112, 115, 114, - 110, 117, 124, 132, 118, 112, 120, 121, 129, 134, - 133, 129, 122, 135, 126, 137, 143, 127, 128, 130, - 131, 142, 144, 146, 110, 145, 147, 150, 132, 151, - 152, 156, 157, 134, 129, 133, 158, 135, 159, 160, - 137, 143, 164, 161, 165, 142, 161, 144, 146, 145, - 147, 150, 168, 151, 169, 152, 156, 157, 129, 170, - - 172, 158, 159, 160, 174, 175, 177, 164, 179, 165, - 180, 182, 185, 183, 161, 185, 187, 168, 190, 169, - 0, 191, 188, 170, 172, 188, 193, 194, 174, 175, - 196, 177, 179, 203, 180, 204, 182, 183, 161, 206, - 187, 185, 190, 200, 188, 191, 200, 201, 207, 209, - 201, 193, 194, 210, 196, 208, 210, 214, 203, 204, - 217, 0, 218, 217, 206, 185, 223, 0, 219, 188, - 200, 219, 220, 207, 209, 220, 0, 201, 0, 208, - 222, 214, 0, 222, 224, 210, 218, 224, 0, 225, - 0, 223, 225, 0, 200, 0, 0, 0, 0, 220, - - 0, 201, 0, 0, 0, 0, 0, 0, 0, 210, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 220, 227, 227, 0, 227, 227, 227, - 228, 228, 229, 229, 229, 230, 230, 230, 231, 231, - 0, 231, 231, 231, 232, 0, 0, 232, 233, 0, - 0, 233, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - - 226, 226, 226, 226, 226, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226 + 8, 8, 8, 15, 15, 17, 18, 99, 20, 6, + 19, 66, 17, 7, 66, 21, 19, 21, 31, 175, + + 23, 22, 175, 23, 42, 49, 49, 21, 26, 48, + 17, 18, 20, 26, 6, 19, 17, 22, 7, 21, + 19, 21, 25, 31, 23, 28, 22, 23, 42, 25, + 54, 21, 27, 26, 28, 25, 27, 26, 55, 193, + 33, 22, 193, 30, 43, 27, 33, 25, 58, 30, + 28, 60, 30, 25, 54, 29, 56, 27, 28, 25, + 57, 27, 29, 55, 29, 33, 29, 30, 32, 27, + 33, 16, 58, 30, 61, 60, 30, 32, 32, 62, + 29, 56, 32, 34, 34, 57, 29, 65, 29, 34, + 29, 13, 12, 32, 35, 35, 35, 35, 9, 61, + + 3, 32, 32, 59, 62, 0, 32, 0, 34, 34, + 63, 65, 59, 34, 36, 36, 36, 36, 37, 37, + 37, 37, 39, 39, 39, 39, 40, 59, 64, 40, + 41, 41, 41, 41, 69, 63, 59, 68, 68, 70, + 71, 72, 225, 73, 40, 225, 75, 76, 41, 79, + 81, 74, 82, 64, 83, 84, 85, 86, 87, 69, + 88, 68, 68, 70, 71, 89, 72, 73, 74, 40, + 75, 76, 92, 41, 79, 81, 74, 82, 83, 84, + 85, 86, 87, 91, 100, 88, 93, 91, 0, 96, + 89, 102, 74, 103, 104, 105, 92, 94, 94, 94, + + 94, 95, 95, 95, 95, 106, 107, 112, 91, 100, + 93, 109, 91, 96, 110, 102, 111, 103, 104, 113, + 105, 114, 113, 116, 115, 117, 0, 0, 118, 106, + 119, 107, 112, 115, 120, 109, 122, 129, 110, 123, + 111, 125, 126, 127, 131, 114, 132, 116, 133, 115, + 117, 113, 118, 134, 119, 137, 134, 115, 135, 120, + 136, 122, 129, 123, 138, 125, 126, 127, 131, 139, + 143, 132, 133, 140, 141, 113, 148, 149, 0, 134, + 137, 150, 135, 151, 136, 152, 0, 153, 158, 138, + 159, 160, 164, 165, 139, 143, 166, 140, 141, 167, + + 148, 168, 149, 134, 172, 169, 150, 151, 169, 173, + 152, 153, 158, 177, 159, 178, 160, 164, 165, 179, + 181, 166, 183, 167, 184, 168, 186, 0, 188, 172, + 189, 191, 194, 192, 173, 194, 169, 202, 177, 196, + 178, 199, 197, 179, 181, 197, 183, 200, 184, 203, + 212, 186, 188, 205, 189, 209, 191, 192, 209, 213, + 169, 194, 202, 196, 197, 199, 210, 215, 216, 210, + 217, 200, 218, 219, 203, 212, 219, 205, 223, 227, + 0, 226, 209, 213, 226, 194, 232, 228, 229, 197, + 228, 229, 215, 216, 217, 231, 210, 218, 231, 0, + + 0, 233, 223, 227, 233, 219, 209, 234, 0, 0, + 234, 232, 0, 0, 0, 229, 0, 0, 0, 0, + 210, 0, 0, 0, 0, 0, 0, 0, 0, 219, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 229, + 236, 236, 0, 236, 236, 236, 237, 237, 238, 238, + 238, 239, 239, 239, 240, 240, 0, 240, 240, 240, + 241, 0, 0, 241, 242, 0, 0, 242, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235, 235, 235, 235, 235, 235, 235, 235, 235, + 235, 235 } ; static yy_state_type yy_last_accepting_state; @@ -720,7 +727,7 @@ static void countnl() { g_lingo->_colnumber = strlen(p); } -#line 724 "engines/director/lingo/lingo-lex.cpp" +#line 731 "engines/director/lingo/lingo-lex.cpp" #define INITIAL 0 @@ -908,7 +915,7 @@ YY_DECL #line 69 "engines/director/lingo/lingo-lex.l" -#line 912 "engines/director/lingo/lingo-lex.cpp" +#line 919 "engines/director/lingo/lingo-lex.cpp" if ( !(yy_init) ) { @@ -962,13 +969,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 >= 227 ) + if ( yy_current_state >= 236 ) 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] != 553 ); + while ( yy_base[yy_current_state] != 569 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1122,96 +1129,106 @@ YY_RULE_SETUP case 26: YY_RULE_SETUP #line 98 "engines/director/lingo/lingo-lex.l" -{ count(); return tLOOP; } +{ count(); return tITEM; } YY_BREAK case 27: YY_RULE_SETUP #line 99 "engines/director/lingo/lingo-lex.l" -{ count(); return tMACRO; } +{ count(); return tLINE; } YY_BREAK case 28: YY_RULE_SETUP #line 100 "engines/director/lingo/lingo-lex.l" -{ count(); return tMETHOD; } +{ count(); return tLOOP; } YY_BREAK case 29: YY_RULE_SETUP #line 101 "engines/director/lingo/lingo-lex.l" -{ count(); return tMOD; } +{ count(); return tMACRO; } YY_BREAK case 30: YY_RULE_SETUP #line 102 "engines/director/lingo/lingo-lex.l" -{ count(); return tMOVIE; } +{ count(); return tMETHOD; } YY_BREAK case 31: YY_RULE_SETUP #line 103 "engines/director/lingo/lingo-lex.l" -{ count(); return tNEXT; } +{ count(); return tMOD; } YY_BREAK case 32: YY_RULE_SETUP #line 104 "engines/director/lingo/lingo-lex.l" -{ count(); return tNOT; } +{ count(); return tMOVIE; } YY_BREAK case 33: YY_RULE_SETUP #line 105 "engines/director/lingo/lingo-lex.l" -{ count(); return tOF; } +{ count(); return tNEXT; } YY_BREAK case 34: YY_RULE_SETUP #line 106 "engines/director/lingo/lingo-lex.l" -{ count(); return tON; } // D3 +{ count(); return tNOT; } YY_BREAK case 35: YY_RULE_SETUP #line 107 "engines/director/lingo/lingo-lex.l" -{ count(); return tOPEN; } +{ count(); return tOF; } YY_BREAK case 36: YY_RULE_SETUP #line 108 "engines/director/lingo/lingo-lex.l" -{ count(); return tOR; } +{ count(); return tON; } // D3 YY_BREAK case 37: YY_RULE_SETUP #line 109 "engines/director/lingo/lingo-lex.l" -{ count(); return tPLAY; } +{ count(); return tOPEN; } YY_BREAK case 38: YY_RULE_SETUP #line 110 "engines/director/lingo/lingo-lex.l" -{ count(); return tPREVIOUS; } +{ count(); return tOR; } YY_BREAK case 39: YY_RULE_SETUP #line 111 "engines/director/lingo/lingo-lex.l" -{ count(); return tPUT; } +{ count(); return tPLAY; } YY_BREAK case 40: YY_RULE_SETUP #line 112 "engines/director/lingo/lingo-lex.l" -{ count(); return tREPEAT; } +{ count(); return tPREVIOUS; } YY_BREAK case 41: YY_RULE_SETUP #line 113 "engines/director/lingo/lingo-lex.l" -{ count(); return tSET; } +{ count(); return tPUT; } YY_BREAK case 42: YY_RULE_SETUP #line 114 "engines/director/lingo/lingo-lex.l" -{ count(); return tSOUND; } // D3 +{ count(); return tREPEAT; } YY_BREAK case 43: YY_RULE_SETUP #line 115 "engines/director/lingo/lingo-lex.l" -{ count(); return tSTARTS; } +{ count(); return tSET; } YY_BREAK case 44: YY_RULE_SETUP #line 116 "engines/director/lingo/lingo-lex.l" +{ count(); return tSOUND; } // D3 + YY_BREAK +case 45: +YY_RULE_SETUP +#line 117 "engines/director/lingo/lingo-lex.l" +{ count(); return tSTARTS; } + YY_BREAK +case 46: +YY_RULE_SETUP +#line 118 "engines/director/lingo/lingo-lex.l" { count(); @@ -1221,9 +1238,9 @@ YY_RULE_SETUP return THEENTITYWITHID; } YY_BREAK -case 45: +case 47: YY_RULE_SETUP -#line 124 "engines/director/lingo/lingo-lex.l" +#line 126 "engines/director/lingo/lingo-lex.l" { count(); @@ -1265,9 +1282,9 @@ YY_RULE_SETUP warning("Unhandled the entity %s", ptr); } YY_BREAK -case 46: +case 48: YY_RULE_SETUP -#line 164 "engines/director/lingo/lingo-lex.l" +#line 166 "engines/director/lingo/lingo-lex.l" { count(); @@ -1288,64 +1305,69 @@ YY_RULE_SETUP warning("Unhandled the entity %s", ptr); } YY_BREAK -case 47: -YY_RULE_SETUP -#line 183 "engines/director/lingo/lingo-lex.l" -{ count(); return tTHEN; } - YY_BREAK -case 48: -YY_RULE_SETUP -#line 184 "engines/director/lingo/lingo-lex.l" -{ count(); return tTO; } - YY_BREAK case 49: YY_RULE_SETUP #line 185 "engines/director/lingo/lingo-lex.l" -{ count(); return tSPRITE; } +{ count(); return tTHEN; } YY_BREAK case 50: YY_RULE_SETUP #line 186 "engines/director/lingo/lingo-lex.l" -{ count(); return tWITH; } +{ count(); return tTO; } YY_BREAK case 51: YY_RULE_SETUP #line 187 "engines/director/lingo/lingo-lex.l" -{ count(); return tWITHIN; } +{ count(); return tSPRITE; } YY_BREAK case 52: YY_RULE_SETUP #line 188 "engines/director/lingo/lingo-lex.l" -{ count(); return tWHEN; } +{ count(); return tWITH; } YY_BREAK case 53: YY_RULE_SETUP #line 189 "engines/director/lingo/lingo-lex.l" -{ count(); return tWHILE; } +{ count(); return tWITHIN; } YY_BREAK case 54: YY_RULE_SETUP -#line 191 "engines/director/lingo/lingo-lex.l" -{ count(); return tNEQ; } +#line 190 "engines/director/lingo/lingo-lex.l" +{ count(); return tWHEN; } YY_BREAK case 55: YY_RULE_SETUP -#line 192 "engines/director/lingo/lingo-lex.l" -{ count(); return tGE; } +#line 191 "engines/director/lingo/lingo-lex.l" +{ count(); return tWHILE; } YY_BREAK case 56: YY_RULE_SETUP -#line 193 "engines/director/lingo/lingo-lex.l" -{ count(); return tLE; } +#line 192 "engines/director/lingo/lingo-lex.l" +{ count(); return tWORD; } YY_BREAK case 57: YY_RULE_SETUP #line 194 "engines/director/lingo/lingo-lex.l" -{ count(); return tCONCAT; } +{ count(); return tNEQ; } YY_BREAK case 58: YY_RULE_SETUP +#line 195 "engines/director/lingo/lingo-lex.l" +{ count(); return tGE; } + YY_BREAK +case 59: +YY_RULE_SETUP #line 196 "engines/director/lingo/lingo-lex.l" +{ count(); return tLE; } + YY_BREAK +case 60: +YY_RULE_SETUP +#line 197 "engines/director/lingo/lingo-lex.l" +{ count(); return tCONCAT; } + YY_BREAK +case 61: +YY_RULE_SETUP +#line 199 "engines/director/lingo/lingo-lex.l" { count(); yylval.s = new Common::String(yytext); @@ -1376,43 +1398,43 @@ YY_RULE_SETUP return ID; } YY_BREAK -case 59: +case 62: YY_RULE_SETUP -#line 225 "engines/director/lingo/lingo-lex.l" +#line 228 "engines/director/lingo/lingo-lex.l" { count(); yylval.f = atof(yytext); return FLOAT; } YY_BREAK -case 60: +case 63: YY_RULE_SETUP -#line 226 "engines/director/lingo/lingo-lex.l" +#line 229 "engines/director/lingo/lingo-lex.l" { count(); yylval.i = strtol(yytext, NULL, 10); return INT; } YY_BREAK -case 61: +case 64: YY_RULE_SETUP -#line 227 "engines/director/lingo/lingo-lex.l" +#line 230 "engines/director/lingo/lingo-lex.l" { count(); return *yytext; } YY_BREAK -case 62: -/* rule 62 can match eol */ +case 65: +/* rule 65 can match eol */ YY_RULE_SETUP -#line 228 "engines/director/lingo/lingo-lex.l" +#line 231 "engines/director/lingo/lingo-lex.l" { return '\n'; } YY_BREAK -case 63: +case 66: YY_RULE_SETUP -#line 229 "engines/director/lingo/lingo-lex.l" +#line 232 "engines/director/lingo/lingo-lex.l" { count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; } YY_BREAK -case 64: +case 67: YY_RULE_SETUP -#line 230 "engines/director/lingo/lingo-lex.l" +#line 233 "engines/director/lingo/lingo-lex.l" YY_BREAK -case 65: +case 68: YY_RULE_SETUP -#line 232 "engines/director/lingo/lingo-lex.l" +#line 235 "engines/director/lingo/lingo-lex.l" ECHO; YY_BREAK -#line 1416 "engines/director/lingo/lingo-lex.cpp" +#line 1438 "engines/director/lingo/lingo-lex.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1705,7 +1727,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 >= 227 ) + if ( yy_current_state >= 236 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1733,11 +1755,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 >= 227 ) + if ( yy_current_state >= 236 ) 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 == 226); + yy_is_jam = (yy_current_state == 235); return yy_is_jam ? 0 : yy_current_state; } @@ -2412,7 +2434,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 232 "engines/director/lingo/lingo-lex.l" +#line 235 "engines/director/lingo/lingo-lex.l" diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l index 2c6f079a05..f6be12d7e3 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -95,6 +95,8 @@ whitespace [\t ] (?i:instance) { count(); return tINSTANCE; } (?i:intersects) { count(); return tINTERSECTS; } (?i:into) { count(); return tINTO; } +(?i:item) { count(); return tITEM; } +(?i:line) { count(); return tLINE; } (?i:loop) { count(); return tLOOP; } (?i:macro) { count(); return tMACRO; } (?i:method) { count(); return tMETHOD; } @@ -187,6 +189,7 @@ whitespace [\t ] (?i:within) { count(); return tWITHIN; } (?i:when) { count(); return tWHEN; } (?i:while) { count(); return tWHILE; } +(?i:word) { count(); return tWORD; } [<][>] { count(); return tNEQ; } [>][=] { count(); return tGE; } diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index 898bdf50fc..b23ec7b110 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -34,6 +34,7 @@ TheEntity entities[] = { { kTheCast, "cast", true }, // D3 { kTheCastMembers, "castmembers", true }, // D3 { kTheCenterStage, "centerStage", false }, // D2 p + { kTheChars, "chars", true }, // D3 { kTheCheckBoxAccess, "checkBoxAccess", false }, // D2 p { kTheCheckBoxType, "checkBoxType", false }, // D2 p { kTheClickOn, "clickOn", false }, // D2 function @@ -43,6 +44,7 @@ TheEntity entities[] = { { kTheControlDown, "controlDown", false }, // D2 f { kTheDoubleClick, "doubleClick", false }, // D2 f { kTheExitLock, "exitLock", false }, // D2 p + { kTheField, "field", true }, // D3 { kTheFixStageSize, "fixStageSize", false }, // D2 p { kTheFloatPrecision, "floatPrecision", false }, // D3 p { kTheFrame, "frame", false }, // D2 f @@ -50,6 +52,7 @@ TheEntity entities[] = { { kTheFreeBytes, "freeBytes", false }, // D2 f { kTheFullColorPermit, "fullColorPermit", false }, // D2 p { kTheImageDirect, "imageDirect", false }, // D2 p + { kTheItems, "items", true }, // D3 { kTheItemDelimiter, "itemDelimiter", false }, { kTheKey, "key", false }, // D2 f { kTheKeyCode, "keyCode", false }, // D2 f @@ -60,6 +63,7 @@ TheEntity entities[] = { { kTheLastFrame, "lastFrame", false }, { kTheLastKey, "lastKey", false }, // D2 f { kTheLastRoll, "lastRoll", false }, // D2 f + { kTheLines, "lines", true }, // D3 { kTheMachineType, "machineType", false }, // D2 f { kTheMemorySize, "memorySize", false }, // D2 f { kTheMenu, "menu", true }, @@ -89,6 +93,8 @@ TheEntity entities[] = { { kTheRightMouseUp, "rightMouseUp", false }, { kTheRomanLingo, "romanLingo", false }, { kTheSelection, "selection", false }, // D2 f + { kTheSelEnd, "selEnd", false }, // D2 p + { kTheSelStart, "selStart", false }, // D2 p { kTheShiftDown, "shiftDown", false }, // D2 f { kTheSoundEnabled, "soundEnabled", false }, // D2 p { kTheSoundLevel, "soundLevel", false }, // D2 p @@ -111,6 +117,7 @@ TheEntity entities[] = { { kTheTimeoutScript, "timeoutScript", false }, // D2 p { kTheTimer, "timer", false }, // D2 p { kTheWindow, "window", false }, + { kTheWords, "words", true }, // D3 { kTheNOEntity, NULL, false } }; @@ -184,11 +191,16 @@ TheEntityField fields[] = { // TextCast fields { kTheCast, "hilite", kTheHilite }, // D2 p - { kTheCast, "selEnd", kTheSelEnd }, // D2 p - { kTheCast, "selStart", kTheSelStart }, // D2 p { kTheCast, "size", kTheSize }, { kTheCast, "text", kTheText }, // D2 p + // Field fields + { kTheField, "textAlign", kTheTextAlign }, // D3 p + { kTheField, "textFont", kTheTextFont }, // D3 p + { kTheField, "textHeight", kTheTextheight }, // D3 p + { kTheField, "textSize", kTheTextSize }, // D3 p + { kTheField, "textStyle", kTheTextStyle }, // D3 p + { kTheWindow, "drawRect", kTheDrawRect }, { kTheWindow, "filename", kTheFilename }, { kTheWindow, "sourceRect", kTheSourceRect }, @@ -201,8 +213,12 @@ TheEntityField fields[] = { { kTheMenu, "name", kTheName }, // D3 p + { kTheChars, "number", kTheNumber }, // D3 p + { kTheItems, "number", kTheNumber }, // D3 p + { kTheLines, "number", kTheNumber }, // D3 p { kTheMenuItems,"number", kTheNumber }, // D3 p { kTheMenus, "number", kTheNumber }, // D3 p + { kTheWords, "number", kTheNumber }, // D3 p { kTheNOEntity, NULL, kTheNOField } }; diff --git a/engines/director/lingo/lingo-the.h b/engines/director/lingo/lingo-the.h index ba3ef8b87c..bbca6361fc 100644 --- a/engines/director/lingo/lingo-the.h +++ b/engines/director/lingo/lingo-the.h @@ -41,6 +41,13 @@ enum TheEntityType { kTheMouseDownScript, kTheMouseUpScript, + kTheField, + + kTheChars, + kTheItems, + kTheLines, + kTheWords, + kTheSprite, kTheCast, kTheCastMembers, @@ -95,6 +102,8 @@ enum TheEntityType { kTheSwitchColorDepth, kTheResult, kTheSelection, + kTheSelEnd, + kTheSelStart, kTheShiftDown, kTheSqrt, @@ -165,13 +174,16 @@ enum TheFieldType { kTheScript, kTheScriptNum, kTheScriptText, - kTheSelEnd, - kTheSelStart, kTheSize, kTheStrech, kTheSound, kTheSourceRect, kTheText, + kTheTextAlign, + kTheTextFont, + kTheTextheight, + kTheTextSize, + kTheTextStyle, kTheTop, kTheTrails, kTheType, diff --git a/engines/director/lingo/lingo.h b/engines/director/lingo/lingo.h index d51a5f07a4..cd0943f5eb 100644 --- a/engines/director/lingo/lingo.h +++ b/engines/director/lingo/lingo.h @@ -251,6 +251,12 @@ public: static void c_within(); static void c_charOf(); static void c_charToOf(); + static void c_itemOf(); + static void c_itemToOf(); + static void c_lineOf(); + static void c_lineToOf(); + static void c_wordOf(); + static void c_wordToOf(); static void c_constpush(); static void c_voidpush(); @@ -319,6 +325,8 @@ public: static void b_chars(int nargs); static void b_charToNum(int nargs); + static void b_delete(int nargs); + static void b_hilite(int nargs); static void b_length(int nargs); static void b_numToChar(int nargs); static void b_offset(int nargs); |