[Scummvm-git-logs] scummvm master -> 7dd6e826e9d19adfd51e5930b17b8f79d8bd8f39

sev- sev at scummvm.org
Mon Jan 23 00:46:21 CET 2017


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:
e237944bfc DIRECTOR: Lingo: Remove token duplicate
7dd6e826e9 DIRECTOR: Lingo: Fix 35 reduce/reduce conflicts in grammar. 65 to go


Commit: e237944bfc477a8830b0461ad9d83f2f4dd804fb
    https://github.com/scummvm/scummvm/commit/e237944bfc477a8830b0461ad9d83f2f4dd804fb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-23T00:46:12+01:00

Commit Message:
DIRECTOR: Lingo: Remove token duplicate

Changed paths:
    engines/director/lingo/lingo-gr.y


diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index b037bc8..45f340e 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -96,7 +96,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
 %token<s> ENDCLAUSE tPLAYACCEL
 %token tDOWN tELSE tNLELSIF tEXIT tFRAME tGLOBAL tGO tIF tINTO tLOOP tMACRO
 %token tMOVIE tNEXT tOF tPREVIOUS tPUT tREPEAT tSET tTHEN tTO tWHEN
-%token tWITH tWHILE tNLELSE tFACTORY tMETHOD tOPEN tPLAY tDONE tPLAYACCEL tINSTANCE
+%token tWITH tWHILE tNLELSE tFACTORY tMETHOD tOPEN tPLAY tDONE tINSTANCE
 %token tGE tLE tGT tLT tEQ tNEQ tAND tOR tNOT tMOD
 %token tAFTER tBEFORE tCONCAT tCONTAINS tSTARTS tCHAR tITEM tLINE tWORD
 %token tSPRITE tINTERSECTS tWITHIN


Commit: 7dd6e826e9d19adfd51e5930b17b8f79d8bd8f39
    https://github.com/scummvm/scummvm/commit/7dd6e826e9d19adfd51e5930b17b8f79d8bd8f39
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-23T00:46:12+01:00

Commit Message:
DIRECTOR: Lingo: Fix 35 reduce/reduce conflicts in grammar. 65 to go

Changed paths:
    engines/director/lingo/lingo-gr.cpp
    engines/director/lingo/lingo-gr.y


diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index d741fe1..ca89e5b 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -520,7 +520,7 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  112
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1631
+#define YYLAST   1581
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  96
@@ -529,7 +529,7 @@ union yyalloc
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  152
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  332
+#define YYNSTATES  333
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -586,18 +586,18 @@ static const yytype_uint16 yyprhs[] =
       21,    23,    25,    30,    35,    40,    45,    50,    56,    61,
       66,    72,    74,    76,    78,    80,    88,    99,   111,   115,
      123,   134,   145,   152,   163,   174,   175,   179,   182,   184,
-     187,   189,   196,   198,   204,   206,   210,   214,   217,   221,
-     223,   225,   226,   227,   228,   231,   234,   238,   240,   242,
-     244,   246,   248,   253,   255,   257,   260,   262,   266,   270,
-     274,   278,   282,   286,   290,   294,   298,   302,   306,   310,
-     313,   317,   321,   325,   329,   333,   336,   339,   343,   347,
-     352,   357,   362,   369,   374,   381,   386,   393,   398,   405,
-     408,   410,   412,   415,   417,   420,   423,   426,   429,   431,
-     436,   439,   444,   451,   456,   459,   463,   465,   469,   471,
-     475,   478,   481,   484,   487,   491,   494,   497,   499,   503,
-     506,   509,   512,   516,   519,   520,   524,   525,   534,   537,
-     538,   547,   548,   549,   560,   561,   563,   567,   572,   573,
-     577,   578,   580
+     187,   189,   196,   198,   205,   207,   211,   215,   218,   222,
+     224,   226,   227,   228,   229,   232,   235,   239,   241,   243,
+     245,   247,   249,   254,   256,   258,   261,   263,   267,   271,
+     275,   279,   283,   287,   291,   295,   299,   303,   307,   311,
+     314,   318,   322,   326,   330,   334,   337,   340,   344,   348,
+     353,   358,   363,   370,   375,   382,   387,   394,   399,   406,
+     409,   411,   413,   416,   418,   421,   424,   427,   430,   432,
+     437,   440,   445,   452,   457,   460,   464,   466,   470,   472,
+     476,   479,   482,   485,   488,   492,   495,   498,   500,   504,
+     507,   510,   513,   517,   520,   521,   525,   526,   535,   538,
+     539,   548,   549,   550,   561,   562,   564,   568,   573,   574,
+     578,   579,   581
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -623,45 +623,45 @@ static const yytype_int16 yyrhs[] =
      115,   104,   115,    -1,    -1,    50,   114,   101,    -1,   105,
      108,    -1,   108,    -1,   106,   107,    -1,   107,    -1,   113,
      109,    45,   114,   102,   115,    -1,   106,    -1,   113,   109,
