aboutsummaryrefslogtreecommitdiff
path: root/engines/director
diff options
context:
space:
mode:
authorEugene Sandulenko2019-12-08 15:21:28 +0100
committerEugene Sandulenko2019-12-08 15:21:28 +0100
commit17d4a24366aa4b74195253f1ac44bcc63593779f (patch)
treebb82a25e37f2b3e03c491493924ce543d3069aae /engines/director
parent8c7ee0e0513978d65b446151b4c10f65b9c812bc (diff)
downloadscummvm-rg350-17d4a24366aa4b74195253f1ac44bcc63593779f.tar.gz
scummvm-rg350-17d4a24366aa4b74195253f1ac44bcc63593779f.tar.bz2
scummvm-rg350-17d4a24366aa4b74195253f1ac44bcc63593779f.zip
DIRECTOR: LINGO: Fixed operator precedence in grammar
Diffstat (limited to 'engines/director')
-rw-r--r--engines/director/lingo/lingo-gr.cpp954
-rw-r--r--engines/director/lingo/lingo-gr.h106
-rw-r--r--engines/director/lingo/lingo-gr.y4
3 files changed, 514 insertions, 550 deletions
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 0a23421932..386e50b40a 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -131,33 +131,31 @@
tINSTANCE = 320,
tGE = 321,
tLE = 322,
- tGT = 323,
- tLT = 324,
- tEQ = 325,
- tNEQ = 326,
- tAND = 327,
- tOR = 328,
- tNOT = 329,
- tMOD = 330,
- tAFTER = 331,
- tBEFORE = 332,
- tCONCAT = 333,
- tCONTAINS = 334,
- tSTARTS = 335,
- tCHAR = 336,
- tITEM = 337,
- tLINE = 338,
- tWORD = 339,
- tSPRITE = 340,
- tINTERSECTS = 341,
- tWITHIN = 342,
- tTELL = 343,
- tPROPERTY = 344,
- tON = 345,
- tME = 346,
- tENDIF = 347,
- tENDREPEAT = 348,
- tENDTELL = 349
+ tEQ = 323,
+ tNEQ = 324,
+ tAND = 325,
+ tOR = 326,
+ tNOT = 327,
+ tMOD = 328,
+ tAFTER = 329,
+ tBEFORE = 330,
+ tCONCAT = 331,
+ tCONTAINS = 332,
+ tSTARTS = 333,
+ tCHAR = 334,
+ tITEM = 335,
+ tLINE = 336,
+ tWORD = 337,
+ tSPRITE = 338,
+ tINTERSECTS = 339,
+ tWITHIN = 340,
+ tTELL = 341,
+ tPROPERTY = 342,
+ tON = 343,
+ tME = 344,
+ tENDIF = 345,
+ tENDREPEAT = 346,
+ tENDTELL = 347
};
#endif
/* Tokens. */
@@ -226,33 +224,31 @@
#define tINSTANCE 320
#define tGE 321
#define tLE 322
-#define tGT 323
-#define tLT 324
-#define tEQ 325
-#define tNEQ 326
-#define tAND 327
-#define tOR 328
-#define tNOT 329
-#define tMOD 330
-#define tAFTER 331
-#define tBEFORE 332
-#define tCONCAT 333
-#define tCONTAINS 334
-#define tSTARTS 335
-#define tCHAR 336
-#define tITEM 337
-#define tLINE 338
-#define tWORD 339
-#define tSPRITE 340
-#define tINTERSECTS 341
-#define tWITHIN 342
-#define tTELL 343
-#define tPROPERTY 344
-#define tON 345
-#define tME 346
-#define tENDIF 347
-#define tENDREPEAT 348
-#define tENDTELL 349
+#define tEQ 323
+#define tNEQ 324
+#define tAND 325
+#define tOR 326
+#define tNOT 327
+#define tMOD 328
+#define tAFTER 329
+#define tBEFORE 330
+#define tCONCAT 331
+#define tCONTAINS 332
+#define tSTARTS 333
+#define tCHAR 334
+#define tITEM 335
+#define tLINE 336
+#define tWORD 337
+#define tSPRITE 338
+#define tINTERSECTS 339
+#define tWITHIN 340
+#define tTELL 341
+#define tPROPERTY 342
+#define tON 343
+#define tME 344
+#define tENDIF 345
+#define tENDREPEAT 346
+#define tENDTELL 347
@@ -320,7 +316,7 @@ typedef union YYSTYPE
Common::Array<double> *arr;
}
/* Line 193 of yacc.c. */
-#line 324 "engines/director/lingo/lingo-gr.cpp"
+#line 320 "engines/director/lingo/lingo-gr.cpp"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -333,7 +329,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 337 "engines/director/lingo/lingo-gr.cpp"
+#line 333 "engines/director/lingo/lingo-gr.cpp"
#ifdef short
# undef short
@@ -548,10 +544,10 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 126
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1554
+#define YYLAST 1412
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 109
+#define YYNTOKENS 107
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 40
/* YYNRULES -- Number of rules. */
@@ -561,7 +557,7 @@ union yyalloc
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 349
+#define YYMAXUTOK 347
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -573,12 +569,12 @@ static const yytype_uint8 yytranslate[] =
101, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 100, 95, 2,
- 102, 103, 98, 96, 108, 97, 2, 99, 2, 2,
+ 102, 103, 98, 96, 106, 97, 2, 99, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 105, 2, 104, 2, 2, 2, 2, 2, 2, 2,
+ 93, 2, 94, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 106, 2, 107, 2, 2, 2, 2, 2, 2,
+ 2, 104, 2, 105, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -603,7 +599,7 @@ static const yytype_uint8 yytranslate[] =
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94
+ 85, 86, 87, 88, 89, 90, 91, 92
};
#if YYDEBUG
@@ -632,63 +628,63 @@ static const yytype_uint16 yyprhs[] =
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 110, 0, -1, 110, 101, 111, -1, 111, -1, 1,
- 101, -1, -1, 139, -1, 114, -1, 51, 128, 44,
- 30, -1, 51, 128, 44, 129, -1, 51, 128, 76,
- 128, -1, 51, 128, 77, 128, -1, 53, 30, 70,
- 128, -1, 53, 15, 70, 128, -1, 53, 30, 55,
- 128, -1, 53, 15, 55, 128, -1, 53, 16, 128,
- 55, 128, -1, 53, 16, 127, 70, 128, -1, 146,
- -1, 128, -1, 130, -1, 113, -1, 115, -1, 118,
- 128, 123, 124, 123, 93, -1, 119, 70, 128, 123,
- 55, 128, 123, 124, 123, 93, -1, 119, 70, 128,
- 123, 36, 55, 128, 123, 124, 123, 93, -1, 125,
- 113, 123, -1, 126, 128, 101, 124, 123, 94, -1,
- 126, 128, 55, 128, -1, 120, 128, 123, 54, 124,
- 123, 116, 123, 92, -1, 120, 128, 123, 54, 124,
- 123, 116, 123, 37, 122, 124, 123, 92, -1, -1,
- 117, 116, -1, 121, 128, 123, 54, 124, 123, -1,
+ 108, 0, -1, 108, 101, 109, -1, 109, -1, 1,
+ 101, -1, -1, 137, -1, 112, -1, 51, 126, 44,
+ 30, -1, 51, 126, 44, 127, -1, 51, 126, 74,
+ 126, -1, 51, 126, 75, 126, -1, 53, 30, 68,
+ 126, -1, 53, 15, 68, 126, -1, 53, 30, 55,
+ 126, -1, 53, 15, 55, 126, -1, 53, 16, 126,
+ 55, 126, -1, 53, 16, 125, 68, 126, -1, 144,
+ -1, 126, -1, 128, -1, 111, -1, 113, -1, 116,
+ 126, 121, 122, 121, 91, -1, 117, 68, 126, 121,
+ 55, 126, 121, 122, 121, 91, -1, 117, 68, 126,
+ 121, 36, 55, 126, 121, 122, 121, 91, -1, 123,
+ 111, 121, -1, 124, 126, 101, 122, 121, 92, -1,
+ 124, 126, 55, 126, -1, 118, 126, 121, 54, 122,
+ 121, 114, 121, 90, -1, 118, 126, 121, 54, 122,
+ 121, 114, 121, 37, 120, 122, 121, 90, -1, -1,
+ 115, 114, -1, 119, 126, 121, 54, 122, 121, -1,
52, 58, -1, 52, 57, 30, -1, 43, -1, 38,
- -1, -1, -1, -1, 124, 101, -1, 124, 114, -1,
- 56, 30, 54, -1, 88, -1, 12, -1, 17, -1,
- 33, -1, 31, -1, 30, -1, 127, -1, 129, -1,
- 25, -1, 26, 128, -1, 27, 148, -1, 30, 102,
- 147, 103, -1, 15, -1, 16, 128, -1, 112, -1,
- 128, 96, 128, -1, 128, 97, 128, -1, 128, 98,
- 128, -1, 128, 99, 128, -1, 128, 75, 128, -1,
- 128, 104, 128, -1, 128, 105, 128, -1, 128, 70,
- 128, -1, 128, 71, 128, -1, 128, 66, 128, -1,
- 128, 67, 128, -1, 128, 72, 128, -1, 128, 73,
- 128, -1, 74, 128, -1, 128, 95, 128, -1, 128,
- 78, 128, -1, 128, 79, 128, -1, 128, 80, 128,
- -1, 96, 128, -1, 97, 128, -1, 102, 128, 103,
- -1, 106, 147, 107, -1, 85, 128, 86, 128, -1,
- 85, 128, 87, 128, -1, 81, 128, 49, 128, -1,
- 81, 128, 55, 128, 49, 128, -1, 82, 128, 49,
- 128, -1, 82, 128, 55, 128, 49, 128, -1, 83,
- 128, 49, 128, -1, 83, 128, 55, 128, 49, 128,
- -1, 84, 128, 49, 128, -1, 84, 128, 55, 128,
- 49, 128, -1, 91, -1, 29, 128, -1, 51, 128,
- -1, 134, -1, 137, -1, 39, 52, -1, 39, -1,
- 41, 131, -1, 89, 132, -1, 65, 133, -1, 19,
- -1, 21, 128, -1, 20, 128, -1, 20, -1, 22,
- 148, -1, 91, 102, 30, 103, -1, 91, 102, 30,
- 108, 147, 103, -1, 62, 128, 57, 128, -1, 62,
- 128, -1, 23, 30, 147, -1, 30, -1, 131, 108,
- 30, -1, 30, -1, 132, 108, 30, -1, 30, -1,
- 133, 108, 30, -1, 42, 45, -1, 42, 48, -1,
- 42, 50, -1, 42, 135, -1, 42, 135, 136, -1,
- 42, 136, -1, 40, 128, -1, 128, -1, 49, 47,
- 128, -1, 47, 128, -1, 63, 64, -1, 63, 135,
- -1, 63, 135, 136, -1, 63, 136, -1, -1, 35,
- 138, 147, -1, -1, 46, 30, 140, 122, 143, 101,
- 145, 124, -1, 60, 30, -1, -1, 61, 30, 141,
- 122, 143, 101, 145, 124, -1, 142, 122, 143, 101,
- 145, 124, 34, 144, -1, 142, 122, 143, 101, 145,
- 124, -1, 90, 30, -1, -1, 30, -1, 143, 108,
- 30, -1, 143, 101, 108, 30, -1, -1, 30, -1,
- 144, 108, 30, -1, -1, 30, 148, -1, -1, 128,
- -1, 147, 108, 128, -1, 128, -1, 148, 108, 128,
+ -1, -1, -1, -1, 122, 101, -1, 122, 112, -1,
+ 56, 30, 54, -1, 86, -1, 12, -1, 17, -1,
+ 33, -1, 31, -1, 30, -1, 125, -1, 127, -1,
+ 25, -1, 26, 126, -1, 27, 146, -1, 30, 102,
+ 145, 103, -1, 15, -1, 16, 126, -1, 110, -1,
+ 126, 96, 126, -1, 126, 97, 126, -1, 126, 98,
+ 126, -1, 126, 99, 126, -1, 126, 73, 126, -1,
+ 126, 94, 126, -1, 126, 93, 126, -1, 126, 68,
+ 126, -1, 126, 69, 126, -1, 126, 66, 126, -1,
+ 126, 67, 126, -1, 126, 70, 126, -1, 126, 71,
+ 126, -1, 72, 126, -1, 126, 95, 126, -1, 126,
+ 76, 126, -1, 126, 77, 126, -1, 126, 78, 126,
+ -1, 96, 126, -1, 97, 126, -1, 102, 126, 103,
+ -1, 104, 145, 105, -1, 83, 126, 84, 126, -1,
+ 83, 126, 85, 126, -1, 79, 126, 49, 126, -1,
+ 79, 126, 55, 126, 49, 126, -1, 80, 126, 49,
+ 126, -1, 80, 126, 55, 126, 49, 126, -1, 81,
+ 126, 49, 126, -1, 81, 126, 55, 126, 49, 126,
+ -1, 82, 126, 49, 126, -1, 82, 126, 55, 126,
+ 49, 126, -1, 89, -1, 29, 126, -1, 51, 126,
+ -1, 132, -1, 135, -1, 39, 52, -1, 39, -1,
+ 41, 129, -1, 87, 130, -1, 65, 131, -1, 19,
+ -1, 21, 126, -1, 20, 126, -1, 20, -1, 22,
+ 146, -1, 89, 102, 30, 103, -1, 89, 102, 30,
+ 106, 145, 103, -1, 62, 126, 57, 126, -1, 62,
+ 126, -1, 23, 30, 145, -1, 30, -1, 129, 106,
+ 30, -1, 30, -1, 130, 106, 30, -1, 30, -1,
+ 131, 106, 30, -1, 42, 45, -1, 42, 48, -1,
+ 42, 50, -1, 42, 133, -1, 42, 133, 134, -1,
+ 42, 134, -1, 40, 126, -1, 126, -1, 49, 47,
+ 126, -1, 47, 126, -1, 63, 64, -1, 63, 133,
+ -1, 63, 133, 134, -1, 63, 134, -1, -1, 35,
+ 136, 145, -1, -1, 46, 30, 138, 120, 141, 101,
+ 143, 122, -1, 60, 30, -1, -1, 61, 30, 139,
+ 120, 141, 101, 143, 122, -1, 140, 120, 141, 101,
+ 143, 122, 34, 142, -1, 140, 120, 141, 101, 143,
+ 122, -1, 88, 30, -1, -1, 30, -1, 141, 106,
+ 30, -1, 141, 101, 106, 30, -1, -1, 30, -1,
+ 142, 106, 30, -1, -1, 30, 146, -1, -1, 126,
+ -1, 145, 106, 126, -1, 126, -1, 146, 106, 126,
-1
};
@@ -729,13 +725,13 @@ static const char *const yytname[] =
"tFRAME", "tGLOBAL", "tGO", "tIF", "tINTO", "tLOOP", "tMACRO", "tMOVIE",
"tNEXT", "tOF", "tPREVIOUS", "tPUT", "tREPEAT", "tSET", "tTHEN", "tTO",
"tWHEN", "tWITH", "tWHILE", "tNLELSE", "tFACTORY", "tMETHOD", "tOPEN",
- "tPLAY", "tDONE", "tINSTANCE", "tGE", "tLE", "tGT", "tLT", "tEQ", "tNEQ",
- "tAND", "tOR", "tNOT", "tMOD", "tAFTER", "tBEFORE", "tCONCAT",
- "tCONTAINS", "tSTARTS", "tCHAR", "tITEM", "tLINE", "tWORD", "tSPRITE",
- "tINTERSECTS", "tWITHIN", "tTELL", "tPROPERTY", "tON", "tME", "tENDIF",
- "tENDREPEAT", "tENDTELL", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'",
- "'\\n'", "'('", "')'", "'>'", "'<'", "'['", "']'", "','", "$accept",
- "program", "programline", "asgn", "stmtoneliner", "stmt", "ifstmt",
+ "tPLAY", "tDONE", "tINSTANCE", "tGE", "tLE", "tEQ", "tNEQ", "tAND",
+ "tOR", "tNOT", "tMOD", "tAFTER", "tBEFORE", "tCONCAT", "tCONTAINS",
+ "tSTARTS", "tCHAR", "tITEM", "tLINE", "tWORD", "tSPRITE", "tINTERSECTS",
+ "tWITHIN", "tTELL", "tPROPERTY", "tON", "tME", "tENDIF", "tENDREPEAT",
+ "tENDTELL", "'<'", "'>'", "'&'", "'+'", "'-'", "'*'", "'/'", "'%'",
+ "'\\n'", "'('", "')'", "'['", "']'", "','", "$accept", "program",
+ "programline", "asgn", "stmtoneliner", "stmt", "ifstmt",
"elseifstmtlist", "elseifstmt", "repeatwhile", "repeatwith", "if",
"elseif", "begin", "end", "stmtlist", "when", "tell", "simpleexpr",
"expr", "reference", "proc", "globallist", "propertylist",
@@ -759,30 +755,30 @@ static const yytype_uint16 yytoknum[] =
315, 316, 317, 318, 319, 320, 321, 322, 323, 324,
325, 326, 327, 328, 329, 330, 331, 332, 333, 334,
335, 336, 337, 338, 339, 340, 341, 342, 343, 344,
- 345, 346, 347, 348, 349, 38, 43, 45, 42, 47,
- 37, 10, 40, 41, 62, 60, 91, 93, 44
+ 345, 346, 347, 60, 62, 38, 43, 45, 42, 47,
+ 37, 10, 40, 41, 91, 93, 44
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 109, 110, 110, 110, 111, 111, 111, 112, 112,
- 112, 112, 112, 112, 112, 112, 112, 112, 113, 113,
- 113, 114, 114, 114, 114, 114, 114, 114, 114, 115,
- 115, 116, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 124, 124, 125, 126, 127, 127, 127, 127, 127,
+ 0, 107, 108, 108, 108, 109, 109, 109, 110, 110,
+ 110, 110, 110, 110, 110, 110, 110, 110, 111, 111,
+ 111, 112, 112, 112, 112, 112, 112, 112, 112, 113,
+ 113, 114, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 122, 122, 123, 124, 125, 125, 125, 125, 125,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 127, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 129, 130, 130, 130, 130, 130, 130, 130,
- 130, 130, 130, 130, 130, 130, 130, 130, 130, 130,
- 130, 131, 131, 132, 132, 133, 133, 134, 134, 134,
- 134, 134, 134, 135, 135, 136, 136, 137, 137, 137,
- 137, 138, 137, 140, 139, 139, 141, 139, 139, 139,
- 142, 143, 143, 143, 143, 144, 144, 144, 145, 146,
- 147, 147, 147, 148, 148
+ 128, 129, 129, 130, 130, 131, 131, 132, 132, 132,
+ 132, 132, 132, 133, 133, 134, 134, 135, 135, 135,
+ 135, 136, 135, 138, 137, 137, 139, 137, 137, 137,
+ 140, 141, 141, 141, 141, 142, 142, 142, 143, 144,
+ 145, 145, 145, 146, 146
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -832,7 +828,7 @@ static const yytype_uint8 yydefact[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 79, 80, 0, 2, 40, 39, 0, 26, 0,
40, 68, 69, 66, 67, 70, 71, 63, 74, 75,
- 76, 73, 59, 60, 61, 62, 64, 65, 142, 0,
+ 76, 65, 64, 73, 59, 60, 61, 62, 142, 0,
154, 55, 112, 125, 141, 8, 9, 10, 11, 15,
13, 0, 0, 14, 12, 141, 108, 116, 83, 0,
85, 0, 87, 0, 89, 0, 81, 82, 114, 106,
@@ -860,48 +856,48 @@ static const yytype_int16 yydefgoto[] =
#define YYPACT_NINF -211
static const yytype_int16 yypact[] =
{
- 271, -83, -211, -211, 821, -211, -211, 821, 821, 821,
- -6, -211, 821, 821, 821, 899, -211, -211, -211, -24,
- 6, 701, -211, 22, 821, 44, 39, 34, 38, 51,
- 821, 779, 55, 821, 821, 821, 821, 821, 821, -211,
- 57, 59, -7, 821, 821, 821, 821, 2, -211, -211,
- -211, -211, -211, 821, 27, 821, 623, 821, -211, 1413,
- -211, -211, -211, -211, -211, -211, -211, -211, 14, 821,
- -211, 1413, 1413, 1413, 1413, 12, 821, 1413, 12, 1413,
- 821, 12, 821, -211, -211, 13, 821, -211, 821, -211,
- 63, -211, 1413, 11, -211, -211, 941, 89, -211, -32,
- 821, -11, 68, -211, -211, 1301, -211, 11, -211, -211,
- 15, -57, 977, 1013, 1049, 1085, 1337, -211, 16, -211,
- 96, -57, -57, 1373, 1413, 1, -211, 359, 1413, 821,
- 1413, -211, 867, 821, 821, 821, 821, 821, 821, 821,
- 821, 821, 821, 821, 821, 821, 821, 821, 821, 821,
- 97, 821, 941, 821, 20, 1373, -41, 20, 118, 1413,
- 1413, 821, -211, -211, 85, 821, 821, -211, 821, 821,
- 81, 1265, 821, 821, -211, -211, 821, -211, 123, 821,
- 821, 821, 821, 821, 821, 821, 821, 821, 821, 124,
- -37, -211, -211, 821, -211, -211, 1413, 101, -211, 821,
- -211, -5, -5, -5, -5, 1449, 1449, -57, 1413, -5,
- -5, 8, 125, 125, -57, -57, 1413, 1413, -211, -86,
- 1413, -211, -211, 1413, 97, -211, -211, 1413, 1413, 1413,
- -5, 821, 821, 1413, -5, 97, 1413, -211, 1413, 1121,
- 1413, 1157, 1413, 1193, 1413, 1229, 1413, 1413, -211, -211,
- 821, 1413, 535, -20, -211, 1413, 535, 48, 128, -51,
- -5, 1413, -45, 821, 821, 821, 821, -28, -211, -211,
- 66, 105, 821, 535, 69, 136, -211, -211, 48, 48,
- 1413, 1413, 1413, 1413, -211, -211, 821, 1413, 132, -211,
- -211, 447, -211, -211, 1413, -211, -211, -211, 132, 821,
- 143, 535, 535, -211, 535, -31, -211, 1413, -211, 77,
- 535, 93, -211, -211, 133, 162, 103, -211, -211, -211,
- -211, -211, 535, 535, 102, -211, -211
+ 271, -79, -211, -211, 819, -211, -211, 819, 819, 819,
+ -14, -211, 819, 819, 819, 880, -211, -211, -211, 6,
+ 18, 718, -211, 47, 819, 69, 41, 51, 55, 57,
+ 819, 779, 59, 819, 819, 819, 819, 819, 819, -211,
+ 75, 84, 14, 819, 819, 819, 819, 2, -211, -211,
+ -211, -211, -211, 819, 56, 819, 635, 819, -211, 1313,
+ -211, -211, -211, -211, -211, -211, -211, -211, 26, 819,
+ -211, 1313, 1313, 1313, 1313, 42, 819, 1313, 42, 1313,
+ 819, 42, 819, -211, -211, 45, 819, -211, 819, -211,
+ 113, -211, 1313, 5, -211, -211, 920, 133, -211, -40,
+ 819, -5, 112, -211, -211, 1228, -211, 5, -211, -211,
+ 64, 97, 24, 137, 954, 988, 1279, -211, 79, -211,
+ 157, 97, 97, 1241, 1313, 48, -211, 362, 1313, 819,
+ 1313, -211, 1158, 819, 819, 819, 819, 819, 819, 819,
+ 819, 819, 819, 819, 819, 819, 819, 819, 819, 819,
+ 164, 819, 920, 819, 90, 1241, -82, 90, 167, 1313,
+ 1313, 819, -211, -211, 126, 819, 819, -211, 819, 819,
+ 130, 1194, 819, 819, -211, -211, 819, -211, 169, 819,
+ 819, 819, 819, 819, 819, 819, 819, 819, 819, 170,
+ 7, -211, -211, 819, -211, -211, 1313, 166, -211, 819,
+ -211, -29, -29, -29, -29, 851, 851, 97, 1313, -29,
+ -29, -29, -29, 10, -38, -38, 97, 97, -211, -83,
+ 1313, -211, -211, 1313, 164, -211, -211, 1313, 1313, 1313,
+ -29, 819, 819, 1313, -29, 164, 1313, -211, 1313, 1022,
+ 1313, 1056, 1313, 1090, 1313, 1124, 1313, 1313, -211, -211,
+ 819, 1313, 544, 0, -211, 1313, 544, 115, 188, -26,
+ -29, 1313, -2, 819, 819, 819, 819, 9, -211, -211,
+ 132, 171, 819, 544, 147, 194, -211, -211, 115, 115,
+ 1313, 1313, 1313, 1313, -211, -211, 819, 1313, 191, -211,
+ -211, 453, -211, -211, 1313, -211, -211, -211, 191, 819,
+ 210, 544, 544, -211, 544, -31, -211, 1313, -211, 135,
+ 544, 151, -211, -211, 189, 214, 154, -211, -211, -211,
+ -211, -211, 544, 544, 158, -211, -211
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -211, -211, 70, -211, 142, 19, -211, -99, -211, -211,
- -211, -211, -211, -162, -85, -102, -211, -211, 104, -4,
- 41, -211, -211, -211, -211, -211, 175, -19, -211, -211,
- -211, -211, -211, -211, -210, -211, -161, -211, -39, 64
+ -211, -211, 120, -211, 193, 19, -211, -48, -211, -211,
+ -211, -211, -211, -162, -85, -102, -211, -211, 152, -4,
+ 87, -211, -211, -211, -211, -211, 222, -19, -211, -211,
+ -211, -211, -211, -211, -210, -211, -120, -211, -39, 49
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -912,31 +908,31 @@ static const yytype_int16 yypgoto[] =
static const yytype_int16 yytable[] =
{
71, 224, 126, 72, 73, 74, 312, 125, 77, 74,
- 79, 74, 108, 235, 259, 257, 271, 92, 67, 51,
- 96, 140, 258, 168, 76, 262, 105, 92, 83, 111,
- 112, 113, 114, 115, 116, 272, 84, 154, 169, 121,
- 122, 123, 124, 157, 172, 197, 198, 148, 149, 128,
- 278, 130, 95, 132, 99, 100, 279, 258, 88, 173,
- 90, 313, 221, 258, 102, 152, 249, 193, 103, 101,
- 139, 250, 124, 140, 162, 284, 155, 78, 124, 81,
- 193, 104, 159, 139, 160, 109, 140, 117, 177, 119,
- 143, 144, 145, 146, 147, 120, 171, 129, 256, 148,
- 149, 97, 98, 127, 144, 145, 146, 147, 192, 193,
- 161, 253, 148, 149, 14, 225, 151, 292, 293, 167,
- 153, 158, 174, 178, 189, 196, 190, 218, 193, 201,
+ 79, 74, 108, 235, 259, 168, 76, 92, 257, 51,
+ 96, 221, 67, 258, 193, 262, 105, 92, 169, 111,
+ 112, 113, 114, 115, 116, 139, 271, 154, 140, 121,
+ 122, 123, 124, 157, 139, 197, 198, 140, 84, 128,
+ 172, 130, 88, 132, 90, 272, 99, 100, 83, 313,
+ 148, 149, 78, 173, 81, 152, 145, 146, 147, 148,
+ 149, 101, 124, 179, 162, 278, 155, 95, 124, 180,
+ 258, 102, 159, 139, 160, 103, 140, 104, 177, 109,
+ 133, 134, 135, 136, 137, 138, 171, 139, 256, 279,
+ 140, 141, 142, 127, 258, 117, 146, 147, 148, 149,
+ 249, 253, 284, 250, 119, 193, 120, 143, 144, 145,
+ 146, 147, 148, 149, 129, 196, 97, 98, 151, 201,
202, 203, 204, 205, 206, 207, 208, 209, 210, 211,
- 212, 213, 214, 215, 216, 217, 51, 124, 222, 220,
- 318, 231, 273, 237, 248, 254, 275, 223, 277, 285,
- 286, 227, 228, 289, 229, 230, 290, 270, 233, 234,
- 296, 274, 236, 308, 291, 238, 239, 240, 241, 242,
- 243, 244, 245, 246, 247, 315, 317, 319, 288, 251,
- 301, 302, 320, 304, 326, 255, 321, 194, 131, 306,
- 139, 310, 295, 140, 170, 226, 107, 0, 0, 303,
- 0, 267, 305, 0, 0, 0, 322, 323, 0, 311,
- 0, 0, 314, 146, 147, 316, 0, 260, 261, 148,
- 149, 0, 0, 0, 0, 0, 0, 324, 325, 0,
- 0, 0, 0, 0, 0, 0, 124, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 280,
+ 212, 213, 214, 215, 216, 217, 51, 124, 153, 220,
+ 318, 158, 273, 192, 193, 14, 225, 223, 292, 293,
+ 161, 227, 228, 167, 229, 230, 174, 270, 233, 234,
+ 178, 274, 236, 140, 291, 238, 239, 240, 241, 242,
+ 243, 244, 245, 246, 247, 189, 181, 190, 288, 251,
+ 301, 302, 182, 304, 218, 255, 193, 222, 231, 237,
+ 248, 310, 295, 133, 134, 135, 136, 137, 138, 303,
+ 139, 267, 305, 140, 141, 142, 322, 323, 277, 311,
+ 254, 275, 314, 285, 290, 316, 286, 260, 261, 296,
+ 143, 144, 145, 146, 147, 148, 149, 324, 325, 289,
+ 308, 315, 317, 319, 320, 321, 124, 194, 326, 131,
+ 306, 226, 170, 107, 0, 0, 0, 0, 0, 280,
281, 282, 283, 0, 0, 0, 0, 0, 287, 0,
0, -5, 1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 294, 2, 0, 0, 3, 4, 5, 0,
@@ -945,158 +941,144 @@ static const yytype_int16 yytable[] =
19, 0, 20, 21, 22, 0, 0, 23, 0, 0,
0, 0, 24, 25, 26, 0, 0, 27, 0, 0,
0, 28, 29, 30, 31, 0, 32, 0, 0, 0,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
- 0, 0, 34, 35, 36, 37, 38, 0, 0, 39,
- 40, 41, 42, 0, 0, 0, 0, 43, 44, 0,
- 0, 2, -5, 45, 3, 4, 5, 46, 6, 7,
- 8, 9, 10, 0, 11, 12, 13, 0, 14, 15,
- 16, 0, 17, 0, 18, 0, 0, 0, 19, 0,
- 20, 21, 22, 0, 0, 23, 0, 0, 0, 0,
- 24, 25, 26, 0, 0, 27, 0, 0, 0, 28,
- 29, 30, 31, 0, 32, 0, 0, 0, 0, 0,
0, 0, 0, 33, 0, 0, 0, 0, 0, 0,
34, 35, 36, 37, 38, 0, 0, 39, 40, 41,
- 42, 0, 0, 0, 0, 43, 44, 0, 0, 2,
- 0, 45, 3, 4, 5, 46, 6, 7, 8, 9,
- 10, 0, 11, 12, 13, 0, 14, 15, 16, 0,
- 17, 300, 18, 0, 0, 0, 19, 0, 20, 21,
- 22, 0, 0, 0, 0, 0, 0, 0, 24, 25,
- 26, 0, 0, 27, 0, 0, 0, 0, 0, 30,
- 31, 0, 32, 0, 0, 0, 0, 0, 0, 0,
- 0, 33, 0, 0, 0, 0, 0, 0, 34, 35,
- 36, 37, 38, 0, 0, 39, 40, 0, 42, 0,
- 0, 0, 0, 43, 44, 0, 0, 2, 268, 45,
- 3, 4, 5, 46, 6, 7, 8, 9, 10, 0,
- 11, 12, 13, 0, 14, 15, 16, 0, 17, 0,
- 18, 0, 0, 0, 19, 0, 20, 21, 22, 0,
- 0, 0, 0, 0, 0, 0, 24, 25, 26, 0,
- 0, 27, 0, 0, 0, 0, 0, 30, 31, 0,
- 32, 0, 0, 0, 0, 0, 0, 0, 0, 33,
- 0, 0, 0, 0, 0, 0, 34, 35, 36, 37,
- 38, 0, 0, 39, 40, 0, 42, 0, 0, 0,
- 0, 43, 44, 0, 0, 2, 268, 45, 3, 4,
- 5, 46, 6, 7, 8, 9, 10, 0, 11, 12,
- 13, 0, 14, 15, 16, 0, 17, 0, 18, 0,
- 0, 0, 19, 0, 20, 21, 0, 0, 0, 0,
- 0, 0, 0, 0, 24, 0, 26, 0, 0, 0,
+ 42, 0, 0, 0, 0, 0, 0, 43, 44, 0,
+ 0, 0, -5, 45, 2, 46, 0, 3, 4, 5,
+ 0, 6, 7, 8, 9, 10, 0, 11, 12, 13,
+ 0, 14, 15, 16, 0, 17, 0, 18, 0, 0,
+ 0, 19, 0, 20, 21, 22, 0, 0, 23, 0,
+ 0, 0, 0, 24, 25, 26, 0, 0, 27, 0,
+ 0, 0, 28, 29, 30, 31, 0, 32, 0, 0,
+ 0, 0, 0, 0, 33, 0, 0, 0, 0, 0,
+ 0, 34, 35, 36, 37, 38, 0, 0, 39, 40,
+ 41, 42, 0, 0, 0, 0, 0, 0, 43, 44,
+ 0, 0, 0, 0, 45, 2, 46, 0, 3, 4,
+ 5, 0, 6, 7, 8, 9, 10, 0, 11, 12,
+ 13, 0, 14, 15, 16, 0, 17, 300, 18, 0,
+ 0, 0, 19, 0, 20, 21, 22, 0, 0, 0,
+ 0, 0, 0, 0, 24, 25, 26, 0, 0, 27,
0, 0, 0, 0, 0, 30, 31, 0, 32, 0,
- 0, 0, 0, 0, 0, 0, 0, 33, 0, 0,
+ 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
+ 0, 0, 34, 35, 36, 37, 38, 0, 0, 39,
+ 40, 0, 42, 0, 0, 0, 0, 0, 0, 43,
+ 44, 0, 0, 0, 268, 45, 2, 46, 0, 3,
+ 4, 5, 0, 6, 7, 8, 9, 10, 0, 11,
+ 12, 13, 0, 14, 15, 16, 0, 17, 0, 18,
+ 0, 0, 0, 19, 0, 20, 21, 22, 0, 0,
+ 0, 0, 0, 0, 0, 24, 25, 26, 0, 0,
+ 27, 0, 0, 0, 0, 0, 30, 31, 0, 32,
+ 0, 0, 0, 0, 0, 0, 33, 0, 0, 0,
+ 0, 0, 0, 34, 35, 36, 37, 38, 0, 0,
+ 39, 40, 0, 42, 0, 0, 0, 0, 0, 0,
+ 43, 44, 0, 0, 0, 268, 45, 2, 46, 0,
+ 3, 4, 5, 0, 6, 7, 8, 9, 10, 0,
+ 11, 12, 13, 0, 14, 15, 16, 0, 17, 0,
+ 18, 0, 0, 0, 19, 0, 20, 21, 0, 0,
+ 0, 0, 0, 0, 0, 0, 24, 0, 26, 0,
+ 0, 0, 0, 0, 0, 0, 0, 30, 31, 0,
+ 32, 0, 0, 0, 0, 0, 0, 33, 0, 0,
0, 0, 0, 0, 34, 35, 36, 37, 38, 0,
- 0, 0, 40, 2, 42, 0, 3, 4, 5, 43,
- 44, 0, 0, 0, 0, 45, 11, 12, 13, 46,
- 14, 68, 16, 0, 17, 0, 0, 0, 0, 0,
- 0, 86, 0, 0, 0, 0, 87, 0, 88, 89,
- 90, 91, 69, 0, 26, 0, 0, 0, 0, 0,
+ 0, 0, 40, 0, 42, 0, 0, 0, 0, 0,
+ 2, 43, 44, 3, 4, 5, 0, 45, 0, 46,
+ 0, 0, 0, 11, 12, 13, 0, 14, 68, 16,
+ 0, 17, 0, 0, 0, 0, 0, 0, 86, 0,
+ 0, 0, 0, 87, 0, 88, 89, 90, 91, 69,
+ 0, 26, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
- 0, 0, 34, 35, 36, 37, 38, 0, 0, 0,
- 0, 2, 70, 0, 3, 4, 5, 43, 44, 0,
- 0, 0, 0, 45, 11, 12, 13, 46, 14, 68,
- 16, 0, 17, 0, 0, 0, 0, 0, 0, 86,
- 0, 0, 0, 0, 0, 0, 88, 0, 90, 0,
- 69, 0, 26, 2, 0, 0, 3, 4, 5, 0,
- 0, 0, 0, 106, 0, 0, 11, 12, 13, 0,
- 14, 68, 16, 33, 17, 0, 0, 0, 0, 0,
- 34, 35, 36, 37, 38, 0, 0, 0, 0, 0,
- 70, 0, 69, 0, 26, 43, 44, 0, 0, 0,
- 0, 45, 0, 0, 0, 46, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 33, 0, 0, 0, 0,
- 0, 0, 34, 35, 36, 37, 38, 0, 0, 0,
- 0, 2, 70, 0, 3, 4, 5, 43, 44, 0,
- 0, 0, 199, 45, 11, 12, 13, 46, 14, 68,
- 16, 0, 17, 133, 134, 0, 0, 135, 136, 137,
- 138, 0, 139, 0, 0, 140, 141, 142, 0, 0,
- 69, 0, 26, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 143, 144, 145, 146, 147, 0, 200, 0,
- 0, 148, 149, 33, 0, 0, 0, 0, 0, 0,
- 34, 35, 36, 37, 38, 164, 0, 0, 0, 0,
- 70, 0, 0, 0, 0, 43, 44, 0, 0, 0,
- 0, 80, 0, 0, 0, 46, 0, 133, 134, 0,
- 0, 135, 136, 137, 138, 0, 139, 165, 166, 140,
- 141, 142, 0, 0, 0, 0, 179, 0, 0, 0,
- 0, 0, 180, 0, 0, 0, 143, 144, 145, 146,
- 147, 0, 0, 133, 134, 148, 149, 135, 136, 137,
- 138, 0, 139, 0, 0, 140, 141, 142, 0, 0,
- 0, 0, 181, 0, 0, 0, 0, 0, 182, 0,
- 0, 0, 143, 144, 145, 146, 147, 0, 0, 133,
- 134, 148, 149, 135, 136, 137, 138, 0, 139, 0,
- 0, 140, 141, 142, 0, 0, 0, 0, 183, 0,
- 0, 0, 0, 0, 184, 0, 0, 0, 143, 144,
- 145, 146, 147, 0, 0, 133, 134, 148, 149, 135,
+ 33, 2, 0, 0, 3, 4, 5, 34, 35, 36,
+ 37, 38, 0, 0, 11, 12, 13, 70, 14, 68,
+ 16, 0, 17, 0, 43, 44, 0, 0, 0, 86,
+ 45, 0, 46, 0, 0, 0, 88, 0, 90, 0,
+ 69, 2, 26, 0, 3, 4, 5, 0, 0, 0,
+ 0, 0, 0, 106, 11, 12, 13, 0, 14, 68,
+ 16, 33, 17, 0, 0, 0, 0, 0, 34, 35,
+ 36, 37, 38, 0, 0, 0, 0, 0, 70, 0,
+ 69, 0, 26, 0, 0, 43, 44, 0, 0, 0,
+ 0, 45, 0, 46, 0, 0, 0, 0, 0, 0,
+ 0, 33, 2, 0, 0, 3, 4, 5, 34, 35,
+ 36, 37, 38, 0, 0, 11, 12, 13, 70, 14,
+ 68, 16, 0, 17, 0, 43, 44, 133, 134, 135,
+ 136, 45, 0, 46, 139, 0, 0, 140, 141, 142,
+ 0, 69, 0, 26, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 143, 144, 145, 146, 147, 148,
+ 149, 0, 33, 0, 0, 0, 0, 0, 0, 34,
+ 35, 36, 37, 38, 164, 0, 0, 0, 0, 70,
+ 0, 0, 0, 0, 0, 0, 43, 44, 0, 0,
+ 0, 0, 80, 0, 46, 0, 133, 134, 135, 136,
+ 137, 138, 0, 139, 165, 166, 140, 141, 142, 0,
+ 0, 0, 0, 183, 0, 0, 0, 0, 0, 184,
+ 0, 0, 0, 143, 144, 145, 146, 147, 148, 149,
+ 133, 134, 135, 136, 137, 138, 0, 139, 0, 0,
+ 140, 141, 142, 0, 0, 0, 0, 185, 0, 0,
+ 0, 0, 0, 186, 0, 0, 0, 143, 144, 145,
+ 146, 147, 148, 149, 133, 134, 135, 136, 137, 138,
+ 0, 139, 0, 0, 140, 141, 142, 0, 0, 0,
+ 0, 263, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 143, 144, 145, 146, 147, 148, 149, 133, 134,
+ 135, 136, 137, 138, 0, 139, 0, 0, 140, 141,
+ 142, 0, 0, 0, 0, 264, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 143, 144, 145, 146, 147,
+ 148, 149, 133, 134, 135, 136, 137, 138, 0, 139,
+ 0, 0, 140, 141, 142, 0, 0, 0, 0, 265,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 143,
+ 144, 145, 146, 147, 148, 149, 133, 134, 135, 136,
+ 137, 138, 0, 139, 0, 0, 140, 141, 142, 0,
+ 0, 0, 0, 266, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 143, 144, 145, 146, 147, 148, 149,
+ 133, 134, 135, 136, 137, 138, 0, 139, 0, 0,
+ 140, 141, 142, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 199, 0, 0, 0, 143, 144, 145,
+ 146, 147, 148, 149, 133, 134, 135, 136, 137, 138,
+ 0, 139, 0, 0, 140, 141, 142, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 232,
+ 0, 143, 144, 145, 146, 147, 148, 149, 0, 200,
+ 133, 134, 135, 136, 137, 138, 0, 139, 0, 0,
+ 140, 141, 142, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 176, 0, 143, 144, 145,
+ 146, 147, 148, 149, 133, 134, 135, 136, 137, 138,
+ 0, 139, 0, 0, 140, 141, 142, 133, 134, 135,
136, 137, 138, 0, 139, 0, 0, 140, 141, 142,
- 0, 0, 0, 0, 185, 0, 0, 0, 0, 0,
- 186, 0, 0, 0, 143, 144, 145, 146, 147, 0,
- 0, 133, 134, 148, 149, 135, 136, 137, 138, 0,
- 139, 0, 0, 140, 141, 142, 0, 0, 0, 0,
- 263, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 143, 144, 145, 146, 147, 0, 0, 133, 134, 148,
- 149, 135, 136, 137, 138, 0, 139, 0, 0, 140,
- 141, 142, 0, 0, 0, 0, 264, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 143, 144, 145, 146,
- 147, 0, 0, 133, 134, 148, 149, 135, 136, 137,
+ 0, 143, 144, 145, 146, 147, 148, 149, 0, 0,
+ 0, 0, 0, 0, 143, 144, 145, 146, 147, 148,
+ 149, 0, 0, 0, 191, 133, 134, 135, 136, 137,
138, 0, 139, 0, 0, 140, 141, 142, 0, 0,
- 0, 0, 265, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 143, 144, 145, 146, 147, 0, 0, 133,
- 134, 148, 149, 135, 136, 137, 138, 0, 139, 0,
- 0, 140, 141, 142, 0, 0, 0, 0, 266, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 143, 144,
- 145, 146, 147, 0, 0, 133, 134, 148, 149, 135,
- 136, 137, 138, 0, 139, 0, 0, 140, 141, 142,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 232, 0, 0, 0, 143, 144, 145, 146, 147, 0,
- 0, 133, 134, 148, 149, 135, 136, 137, 138, 0,
- 139, 0, 0, 140, 141, 142, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 176, 0,
- 143, 144, 145, 146, 147, 0, 0, 133, 134, 148,
- 149, 135, 136, 137, 138, 0, 139, 0, 0, 140,
+ 0, 0, 0, 187, 188, 0, 0, 0, 0, 0,
+ 0, 0, 143, 144, 145, 146, 147, 148, 149, 133,
+ 134, 135, 136, 137, 138, 0, 139, 0, 0, 140,
141, 142, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 143, 144, 145, 146,
- 147, 0, 0, 133, 134, 148, 149, 135, 136, 137,
- 138, 0, 139, 0, 0, 140, 141, 142, 0, 0,
- 0, 0, 0, 187, 188, 0, 0, 0, 0, 0,
- 0, 0, 143, 144, 145, 146, 147, 0, 0, 133,
- 134, 148, 149, 135, 136, 137, 138, 0, 139, 0,
- 0, 140, 141, 142, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 143, 144,
- 145, 146, 147, 0, 0, 0, 191, 148, 149, 133,
- 134, 0, 0, 135, 136, 137, 138, 0, 139, 0,
- 0, 140, 141, 142, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 143, 144,
- 145, 146, 147, 0, 0, 133, 134, 148, 149, 135,
- 136, 0, 0, 0, 139, 0, 0, 140, 141, 142,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 143, 144, 145, 146, 147, 0,
- 0, 0, 0, 148, 149
+ 147, 148, 149
};
static const yytype_int16 yycheck[] =
{
4, 163, 0, 7, 8, 9, 37, 46, 12, 13,
- 14, 15, 31, 175, 224, 101, 36, 21, 101, 0,
- 24, 78, 108, 55, 30, 235, 30, 31, 52, 33,
- 34, 35, 36, 37, 38, 55, 30, 76, 70, 43,
- 44, 45, 46, 82, 55, 130, 131, 104, 105, 53,
- 101, 55, 30, 57, 15, 16, 101, 108, 47, 70,
- 49, 92, 103, 108, 30, 69, 103, 108, 30, 30,
- 75, 108, 76, 78, 93, 103, 80, 13, 82, 15,
- 108, 30, 86, 75, 88, 30, 78, 30, 107, 30,
- 95, 96, 97, 98, 99, 102, 100, 70, 200, 104,
- 105, 57, 58, 101, 96, 97, 98, 99, 107, 108,
- 47, 196, 104, 105, 29, 30, 102, 278, 279, 30,
- 108, 108, 54, 108, 108, 129, 30, 30, 108, 133,
+ 14, 15, 31, 175, 224, 55, 30, 21, 101, 0,
+ 24, 103, 101, 106, 106, 235, 30, 31, 68, 33,
+ 34, 35, 36, 37, 38, 73, 36, 76, 76, 43,
+ 44, 45, 46, 82, 73, 130, 131, 76, 30, 53,
+ 55, 55, 47, 57, 49, 55, 15, 16, 52, 90,
+ 98, 99, 13, 68, 15, 69, 95, 96, 97, 98,
+ 99, 30, 76, 49, 93, 101, 80, 30, 82, 55,
+ 106, 30, 86, 73, 88, 30, 76, 30, 107, 30,
+ 66, 67, 68, 69, 70, 71, 100, 73, 200, 101,
+ 76, 77, 78, 101, 106, 30, 96, 97, 98, 99,
+ 103, 196, 103, 106, 30, 106, 102, 93, 94, 95,
+ 96, 97, 98, 99, 68, 129, 57, 58, 102, 133,
134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 127, 151, 30, 153,
- 312, 70, 254, 30, 30, 54, 108, 161, 30, 93,
- 55, 165, 166, 94, 168, 169, 30, 252, 172, 173,
- 38, 256, 176, 30, 276, 179, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 108, 93, 54, 273, 193,
- 292, 293, 30, 295, 92, 199, 93, 127, 56, 298,
- 75, 303, 287, 78, 100, 164, 31, -1, -1, 294,
- -1, 250, 297, -1, -1, -1, 318, 319, -1, 304,
- -1, -1, 307, 98, 99, 310, -1, 231, 232, 104,
- 105, -1, -1, -1, -1, -1, -1, 322, 323, -1,
- -1, -1, -1, -1, -1, -1, 250, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 263,
+ 144, 145, 146, 147, 148, 149, 127, 151, 106, 153,
+ 312, 106, 254, 105, 106, 29, 30, 161, 278, 279,
+ 47, 165, 166, 30, 168, 169, 54, 252, 172, 173,
+ 106, 256, 176, 76, 276, 179, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 106, 49, 30, 273, 193,
+ 292, 293, 55, 295, 30, 199, 106, 30, 68, 30,
+ 30, 303, 287, 66, 67, 68, 69, 70, 71, 294,
+ 73, 250, 297, 76, 77, 78, 318, 319, 30, 304,
+ 54, 106, 307, 91, 30, 310, 55, 231, 232, 38,
+ 93, 94, 95, 96, 97, 98, 99, 322, 323, 92,
+ 30, 106, 91, 54, 30, 91, 250, 127, 90, 56,
+ 298, 164, 100, 31, -1, -1, -1, -1, -1, 263,
264, 265, 266, -1, -1, -1, -1, -1, 272, -1,
-1, 0, 1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, 286, 12, -1, -1, 15, 16, 17, -1,
@@ -1105,128 +1087,114 @@ static const yytype_int16 yycheck[] =
39, -1, 41, 42, 43, -1, -1, 46, -1, -1,
-1, -1, 51, 52, 53, -1, -1, 56, -1, -1,
-1, 60, 61, 62, 63, -1, 65, -1, -1, -1,
- -1, -1, -1, -1, -1, 74, -1, -1, -1, -1,
- -1, -1, 81, 82, 83, 84, 85, -1, -1, 88,
- 89, 90, 91, -1, -1, -1, -1, 96, 97, -1,
- -1, 12, 101, 102, 15, 16, 17, 106, 19, 20,
- 21, 22, 23, -1, 25, 26, 27, -1, 29, 30,
- 31, -1, 33, -1, 35, -1, -1, -1, 39, -1,
- 41, 42, 43, -1, -1, 46, -1, -1, -1, -1,
- 51, 52, 53, -1, -1, 56, -1, -1, -1, 60,
- 61, 62, 63, -1, 65, -1, -1, -1, -1, -1,
- -1, -1, -1, 74, -1, -1, -1, -1, -1, -1,
- 81, 82, 83, 84, 85, -1, -1, 88, 89, 90,
- 91, -1, -1, -1, -1, 96, 97, -1, -1, 12,
- -1, 102, 15, 16, 17, 106, 19, 20, 21, 22,
- 23, -1, 25, 26, 27, -1, 29, 30, 31, -1,
- 33, 34, 35, -1, -1, -1, 39, -1, 41, 42,
- 43, -1, -1, -1, -1, -1, -1, -1, 51, 52,
- 53, -1, -1, 56, -1, -1, -1, -1, -1, 62,
- 63, -1, 65, -1, -1, -1, -1, -1, -1, -1,
- -1, 74, -1, -1, -1, -1, -1, -1, 81, 82,
- 83, 84, 85, -1, -1, 88, 89, -1, 91, -1,
- -1, -1, -1, 96, 97, -1, -1, 12, 101, 102,
- 15, 16, 17, 106, 19, 20, 21, 22, 23, -1,
- 25, 26, 27, -1, 29, 30, 31, -1, 33, -1,
- 35, -1, -1, -1, 39, -1, 41, 42, 43, -1,
- -1, -1, -1, -1, -1, -1, 51, 52, 53, -1,
- -1, 56, -1, -1, -1, -1, -1, 62, 63, -1,
- 65, -1, -1, -1, -1, -1, -1, -1, -1, 74,
- -1, -1, -1, -1, -1, -1, 81, 82, 83, 84,
- 85, -1, -1, 88, 89, -1, 91, -1, -1, -1,
- -1, 96, 97, -1, -1, 12, 101, 102, 15, 16,
- 17, 106, 19, 20, 21, 22, 23, -1, 25, 26,
- 27, -1, 29, 30, 31, -1, 33, -1, 35, -1,
- -1, -1, 39, -1, 41, 42, -1, -1, -1, -1,
- -1, -1, -1, -1, 51, -1, 53, -1, -1, -1,
+ -1, -1, -1, 72, -1, -1, -1, -1, -1, -1,
+ 79, 80, 81, 82, 83, -1, -1, 86, 87, 88,
+ 89, -1, -1, -1, -1, -1, -1, 96, 97, -1,
+ -1, -1, 101, 102, 12, 104, -1, 15, 16, 17,
+ -1, 19, 20, 21, 22, 23, -1, 25, 26, 27,
+ -1, 29, 30, 31, -1, 33, -1, 35, -1, -1,
+ -1, 39, -1, 41, 42, 43, -1, -1, 46, -1,
+ -1, -1, -1, 51, 52, 53, -1, -1, 56, -1,
+ -1, -1, 60, 61, 62, 63, -1, 65, -1, -1,
+ -1, -1, -1, -1, 72, -1, -1, -1, -1, -1,
+ -1, 79, 80, 81, 82, 83, -1, -1, 86, 87,
+ 88, 89, -1, -1, -1, -1, -1, -1, 96, 97,
+ -1, -1, -1, -1, 102, 12, 104, -1, 15, 16,
+ 17, -1, 19, 20, 21, 22, 23, -1, 25, 26,
+ 27, -1, 29, 30, 31, -1, 33, 34, 35, -1,
+ -1, -1, 39, -1, 41, 42, 43, -1, -1, -1,
+ -1, -1, -1, -1, 51, 52, 53, -1, -1, 56,
-1, -1, -1, -1, -1, 62, 63, -1, 65, -1,
- -1, -1, -1, -1, -1, -1, -1, 74, -1, -1,
- -1, -1, -1, -1, 81, 82, 83, 84, 85, -1,
- -1, -1, 89, 12, 91, -1, 15, 16, 17, 96,
- 97, -1, -1, -1, -1, 102, 25, 26, 27, 106,
- 29, 30, 31, -1, 33, -1, -1, -1, -1, -1,
- -1, 40, -1, -1, -1, -1, 45, -1, 47, 48,
- 49, 50, 51, -1, 53, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 74, -1, -1, -1, -1,
- -1, -1, 81, 82, 83, 84, 85, -1, -1, -1,
- -1, 12, 91, -1, 15, 16, 17, 96, 97, -1,
- -1, -1, -1, 102, 25, 26, 27, 106, 29, 30,
- 31, -1, 33, -1, -1, -1, -1, -1, -1, 40,
- -1, -1, -1, -1, -1, -1, 47, -1, 49, -1,
- 51, -1, 53, 12, -1, -1, 15, 16, 17, -1,
- -1, -1, -1, 64, -1, -1, 25, 26, 27, -1,
- 29, 30, 31, 74, 33, -1, -1, -1, -1, -1,
- 81, 82, 83, 84, 85, -1, -1, -1, -1, -1,
- 91, -1, 51, -1, 53, 96, 97, -1, -1, -1,
- -1, 102, -1, -1, -1, 106, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 74, -1, -1, -1, -1,
- -1, -1, 81, 82, 83, 84, 85, -1, -1, -1,
- -1, 12, 91, -1, 15, 16, 17, 96, 97, -1,
- -1, -1, 55, 102, 25, 26, 27, 106, 29, 30,
- 31, -1, 33, 66, 67, -1, -1, 70, 71, 72,
- 73, -1, 75, -1, -1, 78, 79, 80, -1, -1,
- 51, -1, 53, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 95, 96, 97, 98, 99, -1, 101, -1,
- -1, 104, 105, 74, -1, -1, -1, -1, -1, -1,
- 81, 82, 83, 84, 85, 44, -1, -1, -1, -1,
- 91, -1, -1, -1, -1, 96, 97, -1, -1, -1,
- -1, 102, -1, -1, -1, 106, -1, 66, 67, -1,
- -1, 70, 71, 72, 73, -1, 75, 76, 77, 78,
- 79, 80, -1, -1, -1, -1, 49, -1, -1, -1,
- -1, -1, 55, -1, -1, -1, 95, 96, 97, 98,
- 99, -1, -1, 66, 67, 104, 105, 70, 71, 72,
- 73, -1, 75, -1, -1, 78, 79, 80, -1, -1,
- -1, -1, 49, -1, -1, -1, -1, -1, 55, -1,
- -1, -1, 95, 96, 97, 98, 99, -1, -1, 66,
- 67, 104, 105, 70, 71, 72, 73, -1, 75, -1,
- -1, 78, 79, 80, -1, -1, -1, -1, 49, -1,
- -1, -1, -1, -1, 55, -1, -1, -1, 95, 96,
- 97, 98, 99, -1, -1, 66, 67, 104, 105, 70,
- 71, 72, 73, -1, 75, -1, -1, 78, 79, 80,
- -1, -1, -1, -1, 49, -1, -1, -1, -1, -1,
- 55, -1, -1, -1, 95, 96, 97, 98, 99, -1,
- -1, 66, 67, 104, 105, 70, 71, 72, 73, -1,
- 75, -1, -1, 78, 79, 80, -1, -1, -1, -1,
- 49, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 95, 96, 97, 98, 99, -1, -1, 66, 67, 104,
- 105, 70, 71, 72, 73, -1, 75, -1, -1, 78,
- 79, 80, -1, -1, -1, -1, 49, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 95, 96, 97, 98,
- 99, -1, -1, 66, 67, 104, 105, 70, 71, 72,
- 73, -1, 75, -1, -1, 78, 79, 80, -1, -1,
- -1, -1, 49, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 95, 96, 97, 98, 99, -1, -1, 66,
- 67, 104, 105, 70, 71, 72, 73, -1, 75, -1,
- -1, 78, 79, 80, -1, -1, -1, -1, 49, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 95, 96,
- 97, 98, 99, -1, -1, 66, 67, 104, 105, 70,
- 71, 72, 73, -1, 75, -1, -1, 78, 79, 80,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 55, -1, -1, -1, 95, 96, 97, 98, 99, -1,
- -1, 66, 67, 104, 105, 70, 71, 72, 73, -1,
- 75, -1, -1, 78, 79, 80, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 57, -1,
- 95, 96, 97, 98, 99, -1, -1, 66, 67, 104,
- 105, 70, 71, 72, 73, -1, 75, -1, -1, 78,
- 79, 80, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 95, 96, 97, 98,
- 99, -1, -1, 66, 67, 104, 105, 70, 71, 72,
- 73, -1, 75, -1, -1, 78, 79, 80, -1, -1,
- -1, -1, -1, 86, 87, -1, -1, -1, -1, -1,
- -1, -1, 95, 96, 97, 98, 99, -1, -1, 66,
- 67, 104, 105, 70, 71, 72, 73, -1, 75, -1,
- -1, 78, 79, 80, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 95, 96,
- 97, 98, 99, -1, -1, -1, 103, 104, 105, 66,
- 67, -1, -1, 70, 71, 72, 73, -1, 75, -1,
- -1, 78, 79, 80, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 95, 96,
- 97, 98, 99, -1, -1, 66, 67, 104, 105, 70,
- 71, -1, -1, -1, 75, -1, -1, 78, 79, 80,
+ -1, -1, -1, -1, -1, 72, -1, -1, -1, -1,
+ -1, -1, 79, 80, 81, 82, 83, -1, -1, 86,
+ 87, -1, 89, -1, -1, -1, -1, -1, -1, 96,
+ 97, -1, -1, -1, 101, 102, 12, 104, -1, 15,
+ 16, 17, -1, 19, 20, 21, 22, 23, -1, 25,
+ 26, 27, -1, 29, 30, 31, -1, 33, -1, 35,
+ -1, -1, -1, 39, -1, 41, 42, 43, -1, -1,
+ -1, -1, -1, -1, -1, 51, 52, 53, -1, -1,
+ 56, -1, -1, -1, -1, -1, 62, 63, -1, 65,
+ -1, -1, -1, -1, -1, -1, 72, -1, -1, -1,
+ -1, -1, -1, 79, 80, 81, 82, 83, -1, -1,
+ 86, 87, -1, 89, -1, -1, -1, -1, -1, -1,
+ 96, 97, -1, -1, -1, 101, 102, 12, 104, -1,
+ 15, 16, 17, -1, 19, 20, 21, 22, 23, -1,
+ 25, 26, 27, -1, 29, 30, 31, -1, 33, -1,
+ 35, -1, -1, -1, 39, -1, 41, 42, -1, -1,
+ -1, -1, -1, -1, -1, -1, 51, -1, 53, -1,
+ -1, -1, -1, -1, -1, -1, -1, 62, 63, -1,
+ 65, -1, -1, -1, -1, -1, -1, 72, -1, -1,
+ -1, -1, -1, -1, 79, 80, 81, 82, 83, -1,
+ -1, -1, 87, -1, 89, -1, -1, -1, -1, -1,
+ 12, 96, 97, 15, 16, 17, -1, 102, -1, 104,
+ -1, -1, -1, 25, 26, 27, -1, 29, 30, 31,
+ -1, 33, -1, -1, -1, -1, -1, -1, 40, -1,
+ -1, -1, -1, 45, -1, 47, 48, 49, 50, 51,
+ -1, 53, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 95, 96, 97, 98, 99, -1,
- -1, -1, -1, 104, 105
+ 72, 12, -1, -1, 15, 16, 17, 79, 80, 81,
+ 82, 83, -1, -1, 25, 26, 27, 89, 29, 30,
+ 31, -1, 33, -1, 96, 97, -1, -1, -1, 40,
+ 102, -1, 104, -1, -1, -1, 47, -1, 49, -1,
+ 51, 12, 53, -1, 15, 16, 17, -1, -1, -1,
+ -1, -1, -1, 64, 25, 26, 27, -1, 29, 30,
+ 31, 72, 33, -1, -1, -1, -1, -1, 79, 80,
+ 81, 82, 83, -1, -1, -1, -1, -1, 89, -1,
+ 51, -1, 53, -1, -1, 96, 97, -1, -1, -1,
+ -1, 102, -1, 104, -1, -1, -1, -1, -1, -1,
+ -1, 72, 12, -1, -1, 15, 16, 17, 79, 80,
+ 81, 82, 83, -1, -1, 25, 26, 27, 89, 29,
+ 30, 31, -1, 33, -1, 96, 97, 66, 67, 68,
+ 69, 102, -1, 104, 73, -1, -1, 76, 77, 78,
+ -1, 51, -1, 53, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 93, 94, 95, 96, 97, 98,
+ 99, -1, 72, -1, -1, -1, -1, -1, -1, 79,
+ 80, 81, 82, 83, 44, -1, -1, -1, -1, 89,
+ -1, -1, -1, -1, -1, -1, 96, 97, -1, -1,
+ -1, -1, 102, -1, 104, -1, 66, 67, 68, 69,
+ 70, 71, -1, 73, 74, 75, 76, 77, 78, -1,
+ -1, -1, -1, 49, -1, -1, -1, -1, -1, 55,
+ -1, -1, -1, 93, 94, 95, 96, 97, 98, 99,
+ 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
+ 76, 77, 78, -1, -1, -1, -1, 49, -1, -1,
+ -1, -1, -1, 55, -1, -1, -1, 93, 94, 95,
+ 96, 97, 98, 99, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, -1, -1, -1,
+ -1, 49, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 93, 94, 95, 96, 97, 98, 99, 66, 67,
+ 68, 69, 70, 71, -1, 73, -1, -1, 76, 77,
+ 78, -1, -1, -1, -1, 49, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 93, 94, 95, 96, 97,
+ 98, 99, 66, 67, 68, 69, 70, 71, -1, 73,
+ -1, -1, 76, 77, 78, -1, -1, -1, -1, 49,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 93,
+ 94, 95, 96, 97, 98, 99, 66, 67, 68, 69,
+ 70, 71, -1, 73, -1, -1, 76, 77, 78, -1,
+ -1, -1, -1, 49, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 93, 94, 95, 96, 97, 98, 99,
+ 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
+ 76, 77, 78, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 55, -1, -1, -1, 93, 94, 95,
+ 96, 97, 98, 99, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 55,
+ -1, 93, 94, 95, 96, 97, 98, 99, -1, 101,
+ 66, 67, 68, 69, 70, 71, -1, 73, -1, -1,
+ 76, 77, 78, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 57, -1, 93, 94, 95,
+ 96, 97, 98, 99, 66, 67, 68, 69, 70, 71,
+ -1, 73, -1, -1, 76, 77, 78, 66, 67, 68,
+ 69, 70, 71, -1, 73, -1, -1, 76, 77, 78,
+ -1, 93, 94, 95, 96, 97, 98, 99, -1, -1,
+ -1, -1, -1, -1, 93, 94, 95, 96, 97, 98,
+ 99, -1, -1, -1, 103, 66, 67, 68, 69, 70,
+ 71, -1, 73, -1, -1, 76, 77, 78, -1, -1,
+ -1, -1, -1, 84, 85, -1, -1, -1, -1, -1,
+ -1, -1, 93, 94, 95, 96, 97, 98, 99, 66,
+ 67, 68, 69, 70, 71, -1, 73, -1, -1, 76,
+ 77, 78, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 93, 94, 95, 96,
+ 97, 98, 99
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1236,36 +1204,36 @@ static const yytype_uint8 yystos[] =
0, 1, 12, 15, 16, 17, 19, 20, 21, 22,
23, 25, 26, 27, 29, 30, 31, 33, 35, 39,
41, 42, 43, 46, 51, 52, 53, 56, 60, 61,
- 62, 63, 65, 74, 81, 82, 83, 84, 85, 88,
- 89, 90, 91, 96, 97, 102, 106, 110, 111, 112,
- 113, 114, 115, 118, 119, 120, 125, 126, 127, 128,
- 129, 130, 134, 137, 139, 142, 146, 101, 30, 51,
- 91, 128, 128, 128, 128, 148, 30, 128, 148, 128,
- 102, 148, 138, 52, 30, 131, 40, 45, 47, 48,
- 49, 50, 128, 135, 136, 30, 128, 57, 58, 15,
- 16, 30, 30, 30, 30, 128, 64, 135, 136, 30,
- 133, 128, 128, 128, 128, 128, 128, 30, 132, 30,
- 102, 128, 128, 128, 128, 147, 0, 101, 128, 70,
- 128, 113, 128, 66, 67, 70, 71, 72, 73, 75,
- 78, 79, 80, 95, 96, 97, 98, 99, 104, 105,
- 122, 102, 128, 108, 147, 128, 147, 147, 108, 128,
- 128, 47, 136, 140, 44, 76, 77, 30, 55, 70,
- 127, 128, 55, 70, 54, 141, 57, 136, 108, 49,
- 55, 49, 55, 49, 55, 49, 55, 86, 87, 108,
- 30, 103, 107, 108, 111, 123, 128, 123, 123, 55,
- 101, 128, 128, 128, 128, 128, 128, 128, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 30, 143,
- 128, 103, 30, 128, 122, 30, 129, 128, 128, 128,
- 128, 70, 55, 128, 128, 122, 128, 30, 128, 128,
- 128, 128, 128, 128, 128, 128, 128, 128, 30, 103,
- 108, 128, 124, 123, 54, 128, 124, 101, 108, 143,
- 128, 128, 143, 49, 49, 49, 49, 147, 101, 114,
- 123, 36, 55, 124, 123, 108, 145, 30, 101, 101,
- 128, 128, 128, 128, 103, 93, 55, 128, 123, 94,
- 30, 124, 145, 145, 128, 123, 38, 116, 117, 121,
- 34, 124, 124, 123, 124, 123, 116, 128, 30, 144,
- 124, 123, 37, 92, 123, 108, 123, 93, 122, 54,
- 30, 93, 124, 124, 123, 123, 92
+ 62, 63, 65, 72, 79, 80, 81, 82, 83, 86,
+ 87, 88, 89, 96, 97, 102, 104, 108, 109, 110,
+ 111, 112, 113, 116, 117, 118, 123, 124, 125, 126,
+ 127, 128, 132, 135, 137, 140, 144, 101, 30, 51,
+ 89, 126, 126, 126, 126, 146, 30, 126, 146, 126,
+ 102, 146, 136, 52, 30, 129, 40, 45, 47, 48,
+ 49, 50, 126, 133, 134, 30, 126, 57, 58, 15,
+ 16, 30, 30, 30, 30, 126, 64, 133, 134, 30,
+ 131, 126, 126, 126, 126, 126, 126, 30, 130, 30,
+ 102, 126, 126, 126, 126, 145, 0, 101, 126, 68,
+ 126, 111, 126, 66, 67, 68, 69, 70, 71, 73,
+ 76, 77, 78, 93, 94, 95, 96, 97, 98, 99,
+ 120, 102, 126, 106, 145, 126, 145, 145, 106, 126,
+ 126, 47, 134, 138, 44, 74, 75, 30, 55, 68,
+ 125, 126, 55, 68, 54, 139, 57, 134, 106, 49,
+ 55, 49, 55, 49, 55, 49, 55, 84, 85, 106,
+ 30, 103, 105, 106, 109, 121, 126, 121, 121, 55,
+ 101, 126, 126, 126, 126, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 30, 141,
+ 126, 103, 30, 126, 120, 30, 127, 126, 126, 126,
+ 126, 68, 55, 126, 126, 120, 126, 30, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 30, 103,
+ 106, 126, 122, 121, 54, 126, 122, 101, 106, 141,
+ 126, 126, 141, 49, 49, 49, 49, 145, 101, 112,
+ 121, 36, 55, 122, 121, 106, 143, 30, 101, 101,
+ 126, 126, 126, 126, 103, 91, 55, 126, 121, 92,
+ 30, 122, 143, 143, 126, 121, 38, 114, 115, 119,
+ 34, 122, 122, 121, 122, 121, 114, 126, 30, 142,
+ 122, 121, 37, 90, 121, 106, 121, 91, 120, 54,
+ 30, 91, 122, 122, 121, 121, 90
};
#define yyerrok (yyerrstatus = 0)
@@ -2902,7 +2870,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 2906 "engines/director/lingo/lingo-gr.cpp"
+#line 2874 "engines/director/lingo/lingo-gr.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 0fc9c0efa1..1917368eee 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -104,33 +104,31 @@
tINSTANCE = 320,
tGE = 321,
tLE = 322,
- tGT = 323,
- tLT = 324,
- tEQ = 325,
- tNEQ = 326,
- tAND = 327,
- tOR = 328,
- tNOT = 329,
- tMOD = 330,
- tAFTER = 331,
- tBEFORE = 332,
- tCONCAT = 333,
- tCONTAINS = 334,
- tSTARTS = 335,
- tCHAR = 336,
- tITEM = 337,
- tLINE = 338,
- tWORD = 339,
- tSPRITE = 340,
- tINTERSECTS = 341,
- tWITHIN = 342,
- tTELL = 343,
- tPROPERTY = 344,
- tON = 345,
- tME = 346,
- tENDIF = 347,
- tENDREPEAT = 348,
- tENDTELL = 349
+ tEQ = 323,
+ tNEQ = 324,
+ tAND = 325,
+ tOR = 326,
+ tNOT = 327,
+ tMOD = 328,
+ tAFTER = 329,
+ tBEFORE = 330,
+ tCONCAT = 331,
+ tCONTAINS = 332,
+ tSTARTS = 333,
+ tCHAR = 334,
+ tITEM = 335,
+ tLINE = 336,
+ tWORD = 337,
+ tSPRITE = 338,
+ tINTERSECTS = 339,
+ tWITHIN = 340,
+ tTELL = 341,
+ tPROPERTY = 342,
+ tON = 343,
+ tME = 344,
+ tENDIF = 345,
+ tENDREPEAT = 346,
+ tENDTELL = 347
};
#endif
/* Tokens. */
@@ -199,33 +197,31 @@
#define tINSTANCE 320
#define tGE 321
#define tLE 322
-#define tGT 323
-#define tLT 324
-#define tEQ 325
-#define tNEQ 326
-#define tAND 327
-#define tOR 328
-#define tNOT 329
-#define tMOD 330
-#define tAFTER 331
-#define tBEFORE 332
-#define tCONCAT 333
-#define tCONTAINS 334
-#define tSTARTS 335
-#define tCHAR 336
-#define tITEM 337
-#define tLINE 338
-#define tWORD 339
-#define tSPRITE 340
-#define tINTERSECTS 341
-#define tWITHIN 342
-#define tTELL 343
-#define tPROPERTY 344
-#define tON 345
-#define tME 346
-#define tENDIF 347
-#define tENDREPEAT 348
-#define tENDTELL 349
+#define tEQ 323
+#define tNEQ 324
+#define tAND 325
+#define tOR 326
+#define tNOT 327
+#define tMOD 328
+#define tAFTER 329
+#define tBEFORE 330
+#define tCONCAT 331
+#define tCONTAINS 332
+#define tSTARTS 333
+#define tCHAR 334
+#define tITEM 335
+#define tLINE 336
+#define tWORD 337
+#define tSPRITE 338
+#define tINTERSECTS 339
+#define tWITHIN 340
+#define tTELL 341
+#define tPROPERTY 342
+#define tON 343
+#define tME 344
+#define tENDIF 345
+#define tENDREPEAT 346
+#define tENDTELL 347
@@ -243,7 +239,7 @@ typedef union YYSTYPE
Common::Array<double> *arr;
}
/* Line 1529 of yacc.c. */
-#line 247 "engines/director/lingo/lingo-gr.hpp"
+#line 243 "engines/director/lingo/lingo-gr.hpp"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index 53807a4157..672a970f79 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -98,7 +98,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%token tDOWN tELSE tELSIF 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 tINSTANCE
-%token tGE tLE tGT tLT tEQ tNEQ tAND tOR tNOT tMOD
+%token tGE tLE tEQ tNEQ tAND tOR tNOT tMOD
%token tAFTER tBEFORE tCONCAT tCONTAINS tSTARTS tCHAR tITEM tLINE tWORD
%token tSPRITE tINTERSECTS tWITHIN tTELL tPROPERTY
%token tON tME tENDIF tENDREPEAT tENDTELL
@@ -109,7 +109,7 @@ void checkEnd(Common::String *token, const char *expect, bool required) {
%type<s> on
%left tAND tOR
-%left tLT tLE tGT tGE tNEQ tCONTAINS tSTARTS tEQ
+%left '<' tLE '>' tGE tEQ tNEQ tCONTAINS tSTARTS
%left '&'
%left '+' '-'
%left '*' '/' '%' tMOD