aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2016-07-05 00:38:29 +0200
committerEugene Sandulenko2016-08-03 23:40:36 +0200
commitb5cfcd05f67c4426b277b78f2d4fee86becc0365 (patch)
tree824091679c69c421e78a21bd597306ac8f1c00f2
parent207609ac093d66ca9a9beed1c0d95afab69e9999 (diff)
downloadscummvm-rg350-b5cfcd05f67c4426b277b78f2d4fee86becc0365.tar.gz
scummvm-rg350-b5cfcd05f67c4426b277b78f2d4fee86becc0365.tar.bz2
scummvm-rg350-b5cfcd05f67c4426b277b78f2d4fee86becc0365.zip
DIRECTOR: Lingo: Switched right recursion to left in program rule
-rw-r--r--engines/director/lingo/lingo-gr.cpp130
-rw-r--r--engines/director/lingo/lingo-gr.y2
2 files changed, 66 insertions, 66 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index e89b77ad6c..8cad3b90af 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -503,7 +503,7 @@ static const yytype_uint16 yyprhs[] =
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 57, 0, -1, 58, 50, 57, -1, 58, -1, -1,
+ 57, 0, -1, 57, 50, 58, -1, 58, -1, -1,
79, -1, 74, -1, 83, -1, 59, -1, 61, -1,
60, -1, 1, -1, 31, 73, 22, 10, -1, 33,
10, 44, 73, -1, 33, 10, 35, 73, -1, 73,
@@ -659,34 +659,34 @@ static const yytype_int16 yydefgoto[] =
#define YYPACT_NINF -89
static const yytype_int16 yypact[] =
{
- 138, -89, -89, -89, -2, 278, -89, 42, 96, -89,
- 75, 76, 82, 134, 2, 84, 134, 134, 134, 86,
- 45, 4, -89, -89, -89, 46, 52, 166, 266, -89,
- -89, -89, -89, 134, 134, 134, -89, 44, -89, 91,
- -89, 93, -89, 79, -89, 5, 47, -89, -89, -89,
- -89, 59, 134, -89, -3, 101, -89, -11, 167, 167,
+ 138, -89, -89, -89, -46, 278, -89, 22, 96, -89,
+ 39, 31, 47, 134, 49, 66, 134, 134, 134, 4,
+ -89, 6, -89, -89, -89, 41, 50, 166, 266, -89,
+ -89, -89, -89, 134, 134, 134, -89, 44, -89, 95,
+ -89, 99, -89, 77, -89, 84, 93, -89, -89, -89,
+ -89, 65, 134, -89, -2, 103, -89, -28, -20, -20,
242, -89, 138, 166, 134, 166, 83, 254, 134, 134,
- 134, 134, 134, 134, 134, 134, 134, 266, -34, -18,
- 58, 106, -89, -89, 107, -89, 109, 111, 108, -89,
- -89, -3, 118, -89, 134, 134, -89, -89, 97, 266,
- 98, 224, -9, 134, 266, 266, 266, 203, 203, 167,
- 167, 266, 266, -89, 134, -89, -89, -89, -89, -89,
- 124, -89, 266, 266, -89, -4, -89, 228, 183, 266,
- 266, -89, -30, 183, 116, 134, -89, 166, -89, -89,
- -89, 32, 81, 142, 137, 134, 266, 104, 122, -89,
- 140, 151, 158, -89, -89, 145, 266, -89, 168, -89,
- 183, -89, -89, -89, 151, 166, -89, 183, -89, -89,
- 183, -89, 156, 165, -89, 152, 183, 178, 228, 174,
- 175, 11, 182, 169, -89, -89, -89, 228, 183, 181,
- -89, 157, -89, -89, -89, -89, 172, -89
+ 134, 134, 134, 134, 134, 134, 134, 266, -31, -17,
+ 63, 124, -89, -89, 125, -89, 139, 140, 108, -89,
+ -89, -2, 142, -89, 134, 134, -89, -89, 97, 266,
+ 101, 224, 11, 134, 266, 266, 266, 203, 203, -20,
+ -20, 266, 266, -89, 134, -89, -89, -89, -89, -89,
+ 144, -89, 266, 266, -89, -4, -89, 228, 183, 266,
+ 266, -89, 32, 183, 121, 134, -89, 166, -89, -89,
+ -89, 34, 106, 156, 152, 134, 266, 122, 143, -89,
+ 160, 167, 176, -89, -89, 162, 266, -89, 181, -89,
+ 183, -89, -89, -89, 167, 166, -89, 183, -89, -89,
+ 183, -89, 180, 182, -89, 171, 183, 185, 228, 186,
+ 189, 24, 190, 187, -89, -89, -89, 228, 183, 188,
+ -89, 163, -89, -89, -89, -89, 168, -89
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -89, 161, -89, 10, 0, -89, -89, 54, -89, -62,
+ -89, -89, 159, 10, 0, -89, -89, 58, -89, -62,
-89, -89, 15, -89, -88, -55, -69, -5, 17, -89,
- -89, -89, 173, -89, -89, -89, -89, -89, 22
+ -89, -89, 177, -89, -89, -89, -89, -89, 62
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -696,29 +696,29 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -47
static const yytype_int16 yytable[] =
{
- 22, 98, 120, 100, -8, -39, -39, -39, 54, 134,
- 21, 58, 59, 60, 127, 27, 85, 29, 113, 92,
- 142, 114, 67, 86, 94, 143, -39, -39, 77, 77,
- 77, 135, 87, 95, 115, 68, 69, 114, 55, 56,
- 70, -39, 71, 72, 73, 74, 149, 91, 150, 33,
- 75, 76, 36, 151, -8, 133, 79, 80, 67, 99,
+ 22, 98, 120, 100, 61, 33, -8, 94, 54, 134,
+ 21, 58, 59, 60, 127, 27, 95, 29, 68, 69,
+ 92, 113, 67, 70, 114, -39, -39, -39, 77, 77,
+ 77, 135, 36, 75, 76, 115, 68, 69, 114, -39,
+ -39, 70, 49, 71, 72, 73, 74, 91, 149, 48,
+ 150, 75, 76, 151, 62, 133, -8, 50, 67, 99,
101, -39, 22, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 21, 141, 41, 148, 43, 27, 144, 29,
- 160, 147, 88, 178, 167, 48, 61, 49, 170, 122,
- 123, 157, 50, 187, 57, 62, 64, 63, 129, 81,
- 176, 169, 82, 175, 83, 172, 84, 38, 173, 130,
- 34, 93, 188, 114, 39, 177, 116, 102, 117, 40,
- 118, 182, 119, 41, 42, 43, 44, 136, 121, 191,
- 146, 45, 67, 193, 131, 87, 152, 196, -4, 1,
+ 111, 112, 21, 141, -39, 148, 57, 27, 144, 29,
+ 160, 147, 142, 178, 167, 55, 56, 143, 170, 122,
+ 123, 157, 63, 187, 64, 85, 79, 80, 129, 81,
+ 176, 169, 86, 175, 84, 172, 82, 38, 173, 130,
+ 83, 87, 188, 93, 39, 177, 34, 102, 114, 40,
+ 41, 182, 43, 41, 42, 43, 44, 136, 88, 191,
+ 146, 45, 67, 193, 116, 87, 117, 196, -4, 1,
156, 2, 3, 4, 51, 2, 3, 4, 5, 124,
- 126, 145, 154, 155, 158, 6, 159, 7, 8, 9,
- 67, 161, 10, 11, 12, 52, 162, 15, 166, 13,
- 14, 15, 179, 2, 3, 4, 51, 168, 184, 16,
- 17, 180, 171, 16, 17, 18, 181, 192, -4, 18,
- 2, 3, 4, 51, 183, 185, 186, 52, 189, 15,
- 6, 190, 7, 8, 9, 68, 69, 195, 11, 12,
- 70, 16, 17, 194, 13, 14, 15, 65, 174, 89,
- 75, 76, 197, 97, 0, 0, 0, 0, 16, 17,
+ 118, 119, 121, 126, 131, 6, 145, 7, 8, 9,
+ 67, 152, 10, 11, 12, 52, 154, 15, 155, 13,
+ 14, 15, 158, 2, 3, 4, 51, 159, 184, 16,
+ 17, 161, 162, 16, 17, 18, 166, 192, -4, 18,
+ 2, 3, 4, 51, 168, 171, 179, 52, 180, 15,
+ 6, 183, 7, 8, 9, 181, 189, 185, 11, 12,
+ 186, 16, 17, 195, 13, 14, 15, 65, 197, 190,
+ 194, 97, 174, 89, 0, 0, 0, 0, 16, 17,
0, 0, 0, 139, 18, 2, 3, 4, 51, 0,
0, 68, 69, 0, 0, 6, 70, 7, 8, 9,
73, 74, 0, 11, 12, 0, 75, 76, 0, 13,
@@ -734,29 +734,29 @@ static const yytype_int16 yytable[] =
static const yytype_int16 yycheck[] =
{
- 0, 63, 90, 65, 0, 14, 15, 16, 13, 13,
- 0, 16, 17, 18, 102, 0, 11, 0, 52, 22,
- 50, 55, 27, 18, 35, 55, 15, 16, 33, 34,
- 35, 35, 27, 44, 52, 38, 39, 55, 36, 37,
- 43, 50, 45, 46, 47, 48, 14, 52, 16, 51,
- 53, 54, 10, 141, 50, 124, 34, 35, 63, 64,
+ 0, 63, 90, 65, 0, 51, 0, 35, 13, 13,
+ 0, 16, 17, 18, 102, 0, 44, 0, 38, 39,
+ 22, 52, 27, 43, 55, 14, 15, 16, 33, 34,
+ 35, 35, 10, 53, 54, 52, 38, 39, 55, 15,
+ 16, 43, 11, 45, 46, 47, 48, 52, 14, 10,
+ 16, 53, 54, 141, 50, 124, 50, 10, 63, 64,
65, 50, 62, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 62, 128, 27, 137, 29, 62, 133, 62,
- 149, 136, 35, 171, 153, 10, 0, 11, 157, 94,
- 95, 146, 10, 181, 10, 50, 44, 51, 103, 55,
- 169, 156, 11, 165, 11, 160, 27, 11, 163, 114,
- 51, 10, 181, 55, 18, 170, 10, 34, 11, 23,
- 11, 176, 11, 27, 28, 29, 30, 127, 10, 184,
- 135, 35, 137, 188, 10, 27, 55, 192, 0, 1,
+ 75, 76, 62, 128, 50, 137, 10, 62, 133, 62,
+ 149, 136, 50, 171, 153, 36, 37, 55, 157, 94,
+ 95, 146, 51, 181, 44, 11, 34, 35, 103, 55,
+ 169, 156, 18, 165, 27, 160, 11, 11, 163, 114,
+ 11, 27, 181, 10, 18, 170, 51, 34, 55, 23,
+ 27, 176, 29, 27, 28, 29, 30, 127, 35, 184,
+ 135, 35, 137, 188, 10, 27, 11, 192, 0, 1,
145, 7, 8, 9, 10, 7, 8, 9, 10, 52,
- 52, 35, 10, 16, 50, 17, 34, 19, 20, 21,
- 165, 21, 24, 25, 26, 31, 15, 33, 10, 31,
- 32, 33, 16, 7, 8, 9, 10, 32, 178, 45,
- 46, 16, 14, 45, 46, 51, 34, 187, 50, 51,
- 7, 8, 9, 10, 16, 21, 21, 31, 16, 33,
- 17, 32, 19, 20, 21, 38, 39, 50, 25, 26,
- 43, 45, 46, 32, 31, 32, 33, 51, 164, 46,
- 53, 54, 50, 62, -1, -1, -1, -1, 45, 46,
+ 11, 11, 10, 52, 10, 17, 35, 19, 20, 21,
+ 165, 55, 24, 25, 26, 31, 10, 33, 16, 31,
+ 32, 33, 50, 7, 8, 9, 10, 34, 178, 45,
+ 46, 21, 15, 45, 46, 51, 10, 187, 50, 51,
+ 7, 8, 9, 10, 32, 14, 16, 31, 16, 33,
+ 17, 16, 19, 20, 21, 34, 16, 21, 25, 26,
+ 21, 45, 46, 50, 31, 32, 33, 51, 50, 32,
+ 32, 62, 164, 46, -1, -1, -1, -1, 45, 46,
-1, -1, -1, 50, 51, 7, 8, 9, 10, -1,
-1, 38, 39, -1, -1, 17, 43, 19, 20, 21,
47, 48, -1, 25, 26, -1, 53, 54, -1, 31,
@@ -783,7 +783,7 @@ static const yytype_uint8 yystos[] =
73, 0, 50, 51, 44, 51, 65, 73, 38, 39,
43, 45, 46, 47, 48, 53, 54, 73, 84, 84,
84, 55, 11, 11, 27, 11, 18, 27, 35, 78,
- 80, 73, 22, 10, 35, 44, 52, 57, 65, 73,
+ 80, 73, 22, 10, 35, 44, 52, 58, 65, 73,
65, 73, 34, 44, 73, 73, 73, 73, 73, 73,
73, 73, 73, 52, 55, 52, 10, 11, 11, 11,
70, 10, 73, 73, 52, 71, 52, 70, 72, 73,
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 9fd8f3d910..afd663d612 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -90,7 +90,7 @@ using namespace Director;
%%
-program: programline '\n' program
+program: program '\n' programline
| programline
;