-      45,   116,   115,    -1,   118,    -1,   118,    81,   118,    -1,
-      89,   109,    90,    -1,    43,    49,    -1,    43,    48,    21,
-      -1,    34,    -1,    29,    -1,    -1,    -1,    -1,   116,    98,
-      -1,   116,   102,    -1,    47,    21,    45,    -1,    11,    -1,
-      14,    -1,    24,    -1,    22,    -1,    16,    -1,    21,    89,
-     135,    90,    -1,    21,    -1,    12,    -1,    13,   118,    -1,
-     100,    -1,   118,    83,   118,    -1,   118,    84,   118,    -1,
-     118,    85,   118,    -1,   118,    86,   118,    -1,   118,    66,
-     118,    -1,   118,    91,   118,    -1,   118,    92,   118,    -1,
-     118,    62,   118,    -1,   118,    57,   118,    -1,   118,    58,
-     118,    -1,   118,    63,   118,    -1,   118,    64,   118,    -1,
-      65,   118,    -1,   118,    82,   118,    -1,   118,    67,   118,
-      -1,   118,    69,   118,    -1,   118,    70,   118,    -1,   118,
-      71,   118,    -1,    83,   118,    -1,    84,   118,    -1,    89,
-     118,    90,    -1,    93,   135,    94,    -1,    76,   118,    77,
-     118,    -1,    76,   118,    78,   118,    -1,    72,   118,    40,
-     118,    -1,    72,   118,    46,   118,    40,   118,    -1,    73,
-     118,    40,   118,    -1,    73,   118,    46,   118,    40,   118,
-      -1,    74,   118,    40,   118,    -1,    74,   118,    46,   118,
-      40,   118,    -1,    75,   118,    40,   118,    -1,    75,   118,
-      46,   118,    40,   118,    -1,    42,   118,    -1,   122,    -1,
-     125,    -1,    30,    43,    -1,    30,    -1,    32,   120,    -1,
-      56,   121,    -1,    18,   118,    -1,    17,   118,    -1,    17,
-      -1,    19,    89,   135,    90,    -1,    19,   135,    -1,    80,
-      89,    21,    90,    -1,    80,    89,    21,    95,   135,    90,
-      -1,    53,   118,    48,   118,    -1,    53,   118,    -1,    20,
-      21,   135,    -1,    21,    -1,   120,    95,    21,    -1,    21,
-      -1,   121,    95,    21,    -1,    33,    36,    -1,    33,    39,
-      -1,    33,    41,    -1,    33,   123,    -1,    33,   123,   124,
-      -1,    33,   124,    -1,    31,   118,    -1,   118,    -1,    40,
-      38,   118,    -1,    38,   118,    -1,    54,    55,    -1,    54,
-     123,    -1,    54,   123,   124,    -1,    54,   124,    -1,    -1,
-      26,   126,   135,    -1,    -1,    37,    21,   128,   114,   132,
-      98,   133,   116,    -1,    51,    21,    -1,    -1,    52,    21,
-     129,   114,   132,    98,   133,   116,    -1,    -1,    -1,    79,
-      21,   130,   114,   131,   132,    98,   133,   116,    25,    -1,
-      -1,    21,    -1,   132,    95,    21,    -1,   132,    98,    95,
-      21,    -1,    -1,    21,   114,   135,    -1,    -1,   118,    -1,
-     135,    95,   118,    -1
+      45,   114,   116,   115,    -1,   118,    -1,   118,    81,   118,
+      -1,    89,   109,    90,    -1,    43,    49,    -1,    43,    48,
+      21,    -1,    34,    -1,    29,    -1,    -1,    -1,    -1,   116,
+      98,    -1,   116,   102,    -1,    47,    21,    45,    -1,    11,
+      -1,    14,    -1,    24,    -1,    22,    -1,    16,    -1,    21,
+      89,   135,    90,    -1,    21,    -1,    12,    -1,    13,   118,
+      -1,   100,    -1,   118,    83,   118,    -1,   118,    84,   118,
+      -1,   118,    85,   118,    -1,   118,    86,   118,    -1,   118,
+      66,   118,    -1,   118,    91,   118,    -1,   118,    92,   118,
+      -1,   118,    62,   118,    -1,   118,    57,   118,    -1,   118,
+      58,   118,    -1,   118,    63,   118,    -1,   118,    64,   118,
+      -1,    65,   118,    -1,   118,    82,   118,    -1,   118,    67,
+     118,    -1,   118,    69,   118,    -1,   118,    70,   118,    -1,
+     118,    71,   118,    -1,    83,   118,    -1,    84,   118,    -1,
+      89,   118,    90,    -1,    93,   135,    94,    -1,    76,   118,
+      77,   118,    -1,    76,   118,    78,   118,    -1,    72,   118,
+      40,   118,    -1,    72,   118,    46,   118,    40,   118,    -1,
+      73,   118,    40,   118,    -1,    73,   118,    46,   118,    40,
+     118,    -1,    74,   118,    40,   118,    -1,    74,   118,    46,
+     118,    40,   118,    -1,    75,   118,    40,   118,    -1,    75,
+     118,    46,   118,    40,   118,    -1,    42,   118,    -1,   122,
+      -1,   125,    -1,    30,    43,    -1,    30,    -1,    32,   120,
+      -1,    56,   121,    -1,    18,   118,    -1,    17,   118,    -1,
+      17,    -1,    19,    89,   135,    90,    -1,    19,   135,    -1,
+      80,    89,    21,    90,    -1,    80,    89,    21,    95,   135,
+      90,    -1,    53,   118,    48,   118,    -1,    53,   118,    -1,
+      20,    21,   135,    -1,    21,    -1,   120,    95,    21,    -1,
+      21,    -1,   121,    95,    21,    -1,    33,    36,    -1,    33,
+      39,    -1,    33,    41,    -1,    33,   123,    -1,    33,   123,
+     124,    -1,    33,   124,    -1,    31,   118,    -1,   118,    -1,
+      40,    38,   118,    -1,    38,   118,    -1,    54,    55,    -1,
+      54,   123,    -1,    54,   123,   124,    -1,    54,   124,    -1,
+      -1,    26,   126,   135,    -1,    -1,    37,    21,   128,   114,
+     132,    98,   133,   116,    -1,    51,    21,    -1,    -1,    52,
+      21,   129,   114,   132,    98,   133,   116,    -1,    -1,    -1,
+      79,    21,   130,   114,   131,   132,    98,   133,   116,    25,
+      -1,    -1,    21,    -1,   132,    95,    21,    -1,   132,    98,
+      95,    21,    -1,    -1,    21,   114,   135,    -1,    -1,   118,
+      -1,   135,    95,   118,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -761,7 +761,7 @@ static const yytype_uint8 yyr2[] =
        1,     1,     4,     4,     4,     4,     4,     5,     4,     4,
        5,     1,     1,     1,     1,     7,    10,    11,     3,     7,
       10,    10,     6,    10,    10,     0,     3,     2,     1,     2,
-       1,     6,     1,     5,     1,     3,     3,     2,     3,     1,
+       1,     6,     1,     6,     1,     3,     3,     2,     3,     1,
        1,     0,     0,     0,     2,     2,     3,     1,     1,     1,
        1,     1,     4,     1,     1,     2,     1,     3,     3,     3,
        3,     3,     3,     3,     3,     3,     3,     3,     3,     2,
@@ -812,67 +812,67 @@ static const yytype_uint8 yydefact[] =
      147,   137,   140,    53,    53,    52,    52,    52,    42,    38,
        0,     0,    39,    35,     0,     0,    52,     0,     0,    37,
        0,     0,    52,    51,    52,    51,   143,     0,    26,    30,
