[Scummvm-git-logs] scummvm master -> a37d933beadcadc8a85a21ddf70225832babae18
sev-
sev at scummvm.org
Wed Jan 29 16:05:43 UTC 2020
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:
8f5ada351d DIRECTOR: LINGO: Added more test to 'the sprite <n>' keyword
a37d933bea DIRECTOR: LINGO: Fix regression in THEENTITYWITHID parsing
Commit: 8f5ada351d1581e8144fd02dc5197de22eac0091
https://github.com/scummvm/scummvm/commit/8f5ada351d1581e8144fd02dc5197de22eac0091
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-29T16:55:19+01:00
Commit Message:
DIRECTOR: LINGO: Added more test to 'the sprite <n>' keyword
Changed paths:
engines/director/lingo/tests/the.lingo
diff --git a/engines/director/lingo/tests/the.lingo b/engines/director/lingo/tests/the.lingo
index 97173e7..70d6e3e 100644
--- a/engines/director/lingo/tests/the.lingo
+++ b/engines/director/lingo/tests/the.lingo
@@ -39,3 +39,5 @@ set the checkMark of menuItem "Horizontal" of menu "The Ball" to False
put the number of castMembers into field 5
put the number of menuItems of menu "sam" into field 3
+
+put abs( the locH of sprite 2 - the mouseH) into field 4
Commit: a37d933beadcadc8a85a21ddf70225832babae18
https://github.com/scummvm/scummvm/commit/a37d933beadcadc8a85a21ddf70225832babae18
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-29T16:58:15+01:00
Commit Message:
DIRECTOR: LINGO: Fix regression in THEENTITYWITHID parsing
Changed paths:
engines/director/lingo/lingo-gr.cpp
engines/director/lingo/lingo-gr.h
engines/director/lingo/lingo-gr.y
diff --git a/engines/director/lingo/lingo-gr.cpp b/engines/director/lingo/lingo-gr.cpp
index 4c47eeb..43c0ee8 100644
--- a/engines/director/lingo/lingo-gr.cpp
+++ b/engines/director/lingo/lingo-gr.cpp
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5. */
+/* A Bison parser, made by GNU Bison 3.5.1. */
/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.5"
+#define YYBISON_VERSION "3.5.1"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -576,7 +576,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 128
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1725
+#define YYLAST 1723
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 103
@@ -712,7 +712,7 @@ static const yytype_int16 yytoknum[] =
};
# endif
-#define YYPACT_NINF (-275)
+#define YYPACT_NINF (-277)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
@@ -726,44 +726,44 @@ static const yytype_int16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- 309, -40, -275, -275, 1050, -275, 1088, 1170, -5, 1208,
- -275, -275, -275, -275, -275, -275, 26, -275, 847, -275,
- -275, 41, 968, -12, 37, 42, 72, 1050, 929, 78,
- 1050, 1050, 1050, 1050, 1050, 1050, 1050, -275, -275, 1050,
- 1050, 1050, 391, 7, -275, -275, -275, -275, -275, 1050,
- 1, 1050, 725, -275, 1618, -275, -275, -275, -275, -275,
- -275, -275, -275, -275, -275, 13, 968, 1618, 1050, 1618,
- 5, 1050, 5, -275, -275, 1050, 1618, 22, 1050, -275,
- -275, 98, -275, 1050, -275, 80, -275, 173, -275, 101,
- -275, 102, 362, 107, -275, -31, -5, -5, 8, 82,
- 104, -275, 1535, -275, 173, -275, -275, 54, -275, 1229,
- 1263, 1296, 1329, 1585, 1494, 132, 133, -275, -275, 1548,
- 57, 60, -275, 1618, 62, 65, 66, -275, -275, 479,
- 1618, 1050, 1050, 1618, -275, -275, 1050, 1618, -275, -275,
- 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
- 1050, 1050, 1050, 1050, 1050, 1050, 1050, 142, 1050, 362,
- 1548, -47, 1050, 17, 19, 1050, 5, 142, -275, 69,
- 1618, 1050, -275, -275, -5, 16, 1050, 1050, -275, 1050,
- 1050, 18, 128, 1050, 1050, 1050, -275, 1050, -275, 154,
- 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050, 1050,
- -275, -275, -275, 83, -275, -275, -5, -5, -275, 1050,
- 58, -275, -275, 1618, 1618, 134, -275, 1618, 15, 15,
- 15, 15, 1631, 1631, -275, 20, 15, 15, 15, 15,
- 20, -35, -35, -275, -275, -275, -23, -275, 1618, -275,
- -275, 1618, -19, 160, 1618, -275, 156, -275, -275, 1618,
- 1618, 1618, 15, 1050, 1050, 175, 1618, 15, 1618, 1618,
- -275, 1618, 1362, 1618, 1395, 1618, 1428, 1618, 1461, 1618,
- 1618, 807, -275, 177, -275, -275, 1618, 57, 60, -275,
- 643, -275, -8, -275, 151, 105, 179, 105, -275, 142,
- 1050, 1618, 15, -5, 1050, 1050, 1050, 1050, -275, 643,
- -275, -275, -275, 120, 643, 155, 1050, 643, 807, 184,
- -275, -275, -275, 2, 1618, 159, 1618, 1618, 1618, 1618,
- -275, 125, -275, 127, 1050, 1618, -275, -275, -275, 561,
- 643, 105, 1050, -275, -275, 1618, -275, 85, -22, 192,
- -275, 1618, -275, 643, -275, -275, -275, 1050, 136, -275,
- -275, -275, 119, 643, 643, 139, -275, 1618, -275, 807,
- 198, 140, -275, 643, 176, -275, -275, -275, 144, -275,
- 146, -275, 643, -275, -275
+ 307, -76, -277, -277, 51, -277, 1048, 1086, 51, 1168,
+ -277, -277, -277, -277, -277, -277, -5, -277, 845, -277,
+ -277, 10, 966, -40, 279, 46, 50, 1206, 927, 55,
+ 1206, 1206, 1206, 1206, 1206, 1206, 1206, -277, -277, 1206,
+ 1206, 1206, 389, 6, -277, -277, -277, -277, -277, 1206,
+ 9, 1206, 723, -277, 1616, -277, -277, -277, -277, -277,
+ -277, -277, -277, -277, -277, -277, -277, -60, 966, 1206,
+ 1616, -18, 1206, -18, -277, 1206, 1616, 18, 1206, -277,
+ -277, 76, -277, 1206, -277, 72, -277, 171, -277, 94,
+ -277, 95, 360, 96, -277, -33, 51, 51, -12, 69,
+ 71, -277, 1533, -277, 171, -277, -277, 24, -277, 1227,
+ 1261, 1294, 1327, 1583, 1492, 100, 108, -277, -277, 1546,
+ 52, 58, -277, 1616, 54, 62, 63, -277, -277, 477,
+ 1616, 1206, 1206, 1616, -277, -277, 1206, 1616, -277, -277,
+ 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206,
+ 1206, 1206, 1206, 1206, 1206, 1206, 1206, 129, 1206, 360,
+ 1546, -4, 1206, 14, 16, 1206, -18, 129, -277, 64,
+ 1616, 1206, -277, -277, 51, 15, 1206, 1206, -277, 1206,
+ 1206, -11, 111, 1206, 1206, 1206, -277, 1206, -277, 140,
+ 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206,
+ -277, -277, -277, 67, -277, -277, 51, 51, -277, 1206,
+ 33, -277, -277, 1616, 1616, 121, -277, 1616, 13, 13,
+ 13, 13, 1629, 1629, -277, 17, 13, 13, 13, 13,
+ 17, -37, -37, -277, -277, -277, -45, -277, 1616, -277,
+ -277, 1616, -31, 152, 1616, -277, 139, -277, -277, 1616,
+ 1616, 1616, 13, 1206, 1206, 158, 1616, 13, 1616, 1616,
+ -277, 1616, 1360, 1616, 1393, 1616, 1426, 1616, 1459, 1616,
+ 1616, 805, -277, 159, -277, -277, 1616, 52, 58, -277,
+ 641, -277, -10, -277, 144, 98, 175, 98, -277, 129,
+ 1206, 1616, 13, 51, 1206, 1206, 1206, 1206, -277, 641,
+ -277, -277, -277, 114, 641, 149, 1206, 641, 805, 178,
+ -277, -277, -277, 0, 1616, 153, 1616, 1616, 1616, 1616,
+ -277, 117, -277, 120, 1206, 1616, -277, -277, -277, 559,
+ 641, 98, 1206, -277, -277, 1616, -277, 53, -24, 185,
+ -277, 1616, -277, 641, -277, -277, -277, 1206, 125, -277,
+ -277, -277, 112, 641, 641, 128, -277, 1616, -277, 805,
+ 192, 133, -277, 641, 169, -277, -277, -277, 138, -277,
+ 142, -277, 641, -277, -277
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -777,8 +777,8 @@ static const yytype_uint8 yydefact[] =
0, 0, 0, 0, 0, 0, 0, 112, 147, 0,
0, 0, 164, 0, 3, 71, 28, 7, 29, 0,
0, 0, 0, 62, 22, 104, 63, 23, 106, 107,
- 6, 50, 21, 61, 4, 60, 0, 68, 158, 159,
- 116, 158, 65, 60, 103, 158, 161, 157, 158, 50,
+ 6, 50, 21, 61, 4, 60, 68, 60, 0, 158,
+ 159, 116, 158, 65, 103, 158, 161, 157, 158, 50,
108, 0, 125, 0, 126, 0, 127, 128, 130, 0,
34, 0, 105, 0, 46, 0, 0, 0, 0, 0,
0, 142, 118, 133, 134, 136, 123, 114, 85, 0,
@@ -814,12 +814,12 @@ static const yytype_uint8 yydefact[] =
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -275, -275, 103, -275, -262, -275, 6, 32, -275, -275,
- -275, -275, -275, -275, 182, -275, -75, -84, -112, -275,
- 3, -4, -275, 73, 200, -275, -275, -275, -275, -275,
- -275, -18, -275, -275, -275, -275, -275, -275, -275, -275,
- -166, -275, -274, 202, 10, -275, -275, -275, -275, -275,
- 45
+ -277, -277, 101, -277, -258, -277, 4, 23, -277, -277,
+ -277, -277, -277, -277, 173, -277, -77, -86, -114, -277,
+ 1, -6, -277, 56, 177, -277, -277, -277, -277, -277,
+ -277, -20, -277, -277, -277, -277, -277, -277, -277, -277,
+ -160, -277, -276, 180, 11, -277, -277, -277, -277, -277,
+ 36
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -838,65 +838,73 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 67, 242, 69, 69, 167, 76, 47, 128, 2, 298,
- 105, 74, 349, 312, 87, 5, 70, 72, 92, 73,
- 10, 179, 11, 102, 104, 305, 108, 109, 110, 111,
- 112, 113, 114, 180, 146, 117, 118, 119, 123, 8,
- 247, 131, 93, 94, 306, 130, 327, 133, 137, 215,
- 216, 237, 162, 95, 96, 97, 64, 340, 155, 156,
- 183, 98, 159, 350, 160, 132, 100, 160, 99, 172,
- 253, 160, 184, 285, 69, 80, 286, 287, 161, 170,
- 286, 163, 254, 277, 146, 278, 188, 147, 166, 146,
- 90, 31, 32, 33, 34, 42, 101, 365, 331, 181,
- 182, 286, 106, 129, 162, 152, 153, 154, 155, 156,
- 158, 153, 154, 155, 156, 239, 162, 240, 162, 344,
- 345, 165, 168, 313, 171, 173, 174, 213, 214, 281,
- 282, 178, 217, 284, 185, 47, 218, 219, 220, 221,
- 222, 223, 224, 225, 226, 227, 228, 229, 230, 231,
- 232, 233, 234, 189, 69, 186, 202, 204, 238, 206,
- 299, 241, 207, 208, 209, 210, 235, 244, 243, 304,
- 289, 307, 249, 250, 255, 251, 252, 246, 260, 256,
- 257, 258, 273, 259, 288, 283, 261, 262, 263, 264,
- 265, 266, 267, 268, 269, 270, 303, 290, 329, 293,
- 330, 300, 308, 311, 309, 276, 322, 324, 328, 274,
- 275, 332, 333, 334, 320, 321, 351, 83, 360, 85,
- 323, 358, 366, 326, 343, 362, 367, 369, 353, 371,
- 354, 373, 211, 272, 136, 140, 141, 142, 143, 144,
- 145, 336, 146, 338, 363, 147, 148, 149, 248, 291,
- 292, 342, 138, 348, 139, 279, 0, 372, 0, 355,
- 0, 150, 151, 152, 153, 154, 155, 156, 0, 356,
- 361, 0, 0, 364, 359, 0, 0, 0, 0, 368,
- 0, 370, 0, 0, 0, 0, 314, 0, 374, 0,
- 316, 317, 318, 319, 0, 0, 315, 0, 0, 0,
- 0, 0, 325, 0, 0, 0, 0, 0, 0, -5,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 335, 0, 2, 0, 0, 3, 4, 0, 341, 5,
- 6, 7, 8, 9, 10, 0, 11, 0, 12, 13,
- 14, 15, 0, 357, 0, 16, 17, 18, 19, 0,
- 0, 0, 20, 0, 21, 0, 0, 22, 23, 24,
- 0, 0, 25, 0, 0, 0, 26, 27, 28, 0,
- 29, 0, 0, 0, 0, 0, 0, 30, 0, 0,
+ 70, 70, 167, 76, 47, 66, 128, 242, 105, 74,
+ 349, 312, 87, 298, 93, 94, 92, 71, 73, 179,
+ 64, 102, 104, 305, 108, 109, 110, 111, 112, 113,
+ 114, 180, 146, 117, 118, 119, 123, 158, 8, 247,
+ 183, 253, 306, 130, 80, 133, 137, 215, 216, 131,
+ 327, 285, 184, 254, 286, 340, 155, 156, 277, 90,
+ 278, 350, 159, 160, 2, 287, 160, 172, 286, 160,
+ 100, 5, 70, 132, 101, 65, 10, 170, 11, 106,
+ 161, 162, 146, 163, 188, 147, 146, 344, 345, 166,
+ 31, 32, 33, 34, 237, 162, 331, 181, 182, 286,
+ 168, 365, 129, 152, 153, 154, 155, 156, 153, 154,
+ 155, 156, 239, 162, 240, 162, 171, 165, 173, 174,
+ 178, 185, 186, 189, 202, 213, 214, 281, 282, 313,
+ 217, 284, 204, 47, 218, 219, 220, 221, 222, 223,
+ 224, 225, 226, 227, 228, 229, 230, 231, 232, 233,
+ 234, 42, 70, 235, 206, 208, 238, 255, 299, 241,
+ 207, 209, 210, 243, 260, 244, 273, 304, 289, 307,
+ 249, 250, 283, 251, 252, 246, 288, 256, 257, 258,
+ 290, 259, 293, 300, 261, 262, 263, 264, 265, 266,
+ 267, 268, 269, 270, 303, 308, 329, 309, 330, 311,
+ 322, 324, 328, 276, 333, 332, 334, 274, 275, 351,
+ 358, 360, 320, 321, 362, 83, 366, 85, 323, 367,
+ 369, 326, 343, 371, 272, 136, 353, 373, 354, 138,
+ 211, 248, 139, 140, 141, 142, 143, 144, 145, 336,
+ 146, 338, 363, 147, 148, 149, 279, 291, 292, 342,
+ 0, 348, 0, 0, 0, 372, 0, 355, 0, 150,
+ 151, 152, 153, 154, 155, 156, 0, 356, 361, 0,
+ 0, 364, 359, 0, 0, 0, 0, 368, 0, 370,
+ 0, 0, 0, 0, 314, 0, 374, 0, 316, 317,
+ 318, 319, 0, 0, 315, 95, 96, 97, 0, 0,
+ 325, 0, 0, 98, 0, 0, 0, -5, 1, 0,
+ 99, 0, 0, 0, 0, 0, 0, 0, 335, 0,
+ 2, 0, 0, 3, 4, 0, 341, 5, 6, 7,
+ 8, 9, 10, 0, 11, 0, 12, 13, 14, 15,
+ 0, 357, 0, 16, 17, 18, 19, 0, 0, 0,
+ 20, 0, 21, 0, 0, 22, 23, 24, 0, 0,
+ 25, 0, 0, 0, 26, 27, 28, 0, 29, 0,
+ 0, 0, 0, 0, 0, 30, 0, 0, 0, 0,
+ 0, 0, 31, 32, 33, 34, 35, 0, 0, 36,
+ 37, 38, 0, 0, 0, 0, 0, 0, 39, 40,
+ 0, 175, 2, -5, 41, 3, 4, 42, 0, 5,
+ 0, 7, 8, 67, 120, 0, 121, 0, 0, 0,
+ 14, 15, 140, 141, 142, 143, 144, 145, 0, 146,
+ 176, 177, 147, 148, 149, 0, 0, 68, 0, 24,
+ 0, 0, 0, 0, 0, 0, 0, 0, 150, 151,
+ 152, 153, 154, 155, 156, 0, 0, 30, 0, 0,
0, 0, 0, 0, 31, 32, 33, 34, 35, 0,
- 0, 36, 37, 38, 0, 0, 0, 0, 0, 0,
- 39, 40, 0, 175, 2, -5, 41, 3, 4, 42,
- 0, 5, 0, 7, 8, 65, 120, 0, 121, 0,
- 0, 0, 14, 15, 140, 141, 142, 143, 144, 145,
- 0, 146, 176, 177, 147, 148, 149, 0, 0, 66,
- 0, 24, 0, 0, 0, 0, 0, 0, 0, 0,
- 150, 151, 152, 153, 154, 155, 156, 0, 0, 30,
- 0, 0, 0, 0, 0, 0, 31, 32, 33, 34,
- 35, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 39, 40, 0, 0, 0, 0, 41, 0,
- 0, 42, 2, 122, 0, 3, 4, 0, 0, 5,
- 6, 7, 8, 9, 10, 0, 11, 0, 12, 13,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 39, 40, 0, 0, 0, 0, 41, 0, 0, 42,
+ 2, 122, 0, 3, 4, 0, 0, 5, 6, 7,
+ 8, 9, 10, 0, 11, 0, 12, 13, 14, 15,
+ 0, 0, 0, 16, 17, 18, 19, 0, 0, 0,
+ 20, 0, 21, 0, 0, 22, 23, 24, 0, 0,
+ 25, 0, 0, 0, 26, 27, 28, 0, 29, 0,
+ 0, 0, 0, 0, 0, 30, 0, 0, 0, 0,
+ 0, 0, 31, 32, 33, 34, 35, 0, 0, 36,
+ 37, 38, 0, 0, 0, 0, 0, 0, 39, 40,
+ 0, 0, 2, 0, 41, 3, 4, 42, 0, 5,
+ 6, 7, 8, 9, 10, 0, 11, 339, 12, 0,
14, 15, 0, 0, 0, 16, 17, 18, 19, 0,
- 0, 0, 20, 0, 21, 0, 0, 22, 23, 24,
- 0, 0, 25, 0, 0, 0, 26, 27, 28, 0,
+ 0, 0, 0, 0, 21, 0, 0, 22, 23, 24,
+ 0, 0, 25, 0, 0, 0, 0, 27, 28, 0,
29, 0, 0, 0, 0, 0, 0, 30, 0, 0,
0, 0, 0, 0, 31, 32, 33, 34, 35, 0,
- 0, 36, 37, 38, 0, 0, 0, 0, 0, 0,
- 39, 40, 0, 0, 2, 0, 41, 3, 4, 42,
- 0, 5, 6, 7, 8, 9, 10, 0, 11, 339,
+ 0, 36, 37, 0, 0, 0, 0, 0, 0, 0,
+ 39, 40, 0, 0, 2, 301, 41, 3, 4, 42,
+ 0, 5, 6, 7, 8, 9, 10, 0, 11, 0,
12, 0, 14, 15, 0, 0, 0, 16, 17, 18,
19, 0, 0, 0, 0, 0, 21, 0, 0, 22,
23, 24, 0, 0, 25, 0, 0, 0, 0, 27,
@@ -906,174 +914,174 @@ static const yytype_int16 yytable[] =
0, 0, 39, 40, 0, 0, 2, 301, 41, 3,
4, 42, 0, 5, 6, 7, 8, 9, 10, 0,
11, 0, 12, 0, 14, 15, 0, 0, 0, 16,
- 17, 18, 19, 0, 0, 0, 0, 0, 21, 0,
- 0, 22, 23, 24, 0, 0, 25, 0, 0, 0,
+ 17, 18, 19, 0, 0, 0, 0, 0, 0, 0,
+ 0, 22, 0, 24, 0, 0, 0, 0, 0, 0,
0, 27, 28, 0, 29, 0, 0, 0, 0, 0,
0, 30, 0, 0, 0, 0, 0, 0, 31, 32,
- 33, 34, 35, 0, 0, 36, 37, 0, 0, 0,
- 0, 0, 0, 0, 39, 40, 0, 0, 2, 301,
+ 33, 34, 35, 0, 0, 0, 37, 0, 0, 0,
+ 0, 0, 0, 0, 39, 40, 0, 0, 2, 0,
41, 3, 4, 42, 0, 5, 6, 7, 8, 9,
10, 0, 11, 0, 12, 0, 14, 15, 0, 0,
- 0, 16, 17, 18, 19, 0, 0, 0, 0, 0,
- 0, 0, 0, 22, 0, 24, 0, 0, 0, 0,
- 0, 0, 0, 27, 28, 0, 29, 0, 0, 0,
+ 0, 16, 17, 18, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 22, 0, 24, 0, 0, 2, 0,
+ 0, 3, 4, 27, 28, 5, 29, 7, 8, 67,
+ 10, 0, 11, 30, 0, 0, 14, 15, 0, 0,
+ 31, 32, 33, 34, 35, 0, 0, 82, 37, 83,
+ 84, 85, 86, 68, 0, 24, 39, 40, 0, 0,
+ 0, 0, 41, 0, 0, 42, 0, 0, 0, 0,
0, 0, 0, 30, 0, 0, 0, 0, 0, 0,
- 31, 32, 33, 34, 35, 0, 0, 0, 37, 0,
+ 31, 32, 33, 34, 35, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 39, 40, 0, 0,
- 2, 0, 41, 3, 4, 42, 0, 5, 6, 7,
- 8, 9, 10, 0, 11, 0, 12, 0, 14, 15,
- 0, 0, 0, 16, 17, 18, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 22, 0, 24, 0, 0,
- 2, 0, 0, 3, 4, 27, 28, 5, 29, 7,
- 8, 65, 10, 0, 11, 30, 0, 0, 14, 15,
- 0, 0, 31, 32, 33, 34, 35, 0, 0, 82,
- 37, 83, 84, 85, 86, 66, 0, 24, 39, 40,
- 0, 0, 0, 0, 41, 0, 0, 42, 0, 0,
- 0, 0, 0, 0, 0, 30, 0, 0, 0, 0,
+ 2, 0, 41, 3, 4, 42, 0, 5, 0, 7,
+ 8, 67, 10, 0, 11, 0, 0, 0, 14, 15,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 83, 0, 85, 0, 68, 0, 24, 0, 2,
+ 0, 0, 3, 4, 0, 91, 5, 103, 7, 8,
+ 67, 10, 0, 11, 0, 30, 0, 14, 15, 0,
0, 0, 31, 32, 33, 34, 35, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 39, 40,
- 0, 0, 2, 0, 41, 3, 4, 42, 0, 5,
- 0, 7, 8, 65, 10, 0, 11, 0, 0, 0,
- 14, 15, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 83, 0, 85, 0, 66, 0, 24,
- 0, 2, 0, 0, 3, 4, 0, 91, 5, 103,
- 7, 8, 65, 10, 0, 11, 0, 30, 0, 14,
- 15, 0, 0, 0, 31, 32, 33, 34, 35, 0,
- 0, 0, 0, 0, 0, 0, 66, 0, 24, 0,
- 39, 40, 0, 0, 0, 0, 41, 0, 0, 42,
- 0, 0, 0, 0, 0, 0, 30, 0, 0, 0,
+ 0, 0, 0, 0, 68, 0, 24, 0, 39, 40,
+ 0, 0, 0, 0, 41, 0, 0, 42, 0, 0,
+ 0, 0, 0, 0, 30, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 34, 35, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 39, 40, 0,
+ 0, 2, 0, 41, 3, 4, 42, 0, 5, 0,
+ 7, 8, 67, 10, 0, 11, 0, 0, 0, 14,
+ 15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 68, 0, 24, 2,
+ 0, 0, 3, 4, 0, 0, 5, 0, 7, 8,
+ 67, 10, 0, 11, 0, 0, 30, 14, 15, 0,
0, 0, 0, 31, 32, 33, 34, 35, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 39,
- 40, 0, 0, 2, 0, 41, 3, 4, 42, 0,
- 5, 0, 7, 8, 65, 10, 0, 11, 0, 0,
- 0, 14, 15, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 66, 0,
- 24, 2, 0, 0, 3, 4, 0, 0, 5, 0,
- 7, 8, 65, 10, 0, 11, 0, 0, 30, 14,
- 15, 0, 0, 0, 0, 31, 32, 33, 34, 35,
- 0, 0, 0, 0, 0, 0, 66, 0, 24, 0,
- 0, 39, 40, 0, 0, 0, 0, 41, 0, 0,
- 42, 0, 0, 0, 0, 0, 30, 0, 0, 0,
+ 0, 0, 0, 0, 68, 0, 24, 0, 0, 39,
+ 40, 0, 0, 0, 0, 69, 0, 0, 42, 0,
+ 0, 0, 0, 0, 30, 0, 0, 0, 0, 0,
+ 0, 31, 32, 33, 34, 35, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 39, 40, 0,
+ 0, 2, 0, 72, 3, 4, 42, 0, 5, 0,
+ 7, 8, 67, 10, 0, 11, 0, 0, 0, 14,
+ 15, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 68, 0, 24, 2,
+ 0, 0, 3, 4, 0, 0, 5, 0, 7, 8,
+ 67, 10, 0, 11, 0, 0, 30, 14, 15, 0,
0, 0, 0, 31, 32, 33, 34, 35, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 39,
- 40, 0, 0, 2, 0, 68, 3, 4, 42, 0,
- 5, 0, 7, 8, 65, 10, 0, 11, 0, 0,
- 0, 14, 15, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 66, 0,
- 24, 2, 0, 0, 3, 4, 0, 0, 5, 0,
- 7, 8, 65, 10, 0, 11, 0, 0, 30, 14,
- 15, 0, 0, 0, 0, 31, 32, 33, 34, 35,
- 0, 0, 0, 0, 0, 0, 66, 0, 24, 0,
- 0, 39, 40, 0, 0, 0, 0, 71, 0, 0,
- 42, 0, 0, 0, 0, 190, 30, 0, 0, 0,
- 0, 191, 0, 31, 32, 33, 34, 35, 0, 0,
- 0, 140, 141, 142, 143, 144, 145, 0, 146, 39,
- 40, 147, 148, 149, 0, 75, 0, 0, 42, 192,
- 0, 0, 0, 0, 0, 193, 0, 150, 151, 152,
- 153, 154, 155, 156, 0, 140, 141, 142, 143, 144,
+ 0, 0, 0, 0, 68, 0, 24, 0, 0, 39,
+ 40, 0, 0, 0, 0, 75, 0, 0, 42, 0,
+ 0, 0, 0, 190, 30, 0, 0, 0, 0, 191,
+ 0, 31, 32, 33, 34, 35, 0, 0, 0, 140,
+ 141, 142, 143, 144, 145, 0, 146, 39, 40, 147,
+ 148, 149, 0, 41, 0, 0, 42, 192, 0, 0,
+ 0, 0, 0, 193, 0, 150, 151, 152, 153, 154,
+ 155, 156, 0, 140, 141, 142, 143, 144, 145, 0,
+ 146, 0, 0, 147, 148, 149, 0, 0, 0, 0,
+ 194, 0, 0, 0, 0, 0, 195, 0, 0, 150,
+ 151, 152, 153, 154, 155, 156, 140, 141, 142, 143,
+ 144, 145, 0, 146, 0, 0, 147, 148, 149, 0,
+ 0, 0, 0, 196, 0, 0, 0, 0, 0, 197,
+ 0, 0, 150, 151, 152, 153, 154, 155, 156, 140,
+ 141, 142, 143, 144, 145, 0, 146, 0, 0, 147,
+ 148, 149, 0, 0, 0, 0, 294, 0, 0, 0,
+ 0, 0, 0, 0, 0, 150, 151, 152, 153, 154,
+ 155, 156, 140, 141, 142, 143, 144, 145, 0, 146,
+ 0, 0, 147, 148, 149, 0, 0, 0, 0, 295,
+ 0, 0, 0, 0, 0, 0, 0, 0, 150, 151,
+ 152, 153, 154, 155, 156, 140, 141, 142, 143, 144,
145, 0, 146, 0, 0, 147, 148, 149, 0, 0,
- 0, 0, 194, 0, 0, 0, 0, 0, 195, 0,
+ 0, 0, 296, 0, 0, 0, 0, 0, 0, 0,
0, 150, 151, 152, 153, 154, 155, 156, 140, 141,
142, 143, 144, 145, 0, 146, 0, 0, 147, 148,
- 149, 0, 0, 0, 0, 196, 0, 0, 0, 0,
- 0, 197, 0, 0, 150, 151, 152, 153, 154, 155,
+ 149, 0, 0, 0, 0, 297, 0, 0, 0, 0,
+ 0, 0, 0, 0, 150, 151, 152, 153, 154, 155,
156, 140, 141, 142, 143, 144, 145, 0, 146, 0,
- 0, 147, 148, 149, 0, 0, 0, 0, 294, 0,
- 0, 0, 0, 0, 0, 0, 0, 150, 151, 152,
+ 0, 147, 148, 149, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 200, 0, 0, 150, 151, 152,
153, 154, 155, 156, 140, 141, 142, 143, 144, 145,
0, 146, 0, 0, 147, 148, 149, 0, 0, 0,
- 0, 295, 0, 0, 0, 0, 0, 0, 0, 0,
- 150, 151, 152, 153, 154, 155, 156, 140, 141, 142,
- 143, 144, 145, 0, 146, 0, 0, 147, 148, 149,
- 0, 0, 0, 0, 296, 0, 0, 0, 0, 0,
- 0, 0, 0, 150, 151, 152, 153, 154, 155, 156,
- 140, 141, 142, 143, 144, 145, 0, 146, 0, 0,
- 147, 148, 149, 0, 0, 0, 0, 297, 0, 0,
- 0, 0, 0, 0, 0, 0, 150, 151, 152, 153,
- 154, 155, 156, 140, 141, 142, 143, 144, 145, 0,
- 146, 0, 0, 147, 148, 149, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 200, 0, 0, 150,
- 151, 152, 153, 154, 155, 156, 140, 141, 142, 143,
- 144, 145, 0, 146, 0, 0, 147, 148, 149, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 150, 151, 152, 153, 154, 155, 156, 187,
- 201, 0, 0, 0, 0, 0, 0, 140, 141, 142,
- 143, 144, 145, 0, 146, 0, 0, 147, 148, 149,
- 140, 141, 142, 143, 144, 145, 0, 146, 0, 0,
- 147, 148, 149, 150, 151, 152, 153, 154, 155, 156,
- 0, 0, 0, 0, 0, 0, 150, 151, 152, 153,
- 154, 155, 156, 0, 0, 0, 205, 140, 141, 142,
- 143, 144, 145, 0, 146, 0, 0, 147, 148, 149,
- 0, 0, 0, 0, 0, 198, 199, 0, 0, 0,
- 0, 0, 0, 150, 151, 152, 153, 154, 155, 156,
- 140, 141, 142, 143, 144, 145, 0, 146, 0, 0,
- 147, 148, 149, 140, 141, 142, 143, 0, 0, 0,
- 146, 0, 0, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 0, 0, 0, 0, 0, 0, 150,
- 151, 152, 153, 154, 155, 156
+ 150, 151, 152, 153, 154, 155, 156, 187, 201, 0,
+ 0, 0, 0, 0, 0, 140, 141, 142, 143, 144,
+ 145, 0, 146, 0, 0, 147, 148, 149, 140, 141,
+ 142, 143, 144, 145, 0, 146, 0, 0, 147, 148,
+ 149, 150, 151, 152, 153, 154, 155, 156, 0, 0,
+ 0, 0, 0, 0, 150, 151, 152, 153, 154, 155,
+ 156, 0, 0, 0, 205, 140, 141, 142, 143, 144,
+ 145, 0, 146, 0, 0, 147, 148, 149, 0, 0,
+ 0, 0, 0, 198, 199, 0, 0, 0, 0, 0,
+ 0, 150, 151, 152, 153, 154, 155, 156, 140, 141,
+ 142, 143, 144, 145, 0, 146, 0, 0, 147, 148,
+ 149, 140, 141, 142, 143, 0, 0, 0, 146, 0,
+ 0, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 0, 0, 0, 0, 0, 0, 150, 151, 152,
+ 153, 154, 155, 156
};
static const yytype_int16 yycheck[] =
{
- 4, 167, 6, 7, 79, 9, 0, 0, 13, 271,
- 28, 8, 34, 287, 18, 20, 6, 7, 22, 24,
- 25, 52, 27, 27, 28, 33, 30, 31, 32, 33,
- 34, 35, 36, 64, 69, 39, 40, 41, 42, 23,
- 24, 40, 54, 55, 52, 49, 308, 51, 52, 133,
- 134, 98, 99, 16, 17, 18, 96, 331, 93, 94,
- 52, 24, 66, 85, 68, 64, 24, 71, 31, 87,
- 52, 75, 64, 96, 78, 49, 99, 96, 68, 83,
- 99, 71, 64, 25, 69, 27, 104, 72, 78, 69,
- 49, 75, 76, 77, 78, 100, 24, 359, 96, 96,
- 97, 99, 24, 96, 99, 90, 91, 92, 93, 94,
- 97, 91, 92, 93, 94, 98, 99, 98, 99, 34,
- 35, 99, 24, 289, 44, 24, 24, 131, 132, 213,
- 214, 24, 136, 217, 52, 129, 140, 141, 142, 143,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- 154, 155, 156, 99, 158, 51, 24, 24, 162, 102,
- 272, 165, 102, 101, 99, 99, 24, 171, 99, 281,
- 245, 283, 176, 177, 46, 179, 180, 174, 24, 183,
- 184, 185, 99, 187, 24, 51, 190, 191, 192, 193,
- 194, 195, 196, 197, 198, 199, 280, 41, 310, 24,
- 312, 24, 51, 24, 99, 209, 86, 52, 24, 206,
- 207, 52, 87, 86, 298, 299, 24, 44, 99, 46,
- 304, 85, 24, 307, 336, 86, 86, 51, 340, 85,
- 342, 85, 129, 201, 52, 62, 63, 64, 65, 66,
- 67, 325, 69, 327, 356, 72, 73, 74, 175, 253,
- 254, 335, 52, 337, 52, 210, -1, 369, -1, 343,
- -1, 88, 89, 90, 91, 92, 93, 94, -1, 344,
- 354, -1, -1, 357, 349, -1, -1, -1, -1, 363,
- -1, 365, -1, -1, -1, -1, 290, -1, 372, -1,
- 294, 295, 296, 297, -1, -1, 293, -1, -1, -1,
- -1, -1, 306, -1, -1, -1, -1, -1, -1, 0,
- 1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 324, -1, 13, -1, -1, 16, 17, -1, 332, 20,
- 21, 22, 23, 24, 25, -1, 27, -1, 29, 30,
- 31, 32, -1, 347, -1, 36, 37, 38, 39, -1,
- -1, -1, 43, -1, 45, -1, -1, 48, 49, 50,
- -1, -1, 53, -1, -1, -1, 57, 58, 59, -1,
- 61, -1, -1, -1, -1, -1, -1, 68, -1, -1,
+ 6, 7, 79, 9, 0, 4, 0, 167, 28, 8,
+ 34, 287, 18, 271, 54, 55, 22, 6, 7, 52,
+ 96, 27, 28, 33, 30, 31, 32, 33, 34, 35,
+ 36, 64, 69, 39, 40, 41, 42, 97, 23, 24,
+ 52, 52, 52, 49, 49, 51, 52, 133, 134, 40,
+ 308, 96, 64, 64, 99, 331, 93, 94, 25, 49,
+ 27, 85, 68, 69, 13, 96, 72, 87, 99, 75,
+ 24, 20, 78, 64, 24, 24, 25, 83, 27, 24,
+ 69, 99, 69, 72, 104, 72, 69, 34, 35, 78,
+ 75, 76, 77, 78, 98, 99, 96, 96, 97, 99,
+ 24, 359, 96, 90, 91, 92, 93, 94, 91, 92,
+ 93, 94, 98, 99, 98, 99, 44, 99, 24, 24,
+ 24, 52, 51, 99, 24, 131, 132, 213, 214, 289,
+ 136, 217, 24, 129, 140, 141, 142, 143, 144, 145,
+ 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,
+ 156, 100, 158, 24, 102, 101, 162, 46, 272, 165,
+ 102, 99, 99, 99, 24, 171, 99, 281, 245, 283,
+ 176, 177, 51, 179, 180, 174, 24, 183, 184, 185,
+ 41, 187, 24, 24, 190, 191, 192, 193, 194, 195,
+ 196, 197, 198, 199, 280, 51, 310, 99, 312, 24,
+ 86, 52, 24, 209, 87, 52, 86, 206, 207, 24,
+ 85, 99, 298, 299, 86, 44, 24, 46, 304, 86,
+ 51, 307, 336, 85, 201, 52, 340, 85, 342, 52,
+ 129, 175, 52, 62, 63, 64, 65, 66, 67, 325,
+ 69, 327, 356, 72, 73, 74, 210, 253, 254, 335,
+ -1, 337, -1, -1, -1, 369, -1, 343, -1, 88,
+ 89, 90, 91, 92, 93, 94, -1, 344, 354, -1,
+ -1, 357, 349, -1, -1, -1, -1, 363, -1, 365,
+ -1, -1, -1, -1, 290, -1, 372, -1, 294, 295,
+ 296, 297, -1, -1, 293, 16, 17, 18, -1, -1,
+ 306, -1, -1, 24, -1, -1, -1, 0, 1, -1,
+ 31, -1, -1, -1, -1, -1, -1, -1, 324, -1,
+ 13, -1, -1, 16, 17, -1, 332, 20, 21, 22,
+ 23, 24, 25, -1, 27, -1, 29, 30, 31, 32,
+ -1, 347, -1, 36, 37, 38, 39, -1, -1, -1,
+ 43, -1, 45, -1, -1, 48, 49, 50, -1, -1,
+ 53, -1, -1, -1, 57, 58, 59, -1, 61, -1,
+ -1, -1, -1, -1, -1, 68, -1, -1, -1, -1,
+ -1, -1, 75, 76, 77, 78, 79, -1, -1, 82,
+ 83, 84, -1, -1, -1, -1, -1, -1, 91, 92,
+ -1, 41, 13, 96, 97, 16, 17, 100, -1, 20,
+ -1, 22, 23, 24, 25, -1, 27, -1, -1, -1,
+ 31, 32, 62, 63, 64, 65, 66, 67, -1, 69,
+ 70, 71, 72, 73, 74, -1, -1, 48, -1, 50,
+ -1, -1, -1, -1, -1, -1, -1, -1, 88, 89,
+ 90, 91, 92, 93, 94, -1, -1, 68, -1, -1,
-1, -1, -1, -1, 75, 76, 77, 78, 79, -1,
- -1, 82, 83, 84, -1, -1, -1, -1, -1, -1,
- 91, 92, -1, 41, 13, 96, 97, 16, 17, 100,
- -1, 20, -1, 22, 23, 24, 25, -1, 27, -1,
- -1, -1, 31, 32, 62, 63, 64, 65, 66, 67,
- -1, 69, 70, 71, 72, 73, 74, -1, -1, 48,
- -1, 50, -1, -1, -1, -1, -1, -1, -1, -1,
- 88, 89, 90, 91, 92, 93, 94, -1, -1, 68,
- -1, -1, -1, -1, -1, -1, 75, 76, 77, 78,
- 79, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 91, 92, -1, -1, -1, -1, 97, -1,
- -1, 100, 13, 102, -1, 16, 17, -1, -1, 20,
- 21, 22, 23, 24, 25, -1, 27, -1, 29, 30,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 91, 92, -1, -1, -1, -1, 97, -1, -1, 100,
+ 13, 102, -1, 16, 17, -1, -1, 20, 21, 22,
+ 23, 24, 25, -1, 27, -1, 29, 30, 31, 32,
+ -1, -1, -1, 36, 37, 38, 39, -1, -1, -1,
+ 43, -1, 45, -1, -1, 48, 49, 50, -1, -1,
+ 53, -1, -1, -1, 57, 58, 59, -1, 61, -1,
+ -1, -1, -1, -1, -1, 68, -1, -1, -1, -1,
+ -1, -1, 75, 76, 77, 78, 79, -1, -1, 82,
+ 83, 84, -1, -1, -1, -1, -1, -1, 91, 92,
+ -1, -1, 13, -1, 97, 16, 17, 100, -1, 20,
+ 21, 22, 23, 24, 25, -1, 27, 28, 29, -1,
31, 32, -1, -1, -1, 36, 37, 38, 39, -1,
- -1, -1, 43, -1, 45, -1, -1, 48, 49, 50,
- -1, -1, 53, -1, -1, -1, 57, 58, 59, -1,
+ -1, -1, -1, -1, 45, -1, -1, 48, 49, 50,
+ -1, -1, 53, -1, -1, -1, -1, 58, 59, -1,
61, -1, -1, -1, -1, -1, -1, 68, -1, -1,
-1, -1, -1, -1, 75, 76, 77, 78, 79, -1,
- -1, 82, 83, 84, -1, -1, -1, -1, -1, -1,
- 91, 92, -1, -1, 13, -1, 97, 16, 17, 100,
- -1, 20, 21, 22, 23, 24, 25, -1, 27, 28,
+ -1, 82, 83, -1, -1, -1, -1, -1, -1, -1,
+ 91, 92, -1, -1, 13, 96, 97, 16, 17, 100,
+ -1, 20, 21, 22, 23, 24, 25, -1, 27, -1,
29, -1, 31, 32, -1, -1, -1, 36, 37, 38,
39, -1, -1, -1, -1, -1, 45, -1, -1, 48,
49, 50, -1, -1, 53, -1, -1, -1, -1, 58,
@@ -1083,111 +1091,103 @@ static const yytype_int16 yycheck[] =
-1, -1, 91, 92, -1, -1, 13, 96, 97, 16,
17, 100, -1, 20, 21, 22, 23, 24, 25, -1,
27, -1, 29, -1, 31, 32, -1, -1, -1, 36,
- 37, 38, 39, -1, -1, -1, -1, -1, 45, -1,
- -1, 48, 49, 50, -1, -1, 53, -1, -1, -1,
+ 37, 38, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 48, -1, 50, -1, -1, -1, -1, -1, -1,
-1, 58, 59, -1, 61, -1, -1, -1, -1, -1,
-1, 68, -1, -1, -1, -1, -1, -1, 75, 76,
- 77, 78, 79, -1, -1, 82, 83, -1, -1, -1,
- -1, -1, -1, -1, 91, 92, -1, -1, 13, 96,
+ 77, 78, 79, -1, -1, -1, 83, -1, -1, -1,
+ -1, -1, -1, -1, 91, 92, -1, -1, 13, -1,
97, 16, 17, 100, -1, 20, 21, 22, 23, 24,
25, -1, 27, -1, 29, -1, 31, 32, -1, -1,
- -1, 36, 37, 38, 39, -1, -1, -1, -1, -1,
- -1, -1, -1, 48, -1, 50, -1, -1, -1, -1,
- -1, -1, -1, 58, 59, -1, 61, -1, -1, -1,
+ -1, 36, 37, 38, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 48, -1, 50, -1, -1, 13, -1,
+ -1, 16, 17, 58, 59, 20, 61, 22, 23, 24,
+ 25, -1, 27, 68, -1, -1, 31, 32, -1, -1,
+ 75, 76, 77, 78, 79, -1, -1, 42, 83, 44,
+ 45, 46, 47, 48, -1, 50, 91, 92, -1, -1,
+ -1, -1, 97, -1, -1, 100, -1, -1, -1, -1,
-1, -1, -1, 68, -1, -1, -1, -1, -1, -1,
- 75, 76, 77, 78, 79, -1, -1, -1, 83, -1,
+ 75, 76, 77, 78, 79, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 91, 92, -1, -1,
- 13, -1, 97, 16, 17, 100, -1, 20, 21, 22,
- 23, 24, 25, -1, 27, -1, 29, -1, 31, 32,
- -1, -1, -1, 36, 37, 38, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 48, -1, 50, -1, -1,
- 13, -1, -1, 16, 17, 58, 59, 20, 61, 22,
- 23, 24, 25, -1, 27, 68, -1, -1, 31, 32,
- -1, -1, 75, 76, 77, 78, 79, -1, -1, 42,
- 83, 44, 45, 46, 47, 48, -1, 50, 91, 92,
- -1, -1, -1, -1, 97, -1, -1, 100, -1, -1,
- -1, -1, -1, -1, -1, 68, -1, -1, -1, -1,
+ 13, -1, 97, 16, 17, 100, -1, 20, -1, 22,
+ 23, 24, 25, -1, 27, -1, -1, -1, 31, 32,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 44, -1, 46, -1, 48, -1, 50, -1, 13,
+ -1, -1, 16, 17, -1, 19, 20, 60, 22, 23,
+ 24, 25, -1, 27, -1, 68, -1, 31, 32, -1,
-1, -1, 75, 76, 77, 78, 79, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 91, 92,
- -1, -1, 13, -1, 97, 16, 17, 100, -1, 20,
- -1, 22, 23, 24, 25, -1, 27, -1, -1, -1,
- 31, 32, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 44, -1, 46, -1, 48, -1, 50,
- -1, 13, -1, -1, 16, 17, -1, 19, 20, 60,
- 22, 23, 24, 25, -1, 27, -1, 68, -1, 31,
- 32, -1, -1, -1, 75, 76, 77, 78, 79, -1,
- -1, -1, -1, -1, -1, -1, 48, -1, 50, -1,
- 91, 92, -1, -1, -1, -1, 97, -1, -1, 100,
- -1, -1, -1, -1, -1, -1, 68, -1, -1, -1,
+ -1, -1, -1, -1, 48, -1, 50, -1, 91, 92,
+ -1, -1, -1, -1, 97, -1, -1, 100, -1, -1,
+ -1, -1, -1, -1, 68, -1, -1, -1, -1, -1,
+ -1, 75, 76, 77, 78, 79, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 91, 92, -1,
+ -1, 13, -1, 97, 16, 17, 100, -1, 20, -1,
+ 22, 23, 24, 25, -1, 27, -1, -1, -1, 31,
+ 32, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 48, -1, 50, 13,
+ -1, -1, 16, 17, -1, -1, 20, -1, 22, 23,
+ 24, 25, -1, 27, -1, -1, 68, 31, 32, -1,
-1, -1, -1, 75, 76, 77, 78, 79, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 91,
- 92, -1, -1, 13, -1, 97, 16, 17, 100, -1,
- 20, -1, 22, 23, 24, 25, -1, 27, -1, -1,
- -1, 31, 32, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, -1,
- 50, 13, -1, -1, 16, 17, -1, -1, 20, -1,
- 22, 23, 24, 25, -1, 27, -1, -1, 68, 31,
- 32, -1, -1, -1, -1, 75, 76, 77, 78, 79,
- -1, -1, -1, -1, -1, -1, 48, -1, 50, -1,
- -1, 91, 92, -1, -1, -1, -1, 97, -1, -1,
- 100, -1, -1, -1, -1, -1, 68, -1, -1, -1,
+ -1, -1, -1, -1, 48, -1, 50, -1, -1, 91,
+ 92, -1, -1, -1, -1, 97, -1, -1, 100, -1,
+ -1, -1, -1, -1, 68, -1, -1, -1, -1, -1,
+ -1, 75, 76, 77, 78, 79, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 91, 92, -1,
+ -1, 13, -1, 97, 16, 17, 100, -1, 20, -1,
+ 22, 23, 24, 25, -1, 27, -1, -1, -1, 31,
+ 32, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 48, -1, 50, 13,
+ -1, -1, 16, 17, -1, -1, 20, -1, 22, 23,
+ 24, 25, -1, 27, -1, -1, 68, 31, 32, -1,
-1, -1, -1, 75, 76, 77, 78, 79, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 91,
- 92, -1, -1, 13, -1, 97, 16, 17, 100, -1,
- 20, -1, 22, 23, 24, 25, -1, 27, -1, -1,
- -1, 31, 32, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 48, -1,
- 50, 13, -1, -1, 16, 17, -1, -1, 20, -1,
- 22, 23, 24, 25, -1, 27, -1, -1, 68, 31,
- 32, -1, -1, -1, -1, 75, 76, 77, 78, 79,
- -1, -1, -1, -1, -1, -1, 48, -1, 50, -1,
- -1, 91, 92, -1, -1, -1, -1, 97, -1, -1,
- 100, -1, -1, -1, -1, 46, 68, -1, -1, -1,
- -1, 52, -1, 75, 76, 77, 78, 79, -1, -1,
- -1, 62, 63, 64, 65, 66, 67, -1, 69, 91,
- 92, 72, 73, 74, -1, 97, -1, -1, 100, 46,
- -1, -1, -1, -1, -1, 52, -1, 88, 89, 90,
- 91, 92, 93, 94, -1, 62, 63, 64, 65, 66,
+ -1, -1, -1, -1, 48, -1, 50, -1, -1, 91,
+ 92, -1, -1, -1, -1, 97, -1, -1, 100, -1,
+ -1, -1, -1, 46, 68, -1, -1, -1, -1, 52,
+ -1, 75, 76, 77, 78, 79, -1, -1, -1, 62,
+ 63, 64, 65, 66, 67, -1, 69, 91, 92, 72,
+ 73, 74, -1, 97, -1, -1, 100, 46, -1, -1,
+ -1, -1, -1, 52, -1, 88, 89, 90, 91, 92,
+ 93, 94, -1, 62, 63, 64, 65, 66, 67, -1,
+ 69, -1, -1, 72, 73, 74, -1, -1, -1, -1,
+ 46, -1, -1, -1, -1, -1, 52, -1, -1, 88,
+ 89, 90, 91, 92, 93, 94, 62, 63, 64, 65,
+ 66, 67, -1, 69, -1, -1, 72, 73, 74, -1,
+ -1, -1, -1, 46, -1, -1, -1, -1, -1, 52,
+ -1, -1, 88, 89, 90, 91, 92, 93, 94, 62,
+ 63, 64, 65, 66, 67, -1, 69, -1, -1, 72,
+ 73, 74, -1, -1, -1, -1, 46, -1, -1, -1,
+ -1, -1, -1, -1, -1, 88, 89, 90, 91, 92,
+ 93, 94, 62, 63, 64, 65, 66, 67, -1, 69,
+ -1, -1, 72, 73, 74, -1, -1, -1, -1, 46,
+ -1, -1, -1, -1, -1, -1, -1, -1, 88, 89,
+ 90, 91, 92, 93, 94, 62, 63, 64, 65, 66,
67, -1, 69, -1, -1, 72, 73, 74, -1, -1,
- -1, -1, 46, -1, -1, -1, -1, -1, 52, -1,
+ -1, -1, 46, -1, -1, -1, -1, -1, -1, -1,
-1, 88, 89, 90, 91, 92, 93, 94, 62, 63,
64, 65, 66, 67, -1, 69, -1, -1, 72, 73,
74, -1, -1, -1, -1, 46, -1, -1, -1, -1,
- -1, 52, -1, -1, 88, 89, 90, 91, 92, 93,
+ -1, -1, -1, -1, 88, 89, 90, 91, 92, 93,
94, 62, 63, 64, 65, 66, 67, -1, 69, -1,
- -1, 72, 73, 74, -1, -1, -1, -1, 46, -1,
- -1, -1, -1, -1, -1, -1, -1, 88, 89, 90,
+ -1, 72, 73, 74, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 52, -1, -1, 88, 89, 90,
91, 92, 93, 94, 62, 63, 64, 65, 66, 67,
-1, 69, -1, -1, 72, 73, 74, -1, -1, -1,
- -1, 46, -1, -1, -1, -1, -1, -1, -1, -1,
- 88, 89, 90, 91, 92, 93, 94, 62, 63, 64,
- 65, 66, 67, -1, 69, -1, -1, 72, 73, 74,
- -1, -1, -1, -1, 46, -1, -1, -1, -1, -1,
- -1, -1, -1, 88, 89, 90, 91, 92, 93, 94,
- 62, 63, 64, 65, 66, 67, -1, 69, -1, -1,
- 72, 73, 74, -1, -1, -1, -1, 46, -1, -1,
- -1, -1, -1, -1, -1, -1, 88, 89, 90, 91,
- 92, 93, 94, 62, 63, 64, 65, 66, 67, -1,
- 69, -1, -1, 72, 73, 74, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 52, -1, -1, 88,
- 89, 90, 91, 92, 93, 94, 62, 63, 64, 65,
- 66, 67, -1, 69, -1, -1, 72, 73, 74, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 88, 89, 90, 91, 92, 93, 94, 54,
- 96, -1, -1, -1, -1, -1, -1, 62, 63, 64,
- 65, 66, 67, -1, 69, -1, -1, 72, 73, 74,
- 62, 63, 64, 65, 66, 67, -1, 69, -1, -1,
- 72, 73, 74, 88, 89, 90, 91, 92, 93, 94,
- -1, -1, -1, -1, -1, -1, 88, 89, 90, 91,
- 92, 93, 94, -1, -1, -1, 98, 62, 63, 64,
- 65, 66, 67, -1, 69, -1, -1, 72, 73, 74,
- -1, -1, -1, -1, -1, 80, 81, -1, -1, -1,
- -1, -1, -1, 88, 89, 90, 91, 92, 93, 94,
- 62, 63, 64, 65, 66, 67, -1, 69, -1, -1,
- 72, 73, 74, 62, 63, 64, 65, -1, -1, -1,
- 69, -1, -1, 72, 73, 74, 88, 89, 90, 91,
- 92, 93, 94, -1, -1, -1, -1, -1, -1, 88,
- 89, 90, 91, 92, 93, 94
+ 88, 89, 90, 91, 92, 93, 94, 54, 96, -1,
+ -1, -1, -1, -1, -1, 62, 63, 64, 65, 66,
+ 67, -1, 69, -1, -1, 72, 73, 74, 62, 63,
+ 64, 65, 66, 67, -1, 69, -1, -1, 72, 73,
+ 74, 88, 89, 90, 91, 92, 93, 94, -1, -1,
+ -1, -1, -1, -1, 88, 89, 90, 91, 92, 93,
+ 94, -1, -1, -1, 98, 62, 63, 64, 65, 66,
+ 67, -1, 69, -1, -1, 72, 73, 74, -1, -1,
+ -1, -1, -1, 80, 81, -1, -1, -1, -1, -1,
+ -1, 88, 89, 90, 91, 92, 93, 94, 62, 63,
+ 64, 65, 66, 67, -1, 69, -1, -1, 72, 73,
+ 74, 62, 63, 64, 65, -1, -1, -1, 69, -1,
+ -1, 72, 73, 74, 88, 89, 90, 91, 92, 93,
+ 94, -1, -1, -1, -1, -1, -1, 88, 89, 90,
+ 91, 92, 93, 94
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1200,8 +1200,8 @@ static const yytype_uint8 yystos[] =
68, 75, 76, 77, 78, 79, 82, 83, 84, 91,
92, 97, 100, 104, 105, 106, 107, 109, 111, 115,
116, 117, 122, 123, 124, 125, 126, 127, 133, 135,
- 137, 141, 146, 149, 96, 24, 48, 124, 97, 124,
- 147, 97, 147, 24, 123, 97, 124, 148, 136, 140,
+ 137, 141, 146, 149, 96, 24, 123, 24, 48, 97,
+ 124, 147, 97, 147, 123, 97, 124, 148, 136, 140,
49, 128, 42, 44, 45, 46, 47, 124, 134, 138,
49, 19, 124, 54, 55, 16, 17, 18, 24, 31,
24, 24, 124, 60, 124, 134, 24, 132, 124, 124,
@@ -1424,7 +1424,7 @@ yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, int yyrule)
{
YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr,
- yystos[yyssp[yyi + 1 - yynrhs]],
+ yystos[+yyssp[yyi + 1 - yynrhs]],
&yyvsp[(yyi + 1) - (yynrhs)]
);
YYFPRINTF (stderr, "\n");
@@ -1602,7 +1602,7 @@ yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg,
*/
if (yytoken != YYEMPTY)
{
- int yyn = yypact[*yyssp];
+ int yyn = yypact[+*yyssp];
YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
yysize = yysize0;
yyarg[yycount++] = yytname[yytoken];
@@ -2523,7 +2523,7 @@ yyreduce:
case 68:
#line 441 "engines/director/lingo/lingo-gr.y"
- {
+ {
(yyval.code) = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, (yyvsp[-1].e)[0]);
@@ -3425,7 +3425,7 @@ yyreturn:
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp);
+ yystos[+*yyssp], yyvsp);
YYPOPSTACK (1);
}
#ifndef yyoverflow
diff --git a/engines/director/lingo/lingo-gr.h b/engines/director/lingo/lingo-gr.h
index 474e612..57b2b1e 100644
--- a/engines/director/lingo/lingo-gr.h
+++ b/engines/director/lingo/lingo-gr.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.5. */
+/* A Bison parser, made by GNU Bison 3.5.1. */
/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,
Inc.
This program is free software: you can redistribute it and/or modify
diff --git a/engines/director/lingo/lingo-gr.y b/engines/director/lingo/lingo-gr.y
index f76132c..e57ec14 100644
--- a/engines/director/lingo/lingo-gr.y
+++ b/engines/director/lingo/lingo-gr.y
@@ -438,7 +438,7 @@ expr: simpleexpr { $$ = $simpleexpr; }
WRITE_UINT32(&e, $THEENTITY[0]);
WRITE_UINT32(&f, $THEENTITY[1]);
g_lingo->code2(e, f); }
- | THEENTITYWITHID expr {
+ | THEENTITYWITHID simpleexpr {
$$ = g_lingo->code1(LC::c_theentitypush);
inst e = 0, f = 0;
WRITE_UINT32(&e, $THEENTITYWITHID[0]);
More information about the Scummvm-git-logs
mailing list