diff options
| author | Eugene Sandulenko | 2017-01-23 19:21:37 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-01-23 19:39:50 +0100 |
| commit | a1a42d31168f1b9e2db4d23ded16a7a5c41a5d1f (patch) | |
| tree | 8ba653bc69c41dd765b0e714e1108c8eda939ef4 | |
| parent | 68ab3f228ca2f8e2ef3fd5dcebd2167233e81f15 (diff) | |
| download | scummvm-rg350-a1a42d31168f1b9e2db4d23ded16a7a5c41a5d1f.tar.gz scummvm-rg350-a1a42d31168f1b9e2db4d23ded16a7a5c41a5d1f.tar.bz2 scummvm-rg350-a1a42d31168f1b9e2db4d23ded16a7a5c41a5d1f.zip | |
DIRECTOR: Lingo: Fix 57 more reduce/reduce conflicts in the grammar.
8 to go.
There was incorrect parsing for put..after command.
| -rw-r--r-- | engines/director/lingo/lingo-gr.cpp | 1097 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-gr.y | 1 |
2 files changed, 542 insertions, 556 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index ca89e5b3bf..327183868d 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -520,16 +520,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 112 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1581 +#define YYLAST 1548 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 96 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 40 /* YYNRULES -- Number of rules. */ -#define YYNRULES 152 +#define YYNRULES 151 /* YYNRULES -- Number of states. */ -#define YYNSTATES 333 +#define YYNSTATES 331 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -590,14 +590,14 @@ static const yytype_uint16 yyprhs[] = 224, 226, 227, 228, 229, 232, 235, 239, 241, 243, 245, 247, 249, 254, 256, 258, 261, 263, 267, 271, 275, 279, 283, 287, 291, 295, 299, 303, 307, 311, - 314, 318, 322, 326, 330, 334, 337, 340, 344, 348, - 353, 358, 363, 370, 375, 382, 387, 394, 399, 406, - 409, 411, 413, 416, 418, 421, 424, 427, 430, 432, - 437, 440, 445, 452, 457, 460, 464, 466, 470, 472, - 476, 479, 482, 485, 488, 492, 495, 498, 500, 504, - 507, 510, 513, 517, 520, 521, 525, 526, 535, 538, - 539, 548, 549, 550, 561, 562, 564, 568, 573, 574, - 578, 579, 581 + 314, 318, 322, 326, 330, 333, 336, 340, 344, 349, + 354, 359, 366, 371, 378, 383, 390, 395, 402, 405, + 407, 409, 412, 414, 417, 420, 423, 426, 428, 433, + 436, 441, 448, 453, 456, 460, 462, 466, 468, 472, + 475, 478, 481, 484, 488, 491, 494, 496, 500, 503, + 506, 509, 513, 516, 517, 521, 522, 531, 534, 535, + 544, 545, 546, 557, 558, 560, 564, 569, 570, 574, + 575, 577 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -634,34 +634,34 @@ static const yytype_int16 yyrhs[] = 66, 118, -1, 118, 91, 118, -1, 118, 92, 118, -1, 118, 62, 118, -1, 118, 57, 118, -1, 118, 58, 118, -1, 118, 63, 118, -1, 118, 64, 118, - -1, 65, 118, -1, 118, 82, 118, -1, 118, 67, - 118, -1, 118, 69, 118, -1, 118, 70, 118, -1, - 118, 71, 118, -1, 83, 118, -1, 84, 118, -1, - 89, 118, 90, -1, 93, 135, 94, -1, 76, 118, - 77, 118, -1, 76, 118, 78, 118, -1, 72, 118, - 40, 118, -1, 72, 118, 46, 118, 40, 118, -1, - 73, 118, 40, 118, -1, 73, 118, 46, 118, 40, - 118, -1, 74, 118, 40, 118, -1, 74, 118, 46, - 118, 40, 118, -1, 75, 118, 40, 118, -1, 75, - 118, 46, 118, 40, 118, -1, 42, 118, -1, 122, - -1, 125, -1, 30, 43, -1, 30, -1, 32, 120, - -1, 56, 121, -1, 18, 118, -1, 17, 118, -1, - 17, -1, 19, 89, 135, 90, -1, 19, 135, -1, - 80, 89, 21, 90, -1, 80, 89, 21, 95, 135, - 90, -1, 53, 118, 48, 118, -1, 53, 118, -1, - 20, 21, 135, -1, 21, -1, 120, 95, 21, -1, - 21, -1, 121, 95, 21, -1, 33, 36, -1, 33, - 39, -1, 33, 41, -1, 33, 123, -1, 33, 123, - 124, -1, 33, 124, -1, 31, 118, -1, 118, -1, - 40, 38, 118, -1, 38, 118, -1, 54, 55, -1, - 54, 123, -1, 54, 123, 124, -1, 54, 124, -1, - -1, 26, 126, 135, -1, -1, 37, 21, 128, 114, - 132, 98, 133, 116, -1, 51, 21, -1, -1, 52, - 21, 129, 114, 132, 98, 133, 116, -1, -1, -1, - 79, 21, 130, 114, 131, 132, 98, 133, 116, 25, - -1, -1, 21, -1, 132, 95, 21, -1, 132, 98, - 95, 21, -1, -1, 21, 114, 135, -1, -1, 118, - -1, 135, 95, 118, -1 + -1, 65, 118, -1, 118, 82, 118, -1, 118, 69, + 118, -1, 118, 70, 118, -1, 118, 71, 118, -1, + 83, 118, -1, 84, 118, -1, 89, 118, 90, -1, + 93, 135, 94, -1, 76, 118, 77, 118, -1, 76, + 118, 78, 118, -1, 72, 118, 40, 118, -1, 72, + 118, 46, 118, 40, 118, -1, 73, 118, 40, 118, + -1, 73, 118, 46, 118, 40, 118, -1, 74, 118, + 40, 118, -1, 74, 118, 46, 118, 40, 118, -1, + 75, 118, 40, 118, -1, 75, 118, 46, 118, 40, + 118, -1, 42, 118, -1, 122, -1, 125, -1, 30, + 43, -1, 30, -1, 32, 120, -1, 56, 121, -1, + 18, 118, -1, 17, 118, -1, 17, -1, 19, 89, + 135, 90, -1, 19, 135, -1, 80, 89, 21, 90, + -1, 80, 89, 21, 95, 135, 90, -1, 53, 118, + 48, 118, -1, 53, 118, -1, 20, 21, 135, -1, + 21, -1, 120, 95, 21, -1, 21, -1, 121, 95, + 21, -1, 33, 36, -1, 33, 39, -1, 33, 41, + -1, 33, 123, -1, 33, 123, 124, -1, 33, 124, + -1, 31, 118, -1, 118, -1, 40, 38, 118, -1, + 38, 118, -1, 54, 55, -1, 54, 123, -1, 54, + 123, 124, -1, 54, 124, -1, -1, 26, 126, 135, + -1, -1, 37, 21, 128, 114, 132, 98, 133, 116, + -1, 51, 21, -1, -1, 52, 21, 129, 114, 132, + 98, 133, 116, -1, -1, -1, 79, 21, 130, 114, + 131, 132, 98, 133, 116, 25, -1, -1, 21, -1, + 132, 95, 21, -1, 132, 98, 95, 21, -1, -1, + 21, 114, 135, -1, -1, 118, -1, 135, 95, 118, + -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -676,13 +676,13 @@ static const yytype_uint16 yyrline[] = 391, 394, 397, 400, 404, 411, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, - 441, 442, 443, 444, 445, 446, 447, 448, 449, 452, - 453, 454, 455, 456, 458, 459, 460, 463, 466, 469, - 470, 471, 472, 473, 474, 475, 478, 479, 482, 483, - 494, 495, 496, 497, 500, 503, 508, 509, 512, 513, - 516, 517, 520, 523, 526, 526, 556, 556, 562, 565, - 565, 570, 571, 570, 581, 582, 583, 584, 586, 590, - 598, 599, 600 + 441, 442, 443, 444, 445, 446, 447, 448, 451, 452, + 453, 454, 455, 457, 458, 459, 462, 465, 468, 469, + 470, 471, 472, 473, 474, 477, 478, 481, 482, 493, + 494, 495, 496, 499, 502, 507, 508, 511, 512, 515, + 516, 519, 522, 525, 525, 555, 555, 561, 564, 564, + 569, 570, 569, 580, 581, 582, 583, 585, 589, 597, + 598, 599 }; #endif @@ -745,13 +745,13 @@ static const yytype_uint8 yyr1[] = 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 119, + 118, 118, 118, 118, 118, 118, 118, 118, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 119, 119, 119, 119, 119, 120, 120, 121, 121, - 122, 122, 122, 122, 122, 122, 123, 123, 124, 124, - 125, 125, 125, 125, 126, 125, 128, 127, 127, 129, - 127, 130, 131, 127, 132, 132, 132, 132, 133, 134, - 135, 135, 135 + 119, 119, 119, 119, 119, 120, 120, 121, 121, 122, + 122, 122, 122, 122, 122, 123, 123, 124, 124, 125, + 125, 125, 125, 126, 125, 128, 127, 127, 129, 127, + 130, 131, 127, 132, 132, 132, 132, 133, 134, 135, + 135, 135 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -765,14 +765,14 @@ static const yytype_uint8 yyr2[] = 1, 0, 0, 0, 2, 2, 3, 1, 1, 1, 1, 1, 4, 1, 1, 2, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, - 3, 3, 3, 3, 3, 2, 2, 3, 3, 4, - 4, 4, 6, 4, 6, 4, 6, 4, 6, 2, - 1, 1, 2, 1, 2, 2, 2, 2, 1, 4, - 2, 4, 6, 4, 2, 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, 3, - 0, 1, 3 + 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, 2, 1, 4, 2, + 4, 6, 4, 2, 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, 3, 0, + 1, 3 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -780,99 +780,99 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 0, 0, 57, 64, 0, 58, 61, 108, 0, 150, - 0, 51, 60, 59, 134, 103, 0, 0, 49, 0, + 0, 0, 57, 64, 0, 58, 61, 107, 0, 149, + 0, 51, 60, 59, 133, 102, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 150, 0, 3, 66, 23, 11, 24, 0, 0, 0, - 0, 21, 8, 100, 101, 7, 9, 5, 4, 63, - 0, 66, 65, 107, 106, 150, 151, 110, 150, 150, - 150, 150, 102, 116, 104, 0, 120, 0, 121, 0, - 122, 127, 123, 125, 136, 99, 0, 47, 0, 0, - 0, 0, 138, 139, 114, 130, 131, 133, 118, 105, - 79, 0, 0, 0, 0, 0, 141, 0, 85, 86, + 149, 0, 3, 66, 23, 11, 24, 0, 0, 0, + 0, 21, 8, 99, 100, 7, 9, 5, 4, 63, + 0, 66, 65, 106, 105, 149, 150, 109, 149, 149, + 149, 149, 101, 115, 103, 0, 119, 0, 120, 0, + 121, 126, 122, 124, 135, 98, 0, 47, 0, 0, + 0, 0, 137, 138, 113, 129, 130, 132, 117, 104, + 79, 0, 0, 0, 0, 0, 140, 0, 84, 85, 0, 0, 1, 6, 0, 0, 0, 0, 44, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 151, 0, - 0, 115, 0, 149, 135, 0, 126, 129, 0, 124, - 51, 0, 0, 0, 48, 0, 0, 0, 0, 0, - 56, 51, 0, 132, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 51, 0, 87, 88, 2, - 0, 52, 0, 0, 51, 0, 28, 75, 76, 74, - 77, 78, 71, 81, 82, 83, 84, 80, 67, 68, - 69, 70, 72, 73, 109, 152, 62, 117, 128, 144, - 12, 13, 14, 19, 16, 0, 0, 18, 15, 144, - 113, 119, 91, 0, 93, 0, 95, 0, 97, 0, - 89, 90, 142, 111, 150, 53, 0, 46, 53, 0, - 45, 145, 0, 20, 17, 0, 0, 0, 0, 0, - 144, 0, 52, 0, 0, 52, 52, 22, 0, 148, - 148, 92, 94, 96, 98, 0, 112, 54, 55, 0, - 0, 52, 51, 32, 146, 0, 53, 53, 148, 25, - 52, 53, 29, 53, 0, 50, 51, 52, 40, 0, - 147, 137, 140, 53, 53, 52, 52, 52, 42, 38, - 0, 0, 39, 35, 0, 0, 52, 0, 0, 37, - 0, 0, 52, 51, 52, 51, 143, 0, 26, 30, - 31, 51, 33, 0, 34, 0, 27, 53, 36, 52, - 52, 41, 43 + 0, 0, 0, 0, 0, 0, 0, 150, 0, 0, + 114, 0, 148, 134, 0, 125, 128, 0, 123, 51, + 0, 0, 0, 48, 0, 0, 0, 0, 0, 56, + 51, 0, 131, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 51, 0, 86, 87, 2, 0, + 52, 0, 0, 51, 0, 28, 75, 76, 74, 77, + 78, 71, 81, 82, 83, 80, 67, 68, 69, 70, + 72, 73, 108, 151, 62, 116, 127, 143, 12, 13, + 14, 19, 16, 0, 0, 18, 15, 143, 112, 118, + 90, 0, 92, 0, 94, 0, 96, 0, 88, 89, + 141, 110, 149, 53, 0, 46, 53, 0, 45, 144, + 0, 20, 17, 0, 0, 0, 0, 0, 143, 0, + 52, 0, 0, 52, 52, 22, 0, 147, 147, 91, + 93, 95, 97, 0, 111, 54, 55, 0, 0, 52, + 51, 32, 145, 0, 53, 53, 147, 25, 52, 53, + 29, 53, 0, 50, 51, 52, 40, 0, 146, 136, + 139, 53, 53, 52, 52, 52, 42, 38, 0, 0, + 39, 35, 0, 0, 52, 0, 0, 37, 0, 0, + 52, 51, 52, 51, 142, 0, 26, 30, 31, 51, + 33, 0, 34, 0, 27, 53, 36, 52, 52, 41, + 43 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 41, 267, 42, 61, 44, 268, 46, 314, 297, - 298, 288, 299, 117, 47, 48, 49, 289, 70, 186, - 252, 50, 51, 257, 74, 99, 53, 82, 83, 54, - 71, 55, 150, 161, 175, 250, 242, 276, 56, 67 + -1, 41, 265, 42, 61, 44, 266, 46, 312, 295, + 296, 286, 297, 117, 47, 48, 49, 287, 70, 185, + 250, 50, 51, 255, 74, 99, 53, 82, 83, 54, + 71, 55, 149, 160, 174, 248, 240, 274, 56, 67 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -269 +#define YYPACT_NINF -271 static const yytype_int16 yypact[] = { - 322, -68, -269, -269, 220, -269, -269, 220, 220, 912, - 5, 1489, -269, -269, -269, -20, 35, 811, -269, 38, - 220, 33, 97, 42, 76, 79, 220, 877, 86, 220, - 220, 220, 220, 220, 220, 93, 53, 220, 220, 220, - 220, 4, -269, 13, -269, -269, -269, 59, 69, 978, - 220, 1458, -269, -269, -269, -269, -269, -269, -269, 62, - 220, -269, 1458, 1458, 1458, 220, 1458, 57, 220, 220, - 220, 220, -269, -269, 60, 220, -269, 220, -269, 120, - -269, 1458, 56, -269, -269, 946, 140, -269, -44, 220, - -32, 117, -269, -269, 1303, -269, 56, -269, -269, 82, - 121, 1017, 1049, 1081, 1113, 1334, -269, 143, 121, 121, - 1396, 52, -269, 405, 978, 220, 978, 133, 1427, 1458, - 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 220, 220, 946, 1396, -30, - 220, 57, 48, 57, 57, 159, 1458, 1458, 220, -269, - -269, 160, 220, 220, -269, 220, 220, 1272, 220, 220, - -269, -269, 220, -269, 161, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, -269, 49, -269, -269, -269, - 94, 1458, 95, 1365, -68, 220, -269, 20, 20, 20, - 121, 121, 121, 1458, 1458, 20, 20, 135, 294, 294, - 121, 121, 1458, 1458, -269, 1458, -269, -269, 1458, 168, - -269, 1458, 1458, 1458, 1458, 220, 220, 1458, 1458, 168, - 1458, -269, 1458, 1145, 1458, 1177, 1458, 1209, 1458, 1241, - 1458, 1458, -269, -269, 220, -269, -2, -269, -269, 737, - 1458, -269, 3, 1458, 1458, 3, 220, 220, 220, 220, - 168, 50, 571, 145, 220, 571, -269, -269, 171, 98, - 98, 1458, 1458, 1458, 1458, 3, -269, -269, -269, 169, - 220, 1458, 30, -14, -269, 175, -269, -269, 98, -269, - 1458, -269, -269, -269, 174, -269, -269, 174, -269, 978, - -269, 571, 571, -269, -269, 571, 571, 174, 174, -269, - 978, 737, -269, 147, 155, 488, 571, 180, 182, -269, - 184, 165, -269, -269, -269, -269, -269, 190, -269, -269, - -269, -269, -269, 737, -269, 654, -269, 654, -269, -269, - 571, -269, -269 + 320, -65, -271, -271, 218, -271, -271, 218, 218, 910, + 8, 1456, -271, -271, -271, 51, 35, 809, -271, 76, + 218, 96, 75, 86, 89, 97, 218, 875, 118, 218, + 218, 218, 218, 218, 218, 120, 60, 218, 218, 218, + 218, 3, -271, 13, -271, -271, -271, 61, 70, 976, + 218, 1425, -271, -271, -271, -271, -271, -271, -271, 65, + 218, -271, 1425, 1425, 1425, 218, 1425, 62, 218, 218, + 218, 218, -271, -271, 66, 218, -271, 218, -271, 122, + -271, 1425, 27, -271, -271, 944, 142, -271, -32, 218, + -26, 131, -271, -271, 1270, -271, 27, -271, -271, 82, + -10, 1015, 1047, 1079, 1111, 1301, -271, 158, -10, -10, + 1363, 52, -271, 403, 976, 218, 976, 135, 1394, 1425, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, 218, 218, 944, 1363, 5, 218, + 62, 19, 62, 62, 160, 1425, 1425, 218, -271, -271, + 162, 218, 218, -271, 218, 218, 712, 218, 218, -271, + -271, 218, -271, 163, 218, 218, 218, 218, 218, 218, + 218, 218, 218, 218, -271, 47, -271, -271, -271, 98, + 1425, 99, 1332, -65, 218, -271, 20, 20, 20, -10, + -10, -10, 1425, 20, 20, 133, 172, 172, -10, -10, + 1425, 1425, -271, 1425, -271, -271, 1425, 166, -271, 1425, + 1425, 1425, 1425, 218, 218, 1425, 1425, 166, 1425, -271, + 1425, 1143, 1425, 1175, 1425, 1207, 1425, 1239, 1425, 1425, + -271, -271, 218, -271, -2, -271, -271, 735, 1425, -271, + 4, 1425, 1425, 4, 218, 218, 218, 218, 166, 48, + 569, 144, 218, 569, -271, -271, 170, 100, 100, 1425, + 1425, 1425, 1425, 4, -271, -271, -271, 167, 218, 1425, + -14, -13, -271, 177, -271, -271, 100, -271, 1425, -271, + -271, -271, 164, -271, -271, 164, -271, 976, -271, 569, + 569, -271, -271, 569, 569, 164, 164, -271, 976, 735, + -271, 150, 156, 486, 569, 178, 179, -271, 181, 165, + -271, -271, -271, -271, -271, 183, -271, -271, -271, -271, + -271, 735, -271, 652, -271, 652, -271, -271, 569, -271, + -271 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -269, -269, 11, 109, 6, -228, 0, -269, -269, -269, - -50, -199, -73, -113, -269, -269, -269, -268, -107, 2, - -219, -269, 1, 7, -269, -269, -269, 198, -3, -269, - -269, -269, -269, -269, -269, -269, -197, -193, -269, -23 + -271, -271, 11, 107, 6, -236, 0, -271, -271, -271, + -60, -270, -83, -112, -271, -271, -271, -222, -106, 2, + -217, -271, 1, 7, -271, -271, -271, 194, -3, -271, + -271, -271, -271, -271, -271, -271, -195, -178, -271, -23 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -882,328 +882,320 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -64 static const yytype_int16 yytable[] = { - 45, 180, 155, 182, 112, 62, 43, 52, 63, 64, - 66, 256, 58, -10, 158, 285, 300, 111, 81, 255, - 57, 85, 245, 72, 97, 253, 68, 94, 81, 300, - 100, 101, 102, 103, 104, 105, 286, 156, 108, 109, - 110, 66, 139, 209, 254, 141, 142, 143, 144, 159, - 118, 119, 113, 265, 219, 282, 73, 291, 292, 84, - 204, 137, 295, 91, 296, 140, 138, 277, 232, 66, - 66, 66, 66, 312, 305, 306, 146, 239, 147, 149, - 283, 86, 87, 123, 124, 293, 125, 126, 302, 127, - 157, 57, 57, 163, 77, 328, 79, 92, 258, 302, - 93, -10, 130, 131, 132, 133, 134, 98, 330, 88, - 89, 135, 136, 45, 106, 118, 181, 183, 90, 43, - 52, 187, 188, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202, 203, 206, 233, - 266, 205, 107, 140, 234, 140, 178, 140, 114, 208, - 115, 69, 140, 211, 212, 145, 213, 214, 148, 217, - 218, 154, 160, 220, 176, 284, 222, 223, 224, 225, - 226, 227, 228, 229, 230, 231, 304, 164, 184, 301, - 207, 210, 221, 236, 235, 237, 240, 311, 126, 241, - 127, 270, 274, 275, 279, 238, 290, 313, 123, 124, - 315, 125, 126, 285, 127, 318, 323, 319, 325, 320, - 321, 251, 135, 136, 327, 326, 243, 244, 131, 132, - 133, 134, 179, 287, 309, 96, 135, 136, 0, 0, - 0, 2, 3, 4, 5, 66, 6, 0, 0, 0, - 0, 59, 12, 0, 13, 0, 0, 261, 262, 263, - 264, 0, 0, 259, 269, 271, 260, 272, 273, 0, - 0, 0, 60, 0, 22, 0, 0, 0, 0, 0, - 0, 280, 0, 281, 0, 0, 278, 0, 0, 0, - 0, 0, 294, 0, 0, 29, 0, 0, 0, 303, - 118, 0, 30, 31, 32, 33, 34, 307, 308, 310, - 0, 118, 0, 37, 38, 0, 0, 0, 317, 39, - 0, 0, 0, 40, 322, 0, 324, 0, 0, 0, - 0, 0, -6, 1, 0, 329, 0, 329, 0, 0, - 0, 331, 332, 2, 3, 4, 5, 0, 6, 7, - 8, 9, 10, 11, 12, 0, 13, 0, 14, 0, - 0, 0, 15, 0, 16, 17, 18, 123, 124, 19, - 125, 126, 0, 127, 20, 21, 22, 0, 0, 23, - 0, 0, 0, 24, 25, 26, 27, 0, 28, 133, - 134, 0, 0, 0, 0, 135, 136, 29, 0, 0, + 45, 254, 179, 112, 181, 62, 43, 52, 63, 64, + 66, 280, 58, -10, 154, 300, 283, 111, 81, 253, + 157, 85, 243, 57, 97, 251, 300, 94, 81, 68, + 100, 101, 102, 103, 104, 105, 281, 284, 108, 109, + 110, 66, 138, 207, 252, 140, 141, 142, 143, 155, + 118, 119, 113, 263, 217, 158, 73, 289, 290, 126, + 298, 136, 293, 310, 294, 77, 137, 79, 230, 66, + 66, 66, 66, 298, 303, 304, 145, 237, 146, 148, + 275, 134, 135, 123, 124, 326, 125, 88, 89, 126, + 156, 57, 57, 162, 72, 202, 90, 84, 291, 256, + 139, -10, 129, 130, 131, 132, 133, 91, 328, 204, + 92, 134, 135, 45, 139, 118, 180, 182, 93, 43, + 52, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199, 200, 201, 231, 264, 98, + 203, 106, 232, 139, 86, 87, 177, 139, 206, 107, + 114, 115, 209, 210, 69, 211, 212, 139, 215, 216, + 147, 144, 218, 153, 282, 220, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 302, 159, 163, 299, 175, + 183, 205, 234, 208, 219, 238, 309, 239, 233, 235, + 268, 272, 277, 283, 236, 273, 123, 124, 288, 125, + 311, 313, 126, 316, 317, 321, 318, 323, 324, 249, + 319, 285, 307, 325, 241, 242, 130, 131, 132, 133, + 178, 96, 0, 0, 134, 135, 0, 0, 0, 2, + 3, 4, 5, 66, 6, 123, 124, 0, 125, 59, + 12, 126, 13, 0, 0, 259, 260, 261, 262, 0, + 0, 257, 267, 269, 258, 270, 271, 132, 133, 0, + 60, 0, 22, 134, 135, 0, 0, 0, 0, 278, + 0, 279, 0, 0, 276, 0, 0, 0, 0, 0, + 292, 0, 0, 29, 0, 0, 0, 301, 118, 0, + 30, 31, 32, 33, 34, 305, 306, 308, 0, 118, + 0, 37, 38, 0, 0, 0, 315, 39, 0, 0, + 0, 40, 320, 0, 322, 0, 0, 0, 0, 0, + -6, 1, 0, 327, 0, 327, 0, 0, 0, 329, + 330, 2, 3, 4, 5, 0, 6, 7, 8, 9, + 10, 11, 12, 0, 13, 0, 14, 0, 0, 0, + 15, 0, 16, 17, 18, 0, 0, 19, 0, 0, + 0, 0, 20, 21, 22, 0, 0, 23, 0, 0, + 0, 24, 25, 26, 27, 0, 28, 0, 0, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, + 0, 0, 30, 31, 32, 33, 34, 0, 0, 35, + 36, 0, 0, 37, 38, 0, 0, 0, -6, 39, + 0, 0, 0, 40, 2, 3, 4, 5, 0, 6, + 7, 8, 9, 10, 11, 12, 0, 13, 0, 14, + 0, 0, 0, 15, 0, 16, 17, 18, 0, 0, + 19, 0, 0, 0, 0, 20, 21, 22, 0, 0, + 23, 0, 0, 0, 24, 25, 26, 27, 0, 28, + 0, 0, 0, 0, 0, 0, 0, 0, 29, 0, + 0, 0, 0, 0, 0, 30, 31, 32, 33, 34, + 0, 0, 35, 36, 0, 0, 37, 38, 0, 0, + 0, 0, 39, 0, 0, 0, 40, 2, 3, 4, + 5, 0, 6, 7, 8, 9, 10, 59, 12, 0, + 13, 314, 14, 0, 0, 0, 15, 0, 16, 17, + 18, 0, 0, 0, 0, 0, 0, 0, 20, 21, + 22, 0, 0, 23, 0, 0, 0, 0, 0, 26, + 27, 0, 28, 0, 0, 0, 0, 0, 0, 0, + 0, 29, 0, 0, 0, 0, 0, 0, 30, 31, + 32, 33, 34, 0, 0, 0, 36, 0, 0, 37, + 38, 0, 0, 0, 57, 39, 0, 0, 0, 40, + 2, 3, 4, 5, 0, 6, 7, 8, 9, 10, + 59, 12, 0, 13, 0, 14, 0, 0, 0, 15, + 0, 16, 17, 18, 0, 0, 0, 0, 0, 0, + 0, 20, 21, 22, 0, 0, 23, 0, 0, 0, + 0, 0, 26, 27, 0, 28, 0, 0, 0, 0, + 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, + 0, 30, 31, 32, 33, 34, 0, 0, 0, 36, + 0, 0, 37, 38, 0, 0, 0, 57, 39, 0, + 0, 0, 40, 2, 3, 4, 5, 0, 6, 7, + 8, 9, 10, 59, 12, 0, 13, 0, 14, 0, + 0, 0, 15, 0, 16, 17, 18, 0, 0, 0, + 0, 0, 0, 0, 20, 21, 22, 0, 0, 23, + 0, 0, 0, 0, 0, 26, 27, 0, 28, 0, + 0, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 30, 31, 32, 33, 34, 0, - 0, 35, 36, 0, 0, 37, 38, 0, 0, 0, - -6, 39, 0, 0, 0, 40, 2, 3, 4, 5, - 0, 6, 7, 8, 9, 10, 11, 12, 0, 13, - 0, 14, 0, 0, 0, 15, 0, 16, 17, 18, - 0, 0, 19, 0, 0, 0, 0, 20, 21, 22, - 0, 0, 23, 0, 0, 0, 24, 25, 26, 27, - 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, - 29, 0, 0, 0, 0, 0, 0, 30, 31, 32, - 33, 34, 0, 0, 35, 36, 0, 0, 37, 38, - 0, 0, 0, 0, 39, 0, 0, 0, 40, 2, - 3, 4, 5, 0, 6, 7, 8, 9, 10, 59, - 12, 0, 13, 316, 14, 0, 0, 0, 15, 0, - 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, - 20, 21, 22, 0, 0, 23, 0, 0, 0, 0, - 0, 26, 27, 0, 28, 0, 0, 0, 0, 0, - 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, - 30, 31, 32, 33, 34, 0, 0, 0, 36, 0, - 0, 37, 38, 0, 0, 0, 57, 39, 0, 0, - 0, 40, 2, 3, 4, 5, 0, 6, 7, 8, - 9, 10, 59, 12, 0, 13, 0, 14, 0, 0, - 0, 15, 0, 16, 17, 18, 0, 0, 0, 0, - 0, 0, 0, 20, 21, 22, 0, 0, 23, 0, - 0, 0, 0, 0, 26, 27, 0, 28, 0, 0, - 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, - 0, 0, 0, 30, 31, 32, 33, 34, 0, 0, - 0, 36, 0, 0, 37, 38, 0, 0, 0, 57, - 39, 0, 0, 0, 40, 2, 3, 4, 5, 0, - 6, 7, 8, 9, 10, 59, 12, 0, 13, 0, - 14, 0, 0, 0, 15, 0, 16, 17, 18, 0, - 0, 0, 0, 0, 0, 0, 20, 21, 22, 0, - 0, 23, 0, 0, 0, 0, 0, 26, 27, 0, - 28, 0, 0, 0, 0, 0, 0, 0, 0, 29, - 0, 0, 0, 0, 0, 0, 30, 31, 32, 33, - 34, 0, 0, 0, 36, 0, 0, 37, 38, 0, - 0, 0, 0, 39, 0, 0, 0, 40, 2, 3, - 4, 5, 0, 6, 7, 8, 9, 10, 59, 12, - 0, 13, 0, 14, 0, 0, 0, 15, 0, 16, - 17, 0, 0, 0, 0, 0, 0, 0, 0, 20, - 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, - 26, 27, 0, 28, 0, 0, 0, 0, 0, 0, - 0, 0, 29, 0, 0, 0, 0, 0, 0, 30, - 31, 32, 33, 34, 0, 0, 0, 36, 0, 0, - 37, 38, 2, 3, 4, 5, 39, 6, 0, 0, - 40, 0, 59, 12, 0, 13, 0, 0, 0, 0, - 0, 0, 75, 0, 0, 0, 0, 76, 0, 77, - 78, 79, 80, 60, 0, 22, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, - 0, 0, 0, 30, 31, 32, 33, 34, 2, 3, - 4, 5, 0, 6, 37, 38, 0, 0, 59, 12, - 39, 13, 0, 0, 40, 0, 0, 0, 75, 0, - 0, 0, 0, 0, 0, 77, 0, 79, 0, 60, - 0, 22, 0, 2, 3, 4, 5, 0, 6, 0, - 0, 0, 95, 59, 12, 0, 13, 0, 0, 0, - 0, 0, 29, 0, 0, 0, 0, 0, 0, 30, - 31, 32, 33, 34, 60, 0, 22, 0, 0, 0, - 37, 38, 0, 0, 0, 0, 39, 0, 0, 0, - 40, 0, 0, 0, 0, 0, 0, 29, 0, 0, - 0, 151, 0, 0, 30, 31, 32, 33, 34, 2, - 3, 4, 5, 0, 6, 37, 38, 0, 0, 59, - 12, 65, 13, 120, 121, 40, 0, 0, 122, 123, - 124, 0, 125, 152, 153, 127, 128, 129, 0, 0, - 60, 0, 22, 0, 0, 0, 0, 0, 130, 131, - 132, 133, 134, 0, 0, 0, 0, 135, 136, 0, - 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, - 30, 31, 32, 33, 34, 0, 0, 165, 0, 0, - 0, 37, 38, 166, 0, 0, 0, 116, 0, 0, - 0, 40, 0, 0, 120, 121, 0, 0, 0, 122, - 123, 124, 0, 125, 126, 0, 127, 128, 129, 167, - 0, 0, 0, 0, 0, 168, 0, 0, 0, 130, - 131, 132, 133, 134, 0, 0, 120, 121, 135, 136, - 0, 122, 123, 124, 0, 125, 126, 0, 127, 128, - 129, 169, 0, 0, 0, 0, 0, 170, 0, 0, - 0, 130, 131, 132, 133, 134, 0, 0, 120, 121, - 135, 136, 0, 122, 123, 124, 0, 125, 126, 0, - 127, 128, 129, 171, 0, 0, 0, 0, 0, 172, - 0, 0, 0, 130, 131, 132, 133, 134, 0, 0, - 120, 121, 135, 136, 0, 122, 123, 124, 0, 125, - 126, 0, 127, 128, 129, 246, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 130, 131, 132, 133, 134, - 0, 0, 120, 121, 135, 136, 0, 122, 123, 124, - 0, 125, 126, 0, 127, 128, 129, 247, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 130, 131, 132, - 133, 134, 0, 0, 120, 121, 135, 136, 0, 122, - 123, 124, 0, 125, 126, 0, 127, 128, 129, 248, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 130, - 131, 132, 133, 134, 0, 0, 120, 121, 135, 136, - 0, 122, 123, 124, 0, 125, 126, 0, 127, 128, - 129, 249, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 130, 131, 132, 133, 134, 0, 0, 120, 121, - 135, 136, 0, 122, 123, 124, 0, 125, 126, 0, - 127, 128, 129, 0, 0, 0, 0, 0, 215, 0, - 0, 0, 0, 130, 131, 132, 133, 134, 0, 120, - 121, 0, 135, 136, 122, 123, 124, 0, 125, 126, - 0, 127, 128, 129, 0, 0, 0, 0, 0, 0, - 0, 162, 0, 216, 130, 131, 132, 133, 134, 0, - 120, 121, 0, 135, 136, 122, 123, 124, 0, 125, - 126, 0, 127, 128, 129, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 130, 131, 132, 133, 134, - 0, 120, 121, 0, 135, 136, 122, 123, 124, 0, - 125, 126, 0, 127, 128, 129, 0, 0, 0, 0, - 0, 173, 174, 0, 0, 0, 130, 131, 132, 133, - 134, 0, 120, 121, 0, 135, 136, 122, 123, 124, - 0, 125, 126, 0, 127, 128, 129, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 185, 130, 131, 132, - 133, 134, 0, 120, 121, 177, 135, 136, 122, 123, - 124, 0, 125, 126, 0, 127, 128, 129, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 130, 131, - 132, 133, 134, 0, 120, 121, 177, 135, 136, 122, - 123, 124, 0, 125, 126, 0, 127, 128, 129, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 185, 130, - 131, 132, 133, 134, 0, 120, 121, 0, 135, 136, - 122, 123, 124, 0, 125, 126, 0, 127, 128, 129, + 0, 0, 36, 0, 0, 37, 38, 0, 0, 0, + 0, 39, 0, 0, 0, 40, 2, 3, 4, 5, + 0, 6, 7, 8, 9, 10, 59, 12, 213, 13, + 0, 14, 0, 0, 0, 15, 0, 16, 17, 120, + 121, 0, 0, 0, 122, 123, 124, 20, 125, 22, + 0, 126, 127, 128, 0, 0, 0, 0, 26, 27, + 0, 28, 0, 214, 129, 130, 131, 132, 133, 0, + 29, 0, 0, 134, 135, 0, 0, 30, 31, 32, + 33, 34, 0, 0, 0, 36, 0, 0, 37, 38, + 2, 3, 4, 5, 39, 6, 0, 0, 40, 0, + 59, 12, 0, 13, 0, 0, 0, 0, 0, 0, + 75, 0, 0, 0, 0, 76, 0, 77, 78, 79, + 80, 60, 0, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 130, 131, 132, 133, 134, 0, -63, -63, 0, 135, - 136, -63, -63, -63, 0, -63, -63, 0, -63, -63, - -63, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, -63, 0, 0, -63, -63, 0, 0, 69, 0, - -63, -63 + 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, + 0, 30, 31, 32, 33, 34, 2, 3, 4, 5, + 0, 6, 37, 38, 0, 0, 59, 12, 39, 13, + 0, 0, 40, 0, 0, 0, 75, 0, 0, 0, + 0, 0, 0, 77, 0, 79, 0, 60, 0, 22, + 0, 2, 3, 4, 5, 0, 6, 0, 0, 0, + 95, 59, 12, 0, 13, 0, 0, 0, 0, 0, + 29, 0, 0, 0, 0, 0, 0, 30, 31, 32, + 33, 34, 60, 0, 22, 0, 0, 0, 37, 38, + 0, 0, 0, 0, 39, 0, 0, 0, 40, 0, + 0, 0, 0, 0, 0, 29, 0, 0, 0, 150, + 0, 0, 30, 31, 32, 33, 34, 2, 3, 4, + 5, 0, 6, 37, 38, 0, 0, 59, 12, 65, + 13, 120, 121, 40, 0, 0, 122, 123, 124, 0, + 125, 151, 152, 126, 127, 128, 0, 0, 60, 0, + 22, 0, 0, 0, 0, 0, 129, 130, 131, 132, + 133, 0, 0, 0, 0, 134, 135, 0, 0, 0, + 0, 29, 0, 0, 0, 0, 0, 0, 30, 31, + 32, 33, 34, 0, 0, 164, 0, 0, 0, 37, + 38, 165, 0, 0, 0, 116, 0, 0, 0, 40, + 0, 0, 120, 121, 0, 0, 0, 122, 123, 124, + 0, 125, 0, 0, 126, 127, 128, 166, 0, 0, + 0, 0, 0, 167, 0, 0, 0, 129, 130, 131, + 132, 133, 0, 0, 120, 121, 134, 135, 0, 122, + 123, 124, 0, 125, 0, 0, 126, 127, 128, 168, + 0, 0, 0, 0, 0, 169, 0, 0, 0, 129, + 130, 131, 132, 133, 0, 0, 120, 121, 134, 135, + 0, 122, 123, 124, 0, 125, 0, 0, 126, 127, + 128, 170, 0, 0, 0, 0, 0, 171, 0, 0, + 0, 129, 130, 131, 132, 133, 0, 0, 120, 121, + 134, 135, 0, 122, 123, 124, 0, 125, 0, 0, + 126, 127, 128, 244, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 129, 130, 131, 132, 133, 0, 0, + 120, 121, 134, 135, 0, 122, 123, 124, 0, 125, + 0, 0, 126, 127, 128, 245, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 129, 130, 131, 132, 133, + 0, 0, 120, 121, 134, 135, 0, 122, 123, 124, + 0, 125, 0, 0, 126, 127, 128, 246, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 129, 130, 131, + 132, 133, 0, 0, 120, 121, 134, 135, 0, 122, + 123, 124, 0, 125, 0, 0, 126, 127, 128, 247, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 129, + 130, 131, 132, 133, 0, 0, 120, 121, 134, 135, + 0, 122, 123, 124, 0, 125, 0, 0, 126, 127, + 128, 0, 0, 0, 0, 0, 0, 0, 161, 0, + 0, 129, 130, 131, 132, 133, 0, 120, 121, 0, + 134, 135, 122, 123, 124, 0, 125, 0, 0, 126, + 127, 128, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 129, 130, 131, 132, 133, 0, 120, 121, + 0, 134, 135, 122, 123, 124, 0, 125, 0, 0, + 126, 127, 128, 0, 0, 0, 0, 0, 172, 173, + 0, 0, 0, 129, 130, 131, 132, 133, 0, 120, + 121, 0, 134, 135, 122, 123, 124, 0, 125, 0, + 0, 126, 127, 128, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 184, 129, 130, 131, 132, 133, 0, + 120, 121, 176, 134, 135, 122, 123, 124, 0, 125, + 0, 0, 126, 127, 128, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 129, 130, 131, 132, 133, + 0, 120, 121, 176, 134, 135, 122, 123, 124, 0, + 125, 0, 0, 126, 127, 128, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 184, 129, 130, 131, 132, + 133, 0, 120, 121, 0, 134, 135, 122, 123, 124, + 0, 125, 0, 0, 126, 127, 128, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 129, 130, 131, + 132, 133, 0, -63, -63, 0, 134, 135, -63, -63, + -63, 0, -63, 0, 0, -63, -63, -63, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -63, 0, + 0, -63, -63, 0, 0, 69, 0, -63, -63 }; static const yytype_int16 yycheck[] = { - 0, 114, 46, 116, 0, 4, 0, 0, 7, 8, - 9, 239, 1, 0, 46, 29, 284, 40, 17, 238, - 88, 20, 219, 43, 27, 27, 21, 26, 27, 297, - 29, 30, 31, 32, 33, 34, 50, 81, 37, 38, - 39, 40, 65, 150, 46, 68, 69, 70, 71, 81, - 49, 50, 41, 250, 161, 25, 21, 276, 277, 21, - 90, 60, 281, 21, 283, 95, 65, 260, 175, 68, - 69, 70, 71, 301, 293, 294, 75, 184, 77, 82, - 50, 48, 49, 63, 64, 278, 66, 67, 287, 69, - 89, 88, 88, 96, 38, 323, 40, 21, 95, 298, - 21, 88, 82, 83, 84, 85, 86, 21, 327, 12, - 13, 91, 92, 113, 21, 114, 115, 116, 21, 113, + 0, 237, 114, 0, 116, 4, 0, 0, 7, 8, + 9, 25, 1, 0, 46, 285, 29, 40, 17, 236, + 46, 20, 217, 88, 27, 27, 296, 26, 27, 21, + 29, 30, 31, 32, 33, 34, 50, 50, 37, 38, + 39, 40, 65, 149, 46, 68, 69, 70, 71, 81, + 49, 50, 41, 248, 160, 81, 21, 274, 275, 69, + 282, 60, 279, 299, 281, 38, 65, 40, 174, 68, + 69, 70, 71, 295, 291, 292, 75, 183, 77, 82, + 258, 91, 92, 63, 64, 321, 66, 12, 13, 69, + 89, 88, 88, 96, 43, 90, 21, 21, 276, 95, + 95, 88, 82, 83, 84, 85, 86, 21, 325, 90, + 21, 91, 92, 113, 95, 114, 115, 116, 21, 113, 113, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 90, 90, - 90, 140, 89, 95, 95, 95, 94, 95, 89, 148, - 81, 89, 95, 152, 153, 95, 155, 156, 38, 158, - 159, 21, 45, 162, 21, 272, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 174, 289, 95, 45, 286, - 21, 21, 21, 181, 90, 90, 185, 300, 67, 21, - 69, 46, 21, 95, 25, 184, 21, 50, 63, 64, - 45, 66, 67, 29, 69, 25, 313, 25, 315, 25, - 45, 234, 91, 92, 321, 25, 215, 216, 83, 84, - 85, 86, 113, 273, 297, 27, 91, 92, -1, -1, - -1, 11, 12, 13, 14, 234, 16, -1, -1, -1, - -1, 21, 22, -1, 24, -1, -1, 246, 247, 248, - 249, -1, -1, 242, 252, 254, 245, 255, 256, -1, - -1, -1, 42, -1, 44, -1, -1, -1, -1, -1, - -1, 270, -1, 271, -1, -1, 265, -1, -1, -1, - -1, -1, 280, -1, -1, 65, -1, -1, -1, 287, - 289, -1, 72, 73, 74, 75, 76, 295, 296, 297, - -1, 300, -1, 83, 84, -1, -1, -1, 306, 89, - -1, -1, -1, 93, 312, -1, 314, -1, -1, -1, - -1, -1, 0, 1, -1, 325, -1, 327, -1, -1, - -1, 329, 330, 11, 12, 13, 14, -1, 16, 17, + 129, 130, 131, 132, 133, 134, 135, 90, 90, 21, + 139, 21, 95, 95, 48, 49, 94, 95, 147, 89, + 89, 81, 151, 152, 89, 154, 155, 95, 157, 158, + 38, 95, 161, 21, 270, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 287, 45, 95, 284, 21, + 45, 21, 180, 21, 21, 184, 298, 21, 90, 90, + 46, 21, 25, 29, 183, 95, 63, 64, 21, 66, + 50, 45, 69, 25, 25, 311, 25, 313, 25, 232, + 45, 271, 295, 319, 213, 214, 83, 84, 85, 86, + 113, 27, -1, -1, 91, 92, -1, -1, -1, 11, + 12, 13, 14, 232, 16, 63, 64, -1, 66, 21, + 22, 69, 24, -1, -1, 244, 245, 246, 247, -1, + -1, 240, 250, 252, 243, 253, 254, 85, 86, -1, + 42, -1, 44, 91, 92, -1, -1, -1, -1, 268, + -1, 269, -1, -1, 263, -1, -1, -1, -1, -1, + 278, -1, -1, 65, -1, -1, -1, 285, 287, -1, + 72, 73, 74, 75, 76, 293, 294, 295, -1, 298, + -1, 83, 84, -1, -1, -1, 304, 89, -1, -1, + -1, 93, 310, -1, 312, -1, -1, -1, -1, -1, + 0, 1, -1, 323, -1, 325, -1, -1, -1, 327, + 328, 11, 12, 13, 14, -1, 16, 17, 18, 19, + 20, 21, 22, -1, 24, -1, 26, -1, -1, -1, + 30, -1, 32, 33, 34, -1, -1, 37, -1, -1, + -1, -1, 42, 43, 44, -1, -1, 47, -1, -1, + -1, 51, 52, 53, 54, -1, 56, -1, -1, -1, + -1, -1, -1, -1, -1, 65, -1, -1, -1, -1, + -1, -1, 72, 73, 74, 75, 76, -1, -1, 79, + 80, -1, -1, 83, 84, -1, -1, -1, 88, 89, + -1, -1, -1, 93, 11, 12, 13, 14, -1, 16, + 17, 18, 19, 20, 21, 22, -1, 24, -1, 26, + -1, -1, -1, 30, -1, 32, 33, 34, -1, -1, + 37, -1, -1, -1, -1, 42, 43, 44, -1, -1, + 47, -1, -1, -1, 51, 52, 53, 54, -1, 56, + -1, -1, -1, -1, -1, -1, -1, -1, 65, -1, + -1, -1, -1, -1, -1, 72, 73, 74, 75, 76, + -1, -1, 79, 80, -1, -1, 83, 84, -1, -1, + -1, -1, 89, -1, -1, -1, 93, 11, 12, 13, + 14, -1, 16, 17, 18, 19, 20, 21, 22, -1, + 24, 25, 26, -1, -1, -1, 30, -1, 32, 33, + 34, -1, -1, -1, -1, -1, -1, -1, 42, 43, + 44, -1, -1, 47, -1, -1, -1, -1, -1, 53, + 54, -1, 56, -1, -1, -1, -1, -1, -1, -1, + -1, 65, -1, -1, -1, -1, -1, -1, 72, 73, + 74, 75, 76, -1, -1, -1, 80, -1, -1, 83, + 84, -1, -1, -1, 88, 89, -1, -1, -1, 93, + 11, 12, 13, 14, -1, 16, 17, 18, 19, 20, + 21, 22, -1, 24, -1, 26, -1, -1, -1, 30, + -1, 32, 33, 34, -1, -1, -1, -1, -1, -1, + -1, 42, 43, 44, -1, -1, 47, -1, -1, -1, + -1, -1, 53, 54, -1, 56, -1, -1, -1, -1, + -1, -1, -1, -1, 65, -1, -1, -1, -1, -1, + -1, 72, 73, 74, 75, 76, -1, -1, -1, 80, + -1, -1, 83, 84, -1, -1, -1, 88, 89, -1, + -1, -1, 93, 11, 12, 13, 14, -1, 16, 17, 18, 19, 20, 21, 22, -1, 24, -1, 26, -1, - -1, -1, 30, -1, 32, 33, 34, 63, 64, 37, - 66, 67, -1, 69, 42, 43, 44, -1, -1, 47, - -1, -1, -1, 51, 52, 53, 54, -1, 56, 85, - 86, -1, -1, -1, -1, 91, 92, 65, -1, -1, + -1, -1, 30, -1, 32, 33, 34, -1, -1, -1, + -1, -1, -1, -1, 42, 43, 44, -1, -1, 47, + -1, -1, -1, -1, -1, 53, 54, -1, 56, -1, + -1, -1, -1, -1, -1, -1, -1, 65, -1, -1, -1, -1, -1, -1, 72, 73, 74, 75, 76, -1, - -1, 79, 80, -1, -1, 83, 84, -1, -1, -1, - 88, 89, -1, -1, -1, 93, 11, 12, 13, 14, - -1, 16, 17, 18, 19, 20, 21, 22, -1, 24, - -1, 26, -1, -1, -1, 30, -1, 32, 33, 34, - -1, -1, 37, -1, -1, -1, -1, 42, 43, 44, - -1, -1, 47, -1, -1, -1, 51, 52, 53, 54, - -1, 56, -1, -1, -1, -1, -1, -1, -1, -1, - 65, -1, -1, -1, -1, -1, -1, 72, 73, 74, - 75, 76, -1, -1, 79, 80, -1, -1, 83, 84, - -1, -1, -1, -1, 89, -1, -1, -1, 93, 11, - 12, 13, 14, -1, 16, 17, 18, 19, 20, 21, - 22, -1, 24, 25, 26, -1, -1, -1, 30, -1, - 32, 33, 34, -1, -1, -1, -1, -1, -1, -1, - 42, 43, 44, -1, -1, 47, -1, -1, -1, -1, - -1, 53, 54, -1, 56, -1, -1, -1, -1, -1, - -1, -1, -1, 65, -1, -1, -1, -1, -1, -1, - 72, 73, 74, 75, 76, -1, -1, -1, 80, -1, - -1, 83, 84, -1, -1, -1, 88, 89, -1, -1, - -1, 93, 11, 12, 13, 14, -1, 16, 17, 18, - 19, 20, 21, 22, -1, 24, -1, 26, -1, -1, - -1, 30, -1, 32, 33, 34, -1, -1, -1, -1, - -1, -1, -1, 42, 43, 44, -1, -1, 47, -1, - -1, -1, -1, -1, 53, 54, -1, 56, -1, -1, - -1, -1, -1, -1, -1, -1, 65, -1, -1, -1, - -1, -1, -1, 72, 73, 74, 75, 76, -1, -1, - -1, 80, -1, -1, 83, 84, -1, -1, -1, 88, - 89, -1, -1, -1, 93, 11, 12, 13, 14, -1, - 16, 17, 18, 19, 20, 21, 22, -1, 24, -1, - 26, -1, -1, -1, 30, -1, 32, 33, 34, -1, - -1, -1, -1, -1, -1, -1, 42, 43, 44, -1, - -1, 47, -1, -1, -1, -1, -1, 53, 54, -1, - 56, -1, -1, -1, -1, -1, -1, -1, -1, 65, - -1, -1, -1, -1, -1, -1, 72, 73, 74, 75, - 76, -1, -1, -1, 80, -1, -1, 83, 84, -1, - -1, -1, -1, 89, -1, -1, -1, 93, 11, 12, - 13, 14, -1, 16, 17, 18, 19, 20, 21, 22, - -1, 24, -1, 26, -1, -1, -1, 30, -1, 32, - 33, -1, -1, -1, -1, -1, -1, -1, -1, 42, - -1, 44, -1, -1, -1, -1, -1, -1, -1, -1, - 53, 54, -1, 56, -1, -1, -1, -1, -1, -1, - -1, -1, 65, -1, -1, -1, -1, -1, -1, 72, - 73, 74, 75, 76, -1, -1, -1, 80, -1, -1, - 83, 84, 11, 12, 13, 14, 89, 16, -1, -1, - 93, -1, 21, 22, -1, 24, -1, -1, -1, -1, - -1, -1, 31, -1, -1, -1, -1, 36, -1, 38, - 39, 40, 41, 42, -1, 44, -1, -1, -1, -1, + -1, -1, 80, -1, -1, 83, 84, -1, -1, -1, + -1, 89, -1, -1, -1, 93, 11, 12, 13, 14, + -1, 16, 17, 18, 19, 20, 21, 22, 46, 24, + -1, 26, -1, -1, -1, 30, -1, 32, 33, 57, + 58, -1, -1, -1, 62, 63, 64, 42, 66, 44, + -1, 69, 70, 71, -1, -1, -1, -1, 53, 54, + -1, 56, -1, 81, 82, 83, 84, 85, 86, -1, + 65, -1, -1, 91, 92, -1, -1, 72, 73, 74, + 75, 76, -1, -1, -1, 80, -1, -1, 83, 84, + 11, 12, 13, 14, 89, 16, -1, -1, 93, -1, + 21, 22, -1, 24, -1, -1, -1, -1, -1, -1, + 31, -1, -1, -1, -1, 36, -1, 38, 39, 40, + 41, 42, -1, 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 65, -1, -1, -1, - -1, -1, -1, 72, 73, 74, 75, 76, 11, 12, - 13, 14, -1, 16, 83, 84, -1, -1, 21, 22, - 89, 24, -1, -1, 93, -1, -1, -1, 31, -1, - -1, -1, -1, -1, -1, 38, -1, 40, -1, 42, - -1, 44, -1, 11, 12, 13, 14, -1, 16, -1, - -1, -1, 55, 21, 22, -1, 24, -1, -1, -1, - -1, -1, 65, -1, -1, -1, -1, -1, -1, 72, - 73, 74, 75, 76, 42, -1, 44, -1, -1, -1, - 83, 84, -1, -1, -1, -1, 89, -1, -1, -1, - 93, -1, -1, -1, -1, -1, -1, 65, -1, -1, - -1, 35, -1, -1, 72, 73, 74, 75, 76, 11, - 12, 13, 14, -1, 16, 83, 84, -1, -1, 21, - 22, 89, 24, 57, 58, 93, -1, -1, 62, 63, - 64, -1, 66, 67, 68, 69, 70, 71, -1, -1, - 42, -1, 44, -1, -1, -1, -1, -1, 82, 83, - 84, 85, 86, -1, -1, -1, -1, 91, 92, -1, - -1, -1, -1, 65, -1, -1, -1, -1, -1, -1, - 72, 73, 74, 75, 76, -1, -1, 40, -1, -1, - -1, 83, 84, 46, -1, -1, -1, 89, -1, -1, - -1, 93, -1, -1, 57, 58, -1, -1, -1, 62, - 63, 64, -1, 66, 67, -1, 69, 70, 71, 40, + -1, -1, -1, -1, 65, -1, -1, -1, -1, -1, + -1, 72, 73, 74, 75, 76, 11, 12, 13, 14, + -1, 16, 83, 84, -1, -1, 21, 22, 89, 24, + -1, -1, 93, -1, -1, -1, 31, -1, -1, -1, + -1, -1, -1, 38, -1, 40, -1, 42, -1, 44, + -1, 11, 12, 13, 14, -1, 16, -1, -1, -1, + 55, 21, 22, -1, 24, -1, -1, -1, -1, -1, + 65, -1, -1, -1, -1, -1, -1, 72, 73, 74, + 75, 76, 42, -1, 44, -1, -1, -1, 83, 84, + -1, -1, -1, -1, 89, -1, -1, -1, 93, -1, + -1, -1, -1, -1, -1, 65, -1, -1, -1, 35, + -1, -1, 72, 73, 74, 75, 76, 11, 12, 13, + 14, -1, 16, 83, 84, -1, -1, 21, 22, 89, + 24, 57, 58, 93, -1, -1, 62, 63, 64, -1, + 66, 67, 68, 69, 70, 71, -1, -1, 42, -1, + 44, -1, -1, -1, -1, -1, 82, 83, 84, 85, + 86, -1, -1, -1, -1, 91, 92, -1, -1, -1, + -1, 65, -1, -1, -1, -1, -1, -1, 72, 73, + 74, 75, 76, -1, -1, 40, -1, -1, -1, 83, + 84, 46, -1, -1, -1, 89, -1, -1, -1, 93, + -1, -1, 57, 58, -1, -1, -1, 62, 63, 64, + -1, 66, -1, -1, 69, 70, 71, 40, -1, -1, + -1, -1, -1, 46, -1, -1, -1, 82, 83, 84, + 85, 86, -1, -1, 57, 58, 91, 92, -1, 62, + 63, 64, -1, 66, -1, -1, 69, 70, 71, 40, -1, -1, -1, -1, -1, 46, -1, -1, -1, 82, 83, 84, 85, 86, -1, -1, 57, 58, 91, 92, - -1, 62, 63, 64, -1, 66, 67, -1, 69, 70, + -1, 62, 63, 64, -1, 66, -1, -1, 69, 70, 71, 40, -1, -1, -1, -1, -1, 46, -1, -1, -1, 82, 83, 84, 85, 86, -1, -1, 57, 58, - 91, 92, -1, 62, 63, 64, -1, 66, 67, -1, - 69, 70, 71, 40, -1, -1, -1, -1, -1, 46, + 91, 92, -1, 62, 63, 64, -1, 66, -1, -1, + 69, 70, 71, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, -1, -1, 57, 58, 91, 92, -1, 62, 63, 64, -1, 66, - 67, -1, 69, 70, 71, 40, -1, -1, -1, -1, + -1, -1, 69, 70, 71, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, -1, -1, 57, 58, 91, 92, -1, 62, 63, 64, - -1, 66, 67, -1, 69, 70, 71, 40, -1, -1, + -1, 66, -1, -1, 69, 70, 71, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, -1, -1, 57, 58, 91, 92, -1, 62, - 63, 64, -1, 66, 67, -1, 69, 70, 71, 40, + 63, 64, -1, 66, -1, -1, 69, 70, 71, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, -1, -1, 57, 58, 91, 92, - -1, 62, 63, 64, -1, 66, 67, -1, 69, 70, - 71, 40, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 82, 83, 84, 85, 86, -1, -1, 57, 58, - 91, 92, -1, 62, 63, 64, -1, 66, 67, -1, - 69, 70, 71, -1, -1, -1, -1, -1, 46, -1, + -1, 62, 63, 64, -1, 66, -1, -1, 69, 70, + 71, -1, -1, -1, -1, -1, -1, -1, 48, -1, + -1, 82, 83, 84, 85, 86, -1, 57, 58, -1, + 91, 92, 62, 63, 64, -1, 66, -1, -1, 69, + 70, 71, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 82, 83, 84, 85, 86, -1, 57, 58, + -1, 91, 92, 62, 63, 64, -1, 66, -1, -1, + 69, 70, 71, -1, -1, -1, -1, -1, 77, 78, -1, -1, -1, 82, 83, 84, 85, 86, -1, 57, - 58, -1, 91, 92, 62, 63, 64, -1, 66, 67, + 58, -1, 91, 92, 62, 63, 64, -1, 66, -1, -1, 69, 70, 71, -1, -1, -1, -1, -1, -1, - -1, 48, -1, 81, 82, 83, 84, 85, 86, -1, - 57, 58, -1, 91, 92, 62, 63, 64, -1, 66, - 67, -1, 69, 70, 71, -1, -1, -1, -1, -1, + -1, -1, -1, 81, 82, 83, 84, 85, 86, -1, + 57, 58, 90, 91, 92, 62, 63, 64, -1, 66, + -1, -1, 69, 70, 71, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, 85, 86, - -1, 57, 58, -1, 91, 92, 62, 63, 64, -1, - 66, 67, -1, 69, 70, 71, -1, -1, -1, -1, - -1, 77, 78, -1, -1, -1, 82, 83, 84, 85, + -1, 57, 58, 90, 91, 92, 62, 63, 64, -1, + 66, -1, -1, 69, 70, 71, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 81, 82, 83, 84, 85, 86, -1, 57, 58, -1, 91, 92, 62, 63, 64, - -1, 66, 67, -1, 69, 70, 71, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 81, 82, 83, 84, - 85, 86, -1, 57, 58, 90, 91, 92, 62, 63, - 64, -1, 66, 67, -1, 69, 70, 71, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, 83, - 84, 85, 86, -1, 57, 58, 90, 91, 92, 62, - 63, 64, -1, 66, 67, -1, 69, 70, 71, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 81, 82, - 83, 84, 85, 86, -1, 57, 58, -1, 91, 92, - 62, 63, 64, -1, 66, 67, -1, 69, 70, 71, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 82, 83, 84, 85, 86, -1, 57, 58, -1, 91, - 92, 62, 63, 64, -1, 66, 67, -1, 69, 70, - 71, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 82, -1, -1, 85, 86, -1, -1, 89, -1, - 91, 92 + -1, 66, -1, -1, 69, 70, 71, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, 83, 84, + 85, 86, -1, 57, 58, -1, 91, 92, 62, 63, + 64, -1, 66, -1, -1, 69, 70, 71, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, + -1, 85, 86, -1, -1, 89, -1, 91, 92 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1222,28 +1214,28 @@ static const yytype_uint8 yystos[] = 21, 21, 21, 21, 118, 55, 123, 124, 21, 121, 118, 118, 118, 118, 118, 118, 21, 89, 118, 118, 118, 135, 0, 98, 89, 81, 89, 109, 118, 118, - 57, 58, 62, 63, 64, 66, 67, 69, 70, 71, - 82, 83, 84, 85, 86, 91, 92, 118, 118, 135, - 95, 135, 135, 135, 135, 95, 118, 118, 38, 124, - 128, 35, 67, 68, 21, 46, 81, 118, 46, 81, - 45, 129, 48, 124, 95, 40, 46, 40, 46, 40, - 46, 40, 46, 77, 78, 130, 21, 90, 94, 99, - 109, 118, 109, 118, 45, 81, 115, 118, 118, 118, + 57, 58, 62, 63, 64, 66, 69, 70, 71, 82, + 83, 84, 85, 86, 91, 92, 118, 118, 135, 95, + 135, 135, 135, 135, 95, 118, 118, 38, 124, 128, + 35, 67, 68, 21, 46, 81, 118, 46, 81, 45, + 129, 48, 124, 95, 40, 46, 40, 46, 40, 46, + 40, 46, 77, 78, 130, 21, 90, 94, 99, 109, + 118, 109, 118, 45, 81, 115, 118, 118, 118, 118, + 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, + 118, 118, 90, 118, 90, 21, 118, 114, 21, 118, + 118, 118, 118, 46, 81, 118, 118, 114, 118, 21, 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 118, 118, 90, 118, 90, 21, 118, 114, - 21, 118, 118, 118, 118, 46, 81, 118, 118, 114, - 118, 21, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 114, 90, 95, 90, 115, 90, 98, 114, - 118, 21, 132, 118, 118, 132, 40, 40, 40, 40, - 131, 135, 116, 27, 46, 116, 101, 119, 95, 98, - 98, 118, 118, 118, 118, 132, 90, 98, 102, 115, - 46, 118, 115, 115, 21, 95, 133, 133, 98, 25, - 118, 115, 25, 50, 114, 29, 50, 106, 107, 113, - 21, 116, 116, 133, 115, 116, 116, 105, 106, 108, - 113, 114, 107, 115, 109, 116, 116, 115, 115, 108, - 115, 109, 101, 50, 104, 45, 25, 115, 25, 25, - 25, 45, 115, 114, 115, 114, 25, 114, 101, 102, - 116, 115, 115 + 114, 90, 95, 90, 115, 90, 98, 114, 118, 21, + 132, 118, 118, 132, 40, 40, 40, 40, 131, 135, + 116, 27, 46, 116, 101, 119, 95, 98, 98, 118, + 118, 118, 118, 132, 90, 98, 102, 115, 46, 118, + 115, 115, 21, 95, 133, 133, 98, 25, 118, 115, + 25, 50, 114, 29, 50, 106, 107, 113, 21, 116, + 116, 133, 115, 116, 116, 105, 106, 108, 113, 114, + 107, 115, 109, 116, 116, 115, 115, 108, 115, 109, + 101, 50, 104, 45, 25, 115, 25, 25, 25, 45, + 115, 114, 115, 114, 25, 114, 101, 102, 116, 115, + 115 }; #define yyerrok (yyerrstatus = 0) @@ -2552,267 +2544,262 @@ yyreduce: case 81: #line 432 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_after); ;} + { g_lingo->code1(g_lingo->c_concat); ;} break; case 82: #line 433 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_concat); ;} + { g_lingo->code1(g_lingo->c_contains); ;} break; case 83: #line 434 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_contains); ;} + { g_lingo->code1(g_lingo->c_starts); ;} break; case 84: #line 435 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_starts); ;} + { (yyval.code) = (yyvsp[(2) - (2)].code); ;} break; case 85: #line 436 "engines/director/lingo/lingo-gr.y" - { (yyval.code) = (yyvsp[(2) - (2)].code); ;} + { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;} break; case 86: #line 437 "engines/director/lingo/lingo-gr.y" - { (yyval.code) = (yyvsp[(2) - (2)].code); g_lingo->code1(g_lingo->c_negate); ;} + { (yyval.code) = (yyvsp[(2) - (3)].code); ;} break; case 87: #line 438 "engines/director/lingo/lingo-gr.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); ;} + { (yyval.code) = g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;} break; case 88: #line 439 "engines/director/lingo/lingo-gr.y" - { (yyval.code) = g_lingo->codeArray((yyvsp[(2) - (3)].narg)); ;} + { g_lingo->code1(g_lingo->c_intersects); ;} break; case 89: #line 440 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_intersects); ;} + { g_lingo->code1(g_lingo->c_within); ;} break; case 90: #line 441 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_within); ;} + { g_lingo->code1(g_lingo->c_charOf); ;} break; case 91: #line 442 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_charOf); ;} + { g_lingo->code1(g_lingo->c_charToOf); ;} break; case 92: #line 443 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_charToOf); ;} + { g_lingo->code1(g_lingo->c_itemOf); ;} break; case 93: #line 444 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_itemOf); ;} + { g_lingo->code1(g_lingo->c_itemToOf); ;} break; case 94: #line 445 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_itemToOf); ;} + { g_lingo->code1(g_lingo->c_lineOf); ;} break; case 95: #line 446 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_lineOf); ;} + { g_lingo->code1(g_lingo->c_lineToOf); ;} break; case 96: #line 447 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_lineToOf); ;} + { g_lingo->code1(g_lingo->c_wordOf); ;} break; case 97: #line 448 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_wordOf); ;} - break; - - case 98: -#line 449 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_wordToOf); ;} break; - case 99: -#line 452 "engines/director/lingo/lingo-gr.y" + case 98: +#line 451 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_printtop); ;} break; - case 102: -#line 455 "engines/director/lingo/lingo-gr.y" + case 101: +#line 454 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_exitRepeat); ;} break; - case 103: -#line 456 "engines/director/lingo/lingo-gr.y" + case 102: +#line 455 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); ;} break; - case 106: -#line 460 "engines/director/lingo/lingo-gr.y" + case 105: +#line 459 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->_builtins[*(yyvsp[(1) - (2)].s)]->u.func); delete (yyvsp[(1) - (2)].s); ;} break; - case 107: -#line 463 "engines/director/lingo/lingo-gr.y" + case 106: +#line 462 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->_builtins[*(yyvsp[(1) - (2)].s)]->u.func); delete (yyvsp[(1) - (2)].s); ;} break; - case 108: -#line 466 "engines/director/lingo/lingo-gr.y" + case 107: +#line 465 "engines/director/lingo/lingo-gr.y" { g_lingo->code2(g_lingo->c_voidpush, g_lingo->_builtins[*(yyvsp[(1) - (1)].s)]->u.func); delete (yyvsp[(1) - (1)].s); ;} break; + case 108: +#line 468 "engines/director/lingo/lingo-gr.y" + { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;} + break; + case 109: #line 469 "engines/director/lingo/lingo-gr.y" - { g_lingo->codeFunc((yyvsp[(1) - (4)].s), (yyvsp[(3) - (4)].narg)); ;} + { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} break; case 110: #line 470 "engines/director/lingo/lingo-gr.y" - { g_lingo->codeFunc((yyvsp[(1) - (2)].s), (yyvsp[(2) - (2)].narg)); ;} + { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;} break; case 111: #line 471 "engines/director/lingo/lingo-gr.y" - { g_lingo->codeMe((yyvsp[(3) - (4)].s), 0); ;} + { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;} break; case 112: #line 472 "engines/director/lingo/lingo-gr.y" - { g_lingo->codeMe((yyvsp[(3) - (6)].s), (yyvsp[(5) - (6)].narg)); ;} + { g_lingo->code1(g_lingo->c_open); ;} break; case 113: #line 473 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_open); ;} + { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;} break; case 114: #line 474 "engines/director/lingo/lingo-gr.y" - { g_lingo->code2(g_lingo->c_voidpush, g_lingo->c_open); ;} + { Common::String s(*(yyvsp[(1) - (3)].s)); s += '-'; s += *(yyvsp[(2) - (3)].s); g_lingo->codeFunc(&s, (yyvsp[(3) - (3)].narg)); ;} break; case 115: -#line 475 "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)); ;} +#line 477 "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 116: #line 478 "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); ;} + { g_lingo->code1(g_lingo->c_global); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; case 117: -#line 479 "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); ;} +#line 481 "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 118: #line 482 "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); ;} + { g_lingo->code1(g_lingo->c_instance); g_lingo->codeString((yyvsp[(3) - (3)].s)->c_str()); delete (yyvsp[(3) - (3)].s); ;} break; case 119: -#line 483 "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); ;} +#line 493 "engines/director/lingo/lingo-gr.y" + { g_lingo->code1(g_lingo->c_gotoloop); ;} break; case 120: #line 494 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_gotoloop); ;} + { g_lingo->code1(g_lingo->c_gotonext); ;} break; case 121: #line 495 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_gotonext); ;} + { g_lingo->code1(g_lingo->c_gotoprevious); ;} break; case 122: #line 496 "engines/director/lingo/lingo-gr.y" - { g_lingo->code1(g_lingo->c_gotoprevious); ;} - break; - - case 123: -#line 497 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(1); g_lingo->code1(g_lingo->c_goto); ;} break; - case 124: -#line 500 "engines/director/lingo/lingo-gr.y" + case 123: +#line 499 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(3); g_lingo->code1(g_lingo->c_goto); ;} break; - case 125: -#line 503 "engines/director/lingo/lingo-gr.y" + case 124: +#line 502 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(2); g_lingo->code1(g_lingo->c_goto); ;} break; - case 130: -#line 516 "engines/director/lingo/lingo-gr.y" + case 129: +#line 515 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_playdone); ;} break; - case 131: -#line 517 "engines/director/lingo/lingo-gr.y" + case 130: +#line 516 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(1); g_lingo->code1(g_lingo->c_play); ;} break; - case 132: -#line 520 "engines/director/lingo/lingo-gr.y" + case 131: +#line 519 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(3); g_lingo->code1(g_lingo->c_play); ;} break; - case 133: -#line 523 "engines/director/lingo/lingo-gr.y" + case 132: +#line 522 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(2); g_lingo->code1(g_lingo->c_play); ;} break; - case 134: -#line 526 "engines/director/lingo/lingo-gr.y" + case 133: +#line 525 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(true); ;} break; - case 135: -#line 526 "engines/director/lingo/lingo-gr.y" + case 134: +#line 525 "engines/director/lingo/lingo-gr.y" { g_lingo->codeSetImmediate(false); g_lingo->codeFunc((yyvsp[(1) - (3)].s), (yyvsp[(3) - (3)].narg)); ;} break; - case 136: -#line 556 "engines/director/lingo/lingo-gr.y" + case 135: +#line 555 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;} break; - case 137: -#line 557 "engines/director/lingo/lingo-gr.y" + case 136: +#line 556 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); @@ -2820,38 +2807,38 @@ yyreduce: g_lingo->_indef = false; ;} break; - case 138: -#line 562 "engines/director/lingo/lingo-gr.y" + case 137: +#line 561 "engines/director/lingo/lingo-gr.y" { g_lingo->codeFactory(*(yyvsp[(2) - (2)].s)); ;} break; - case 139: -#line 565 "engines/director/lingo/lingo-gr.y" + case 138: +#line 564 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; ;} break; - case 140: -#line 566 "engines/director/lingo/lingo-gr.y" + case 139: +#line 565 "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 141: -#line 570 "engines/director/lingo/lingo-gr.y" + case 140: +#line 569 "engines/director/lingo/lingo-gr.y" { g_lingo->_indef = true; g_lingo->_currentFactory.clear(); ;} break; - case 142: -#line 571 "engines/director/lingo/lingo-gr.y" + case 141: +#line 570 "engines/director/lingo/lingo-gr.y" { g_lingo->_ignoreMe = true; ;} break; - case 143: -#line 571 "engines/director/lingo/lingo-gr.y" + case 142: +#line 570 "engines/director/lingo/lingo-gr.y" { g_lingo->codeConst(0); // Push fake value on stack g_lingo->code1(g_lingo->c_procret); @@ -2863,33 +2850,33 @@ yyreduce: ;} break; + case 143: +#line 580 "engines/director/lingo/lingo-gr.y" + { (yyval.narg) = 0; ;} + break; + case 144: #line 581 "engines/director/lingo/lingo-gr.y" - { (yyval.narg) = 0; ;} + { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;} break; case 145: #line 582 "engines/director/lingo/lingo-gr.y" - { g_lingo->codeArg((yyvsp[(1) - (1)].s)); (yyval.narg) = 1; ;} + { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; case 146: #line 583 "engines/director/lingo/lingo-gr.y" - { g_lingo->codeArg((yyvsp[(3) - (3)].s)); (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} - break; - - case 147: -#line 584 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArg((yyvsp[(4) - (4)].s)); (yyval.narg) = (yyvsp[(1) - (4)].narg) + 1; ;} break; - case 148: -#line 586 "engines/director/lingo/lingo-gr.y" + case 147: +#line 585 "engines/director/lingo/lingo-gr.y" { g_lingo->codeArgStore(); ;} break; - case 149: -#line 590 "engines/director/lingo/lingo-gr.y" + case 148: +#line 589 "engines/director/lingo/lingo-gr.y" { g_lingo->code1(g_lingo->c_call); g_lingo->codeString((yyvsp[(1) - (3)].s)->c_str()); @@ -2898,24 +2885,24 @@ yyreduce: g_lingo->code1(numpar); ;} break; - case 150: -#line 598 "engines/director/lingo/lingo-gr.y" + case 149: +#line 597 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 0; ;} break; - case 151: -#line 599 "engines/director/lingo/lingo-gr.y" + case 150: +#line 598 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = 1; ;} break; - case 152: -#line 600 "engines/director/lingo/lingo-gr.y" + case 151: +#line 599 "engines/director/lingo/lingo-gr.y" { (yyval.narg) = (yyvsp[(1) - (3)].narg) + 1; ;} break; /* Line 1267 of yacc.c. */ -#line 2919 "engines/director/lingo/lingo-gr.cpp" +#line 2906 "engines/director/lingo/lingo-gr.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -3129,6 +3116,6 @@ yyreturn: } -#line 603 "engines/director/lingo/lingo-gr.y" +#line 602 "engines/director/lingo/lingo-gr.y" diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index d0fec592b9..a6f7e08865 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -429,7 +429,6 @@ expr: INT { $$ = g_lingo->codeConst($1); } | expr tOR expr { g_lingo->code1(g_lingo->c_or); } | tNOT expr %prec UNARY { g_lingo->code1(g_lingo->c_not); } | expr '&' expr { g_lingo->code1(g_lingo->c_ampersand); } - | expr tAFTER expr { g_lingo->code1(g_lingo->c_after); } | expr tCONCAT expr { g_lingo->code1(g_lingo->c_concat); } | expr tCONTAINS expr { g_lingo->code1(g_lingo->c_contains); } | expr tSTARTS expr { g_lingo->code1(g_lingo->c_starts); } |