[Forensics-changes] [yara] 60/415: Changed "match" for "matches" in syntax
Hilko Bengen
bengen at moszumanska.debian.org
Thu Apr 3 05:42:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch debian
in repository yara.
commit b0318c94700288c35249b1bea8b7a57f16fdebc0
Author: Victor M. Alvarez <plusvic at gmail.com>
Date: Thu May 13 11:15:54 2010 +0000
Changed "match" for "matches" in syntax
---
libyara/grammar.c | 10 +-
libyara/grammar.h | 4 +-
libyara/grammar.y | 4 +-
libyara/lex.c | 266 +++++++++++++++++++++++++++---------------------------
libyara/lex.l | 2 +-
5 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/libyara/grammar.c b/libyara/grammar.c
index 3de3b0b..9211c5d 100644
--- a/libyara/grammar.c
+++ b/libyara/grammar.c
@@ -107,7 +107,7 @@
_UINT8_ = 296,
_UINT16_ = 297,
_UINT32_ = 298,
- _MATCH_ = 299,
+ _MATCHES_ = 299,
_CONTAINS_ = 300,
_MZ_ = 301,
_PE_ = 302,
@@ -168,7 +168,7 @@
#define _UINT8_ 296
#define _UINT16_ 297
#define _UINT32_ 298
-#define _MATCH_ 299
+#define _MATCHES_ 299
#define _CONTAINS_ 300
#define _MZ_ 301
#define _PE_ 302
@@ -697,9 +697,9 @@ static const char *const yytname[] =
"_WIDE_", "_NOCASE_", "_FULLWORD_", "_AT_", "_SIZE_", "_ENTRYPOINT_",
"_ALL_", "_ANY_", "_RVA_", "_OFFSET_", "_FILE_", "_IN_", "_OF_", "_FOR_",
"_THEM_", "_SECTION_", "_INT8_", "_INT16_", "_INT32_", "_UINT8_",
- "_UINT16_", "_UINT32_", "_MATCH_", "_CONTAINS_", "_MZ_", "_PE_", "_DLL_",
- "_TRUE_", "_FALSE_", "_OR_", "_AND_", "_NOT_", "_IS_", "_NEQ_", "_EQ_",
- "_GE_", "_GT_", "_LE_", "_LT_", "'+'", "'-'", "'*'", "'\\\\'",
+ "_UINT16_", "_UINT32_", "_MATCHES_", "_CONTAINS_", "_MZ_", "_PE_",
+ "_DLL_", "_TRUE_", "_FALSE_", "_OR_", "_AND_", "_NOT_", "_IS_", "_NEQ_",
+ "_EQ_", "_GE_", "_GT_", "_LE_", "_LT_", "'+'", "'-'", "'*'", "'\\\\'",
"'include'", "'{'", "'}'", "':'", "'='", "'('", "'.'", "')'", "','",
"$accept", "rules", "rule", "meta", "strings", "condition",
"rule_modifiers", "rule_modifier", "tags", "tag_list",
diff --git a/libyara/grammar.h b/libyara/grammar.h
index 316e9fc..947c280 100644
--- a/libyara/grammar.h
+++ b/libyara/grammar.h
@@ -80,7 +80,7 @@
_UINT8_ = 296,
_UINT16_ = 297,
_UINT32_ = 298,
- _MATCH_ = 299,
+ _MATCHES_ = 299,
_CONTAINS_ = 300,
_MZ_ = 301,
_PE_ = 302,
@@ -141,7 +141,7 @@
#define _UINT8_ 296
#define _UINT16_ 297
#define _UINT32_ 298
-#define _MATCH_ 299
+#define _MATCHES_ 299
#define _CONTAINS_ 300
#define _MZ_ 301
#define _PE_ 302
diff --git a/libyara/grammar.y b/libyara/grammar.y
index c04387c..175fc66 100644
--- a/libyara/grammar.y
+++ b/libyara/grammar.y
@@ -60,7 +60,7 @@
%token _UINT8_
%token _UINT16_
%token _UINT32_
-%token _MATCH_
+%token _MATCHES_
%token _CONTAINS_
%token _MZ_
@@ -401,7 +401,7 @@ boolean_expression : _TRUE_ { $$ = reduce_consta
YYERROR;
}
}
- | _IDENTIFIER_ _MATCH_ _REGEXP_
+ | _IDENTIFIER_ _MATCHES_ _REGEXP_
{
$$ = reduce_external_string_operation(yyscanner, TERM_TYPE_EXTERNAL_STRING_MATCH, $1, $3);
diff --git a/libyara/lex.c b/libyara/lex.c
index 7f63900..d70db29 100644
--- a/libyara/lex.c
+++ b/libyara/lex.c
@@ -370,7 +370,7 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[218] =
+static yyconst flex_int16_t yy_accept[220] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 75, 73,
72, 72, 73, 69, 51, 50, 70, 54, 54, 1,
@@ -390,12 +390,12 @@ static yyconst flex_int16_t yy_accept[218] =
53, 53, 53, 33, 53, 53, 53, 53, 53, 39,
53, 10, 53, 53, 53, 9, 53, 53, 25, 17,
53, 13, 60, 12, 53, 53, 53, 18, 53, 53,
- 53, 53, 40, 41, 42, 53, 53, 53, 53, 53,
+ 53, 53, 40, 41, 53, 53, 53, 53, 53, 53,
53, 53, 36, 53, 53, 53, 53, 53, 8, 53,
- 15, 32, 53, 53, 53, 37, 38, 53, 53, 53,
+ 53, 15, 32, 53, 53, 53, 37, 38, 53, 53,
- 53, 53, 53, 7, 35, 11, 53, 43, 53, 30,
- 14, 0, 16, 53, 46, 29, 0
+ 53, 53, 53, 53, 42, 7, 35, 11, 53, 43,
+ 53, 30, 14, 0, 16, 53, 46, 29, 0
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -440,67 +440,67 @@ static yyconst flex_int32_t yy_meta[56] =
10, 9, 9, 1, 1
} ;
-static yyconst flex_int16_t yy_base[237] =
+static yyconst flex_int16_t yy_base[239] =
{ 0,
- 0, 0, 53, 54, 55, 56, 351, 350, 356, 359,
- 359, 359, 334, 359, 0, 343, 51, 37, 42, 332,
- 331, 330, 0, 0, 31, 307, 307, 48, 308, 30,
- 55, 304, 30, 301, 32, 54, 54, 306, 305, 0,
- 0, 359, 359, 87, 0, 359, 359, 331, 0, 359,
- 359, 0, 359, 331, 330, 0, 0, 315, 314, 0,
- 359, 359, 359, 0, 0, 298, 61, 304, 0, 294,
- 288, 294, 293, 287, 291, 287, 64, 0, 282, 281,
- 65, 291, 0, 287, 285, 293, 290, 277, 286, 272,
- 277, 284, 262, 0, 359, 359, 359, 359, 0, 0,
-
- 359, 359, 0, 305, 303, 0, 359, 0, 0, 0,
- 0, 275, 68, 268, 266, 276, 0, 270, 277, 268,
- 89, 274, 275, 274, 0, 258, 254, 267, 0, 254,
- 261, 258, 263, 250, 261, 359, 0, 359, 256, 255,
- 262, 240, 256, 244, 239, 257, 239, 268, 270, 0,
- 246, 0, 237, 247, 250, 0, 226, 203, 0, 0,
- 90, 0, 359, 0, 185, 187, 178, 0, 164, 158,
- 157, 162, 0, 0, 0, 160, 137, 136, 134, 100,
- 118, 120, 0, 94, 90, 88, 77, 84, 0, 93,
- 0, 0, 92, 84, 79, 0, 0, 81, 77, 83,
-
- 86, 86, 105, 0, 0, 0, 76, 0, 58, 0,
- 0, 112, 0, 27, 359, 0, 359, 138, 149, 160,
- 165, 171, 175, 179, 183, 191, 199, 209, 220, 230,
- 241, 252, 263, 268, 270, 272
+ 0, 0, 53, 54, 55, 56, 353, 352, 358, 361,
+ 361, 361, 336, 361, 0, 345, 51, 37, 42, 334,
+ 333, 332, 0, 0, 31, 309, 309, 48, 310, 30,
+ 55, 306, 30, 303, 32, 54, 54, 308, 307, 0,
+ 0, 361, 361, 87, 0, 361, 361, 333, 0, 361,
+ 361, 0, 361, 333, 332, 0, 0, 317, 316, 0,
+ 361, 361, 361, 0, 0, 300, 61, 306, 0, 296,
+ 290, 296, 295, 289, 293, 289, 64, 0, 284, 283,
+ 65, 293, 0, 289, 287, 295, 292, 279, 288, 274,
+ 279, 286, 264, 0, 361, 361, 361, 361, 0, 0,
+
+ 361, 361, 0, 307, 305, 0, 361, 0, 0, 0,
+ 0, 277, 68, 270, 268, 278, 0, 272, 279, 270,
+ 89, 276, 277, 276, 0, 260, 256, 269, 0, 256,
+ 263, 260, 265, 252, 263, 361, 0, 361, 258, 257,
+ 264, 242, 258, 246, 241, 259, 241, 270, 272, 0,
+ 248, 0, 239, 249, 252, 0, 243, 239, 0, 0,
+ 90, 0, 361, 0, 218, 206, 188, 0, 187, 179,
+ 163, 167, 0, 0, 162, 161, 148, 137, 140, 140,
+ 119, 121, 0, 96, 91, 89, 78, 85, 0, 94,
+ 82, 0, 0, 92, 84, 79, 0, 0, 81, 77,
+
+ 83, 86, 86, 105, 0, 0, 0, 0, 76, 0,
+ 58, 0, 0, 112, 0, 27, 361, 0, 361, 138,
+ 149, 160, 165, 171, 175, 179, 183, 191, 199, 209,
+ 220, 230, 241, 252, 263, 268, 270, 272
} ;
-static yyconst flex_int16_t yy_def[237] =
+static yyconst flex_int16_t yy_def[239] =
{ 0,
- 217, 1, 218, 218, 219, 219, 220, 220, 217, 217,
- 217, 217, 217, 217, 221, 222, 217, 223, 223, 217,
- 217, 217, 224, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 226,
- 227, 217, 217, 228, 229, 217, 217, 230, 231, 217,
- 217, 221, 217, 222, 232, 233, 19, 217, 217, 234,
- 217, 217, 217, 224, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 226, 227, 217, 217, 217, 217, 235, 229,
-
- 217, 217, 231, 232, 232, 233, 217, 234, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 217, 236, 217, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 217, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
-
- 225, 225, 225, 225, 225, 225, 225, 225, 225, 225,
- 225, 217, 225, 225, 217, 225, 0, 217, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217, 217, 217
+ 219, 1, 220, 220, 221, 221, 222, 222, 219, 219,
+ 219, 219, 219, 219, 223, 224, 219, 225, 225, 219,
+ 219, 219, 226, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 228,
+ 229, 219, 219, 230, 231, 219, 219, 232, 233, 219,
+ 219, 223, 219, 224, 234, 235, 19, 219, 219, 236,
+ 219, 219, 219, 226, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 228, 229, 219, 219, 219, 219, 237, 231,
+
+ 219, 219, 233, 234, 234, 235, 219, 236, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 219, 238, 219, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 219, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+
+ 227, 227, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 219, 227, 227, 219, 227, 0, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219
} ;
-static yyconst flex_int16_t yy_nxt[415] =
+static yyconst flex_int16_t yy_nxt[417] =
{ 0,
10, 11, 12, 11, 11, 13, 14, 15, 16, 10,
10, 17, 18, 19, 19, 19, 19, 19, 19, 20,
@@ -509,48 +509,48 @@ static yyconst flex_int16_t yy_nxt[415] =
31, 32, 33, 34, 35, 36, 37, 38, 24, 39,
24, 24, 24, 40, 10, 42, 42, 46, 46, 43,
43, 55, 56, 58, 59, 82, 47, 47, 58, 59,
- 66, 77, 67, 216, 83, 78, 68, 69, 72, 85,
+ 66, 77, 67, 218, 83, 78, 68, 69, 72, 85,
86, 44, 44, 48, 48, 79, 73, 60, 87, 80,
- 74, 89, 217, 96, 110, 75, 120, 124, 90, 214,
+ 74, 89, 219, 96, 110, 75, 120, 124, 90, 216,
- 88, 140, 148, 181, 149, 182, 212, 150, 183, 212,
- 121, 125, 111, 212, 141, 97, 212, 213, 215, 211,
- 210, 209, 208, 207, 206, 205, 204, 203, 202, 201,
- 200, 199, 198, 98, 197, 196, 195, 99, 41, 41,
+ 88, 140, 148, 181, 149, 182, 214, 150, 183, 214,
+ 121, 125, 111, 214, 141, 97, 214, 215, 217, 213,
+ 212, 211, 210, 209, 208, 207, 206, 205, 204, 203,
+ 202, 201, 200, 98, 199, 198, 197, 99, 41, 41,
41, 41, 41, 41, 41, 41, 41, 41, 41, 45,
45, 45, 45, 45, 45, 45, 45, 45, 45, 45,
49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
- 49, 52, 52, 52, 52, 54, 194, 54, 54, 54,
- 54, 57, 193, 192, 57, 64, 64, 64, 64, 65,
- 65, 65, 65, 93, 191, 190, 189, 93, 93, 94,
+ 49, 52, 52, 52, 52, 54, 196, 54, 54, 54,
+ 54, 57, 195, 194, 57, 64, 64, 64, 64, 65,
+ 65, 65, 65, 93, 193, 192, 191, 93, 93, 94,
- 188, 94, 187, 94, 94, 94, 94, 94, 94, 95,
+ 190, 94, 189, 94, 94, 94, 94, 94, 94, 95,
95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 100, 186, 100, 100, 100, 185, 100, 100, 100, 100,
- 101, 184, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 103, 103, 103, 180, 103, 103, 103, 103, 103,
+ 100, 188, 100, 100, 100, 187, 100, 100, 100, 100,
+ 101, 186, 101, 101, 101, 101, 101, 101, 101, 101,
+ 101, 103, 103, 103, 185, 103, 103, 103, 103, 103,
103, 103, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 106, 179, 106, 106, 106, 106, 106,
+ 104, 104, 104, 106, 184, 106, 106, 106, 106, 106,
106, 106, 106, 106, 108, 108, 137, 137, 163, 163,
- 178, 177, 176, 175, 174, 173, 172, 171, 170, 169,
- 168, 167, 166, 165, 164, 162, 161, 160, 159, 158,
-
- 157, 156, 155, 154, 153, 152, 151, 147, 146, 145,
- 144, 143, 142, 139, 138, 105, 136, 135, 134, 133,
- 132, 131, 130, 129, 128, 127, 126, 123, 122, 119,
- 118, 117, 116, 115, 114, 113, 112, 109, 107, 107,
- 105, 53, 102, 92, 91, 84, 81, 76, 71, 70,
- 63, 62, 61, 53, 51, 217, 50, 50, 9, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
-
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217
+ 180, 179, 178, 177, 176, 175, 174, 173, 172, 171,
+ 170, 169, 168, 167, 166, 165, 164, 162, 161, 160,
+
+ 159, 158, 157, 156, 155, 154, 153, 152, 151, 147,
+ 146, 145, 144, 143, 142, 139, 138, 105, 136, 135,
+ 134, 133, 132, 131, 130, 129, 128, 127, 126, 123,
+ 122, 119, 118, 117, 116, 115, 114, 113, 112, 109,
+ 107, 107, 105, 53, 102, 92, 91, 84, 81, 76,
+ 71, 70, 63, 62, 61, 53, 51, 219, 50, 50,
+ 9, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219
} ;
-static yyconst flex_int16_t yy_chk[415] =
+static yyconst flex_int16_t yy_chk[417] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -559,45 +559,45 @@ static yyconst flex_int16_t yy_chk[415] =
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 3, 4, 5, 6, 3,
4, 17, 17, 18, 18, 33, 5, 6, 19, 19,
- 25, 30, 25, 214, 33, 30, 25, 25, 28, 35,
+ 25, 30, 25, 216, 33, 30, 25, 25, 28, 35,
35, 3, 4, 5, 6, 31, 28, 18, 36, 31,
- 28, 37, 19, 44, 67, 28, 77, 81, 37, 209,
+ 28, 37, 19, 44, 67, 28, 77, 81, 37, 211,
+
+ 36, 113, 121, 161, 121, 161, 204, 121, 161, 204,
+ 77, 81, 67, 214, 113, 44, 214, 209, 214, 203,
+ 202, 201, 200, 199, 196, 195, 194, 191, 190, 188,
+ 187, 186, 185, 44, 184, 182, 181, 44, 220, 220,
+ 220, 220, 220, 220, 220, 220, 220, 220, 220, 221,
+ 221, 221, 221, 221, 221, 221, 221, 221, 221, 221,
+ 222, 222, 222, 222, 222, 222, 222, 222, 222, 222,
+ 222, 223, 223, 223, 223, 224, 180, 224, 224, 224,
+ 224, 225, 179, 178, 225, 226, 226, 226, 226, 227,
+ 227, 227, 227, 228, 177, 176, 175, 228, 228, 229,
+
+ 172, 229, 171, 229, 229, 229, 229, 229, 229, 230,
+ 230, 230, 230, 230, 230, 230, 230, 230, 230, 230,
+ 231, 170, 231, 231, 231, 169, 231, 231, 231, 231,
+ 232, 167, 232, 232, 232, 232, 232, 232, 232, 232,
+ 232, 233, 233, 233, 166, 233, 233, 233, 233, 233,
+ 233, 233, 234, 234, 234, 234, 234, 234, 234, 234,
+ 234, 234, 234, 235, 165, 235, 235, 235, 235, 235,
+ 235, 235, 235, 235, 236, 236, 237, 237, 238, 238,
+ 158, 157, 155, 154, 153, 151, 149, 148, 147, 146,
+ 145, 144, 143, 142, 141, 140, 139, 135, 134, 133,
+
+ 132, 131, 130, 128, 127, 126, 124, 123, 122, 120,
+ 119, 118, 116, 115, 114, 112, 105, 104, 93, 92,
+ 91, 90, 89, 88, 87, 86, 85, 84, 82, 80,
+ 79, 76, 75, 74, 73, 72, 71, 70, 68, 66,
+ 59, 58, 55, 54, 48, 39, 38, 34, 32, 29,
+ 27, 26, 22, 21, 20, 16, 13, 9, 8, 7,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
- 36, 113, 121, 161, 121, 161, 203, 121, 161, 203,
- 77, 81, 67, 212, 113, 44, 212, 207, 212, 202,
- 201, 200, 199, 198, 195, 194, 193, 190, 188, 187,
- 186, 185, 184, 44, 182, 181, 180, 44, 218, 218,
- 218, 218, 218, 218, 218, 218, 218, 218, 218, 219,
219, 219, 219, 219, 219, 219, 219, 219, 219, 219,
- 220, 220, 220, 220, 220, 220, 220, 220, 220, 220,
- 220, 221, 221, 221, 221, 222, 179, 222, 222, 222,
- 222, 223, 178, 177, 223, 224, 224, 224, 224, 225,
- 225, 225, 225, 226, 176, 172, 171, 226, 226, 227,
-
- 170, 227, 169, 227, 227, 227, 227, 227, 227, 228,
- 228, 228, 228, 228, 228, 228, 228, 228, 228, 228,
- 229, 167, 229, 229, 229, 166, 229, 229, 229, 229,
- 230, 165, 230, 230, 230, 230, 230, 230, 230, 230,
- 230, 231, 231, 231, 158, 231, 231, 231, 231, 231,
- 231, 231, 232, 232, 232, 232, 232, 232, 232, 232,
- 232, 232, 232, 233, 157, 233, 233, 233, 233, 233,
- 233, 233, 233, 233, 234, 234, 235, 235, 236, 236,
- 155, 154, 153, 151, 149, 148, 147, 146, 145, 144,
- 143, 142, 141, 140, 139, 135, 134, 133, 132, 131,
-
- 130, 128, 127, 126, 124, 123, 122, 120, 119, 118,
- 116, 115, 114, 112, 105, 104, 93, 92, 91, 90,
- 89, 88, 87, 86, 85, 84, 82, 80, 79, 76,
- 75, 74, 73, 72, 71, 70, 68, 66, 59, 58,
- 55, 54, 48, 39, 38, 34, 32, 29, 27, 26,
- 22, 21, 20, 16, 13, 9, 8, 7, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
-
- 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
- 217, 217, 217, 217
+ 219, 219, 219, 219, 219, 219
} ;
/* Table of booleans, true if rule could match eol. */
@@ -940,13 +940,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 218 )
+ if ( yy_current_state >= 220 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
++yy_cp;
}
- while ( yy_base[yy_current_state] != 359 );
+ while ( yy_base[yy_current_state] != 361 );
yy_find_action:
yy_act = yy_accept[yy_current_state];
@@ -1190,7 +1190,7 @@ YY_RULE_SETUP
case 42:
YY_RULE_SETUP
#line 90 "lex.l"
-{ return _MATCH_; }
+{ return _MATCHES_; }
YY_BREAK
case 43:
YY_RULE_SETUP
@@ -1881,7 +1881,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 218 )
+ if ( yy_current_state >= 220 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1910,11 +1910,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{
yy_current_state = (int) yy_def[yy_current_state];
- if ( yy_current_state >= 218 )
+ if ( yy_current_state >= 220 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- yy_is_jam = (yy_current_state == 217);
+ yy_is_jam = (yy_current_state == 219);
return yy_is_jam ? 0 : yy_current_state;
}
diff --git a/libyara/lex.l b/libyara/lex.l
index 51f2fef..f05b305 100644
--- a/libyara/lex.l
+++ b/libyara/lex.l
@@ -87,7 +87,7 @@ hexdigit [a-fA-F0-9]
"int8" { return _INT8_; }
"int16" { return _INT16_; }
"int32" { return _INT32_; }
-"match" { return _MATCH_; }
+"matches" { return _MATCHES_; }
"contains" { return _CONTAINS_; }
--
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