-      31,    51,    33,     0,    34,     0,    27,    52,    36,    52,
-      43,    41
+      31,    51,    33,     0,    34,     0,    27,    53,    36,    52,
+      52,    41,    43
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,    41,   267,    42,    61,    44,   268,    46,   314,   297,
-     298,   288,   299,   117,    47,    48,    49,   289,   325,   186,
+     298,   288,   299,   117,    47,    48,    49,   289,    70,   186,
      252,    50,    51,   257,    74,    99,    53,    82,    83,    54,
       71,    55,   150,   161,   175,   250,   242,   276,    56,    67
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -235
+#define YYPACT_NINF -269
 static const yytype_int16 yypact[] =
 {
-     326,   -68,  -235,  -235,   916,  -235,  -235,   916,   916,   982,
-      38,  1539,  -235,  -235,  -235,   -13,    44,   815,  -235,    55,
-     916,     9,    11,    57,    60,    64,   916,   881,    67,   916,
-     916,   916,   916,   916,   916,    81,   -62,   916,   916,   916,
-     916,     3,  -235,     6,  -235,  -235,  -235,    -7,    26,  1007,
-     916,  1508,  -235,  -235,  -235,  -235,  -235,  -235,  -235,    -2,
-     916,  -235,  1508,  1508,  1508,   916,  1508,    13,   916,   916,
-     916,   916,  -235,  -235,    14,   916,  -235,   916,  -235,    72,
-    -235,  1508,   -12,  -235,  -235,  1035,    90,  -235,   -33,   916,
-     -32,    69,  -235,  -235,  1353,  -235,   -12,  -235,  -235,    17,
-     -48,  1067,  1099,  1131,  1163,  1384,  -235,    98,   -48,   -48,
-    1446,   -26,  -235,   409,  1007,   916,  1007,    75,  1477,  1508,
-     916,   916,   916,   916,   916,   916,   916,   916,   916,   916,
-     916,   916,   916,   916,   916,   916,   916,  1035,  1446,   -35,
-     916,    13,   -34,    13,    13,   100,  1508,  1508,   916,  -235,
-    -235,   101,   916,   916,  -235,   916,   916,  1322,   916,   916,
-    -235,  -235,   916,  -235,   102,   916,   916,   916,   916,   916,
-     916,   916,   916,   916,   916,  -235,   -18,  -235,  -235,  -235,
-      39,  1508,    42,  1415,   -68,   916,  -235,   778,   778,   778,
-     -48,   -48,   -48,  1508,  1508,   778,   778,    61,   192,   192,
-     -48,   -48,  1508,  1508,  -235,  1508,  -235,  -235,  1508,   112,
-    -235,  1508,  1508,  1508,  1508,   916,   916,  1508,  1508,   112,
-    1508,  -235,  1508,  1195,  1508,  1227,  1508,  1259,  1508,  1291,
-    1508,  1508,  -235,  -235,   916,  -235,   -11,  -235,  -235,   741,
-    1508,  -235,   -70,  1508,  1508,   -70,   916,   916,   916,   916,
-     112,    -6,   575,    92,   916,   575,  -235,  -235,   118,    47,
-      47,  1508,  1508,  1508,  1508,   -70,  -235,  -235,  -235,   123,
-     916,  1508,    -3,   -14,  -235,   128,  -235,  -235,    47,  -235,
-    1508,  -235,  -235,  -235,   121,  -235,  -235,   121,  -235,  1007,
-    -235,   575,   575,  -235,  -235,   575,   575,   121,   121,  -235,
-    1007,   741,  -235,   104,   111,   492,   575,   132,   133,  -235,
-     134,   115,  -235,  -235,  -235,  -235,  -235,   136,  -235,  -235,
-    -235,   -17,  -235,   741,  -235,   658,  -235,   575,  -235,  -235,
-    -235,  -235
+     322,   -68,  -269,  -269,   220,  -269,  -269,   220,   220,   912,
+       5,  1489,  -269,  -269,  -269,   -20,    35,   811,  -269,    38,
+     220,    33,    97,    42,    76,    79,   220,   877,    86,   220,
+     220,   220,   220,   220,   220,    93,    53,   220,   220,   220,
+     220,     4,  -269,    13,  -269,  -269,  -269,    59,    69,   978,
+     220,  1458,  -269,  -269,  -269,  -269,  -269,  -269,  -269,    62,
+     220,  -269,  1458,  1458,  1458,   220,  1458,    57,   220,   220,
+     220,   220,  -269,  -269,    60,   220,  -269,   220,  -269,   120,
+    -269,  1458,    56,  -269,  -269,   946,   140,  -269,   -44,   220,
+     -32,   117,  -269,  -269,  1303,  -269,    56,  -269,  -269,    82,
+     121,  1017,  1049,  1081,  1113,  1334,  -269,   143,   121,   121,
+    1396,    52,  -269,   405,   978,   220,   978,   133,  1427,  1458,
+     220,   220,   220,   220,   220,   220,   220,   220,   220,   220,
+     220,   220,   220,   220,   220,   220,   220,   946,  1396,   -30,
+     220,    57,    48,    57,    57,   159,  1458,  1458,   220,  -269,
+    -269,   160,   220,   220,  -269,   220,   220,  1272,   220,   220,
+    -269,  -269,   220,  -269,   161,   220,   220,   220,   220,   220,
+     220,   220,   220,   220,   220,  -269,    49,  -269,  -269,  -269,
+      94,  1458,    95,  1365,   -68,   220,  -269,    20,    20,    20,
+     121,   121,   121,  1458,  1458,    20,    20,   135,   294,   294,
+     121,   121,  1458,  1458,  -269,  1458,  -269,  -269,  1458,   168,
+    -269,  1458,  1458,  1458,  1458,   220,   220,  1458,  1458,   168,
+    1458,  -269,  1458,  1145,  1458,  1177,  1458,  1209,  1458,  1241,
+    1458,  1458,  -269,  -269,   220,  -269,    -2,  -269,  -269,   737,
+    1458,  -269,     3,  1458,  1458,     3,   220,   220,   220,   220,
+     168,    50,   571,   145,   220,   571,  -269,  -269,   171,    98,
+      98,  1458,  1458,  1458,  1458,     3,  -269,  -269,  -269,   169,
+     220,  1458,    30,   -14,  -269,   175,  -269,  -269,    98,  -269,
+    1458,  -269,  -269,  -269,   174,  -269,  -269,   174,  -269,   978,
+    -269,   571,   571,  -269,  -269,   571,   571,   174,   174,  -269,
+     978,   737,  -269,   147,   155,   488,   571,   180,   182,  -269,
+     184,   165,  -269,  -269,  -269,  -269,  -269,   190,  -269,  -269,
+    -269,  -269,  -269,   737,  -269,   654,  -269,   654,  -269,  -269,
+     571,  -269,  -269
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -235,  -235,     1,    49,     4,  -222,     0,  -235,  -235,  -235,
-    -110,  -234,  -133,   -85,  -235,  -235,  -235,  -230,   -10,    -8,
-    -231,  -235,    66,     5,  -235,  -235,  -235,   139,   -16,  -235,
-    -235,  -235,  -235,  -235,  -235,  -235,  -209,  -227,  -235,   -31
+    -269,  -269,    11,   109,     6,  -228,     0,  -269,  -269,  -269,
+     -50,  -199,   -73,  -113,  -269,  -269,  -269,  -268,  -107,     2,
+    -219,  -269,     1,     7,  -269,  -269,  -269,   198,    -3,  -269,
+    -269,  -269,  -269,  -269,  -269,  -269,  -197,  -193,  -269,   -23
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -882,119 +882,114 @@ static const yytype_int16 yypgoto[] =
 #define YYTABLE_NINF -64
 static const yytype_int16 yytable[] =
 {
-      45,    70,    58,   112,    43,    52,   -10,   255,   -53,   111,
-     245,    97,   -53,   155,   158,   285,   253,   256,    57,   126,
-      57,   127,   282,    88,    89,   258,    77,   107,    79,   180,
-      72,   182,    90,   277,   139,   254,   286,   141,   142,   143,
-     144,   265,   113,   135,   136,   291,   292,   283,   156,   159,
-     295,   293,   296,   302,   300,   204,   206,    86,    87,    68,
-     140,   140,   305,   306,   302,    73,   149,   300,   178,   140,
-      62,   -53,   233,    63,    64,    66,    84,   234,    91,   312,
-     163,    92,   114,    81,   266,    93,    85,    69,    98,   140,
-     327,    57,    94,    81,   -10,   100,   101,   102,   103,   104,
-     105,   328,   106,   108,   109,   110,    66,   115,   140,   145,
-     148,   154,   164,    45,   160,   118,   119,    43,    52,   176,
-     184,   207,   210,   221,   123,   124,   137,   125,   126,   235,
-     127,   138,   237,   241,    66,    66,    66,    66,   270,   274,
-     209,   146,   275,   147,   131,   132,   133,   134,   279,   290,
-     285,   219,   135,   136,   313,   157,   315,   318,   319,   320,
-     321,   326,   179,   287,   309,   232,    96,     0,     0,     0,
-       0,     0,     0,   236,   239,     0,     0,     0,     0,     0,
-     118,   181,   183,     0,     0,   238,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,   203,   251,   304,     0,   205,     0,     0,     0,
-       0,     0,     0,     0,   208,   311,     0,     0,   211,   212,
-       0,   213,   214,     0,   217,   218,     0,     0,   220,     0,
-       0,   222,   223,   224,   225,   226,   227,   228,   229,   230,
-     231,     0,     0,   259,   269,     0,   260,   272,   273,     0,
-       0,   240,     0,     0,     0,   123,   124,     0,   125,   126,
-       0,   127,   284,   281,     0,     0,   278,     0,     0,     0,
-       0,     0,   294,     0,     0,     0,   301,   133,   134,   303,
-       0,   243,   244,   135,   136,     0,     0,   307,   308,   310,
-       0,     0,     0,     0,     0,     0,     0,     0,   317,     0,
-      66,     0,     0,   323,   322,     0,   324,     0,     0,     0,
-       0,     0,   261,   262,   263,   264,     0,     0,     0,   330,
-     271,   331,     0,     0,     0,   329,    -6,     1,     0,     0,
-       0,     0,     0,     0,     0,     0,   280,     2,     3,     4,
-       5,     0,     6,     7,     8,     9,    10,    11,    12,     0,
-      13,     0,    14,     0,     0,   118,    15,     0,    16,    17,
-      18,     0,     0,    19,     0,     0,   118,     0,    20,    21,
-      22,     0,     0,    23,     0,     0,     0,    24,    25,    26,
-      27,     0,    28,     0,     0,     0,     0,     0,     0,     0,
-       0,    29,     0,     0,     0,     0,     0,     0,    30,    31,
-      32,    33,    34,     0,     0,    35,    36,     0,     0,    37,
-      38,     0,     0,     0,    -6,    39,     0,     0,     0,    40,
-       2,     3,     4,     5,     0,     6,     7,     8,     9,    10,
-      11,    12,     0,    13,     0,    14,     0,     0,     0,    15,
-       0,    16,    17,    18,     0,     0,    19,     0,     0,     0,
-       0,    20,    21,    22,     0,     0,    23,     0,     0,     0,
-      24,    25,    26,    27,     0,    28,     0,     0,     0,     0,
-       0,     0,     0,     0,    29,     0,     0,     0,     0,     0,
-       0,    30,    31,    32,    33,    34,     0,     0,    35,    36,
-       0,     0,    37,    38,     0,     0,     0,     0,    39,     0,
-       0,     0,    40,     2,     3,     4,     5,     0,     6,     7,
-       8,     9,    10,    59,    12,     0,    13,   316,    14,     0,
-       0,     0,    15,     0,    16,    17,    18,     0,     0,     0,
-       0,     0,     0,     0,    20,    21,    22,     0,     0,    23,
-       0,     0,     0,     0,     0,    26,    27,     0,    28,     0,
-       0,     0,     0,     0,     0,     0,     0,    29,     0,     0,
+      45,   180,   155,   182,   112,    62,    43,    52,    63,    64,
+      66,   256,    58,   -10,   158,   285,   300,   111,    81,   255,
+      57,    85,   245,    72,    97,   253,    68,    94,    81,   300,
+     100,   101,   102,   103,   104,   105,   286,   156,   108,   109,
+     110,    66,   139,   209,   254,   141,   142,   143,   144,   159,
+     118,   119,   113,   265,   219,   282,    73,   291,   292,    84,
+     204,   137,   295,    91,   296,   140,   138,   277,   232,    66,
+      66,    66,    66,   312,   305,   306,   146,   239,   147,   149,
+     283,    86,    87,   123,   124,   293,   125,   126,   302,   127,
+     157,    57,    57,   163,    77,   328,    79,    92,   258,   302,
+      93,   -10,   130,   131,   132,   133,   134,    98,   330,    88,
+      89,   135,   136,    45,   106,   118,   181,   183,    90,    43,
+      52,   187,   188,   189,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   201,   202,   203,   206,   233,
+     266,   205,   107,   140,   234,   140,   178,   140,   114,   208,
+     115,    69,   140,   211,   212,   145,   213,   214,   148,   217,
+     218,   154,   160,   220,   176,   284,   222,   223,   224,   225,
+     226,   227,   228,   229,   230,   231,   304,   164,   184,   301,
+     207,   210,   221,   236,   235,   237,   240,   311,   126,   241,
+     127,   270,   274,   275,   279,   238,   290,   313,   123,   124,
+     315,   125,   126,   285,   127,   318,   323,   319,   325,   320,
+     321,   251,   135,   136,   327,   326,   243,   244,   131,   132,
+     133,   134,   179,   287,   309,    96,   135,   136,     0,     0,
+       0,     2,     3,     4,     5,    66,     6,     0,     0,     0,
+       0,    59,    12,     0,    13,     0,     0,   261,   262,   263,
+     264,     0,     0,   259,   269,   271,   260,   272,   273,     0,
+       0,     0,    60,     0,    22,     0,     0,     0,     0,     0,
+       0,   280,     0,   281,     0,     0,   278,     0,     0,     0,
+       0,     0,   294,     0,     0,    29,     0,     0,     0,   303,
+     118,     0,    30,    31,    32,    33,    34,   307,   308,   310,
+       0,   118,     0,    37,    38,     0,     0,     0,   317,    39,
+       0,     0,     0,    40,   322,     0,   324,     0,     0,     0,
+       0,     0,    -6,     1,     0,   329,     0,   329,     0,     0,
+       0,   331,   332,     2,     3,     4,     5,     0,     6,     7,
+       8,     9,    10,    11,    12,     0,    13,     0,    14,     0,
+       0,     0,    15,     0,    16,    17,    18,   123,   124,    19,
+     125,   126,     0,   127,    20,    21,    22,     0,     0,    23,
+       0,     0,     0,    24,    25,    26,    27,     0,    28,   133,
+     134,     0,     0,     0,     0,   135,   136,    29,     0,     0,
        0,     0,     0,     0,    30,    31,    32,    33,    34,     0,
-       0,     0,    36,     0,     0,    37,    38,     0,     0,     0,
-      57,    39,     0,     0,     0,    40,     2,     3,     4,     5,
-       0,     6,     7,     8,     9,    10,    59,    12,     0,    13,
+       0,    35,    36,     0,     0,    37,    38,     0,     0,     0,
+      -6,    39,     0,     0,     0,    40,     2,     3,     4,     5,
+       0,     6,     7,     8,     9,    10,    11,    12,     0,    13,
        0,    14,     0,     0,     0,    15,     0,    16,    17,    18,
-       0,     0,     0,     0,     0,     0,     0,    20,    21,    22,
-       0,     0,    23,     0,     0,     0,     0,     0,    26,    27,
+       0,     0,    19,     0,     0,     0,     0,    20,    21,    22,
+       0,     0,    23,     0,     0,     0,    24,    25,    26,    27,
        0,    28,     0,     0,     0,     0,     0,     0,     0,     0,
       29,     0,     0,     0,     0,     0,     0,    30,    31,    32,
-      33,    34,     0,     0,     0,    36,     0,     0,    37,    38,
-       0,     0,     0,    57,    39,     0,     0,     0,    40,     2,
+      33,    34,     0,     0,    35,    36,     0,     0,    37,    38,
+       0,     0,     0,     0,    39,     0,     0,     0,    40,     2,
        3,     4,     5,     0,     6,     7,     8,     9,    10,    59,
-      12,     0,    13,     0,    14,     0,     0,     0,    15,     0,
+      12,     0,    13,   316,    14,     0,     0,     0,    15,     0,
       16,    17,    18,     0,     0,     0,     0,     0,     0,     0,
       20,    21,    22,     0,     0,    23,     0,     0,     0,     0,
        0,    26,    27,     0,    28,     0,     0,     0,     0,     0,
        0,     0,     0,    29,     0,     0,     0,     0,     0,     0,
       30,    31,    32,    33,    34,     0,     0,     0,    36,     0,
-       0,    37,    38,     0,     0,     0,     0,    39,     0,     0,
+       0,    37,    38,     0,     0,     0,    57,    39,     0,     0,
        0,    40,     2,     3,     4,     5,     0,     6,     7,     8,
        9,    10,    59,    12,     0,    13,     0,    14,     0,     0,
-       0,    15,     0,    16,    17,     0,     0,     0,     0,     0,
-       0,     0,     0,    20,     0,    22,     0,     0,     0,     0,
+       0,    15,     0,    16,    17,    18,     0,     0,     0,     0,
+       0,     0,     0,    20,    21,    22,     0,     0,    23,     0,
        0,     0,     0,     0,    26,    27,     0,    28,     0,     0,
        0,     0,     0,     0,     0,     0,    29,     0,     0,     0,
        0,     0,     0,    30,    31,    32,    33,    34,     0,     0,
-       0,    36,     0,     0,    37,    38,     2,     3,     4,     5,
-      39,     6,     0,     0,    40,     0,    59,    12,     0,    13,
-       0,   123,   124,     0,   125,   126,    75,   127,     0,     0,
-       0,    76,     0,    77,    78,    79,    80,    60,     0,    22,
-     130,   131,   132,   133,   134,     0,     0,     0,     0,   135,
-     136,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      29,     0,     0,     0,     0,     0,     0,    30,    31,    32,
-      33,    34,     2,     3,     4,     5,     0,     6,    37,    38,
-       0,     0,    59,    12,    39,    13,     0,     0,    40,     0,
-       0,     0,    75,     0,     0,     0,     0,     0,     0,    77,
-       0,    79,     0,    60,     0,    22,     0,     2,     3,     4,
-       5,     0,     6,     0,     0,     0,    95,    59,    12,     0,
-      13,     0,     0,     0,     0,     0,    29,     0,     0,     0,
-       0,     0,     0,    30,    31,    32,    33,    34,    60,     0,
-      22,     0,     0,     0,    37,    38,     0,     0,     0,     0,
-      39,     0,     0,     0,    40,     0,     0,     0,     0,     0,
-       0,    29,     0,     0,     0,     0,     0,     0,    30,    31,
-      32,    33,    34,     2,     3,     4,     5,     0,     6,    37,
-      38,     0,     0,    59,    12,    39,    13,     0,     0,    40,
-       0,     0,     0,     0,     0,     0,     0,     0,     2,     3,
-       4,     5,     0,     6,    60,     0,    22,     0,    59,    12,
-       0,    13,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    29,     0,    60,
-       0,    22,     0,     0,    30,    31,    32,    33,    34,     0,
-       0,     0,     0,     0,     0,    37,    38,     0,     0,     0,
-     151,    65,    29,     0,     0,    40,     0,     0,     0,    30,
-      31,    32,    33,    34,     0,     0,     0,     0,     0,     0,
-      37,    38,   120,   121,     0,     0,   116,   122,   123,   124,
-      40,   125,   152,   153,   127,   128,   129,   165,     0,     0,
-       0,     0,     0,   166,     0,     0,     0,   130,   131,   132,
-     133,   134,     0,     0,   120,   121,   135,   136,     0,   122,
+       0,    36,     0,     0,    37,    38,     0,     0,     0,    57,
+      39,     0,     0,     0,    40,     2,     3,     4,     5,     0,
+       6,     7,     8,     9,    10,    59,    12,     0,    13,     0,
+      14,     0,     0,     0,    15,     0,    16,    17,    18,     0,
+       0,     0,     0,     0,     0,     0,    20,    21,    22,     0,
+       0,    23,     0,     0,     0,     0,     0,    26,    27,     0,
+      28,     0,     0,     0,     0,     0,     0,     0,     0,    29,
+       0,     0,     0,     0,     0,     0,    30,    31,    32,    33,
+      34,     0,     0,     0,    36,     0,     0,    37,    38,     0,
+       0,     0,     0,    39,     0,     0,     0,    40,     2,     3,
+       4,     5,     0,     6,     7,     8,     9,    10,    59,    12,
+       0,    13,     0,    14,     0,     0,     0,    15,     0,    16,
+      17,     0,     0,     0,     0,     0,     0,     0,     0,    20,
+       0,    22,     0,     0,     0,     0,     0,     0,     0,     0,
+      26,    27,     0,    28,     0,     0,     0,     0,     0,     0,
+       0,     0,    29,     0,     0,     0,     0,     0,     0,    30,
+      31,    32,    33,    34,     0,     0,     0,    36,     0,     0,
+      37,    38,     2,     3,     4,     5,    39,     6,     0,     0,
+      40,     0,    59,    12,     0,    13,     0,     0,     0,     0,
+       0,     0,    75,     0,     0,     0,     0,    76,     0,    77,
+      78,    79,    80,    60,     0,    22,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    29,     0,     0,     0,
+       0,     0,     0,    30,    31,    32,    33,    34,     2,     3,
+       4,     5,     0,     6,    37,    38,     0,     0,    59,    12,
+      39,    13,     0,     0,    40,     0,     0,     0,    75,     0,
+       0,     0,     0,     0,     0,    77,     0,    79,     0,    60,
+       0,    22,     0,     2,     3,     4,     5,     0,     6,     0,
+       0,     0,    95,    59,    12,     0,    13,     0,     0,     0,
+       0,     0,    29,     0,     0,     0,     0,     0,     0,    30,
+      31,    32,    33,    34,    60,     0,    22,     0,     0,     0,
+      37,    38,     0,     0,     0,     0,    39,     0,     0,     0,
+      40,     0,     0,     0,     0,     0,     0,    29,     0,     0,
+       0,   151,     0,     0,    30,    31,    32,    33,    34,     2,
+       3,     4,     5,     0,     6,    37,    38,     0,     0,    59,
+      12,    65,    13,   120,   121,    40,     0,     0,   122,   123,
+     124,     0,   125,   152,   153,   127,   128,   129,     0,     0,
+      60,     0,    22,     0,     0,     0,     0,     0,   130,   131,
+     132,   133,   134,     0,     0,     0,     0,   135,   136,     0,
+       0,     0,     0,    29,     0,     0,     0,     0,     0,     0,
+      30,    31,    32,    33,    34,     0,     0,   165,     0,     0,
+       0,    37,    38,   166,     0,     0,     0,   116,     0,     0,
+       0,    40,     0,     0,   120,   121,     0,     0,     0,   122,
      123,   124,     0,   125,   126,     0,   127,   128,   129,   167,
        0,     0,     0,     0,     0,   168,     0,     0,     0,   130,
      131,   132,   133,   134,     0,     0,   120,   121,   135,   136,
@@ -1050,119 +1045,114 @@ static const yytype_int16 yytable[] =
 
 static const yytype_int16 yycheck[] =
 {
-       0,    11,     1,     0,     0,     0,     0,   238,    25,    40,
-     219,    27,    29,    46,    46,    29,    27,   239,    88,    67,
-      88,    69,    25,    12,    13,    95,    38,    89,    40,   114,
-      43,   116,    21,   260,    65,    46,    50,    68,    69,    70,
-      71,   250,    41,    91,    92,   276,   277,    50,    81,    81,
-     281,   278,   283,   287,   284,    90,    90,    48,    49,    21,
-      95,    95,   293,   294,   298,    21,    82,   297,    94,    95,
-       4,    88,    90,     7,     8,     9,    21,    95,    21,   301,
-      96,    21,    89,    17,    90,    21,    20,    89,    21,    95,
-     321,    88,    26,    27,    88,    29,    30,    31,    32,    33,
-      34,   323,    21,    37,    38,    39,    40,    81,    95,    95,
-      38,    21,    95,   113,    45,    49,    50,   113,   113,    21,
-      45,    21,    21,    21,    63,    64,    60,    66,    67,    90,
-      69,    65,    90,    21,    68,    69,    70,    71,    46,    21,
-     150,    75,    95,    77,    83,    84,    85,    86,    25,    21,
-      29,   161,    91,    92,    50,    89,    45,    25,    25,    25,
-      45,    25,   113,   273,   297,   175,    27,    -1,    -1,    -1,
-      -1,    -1,    -1,   181,   184,    -1,    -1,    -1,    -1,    -1,
-     114,   115,   116,    -1,    -1,   184,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,   132,   133,
-     134,   135,   136,   234,   289,    -1,   140,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   148,   300,    -1,    -1,   152,   153,
-      -1,   155,   156,    -1,   158,   159,    -1,    -1,   162,    -1,
-      -1,   165,   166,   167,   168,   169,   170,   171,   172,   173,
-     174,    -1,    -1,   242,   252,    -1,   245,   255,   256,    -1,
-      -1,   185,    -1,    -1,    -1,    63,    64,    -1,    66,    67,
-      -1,    69,   272,   271,    -1,    -1,   265,    -1,    -1,    -1,
-      -1,    -1,   280,    -1,    -1,    -1,   286,    85,    86,   287,
-      -1,   215,   216,    91,    92,    -1,    -1,   295,   296,   297,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   306,    -1,
-     234,    -1,    -1,   313,   312,    -1,   314,    -1,    -1,    -1,
-      -1,    -1,   246,   247,   248,   249,    -1,    -1,    -1,   327,
-     254,   329,    -1,    -1,    -1,   325,     0,     1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   270,    11,    12,    13,
-      14,    -1,    16,    17,    18,    19,    20,    21,    22,    -1,
-      24,    -1,    26,    -1,    -1,   289,    30,    -1,    32,    33,
-      34,    -1,    -1,    37,    -1,    -1,   300,    -1,    42,    43,
-      44,    -1,    -1,    47,    -1,    -1,    -1,    51,    52,    53,
-      54,    -1,    56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    -1,    -1,    79,    80,    -1,    -1,    83,
-      84,    -1,    -1,    -1,    88,    89,    -1,    -1,    -1,    93,
-      11,    12,    13,    14,    -1,    16,    17,    18,    19,    20,
-      21,    22,    -1,    24,    -1,    26,    -1,    -1,    -1,    30,
-      -1,    32,    33,    34,    -1,    -1,    37,    -1,    -1,    -1,
-      -1,    42,    43,    44,    -1,    -1,    47,    -1,    -1,    -1,
-      51,    52,    53,    54,    -1,    56,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,
-      -1,    72,    73,    74,    75,    76,    -1,    -1,    79,    80,
-      -1,    -1,    83,    84,    -1,    -1,    -1,    -1,    89,    -1,
-      -1,    -1,    93,    11,    12,    13,    14,    -1,    16,    17,
-      18,    19,    20,    21,    22,    -1,    24,    25,    26,    -1,
-      -1,    -1,    30,    -1,    32,    33,    34,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    42,    43,    44,    -1,    -1,    47,
-      -1,    -1,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,
+       0,   114,    46,   116,     0,     4,     0,     0,     7,     8,
+       9,   239,     1,     0,    46,    29,   284,    40,    17,   238,
+      88,    20,   219,    43,    27,    27,    21,    26,    27,   297,
+      29,    30,    31,    32,    33,    34,    50,    81,    37,    38,
+      39,    40,    65,   150,    46,    68,    69,    70,    71,    81,
+      49,    50,    41,   250,   161,    25,    21,   276,   277,    21,
+      90,    60,   281,    21,   283,    95,    65,   260,   175,    68,
+      69,    70,    71,   301,   293,   294,    75,   184,    77,    82,
+      50,    48,    49,    63,    64,   278,    66,    67,   287,    69,
+      89,    88,    88,    96,    38,   323,    40,    21,    95,   298,
+      21,    88,    82,    83,    84,    85,    86,    21,   327,    12,
+      13,    91,    92,   113,    21,   114,   115,   116,    21,   113,
+     113,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,    90,    90,
+      90,   140,    89,    95,    95,    95,    94,    95,    89,   148,
+      81,    89,    95,   152,   153,    95,   155,   156,    38,   158,
+     159,    21,    45,   162,    21,   272,   165,   166,   167,   168,
+     169,   170,   171,   172,   173,   174,   289,    95,    45,   286,
+      21,    21,    21,   181,    90,    90,   185,   300,    67,    21,
+      69,    46,    21,    95,    25,   184,    21,    50,    63,    64,
+      45,    66,    67,    29,    69,    25,   313,    25,   315,    25,
+      45,   234,    91,    92,   321,    25,   215,   216,    83,    84,
+      85,    86,   113,   273,   297,    27,    91,    92,    -1,    -1,
+      -1,    11,    12,    13,    14,   234,    16,    -1,    -1,    -1,
+      -1,    21,    22,    -1,    24,    -1,    -1,   246,   247,   248,
+     249,    -1,    -1,   242,   252,   254,   245,   255,   256,    -1,
+      -1,    -1,    42,    -1,    44,    -1,    -1,    -1,    -1,    -1,
+      -1,   270,    -1,   271,    -1,    -1,   265,    -1,    -1,    -1,
+      -1,    -1,   280,    -1,    -1,    65,    -1,    -1,    -1,   287,
+     289,    -1,    72,    73,    74,    75,    76,   295,   296,   297,
+      -1,   300,    -1,    83,    84,    -1,    -1,    -1,   306,    89,
+      -1,    -1,    -1,    93,   312,    -1,   314,    -1,    -1,    -1,
+      -1,    -1,     0,     1,    -1,   325,    -1,   327,    -1,    -1,
+      -1,   329,   330,    11,    12,    13,    14,    -1,    16,    17,
+      18,    19,    20,    21,    22,    -1,    24,    -1,    26,    -1,
+      -1,    -1,    30,    -1,    32,    33,    34,    63,    64,    37,
+      66,    67,    -1,    69,    42,    43,    44,    -1,    -1,    47,
+      -1,    -1,    -1,    51,    52,    53,    54,    -1,    56,    85,
+      86,    -1,    -1,    -1,    -1,    91,    92,    65,    -1,    -1,
       -1,    -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,
-      -1,    -1,    80,    -1,    -1,    83,    84,    -1,    -1,    -1,
+      -1,    79,    80,    -1,    -1,    83,    84,    -1,    -1,    -1,
       88,    89,    -1,    -1,    -1,    93,    11,    12,    13,    14,
       -1,    16,    17,    18,    19,    20,    21,    22,    -1,    24,
       -1,    26,    -1,    -1,    -1,    30,    -1,    32,    33,    34,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,    43,    44,
-      -1,    -1,    47,    -1,    -1,    -1,    -1,    -1,    53,    54,
+      -1,    -1,    37,    -1,    -1,    -1,    -1,    42,    43,    44,
+      -1,    -1,    47,    -1,    -1,    -1,    51,    52,    53,    54,
       -1,    56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       65,    -1,    -1,    -1,    -1,    -1,    -1,    72,    73,    74,
-      75,    76,    -1,    -1,    -1,    80,    -1,    -1,    83,    84,
-      -1,    -1,    -1,    88,    89,    -1,    -1,    -1,    93,    11,
+      75,    76,    -1,    -1,    79,    80,    -1,    -1,    83,    84,
+      -1,    -1,    -1,    -1,    89,    -1,    -1,    -1,    93,    11,
       12,    13,    14,    -1,    16,    17,    18,    19,    20,    21,
-      22,    -1,    24,    -1,    26,    -1,    -1,    -1,    30,    -1,
+      22,    -1,    24,    25,    26,    -1,    -1,    -1,    30,    -1,
       32,    33,    34,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       42,    43,    44,    -1,    -1,    47,    -1,    -1,    -1,    -1,
       -1,    53,    54,    -1,    56,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,
       72,    73,    74,    75,    76,    -1,    -1,    -1,    80,    -1,
-      -1,    83,    84,    -1,    -1,    -1,    -1,    89,    -1,    -1,
+      -1,    83,    84,    -1,    -1,    -1,    88,    89,    -1,    -1,
       -1,    93,    11,    12,    13,    14,    -1,    16,    17,    18,
       19,    20,    21,    22,    -1,    24,    -1,    26,    -1,    -1,
-      -1,    30,    -1,    32,    33,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    42,    -1,    44,    -1,    -1,    -1,    -1,
+      -1,    30,    -1,    32,    33,    34,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    42,    43,    44,    -1,    -1,    47,    -1,
       -1,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,
       -1,    -1,    -1,    72,    73,    74,    75,    76,    -1,    -1,
-      -1,    80,    -1,    -1,    83,    84,    11,    12,    13,    14,
-      89,    16,    -1,    -1,    93,    -1,    21,    22,    -1,    24,
-      -1,    63,    64,    -1,    66,    67,    31,    69,    -1,    -1,
-      -1,    36,    -1,    38,    39,    40,    41,    42,    -1,    44,
-      82,    83,    84,    85,    86,    -1,    -1,    -1,    -1,    91,
-      92,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      65,    -1,    -1,    -1,    -1,    -1,    -1,    72,    73,    74,
-      75,    76,    11,    12,    13,    14,    -1,    16,    83,    84,
-      -1,    -1,    21,    22,    89,    24,    -1,    -1,    93,    -1,
-      -1,    -1,    31,    -1,    -1,    -1,    -1,    -1,    -1,    38,
-      -1,    40,    -1,    42,    -1,    44,    -1,    11,    12,    13,
-      14,    -1,    16,    -1,    -1,    -1,    55,    21,    22,    -1,
-      24,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,
-      -1,    -1,    -1,    72,    73,    74,    75,    76,    42,    -1,
-      44,    -1,    -1,    -1,    83,    84,    -1,    -1,    -1,    -1,
-      89,    -1,    -1,    -1,    93,    -1,    -1,    -1,    -1,    -1,
-      -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    72,    73,
-      74,    75,    76,    11,    12,    13,    14,    -1,    16,    83,
-      84,    -1,    -1,    21,    22,    89,    24,    -1,    -1,    93,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    11,    12,
-      13,    14,    -1,    16,    42,    -1,    44,    -1,    21,    22,
-      -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,    -1,    42,
-      -1,    44,    -1,    -1,    72,    73,    74,    75,    76,    -1,
-      -1,    -1,    -1,    -1,    -1,    83,    84,    -1,    -1,    -1,
-      35,    89,    65,    -1,    -1,    93,    -1,    -1,    -1,    72,
-      73,    74,    75,    76,    -1,    -1,    -1,    -1,    -1,    -1,
-      83,    84,    57,    58,    -1,    -1,    89,    62,    63,    64,
-      93,    66,    67,    68,    69,    70,    71,    40,    -1,    -1,
-      -1,    -1,    -1,    46,    -1,    -1,    -1,    82,    83,    84,
-      85,    86,    -1,    -1,    57,    58,    91,    92,    -1,    62,
+      -1,    80,    -1,    -1,    83,    84,    -1,    -1,    -1,    88,
+      89,    -1,    -1,    -1,    93,    11,    12,    13,    14,    -1,
+      16,    17,    18,    19,    20,    21,    22,    -1,    24,    -1,
+      26,    -1,    -1,    -1,    30,    -1,    32,    33,    34,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    42,    43,    44,    -1,
+      -1,    47,    -1,    -1,    -1,    -1,    -1,    53,    54,    -1,
+      56,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    65,
+      -1,    -1,    -1,    -1,    -1,    -1,    72,    73,    74,    75,
+      76,    -1,    -1,    -1,    80,    -1,    -1,    83,    84,    -1,
+      -1,    -1,    -1,    89,    -1,    -1,    -1,    93,    11,    12,
+      13,    14,    -1,    16,    17,    18,    19,    20,    21,    22,
+      -1,    24,    -1,    26,    -1,    -1,    -1,    30,    -1,    32,
+      33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    42,
+      -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      53,    54,    -1,    56,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    72,
+      73,    74,    75,    76,    -1,    -1,    -1,    80,    -1,    -1,
+      83,    84,    11,    12,    13,    14,    89,    16,    -1,    -1,
+      93,    -1,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
+      -1,    -1,    31,    -1,    -1,    -1,    -1,    36,    -1,    38,
+      39,    40,    41,    42,    -1,    44,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,
+      -1,    -1,    -1,    72,    73,    74,    75,    76,    11,    12,
+      13,    14,    -1,    16,    83,    84,    -1,    -1,    21,    22,
+      89,    24,    -1,    -1,    93,    -1,    -1,    -1,    31,    -1,
+      -1,    -1,    -1,    -1,    -1,    38,    -1,    40,    -1,    42,
+      -1,    44,    -1,    11,    12,    13,    14,    -1,    16,    -1,
+      -1,    -1,    55,    21,    22,    -1,    24,    -1,    -1,    -1,
+      -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    72,
+      73,    74,    75,    76,    42,    -1,    44,    -1,    -1,    -1,
+      83,    84,    -1,    -1,    -1,    -1,    89,    -1,    -1,    -1,
+      93,    -1,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,
+      -1,    35,    -1,    -1,    72,    73,    74,    75,    76,    11,
+      12,    13,    14,    -1,    16,    83,    84,    -1,    -1,    21,
+      22,    89,    24,    57,    58,    93,    -1,    -1,    62,    63,
+      64,    -1,    66,    67,    68,    69,    70,    71,    -1,    -1,
+      42,    -1,    44,    -1,    -1,    -1,    -1,    -1,    82,    83,
+      84,    85,    86,    -1,    -1,    -1,    -1,    91,    92,    -1,
+      -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,
+      72,    73,    74,    75,    76,    -1,    -1,    40,    -1,    -1,
+      -1,    83,    84,    46,    -1,    -1,    -1,    89,    -1,    -1,
+      -1,    93,    -1,    -1,    57,    58,    -1,    -1,    -1,    62,
       63,    64,    -1,    66,    67,    -1,    69,    70,    71,    40,
       -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    82,
       83,    84,    85,    86,    -1,    -1,    57,    58,    91,    92,
@@ -1252,8 +1242,8 @@ static const yytype_uint8 yystos[] =
       21,   116,   116,   133,   115,   116,   116,   105,   106,   108,
      113,   114,   107,   115,   109,   116,   116,   115,   115,   108,
      115,   109,   101,    50,   104,    45,    25,   115,    25,    25,
-      25,    45,   115,   114,   115,   114,    25,   116,   101,   102,
-     115,   115
+      25,    45,   115,   114,   115,   114,    25,   114,   101,   102,
+     116,   115,   115
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -2348,10 +2338,10 @@ yyreduce:
 #line 336 "engines/director/lingo/lingo-gr.y"
     {
 		inst then = 0;
-		WRITE_UINT32(&then, (yyvsp[(4) - (5)].code));
-		(*g_lingo->_currentScript)[(yyvsp[(1) - (5)].code) + 1] = then;	/* thenpart */
+		WRITE_UINT32(&then, (yyvsp[(5) - (6)].code));
+		(*g_lingo->_currentScript)[(yyvsp[(1) - (6)].code) + 1] = then;	/* thenpart */
 
-		g_lingo->codeLabel((yyvsp[(1) - (5)].code)); ;}
+		g_lingo->codeLabel((yyvsp[(1) - (6)].code)); ;}
     break;
 
   case 44:
@@ -2925,7 +2915,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 2929 "engines/director/lingo/lingo-gr.cpp"
+#line 2919 "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 45f340e..d0fec59 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -333,9 +333,9 @@ elseifstmtoneliner1:	elseif cond tTHEN begin stmt end {
 	;
 
 elseifstmt1: elseifstmtoneliner
-	| elseif cond tTHEN stmtlist end {
+	| elseif cond tTHEN begin stmtlist end {
 		inst then = 0;
-		WRITE_UINT32(&then, $4);
+		WRITE_UINT32(&then, $5);
 		(*g_lingo->_currentScript)[$1 + 1] = then;	/* thenpart */
 
 		g_lingo->codeLabel($1); }





More information about the Scummvm-git-logs mailing list