[Forensics-changes] [yara] 286/407: Remove dead code (issue #225)
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:28:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag v3.3.0
in repository yara.
commit 45352ea0690b380c20e49b79df80f37b1bfc71e0
Author: Victor M. Alvarez <plusvic at gmail.com>
Date: Wed Dec 31 12:07:02 2014 +0100
Remove dead code (issue #225)
---
libyara/grammar.c | 626 ++++++++++++++++++++++++++----------------------------
libyara/grammar.h | 40 ++--
libyara/grammar.y | 11 +-
3 files changed, 327 insertions(+), 350 deletions(-)
diff --git a/libyara/grammar.c b/libyara/grammar.c
index 86b4ca0..3677ca3 100644
--- a/libyara/grammar.c
+++ b/libyara/grammar.c
@@ -111,16 +111,15 @@
_FALSE_ = 292,
_OR_ = 293,
_AND_ = 294,
- _IS_ = 295,
- _NEQ_ = 296,
- _EQ_ = 297,
- _GE_ = 298,
- _GT_ = 299,
- _LE_ = 300,
- _LT_ = 301,
- _SHIFT_RIGHT_ = 302,
- _SHIFT_LEFT_ = 303,
- _NOT_ = 304
+ _NEQ_ = 295,
+ _EQ_ = 296,
+ _GE_ = 297,
+ _GT_ = 298,
+ _LE_ = 299,
+ _LT_ = 300,
+ _SHIFT_RIGHT_ = 301,
+ _SHIFT_LEFT_ = 302,
+ _NOT_ = 303
};
#endif
/* Tokens. */
@@ -161,16 +160,15 @@
#define _FALSE_ 292
#define _OR_ 293
#define _AND_ 294
-#define _IS_ 295
-#define _NEQ_ 296
-#define _EQ_ 297
-#define _GE_ 298
-#define _GT_ 299
-#define _LE_ 300
-#define _LT_ 301
-#define _SHIFT_RIGHT_ 302
-#define _SHIFT_LEFT_ 303
-#define _NOT_ 304
+#define _NEQ_ 295
+#define _EQ_ 296
+#define _GE_ 297
+#define _GT_ 298
+#define _LE_ 299
+#define _LT_ 300
+#define _SHIFT_RIGHT_ 301
+#define _SHIFT_LEFT_ 302
+#define _NOT_ 303
@@ -271,7 +269,7 @@ typedef union YYSTYPE
YR_META* meta;
}
/* Line 193 of yacc.c. */
-#line 275 "grammar.c"
+#line 273 "grammar.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -284,7 +282,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 288 "grammar.c"
+#line 286 "grammar.c"
#ifdef short
# undef short
@@ -499,20 +497,20 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 2
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 316
+#define YYLAST 335
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 70
+#define YYNTOKENS 69
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 35
/* YYNRULES -- Number of rules. */
-#define YYNRULES 112
+#define YYNRULES 111
/* YYNRULES -- Number of states. */
-#define YYNSTATES 198
+#define YYNSTATES 196
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 305
+#define YYMAXUTOK 304
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -523,16 +521,16 @@ static const yytype_uint8 yytranslate[] =
0, 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, 56, 40, 2,
- 67, 68, 54, 52, 69, 53, 64, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 62, 2,
- 2, 63, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 55, 40, 2,
+ 66, 67, 53, 51, 68, 52, 63, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 61, 2,
+ 2, 62, 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, 65, 55, 66, 42, 2, 2, 2, 2, 2,
+ 2, 64, 54, 65, 42, 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, 60, 41, 61, 58, 2, 2, 2,
+ 2, 2, 2, 59, 41, 60, 57, 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,
@@ -550,7 +548,7 @@ static const yytype_uint8 yytranslate[] =
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 57, 59
+ 48, 49, 50, 56, 58
};
#if YYDEBUG
@@ -565,53 +563,52 @@ static const yytype_uint16 yyprhs[] =
118, 120, 122, 126, 131, 136, 137, 139, 143, 145,
147, 149, 151, 155, 159, 161, 165, 169, 170, 171,
183, 184, 194, 198, 201, 205, 209, 213, 217, 221,
- 225, 229, 233, 237, 239, 243, 247, 249, 256, 258,
- 262, 263, 268, 270, 272, 276, 278, 280, 282, 284,
- 286, 290, 292, 294, 299, 301, 303, 305, 307, 312,
- 314, 316, 320, 324, 328, 332, 336, 340, 344, 348,
- 351, 355, 359
+ 225, 229, 233, 235, 239, 243, 245, 252, 254, 258,
+ 259, 264, 266, 268, 272, 274, 276, 278, 280, 282,
+ 286, 288, 290, 295, 297, 299, 301, 303, 308, 310,
+ 312, 316, 320, 324, 328, 332, 336, 340, 344, 347,
+ 351, 355
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int8 yyrhs[] =
{
- 71, 0, -1, -1, 71, 73, -1, 71, 72, -1,
- 71, 1, 73, -1, 71, 1, 72, -1, 71, 1,
- 59, -1, 35, 17, -1, 77, 3, 9, 79, 60,
- 74, 75, 76, 61, -1, -1, 6, 62, 81, -1,
- -1, 7, 62, 83, -1, 8, 62, 91, -1, -1,
- 77, 78, -1, 4, -1, 5, -1, -1, 62, 80,
- -1, 9, -1, 80, 9, -1, 82, -1, 81, 82,
- -1, 9, 63, 17, -1, 9, 63, 14, -1, 9,
- 63, 36, -1, 9, 63, 37, -1, 84, -1, 83,
- 84, -1, 10, 63, 17, 86, -1, -1, 10, 63,
- 85, 19, 86, -1, 10, 63, 18, -1, -1, 86,
- 87, -1, 21, -1, 20, -1, 22, -1, 23, -1,
- 9, -1, 88, 64, 9, -1, 88, 65, 104, 66,
- -1, 88, 67, 89, 68, -1, -1, 92, -1, 89,
- 69, 92, -1, 19, -1, 92, -1, 36, -1, 37,
- -1, 104, 33, 90, -1, 104, 34, 104, -1, 10,
- -1, 10, 24, 104, -1, 10, 29, 97, -1, -1,
- -1, 31, 103, 9, 29, 93, 96, 62, 94, 67,
- 91, 68, -1, -1, 31, 103, 30, 99, 62, 95,
- 67, 91, 68, -1, 103, 30, 99, -1, 57, 91,
- -1, 91, 39, 91, -1, 91, 38, 91, -1, 104,
- 49, 104, -1, 104, 47, 104, -1, 104, 48, 104,
- -1, 104, 46, 104, -1, 104, 45, 104, -1, 104,
- 43, 104, -1, 104, 44, 104, -1, 104, -1, 67,
- 92, 68, -1, 67, 98, 68, -1, 97, -1, 67,
- 104, 64, 64, 104, 68, -1, 104, -1, 98, 69,
- 104, -1, -1, 67, 100, 101, 68, -1, 32, -1,
- 102, -1, 101, 69, 102, -1, 10, -1, 13, -1,
- 104, -1, 27, -1, 28, -1, 67, 104, 68, -1,
- 25, -1, 26, -1, 16, 67, 104, 68, -1, 14,
- -1, 15, -1, 17, -1, 11, -1, 12, 65, 104,
- 66, -1, 12, -1, 88, -1, 104, 52, 104, -1,
- 104, 53, 104, -1, 104, 54, 104, -1, 104, 55,
- 104, -1, 104, 56, 104, -1, 104, 42, 104, -1,
- 104, 40, 104, -1, 104, 41, 104, -1, 58, 104,
- -1, 104, 51, 104, -1, 104, 50, 104, -1, 90,
- -1
+ 70, 0, -1, -1, 70, 72, -1, 70, 71, -1,
+ 70, 1, 72, -1, 70, 1, 71, -1, 70, 1,
+ 58, -1, 35, 17, -1, 76, 3, 9, 78, 59,
+ 73, 74, 75, 60, -1, -1, 6, 61, 80, -1,
+ -1, 7, 61, 82, -1, 8, 61, 90, -1, -1,
+ 76, 77, -1, 4, -1, 5, -1, -1, 61, 79,
+ -1, 9, -1, 79, 9, -1, 81, -1, 80, 81,
+ -1, 9, 62, 17, -1, 9, 62, 14, -1, 9,
+ 62, 36, -1, 9, 62, 37, -1, 83, -1, 82,
+ 83, -1, 10, 62, 17, 85, -1, -1, 10, 62,
+ 84, 19, 85, -1, 10, 62, 18, -1, -1, 85,
+ 86, -1, 21, -1, 20, -1, 22, -1, 23, -1,
+ 9, -1, 87, 63, 9, -1, 87, 64, 103, 65,
+ -1, 87, 66, 88, 67, -1, -1, 91, -1, 88,
+ 68, 91, -1, 19, -1, 91, -1, 36, -1, 37,
+ -1, 103, 33, 89, -1, 103, 34, 103, -1, 10,
+ -1, 10, 24, 103, -1, 10, 29, 96, -1, -1,
+ -1, 31, 102, 9, 29, 92, 95, 61, 93, 66,
+ 90, 67, -1, -1, 31, 102, 30, 98, 61, 94,
+ 66, 90, 67, -1, 102, 30, 98, -1, 56, 90,
+ -1, 90, 39, 90, -1, 90, 38, 90, -1, 103,
+ 48, 103, -1, 103, 46, 103, -1, 103, 47, 103,
+ -1, 103, 45, 103, -1, 103, 44, 103, -1, 103,
+ 43, 103, -1, 103, -1, 66, 91, 67, -1, 66,
+ 97, 67, -1, 96, -1, 66, 103, 63, 63, 103,
+ 67, -1, 103, -1, 97, 68, 103, -1, -1, 66,
+ 99, 100, 67, -1, 32, -1, 101, -1, 100, 68,
+ 101, -1, 10, -1, 13, -1, 103, -1, 27, -1,
+ 28, -1, 66, 103, 67, -1, 25, -1, 26, -1,
+ 16, 66, 103, 67, -1, 14, -1, 15, -1, 17,
+ -1, 11, -1, 12, 64, 103, 65, -1, 12, -1,
+ 87, -1, 103, 51, 103, -1, 103, 52, 103, -1,
+ 103, 53, 103, -1, 103, 54, 103, -1, 103, 55,
+ 103, -1, 103, 42, 103, -1, 103, 40, 103, -1,
+ 103, 41, 103, -1, 57, 103, -1, 103, 50, 103,
+ -1, 103, 49, 103, -1, 89, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -624,11 +621,11 @@ static const yytype_uint16 yyrline[] =
512, 517, 605, 653, 713, 760, 763, 788, 824, 869,
886, 895, 904, 919, 933, 947, 963, 978, 1013, 977,
1127, 1126, 1205, 1211, 1217, 1223, 1231, 1240, 1249, 1258,
- 1267, 1276, 1285, 1294, 1298, 1306, 1307, 1312, 1334, 1346,
- 1362, 1361, 1367, 1376, 1377, 1382, 1387, 1396, 1397, 1401,
- 1409, 1413, 1423, 1437, 1453, 1463, 1472, 1495, 1510, 1525,
- 1547, 1591, 1609, 1627, 1645, 1663, 1673, 1683, 1693, 1703,
- 1713, 1723, 1733
+ 1267, 1276, 1285, 1289, 1297, 1298, 1303, 1325, 1337, 1353,
+ 1352, 1358, 1367, 1368, 1373, 1378, 1387, 1388, 1392, 1400,
+ 1404, 1414, 1428, 1444, 1454, 1463, 1486, 1501, 1516, 1538,
+ 1582, 1600, 1618, 1636, 1654, 1664, 1674, 1684, 1694, 1704,
+ 1714, 1724
};
#endif
@@ -645,18 +642,17 @@ static const char *const yytname[] =
"_ASCII_", "_WIDE_", "_NOCASE_", "_FULLWORD_", "_AT_", "_FILESIZE_",
"_ENTRYPOINT_", "_ALL_", "_ANY_", "_IN_", "_OF_", "_FOR_", "_THEM_",
"_MATCHES_", "_CONTAINS_", "_IMPORT_", "_TRUE_", "_FALSE_", "_OR_",
- "_AND_", "'&'", "'|'", "'^'", "_IS_", "_NEQ_", "_EQ_", "_GE_", "_GT_",
- "_LE_", "_LT_", "_SHIFT_RIGHT_", "_SHIFT_LEFT_", "'+'", "'-'", "'*'",
- "'\\\\'", "'%'", "_NOT_", "'~'", "\"include\"", "'{'", "'}'", "':'",
- "'='", "'.'", "'['", "']'", "'('", "')'", "','", "$accept", "rules",
- "import", "rule", "meta", "strings", "condition", "rule_modifiers",
- "rule_modifier", "tags", "tag_list", "meta_declarations",
- "meta_declaration", "string_declarations", "string_declaration", "@1",
- "string_modifiers", "string_modifier", "identifier", "arguments_list",
- "regexp", "boolean_expression", "expression", "@2", "@3", "@4",
- "integer_set", "range", "integer_enumeration", "string_set", "@5",
- "string_enumeration", "string_enumeration_item", "for_expression",
- "primary_expression", 0
+ "_AND_", "'&'", "'|'", "'^'", "_NEQ_", "_EQ_", "_GE_", "_GT_", "_LE_",
+ "_LT_", "_SHIFT_RIGHT_", "_SHIFT_LEFT_", "'+'", "'-'", "'*'", "'\\\\'",
+ "'%'", "_NOT_", "'~'", "\"include\"", "'{'", "'}'", "':'", "'='", "'.'",
+ "'['", "']'", "'('", "')'", "','", "$accept", "rules", "import", "rule",
+ "meta", "strings", "condition", "rule_modifiers", "rule_modifier",
+ "tags", "tag_list", "meta_declarations", "meta_declaration",
+ "string_declarations", "string_declaration", "@1", "string_modifiers",
+ "string_modifier", "identifier", "arguments_list", "regexp",
+ "boolean_expression", "expression", "@2", "@3", "@4", "integer_set",
+ "range", "integer_enumeration", "string_set", "@5", "string_enumeration",
+ "string_enumeration_item", "for_expression", "primary_expression", 0
};
#endif
@@ -670,26 +666,26 @@ static const yytype_uint16 yytoknum[] =
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
38, 124, 94, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 43, 45, 42, 92, 37, 304, 126, 305,
- 123, 125, 58, 61, 46, 91, 93, 40, 41, 44
+ 302, 43, 45, 42, 92, 37, 303, 126, 304, 123,
+ 125, 58, 61, 46, 91, 93, 40, 41, 44
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 70, 71, 71, 71, 71, 71, 71, 72, 73,
- 74, 74, 75, 75, 76, 77, 77, 78, 78, 79,
- 79, 80, 80, 81, 81, 82, 82, 82, 82, 83,
- 83, 84, 85, 84, 84, 86, 86, 87, 87, 87,
- 87, 88, 88, 88, 88, 89, 89, 89, 90, 91,
- 92, 92, 92, 92, 92, 92, 92, 93, 94, 92,
- 95, 92, 92, 92, 92, 92, 92, 92, 92, 92,
- 92, 92, 92, 92, 92, 96, 96, 97, 98, 98,
- 100, 99, 99, 101, 101, 102, 102, 103, 103, 103,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104
+ 0, 69, 70, 70, 70, 70, 70, 70, 71, 72,
+ 73, 73, 74, 74, 75, 76, 76, 77, 77, 78,
+ 78, 79, 79, 80, 80, 81, 81, 81, 81, 82,
+ 82, 83, 84, 83, 83, 85, 85, 86, 86, 86,
+ 86, 87, 87, 87, 87, 88, 88, 88, 89, 90,
+ 91, 91, 91, 91, 91, 91, 91, 92, 93, 91,
+ 94, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, 95, 95, 96, 97, 97, 99,
+ 98, 98, 100, 100, 101, 101, 102, 102, 102, 103,
+ 103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
+ 103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
+ 103, 103
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -702,11 +698,11 @@ static const yytype_uint8 yyr2[] =
1, 1, 3, 4, 4, 0, 1, 3, 1, 1,
1, 1, 3, 3, 1, 3, 3, 0, 0, 11,
0, 9, 3, 2, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 1, 3, 3, 1, 6, 1, 3,
- 0, 4, 1, 1, 3, 1, 1, 1, 1, 1,
- 3, 1, 1, 4, 1, 1, 1, 1, 4, 1,
- 1, 3, 3, 3, 3, 3, 3, 3, 3, 2,
- 3, 3, 1
+ 3, 3, 1, 3, 3, 1, 6, 1, 3, 0,
+ 4, 1, 1, 3, 1, 1, 1, 1, 1, 3,
+ 1, 1, 4, 1, 1, 1, 1, 4, 1, 1,
+ 3, 3, 3, 3, 3, 3, 3, 3, 2, 3,
+ 3, 1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -718,31 +714,31 @@ static const yytype_uint8 yydefact[] =
5, 8, 0, 17, 18, 16, 19, 0, 0, 21,
20, 10, 22, 0, 12, 0, 0, 0, 0, 11,
23, 0, 0, 0, 0, 24, 0, 13, 29, 0,
- 9, 26, 25, 27, 28, 32, 30, 41, 54, 97,
- 99, 94, 95, 0, 96, 48, 91, 92, 88, 89,
- 0, 50, 51, 0, 0, 0, 100, 112, 14, 49,
- 0, 73, 35, 34, 0, 0, 0, 0, 0, 0,
- 0, 87, 63, 109, 0, 49, 73, 0, 0, 45,
+ 9, 26, 25, 27, 28, 32, 30, 41, 54, 96,
+ 98, 93, 94, 0, 95, 48, 90, 91, 87, 88,
+ 0, 50, 51, 0, 0, 0, 99, 111, 14, 49,
+ 0, 72, 35, 34, 0, 0, 0, 0, 0, 0,
+ 0, 86, 63, 108, 0, 49, 72, 0, 0, 45,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 31, 35, 55, 0, 56, 0, 0, 0,
- 0, 0, 74, 90, 42, 0, 0, 46, 65, 64,
- 82, 80, 62, 52, 53, 107, 108, 106, 71, 72,
- 70, 69, 67, 68, 66, 111, 110, 101, 102, 103,
- 104, 105, 38, 37, 39, 40, 36, 33, 0, 98,
- 93, 57, 0, 43, 44, 0, 0, 0, 0, 60,
- 47, 85, 86, 0, 83, 0, 0, 0, 76, 0,
- 81, 0, 0, 0, 78, 58, 0, 84, 77, 75,
- 0, 0, 0, 79, 0, 61, 0, 59
+ 0, 31, 35, 55, 0, 56, 0, 0, 0, 0,
+ 0, 73, 89, 42, 0, 0, 46, 65, 64, 81,
+ 79, 62, 52, 53, 106, 107, 105, 71, 70, 69,
+ 67, 68, 66, 110, 109, 100, 101, 102, 103, 104,
+ 38, 37, 39, 40, 36, 33, 0, 97, 92, 57,
+ 0, 43, 44, 0, 0, 0, 0, 60, 47, 84,
+ 85, 0, 82, 0, 0, 0, 75, 0, 80, 0,
+ 0, 0, 77, 58, 0, 83, 76, 74, 0, 0,
+ 0, 78, 0, 61, 0, 59
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
-1, 1, 5, 6, 24, 27, 33, 7, 15, 18,
- 20, 29, 30, 37, 38, 74, 112, 156, 66, 126,
- 67, 84, 69, 168, 191, 179, 177, 116, 183, 132,
- 166, 173, 174, 70, 71
+ 20, 29, 30, 37, 38, 74, 111, 154, 66, 125,
+ 67, 84, 69, 166, 189, 177, 175, 115, 181, 131,
+ 164, 171, 172, 70, 71
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -750,138 +746,142 @@ static const yytype_int16 yydefgoto[] =
#define YYPACT_NINF -65
static const yytype_int16 yypact[] =
{
- -65, 3, -65, 39, -2, -65, -65, 50, -65, -65,
- -65, -65, 9, -65, -65, -65, -34, 27, -17, -65,
- 36, 76, -65, 42, 82, 90, 45, 100, 48, 90,
- -65, 106, 51, 60, 73, -65, 62, 106, -65, 69,
- -65, -65, -65, -65, -65, 31, -65, -65, -19, -65,
- 79, -65, -65, 74, -65, -65, -65, -65, -65, -65,
- 103, -65, -65, 69, 134, 69, 75, -65, 64, -65,
- 124, 201, -65, -65, 139, 134, 101, 134, 134, 134,
- -7, 252, -65, -65, 64, 99, 132, 160, 134, 69,
- 69, 69, -23, 152, 134, 134, 134, 134, 134, 134,
- 134, 134, 134, 134, 134, 134, 134, 134, 134, 134,
- 134, 134, 112, -65, 252, 134, -65, 218, -21, 153,
- 161, -23, -65, -65, -65, 225, 7, 85, 150, -65,
- -65, -65, -65, -65, 252, 260, 260, 260, 252, 252,
- 252, 252, 252, 252, 252, 163, 163, 37, 37, -65,
- -65, -65, -65, -65, -65, -65, -65, 112, 245, -65,
- -65, -65, 129, -65, -65, 69, 1, 133, 131, -65,
- 85, -65, -65, 88, -65, 134, 134, 137, -65, 135,
- -65, 1, 172, 95, 245, -65, 69, -65, -65, -65,
- 134, 143, -26, 252, 69, -65, -22, -65
+ -65, 3, -65, 20, -6, -65, -65, 44, -65, -65,
+ -65, -65, 14, -65, -65, -65, -26, 34, -14, -65,
+ 64, 47, -65, 27, 86, 89, 53, 109, 33, 89,
+ -65, 112, 65, 68, 60, -65, 78, 112, -65, 75,
+ -65, -65, -65, -65, -65, 0, -65, -65, -19, -65,
+ 94, -65, -65, 82, -65, -65, -65, -65, -65, -65,
+ 140, -65, -65, 75, 104, 75, 61, -65, 66, -65,
+ 130, 207, -65, -65, 123, 104, 103, 104, 104, 104,
+ 45, 273, -65, -65, 66, 105, 141, 153, 104, 75,
+ 75, 75, -30, 154, 104, 104, 104, 104, 104, 104,
+ 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 104, 87, -65, 273, 104, -65, 223, -21, 160, 147,
+ -30, -65, -65, -65, 240, 76, 95, 138, -65, -65,
+ -65, -65, -65, 273, 280, 280, 280, 273, 273, 273,
+ 273, 273, 273, 28, 28, 84, 84, -65, -65, -65,
+ -65, -65, -65, -65, -65, 87, 257, -65, -65, -65,
+ 117, -65, -65, 75, -1, 116, 114, -65, 95, -65,
+ -65, 79, -65, 104, 104, 137, -65, 133, -65, -1,
+ 179, 96, 257, -65, 75, -65, -65, -65, 104, 139,
+ -25, 273, 75, -65, -23, -65
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -65, -65, 193, 208, -65, -65, -65, -65, -65, -65,
- -65, -65, 191, -65, 192, -65, 117, -65, -65, -65,
- 140, -39, -64, -65, -65, -65, -65, 68, -65, 111,
- -65, -65, 56, 178, -38
+ -65, -65, 200, 201, -65, -65, -65, -65, -65, -65,
+ -65, -65, 178, -65, 180, -65, 106, -65, -65, -65,
+ 129, -39, -64, -65, -65, -65, -65, 50, -65, 115,
+ -65, -65, 46, 163, -38
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
number is the opposite. If zero, do what YYDEFACT says.
If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -88
+#define YYTABLE_NINF -87
static const yytype_int16 yytable[] =
{
- 68, 85, 120, 2, 3, 75, -15, -15, -15, 130,
- 76, 171, 90, 91, 172, 11, 90, 91, 16, 95,
- 96, 97, 81, 121, 82, 127, 83, 86, 17, 105,
- 106, 107, 108, 109, 110, 111, 19, 114, 4, 117,
- 118, 119, 195, 21, 131, 22, 197, 160, 72, 73,
- 125, 128, 129, 12, 13, 14, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 145, 146, 147,
- 148, 149, 150, 151, 4, 164, 165, 158, 47, 48,
- 49, 50, 23, 51, 52, 53, 54, 41, 55, 26,
- 42, 109, 110, 111, 56, 57, 58, 59, 8, 28,
- 60, 170, 90, 91, 25, 61, 62, 31, 32, 43,
- 44, 34, 47, 39, 49, 50, 36, 51, 52, 53,
- 54, 40, 55, -49, -49, 45, 63, 64, 56, 57,
- 58, 59, 152, 153, 154, 155, 65, 182, 184, 87,
- 88, 78, 89, 47, 77, 49, 50, 192, 51, 52,
- 53, 54, 193, 55, 92, 196, 180, 181, 113, 56,
- 57, 64, -87, 189, 190, 93, 94, 122, 115, 124,
- 79, 55, 95, 96, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 91,
- 161, 169, 64, 95, 96, 97, 9, 175, 176, 185,
- 123, 79, 186, 105, 106, 107, 108, 109, 110, 111,
- 194, 10, 95, 96, 97, 107, 108, 109, 110, 111,
- 35, 123, 105, 106, 107, 108, 109, 110, 111, 46,
- 157, -87, 162, 133, 93, 94, 178, 187, 80, 0,
- 188, 95, 96, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 95, 96,
- 97, 0, 0, 0, 0, 95, 96, 97, 105, 106,
- 107, 108, 109, 110, 111, 105, 106, 107, 108, 109,
- 110, 111, 0, 0, 159, 95, 96, 97, 0, 0,
- 0, 163, 95, 96, 97, 105, 106, 107, 108, 109,
- 110, 111, 105, 106, 107, 108, 109, 110, 111, 167,
- 105, 106, 107, 108, 109, 110, 111
+ 68, 85, 129, 2, 3, 75, -15, -15, -15, 169,
+ 76, 11, 170, 90, 91, 90, 91, 72, 73, 95,
+ 96, 97, 81, 16, 82, 126, 83, 86, 104, 105,
+ 106, 107, 108, 109, 110, 17, 130, 113, 4, 116,
+ 117, 118, 193, 19, 195, 21, 158, 12, 13, 14,
+ 124, 127, 128, 23, 119, 4, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 22, 41, 120, 156, 42, 8, 106,
+ 107, 108, 109, 110, 47, 48, 49, 50, 25, 51,
+ 52, 53, 54, 26, 55, 34, 43, 44, 28, 168,
+ 56, 57, 58, 59, 90, 91, 60, 150, 151, 152,
+ 153, 61, 62, 47, 31, 49, 50, 32, 51, 52,
+ 53, 54, 36, 55, 87, 88, 39, 89, 40, 56,
+ 57, 63, 64, -49, -49, 180, 182, 108, 109, 110,
+ 45, 65, 112, 162, 163, 190, 178, 179, 78, 47,
+ 191, 49, 50, 194, 51, 52, 53, 54, 77, 55,
+ 92, 64, 123, 187, 188, 56, 57, 58, 59, 114,
+ 79, -86, 121, 55, 93, 94, 159, 91, 167, 173,
+ 174, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 64, 183, 184,
+ 95, 96, 97, 9, 10, 192, 79, 35, 122, 104,
+ 105, 106, 107, 108, 109, 110, 176, 46, 155, 95,
+ 96, 97, 132, 80, 0, 185, 0, 122, 104, 105,
+ 106, 107, 108, 109, 110, 160, 0, -86, 0, 0,
+ 93, 94, 0, 0, 0, 0, 186, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 95, 96, 97, 0, 0, 0, 0,
+ 0, 0, 104, 105, 106, 107, 108, 109, 110, 0,
+ 95, 96, 97, 0, 0, 0, 0, 0, 157, 104,
+ 105, 106, 107, 108, 109, 110, 0, 95, 96, 97,
+ 0, 0, 0, 0, 0, 161, 104, 105, 106, 107,
+ 108, 109, 110, 95, 96, 97, 0, 0, 0, 0,
+ 165, 0, 104, 105, 106, 107, 108, 109, 110, 104,
+ 105, 106, 107, 108, 109, 110
};
static const yytype_int16 yycheck[] =
{
- 39, 65, 9, 0, 1, 24, 3, 4, 5, 32,
- 29, 10, 38, 39, 13, 17, 38, 39, 9, 40,
- 41, 42, 60, 30, 63, 89, 64, 65, 62, 50,
- 51, 52, 53, 54, 55, 56, 9, 75, 35, 77,
- 78, 79, 68, 60, 67, 9, 68, 68, 17, 18,
- 88, 90, 91, 3, 4, 5, 94, 95, 96, 97,
+ 39, 65, 32, 0, 1, 24, 3, 4, 5, 10,
+ 29, 17, 13, 38, 39, 38, 39, 17, 18, 40,
+ 41, 42, 60, 9, 63, 89, 64, 65, 49, 50,
+ 51, 52, 53, 54, 55, 61, 66, 75, 35, 77,
+ 78, 79, 67, 9, 67, 59, 67, 3, 4, 5,
+ 88, 90, 91, 6, 9, 35, 94, 95, 96, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 35, 68, 69, 115, 9, 10,
- 11, 12, 6, 14, 15, 16, 17, 14, 19, 7,
- 17, 54, 55, 56, 25, 26, 27, 28, 59, 9,
- 31, 165, 38, 39, 62, 36, 37, 62, 8, 36,
- 37, 63, 9, 62, 11, 12, 10, 14, 15, 16,
- 17, 61, 19, 38, 39, 63, 57, 58, 25, 26,
- 27, 28, 20, 21, 22, 23, 67, 175, 176, 64,
- 65, 67, 67, 9, 65, 11, 12, 186, 14, 15,
- 16, 17, 190, 19, 30, 194, 68, 69, 19, 25,
- 26, 58, 30, 68, 69, 33, 34, 68, 67, 9,
- 67, 19, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 39,
- 29, 62, 58, 40, 41, 42, 3, 64, 67, 62,
- 68, 67, 67, 50, 51, 52, 53, 54, 55, 56,
- 67, 3, 40, 41, 42, 52, 53, 54, 55, 56,
- 29, 68, 50, 51, 52, 53, 54, 55, 56, 37,
- 113, 30, 121, 93, 33, 34, 168, 181, 60, -1,
- 68, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 40, 41,
- 42, -1, -1, -1, -1, 40, 41, 42, 50, 51,
- 52, 53, 54, 55, 56, 50, 51, 52, 53, 54,
- 55, 56, -1, -1, 66, 40, 41, 42, -1, -1,
- -1, 66, 40, 41, 42, 50, 51, 52, 53, 54,
- 55, 56, 50, 51, 52, 53, 54, 55, 56, 64,
- 50, 51, 52, 53, 54, 55, 56
+ 108, 109, 110, 9, 14, 30, 114, 17, 58, 51,
+ 52, 53, 54, 55, 9, 10, 11, 12, 61, 14,
+ 15, 16, 17, 7, 19, 62, 36, 37, 9, 163,
+ 25, 26, 27, 28, 38, 39, 31, 20, 21, 22,
+ 23, 36, 37, 9, 61, 11, 12, 8, 14, 15,
+ 16, 17, 10, 19, 63, 64, 61, 66, 60, 25,
+ 26, 56, 57, 38, 39, 173, 174, 53, 54, 55,
+ 62, 66, 19, 67, 68, 184, 67, 68, 66, 9,
+ 188, 11, 12, 192, 14, 15, 16, 17, 64, 19,
+ 30, 57, 9, 67, 68, 25, 26, 27, 28, 66,
+ 66, 30, 67, 19, 33, 34, 29, 39, 61, 63,
+ 66, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 57, 61, 66,
+ 40, 41, 42, 3, 3, 66, 66, 29, 67, 49,
+ 50, 51, 52, 53, 54, 55, 166, 37, 112, 40,
+ 41, 42, 93, 60, -1, 179, -1, 67, 49, 50,
+ 51, 52, 53, 54, 55, 120, -1, 30, -1, -1,
+ 33, 34, -1, -1, -1, -1, 67, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 40, 41, 42, -1, -1, -1, -1,
+ -1, -1, 49, 50, 51, 52, 53, 54, 55, -1,
+ 40, 41, 42, -1, -1, -1, -1, -1, 65, 49,
+ 50, 51, 52, 53, 54, 55, -1, 40, 41, 42,
+ -1, -1, -1, -1, -1, 65, 49, 50, 51, 52,
+ 53, 54, 55, 40, 41, 42, -1, -1, -1, -1,
+ 63, -1, 49, 50, 51, 52, 53, 54, 55, 49,
+ 50, 51, 52, 53, 54, 55
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 71, 0, 1, 35, 72, 73, 77, 59, 72,
- 73, 17, 3, 4, 5, 78, 9, 62, 79, 9,
- 80, 60, 9, 6, 74, 62, 7, 75, 9, 81,
- 82, 62, 8, 76, 63, 82, 10, 83, 84, 62,
- 61, 14, 17, 36, 37, 63, 84, 9, 10, 11,
+ 0, 70, 0, 1, 35, 71, 72, 76, 58, 71,
+ 72, 17, 3, 4, 5, 77, 9, 61, 78, 9,
+ 79, 59, 9, 6, 73, 61, 7, 74, 9, 80,
+ 81, 61, 8, 75, 62, 81, 10, 82, 83, 61,
+ 60, 14, 17, 36, 37, 62, 83, 9, 10, 11,
12, 14, 15, 16, 17, 19, 25, 26, 27, 28,
- 31, 36, 37, 57, 58, 67, 88, 90, 91, 92,
- 103, 104, 17, 18, 85, 24, 29, 65, 67, 67,
- 103, 104, 91, 104, 91, 92, 104, 64, 65, 67,
+ 31, 36, 37, 56, 57, 66, 87, 89, 90, 91,
+ 102, 103, 17, 18, 84, 24, 29, 64, 66, 66,
+ 102, 103, 90, 103, 90, 91, 103, 63, 64, 66,
38, 39, 30, 33, 34, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 86, 19, 104, 67, 97, 104, 104, 104,
- 9, 30, 68, 68, 9, 104, 89, 92, 91, 91,
- 32, 67, 99, 90, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 20, 21, 22, 23, 87, 86, 104, 66,
- 68, 29, 99, 66, 68, 69, 100, 64, 93, 62,
- 92, 10, 13, 101, 102, 64, 67, 96, 97, 95,
- 68, 69, 104, 98, 104, 62, 67, 102, 68, 68,
- 69, 94, 91, 104, 67, 68, 91, 68
+ 55, 85, 19, 103, 66, 96, 103, 103, 103, 9,
+ 30, 67, 67, 9, 103, 88, 91, 90, 90, 32,
+ 66, 98, 89, 103, 103, 103, 103, 103, 103, 103,
+ 103, 103, 103, 103, 103, 103, 103, 103, 103, 103,
+ 20, 21, 22, 23, 86, 85, 103, 65, 67, 29,
+ 98, 65, 67, 68, 99, 63, 92, 61, 91, 10,
+ 13, 100, 101, 63, 66, 95, 96, 94, 67, 68,
+ 103, 97, 103, 61, 66, 101, 67, 67, 68, 93,
+ 90, 103, 66, 67, 90, 67
};
#define yyerrok (yyerrstatus = 0)
@@ -2950,7 +2950,7 @@ yyreduce:
#line 1277 "grammar.y"
{
compiler->last_result = yr_parser_reduce_operation(
- yyscanner, "==", (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
+ yyscanner, "!=", (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
@@ -2961,41 +2961,29 @@ yyreduce:
case 72:
#line 1286 "grammar.y"
{
- compiler->last_result = yr_parser_reduce_operation(
- yyscanner, "!=", (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
-
- ERROR_IF(compiler->last_result != ERROR_SUCCESS);
-
- (yyval.expression).type = EXPRESSION_TYPE_BOOLEAN;
- }
- break;
-
- case 73:
-#line 1295 "grammar.y"
- {
(yyval.expression) = (yyvsp[(1) - (1)].expression);
}
break;
- case 74:
-#line 1299 "grammar.y"
+ case 73:
+#line 1290 "grammar.y"
{
(yyval.expression) = (yyvsp[(2) - (3)].expression);
}
break;
- case 75:
-#line 1306 "grammar.y"
+ case 74:
+#line 1297 "grammar.y"
{ (yyval.integer) = INTEGER_SET_ENUMERATION; }
break;
- case 76:
-#line 1307 "grammar.y"
+ case 75:
+#line 1298 "grammar.y"
{ (yyval.integer) = INTEGER_SET_RANGE; }
break;
- case 77:
-#line 1313 "grammar.y"
+ case 76:
+#line 1304 "grammar.y"
{
if ((yyvsp[(2) - (6)].expression).type != EXPRESSION_TYPE_INTEGER)
{
@@ -3015,8 +3003,8 @@ yyreduce:
}
break;
- case 78:
-#line 1335 "grammar.y"
+ case 77:
+#line 1326 "grammar.y"
{
if ((yyvsp[(1) - (1)].expression).type != EXPRESSION_TYPE_INTEGER)
{
@@ -3030,8 +3018,8 @@ yyreduce:
}
break;
- case 79:
-#line 1347 "grammar.y"
+ case 78:
+#line 1338 "grammar.y"
{
if ((yyvsp[(3) - (3)].expression).type != EXPRESSION_TYPE_INTEGER)
{
@@ -3044,61 +3032,61 @@ yyreduce:
}
break;
- case 80:
-#line 1362 "grammar.y"
+ case 79:
+#line 1353 "grammar.y"
{
// Push end-of-list marker
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
}
break;
- case 82:
-#line 1368 "grammar.y"
+ case 81:
+#line 1359 "grammar.y"
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
yr_parser_emit_pushes_for_strings(yyscanner, "$*");
}
break;
- case 85:
-#line 1383 "grammar.y"
+ case 84:
+#line 1374 "grammar.y"
{
yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[(1) - (1)].c_string));
yr_free((yyvsp[(1) - (1)].c_string));
}
break;
- case 86:
-#line 1388 "grammar.y"
+ case 85:
+#line 1379 "grammar.y"
{
yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[(1) - (1)].c_string));
yr_free((yyvsp[(1) - (1)].c_string));
}
break;
- case 88:
-#line 1398 "grammar.y"
+ case 87:
+#line 1389 "grammar.y"
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
}
break;
- case 89:
-#line 1402 "grammar.y"
+ case 88:
+#line 1393 "grammar.y"
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, 1, NULL);
}
break;
- case 90:
-#line 1410 "grammar.y"
+ case 89:
+#line 1401 "grammar.y"
{
(yyval.expression) = (yyvsp[(2) - (3)].expression);
}
break;
- case 91:
-#line 1414 "grammar.y"
+ case 90:
+#line 1405 "grammar.y"
{
compiler->last_result = yr_parser_emit(
yyscanner, OP_FILESIZE, NULL);
@@ -3110,8 +3098,8 @@ yyreduce:
}
break;
- case 92:
-#line 1424 "grammar.y"
+ case 91:
+#line 1415 "grammar.y"
{
yywarning(yyscanner,
"Using deprecated \"entrypoint\" keyword. Use the \"entry_point\" "
@@ -3127,8 +3115,8 @@ yyreduce:
}
break;
- case 93:
-#line 1438 "grammar.y"
+ case 92:
+#line 1429 "grammar.y"
{
CHECK_TYPE((yyvsp[(3) - (4)].expression), EXPRESSION_TYPE_INTEGER, "intXXXX or uintXXXX");
@@ -3146,8 +3134,8 @@ yyreduce:
}
break;
- case 94:
-#line 1454 "grammar.y"
+ case 93:
+#line 1445 "grammar.y"
{
compiler->last_result = yr_parser_emit_with_arg(
yyscanner, OP_PUSH, (yyvsp[(1) - (1)].integer), NULL);
@@ -3159,8 +3147,8 @@ yyreduce:
}
break;
- case 95:
-#line 1464 "grammar.y"
+ case 94:
+#line 1455 "grammar.y"
{
compiler->last_result = yr_parser_emit_with_arg_double(
yyscanner, OP_PUSH, (yyvsp[(1) - (1)].double_), NULL);
@@ -3171,8 +3159,8 @@ yyreduce:
}
break;
- case 96:
-#line 1473 "grammar.y"
+ case 95:
+#line 1464 "grammar.y"
{
SIZED_STRING* sized_string;
@@ -3197,8 +3185,8 @@ yyreduce:
}
break;
- case 97:
-#line 1496 "grammar.y"
+ case 96:
+#line 1487 "grammar.y"
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner,
@@ -3215,8 +3203,8 @@ yyreduce:
}
break;
- case 98:
-#line 1511 "grammar.y"
+ case 97:
+#line 1502 "grammar.y"
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner,
@@ -3233,8 +3221,8 @@ yyreduce:
}
break;
- case 99:
-#line 1526 "grammar.y"
+ case 98:
+#line 1517 "grammar.y"
{
compiler->last_result = yr_parser_emit_with_arg(
yyscanner,
@@ -3258,8 +3246,8 @@ yyreduce:
}
break;
- case 100:
-#line 1548 "grammar.y"
+ case 99:
+#line 1539 "grammar.y"
{
if ((yyvsp[(1) - (1)].expression).type == EXPRESSION_TYPE_INTEGER) // loop identifier
{
@@ -3305,8 +3293,8 @@ yyreduce:
}
break;
- case 101:
-#line 1592 "grammar.y"
+ case 100:
+#line 1583 "grammar.y"
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "+", (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3326,8 +3314,8 @@ yyreduce:
}
break;
- case 102:
-#line 1610 "grammar.y"
+ case 101:
+#line 1601 "grammar.y"
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "-", (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3347,8 +3335,8 @@ yyreduce:
}
break;
- case 103:
-#line 1628 "grammar.y"
+ case 102:
+#line 1619 "grammar.y"
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "*", (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3368,8 +3356,8 @@ yyreduce:
}
break;
- case 104:
-#line 1646 "grammar.y"
+ case 103:
+#line 1637 "grammar.y"
{
compiler->last_result = yr_parser_reduce_operation(
yyscanner, "\\", (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3389,8 +3377,8 @@ yyreduce:
}
break;
- case 105:
-#line 1664 "grammar.y"
+ case 104:
+#line 1655 "grammar.y"
{
CHECK_TYPE((yyvsp[(1) - (3)].expression), EXPRESSION_TYPE_INTEGER, "%");
CHECK_TYPE((yyvsp[(3) - (3)].expression), EXPRESSION_TYPE_INTEGER, "%");
@@ -3402,8 +3390,8 @@ yyreduce:
}
break;
- case 106:
-#line 1674 "grammar.y"
+ case 105:
+#line 1665 "grammar.y"
{
CHECK_TYPE((yyvsp[(1) - (3)].expression), EXPRESSION_TYPE_INTEGER, "^");
CHECK_TYPE((yyvsp[(3) - (3)].expression), EXPRESSION_TYPE_INTEGER, "^");
@@ -3415,8 +3403,8 @@ yyreduce:
}
break;
- case 107:
-#line 1684 "grammar.y"
+ case 106:
+#line 1675 "grammar.y"
{
CHECK_TYPE((yyvsp[(1) - (3)].expression), EXPRESSION_TYPE_INTEGER, "^");
CHECK_TYPE((yyvsp[(3) - (3)].expression), EXPRESSION_TYPE_INTEGER, "^");
@@ -3428,8 +3416,8 @@ yyreduce:
}
break;
- case 108:
-#line 1694 "grammar.y"
+ case 107:
+#line 1685 "grammar.y"
{
CHECK_TYPE((yyvsp[(1) - (3)].expression), EXPRESSION_TYPE_INTEGER, "|");
CHECK_TYPE((yyvsp[(3) - (3)].expression), EXPRESSION_TYPE_INTEGER, "|");
@@ -3441,8 +3429,8 @@ yyreduce:
}
break;
- case 109:
-#line 1704 "grammar.y"
+ case 108:
+#line 1695 "grammar.y"
{
CHECK_TYPE((yyvsp[(2) - (2)].expression), EXPRESSION_TYPE_INTEGER, "~");
@@ -3454,8 +3442,8 @@ yyreduce:
}
break;
- case 110:
-#line 1714 "grammar.y"
+ case 109:
+#line 1705 "grammar.y"
{
CHECK_TYPE((yyvsp[(1) - (3)].expression), EXPRESSION_TYPE_INTEGER, "<<");
CHECK_TYPE((yyvsp[(3) - (3)].expression), EXPRESSION_TYPE_INTEGER, "<<");
@@ -3467,8 +3455,8 @@ yyreduce:
}
break;
- case 111:
-#line 1724 "grammar.y"
+ case 110:
+#line 1715 "grammar.y"
{
CHECK_TYPE((yyvsp[(1) - (3)].expression), EXPRESSION_TYPE_INTEGER, ">>");
CHECK_TYPE((yyvsp[(3) - (3)].expression), EXPRESSION_TYPE_INTEGER, ">>");
@@ -3480,8 +3468,8 @@ yyreduce:
}
break;
- case 112:
-#line 1734 "grammar.y"
+ case 111:
+#line 1725 "grammar.y"
{
(yyval.expression) = (yyvsp[(1) - (1)].expression);
}
@@ -3489,7 +3477,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 3493 "grammar.c"
+#line 3481 "grammar.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -3703,6 +3691,6 @@ yyreturn:
}
-#line 1739 "grammar.y"
+#line 1730 "grammar.y"
diff --git a/libyara/grammar.h b/libyara/grammar.h
index 59defbe..39237d8 100644
--- a/libyara/grammar.h
+++ b/libyara/grammar.h
@@ -76,16 +76,15 @@
_FALSE_ = 292,
_OR_ = 293,
_AND_ = 294,
- _IS_ = 295,
- _NEQ_ = 296,
- _EQ_ = 297,
- _GE_ = 298,
- _GT_ = 299,
- _LE_ = 300,
- _LT_ = 301,
- _SHIFT_RIGHT_ = 302,
- _SHIFT_LEFT_ = 303,
- _NOT_ = 304
+ _NEQ_ = 295,
+ _EQ_ = 296,
+ _GE_ = 297,
+ _GT_ = 298,
+ _LE_ = 299,
+ _LT_ = 300,
+ _SHIFT_RIGHT_ = 301,
+ _SHIFT_LEFT_ = 302,
+ _NOT_ = 303
};
#endif
/* Tokens. */
@@ -126,16 +125,15 @@
#define _FALSE_ 292
#define _OR_ 293
#define _AND_ 294
-#define _IS_ 295
-#define _NEQ_ 296
-#define _EQ_ 297
-#define _GE_ 298
-#define _GT_ 299
-#define _LE_ 300
-#define _LT_ 301
-#define _SHIFT_RIGHT_ 302
-#define _SHIFT_LEFT_ 303
-#define _NOT_ 304
+#define _NEQ_ 295
+#define _EQ_ 296
+#define _GE_ 297
+#define _GT_ 298
+#define _LE_ 299
+#define _LT_ 300
+#define _SHIFT_RIGHT_ 301
+#define _SHIFT_LEFT_ 302
+#define _NOT_ 303
@@ -153,7 +151,7 @@ typedef union YYSTYPE
YR_META* meta;
}
/* Line 1529 of yacc.c. */
-#line 157 "grammar.h"
+#line 155 "grammar.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
diff --git a/libyara/grammar.y b/libyara/grammar.y
index 690d4ce..cbfc4b7 100644
--- a/libyara/grammar.y
+++ b/libyara/grammar.y
@@ -128,7 +128,7 @@ limitations under the License.
%left _OR_
%left _AND_
%left '&' '|' '^'
-%left _LT_ _LE_ _GT_ _GE_ _EQ_ _NEQ_ _IS_
+%left _LT_ _LE_ _GT_ _GE_ _EQ_ _NEQ_
%left _SHIFT_LEFT_ _SHIFT_RIGHT_
%left '+' '-'
%left '*' '\\' '%'
@@ -1273,15 +1273,6 @@ expression
$$.type = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression _IS_ primary_expression
- {
- compiler->last_result = yr_parser_reduce_operation(
- yyscanner, "==", $1, $3);
-
- ERROR_IF(compiler->last_result != ERROR_SUCCESS);
-
- $$.type = EXPRESSION_TYPE_BOOLEAN;
- }
| primary_expression _NEQ_ primary_expression
{
compiler->last_result = yr_parser_reduce_operation(
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list