From e71ebaae8fa8697bc2072689f68c4dd26061913d Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 24 Dec 2019 15:32:14 +0100 Subject: DIRECTOR: LINGO: onle line statement can contain one line ifs --- engines/director/lingo/lingo-gr.cpp | 1485 ++++++++++++++++++----------------- engines/director/lingo/lingo-gr.y | 25 +- 2 files changed, 785 insertions(+), 725 deletions(-) (limited to 'engines/director/lingo') diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index a422ff53c0..4bae8c15e0 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -542,18 +542,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 124 +#define YYFINAL 125 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1504 +#define YYLAST 1520 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 106 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 39 +#define YYNNTS 40 /* YYNRULES -- Number of rules. */ -#define YYNRULES 152 +#define YYNRULES 155 /* YYNRULES -- Number of states. */ -#define YYNSTATES 323 +#define YYNSTATES 336 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -609,82 +609,84 @@ static const yytype_uint16 yyprhs[] = { 0, 0, 3, 7, 9, 12, 13, 15, 17, 22, 27, 32, 37, 42, 47, 52, 57, 63, 69, 71, - 73, 75, 77, 79, 86, 97, 109, 113, 120, 125, - 135, 148, 149, 152, 159, 162, 166, 168, 170, 171, - 172, 173, 176, 179, 183, 185, 187, 189, 191, 193, - 195, 197, 199, 201, 204, 207, 212, 214, 217, 219, - 223, 227, 231, 235, 239, 243, 247, 251, 255, 259, - 263, 267, 271, 274, 278, 282, 286, 290, 293, 296, - 300, 304, 309, 314, 319, 326, 331, 338, 343, 350, - 355, 362, 367, 374, 376, 379, 382, 384, 386, 389, - 391, 394, 397, 400, 402, 405, 408, 410, 413, 418, - 421, 425, 427, 431, 433, 437, 439, 443, 446, 449, - 452, 455, 459, 462, 466, 469, 472, 475, 479, 482, - 483, 487, 488, 497, 500, 501, 509, 518, 525, 528, - 529, 531, 535, 540, 541, 543, 547, 548, 551, 552, - 554, 558, 560 + 73, 75, 77, 79, 81, 88, 99, 111, 115, 122, + 127, 137, 150, 151, 154, 161, 173, 181, 184, 188, + 190, 192, 193, 194, 195, 198, 201, 205, 207, 209, + 211, 213, 215, 217, 219, 221, 223, 226, 229, 234, + 236, 239, 241, 245, 249, 253, 257, 261, 265, 269, + 273, 277, 281, 285, 289, 293, 296, 300, 304, 308, + 312, 315, 318, 322, 326, 331, 336, 341, 348, 353, + 360, 365, 372, 377, 384, 389, 396, 398, 401, 404, + 406, 408, 411, 413, 416, 419, 422, 424, 427, 430, + 432, 435, 440, 443, 447, 449, 453, 455, 459, 461, + 465, 468, 471, 474, 477, 481, 484, 488, 491, 494, + 497, 501, 504, 505, 509, 510, 519, 522, 523, 531, + 540, 547, 550, 551, 553, 557, 562, 563, 565, 569, + 570, 573, 574, 576, 580, 582 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { 107, 0, -1, 107, 100, 108, -1, 108, -1, 1, - 100, -1, -1, 135, -1, 111, -1, 51, 125, 44, - 30, -1, 51, 125, 44, 126, -1, 51, 125, 73, - 125, -1, 51, 125, 74, 125, -1, 53, 30, 67, - 125, -1, 53, 15, 67, 125, -1, 53, 30, 55, - 125, -1, 53, 15, 55, 125, -1, 53, 16, 125, - 55, 125, -1, 53, 16, 124, 67, 125, -1, 142, - -1, 125, -1, 127, -1, 110, -1, 112, -1, 115, - 125, 120, 121, 120, 90, -1, 116, 67, 125, 120, - 55, 125, 120, 121, 120, 90, -1, 116, 67, 125, - 120, 37, 55, 125, 120, 121, 120, 90, -1, 122, - 110, 120, -1, 123, 125, 100, 121, 120, 91, -1, - 123, 125, 55, 125, -1, 117, 125, 120, 54, 121, - 120, 113, 120, 89, -1, 117, 125, 120, 54, 121, - 120, 113, 38, 119, 121, 120, 89, -1, -1, 114, - 113, -1, 118, 125, 120, 54, 121, 120, -1, 52, - 58, -1, 52, 57, 30, -1, 43, -1, 39, -1, - -1, -1, -1, 121, 100, -1, 121, 111, -1, 56, - 30, 54, -1, 85, -1, 12, -1, 17, -1, 33, - -1, 31, -1, 30, -1, 124, -1, 126, -1, 25, - -1, 26, 125, -1, 27, 144, -1, 30, 101, 143, - 102, -1, 15, -1, 16, 125, -1, 109, -1, 125, - 95, 125, -1, 125, 96, 125, -1, 125, 97, 125, - -1, 125, 98, 125, -1, 125, 72, 125, -1, 125, - 93, 125, -1, 125, 92, 125, -1, 125, 67, 125, - -1, 125, 68, 125, -1, 125, 65, 125, -1, 125, - 66, 125, -1, 125, 69, 125, -1, 125, 70, 125, - -1, 71, 125, -1, 125, 94, 125, -1, 125, 75, - 125, -1, 125, 76, 125, -1, 125, 77, 125, -1, - 95, 125, -1, 96, 125, -1, 101, 125, 102, -1, - 103, 143, 104, -1, 82, 125, 83, 125, -1, 82, - 125, 84, 125, -1, 78, 125, 49, 125, -1, 78, - 125, 55, 125, 49, 125, -1, 79, 125, 49, 125, - -1, 79, 125, 55, 125, 49, 125, -1, 80, 125, - 49, 125, -1, 80, 125, 55, 125, 49, 125, -1, - 81, 125, 49, 125, -1, 81, 125, 55, 125, 49, - 125, -1, 88, 101, 30, 102, -1, 88, 101, 30, - 105, 143, 102, -1, 88, -1, 29, 124, -1, 51, - 125, -1, 131, -1, 133, -1, 40, 52, -1, 40, - -1, 41, 128, -1, 86, 129, -1, 64, 130, -1, - 19, -1, 21, 125, -1, 20, 125, -1, 20, -1, - 22, 144, -1, 61, 125, 57, 125, -1, 61, 125, - -1, 23, 30, 143, -1, 30, -1, 128, 105, 30, - -1, 30, -1, 129, 105, 30, -1, 30, -1, 130, - 105, 30, -1, 42, 45, -1, 42, 48, -1, 42, - 50, -1, 42, 125, -1, 42, 125, 132, -1, 42, - 132, -1, 49, 47, 125, -1, 47, 125, -1, 62, - 63, -1, 62, 125, -1, 62, 125, 132, -1, 62, - 132, -1, -1, 35, 134, 143, -1, -1, 46, 30, - 136, 119, 139, 100, 141, 121, -1, 60, 30, -1, - -1, 36, 137, 119, 139, 100, 141, 121, -1, 138, - 119, 139, 100, 141, 121, 34, 140, -1, 138, 119, - 139, 100, 141, 121, -1, 87, 30, -1, -1, 30, - -1, 139, 105, 30, -1, 139, 100, 105, 30, -1, - -1, 30, -1, 140, 105, 30, -1, -1, 30, 144, - -1, -1, 125, -1, 143, 105, 125, -1, 125, -1, - 144, 105, 125, -1 + 100, -1, -1, 136, -1, 111, -1, 51, 126, 44, + 30, -1, 51, 126, 44, 127, -1, 51, 126, 73, + 126, -1, 51, 126, 74, 126, -1, 53, 30, 67, + 126, -1, 53, 15, 67, 126, -1, 53, 30, 55, + 126, -1, 53, 15, 55, 126, -1, 53, 16, 126, + 55, 126, -1, 53, 16, 125, 67, 126, -1, 143, + -1, 126, -1, 128, -1, 115, -1, 110, -1, 112, + -1, 116, 126, 121, 122, 121, 90, -1, 117, 67, + 126, 121, 55, 126, 121, 122, 121, 90, -1, 117, + 67, 126, 121, 37, 55, 126, 121, 122, 121, 90, + -1, 123, 110, 121, -1, 124, 126, 100, 122, 121, + 91, -1, 124, 126, 55, 126, -1, 118, 126, 121, + 54, 122, 121, 113, 121, 89, -1, 118, 126, 121, + 54, 122, 121, 113, 38, 120, 122, 121, 89, -1, + -1, 114, 113, -1, 119, 126, 121, 54, 122, 121, + -1, 118, 126, 121, 54, 110, 121, 38, 120, 110, + 121, 89, -1, 118, 126, 121, 54, 110, 121, 89, + -1, 52, 58, -1, 52, 57, 30, -1, 43, -1, + 39, -1, -1, -1, -1, 122, 100, -1, 122, 111, + -1, 56, 30, 54, -1, 85, -1, 12, -1, 17, + -1, 33, -1, 31, -1, 30, -1, 125, -1, 127, + -1, 25, -1, 26, 126, -1, 27, 145, -1, 30, + 101, 144, 102, -1, 15, -1, 16, 126, -1, 109, + -1, 126, 95, 126, -1, 126, 96, 126, -1, 126, + 97, 126, -1, 126, 98, 126, -1, 126, 72, 126, + -1, 126, 93, 126, -1, 126, 92, 126, -1, 126, + 67, 126, -1, 126, 68, 126, -1, 126, 65, 126, + -1, 126, 66, 126, -1, 126, 69, 126, -1, 126, + 70, 126, -1, 71, 126, -1, 126, 94, 126, -1, + 126, 75, 126, -1, 126, 76, 126, -1, 126, 77, + 126, -1, 95, 126, -1, 96, 126, -1, 101, 126, + 102, -1, 103, 144, 104, -1, 82, 126, 83, 126, + -1, 82, 126, 84, 126, -1, 78, 126, 49, 126, + -1, 78, 126, 55, 126, 49, 126, -1, 79, 126, + 49, 126, -1, 79, 126, 55, 126, 49, 126, -1, + 80, 126, 49, 126, -1, 80, 126, 55, 126, 49, + 126, -1, 81, 126, 49, 126, -1, 81, 126, 55, + 126, 49, 126, -1, 88, 101, 30, 102, -1, 88, + 101, 30, 105, 144, 102, -1, 88, -1, 29, 125, + -1, 51, 126, -1, 132, -1, 134, -1, 40, 52, + -1, 40, -1, 41, 129, -1, 86, 130, -1, 64, + 131, -1, 19, -1, 21, 126, -1, 20, 126, -1, + 20, -1, 22, 145, -1, 61, 126, 57, 126, -1, + 61, 126, -1, 23, 30, 144, -1, 30, -1, 129, + 105, 30, -1, 30, -1, 130, 105, 30, -1, 30, + -1, 131, 105, 30, -1, 42, 45, -1, 42, 48, + -1, 42, 50, -1, 42, 126, -1, 42, 126, 133, + -1, 42, 133, -1, 49, 47, 126, -1, 47, 126, + -1, 62, 63, -1, 62, 126, -1, 62, 126, 133, + -1, 62, 133, -1, -1, 35, 135, 144, -1, -1, + 46, 30, 137, 120, 140, 100, 142, 122, -1, 60, + 30, -1, -1, 36, 138, 120, 140, 100, 142, 122, + -1, 139, 120, 140, 100, 142, 122, 34, 141, -1, + 139, 120, 140, 100, 142, 122, -1, 87, 30, -1, + -1, 30, -1, 140, 105, 30, -1, 140, 100, 105, + 30, -1, -1, 30, -1, 141, 105, 30, -1, -1, + 30, 145, -1, -1, 126, -1, 144, 105, 126, -1, + 126, -1, 145, 105, 126, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -692,20 +694,20 @@ static const yytype_uint16 yyrline[] = { 0, 125, 125, 126, 127, 130, 131, 132, 135, 141, 144, 145, 146, 152, 159, 165, 172, 178, 186, 187, - 188, 191, 192, 197, 208, 225, 237, 242, 244, 249, - 259, 271, 272, 275, 283, 286, 293, 300, 308, 311, - 314, 315, 316, 319, 325, 329, 332, 335, 338, 341, - 347, 348, 349, 352, 355, 356, 359, 367, 373, 374, - 375, 376, 377, 378, 379, 380, 381, 382, 383, 384, - 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, - 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, - 405, 406, 407, 408, 411, 416, 417, 418, 419, 420, - 421, 422, 423, 424, 427, 430, 433, 437, 438, 439, - 440, 443, 444, 447, 448, 451, 452, 463, 464, 465, - 466, 470, 474, 480, 481, 484, 485, 489, 493, 497, - 497, 527, 527, 533, 534, 534, 540, 548, 555, 557, - 558, 559, 560, 563, 564, 565, 568, 572, 580, 581, - 582, 585, 586 + 188, 189, 192, 193, 198, 209, 226, 238, 243, 245, + 250, 260, 272, 273, 276, 284, 294, 307, 310, 317, + 324, 332, 335, 338, 339, 340, 343, 349, 353, 356, + 359, 362, 365, 371, 372, 373, 376, 379, 380, 383, + 391, 397, 398, 399, 400, 401, 402, 403, 404, 405, + 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, + 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, + 426, 427, 428, 429, 430, 431, 432, 435, 440, 441, + 442, 443, 444, 445, 446, 447, 448, 451, 454, 457, + 461, 462, 463, 464, 467, 468, 471, 472, 475, 476, + 487, 488, 489, 490, 494, 498, 504, 505, 508, 509, + 513, 517, 521, 521, 551, 551, 557, 558, 558, 564, + 572, 579, 581, 582, 583, 584, 587, 588, 589, 592, + 595, 603, 604, 605, 608, 609 }; #endif @@ -731,9 +733,9 @@ static const char *const yytname[] = "tENDREPEAT", "tENDTELL", "'<'", "'>'", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'", "'\\n'", "'('", "')'", "'['", "']'", "','", "$accept", "program", "programline", "asgn", "stmtoneliner", "stmt", "ifstmt", - "elseifstmtlist", "elseifstmt", "repeatwhile", "repeatwith", "if", - "elseif", "begin", "end", "stmtlist", "when", "tell", "simpleexpr", - "expr", "reference", "proc", "globallist", "propertylist", + "elseifstmtlist", "elseifstmt", "ifoneliner", "repeatwhile", + "repeatwith", "if", "elseif", "begin", "end", "stmtlist", "when", "tell", + "simpleexpr", "expr", "reference", "proc", "globallist", "propertylist", "instancelist", "gotofunc", "gotomovie", "playfunc", "@1", "defn", "@2", "@3", "on", "argdef", "endargdef", "argstore", "macro", "arglist", "nonemptyarglist", 0 @@ -764,20 +766,20 @@ static const yytype_uint8 yyr1[] = { 0, 106, 107, 107, 107, 108, 108, 108, 109, 109, 109, 109, 109, 109, 109, 109, 109, 109, 110, 110, - 110, 111, 111, 111, 111, 111, 111, 111, 111, 112, - 112, 113, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 121, 121, 122, 123, 124, 124, 124, 124, 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, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 128, 128, 129, 129, 130, 130, 131, 131, 131, - 131, 131, 131, 132, 132, 133, 133, 133, 133, 134, - 133, 136, 135, 135, 137, 135, 135, 135, 138, 139, - 139, 139, 139, 140, 140, 140, 141, 142, 143, 143, - 143, 144, 144 + 110, 110, 111, 111, 111, 111, 111, 111, 111, 111, + 112, 112, 113, 113, 114, 115, 115, 116, 117, 118, + 119, 120, 121, 122, 122, 122, 123, 124, 125, 125, + 125, 125, 125, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 127, 128, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 128, 128, 129, 129, 130, 130, 131, 131, + 132, 132, 132, 132, 132, 132, 133, 133, 134, 134, + 134, 134, 135, 134, 137, 136, 136, 138, 136, 136, + 136, 139, 140, 140, 140, 140, 141, 141, 141, 142, + 143, 144, 144, 144, 145, 145 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -785,20 +787,20 @@ static const yytype_uint8 yyr2[] = { 0, 2, 3, 1, 2, 0, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 1, 1, - 1, 1, 1, 6, 10, 11, 3, 6, 4, 9, - 12, 0, 2, 6, 2, 3, 1, 1, 0, 0, - 0, 2, 2, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 4, 1, 2, 1, 3, - 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, 4, 6, 1, 2, 2, 1, 1, 2, 1, - 2, 2, 2, 1, 2, 2, 1, 2, 4, 2, - 3, 1, 3, 1, 3, 1, 3, 2, 2, 2, - 2, 3, 2, 3, 2, 2, 2, 3, 2, 0, - 3, 0, 8, 2, 0, 7, 8, 6, 2, 0, - 1, 3, 4, 0, 1, 3, 0, 2, 0, 1, - 3, 1, 3 + 1, 1, 1, 1, 6, 10, 11, 3, 6, 4, + 9, 12, 0, 2, 6, 11, 7, 2, 3, 1, + 1, 0, 0, 0, 2, 2, 3, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 4, 1, + 2, 1, 3, 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, 4, 6, 1, 2, 2, 1, + 1, 2, 1, 2, 2, 2, 1, 2, 2, 1, + 2, 4, 2, 3, 1, 3, 1, 3, 1, 3, + 2, 2, 2, 2, 3, 2, 3, 2, 2, 2, + 3, 2, 0, 3, 0, 8, 2, 0, 7, 8, + 6, 2, 0, 1, 3, 4, 0, 1, 3, 0, + 2, 0, 1, 3, 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -806,97 +808,99 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 45, 56, 0, 46, 103, 106, 0, 0, - 0, 52, 0, 0, 0, 49, 48, 47, 129, 134, - 99, 0, 0, 36, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, - 0, 0, 93, 0, 0, 0, 148, 0, 3, 58, - 21, 7, 22, 0, 0, 0, 0, 0, 50, 19, - 51, 20, 96, 97, 6, 38, 18, 4, 49, 0, - 57, 105, 104, 151, 107, 148, 53, 54, 49, 94, - 148, 147, 148, 38, 98, 111, 100, 117, 0, 118, - 0, 119, 120, 122, 131, 95, 0, 34, 0, 0, - 0, 0, 133, 109, 125, 126, 128, 115, 102, 72, - 0, 0, 0, 0, 0, 113, 101, 138, 0, 77, - 78, 0, 149, 0, 1, 5, 39, 0, 39, 39, + 0, 0, 48, 59, 0, 49, 106, 109, 0, 0, + 0, 55, 0, 0, 0, 52, 51, 50, 132, 137, + 102, 0, 0, 39, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 47, + 0, 0, 96, 0, 0, 0, 151, 0, 3, 61, + 22, 7, 23, 21, 0, 0, 0, 0, 0, 53, + 19, 54, 20, 99, 100, 6, 41, 18, 4, 52, + 0, 60, 108, 107, 154, 110, 151, 56, 57, 52, + 97, 151, 150, 151, 41, 101, 114, 103, 120, 0, + 121, 0, 122, 123, 125, 134, 98, 0, 37, 0, + 0, 0, 0, 136, 112, 128, 129, 131, 118, 105, + 75, 0, 0, 0, 0, 0, 116, 104, 141, 0, + 80, 81, 0, 152, 0, 1, 5, 42, 0, 42, + 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 139, 148, - 0, 0, 110, 149, 0, 130, 139, 0, 124, 0, - 121, 38, 0, 0, 0, 35, 0, 0, 50, 0, - 0, 0, 43, 0, 127, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 79, 80, - 0, 2, 40, 39, 0, 26, 0, 40, 68, 69, - 66, 67, 70, 71, 63, 74, 75, 76, 65, 64, - 73, 59, 60, 61, 62, 140, 0, 152, 55, 0, - 112, 123, 139, 8, 9, 10, 11, 15, 13, 0, - 0, 14, 12, 108, 116, 83, 0, 85, 0, 87, - 0, 89, 0, 81, 82, 114, 91, 148, 150, 39, - 0, 40, 28, 39, 146, 0, 146, 0, 17, 16, - 0, 0, 0, 0, 0, 41, 42, 0, 0, 0, - 39, 0, 0, 40, 141, 40, 146, 84, 86, 88, - 90, 92, 23, 0, 39, 31, 27, 142, 137, 135, - 40, 39, 40, 37, 39, 31, 0, 143, 132, 40, - 39, 38, 0, 32, 39, 144, 136, 39, 0, 40, - 29, 0, 0, 0, 24, 39, 40, 145, 25, 0, - 39, 30, 33 + 142, 151, 0, 0, 113, 152, 0, 133, 142, 0, + 127, 0, 124, 41, 0, 0, 0, 38, 0, 0, + 53, 0, 0, 0, 46, 0, 130, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 82, 83, 0, 2, 43, 42, 0, 27, 42, 0, + 43, 71, 72, 69, 70, 73, 74, 66, 77, 78, + 79, 68, 67, 76, 62, 63, 64, 65, 143, 0, + 155, 58, 0, 115, 126, 142, 8, 9, 10, 11, + 15, 13, 0, 0, 14, 12, 111, 119, 86, 0, + 88, 0, 90, 0, 92, 0, 84, 85, 117, 94, + 151, 153, 42, 0, 43, 0, 29, 42, 149, 0, + 149, 0, 17, 16, 0, 0, 0, 0, 0, 44, + 45, 0, 0, 0, 42, 42, 0, 0, 0, 43, + 144, 43, 149, 87, 89, 91, 93, 95, 24, 0, + 42, 0, 32, 28, 145, 140, 138, 43, 42, 43, + 41, 36, 40, 42, 32, 0, 146, 135, 43, 42, + 0, 41, 0, 33, 42, 147, 139, 42, 0, 42, + 43, 30, 0, 0, 0, 25, 0, 42, 43, 148, + 26, 35, 0, 42, 31, 34 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 47, 48, 49, 50, 266, 52, 294, 295, 53, - 54, 55, 296, 148, 192, 249, 56, 57, 58, 59, - 60, 61, 86, 116, 108, 62, 93, 63, 82, 64, - 161, 83, 65, 216, 306, 273, 66, 154, 74 + -1, 47, 48, 49, 50, 270, 52, 303, 304, 53, + 54, 55, 56, 305, 150, 194, 252, 57, 58, 59, + 60, 61, 62, 87, 117, 109, 63, 94, 64, 83, + 65, 163, 84, 66, 219, 316, 279, 67, 156, 75 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -207 +#define YYPACT_NINF -212 static const yytype_int16 yypact[] = { - 281, -83, -207, -207, 843, -207, -207, 843, 843, 843, - 26, -207, 843, 843, 52, 876, -207, -207, -207, -207, - 16, 51, 723, -207, 64, 843, 17, 8, 68, 73, - 843, 783, 74, 843, 843, 843, 843, 843, 843, -207, - 77, 78, 9, 843, 843, 843, 843, 2, -207, -207, - -207, -207, -207, 843, 42, 843, 641, 843, -207, 1393, - -207, -207, -207, -207, -207, -207, -207, -207, 10, 843, - 1393, 1393, 1393, 1393, 7, 843, 1393, 7, -207, -207, - 843, 7, 843, -207, -207, -207, 11, -207, 843, -207, - 66, -207, 929, -207, -207, 915, 85, -207, -1, 843, - 0, 60, -207, 1287, -207, 929, -207, -207, 12, -207, - 965, 999, 1033, 1067, 1359, -207, 13, -207, 89, -207, - -207, 1321, 1393, 1, -207, 371, 1393, 843, 1393, -207, - 1237, 843, 843, 843, 843, 843, 843, 843, 843, 843, - 843, 843, 843, 843, 843, 843, 843, 843, 90, 843, - 915, 843, 20, 1321, -89, 20, 90, 91, 1393, 843, - -207, -207, 71, 843, 843, -207, 843, 843, 55, 1273, - 843, 843, -207, 843, -207, 94, 843, 843, 843, 843, - 843, 843, 843, 843, 843, 843, 96, -15, -207, -207, - 843, -207, -207, 1393, 95, -207, 843, -207, -50, -50, - -50, -50, 1406, 1406, -207, -37, -50, -50, -50, -50, - -37, -35, -35, -207, -207, -207, -85, 1393, -207, -48, - -207, 1393, 90, -207, -207, 1393, 1393, 1393, -50, 843, - 843, 1393, -50, 1393, -207, 1393, 1101, 1393, 1135, 1393, - 1169, 1393, 1203, 1393, 1393, -207, -207, 843, 1393, 551, - -27, -207, 1393, 551, 43, 120, 43, -28, -50, 1393, - 843, 843, 843, 843, -9, -207, -207, 61, 97, 843, - 551, 63, 126, -207, -207, -207, 43, 1393, 1393, 1393, - 1393, -207, -207, 843, 1393, 118, -207, -207, 461, 551, - -207, 1393, -207, -207, 123, 118, 843, 128, 551, -207, - 551, -207, 75, -207, 1393, -207, 79, 551, 81, -207, - -207, 111, 152, 93, -207, 551, -207, -207, -207, 99, - 551, -207, -207 + 297, -85, -212, -212, 859, -212, -212, 859, 859, 859, + -7, -212, 859, 859, 70, 892, -212, -212, -212, -212, + -24, 27, 739, -212, 35, 859, 48, 53, 40, 44, + 859, 799, 63, 859, 859, 859, 859, 859, 859, -212, + 65, 83, -84, 859, 859, 859, 859, 10, -212, -212, + -212, -212, -212, -212, 859, -12, 859, 657, 859, -212, + 1409, -212, -212, -212, -212, -212, -212, -212, -212, 13, + 859, 1409, 1409, 1409, 1409, 11, 859, 1409, 11, -212, + -212, 859, 11, 859, -212, -212, -212, 12, -212, 859, + -212, 68, -212, 945, -212, -212, 931, 88, -212, 9, + 859, 25, 66, -212, 1303, -212, 945, -212, -212, 14, + -212, 981, 1015, 1049, 1083, 1375, -212, 16, -212, 92, + -212, -212, 1337, 1409, 4, -212, 387, 1409, 859, 1409, + -212, 859, 1253, 859, 859, 859, 859, 859, 859, 859, + 859, 859, 859, 859, 859, 859, 859, 859, 859, 859, + 93, 859, 931, 859, 21, 1337, -8, 21, 93, 95, + 1409, 859, -212, -212, 82, 859, 859, -212, 859, 859, + 61, 1289, 859, 859, -212, 859, -212, 118, 859, 859, + 859, 859, 859, 859, 859, 859, 859, 859, 120, -3, + -212, -212, 859, -212, -212, 1409, 97, -212, 1409, 859, + -212, -50, -50, -50, -50, 1422, 1422, -212, -37, -50, + -50, -50, -50, -37, -35, -35, -212, -212, -212, -81, + 1409, -212, -27, -212, 1409, 93, -212, -212, 1409, 1409, + 1409, -50, 859, 859, 1409, -50, 1409, -212, 1409, 1117, + 1409, 1151, 1409, 1185, 1409, 1219, 1409, 1409, -212, -212, + 859, 1409, 567, 1, 657, 98, 1409, 567, 49, 123, + 49, -16, -50, 1409, 859, 859, 859, 859, 2, -212, + -212, 73, 100, 859, -212, 567, 657, 67, 130, -212, + -212, -212, 49, 1409, 1409, 1409, 1409, -212, -212, 859, + 1409, -22, 127, -212, -212, 477, 567, -212, 1409, -212, + -212, -212, -212, 129, 127, 859, 140, 567, -212, 567, + 657, -212, 84, -212, 1409, -212, 79, 567, 96, -212, + -212, -212, 131, 142, 99, -212, 101, 567, -212, -212, + -212, -212, 102, 567, -212, -212 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -207, -207, 65, -207, 133, 19, -207, -104, -207, -207, - -207, -207, -207, -82, -40, -105, -207, -207, -8, -4, - 31, -207, -207, -207, -207, -207, -19, -207, -207, -207, - -207, -207, -207, -142, -207, -206, -207, -39, 84 + -212, -212, 71, -212, -56, 20, -212, -112, -212, -212, + -212, -212, -55, -212, -77, -39, -13, -212, -212, -2, + -4, 29, -212, -212, -212, -212, -212, -18, -212, -212, + -212, -212, -212, -212, -144, -212, -211, -212, -40, 38 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -906,264 +910,271 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -6 static const yytype_int16 yytable[] = { - 70, 156, 124, 71, 72, 73, 79, 123, 76, 73, - 268, 73, 106, 218, 219, 254, 190, 67, 92, 51, - 255, 95, 137, 98, 99, 138, 103, 105, 269, 109, - 110, 111, 112, 113, 114, 137, 152, 137, 100, 119, - 120, 121, 122, 155, 143, 144, 145, 146, 147, 126, - 275, 128, 256, 130, 166, 170, 75, 255, 144, 145, - 146, 147, 146, 147, 2, 150, 167, 171, 84, 5, - 290, 122, 276, 160, 96, 97, 153, 255, 122, 222, - 257, 85, 78, 16, 158, 17, 174, 246, 194, 195, - 247, 168, 253, 281, 94, 169, 190, 77, 101, 81, - 14, 223, 125, 102, 107, 189, 190, 115, 117, 127, - 118, 149, 151, 159, 172, 165, 157, 175, 186, 187, - 215, 220, 229, 193, 234, 190, 245, 198, 199, 200, - 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, - 211, 212, 213, 214, 51, 122, 270, 217, 272, 251, - 274, 282, 283, 250, 286, 221, 287, 293, 305, 225, - 226, 301, 227, 228, 310, 316, 231, 232, 288, 233, - 289, 314, 235, 236, 237, 238, 239, 240, 241, 242, - 243, 244, 317, 318, 312, 298, 248, 300, 321, 129, - 191, 303, 252, 224, 307, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 315, 0, 0, 0, 264, 267, - 0, 320, 0, 271, 0, 0, 0, 0, 0, 309, - 0, 0, 0, 0, 0, 258, 259, 0, 0, 0, - 285, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 122, 292, 0, 0, 0, 0, 0, - 0, 299, 0, 0, 302, 0, 277, 278, 279, 280, - 308, 0, 0, 0, 311, 284, 0, 313, 0, 0, - 0, 0, 0, 0, 0, 319, 0, 0, 0, 291, - 322, -5, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 304, 2, 0, 0, 3, 4, 5, 0, - 6, 7, 8, 9, 10, 0, 11, 12, 13, 0, - 14, 15, 16, 0, 17, 0, 18, 19, 0, 0, - 0, 20, 21, 22, 23, 0, 0, 24, 0, 0, - 0, 0, 25, 26, 27, 0, 0, 28, 0, 0, - 0, 29, 30, 31, 0, 32, 0, 0, 0, 0, - 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, - 35, 36, 37, 38, 0, 0, 39, 40, 41, 42, - 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, - 0, -5, 45, 2, 46, 0, 3, 4, 5, 0, - 6, 7, 8, 9, 10, 0, 11, 12, 13, 0, - 14, 15, 16, 0, 17, 0, 18, 19, 0, 0, - 0, 20, 21, 22, 23, 0, 0, 24, 0, 0, - 0, 0, 25, 26, 27, 0, 0, 28, 0, 0, - 0, 29, 30, 31, 0, 32, 0, 0, 0, 0, - 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, - 35, 36, 37, 38, 0, 0, 39, 40, 41, 42, - 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, - 0, 0, 45, 2, 46, 0, 3, 4, 5, 0, - 6, 7, 8, 9, 10, 0, 11, 12, 13, 0, - 14, 15, 16, 0, 17, 297, 18, 0, 0, 0, - 0, 20, 21, 22, 23, 0, 0, 0, 0, 0, - 0, 0, 25, 26, 27, 0, 0, 28, 0, 0, - 0, 0, 30, 31, 0, 32, 0, 0, 0, 0, - 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, - 35, 36, 37, 38, 0, 0, 39, 40, 0, 42, - 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, - 0, 265, 45, 2, 46, 0, 3, 4, 5, 0, - 6, 7, 8, 9, 10, 0, 11, 12, 13, 0, - 14, 15, 16, 0, 17, 0, 18, 0, 0, 0, - 0, 20, 21, 22, 23, 0, 0, 0, 0, 0, - 0, 0, 25, 26, 27, 0, 0, 28, 0, 0, - 0, 0, 30, 31, 0, 32, 0, 0, 0, 0, - 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, - 35, 36, 37, 38, 0, 0, 39, 40, 0, 42, - 0, 0, 0, 0, 0, 0, 43, 44, 0, 0, - 0, 265, 45, 2, 46, 0, 3, 4, 5, 0, - 6, 7, 8, 9, 10, 0, 11, 12, 13, 0, - 14, 15, 16, 0, 17, 0, 18, 0, 0, 0, - 0, 20, 21, 22, 0, 0, 0, 0, 0, 0, - 0, 0, 25, 0, 27, 0, 0, 0, 0, 0, - 0, 0, 30, 31, 0, 32, 0, 0, 0, 0, - 0, 0, 33, 0, 0, 0, 0, 0, 0, 34, - 35, 36, 37, 38, 0, 0, 0, 40, 0, 42, - 0, 0, 0, 0, 0, 2, 43, 44, 3, 4, - 5, 0, 45, 0, 46, 0, 0, 0, 11, 12, - 13, 0, 14, 68, 16, 0, 17, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 87, 0, - 88, 89, 90, 91, 69, 0, 27, 0, 0, 0, + 71, 130, 131, 72, 73, 74, 124, 158, 77, 74, + 125, 74, 80, 107, 222, 68, 300, 119, 93, 258, + 51, 96, 139, 76, 259, 140, 104, 106, 85, 110, + 111, 112, 113, 114, 115, 139, 154, 139, 272, 120, + 121, 122, 123, 157, 145, 146, 147, 148, 149, 281, + 127, 78, 129, 82, 132, 128, 273, 86, 146, 147, + 148, 149, 148, 149, 168, 95, 152, 301, 99, 100, + 102, 297, 123, 260, 103, 162, 169, 155, 259, 123, + 172, 261, 2, 101, 282, 160, 225, 5, 176, 259, + 196, 197, 173, 108, 221, 116, 171, 192, 170, 249, + 79, 16, 250, 17, 287, 97, 98, 192, 191, 192, + 126, 14, 226, 118, 151, 161, 153, 159, 167, 177, + 174, 188, 189, 218, 195, 223, 192, 198, 232, 201, + 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, + 212, 213, 214, 215, 216, 217, 51, 123, 237, 220, + 248, 254, 276, 280, 278, 289, 253, 224, 293, 255, + 294, 228, 229, 288, 230, 231, 302, 311, 234, 235, + 315, 236, 329, 321, 238, 239, 240, 241, 242, 243, + 244, 245, 246, 247, 323, 328, 325, 257, 251, 330, + 331, 334, 313, 227, 0, 256, 0, 193, 274, 131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 33, 2, 0, 0, 3, 4, - 5, 34, 35, 36, 37, 38, 0, 0, 11, 12, - 13, 42, 14, 68, 16, 0, 17, 0, 43, 44, - 0, 0, 0, 0, 45, 0, 46, 0, 0, 0, - 88, 0, 90, 0, 69, 0, 27, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 104, 0, 0, 0, - 0, 0, 0, 0, 33, 2, 0, 0, 3, 4, - 5, 34, 35, 36, 37, 38, 0, 0, 11, 12, - 13, 42, 14, 68, 16, 0, 17, 0, 43, 44, - 0, 0, 0, 0, 45, 0, 46, 0, 2, 0, - 0, 3, 4, 5, 69, 0, 27, 0, 0, 0, - 0, 11, 12, 13, 0, 14, 68, 16, 0, 17, - 0, 0, 0, 0, 33, 0, 0, 0, 0, 0, - 0, 34, 35, 36, 37, 38, 0, 69, 0, 27, - 0, 42, 0, 0, 0, 0, 0, 0, 43, 44, - 0, 0, 0, 0, 45, 0, 46, 33, 0, 0, - 0, 0, 0, 0, 34, 35, 36, 37, 38, 162, - 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, - 0, 43, 44, 0, 0, 0, 88, 80, 90, 46, - 131, 132, 133, 134, 135, 136, 0, 137, 163, 164, - 138, 139, 140, 0, 131, 132, 133, 134, 135, 136, - 0, 137, 0, 0, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 176, 0, 0, 0, 0, 0, - 177, 141, 142, 143, 144, 145, 146, 147, 0, 0, - 131, 132, 133, 134, 135, 136, 0, 137, 0, 0, - 138, 139, 140, 0, 0, 0, 0, 0, 178, 0, - 0, 0, 0, 0, 179, 0, 0, 141, 142, 143, - 144, 145, 146, 147, 131, 132, 133, 134, 135, 136, - 0, 137, 0, 0, 138, 139, 140, 0, 0, 0, - 0, 0, 180, 0, 0, 0, 0, 0, 181, 0, - 0, 141, 142, 143, 144, 145, 146, 147, 131, 132, - 133, 134, 135, 136, 0, 137, 0, 0, 138, 139, - 140, 0, 0, 0, 0, 0, 182, 0, 0, 0, - 0, 0, 183, 0, 0, 141, 142, 143, 144, 145, - 146, 147, 131, 132, 133, 134, 135, 136, 0, 137, - 0, 0, 138, 139, 140, 0, 0, 0, 0, 0, - 260, 0, 0, 0, 0, 0, 0, 0, 0, 141, - 142, 143, 144, 145, 146, 147, 131, 132, 133, 134, - 135, 136, 0, 137, 0, 0, 138, 139, 140, 0, - 0, 0, 0, 0, 261, 0, 0, 0, 0, 0, - 0, 0, 0, 141, 142, 143, 144, 145, 146, 147, - 131, 132, 133, 134, 135, 136, 0, 137, 0, 0, - 138, 139, 140, 0, 0, 0, 0, 0, 262, 0, - 0, 0, 0, 0, 0, 0, 0, 141, 142, 143, - 144, 145, 146, 147, 131, 132, 133, 134, 135, 136, - 0, 137, 0, 0, 138, 139, 140, 0, 0, 0, - 0, 0, 263, 0, 0, 0, 0, 0, 0, 0, - 0, 141, 142, 143, 144, 145, 146, 147, 131, 132, - 133, 134, 135, 136, 0, 137, 0, 0, 138, 139, - 140, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 196, 0, 0, 141, 142, 143, 144, 145, - 146, 147, 131, 132, 133, 134, 135, 136, 0, 137, - 0, 0, 138, 139, 140, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 230, 141, - 142, 143, 144, 145, 146, 147, 0, 197, 131, 132, - 133, 134, 135, 136, 173, 137, 0, 0, 138, 139, - 140, 0, 131, 132, 133, 134, 135, 136, 0, 137, - 0, 0, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 0, 0, 0, 0, 0, 0, 0, 141, - 142, 143, 144, 145, 146, 147, 131, 132, 133, 134, - 135, 136, 0, 137, 0, 0, 138, 139, 140, 0, + 268, 0, 0, 271, 0, 0, 0, 0, 277, 0, + 274, 131, 0, 310, 0, 0, 0, 0, 262, 263, + 0, 0, 0, 0, 320, 291, 292, 0, 0, 0, + 0, 275, 0, 0, 0, 0, 123, 0, 0, 0, + 0, 299, 0, 0, 319, 131, 0, 0, 0, 308, + 283, 284, 285, 286, 312, 0, 295, 0, 296, 290, + 318, 0, 0, 0, 0, 322, 0, 0, 324, 0, + 326, 0, 0, 0, 307, 298, 309, 0, 332, 0, + 0, 0, 0, 0, 335, 317, 0, -5, 1, 0, + 0, 314, 0, 0, 0, 0, 0, 327, 0, 2, + 0, 0, 3, 4, 5, 333, 6, 7, 8, 9, + 10, 0, 11, 12, 13, 0, 14, 15, 16, 0, + 17, 0, 18, 19, 0, 0, 0, 20, 21, 22, + 23, 0, 0, 24, 0, 0, 0, 0, 25, 26, + 27, 0, 0, 28, 0, 0, 0, 29, 30, 31, + 0, 32, 0, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 34, 35, 36, 37, 38, + 0, 0, 39, 40, 41, 42, 0, 0, 0, 0, + 0, 0, 43, 44, 0, 0, 0, -5, 45, 2, + 46, 0, 3, 4, 5, 0, 6, 7, 8, 9, + 10, 0, 11, 12, 13, 0, 14, 15, 16, 0, + 17, 0, 18, 19, 0, 0, 0, 20, 21, 22, + 23, 0, 0, 24, 0, 0, 0, 0, 25, 26, + 27, 0, 0, 28, 0, 0, 0, 29, 30, 31, + 0, 32, 0, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 34, 35, 36, 37, 38, + 0, 0, 39, 40, 41, 42, 0, 0, 0, 0, + 0, 0, 43, 44, 0, 0, 0, 0, 45, 2, + 46, 0, 3, 4, 5, 0, 6, 7, 8, 9, + 10, 0, 11, 12, 13, 0, 14, 15, 16, 0, + 17, 306, 18, 0, 0, 0, 0, 20, 21, 22, + 23, 0, 0, 0, 0, 0, 0, 0, 25, 26, + 27, 0, 0, 28, 0, 0, 0, 0, 30, 31, + 0, 32, 0, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 34, 35, 36, 37, 38, + 0, 0, 39, 40, 0, 42, 0, 0, 0, 0, + 0, 0, 43, 44, 0, 0, 0, 269, 45, 2, + 46, 0, 3, 4, 5, 0, 6, 7, 8, 9, + 10, 0, 11, 12, 13, 0, 14, 15, 16, 0, + 17, 0, 18, 0, 0, 0, 0, 20, 21, 22, + 23, 0, 0, 0, 0, 0, 0, 0, 25, 26, + 27, 0, 0, 28, 0, 0, 0, 0, 30, 31, + 0, 32, 0, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 34, 35, 36, 37, 38, + 0, 0, 39, 40, 0, 42, 0, 0, 0, 0, + 0, 0, 43, 44, 0, 0, 0, 269, 45, 2, + 46, 0, 3, 4, 5, 0, 6, 7, 8, 9, + 10, 0, 11, 12, 13, 0, 14, 15, 16, 0, + 17, 0, 18, 0, 0, 0, 0, 20, 21, 22, + 23, 0, 0, 0, 0, 0, 0, 0, 25, 0, + 27, 0, 0, 0, 0, 0, 0, 0, 30, 31, + 0, 32, 0, 0, 0, 0, 0, 0, 33, 0, + 0, 0, 0, 0, 0, 34, 35, 36, 37, 38, + 0, 0, 0, 40, 0, 42, 0, 0, 0, 0, + 0, 2, 43, 44, 3, 4, 5, 0, 45, 0, + 46, 0, 0, 0, 11, 12, 13, 0, 14, 69, + 16, 0, 17, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 88, 0, 89, 90, 91, 92, + 70, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 141, 142, 143, 144, 145, 146, 147, - 0, 0, 0, 188, 131, 132, 133, 134, 135, 136, - 0, 137, 0, 0, 138, 139, 140, 0, 0, 0, - 0, 0, 184, 185, 0, 0, 0, 0, 0, 0, - 0, 141, 142, 143, 144, 145, 146, 147, 131, 132, - 133, 134, 135, 136, 0, 137, 0, 0, 138, 139, - 140, 131, 132, 133, 134, 0, 0, 0, 137, 0, - 0, 138, 139, 140, 0, 141, 142, 143, 144, 145, - 146, 147, 0, 0, 0, 0, 0, 0, 141, 142, - 143, 144, 145, 146, 147 + 33, 2, 0, 0, 3, 4, 5, 34, 35, 36, + 37, 38, 0, 0, 11, 12, 13, 42, 14, 69, + 16, 0, 17, 0, 43, 44, 0, 0, 0, 0, + 45, 0, 46, 0, 0, 0, 89, 0, 91, 0, + 70, 0, 27, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 105, 0, 0, 0, 0, 0, 0, 0, + 33, 2, 0, 0, 3, 4, 5, 34, 35, 36, + 37, 38, 0, 0, 11, 12, 13, 42, 14, 69, + 16, 0, 17, 0, 43, 44, 0, 0, 0, 0, + 45, 0, 46, 0, 2, 0, 0, 3, 4, 5, + 70, 0, 27, 0, 0, 0, 0, 11, 12, 13, + 0, 14, 69, 16, 0, 17, 0, 0, 0, 0, + 33, 0, 0, 0, 0, 0, 0, 34, 35, 36, + 37, 38, 0, 70, 0, 27, 0, 42, 0, 0, + 0, 0, 0, 0, 43, 44, 0, 0, 0, 0, + 45, 0, 46, 33, 0, 0, 0, 0, 0, 0, + 34, 35, 36, 37, 38, 164, 0, 0, 0, 0, + 42, 0, 0, 0, 0, 0, 0, 43, 44, 0, + 0, 0, 89, 81, 91, 46, 133, 134, 135, 136, + 137, 138, 0, 139, 165, 166, 140, 141, 142, 0, + 133, 134, 135, 136, 137, 138, 0, 139, 0, 0, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 178, 0, 0, 0, 0, 0, 179, 143, 144, 145, + 146, 147, 148, 149, 0, 0, 133, 134, 135, 136, + 137, 138, 0, 139, 0, 0, 140, 141, 142, 0, + 0, 0, 0, 0, 180, 0, 0, 0, 0, 0, + 181, 0, 0, 143, 144, 145, 146, 147, 148, 149, + 133, 134, 135, 136, 137, 138, 0, 139, 0, 0, + 140, 141, 142, 0, 0, 0, 0, 0, 182, 0, + 0, 0, 0, 0, 183, 0, 0, 143, 144, 145, + 146, 147, 148, 149, 133, 134, 135, 136, 137, 138, + 0, 139, 0, 0, 140, 141, 142, 0, 0, 0, + 0, 0, 184, 0, 0, 0, 0, 0, 185, 0, + 0, 143, 144, 145, 146, 147, 148, 149, 133, 134, + 135, 136, 137, 138, 0, 139, 0, 0, 140, 141, + 142, 0, 0, 0, 0, 0, 264, 0, 0, 0, + 0, 0, 0, 0, 0, 143, 144, 145, 146, 147, + 148, 149, 133, 134, 135, 136, 137, 138, 0, 139, + 0, 0, 140, 141, 142, 0, 0, 0, 0, 0, + 265, 0, 0, 0, 0, 0, 0, 0, 0, 143, + 144, 145, 146, 147, 148, 149, 133, 134, 135, 136, + 137, 138, 0, 139, 0, 0, 140, 141, 142, 0, + 0, 0, 0, 0, 266, 0, 0, 0, 0, 0, + 0, 0, 0, 143, 144, 145, 146, 147, 148, 149, + 133, 134, 135, 136, 137, 138, 0, 139, 0, 0, + 140, 141, 142, 0, 0, 0, 0, 0, 267, 0, + 0, 0, 0, 0, 0, 0, 0, 143, 144, 145, + 146, 147, 148, 149, 133, 134, 135, 136, 137, 138, + 0, 139, 0, 0, 140, 141, 142, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 199, 0, + 0, 143, 144, 145, 146, 147, 148, 149, 133, 134, + 135, 136, 137, 138, 0, 139, 0, 0, 140, 141, + 142, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 233, 143, 144, 145, 146, 147, + 148, 149, 0, 200, 133, 134, 135, 136, 137, 138, + 175, 139, 0, 0, 140, 141, 142, 0, 133, 134, + 135, 136, 137, 138, 0, 139, 0, 0, 140, 141, + 142, 143, 144, 145, 146, 147, 148, 149, 0, 0, + 0, 0, 0, 0, 0, 143, 144, 145, 146, 147, + 148, 149, 133, 134, 135, 136, 137, 138, 0, 139, + 0, 0, 140, 141, 142, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 143, + 144, 145, 146, 147, 148, 149, 0, 0, 0, 190, + 133, 134, 135, 136, 137, 138, 0, 139, 0, 0, + 140, 141, 142, 0, 0, 0, 0, 0, 186, 187, + 0, 0, 0, 0, 0, 0, 0, 143, 144, 145, + 146, 147, 148, 149, 133, 134, 135, 136, 137, 138, + 0, 139, 0, 0, 140, 141, 142, 133, 134, 135, + 136, 0, 0, 0, 139, 0, 0, 140, 141, 142, + 0, 143, 144, 145, 146, 147, 148, 149, 0, 0, + 0, 0, 0, 0, 143, 144, 145, 146, 147, 148, + 149 }; static const yytype_int16 yycheck[] = { - 4, 83, 0, 7, 8, 9, 14, 46, 12, 13, - 37, 15, 31, 102, 156, 100, 105, 100, 22, 0, - 105, 25, 72, 15, 16, 75, 30, 31, 55, 33, - 34, 35, 36, 37, 38, 72, 75, 72, 30, 43, - 44, 45, 46, 82, 94, 95, 96, 97, 98, 53, - 256, 55, 100, 57, 55, 55, 30, 105, 95, 96, - 97, 98, 97, 98, 12, 69, 67, 67, 52, 17, - 276, 75, 100, 92, 57, 58, 80, 105, 82, 161, - 222, 30, 30, 31, 88, 33, 105, 102, 128, 129, - 105, 99, 197, 102, 30, 99, 105, 13, 30, 15, - 29, 30, 100, 30, 30, 104, 105, 30, 30, 67, - 101, 101, 105, 47, 54, 30, 105, 105, 105, 30, - 30, 30, 67, 127, 30, 105, 30, 131, 132, 133, + 4, 57, 57, 7, 8, 9, 46, 84, 12, 13, + 0, 15, 14, 31, 158, 100, 38, 101, 22, 100, + 0, 25, 72, 30, 105, 75, 30, 31, 52, 33, + 34, 35, 36, 37, 38, 72, 76, 72, 37, 43, + 44, 45, 46, 83, 94, 95, 96, 97, 98, 260, + 54, 13, 56, 15, 58, 67, 55, 30, 95, 96, + 97, 98, 97, 98, 55, 30, 70, 89, 15, 16, + 30, 282, 76, 100, 30, 93, 67, 81, 105, 83, + 55, 225, 12, 30, 100, 89, 163, 17, 106, 105, + 129, 130, 67, 30, 102, 30, 100, 105, 100, 102, + 30, 31, 105, 33, 102, 57, 58, 105, 104, 105, + 100, 29, 30, 30, 101, 47, 105, 105, 30, 105, + 54, 105, 30, 30, 128, 30, 105, 131, 67, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 125, 149, 251, 151, 105, 54, - 30, 90, 55, 193, 91, 159, 30, 39, 30, 163, - 164, 38, 166, 167, 89, 54, 170, 171, 273, 173, - 275, 90, 176, 177, 178, 179, 180, 181, 182, 183, - 184, 185, 30, 90, 105, 290, 190, 292, 89, 56, - 125, 295, 196, 162, 299, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 309, -1, -1, -1, 247, 249, - -1, 316, -1, 253, -1, -1, -1, -1, -1, 301, - -1, -1, -1, -1, -1, 229, 230, -1, -1, -1, - 270, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 247, 284, -1, -1, -1, -1, -1, - -1, 291, -1, -1, 294, -1, 260, 261, 262, 263, - 300, -1, -1, -1, 304, 269, -1, 307, -1, -1, - -1, -1, -1, -1, -1, 315, -1, -1, -1, 283, - 320, 0, 1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 296, 12, -1, -1, 15, 16, 17, -1, - 19, 20, 21, 22, 23, -1, 25, 26, 27, -1, - 29, 30, 31, -1, 33, -1, 35, 36, -1, -1, - -1, 40, 41, 42, 43, -1, -1, 46, -1, -1, - -1, -1, 51, 52, 53, -1, -1, 56, -1, -1, - -1, 60, 61, 62, -1, 64, -1, -1, -1, -1, - -1, -1, 71, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 81, 82, -1, -1, 85, 86, 87, 88, - -1, -1, -1, -1, -1, -1, 95, 96, -1, -1, - -1, 100, 101, 12, 103, -1, 15, 16, 17, -1, - 19, 20, 21, 22, 23, -1, 25, 26, 27, -1, - 29, 30, 31, -1, 33, -1, 35, 36, -1, -1, - -1, 40, 41, 42, 43, -1, -1, 46, -1, -1, - -1, -1, 51, 52, 53, -1, -1, 56, -1, -1, - -1, 60, 61, 62, -1, 64, -1, -1, -1, -1, - -1, -1, 71, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 81, 82, -1, -1, 85, 86, 87, 88, - -1, -1, -1, -1, -1, -1, 95, 96, -1, -1, - -1, -1, 101, 12, 103, -1, 15, 16, 17, -1, - 19, 20, 21, 22, 23, -1, 25, 26, 27, -1, - 29, 30, 31, -1, 33, 34, 35, -1, -1, -1, - -1, 40, 41, 42, 43, -1, -1, -1, -1, -1, - -1, -1, 51, 52, 53, -1, -1, 56, -1, -1, - -1, -1, 61, 62, -1, 64, -1, -1, -1, -1, - -1, -1, 71, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 81, 82, -1, -1, 85, 86, -1, 88, - -1, -1, -1, -1, -1, -1, 95, 96, -1, -1, - -1, 100, 101, 12, 103, -1, 15, 16, 17, -1, - 19, 20, 21, 22, 23, -1, 25, 26, 27, -1, - 29, 30, 31, -1, 33, -1, 35, -1, -1, -1, - -1, 40, 41, 42, 43, -1, -1, -1, -1, -1, - -1, -1, 51, 52, 53, -1, -1, 56, -1, -1, - -1, -1, 61, 62, -1, 64, -1, -1, -1, -1, - -1, -1, 71, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 81, 82, -1, -1, 85, 86, -1, 88, - -1, -1, -1, -1, -1, -1, 95, 96, -1, -1, - -1, 100, 101, 12, 103, -1, 15, 16, 17, -1, - 19, 20, 21, 22, 23, -1, 25, 26, 27, -1, - 29, 30, 31, -1, 33, -1, 35, -1, -1, -1, - -1, 40, 41, 42, -1, -1, -1, -1, -1, -1, - -1, -1, 51, -1, 53, -1, -1, -1, -1, -1, - -1, -1, 61, 62, -1, 64, -1, -1, -1, -1, - -1, -1, 71, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 81, 82, -1, -1, -1, 86, -1, 88, - -1, -1, -1, -1, -1, 12, 95, 96, 15, 16, - 17, -1, 101, -1, 103, -1, -1, -1, 25, 26, - 27, -1, 29, 30, 31, -1, 33, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 45, -1, - 47, 48, 49, 50, 51, -1, 53, -1, -1, -1, + 144, 145, 146, 147, 148, 149, 126, 151, 30, 153, + 30, 54, 54, 30, 105, 55, 195, 161, 91, 198, + 30, 165, 166, 90, 168, 169, 39, 38, 172, 173, + 30, 175, 30, 89, 178, 179, 180, 181, 182, 183, + 184, 185, 186, 187, 105, 54, 90, 200, 192, 90, + 89, 89, 304, 164, -1, 199, -1, 126, 254, 254, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 250, -1, -1, 252, -1, -1, -1, -1, 257, -1, + 276, 276, -1, 300, -1, -1, -1, -1, 232, 233, + -1, -1, -1, -1, 311, 274, 275, -1, -1, -1, + -1, 254, -1, -1, -1, -1, 250, -1, -1, -1, + -1, 290, -1, -1, 310, 310, -1, -1, -1, 298, + 264, 265, 266, 267, 303, -1, 279, -1, 281, 273, + 309, -1, -1, -1, -1, 314, -1, -1, 317, -1, + 319, -1, -1, -1, 297, 289, 299, -1, 327, -1, + -1, -1, -1, -1, 333, 308, -1, 0, 1, -1, + -1, 305, -1, -1, -1, -1, -1, 320, -1, 12, + -1, -1, 15, 16, 17, 328, 19, 20, 21, 22, + 23, -1, 25, 26, 27, -1, 29, 30, 31, -1, + 33, -1, 35, 36, -1, -1, -1, 40, 41, 42, + 43, -1, -1, 46, -1, -1, -1, -1, 51, 52, + 53, -1, -1, 56, -1, -1, -1, 60, 61, 62, + -1, 64, -1, -1, -1, -1, -1, -1, 71, -1, + -1, -1, -1, -1, -1, 78, 79, 80, 81, 82, + -1, -1, 85, 86, 87, 88, -1, -1, -1, -1, + -1, -1, 95, 96, -1, -1, -1, 100, 101, 12, + 103, -1, 15, 16, 17, -1, 19, 20, 21, 22, + 23, -1, 25, 26, 27, -1, 29, 30, 31, -1, + 33, -1, 35, 36, -1, -1, -1, 40, 41, 42, + 43, -1, -1, 46, -1, -1, -1, -1, 51, 52, + 53, -1, -1, 56, -1, -1, -1, 60, 61, 62, + -1, 64, -1, -1, -1, -1, -1, -1, 71, -1, + -1, -1, -1, -1, -1, 78, 79, 80, 81, 82, + -1, -1, 85, 86, 87, 88, -1, -1, -1, -1, + -1, -1, 95, 96, -1, -1, -1, -1, 101, 12, + 103, -1, 15, 16, 17, -1, 19, 20, 21, 22, + 23, -1, 25, 26, 27, -1, 29, 30, 31, -1, + 33, 34, 35, -1, -1, -1, -1, 40, 41, 42, + 43, -1, -1, -1, -1, -1, -1, -1, 51, 52, + 53, -1, -1, 56, -1, -1, -1, -1, 61, 62, + -1, 64, -1, -1, -1, -1, -1, -1, 71, -1, + -1, -1, -1, -1, -1, 78, 79, 80, 81, 82, + -1, -1, 85, 86, -1, 88, -1, -1, -1, -1, + -1, -1, 95, 96, -1, -1, -1, 100, 101, 12, + 103, -1, 15, 16, 17, -1, 19, 20, 21, 22, + 23, -1, 25, 26, 27, -1, 29, 30, 31, -1, + 33, -1, 35, -1, -1, -1, -1, 40, 41, 42, + 43, -1, -1, -1, -1, -1, -1, -1, 51, 52, + 53, -1, -1, 56, -1, -1, -1, -1, 61, 62, + -1, 64, -1, -1, -1, -1, -1, -1, 71, -1, + -1, -1, -1, -1, -1, 78, 79, 80, 81, 82, + -1, -1, 85, 86, -1, 88, -1, -1, -1, -1, + -1, -1, 95, 96, -1, -1, -1, 100, 101, 12, + 103, -1, 15, 16, 17, -1, 19, 20, 21, 22, + 23, -1, 25, 26, 27, -1, 29, 30, 31, -1, + 33, -1, 35, -1, -1, -1, -1, 40, 41, 42, + 43, -1, -1, -1, -1, -1, -1, -1, 51, -1, + 53, -1, -1, -1, -1, -1, -1, -1, 61, 62, + -1, 64, -1, -1, -1, -1, -1, -1, 71, -1, + -1, -1, -1, -1, -1, 78, 79, 80, 81, 82, + -1, -1, -1, 86, -1, 88, -1, -1, -1, -1, + -1, 12, 95, 96, 15, 16, 17, -1, 101, -1, + 103, -1, -1, -1, 25, 26, 27, -1, 29, 30, + 31, -1, 33, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 45, -1, 47, 48, 49, 50, + 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 71, 12, -1, -1, 15, 16, - 17, 78, 79, 80, 81, 82, -1, -1, 25, 26, - 27, 88, 29, 30, 31, -1, 33, -1, 95, 96, - -1, -1, -1, -1, 101, -1, 103, -1, -1, -1, - 47, -1, 49, -1, 51, -1, 53, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 63, -1, -1, -1, - -1, -1, -1, -1, 71, 12, -1, -1, 15, 16, - 17, 78, 79, 80, 81, 82, -1, -1, 25, 26, - 27, 88, 29, 30, 31, -1, 33, -1, 95, 96, - -1, -1, -1, -1, 101, -1, 103, -1, 12, -1, - -1, 15, 16, 17, 51, -1, 53, -1, -1, -1, - -1, 25, 26, 27, -1, 29, 30, 31, -1, 33, - -1, -1, -1, -1, 71, -1, -1, -1, -1, -1, - -1, 78, 79, 80, 81, 82, -1, 51, -1, 53, - -1, 88, -1, -1, -1, -1, -1, -1, 95, 96, - -1, -1, -1, -1, 101, -1, 103, 71, -1, -1, - -1, -1, -1, -1, 78, 79, 80, 81, 82, 44, - -1, -1, -1, -1, 88, -1, -1, -1, -1, -1, - -1, 95, 96, -1, -1, -1, 47, 101, 49, 103, - 65, 66, 67, 68, 69, 70, -1, 72, 73, 74, - 75, 76, 77, -1, 65, 66, 67, 68, 69, 70, - -1, 72, -1, -1, 75, 76, 77, 92, 93, 94, - 95, 96, 97, 98, 49, -1, -1, -1, -1, -1, - 55, 92, 93, 94, 95, 96, 97, 98, -1, -1, + 71, 12, -1, -1, 15, 16, 17, 78, 79, 80, + 81, 82, -1, -1, 25, 26, 27, 88, 29, 30, + 31, -1, 33, -1, 95, 96, -1, -1, -1, -1, + 101, -1, 103, -1, -1, -1, 47, -1, 49, -1, + 51, -1, 53, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 63, -1, -1, -1, -1, -1, -1, -1, + 71, 12, -1, -1, 15, 16, 17, 78, 79, 80, + 81, 82, -1, -1, 25, 26, 27, 88, 29, 30, + 31, -1, 33, -1, 95, 96, -1, -1, -1, -1, + 101, -1, 103, -1, 12, -1, -1, 15, 16, 17, + 51, -1, 53, -1, -1, -1, -1, 25, 26, 27, + -1, 29, 30, 31, -1, 33, -1, -1, -1, -1, + 71, -1, -1, -1, -1, -1, -1, 78, 79, 80, + 81, 82, -1, 51, -1, 53, -1, 88, -1, -1, + -1, -1, -1, -1, 95, 96, -1, -1, -1, -1, + 101, -1, 103, 71, -1, -1, -1, -1, -1, -1, + 78, 79, 80, 81, 82, 44, -1, -1, -1, -1, + 88, -1, -1, -1, -1, -1, -1, 95, 96, -1, + -1, -1, 47, 101, 49, 103, 65, 66, 67, 68, + 69, 70, -1, 72, 73, 74, 75, 76, 77, -1, + 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, + 75, 76, 77, 92, 93, 94, 95, 96, 97, 98, + 49, -1, -1, -1, -1, -1, 55, 92, 93, 94, + 95, 96, 97, 98, -1, -1, 65, 66, 67, 68, + 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, + -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, + 55, -1, -1, 92, 93, 94, 95, 96, 97, 98, 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, 55, -1, -1, 92, 93, 94, @@ -1173,7 +1184,7 @@ static const yytype_int16 yycheck[] = -1, 92, 93, 94, 95, 96, 97, 98, 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, -1, -1, 49, -1, -1, -1, - -1, -1, 55, -1, -1, 92, 93, 94, 95, 96, + -1, -1, -1, -1, -1, 92, 93, 94, 95, 96, 97, 98, 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, -1, 92, @@ -1186,32 +1197,29 @@ static const yytype_int16 yycheck[] = -1, -1, -1, -1, -1, -1, -1, 92, 93, 94, 95, 96, 97, 98, 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, - -1, -1, 49, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 55, -1, -1, 92, 93, 94, 95, 96, 97, 98, 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 55, -1, -1, 92, 93, 94, 95, 96, + -1, -1, -1, -1, 55, 92, 93, 94, 95, 96, + 97, 98, -1, 100, 65, 66, 67, 68, 69, 70, + 57, 72, -1, -1, 75, 76, 77, -1, 65, 66, + 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, + 77, 92, 93, 94, 95, 96, 97, 98, -1, -1, + -1, -1, -1, -1, -1, 92, 93, 94, 95, 96, 97, 98, 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 55, 92, - 93, 94, 95, 96, 97, 98, -1, 100, 65, 66, - 67, 68, 69, 70, 57, 72, -1, -1, 75, 76, - 77, -1, 65, 66, 67, 68, 69, 70, -1, 72, - -1, -1, 75, 76, 77, 92, 93, 94, 95, 96, - 97, 98, -1, -1, -1, -1, -1, -1, -1, 92, - 93, 94, 95, 96, 97, 98, 65, 66, 67, 68, - 69, 70, -1, 72, -1, -1, 75, 76, 77, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 92, 93, 94, 95, 96, 97, 98, - -1, -1, -1, 102, 65, 66, 67, 68, 69, 70, - -1, 72, -1, -1, 75, 76, 77, -1, -1, -1, - -1, -1, 83, 84, -1, -1, -1, -1, -1, -1, - -1, 92, 93, 94, 95, 96, 97, 98, 65, 66, - 67, 68, 69, 70, -1, 72, -1, -1, 75, 76, - 77, 65, 66, 67, 68, -1, -1, -1, 72, -1, - -1, 75, 76, 77, -1, 92, 93, 94, 95, 96, - 97, 98, -1, -1, -1, -1, -1, -1, 92, 93, - 94, 95, 96, 97, 98 + -1, -1, -1, -1, -1, -1, -1, -1, -1, 92, + 93, 94, 95, 96, 97, 98, -1, -1, -1, 102, + 65, 66, 67, 68, 69, 70, -1, 72, -1, -1, + 75, 76, 77, -1, -1, -1, -1, -1, 83, 84, + -1, -1, -1, -1, -1, -1, -1, 92, 93, 94, + 95, 96, 97, 98, 65, 66, 67, 68, 69, 70, + -1, 72, -1, -1, 75, 76, 77, 65, 66, 67, + 68, -1, -1, -1, 72, -1, -1, 75, 76, 77, + -1, 92, 93, 94, 95, 96, 97, 98, -1, -1, + -1, -1, -1, -1, 92, 93, 94, 95, 96, 97, + 98 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1223,34 +1231,35 @@ static const yytype_uint8 yystos[] = 40, 41, 42, 43, 46, 51, 52, 53, 56, 60, 61, 62, 64, 71, 78, 79, 80, 81, 82, 85, 86, 87, 88, 95, 96, 101, 103, 107, 108, 109, - 110, 111, 112, 115, 116, 117, 122, 123, 124, 125, - 126, 127, 131, 133, 135, 138, 142, 100, 30, 51, - 125, 125, 125, 125, 144, 30, 125, 144, 30, 124, - 101, 144, 134, 137, 52, 30, 128, 45, 47, 48, - 49, 50, 125, 132, 30, 125, 57, 58, 15, 16, - 30, 30, 30, 125, 63, 125, 132, 30, 130, 125, - 125, 125, 125, 125, 125, 30, 129, 30, 101, 125, - 125, 125, 125, 143, 0, 100, 125, 67, 125, 110, - 125, 65, 66, 67, 68, 69, 70, 72, 75, 76, - 77, 92, 93, 94, 95, 96, 97, 98, 119, 101, - 125, 105, 143, 125, 143, 143, 119, 105, 125, 47, - 132, 136, 44, 73, 74, 30, 55, 67, 124, 125, - 55, 67, 54, 57, 132, 105, 49, 55, 49, 55, - 49, 55, 49, 55, 83, 84, 105, 30, 102, 104, - 105, 108, 120, 125, 120, 120, 55, 100, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 30, 139, 125, 102, 139, - 30, 125, 119, 30, 126, 125, 125, 125, 125, 67, - 55, 125, 125, 125, 30, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 30, 102, 105, 125, 121, - 120, 54, 125, 121, 100, 105, 100, 139, 125, 125, - 49, 49, 49, 49, 143, 100, 111, 120, 37, 55, - 121, 120, 105, 141, 30, 141, 100, 125, 125, 125, - 125, 102, 90, 55, 125, 120, 91, 30, 121, 121, - 141, 125, 120, 39, 113, 114, 118, 34, 121, 120, - 121, 38, 120, 113, 125, 30, 140, 121, 120, 119, - 89, 120, 105, 120, 90, 121, 54, 30, 90, 120, - 121, 89, 120 + 110, 111, 112, 115, 116, 117, 118, 123, 124, 125, + 126, 127, 128, 132, 134, 136, 139, 143, 100, 30, + 51, 126, 126, 126, 126, 145, 30, 126, 145, 30, + 125, 101, 145, 135, 138, 52, 30, 129, 45, 47, + 48, 49, 50, 126, 133, 30, 126, 57, 58, 15, + 16, 30, 30, 30, 126, 63, 126, 133, 30, 131, + 126, 126, 126, 126, 126, 126, 30, 130, 30, 101, + 126, 126, 126, 126, 144, 0, 100, 126, 67, 126, + 110, 118, 126, 65, 66, 67, 68, 69, 70, 72, + 75, 76, 77, 92, 93, 94, 95, 96, 97, 98, + 120, 101, 126, 105, 144, 126, 144, 144, 120, 105, + 126, 47, 133, 137, 44, 73, 74, 30, 55, 67, + 125, 126, 55, 67, 54, 57, 133, 105, 49, 55, + 49, 55, 49, 55, 49, 55, 83, 84, 105, 30, + 102, 104, 105, 108, 121, 126, 121, 121, 126, 55, + 100, 126, 126, 126, 126, 126, 126, 126, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 30, 140, + 126, 102, 140, 30, 126, 120, 30, 127, 126, 126, + 126, 126, 67, 55, 126, 126, 126, 30, 126, 126, + 126, 126, 126, 126, 126, 126, 126, 126, 30, 102, + 105, 126, 122, 121, 54, 121, 126, 122, 100, 105, + 100, 140, 126, 126, 49, 49, 49, 49, 144, 100, + 111, 121, 37, 55, 110, 122, 54, 121, 105, 142, + 30, 142, 100, 126, 126, 126, 126, 102, 90, 55, + 126, 121, 121, 91, 30, 122, 122, 142, 126, 121, + 38, 89, 39, 113, 114, 119, 34, 122, 121, 122, + 120, 38, 121, 113, 126, 30, 141, 122, 121, 110, + 120, 89, 121, 105, 121, 90, 121, 122, 54, 30, + 90, 89, 121, 122, 89, 121 }; #define yyerrok (yyerrstatus = 0) @@ -2158,8 +2167,8 @@ yyreduce: (yyval.code) = (yyvsp[(5) - (5)].code); ;} break; - case 23: -#line 197 "engines/director/lingo/lingo-gr.y" + case 24: +#line 198 "engines/director/lingo/lingo-gr.y" { inst body = 0, end = 0; WRITE_UINT32(&body, (yyvsp[(3) - (6)].code) - (yyvsp[(1) - (6)].code)); @@ -2168,8 +2177,8 @@ yyreduce: (*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 2] = end; ;} break; - case 24: -#line 208 "engines/director/lingo/lingo-gr.y" + case 25: +#line 209 "engines/director/lingo/lingo-gr.y" { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, (yyvsp[(3) - (10)].code) - (yyvsp[(1) - (10)].code)); @@ -2184,8 +2193,8 @@ yyreduce: (*g_lingo->_currentScript)[(yyvsp[(1) - (10)].code) + 5] = end; ;} break; - case 25: -#line 225 "engines/director/lingo/lingo-gr.y" + case 26: +#line 226 "engines/director/lingo/lingo-gr.y" { inst init = 0, finish = 0, body = 0, end = 0, inc = 0; WRITE_UINT32(&init, (yyvsp[(3) - (11)].code) - (yyvsp[(1) - (11)].code)); @@ -2200,8 +2209,8 @@ yyreduce: (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 5] = end; ;} break; - case 26: -#line 237 "engines/director/lingo/lingo-gr.y" + case 27: +#line 238 "engines/director/lingo/lingo-gr.y" { inst end = 0; WRITE_UINT32(&end, (yyvsp[(3) - (3)].code) - (yyvsp[(1) - (3)].code)); @@ -2209,21 +2218,21 @@ yyreduce: (*g_lingo->_currentScript)[(yyvsp[(1) - (3)].code) + 1] = end; ;} break; - case 27: -#line 242 "engines/director/lingo/lingo-gr.y" + case 28: +#line 243 "engines/director/lingo/lingo-gr.y" { warning("STUB: TELL is not implemented"); ;} break; - case 28: -#line 244 "engines/director/lingo/lingo-gr.y" + case 29: +#line 245 "engines/director/lingo/lingo-gr.y" { warning("STUB: TELL is not implemented"); ;} break; - case 29: -#line 249 "engines/director/lingo/lingo-gr.y" + case 30: +#line 250 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(3) - (9)].code) - (yyvsp[(1) - (9)].code)); @@ -2236,8 +2245,8 @@ yyreduce: g_lingo->processIf((yyvsp[(1) - (9)].code), (yyvsp[(8) - (9)].code) - (yyvsp[(1) - (9)].code), 0); ;} break; - case 30: -#line 259 "engines/director/lingo/lingo-gr.y" + case 31: +#line 260 "engines/director/lingo/lingo-gr.y" { inst then = 0, else1 = 0, end = 0; WRITE_UINT32(&then, (yyvsp[(3) - (12)].code) - (yyvsp[(1) - (12)].code)); @@ -2250,8 +2259,8 @@ yyreduce: g_lingo->processIf((yyvsp[(1) - (12)].code), (yyvsp[(11) - (12)].code) - (yyvsp[(1) - (12)].code), (yyvsp[(9) - (12)].code) - (yyvsp[(1) - (12)].code)); ;} break; - case 33: -#line 275 "engines/director/lingo/lingo-gr.y" + case 34: +#line 276 "engines/director/lingo/lingo-gr.y" { inst then = 0; WRITE_UINT32(&then, (yyvsp[(3) - (6)].code) - (yyvsp[(1) - (6)].code)); @@ -2260,13 +2269,41 @@ yyreduce: g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;} break; - case 34: -#line 283 "engines/director/lingo/lingo-gr.y" + case 35: +#line 284 "engines/director/lingo/lingo-gr.y" + { + inst then = 0, else1 = 0, end = 0; + WRITE_UINT32(&then, (yyvsp[(3) - (11)].code) - (yyvsp[(1) - (11)].code)); + WRITE_UINT32(&else1, (yyvsp[(6) - (11)].code) - (yyvsp[(1) - (11)].code)); + WRITE_UINT32(&end, (yyvsp[(10) - (11)].code) - (yyvsp[(1) - (11)].code)); + (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 1] = then; /* thenpart */ + (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 2] = else1; /* elsepart */ + (*g_lingo->_currentScript)[(yyvsp[(1) - (11)].code) + 3] = end; /* end, if cond fails */ + + g_lingo->processIf((yyvsp[(1) - (11)].code), (yyvsp[(10) - (11)].code) - (yyvsp[(1) - (11)].code), (yyvsp[(8) - (11)].code) - (yyvsp[(1) - (11)].code)); ;} + break; + + case 36: +#line 294 "engines/director/lingo/lingo-gr.y" + { + inst then = 0, else1 = 0, end = 0; + WRITE_UINT32(&then, (yyvsp[(3) - (7)].code) - (yyvsp[(1) - (7)].code)); + WRITE_UINT32(&else1, 0); + WRITE_UINT32(&end, (yyvsp[(6) - (7)].code) - (yyvsp[(1) - (7)].code)); + (*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 1] = then; /* thenpart */ + (*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 2] = else1; /* elsepart */ + (*g_lingo->_currentScript)[(yyvsp[(1) - (7)].code) + 3] = end; /* end, if cond fails */ + + g_lingo->processIf((yyvsp[(1) - (7)].code), (yyvsp[(6) - (7)].code) - (yyvsp[(1) - (7)].code), (yyvsp[(6) - (7)].code) - (yyvsp[(1) - (7)].code)); ;} + break; + + case 37: +#line 307 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); ;} break; - case 35: -#line 286 "engines/director/lingo/lingo-gr.y" + case 38: +#line 310 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code3(g_lingo->c_repeatwithcode, STOP, STOP); g_lingo->code3(STOP, STOP, STOP); @@ -2274,8 +2311,8 @@ yyreduce: delete (yyvsp[(3) - (3)].s); ;} break; - case 36: -#line 293 "engines/director/lingo/lingo-gr.y" + case 39: +#line 317 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_ifcode); g_lingo->code3(STOP, STOP, STOP); @@ -2283,8 +2320,8 @@ yyreduce: g_lingo->codeLabel(0); ;} break; - case 37: -#line 300 "engines/director/lingo/lingo-gr.y" + case 40: +#line 324 "engines/director/lingo/lingo-gr.y" { inst skipEnd; WRITE_UINT32(&skipEnd, 1); // We have to skip end to avoid multiple executions @@ -2293,23 +2330,23 @@ yyreduce: g_lingo->code1(skipEnd); ;} break; - case 38: -#line 308 "engines/director/lingo/lingo-gr.y" + case 41: +#line 332 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->_currentScript->size(); ;} break; - case 39: -#line 311 "engines/director/lingo/lingo-gr.y" + case 42: +#line 335 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(STOP); (yyval.code) = g_lingo->_currentScript->size(); ;} break; - case 40: -#line 314 "engines/director/lingo/lingo-gr.y" + case 43: +#line 338 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->_currentScript->size(); ;} break; - case 43: -#line 319 "engines/director/lingo/lingo-gr.y" + case 46: +#line 343 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_whencode); g_lingo->code1(STOP); @@ -2317,82 +2354,82 @@ yyreduce: delete (yyvsp[(2) - (3)].s); ;} break; - case 44: -#line 325 "engines/director/lingo/lingo-gr.y" + case 47: +#line 349 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_tellcode); g_lingo->code1(STOP); ;} break; - case 45: -#line 329 "engines/director/lingo/lingo-gr.y" + case 48: +#line 353 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt((yyvsp[(1) - (1)].i)); ;} break; - case 46: -#line 332 "engines/director/lingo/lingo-gr.y" + case 49: +#line 356 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_floatpush); g_lingo->codeFloat((yyvsp[(1) - (1)].f)); ;} break; - case 47: -#line 335 "engines/director/lingo/lingo-gr.y" + case 50: +#line 359 "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 48: -#line 338 "engines/director/lingo/lingo-gr.y" + case 51: +#line 362 "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 49: -#line 341 "engines/director/lingo/lingo-gr.y" + case 52: +#line 365 "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 50: -#line 347 "engines/director/lingo/lingo-gr.y" + case 53: +#line 371 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(1) - (1)].code); ;} break; - case 52: -#line 349 "engines/director/lingo/lingo-gr.y" + case 55: +#line 373 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0); delete (yyvsp[(1) - (1)].s); ;} break; - case 53: -#line 352 "engines/director/lingo/lingo-gr.y" + case 56: +#line 376 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 54: -#line 355 "engines/director/lingo/lingo-gr.y" + case 57: +#line 379 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; - case 55: -#line 356 "engines/director/lingo/lingo-gr.y" + case 58: +#line 380 "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 56: -#line 359 "engines/director/lingo/lingo-gr.y" + case 59: +#line 383 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(0); // Put dummy id @@ -2403,8 +2440,8 @@ yyreduce: g_lingo->code2(e, f); ;} break; - case 57: -#line 367 "engines/director/lingo/lingo-gr.y" + case 60: +#line 391 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_theentitypush); inst e = 0, f = 0; @@ -2413,369 +2450,369 @@ yyreduce: g_lingo->code2(e, f); ;} break; - case 59: -#line 374 "engines/director/lingo/lingo-gr.y" + case 62: +#line 398 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_add); ;} break; - case 60: -#line 375 "engines/director/lingo/lingo-gr.y" + case 63: +#line 399 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_sub); ;} break; - case 61: -#line 376 "engines/director/lingo/lingo-gr.y" + case 64: +#line 400 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_mul); ;} break; - case 62: -#line 377 "engines/director/lingo/lingo-gr.y" + case 65: +#line 401 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_div); ;} break; - case 63: -#line 378 "engines/director/lingo/lingo-gr.y" + case 66: +#line 402 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_mod); ;} break; - case 64: -#line 379 "engines/director/lingo/lingo-gr.y" + case 67: +#line 403 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gt); ;} break; - case 65: -#line 380 "engines/director/lingo/lingo-gr.y" + case 68: +#line 404 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lt); ;} break; - case 66: -#line 381 "engines/director/lingo/lingo-gr.y" + case 69: +#line 405 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_eq); ;} break; - case 67: -#line 382 "engines/director/lingo/lingo-gr.y" + case 70: +#line 406 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_neq); ;} break; - case 68: -#line 383 "engines/director/lingo/lingo-gr.y" + case 71: +#line 407 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_ge); ;} break; - case 69: -#line 384 "engines/director/lingo/lingo-gr.y" + case 72: +#line 408 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_le); ;} break; - case 70: -#line 385 "engines/director/lingo/lingo-gr.y" + case 73: +#line 409 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_and); ;} break; - case 71: -#line 386 "engines/director/lingo/lingo-gr.y" + case 74: +#line 410 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_or); ;} break; - case 72: -#line 387 "engines/director/lingo/lingo-gr.y" + case 75: +#line 411 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_not); ;} break; - case 73: -#line 388 "engines/director/lingo/lingo-gr.y" + case 76: +#line 412 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_ampersand); ;} break; - case 74: -#line 389 "engines/director/lingo/lingo-gr.y" + case 77: +#line 413 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_concat); ;} break; - case 75: -#line 390 "engines/director/lingo/lingo-gr.y" + case 78: +#line 414 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_contains); ;} break; - case 76: -#line 391 "engines/director/lingo/lingo-gr.y" + case 79: +#line 415 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_starts); ;} break; - case 77: -#line 392 "engines/director/lingo/lingo-gr.y" + case 80: +#line 416 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (2)].code); ;} break; - case 78: -#line 393 "engines/director/lingo/lingo-gr.y" + case 81: +#line 417 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;} break; - case 79: -#line 394 "engines/director/lingo/lingo-gr.y" + case 82: +#line 418 "engines/director/lingo/lingo-gr.y" { (yyval.code) = (yyvsp[(2) - (3)].code); ;} break; - case 80: -#line 395 "engines/director/lingo/lingo-gr.y" + case 83: +#line 419 "engines/director/lingo/lingo-gr.y" { (yyval.code) = g_lingo->code1(g_lingo->c_arraypush); g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;} break; - case 81: -#line 396 "engines/director/lingo/lingo-gr.y" + case 84: +#line 420 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intersects); ;} break; - case 82: -#line 397 "engines/director/lingo/lingo-gr.y" + case 85: +#line 421 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_within); ;} break; - case 83: -#line 398 "engines/director/lingo/lingo-gr.y" + case 86: +#line 422 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_charOf); ;} break; - case 84: -#line 399 "engines/director/lingo/lingo-gr.y" + case 87: +#line 423 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_charToOf); ;} break; - case 85: -#line 400 "engines/director/lingo/lingo-gr.y" + case 88: +#line 424 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_itemOf); ;} break; - case 86: -#line 401 "engines/director/lingo/lingo-gr.y" + case 89: +#line 425 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_itemToOf); ;} break; - case 87: -#line 402 "engines/director/lingo/lingo-gr.y" + case 90: +#line 426 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lineOf); ;} break; - case 88: -#line 403 "engines/director/lingo/lingo-gr.y" + case 91: +#line 427 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_lineToOf); ;} break; - case 89: -#line 404 "engines/director/lingo/lingo-gr.y" + case 92: +#line 428 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_wordOf); ;} break; - case 90: -#line 405 "engines/director/lingo/lingo-gr.y" + case 93: +#line 429 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_wordToOf); ;} break; - case 91: -#line 406 "engines/director/lingo/lingo-gr.y" + case 94: +#line 430 "engines/director/lingo/lingo-gr.y" { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;} break; - case 92: -#line 407 "engines/director/lingo/lingo-gr.y" + case 95: +#line 431 "engines/director/lingo/lingo-gr.y" { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;} break; - case 93: -#line 408 "engines/director/lingo/lingo-gr.y" + case 96: +#line 432 "engines/director/lingo/lingo-gr.y" { g_lingo->codeMe(nullptr, 0); ;} break; - case 94: -#line 411 "engines/director/lingo/lingo-gr.y" + case 97: +#line 435 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 95: -#line 416 "engines/director/lingo/lingo-gr.y" + case 98: +#line 440 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_printtop); ;} break; - case 98: -#line 419 "engines/director/lingo/lingo-gr.y" + case 101: +#line 443 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_exitRepeat); ;} break; - case 99: -#line 420 "engines/director/lingo/lingo-gr.y" + case 102: +#line 444 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_procret); ;} break; - case 103: -#line 424 "engines/director/lingo/lingo-gr.y" + case 106: +#line 448 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (1)].s), 0); delete (yyvsp[(1) - (1)].s); ;} break; - case 104: -#line 427 "engines/director/lingo/lingo-gr.y" + case 107: +#line 451 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 105: -#line 430 "engines/director/lingo/lingo-gr.y" + case 108: +#line 454 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), 1); delete (yyvsp[(1) - (2)].s); ;} break; - case 106: -#line 433 "engines/director/lingo/lingo-gr.y" + case 109: +#line 457 "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 107: -#line 437 "engines/director/lingo/lingo-gr.y" + case 110: +#line 461 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; - case 108: -#line 438 "engines/director/lingo/lingo-gr.y" + case 111: +#line 462 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_open); ;} break; - case 109: -#line 439 "engines/director/lingo/lingo-gr.y" + case 112: +#line 463 "engines/director/lingo/lingo-gr.y" { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;} break; - case 110: -#line 440 "engines/director/lingo/lingo-gr.y" + case 113: +#line 464 "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 111: -#line 443 "engines/director/lingo/lingo-gr.y" + case 114: +#line 467 "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 112: -#line 444 "engines/director/lingo/lingo-gr.y" + case 115: +#line 468 "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 113: -#line 447 "engines/director/lingo/lingo-gr.y" + case 116: +#line 471 "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 114: -#line 448 "engines/director/lingo/lingo-gr.y" + case 117: +#line 472 "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 115: -#line 451 "engines/director/lingo/lingo-gr.y" + case 118: +#line 475 "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 116: -#line 452 "engines/director/lingo/lingo-gr.y" + case 119: +#line 476 "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 117: -#line 463 "engines/director/lingo/lingo-gr.y" + case 120: +#line 487 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoloop); ;} break; - case 118: -#line 464 "engines/director/lingo/lingo-gr.y" + case 121: +#line 488 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotonext); ;} break; - case 119: -#line 465 "engines/director/lingo/lingo-gr.y" + case 122: +#line 489 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_gotoprevious); ;} break; - case 120: -#line 466 "engines/director/lingo/lingo-gr.y" + case 123: +#line 490 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(1); g_lingo->code1(g_lingo->c_goto); ;} break; - case 121: -#line 470 "engines/director/lingo/lingo-gr.y" + case 124: +#line 494 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(3); g_lingo->code1(g_lingo->c_goto); ;} break; - case 122: -#line 474 "engines/director/lingo/lingo-gr.y" + case 125: +#line 498 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(2); g_lingo->code1(g_lingo->c_goto); ;} break; - case 125: -#line 484 "engines/director/lingo/lingo-gr.y" + case 128: +#line 508 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_playdone); ;} break; - case 126: -#line 485 "engines/director/lingo/lingo-gr.y" + case 129: +#line 509 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(1); g_lingo->code1(g_lingo->c_play); ;} break; - case 127: -#line 489 "engines/director/lingo/lingo-gr.y" + case 130: +#line 513 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(3); g_lingo->code1(g_lingo->c_play); ;} break; - case 128: -#line 493 "engines/director/lingo/lingo-gr.y" + case 131: +#line 517 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_intpush); g_lingo->codeInt(2); g_lingo->code1(g_lingo->c_play); ;} break; - case 129: -#line 497 "engines/director/lingo/lingo-gr.y" + case 132: +#line 521 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(true); ;} break; - case 130: -#line 497 "engines/director/lingo/lingo-gr.y" + case 133: +#line 521 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(false); g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;} break; - case 131: -#line 527 "engines/director/lingo/lingo-gr.y" + case 134: +#line 551 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); ;} break; - case 132: -#line 528 "engines/director/lingo/lingo-gr.y" + case 135: +#line 552 "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)); @@ -2783,18 +2820,18 @@ yyreduce: g_lingo->_indef = kStateNone; ;} break; - case 133: -#line 533 "engines/director/lingo/lingo-gr.y" + case 136: +#line 557 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;} break; - case 134: -#line 534 "engines/director/lingo/lingo-gr.y" + case 137: +#line 558 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = kStateInArgs; ;} break; - case 135: -#line 535 "engines/director/lingo/lingo-gr.y" + case 138: +#line 559 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(1) - (7)].s), (yyvsp[(3) - (7)].code), (yyvsp[(4) - (7)].narg) + 1, &g_lingo->_currentFactory); @@ -2802,8 +2839,8 @@ yyreduce: g_lingo->_indef = kStateNone; ;} break; - case 136: -#line 540 "engines/director/lingo/lingo-gr.y" + case 139: +#line 564 "engines/director/lingo/lingo-gr.y" { // D3 g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(1) - (8)].s), (yyvsp[(2) - (8)].code), (yyvsp[(3) - (8)].narg)); @@ -2814,8 +2851,8 @@ yyreduce: checkEnd((yyvsp[(7) - (8)].s), (yyvsp[(1) - (8)].s)->c_str(), false); ;} break; - case 137: -#line 548 "engines/director/lingo/lingo-gr.y" + case 140: +#line 572 "engines/director/lingo/lingo-gr.y" { // D4. No 'end' clause g_lingo->code1(g_lingo->c_procret); g_lingo->define(*(yyvsp[(1) - (6)].s), (yyvsp[(2) - (6)].code), (yyvsp[(3) - (6)].narg)); @@ -2824,38 +2861,38 @@ yyreduce: g_lingo->_ignoreMe = false; ;} break; - case 138: -#line 555 "engines/director/lingo/lingo-gr.y" + case 141: +#line 579 "engines/director/lingo/lingo-gr.y" { (yyval.s) = (yyvsp[(2) - (2)].s); g_lingo->_indef = kStateInArgs; g_lingo->_currentFactory.clear(); g_lingo->_ignoreMe = true; ;} break; - case 139: -#line 557 "engines/director/lingo/lingo-gr.y" + case 142: +#line 581 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 140: -#line 558 "engines/director/lingo/lingo-gr.y" + case 143: +#line 582 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;} break; - case 141: -#line 559 "engines/director/lingo/lingo-gr.y" + case 144: +#line 583 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; - case 142: -#line 560 "engines/director/lingo/lingo-gr.y" + case 145: +#line 584 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;} break; - case 146: -#line 568 "engines/director/lingo/lingo-gr.y" + case 149: +#line 592 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; ;} break; - case 147: -#line 572 "engines/director/lingo/lingo-gr.y" + case 150: +#line 595 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_call); g_lingo->codeString((yyvsp[(1) - (2)].s)->c_str()); @@ -2864,34 +2901,34 @@ yyreduce: g_lingo->code1(numpar); ;} break; - case 148: -#line 580 "engines/director/lingo/lingo-gr.y" + case 151: +#line 603 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 149: -#line 581 "engines/director/lingo/lingo-gr.y" + case 152: +#line 604 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 150: -#line 582 "engines/director/lingo/lingo-gr.y" + case 153: +#line 605 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; - case 151: -#line 585 "engines/director/lingo/lingo-gr.y" + case 154: +#line 608 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 152: -#line 586 "engines/director/lingo/lingo-gr.y" + case 155: +#line 609 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; /* Line 1267 of yacc.c. */ -#line 2895 "engines/director/lingo/lingo-gr.cpp" +#line 2932 "engines/director/lingo/lingo-gr.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3105,6 +3142,6 @@ yyreturn: } -#line 589 "engines/director/lingo/lingo-gr.y" +#line 612 "engines/director/lingo/lingo-gr.y" diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index aa7b944cdc..9214a7e7b7 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -186,6 +186,7 @@ asgn: tPUT expr tINTO ID { stmtoneliner: macro | expr | proc + | ifoneliner ; stmt: stmtoneliner @@ -280,6 +281,29 @@ elseifstmt: elseif expr end tTHEN stmtlist end { g_lingo->codeLabel($1); } ; +ifoneliner: if expr end tTHEN stmtoneliner end tELSE begin stmtoneliner end tENDIF { + inst then = 0, else1 = 0, end = 0; + WRITE_UINT32(&then, $3 - $1); + WRITE_UINT32(&else1, $6 - $1); + WRITE_UINT32(&end, $10 - $1); + (*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */ + (*g_lingo->_currentScript)[$1 + 2] = else1; /* elsepart */ + (*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */ + + g_lingo->processIf($1, $10 - $1, $8 - $1); } + | if expr end tTHEN stmtoneliner end tENDIF { + inst then = 0, else1 = 0, end = 0; + WRITE_UINT32(&then, $3 - $1); + WRITE_UINT32(&else1, 0); + WRITE_UINT32(&end, $6 - $1); + (*g_lingo->_currentScript)[$1 + 1] = then; /* thenpart */ + (*g_lingo->_currentScript)[$1 + 2] = else1; /* elsepart */ + (*g_lingo->_currentScript)[$1 + 3] = end; /* end, if cond fails */ + + g_lingo->processIf($1, $6 - $1, $6 - $1); } + ; + + repeatwhile: tREPEAT tWHILE { $$ = g_lingo->code3(g_lingo->c_repeatwhilecode, STOP, STOP); } ; @@ -568,7 +592,6 @@ endargdef: /* nothing */ argstore: /* nothing */ { g_lingo->codeArgStore(); g_lingo->_indef = kStateInDef; } ; - macro: ID nonemptyarglist { g_lingo->code1(g_lingo->c_call); g_lingo->codeString($1->c_str()); -- cgit v1.2.3