diff options
| author | Eugene Sandulenko | 2019-12-31 01:35:30 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2019-12-31 16:27:28 +0100 |
| commit | 5d2cbc1bfc265db4c970f4120420efd677a0d692 (patch) | |
| tree | 477f5622400a55022607aa213c7b753da7d93946 | |
| parent | 6250d722aaf8d273eb7b47bd594aa90e1c123142 (diff) | |
| download | scummvm-rg350-5d2cbc1bfc265db4c970f4120420efd677a0d692.tar.gz scummvm-rg350-5d2cbc1bfc265db4c970f4120420efd677a0d692.tar.bz2 scummvm-rg350-5d2cbc1bfc265db4c970f4120420efd677a0d692.zip | |
DIRECTOR: LINGO: Fixed 'factory' lexing
| -rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 556 | ||||
| -rw-r--r-- | engines/director/lingo/lingo-lex.l | 2 |
2 files changed, 277 insertions, 281 deletions
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 8a68f32c70..d114f77c93 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -373,40 +373,40 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[292] = +static yyconst flex_int16_t yy_accept[297] = { 0, 0, 0, 76, 74, 4, 72, 72, 74, 74, 74, 71, 71, 71, 70, 71, 67, 71, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 71, 74, 3, 3, 4, 72, + 68, 68, 68, 68, 74, 3, 3, 68, 4, 72, 0, 0, 0, 73, 5, 66, 2, 69, 70, 65, 63, 64, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 22, 13, 68, 68, 68, 68, 68, 68, 68, 68, 68, 35, 36, 68, 38, 68, 68, 68, 68, 68, 68, 68, 68, 68, 56, 68, 68, - 68, 0, 0, 1, 3, 3, 5, 2, 69, 68, + 68, 1, 3, 3, 0, 68, 5, 2, 69, 68, 7, 68, 68, 68, 68, 68, 68, 16, 68, 68, 0, 68, 68, 68, 68, 68, 68, 68, 31, 68, 68, 34, 68, 68, 68, 68, 44, 68, 46, 68, 68, 68, 68, 68, 68, 68, 68, 0, 68, 68, - 9, 68, 11, 12, 15, 0, 18, 68, 0, 68, - 68, 25, 26, 27, 28, 68, 68, 68, 33, 37, - 40, 68, 68, 68, 68, 68, 48, 0, 55, 60, - 68, 58, 62, 0, 6, 68, 68, 0, 16, 68, - 21, 68, 68, 29, 68, 32, 0, 68, 68, 68, - 68, 68, 68, 54, 54, 54, 54, 61, 68, 0, - - 8, 68, 0, 16, 19, 0, 68, 68, 68, 0, - 68, 68, 68, 45, 57, 47, 0, 0, 54, 54, - 54, 59, 0, 68, 14, 0, 68, 68, 0, 30, - 0, 68, 68, 68, 0, 0, 0, 0, 54, 54, - 54, 0, 10, 0, 23, 68, 30, 30, 0, 68, - 42, 43, 0, 0, 0, 54, 54, 54, 17, 0, - 68, 30, 0, 41, 0, 0, 0, 0, 0, 54, - 0, 24, 39, 53, 52, 53, 0, 0, 0, 0, - 0, 20, 0, 0, 0, 0, 49, 50, 51, 51, - 0 + 68, 9, 68, 11, 12, 15, 0, 18, 68, 0, + 68, 68, 25, 26, 27, 28, 68, 68, 68, 33, + 37, 40, 68, 68, 68, 68, 68, 48, 0, 55, + 60, 68, 58, 62, 0, 68, 6, 68, 68, 0, + 16, 68, 21, 68, 68, 29, 68, 32, 0, 68, + 68, 68, 68, 68, 68, 54, 54, 54, 54, 61, + + 68, 0, 68, 8, 68, 0, 16, 19, 0, 68, + 68, 68, 0, 68, 68, 68, 45, 57, 47, 0, + 0, 54, 54, 54, 59, 0, 68, 68, 14, 0, + 68, 68, 0, 30, 0, 68, 68, 68, 0, 0, + 0, 0, 54, 54, 54, 0, 17, 10, 0, 23, + 68, 30, 30, 0, 68, 42, 43, 0, 0, 0, + 54, 54, 54, 17, 0, 68, 30, 0, 41, 0, + 0, 0, 0, 0, 54, 0, 24, 39, 53, 52, + 53, 0, 0, 0, 0, 0, 20, 0, 0, 0, + 0, 49, 50, 51, 51, 0 } ; @@ -421,18 +421,18 @@ static yyconst flex_int32_t yy_ec[256] = 15, 16, 1, 1, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 26, - 8, 1, 8, 41, 42, 1, 43, 44, 45, 46, + 8, 1, 8, 8, 41, 1, 42, 43, 44, 45, - 47, 48, 49, 50, 51, 26, 26, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 26, 1, 1, 1, 1, 1, 1, 1, 1, + 46, 47, 48, 49, 50, 26, 26, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, + 64, 26, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 66, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 65, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -442,189 +442,187 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[67] = +static yyconst flex_int32_t yy_meta[66] = { 0, 1, 2, 3, 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 1, 1, 1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 1, 6, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 1 + 5, 5, 5, 5, 1 } ; -static yyconst flex_int16_t yy_base[305] = +static yyconst flex_int16_t yy_base[310] = { 0, - 0, 65, 226, 758, 69, 758, 758, 73, 158, 0, - 758, 147, 138, 56, 64, 758, 127, 59, 61, 59, - 55, 63, 0, 64, 64, 70, 111, 75, 107, 110, - 76, 113, 129, 127, 165, 100, 186, 190, 194, 758, - 198, 171, 127, 758, 0, 758, 0, 98, 168, 758, - 758, 758, 0, 66, 163, 163, 169, 77, 176, 86, - 186, 182, 117, 82, 0, 181, 187, 175, 180, 198, - 184, 200, 183, 188, 0, 0, 203, 0, 208, 206, - 203, 211, 210, 216, 211, 228, 210, 0, 244, 223, - 226, 266, 249, 758, 273, 294, 0, 0, 85, 258, - - 0, 251, 249, 250, 265, 261, 266, 216, 258, 276, - 298, 266, 281, 276, 287, 285, 284, 285, 0, 294, - 286, 0, 293, 283, 287, 294, 0, 306, 0, 305, - 299, 310, 338, 309, 317, 327, 332, 335, 326, 328, - 0, 338, 0, 0, 363, 368, 0, 347, 336, 354, - 341, 0, 0, 0, 0, 345, 346, 351, 0, 0, - 377, 358, 364, 370, 354, 358, 0, 400, 0, 0, - 374, 371, 0, 368, 0, 383, 381, 410, 0, 381, - 405, 387, 383, 0, 399, 0, 421, 405, 399, 398, - 403, 404, 405, 455, 465, 466, 475, 0, 418, 418, - - 0, 420, 418, 0, 0, 479, 434, 457, 481, 454, - 469, 454, 456, 0, 0, 0, 491, 482, 495, 520, - 529, 0, 462, 465, 758, 474, 488, 491, 453, 0, - 502, 512, 479, 500, 539, 530, 526, 524, 550, 556, - 562, 503, 0, 533, 0, 522, 0, 0, 534, 536, - 0, 0, 535, 501, 543, 587, 597, 598, 758, 551, - 546, 0, 562, 0, 565, 588, 580, 609, 613, 615, - 585, 0, 758, 758, 619, 758, 626, 604, 632, 613, - 645, 758, 636, 644, 649, 618, 655, 665, 669, 680, - 758, 705, 707, 710, 713, 719, 724, 729, 731, 736, - - 741, 744, 747, 752 + 0, 64, 554, 743, 68, 743, 743, 72, 492, 0, + 743, 426, 418, 55, 63, 743, 365, 59, 59, 59, + 55, 63, 0, 64, 75, 70, 100, 77, 110, 102, + 98, 129, 128, 131, 83, 166, 187, 293, 191, 743, + 195, 144, 320, 743, 0, 743, 0, 305, 160, 743, + 743, 743, 0, 66, 131, 156, 162, 74, 173, 149, + 167, 180, 156, 91, 0, 174, 193, 172, 186, 198, + 184, 200, 183, 188, 0, 0, 203, 0, 211, 208, + 192, 210, 209, 215, 233, 228, 236, 0, 238, 231, + 234, 743, 290, 294, 271, 225, 0, 0, 223, 237, + + 0, 246, 244, 243, 243, 251, 260, 213, 250, 268, + 268, 270, 286, 282, 266, 283, 282, 284, 0, 292, + 284, 0, 291, 281, 285, 292, 0, 303, 0, 300, + 295, 303, 346, 307, 326, 307, 337, 177, 147, 328, + 329, 0, 341, 0, 0, 269, 361, 0, 347, 337, + 348, 335, 0, 0, 0, 0, 339, 340, 350, 0, + 0, 371, 347, 357, 362, 339, 346, 0, 382, 0, + 0, 374, 375, 0, 107, 91, 0, 380, 377, 405, + 0, 381, 409, 383, 381, 0, 386, 0, 416, 398, + 392, 390, 389, 407, 400, 439, 449, 455, 459, 0, + + 421, 86, 79, 0, 427, 415, 0, 0, 466, 426, + 431, 470, 440, 448, 442, 444, 0, 0, 0, 479, + 470, 484, 502, 517, 0, 42, 20, 448, 743, 460, + 464, 476, 521, 0, 479, 479, 474, 476, 526, 513, + 514, 512, 541, 543, 547, 18, 0, 0, 522, 0, + 499, 0, 0, 513, 520, 0, 0, 515, 558, 538, + 565, 567, 577, 743, 545, 547, 0, 563, 0, 564, + 584, 567, 591, 599, 589, 571, 0, 743, 743, 601, + 743, 610, 573, 622, 586, 626, 743, 620, 630, 636, + 592, 646, 652, 657, 658, 743, 690, 692, 695, 698, + + 704, 709, 714, 716, 721, 726, 729, 732, 737 } ; -static yyconst flex_int16_t yy_def[305] = +static yyconst flex_int16_t yy_def[310] = { 0, - 291, 1, 291, 291, 291, 291, 291, 291, 292, 293, - 291, 291, 291, 291, 291, 291, 291, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 291, 291, 291, 291, 291, 291, - 291, 291, 292, 291, 295, 291, 296, 291, 291, 291, - 291, 291, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 291, 291, 291, 291, 291, 295, 296, 291, 294, - - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 291, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 291, 294, 294, - 294, 294, 294, 294, 294, 297, 294, 294, 291, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 298, 294, 294, - 294, 294, 294, 291, 294, 294, 294, 291, 299, 294, - 291, 294, 294, 294, 294, 294, 291, 294, 294, 294, - 294, 294, 294, 298, 298, 298, 298, 294, 294, 291, - - 294, 294, 291, 299, 294, 291, 294, 294, 300, 291, - 294, 294, 294, 294, 294, 294, 291, 291, 298, 298, - 298, 294, 291, 294, 291, 291, 294, 294, 301, 302, - 291, 294, 294, 294, 291, 291, 291, 291, 298, 298, - 298, 291, 294, 291, 294, 294, 303, 302, 291, 294, - 294, 294, 291, 291, 291, 298, 298, 298, 291, 291, - 294, 303, 291, 294, 291, 304, 291, 291, 291, 298, - 291, 294, 291, 291, 304, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 304, 304, 291, 304, - 0, 291, 291, 291, 291, 291, 291, 291, 291, 291, - - 291, 291, 291, 291 + 296, 1, 296, 296, 296, 296, 296, 296, 297, 298, + 296, 296, 296, 296, 296, 296, 296, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 296, 296, 296, 299, 296, 296, + 296, 296, 297, 296, 300, 296, 301, 296, 296, 296, + 296, 296, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 296, 296, 296, 296, 299, 300, 301, 296, 299, + + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 296, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 296, 299, 299, + 299, 299, 299, 299, 299, 299, 302, 299, 299, 296, + 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, + 299, 299, 299, 299, 299, 299, 299, 299, 303, 299, + 299, 299, 299, 299, 296, 299, 299, 299, 299, 296, + 304, 299, 296, 299, 299, 299, 299, 299, 296, 299, + 299, 299, 299, 299, 299, 303, 303, 303, 303, 299, + + 299, 296, 299, 299, 299, 296, 304, 299, 296, 299, + 299, 305, 296, 299, 299, 299, 299, 299, 299, 296, + 296, 303, 303, 303, 299, 296, 299, 299, 296, 296, + 299, 299, 306, 307, 296, 299, 299, 299, 296, 296, + 296, 296, 303, 303, 303, 296, 299, 299, 296, 299, + 299, 308, 307, 296, 299, 299, 299, 296, 296, 296, + 303, 303, 303, 296, 296, 299, 308, 296, 299, 296, + 309, 296, 296, 296, 303, 296, 299, 296, 296, 309, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 309, 309, 296, 309, 0, 296, 296, 296, 296, + + 296, 296, 296, 296, 296, 296, 296, 296, 296 } ; -static yyconst flex_int16_t yy_nxt[825] = +static yyconst flex_int16_t yy_nxt[809] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 11, 13, 4, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 23, 25, 23, 26, 27, 28, 29, 30, 23, 31, 32, 33, 23, 23, 34, 23, 23, - 35, 23, 18, 19, 20, 21, 22, 23, 24, 23, - 25, 26, 27, 28, 29, 30, 23, 31, 32, 33, - 23, 23, 34, 23, 23, 36, 37, 48, 49, 38, - 39, 40, 40, 41, 41, 40, 40, 41, 50, 51, - 54, 56, 57, 111, 59, 65, 111, 55, 58, 60, - 63, 61, 66, 64, 68, 73, 82, 99, 67, 69, - - 100, 62, 94, 94, 74, 104, 54, 56, 57, 59, - 99, 65, 55, 58, 60, 63, 61, 66, 64, 107, - 68, 73, 82, 67, 69, 100, 62, 70, 75, 74, - 104, 71, 44, 83, 42, 76, 79, 77, 42, 78, - 72, 52, 80, 84, 107, 81, 110, 85, 47, 86, - 89, 90, 87, 70, 75, 46, 91, 71, 88, 83, - 76, 79, 77, 44, 78, 72, 92, 80, 84, 92, - 81, 110, 85, 94, 94, 86, 89, 90, 87, 48, - 49, 91, 101, 88, 102, 103, 93, 95, 40, 40, - 96, 96, 40, 40, 96, 39, 40, 40, 41, 41, - - 40, 40, 41, 115, 105, 108, 109, 114, 101, 116, - 102, 103, 93, 106, 112, 113, 117, 146, 118, 119, - 146, 121, 122, 123, 124, 291, 125, 131, 115, 105, - 133, 108, 109, 114, 116, 126, 120, 127, 106, 112, - 113, 128, 117, 118, 129, 119, 121, 122, 130, 123, - 124, 42, 125, 131, 132, 42, 133, 136, 137, 42, - 126, 120, 127, 42, 134, 138, 128, 92, 135, 129, - 92, 291, 291, 130, 95, 40, 40, 96, 139, 132, - 140, 141, 136, 137, 142, 143, 145, 93, 291, 144, - 134, 138, 147, 148, 135, 96, 40, 40, 96, 111, - - 150, 151, 111, 153, 139, 140, 141, 154, 157, 142, - 152, 143, 145, 93, 144, 155, 156, 147, 158, 148, - 159, 160, 161, 162, 163, 150, 164, 151, 153, 165, - 291, 166, 149, 154, 157, 152, 167, 170, 42, 168, - 155, 156, 168, 171, 158, 159, 160, 161, 162, 163, - 172, 173, 164, 174, 177, 165, 166, 149, 175, 42, - 176, 167, 170, 180, 178, 181, 169, 178, 171, 146, - 182, 186, 146, 183, 184, 185, 172, 173, 187, 174, - 177, 187, 189, 175, 190, 176, 191, 291, 192, 180, - 181, 169, 193, 188, 198, 199, 182, 186, 183, 184, - - 185, 168, 200, 201, 168, 202, 206, 205, 189, 206, - 190, 178, 191, 192, 178, 207, 208, 193, 209, 188, - 198, 199, 187, 211, 215, 187, 195, 200, 212, 201, - 213, 202, 205, 196, 203, 291, 197, 214, 216, 225, - 207, 208, 210, 291, 209, 291, 222, 223, 224, 211, - 215, 195, 227, 212, 229, 213, 217, 229, 196, 217, - 203, 197, 214, 216, 218, 225, 217, 217, 210, 217, - 217, 222, 223, 224, 218, 218, 217, 228, 227, 217, - 206, 219, 229, 206, 218, 229, 231, 232, 291, 233, - 234, 221, 235, 53, 242, 235, 217, 220, 243, 217, - - 226, 236, 266, 228, 218, 266, 244, 219, 245, 246, - 236, 231, 251, 232, 233, 234, 238, 221, 249, 242, - 237, 217, 220, 243, 217, 238, 226, 236, 239, 218, - 217, 244, 250, 217, 245, 246, 236, 251, 218, 252, - 235, 238, 259, 235, 249, 237, 253, 254, 255, 260, - 238, 217, 240, 239, 217, 241, 261, 217, 250, 218, - 217, 263, 264, 217, 252, 218, 217, 259, 237, 265, - 267, 218, 253, 254, 255, 260, 291, 240, 271, 272, - 241, 261, 273, 291, 256, 274, 263, 264, 268, 266, - 257, 268, 266, 237, 265, 267, 218, 258, 269, 217, - - 276, 269, 217, 271, 272, 282, 218, 218, 273, 256, - 277, 274, 291, 277, 279, 257, 281, 279, 270, 281, - 291, 291, 258, 291, 218, 283, 276, 277, 236, 291, - 277, 282, 236, 279, 284, 291, 279, 287, 278, 289, - 287, 291, 280, 238, 270, 288, 285, 238, 288, 285, - 285, 283, 291, 285, 236, 278, 287, 291, 236, 287, - 284, 280, 291, 278, 236, 289, 288, 280, 238, 288, - 290, 291, 238, 290, 286, 291, 291, 291, 286, 238, - 278, 290, 291, 291, 290, 291, 280, 291, 291, 291, - 236, 291, 291, 291, 291, 291, 291, 291, 291, 286, - - 291, 291, 291, 286, 238, 43, 43, 291, 43, 43, - 43, 45, 45, 53, 53, 53, 97, 97, 97, 98, - 98, 291, 98, 98, 98, 179, 291, 291, 179, 179, - 194, 291, 291, 194, 204, 204, 204, 230, 291, 230, - 230, 230, 247, 291, 291, 247, 247, 248, 248, 248, - 262, 262, 262, 275, 291, 291, 275, 3, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291 + 23, 18, 19, 20, 21, 22, 23, 24, 23, 25, + 26, 27, 28, 29, 30, 23, 31, 32, 33, 23, + 23, 34, 23, 23, 35, 36, 48, 49, 37, 39, + 40, 40, 41, 41, 40, 40, 41, 50, 51, 56, + 54, 264, 57, 247, 59, 92, 92, 55, 58, 60, + 63, 61, 111, 64, 68, 111, 65, 73, 246, 69, + + 100, 62, 104, 66, 56, 54, 74, 57, 59, 67, + 38, 55, 58, 60, 63, 61, 70, 64, 82, 68, + 71, 65, 73, 69, 100, 62, 104, 66, 79, 72, + 74, 75, 42, 67, 80, 227, 42, 81, 76, 226, + 77, 70, 78, 82, 203, 71, 92, 92, 86, 83, + 101, 87, 79, 72, 89, 90, 75, 88, 80, 84, + 91, 81, 76, 85, 77, 202, 78, 93, 40, 40, + 94, 48, 49, 86, 83, 101, 87, 102, 103, 89, + 90, 88, 107, 84, 91, 110, 108, 85, 94, 40, + 40, 94, 39, 40, 40, 41, 41, 40, 40, 41, + + 115, 105, 102, 103, 109, 176, 107, 112, 113, 110, + 106, 108, 95, 114, 147, 116, 117, 147, 118, 119, + 175, 121, 122, 123, 115, 105, 127, 124, 125, 109, + 42, 112, 113, 95, 106, 99, 120, 126, 114, 116, + 128, 117, 118, 129, 119, 121, 122, 130, 123, 131, + 127, 42, 124, 125, 132, 42, 133, 140, 134, 42, + 120, 126, 135, 144, 128, 136, 137, 129, 139, 111, + 180, 130, 111, 180, 131, 141, 142, 143, 132, 145, + 146, 133, 140, 134, 148, 149, 155, 135, 144, 136, + 137, 93, 40, 40, 94, 94, 40, 40, 94, 141, + + 142, 143, 150, 145, 151, 146, 152, 158, 148, 154, + 149, 155, 138, 156, 157, 153, 159, 99, 160, 161, + 162, 163, 164, 165, 166, 44, 150, 167, 151, 168, + 173, 152, 158, 154, 96, 171, 95, 156, 157, 153, + 95, 159, 160, 161, 162, 163, 164, 169, 165, 166, + 169, 167, 172, 168, 42, 173, 174, 179, 42, 171, + 177, 178, 147, 182, 184, 147, 183, 185, 186, 187, + 188, 191, 189, 194, 170, 189, 172, 192, 193, 52, + 195, 174, 179, 169, 177, 178, 169, 190, 182, 184, + 183, 185, 186, 187, 200, 188, 191, 194, 170, 201, + + 204, 205, 192, 193, 195, 212, 180, 208, 197, 180, + 209, 210, 190, 209, 211, 198, 214, 189, 199, 200, + 189, 215, 216, 217, 201, 204, 205, 218, 47, 206, + 212, 208, 197, 219, 46, 210, 229, 213, 211, 198, + 220, 214, 199, 220, 231, 215, 216, 217, 221, 225, + 220, 232, 218, 220, 206, 228, 220, 219, 221, 220, + 220, 229, 213, 220, 221, 222, 236, 209, 221, 231, + 209, 233, 235, 225, 233, 224, 232, 237, 238, 228, + 239, 248, 53, 239, 250, 220, 223, 230, 220, 240, + 222, 236, 249, 221, 251, 254, 235, 44, 240, 255, + + 224, 237, 238, 220, 242, 248, 220, 256, 241, 250, + 223, 221, 230, 242, 240, 257, 249, 243, 220, 251, + 254, 220, 233, 240, 255, 233, 221, 239, 242, 258, + 239, 256, 241, 266, 244, 259, 260, 242, 265, 257, + 268, 243, 220, 245, 220, 220, 269, 220, 220, 270, + 221, 220, 221, 296, 258, 241, 221, 266, 244, 271, + 259, 260, 271, 265, 268, 272, 273, 245, 274, 273, + 269, 274, 276, 270, 221, 261, 221, 262, 220, 241, + 277, 220, 263, 278, 279, 271, 221, 281, 271, 272, + 286, 287, 282, 286, 288, 282, 276, 275, 221, 261, + + 284, 262, 296, 284, 277, 296, 263, 289, 278, 279, + 240, 282, 281, 294, 282, 296, 287, 296, 240, 288, + 283, 292, 275, 284, 292, 242, 284, 290, 285, 296, + 290, 293, 289, 242, 293, 240, 296, 290, 294, 283, + 290, 296, 296, 240, 283, 240, 296, 292, 296, 242, + 292, 285, 285, 293, 296, 291, 293, 242, 295, 295, + 242, 295, 295, 283, 296, 291, 296, 296, 296, 296, + 240, 296, 296, 296, 296, 285, 296, 296, 296, 291, + 296, 296, 296, 296, 242, 296, 296, 296, 296, 291, + 43, 43, 296, 43, 43, 43, 45, 45, 53, 53, + + 53, 97, 97, 97, 98, 98, 296, 98, 98, 98, + 181, 296, 296, 181, 181, 196, 296, 296, 196, 207, + 207, 207, 234, 296, 234, 234, 234, 252, 296, 296, + 252, 252, 253, 253, 253, 267, 267, 267, 280, 296, + 296, 280, 3, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + + 296, 296, 296, 296, 296, 296, 296, 296 } ; -static yyconst flex_int16_t yy_chk[825] = +static yyconst flex_int16_t yy_chk[809] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -632,91 +630,89 @@ static yyconst flex_int16_t yy_chk[825] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 14, 14, 2, - 5, 5, 5, 5, 8, 8, 8, 8, 15, 15, - 18, 19, 20, 64, 21, 25, 64, 18, 20, 22, - 24, 22, 25, 24, 26, 28, 31, 99, 25, 26, - - 54, 22, 36, 36, 28, 58, 18, 19, 20, 21, - 48, 25, 18, 20, 22, 24, 22, 25, 24, 60, - 26, 28, 31, 25, 26, 54, 22, 27, 29, 28, - 58, 27, 43, 32, 5, 29, 30, 29, 8, 29, - 27, 17, 30, 32, 60, 30, 63, 32, 13, 33, - 34, 34, 33, 27, 29, 12, 34, 27, 33, 32, - 29, 30, 29, 9, 29, 27, 35, 30, 32, 35, - 30, 63, 32, 42, 42, 33, 34, 34, 33, 49, - 49, 34, 55, 33, 56, 57, 35, 37, 37, 37, - 37, 38, 38, 38, 38, 39, 39, 39, 39, 41, - - 41, 41, 41, 68, 59, 61, 62, 67, 55, 69, - 56, 57, 35, 59, 66, 66, 70, 108, 71, 72, - 108, 73, 74, 77, 79, 3, 80, 85, 68, 59, - 87, 61, 62, 67, 69, 80, 72, 81, 59, 66, - 66, 82, 70, 71, 83, 72, 73, 74, 84, 77, - 79, 37, 80, 85, 86, 38, 87, 90, 91, 39, - 80, 72, 81, 41, 89, 93, 82, 92, 89, 83, - 92, 0, 0, 84, 95, 95, 95, 95, 100, 86, - 102, 103, 90, 91, 104, 105, 107, 92, 0, 106, - 89, 93, 109, 110, 89, 96, 96, 96, 96, 111, - - 112, 113, 111, 114, 100, 102, 103, 115, 118, 104, - 113, 105, 107, 92, 106, 116, 117, 109, 120, 110, - 121, 123, 124, 125, 126, 112, 128, 113, 114, 130, - 0, 131, 111, 115, 118, 113, 132, 134, 95, 133, - 116, 117, 133, 135, 120, 121, 123, 124, 125, 126, - 136, 137, 128, 138, 142, 130, 131, 111, 139, 96, - 140, 132, 134, 148, 145, 149, 133, 145, 135, 146, - 150, 158, 146, 151, 156, 157, 136, 137, 161, 138, - 142, 161, 162, 139, 163, 140, 164, 0, 165, 148, - 149, 133, 166, 161, 171, 172, 150, 158, 151, 156, - - 157, 168, 174, 176, 168, 177, 181, 180, 162, 181, - 163, 178, 164, 165, 178, 182, 183, 166, 185, 161, - 171, 172, 187, 188, 192, 187, 168, 174, 189, 176, - 190, 177, 180, 168, 178, 0, 168, 191, 193, 203, - 182, 183, 187, 0, 185, 0, 199, 200, 202, 188, - 192, 168, 207, 189, 229, 190, 194, 229, 168, 194, - 178, 168, 191, 193, 194, 203, 195, 196, 187, 195, - 196, 199, 200, 202, 195, 196, 197, 208, 207, 197, - 206, 195, 209, 206, 197, 209, 210, 211, 0, 212, - 213, 197, 217, 209, 223, 217, 219, 196, 224, 219, - - 206, 218, 254, 208, 219, 254, 226, 195, 227, 228, - 217, 210, 233, 211, 212, 213, 218, 197, 231, 223, - 217, 220, 196, 224, 220, 217, 206, 218, 219, 220, - 221, 226, 232, 221, 227, 228, 217, 233, 221, 234, - 235, 218, 242, 235, 231, 217, 236, 237, 238, 244, - 217, 239, 220, 219, 239, 221, 246, 240, 232, 239, - 240, 249, 250, 241, 234, 240, 241, 242, 235, 253, - 255, 241, 236, 237, 238, 244, 0, 220, 260, 261, - 221, 246, 263, 0, 239, 265, 249, 250, 256, 266, - 240, 256, 266, 235, 253, 255, 256, 241, 257, 258, - - 267, 257, 258, 260, 261, 271, 257, 258, 263, 239, - 268, 265, 0, 268, 269, 240, 270, 269, 258, 270, - 275, 0, 241, 275, 270, 278, 267, 277, 268, 0, - 277, 271, 269, 279, 280, 0, 279, 283, 268, 286, - 283, 0, 269, 268, 258, 284, 281, 269, 284, 281, - 285, 278, 0, 285, 268, 277, 287, 0, 269, 287, - 280, 279, 0, 268, 281, 286, 288, 269, 268, 288, - 289, 0, 269, 289, 281, 0, 0, 0, 285, 281, - 277, 290, 0, 0, 290, 0, 279, 0, 0, 0, - 281, 0, 0, 0, 0, 0, 0, 0, 0, 281, - - 0, 0, 0, 285, 281, 292, 292, 0, 292, 292, - 292, 293, 293, 294, 294, 294, 295, 295, 295, 296, - 296, 0, 296, 296, 296, 297, 0, 0, 297, 297, - 298, 0, 0, 298, 299, 299, 299, 300, 0, 300, - 300, 300, 301, 0, 0, 301, 301, 302, 302, 302, - 303, 303, 303, 304, 0, 0, 304, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 291, 291, 291, 291, - 291, 291, 291, 291 + 1, 1, 1, 1, 1, 2, 14, 14, 2, 5, + 5, 5, 5, 8, 8, 8, 8, 15, 15, 19, + 18, 246, 20, 227, 21, 35, 35, 18, 20, 22, + 24, 22, 64, 24, 26, 64, 25, 28, 226, 26, + + 54, 22, 58, 25, 19, 18, 28, 20, 21, 25, + 2, 18, 20, 22, 24, 22, 27, 24, 31, 26, + 27, 25, 28, 26, 54, 22, 58, 25, 30, 27, + 28, 29, 5, 25, 30, 203, 8, 30, 29, 202, + 29, 27, 29, 31, 176, 27, 42, 42, 33, 32, + 55, 33, 30, 27, 34, 34, 29, 33, 30, 32, + 34, 30, 29, 32, 29, 175, 29, 36, 36, 36, + 36, 49, 49, 33, 32, 55, 33, 56, 57, 34, + 34, 33, 60, 32, 34, 63, 61, 32, 37, 37, + 37, 37, 39, 39, 39, 39, 41, 41, 41, 41, + + 68, 59, 56, 57, 62, 139, 60, 66, 66, 63, + 59, 61, 36, 67, 108, 69, 70, 108, 71, 72, + 138, 73, 74, 77, 68, 59, 81, 79, 80, 62, + 36, 66, 66, 37, 59, 99, 72, 80, 67, 69, + 82, 70, 71, 83, 72, 73, 74, 84, 77, 85, + 81, 37, 79, 80, 86, 39, 87, 100, 89, 41, + 72, 80, 89, 105, 82, 90, 91, 83, 96, 111, + 146, 84, 111, 146, 85, 102, 103, 104, 86, 106, + 107, 87, 100, 89, 109, 110, 115, 89, 105, 90, + 91, 93, 93, 93, 93, 94, 94, 94, 94, 102, + + 103, 104, 111, 106, 112, 107, 113, 118, 109, 114, + 110, 115, 95, 116, 117, 113, 120, 48, 121, 123, + 124, 125, 126, 128, 130, 43, 111, 131, 112, 132, + 136, 113, 118, 114, 38, 134, 93, 116, 117, 113, + 94, 120, 121, 123, 124, 125, 126, 133, 128, 130, + 133, 131, 135, 132, 93, 136, 137, 143, 94, 134, + 140, 141, 147, 149, 151, 147, 150, 152, 157, 158, + 159, 163, 162, 166, 133, 162, 135, 164, 165, 17, + 167, 137, 143, 169, 140, 141, 169, 162, 149, 151, + 150, 152, 157, 158, 172, 159, 163, 166, 133, 173, + + 178, 179, 164, 165, 167, 187, 180, 182, 169, 180, + 183, 184, 162, 183, 185, 169, 190, 189, 169, 172, + 189, 191, 192, 193, 173, 178, 179, 194, 13, 180, + 187, 182, 169, 195, 12, 184, 206, 189, 185, 169, + 196, 190, 169, 196, 210, 191, 192, 193, 196, 201, + 197, 211, 194, 197, 180, 205, 198, 195, 197, 198, + 199, 206, 189, 199, 198, 197, 214, 209, 199, 210, + 209, 212, 213, 201, 212, 199, 211, 215, 216, 205, + 220, 228, 212, 220, 231, 222, 198, 209, 222, 221, + 197, 214, 230, 222, 232, 235, 213, 9, 220, 236, + + 199, 215, 216, 223, 221, 228, 223, 237, 220, 231, + 198, 223, 209, 220, 221, 238, 230, 222, 224, 232, + 235, 224, 233, 220, 236, 233, 224, 239, 221, 240, + 239, 237, 220, 251, 223, 241, 242, 220, 249, 238, + 254, 222, 243, 224, 244, 243, 255, 244, 245, 258, + 243, 245, 244, 3, 240, 239, 245, 251, 223, 259, + 241, 242, 259, 249, 254, 260, 261, 224, 262, 261, + 255, 262, 265, 258, 261, 243, 262, 244, 263, 239, + 266, 263, 245, 268, 270, 271, 263, 272, 271, 260, + 275, 276, 273, 275, 283, 273, 265, 263, 275, 243, + + 274, 244, 280, 274, 266, 280, 245, 285, 268, 270, + 273, 282, 272, 291, 282, 0, 276, 0, 274, 283, + 273, 288, 263, 284, 288, 273, 284, 286, 274, 0, + 286, 289, 285, 274, 289, 273, 0, 290, 291, 282, + 290, 0, 0, 274, 273, 286, 0, 292, 0, 273, + 292, 284, 274, 293, 0, 286, 293, 274, 294, 295, + 286, 294, 295, 282, 0, 290, 0, 0, 0, 0, + 286, 0, 0, 0, 0, 284, 0, 0, 0, 286, + 0, 0, 0, 0, 286, 0, 0, 0, 0, 290, + 297, 297, 0, 297, 297, 297, 298, 298, 299, 299, + + 299, 300, 300, 300, 301, 301, 0, 301, 301, 301, + 302, 0, 0, 302, 302, 303, 0, 0, 303, 304, + 304, 304, 305, 0, 305, 305, 305, 306, 0, 0, + 306, 306, 307, 307, 307, 308, 308, 308, 309, 0, + 0, 309, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + 296, 296, 296, 296, 296, 296, 296, 296, 296, 296, + + 296, 296, 296, 296, 296, 296, 296, 296 } ; static yy_state_type yy_last_accepting_state; @@ -805,7 +801,7 @@ static int checkImmediate(int token) { return token; } -#line 809 "engines/director/lingo/lingo-lex.cpp" +#line 805 "engines/director/lingo/lingo-lex.cpp" #define INITIAL 0 @@ -991,7 +987,7 @@ YY_DECL #line 87 "engines/director/lingo/lingo-lex.l" -#line 995 "engines/director/lingo/lingo-lex.cpp" +#line 991 "engines/director/lingo/lingo-lex.cpp" if ( !(yy_init) ) { @@ -1045,13 +1041,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 292 ) + if ( yy_current_state >= 297 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 291 ); + while ( yy_current_state != 296 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1648,7 +1644,7 @@ YY_RULE_SETUP #line 368 "engines/director/lingo/lingo-lex.l" ECHO; YY_BREAK -#line 1652 "engines/director/lingo/lingo-lex.cpp" +#line 1648 "engines/director/lingo/lingo-lex.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1942,7 +1938,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 292 ) + if ( yy_current_state >= 297 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1970,11 +1966,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 292 ) + if ( yy_current_state >= 297 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 291); + yy_is_jam = (yy_current_state == 296); return yy_is_jam ? 0 : yy_current_state; } diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l index d9dbc36dd1..b3928730eb 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -121,7 +121,7 @@ whitespace [\t ] return ENDCLAUSE; } -(?i:^[ \t]*factory) { count(); return tFACTORY; } +^[ \t]*(?:factory) { count(); return tFACTORY; } (?i:exit) { count(); return tEXIT; } (?i:global) { count(); return tGLOBAL; } (?i:go[\t ]+to[\t ]+frame) { count(); return tGO; } |