diff options
author | Eugene Sandulenko | 2016-08-07 08:05:34 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2016-08-07 22:32:59 +0200 |
commit | 8467a3c0fc01b877412348b861e91f0b5461d3ac (patch) | |
tree | 73f4fe3b8e823e0b6a4da51a779606d31df7b1f0 /engines | |
parent | 7e2c77f001cdedc9c6117bdc263f768eade73018 (diff) | |
download | scummvm-rg350-8467a3c0fc01b877412348b861e91f0b5461d3ac.tar.gz scummvm-rg350-8467a3c0fc01b877412348b861e91f0b5461d3ac.tar.bz2 scummvm-rg350-8467a3c0fc01b877412348b861e91f0b5461d3ac.zip |
DIRECTOR: Lingo: Fixed line counting on error and multiple consequtive newlines
Diffstat (limited to 'engines')
-rw-r--r-- | engines/director/lingo/lingo-gr.cpp | 380 | ||||
-rw-r--r-- | engines/director/lingo/lingo-gr.y | 2 | ||||
-rw-r--r-- | engines/director/lingo/lingo-lex.cpp | 214 | ||||
-rw-r--r-- | engines/director/lingo/lingo-lex.l | 2 |
4 files changed, 294 insertions, 304 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp index d8409c5bec..89cf48f3e2 100644 --- a/engines/director/lingo/lingo-gr.cpp +++ b/engines/director/lingo/lingo-gr.cpp @@ -484,9 +484,9 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 87 +#define YYFINAL 88 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 784 +#define YYLAST 748 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 82 @@ -566,7 +566,7 @@ static const yytype_uint16 yyprhs[] = static const yytype_int8 yyrhs[] = { 83, 0, -1, 83, 84, 85, -1, 85, -1, 1, - 75, -1, 75, -1, -1, 110, -1, 104, -1, 115, + 84, -1, 75, -1, -1, 110, -1, 104, -1, 115, -1, 86, -1, 88, -1, 40, 103, 31, 19, -1, 42, 19, 69, 103, -1, 42, 12, 69, 103, -1, 42, 13, 103, 69, 103, -1, 42, 19, 44, 103, @@ -720,11 +720,11 @@ static const yytype_uint8 yydefact[] = 56, 89, 0, 0, 47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 62, 21, 11, 22, 0, 0, 0, - 19, 8, 87, 88, 7, 9, 4, 59, 0, 62, - 61, 92, 91, 123, 123, 96, 90, 105, 0, 98, - 0, 99, 0, 100, 101, 103, 112, 84, 85, 86, - 0, 45, 0, 0, 0, 0, 114, 115, 95, 108, - 109, 111, 74, 0, 79, 80, 0, 1, 5, 6, + 19, 8, 87, 88, 7, 9, 5, 4, 59, 0, + 62, 61, 92, 91, 123, 123, 96, 90, 105, 0, + 98, 0, 99, 0, 100, 101, 103, 112, 84, 85, + 86, 0, 45, 0, 0, 0, 0, 114, 115, 95, + 108, 109, 111, 74, 0, 79, 80, 0, 1, 6, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 0, 122, 0, 104, 107, 0, 102, 49, @@ -748,53 +748,53 @@ static const yytype_uint8 yydefact[] = /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 31, 194, 32, 49, 34, 195, 36, 240, 224, + -1, 31, 194, 32, 50, 34, 195, 36, 240, 224, 225, 214, 226, 93, 37, 38, 39, 215, 250, 174, - 185, 40, 190, 56, 42, 64, 65, 43, 44, 119, + 185, 40, 190, 57, 42, 65, 66, 43, 44, 119, 128, 181, 203, 45, 112 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -189 +#define YYPACT_NINF -190 static const yytype_int16 yypact[] = { - 206, -68, -189, -189, 443, -189, -189, 443, 443, 478, - -189, -189, 18, 49, -189, 45, 14, 51, 443, 25, - 48, 54, 56, 60, 443, 12, 443, 443, 443, 443, - 443, 2, -189, 3, -189, -189, -189, 4, 21, 504, - 682, -189, -189, -189, -189, -189, -189, 7, 443, -189, - 682, 682, 682, 443, 443, -189, 33, -189, 74, -189, - 95, -189, 80, -189, 15, -189, -189, -189, -189, 518, - 98, -189, -26, 443, -23, 75, -189, -189, 562, -189, - 15, -189, 276, 584, 276, 276, 633, -189, -189, 272, - 504, 443, 504, 76, 660, 443, 443, 443, 443, 443, - 443, 443, 443, 443, 443, 443, 443, 443, 443, 443, - 518, 682, -18, 40, 103, -189, -189, 105, -189, -189, - 110, -189, 443, 443, 540, 443, 443, 443, -189, 443, - -189, 443, 443, -189, -189, 57, 682, 59, 606, 62, - 443, 682, 682, 682, 682, 682, 682, 682, 682, 704, - 704, 276, 276, 682, 682, 682, -189, 443, -189, -189, - 119, -189, 682, 682, 443, 443, 682, 682, 682, 119, - 682, 682, 682, -189, 13, -189, -189, 460, 682, 682, - -189, -58, 682, 682, -58, 333, 96, 443, 333, -189, - -189, 125, 64, 64, -189, -189, 121, 443, 682, 8, - -4, -189, 129, -189, -189, 108, 682, -189, 120, -189, - 127, -189, -189, 127, -189, 504, -189, 333, 333, -189, - -189, 333, -189, 333, 127, 127, -189, 504, 460, -189, - 107, 113, 333, 128, 134, -189, 136, 126, -189, -189, - -189, -189, 137, 122, 138, 140, -9, -189, 460, -189, - 399, 123, -189, -189, -189, 333, -189, -189, -189, -189, - -189 + 206, -53, -190, -190, 478, -190, -190, 478, 478, 117, + -190, -190, 5, 49, -190, 14, 37, 41, 478, 67, + 59, 46, 51, 54, 478, 26, 478, 478, 478, 478, + 478, 2, -190, 7, -190, -190, -190, 4, -1, 539, + 646, -190, -190, -190, -190, -190, -190, -190, 18, 478, + -190, 646, 646, 646, 478, 478, -190, 9, -190, 63, + -190, 95, -190, 80, -190, 25, -190, -190, -190, -190, + 90, 98, -190, -31, 478, -26, 75, -190, -190, 232, + -190, 25, -190, 311, 575, 311, 311, 597, -190, 307, + 539, 478, 539, 76, 624, 478, 478, 478, 478, 478, + 478, 478, 478, 478, 478, 478, 478, 478, 478, 478, + 90, 646, -29, 44, 103, -190, -190, 109, -190, -190, + 115, -190, 478, 478, 553, 478, 478, 478, -190, 478, + -190, 478, 478, -190, -190, 60, 646, 61, 513, -53, + 478, 646, 646, 646, 646, 646, 646, 646, 646, 668, + 668, 311, 311, 646, 646, 646, -190, 478, -190, -190, + 120, -190, 646, 646, 478, 478, 646, 646, 646, 120, + 646, 646, 646, -190, -5, -190, -190, 495, 646, 646, + -190, -49, 646, 646, -49, 368, 92, 478, 368, -190, + -190, 121, 62, 62, -190, -190, 123, 478, 646, 11, + -4, -190, 127, -190, -190, 111, 646, -190, 126, -190, + 133, -190, -190, 133, -190, 539, -190, 368, 368, -190, + -190, 368, -190, 368, 133, 133, -190, 539, 495, -190, + 116, 124, 368, 134, 148, -190, 149, 132, -190, -190, + -190, -190, 154, 142, 155, 156, -9, -190, 495, -190, + 434, 151, -190, -190, -190, 368, -190, -190, -190, -190, + -190 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -189, -189, -27, 82, 6, -166, 0, -189, -189, -189, - -28, -187, -51, -80, -189, -189, -189, -188, -8, -46, - -162, 1, 24, -189, -189, 149, -12, -189, -189, -189, - -189, 10, -17, -189, 130 + -190, -190, 3, 105, 6, -174, 0, -190, -190, -190, + 8, -176, -25, -80, -190, -190, -190, -189, -8, 77, + -162, 1, 23, -190, -190, 175, -14, -190, -190, -190, + -190, 32, 10, -190, 147 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -804,168 +804,160 @@ static const yytype_int16 yypgoto[] = #define YYTABLE_NINF -60 static const yytype_int16 yytable[] = { - 35, 54, 87, -10, 89, 50, 33, 46, 51, 52, - 135, 189, 137, 81, 188, -51, -51, 88, 122, 69, - 211, 125, 227, 191, 41, 78, 229, 82, 83, 84, - 85, 86, 57, 208, 67, 186, 227, 55, 229, 58, - 94, 217, 218, 123, 212, 221, 126, 223, 60, 110, - 62, 60, 118, 62, 111, 111, 209, 187, 232, 156, - 72, 73, 238, 157, 66, 79, -51, 74, 130, 57, - 68, 70, 71, 75, 124, 76, 58, 88, -10, 77, - 90, 59, 256, 53, 255, 60, 61, 62, 63, 35, - 91, 94, 136, 138, 115, 33, 141, 142, 143, 144, + 35, 55, 88, 189, 47, 51, 33, -10, 52, 53, + 135, 82, 137, 122, 188, -51, -51, 186, 125, 70, + 211, 227, 46, 41, 56, 79, 46, 83, 84, 85, + 86, 87, 191, 67, 89, 227, 208, 229, 123, 187, + 94, 217, 218, 126, 212, 221, 58, 223, 156, 229, + 110, 118, 157, 59, 238, 111, 111, 68, 232, 209, + 69, 61, 61, 63, 63, 76, -51, 130, 91, 58, + 77, 73, 74, 78, 256, 124, 59, 46, 75, 80, + 90, 60, -10, 115, 255, 61, 62, 63, 64, 35, + 114, 94, 136, 138, 54, 33, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, - 155, 160, 176, 41, 114, 116, 117, 121, 127, 139, - 169, 157, 158, 162, 163, 159, 166, 167, 168, 161, - 170, 177, 171, 172, 173, 231, 175, 88, 180, 196, - 197, 178, 199, 200, 201, 202, 205, 237, 216, 219, - 222, 211, 207, 243, 192, 239, 241, 193, 179, 244, - 220, 245, 251, 252, 258, 182, 183, 230, 253, 246, - 254, 134, 213, 235, 80, 233, 204, 234, 236, 184, - 0, 0, 0, 0, 113, 0, 242, 0, 198, 0, - 0, 210, 247, 0, 249, 0, 0, 0, 206, 0, - 0, 0, 0, 0, 228, 0, -6, 1, 0, 259, - 0, 260, 0, 0, 0, 0, 94, 2, 3, 4, + 155, 160, 41, 71, 72, 116, 117, 121, 127, 139, + 169, 120, 158, 162, 163, 157, 166, 167, 168, 159, + 170, 177, 171, 172, 161, 231, 197, 173, 175, 180, + 201, 178, 176, 202, 95, 96, 216, 237, 205, 97, + 98, 99, 219, 100, 101, 102, 222, 211, 179, 243, + 103, 104, 105, 106, 239, 182, 183, 241, 107, 108, + 109, -59, -59, 244, 245, 246, -59, -59, -59, 251, + -59, -59, -59, 252, 192, 253, 254, 193, 198, -59, + -59, 210, 258, 54, 134, -59, -59, -59, 206, 235, + 81, 184, 113, 204, 228, 0, -6, 1, 213, 0, + 0, 0, 0, 0, 0, 0, 94, 2, 3, 4, 5, 0, 6, 7, 8, 9, 10, 0, 94, 0, 0, 248, 11, 0, 12, 13, 14, 0, 0, 15, 16, 17, 0, 0, 0, 0, 18, 19, 20, 0, 257, 21, 0, 0, 0, 22, 23, 24, 25, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 26, 0, - 0, 0, 27, 0, 0, 0, 28, 29, 0, 0, - 0, -6, 30, 2, 3, 4, 5, 0, 6, 7, - 8, 9, 10, 0, 0, 0, 0, 0, 11, 0, - 12, 13, 14, 0, 0, 15, 16, 17, 0, 0, - 0, 0, 18, 19, 20, 0, 0, 21, 0, 0, - 0, 22, 23, 24, 25, 0, 0, 0, 0, 0, - 95, 96, 0, 0, 26, 97, 98, 99, 27, 100, - 101, 102, 28, 29, 2, 3, 4, 5, 30, 6, - 7, 8, 47, 10, 107, 108, 109, 0, 0, 11, - 0, 12, 13, 14, 0, 0, 0, 16, 17, 0, - 0, 0, 0, 18, 19, 20, 0, 0, 21, 0, - 0, 0, 0, 0, 24, 25, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 26, 0, 0, 0, 27, - 0, 0, 0, 28, 29, 0, 0, 0, 88, 30, - 2, 3, 4, 5, 0, 6, 7, 8, 47, 10, - 0, 0, 0, 0, 0, 11, 0, 12, 13, 14, - 0, 0, 0, 16, 17, 0, 0, 0, 0, 18, - 19, 20, 0, 0, 21, 0, 0, 0, 0, 0, - 24, 25, 0, 0, 2, 3, 4, 5, 0, 6, - 0, 26, 47, 10, 0, 27, 0, 0, 0, 28, - 29, 2, 3, 4, 5, 30, 6, 7, 8, 47, - 10, 0, 0, 48, 0, 20, 11, 0, 12, 13, - 0, 0, 0, 0, 16, 17, 0, 0, 0, 0, - 18, 0, 20, 0, 0, 26, 0, 0, 0, 27, - 0, 24, 25, 28, 29, 2, 3, 4, 5, 30, - 6, 0, 26, 47, 10, 0, 27, 0, 0, 0, - 28, 29, -59, -59, 0, 0, 30, -59, -59, -59, - 0, -59, -59, -59, 48, 0, 20, 0, 0, 120, - -59, -59, 0, 0, 53, 0, -59, -59, -59, 0, - 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, - 27, 0, 95, 96, 28, 29, 0, 97, 98, 99, - 92, 100, 101, 102, 164, 0, 0, 0, 103, 104, - 105, 106, 0, 0, 95, 96, 107, 108, 109, 97, - 98, 99, 0, 100, 101, 102, 0, 0, 129, 165, - 103, 104, 105, 106, 0, 0, 95, 96, 107, 108, - 109, 97, 98, 99, 0, 100, 101, 102, 0, 0, - 0, 0, 103, 104, 105, 106, 0, 0, 95, 96, - 107, 108, 109, 97, 98, 99, 0, 100, 101, 102, - 0, 131, 132, 0, 103, 104, 105, 106, 0, 0, + 0, 0, 196, 0, 0, 199, 200, 0, 26, 0, + 0, 0, 27, 0, 0, 207, 28, 29, 129, 0, + 0, -6, 30, 220, 0, 0, 95, 96, 0, 0, + 230, 97, 98, 99, 0, 100, 101, 102, 233, 0, + 234, 236, 103, 104, 105, 106, 0, 0, 0, 242, + 107, 108, 109, 0, 0, 247, 0, 249, 2, 3, + 4, 5, 0, 6, 7, 8, 9, 10, 0, 0, + 0, 0, 259, 11, 260, 12, 13, 14, 0, 0, + 15, 16, 17, 0, 0, 0, 0, 18, 19, 20, + 0, 0, 21, 0, 0, 0, 22, 23, 24, 25, + 0, 0, 0, 0, 0, 95, 96, 0, 0, 26, + 97, 98, 99, 27, 100, 101, 102, 28, 29, 2, + 3, 4, 5, 30, 6, 7, 8, 48, 10, 107, + 108, 109, 0, 0, 11, 0, 12, 13, 14, 0, + 0, 0, 16, 17, 0, 0, 0, 0, 18, 19, + 20, 0, 0, 21, 0, 0, 0, 0, 0, 24, + 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 26, 0, 0, 0, 27, 0, 0, 0, 28, 29, + 0, 0, 0, 46, 30, 2, 3, 4, 5, 0, + 6, 7, 8, 48, 10, 0, 0, 0, 0, 0, + 11, 0, 12, 13, 14, 0, 0, 0, 16, 17, + 0, 0, 0, 0, 18, 19, 20, 0, 0, 21, + 0, 0, 0, 0, 0, 24, 25, 0, 0, 2, + 3, 4, 5, 0, 6, 0, 26, 48, 10, 0, + 27, 0, 0, 0, 28, 29, 2, 3, 4, 5, + 30, 6, 7, 8, 48, 10, 0, 0, 49, 0, + 20, 11, 0, 12, 13, 0, 0, 0, 0, 16, + 17, 0, 0, 0, 0, 18, 0, 20, 0, 0, + 26, 0, 0, 0, 27, 0, 24, 25, 28, 29, + 2, 3, 4, 5, 30, 6, 0, 26, 48, 10, + 0, 27, 0, 0, 0, 28, 29, 95, 96, 0, + 0, 30, 97, 98, 99, 0, 100, 101, 102, 49, + 0, 20, 140, 103, 104, 105, 106, 0, 0, 0, + 133, 107, 108, 109, 0, 0, 0, 164, 0, 0, + 0, 26, 0, 0, 0, 27, 0, 95, 96, 28, + 29, 0, 97, 98, 99, 92, 100, 101, 102, 0, + 0, 0, 165, 103, 104, 105, 106, 0, 0, 95, + 96, 107, 108, 109, 97, 98, 99, 0, 100, 101, + 102, 0, 131, 132, 0, 103, 104, 105, 106, 0, + 0, 95, 96, 107, 108, 109, 97, 98, 99, 0, + 100, 101, 102, 0, 0, 0, 0, 103, 104, 105, + 106, 0, 0, 0, 133, 107, 108, 109, 95, 96, + 0, 0, 0, 97, 98, 99, 0, 100, 101, 102, + 0, 0, 0, 140, 103, 104, 105, 106, 0, 0, 95, 96, 107, 108, 109, 97, 98, 99, 0, 100, - 101, 102, 0, 0, 0, 140, 103, 104, 105, 106, - 0, 0, 0, 133, 107, 108, 109, 95, 96, 0, - 0, 0, 97, 98, 99, 0, 100, 101, 102, 0, - 0, 0, 0, 103, 104, 105, 106, 0, 0, 0, - 133, 107, 108, 109, 95, 96, 0, 0, 0, 97, - 98, 99, 0, 100, 101, 102, 0, 0, 0, 140, - 103, 104, 105, 106, 0, 0, 95, 96, 107, 108, - 109, 97, 98, 99, 0, 100, 101, 102, 0, 0, - 0, 0, 103, 104, 105, 106, 0, 0, 95, 96, - 107, 108, 109, 97, 98, 99, 0, 100, 101, 102, - 0, 0, 0, 0, 0, 0, 105, 106, 0, 0, - 0, 0, 107, 108, 109 + 101, 102, 0, 0, 0, 0, 103, 104, 105, 106, + 0, 0, 95, 96, 107, 108, 109, 97, 98, 99, + 0, 100, 101, 102, 0, 0, 0, 0, 0, 0, + 105, 106, 0, 0, 0, 0, 107, 108, 109 }; static const yytype_int16 yycheck[] = { - 0, 9, 0, 0, 31, 4, 0, 75, 7, 8, - 90, 177, 92, 25, 176, 24, 25, 75, 44, 18, - 24, 44, 210, 81, 0, 24, 213, 26, 27, 28, - 29, 30, 20, 25, 20, 22, 224, 19, 225, 27, - 39, 203, 204, 69, 48, 207, 69, 209, 36, 48, - 38, 36, 64, 38, 53, 54, 48, 44, 220, 77, - 12, 13, 228, 81, 19, 53, 75, 19, 80, 20, - 19, 46, 47, 19, 73, 19, 27, 75, 75, 19, - 76, 32, 248, 76, 246, 36, 37, 38, 39, 89, - 69, 90, 91, 92, 20, 89, 95, 96, 97, 98, + 0, 9, 0, 177, 1, 4, 0, 0, 7, 8, + 90, 25, 92, 44, 176, 24, 25, 22, 44, 18, + 24, 210, 75, 0, 19, 24, 75, 26, 27, 28, + 29, 30, 81, 19, 31, 224, 25, 213, 69, 44, + 39, 203, 204, 69, 48, 207, 20, 209, 77, 225, + 49, 65, 81, 27, 228, 54, 55, 20, 220, 48, + 19, 36, 36, 38, 38, 19, 75, 81, 69, 20, + 19, 12, 13, 19, 248, 74, 27, 75, 19, 53, + 76, 32, 75, 20, 246, 36, 37, 38, 39, 89, + 81, 90, 91, 92, 76, 89, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 119, 139, 89, 81, 20, 36, 19, 43, 43, - 128, 81, 19, 122, 123, 20, 125, 126, 127, 19, - 129, 139, 131, 132, 77, 215, 77, 75, 19, 185, - 44, 140, 188, 189, 19, 81, 25, 227, 19, 41, - 30, 24, 198, 25, 181, 48, 43, 184, 157, 25, - 206, 25, 25, 41, 41, 164, 165, 213, 30, 43, - 30, 89, 200, 224, 25, 221, 193, 223, 224, 169, - -1, -1, -1, -1, 54, -1, 232, -1, 187, -1, - -1, 199, 238, -1, 240, -1, -1, -1, 197, -1, - -1, -1, -1, -1, 212, -1, 0, 1, -1, 255, - -1, 257, -1, -1, -1, -1, 215, 11, 12, 13, + 109, 119, 89, 46, 47, 20, 36, 19, 43, 43, + 128, 31, 19, 122, 123, 81, 125, 126, 127, 20, + 129, 139, 131, 132, 19, 215, 44, 77, 77, 19, + 19, 140, 139, 81, 54, 55, 19, 227, 25, 59, + 60, 61, 41, 63, 64, 65, 30, 24, 157, 25, + 70, 71, 72, 73, 48, 164, 165, 43, 78, 79, + 80, 54, 55, 25, 25, 43, 59, 60, 61, 25, + 63, 64, 65, 41, 181, 30, 30, 184, 187, 72, + 73, 199, 41, 76, 89, 78, 79, 80, 197, 224, + 25, 169, 55, 193, 212, -1, 0, 1, 200, -1, + -1, -1, -1, -1, -1, -1, 215, 11, 12, 13, 14, -1, 16, 17, 18, 19, 20, -1, 227, -1, -1, 239, 26, -1, 28, 29, 30, -1, -1, 33, 34, 35, -1, -1, -1, -1, 40, 41, 42, -1, 250, 45, -1, -1, -1, 49, 50, 51, 52, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, - -1, -1, 66, -1, -1, -1, 70, 71, -1, -1, - -1, 75, 76, 11, 12, 13, 14, -1, 16, 17, - 18, 19, 20, -1, -1, -1, -1, -1, 26, -1, - 28, 29, 30, -1, -1, 33, 34, 35, -1, -1, - -1, -1, 40, 41, 42, -1, -1, 45, -1, -1, - -1, 49, 50, 51, 52, -1, -1, -1, -1, -1, - 54, 55, -1, -1, 62, 59, 60, 61, 66, 63, - 64, 65, 70, 71, 11, 12, 13, 14, 76, 16, - 17, 18, 19, 20, 78, 79, 80, -1, -1, 26, - -1, 28, 29, 30, -1, -1, -1, 34, 35, -1, - -1, -1, -1, 40, 41, 42, -1, -1, 45, -1, - -1, -1, -1, -1, 51, 52, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 62, -1, -1, -1, 66, - -1, -1, -1, 70, 71, -1, -1, -1, 75, 76, - 11, 12, 13, 14, -1, 16, 17, 18, 19, 20, - -1, -1, -1, -1, -1, 26, -1, 28, 29, 30, - -1, -1, -1, 34, 35, -1, -1, -1, -1, 40, - 41, 42, -1, -1, 45, -1, -1, -1, -1, -1, - 51, 52, -1, -1, 11, 12, 13, 14, -1, 16, - -1, 62, 19, 20, -1, 66, -1, -1, -1, 70, - 71, 11, 12, 13, 14, 76, 16, 17, 18, 19, - 20, -1, -1, 40, -1, 42, 26, -1, 28, 29, - -1, -1, -1, -1, 34, 35, -1, -1, -1, -1, - 40, -1, 42, -1, -1, 62, -1, -1, -1, 66, - -1, 51, 52, 70, 71, 11, 12, 13, 14, 76, - 16, -1, 62, 19, 20, -1, 66, -1, -1, -1, - 70, 71, 54, 55, -1, -1, 76, 59, 60, 61, - -1, 63, 64, 65, 40, -1, 42, -1, -1, 31, - 72, 73, -1, -1, 76, -1, 78, 79, 80, -1, - -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, - 66, -1, 54, 55, 70, 71, -1, 59, 60, 61, - 76, 63, 64, 65, 44, -1, -1, -1, 70, 71, - 72, 73, -1, -1, 54, 55, 78, 79, 80, 59, - 60, 61, -1, 63, 64, 65, -1, -1, 46, 69, - 70, 71, 72, 73, -1, -1, 54, 55, 78, 79, - 80, 59, 60, 61, -1, 63, 64, 65, -1, -1, - -1, -1, 70, 71, 72, 73, -1, -1, 54, 55, - 78, 79, 80, 59, 60, 61, -1, 63, 64, 65, - -1, 67, 68, -1, 70, 71, 72, 73, -1, -1, + -1, -1, 185, -1, -1, 188, 189, -1, 62, -1, + -1, -1, 66, -1, -1, 198, 70, 71, 46, -1, + -1, 75, 76, 206, -1, -1, 54, 55, -1, -1, + 213, 59, 60, 61, -1, 63, 64, 65, 221, -1, + 223, 224, 70, 71, 72, 73, -1, -1, -1, 232, + 78, 79, 80, -1, -1, 238, -1, 240, 11, 12, + 13, 14, -1, 16, 17, 18, 19, 20, -1, -1, + -1, -1, 255, 26, 257, 28, 29, 30, -1, -1, + 33, 34, 35, -1, -1, -1, -1, 40, 41, 42, + -1, -1, 45, -1, -1, -1, 49, 50, 51, 52, + -1, -1, -1, -1, -1, 54, 55, -1, -1, 62, + 59, 60, 61, 66, 63, 64, 65, 70, 71, 11, + 12, 13, 14, 76, 16, 17, 18, 19, 20, 78, + 79, 80, -1, -1, 26, -1, 28, 29, 30, -1, + -1, -1, 34, 35, -1, -1, -1, -1, 40, 41, + 42, -1, -1, 45, -1, -1, -1, -1, -1, 51, + 52, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 62, -1, -1, -1, 66, -1, -1, -1, 70, 71, + -1, -1, -1, 75, 76, 11, 12, 13, 14, -1, + 16, 17, 18, 19, 20, -1, -1, -1, -1, -1, + 26, -1, 28, 29, 30, -1, -1, -1, 34, 35, + -1, -1, -1, -1, 40, 41, 42, -1, -1, 45, + -1, -1, -1, -1, -1, 51, 52, -1, -1, 11, + 12, 13, 14, -1, 16, -1, 62, 19, 20, -1, + 66, -1, -1, -1, 70, 71, 11, 12, 13, 14, + 76, 16, 17, 18, 19, 20, -1, -1, 40, -1, + 42, 26, -1, 28, 29, -1, -1, -1, -1, 34, + 35, -1, -1, -1, -1, 40, -1, 42, -1, -1, + 62, -1, -1, -1, 66, -1, 51, 52, 70, 71, + 11, 12, 13, 14, 76, 16, -1, 62, 19, 20, + -1, 66, -1, -1, -1, 70, 71, 54, 55, -1, + -1, 76, 59, 60, 61, -1, 63, 64, 65, 40, + -1, 42, 69, 70, 71, 72, 73, -1, -1, -1, + 77, 78, 79, 80, -1, -1, -1, 44, -1, -1, + -1, 62, -1, -1, -1, 66, -1, 54, 55, 70, + 71, -1, 59, 60, 61, 76, 63, 64, 65, -1, + -1, -1, 69, 70, 71, 72, 73, -1, -1, 54, + 55, 78, 79, 80, 59, 60, 61, -1, 63, 64, + 65, -1, 67, 68, -1, 70, 71, 72, 73, -1, + -1, 54, 55, 78, 79, 80, 59, 60, 61, -1, + 63, 64, 65, -1, -1, -1, -1, 70, 71, 72, + 73, -1, -1, -1, 77, 78, 79, 80, 54, 55, + -1, -1, -1, 59, 60, 61, -1, 63, 64, 65, + -1, -1, -1, 69, 70, 71, 72, 73, -1, -1, 54, 55, 78, 79, 80, 59, 60, 61, -1, 63, - 64, 65, -1, -1, -1, 69, 70, 71, 72, 73, - -1, -1, -1, 77, 78, 79, 80, 54, 55, -1, - -1, -1, 59, 60, 61, -1, 63, 64, 65, -1, - -1, -1, -1, 70, 71, 72, 73, -1, -1, -1, - 77, 78, 79, 80, 54, 55, -1, -1, -1, 59, - 60, 61, -1, 63, 64, 65, -1, -1, -1, 69, - 70, 71, 72, 73, -1, -1, 54, 55, 78, 79, - 80, 59, 60, 61, -1, 63, 64, 65, -1, -1, - -1, -1, 70, 71, 72, 73, -1, -1, 54, 55, - 78, 79, 80, 59, 60, 61, -1, 63, 64, 65, - -1, -1, -1, -1, -1, -1, 72, 73, -1, -1, - -1, -1, 78, 79, 80 + 64, 65, -1, -1, -1, -1, 70, 71, 72, 73, + -1, -1, 54, 55, 78, 79, 80, 59, 60, 61, + -1, 63, 64, 65, -1, -1, -1, -1, -1, -1, + 72, 73, -1, -1, -1, -1, 78, 79, 80 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -976,11 +968,11 @@ static const yytype_uint8 yystos[] = 20, 26, 28, 29, 30, 33, 34, 35, 40, 41, 42, 45, 49, 50, 51, 52, 62, 66, 70, 71, 76, 83, 85, 86, 87, 88, 89, 96, 97, 98, - 103, 104, 106, 109, 110, 115, 75, 19, 40, 86, - 103, 103, 103, 76, 100, 19, 105, 20, 27, 32, - 36, 37, 38, 39, 107, 108, 19, 20, 19, 103, - 46, 47, 12, 13, 19, 19, 19, 19, 103, 53, - 107, 108, 103, 103, 103, 103, 103, 0, 75, 84, + 103, 104, 106, 109, 110, 115, 75, 84, 19, 40, + 86, 103, 103, 103, 76, 100, 19, 105, 20, 27, + 32, 36, 37, 38, 39, 107, 108, 19, 20, 19, + 103, 46, 47, 12, 13, 19, 19, 19, 19, 103, + 53, 107, 108, 103, 103, 103, 103, 103, 0, 84, 76, 69, 76, 95, 103, 54, 55, 59, 60, 61, 63, 64, 65, 70, 71, 72, 73, 78, 79, 80, 103, 103, 116, 116, 81, 20, 20, 36, 108, 111, @@ -2542,7 +2534,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2546 "engines/director/lingo/lingo-gr.cpp" +#line 2538 "engines/director/lingo/lingo-gr.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y index afefe696a0..2cdb8b338f 100644 --- a/engines/director/lingo/lingo-gr.y +++ b/engines/director/lingo/lingo-gr.y @@ -102,7 +102,7 @@ void yyerror(char *s) { program: program nl programline | programline - | error '\n' { yyerrok; } + | error nl { yyerrok; } ; nl: '\n' { diff --git a/engines/director/lingo/lingo-lex.cpp b/engines/director/lingo/lingo-lex.cpp index dfea1ceae6..873aa84565 100644 --- a/engines/director/lingo/lingo-lex.cpp +++ b/engines/director/lingo/lingo-lex.cpp @@ -378,7 +378,7 @@ static yyconst flex_int16_t yy_accept[197] = 0, 0, 59, 57, 3, 55, 55, 57, 57, 54, 54, 54, 53, 54, 54, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, - 51, 51, 2, 2, 3, 55, 0, 0, 55, 0, + 51, 51, 2, 2, 3, 55, 0, 0, 0, 0, 0, 56, 50, 1, 52, 53, 49, 47, 48, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 17, 8, 51, 51, 51, 51, 51, 51, 51, 51, 29, @@ -443,29 +443,29 @@ static yyconst flex_int32_t yy_meta[61] = static yyconst flex_int16_t yy_base[202] = { 0, - 0, 59, 162, 472, 63, 67, 71, 75, 154, 472, - 141, 134, 52, 68, 129, 56, 0, 56, 57, 67, + 0, 59, 187, 469, 63, 67, 71, 75, 169, 469, + 152, 140, 52, 68, 130, 56, 0, 56, 57, 67, 72, 68, 68, 69, 112, 70, 104, 111, 80, 118, - 130, 143, 175, 180, 189, 97, 193, 167, 197, 80, - 129, 472, 472, 0, 93, 128, 472, 472, 472, 0, - 104, 82, 176, 114, 112, 165, 187, 190, 179, 169, - 0, 176, 181, 196, 191, 186, 185, 184, 189, 0, - 196, 0, 207, 204, 193, 198, 201, 205, 221, 226, - 0, 230, 219, 259, 263, 221, 0, 80, 0, 223, - 238, 232, 251, 0, 240, 244, 253, 264, 281, 265, - - 258, 258, 254, 263, 267, 260, 0, 269, 260, 264, - 0, 281, 0, 278, 273, 325, 278, 281, 285, 298, - 303, 0, 0, 0, 0, 294, 304, 317, 306, 305, - 0, 0, 309, 323, 312, 324, 0, 0, 0, 321, - 331, 316, 317, 348, 0, 0, 335, 332, 359, 336, - 321, 0, 340, 472, 335, 0, 346, 355, 0, 348, - 345, 361, 351, 379, 0, 358, 389, 359, 350, 0, - 371, 360, 0, 362, 0, 0, 0, 396, 0, 376, - 371, 0, 386, 0, 375, 387, 472, 0, 379, 0, - 411, 386, 417, 0, 421, 472, 447, 449, 455, 460, - - 465 + 130, 143, 175, 180, 189, 469, 193, 167, 197, 80, + 136, 469, 469, 0, 93, 90, 469, 469, 469, 0, + 104, 82, 176, 108, 112, 165, 187, 190, 117, 133, + 0, 175, 180, 192, 190, 183, 184, 183, 188, 0, + 202, 0, 207, 204, 193, 198, 200, 205, 221, 220, + 0, 230, 212, 266, 276, 220, 0, 80, 0, 220, + 240, 234, 243, 0, 232, 233, 240, 256, 280, 271, + + 263, 263, 259, 254, 272, 265, 0, 271, 264, 268, + 0, 284, 0, 281, 276, 303, 282, 285, 285, 294, + 303, 0, 0, 0, 0, 283, 304, 311, 308, 308, + 0, 0, 311, 325, 315, 322, 0, 0, 0, 321, + 330, 316, 317, 169, 0, 0, 327, 328, 212, 329, + 324, 0, 330, 469, 325, 0, 334, 340, 0, 332, + 331, 348, 342, 252, 0, 347, 382, 353, 348, 0, + 369, 358, 0, 359, 0, 0, 0, 393, 0, 373, + 368, 0, 377, 0, 369, 381, 469, 0, 372, 0, + 404, 376, 409, 0, 414, 469, 444, 446, 452, 457, + + 462 } ; static yyconst flex_int16_t yy_def[202] = @@ -495,7 +495,7 @@ static yyconst flex_int16_t yy_def[202] = 196 } ; -static yyconst flex_int16_t yy_nxt[533] = +static yyconst flex_int16_t yy_nxt[530] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 4, 13, 14, 10, 15, 16, 17, 18, 19, 20, 21, @@ -506,59 +506,58 @@ static yyconst flex_int16_t yy_nxt[533] = 33, 45, 46, 34, 35, 36, 36, 37, 38, 39, 39, 38, 38, 39, 39, 38, 37, 36, 36, 37, 47, 48, 51, 52, 53, 40, 57, 61, 68, 40, - 88, 54, 59, 55, 62, 60, 63, 69, 76, 36, + 88, 54, 59, 55, 62, 60, 63, 69, 76, 45, - 36, 58, 56, 88, 86, 51, 52, 53, 90, 40, + 46, 58, 56, 88, 86, 51, 52, 53, 90, 40, 57, 61, 68, 40, 54, 59, 55, 62, 60, 63, 69, 89, 76, 70, 58, 56, 64, 86, 65, 94, - 66, 90, 71, 72, 42, 73, 77, 45, 46, 67, - 74, 49, 44, 75, 93, 89, 78, 70, 43, 79, - 64, 80, 65, 94, 66, 71, 72, 81, 73, 42, - 77, 196, 67, 74, 82, 83, 75, 93, 38, 78, - 99, 38, 79, 99, 196, 80, 84, 36, 36, 85, + 66, 90, 71, 72, 99, 73, 77, 99, 93, 67, + 74, 42, 49, 75, 98, 89, 78, 70, 44, 79, + 64, 80, 65, 94, 66, 71, 72, 81, 73, 43, + 77, 93, 67, 74, 82, 83, 75, 98, 38, 78, + 144, 38, 79, 144, 42, 80, 84, 36, 36, 85, 81, 85, 36, 36, 85, 40, 196, 95, 82, 83, 35, 36, 36, 37, 37, 36, 36, 37, 38, 39, - 39, 38, 91, 96, 97, 196, 98, 100, 101, 40, - 92, 95, 102, 103, 108, 40, 196, 104, 105, 106, - 107, 109, 110, 196, 111, 91, 112, 96, 97, 98, - 100, 101, 113, 92, 114, 115, 102, 103, 108, 40, - 104, 105, 106, 107, 116, 109, 110, 111, 117, 112, - 119, 120, 118, 196, 121, 113, 122, 114, 123, 115, - 84, 36, 36, 85, 85, 36, 36, 85, 116, 124, - 196, 125, 117, 119, 120, 126, 118, 121, 127, 128, - 122, 123, 99, 130, 135, 99, 132, 133, 134, 136, - 196, 137, 131, 124, 125, 138, 139, 140, 126, 141, - - 142, 127, 143, 128, 146, 147, 148, 130, 135, 132, - 133, 134, 129, 136, 137, 131, 149, 150, 138, 139, - 140, 151, 152, 141, 142, 143, 144, 146, 147, 144, - 148, 153, 196, 154, 155, 129, 156, 157, 196, 158, - 149, 150, 159, 160, 151, 161, 152, 162, 163, 144, - 169, 145, 144, 165, 166, 153, 154, 155, 168, 156, - 167, 157, 158, 167, 170, 171, 159, 160, 172, 161, - 162, 163, 173, 169, 145, 174, 175, 165, 166, 176, - 178, 177, 168, 178, 179, 181, 182, 170, 171, 183, - 167, 184, 172, 167, 185, 187, 173, 178, 174, 175, - - 178, 188, 189, 176, 177, 190, 191, 179, 181, 182, - 192, 180, 193, 183, 184, 193, 194, 185, 193, 187, - 196, 193, 196, 186, 188, 196, 189, 196, 190, 196, - 191, 196, 196, 192, 196, 180, 196, 196, 196, 194, - 196, 196, 196, 196, 196, 196, 186, 41, 41, 196, - 41, 41, 41, 50, 50, 87, 87, 196, 196, 87, - 87, 164, 196, 196, 196, 164, 195, 196, 196, 196, - 195, 3, 196, 196, 196, 196, 196, 196, 196, 196, + 39, 38, 91, 96, 97, 196, 100, 101, 102, 40, + 92, 95, 103, 167, 104, 40, 167, 105, 106, 107, + 108, 109, 110, 196, 111, 91, 112, 96, 97, 100, + 101, 113, 102, 92, 114, 115, 103, 104, 116, 40, + 105, 106, 107, 119, 108, 109, 110, 111, 117, 112, + 120, 121, 118, 178, 113, 196, 178, 114, 122, 115, + 123, 124, 116, 125, 126, 127, 119, 84, 36, 36, + 85, 128, 117, 120, 121, 135, 118, 85, 36, 36, + 85, 99, 122, 123, 99, 124, 125, 126, 127, 130, + 196, 132, 133, 134, 136, 128, 137, 138, 131, 135, + + 139, 140, 141, 142, 144, 143, 148, 144, 146, 147, + 151, 129, 149, 130, 132, 133, 134, 150, 136, 137, + 138, 131, 152, 139, 140, 153, 141, 142, 143, 145, + 148, 146, 147, 151, 129, 154, 149, 155, 156, 157, + 159, 150, 158, 160, 161, 165, 152, 162, 163, 153, + 166, 168, 145, 169, 170, 171, 172, 173, 154, 174, + 155, 156, 175, 157, 159, 158, 176, 160, 161, 165, + 162, 163, 177, 179, 166, 168, 169, 170, 171, 181, + 172, 173, 174, 167, 182, 175, 167, 183, 196, 184, + 176, 185, 187, 189, 178, 177, 179, 178, 188, 190, + + 191, 196, 181, 192, 180, 193, 194, 182, 193, 196, + 193, 183, 184, 193, 185, 196, 187, 189, 196, 196, + 186, 188, 190, 196, 191, 196, 192, 196, 180, 194, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 186, 41, 41, 196, 41, 41, 41, + 50, 50, 87, 87, 196, 196, 87, 87, 164, 196, + 196, 196, 164, 195, 196, 196, 196, 195, 3, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196 + 196, 196, 196, 196, 196, 196, 196, 196, 196 } ; -static yyconst flex_int16_t yy_chk[533] = +static yyconst flex_int16_t yy_chk[530] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -569,56 +568,55 @@ static yyconst flex_int16_t yy_chk[533] = 2, 13, 13, 2, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 14, 14, 16, 18, 19, 6, 21, 23, 26, 7, - 88, 20, 22, 20, 23, 22, 24, 26, 29, 36, + 88, 20, 22, 20, 23, 22, 24, 26, 29, 46, - 36, 21, 20, 45, 40, 16, 18, 19, 52, 6, + 46, 21, 20, 45, 40, 16, 18, 19, 52, 6, 21, 23, 26, 7, 20, 22, 20, 23, 22, 24, 26, 51, 29, 27, 21, 20, 25, 40, 25, 55, - 25, 52, 27, 27, 41, 28, 30, 46, 46, 25, - 28, 15, 12, 28, 54, 51, 30, 27, 11, 30, - 25, 31, 25, 55, 25, 27, 27, 31, 28, 9, - 30, 3, 25, 28, 32, 32, 28, 54, 38, 30, - 60, 38, 30, 60, 0, 31, 33, 33, 33, 33, - 31, 34, 34, 34, 34, 38, 0, 56, 32, 32, + 25, 52, 27, 27, 60, 28, 30, 60, 54, 25, + 28, 41, 15, 28, 59, 51, 30, 27, 12, 30, + 25, 31, 25, 55, 25, 27, 27, 31, 28, 11, + 30, 54, 25, 28, 32, 32, 28, 59, 38, 30, + 144, 38, 30, 144, 9, 31, 33, 33, 33, 33, + 31, 34, 34, 34, 34, 38, 3, 56, 32, 32, 35, 35, 35, 35, 37, 37, 37, 37, 39, 39, - 39, 39, 53, 57, 58, 0, 59, 62, 63, 38, - 53, 56, 64, 65, 71, 39, 0, 66, 67, 68, - 69, 73, 74, 0, 75, 53, 76, 57, 58, 59, - 62, 63, 77, 53, 78, 79, 64, 65, 71, 39, - 66, 67, 68, 69, 80, 73, 74, 75, 82, 76, - 83, 86, 82, 0, 90, 77, 91, 78, 92, 79, - 84, 84, 84, 84, 85, 85, 85, 85, 80, 93, - 0, 95, 82, 83, 86, 96, 82, 90, 97, 98, - 91, 92, 99, 100, 104, 99, 101, 102, 103, 105, - 0, 106, 100, 93, 95, 108, 109, 110, 96, 112, - - 114, 97, 115, 98, 117, 118, 119, 100, 104, 101, - 102, 103, 99, 105, 106, 100, 120, 121, 108, 109, - 110, 126, 127, 112, 114, 115, 116, 117, 118, 116, - 119, 128, 0, 129, 130, 99, 133, 134, 0, 135, - 120, 121, 136, 140, 126, 141, 127, 142, 143, 144, - 151, 116, 144, 147, 148, 128, 129, 130, 150, 133, - 149, 134, 135, 149, 153, 155, 136, 140, 157, 141, - 142, 143, 158, 151, 116, 160, 161, 147, 148, 162, - 164, 163, 150, 164, 166, 168, 169, 153, 155, 171, - 167, 172, 157, 167, 174, 180, 158, 178, 160, 161, - - 178, 181, 183, 162, 163, 185, 186, 166, 168, 169, - 189, 167, 191, 171, 172, 191, 192, 174, 193, 180, - 0, 193, 195, 178, 181, 195, 183, 0, 185, 0, - 186, 0, 0, 189, 0, 167, 0, 0, 0, 192, - 0, 0, 0, 0, 0, 0, 178, 197, 197, 0, - 197, 197, 197, 198, 198, 199, 199, 0, 0, 199, - 199, 200, 0, 0, 0, 200, 201, 0, 0, 0, - 201, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 39, 39, 53, 57, 58, 0, 62, 63, 64, 38, + 53, 56, 65, 149, 66, 39, 149, 67, 68, 69, + 71, 73, 74, 0, 75, 53, 76, 57, 58, 62, + 63, 77, 64, 53, 78, 79, 65, 66, 80, 39, + 67, 68, 69, 83, 71, 73, 74, 75, 82, 76, + 86, 90, 82, 164, 77, 0, 164, 78, 91, 79, + 92, 93, 80, 95, 96, 97, 83, 84, 84, 84, + 84, 98, 82, 86, 90, 104, 82, 85, 85, 85, + 85, 99, 91, 92, 99, 93, 95, 96, 97, 100, + 0, 101, 102, 103, 105, 98, 106, 108, 100, 104, + + 109, 110, 112, 114, 116, 115, 119, 116, 117, 118, + 126, 99, 120, 100, 101, 102, 103, 121, 105, 106, + 108, 100, 127, 109, 110, 128, 112, 114, 115, 116, + 119, 117, 118, 126, 99, 129, 120, 130, 133, 134, + 136, 121, 135, 140, 141, 147, 127, 142, 143, 128, + 148, 150, 116, 151, 153, 155, 157, 158, 129, 160, + 130, 133, 161, 134, 136, 135, 162, 140, 141, 147, + 142, 143, 163, 166, 148, 150, 151, 153, 155, 168, + 157, 158, 160, 167, 169, 161, 167, 171, 0, 172, + 162, 174, 180, 183, 178, 163, 166, 178, 181, 185, + + 186, 0, 168, 189, 167, 191, 192, 169, 191, 0, + 193, 171, 172, 193, 174, 195, 180, 183, 195, 0, + 178, 181, 185, 0, 186, 0, 189, 0, 167, 192, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 178, 197, 197, 0, 197, 197, 197, + 198, 198, 199, 199, 0, 0, 199, 199, 200, 0, + 0, 0, 200, 201, 0, 0, 0, 201, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, + 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, 196, - 196, 196 + 196, 196, 196, 196, 196, 196, 196, 196, 196 } ; static yy_state_type yy_last_accepting_state; @@ -692,7 +690,7 @@ static void countnl() { g_lingo->_colnumber = strlen(p); } -#line 696 "engines/director/lingo/lingo-lex.cpp" +#line 694 "engines/director/lingo/lingo-lex.cpp" #define INITIAL 0 @@ -880,7 +878,7 @@ YY_DECL #line 69 "engines/director/lingo/lingo-lex.l" -#line 884 "engines/director/lingo/lingo-lex.cpp" +#line 882 "engines/director/lingo/lingo-lex.cpp" if ( !(yy_init) ) { @@ -940,7 +938,7 @@ yy_match: yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 472 ); + while ( yy_base[yy_current_state] != 469 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1337,7 +1335,7 @@ YY_RULE_SETUP #line 212 "engines/director/lingo/lingo-lex.l" ECHO; YY_BREAK -#line 1341 "engines/director/lingo/lingo-lex.cpp" +#line 1339 "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 16e060aefc..cc3b48b593 100644 --- a/engines/director/lingo/lingo-lex.l +++ b/engines/director/lingo/lingo-lex.l @@ -63,7 +63,7 @@ constfloat [[:digit:]]+\.[[:digit:]]* constinteger [[:digit:]]+ conststring \"[^\"\n]*\" operator [-+*/%=^:,()><&] -newline [ \t]*[\n\r]+ +newline [ \t]*[\n\r] whitespace [\t ] %% |