[Scummvm-git-logs] scummvm master -> b6011f5270e9b6795b345306be2cb21a2f2ee753
sev-
sev at scummvm.org
Wed Jan 15 00:34:51 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:
b6011f5270 DIRECTOR: LINGO: Specify case-insensitivity as a general lexer option
Commit: b6011f5270e9b6795b345306be2cb21a2f2ee753
https://github.com/scummvm/scummvm/commit/b6011f5270e9b6795b345306be2cb21a2f2ee753
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-15T01:34:39+01:00
Commit Message:
DIRECTOR: LINGO: Specify case-insensitivity as a general lexer option
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 6c17e36..1fe7e55 100644
--- a/engines/director/lingo/lingo-lex.cpp
+++ b/engines/director/lingo/lingo-lex.cpp
@@ -462,47 +462,47 @@ static yyconst flex_int32_t yy_meta[66] =
static yyconst flex_int16_t yy_base[381] =
{ 0,
- 0, 64, 642, 908, 68, 908, 908, 72, 625, 0,
- 908, 617, 581, 55, 63, 908, 535, 59, 59, 59,
+ 0, 64, 240, 939, 68, 939, 939, 72, 180, 0,
+ 939, 164, 140, 55, 63, 939, 130, 59, 59, 59,
55, 63, 0, 64, 75, 70, 100, 77, 110, 102,
- 98, 139, 126, 152, 83, 184, 205, 458, 209, 908,
- 213, 145, 482, 908, 0, 908, 0, 430, 139, 908,
- 908, 908, 0, 66, 116, 136, 149, 74, 166, 106,
- 151, 153, 125, 91, 0, 165, 176, 139, 151, 201,
- 191, 201, 188, 194, 0, 0, 209, 0, 215, 212,
- 200, 205, 202, 203, 207, 226, 214, 223, 0, 246,
- 213, 223, 908, 279, 283, 333, 324, 0, 0, 234,
-
- 233, 0, 243, 242, 241, 256, 260, 269, 289, 258,
- 277, 296, 268, 286, 276, 287, 274, 277, 287, 0,
- 287, 279, 0, 289, 279, 284, 291, 0, 303, 0,
- 294, 300, 302, 312, 349, 312, 325, 332, 337, 190,
- 166, 320, 327, 0, 341, 0, 0, 304, 359, 0,
- 345, 336, 350, 336, 0, 0, 0, 0, 340, 341,
- 351, 0, 0, 383, 348, 353, 362, 360, 351, 354,
- 0, 401, 0, 0, 370, 371, 0, 131, 130, 0,
- 380, 382, 406, 0, 382, 410, 388, 384, 0, 394,
- 0, 418, 400, 392, 391, 392, 423, 415, 395, 445,
-
- 447, 458, 462, 0, 416, 119, 88, 0, 441, 444,
- 0, 0, 471, 452, 453, 473, 444, 461, 448, 450,
- 0, 514, 569, 0, 0, 493, 467, 487, 520, 519,
- 0, 42, 20, 469, 908, 477, 460, 497, 432, 0,
- 500, 510, 477, 480, 513, 515, 516, 516, 527, 520,
- 528, 524, 563, 543, 549, 551, 579, 585, 597, 18,
- 0, 0, 563, 0, 547, 0, 0, 558, 567, 0,
- 0, 578, 578, 592, 581, 582, 594, 598, 589, 586,
- 561, 597, 645, 636, 646, 908, 601, 596, 0, 616,
- 0, 618, 637, 620, 630, 629, 643, 629, 639, 644,
-
- 666, 651, 672, 676, 693, 654, 0, 908, 658, 677,
- 666, 908, 678, 684, 679, 0, 908, 0, 908, 710,
- 714, 686, 720, 908, 908, 657, 681, 693, 0, 694,
- 692, 707, 0, 740, 734, 746, 715, 908, 714, 726,
- 0, 719, 729, 756, 724, 761, 762, 908, 738, 0,
- 751, 785, 786, 908, 0, 787, 791, 773, 800, 753,
- 761, 908, 908, 908, 841, 843, 846, 849, 855, 860,
- 865, 867, 872, 877, 880, 883, 888, 891, 896, 901
+ 98, 139, 126, 152, 145, 185, 206, 110, 210, 939,
+ 214, 175, 97, 939, 0, 939, 0, 86, 171, 939,
+ 939, 939, 0, 66, 116, 144, 154, 111, 192, 134,
+ 175, 172, 151, 82, 0, 165, 183, 174, 195, 207,
+ 196, 215, 194, 199, 0, 0, 215, 0, 220, 218,
+ 206, 211, 208, 208, 213, 221, 229, 238, 0, 248,
+ 242, 245, 939, 283, 287, 257, 262, 0, 0, 69,
+
+ 261, 0, 263, 262, 261, 262, 268, 279, 91, 268,
+ 286, 308, 276, 293, 284, 294, 287, 289, 292, 0,
+ 299, 291, 0, 302, 292, 296, 306, 0, 307, 0,
+ 309, 319, 318, 327, 358, 329, 332, 321, 344, 346,
+ 333, 338, 339, 0, 349, 0, 0, 153, 371, 0,
+ 357, 347, 362, 348, 0, 0, 0, 0, 354, 355,
+ 367, 0, 0, 395, 368, 373, 381, 382, 351, 371,
+ 0, 412, 0, 0, 382, 382, 0, 380, 386, 0,
+ 399, 397, 419, 0, 399, 429, 400, 399, 0, 415,
+ 0, 446, 417, 408, 409, 408, 420, 431, 420, 454,
+
+ 470, 479, 480, 0, 434, 441, 441, 0, 447, 436,
+ 0, 0, 486, 473, 473, 494, 453, 482, 467, 469,
+ 0, 531, 586, 0, 0, 529, 509, 511, 510, 546,
+ 0, 481, 478, 489, 939, 504, 511, 526, 500, 0,
+ 529, 531, 521, 518, 533, 552, 545, 541, 553, 564,
+ 558, 552, 593, 576, 577, 576, 617, 605, 626, 552,
+ 0, 0, 595, 0, 579, 0, 0, 597, 602, 0,
+ 0, 602, 614, 625, 609, 616, 623, 631, 620, 616,
+ 650, 626, 656, 674, 678, 939, 629, 631, 0, 648,
+ 0, 637, 651, 642, 654, 653, 669, 652, 662, 675,
+
+ 696, 679, 702, 703, 708, 682, 0, 939, 693, 697,
+ 697, 939, 699, 704, 708, 0, 939, 0, 939, 751,
+ 735, 719, 747, 939, 939, 697, 700, 718, 0, 717,
+ 727, 744, 0, 770, 769, 774, 751, 939, 729, 751,
+ 0, 748, 757, 791, 763, 807, 809, 939, 770, 0,
+ 774, 817, 821, 939, 0, 825, 829, 807, 831, 788,
+ 791, 939, 939, 939, 872, 874, 877, 880, 886, 891,
+ 896, 898, 903, 908, 911, 914, 919, 922, 927, 932
} ;
static yyconst flex_int16_t yy_def[381] =
@@ -550,7 +550,7 @@ static yyconst flex_int16_t yy_def[381] =
364, 364, 364, 364, 364, 364, 364, 364, 364, 364
} ;
-static yyconst flex_int16_t yy_nxt[974] =
+static yyconst flex_int16_t yy_nxt[1005] =
{ 0,
4, 5, 6, 7, 8, 9, 10, 11, 12, 11,
13, 4, 14, 15, 16, 17, 18, 19, 20, 21,
@@ -560,108 +560,112 @@ static yyconst flex_int16_t yy_nxt[974] =
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, 286, 57, 261, 59, 93, 93, 55, 58, 60,
- 63, 61, 112, 64, 68, 112, 65, 73, 260, 69,
+ 54, 100, 57, 112, 59, 38, 112, 55, 58, 60,
+ 63, 61, 149, 64, 68, 149, 65, 73, 100, 69,
- 101, 62, 105, 66, 56, 54, 74, 57, 59, 67,
+ 101, 62, 44, 66, 56, 54, 74, 57, 59, 67,
38, 55, 58, 60, 63, 61, 70, 64, 82, 68,
- 71, 65, 73, 69, 101, 62, 105, 66, 79, 72,
- 74, 75, 42, 67, 80, 102, 42, 81, 76, 108,
- 77, 70, 78, 82, 233, 71, 87, 93, 93, 88,
- 48, 49, 79, 72, 111, 89, 75, 103, 80, 83,
- 102, 81, 76, 108, 77, 104, 78, 116, 84, 85,
- 109, 87, 232, 86, 88, 90, 91, 110, 111, 89,
- 117, 92, 103, 207, 83, 94, 40, 40, 95, 206,
- 104, 116, 84, 85, 106, 109, 115, 86, 113, 114,
-
- 90, 91, 110, 107, 117, 92, 95, 40, 40, 95,
- 39, 40, 40, 41, 41, 40, 40, 41, 106, 118,
- 120, 115, 113, 114, 179, 119, 122, 107, 123, 124,
- 96, 125, 126, 178, 128, 129, 130, 121, 131, 132,
- 134, 127, 133, 135, 118, 120, 100, 138, 42, 119,
- 122, 96, 123, 142, 124, 139, 125, 126, 128, 129,
- 130, 121, 131, 132, 134, 127, 136, 133, 135, 42,
- 137, 138, 143, 42, 144, 145, 146, 42, 142, 139,
- 94, 40, 40, 95, 95, 40, 40, 95, 147, 148,
- 149, 136, 150, 149, 151, 137, 143, 112, 144, 145,
-
- 112, 146, 153, 156, 158, 183, 154, 157, 183, 159,
- 160, 161, 147, 162, 148, 155, 150, 163, 164, 151,
- 165, 166, 168, 167, 169, 96, 153, 156, 158, 96,
- 152, 154, 157, 159, 170, 160, 161, 162, 171, 155,
- 174, 163, 164, 42, 165, 166, 168, 42, 167, 169,
- 172, 175, 180, 172, 152, 176, 177, 182, 170, 181,
- 149, 185, 171, 149, 174, 186, 187, 141, 188, 189,
- 190, 191, 194, 195, 140, 175, 180, 173, 196, 197,
- 176, 177, 182, 181, 192, 198, 185, 192, 199, 186,
- 204, 187, 188, 189, 190, 205, 191, 194, 195, 193,
-
- 208, 173, 172, 196, 197, 172, 209, 183, 212, 198,
- 183, 213, 199, 216, 213, 204, 214, 215, 218, 192,
- 205, 219, 192, 220, 193, 208, 221, 222, 225, 201,
- 210, 209, 212, 239, 202, 224, 239, 203, 216, 217,
- 214, 215, 100, 218, 231, 219, 226, 220, 226, 226,
- 221, 226, 225, 201, 227, 210, 227, 223, 202, 226,
- 224, 203, 226, 226, 217, 235, 226, 227, 231, 234,
- 237, 227, 213, 238, 239, 213, 241, 239, 230, 242,
- 264, 223, 228, 243, 244, 53, 254, 44, 226, 229,
- 235, 226, 236, 234, 253, 237, 227, 253, 238, 97,
-
- 241, 256, 262, 230, 242, 264, 228, 243, 244, 263,
- 270, 254, 254, 229, 257, 265, 268, 236, 222, 271,
- 226, 226, 255, 226, 226, 256, 262, 256, 227, 227,
- 269, 273, 245, 263, 270, 246, 277, 254, 257, 272,
- 265, 268, 274, 271, 247, 259, 255, 248, 222, 52,
- 275, 256, 258, 276, 278, 269, 273, 245, 279, 280,
- 246, 277, 301, 272, 253, 301, 274, 253, 247, 259,
- 281, 248, 222, 222, 275, 282, 258, 276, 278, 287,
- 226, 288, 279, 226, 280, 290, 226, 249, 227, 226,
- 250, 47, 255, 291, 227, 281, 283, 293, 226, 251,
-
- 282, 226, 252, 223, 287, 288, 227, 292, 294, 290,
- 295, 296, 249, 297, 298, 250, 255, 291, 299, 284,
- 300, 283, 293, 251, 302, 46, 252, 223, 306, 307,
- 44, 292, 285, 294, 295, 296, 308, 304, 297, 298,
- 304, 364, 299, 284, 300, 227, 226, 226, 302, 226,
- 226, 309, 306, 307, 227, 227, 285, 310, 364, 311,
- 312, 308, 313, 314, 317, 303, 305, 301, 315, 316,
- 301, 319, 364, 226, 324, 309, 226, 321, 325, 364,
- 321, 227, 310, 311, 312, 338, 313, 328, 314, 317,
- 303, 305, 315, 316, 323, 254, 319, 323, 329, 324,
-
- 332, 326, 227, 325, 320, 322, 327, 335, 330, 338,
- 256, 334, 328, 331, 334, 321, 339, 340, 321, 227,
- 254, 336, 341, 329, 336, 332, 326, 342, 320, 322,
- 327, 343, 335, 330, 256, 346, 347, 331, 346, 254,
- 339, 344, 340, 322, 344, 352, 341, 336, 348, 337,
- 336, 342, 349, 350, 256, 351, 343, 344, 354, 254,
- 344, 347, 346, 353, 254, 346, 353, 322, 364, 345,
- 352, 355, 348, 337, 256, 337, 349, 350, 256, 351,
- 364, 362, 363, 354, 254, 345, 356, 353, 356, 356,
- 353, 356, 358, 345, 364, 358, 355, 360, 256, 337,
-
- 364, 358, 361, 333, 358, 362, 364, 363, 364, 345,
- 364, 364, 333, 364, 364, 364, 364, 364, 364, 364,
- 364, 364, 360, 364, 364, 364, 361, 318, 364, 364,
- 364, 333, 364, 364, 364, 364, 364, 364, 364, 364,
- 333, 43, 43, 364, 43, 43, 43, 45, 45, 53,
- 53, 53, 98, 98, 98, 99, 99, 364, 99, 99,
- 99, 184, 364, 364, 184, 184, 200, 364, 364, 200,
- 211, 211, 211, 240, 364, 240, 240, 240, 266, 364,
- 364, 266, 266, 267, 267, 267, 289, 289, 289, 318,
- 364, 364, 318, 318, 333, 333, 333, 357, 364, 364,
-
- 357, 357, 359, 364, 359, 359, 359, 3, 364, 364,
+ 71, 65, 73, 69, 101, 62, 97, 66, 79, 72,
+ 74, 75, 42, 67, 80, 102, 42, 81, 76, 105,
+ 77, 70, 78, 82, 52, 71, 87, 93, 93, 88,
+ 47, 97, 79, 72, 183, 89, 75, 183, 80, 83,
+ 102, 81, 76, 105, 77, 103, 78, 108, 84, 85,
+ 104, 87, 46, 86, 88, 90, 91, 93, 93, 89,
+ 111, 92, 48, 49, 83, 44, 94, 40, 40, 95,
+ 103, 108, 84, 85, 109, 104, 110, 86, 113, 114,
+
+ 90, 91, 116, 115, 111, 92, 96, 95, 40, 40,
+ 95, 39, 40, 40, 41, 41, 40, 40, 41, 109,
+ 106, 110, 113, 114, 117, 118, 116, 96, 115, 107,
+ 119, 96, 122, 123, 120, 124, 125, 133, 126, 364,
+ 128, 129, 130, 131, 106, 132, 364, 127, 117, 42,
+ 118, 121, 96, 107, 119, 134, 122, 123, 135, 120,
+ 124, 125, 133, 126, 128, 129, 130, 131, 136, 132,
+ 42, 127, 137, 140, 42, 121, 138, 139, 42, 134,
+ 141, 142, 146, 135, 94, 40, 40, 95, 95, 40,
+ 40, 95, 143, 136, 144, 145, 147, 137, 140, 148,
+
+ 138, 139, 150, 151, 96, 141, 142, 146, 96, 112,
+ 153, 156, 112, 154, 157, 160, 143, 158, 144, 145,
+ 147, 159, 155, 161, 148, 162, 150, 167, 151, 96,
+ 163, 164, 165, 96, 153, 156, 166, 168, 154, 157,
+ 160, 158, 152, 169, 176, 159, 155, 42, 161, 162,
+ 170, 42, 167, 171, 163, 164, 165, 174, 175, 172,
+ 166, 168, 172, 177, 178, 182, 152, 179, 169, 176,
+ 180, 181, 149, 185, 170, 149, 186, 171, 187, 364,
+ 188, 174, 175, 189, 190, 198, 173, 191, 177, 178,
+ 182, 179, 194, 195, 180, 181, 192, 196, 185, 192,
+
+ 186, 197, 204, 187, 188, 199, 205, 189, 190, 198,
+ 173, 193, 191, 172, 206, 207, 172, 194, 195, 208,
+ 183, 209, 196, 183, 222, 212, 197, 204, 214, 199,
+ 213, 205, 215, 213, 216, 218, 193, 219, 206, 207,
+ 201, 220, 221, 210, 208, 202, 209, 192, 203, 212,
+ 192, 224, 214, 225, 223, 226, 215, 235, 226, 216,
+ 218, 219, 231, 227, 201, 220, 221, 217, 210, 202,
+ 232, 226, 203, 233, 226, 234, 224, 225, 223, 227,
+ 226, 226, 235, 226, 226, 241, 231, 213, 227, 227,
+ 213, 237, 217, 238, 232, 239, 230, 233, 239, 234,
+
+ 242, 239, 243, 244, 239, 228, 53, 236, 364, 241,
+ 229, 226, 226, 260, 226, 226, 237, 261, 238, 227,
+ 227, 230, 262, 364, 364, 242, 243, 244, 254, 228,
+ 253, 264, 236, 253, 229, 222, 263, 260, 257, 364,
+ 364, 261, 258, 256, 265, 268, 262, 226, 254, 245,
+ 226, 269, 246, 254, 270, 227, 264, 271, 255, 272,
+ 263, 247, 257, 256, 248, 222, 258, 256, 273, 265,
+ 268, 274, 259, 254, 245, 275, 269, 246, 270, 276,
+ 277, 271, 255, 272, 278, 247, 279, 256, 248, 222,
+ 222, 286, 280, 273, 253, 274, 259, 253, 281, 275,
+
+ 282, 364, 364, 276, 249, 277, 226, 250, 278, 226,
+ 279, 287, 364, 288, 227, 286, 251, 280, 226, 252,
+ 223, 226, 255, 281, 290, 282, 227, 226, 291, 249,
+ 226, 292, 250, 293, 283, 227, 287, 288, 295, 284,
+ 251, 294, 297, 252, 223, 296, 255, 298, 290, 299,
+ 300, 301, 291, 302, 301, 292, 306, 226, 293, 283,
+ 226, 285, 295, 284, 307, 227, 294, 297, 308, 296,
+ 309, 310, 298, 299, 300, 304, 303, 302, 304, 226,
+ 306, 311, 226, 227, 312, 285, 313, 227, 307, 314,
+ 364, 315, 316, 308, 309, 317, 310, 301, 305, 319,
+
+ 301, 303, 324, 226, 321, 311, 226, 321, 312, 323,
+ 313, 227, 323, 325, 314, 315, 316, 227, 328, 329,
+ 317, 326, 254, 305, 319, 338, 327, 324, 330, 332,
+ 364, 364, 322, 331, 320, 339, 321, 256, 325, 321,
+ 335, 364, 340, 328, 329, 341, 326, 254, 336, 338,
+ 327, 336, 334, 330, 332, 334, 322, 331, 320, 339,
+ 227, 256, 342, 348, 322, 335, 254, 340, 343, 341,
+ 346, 344, 347, 346, 344, 336, 337, 349, 336, 364,
+ 364, 256, 350, 351, 352, 364, 342, 348, 322, 254,
+ 354, 254, 344, 343, 355, 344, 364, 347, 364, 345,
+
+ 337, 349, 364, 337, 256, 256, 350, 351, 346, 352,
+ 353, 346, 363, 353, 254, 354, 362, 364, 356, 355,
+ 345, 356, 353, 345, 364, 353, 356, 337, 256, 356,
+ 358, 360, 358, 358, 364, 358, 361, 363, 364, 364,
+ 362, 333, 364, 333, 345, 364, 364, 364, 364, 364,
+ 364, 364, 364, 364, 364, 364, 360, 364, 364, 364,
+ 361, 364, 364, 364, 364, 318, 364, 364, 364, 333,
+ 364, 333, 43, 43, 364, 43, 43, 43, 45, 45,
+ 53, 53, 53, 98, 98, 98, 99, 99, 364, 99,
+ 99, 99, 184, 364, 364, 184, 184, 200, 364, 364,
+
+ 200, 211, 211, 211, 240, 364, 240, 240, 240, 266,
+ 364, 364, 266, 266, 267, 267, 267, 289, 289, 289,
+ 318, 364, 364, 318, 318, 333, 333, 333, 357, 364,
+ 364, 357, 357, 359, 364, 359, 359, 359, 3, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
- 364, 364, 364
+
+ 364, 364, 364, 364
} ;
-static yyconst flex_int16_t yy_chk[974] =
+static yyconst flex_int16_t yy_chk[1005] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -671,105 +675,109 @@ static yyconst flex_int16_t yy_chk[974] =
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, 19,
- 18, 260, 20, 233, 21, 35, 35, 18, 20, 22,
- 24, 22, 64, 24, 26, 64, 25, 28, 232, 26,
+ 18, 100, 20, 64, 21, 2, 64, 18, 20, 22,
+ 24, 22, 109, 24, 26, 109, 25, 28, 48, 26,
- 54, 22, 58, 25, 19, 18, 28, 20, 21, 25,
+ 54, 22, 43, 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, 55, 8, 30, 29, 60,
- 29, 27, 29, 31, 207, 27, 33, 42, 42, 33,
- 49, 49, 30, 27, 63, 33, 29, 56, 30, 32,
- 55, 30, 29, 60, 29, 57, 29, 68, 32, 32,
- 61, 33, 206, 32, 33, 34, 34, 62, 63, 33,
- 69, 34, 56, 179, 32, 36, 36, 36, 36, 178,
- 57, 68, 32, 32, 59, 61, 67, 32, 66, 66,
-
- 34, 34, 62, 59, 69, 34, 37, 37, 37, 37,
- 39, 39, 39, 39, 41, 41, 41, 41, 59, 70,
- 72, 67, 66, 66, 141, 71, 73, 59, 74, 77,
- 36, 79, 80, 140, 81, 82, 83, 72, 84, 85,
- 87, 80, 86, 88, 70, 72, 100, 91, 36, 71,
- 73, 37, 74, 101, 77, 92, 79, 80, 81, 82,
- 83, 72, 84, 85, 87, 80, 90, 86, 88, 37,
- 90, 91, 103, 39, 104, 105, 106, 41, 101, 92,
- 94, 94, 94, 94, 95, 95, 95, 95, 107, 108,
- 109, 90, 110, 109, 111, 90, 103, 112, 104, 105,
-
- 112, 106, 113, 115, 117, 148, 114, 116, 148, 118,
- 119, 121, 107, 122, 108, 114, 110, 124, 125, 111,
- 126, 127, 131, 129, 132, 94, 113, 115, 117, 95,
- 112, 114, 116, 118, 133, 119, 121, 122, 134, 114,
- 136, 124, 125, 94, 126, 127, 131, 95, 129, 132,
- 135, 137, 142, 135, 112, 138, 139, 145, 133, 143,
- 149, 151, 134, 149, 136, 152, 153, 97, 154, 159,
- 160, 161, 165, 166, 96, 137, 142, 135, 167, 168,
- 138, 139, 145, 143, 164, 169, 151, 164, 170, 152,
- 175, 153, 154, 159, 160, 176, 161, 165, 166, 164,
-
- 181, 135, 172, 167, 168, 172, 182, 183, 185, 169,
- 183, 186, 170, 190, 186, 175, 187, 188, 193, 192,
- 176, 194, 192, 195, 164, 181, 196, 197, 199, 172,
- 183, 182, 185, 239, 172, 198, 239, 172, 190, 192,
- 187, 188, 48, 193, 205, 194, 200, 195, 201, 200,
- 196, 201, 199, 172, 200, 183, 201, 197, 172, 202,
- 198, 172, 202, 203, 192, 210, 203, 202, 205, 209,
- 214, 203, 213, 215, 216, 213, 217, 216, 203, 218,
- 237, 197, 201, 219, 220, 216, 227, 43, 228, 202,
- 210, 228, 213, 209, 226, 214, 228, 226, 215, 38,
-
- 217, 227, 234, 203, 218, 237, 201, 219, 220, 236,
- 243, 227, 226, 202, 228, 238, 241, 213, 222, 244,
- 230, 229, 226, 230, 229, 227, 234, 226, 230, 229,
- 242, 246, 222, 236, 243, 222, 250, 226, 228, 245,
- 238, 241, 247, 244, 222, 230, 226, 222, 222, 17,
- 248, 226, 229, 249, 251, 242, 246, 222, 252, 254,
- 222, 250, 281, 245, 253, 281, 247, 253, 222, 230,
- 255, 222, 222, 223, 248, 256, 229, 249, 251, 263,
- 257, 265, 252, 257, 254, 268, 258, 223, 257, 258,
- 223, 13, 253, 269, 258, 255, 257, 273, 259, 223,
-
- 256, 259, 223, 223, 263, 265, 259, 272, 274, 268,
- 275, 276, 223, 277, 278, 223, 253, 269, 279, 258,
- 280, 257, 273, 223, 282, 12, 223, 223, 287, 288,
- 9, 272, 259, 274, 275, 276, 290, 284, 277, 278,
- 284, 3, 279, 258, 280, 284, 283, 285, 282, 283,
- 285, 292, 287, 288, 283, 285, 259, 293, 0, 294,
- 295, 290, 296, 297, 300, 283, 285, 301, 298, 299,
- 301, 302, 0, 303, 306, 292, 303, 304, 309, 0,
- 304, 303, 293, 294, 295, 326, 296, 311, 297, 300,
- 283, 285, 298, 299, 305, 304, 302, 305, 313, 306,
-
- 315, 310, 305, 309, 303, 304, 310, 322, 314, 326,
- 304, 320, 311, 314, 320, 321, 327, 328, 321, 320,
- 304, 323, 330, 313, 323, 315, 310, 331, 303, 304,
- 310, 332, 322, 314, 304, 335, 337, 314, 335, 323,
- 327, 334, 328, 321, 334, 345, 330, 336, 339, 323,
- 336, 331, 340, 342, 323, 343, 332, 344, 349, 334,
- 344, 337, 346, 347, 323, 346, 347, 321, 0, 334,
- 345, 351, 339, 323, 334, 336, 340, 342, 323, 343,
- 0, 360, 361, 349, 334, 344, 352, 353, 356, 352,
- 353, 356, 357, 334, 0, 357, 351, 358, 334, 336,
-
- 0, 359, 358, 357, 359, 360, 0, 361, 0, 344,
- 0, 0, 359, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 358, 0, 0, 0, 358, 356, 0, 0,
- 0, 357, 0, 0, 0, 0, 0, 0, 0, 0,
- 359, 365, 365, 0, 365, 365, 365, 366, 366, 367,
- 367, 367, 368, 368, 368, 369, 369, 0, 369, 369,
- 369, 370, 0, 0, 370, 370, 371, 0, 0, 371,
- 372, 372, 372, 373, 0, 373, 373, 373, 374, 0,
- 0, 374, 374, 375, 375, 375, 376, 376, 376, 377,
- 0, 0, 377, 377, 378, 378, 378, 379, 0, 0,
-
- 379, 379, 380, 0, 380, 380, 380, 364, 364, 364,
+ 27, 25, 28, 26, 54, 22, 38, 25, 30, 27,
+ 28, 29, 5, 25, 30, 55, 8, 30, 29, 58,
+ 29, 27, 29, 31, 17, 27, 33, 35, 35, 33,
+ 13, 38, 30, 27, 148, 33, 29, 148, 30, 32,
+ 55, 30, 29, 58, 29, 56, 29, 60, 32, 32,
+ 57, 33, 12, 32, 33, 34, 34, 42, 42, 33,
+ 63, 34, 49, 49, 32, 9, 36, 36, 36, 36,
+ 56, 60, 32, 32, 61, 57, 62, 32, 66, 66,
+
+ 34, 34, 68, 67, 63, 34, 36, 37, 37, 37,
+ 37, 39, 39, 39, 39, 41, 41, 41, 41, 61,
+ 59, 62, 66, 66, 69, 70, 68, 37, 67, 59,
+ 71, 36, 73, 74, 72, 77, 79, 86, 80, 3,
+ 81, 82, 83, 84, 59, 85, 0, 80, 69, 36,
+ 70, 72, 37, 59, 71, 87, 73, 74, 88, 72,
+ 77, 79, 86, 80, 81, 82, 83, 84, 90, 85,
+ 37, 80, 90, 96, 39, 72, 91, 92, 41, 87,
+ 97, 101, 106, 88, 94, 94, 94, 94, 95, 95,
+ 95, 95, 103, 90, 104, 105, 107, 90, 96, 108,
+
+ 91, 92, 110, 111, 94, 97, 101, 106, 95, 112,
+ 113, 115, 112, 114, 116, 119, 103, 117, 104, 105,
+ 107, 118, 114, 121, 108, 122, 110, 129, 111, 94,
+ 124, 125, 126, 95, 113, 115, 127, 131, 114, 116,
+ 119, 117, 112, 132, 138, 118, 114, 94, 121, 122,
+ 133, 95, 129, 134, 124, 125, 126, 136, 137, 135,
+ 127, 131, 135, 139, 140, 145, 112, 141, 132, 138,
+ 142, 143, 149, 151, 133, 149, 152, 134, 153, 0,
+ 154, 136, 137, 159, 160, 169, 135, 161, 139, 140,
+ 145, 141, 165, 166, 142, 143, 164, 167, 151, 164,
+
+ 152, 168, 175, 153, 154, 170, 176, 159, 160, 169,
+ 135, 164, 161, 172, 178, 179, 172, 165, 166, 181,
+ 183, 182, 167, 183, 197, 185, 168, 175, 187, 170,
+ 186, 176, 188, 186, 190, 193, 164, 194, 178, 179,
+ 172, 195, 196, 183, 181, 172, 182, 192, 172, 185,
+ 192, 198, 187, 199, 197, 200, 188, 210, 200, 190,
+ 193, 194, 205, 200, 172, 195, 196, 192, 183, 172,
+ 206, 201, 172, 207, 201, 209, 198, 199, 197, 201,
+ 202, 203, 210, 202, 203, 217, 205, 213, 202, 203,
+ 213, 214, 192, 215, 206, 216, 203, 207, 216, 209,
+
+ 218, 239, 219, 220, 239, 201, 216, 213, 0, 217,
+ 202, 229, 228, 232, 229, 228, 214, 233, 215, 229,
+ 228, 203, 234, 0, 0, 218, 219, 220, 227, 201,
+ 226, 237, 213, 226, 202, 222, 236, 232, 228, 0,
+ 0, 233, 229, 227, 238, 241, 234, 230, 226, 222,
+ 230, 242, 222, 227, 243, 230, 237, 244, 226, 245,
+ 236, 222, 228, 226, 222, 222, 229, 227, 246, 238,
+ 241, 247, 230, 226, 222, 248, 242, 222, 243, 249,
+ 250, 244, 226, 245, 251, 222, 252, 226, 222, 222,
+ 223, 260, 254, 246, 253, 247, 230, 253, 255, 248,
+
+ 256, 0, 0, 249, 223, 250, 258, 223, 251, 258,
+ 252, 263, 0, 265, 258, 260, 223, 254, 257, 223,
+ 223, 257, 253, 255, 268, 256, 257, 259, 269, 223,
+ 259, 272, 223, 273, 257, 259, 263, 265, 275, 258,
+ 223, 274, 277, 223, 223, 276, 253, 278, 268, 279,
+ 280, 281, 269, 282, 281, 272, 287, 283, 273, 257,
+ 283, 259, 275, 258, 288, 283, 274, 277, 290, 276,
+ 292, 293, 278, 279, 280, 284, 283, 282, 284, 285,
+ 287, 294, 285, 284, 295, 259, 296, 285, 288, 297,
+ 0, 298, 299, 290, 292, 300, 293, 301, 285, 302,
+
+ 301, 283, 306, 303, 304, 294, 303, 304, 295, 305,
+ 296, 303, 305, 309, 297, 298, 299, 305, 311, 313,
+ 300, 310, 304, 285, 302, 326, 310, 306, 314, 315,
+ 0, 0, 304, 314, 303, 327, 321, 304, 309, 321,
+ 322, 0, 328, 311, 313, 330, 310, 304, 323, 326,
+ 310, 323, 320, 314, 315, 320, 304, 314, 303, 327,
+ 320, 304, 331, 339, 321, 322, 323, 328, 332, 330,
+ 335, 334, 337, 335, 334, 336, 323, 340, 336, 0,
+ 0, 323, 342, 343, 345, 0, 331, 339, 321, 334,
+ 349, 323, 344, 332, 351, 344, 0, 337, 0, 334,
+
+ 323, 340, 0, 336, 334, 323, 342, 343, 346, 345,
+ 347, 346, 361, 347, 334, 349, 360, 0, 352, 351,
+ 344, 352, 353, 334, 0, 353, 356, 336, 334, 356,
+ 357, 358, 359, 357, 0, 359, 358, 361, 0, 0,
+ 360, 357, 0, 359, 344, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 358, 0, 0, 0,
+ 358, 0, 0, 0, 0, 356, 0, 0, 0, 357,
+ 0, 359, 365, 365, 0, 365, 365, 365, 366, 366,
+ 367, 367, 367, 368, 368, 368, 369, 369, 0, 369,
+ 369, 369, 370, 0, 0, 370, 370, 371, 0, 0,
+
+ 371, 372, 372, 372, 373, 0, 373, 373, 373, 374,
+ 0, 0, 374, 374, 375, 375, 375, 376, 376, 376,
+ 377, 0, 0, 377, 377, 378, 378, 378, 379, 0,
+ 0, 379, 379, 380, 0, 380, 380, 380, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
364, 364, 364, 364, 364, 364, 364, 364, 364, 364,
- 364, 364, 364
+
+ 364, 364, 364, 364
} ;
static yy_state_type yy_last_accepting_state;
@@ -809,7 +817,7 @@ char *yytext;
*
*/
#define YY_NO_INPUT 1
-#line 31 "engines/director/lingo/lingo-lex.l"
+#line 32 "engines/director/lingo/lingo-lex.l"
#define YY_NO_UNISTD_H
#define FORBIDDEN_SYMBOL_ALLOW_ALL
@@ -858,7 +866,7 @@ static int checkImmediate(int token) {
return token;
}
-#line 862 "engines/director/lingo/lingo-lex.cpp"
+#line 870 "engines/director/lingo/lingo-lex.cpp"
#define INITIAL 0
@@ -1041,10 +1049,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 89 "engines/director/lingo/lingo-lex.l"
+#line 90 "engines/director/lingo/lingo-lex.l"
-#line 1048 "engines/director/lingo/lingo-lex.cpp"
+#line 1056 "engines/director/lingo/lingo-lex.cpp"
if ( !(yy_init) )
{
@@ -1127,82 +1135,82 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
-#line 91 "engines/director/lingo/lingo-lex.l"
+#line 92 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 92 "engines/director/lingo/lingo-lex.l"
+#line 93 "engines/director/lingo/lingo-lex.l"
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 93 "engines/director/lingo/lingo-lex.l"
+#line 94 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 94 "engines/director/lingo/lingo-lex.l"
+#line 95 "engines/director/lingo/lingo-lex.l"
{ count(); return ' '; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 96 "engines/director/lingo/lingo-lex.l"
+#line 97 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(yytext); return SYMBOL; } // D3
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 98 "engines/director/lingo/lingo-lex.l"
+#line 99 "engines/director/lingo/lingo-lex.l"
{ count(); return tAFTER; } // D3
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 99 "engines/director/lingo/lingo-lex.l"
+#line 100 "engines/director/lingo/lingo-lex.l"
{ count(); return tAND; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 100 "engines/director/lingo/lingo-lex.l"
+#line 101 "engines/director/lingo/lingo-lex.l"
{ count(); return tBEFORE; } // D3
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 101 "engines/director/lingo/lingo-lex.l"
+#line 102 "engines/director/lingo/lingo-lex.l"
{ count(); return tCHAR; } // D3
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 102 "engines/director/lingo/lingo-lex.l"
+#line 103 "engines/director/lingo/lingo-lex.l"
{ count(); return tCONTAINS; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 103 "engines/director/lingo/lingo-lex.l"
+#line 104 "engines/director/lingo/lingo-lex.l"
{ count(); return tDONE; }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 104 "engines/director/lingo/lingo-lex.l"
+#line 105 "engines/director/lingo/lingo-lex.l"
{ count(); return tDOWN; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 105 "engines/director/lingo/lingo-lex.l"
+#line 106 "engines/director/lingo/lingo-lex.l"
{ count(); return tIF; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 106 "engines/director/lingo/lingo-lex.l"
+#line 107 "engines/director/lingo/lingo-lex.l"
{ count(); return tELSIF; }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 107 "engines/director/lingo/lingo-lex.l"
+#line 108 "engines/director/lingo/lingo-lex.l"
{ count(); return tELSE; }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 108 "engines/director/lingo/lingo-lex.l"
+#line 109 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1224,72 +1232,72 @@ YY_RULE_SETUP
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 126 "engines/director/lingo/lingo-lex.l"
+#line 127 "engines/director/lingo/lingo-lex.l"
{ count(); return tFACTORY; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 127 "engines/director/lingo/lingo-lex.l"
+#line 128 "engines/director/lingo/lingo-lex.l"
{ count(); return tEXIT; }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 128 "engines/director/lingo/lingo-lex.l"
+#line 129 "engines/director/lingo/lingo-lex.l"
{ count(); return tGLOBAL; }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 129 "engines/director/lingo/lingo-lex.l"
+#line 130 "engines/director/lingo/lingo-lex.l"
{ count(); return tGO; }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 130 "engines/director/lingo/lingo-lex.l"
+#line 131 "engines/director/lingo/lingo-lex.l"
{ count(); return tGO; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 131 "engines/director/lingo/lingo-lex.l"
+#line 132 "engines/director/lingo/lingo-lex.l"
{ count(); return tGO; }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 132 "engines/director/lingo/lingo-lex.l"
+#line 133 "engines/director/lingo/lingo-lex.l"
{ count(); return tINSTANCE; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 133 "engines/director/lingo/lingo-lex.l"
+#line 134 "engines/director/lingo/lingo-lex.l"
{ count(); return tINTERSECTS; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 134 "engines/director/lingo/lingo-lex.l"
+#line 135 "engines/director/lingo/lingo-lex.l"
{ count(); return tINTO; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 135 "engines/director/lingo/lingo-lex.l"
+#line 136 "engines/director/lingo/lingo-lex.l"
{ count(); return tITEM; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 136 "engines/director/lingo/lingo-lex.l"
+#line 137 "engines/director/lingo/lingo-lex.l"
{ count(); return tLINE; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 137 "engines/director/lingo/lingo-lex.l"
+#line 138 "engines/director/lingo/lingo-lex.l"
{ count(); return checkImmediate(tLOOP); }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 138 "engines/director/lingo/lingo-lex.l"
+#line 139 "engines/director/lingo/lingo-lex.l"
{ count(); return tMACRO; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 139 "engines/director/lingo/lingo-lex.l"
+#line 140 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1304,87 +1312,87 @@ YY_RULE_SETUP
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 150 "engines/director/lingo/lingo-lex.l"
+#line 151 "engines/director/lingo/lingo-lex.l"
{ count(); return tMOD; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 151 "engines/director/lingo/lingo-lex.l"
+#line 152 "engines/director/lingo/lingo-lex.l"
{ count(); return tMOVIE; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 152 "engines/director/lingo/lingo-lex.l"
+#line 153 "engines/director/lingo/lingo-lex.l"
{ count(); return tNEXT; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 153 "engines/director/lingo/lingo-lex.l"
+#line 154 "engines/director/lingo/lingo-lex.l"
{ count(); return tNOT; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 154 "engines/director/lingo/lingo-lex.l"
+#line 155 "engines/director/lingo/lingo-lex.l"
{ count(); return tOF; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 155 "engines/director/lingo/lingo-lex.l"
+#line 156 "engines/director/lingo/lingo-lex.l"
{ count(); return tON; } // D3
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 156 "engines/director/lingo/lingo-lex.l"
+#line 157 "engines/director/lingo/lingo-lex.l"
{ count(); return tOPEN; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 157 "engines/director/lingo/lingo-lex.l"
+#line 158 "engines/director/lingo/lingo-lex.l"
{ count(); return tOR; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 158 "engines/director/lingo/lingo-lex.l"
+#line 159 "engines/director/lingo/lingo-lex.l"
{ count(); return tPLAY; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 159 "engines/director/lingo/lingo-lex.l"
+#line 160 "engines/director/lingo/lingo-lex.l"
{ count(); return tPLAY; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 160 "engines/director/lingo/lingo-lex.l"
+#line 161 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(yytext); return tPLAYACCEL; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 161 "engines/director/lingo/lingo-lex.l"
+#line 162 "engines/director/lingo/lingo-lex.l"
{ count(); return tPREVIOUS; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 162 "engines/director/lingo/lingo-lex.l"
+#line 163 "engines/director/lingo/lingo-lex.l"
{ count(); return tPROPERTY; } // D4
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 163 "engines/director/lingo/lingo-lex.l"
+#line 164 "engines/director/lingo/lingo-lex.l"
{ count(); return tPUT; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 164 "engines/director/lingo/lingo-lex.l"
+#line 165 "engines/director/lingo/lingo-lex.l"
{ count(); return checkImmediate(tREPEAT); }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 165 "engines/director/lingo/lingo-lex.l"
+#line 166 "engines/director/lingo/lingo-lex.l"
{ count(); return tSET; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 166 "engines/director/lingo/lingo-lex.l"
+#line 167 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1408,17 +1416,17 @@ YY_RULE_SETUP
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 186 "engines/director/lingo/lingo-lex.l"
+#line 187 "engines/director/lingo/lingo-lex.l"
{ count(); return tSTARTS; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 187 "engines/director/lingo/lingo-lex.l"
+#line 188 "engines/director/lingo/lingo-lex.l"
{ count(); return tTELL; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 188 "engines/director/lingo/lingo-lex.l"
+#line 189 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1430,7 +1438,7 @@ YY_RULE_SETUP
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 196 "engines/director/lingo/lingo-lex.l"
+#line 197 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1441,7 +1449,7 @@ YY_RULE_SETUP
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 203 "engines/director/lingo/lingo-lex.l"
+#line 204 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1468,7 +1476,7 @@ YY_RULE_SETUP
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 226 "engines/director/lingo/lingo-lex.l"
+#line 227 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1525,7 +1533,7 @@ YY_RULE_SETUP
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 279 "engines/director/lingo/lingo-lex.l"
+#line 280 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1560,7 +1568,7 @@ YY_RULE_SETUP
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 310 "engines/director/lingo/lingo-lex.l"
+#line 311 "engines/director/lingo/lingo-lex.l"
{
count();
@@ -1583,72 +1591,72 @@ YY_RULE_SETUP
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 329 "engines/director/lingo/lingo-lex.l"
+#line 330 "engines/director/lingo/lingo-lex.l"
{ count(); return tTHEN; }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 330 "engines/director/lingo/lingo-lex.l"
+#line 331 "engines/director/lingo/lingo-lex.l"
{ count(); return tTO; }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 331 "engines/director/lingo/lingo-lex.l"
+#line 332 "engines/director/lingo/lingo-lex.l"
{ count(); return tSPRITE; }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 332 "engines/director/lingo/lingo-lex.l"
+#line 333 "engines/director/lingo/lingo-lex.l"
{ count(); return tWITH; }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 333 "engines/director/lingo/lingo-lex.l"
+#line 334 "engines/director/lingo/lingo-lex.l"
{ count(); return tWITHIN; }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 334 "engines/director/lingo/lingo-lex.l"
+#line 335 "engines/director/lingo/lingo-lex.l"
{ count(); return tWHEN; }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 335 "engines/director/lingo/lingo-lex.l"
+#line 336 "engines/director/lingo/lingo-lex.l"
{ count(); return tWHILE; }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 336 "engines/director/lingo/lingo-lex.l"
+#line 337 "engines/director/lingo/lingo-lex.l"
{ count(); return tWORD; }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 338 "engines/director/lingo/lingo-lex.l"
+#line 339 "engines/director/lingo/lingo-lex.l"
{ count(); return tNEQ; }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 339 "engines/director/lingo/lingo-lex.l"
+#line 340 "engines/director/lingo/lingo-lex.l"
{ count(); return tGE; }
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 340 "engines/director/lingo/lingo-lex.l"
+#line 341 "engines/director/lingo/lingo-lex.l"
{ count(); return tLE; }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 341 "engines/director/lingo/lingo-lex.l"
+#line 342 "engines/director/lingo/lingo-lex.l"
{ count(); return tCONCAT; }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 342 "engines/director/lingo/lingo-lex.l"
+#line 343 "engines/director/lingo/lingo-lex.l"
{ count(); return tEQ; }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 344 "engines/director/lingo/lingo-lex.l"
+#line 345 "engines/director/lingo/lingo-lex.l"
{
count();
yylval.s = new Common::String(yytext);
@@ -1684,41 +1692,41 @@ YY_RULE_SETUP
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 376 "engines/director/lingo/lingo-lex.l"
+#line 377 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.f = atof(yytext); return FLOAT; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 377 "engines/director/lingo/lingo-lex.l"
+#line 378 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.i = strtol(yytext, NULL, 10); return INT; }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 378 "engines/director/lingo/lingo-lex.l"
+#line 379 "engines/director/lingo/lingo-lex.l"
{ count(); return *yytext; }
YY_BREAK
case 73:
/* rule 73 can match eol */
YY_RULE_SETUP
-#line 379 "engines/director/lingo/lingo-lex.l"
+#line 380 "engines/director/lingo/lingo-lex.l"
{ count(); return '\n'; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 380 "engines/director/lingo/lingo-lex.l"
+#line 381 "engines/director/lingo/lingo-lex.l"
{ count(); yylval.s = new Common::String(&yytext[1]); yylval.s->deleteLastChar(); return STRING; }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 381 "engines/director/lingo/lingo-lex.l"
+#line 382 "engines/director/lingo/lingo-lex.l"
{ count(); }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 383 "engines/director/lingo/lingo-lex.l"
+#line 384 "engines/director/lingo/lingo-lex.l"
ECHO;
YY_BREAK
-#line 1722 "engines/director/lingo/lingo-lex.cpp"
+#line 1730 "engines/director/lingo/lingo-lex.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2678,7 +2686,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 383 "engines/director/lingo/lingo-lex.l"
+#line 384 "engines/director/lingo/lingo-lex.l"
diff --git a/engines/director/lingo/lingo-lex.l b/engines/director/lingo/lingo-lex.l
index c0dc2cf..09937e2 100644
--- a/engines/director/lingo/lingo-lex.l
+++ b/engines/director/lingo/lingo-lex.l
@@ -24,6 +24,7 @@
%option nounput
%option noinput
%option never-interactive
+%option case-insensitive
%option outfile="engines/director/lingo/lingo-lex.cpp"
@@ -95,17 +96,17 @@ whitespace [\t ]
[#]{identifier} { count(); yylval.s = new Common::String(yytext); return SYMBOL; } // D3
-(?i:after) { count(); return tAFTER; } // D3
-(?i:and) { count(); return tAND; }
-(?i:before) { count(); return tBEFORE; } // D3
-(?i:char) { count(); return tCHAR; } // D3
-(?i:contains) { count(); return tCONTAINS; }
-(?i:done) { count(); return tDONE; }
-(?i:down) { count(); return tDOWN; }
-(?i:if) { count(); return tIF; }
-(?i:else[\t ]+if) { count(); return tELSIF; }
-(?i:else) { count(); return tELSE; }
-(?i:end)([\t ]+{identifier})? {
+after { count(); return tAFTER; } // D3
+and { count(); return tAND; }
+before { count(); return tBEFORE; } // D3
+char { count(); return tCHAR; } // D3
+contains { count(); return tCONTAINS; }
+done { count(); return tDONE; }
+down { count(); return tDOWN; }
+if { count(); return tIF; }
+else[\t ]+if { count(); return tELSIF; }
+else { count(); return tELSE; }
+end([\t ]+{identifier})? {
count();
const char *ptr = &yytext[4]; // Skip 'end '
@@ -123,20 +124,20 @@ whitespace [\t ]
return ENDCLAUSE;
}
-^[ \t]*(?:factory) { count(); return tFACTORY; }
-(?i:exit) { count(); return tEXIT; }
-(?i:global) { count(); return tGLOBAL; }
-(?i:go[\t ]+to[\t ]+frame) { count(); return tGO; }
-(?i:go[\t ]+to) { count(); return tGO; }
-(?i:go) { count(); return tGO; }
-(?i:instance) { count(); return tINSTANCE; }
-(?i:intersects) { count(); return tINTERSECTS; }
-(?i:into) { count(); return tINTO; }
-(?i:item) { count(); return tITEM; }
-(?i:line) { count(); return tLINE; }
-(?i:loop) { count(); return checkImmediate(tLOOP); }
-(?i:macro) { count(); return tMACRO; }
-(?i:method)([\t ]*{identifier}) {
+^[ \t]*factory { count(); return tFACTORY; }
+exit { count(); return tEXIT; }
+global { count(); return tGLOBAL; }
+go[\t ]+to[\t ]+frame { count(); return tGO; }
+go[\t ]+to { count(); return tGO; }
+go { count(); return tGO; }
+instance { count(); return tINSTANCE; }
+intersects { count(); return tINTERSECTS; }
+into { count(); return tINTO; }
+item { count(); return tITEM; }
+line { count(); return tLINE; }
+loop { count(); return checkImmediate(tLOOP); }
+macro { count(); return tMACRO; }
+method[\t ]*{identifier} {
count();
const char *ptr = &yytext[6]; // Skip 'method '
@@ -147,23 +148,23 @@ whitespace [\t ]
return tMETHOD;
}
-(?i:mod) { count(); return tMOD; }
-(?i:movie) { count(); return tMOVIE; }
-(?i:next) { count(); return tNEXT; }
-(?i:not) { count(); return tNOT; }
-(?i:of) { count(); return tOF; }
-(?i:on) { count(); return tON; } // D3
-(?i:open) { count(); return tOPEN; }
-(?i:or) { count(); return tOR; }
-(?i:play[\t ]+frame) { count(); return tPLAY; }
-(?i:play) { count(); return tPLAY; }
-(?i:playAccel) { count(); yylval.s = new Common::String(yytext); return tPLAYACCEL; }
-(?i:previous) { count(); return tPREVIOUS; }
-(?i:property) { count(); return tPROPERTY; } // D4
-(?i:put) { count(); return tPUT; }
-(?i:repeat) { count(); return checkImmediate(tREPEAT); }
-(?i:set) { count(); return tSET; }
-(?i:sound[\ t]+(close|fadeIn|fadeOut|playFile|stop)) {
+mod { count(); return tMOD; }
+movie { count(); return tMOVIE; }
+next { count(); return tNEXT; }
+not { count(); return tNOT; }
+of { count(); return tOF; }
+on { count(); return tON; } // D3
+open { count(); return tOPEN; }
+or { count(); return tOR; }
+play[\t ]+frame { count(); return tPLAY; }
+play { count(); return tPLAY; }
+playAccel { count(); yylval.s = new Common::String(yytext); return tPLAYACCEL; }
+previous { count(); return tPREVIOUS; }
+property { count(); return tPROPERTY; } // D4
+put { count(); return tPUT; }
+repeat { count(); return checkImmediate(tREPEAT); }
+set { count(); return tSET; }
+sound[\ t]+(close|fadeIn|fadeOut|playFile|stop) {
count();
const char *ptr = &yytext[6]; // Skip 'sound '
@@ -183,9 +184,9 @@ whitespace [\t ]
error("LEXER: Unhandled 'sound %s'", command.c_str());
}
}
-(?i:starts) { count(); return tSTARTS; }
-(?i:tell) { count(); return tTELL; }
-(?i:the[ \t]+sqrt[\t ]+of[\t ]+) {
+starts { count(); return tSTARTS; }
+tell { count(); return tTELL; }
+the[ \t]+sqrt[\t ]+of[\t ]+ {
count();
yylval.e[0] = g_lingo->_theEntities["sqrt"]->entity;
@@ -193,14 +194,14 @@ whitespace [\t ]
return THEENTITYWITHID;
}
-(?i:the[ \t]+value[\t ]+of[\t ]*) {
+the[ \t]+value[\t ]+of[\t ]* {
count();
yylval.s = new Common::String("value");
return FBLTIN;
}
-(?i:the[ \t]+number[\t ]+of[\t ]+[[:alpha:]]+[\t ](in|of)) {
+the[ \t]+number[\t ]+of[\t ]+[[:alpha:]]+[\t ](in|of) {
count();
const char *ptr = &yytext[4]; // Skip 'the '
@@ -223,7 +224,7 @@ whitespace [\t ]
else
error("LEXER: Unhandled chunk expression '%s'", yylval.s->c_str());
}
-(?i:the[ \t]+[[:alpha:]]+[\t ]+of[\t ]+{identifier}) {
+the[ \t]+[[:alpha:]]+[\t ]+of[\t ]+{identifier} {
count();
const char *ptr = &yytext[4]; // Skip 'the '
@@ -276,7 +277,7 @@ whitespace [\t ]
warning("LEXER: Unhandled the entity '%s', field '%s'", ptr, field.c_str());
}
-(?i:the[ \t]+[[:alpha:]]+[ \t+](date|time)) {
+the[ \t]+[[:alpha:]]+[ \t+](date|time) {
count();
const char *ptr = &yytext[4]; // Skip 'the '
@@ -307,7 +308,7 @@ whitespace [\t ]
else
return THEENTITY;
}
-(?i:the[ \t]+[[:alpha:]]+) {
+the[ \t]+[[:alpha:]]+ {
count();
const char *ptr = &yytext[4]; // Skip 'the '
@@ -326,14 +327,14 @@ whitespace [\t ]
warning("LEXER: Unhandled the entity '%s'", ptr);
}
-(?i:then) { count(); return tTHEN; }
-(?i:to) { count(); return tTO; }
-(?i:sprite) { count(); return tSPRITE; }
-(?i:with) { count(); return tWITH; }
-(?i:within) { count(); return tWITHIN; }
-(?i:when) { count(); return tWHEN; }
-(?i:while) { count(); return tWHILE; }
-(?i:word) { count(); return tWORD; }
+then { count(); return tTHEN; }
+to { count(); return tTO; }
+sprite { count(); return tSPRITE; }
+with { count(); return tWITH; }
+within { count(); return tWITHIN; }
+when { count(); return tWHEN; }
+while { count(); return tWHILE; }
+word { count(); return tWORD; }
[<][>] { count(); return tNEQ; }
[>][=] { count(); return tGE; }
More information about the Scummvm-git-logs
mailing list