diff options
author | Eugene Sandulenko | 2017-02-12 11:30:59 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2017-02-12 11:32:05 +0100 |
commit | a243a479aef65fe184519803100477ac1f3626bf (patch) | |
tree | 37bdfeb2b4a62681ab3d43879361e2842a59d671 | |
parent | e76fec67a13ccc433de6eb41e45649e68a2865cc (diff) | |
download | scummvm-rg350-a243a479aef65fe184519803100477ac1f3626bf.tar.gz scummvm-rg350-a243a479aef65fe184519803100477ac1f3626bf.tar.bz2 scummvm-rg350-a243a479aef65fe184519803100477ac1f3626bf.zip |
DIRECTOR: Lingo: Added grammar for assignment to references
-rw-r--r-- | engines/director/lingo/lingo-builtins.cpp | 15 | ||||
-rw-r--r-- | engines/director/lingo/lingo-code.cpp | 7 | ||||
-rw-r--r-- | engines/director/lingo/lingo-gr.cpp | 2012 | ||||
-rw-r--r-- | engines/director/lingo/lingo-gr.h | 254 | ||||
-rw-r--r-- | engines/director/lingo/lingo-gr.y | 10 | ||||
-rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 26 | ||||
-rw-r--r-- | engines/director/lingo/lingo-lex.l | 8 |
7 files changed, 1202 insertions, 1130 deletions
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp index 98a4399e4e..ecf7fe22ad 100644 --- a/engines/director/lingo/lingo-builtins.cpp +++ b/engines/director/lingo/lingo-builtins.cpp @@ -296,6 +296,14 @@ static const char *builtinFunctions[] = { 0 }; +static const char *builtinReferences[] = { + "cast", + "field", + "script", + "window", + 0 +}; + static const char *predefinedMethods[] = { "mAtFrame", // D3 @@ -335,6 +343,13 @@ void Lingo::initBuiltIns() { _builtins[*b]->type = FBLTIN; } + for (const char **b = builtinReferences; *b; b++) { + if (!_builtins.contains(*b)) + error("Incorrectly setup builtinReferences[]: %s", *b); + + _builtins[*b]->type = RBLTIN; + } + for (const char **b = twoWordBuiltins; *b; b++) _twoWordBuiltins[*b] = true; diff --git a/engines/director/lingo/lingo-code.cpp b/engines/director/lingo/lingo-code.cpp index ee32cf06e5..87cf6da6df 100644 --- a/engines/director/lingo/lingo-code.cpp +++ b/engines/director/lingo/lingo-code.cpp @@ -1035,7 +1035,8 @@ void Lingo::call(Common::String name, int nargs) { warning("Call to undefined handler '%s'. Dropping %d stack items", name.c_str(), nargs); dropArgs = true; } else { - if ((sym->type == BLTIN || sym->type == FBLTIN) && sym->nargs != -1 && sym->nargs != nargs && sym->maxArgs != nargs) { + if ((sym->type == BLTIN || sym->type == FBLTIN || sym->type == RBLTIN) + && sym->nargs != -1 && sym->nargs != nargs && sym->maxArgs != nargs) { if (sym->nargs == sym->maxArgs) warning("Incorrect number of arguments to handler '%s', expecting %d. Dropping %d stack items", name.c_str(), sym->nargs, nargs); else @@ -1062,7 +1063,7 @@ void Lingo::call(Common::String name, int nargs) { g_lingo->pop(); } - if (sym->type == BLTIN || sym->type == FBLTIN) { + if (sym->type == BLTIN || sym->type == FBLTIN || sym->type == RBLTIN) { if (sym->u.bltin == b_factory) { g_lingo->factoryCall(name, nargs); } else { @@ -1072,7 +1073,7 @@ void Lingo::call(Common::String name, int nargs) { int stackNewSize = _stack.size(); - if (sym->type == FBLTIN) { + if (sym->type == FBLTIN || sym->type == RBLTIN) { if (stackNewSize - stackSize != 1) warning("built-in function %s did not return value", name.c_str()); } else { diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index f32f171c07..2406a8703d 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -88,68 +88,70 @@ FBLTINNOARGS = 277, FBLTINONEARG = 278, FBLTINARGLIST = 279, - ID = 280, - STRING = 281, - HANDLER = 282, - SYMBOL = 283, - ENDCLAUSE = 284, - tPLAYACCEL = 285, - tDOWN = 286, - tELSE = 287, - tNLELSIF = 288, - tEXIT = 289, - tFRAME = 290, - tGLOBAL = 291, - tGO = 292, - tIF = 293, - tINTO = 294, - tLOOP = 295, - tMACRO = 296, - tMOVIE = 297, - tNEXT = 298, - tOF = 299, - tPREVIOUS = 300, - tPUT = 301, - tREPEAT = 302, - tSET = 303, - tTHEN = 304, - tTO = 305, - tWHEN = 306, - tWITH = 307, - tWHILE = 308, - tNLELSE = 309, - tFACTORY = 310, - tMETHOD = 311, - tOPEN = 312, - tPLAY = 313, - tDONE = 314, - tINSTANCE = 315, - tGE = 316, - tLE = 317, - tGT = 318, - tLT = 319, - tEQ = 320, - tNEQ = 321, - tAND = 322, - tOR = 323, - tNOT = 324, - tMOD = 325, - tAFTER = 326, - tBEFORE = 327, - tCONCAT = 328, - tCONTAINS = 329, - tSTARTS = 330, - tCHAR = 331, - tITEM = 332, - tLINE = 333, - tWORD = 334, - tSPRITE = 335, - tINTERSECTS = 336, - tWITHIN = 337, - tTELL = 338, - tPROPERTY = 339, - tON = 340, - tME = 341 + RBLTIN = 280, + RBLTINONEARG = 281, + ID = 282, + STRING = 283, + HANDLER = 284, + SYMBOL = 285, + ENDCLAUSE = 286, + tPLAYACCEL = 287, + tDOWN = 288, + tELSE = 289, + tNLELSIF = 290, + tEXIT = 291, + tFRAME = 292, + tGLOBAL = 293, + tGO = 294, + tIF = 295, + tINTO = 296, + tLOOP = 297, + tMACRO = 298, + tMOVIE = 299, + tNEXT = 300, + tOF = 301, + tPREVIOUS = 302, + tPUT = 303, + tREPEAT = 304, + tSET = 305, + tTHEN = 306, + tTO = 307, + tWHEN = 308, + tWITH = 309, + tWHILE = 310, + tNLELSE = 311, + tFACTORY = 312, + tMETHOD = 313, + tOPEN = 314, + tPLAY = 315, + tDONE = 316, + tINSTANCE = 317, + tGE = 318, + tLE = 319, + tGT = 320, + tLT = 321, + tEQ = 322, + tNEQ = 323, + tAND = 324, + tOR = 325, + tNOT = 326, + tMOD = 327, + tAFTER = 328, + tBEFORE = 329, + tCONCAT = 330, + tCONTAINS = 331, + tSTARTS = 332, + tCHAR = 333, + tITEM = 334, + tLINE = 335, + tWORD = 336, + tSPRITE = 337, + tINTERSECTS = 338, + tWITHIN = 339, + tTELL = 340, + tPROPERTY = 341, + tON = 342, + tME = 343 }; #endif /* Tokens. */ @@ -175,68 +177,70 @@ #define FBLTINNOARGS 277 #define FBLTINONEARG 278 #define FBLTINARGLIST 279 -#define ID 280 -#define STRING 281 -#define HANDLER 282 -#define SYMBOL 283 -#define ENDCLAUSE 284 -#define tPLAYACCEL 285 -#define tDOWN 286 -#define tELSE 287 -#define tNLELSIF 288 -#define tEXIT 289 -#define tFRAME 290 -#define tGLOBAL 291 -#define tGO 292 -#define tIF 293 -#define tINTO 294 -#define tLOOP 295 -#define tMACRO 296 -#define tMOVIE 297 -#define tNEXT 298 -#define tOF 299 -#define tPREVIOUS 300 -#define tPUT 301 -#define tREPEAT 302 -#define tSET 303 -#define tTHEN 304 -#define tTO 305 -#define tWHEN 306 -#define tWITH 307 -#define tWHILE 308 -#define tNLELSE 309 -#define tFACTORY 310 -#define tMETHOD 311 -#define tOPEN 312 -#define tPLAY 313 -#define tDONE 314 -#define tINSTANCE 315 -#define tGE 316 -#define tLE 317 -#define tGT 318 -#define tLT 319 -#define tEQ 320 -#define tNEQ 321 -#define tAND 322 -#define tOR 323 -#define tNOT 324 -#define tMOD 325 -#define tAFTER 326 -#define tBEFORE 327 -#define tCONCAT 328 -#define tCONTAINS 329 -#define tSTARTS 330 -#define tCHAR 331 -#define tITEM 332 -#define tLINE 333 -#define tWORD 334 -#define tSPRITE 335 -#define tINTERSECTS 336 -#define tWITHIN 337 -#define tTELL 338 -#define tPROPERTY 339 -#define tON 340 -#define tME 341 +#define RBLTIN 280 +#define RBLTINONEARG 281 +#define ID 282 +#define STRING 283 +#define HANDLER 284 +#define SYMBOL 285 +#define ENDCLAUSE 286 +#define tPLAYACCEL 287 +#define tDOWN 288 +#define tELSE 289 +#define tNLELSIF 290 +#define tEXIT 291 +#define tFRAME 292 +#define tGLOBAL 293 +#define tGO 294 +#define tIF 295 +#define tINTO 296 +#define tLOOP 297 +#define tMACRO 298 +#define tMOVIE 299 +#define tNEXT 300 +#define tOF 301 +#define tPREVIOUS 302 +#define tPUT 303 +#define tREPEAT 304 +#define tSET 305 +#define tTHEN 306 +#define tTO 307 +#define tWHEN 308 +#define tWITH 309 +#define tWHILE 310 +#define tNLELSE 311 +#define tFACTORY 312 +#define tMETHOD 313 +#define tOPEN 314 +#define tPLAY 315 +#define tDONE 316 +#define tINSTANCE 317 +#define tGE 318 +#define tLE 319 +#define tGT 320 +#define tLT 321 +#define tEQ 322 +#define tNEQ 323 +#define tAND 324 +#define tOR 325 +#define tNOT 326 +#define tMOD 327 +#define tAFTER 328 +#define tBEFORE 329 +#define tCONCAT 330 +#define tCONTAINS 331 +#define tSTARTS 332 +#define tCHAR 333 +#define tITEM 334 +#define tLINE 335 +#define tWORD 336 +#define tSPRITE 337 +#define tINTERSECTS 338 +#define tWITHIN 339 +#define tTELL 340 +#define tPROPERTY 341 +#define tON 342 +#define tME 343 @@ -304,7 +308,7 @@ typedef union YYSTYPE Common::Array<double> *arr; } /* Line 193 of yacc.c. */ -#line 308 "engines/director/lingo/lingo-gr.cpp" +#line 312 "engines/director/lingo/lingo-gr.cpp" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -317,7 +321,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 321 "engines/director/lingo/lingo-gr.cpp" +#line 325 "engines/director/lingo/lingo-gr.cpp" #ifdef short # undef short @@ -532,20 +536,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 123 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1818 +#define YYLAST 1879 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 102 +#define YYNTOKENS 104 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 43 +#define YYNNTS 44 /* YYNRULES -- Number of rules. */ -#define YYNRULES 161 +#define YYNRULES 163 /* YYNRULES -- Number of states. */ -#define YYNSTATES 355 +#define YYNSTATES 358 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 341 +#define YYMAXUTOK 343 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -554,15 +558,15 @@ union yyalloc static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 94, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 96, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 93, 88, 2, - 95, 96, 91, 89, 101, 90, 2, 92, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 95, 90, 2, + 97, 98, 93, 91, 103, 92, 2, 94, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 98, 87, 97, 2, 2, 2, 2, 2, 2, 2, + 100, 89, 99, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 99, 2, 100, 2, 2, 2, 2, 2, 2, + 2, 101, 2, 102, 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, @@ -587,7 +591,7 @@ static const yytype_uint8 yytranslate[] = 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86 + 85, 86, 87, 88 }; #if YYDEBUG @@ -596,111 +600,112 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint16 yyprhs[] = { 0, 0, 3, 7, 9, 12, 14, 15, 17, 19, - 21, 26, 31, 36, 41, 46, 52, 57, 62, 68, - 70, 72, 74, 76, 84, 95, 107, 111, 118, 123, - 131, 142, 153, 160, 171, 182, 183, 187, 190, 192, - 195, 197, 204, 206, 213, 215, 219, 223, 226, 230, - 232, 234, 235, 236, 237, 240, 243, 247, 249, 251, - 253, 255, 257, 259, 262, 265, 270, 275, 277, 279, - 282, 284, 288, 292, 296, 300, 304, 308, 312, 316, - 320, 324, 328, 332, 335, 339, 343, 347, 351, 354, - 357, 361, 365, 370, 375, 380, 387, 392, 399, 404, - 411, 416, 423, 426, 428, 430, 433, 435, 438, 441, - 444, 446, 449, 452, 454, 457, 462, 467, 474, 479, - 482, 486, 488, 492, 494, 498, 500, 504, 507, 510, - 513, 516, 520, 523, 526, 528, 532, 535, 538, 541, - 545, 548, 549, 553, 554, 563, 566, 567, 576, 577, - 578, 589, 590, 592, 596, 601, 602, 605, 606, 608, - 612, 614 + 21, 26, 31, 36, 41, 46, 51, 57, 62, 67, + 73, 75, 77, 79, 81, 89, 100, 112, 116, 123, + 128, 136, 147, 158, 165, 176, 187, 188, 192, 195, + 197, 200, 202, 209, 211, 218, 220, 224, 228, 231, + 235, 237, 239, 240, 241, 242, 245, 248, 252, 254, + 256, 258, 260, 262, 264, 267, 270, 275, 280, 282, + 284, 287, 289, 293, 297, 301, 305, 309, 313, 317, + 321, 325, 329, 333, 337, 340, 344, 348, 352, 356, + 359, 362, 366, 370, 375, 380, 385, 392, 397, 404, + 409, 416, 421, 428, 431, 434, 436, 438, 441, 443, + 446, 449, 452, 454, 457, 460, 462, 465, 470, 475, + 482, 487, 490, 494, 496, 500, 502, 506, 508, 512, + 515, 518, 521, 524, 528, 531, 534, 536, 540, 543, + 546, 549, 553, 556, 557, 561, 562, 571, 574, 575, + 584, 585, 586, 597, 598, 600, 604, 609, 610, 613, + 614, 616, 620, 622 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 103, 0, -1, 103, 104, 105, -1, 105, -1, 1, - 104, -1, 94, -1, -1, 135, -1, 142, -1, 108, - -1, 46, 125, 39, 25, -1, 46, 125, 71, 125, - -1, 46, 125, 72, 125, -1, 48, 25, 87, 125, - -1, 48, 12, 87, 125, -1, 48, 13, 125, 87, - 125, -1, 48, 25, 50, 125, -1, 48, 12, 50, - 125, -1, 48, 13, 125, 50, 125, -1, 125, -1, - 126, -1, 107, -1, 109, -1, 116, 95, 115, 96, - 122, 121, 29, -1, 117, 87, 125, 121, 50, 125, - 121, 122, 121, 29, -1, 117, 87, 125, 121, 31, - 50, 125, 121, 122, 121, 29, -1, 123, 107, 121, - -1, 124, 125, 104, 122, 121, 29, -1, 124, 125, - 50, 125, -1, 118, 115, 49, 104, 122, 121, 29, - -1, 118, 115, 49, 104, 122, 121, 54, 122, 121, - 29, -1, 118, 115, 49, 104, 122, 121, 120, 111, - 121, 29, -1, 118, 115, 49, 120, 107, 121, -1, - 118, 115, 49, 120, 107, 121, 54, 120, 107, 121, - -1, 118, 115, 49, 120, 107, 121, 112, 121, 110, - 121, -1, -1, 54, 120, 107, -1, 111, 114, -1, - 114, -1, 112, 113, -1, 113, -1, 119, 115, 49, - 120, 108, 121, -1, 112, -1, 119, 115, 49, 120, - 122, 121, -1, 125, -1, 125, 87, 125, -1, 95, - 115, 96, -1, 47, 53, -1, 47, 52, 25, -1, - 38, -1, 33, -1, -1, -1, -1, 122, 104, -1, - 122, 108, -1, 51, 25, 49, -1, 83, -1, 11, - -1, 14, -1, 28, -1, 26, -1, 22, -1, 23, - 125, -1, 24, 144, -1, 24, 95, 144, 96, -1, - 25, 95, 143, 96, -1, 25, -1, 12, -1, 13, - 125, -1, 106, -1, 125, 89, 125, -1, 125, 90, - 125, -1, 125, 91, 125, -1, 125, 92, 125, -1, - 125, 70, 125, -1, 125, 97, 125, -1, 125, 98, - 125, -1, 125, 66, 125, -1, 125, 61, 125, -1, - 125, 62, 125, -1, 125, 67, 125, -1, 125, 68, - 125, -1, 69, 125, -1, 125, 88, 125, -1, 125, - 73, 125, -1, 125, 74, 125, -1, 125, 75, 125, - -1, 89, 125, -1, 90, 125, -1, 95, 125, 96, - -1, 99, 143, 100, -1, 80, 125, 81, 125, -1, - 80, 125, 82, 125, -1, 76, 125, 44, 125, -1, - 76, 125, 50, 125, 44, 125, -1, 77, 125, 44, - 125, -1, 77, 125, 50, 125, 44, 125, -1, 78, - 125, 44, 125, -1, 78, 125, 50, 125, 44, 125, - -1, 79, 125, 44, 125, -1, 79, 125, 50, 125, - 44, 125, -1, 46, 125, -1, 130, -1, 133, -1, - 34, 47, -1, 34, -1, 36, 127, -1, 84, 128, - -1, 60, 129, -1, 16, -1, 18, 125, -1, 17, - 125, -1, 17, -1, 19, 144, -1, 19, 95, 144, - 96, -1, 86, 95, 25, 96, -1, 86, 95, 25, - 101, 143, 96, -1, 57, 125, 52, 125, -1, 57, - 125, -1, 20, 25, 143, -1, 25, -1, 127, 101, - 25, -1, 25, -1, 128, 101, 25, -1, 25, -1, - 129, 101, 25, -1, 37, 40, -1, 37, 43, -1, - 37, 45, -1, 37, 131, -1, 37, 131, 132, -1, - 37, 132, -1, 35, 125, -1, 125, -1, 44, 42, - 125, -1, 42, 125, -1, 58, 59, -1, 58, 131, - -1, 58, 131, 132, -1, 58, 132, -1, -1, 30, - 134, 143, -1, -1, 41, 25, 136, 120, 140, 104, - 141, 122, -1, 55, 25, -1, -1, 56, 25, 137, - 120, 140, 104, 141, 122, -1, -1, -1, 85, 25, - 138, 120, 139, 140, 104, 141, 122, 29, -1, -1, - 25, -1, 140, 101, 25, -1, 140, 104, 101, 25, - -1, -1, 25, 144, -1, -1, 125, -1, 143, 101, - 125, -1, 125, -1, 144, 101, 125, -1 + 105, 0, -1, 105, 106, 107, -1, 107, -1, 1, + 106, -1, 96, -1, -1, 138, -1, 145, -1, 110, + -1, 48, 127, 41, 27, -1, 48, 127, 41, 128, + -1, 48, 127, 73, 127, -1, 48, 127, 74, 127, + -1, 50, 27, 89, 127, -1, 50, 12, 89, 127, + -1, 50, 13, 127, 89, 127, -1, 50, 27, 52, + 127, -1, 50, 12, 52, 127, -1, 50, 13, 127, + 52, 127, -1, 127, -1, 129, -1, 109, -1, 111, + -1, 118, 97, 117, 98, 124, 123, 31, -1, 119, + 89, 127, 123, 52, 127, 123, 124, 123, 31, -1, + 119, 89, 127, 123, 33, 52, 127, 123, 124, 123, + 31, -1, 125, 109, 123, -1, 126, 127, 106, 124, + 123, 31, -1, 126, 127, 52, 127, -1, 120, 117, + 51, 106, 124, 123, 31, -1, 120, 117, 51, 106, + 124, 123, 56, 124, 123, 31, -1, 120, 117, 51, + 106, 124, 123, 122, 113, 123, 31, -1, 120, 117, + 51, 122, 109, 123, -1, 120, 117, 51, 122, 109, + 123, 56, 122, 109, 123, -1, 120, 117, 51, 122, + 109, 123, 114, 123, 112, 123, -1, -1, 56, 122, + 109, -1, 113, 116, -1, 116, -1, 114, 115, -1, + 115, -1, 121, 117, 51, 122, 110, 123, -1, 114, + -1, 121, 117, 51, 122, 124, 123, -1, 127, -1, + 127, 89, 127, -1, 97, 117, 98, -1, 49, 55, + -1, 49, 54, 27, -1, 40, -1, 35, -1, -1, + -1, -1, 124, 106, -1, 124, 110, -1, 53, 27, + 51, -1, 85, -1, 11, -1, 14, -1, 30, -1, + 28, -1, 22, -1, 23, 127, -1, 24, 147, -1, + 24, 97, 147, 98, -1, 27, 97, 146, 98, -1, + 27, -1, 12, -1, 13, 127, -1, 108, -1, 127, + 91, 127, -1, 127, 92, 127, -1, 127, 93, 127, + -1, 127, 94, 127, -1, 127, 72, 127, -1, 127, + 99, 127, -1, 127, 100, 127, -1, 127, 68, 127, + -1, 127, 63, 127, -1, 127, 64, 127, -1, 127, + 69, 127, -1, 127, 70, 127, -1, 71, 127, -1, + 127, 90, 127, -1, 127, 75, 127, -1, 127, 76, + 127, -1, 127, 77, 127, -1, 91, 127, -1, 92, + 127, -1, 97, 127, 98, -1, 101, 146, 102, -1, + 82, 127, 83, 127, -1, 82, 127, 84, 127, -1, + 78, 127, 46, 127, -1, 78, 127, 52, 127, 46, + 127, -1, 79, 127, 46, 127, -1, 79, 127, 52, + 127, 46, 127, -1, 80, 127, 46, 127, -1, 80, + 127, 52, 127, 46, 127, -1, 81, 127, 46, 127, + -1, 81, 127, 52, 127, 46, 127, -1, 26, 127, + -1, 48, 127, -1, 133, -1, 136, -1, 36, 49, + -1, 36, -1, 38, 130, -1, 86, 131, -1, 62, + 132, -1, 16, -1, 18, 127, -1, 17, 127, -1, + 17, -1, 19, 147, -1, 19, 97, 147, 98, -1, + 88, 97, 27, 98, -1, 88, 97, 27, 103, 146, + 98, -1, 59, 127, 54, 127, -1, 59, 127, -1, + 20, 27, 146, -1, 27, -1, 130, 103, 27, -1, + 27, -1, 131, 103, 27, -1, 27, -1, 132, 103, + 27, -1, 39, 42, -1, 39, 45, -1, 39, 47, + -1, 39, 134, -1, 39, 134, 135, -1, 39, 135, + -1, 37, 127, -1, 127, -1, 46, 44, 127, -1, + 44, 127, -1, 60, 61, -1, 60, 134, -1, 60, + 134, 135, -1, 60, 135, -1, -1, 32, 137, 146, + -1, -1, 43, 27, 139, 122, 143, 106, 144, 124, + -1, 57, 27, -1, -1, 58, 27, 140, 122, 143, + 106, 144, 124, -1, -1, -1, 87, 27, 141, 122, + 142, 143, 106, 144, 124, 31, -1, -1, 27, -1, + 143, 103, 27, -1, 143, 106, 103, 27, -1, -1, + 27, 147, -1, -1, 127, -1, 146, 103, 127, -1, + 127, -1, 147, 103, 127, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { 0, 118, 118, 119, 120, 123, 128, 129, 130, 131, - 134, 140, 141, 142, 148, 156, 164, 170, 178, 188, - 189, 192, 193, 198, 211, 229, 243, 249, 252, 257, - 267, 279, 291, 301, 311, 323, 324, 327, 328, 331, - 332, 335, 343, 344, 352, 353, 354, 357, 360, 367, - 374, 382, 385, 388, 389, 390, 393, 399, 403, 404, - 407, 410, 413, 416, 419, 420, 421, 424, 428, 435, - 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, - 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, - 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, - 471, 472, 475, 476, 477, 478, 479, 481, 482, 483, - 484, 487, 490, 493, 497, 498, 499, 500, 501, 502, - 503, 506, 507, 510, 511, 514, 515, 526, 527, 528, - 529, 532, 535, 540, 541, 544, 545, 548, 549, 552, - 555, 558, 558, 588, 588, 594, 597, 597, 602, 603, - 602, 613, 614, 615, 616, 619, 623, 631, 632, 633, - 636, 637 + 134, 140, 143, 144, 145, 151, 159, 167, 173, 181, + 191, 192, 195, 196, 201, 214, 232, 246, 252, 255, + 260, 270, 282, 294, 304, 314, 326, 327, 330, 331, + 334, 335, 338, 346, 347, 355, 356, 357, 360, 363, + 370, 377, 385, 388, 391, 392, 393, 396, 402, 406, + 407, 410, 413, 416, 419, 422, 423, 424, 427, 431, + 438, 444, 445, 446, 447, 448, 449, 450, 451, 452, + 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, + 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, + 473, 474, 475, 478, 483, 484, 485, 486, 487, 489, + 490, 491, 492, 495, 498, 501, 505, 506, 507, 508, + 509, 510, 511, 514, 515, 518, 519, 522, 523, 534, + 535, 536, 537, 540, 543, 548, 549, 552, 553, 556, + 557, 560, 563, 566, 566, 596, 596, 602, 605, 605, + 610, 611, 610, 621, 622, 623, 624, 627, 631, 639, + 640, 641, 644, 645 }; #endif @@ -713,24 +718,25 @@ static const char *const yytname[] = "POINT", "RECT", "ARRAY", "OBJECT", "INT", "THEENTITY", "THEENTITYWITHID", "FLOAT", "BLTIN", "BLTINNOARGS", "BLTINNOARGSORONE", "BLTINONEARG", "BLTINARGLIST", "TWOWORDBUILTIN", "FBLTIN", - "FBLTINNOARGS", "FBLTINONEARG", "FBLTINARGLIST", "ID", "STRING", - "HANDLER", "SYMBOL", "ENDCLAUSE", "tPLAYACCEL", "tDOWN", "tELSE", - "tNLELSIF", "tEXIT", "tFRAME", "tGLOBAL", "tGO", "tIF", "tINTO", "tLOOP", - "tMACRO", "tMOVIE", "tNEXT", "tOF", "tPREVIOUS", "tPUT", "tREPEAT", - "tSET", "tTHEN", "tTO", "tWHEN", "tWITH", "tWHILE", "tNLELSE", - "tFACTORY", "tMETHOD", "tOPEN", "tPLAY", "tDONE", "tINSTANCE", "tGE", - "tLE", "tGT", "tLT", "tEQ", "tNEQ", "tAND", "tOR", "tNOT", "tMOD", - "tAFTER", "tBEFORE", "tCONCAT", "tCONTAINS", "tSTARTS", "tCHAR", "tITEM", - "tLINE", "tWORD", "tSPRITE", "tINTERSECTS", "tWITHIN", "tTELL", - "tPROPERTY", "tON", "tME", "'='", "'&'", "'+'", "'-'", "'*'", "'/'", - "'%'", "'\\n'", "'('", "')'", "'>'", "'<'", "'['", "']'", "','", + "FBLTINNOARGS", "FBLTINONEARG", "FBLTINARGLIST", "RBLTIN", + "RBLTINONEARG", "ID", "STRING", "HANDLER", "SYMBOL", "ENDCLAUSE", + "tPLAYACCEL", "tDOWN", "tELSE", "tNLELSIF", "tEXIT", "tFRAME", "tGLOBAL", + "tGO", "tIF", "tINTO", "tLOOP", "tMACRO", "tMOVIE", "tNEXT", "tOF", + "tPREVIOUS", "tPUT", "tREPEAT", "tSET", "tTHEN", "tTO", "tWHEN", "tWITH", + "tWHILE", "tNLELSE", "tFACTORY", "tMETHOD", "tOPEN", "tPLAY", "tDONE", + "tINSTANCE", "tGE", "tLE", "tGT", "tLT", "tEQ", "tNEQ", "tAND", "tOR", + "tNOT", "tMOD", "tAFTER", "tBEFORE", "tCONCAT", "tCONTAINS", "tSTARTS", + "tCHAR", "tITEM", "tLINE", "tWORD", "tSPRITE", "tINTERSECTS", "tWITHIN", + "tTELL", "tPROPERTY", "tON", "tME", "'='", "'&'", "'+'", "'-'", "'*'", + "'/'", "'%'", "'\\n'", "'('", "')'", "'>'", "'<'", "'['", "']'", "','", "$accept", "program", "nl", "programline", "asgn", "stmtoneliner", "stmt", "ifstmt", "elsestmtoneliner", "elseifstmt", "elseifstmtoneliner", "elseifstmtoneliner1", "elseifstmt1", "cond", "repeatwhile", "repeatwith", "if", "elseif", "begin", "end", "stmtlist", "when", "tell", - "expr", "proc", "globallist", "propertylist", "instancelist", "gotofunc", - "gotoframe", "gotomovie", "playfunc", "@1", "defn", "@2", "@3", "@4", - "@5", "argdef", "argstore", "macro", "arglist", "nonemptyarglist", 0 + "expr", "reference", "proc", "globallist", "propertylist", + "instancelist", "gotofunc", "gotoframe", "gotomovie", "playfunc", "@1", + "defn", "@2", "@3", "@4", "@5", "argdef", "argstore", "macro", "arglist", + "nonemptyarglist", 0 }; #endif @@ -747,54 +753,54 @@ static const yytype_uint16 yytoknum[] = 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, - 335, 336, 337, 338, 339, 340, 341, 61, 38, 43, - 45, 42, 47, 37, 10, 40, 41, 62, 60, 91, - 93, 44 + 335, 336, 337, 338, 339, 340, 341, 342, 343, 61, + 38, 43, 45, 42, 47, 37, 10, 40, 41, 62, + 60, 91, 93, 44 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 102, 103, 103, 103, 104, 105, 105, 105, 105, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 107, - 107, 108, 108, 108, 108, 108, 108, 108, 108, 109, - 109, 109, 109, 109, 109, 110, 110, 111, 111, 112, - 112, 113, 114, 114, 115, 115, 115, 116, 117, 118, - 119, 120, 121, 122, 122, 122, 123, 124, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 127, 127, 128, 128, 129, 129, 130, 130, 130, - 130, 130, 130, 131, 131, 132, 132, 133, 133, 133, - 133, 134, 133, 136, 135, 135, 137, 135, 138, 139, - 135, 140, 140, 140, 140, 141, 142, 143, 143, 143, - 144, 144 + 0, 104, 105, 105, 105, 106, 107, 107, 107, 107, + 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, + 109, 109, 110, 110, 110, 110, 110, 110, 110, 110, + 111, 111, 111, 111, 111, 111, 112, 112, 113, 113, + 114, 114, 115, 116, 116, 117, 117, 117, 118, 119, + 120, 121, 122, 123, 124, 124, 124, 125, 126, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 128, 129, 129, 129, 129, 129, 129, + 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, + 129, 129, 129, 130, 130, 131, 131, 132, 132, 133, + 133, 133, 133, 133, 133, 134, 134, 135, 135, 136, + 136, 136, 136, 137, 136, 139, 138, 138, 140, 138, + 141, 142, 138, 143, 143, 143, 143, 144, 145, 146, + 146, 146, 147, 147 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 3, 1, 2, 1, 0, 1, 1, 1, - 4, 4, 4, 4, 4, 5, 4, 4, 5, 1, - 1, 1, 1, 7, 10, 11, 3, 6, 4, 7, - 10, 10, 6, 10, 10, 0, 3, 2, 1, 2, - 1, 6, 1, 6, 1, 3, 3, 2, 3, 1, - 1, 0, 0, 0, 2, 2, 3, 1, 1, 1, - 1, 1, 1, 2, 2, 4, 4, 1, 1, 2, - 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 2, 3, 3, 3, 3, 2, 2, - 3, 3, 4, 4, 4, 6, 4, 6, 4, 6, - 4, 6, 2, 1, 1, 2, 1, 2, 2, 2, - 1, 2, 2, 1, 2, 4, 4, 6, 4, 2, - 3, 1, 3, 1, 3, 1, 3, 2, 2, 2, - 2, 3, 2, 2, 1, 3, 2, 2, 2, 3, - 2, 0, 3, 0, 8, 2, 0, 8, 0, 0, - 10, 0, 1, 3, 4, 0, 2, 0, 1, 3, - 1, 3 + 4, 4, 4, 4, 4, 4, 5, 4, 4, 5, + 1, 1, 1, 1, 7, 10, 11, 3, 6, 4, + 7, 10, 10, 6, 10, 10, 0, 3, 2, 1, + 2, 1, 6, 1, 6, 1, 3, 3, 2, 3, + 1, 1, 0, 0, 0, 2, 2, 3, 1, 1, + 1, 1, 1, 1, 2, 2, 4, 4, 1, 1, + 2, 1, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 2, 3, 3, 3, 3, 2, + 2, 3, 3, 4, 4, 4, 6, 4, 6, 4, + 6, 4, 6, 2, 2, 1, 1, 2, 1, 2, + 2, 2, 1, 2, 2, 1, 2, 4, 4, 6, + 4, 2, 3, 1, 3, 1, 3, 1, 3, 2, + 2, 2, 2, 3, 2, 2, 1, 3, 2, 2, + 2, 3, 2, 0, 3, 0, 8, 2, 0, 8, + 0, 0, 10, 0, 1, 3, 4, 0, 2, 0, + 1, 3, 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -802,105 +808,105 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 58, 68, 0, 59, 110, 113, 0, 0, - 0, 62, 0, 0, 67, 61, 60, 141, 106, 0, - 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 57, 0, - 0, 0, 0, 0, 0, 157, 0, 3, 70, 21, - 9, 22, 0, 0, 0, 0, 0, 19, 20, 103, - 104, 7, 8, 5, 4, 67, 0, 69, 112, 111, - 0, 160, 114, 157, 63, 0, 64, 157, 156, 157, - 105, 121, 107, 0, 127, 0, 128, 0, 129, 134, - 130, 132, 143, 102, 0, 47, 0, 0, 0, 0, - 145, 146, 119, 137, 138, 140, 125, 109, 83, 0, - 0, 0, 0, 0, 123, 108, 148, 0, 88, 89, - 0, 158, 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, 157, 0, - 160, 0, 0, 120, 0, 158, 0, 142, 0, 133, - 136, 0, 131, 51, 0, 0, 0, 48, 0, 0, - 0, 0, 0, 56, 51, 0, 139, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, - 0, 90, 91, 0, 2, 0, 52, 0, 0, 51, - 0, 26, 0, 53, 79, 80, 78, 81, 82, 75, - 85, 86, 87, 84, 71, 72, 73, 74, 76, 77, - 115, 161, 65, 66, 122, 135, 151, 10, 11, 12, - 17, 14, 0, 0, 16, 13, 151, 118, 126, 94, - 0, 96, 0, 98, 0, 100, 0, 92, 93, 124, - 149, 116, 157, 159, 53, 0, 46, 53, 0, 45, - 28, 52, 152, 0, 18, 15, 0, 0, 0, 0, - 0, 151, 0, 52, 0, 0, 52, 52, 54, 55, - 0, 0, 155, 155, 95, 97, 99, 101, 0, 117, - 0, 0, 52, 51, 32, 27, 153, 0, 53, 53, - 155, 23, 52, 53, 29, 53, 0, 50, 51, 52, - 40, 0, 154, 144, 147, 53, 53, 52, 52, 52, - 42, 38, 0, 0, 39, 35, 0, 0, 52, 0, - 0, 37, 0, 0, 52, 51, 52, 51, 150, 0, - 24, 30, 31, 51, 33, 0, 34, 0, 25, 53, - 36, 52, 52, 41, 43 + 0, 0, 59, 69, 0, 60, 112, 115, 0, 0, + 0, 63, 0, 0, 68, 62, 61, 143, 108, 0, + 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 58, 0, + 0, 0, 0, 0, 0, 159, 0, 3, 71, 22, + 9, 23, 0, 0, 0, 0, 0, 20, 21, 105, + 106, 7, 8, 5, 4, 68, 0, 70, 114, 113, + 0, 162, 116, 159, 64, 0, 65, 159, 158, 159, + 107, 123, 109, 0, 129, 0, 130, 0, 131, 136, + 132, 134, 145, 104, 0, 48, 0, 0, 0, 0, + 147, 148, 121, 139, 140, 142, 127, 111, 84, 0, + 0, 0, 0, 0, 125, 110, 150, 0, 89, 90, + 0, 160, 0, 1, 6, 0, 0, 0, 0, 45, + 53, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 159, 0, + 162, 0, 0, 122, 0, 160, 0, 144, 0, 135, + 138, 0, 133, 52, 0, 0, 0, 49, 0, 0, + 0, 0, 0, 57, 52, 0, 141, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, + 0, 91, 92, 0, 2, 0, 53, 0, 0, 52, + 0, 27, 0, 54, 80, 81, 79, 82, 83, 76, + 86, 87, 88, 85, 72, 73, 74, 75, 77, 78, + 117, 163, 66, 67, 124, 137, 153, 0, 10, 11, + 12, 13, 18, 15, 0, 0, 17, 14, 153, 120, + 128, 95, 0, 97, 0, 99, 0, 101, 0, 93, + 94, 126, 151, 118, 159, 161, 54, 0, 47, 54, + 0, 46, 29, 53, 154, 0, 103, 19, 16, 0, + 0, 0, 0, 0, 153, 0, 53, 0, 0, 53, + 53, 55, 56, 0, 0, 157, 157, 96, 98, 100, + 102, 0, 119, 0, 0, 53, 52, 33, 28, 155, + 0, 54, 54, 157, 24, 53, 54, 30, 54, 0, + 51, 52, 53, 41, 0, 156, 146, 149, 54, 54, + 53, 53, 53, 43, 39, 0, 0, 40, 36, 0, + 0, 53, 0, 0, 38, 0, 0, 53, 52, 53, + 52, 152, 0, 25, 31, 32, 52, 34, 0, 35, + 0, 26, 54, 37, 53, 53, 42, 44 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 46, 278, 47, 48, 49, 279, 51, 336, 319, - 320, 310, 321, 128, 52, 53, 54, 311, 226, 201, - 261, 55, 56, 57, 58, 82, 115, 107, 59, 90, - 91, 60, 79, 61, 163, 174, 189, 271, 263, 298, - 62, 156, 72 + -1, 46, 281, 47, 48, 49, 282, 51, 339, 322, + 323, 313, 324, 128, 52, 53, 54, 314, 226, 201, + 263, 55, 56, 57, 229, 58, 82, 115, 107, 59, + 90, 91, 60, 79, 61, 163, 174, 189, 274, 265, + 301, 62, 156, 72 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -272 +#define YYPACT_NINF -275 static const yytype_int16 yypact[] = { - 339, -52, -272, -272, 962, -272, -272, 962, 962, 1000, - 37, -272, 962, 1059, 1097, -272, -272, -272, 34, 66, - 864, -272, 72, 962, 41, 57, 77, 81, 90, 962, - 903, 97, 962, 962, 962, 962, 962, 962, -272, 98, - 100, -41, 962, 962, 962, 962, 2, -272, -272, -272, - -272, -272, 36, -21, 1156, 784, 962, 1720, -272, -272, - -272, -272, -272, -272, -272, 59, 962, 1720, 1720, 1720, - 962, 1720, 31, 962, 1720, 962, 31, 962, 31, 962, - -272, -272, 51, 962, -272, 962, -272, 113, -272, 1720, - 43, -272, -272, 1191, 131, -272, -47, 962, -39, 108, - -272, -272, 1555, -272, 43, -272, -272, 58, -48, 1224, - 1257, 1290, 1323, 1588, -272, 60, -272, 133, -48, -48, - 1654, 1720, 29, -272, 428, 1156, 962, 1156, 111, 1687, - -272, 1488, 962, 962, 962, 962, 962, 962, 962, 962, - 962, 962, 962, 962, 962, 962, 962, 962, 962, 1191, - 1654, -73, 962, 62, -69, 1654, 7, 62, 139, 1720, - 1720, 962, -272, -272, 140, 962, 962, -272, 962, 962, - 1522, 962, 962, -272, -272, 962, -272, 143, 962, 962, - 962, 962, 962, 962, 962, 962, 962, 962, 146, -272, - 8, -272, -272, 962, -272, 78, 1720, 79, 1621, -52, - 962, -272, 962, -272, 22, 22, 22, -48, -48, -48, - 1720, 22, 22, 147, 238, 238, -48, -48, 1720, 1720, - -272, 1720, -272, -272, -272, 1720, 164, -272, 1720, 1720, - 1720, 1720, 962, 962, 1720, 1720, 164, 1720, -272, 1720, - 1356, 1720, 1389, 1720, 1422, 1720, 1455, 1720, 1720, -272, - -272, -272, 962, 1720, -272, -9, -272, -272, 784, 1720, - 1720, 606, -272, -22, 1720, 1720, -22, 962, 962, 962, - 962, 164, 20, 606, 141, 962, 606, -272, -272, -272, - 161, 168, 94, 94, 1720, 1720, 1720, 1720, -22, -272, - 167, 962, 1720, -3, 6, -272, -272, 172, -272, -272, - 94, -272, 1720, -272, -272, -272, 165, -272, -272, 165, - -272, 1156, -272, 606, 606, -272, -272, 606, 606, 165, - 165, -272, 1156, 784, -272, 145, 151, 517, 606, 175, - 176, -272, 177, 159, -272, -272, -272, -272, -272, 180, - -272, -272, -272, -272, -272, 784, -272, 695, -272, 695, - -272, -272, 606, -272, -272 + 342, -64, -275, -275, 991, -275, -275, 991, 991, 1063, + 33, -275, 991, 1103, 1175, -275, -275, -275, 15, 39, + 879, -275, 43, 991, 61, 60, 52, 54, 66, 991, + 951, 68, 991, 991, 991, 991, 991, 991, -275, 75, + 78, 14, 991, 991, 991, 991, 3, -275, -275, -275, + -275, -275, 22, 28, 1215, 797, 991, 1779, -275, -275, + -275, -275, -275, -275, -275, 25, 991, 1779, 1779, 1779, + 991, 1779, 48, 991, 1779, 991, 48, 991, 48, 991, + -275, -275, 49, 991, -275, 991, -275, 81, -275, 1779, + 5, -275, -275, 1250, 128, -275, -50, 991, -41, 106, + -275, -275, 1614, -275, 5, -275, -275, 53, -74, 1283, + 1316, 1349, 1382, 1647, -275, 55, -275, 132, -74, -74, + 1713, 1779, 27, -275, 433, 1215, 991, 1215, 109, 1746, + -275, 1547, 991, 991, 991, 991, 991, 991, 991, 991, + 991, 991, 991, 991, 991, 991, 991, 991, 991, 1250, + 1713, -9, 991, 58, -6, 1713, -2, 58, 136, 1779, + 1779, 991, -275, -275, 105, 991, 991, -275, 991, 991, + 1581, 991, 991, -275, -275, 991, -275, 137, 991, 991, + 991, 991, 991, 991, 991, 991, 991, 991, 138, -275, + 11, -275, -275, 991, -275, 70, 1779, 73, 1680, -64, + 991, -275, 991, -275, 239, 239, 239, -74, -74, -74, + 1779, 239, 239, 771, 13, 13, -74, -74, 1779, 1779, + -275, 1779, -275, -275, -275, 1779, 147, 991, -275, -275, + 1779, 1779, 1779, 1779, 991, 991, 1779, 1779, 147, 1779, + -275, 1779, 1415, 1779, 1448, 1779, 1481, 1779, 1514, 1779, + 1779, -275, -275, -275, 991, 1779, -275, -5, -275, -275, + 797, 1779, 1779, 615, -275, -34, 1779, 1779, 1779, -34, + 991, 991, 991, 991, 147, 20, 615, 123, 991, 615, + -275, -275, -275, 158, 151, 87, 87, 1779, 1779, 1779, + 1779, -34, -275, 160, 991, 1779, -4, -16, -275, -275, + 165, -275, -275, 87, -275, 1779, -275, -275, -275, 161, + -275, -275, 161, -275, 1215, -275, 615, 615, -275, -275, + 615, 615, 161, 161, -275, 1215, 797, -275, 139, 142, + 524, 615, 167, 168, -275, 169, 153, -275, -275, -275, + -275, -275, 171, -275, -275, -275, -275, -275, 797, -275, + 706, -275, 706, -275, -275, 615, -275, -275 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -272, -272, 19, 86, -272, -51, 0, -272, -272, -272, - -83, -221, -107, -109, -272, -272, -272, -242, -116, -18, - -198, -272, -272, 1, -272, -272, -272, -272, -272, 186, - -29, -272, -272, -272, -272, -272, -272, -272, -219, -271, - -272, -26, -7 + -275, -275, 19, 82, -275, -51, 0, -275, -275, -275, + -90, -270, -114, -109, -275, -275, -275, -268, -99, -19, + -198, -275, -275, 1, -275, -275, -275, -275, -275, -275, + 180, -13, -275, -275, -275, -275, -275, -275, -275, -215, + -274, -275, -23, -7 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -910,70 +916,62 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -7 static const yytype_int16 yytable[] = { - 50, 105, 123, 168, 130, 67, 76, 78, 68, 69, - 71, 171, 299, 74, 71, 71, 195, 266, 197, 122, - 64, 89, 274, 220, 93, 138, 304, 222, 152, 315, - 102, 89, 152, 108, 109, 110, 111, 112, 113, 307, - 169, 275, 63, 118, 119, 120, 121, 153, 172, 146, - 147, 305, 288, 157, 117, 129, 273, 131, 236, 276, - 308, 162, 73, 151, 322, 124, 126, 149, 154, 96, - 97, 150, 63, 250, 121, 176, 150, 322, 155, 281, - 121, 80, 98, 258, 159, 85, 160, 87, 324, 135, - 136, 81, 137, 94, 95, 138, 63, 92, 170, 324, - 313, 314, 99, 223, 251, 317, 100, 318, 193, 252, - 141, 142, 143, 144, 145, 101, 289, 327, 328, 146, - 147, 193, 106, 114, 50, 116, 129, 196, 198, 192, - 193, 125, 152, 204, 205, 206, 207, 208, 209, 210, + 50, 138, 168, 123, 130, 67, 76, 78, 68, 69, + 71, 171, 302, 74, 71, 71, 195, 105, 197, 310, + 64, 89, 122, 269, 93, 146, 147, 307, 277, 318, + 102, 89, 63, 108, 109, 110, 111, 112, 113, 169, + 311, 325, 327, 118, 119, 120, 121, 278, 172, 85, + 153, 87, 308, 327, 325, 129, 157, 131, 276, 291, + 73, 279, 63, 151, 80, 124, 81, 149, 154, 284, + 92, 150, 96, 97, 121, 238, 150, 162, 155, 99, + 121, 100, 135, 136, 159, 137, 160, 98, 138, 220, + 252, 176, 222, 101, 152, 106, 223, 152, 170, 63, + 260, 193, 114, 316, 317, 116, 144, 145, 320, 253, + 321, 117, 146, 147, 254, 94, 95, 126, 292, 125, + 330, 331, 148, 193, 50, 161, 129, 196, 198, 192, + 193, 227, 228, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 121, - 203, 352, 158, 221, 148, 161, 167, 173, 190, 177, - 199, 188, 225, 193, 224, 227, 228, 229, 238, 230, - 231, 249, 234, 235, 254, 256, 237, 306, 255, 239, - 240, 241, 242, 243, 244, 245, 246, 247, 248, 262, - 295, 291, 323, 296, 253, 297, 301, 312, 307, 335, - 337, 259, 326, 260, 340, 341, 342, 277, 343, 348, - 194, 309, 331, 333, 135, 136, 104, 137, 257, 345, - 138, 347, 0, 0, 0, 0, 272, 349, 0, 0, - 0, 0, 0, 264, 265, 0, 142, 143, 144, 145, - 0, 0, 0, 280, 146, 147, 0, 0, 0, 0, - 0, 0, 0, 121, 0, 290, 0, 0, 293, 294, - 0, 0, 0, 0, 0, 0, 0, 0, 284, 285, - 286, 287, 334, 0, 303, 0, 292, 0, 0, 0, - 0, 0, 282, 0, 316, 283, 0, 0, 0, 0, - 0, 325, 302, 0, 350, 0, 0, 0, 0, 329, - 330, 332, 0, 0, 0, 135, 136, 300, 137, 0, - 339, 138, 129, 0, 0, 0, 344, 0, 346, 0, - 0, 0, 0, 129, 0, 0, 0, 0, 0, 144, - 145, 0, 0, 353, 354, 146, 147, 0, 0, -6, - 1, 0, 0, 0, 0, 0, 0, 351, 0, 351, - 2, 3, 4, 5, 0, 6, 7, 8, 9, 10, - 0, 11, 12, 13, 14, 15, 0, 16, 0, 17, - 0, 0, 0, 18, 0, 19, 20, 21, 0, 0, - 22, 0, 0, 0, 0, 23, 24, 25, 0, 0, - 26, 0, 0, 0, 27, 28, 29, 30, 0, 31, - 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, - 0, 0, 0, 0, 0, 33, 34, 35, 36, 37, - 0, 0, 38, 39, 40, 41, 0, 0, 42, 43, - 0, 0, 0, -6, 44, 0, 0, 0, 45, 2, - 3, 4, 5, 0, 6, 7, 8, 9, 10, 0, - 11, 12, 13, 14, 15, 0, 16, 0, 17, 0, - 0, 0, 18, 0, 19, 20, 21, 0, 0, 22, - 0, 0, 0, 0, 23, 24, 25, 0, 0, 26, - 0, 0, 0, 27, 28, 29, 30, 0, 31, 0, - 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, - 0, 0, 0, 0, 33, 34, 35, 36, 37, 0, - 0, 38, 39, 40, 41, 0, 0, 42, 43, 0, - 0, 0, 0, 44, 0, 0, 0, 45, 2, 3, - 4, 5, 0, 6, 7, 8, 9, 10, 0, 11, - 12, 13, 65, 15, 0, 16, 338, 17, 0, 0, - 0, 18, 0, 19, 20, 21, 0, 0, 0, 0, - 0, 0, 0, 23, 24, 25, 0, 0, 26, 0, - 0, 0, 0, 0, 29, 30, 0, 31, 0, 0, - 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, - 0, 0, 0, 33, 34, 35, 36, 37, 0, 0, - 38, 39, 0, 41, 0, 0, 42, 43, 0, 0, - 0, 63, 44, 0, 0, 0, 45, 2, 3, 4, - 5, 0, 6, 7, 8, 9, 10, 0, 11, 12, - 13, 65, 15, 0, 16, 0, 17, 0, 0, 0, + 203, 152, 158, 221, 355, 167, 177, 173, 188, 190, + 199, 193, 225, 224, 240, 251, 230, 231, 256, 232, + 233, 258, 236, 237, 264, 294, 239, 257, 299, 241, + 242, 243, 244, 245, 246, 247, 248, 249, 250, 298, + 300, 304, 315, 340, 255, 338, 310, 309, 343, 344, + 345, 261, 351, 262, 346, 329, 194, 312, 334, 280, + 104, 0, 326, 0, 0, 0, 336, 0, 259, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 266, 0, + 0, 275, 0, 0, 0, 267, 268, 0, 0, 348, + 0, 350, 0, 0, 283, 0, 0, 352, 0, 0, + 0, 0, 0, 0, 0, 121, 0, 293, 0, 0, + 296, 297, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 287, 288, 289, 290, 337, 306, 0, 0, 295, + 0, 0, 0, 0, 285, 0, 319, 0, 286, 0, + 0, 0, 0, 328, 0, 305, 0, 353, 0, 0, + 0, 332, 333, 335, 0, 0, 0, 0, 135, 136, + 303, 137, 342, 0, 138, 129, 0, 0, 347, 0, + 349, 0, 0, 0, 0, 0, 129, 0, 0, 141, + 142, 143, 144, 145, 0, 356, 357, 0, 146, 147, + 0, 0, -6, 1, 0, 0, 0, 0, 0, 0, + 354, 0, 354, 2, 3, 4, 5, 0, 6, 7, + 8, 9, 10, 0, 11, 12, 13, 0, 0, 14, + 15, 0, 16, 0, 17, 0, 0, 0, 18, 0, + 19, 20, 21, 0, 0, 22, 0, 0, 0, 0, + 23, 24, 25, 0, 0, 26, 0, 0, 0, 27, + 28, 29, 30, 0, 31, 0, 0, 0, 0, 0, + 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, + 33, 34, 35, 36, 37, 0, 0, 38, 39, 40, + 41, 0, 0, 42, 43, 0, 0, 0, -6, 44, + 0, 0, 0, 45, 2, 3, 4, 5, 0, 6, + 7, 8, 9, 10, 0, 11, 12, 13, 0, 0, + 14, 15, 0, 16, 0, 17, 0, 0, 0, 18, + 0, 19, 20, 21, 0, 0, 22, 0, 0, 0, + 0, 23, 24, 25, 0, 0, 26, 0, 0, 0, + 27, 28, 29, 30, 0, 31, 0, 0, 0, 0, + 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, + 0, 33, 34, 35, 36, 37, 0, 0, 38, 39, + 40, 41, 0, 0, 42, 43, 0, 0, 0, 0, + 44, 0, 0, 0, 45, 2, 3, 4, 5, 0, + 6, 7, 8, 9, 10, 0, 11, 12, 13, 0, + 0, 65, 15, 0, 16, 341, 17, 0, 0, 0, 18, 0, 19, 20, 21, 0, 0, 0, 0, 0, 0, 0, 23, 24, 25, 0, 0, 26, 0, 0, 0, 0, 0, 29, 30, 0, 31, 0, 0, 0, @@ -982,302 +980,322 @@ static const yytype_int16 yytable[] = 39, 0, 41, 0, 0, 42, 43, 0, 0, 0, 63, 44, 0, 0, 0, 45, 2, 3, 4, 5, 0, 6, 7, 8, 9, 10, 0, 11, 12, 13, - 65, 15, 0, 16, 0, 17, 0, 0, 0, 18, - 0, 19, 20, 21, 0, 0, 0, 0, 0, 0, - 0, 23, 24, 25, 0, 0, 26, 0, 0, 0, - 0, 0, 29, 30, 0, 31, 0, 0, 0, 0, + 0, 0, 65, 15, 0, 16, 0, 17, 0, 0, + 0, 18, 0, 19, 20, 21, 0, 0, 0, 0, + 0, 0, 0, 23, 24, 25, 0, 0, 26, 0, + 0, 0, 0, 0, 29, 30, 0, 31, 0, 0, + 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, + 0, 0, 0, 33, 34, 35, 36, 37, 0, 0, + 38, 39, 0, 41, 0, 0, 42, 43, 0, 0, + 0, 63, 44, 0, 0, 0, 45, 2, 3, 4, + 5, 0, 6, 7, 8, 9, 10, 0, 11, 12, + 13, 0, 0, 65, 15, 0, 16, 0, 17, 0, + 0, 0, 18, 0, 19, 20, 21, 0, 0, 0, + 0, 0, 0, 0, 23, 24, 25, 0, 0, 26, + 0, 0, 0, 0, 0, 29, 30, 0, 31, 0, + 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, + 0, 0, 0, 0, 33, 34, 35, 36, 37, 0, + 0, 38, 39, 0, 41, 0, 0, 42, 43, 0, + 0, 0, 0, 44, 0, 0, 0, 45, 2, 3, + 4, 5, 0, 6, 7, 8, 9, 10, 0, 11, + 12, 13, 0, 0, 65, 15, 0, 16, 0, 17, + 0, 0, 0, 18, 0, 19, 20, 0, 0, 0, + 135, 136, 0, 137, 0, 23, 138, 25, 0, 0, + 0, 0, 0, 0, 0, 0, 29, 30, 0, 31, + 0, 0, 142, 143, 144, 145, 0, 0, 32, 0, + 146, 147, 0, 0, 0, 33, 34, 35, 36, 37, + 0, 0, 0, 39, 0, 41, 0, 0, 42, 43, + 2, 3, 4, 5, 44, 0, 0, 0, 45, 0, + 0, 11, 12, 13, 0, 0, 65, 15, 0, 16, + 0, 0, 0, 0, 0, 0, 83, 0, 0, 0, + 0, 84, 0, 85, 86, 87, 88, 66, 0, 25, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 32, 0, 0, 0, 0, 0, 0, 33, 34, 35, + 36, 37, 2, 3, 4, 5, 0, 0, 0, 0, + 42, 43, 0, 11, 12, 13, 44, 0, 65, 15, + 45, 16, 0, 0, 0, 0, 0, 0, 83, 0, + 0, 0, 0, 0, 0, 85, 0, 87, 0, 66, + 0, 25, 2, 3, 4, 5, 0, 0, 0, 0, + 0, 0, 103, 11, 12, 13, 0, 0, 65, 15, + 0, 16, 32, 0, 0, 0, 0, 0, 0, 33, + 34, 35, 36, 37, 0, 0, 0, 0, 0, 66, + 0, 25, 42, 43, 0, 0, 0, 0, 44, 0, + 0, 0, 45, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 32, 0, 0, 0, 0, 0, 0, 33, + 34, 35, 36, 37, 2, 3, 4, 5, 0, 0, + 0, 0, 42, 43, 0, 11, 12, 13, 44, 0, + 65, 15, 45, 16, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 66, 0, 25, 2, 3, 4, 5, 0, 0, + 0, 0, 0, 0, 0, 11, 12, 13, 0, 0, + 65, 15, 0, 16, 32, 0, 0, 0, 0, 0, + 0, 33, 34, 35, 36, 37, 0, 0, 0, 0, + 0, 66, 0, 25, 42, 43, 0, 0, 0, 0, + 70, 0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, - 0, 33, 34, 35, 36, 37, 0, 0, 38, 39, - 0, 41, 0, 0, 42, 43, 0, 0, 0, 0, - 44, 0, 0, 0, 45, 2, 3, 4, 5, 0, - 6, 7, 8, 9, 10, 0, 11, 12, 13, 65, - 15, 0, 16, 0, 17, 0, 0, 0, 18, 0, - 19, 20, 0, 0, 0, 0, 0, 0, 0, 0, - 23, 0, 25, 0, 0, 0, 0, 0, 0, 0, - 0, 29, 30, 0, 31, 0, 0, 0, 0, 0, - 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, - 33, 34, 35, 36, 37, 0, 0, 0, 39, 0, - 41, 0, 0, 42, 43, 2, 3, 4, 5, 44, - 0, 0, 0, 45, 0, 0, 11, 12, 13, 65, - 15, 0, 16, 0, 0, 0, 0, 0, 0, 83, - 0, 0, 0, 0, 84, 0, 85, 86, 87, 88, - 66, 0, 25, 0, 2, 3, 4, 5, 0, 0, - 0, 0, 0, 0, 0, 11, 12, 13, 65, 15, - 0, 16, 0, 32, 0, 0, 0, 0, 83, 0, - 33, 34, 35, 36, 37, 85, 0, 87, 0, 66, - 0, 25, 0, 42, 43, 0, 0, 0, 0, 44, - 0, 0, 103, 45, 0, 0, 0, 0, 0, 0, - 0, 0, 32, 2, 3, 4, 5, 0, 0, 33, - 34, 35, 36, 37, 11, 12, 13, 65, 15, 0, - 16, 0, 42, 43, 0, 0, 0, 0, 44, 0, - 0, 0, 45, 0, 0, 0, 0, 0, 66, 0, - 25, 2, 3, 4, 5, 0, 0, 0, 0, 0, - 0, 0, 11, 12, 13, 65, 15, 0, 16, 0, - 0, 32, 0, 0, 0, 0, 0, 0, 33, 34, - 35, 36, 37, 0, 0, 0, 66, 0, 25, 0, - 0, 42, 43, 0, 0, 0, 0, 44, 0, 0, - 0, 45, 0, 0, 0, 0, 0, 0, 0, 32, - 2, 3, 4, 5, 0, 0, 33, 34, 35, 36, - 37, 11, 12, 13, 65, 15, 0, 16, 0, 42, - 43, 0, 0, 0, 0, 70, 0, 0, 0, 45, - 0, 0, 0, 0, 0, 66, 0, 25, 2, 3, - 4, 5, 0, 0, 0, 0, 0, 0, 0, 11, - 12, 13, 65, 15, 0, 16, 0, 0, 32, 0, - 0, 0, 0, 0, 0, 33, 34, 35, 36, 37, - 0, 0, 0, 66, 0, 25, 0, 0, 42, 43, - 0, 0, 0, 0, 75, 0, 0, 0, 45, 0, - 0, 0, 0, 0, 0, 0, 32, 2, 3, 4, - 5, 0, 0, 33, 34, 35, 36, 37, 11, 12, - 13, 65, 15, 0, 16, 0, 42, 43, 0, 0, - 0, 0, 77, 0, 0, 0, 45, 0, 0, 0, - 0, 0, 66, 0, 25, 0, 0, 0, 0, 0, + 0, 33, 34, 35, 36, 37, 2, 3, 4, 5, + 0, 0, 0, 0, 42, 43, 0, 11, 12, 13, + 75, 0, 65, 15, 45, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, - 164, 0, 33, 34, 35, 36, 37, 0, 0, 0, - 0, 0, 0, 0, 0, 42, 43, 0, 0, 0, - 0, 127, 132, 133, 0, 45, 0, 134, 135, 136, - 0, 137, 165, 166, 138, 139, 140, 0, 178, 0, - 0, 0, 0, 0, 179, 0, 0, 0, 0, 141, + 0, 0, 0, 66, 0, 25, 2, 3, 4, 5, + 0, 0, 0, 0, 0, 0, 0, 11, 12, 13, + 0, 0, 65, 15, 0, 16, 32, 0, 0, 0, + 0, 0, 0, 33, 34, 35, 36, 37, 0, 0, + 0, 0, 0, 66, 0, 25, 42, 43, 0, 0, + 0, 0, 77, 0, 0, 0, 45, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, + 0, 164, 0, 33, 34, 35, 36, 37, 0, 0, + 0, 0, 0, 0, 0, 0, 42, 43, 0, 0, + 0, 0, 127, 132, 133, 0, 45, 0, 134, 135, + 136, 0, 137, 165, 166, 138, 139, 140, 0, 178, + 0, 0, 0, 0, 0, 179, 0, 0, 0, 0, + 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, + 147, 134, 135, 136, 0, 137, 0, 0, 138, 139, + 140, 0, 180, 0, 0, 0, 0, 0, 181, 0, + 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, + 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, + 0, 138, 139, 140, 0, 182, 0, 0, 0, 0, + 0, 183, 0, 0, 0, 0, 141, 142, 143, 144, + 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, + 0, 137, 0, 0, 138, 139, 140, 0, 184, 0, + 0, 0, 0, 0, 185, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, 0, 138, 139, 140, - 0, 180, 0, 0, 0, 0, 0, 181, 0, 0, + 0, 270, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, 0, - 138, 139, 140, 0, 182, 0, 0, 0, 0, 0, - 183, 0, 0, 0, 0, 141, 142, 143, 144, 145, + 138, 139, 140, 0, 271, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, - 137, 0, 0, 138, 139, 140, 0, 184, 0, 0, - 0, 0, 0, 185, 0, 0, 0, 0, 141, 142, + 137, 0, 0, 138, 139, 140, 0, 272, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, 0, 138, 139, 140, 0, - 267, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 273, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, 0, 138, - 139, 140, 0, 268, 0, 0, 0, 0, 0, 0, + 139, 140, 0, 0, 0, 0, 0, 0, 0, 202, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, 137, - 0, 0, 138, 139, 140, 0, 269, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 141, 142, 143, + 0, 0, 138, 139, 140, 0, 0, 0, 0, 0, + 0, 0, 0, 234, 0, 0, 0, 141, 142, 143, + 144, 145, 0, 63, 132, 133, 146, 147, 0, 134, + 135, 136, 0, 137, 0, 0, 138, 139, 140, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 175, 0, + 235, 141, 142, 143, 144, 145, 0, 132, 133, 0, + 146, 147, 134, 135, 136, 0, 137, 0, 0, 138, + 139, 140, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, + 132, 133, 0, 146, 147, 134, 135, 136, 0, 137, + 0, 0, 138, 139, 140, 0, 0, 0, 0, 0, + 186, 187, 0, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, - 136, 0, 137, 0, 0, 138, 139, 140, 0, 270, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, - 147, 134, 135, 136, 0, 137, 0, 0, 138, 139, - 140, 0, 0, 0, 0, 0, 0, 0, 202, 0, - 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, - 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, - 0, 138, 139, 140, 0, 0, 0, 0, 0, 0, - 0, 0, 232, 0, 0, 0, 141, 142, 143, 144, - 145, 0, 63, 132, 133, 146, 147, 0, 134, 135, 136, 0, 137, 0, 0, 138, 139, 140, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 175, 0, 233, - 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 200, + 141, 142, 143, 144, 145, 0, 132, 133, 191, 146, 147, 134, 135, 136, 0, 137, 0, 0, 138, 139, 140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, 142, 143, 144, 145, 0, 132, - 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, - 0, 138, 139, 140, 0, 0, 0, 0, 0, 186, - 187, 0, 0, 0, 0, 0, 141, 142, 143, 144, + 133, 191, 146, 147, 134, 135, 136, 0, 137, 0, + 0, 138, 139, 140, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 200, 141, 142, 143, 144, 145, 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, 137, 0, 0, 138, 139, 140, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 200, 141, - 142, 143, 144, 145, 0, 132, 133, 191, 146, 147, - 134, 135, 136, 0, 137, 0, 0, 138, 139, 140, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 141, 142, 143, 144, 145, 0, 132, 133, - 191, 146, 147, 134, 135, 136, 0, 137, 0, 0, - 138, 139, 140, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 200, 141, 142, 143, 144, 145, - 0, 132, 133, 0, 146, 147, 134, 135, 136, 0, - 137, 0, 0, 138, 139, 140, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 141, 142, - 143, 144, 145, 0, 0, 0, 0, 146, 147 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 141, + 142, 143, 144, 145, 0, 0, 0, 0, 146, 147 }; static const yytype_int16 yycheck[] = { - 0, 30, 0, 50, 55, 4, 13, 14, 7, 8, - 9, 50, 283, 12, 13, 14, 125, 236, 127, 45, - 1, 20, 31, 96, 23, 73, 29, 96, 101, 300, - 29, 30, 101, 32, 33, 34, 35, 36, 37, 33, - 87, 50, 94, 42, 43, 44, 45, 73, 87, 97, - 98, 54, 271, 79, 95, 54, 254, 56, 174, 257, - 54, 90, 25, 70, 306, 46, 87, 66, 75, 12, - 13, 70, 94, 189, 73, 104, 75, 319, 77, 101, - 79, 47, 25, 199, 83, 42, 85, 44, 309, 67, - 68, 25, 70, 52, 53, 73, 94, 25, 97, 320, - 298, 299, 25, 96, 96, 303, 25, 305, 101, 101, - 88, 89, 90, 91, 92, 25, 96, 315, 316, 97, - 98, 101, 25, 25, 124, 25, 125, 126, 127, 100, - 101, 95, 101, 132, 133, 134, 135, 136, 137, 138, + 0, 75, 52, 0, 55, 4, 13, 14, 7, 8, + 9, 52, 286, 12, 13, 14, 125, 30, 127, 35, + 1, 20, 45, 238, 23, 99, 100, 31, 33, 303, + 29, 30, 96, 32, 33, 34, 35, 36, 37, 89, + 56, 309, 312, 42, 43, 44, 45, 52, 89, 44, + 73, 46, 56, 323, 322, 54, 79, 56, 256, 274, + 27, 259, 96, 70, 49, 46, 27, 66, 75, 103, + 27, 70, 12, 13, 73, 174, 75, 90, 77, 27, + 79, 27, 69, 70, 83, 72, 85, 27, 75, 98, + 189, 104, 98, 27, 103, 27, 98, 103, 97, 96, + 199, 103, 27, 301, 302, 27, 93, 94, 306, 98, + 308, 97, 99, 100, 103, 54, 55, 89, 98, 97, + 318, 319, 97, 103, 124, 44, 125, 126, 127, 102, + 103, 26, 27, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 131, 349, 101, 152, 95, 42, 25, 49, 25, 101, - 49, 101, 161, 101, 25, 25, 165, 166, 25, 168, - 169, 25, 171, 172, 96, 96, 175, 293, 196, 178, - 179, 180, 181, 182, 183, 184, 185, 186, 187, 25, - 29, 50, 308, 25, 193, 101, 29, 25, 33, 54, - 49, 200, 311, 202, 29, 29, 29, 258, 49, 29, - 124, 294, 319, 322, 67, 68, 30, 70, 199, 335, - 73, 337, -1, -1, -1, -1, 252, 343, -1, -1, - -1, -1, -1, 232, 233, -1, 89, 90, 91, 92, - -1, -1, -1, 261, 97, 98, -1, -1, -1, -1, - -1, -1, -1, 252, -1, 273, -1, -1, 276, 277, - -1, -1, -1, -1, -1, -1, -1, -1, 267, 268, - 269, 270, 323, -1, 292, -1, 275, -1, -1, -1, - -1, -1, 263, -1, 302, 266, -1, -1, -1, -1, - -1, 309, 291, -1, 345, -1, -1, -1, -1, 317, - 318, 319, -1, -1, -1, 67, 68, 288, 70, -1, - 328, 73, 311, -1, -1, -1, 334, -1, 336, -1, - -1, -1, -1, 322, -1, -1, -1, -1, -1, 91, - 92, -1, -1, 351, 352, 97, 98, -1, -1, 0, - 1, -1, -1, -1, -1, -1, -1, 347, -1, 349, - 11, 12, 13, 14, -1, 16, 17, 18, 19, 20, - -1, 22, 23, 24, 25, 26, -1, 28, -1, 30, - -1, -1, -1, 34, -1, 36, 37, 38, -1, -1, - 41, -1, -1, -1, -1, 46, 47, 48, -1, -1, - 51, -1, -1, -1, 55, 56, 57, 58, -1, 60, - -1, -1, -1, -1, -1, -1, -1, -1, 69, -1, - -1, -1, -1, -1, -1, 76, 77, 78, 79, 80, - -1, -1, 83, 84, 85, 86, -1, -1, 89, 90, - -1, -1, -1, 94, 95, -1, -1, -1, 99, 11, - 12, 13, 14, -1, 16, 17, 18, 19, 20, -1, - 22, 23, 24, 25, 26, -1, 28, -1, 30, -1, - -1, -1, 34, -1, 36, 37, 38, -1, -1, 41, - -1, -1, -1, -1, 46, 47, 48, -1, -1, 51, - -1, -1, -1, 55, 56, 57, 58, -1, 60, -1, - -1, -1, -1, -1, -1, -1, -1, 69, -1, -1, - -1, -1, -1, -1, 76, 77, 78, 79, 80, -1, - -1, 83, 84, 85, 86, -1, -1, 89, 90, -1, - -1, -1, -1, 95, -1, -1, -1, 99, 11, 12, - 13, 14, -1, 16, 17, 18, 19, 20, -1, 22, - 23, 24, 25, 26, -1, 28, 29, 30, -1, -1, - -1, 34, -1, 36, 37, 38, -1, -1, -1, -1, - -1, -1, -1, 46, 47, 48, -1, -1, 51, -1, - -1, -1, -1, -1, 57, 58, -1, 60, -1, -1, - -1, -1, -1, -1, -1, -1, 69, -1, -1, -1, - -1, -1, -1, 76, 77, 78, 79, 80, -1, -1, - 83, 84, -1, 86, -1, -1, 89, 90, -1, -1, - -1, 94, 95, -1, -1, -1, 99, 11, 12, 13, - 14, -1, 16, 17, 18, 19, 20, -1, 22, 23, - 24, 25, 26, -1, 28, -1, 30, -1, -1, -1, - 34, -1, 36, 37, 38, -1, -1, -1, -1, -1, - -1, -1, 46, 47, 48, -1, -1, 51, -1, -1, - -1, -1, -1, 57, 58, -1, 60, -1, -1, -1, - -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, - -1, -1, 76, 77, 78, 79, 80, -1, -1, 83, - 84, -1, 86, -1, -1, 89, 90, -1, -1, -1, - 94, 95, -1, -1, -1, 99, 11, 12, 13, 14, + 131, 103, 103, 152, 352, 27, 103, 51, 103, 27, + 51, 103, 161, 27, 27, 27, 165, 166, 98, 168, + 169, 98, 171, 172, 27, 52, 175, 196, 27, 178, + 179, 180, 181, 182, 183, 184, 185, 186, 187, 31, + 103, 31, 27, 51, 193, 56, 35, 296, 31, 31, + 31, 200, 31, 202, 51, 314, 124, 297, 322, 260, + 30, -1, 311, -1, -1, -1, 325, -1, 199, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 227, -1, + -1, 254, -1, -1, -1, 234, 235, -1, -1, 338, + -1, 340, -1, -1, 263, -1, -1, 346, -1, -1, + -1, -1, -1, -1, -1, 254, -1, 276, -1, -1, + 279, 280, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 270, 271, 272, 273, 326, 295, -1, -1, 278, + -1, -1, -1, -1, 265, -1, 305, -1, 269, -1, + -1, -1, -1, 312, -1, 294, -1, 348, -1, -1, + -1, 320, 321, 322, -1, -1, -1, -1, 69, 70, + 291, 72, 331, -1, 75, 314, -1, -1, 337, -1, + 339, -1, -1, -1, -1, -1, 325, -1, -1, 90, + 91, 92, 93, 94, -1, 354, 355, -1, 99, 100, + -1, -1, 0, 1, -1, -1, -1, -1, -1, -1, + 350, -1, 352, 11, 12, 13, 14, -1, 16, 17, + 18, 19, 20, -1, 22, 23, 24, -1, -1, 27, + 28, -1, 30, -1, 32, -1, -1, -1, 36, -1, + 38, 39, 40, -1, -1, 43, -1, -1, -1, -1, + 48, 49, 50, -1, -1, 53, -1, -1, -1, 57, + 58, 59, 60, -1, 62, -1, -1, -1, -1, -1, + -1, -1, -1, 71, -1, -1, -1, -1, -1, -1, + 78, 79, 80, 81, 82, -1, -1, 85, 86, 87, + 88, -1, -1, 91, 92, -1, -1, -1, 96, 97, + -1, -1, -1, 101, 11, 12, 13, 14, -1, 16, + 17, 18, 19, 20, -1, 22, 23, 24, -1, -1, + 27, 28, -1, 30, -1, 32, -1, -1, -1, 36, + -1, 38, 39, 40, -1, -1, 43, -1, -1, -1, + -1, 48, 49, 50, -1, -1, 53, -1, -1, -1, + 57, 58, 59, 60, -1, 62, -1, -1, -1, -1, + -1, -1, -1, -1, 71, -1, -1, -1, -1, -1, + -1, 78, 79, 80, 81, 82, -1, -1, 85, 86, + 87, 88, -1, -1, 91, 92, -1, -1, -1, -1, + 97, -1, -1, -1, 101, 11, 12, 13, 14, -1, + 16, 17, 18, 19, 20, -1, 22, 23, 24, -1, + -1, 27, 28, -1, 30, 31, 32, -1, -1, -1, + 36, -1, 38, 39, 40, -1, -1, -1, -1, -1, + -1, -1, 48, 49, 50, -1, -1, 53, -1, -1, + -1, -1, -1, 59, 60, -1, 62, -1, -1, -1, + -1, -1, -1, -1, -1, 71, -1, -1, -1, -1, + -1, -1, 78, 79, 80, 81, 82, -1, -1, 85, + 86, -1, 88, -1, -1, 91, 92, -1, -1, -1, + 96, 97, -1, -1, -1, 101, 11, 12, 13, 14, -1, 16, 17, 18, 19, 20, -1, 22, 23, 24, - 25, 26, -1, 28, -1, 30, -1, -1, -1, 34, - -1, 36, 37, 38, -1, -1, -1, -1, -1, -1, - -1, 46, 47, 48, -1, -1, 51, -1, -1, -1, - -1, -1, 57, 58, -1, 60, -1, -1, -1, -1, - -1, -1, -1, -1, 69, -1, -1, -1, -1, -1, - -1, 76, 77, 78, 79, 80, -1, -1, 83, 84, - -1, 86, -1, -1, 89, 90, -1, -1, -1, -1, - 95, -1, -1, -1, 99, 11, 12, 13, 14, -1, - 16, 17, 18, 19, 20, -1, 22, 23, 24, 25, - 26, -1, 28, -1, 30, -1, -1, -1, 34, -1, - 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, - 46, -1, 48, -1, -1, -1, -1, -1, -1, -1, - -1, 57, 58, -1, 60, -1, -1, -1, -1, -1, - -1, -1, -1, 69, -1, -1, -1, -1, -1, -1, - 76, 77, 78, 79, 80, -1, -1, -1, 84, -1, - 86, -1, -1, 89, 90, 11, 12, 13, 14, 95, - -1, -1, -1, 99, -1, -1, 22, 23, 24, 25, - 26, -1, 28, -1, -1, -1, -1, -1, -1, 35, - -1, -1, -1, -1, 40, -1, 42, 43, 44, 45, - 46, -1, 48, -1, 11, 12, 13, 14, -1, -1, - -1, -1, -1, -1, -1, 22, 23, 24, 25, 26, - -1, 28, -1, 69, -1, -1, -1, -1, 35, -1, - 76, 77, 78, 79, 80, 42, -1, 44, -1, 46, - -1, 48, -1, 89, 90, -1, -1, -1, -1, 95, - -1, -1, 59, 99, -1, -1, -1, -1, -1, -1, - -1, -1, 69, 11, 12, 13, 14, -1, -1, 76, - 77, 78, 79, 80, 22, 23, 24, 25, 26, -1, - 28, -1, 89, 90, -1, -1, -1, -1, 95, -1, - -1, -1, 99, -1, -1, -1, -1, -1, 46, -1, - 48, 11, 12, 13, 14, -1, -1, -1, -1, -1, - -1, -1, 22, 23, 24, 25, 26, -1, 28, -1, - -1, 69, -1, -1, -1, -1, -1, -1, 76, 77, - 78, 79, 80, -1, -1, -1, 46, -1, 48, -1, - -1, 89, 90, -1, -1, -1, -1, 95, -1, -1, - -1, 99, -1, -1, -1, -1, -1, -1, -1, 69, - 11, 12, 13, 14, -1, -1, 76, 77, 78, 79, - 80, 22, 23, 24, 25, 26, -1, 28, -1, 89, - 90, -1, -1, -1, -1, 95, -1, -1, -1, 99, - -1, -1, -1, -1, -1, 46, -1, 48, 11, 12, - 13, 14, -1, -1, -1, -1, -1, -1, -1, 22, - 23, 24, 25, 26, -1, 28, -1, -1, 69, -1, - -1, -1, -1, -1, -1, 76, 77, 78, 79, 80, - -1, -1, -1, 46, -1, 48, -1, -1, 89, 90, - -1, -1, -1, -1, 95, -1, -1, -1, 99, -1, - -1, -1, -1, -1, -1, -1, 69, 11, 12, 13, - 14, -1, -1, 76, 77, 78, 79, 80, 22, 23, - 24, 25, 26, -1, 28, -1, 89, 90, -1, -1, - -1, -1, 95, -1, -1, -1, 99, -1, -1, -1, - -1, -1, 46, -1, 48, -1, -1, -1, -1, -1, + -1, -1, 27, 28, -1, 30, -1, 32, -1, -1, + -1, 36, -1, 38, 39, 40, -1, -1, -1, -1, + -1, -1, -1, 48, 49, 50, -1, -1, 53, -1, + -1, -1, -1, -1, 59, 60, -1, 62, -1, -1, + -1, -1, -1, -1, -1, -1, 71, -1, -1, -1, + -1, -1, -1, 78, 79, 80, 81, 82, -1, -1, + 85, 86, -1, 88, -1, -1, 91, 92, -1, -1, + -1, 96, 97, -1, -1, -1, 101, 11, 12, 13, + 14, -1, 16, 17, 18, 19, 20, -1, 22, 23, + 24, -1, -1, 27, 28, -1, 30, -1, 32, -1, + -1, -1, 36, -1, 38, 39, 40, -1, -1, -1, + -1, -1, -1, -1, 48, 49, 50, -1, -1, 53, + -1, -1, -1, -1, -1, 59, 60, -1, 62, -1, + -1, -1, -1, -1, -1, -1, -1, 71, -1, -1, + -1, -1, -1, -1, 78, 79, 80, 81, 82, -1, + -1, 85, 86, -1, 88, -1, -1, 91, 92, -1, + -1, -1, -1, 97, -1, -1, -1, 101, 11, 12, + 13, 14, -1, 16, 17, 18, 19, 20, -1, 22, + 23, 24, -1, -1, 27, 28, -1, 30, -1, 32, + -1, -1, -1, 36, -1, 38, 39, -1, -1, -1, + 69, 70, -1, 72, -1, 48, 75, 50, -1, -1, + -1, -1, -1, -1, -1, -1, 59, 60, -1, 62, + -1, -1, 91, 92, 93, 94, -1, -1, 71, -1, + 99, 100, -1, -1, -1, 78, 79, 80, 81, 82, + -1, -1, -1, 86, -1, 88, -1, -1, 91, 92, + 11, 12, 13, 14, 97, -1, -1, -1, 101, -1, + -1, 22, 23, 24, -1, -1, 27, 28, -1, 30, + -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, + -1, 42, -1, 44, 45, 46, 47, 48, -1, 50, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 69, -1, -1, -1, -1, - 39, -1, 76, 77, 78, 79, 80, -1, -1, -1, - -1, -1, -1, -1, -1, 89, 90, -1, -1, -1, - -1, 95, 61, 62, -1, 99, -1, 66, 67, 68, - -1, 70, 71, 72, 73, 74, 75, -1, 44, -1, - -1, -1, -1, -1, 50, -1, -1, -1, -1, 88, - 89, 90, 91, 92, -1, 61, 62, -1, 97, 98, - 66, 67, 68, -1, 70, -1, -1, 73, 74, 75, - -1, 44, -1, -1, -1, -1, -1, 50, -1, -1, - -1, -1, 88, 89, 90, 91, 92, -1, 61, 62, - -1, 97, 98, 66, 67, 68, -1, 70, -1, -1, - 73, 74, 75, -1, 44, -1, -1, -1, -1, -1, - 50, -1, -1, -1, -1, 88, 89, 90, 91, 92, - -1, 61, 62, -1, 97, 98, 66, 67, 68, -1, - 70, -1, -1, 73, 74, 75, -1, 44, -1, -1, - -1, -1, -1, 50, -1, -1, -1, -1, 88, 89, - 90, 91, 92, -1, 61, 62, -1, 97, 98, 66, - 67, 68, -1, 70, -1, -1, 73, 74, 75, -1, - 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 88, 89, 90, 91, 92, -1, 61, 62, -1, - 97, 98, 66, 67, 68, -1, 70, -1, -1, 73, - 74, 75, -1, 44, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 88, 89, 90, 91, 92, -1, - 61, 62, -1, 97, 98, 66, 67, 68, -1, 70, - -1, -1, 73, 74, 75, -1, 44, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 88, 89, 90, - 91, 92, -1, 61, 62, -1, 97, 98, 66, 67, - 68, -1, 70, -1, -1, 73, 74, 75, -1, 44, + 71, -1, -1, -1, -1, -1, -1, 78, 79, 80, + 81, 82, 11, 12, 13, 14, -1, -1, -1, -1, + 91, 92, -1, 22, 23, 24, 97, -1, 27, 28, + 101, 30, -1, -1, -1, -1, -1, -1, 37, -1, + -1, -1, -1, -1, -1, 44, -1, 46, -1, 48, + -1, 50, 11, 12, 13, 14, -1, -1, -1, -1, + -1, -1, 61, 22, 23, 24, -1, -1, 27, 28, + -1, 30, 71, -1, -1, -1, -1, -1, -1, 78, + 79, 80, 81, 82, -1, -1, -1, -1, -1, 48, + -1, 50, 91, 92, -1, -1, -1, -1, 97, -1, + -1, -1, 101, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 71, -1, -1, -1, -1, -1, -1, 78, + 79, 80, 81, 82, 11, 12, 13, 14, -1, -1, + -1, -1, 91, 92, -1, 22, 23, 24, 97, -1, + 27, 28, 101, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 88, 89, 90, 91, 92, -1, 61, 62, -1, 97, - 98, 66, 67, 68, -1, 70, -1, -1, 73, 74, - 75, -1, -1, -1, -1, -1, -1, -1, 50, -1, - -1, -1, -1, 88, 89, 90, 91, 92, -1, 61, - 62, -1, 97, 98, 66, 67, 68, -1, 70, -1, - -1, 73, 74, 75, -1, -1, -1, -1, -1, -1, - -1, -1, 50, -1, -1, -1, 88, 89, 90, 91, - 92, -1, 94, 61, 62, 97, 98, -1, 66, 67, - 68, -1, 70, -1, -1, 73, 74, 75, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 52, -1, 87, - 88, 89, 90, 91, 92, -1, 61, 62, -1, 97, - 98, 66, 67, 68, -1, 70, -1, -1, 73, 74, - 75, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 88, 89, 90, 91, 92, -1, 61, - 62, -1, 97, 98, 66, 67, 68, -1, 70, -1, - -1, 73, 74, 75, -1, -1, -1, -1, -1, 81, - 82, -1, -1, -1, -1, -1, 88, 89, 90, 91, - 92, -1, 61, 62, -1, 97, 98, 66, 67, 68, - -1, 70, -1, -1, 73, 74, 75, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 87, 88, - 89, 90, 91, 92, -1, 61, 62, 96, 97, 98, - 66, 67, 68, -1, 70, -1, -1, 73, 74, 75, + -1, 48, -1, 50, 11, 12, 13, 14, -1, -1, + -1, -1, -1, -1, -1, 22, 23, 24, -1, -1, + 27, 28, -1, 30, 71, -1, -1, -1, -1, -1, + -1, 78, 79, 80, 81, 82, -1, -1, -1, -1, + -1, 48, -1, 50, 91, 92, -1, -1, -1, -1, + 97, -1, -1, -1, 101, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 71, -1, -1, -1, -1, -1, + -1, 78, 79, 80, 81, 82, 11, 12, 13, 14, + -1, -1, -1, -1, 91, 92, -1, 22, 23, 24, + 97, -1, 27, 28, 101, 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 88, 89, 90, 91, 92, -1, 61, 62, - 96, 97, 98, 66, 67, 68, -1, 70, -1, -1, - 73, 74, 75, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 87, 88, 89, 90, 91, 92, - -1, 61, 62, -1, 97, 98, 66, 67, 68, -1, - 70, -1, -1, 73, 74, 75, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 88, 89, - 90, 91, 92, -1, -1, -1, -1, 97, 98 + -1, -1, -1, 48, -1, 50, 11, 12, 13, 14, + -1, -1, -1, -1, -1, -1, -1, 22, 23, 24, + -1, -1, 27, 28, -1, 30, 71, -1, -1, -1, + -1, -1, -1, 78, 79, 80, 81, 82, -1, -1, + -1, -1, -1, 48, -1, 50, 91, 92, -1, -1, + -1, -1, 97, -1, -1, -1, 101, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 71, -1, -1, -1, + -1, 41, -1, 78, 79, 80, 81, 82, -1, -1, + -1, -1, -1, -1, -1, -1, 91, 92, -1, -1, + -1, -1, 97, 63, 64, -1, 101, -1, 68, 69, + 70, -1, 72, 73, 74, 75, 76, 77, -1, 46, + -1, -1, -1, -1, -1, 52, -1, -1, -1, -1, + 90, 91, 92, 93, 94, -1, 63, 64, -1, 99, + 100, 68, 69, 70, -1, 72, -1, -1, 75, 76, + 77, -1, 46, -1, -1, -1, -1, -1, 52, -1, + -1, -1, -1, 90, 91, 92, 93, 94, -1, 63, + 64, -1, 99, 100, 68, 69, 70, -1, 72, -1, + -1, 75, 76, 77, -1, 46, -1, -1, -1, -1, + -1, 52, -1, -1, -1, -1, 90, 91, 92, 93, + 94, -1, 63, 64, -1, 99, 100, 68, 69, 70, + -1, 72, -1, -1, 75, 76, 77, -1, 46, -1, + -1, -1, -1, -1, 52, -1, -1, -1, -1, 90, + 91, 92, 93, 94, -1, 63, 64, -1, 99, 100, + 68, 69, 70, -1, 72, -1, -1, 75, 76, 77, + -1, 46, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 90, 91, 92, 93, 94, -1, 63, 64, + -1, 99, 100, 68, 69, 70, -1, 72, -1, -1, + 75, 76, 77, -1, 46, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 90, 91, 92, 93, 94, + -1, 63, 64, -1, 99, 100, 68, 69, 70, -1, + 72, -1, -1, 75, 76, 77, -1, 46, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 90, 91, + 92, 93, 94, -1, 63, 64, -1, 99, 100, 68, + 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, + 46, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 90, 91, 92, 93, 94, -1, 63, 64, -1, + 99, 100, 68, 69, 70, -1, 72, -1, -1, 75, + 76, 77, -1, -1, -1, -1, -1, -1, -1, 52, + -1, -1, -1, -1, 90, 91, 92, 93, 94, -1, + 63, 64, -1, 99, 100, 68, 69, 70, -1, 72, + -1, -1, 75, 76, 77, -1, -1, -1, -1, -1, + -1, -1, -1, 52, -1, -1, -1, 90, 91, 92, + 93, 94, -1, 96, 63, 64, 99, 100, -1, 68, + 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 54, -1, + 89, 90, 91, 92, 93, 94, -1, 63, 64, -1, + 99, 100, 68, 69, 70, -1, 72, -1, -1, 75, + 76, 77, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 90, 91, 92, 93, 94, -1, + 63, 64, -1, 99, 100, 68, 69, 70, -1, 72, + -1, -1, 75, 76, 77, -1, -1, -1, -1, -1, + 83, 84, -1, -1, -1, -1, -1, 90, 91, 92, + 93, 94, -1, 63, 64, -1, 99, 100, 68, 69, + 70, -1, 72, -1, -1, 75, 76, 77, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 89, + 90, 91, 92, 93, 94, -1, 63, 64, 98, 99, + 100, 68, 69, 70, -1, 72, -1, -1, 75, 76, + 77, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 90, 91, 92, 93, 94, -1, 63, + 64, 98, 99, 100, 68, 69, 70, -1, 72, -1, + -1, 75, 76, 77, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 89, 90, 91, 92, 93, + 94, -1, 63, 64, -1, 99, 100, 68, 69, 70, + -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 90, + 91, 92, 93, 94, -1, -1, -1, -1, 99, 100 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1285,41 +1303,41 @@ static const yytype_int16 yycheck[] = static const yytype_uint8 yystos[] = { 0, 1, 11, 12, 13, 14, 16, 17, 18, 19, - 20, 22, 23, 24, 25, 26, 28, 30, 34, 36, - 37, 38, 41, 46, 47, 48, 51, 55, 56, 57, - 58, 60, 69, 76, 77, 78, 79, 80, 83, 84, - 85, 86, 89, 90, 95, 99, 103, 105, 106, 107, - 108, 109, 116, 117, 118, 123, 124, 125, 126, 130, - 133, 135, 142, 94, 104, 25, 46, 125, 125, 125, - 95, 125, 144, 25, 125, 95, 144, 95, 144, 134, - 47, 25, 127, 35, 40, 42, 43, 44, 45, 125, - 131, 132, 25, 125, 52, 53, 12, 13, 25, 25, - 25, 25, 125, 59, 131, 132, 25, 129, 125, 125, - 125, 125, 125, 125, 25, 128, 25, 95, 125, 125, - 125, 125, 143, 0, 104, 95, 87, 95, 115, 125, - 107, 125, 61, 62, 66, 67, 68, 70, 73, 74, - 75, 88, 89, 90, 91, 92, 97, 98, 95, 125, - 125, 144, 101, 143, 144, 125, 143, 143, 101, 125, - 125, 42, 132, 136, 39, 71, 72, 25, 50, 87, - 125, 50, 87, 49, 137, 52, 132, 101, 44, 50, - 44, 50, 44, 50, 44, 50, 81, 82, 101, 138, - 25, 96, 100, 101, 105, 115, 125, 115, 125, 49, - 87, 121, 50, 104, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 96, 125, 96, 96, 25, 125, 120, 25, 125, 125, - 125, 125, 50, 87, 125, 125, 120, 125, 25, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 25, - 120, 96, 101, 125, 96, 121, 96, 104, 120, 125, - 125, 122, 25, 140, 125, 125, 140, 44, 44, 44, - 44, 139, 143, 122, 31, 50, 122, 107, 104, 108, - 121, 101, 104, 104, 125, 125, 125, 125, 140, 96, - 121, 50, 125, 121, 121, 29, 25, 101, 141, 141, - 104, 29, 125, 121, 29, 54, 120, 33, 54, 112, - 113, 119, 25, 122, 122, 141, 121, 122, 122, 111, - 112, 114, 119, 120, 113, 121, 115, 122, 122, 121, - 121, 114, 121, 115, 107, 54, 110, 49, 29, 121, - 29, 29, 29, 49, 121, 120, 121, 120, 29, 120, - 107, 108, 122, 121, 121 + 20, 22, 23, 24, 27, 28, 30, 32, 36, 38, + 39, 40, 43, 48, 49, 50, 53, 57, 58, 59, + 60, 62, 71, 78, 79, 80, 81, 82, 85, 86, + 87, 88, 91, 92, 97, 101, 105, 107, 108, 109, + 110, 111, 118, 119, 120, 125, 126, 127, 129, 133, + 136, 138, 145, 96, 106, 27, 48, 127, 127, 127, + 97, 127, 147, 27, 127, 97, 147, 97, 147, 137, + 49, 27, 130, 37, 42, 44, 45, 46, 47, 127, + 134, 135, 27, 127, 54, 55, 12, 13, 27, 27, + 27, 27, 127, 61, 134, 135, 27, 132, 127, 127, + 127, 127, 127, 127, 27, 131, 27, 97, 127, 127, + 127, 127, 146, 0, 106, 97, 89, 97, 117, 127, + 109, 127, 63, 64, 68, 69, 70, 72, 75, 76, + 77, 90, 91, 92, 93, 94, 99, 100, 97, 127, + 127, 147, 103, 146, 147, 127, 146, 146, 103, 127, + 127, 44, 135, 139, 41, 73, 74, 27, 52, 89, + 127, 52, 89, 51, 140, 54, 135, 103, 46, 52, + 46, 52, 46, 52, 46, 52, 83, 84, 103, 141, + 27, 98, 102, 103, 107, 117, 127, 117, 127, 51, + 89, 123, 52, 106, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 98, 127, 98, 98, 27, 127, 122, 26, 27, 128, + 127, 127, 127, 127, 52, 89, 127, 127, 122, 127, + 27, 127, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 27, 122, 98, 103, 127, 98, 123, 98, 106, + 122, 127, 127, 124, 27, 143, 127, 127, 127, 143, + 46, 46, 46, 46, 142, 146, 124, 33, 52, 124, + 109, 106, 110, 123, 103, 106, 106, 127, 127, 127, + 127, 143, 98, 123, 52, 127, 123, 123, 31, 27, + 103, 144, 144, 106, 31, 127, 123, 31, 56, 122, + 35, 56, 114, 115, 121, 27, 124, 124, 144, 123, + 124, 124, 113, 114, 116, 121, 122, 115, 123, 117, + 124, 124, 123, 123, 116, 123, 117, 109, 56, 112, + 51, 31, 123, 31, 31, 31, 51, 123, 122, 123, + 122, 31, 122, 109, 110, 124, 123, 123 }; #define yyerrok (yyerrstatus = 0) @@ -2158,16 +2176,23 @@ yyreduce: case 11: #line 140 "engines/director/lingo/lingo-gr.y" - { (yyval.code) = g_lingo->code1(g_lingo->c_after); ;} + { + g_lingo->code1(g_lingo->c_assign); + (yyval.code) = (yyvsp[(2) - (4)].code); ;} break; case 12: -#line 141 "engines/director/lingo/lingo-gr.y" - { (yyval.code) = g_lingo->code1(g_lingo->c_before); ;} +#line 143 "engines/director/lingo/lingo-gr.y" + { (yyval.code) = g_lingo->code1(g_lingo->c_after); ;} break; case 13: -#line 142 "engines/director/lingo/lingo-gr.y" +#line 144 "engines/director/lingo/lingo-gr.y" + { (yyval.code) = g_lingo->code1(g_lingo->c_before); ;} + break; + + case 14: +#line 145 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); @@ -2176,8 +2201,8 @@ yyreduce: delete (yyvsp[(2) - (4)].s); ;} break; - case 14: -#line 148 "engines/director/lingo/lingo-gr.y" + case 15: +#line 151 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Put dummy id g_lingo->code1(g_lingo->c_theentityassign); @@ -2188,8 +2213,8 @@ yyreduce: (yyval.code) = (yyvsp[(4) - (4)].code); ;} break; - case 15: -#line 156 "engines/director/lingo/lingo-gr.y" + case 16: +#line 159 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_swap); g_lingo->code1(g_lingo->c_theentityassign); @@ -2200,8 +2225,8 @@ yyreduce: (yyval.code) = (yyvsp[(5) - (5)].code); ;} break; - case 16: -#line 164 "engines/director/lingo/lingo-gr.y" + case 17: +#line 167 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_varpush); g_lingo->codeString((yyvsp[(2) - (4)].s)->c_str()); @@ -2210,8 +2235,8 @@ yyreduce: delete (yyvsp[(2) - (4)].s); ;} break; - case 17: -#line 170 "engines/director/lingo/lingo-gr.y" + case 18: +#line 173 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Put dummy id g_lingo->code1(g_lingo->c_theentityassign); @@ -2222,8 +2247,8 @@ yyreduce: (yyval.code) = (yyvsp[(4) - (4)].code); ;} break; - case 18: -#line 178 "engines/director/lingo/lingo-gr.y" + case 19: +#line 181 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_swap); g_lingo->code1(g_lingo->c_theentityassign); @@ -2234,13 +2259,13 @@ yyreduce: (yyval.code) = (yyvsp[(5) - (5)].code); ;} break; - case 19: -#line 188 "engines/director/lingo/lingo-gr.y" + case 20: +#line 191 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_xpop); ;} break; - case 23: -#line 198 "engines/director/lingo/lingo-gr.y" + case 24: +#line 201 "engines/director/lingo/lingo-gr.y" { inst body = 0, end = 0; WRITE_UINT32(&body, (yyvsp[(5) - (7)].code)); @@ -2251,8 +2276,8 @@ yyreduce: checkEnd((yyvsp[(7) - (7)].s), "repeat", true); ;} break; - case 24: -#line 211 "engines/director/lingo/lingo-gr.y" + case 25: +#line 214 "engines/director/lingo/lingo-gr.y" { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, (yyvsp[(3) - (10)].code)); @@ -2269,8 +2294,8 @@ yyreduce: checkEnd((yyvsp[(10) - (10)].s), "repeat", true); ;} break; - case 25: -#line 229 "engines/director/lingo/lingo-gr.y" + case 26: +#line 232 "engines/director/lingo/lingo-gr.y" { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, (yyvsp[(3) - (11)].code)); @@ -2287,8 +2312,8 @@ yyreduce: checkEnd((yyvsp[(11) - (11)].s), "repeat", true); ;} break; - case 26: -#line 243 "engines/director/lingo/lingo-gr.y" + case 27: +#line 246 "engines/director/lingo/lingo-gr.y" { inst end = 0; WRITE_UINT32(&end, (yyvsp[(3) - (3)].code)); @@ -2297,22 +2322,22 @@ yyreduce: ;} break; - case 27: -#line 249 "engines/director/lingo/lingo-gr.y" + case 28: +#line 252 "engines/director/lingo/lingo-gr.y" { warning("STUB: TELL is not implemented"); checkEnd((yyvsp[(6) - (6)].s), "tell", true); ;} break; - case 28: -#line 252 "engines/director/lingo/lingo-gr.y" + case 29: +#line 255 "engines/director/lingo/lingo-gr.y" { warning("STUB: TELL is not implemented"); ;} break; - case 29: -#line 257 "engines/director/lingo/lingo-gr.y" + case 30: +#line 260 "engines/director/lingo/lingo-gr.y" { inst then = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(5) - (7)].code)); @@ -2325,8 +2350,8 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 30: -#line 267 "engines/director/lingo/lingo-gr.y" + case 31: +#line 270 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(5) - (10)].code)); @@ -2341,8 +2366,8 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 31: -#line 279 "engines/director/lingo/lingo-gr.y" + case 32: +#line 282 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(5) - (10)].code)); @@ -2357,8 +2382,8 @@ yyreduce: g_lingo->processIf(0, (yyvsp[(9) - (10)].code)); ;} break; - case 32: -#line 291 "engines/director/lingo/lingo-gr.y" + case 33: +#line 294 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (6)].code)); @@ -2371,8 +2396,8 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 33: -#line 301 "engines/director/lingo/lingo-gr.y" + case 34: +#line 304 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (10)].code)); @@ -2385,8 +2410,8 @@ yyreduce: g_lingo->processIf(0, 0); ;} break; - case 34: -#line 311 "engines/director/lingo/lingo-gr.y" + case 35: +#line 314 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(4) - (10)].code)); @@ -2399,18 +2424,18 @@ yyreduce: g_lingo->processIf(0, (yyvsp[(10) - (10)].code)); ;} break; - case 35: -#line 323 "engines/director/lingo/lingo-gr.y" + case 36: +#line 326 "engines/director/lingo/lingo-gr.y" { (yyval.code) = 0; ;} break; - case 36: -#line 324 "engines/director/lingo/lingo-gr.y" + case 37: +#line 327 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (3)].code); ;} break; - case 41: -#line 335 "engines/director/lingo/lingo-gr.y" + case 42: +#line 338 "engines/director/lingo/lingo-gr.y" { inst then = 0; WRITE_UINT32(&then, (yyvsp[(4) - (6)].code)); @@ -2419,8 +2444,8 @@ yyreduce: g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;} break; - case 43: -#line 344 "engines/director/lingo/lingo-gr.y" + case 44: +#line 347 "engines/director/lingo/lingo-gr.y" { inst then = 0; WRITE_UINT32(&then, (yyvsp[(5) - (6)].code)); @@ -2429,23 +2454,23 @@ yyreduce: g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;} break; - case 44: -#line 352 "engines/director/lingo/lingo-gr.y" + case 45: +#line 355 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(STOP); ;} break; - case 45: -#line 353 "engines/director/lingo/lingo-gr.y" + case 46: +#line 356 "engines/director/lingo/lingo-gr.y" { g_lingo->code2(g_lingo->c_eq, STOP); ;} break; - case 47: -#line 357 "engines/director/lingo/lingo-gr.y" + case 48: +#line 360 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;} break; - case 48: -#line 360 "engines/director/lingo/lingo-gr.y" + case 49: +#line 363 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP); g_lingo->code3(STOP, STOP, STOP); @@ -2453,8 +2478,8 @@ yyreduce: delete (yyvsp[(3) - (3)].s); ;} break; - case 49: -#line 367 "engines/director/lingo/lingo-gr.y" + case 50: +#line 370 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_ifcode); g_lingo->code3(STOP, STOP, STOP); @@ -2462,8 +2487,8 @@ yyreduce: g_lingo->codeLabel(0); ;} break; - case 50: -#line 374 "engines/director/lingo/lingo-gr.y" + case 51: +#line 377 "engines/director/lingo/lingo-gr.y" { inst skipEnd; WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions @@ -2472,23 +2497,23 @@ yyreduce: g_lingo->code1(skipEnd); ;} break; - case 51: -#line 382 "engines/director/lingo/lingo-gr.y" - { (yyval.code) = g_lingo->_currentScript->size(); ;} - break; - case 52: #line 385 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;} + { (yyval.code) = g_lingo->_currentScript->size(); ;} break; case 53: #line 388 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;} + break; + + case 54: +#line 391 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->_currentScript->size(); ;} break; - case 56: -#line 393 "engines/director/lingo/lingo-gr.y" + case 57: +#line 396 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_whencode); g_lingo->code1(STOP); @@ -2496,80 +2521,80 @@ yyreduce: delete (yyvsp[(2) - (3)].s); ;} break; - case 57: -#line 399 "engines/director/lingo/lingo-gr.y" + case 58: +#line 402 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_tellcode); g_lingo->code1(STOP); ;} break; - case 58: -#line 403 "engines/director/lingo/lingo-gr.y" + case 59: +#line 406 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->codeConst((yyvsp[(1) - (1)].i)); ;} break; - case 59: -#line 404 "engines/director/lingo/lingo-gr.y" + case 60: +#line 407 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_fconstpush); g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;} break; - case 60: -#line 407 "engines/director/lingo/lingo-gr.y" + case 61: +#line 410 "engines/director/lingo/lingo-gr.y" { // D3 (yyval.code) = g_lingo->code1(g_lingo->c_symbolpush); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;} break; - case 61: -#line 410 "engines/director/lingo/lingo-gr.y" + case 62: +#line 413 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_stringpush); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); ;} break; - case 62: -#line 413 "engines/director/lingo/lingo-gr.y" + case 63: +#line 416 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0); delete (yyvsp[(1) - (1)].s); ;} break; - case 63: -#line 416 "engines/director/lingo/lingo-gr.y" + case 64: +#line 419 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 64: -#line 419 "engines/director/lingo/lingo-gr.y" + case 65: +#line 422 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; - case 65: -#line 420 "engines/director/lingo/lingo-gr.y" + case 66: +#line 423 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;} break; - case 66: -#line 421 "engines/director/lingo/lingo-gr.y" + case 67: +#line 424 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); delete (yyvsp[(1) - (4)].s); ;} break; - case 67: -#line 424 "engines/director/lingo/lingo-gr.y" + case 68: +#line 427 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_eval); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 68: -#line 428 "engines/director/lingo/lingo-gr.y" + case 69: +#line 431 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->codeConst(0); // Put dummy id g_lingo->code1(g_lingo->c_theentitypush); @@ -2579,8 +2604,8 @@ yyreduce: g_lingo->code2(e, f); ;} break; - case 69: -#line 435 "engines/director/lingo/lingo-gr.y" + case 70: +#line 438 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_theentitypush); inst e = 0, f = 0; @@ -2589,352 +2614,359 @@ yyreduce: g_lingo->code2(e, f); ;} break; - case 71: -#line 442 "engines/director/lingo/lingo-gr.y" + case 72: +#line 445 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_add); ;} break; - case 72: -#line 443 "engines/director/lingo/lingo-gr.y" + case 73: +#line 446 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_sub); ;} break; - case 73: -#line 444 "engines/director/lingo/lingo-gr.y" + case 74: +#line 447 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_mul); ;} break; - case 74: -#line 445 "engines/director/lingo/lingo-gr.y" + case 75: +#line 448 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_div); ;} break; - case 75: -#line 446 "engines/director/lingo/lingo-gr.y" + case 76: +#line 449 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_mod); ;} break; - case 76: -#line 447 "engines/director/lingo/lingo-gr.y" + case 77: +#line 450 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gt); ;} break; - case 77: -#line 448 "engines/director/lingo/lingo-gr.y" + case 78: +#line 451 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lt); ;} break; - case 78: -#line 449 "engines/director/lingo/lingo-gr.y" + case 79: +#line 452 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_neq); ;} break; - case 79: -#line 450 "engines/director/lingo/lingo-gr.y" + case 80: +#line 453 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_ge); ;} break; - case 80: -#line 451 "engines/director/lingo/lingo-gr.y" + case 81: +#line 454 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_le); ;} break; - case 81: -#line 452 "engines/director/lingo/lingo-gr.y" + case 82: +#line 455 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_and); ;} break; - case 82: -#line 453 "engines/director/lingo/lingo-gr.y" + case 83: +#line 456 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_or); ;} break; - case 83: -#line 454 "engines/director/lingo/lingo-gr.y" + case 84: +#line 457 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_not); ;} break; - case 84: -#line 455 "engines/director/lingo/lingo-gr.y" + case 85: +#line 458 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_ampersand); ;} break; - case 85: -#line 456 "engines/director/lingo/lingo-gr.y" + case 86: +#line 459 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_concat); ;} break; - case 86: -#line 457 "engines/director/lingo/lingo-gr.y" + case 87: +#line 460 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_contains); ;} break; - case 87: -#line 458 "engines/director/lingo/lingo-gr.y" + case 88: +#line 461 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_starts); ;} break; - case 88: -#line 459 "engines/director/lingo/lingo-gr.y" + case 89: +#line 462 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (2)].code); ;} break; - case 89: -#line 460 "engines/director/lingo/lingo-gr.y" + case 90: +#line 463 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;} break; - case 90: -#line 461 "engines/director/lingo/lingo-gr.y" + case 91: +#line 464 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (3)].code); ;} break; - case 91: -#line 462 "engines/director/lingo/lingo-gr.y" + case 92: +#line 465 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;} break; - case 92: -#line 463 "engines/director/lingo/lingo-gr.y" + case 93: +#line 466 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intersects); ;} break; - case 93: -#line 464 "engines/director/lingo/lingo-gr.y" + case 94: +#line 467 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_within); ;} break; - case 94: -#line 465 "engines/director/lingo/lingo-gr.y" + case 95: +#line 468 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_charOf); ;} break; - case 95: -#line 466 "engines/director/lingo/lingo-gr.y" + case 96: +#line 469 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_charToOf); ;} break; - case 96: -#line 467 "engines/director/lingo/lingo-gr.y" + case 97: +#line 470 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_itemOf); ;} break; - case 97: -#line 468 "engines/director/lingo/lingo-gr.y" + case 98: +#line 471 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_itemToOf); ;} break; - case 98: -#line 469 "engines/director/lingo/lingo-gr.y" + case 99: +#line 472 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lineOf); ;} break; - case 99: -#line 470 "engines/director/lingo/lingo-gr.y" + case 100: +#line 473 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lineToOf); ;} break; - case 100: -#line 471 "engines/director/lingo/lingo-gr.y" + case 101: +#line 474 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_wordOf); ;} break; - case 101: -#line 472 "engines/director/lingo/lingo-gr.y" + case 102: +#line 475 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_wordToOf); ;} break; - case 102: -#line 475 "engines/director/lingo/lingo-gr.y" + case 103: +#line 478 "engines/director/lingo/lingo-gr.y" + { + g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); + delete (yyvsp[(1) - (2)].s); ;} + break; + + case 104: +#line 483 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_printtop); ;} break; - case 105: -#line 478 "engines/director/lingo/lingo-gr.y" + case 107: +#line 486 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_exitRepeat); ;} break; - case 106: -#line 479 "engines/director/lingo/lingo-gr.y" + case 108: +#line 487 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); ;} break; - case 110: -#line 484 "engines/director/lingo/lingo-gr.y" + case 112: +#line 492 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0); delete (yyvsp[(1) - (1)].s); ;} break; - case 111: -#line 487 "engines/director/lingo/lingo-gr.y" + case 113: +#line 495 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 112: -#line 490 "engines/director/lingo/lingo-gr.y" + case 114: +#line 498 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 113: -#line 493 "engines/director/lingo/lingo-gr.y" + case 115: +#line 501 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_voidpush); g_lingo->codeFunc((yyvsp[(1) - (1)].s), 1); delete (yyvsp[(1) - (1)].s); ;} break; - case 114: -#line 497 "engines/director/lingo/lingo-gr.y" + case 116: +#line 505 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; - case 115: -#line 498 "engines/director/lingo/lingo-gr.y" + case 117: +#line 506 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;} break; - case 116: -#line 499 "engines/director/lingo/lingo-gr.y" + case 118: +#line 507 "engines/director/lingo/lingo-gr.y" { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;} break; - case 117: -#line 500 "engines/director/lingo/lingo-gr.y" + case 119: +#line 508 "engines/director/lingo/lingo-gr.y" { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;} break; - case 118: -#line 501 "engines/director/lingo/lingo-gr.y" + case 120: +#line 509 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_open); ;} break; - case 119: -#line 502 "engines/director/lingo/lingo-gr.y" + case 121: +#line 510 "engines/director/lingo/lingo-gr.y" { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;} break; - case 120: -#line 503 "engines/director/lingo/lingo-gr.y" + case 122: +#line 511 "engines/director/lingo/lingo-gr.y" { Common::String s(*(yyvsp[(1) - (3)].s)); s += '-'; s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;} break; - case 121: -#line 506 "engines/director/lingo/lingo-gr.y" + case 123: +#line 514 "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 122: -#line 507 "engines/director/lingo/lingo-gr.y" + case 124: +#line 515 "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 123: -#line 510 "engines/director/lingo/lingo-gr.y" + case 125: +#line 518 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(1) - (1)].s)->c_str()); delete (yyvsp[(1) - (1)].s); ;} break; - case 124: -#line 511 "engines/director/lingo/lingo-gr.y" + case 126: +#line 519 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_property); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; - case 125: -#line 514 "engines/director/lingo/lingo-gr.y" + case 127: +#line 522 "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 126: -#line 515 "engines/director/lingo/lingo-gr.y" + case 128: +#line 523 "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 127: -#line 526 "engines/director/lingo/lingo-gr.y" + case 129: +#line 534 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoloop); ;} break; - case 128: -#line 527 "engines/director/lingo/lingo-gr.y" + case 130: +#line 535 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotonext); ;} break; - case 129: -#line 528 "engines/director/lingo/lingo-gr.y" + case 131: +#line 536 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoprevious); ;} break; - case 130: -#line 529 "engines/director/lingo/lingo-gr.y" + case 132: +#line 537 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(1); g_lingo->code1(g_lingo->c_goto); ;} break; - case 131: -#line 532 "engines/director/lingo/lingo-gr.y" + case 133: +#line 540 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(3); g_lingo->code1(g_lingo->c_goto); ;} break; - case 132: -#line 535 "engines/director/lingo/lingo-gr.y" + case 134: +#line 543 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(2); g_lingo->code1(g_lingo->c_goto); ;} break; - case 137: -#line 548 "engines/director/lingo/lingo-gr.y" + case 139: +#line 556 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_playdone); ;} break; - case 138: -#line 549 "engines/director/lingo/lingo-gr.y" + case 140: +#line 557 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(1); g_lingo->code1(g_lingo->c_play); ;} break; - case 139: -#line 552 "engines/director/lingo/lingo-gr.y" + case 141: +#line 560 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(3); g_lingo->code1(g_lingo->c_play); ;} break; - case 140: -#line 555 "engines/director/lingo/lingo-gr.y" + case 142: +#line 563 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(2); g_lingo->code1(g_lingo->c_play); ;} break; - case 141: -#line 558 "engines/director/lingo/lingo-gr.y" + case 143: +#line 566 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(true); ;} break; - case 142: -#line 558 "engines/director/lingo/lingo-gr.y" + case 144: +#line 566 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(false); g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;} break; - case 143: -#line 588 "engines/director/lingo/lingo-gr.y" + case 145: +#line 596 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;} break; - case 144: -#line 589 "engines/director/lingo/lingo-gr.y" + case 146: +#line 597 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); @@ -2942,38 +2974,38 @@ yyreduce: g_lingo->_indef = false; ;} break; - case 145: -#line 594 "engines/director/lingo/lingo-gr.y" + case 147: +#line 602 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;} break; - case 146: -#line 597 "engines/director/lingo/lingo-gr.y" + case 148: +#line 605 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; ;} break; - case 147: -#line 598 "engines/director/lingo/lingo-gr.y" + case 149: +#line 606 "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 148: -#line 602 "engines/director/lingo/lingo-gr.y" + case 150: +#line 610 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;} break; - case 149: -#line 603 "engines/director/lingo/lingo-gr.y" + case 151: +#line 611 "engines/director/lingo/lingo-gr.y" { g_lingo->_ignoreMe = true; ;} break; - case 150: -#line 603 "engines/director/lingo/lingo-gr.y" + case 152: +#line 611 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); @@ -2985,33 +3017,33 @@ yyreduce: ;} break; - case 151: -#line 613 "engines/director/lingo/lingo-gr.y" + case 153: +#line 621 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 152: -#line 614 "engines/director/lingo/lingo-gr.y" + case 154: +#line 622 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;} break; - case 153: -#line 615 "engines/director/lingo/lingo-gr.y" + case 155: +#line 623 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; - case 154: -#line 616 "engines/director/lingo/lingo-gr.y" + case 156: +#line 624 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;} break; - case 155: -#line 619 "engines/director/lingo/lingo-gr.y" + case 157: +#line 627 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArgStore(); ;} break; - case 156: -#line 623 "engines/director/lingo/lingo-gr.y" + case 158: +#line 631 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_call); g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str()); @@ -3020,34 +3052,34 @@ yyreduce: g_lingo->code1(numpar); ;} break; - case 157: -#line 631 "engines/director/lingo/lingo-gr.y" + case 159: +#line 639 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 158: -#line 632 "engines/director/lingo/lingo-gr.y" + case 160: +#line 640 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 159: -#line 633 "engines/director/lingo/lingo-gr.y" + case 161: +#line 641 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; - case 160: -#line 636 "engines/director/lingo/lingo-gr.y" + case 162: +#line 644 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 161: -#line 637 "engines/director/lingo/lingo-gr.y" + case 163: +#line 645 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; /* Line 1267 of yacc.c. */ -#line 3051 "engines/director/lingo/lingo-gr.cpp" +#line 3083 "engines/director/lingo/lingo-gr.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3261,6 +3293,6 @@ yyreturn: } -#line 640 "engines/director/lingo/lingo-gr.y" +#line 648 "engines/director/lingo/lingo-gr.y" diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h index 0bd75956d2..054d55a224 100644 --- a/engines/director/lingo/lingo-gr.h +++ b/engines/director/lingo/lingo-gr.h @@ -61,68 +61,70 @@ FBLTINNOARGS = 277, FBLTINONEARG = 278, FBLTINARGLIST = 279, - ID = 280, - STRING = 281, - HANDLER = 282, - SYMBOL = 283, - ENDCLAUSE = 284, - tPLAYACCEL = 285, - tDOWN = 286, - tELSE = 287, - tNLELSIF = 288, - tEXIT = 289, - tFRAME = 290, - tGLOBAL = 291, - tGO = 292, - tIF = 293, - tINTO = 294, - tLOOP = 295, - tMACRO = 296, - tMOVIE = 297, - tNEXT = 298, - tOF = 299, - tPREVIOUS = 300, - tPUT = 301, - tREPEAT = 302, - tSET = 303, - tTHEN = 304, - tTO = 305, - tWHEN = 306, - tWITH = 307, - tWHILE = 308, - tNLELSE = 309, - tFACTORY = 310, - tMETHOD = 311, - tOPEN = 312, - tPLAY = 313, - tDONE = 314, - tINSTANCE = 315, - tGE = 316, - tLE = 317, - tGT = 318, - tLT = 319, - tEQ = 320, - tNEQ = 321, - tAND = 322, - tOR = 323, - tNOT = 324, - tMOD = 325, - tAFTER = 326, - tBEFORE = 327, - tCONCAT = 328, - tCONTAINS = 329, - tSTARTS = 330, - tCHAR = 331, - tITEM = 332, - tLINE = 333, - tWORD = 334, - tSPRITE = 335, - tINTERSECTS = 336, - tWITHIN = 337, - tTELL = 338, - tPROPERTY = 339, - tON = 340, - tME = 341 + RBLTIN = 280, + RBLTINONEARG = 281, + ID = 282, + STRING = 283, + HANDLER = 284, + SYMBOL = 285, + ENDCLAUSE = 286, + tPLAYACCEL = 287, + tDOWN = 288, + tELSE = 289, + tNLELSIF = 290, + tEXIT = 291, + tFRAME = 292, + tGLOBAL = 293, + tGO = 294, + tIF = 295, + tINTO = 296, + tLOOP = 297, + tMACRO = 298, + tMOVIE = 299, + tNEXT = 300, + tOF = 301, + tPREVIOUS = 302, + tPUT = 303, + tREPEAT = 304, + tSET = 305, + tTHEN = 306, + tTO = 307, + tWHEN = 308, + tWITH = 309, + tWHILE = 310, + tNLELSE = 311, + tFACTORY = 312, + tMETHOD = 313, + tOPEN = 314, + tPLAY = 315, + tDONE = 316, + tINSTANCE = 317, + tGE = 318, + tLE = 319, + tGT = 320, + tLT = 321, + tEQ = 322, + tNEQ = 323, + tAND = 324, + tOR = 325, + tNOT = 326, + tMOD = 327, + tAFTER = 328, + tBEFORE = 329, + tCONCAT = 330, + tCONTAINS = 331, + tSTARTS = 332, + tCHAR = 333, + tITEM = 334, + tLINE = 335, + tWORD = 336, + tSPRITE = 337, + tINTERSECTS = 338, + tWITHIN = 339, + tTELL = 340, + tPROPERTY = 341, + tON = 342, + tME = 343 }; #endif /* Tokens. */ @@ -148,68 +150,70 @@ #define FBLTINNOARGS 277 #define FBLTINONEARG 278 #define FBLTINARGLIST 279 -#define ID 280 -#define STRING 281 -#define HANDLER 282 -#define SYMBOL 283 -#define ENDCLAUSE 284 -#define tPLAYACCEL 285 -#define tDOWN 286 -#define tELSE 287 -#define tNLELSIF 288 -#define tEXIT 289 -#define tFRAME 290 -#define tGLOBAL 291 -#define tGO 292 -#define tIF 293 -#define tINTO 294 -#define tLOOP 295 -#define tMACRO 296 -#define tMOVIE 297 -#define tNEXT 298 -#define tOF 299 -#define tPREVIOUS 300 -#define tPUT 301 -#define tREPEAT 302 -#define tSET 303 -#define tTHEN 304 -#define tTO 305 -#define tWHEN 306 -#define tWITH 307 -#define tWHILE 308 -#define tNLELSE 309 -#define tFACTORY 310 -#define tMETHOD 311 -#define tOPEN 312 -#define tPLAY 313 -#define tDONE 314 -#define tINSTANCE 315 -#define tGE 316 -#define tLE 317 -#define tGT 318 -#define tLT 319 -#define tEQ 320 -#define tNEQ 321 -#define tAND 322 -#define tOR 323 -#define tNOT 324 -#define tMOD 325 -#define tAFTER 326 -#define tBEFORE 327 -#define tCONCAT 328 -#define tCONTAINS 329 -#define tSTARTS 330 -#define tCHAR 331 -#define tITEM 332 -#define tLINE 333 -#define tWORD 334 -#define tSPRITE 335 -#define tINTERSECTS 336 -#define tWITHIN 337 -#define tTELL 338 -#define tPROPERTY 339 -#define tON 340 -#define tME 341 +#define RBLTIN 280 +#define RBLTINONEARG 281 +#define ID 282 +#define STRING 283 +#define HANDLER 284 +#define SYMBOL 285 +#define ENDCLAUSE 286 +#define tPLAYACCEL 287 +#define tDOWN 288 +#define tELSE 289 +#define tNLELSIF 290 +#define tEXIT 291 +#define tFRAME 292 +#define tGLOBAL 293 +#define tGO 294 +#define tIF 295 +#define tINTO 296 +#define tLOOP 297 +#define tMACRO 298 +#define tMOVIE 299 +#define tNEXT 300 +#define tOF 301 +#define tPREVIOUS 302 +#define tPUT 303 +#define tREPEAT 304 +#define tSET 305 +#define tTHEN 306 +#define tTO 307 +#define tWHEN 308 +#define tWITH 309 +#define tWHILE 310 +#define tNLELSE 311 +#define tFACTORY 312 +#define tMETHOD 313 +#define tOPEN 314 +#define tPLAY 315 +#define tDONE 316 +#define tINSTANCE 317 +#define tGE 318 +#define tLE 319 +#define tGT 320 +#define tLT 321 +#define tEQ 322 +#define tNEQ 323 +#define tAND 324 +#define tOR 325 +#define tNOT 326 +#define tMOD 327 +#define tAFTER 328 +#define tBEFORE 329 +#define tCONCAT 330 +#define tCONTAINS 331 +#define tSTARTS 332 +#define tCHAR 333 +#define tITEM 334 +#define tLINE 335 +#define tWORD 336 +#define tSPRITE 337 +#define tINTERSECTS 338 +#define tWITHIN 339 +#define tTELL 340 +#define tPROPERTY 341 +#define tON 342 +#define tME 343 @@ -227,7 +231,7 @@ typedef union YYSTYPE Common::Array<double> *arr; } /* Line 1529 of yacc.c. */ -#line 231 "engines/director/lingo/lingo-gr.hpp" +#line 235 "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 1e3c721f08..4bbbbcdf96 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -92,7 +92,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) { %token<e> THEENTITY THEENTITYWITHID %token<f> FLOAT %token<s> BLTIN BLTINNOARGS BLTINNOARGSORONE BLTINONEARG BLTINARGLIST TWOWORDBUILTIN -%token<s> FBLTIN FBLTINNOARGS FBLTINONEARG FBLTINARGLIST +%token<s> FBLTIN FBLTINNOARGS FBLTINONEARG FBLTINARGLIST RBLTIN RBLTINONEARG %token<s> ID STRING HANDLER SYMBOL %token<s> ENDCLAUSE tPLAYACCEL %token tDOWN tELSE tNLELSIF tEXIT tFRAME tGLOBAL tGO tIF tINTO tLOOP tMACRO @@ -137,6 +137,9 @@ asgn: tPUT expr tINTO ID { g_lingo->code1(g_lingo->c_assign); $$ = $2; delete $4; } + | tPUT expr tINTO reference { + g_lingo->code1(g_lingo->c_assign); + $$ = $2; } | tPUT expr tAFTER expr { $$ = g_lingo->code1(g_lingo->c_after); } // D3 | tPUT expr tBEFORE expr { $$ = g_lingo->code1(g_lingo->c_before); } // D3 | tSET ID '=' expr { @@ -472,6 +475,11 @@ expr: INT { $$ = g_lingo->codeConst($1); } | tWORD expr tTO expr tOF expr { g_lingo->code1(g_lingo->c_wordToOf); } ; +reference: RBLTINONEARG expr { + g_lingo->codeFunc($1, 1); + delete $1; } + ; + proc: tPUT expr { g_lingo->code1(g_lingo->c_printtop); } | gotofunc | playfunc diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 54e62948a0..995faf6bd8 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -1504,7 +1504,13 @@ YY_RULE_SETUP if (g_lingo->_builtins.contains(yytext)) { int type = g_lingo->_builtins[yytext]->type; - if ((type == BLTIN || type == FBLTIN) && g_lingo->_builtins[yytext]->parens == false) { + if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) { + if (type == RBLTIN) { + if (g_lingo->_builtins[yytext]->nargs != 1 || g_lingo->_builtins[yytext]->maxArgs != 1) + error("Incorrectly set RBLTIN %s", yytext); + + return RBLTINONEARG; + } if (g_lingo->_builtins[yytext]->nargs == 0) { if (g_lingo->_builtins[yytext]->maxArgs == 0) return type == BLTIN ? BLTINNOARGS : FBLTINNOARGS; @@ -1528,41 +1534,41 @@ YY_RULE_SETUP YY_BREAK case 66: YY_RULE_SETUP -#line 305 "engines/director/lingo/lingo-lex.l" +#line 311 "engines/director/lingo/lingo-lex.l" { count(); yylval.f = atof(yytext); return FLOAT; } YY_BREAK case 67: YY_RULE_SETUP -#line 306 "engines/director/lingo/lingo-lex.l" +#line 312 "engines/director/lingo/lingo-lex.l" { count(); yylval.i = strtol(yytext, NULL, 10); return INT; } YY_BREAK case 68: YY_RULE_SETUP -#line 307 "engines/director/lingo/lingo-lex.l" +#line 313 "engines/director/lingo/lingo-lex.l" { count(); return *yytext; } YY_BREAK case 69: /* rule 69 can match eol */ YY_RULE_SETUP -#line 308 "engines/director/lingo/lingo-lex.l" +#line 314 "engines/director/lingo/lingo-lex.l" { return '\n'; } YY_BREAK case 70: YY_RULE_SETUP -#line 309 "engines/director/lingo/lingo-lex.l" +#line 315 "engines/director/lingo/lingo-lex.l" { count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; } YY_BREAK case 71: YY_RULE_SETUP -#line 310 "engines/director/lingo/lingo-lex.l" +#line 316 "engines/director/lingo/lingo-lex.l" { count(); } YY_BREAK case 72: YY_RULE_SETUP -#line 312 "engines/director/lingo/lingo-lex.l" +#line 318 "engines/director/lingo/lingo-lex.l" ECHO; YY_BREAK -#line 1566 "engines/director/lingo/lingo-lex.cpp" +#line 1572 "engines/director/lingo/lingo-lex.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2525,7 +2531,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 312 "engines/director/lingo/lingo-lex.l" +#line 318 "engines/director/lingo/lingo-lex.l" diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l index b69e3d0328..0f6dd5894f 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -281,7 +281,13 @@ whitespace [\t ] if (g_lingo->_builtins.contains(yytext)) { int type = g_lingo->_builtins[yytext]->type; - if ((type == BLTIN || type == FBLTIN) && g_lingo->_builtins[yytext]->parens == false) { + if ((type == BLTIN || type == FBLTIN || type == RBLTIN) && g_lingo->_builtins[yytext]->parens == false) { + if (type == RBLTIN) { + if (g_lingo->_builtins[yytext]->nargs != 1 || g_lingo->_builtins[yytext]->maxArgs != 1) + error("Incorrectly set RBLTIN %s", yytext); + + return RBLTINONEARG; + } if (g_lingo->_builtins[yytext]->nargs == 0) { if (g_lingo->_builtins[yytext]->maxArgs == 0) return type == BLTIN ? BLTINNOARGS : FBLTINNOARGS; |