[Scummvm-git-logs] scummvm master -> 3cddac17c49572f32cec6d7d7632f7a00ba48f44
sev-
sev at scummvm.org
Mon Dec 2 23:14:00 UTC 2019
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
68795590d0 DIRECTOR: LINGO: Properly set pointer
3cddac17c4 DIRECTOR: LINGO: Correct processing of \xC3 (continuation) symbol
Commit: 68795590d0b808cd12cbf9c08cdd03116fe84b35
https://github.com/scummvm/scummvm/commit/68795590d0b808cd12cbf9c08cdd03116fe84b35
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-03T00:12:44+01:00
Commit Message:
DIRECTOR: LINGO: Properly set pointer
Changed paths:
engines/director/lingo/lingo-gr.cpp
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index d126eb5..050449a 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -2821,7 +2821,7 @@ yyreduce:
case 108:
#line 505 "engines/director/lingo/lingo-gr.y"
- { g_lingo->codeMe(0, 0); ;}
+ { g_lingo->codeMe(nullptr, 0); ;}
break;
case 109:
Commit: 3cddac17c49572f32cec6d7d7632f7a00ba48f44
https://github.com/scummvm/scummvm/commit/3cddac17c49572f32cec6d7d7632f7a00ba48f44
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-12-03T00:13:24+01:00
Commit Message:
DIRECTOR: LINGO: Correct processing of \xC3 (continuation) symbol
Changed paths:
engines/director/lingo/lingo-lex.cpp
engines/director/lingo/lingo-lex.l
diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp
index 2c1802c..bea0747 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -378,13 +378,13 @@ static yyconst flex_int16_t yy_accept[285] =
0, 0, 77, 75, 4, 73, 73, 75, 75, 75,
72, 72, 72, 71, 72, 68, 72, 69, 69, 69,
69, 69, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 69, 69, 69, 69, 75, 3, 3, 4, 73,
+ 69, 69, 69, 69, 69, 3, 3, 4, 73, 0,
0, 0, 0, 0, 0, 74, 5, 67, 2, 70,
71, 66, 64, 65, 69, 69, 69, 69, 69, 69,
69, 69, 69, 69, 69, 69, 69, 23, 13, 69,
69, 69, 69, 69, 69, 69, 69, 69, 36, 37,
69, 39, 69, 69, 69, 69, 69, 69, 69, 69,
- 69, 57, 69, 69, 69, 1, 3, 3, 0, 5,
+ 69, 57, 69, 69, 69, 3, 3, 1, 0, 5,
2, 70, 69, 7, 69, 69, 69, 69, 69, 69,
17, 69, 69, 69, 69, 0, 69, 69, 69, 69,
@@ -453,38 +453,38 @@ static yyconst flex_int32_t yy_meta[66] =
static yyconst flex_int16_t yy_base[296] =
{ 0,
- 0, 64, 188, 741, 68, 72, 76, 80, 148, 0,
- 741, 129, 106, 55, 71, 741, 95, 66, 68, 66,
- 62, 72, 88, 73, 0, 104, 82, 120, 110, 136,
- 119, 83, 113, 154, 156, 105, 192, 209, 213, 741,
- 217, 180, 225, 120, 100, 741, 0, 741, 0, 89,
- 130, 741, 741, 741, 0, 114, 108, 155, 181, 178,
- 195, 191, 189, 210, 217, 220, 202, 89, 0, 205,
- 220, 214, 214, 226, 215, 232, 212, 219, 0, 0,
- 226, 0, 238, 252, 224, 234, 241, 246, 267, 254,
- 264, 0, 265, 253, 259, 741, 292, 315, 265, 0,
-
- 0, 85, 280, 0, 274, 274, 273, 281, 284, 293,
- 320, 286, 289, 301, 312, 333, 299, 319, 308, 320,
- 312, 313, 320, 0, 322, 315, 0, 322, 312, 317,
- 325, 0, 336, 0, 334, 328, 335, 385, 335, 344,
- 353, 359, 360, 350, 356, 0, 374, 0, 0, 0,
- 185, 0, 0, 363, 373, 379, 368, 382, 368, 0,
- 0, 0, 0, 373, 375, 387, 0, 0, 392, 385,
- 390, 395, 380, 383, 0, 418, 157, 0, 405, 403,
- 0, 395, 0, 410, 407, 0, 0, 397, 0, 413,
- 741, 412, 409, 0, 426, 0, 428, 414, 416, 415,
-
- 437, 426, 475, 476, 485, 486, 458, 0, 441, 487,
- 0, 446, 0, 442, 0, 478, 477, 0, 481, 466,
- 470, 0, 0, 0, 514, 495, 499, 522, 533, 0,
- 489, 473, 0, 493, 501, 500, 508, 507, 546, 533,
- 530, 528, 559, 560, 578, 741, 0, 0, 523, 536,
- 0, 0, 532, 461, 544, 587, 588, 599, 547, 0,
- 553, 508, 564, 601, 621, 606, 0, 741, 610, 741,
- 620, 580, 627, 595, 628, 632, 638, 642, 602, 657,
- 659, 663, 665, 741, 696, 698, 701, 704, 710, 715,
- 720, 723, 728, 730, 735
+ 0, 64, 190, 750, 68, 72, 76, 80, 172, 0,
+ 750, 152, 121, 55, 71, 750, 106, 66, 68, 66,
+ 62, 72, 95, 73, 0, 107, 80, 123, 117, 117,
+ 122, 85, 154, 138, 156, 191, 199, 212, 750, 216,
+ 104, 186, 220, 75, 103, 750, 0, 750, 0, 91,
+ 144, 750, 750, 750, 0, 82, 131, 161, 194, 114,
+ 197, 193, 192, 203, 210, 213, 203, 89, 0, 204,
+ 219, 205, 213, 225, 211, 240, 208, 213, 0, 0,
+ 228, 0, 244, 252, 217, 237, 240, 245, 262, 254,
+ 262, 0, 263, 252, 257, 291, 313, 750, 263, 0,
+
+ 0, 85, 279, 0, 273, 274, 275, 291, 290, 299,
+ 327, 287, 288, 296, 308, 328, 293, 314, 310, 315,
+ 310, 309, 315, 0, 324, 318, 0, 325, 315, 319,
+ 326, 0, 329, 0, 333, 334, 342, 368, 342, 345,
+ 335, 356, 361, 352, 353, 0, 371, 0, 0, 0,
+ 240, 0, 0, 360, 371, 377, 368, 382, 369, 0,
+ 0, 0, 0, 373, 374, 379, 0, 0, 388, 381,
+ 387, 394, 380, 381, 0, 418, 194, 0, 391, 393,
+ 0, 427, 0, 413, 410, 0, 0, 405, 0, 414,
+ 750, 413, 410, 0, 426, 0, 428, 419, 417, 416,
+
+ 432, 422, 479, 480, 481, 490, 454, 0, 434, 491,
+ 0, 435, 0, 430, 0, 458, 477, 0, 480, 465,
+ 468, 0, 0, 0, 509, 486, 528, 507, 545, 0,
+ 488, 470, 0, 497, 507, 513, 502, 502, 544, 531,
+ 530, 528, 565, 574, 578, 750, 0, 0, 522, 531,
+ 0, 0, 526, 503, 537, 585, 589, 600, 535, 0,
+ 571, 599, 576, 606, 610, 618, 0, 750, 601, 750,
+ 614, 585, 629, 596, 637, 645, 647, 651, 607, 656,
+ 661, 668, 669, 750, 705, 707, 710, 713, 719, 724,
+ 729, 732, 737, 739, 744
} ;
@@ -525,7 +525,7 @@ static yyconst flex_int16_t yy_def[296] =
} ;
-static yyconst flex_int16_t yy_nxt[807] =
+static yyconst flex_int16_t yy_nxt[816] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 12, 11,
13, 4, 14, 15, 16, 17, 18, 19, 20, 21,
@@ -533,92 +533,93 @@ static yyconst flex_int16_t yy_nxt[807] =
31, 25, 32, 33, 34, 25, 25, 35, 25, 25,
25, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 25, 32, 33, 34, 25,
- 25, 35, 25, 25, 36, 37, 50, 51, 38, 39,
- 40, 40, 41, 42, 43, 43, 42, 42, 43, 43,
- 42, 41, 40, 40, 41, 52, 53, 56, 58, 59,
+ 25, 35, 25, 25, 4, 36, 50, 51, 37, 38,
+ 39, 39, 40, 42, 43, 43, 42, 42, 43, 43,
+ 42, 40, 39, 39, 40, 52, 53, 56, 58, 59,
116, 61, 44, 116, 57, 60, 44, 102, 62, 67,
- 63, 102, 68, 86, 65, 46, 72, 96, 96, 54,
- 64, 73, 56, 58, 59, 61, 49, 44, 57, 60,
- 66, 44, 62, 67, 63, 69, 68, 104, 86, 65,
- 77, 72, 70, 87, 64, 73, 74, 48, 71, 78,
- 75, 50, 51, 88, 66, 83, 99, 89, 103, 76,
- 69, 84, 104, 46, 85, 77, 70, 79, 87, 207,
- 207, 74, 71, 78, 80, 75, 81, 88, 82, 83,
- 99, 89, 103, 76, 90, 84, 105, 91, 85, 93,
- 94, 42, 79, 92, 42, 95, 151, 284, 80, 151,
- 81, 284, 82, 97, 40, 40, 98, 106, 284, 90,
-
- 44, 105, 91, 284, 93, 94, 107, 92, 111, 95,
- 98, 40, 40, 98, 39, 40, 40, 41, 41, 40,
- 40, 41, 106, 108, 110, 44, 42, 43, 43, 42,
- 107, 115, 109, 111, 112, 113, 114, 284, 117, 118,
- 119, 284, 120, 121, 122, 44, 128, 108, 110, 123,
- 126, 124, 284, 127, 129, 115, 109, 284, 132, 112,
- 113, 114, 117, 118, 133, 119, 120, 121, 125, 122,
- 44, 128, 130, 123, 126, 134, 124, 127, 135, 129,
- 137, 131, 132, 136, 138, 139, 284, 141, 133, 140,
- 284, 142, 125, 97, 40, 40, 98, 130, 143, 134,
-
- 144, 148, 135, 145, 137, 131, 146, 147, 136, 138,
- 139, 141, 149, 150, 140, 142, 98, 40, 40, 98,
- 153, 151, 143, 154, 151, 144, 148, 145, 155, 156,
- 146, 147, 55, 158, 116, 161, 149, 116, 150, 159,
- 162, 284, 163, 165, 153, 164, 166, 154, 160, 167,
- 168, 169, 155, 170, 156, 171, 172, 158, 173, 161,
- 174, 175, 284, 178, 159, 162, 163, 157, 165, 164,
- 179, 166, 160, 167, 168, 169, 180, 170, 181, 171,
- 182, 172, 183, 173, 174, 175, 176, 178, 184, 176,
- 185, 157, 188, 189, 179, 190, 210, 191, 192, 210,
-
- 193, 180, 194, 181, 195, 182, 183, 196, 197, 198,
- 199, 200, 184, 177, 201, 185, 188, 202, 189, 176,
- 190, 191, 176, 192, 193, 208, 194, 209, 195, 214,
- 211, 212, 196, 197, 198, 199, 200, 177, 201, 215,
- 216, 202, 217, 220, 204, 218, 219, 284, 221, 222,
- 208, 205, 209, 214, 206, 211, 212, 223, 284, 224,
- 207, 207, 262, 215, 216, 262, 217, 220, 204, 230,
- 218, 219, 221, 222, 232, 205, 225, 225, 206, 225,
- 225, 233, 223, 224, 226, 226, 225, 225, 210, 225,
- 225, 210, 227, 230, 226, 226, 234, 235, 232, 236,
-
- 225, 237, 229, 225, 238, 233, 247, 284, 226, 262,
- 246, 231, 262, 248, 240, 239, 228, 227, 239, 249,
- 250, 234, 235, 225, 236, 237, 225, 229, 238, 242,
- 247, 226, 243, 240, 225, 246, 231, 225, 248, 240,
- 228, 251, 226, 241, 249, 250, 252, 239, 242, 253,
- 239, 254, 255, 242, 244, 284, 243, 259, 240, 245,
- 225, 225, 260, 225, 225, 251, 261, 241, 226, 226,
- 252, 263, 242, 268, 253, 241, 254, 255, 244, 225,
- 267, 259, 225, 245, 270, 284, 260, 226, 264, 265,
- 261, 264, 265, 256, 257, 263, 226, 226, 268, 241,
-
- 225, 276, 271, 225, 267, 271, 284, 275, 226, 270,
- 275, 284, 284, 258, 284, 226, 277, 256, 257, 266,
- 240, 271, 273, 282, 271, 273, 276, 284, 273, 278,
- 272, 273, 278, 280, 284, 242, 280, 258, 284, 281,
- 240, 277, 281, 278, 266, 240, 278, 240, 282, 272,
- 274, 284, 284, 284, 272, 242, 274, 279, 280, 242,
- 281, 280, 242, 281, 283, 240, 283, 283, 284, 283,
- 284, 279, 240, 272, 274, 284, 284, 284, 284, 242,
- 274, 279, 284, 284, 284, 284, 242, 284, 284, 284,
- 284, 284, 284, 284, 284, 279, 45, 45, 284, 45,
-
- 45, 45, 47, 47, 55, 55, 55, 100, 100, 100,
- 101, 101, 284, 101, 101, 101, 152, 284, 152, 152,
- 152, 186, 284, 284, 186, 186, 187, 187, 187, 203,
- 284, 284, 203, 213, 213, 213, 269, 284, 284, 269,
- 3, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+ 63, 99, 68, 102, 72, 86, 98, 98, 46, 73,
+ 64, 65, 56, 58, 59, 61, 103, 44, 57, 60,
+ 54, 44, 62, 67, 63, 99, 68, 66, 69, 72,
+ 86, 49, 41, 73, 64, 70, 65, 77, 79, 74,
+ 103, 71, 107, 75, 41, 80, 78, 81, 83, 82,
+ 104, 66, 76, 69, 84, 50, 51, 85, 90, 70,
+ 48, 91, 77, 79, 74, 71, 107, 92, 75, 80,
+ 78, 81, 83, 82, 87, 104, 76, 46, 84, 93,
+ 94, 85, 105, 90, 88, 95, 91, 42, 89, 284,
+ 42, 92, 96, 39, 39, 97, 207, 207, 284, 87,
+
+ 97, 39, 39, 97, 93, 94, 44, 105, 88, 95,
+ 106, 111, 89, 38, 39, 39, 40, 40, 39, 39,
+ 40, 42, 43, 43, 42, 108, 110, 112, 113, 114,
+ 284, 44, 115, 120, 109, 106, 111, 117, 118, 119,
+ 44, 151, 121, 122, 151, 123, 126, 127, 128, 108,
+ 110, 132, 112, 113, 114, 41, 115, 120, 109, 124,
+ 129, 117, 118, 41, 119, 44, 121, 133, 122, 123,
+ 126, 127, 130, 128, 134, 132, 125, 135, 136, 284,
+ 137, 131, 138, 139, 124, 129, 141, 140, 284, 142,
+ 284, 133, 96, 39, 39, 97, 143, 130, 134, 144,
+
+ 125, 135, 145, 136, 137, 131, 146, 138, 139, 147,
+ 141, 148, 140, 142, 97, 39, 39, 97, 149, 150,
+ 143, 153, 154, 155, 144, 156, 145, 158, 151, 116,
+ 146, 151, 116, 147, 159, 162, 148, 161, 165, 55,
+ 163, 164, 149, 160, 150, 153, 154, 155, 166, 172,
+ 156, 158, 167, 168, 169, 170, 171, 173, 180, 159,
+ 162, 161, 157, 165, 163, 164, 174, 160, 175, 176,
+ 178, 179, 176, 166, 172, 181, 167, 168, 169, 170,
+ 171, 182, 173, 180, 183, 184, 157, 185, 284, 188,
+ 174, 189, 175, 190, 178, 179, 177, 191, 192, 196,
+
+ 181, 193, 194, 195, 197, 198, 182, 199, 183, 184,
+ 200, 208, 185, 188, 201, 202, 189, 209, 190, 176,
+ 177, 191, 176, 192, 196, 193, 194, 195, 210, 197,
+ 198, 210, 199, 211, 212, 200, 208, 214, 201, 202,
+ 215, 216, 209, 217, 204, 218, 219, 284, 220, 221,
+ 222, 205, 223, 284, 206, 224, 207, 207, 211, 212,
+ 284, 214, 230, 232, 215, 216, 284, 217, 204, 233,
+ 218, 219, 220, 221, 222, 205, 234, 223, 206, 224,
+ 225, 225, 225, 225, 225, 225, 230, 232, 226, 226,
+ 226, 225, 210, 233, 225, 210, 227, 235, 236, 226,
+
+ 237, 234, 238, 247, 262, 240, 229, 262, 225, 246,
+ 239, 225, 228, 239, 284, 231, 226, 248, 284, 284,
+ 242, 227, 235, 236, 237, 249, 238, 247, 240, 225,
+ 240, 229, 225, 250, 246, 251, 228, 226, 241, 244,
+ 231, 252, 248, 242, 242, 239, 225, 253, 239, 225,
+ 249, 254, 255, 240, 226, 284, 259, 260, 250, 251,
+ 261, 243, 241, 244, 263, 252, 225, 242, 267, 225,
+ 284, 245, 253, 241, 226, 225, 254, 255, 225, 225,
+ 259, 260, 225, 226, 261, 243, 264, 226, 263, 264,
+ 265, 268, 267, 265, 226, 245, 270, 241, 226, 256,
+
+ 262, 225, 284, 262, 225, 284, 276, 271, 257, 226,
+ 271, 273, 284, 258, 273, 271, 268, 277, 271, 275,
+ 266, 270, 275, 256, 284, 240, 284, 226, 282, 240,
+ 273, 276, 257, 273, 284, 272, 284, 258, 278, 274,
+ 242, 278, 277, 272, 242, 266, 280, 284, 281, 280,
+ 240, 281, 278, 282, 240, 278, 240, 280, 274, 272,
+ 280, 284, 281, 274, 242, 281, 279, 272, 242, 283,
+ 283, 242, 283, 283, 284, 284, 284, 284, 284, 284,
+ 279, 240, 274, 284, 284, 284, 284, 284, 284, 284,
+ 279, 284, 284, 284, 284, 242, 284, 284, 284, 284,
+
+ 284, 284, 284, 284, 279, 45, 45, 284, 45, 45,
+ 45, 47, 47, 55, 55, 55, 100, 100, 100, 101,
+ 101, 284, 101, 101, 101, 152, 284, 152, 152, 152,
+ 186, 284, 284, 186, 186, 187, 187, 187, 203, 284,
+ 284, 203, 213, 213, 213, 269, 284, 284, 269, 3,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
- 284, 284, 284, 284, 284, 284
+ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 284, 284
} ;
-static yyconst flex_int16_t yy_chk[807] =
+static yyconst flex_int16_t yy_chk[816] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -631,84 +632,85 @@ static yyconst flex_int16_t yy_chk[807] =
7, 8, 8, 8, 8, 15, 15, 18, 19, 20,
68, 21, 6, 68, 18, 20, 7, 102, 22, 24,
- 22, 50, 24, 32, 23, 45, 27, 36, 36, 17,
- 22, 27, 18, 19, 20, 21, 13, 6, 18, 20,
- 23, 7, 22, 24, 22, 26, 24, 57, 32, 23,
- 29, 27, 26, 33, 22, 27, 28, 12, 26, 29,
- 28, 51, 51, 33, 23, 31, 44, 33, 56, 28,
- 26, 31, 57, 9, 31, 29, 26, 30, 33, 177,
- 177, 28, 26, 29, 30, 28, 30, 33, 30, 31,
- 44, 33, 56, 28, 34, 31, 58, 34, 31, 35,
- 35, 42, 30, 34, 42, 35, 151, 3, 30, 151,
- 30, 0, 30, 37, 37, 37, 37, 59, 0, 34,
-
- 42, 58, 34, 0, 35, 35, 60, 34, 63, 35,
- 38, 38, 38, 38, 39, 39, 39, 39, 41, 41,
- 41, 41, 59, 61, 62, 42, 43, 43, 43, 43,
- 60, 67, 61, 63, 64, 65, 66, 0, 70, 70,
- 71, 0, 72, 73, 74, 43, 81, 61, 62, 75,
- 77, 76, 0, 78, 83, 67, 61, 0, 85, 64,
- 65, 66, 70, 70, 86, 71, 72, 73, 76, 74,
- 43, 81, 84, 75, 77, 87, 76, 78, 88, 83,
- 90, 84, 85, 89, 91, 93, 0, 94, 86, 93,
- 0, 95, 76, 97, 97, 97, 97, 84, 99, 87,
-
- 103, 108, 88, 105, 90, 84, 106, 107, 89, 91,
- 93, 94, 109, 110, 93, 95, 98, 98, 98, 98,
- 112, 111, 99, 113, 111, 103, 108, 105, 114, 115,
- 106, 107, 111, 117, 116, 119, 109, 116, 110, 118,
- 120, 0, 121, 123, 112, 122, 125, 113, 118, 126,
- 128, 129, 114, 130, 115, 131, 133, 117, 135, 119,
- 136, 137, 0, 139, 118, 120, 121, 116, 123, 122,
- 140, 125, 118, 126, 128, 129, 141, 130, 142, 131,
- 143, 133, 144, 135, 136, 137, 138, 139, 145, 138,
- 147, 116, 154, 155, 140, 156, 182, 157, 158, 182,
-
- 159, 141, 164, 142, 165, 143, 144, 166, 169, 170,
- 171, 172, 145, 138, 173, 147, 154, 174, 155, 176,
- 156, 157, 176, 158, 159, 179, 164, 180, 165, 188,
- 184, 185, 166, 169, 170, 171, 172, 138, 173, 190,
- 192, 174, 193, 198, 176, 195, 197, 0, 199, 200,
- 179, 176, 180, 188, 176, 184, 185, 201, 0, 202,
- 207, 207, 254, 190, 192, 254, 193, 198, 176, 209,
- 195, 197, 199, 200, 212, 176, 203, 204, 176, 203,
- 204, 214, 201, 202, 203, 204, 205, 206, 210, 205,
- 206, 210, 204, 209, 205, 206, 216, 217, 212, 219,
-
- 227, 220, 206, 227, 221, 214, 232, 0, 227, 262,
- 231, 210, 262, 234, 226, 225, 205, 204, 225, 235,
- 236, 216, 217, 228, 219, 220, 228, 206, 221, 226,
- 232, 228, 227, 225, 229, 231, 210, 229, 234, 226,
- 205, 237, 229, 225, 235, 236, 238, 239, 225, 240,
- 239, 241, 242, 226, 228, 0, 227, 249, 225, 229,
- 243, 244, 250, 243, 244, 237, 253, 225, 243, 244,
- 238, 255, 225, 261, 240, 239, 241, 242, 228, 245,
- 259, 249, 245, 229, 263, 0, 250, 245, 256, 257,
- 253, 256, 257, 243, 244, 255, 256, 257, 261, 239,
-
- 258, 272, 264, 258, 259, 264, 0, 266, 258, 263,
- 266, 269, 0, 245, 269, 266, 274, 243, 244, 258,
- 264, 271, 265, 279, 271, 265, 272, 0, 273, 275,
- 264, 273, 275, 276, 0, 264, 276, 245, 0, 277,
- 265, 274, 277, 278, 258, 264, 278, 275, 279, 271,
- 265, 0, 0, 0, 264, 265, 273, 275, 280, 264,
- 281, 280, 275, 281, 282, 265, 283, 282, 0, 283,
- 0, 278, 275, 271, 265, 0, 0, 0, 0, 265,
- 273, 275, 0, 0, 0, 0, 275, 0, 0, 0,
- 0, 0, 0, 0, 0, 278, 285, 285, 0, 285,
-
- 285, 285, 286, 286, 287, 287, 287, 288, 288, 288,
- 289, 289, 0, 289, 289, 289, 290, 0, 290, 290,
- 290, 291, 0, 0, 291, 291, 292, 292, 292, 293,
- 0, 0, 293, 294, 294, 294, 295, 0, 0, 295,
- 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+ 22, 44, 24, 50, 27, 32, 41, 41, 45, 27,
+ 22, 23, 18, 19, 20, 21, 56, 6, 18, 20,
+ 17, 7, 22, 24, 22, 44, 24, 23, 26, 27,
+ 32, 13, 5, 27, 22, 26, 23, 29, 30, 28,
+ 56, 26, 60, 28, 8, 30, 29, 30, 31, 30,
+ 57, 23, 28, 26, 31, 51, 51, 31, 34, 26,
+ 12, 34, 29, 30, 28, 26, 60, 34, 28, 30,
+ 29, 30, 31, 30, 33, 57, 28, 9, 31, 35,
+ 35, 31, 58, 34, 33, 35, 34, 42, 33, 3,
+ 42, 34, 36, 36, 36, 36, 177, 177, 0, 33,
+
+ 37, 37, 37, 37, 35, 35, 42, 58, 33, 35,
+ 59, 63, 33, 38, 38, 38, 38, 40, 40, 40,
+ 40, 43, 43, 43, 43, 61, 62, 64, 65, 66,
+ 0, 42, 67, 72, 61, 59, 63, 70, 70, 71,
+ 43, 151, 73, 74, 151, 75, 77, 78, 81, 61,
+ 62, 85, 64, 65, 66, 36, 67, 72, 61, 76,
+ 83, 70, 70, 37, 71, 43, 73, 86, 74, 75,
+ 77, 78, 84, 81, 87, 85, 76, 88, 89, 0,
+ 90, 84, 91, 93, 76, 83, 94, 93, 0, 95,
+ 0, 86, 96, 96, 96, 96, 99, 84, 87, 103,
+
+ 76, 88, 105, 89, 90, 84, 106, 91, 93, 107,
+ 94, 108, 93, 95, 97, 97, 97, 97, 109, 110,
+ 99, 112, 113, 114, 103, 115, 105, 117, 111, 116,
+ 106, 111, 116, 107, 118, 120, 108, 119, 123, 111,
+ 121, 122, 109, 118, 110, 112, 113, 114, 125, 133,
+ 115, 117, 126, 128, 129, 130, 131, 135, 141, 118,
+ 120, 119, 116, 123, 121, 122, 136, 118, 137, 138,
+ 139, 140, 138, 125, 133, 142, 126, 128, 129, 130,
+ 131, 143, 135, 141, 144, 145, 116, 147, 0, 154,
+ 136, 155, 137, 156, 139, 140, 138, 157, 158, 166,
+
+ 142, 159, 164, 165, 169, 170, 143, 171, 144, 145,
+ 172, 179, 147, 154, 173, 174, 155, 180, 156, 176,
+ 138, 157, 176, 158, 166, 159, 164, 165, 182, 169,
+ 170, 182, 171, 184, 185, 172, 179, 188, 173, 174,
+ 190, 192, 180, 193, 176, 195, 197, 0, 198, 199,
+ 200, 176, 201, 0, 176, 202, 207, 207, 184, 185,
+ 0, 188, 209, 212, 190, 192, 0, 193, 176, 214,
+ 195, 197, 198, 199, 200, 176, 216, 201, 176, 202,
+ 203, 204, 205, 203, 204, 205, 209, 212, 203, 204,
+ 205, 206, 210, 214, 206, 210, 204, 217, 219, 206,
+
+ 220, 216, 221, 232, 254, 226, 206, 254, 228, 231,
+ 225, 228, 205, 225, 0, 210, 228, 234, 0, 0,
+ 226, 204, 217, 219, 220, 235, 221, 232, 225, 227,
+ 226, 206, 227, 236, 231, 237, 205, 227, 225, 228,
+ 210, 238, 234, 225, 226, 239, 229, 240, 239, 229,
+ 235, 241, 242, 225, 229, 0, 249, 250, 236, 237,
+ 253, 227, 225, 228, 255, 238, 243, 225, 259, 243,
+ 0, 229, 240, 239, 243, 244, 241, 242, 244, 245,
+ 249, 250, 245, 244, 253, 227, 256, 245, 255, 256,
+ 257, 261, 259, 257, 256, 229, 263, 239, 257, 243,
+
+ 262, 258, 269, 262, 258, 269, 272, 264, 244, 258,
+ 264, 265, 0, 245, 265, 271, 261, 274, 271, 266,
+ 258, 263, 266, 243, 0, 264, 0, 266, 279, 265,
+ 273, 272, 244, 273, 0, 264, 0, 245, 275, 265,
+ 264, 275, 274, 271, 265, 258, 276, 0, 277, 276,
+ 264, 277, 278, 279, 265, 278, 275, 280, 273, 264,
+ 280, 0, 281, 265, 264, 281, 275, 271, 265, 282,
+ 283, 275, 282, 283, 0, 0, 0, 0, 0, 0,
+ 278, 275, 273, 0, 0, 0, 0, 0, 0, 0,
+ 275, 0, 0, 0, 0, 275, 0, 0, 0, 0,
+
+ 0, 0, 0, 0, 278, 285, 285, 0, 285, 285,
+ 285, 286, 286, 287, 287, 287, 288, 288, 288, 289,
+ 289, 0, 289, 289, 289, 290, 0, 290, 290, 290,
+ 291, 0, 0, 291, 291, 292, 292, 292, 293, 0,
+ 0, 293, 294, 294, 294, 295, 0, 0, 295, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
- 284, 284, 284, 284, 284, 284
+ 284, 284, 284, 284, 284, 284, 284, 284, 284, 284,
+ 284, 284, 284, 284, 284
} ;
static yy_state_type yy_last_accepting_state;
@@ -788,7 +790,7 @@ static int checkImmediate(int token) {
return token;
}
-#line 792 "engines/director/lingo/lingo-lex.cpp"
+#line 794 "engines/director/lingo/lingo-lex.cpp"
#define INITIAL 0
@@ -974,7 +976,7 @@ YY_DECL
#line 78 "engines/director/lingo/lingo-lex.l"
-#line 978 "engines/director/lingo/lingo-lex.cpp"
+#line 980 "engines/director/lingo/lingo-lex.cpp"
if ( !(yy_init) )
{
@@ -1600,7 +1602,7 @@ YY_RULE_SETUP
#line 321 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1604 "engines/director/lingo/lingo-lex.cpp"
+#line 1606 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index 2d69834..fb689d5 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -77,7 +77,7 @@ whitespace [\t ]
%%
-\xC2[\r\n] { g_lingo->_linenumber++; g_lingo->_colnumber = 0; }
+{whitespace}\xC2[\r\n] { g_lingo->_linenumber++; g_lingo->_colnumber = 0; }
--[^\r\n]*
^{whitespace}+ { count(); }
[\t]+ { count(); return ' '; }
More information about the Scummvm-git-logs
mailing list