diff options
author | Eugene Sandulenko | 2019-12-23 13:07:59 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2019-12-23 13:14:54 +0100 |
commit | e0340374c889a77e7747bf5435105bd91e89fe60 (patch) | |
tree | 9e7f51880553ef182e46e4c19368fa2fbaed972d /engines/director/lingo | |
parent | 3e835a9e2a617eb23c94d7c0977f929178d31bea (diff) | |
download | scummvm-rg350-e0340374c889a77e7747bf5435105bd91e89fe60.tar.gz scummvm-rg350-e0340374c889a77e7747bf5435105bd91e89fe60.tar.bz2 scummvm-rg350-e0340374c889a77e7747bf5435105bd91e89fe60.zip |
DIRECTOR: LINGO: Fix ENDCLAUSE lexer regexp
Diffstat (limited to 'engines/director/lingo')
-rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 448 | ||||
-rw-r--r-- | engines/director/lingo/lingo-lex.l | 2 |
2 files changed, 224 insertions, 226 deletions
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index 3f1e0ffcd6..a975efeee5 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -373,7 +373,7 @@ 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[290] = { 0, 0, 0, 76, 74, 4, 72, 72, 74, 74, 74, 71, 71, 71, 70, 71, 67, 71, 68, 68, 68, @@ -390,24 +390,22 @@ static yyconst flex_int16_t yy_accept[292] = 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, 68, 68, 9, - 68, 11, 12, 15, 0, 16, 18, 68, 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, 6, 68, 68, 0, 16, 16, - 68, 68, 21, 68, 68, 29, 68, 32, 0, 68, - 68, 68, 68, 68, 68, 54, 54, 54, 54, 61, - - 68, 8, 68, 0, 16, 68, 19, 0, 68, 68, - 68, 0, 68, 68, 68, 45, 57, 47, 0, 0, - 54, 54, 54, 59, 68, 14, 17, 0, 68, 68, - 0, 30, 0, 68, 68, 68, 0, 0, 0, 0, - 54, 54, 54, 10, 0, 23, 68, 30, 30, 0, - 68, 42, 43, 0, 0, 0, 54, 54, 54, 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, 11, 12, 15, 0, 18, 68, 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, 6, 68, 68, 0, 16, 68, 68, + 21, 68, 68, 29, 68, 32, 0, 68, 68, 68, + 68, 68, 68, 54, 54, 54, 54, 61, 68, 8, + + 68, 0, 16, 68, 19, 0, 68, 68, 68, 0, + 68, 68, 68, 45, 57, 47, 0, 0, 54, 54, + 54, 59, 68, 14, 17, 0, 68, 68, 0, 30, + 0, 68, 68, 68, 0, 0, 0, 0, 54, 54, + 54, 10, 0, 23, 68, 30, 30, 0, 68, 42, + 43, 0, 0, 0, 54, 54, 54, 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 } ; static yyconst flex_int32_t yy_ec[256] = @@ -453,83 +451,83 @@ static yyconst flex_int32_t yy_meta[66] = 5, 5, 5, 5, 1 } ; -static yyconst flex_int16_t yy_base[307] = +static yyconst flex_int16_t yy_base[303] = { 0, - 0, 64, 186, 764, 68, 764, 764, 72, 179, 0, - 764, 161, 154, 55, 63, 764, 142, 58, 60, 58, + 0, 64, 186, 760, 68, 760, 760, 72, 179, 0, + 760, 161, 154, 55, 63, 760, 142, 58, 60, 58, 54, 62, 68, 63, 0, 87, 69, 109, 74, 114, - 102, 75, 129, 128, 148, 94, 187, 191, 201, 764, - 205, 99, 142, 764, 0, 764, 0, 114, 119, 764, - 764, 764, 0, 65, 121, 132, 139, 89, 182, 110, + 102, 75, 129, 128, 148, 94, 187, 191, 201, 760, + 205, 99, 142, 760, 0, 760, 0, 114, 119, 760, + 760, 760, 0, 65, 121, 132, 139, 89, 182, 110, 156, 162, 180, 183, 81, 0, 180, 179, 187, 187, 199, 186, 210, 183, 191, 0, 0, 202, 0, 211, 221, 198, 203, 201, 216, 212, 232, 240, 0, 243, - 228, 239, 764, 274, 295, 0, 0, 79, 244, 0, - - 250, 248, 247, 248, 255, 264, 290, 253, 256, 283, - 309, 272, 288, 285, 281, 285, 284, 296, 0, 296, - 284, 0, 294, 284, 288, 297, 0, 308, 0, 305, - 299, 306, 333, 321, 324, 312, 333, 325, 326, 0, - 346, 0, 0, 178, 362, 0, 0, 335, 349, 339, - 353, 339, 0, 0, 0, 0, 343, 346, 356, 0, - 0, 382, 354, 359, 364, 350, 355, 0, 396, 0, - 0, 371, 369, 0, 0, 382, 382, 406, 0, 0, - 377, 385, 411, 386, 384, 0, 400, 0, 424, 406, - 397, 402, 402, 417, 406, 439, 450, 463, 464, 0, - - 419, 0, 424, 436, 0, 422, 0, 474, 456, 457, - 480, 437, 461, 448, 452, 0, 0, 0, 496, 469, - 505, 507, 520, 0, 465, 764, 0, 480, 481, 499, - 486, 0, 503, 503, 495, 492, 531, 517, 513, 517, - 552, 563, 564, 0, 534, 0, 511, 0, 0, 520, - 531, 0, 0, 540, 575, 550, 579, 581, 591, 551, - 556, 0, 567, 0, 571, 592, 574, 603, 605, 616, - 583, 0, 764, 764, 604, 764, 614, 605, 626, 608, - 640, 764, 634, 641, 649, 619, 656, 667, 669, 671, - 764, 703, 705, 708, 711, 717, 722, 727, 730, 735, - - 737, 742, 747, 750, 753, 758 + 228, 239, 760, 274, 295, 0, 0, 79, 244, 0, + + 250, 248, 247, 248, 255, 264, 178, 253, 256, 274, + 309, 260, 286, 273, 281, 278, 280, 279, 0, 293, + 286, 0, 293, 283, 287, 295, 0, 308, 0, 305, + 301, 308, 336, 313, 322, 307, 316, 318, 319, 0, + 336, 0, 0, 362, 367, 0, 327, 345, 340, 346, + 338, 0, 0, 0, 0, 344, 347, 358, 0, 0, + 380, 355, 362, 367, 351, 355, 0, 391, 0, 0, + 370, 367, 0, 0, 378, 377, 398, 0, 373, 380, + 410, 382, 379, 0, 399, 0, 424, 401, 402, 400, + 399, 415, 404, 445, 449, 458, 462, 0, 412, 0, + + 424, 447, 0, 433, 0, 473, 455, 455, 479, 449, + 461, 447, 450, 0, 0, 0, 491, 468, 513, 520, + 514, 0, 452, 760, 0, 475, 466, 498, 438, 0, + 512, 510, 494, 493, 532, 518, 516, 514, 538, 556, + 565, 0, 527, 0, 520, 0, 0, 531, 541, 0, + 0, 537, 544, 546, 579, 580, 597, 548, 546, 0, + 557, 0, 566, 603, 567, 604, 612, 617, 574, 0, + 760, 760, 621, 760, 626, 588, 631, 594, 648, 760, + 635, 643, 649, 599, 650, 657, 662, 667, 760, 707, + 709, 712, 715, 721, 726, 731, 733, 738, 743, 746, + + 749, 754 } ; -static yyconst flex_int16_t yy_def[307] = +static yyconst flex_int16_t yy_def[303] = { 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, 294, 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, 294, 291, 291, 291, 295, 296, 291, 294, 294, - - 294, 294, 294, 294, 294, 294, 297, 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, 294, 294, 294, - 294, 294, 294, 294, 298, 299, 294, 294, 294, 291, - 294, 294, 294, 294, 294, 294, 294, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 294, 300, 294, - 294, 294, 294, 294, 294, 294, 294, 291, 301, 299, - 294, 294, 291, 294, 294, 294, 294, 294, 291, 294, - 294, 294, 294, 294, 294, 300, 300, 300, 300, 294, - - 294, 294, 294, 291, 301, 294, 294, 291, 294, 294, - 302, 291, 294, 294, 294, 294, 294, 294, 291, 291, - 300, 300, 300, 294, 294, 291, 294, 291, 294, 294, - 303, 304, 291, 294, 294, 294, 291, 291, 291, 291, - 300, 300, 300, 294, 291, 294, 294, 305, 304, 291, - 294, 294, 294, 291, 291, 291, 300, 300, 300, 291, - 294, 305, 291, 294, 291, 306, 291, 291, 291, 300, - 291, 294, 291, 291, 306, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 306, 306, 291, 306, - 0, 291, 291, 291, 291, 291, 291, 291, 291, 291, - - 291, 291, 291, 291, 291, 291 + 289, 1, 289, 289, 289, 289, 289, 289, 290, 291, + 289, 289, 289, 289, 289, 289, 289, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 289, 289, 289, 289, 289, + 289, 289, 290, 289, 293, 289, 294, 289, 289, 289, + 289, 289, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 289, 289, 289, 293, 294, 289, 292, 292, + + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 289, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 295, 292, 292, 292, 289, 292, + 292, 292, 292, 292, 292, 292, 292, 292, 292, 292, + 292, 292, 292, 292, 292, 292, 292, 296, 292, 292, + 292, 292, 292, 292, 292, 292, 289, 297, 292, 292, + 289, 292, 292, 292, 292, 292, 289, 292, 292, 292, + 292, 292, 292, 296, 296, 296, 296, 292, 292, 292, + + 292, 289, 297, 292, 292, 289, 292, 292, 298, 289, + 292, 292, 292, 292, 292, 292, 289, 289, 296, 296, + 296, 292, 292, 289, 292, 289, 292, 292, 299, 300, + 289, 292, 292, 292, 289, 289, 289, 289, 296, 296, + 296, 292, 289, 292, 292, 301, 300, 289, 292, 292, + 292, 289, 289, 289, 296, 296, 296, 289, 292, 301, + 289, 292, 289, 302, 289, 289, 289, 296, 289, 292, + 289, 289, 302, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 302, 302, 289, 302, 0, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + + 289, 289 } ; -static yyconst flex_int16_t yy_nxt[830] = +static yyconst flex_int16_t yy_nxt[826] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 11, 13, 4, 14, 15, 16, 17, 18, 19, 20, 21, @@ -549,82 +547,82 @@ static yyconst flex_int16_t yy_nxt[830] = 100, 103, 77, 106, 78, 68, 79, 44, 87, 84, 71, 88, 80, 101, 72, 102, 52, 89, 81, 85, 76, 82, 73, 86, 47, 100, 77, 106, 78, 46, - 79, 90, 91, 87, 84, 107, 88, 92, 101, 178, - 102, 89, 178, 85, 44, 291, 108, 86, 94, 40, + 79, 90, 91, 87, 84, 107, 88, 92, 101, 145, + 102, 89, 145, 85, 44, 289, 108, 86, 94, 40, 40, 95, 95, 40, 40, 95, 90, 91, 109, 114, 107, 92, 39, 40, 40, 41, 41, 40, 40, 41, - 104, 108, 110, 112, 113, 115, 116, 117, 291, 105, - 118, 121, 123, 109, 114, 122, 291, 124, 131, 119, - 291, 291, 127, 128, 104, 129, 110, 112, 113, 115, + 104, 108, 110, 112, 113, 115, 116, 117, 289, 105, + 118, 121, 123, 109, 114, 122, 289, 124, 131, 119, + 289, 289, 127, 128, 104, 129, 110, 112, 113, 115, 116, 125, 117, 105, 118, 121, 120, 123, 130, 122, 126, 42, 124, 131, 119, 42, 127, 128, 132, 129, - 133, 291, 136, 134, 138, 42, 125, 135, 142, 42, - 120, 137, 130, 291, 126, 94, 40, 40, 95, 139, - 140, 141, 132, 143, 144, 133, 136, 147, 134, 138, - 148, 145, 135, 142, 145, 137, 95, 40, 40, 95, - - 149, 155, 53, 139, 140, 141, 151, 143, 152, 144, - 111, 147, 154, 111, 148, 156, 157, 153, 160, 158, - 159, 291, 161, 162, 163, 149, 155, 164, 165, 166, - 151, 167, 168, 152, 169, 173, 154, 169, 42, 156, - 157, 153, 160, 150, 158, 159, 161, 162, 163, 171, - 172, 164, 174, 165, 166, 167, 168, 175, 176, 42, - 173, 170, 177, 145, 181, 182, 145, 150, 183, 184, - 291, 185, 186, 171, 172, 187, 188, 174, 191, 192, - 193, 175, 176, 189, 194, 170, 189, 177, 181, 195, - 182, 200, 183, 201, 184, 185, 186, 169, 190, 187, - - 169, 188, 202, 191, 192, 193, 203, 178, 194, 206, - 178, 207, 208, 195, 209, 208, 200, 210, 201, 211, - 291, 291, 197, 190, 213, 189, 214, 202, 189, 198, - 204, 203, 199, 206, 215, 207, 216, 217, 209, 218, - 219, 210, 291, 219, 211, 212, 197, 224, 220, 213, - 214, 219, 225, 198, 219, 204, 199, 226, 215, 220, - 216, 227, 217, 218, 219, 219, 221, 219, 219, 233, - 212, 224, 220, 220, 229, 208, 225, 230, 208, 234, - 223, 231, 226, 235, 231, 227, 236, 231, 238, 291, - 231, 221, 53, 233, 222, 228, 291, 237, 244, 229, - - 237, 246, 230, 240, 234, 223, 219, 235, 219, 219, - 236, 219, 245, 238, 220, 238, 220, 247, 222, 250, - 228, 219, 244, 251, 219, 239, 246, 240, 252, 220, - 240, 253, 237, 254, 255, 237, 245, 291, 241, 242, - 238, 256, 247, 291, 250, 261, 243, 263, 251, 239, - 260, 291, 252, 219, 240, 253, 219, 264, 254, 255, - 239, 220, 241, 242, 219, 219, 256, 219, 219, 261, - 243, 263, 220, 220, 265, 260, 266, 267, 271, 266, - 268, 264, 269, 268, 239, 269, 257, 273, 220, 272, - 220, 274, 219, 266, 276, 219, 266, 258, 265, 259, - - 220, 267, 271, 282, 277, 291, 279, 277, 291, 279, - 257, 270, 273, 272, 291, 277, 274, 281, 277, 276, - 281, 258, 238, 259, 238, 220, 283, 279, 282, 284, - 279, 291, 278, 291, 280, 287, 270, 240, 287, 240, - 289, 285, 288, 278, 285, 288, 291, 238, 291, 238, - 285, 283, 291, 285, 284, 280, 278, 287, 280, 238, - 287, 240, 291, 240, 291, 289, 291, 278, 288, 286, - 290, 288, 290, 290, 240, 290, 291, 291, 286, 280, - 291, 291, 291, 291, 238, 291, 291, 291, 291, 291, - 291, 291, 291, 286, 291, 291, 291, 291, 240, 291, - - 291, 291, 286, 43, 43, 291, 43, 43, 43, 45, - 45, 53, 53, 53, 96, 96, 96, 97, 97, 291, - 97, 97, 97, 146, 291, 146, 146, 146, 179, 291, - 291, 179, 179, 180, 180, 180, 196, 291, 291, 196, - 205, 205, 205, 232, 291, 232, 232, 232, 248, 291, - 291, 248, 248, 249, 249, 249, 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 + 133, 289, 136, 134, 138, 42, 125, 135, 142, 42, + 120, 137, 130, 289, 126, 94, 40, 40, 95, 139, + 140, 141, 132, 143, 144, 133, 136, 146, 134, 138, + 147, 148, 135, 142, 150, 137, 95, 40, 40, 95, + + 153, 154, 157, 139, 140, 141, 151, 143, 155, 144, + 111, 146, 156, 111, 147, 152, 148, 158, 150, 289, + 159, 160, 161, 162, 153, 163, 154, 157, 164, 165, + 172, 151, 155, 166, 167, 173, 156, 168, 42, 152, + 168, 170, 158, 149, 159, 160, 161, 162, 171, 163, + 174, 175, 176, 164, 165, 172, 179, 166, 167, 42, + 173, 180, 182, 177, 169, 170, 177, 149, 145, 181, + 183, 145, 171, 184, 174, 175, 185, 176, 186, 189, + 179, 187, 190, 191, 187, 192, 180, 182, 169, 193, + 198, 199, 168, 181, 183, 168, 188, 184, 200, 177, + + 185, 201, 177, 186, 189, 204, 205, 190, 191, 192, + 207, 206, 208, 193, 206, 198, 199, 195, 209, 211, + 289, 188, 202, 200, 196, 187, 201, 197, 187, 204, + 205, 212, 213, 214, 207, 215, 208, 216, 289, 229, + 222, 195, 229, 209, 211, 210, 217, 202, 196, 217, + 217, 197, 223, 217, 218, 212, 213, 214, 218, 217, + 215, 216, 217, 217, 222, 219, 217, 218, 224, 289, + 210, 218, 225, 227, 206, 228, 223, 206, 221, 232, + 229, 231, 233, 229, 234, 242, 244, 236, 289, 220, + 219, 53, 235, 224, 226, 235, 225, 289, 227, 289, + + 228, 289, 238, 221, 232, 231, 233, 243, 234, 242, + 236, 244, 236, 220, 217, 217, 245, 217, 217, 226, + 237, 217, 218, 218, 217, 238, 238, 250, 248, 218, + 249, 243, 251, 235, 252, 236, 235, 253, 254, 217, + 241, 245, 217, 258, 237, 264, 239, 218, 264, 238, + 289, 250, 240, 248, 259, 249, 251, 217, 261, 252, + 217, 237, 253, 254, 241, 218, 217, 262, 258, 217, + 239, 263, 255, 265, 218, 269, 240, 271, 259, 270, + 266, 267, 261, 266, 267, 237, 272, 274, 218, 218, + 256, 262, 289, 289, 280, 263, 255, 265, 217, 269, + + 257, 217, 271, 270, 264, 275, 218, 264, 275, 281, + 289, 272, 274, 277, 256, 282, 277, 268, 279, 280, + 287, 279, 289, 236, 257, 289, 218, 275, 289, 289, + 275, 236, 277, 276, 281, 277, 285, 289, 238, 285, + 282, 278, 268, 289, 286, 287, 238, 286, 236, 283, + 283, 285, 283, 283, 285, 276, 236, 276, 286, 289, + 278, 286, 238, 288, 289, 278, 288, 236, 288, 289, + 238, 288, 289, 289, 289, 289, 289, 284, 284, 276, + 289, 289, 238, 289, 278, 289, 289, 289, 289, 289, + 289, 289, 236, 289, 289, 289, 289, 289, 289, 289, + + 289, 284, 284, 289, 289, 289, 238, 43, 43, 289, + 43, 43, 43, 45, 45, 53, 53, 53, 96, 96, + 96, 97, 97, 289, 97, 97, 97, 178, 289, 289, + 178, 178, 194, 289, 289, 194, 203, 203, 203, 230, + 289, 230, 230, 230, 246, 289, 289, 246, 246, 247, + 247, 247, 260, 260, 260, 273, 289, 289, 273, 3, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289 } ; -static yyconst flex_int16_t yy_chk[830] = +static yyconst flex_int16_t yy_chk[826] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -644,8 +642,8 @@ static yyconst flex_int16_t yy_chk[830] = 55, 58, 30, 60, 30, 26, 30, 43, 34, 33, 28, 34, 31, 56, 28, 57, 17, 34, 31, 33, 30, 31, 28, 33, 13, 55, 30, 60, 30, 12, - 30, 35, 35, 34, 33, 61, 34, 35, 56, 144, - 57, 34, 144, 33, 9, 3, 62, 33, 37, 37, + 30, 35, 35, 34, 33, 61, 34, 35, 56, 107, + 57, 34, 107, 33, 9, 3, 62, 33, 37, 37, 37, 37, 38, 38, 38, 38, 35, 35, 63, 68, 61, 35, 39, 39, 39, 39, 41, 41, 41, 41, @@ -657,66 +655,66 @@ static yyconst flex_int16_t yy_chk[830] = 88, 0, 91, 90, 99, 39, 81, 90, 104, 41, 73, 92, 85, 0, 81, 94, 94, 94, 94, 101, 102, 103, 87, 105, 106, 88, 91, 108, 90, 99, - 109, 107, 90, 104, 107, 92, 95, 95, 95, 95, - - 110, 115, 107, 101, 102, 103, 112, 105, 113, 106, - 111, 108, 114, 111, 109, 116, 117, 113, 121, 118, - 120, 0, 123, 124, 125, 110, 115, 126, 128, 130, - 112, 131, 132, 113, 133, 136, 114, 133, 94, 116, - 117, 113, 121, 111, 118, 120, 123, 124, 125, 134, - 135, 126, 137, 128, 130, 131, 132, 138, 139, 95, - 136, 133, 141, 145, 148, 149, 145, 111, 150, 151, - 0, 152, 157, 134, 135, 158, 159, 137, 163, 164, - 165, 138, 139, 162, 166, 133, 162, 141, 148, 167, - 149, 172, 150, 173, 151, 152, 157, 169, 162, 158, - - 169, 159, 176, 163, 164, 165, 177, 178, 166, 181, - 178, 182, 183, 167, 184, 183, 172, 185, 173, 187, - 0, 0, 169, 162, 190, 189, 191, 176, 189, 169, - 178, 177, 169, 181, 192, 182, 193, 194, 184, 195, - 196, 185, 0, 196, 187, 189, 169, 201, 196, 190, - 191, 197, 203, 169, 197, 178, 169, 204, 192, 197, - 193, 206, 194, 195, 198, 199, 197, 198, 199, 212, - 189, 201, 198, 199, 209, 208, 203, 210, 208, 213, - 199, 211, 204, 214, 211, 206, 215, 231, 220, 0, - 231, 197, 211, 212, 198, 208, 0, 219, 225, 209, - - 219, 229, 210, 220, 213, 199, 221, 214, 222, 221, - 215, 222, 228, 220, 221, 219, 222, 230, 198, 233, - 208, 223, 225, 234, 223, 219, 229, 220, 235, 223, - 219, 236, 237, 238, 239, 237, 228, 0, 221, 222, - 219, 240, 230, 0, 233, 247, 223, 250, 234, 219, - 245, 0, 235, 241, 219, 236, 241, 251, 238, 239, - 237, 241, 221, 222, 242, 243, 240, 242, 243, 247, - 223, 250, 242, 243, 254, 245, 255, 256, 260, 255, - 257, 251, 258, 257, 237, 258, 241, 263, 257, 261, - 258, 265, 259, 266, 267, 259, 266, 242, 254, 243, - - 259, 256, 260, 271, 268, 275, 269, 268, 275, 269, - 241, 259, 263, 261, 0, 277, 265, 270, 277, 267, - 270, 242, 268, 243, 269, 270, 278, 279, 271, 280, - 279, 0, 268, 0, 269, 283, 259, 268, 283, 269, - 286, 281, 284, 277, 281, 284, 0, 268, 0, 269, - 285, 278, 0, 285, 280, 279, 268, 287, 269, 281, - 287, 268, 0, 269, 0, 286, 0, 277, 288, 281, - 289, 288, 290, 289, 281, 290, 0, 0, 285, 279, - 0, 0, 0, 0, 281, 0, 0, 0, 0, 0, - 0, 0, 0, 281, 0, 0, 0, 0, 281, 0, - - 0, 0, 285, 292, 292, 0, 292, 292, 292, 293, - 293, 294, 294, 294, 295, 295, 295, 296, 296, 0, - 296, 296, 296, 297, 0, 297, 297, 297, 298, 0, - 0, 298, 298, 299, 299, 299, 300, 0, 0, 300, - 301, 301, 301, 302, 0, 302, 302, 302, 303, 0, - 0, 303, 303, 304, 304, 304, 305, 305, 305, 306, - 0, 0, 306, 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 + 109, 110, 90, 104, 112, 92, 95, 95, 95, 95, + + 114, 115, 118, 101, 102, 103, 113, 105, 116, 106, + 111, 108, 117, 111, 109, 113, 110, 120, 112, 0, + 121, 123, 124, 125, 114, 126, 115, 118, 128, 130, + 136, 113, 116, 131, 132, 137, 117, 133, 94, 113, + 133, 134, 120, 111, 121, 123, 124, 125, 135, 126, + 138, 139, 141, 128, 130, 136, 147, 131, 132, 95, + 137, 148, 150, 144, 133, 134, 144, 111, 145, 149, + 151, 145, 135, 156, 138, 139, 157, 141, 158, 162, + 147, 161, 163, 164, 161, 165, 148, 150, 133, 166, + 171, 172, 168, 149, 151, 168, 161, 156, 175, 177, + + 157, 176, 177, 158, 162, 179, 180, 163, 164, 165, + 182, 181, 183, 166, 181, 171, 172, 168, 185, 188, + 0, 161, 177, 175, 168, 187, 176, 168, 187, 179, + 180, 189, 190, 191, 182, 192, 183, 193, 0, 229, + 199, 168, 229, 185, 188, 187, 194, 177, 168, 194, + 195, 168, 201, 195, 194, 189, 190, 191, 195, 196, + 192, 193, 196, 197, 199, 195, 197, 196, 202, 0, + 187, 197, 204, 207, 206, 208, 201, 206, 197, 211, + 209, 210, 212, 209, 213, 223, 227, 218, 0, 196, + 195, 209, 217, 202, 206, 217, 204, 0, 207, 0, + + 208, 0, 218, 197, 211, 210, 212, 226, 213, 223, + 217, 227, 218, 196, 219, 221, 228, 219, 221, 206, + 217, 220, 219, 221, 220, 217, 218, 233, 231, 220, + 232, 226, 234, 235, 236, 217, 235, 237, 238, 239, + 221, 228, 239, 243, 217, 253, 219, 239, 253, 217, + 0, 233, 220, 231, 245, 232, 234, 240, 248, 236, + 240, 235, 237, 238, 221, 240, 241, 249, 243, 241, + 219, 252, 239, 254, 241, 258, 220, 261, 245, 259, + 255, 256, 248, 255, 256, 235, 263, 265, 255, 256, + 240, 249, 0, 0, 269, 252, 239, 254, 257, 258, + + 241, 257, 261, 259, 264, 266, 257, 264, 266, 276, + 0, 263, 265, 267, 240, 278, 267, 257, 268, 269, + 284, 268, 273, 266, 241, 273, 268, 275, 0, 0, + 275, 267, 277, 266, 276, 277, 281, 0, 266, 281, + 278, 267, 257, 0, 282, 284, 267, 282, 266, 279, + 283, 285, 279, 283, 285, 275, 267, 266, 286, 0, + 277, 286, 266, 287, 0, 267, 287, 279, 288, 0, + 267, 288, 0, 0, 0, 0, 0, 279, 283, 275, + 0, 0, 279, 0, 277, 0, 0, 0, 0, 0, + 0, 0, 279, 0, 0, 0, 0, 0, 0, 0, + + 0, 279, 283, 0, 0, 0, 279, 290, 290, 0, + 290, 290, 290, 291, 291, 292, 292, 292, 293, 293, + 293, 294, 294, 0, 294, 294, 294, 295, 0, 0, + 295, 295, 296, 0, 0, 296, 297, 297, 297, 298, + 0, 298, 298, 298, 299, 0, 0, 299, 299, 300, + 300, 300, 301, 301, 301, 302, 0, 0, 302, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289, 289, 289, 289, 289, 289, + 289, 289, 289, 289, 289 } ; static yy_state_type yy_last_accepting_state; @@ -803,7 +801,7 @@ static int checkImmediate(int token) { return token; } -#line 807 "engines/director/lingo/lingo-lex.cpp" +#line 805 "engines/director/lingo/lingo-lex.cpp" #define INITIAL 0 @@ -989,7 +987,7 @@ YY_DECL #line 85 "engines/director/lingo/lingo-lex.l" -#line 993 "engines/director/lingo/lingo-lex.cpp" +#line 991 "engines/director/lingo/lingo-lex.cpp" if ( !(yy_init) ) { @@ -1043,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 >= 290 ) 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 != 289 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1633,7 +1631,7 @@ YY_RULE_SETUP #line 353 "engines/director/lingo/lingo-lex.l" ECHO; YY_BREAK -#line 1637 "engines/director/lingo/lingo-lex.cpp" +#line 1635 "engines/director/lingo/lingo-lex.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1927,7 +1925,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 >= 290 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1955,11 +1953,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 >= 290 ) 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 == 289); 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 df5203a001..a654d3cf70 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -101,7 +101,7 @@ whitespace [\t ] (?i:if) { count(); return tIF; } (?i:else[\t ]+if) { count(); return tELSIF; } (?i:else) { count(); return tELSE; } -(?i:end)([\t ]*{identifier})? { +(?i:end)([\t ]+{identifier})? { count(); const char *ptr = &yytext[4]; // Skip 'end ' |