[Scummvm-git-logs] scummvm master -> dea5a8625dec60780d6bba09fcb56c52291ecd1f
sev-
sev at scummvm.org
Mon Aug 3 20:06:02 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
dea5a8625d DIRECTOR: LINGO: Implement grammar for 'go the frame XX'
Commit: dea5a8625dec60780d6bba09fcb56c52291ecd1f
https://github.com/scummvm/scummvm/commit/dea5a8625dec60780d6bba09fcb56c52291ecd1f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-03T22:05:37+02:00
Commit Message:
DIRECTOR: LINGO: Implement grammar for 'go the frame XX'
Changed paths:
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
engines/director/lingo/tests/goto.lingo
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index dc04ba4797..661a594d46 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -364,7 +364,7 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static const flex_int16_t yy_accept[317] =
+static const flex_int16_t yy_accept[321] =
{ 0,
0, 0, 75, 73, 1, 71, 71, 73, 73, 70,
70, 69, 70, 66, 70, 67, 67, 67, 67, 67,
@@ -385,22 +385,22 @@ static const flex_int16_t yy_accept[317] =
23, 25, 26, 67, 67, 67, 31, 35, 38, 67,
67, 67, 67, 67, 67, 47, 0, 53, 58, 67,
67, 56, 61, 0, 67, 3, 67, 67, 0, 13,
- 16, 67, 0, 0, 19, 67, 67, 27, 67, 30,
- 0, 67, 67, 67, 67, 67, 67, 67, 52, 52,
-
- 52, 59, 67, 67, 0, 67, 5, 67, 0, 13,
- 17, 0, 0, 0, 67, 67, 67, 0, 67, 67,
- 67, 43, 44, 55, 46, 0, 52, 52, 60, 57,
- 0, 67, 67, 11, 0, 20, 67, 67, 0, 0,
- 67, 67, 67, 0, 0, 0, 52, 52, 0, 14,
- 8, 18, 21, 67, 28, 0, 67, 40, 41, 0,
- 0, 0, 52, 52, 14, 67, 28, 0, 39, 0,
- 0, 0, 0, 52, 22, 37, 51, 50, 51, 0,
- 0, 0, 0, 52, 50, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 51, 50,
-
- 50, 51, 0, 49, 50, 50, 0, 50, 0, 50,
- 0, 0, 0, 0, 48, 0
+ 16, 67, 0, 0, 0, 19, 67, 67, 27, 67,
+ 30, 0, 67, 67, 67, 67, 67, 67, 67, 52,
+
+ 52, 52, 59, 67, 67, 0, 67, 5, 67, 0,
+ 13, 17, 0, 0, 0, 0, 67, 67, 67, 0,
+ 67, 67, 67, 43, 44, 55, 46, 0, 52, 52,
+ 60, 57, 0, 67, 67, 11, 0, 20, 0, 0,
+ 67, 67, 0, 0, 67, 67, 67, 0, 0, 0,
+ 52, 52, 0, 14, 8, 18, 21, 67, 28, 0,
+ 67, 40, 41, 0, 0, 0, 52, 52, 14, 67,
+ 28, 0, 39, 0, 0, 0, 0, 52, 22, 37,
+ 51, 50, 51, 0, 0, 0, 0, 52, 50, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+ 0, 0, 51, 50, 50, 51, 0, 49, 50, 50,
+ 0, 50, 0, 50, 0, 0, 0, 0, 48, 0
} ;
static const YY_CHAR yy_ec[256] =
@@ -445,87 +445,89 @@ static const YY_CHAR yy_meta[60] =
5, 5, 5, 5, 5, 5, 5, 5, 5
} ;
-static const flex_int16_t yy_base[331] =
+static const flex_int16_t yy_base[335] =
{ 0,
- 0, 58, 630, 704, 59, 704, 704, 624, 0, 704,
- 620, 55, 54, 704, 615, 49, 51, 57, 46, 50,
+ 0, 58, 642, 712, 59, 712, 712, 635, 0, 712,
+ 631, 55, 54, 712, 624, 49, 51, 57, 46, 50,
48, 56, 0, 85, 59, 95, 73, 98, 106, 68,
- 124, 138, 98, 165, 148, 85, 704, 621, 704, 0,
- 704, 615, 122, 704, 704, 704, 0, 120, 73, 93,
- 124, 143, 146, 139, 146, 146, 157, 164, 162, 621,
+ 124, 138, 98, 165, 148, 85, 712, 630, 712, 0,
+ 712, 624, 122, 712, 712, 712, 0, 120, 73, 93,
+ 124, 143, 146, 139, 146, 146, 157, 164, 162, 631,
0, 160, 167, 166, 177, 166, 183, 163, 171, 0,
0, 186, 0, 191, 192, 176, 190, 193, 192, 197,
197, 203, 213, 0, 214, 212, 211, 249, 219, 231,
- 0, 612, 230, 0, 217, 223, 229, 228, 236, 246,
+ 0, 621, 230, 0, 217, 223, 229, 228, 236, 246,
- 618, 239, 249, 250, 267, 243, 257, 253, 258, 250,
+ 628, 239, 249, 250, 267, 243, 257, 253, 258, 250,
259, 0, 265, 252, 0, 264, 258, 262, 275, 0,
287, 286, 0, 287, 283, 291, 314, 293, 296, 305,
302, 307, 309, 296, 299, 301, 0, 0, 317, 0,
- 614, 613, 0, 317, 322, 310, 314, 317, 323, 316,
- 0, 0, 0, 325, 327, 338, 0, 0, 355, 337,
- 347, 352, 343, 341, 342, 0, 374, 0, 0, 360,
- 347, 357, 0, 350, 355, 0, 366, 363, 384, 0,
- 0, 363, 374, 364, 611, 366, 369, 0, 384, 0,
- 405, 395, 386, 387, 386, 387, 401, 396, 610, 418,
-
- 425, 0, 394, 403, 404, 408, 0, 412, 415, 0,
- 0, 417, 416, 431, 429, 428, 609, 424, 431, 423,
- 428, 0, 0, 0, 0, 460, 462, 461, 0, 0,
- 437, 436, 443, 704, 457, 704, 461, 465, 605, 469,
- 466, 458, 454, 479, 475, 475, 496, 504, 464, 0,
- 0, 704, 0, 471, 0, 487, 492, 0, 0, 491,
- 604, 499, 556, 502, 704, 496, 0, 510, 0, 511,
- 531, 512, 529, 530, 0, 704, 704, 0, 704, 483,
- 534, 532, 535, 466, 0, 539, 536, 368, 538, 560,
- 516, 545, 553, 571, 566, 557, 235, 199, 169, 543,
-
- 559, 158, 144, 127, 119, 116, 572, 594, 597, 595,
- 554, 575, 80, 77, 70, 704, 647, 649, 652, 655,
- 660, 665, 667, 672, 675, 680, 685, 687, 692, 697
+ 627, 626, 0, 317, 322, 310, 314, 338, 323, 315,
+ 0, 0, 0, 318, 325, 336, 0, 0, 355, 334,
+ 348, 356, 344, 342, 343, 0, 374, 0, 0, 359,
+ 352, 359, 0, 353, 358, 0, 364, 364, 369, 0,
+ 0, 365, 373, 372, 374, 624, 377, 374, 0, 392,
+ 0, 411, 398, 390, 389, 388, 389, 406, 398, 623,
+
+ 423, 427, 0, 398, 408, 408, 410, 0, 418, 417,
+ 0, 0, 420, 418, 621, 445, 433, 432, 618, 423,
+ 437, 424, 432, 0, 0, 0, 0, 463, 468, 464,
+ 0, 0, 443, 442, 453, 712, 463, 712, 483, 463,
+ 469, 475, 617, 478, 478, 470, 471, 489, 490, 488,
+ 491, 516, 478, 0, 0, 712, 0, 488, 0, 499,
+ 501, 0, 0, 497, 616, 504, 613, 536, 712, 505,
+ 0, 514, 0, 518, 544, 521, 542, 538, 0, 712,
+ 712, 0, 712, 495, 539, 555, 548, 469, 0, 559,
+ 541, 429, 560, 562, 539, 556, 564, 595, 569, 557,
+
+ 235, 199, 169, 542, 561, 158, 144, 127, 119, 116,
+ 547, 600, 605, 611, 575, 595, 80, 77, 70, 712,
+ 655, 657, 660, 663, 668, 673, 675, 680, 683, 688,
+ 693, 695, 700, 705
} ;
-static const flex_int16_t yy_def[331] =
+static const flex_int16_t yy_def[335] =
{ 0,
- 316, 1, 316, 316, 316, 316, 316, 317, 318, 316,
- 316, 316, 316, 316, 316, 319, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 319, 319, 319,
- 319, 319, 319, 316, 319, 316, 316, 317, 316, 320,
- 316, 316, 316, 316, 316, 316, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 316, 316, 319,
- 320, 316, 319, 319, 319, 319, 319, 319, 319, 319,
-
- 319, 319, 319, 319, 316, 319, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 319, 319, 319,
- 319, 319, 316, 319, 319, 319, 319, 319, 319, 319,
- 319, 321, 319, 319, 319, 316, 316, 316, 319, 319,
- 319, 319, 319, 319, 319, 319, 319, 319, 319, 319,
- 319, 319, 319, 319, 319, 319, 322, 319, 319, 319,
- 319, 319, 319, 316, 319, 319, 319, 319, 316, 323,
- 319, 319, 316, 316, 316, 319, 319, 319, 319, 319,
- 316, 319, 319, 319, 319, 319, 319, 319, 322, 322,
-
- 322, 319, 319, 319, 316, 319, 319, 319, 316, 323,
- 319, 316, 316, 316, 319, 319, 319, 316, 319, 319,
- 319, 319, 319, 319, 319, 316, 322, 322, 319, 319,
- 316, 319, 319, 316, 316, 316, 319, 319, 324, 316,
- 319, 319, 319, 316, 316, 316, 322, 322, 316, 319,
- 319, 316, 319, 319, 325, 316, 319, 319, 319, 316,
- 316, 316, 322, 322, 316, 319, 325, 316, 319, 316,
- 326, 316, 327, 322, 319, 316, 316, 328, 316, 327,
- 327, 327, 327, 322, 328, 316, 327, 327, 327, 316,
- 316, 316, 327, 326, 327, 316, 316, 316, 327, 328,
-
- 328, 327, 316, 316, 328, 328, 329, 330, 316, 330,
- 316, 316, 316, 316, 316, 0, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316
+ 320, 1, 320, 320, 320, 320, 320, 321, 322, 320,
+ 320, 320, 320, 320, 320, 323, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323,
+ 323, 323, 323, 320, 323, 320, 320, 321, 320, 324,
+ 320, 320, 320, 320, 320, 320, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 320, 320, 323,
+ 324, 320, 323, 323, 323, 323, 323, 323, 323, 323,
+
+ 323, 323, 323, 323, 320, 323, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323,
+ 323, 323, 320, 323, 323, 323, 323, 323, 323, 323,
+ 323, 325, 323, 323, 323, 320, 320, 320, 323, 323,
+ 323, 323, 323, 323, 323, 323, 323, 323, 323, 323,
+ 323, 323, 323, 323, 323, 323, 326, 323, 323, 323,
+ 323, 323, 323, 320, 323, 323, 323, 323, 320, 327,
+ 323, 323, 320, 320, 320, 320, 323, 323, 323, 323,
+ 323, 320, 323, 323, 323, 323, 323, 323, 323, 326,
+
+ 326, 326, 323, 323, 323, 320, 323, 323, 323, 320,
+ 327, 323, 320, 320, 320, 320, 323, 323, 323, 320,
+ 323, 323, 323, 323, 323, 323, 323, 320, 326, 326,
+ 323, 323, 320, 323, 323, 320, 320, 320, 320, 320,
+ 323, 323, 328, 320, 323, 323, 323, 320, 320, 320,
+ 326, 326, 320, 323, 323, 320, 323, 323, 329, 320,
+ 323, 323, 323, 320, 320, 320, 326, 326, 320, 323,
+ 329, 320, 323, 320, 330, 320, 331, 326, 323, 320,
+ 320, 332, 320, 331, 331, 331, 331, 326, 332, 320,
+ 331, 331, 331, 320, 320, 320, 331, 330, 331, 320,
+
+ 320, 320, 331, 332, 332, 331, 320, 320, 332, 332,
+ 333, 334, 320, 334, 320, 320, 320, 320, 320, 0,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320
} ;
-static const flex_int16_t yy_nxt[764] =
+static const flex_int16_t yy_nxt[772] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 4, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
@@ -534,25 +536,25 @@ static const flex_int16_t yy_nxt[764] =
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 23, 23, 33, 23, 23, 34,
36, 37, 37, 42, 43, 44, 45, 48, 50, 58,
- 51, 315, 54, 55, 49, 56, 35, 52, 315, 59,
- 64, 315, 60, 53, 57, 77, 36, 37, 37, 94,
+ 51, 319, 54, 55, 49, 56, 35, 52, 319, 59,
+ 64, 319, 60, 53, 57, 77, 36, 37, 37, 94,
68, 48, 50, 58, 51, 54, 55, 49, 56, 69,
35, 52, 59, 61, 64, 60, 53, 57, 65, 77,
- 62, 95, 66, 94, 68, 63, 70, 304, 85, 86,
- 304, 67, 69, 71, 87, 72, 73, 61, 304, 74,
+ 62, 95, 66, 94, 68, 63, 70, 308, 85, 86,
+ 308, 67, 69, 71, 87, 72, 73, 61, 308, 74,
42, 43, 65, 62, 75, 95, 66, 76, 63, 78,
- 70, 79, 85, 86, 67, 307, 71, 87, 72, 73,
- 93, 80, 74, 96, 81, 82, 97, 75, 83, 286,
+ 70, 79, 85, 86, 67, 311, 71, 87, 72, 73,
+ 93, 80, 74, 96, 81, 82, 97, 75, 83, 290,
76, 90, 101, 78, 84, 79, 88, 37, 37, 58,
- 286, 98, 99, 93, 80, 100, 96, 81, 102, 82,
+ 290, 98, 99, 93, 80, 100, 96, 81, 102, 82,
97, 103, 83, 89, 108, 90, 101, 84, 104, 106,
107, 109, 110, 58, 98, 99, 111, 114, 100, 112,
- 304, 115, 102, 116, 117, 103, 120, 89, 108, 118,
+ 308, 115, 102, 116, 117, 103, 120, 89, 108, 118,
125, 104, 106, 107, 109, 113, 110, 121, 119, 111,
114, 122, 123, 112, 115, 124, 126, 116, 117, 120,
- 127, 128, 133, 118, 125, 129, 304, 130, 113, 132,
+ 127, 128, 133, 118, 125, 129, 308, 130, 113, 132,
121, 119, 131, 136, 122, 123, 134, 135, 124, 126,
88, 37, 37, 137, 127, 128, 133, 138, 139, 129,
130, 140, 132, 141, 145, 131, 136, 89, 105, 143,
@@ -563,57 +565,58 @@ static const flex_int16_t yy_nxt[764] =
152, 154, 161, 155, 162, 157, 151, 163, 164, 146,
156, 165, 158, 147, 166, 167, 159, 160, 169, 170,
148, 171, 172, 173, 174, 161, 175, 176, 162, 177,
- 178, 163, 164, 181, 165, 182, 186, 166, 183, 168,
- 184, 169, 170, 185, 187, 171, 172, 173, 174, 175,
- 176, 188, 177, 189, 178, 190, 191, 181, 193, 182,
- 186, 183, 168, 184, 194, 195, 185, 187, 192, 294,
- 196, 197, 198, 203, 188, 167, 189, 202, 204, 190,
- 205, 206, 193, 207, 208, 179, 211, 212, 194, 195,
- 213, 215, 192, 196, 197, 198, 203, 200, 216, 201,
-
- 217, 202, 204, 205, 206, 209, 191, 207, 208, 211,
- 219, 212, 220, 213, 215, 221, 222, 223, 224, 226,
- 200, 216, 201, 218, 217, 225, 226, 229, 230, 209,
- 231, 227, 214, 234, 219, 220, 232, 233, 221, 222,
- 223, 235, 224, 236, 237, 238, 241, 218, 225, 146,
- 229, 230, 240, 231, 242, 227, 228, 234, 243, 232,
- 233, 226, 226, 226, 235, 249, 236, 290, 237, 238,
- 241, 250, 251, 146, 252, 240, 244, 242, 253, 228,
- 254, 243, 256, 257, 286, 248, 245, 258, 249, 259,
- 246, 247, 260, 261, 250, 251, 262, 226, 252, 265,
-
- 244, 266, 253, 226, 254, 226, 256, 257, 248, 245,
- 258, 268, 259, 246, 247, 269, 260, 261, 264, 274,
- 262, 270, 265, 272, 266, 275, 263, 276, 277, 279,
- 273, 226, 271, 286, 268, 286, 286, 286, 269, 286,
- 286, 297, 264, 274, 270, 281, 272, 287, 275, 263,
- 288, 276, 277, 279, 286, 282, 289, 273, 284, 283,
- 291, 290, 295, 298, 297, 292, 293, 286, 305, 281,
- 299, 287, 294, 307, 288, 303, 244, 306, 282, 313,
- 289, 284, 283, 302, 291, 295, 296, 298, 292, 293,
- 246, 305, 300, 314, 299, 309, 309, 301, 309, 303,
-
- 244, 306, 313, 285, 285, 271, 239, 302, 278, 296,
- 239, 226, 214, 246, 142, 179, 300, 314, 311, 142,
- 301, 92, 105, 312, 92, 39, 46, 41, 39, 316,
- 285, 285, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 311, 316, 316, 316, 312, 38, 38, 316,
- 38, 38, 38, 40, 40, 47, 47, 47, 91, 91,
- 91, 180, 316, 316, 180, 180, 199, 316, 316, 199,
- 210, 210, 210, 255, 316, 316, 255, 255, 267, 267,
- 267, 278, 316, 316, 278, 278, 280, 316, 316, 280,
- 285, 285, 285, 308, 316, 316, 308, 308, 310, 316,
-
- 310, 310, 310, 3, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316
+ 178, 163, 164, 181, 165, 182, 187, 166, 183, 168,
+ 184, 169, 170, 188, 189, 171, 172, 173, 174, 175,
+ 176, 190, 177, 191, 178, 194, 192, 181, 185, 182,
+ 187, 183, 168, 184, 186, 195, 188, 189, 193, 196,
+ 179, 197, 198, 199, 190, 167, 203, 191, 204, 194,
+ 205, 208, 185, 206, 207, 209, 213, 186, 212, 195,
+ 210, 215, 193, 196, 197, 198, 199, 201, 214, 202,
+
+ 203, 204, 217, 218, 205, 208, 206, 207, 219, 209,
+ 213, 212, 192, 221, 210, 215, 222, 223, 224, 225,
+ 201, 214, 202, 226, 228, 217, 218, 227, 228, 220,
+ 298, 231, 219, 232, 233, 236, 229, 221, 234, 222,
+ 223, 224, 225, 235, 237, 238, 216, 226, 241, 242,
+ 227, 244, 245, 220, 231, 246, 232, 233, 230, 236,
+ 229, 234, 247, 146, 228, 228, 235, 237, 238, 228,
+ 294, 253, 241, 242, 244, 240, 245, 254, 246, 248,
+ 256, 230, 255, 185, 239, 247, 257, 146, 252, 249,
+ 258, 260, 228, 250, 253, 261, 290, 251, 240, 262,
+
+ 254, 146, 264, 248, 256, 255, 263, 185, 265, 266,
+ 257, 252, 249, 269, 258, 260, 250, 228, 270, 261,
+ 251, 267, 262, 272, 273, 146, 264, 274, 276, 263,
+ 268, 280, 265, 266, 279, 281, 269, 228, 283, 228,
+ 290, 270, 290, 277, 267, 275, 272, 273, 311, 290,
+ 274, 276, 291, 278, 268, 280, 290, 279, 285, 281,
+ 290, 290, 283, 294, 301, 290, 288, 309, 286, 293,
+ 290, 297, 287, 292, 302, 307, 291, 278, 248, 310,
+ 295, 303, 285, 282, 299, 296, 306, 301, 300, 288,
+ 309, 286, 250, 293, 297, 287, 298, 292, 302, 307,
+
+ 317, 313, 248, 310, 295, 303, 313, 299, 296, 289,
+ 306, 300, 313, 318, 277, 250, 304, 275, 243, 243,
+ 289, 305, 239, 317, 228, 216, 315, 142, 179, 142,
+ 92, 316, 105, 92, 39, 46, 289, 318, 41, 39,
+ 304, 320, 320, 320, 305, 320, 320, 289, 320, 320,
+ 315, 320, 320, 320, 316, 38, 38, 320, 38, 38,
+ 38, 40, 40, 47, 47, 47, 91, 91, 91, 180,
+ 320, 320, 180, 180, 200, 320, 320, 200, 211, 211,
+ 211, 259, 320, 320, 259, 259, 271, 271, 271, 282,
+ 320, 320, 282, 282, 284, 320, 320, 284, 289, 289,
+
+ 289, 312, 320, 320, 312, 312, 314, 320, 314, 314,
+ 314, 3, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320
} ;
-static const flex_int16_t yy_chk[764] =
+static const flex_int16_t yy_chk[772] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -622,25 +625,25 @@ static const flex_int16_t yy_chk[764] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
5, 5, 5, 12, 12, 13, 13, 16, 17, 21,
- 18, 315, 19, 20, 16, 20, 2, 18, 314, 22,
- 25, 313, 22, 18, 20, 30, 36, 36, 36, 49,
+ 18, 319, 19, 20, 16, 20, 2, 18, 318, 22,
+ 25, 317, 22, 18, 20, 30, 36, 36, 36, 49,
27, 16, 17, 21, 18, 19, 20, 16, 20, 27,
2, 18, 22, 24, 25, 22, 18, 20, 26, 30,
- 24, 50, 26, 49, 27, 24, 28, 306, 33, 33,
- 305, 26, 27, 28, 33, 28, 28, 24, 304, 29,
+ 24, 50, 26, 49, 27, 24, 28, 310, 33, 33,
+ 309, 26, 27, 28, 33, 28, 28, 24, 308, 29,
43, 43, 26, 24, 29, 50, 26, 29, 24, 31,
- 28, 31, 33, 33, 26, 303, 28, 33, 28, 28,
- 48, 31, 29, 51, 31, 32, 52, 29, 32, 302,
+ 28, 31, 33, 33, 26, 307, 28, 33, 28, 28,
+ 48, 31, 29, 51, 31, 32, 52, 29, 32, 306,
29, 35, 56, 31, 32, 31, 34, 34, 34, 35,
- 299, 53, 54, 48, 31, 55, 51, 31, 57, 32,
+ 303, 53, 54, 48, 31, 55, 51, 31, 57, 32,
52, 58, 32, 34, 63, 35, 56, 32, 59, 62,
62, 64, 65, 35, 53, 54, 66, 68, 55, 67,
- 298, 69, 57, 72, 74, 58, 76, 34, 63, 75,
+ 302, 69, 57, 72, 74, 58, 76, 34, 63, 75,
81, 59, 62, 62, 64, 67, 65, 77, 75, 66,
68, 78, 79, 67, 69, 80, 82, 72, 74, 76,
- 83, 85, 89, 75, 81, 85, 297, 86, 67, 87,
+ 83, 85, 89, 75, 81, 85, 301, 86, 67, 87,
77, 75, 86, 95, 78, 79, 90, 93, 80, 82,
88, 88, 88, 96, 83, 85, 89, 97, 98, 85,
86, 99, 87, 100, 104, 86, 95, 88, 105, 102,
@@ -652,53 +655,54 @@ static const flex_int16_t yy_chk[764] =
113, 125, 116, 105, 126, 127, 117, 118, 128, 129,
105, 130, 131, 132, 133, 119, 134, 135, 121, 136,
139, 122, 124, 144, 125, 145, 149, 126, 146, 127,
- 147, 128, 129, 148, 150, 130, 131, 132, 133, 134,
- 135, 154, 136, 155, 139, 156, 159, 144, 160, 145,
- 149, 146, 127, 147, 161, 162, 148, 150, 159, 288,
- 163, 164, 165, 171, 154, 167, 155, 170, 172, 156,
- 174, 175, 160, 177, 178, 179, 182, 183, 161, 162,
- 184, 186, 159, 163, 164, 165, 171, 167, 187, 167,
-
- 189, 170, 172, 174, 175, 179, 191, 177, 178, 182,
- 192, 183, 193, 184, 186, 194, 195, 196, 197, 200,
- 167, 187, 167, 191, 189, 198, 201, 203, 204, 179,
- 205, 200, 214, 209, 192, 193, 206, 208, 194, 195,
- 196, 212, 197, 213, 215, 216, 219, 191, 198, 214,
- 203, 204, 218, 205, 220, 200, 201, 209, 221, 206,
- 208, 226, 228, 227, 212, 231, 213, 284, 215, 216,
- 219, 232, 233, 214, 235, 218, 226, 220, 237, 201,
- 238, 221, 240, 241, 280, 228, 226, 242, 231, 243,
- 226, 227, 244, 245, 232, 233, 246, 247, 235, 249,
-
- 226, 254, 237, 264, 238, 248, 240, 241, 228, 226,
- 242, 256, 243, 226, 227, 257, 244, 245, 248, 264,
- 246, 260, 249, 262, 254, 266, 247, 268, 270, 272,
- 273, 274, 271, 282, 256, 281, 283, 287, 257, 289,
- 286, 291, 248, 264, 260, 273, 262, 281, 266, 247,
- 282, 268, 270, 272, 293, 273, 283, 263, 274, 273,
- 286, 290, 289, 292, 291, 286, 287, 295, 300, 273,
- 293, 281, 294, 307, 282, 296, 290, 301, 273, 311,
- 283, 274, 273, 295, 286, 289, 290, 292, 286, 287,
- 290, 300, 294, 312, 293, 308, 310, 294, 309, 296,
-
- 290, 301, 311, 308, 310, 261, 239, 295, 307, 290,
- 217, 199, 185, 290, 142, 141, 294, 312, 309, 101,
- 294, 92, 60, 309, 42, 38, 15, 11, 8, 3,
- 308, 310, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 309, 0, 0, 0, 309, 317, 317, 0,
- 317, 317, 317, 318, 318, 319, 319, 319, 320, 320,
- 320, 321, 0, 0, 321, 321, 322, 0, 0, 322,
- 323, 323, 323, 324, 0, 0, 324, 324, 325, 325,
- 325, 326, 0, 0, 326, 326, 327, 0, 0, 327,
- 328, 328, 328, 329, 0, 0, 329, 329, 330, 0,
-
- 330, 330, 330, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316, 316, 316, 316, 316, 316, 316, 316,
- 316, 316, 316
+ 147, 128, 129, 150, 154, 130, 131, 132, 133, 134,
+ 135, 155, 136, 156, 139, 160, 159, 144, 148, 145,
+ 149, 146, 127, 147, 148, 161, 150, 154, 159, 162,
+ 179, 163, 164, 165, 155, 167, 170, 156, 171, 160,
+ 172, 177, 148, 174, 175, 178, 183, 148, 182, 161,
+ 179, 185, 159, 162, 163, 164, 165, 167, 184, 167,
+
+ 170, 171, 187, 188, 172, 177, 174, 175, 190, 178,
+ 183, 182, 192, 193, 179, 185, 194, 195, 196, 197,
+ 167, 184, 167, 198, 201, 187, 188, 199, 202, 192,
+ 292, 204, 190, 205, 206, 210, 201, 193, 207, 194,
+ 195, 196, 197, 209, 213, 214, 216, 198, 217, 218,
+ 199, 220, 221, 192, 204, 222, 205, 206, 202, 210,
+ 201, 207, 223, 216, 228, 230, 209, 213, 214, 229,
+ 288, 233, 217, 218, 220, 216, 221, 234, 222, 228,
+ 237, 202, 235, 240, 239, 223, 241, 216, 230, 228,
+ 242, 244, 251, 228, 233, 245, 284, 229, 216, 246,
+
+ 234, 239, 248, 228, 237, 235, 247, 240, 249, 250,
+ 241, 230, 228, 253, 242, 244, 228, 252, 258, 245,
+ 229, 251, 246, 260, 261, 239, 248, 264, 266, 247,
+ 252, 272, 249, 250, 270, 274, 253, 268, 276, 278,
+ 285, 258, 291, 277, 251, 275, 260, 261, 311, 287,
+ 264, 266, 285, 268, 252, 272, 286, 270, 277, 274,
+ 290, 293, 276, 294, 295, 297, 278, 304, 277, 287,
+ 299, 291, 277, 286, 296, 300, 285, 268, 294, 305,
+ 290, 297, 277, 311, 293, 290, 299, 295, 294, 278,
+ 304, 277, 294, 287, 291, 277, 298, 286, 296, 300,
+
+ 315, 312, 294, 305, 290, 297, 313, 293, 290, 312,
+ 299, 294, 314, 316, 267, 294, 298, 265, 243, 219,
+ 314, 298, 215, 315, 200, 186, 313, 142, 141, 101,
+ 92, 313, 60, 42, 38, 15, 312, 316, 11, 8,
+ 298, 3, 0, 0, 298, 0, 0, 314, 0, 0,
+ 313, 0, 0, 0, 313, 321, 321, 0, 321, 321,
+ 321, 322, 322, 323, 323, 323, 324, 324, 324, 325,
+ 0, 0, 325, 325, 326, 0, 0, 326, 327, 327,
+ 327, 328, 0, 0, 328, 328, 329, 329, 329, 330,
+ 0, 0, 330, 330, 331, 0, 0, 331, 332, 332,
+
+ 332, 333, 0, 0, 333, 333, 334, 0, 334, 334,
+ 334, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320, 320, 320, 320, 320, 320, 320, 320, 320, 320,
+ 320
} ;
static yy_state_type yy_last_accepting_state;
@@ -824,8 +828,8 @@ static int varCheck(int token, const char *name) {
return token;
}
-#line 827 "engines/director/lingo/lingo-lex.cpp"
-#line 828 "engines/director/lingo/lingo-lex.cpp"
+#line 831 "engines/director/lingo/lingo-lex.cpp"
+#line 832 "engines/director/lingo/lingo-lex.cpp"
#define INITIAL 0
@@ -1048,7 +1052,7 @@ YY_DECL
#line 126 "engines/director/lingo/lingo-lex.l"
-#line 1051 "engines/director/lingo/lingo-lex.cpp"
+#line 1055 "engines/director/lingo/lingo-lex.cpp"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -1076,13 +1080,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 >= 317 )
+ if ( yy_current_state >= 321 )
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
++yy_cp;
}
- while ( yy_current_state != 316 );
+ while ( yy_current_state != 320 );
yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state);
@@ -1695,7 +1699,7 @@ YY_RULE_SETUP
#line 428 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1698 "engines/director/lingo/lingo-lex.cpp"
+#line 1702 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1994,7 +1998,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 >= 317 )
+ if ( yy_current_state >= 321 )
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -2022,11 +2026,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 >= 317 )
+ if ( yy_current_state >= 321 )
yy_c = yy_meta[yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
- yy_is_jam = (yy_current_state == 316);
+ yy_is_jam = (yy_current_state == 320);
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 9783774fe6..1b1e97b7e7 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -166,7 +166,7 @@ end({spc}+{identifier})? {
exit { count(); return varCheck(tEXIT, "exit"); }
field { count(); return tFIELD; }
global { count(); return varCheck(tGLOBAL, "global"); }
-go{spc}+(to{spc}+)?frame { count(); return tGO; }
+go{spc}+(to{spc}+)?(the{spc}+)?frame { count(); return tGO; }
go{spc}+(to)? { count(); return tGO; }
go{spc}+loop { count(); return tGOLOOP; }
instance { count(); return varCheck(tINSTANCE, "instance"); }
diff --git a/engines/director/lingo/tests/goto.lingo b/engines/director/lingo/tests/goto.lingo
index ccf0ad07da..7da2d06ad6 100644
--- a/engines/director/lingo/tests/goto.lingo
+++ b/engines/director/lingo/tests/goto.lingo
@@ -8,6 +8,7 @@ set varframe to "VARFrame"
set varmovie to "VARMovie"
go to frame 35
+go the frame 2
go "label two"
go to movie "Chicago"
go to frame 23 of movie "Chicago"
More information about the Scummvm-git-logs
mailing list