[Forensics-changes] [yara] 46/135: Put leading and trailing underscores to tokens, to avoid conflicts with other types and macros
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:27:31 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag v3.1.0
in repository yara.
commit 7857a475f7a38278f1dd38cc2fabfb94ee5f6d73
Author: Victor M. Alvarez <plusvic at gmail.com>
Date: Fri Jul 4 12:55:42 2014 +0200
Put leading and trailing underscores to tokens, to avoid conflicts with other types and macros
---
libyara/grammar.c | 266 +++++++++++++++++++++++++++---------------------------
libyara/grammar.h | 196 ++++++++++++++++++++--------------------
libyara/grammar.y | 224 ++++++++++++++++++++++-----------------------
libyara/lexer.c | 98 ++++++++++----------
libyara/lexer.l | 98 ++++++++++----------
5 files changed, 442 insertions(+), 440 deletions(-)
diff --git a/libyara/grammar.c b/libyara/grammar.c
index afcc15c..7eaa043 100644
--- a/libyara/grammar.c
+++ b/libyara/grammar.c
@@ -74,111 +74,111 @@
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
- RULE = 258,
- PRIVATE = 259,
- GLOBAL = 260,
- META = 261,
- STRINGS = 262,
- CONDITION = 263,
- IDENTIFIER = 264,
- STRING_IDENTIFIER = 265,
- STRING_COUNT = 266,
- STRING_OFFSET = 267,
- STRING_IDENTIFIER_WITH_WILDCARD = 268,
- NUMBER = 269,
- TEXT_STRING = 270,
- HEX_STRING = 271,
- REGEXP = 272,
- ASCII = 273,
- WIDE = 274,
- NOCASE = 275,
- FULLWORD = 276,
- AT = 277,
- FILESIZE = 278,
- ENTRYPOINT = 279,
- ALL = 280,
- ANY = 281,
- IN = 282,
- OF = 283,
- FOR = 284,
- THEM = 285,
- INT8 = 286,
- INT16 = 287,
- INT32 = 288,
- UINT8 = 289,
- UINT16 = 290,
- UINT32 = 291,
- MATCHES = 292,
- CONTAINS = 293,
- IMPORT = 294,
+ _RULE_ = 258,
+ _PRIVATE_ = 259,
+ _GLOBAL_ = 260,
+ _META_ = 261,
+ _STRINGS_ = 262,
+ _CONDITION_ = 263,
+ _IDENTIFIER_ = 264,
+ _STRING_IDENTIFIER_ = 265,
+ _STRING_COUNT_ = 266,
+ _STRING_OFFSET_ = 267,
+ _STRING_IDENTIFIER_WITH_WILDCARD_ = 268,
+ _NUMBER_ = 269,
+ _TEXT_STRING_ = 270,
+ _HEX_STRING_ = 271,
+ _REGEXP_ = 272,
+ _ASCII_ = 273,
+ _WIDE_ = 274,
+ _NOCASE_ = 275,
+ _FULLWORD_ = 276,
+ _AT_ = 277,
+ _FILESIZE_ = 278,
+ _ENTRYPOINT_ = 279,
+ _ALL_ = 280,
+ _ANY_ = 281,
+ _IN_ = 282,
+ _OF_ = 283,
+ _FOR_ = 284,
+ _THEM_ = 285,
+ _INT8_ = 286,
+ _INT16_ = 287,
+ _INT32_ = 288,
+ _UINT8_ = 289,
+ _UINT16_ = 290,
+ _UINT32_ = 291,
+ _MATCHES_ = 292,
+ _CONTAINS_ = 293,
+ _IMPORT_ = 294,
_TRUE_ = 295,
_FALSE_ = 296,
- OR = 297,
- AND = 298,
- IS = 299,
- NEQ = 300,
- EQ = 301,
- GE = 302,
- GT = 303,
- LE = 304,
- LT = 305,
- SHIFT_RIGHT = 306,
- SHIFT_LEFT = 307,
- NOT = 308
+ _OR_ = 297,
+ _AND_ = 298,
+ _IS_ = 299,
+ _NEQ_ = 300,
+ _EQ_ = 301,
+ _GE_ = 302,
+ _GT_ = 303,
+ _LE_ = 304,
+ _LT_ = 305,
+ _SHIFT_RIGHT_ = 306,
+ _SHIFT_LEFT_ = 307,
+ _NOT_ = 308
};
#endif
/* Tokens. */
-#define RULE 258
-#define PRIVATE 259
-#define GLOBAL 260
-#define META 261
-#define STRINGS 262
-#define CONDITION 263
-#define IDENTIFIER 264
-#define STRING_IDENTIFIER 265
-#define STRING_COUNT 266
-#define STRING_OFFSET 267
-#define STRING_IDENTIFIER_WITH_WILDCARD 268
-#define NUMBER 269
-#define TEXT_STRING 270
-#define HEX_STRING 271
-#define REGEXP 272
-#define ASCII 273
-#define WIDE 274
-#define NOCASE 275
-#define FULLWORD 276
-#define AT 277
-#define FILESIZE 278
-#define ENTRYPOINT 279
-#define ALL 280
-#define ANY 281
-#define IN 282
-#define OF 283
-#define FOR 284
-#define THEM 285
-#define INT8 286
-#define INT16 287
-#define INT32 288
-#define UINT8 289
-#define UINT16 290
-#define UINT32 291
-#define MATCHES 292
-#define CONTAINS 293
-#define IMPORT 294
+#define _RULE_ 258
+#define _PRIVATE_ 259
+#define _GLOBAL_ 260
+#define _META_ 261
+#define _STRINGS_ 262
+#define _CONDITION_ 263
+#define _IDENTIFIER_ 264
+#define _STRING_IDENTIFIER_ 265
+#define _STRING_COUNT_ 266
+#define _STRING_OFFSET_ 267
+#define _STRING_IDENTIFIER_WITH_WILDCARD_ 268
+#define _NUMBER_ 269
+#define _TEXT_STRING_ 270
+#define _HEX_STRING_ 271
+#define _REGEXP_ 272
+#define _ASCII_ 273
+#define _WIDE_ 274
+#define _NOCASE_ 275
+#define _FULLWORD_ 276
+#define _AT_ 277
+#define _FILESIZE_ 278
+#define _ENTRYPOINT_ 279
+#define _ALL_ 280
+#define _ANY_ 281
+#define _IN_ 282
+#define _OF_ 283
+#define _FOR_ 284
+#define _THEM_ 285
+#define _INT8_ 286
+#define _INT16_ 287
+#define _INT32_ 288
+#define _UINT8_ 289
+#define _UINT16_ 290
+#define _UINT32_ 291
+#define _MATCHES_ 292
+#define _CONTAINS_ 293
+#define _IMPORT_ 294
#define _TRUE_ 295
#define _FALSE_ 296
-#define OR 297
-#define AND 298
-#define IS 299
-#define NEQ 300
-#define EQ 301
-#define GE 302
-#define GT 303
-#define LE 304
-#define LT 305
-#define SHIFT_RIGHT 306
-#define SHIFT_LEFT 307
-#define NOT 308
+#define _OR_ 297
+#define _AND_ 298
+#define _IS_ 299
+#define _NEQ_ 300
+#define _EQ_ 301
+#define _GE_ 302
+#define _GT_ 303
+#define _LE_ 304
+#define _LT_ 305
+#define _SHIFT_RIGHT_ 306
+#define _SHIFT_LEFT_ 307
+#define _NOT_ 308
@@ -651,23 +651,25 @@ static const yytype_uint16 yyrline[] =
First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] =
{
- "$end", "error", "$undefined", "RULE", "PRIVATE", "GLOBAL", "META",
- "STRINGS", "CONDITION", "IDENTIFIER", "STRING_IDENTIFIER",
- "STRING_COUNT", "STRING_OFFSET", "STRING_IDENTIFIER_WITH_WILDCARD",
- "NUMBER", "TEXT_STRING", "HEX_STRING", "REGEXP", "ASCII", "WIDE",
- "NOCASE", "FULLWORD", "AT", "FILESIZE", "ENTRYPOINT", "ALL", "ANY", "IN",
- "OF", "FOR", "THEM", "INT8", "INT16", "INT32", "UINT8", "UINT16",
- "UINT32", "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",
+ "$end", "error", "$undefined", "_RULE_", "_PRIVATE_", "_GLOBAL_",
+ "_META_", "_STRINGS_", "_CONDITION_", "_IDENTIFIER_",
+ "_STRING_IDENTIFIER_", "_STRING_COUNT_", "_STRING_OFFSET_",
+ "_STRING_IDENTIFIER_WITH_WILDCARD_", "_NUMBER_", "_TEXT_STRING_",
+ "_HEX_STRING_", "_REGEXP_", "_ASCII_", "_WIDE_", "_NOCASE_",
+ "_FULLWORD_", "_AT_", "_FILESIZE_", "_ENTRYPOINT_", "_ALL_", "_ANY_",
+ "_IN_", "_OF_", "_FOR_", "_THEM_", "_INT8_", "_INT16_", "_INT32_",
+ "_UINT8_", "_UINT16_", "_UINT32_", "_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
};
#endif
@@ -1444,45 +1446,45 @@ yydestruct (yymsg, yytype, yyvaluep, yyscanner, compiler)
switch (yytype)
{
- case 9: /* "IDENTIFIER" */
+ case 9: /* "_IDENTIFIER_" */
#line 176 "grammar.y"
{ yr_free((yyvaluep->c_string)); };
-#line 1451 "grammar.c"
+#line 1453 "grammar.c"
break;
- case 10: /* "STRING_IDENTIFIER" */
+ case 10: /* "_STRING_IDENTIFIER_" */
#line 177 "grammar.y"
{ yr_free((yyvaluep->c_string)); };
-#line 1456 "grammar.c"
+#line 1458 "grammar.c"
break;
- case 11: /* "STRING_COUNT" */
+ case 11: /* "_STRING_COUNT_" */
#line 178 "grammar.y"
{ yr_free((yyvaluep->c_string)); };
-#line 1461 "grammar.c"
+#line 1463 "grammar.c"
break;
- case 12: /* "STRING_OFFSET" */
+ case 12: /* "_STRING_OFFSET_" */
#line 179 "grammar.y"
{ yr_free((yyvaluep->c_string)); };
-#line 1466 "grammar.c"
+#line 1468 "grammar.c"
break;
- case 13: /* "STRING_IDENTIFIER_WITH_WILDCARD" */
+ case 13: /* "_STRING_IDENTIFIER_WITH_WILDCARD_" */
#line 180 "grammar.y"
{ yr_free((yyvaluep->c_string)); };
-#line 1471 "grammar.c"
+#line 1473 "grammar.c"
break;
- case 15: /* "TEXT_STRING" */
+ case 15: /* "_TEXT_STRING_" */
#line 181 "grammar.y"
{ yr_free((yyvaluep->sized_string)); };
-#line 1476 "grammar.c"
+#line 1478 "grammar.c"
break;
- case 16: /* "HEX_STRING" */
+ case 16: /* "_HEX_STRING_" */
#line 182 "grammar.y"
{ yr_free((yyvaluep->sized_string)); };
-#line 1481 "grammar.c"
+#line 1483 "grammar.c"
break;
- case 17: /* "REGEXP" */
+ case 17: /* "_REGEXP_" */
#line 183 "grammar.y"
{ yr_free((yyvaluep->sized_string)); };
-#line 1486 "grammar.c"
+#line 1488 "grammar.c"
break;
default:
@@ -3505,7 +3507,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 3509 "grammar.c"
+#line 3511 "grammar.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/libyara/grammar.h b/libyara/grammar.h
index 17a073e..641f93e 100644
--- a/libyara/grammar.h
+++ b/libyara/grammar.h
@@ -39,111 +39,111 @@
/* Put the tokens into the symbol table, so that GDB and other debuggers
know about them. */
enum yytokentype {
- RULE = 258,
- PRIVATE = 259,
- GLOBAL = 260,
- META = 261,
- STRINGS = 262,
- CONDITION = 263,
- IDENTIFIER = 264,
- STRING_IDENTIFIER = 265,
- STRING_COUNT = 266,
- STRING_OFFSET = 267,
- STRING_IDENTIFIER_WITH_WILDCARD = 268,
- NUMBER = 269,
- TEXT_STRING = 270,
- HEX_STRING = 271,
- REGEXP = 272,
- ASCII = 273,
- WIDE = 274,
- NOCASE = 275,
- FULLWORD = 276,
- AT = 277,
- FILESIZE = 278,
- ENTRYPOINT = 279,
- ALL = 280,
- ANY = 281,
- IN = 282,
- OF = 283,
- FOR = 284,
- THEM = 285,
- INT8 = 286,
- INT16 = 287,
- INT32 = 288,
- UINT8 = 289,
- UINT16 = 290,
- UINT32 = 291,
- MATCHES = 292,
- CONTAINS = 293,
- IMPORT = 294,
+ _RULE_ = 258,
+ _PRIVATE_ = 259,
+ _GLOBAL_ = 260,
+ _META_ = 261,
+ _STRINGS_ = 262,
+ _CONDITION_ = 263,
+ _IDENTIFIER_ = 264,
+ _STRING_IDENTIFIER_ = 265,
+ _STRING_COUNT_ = 266,
+ _STRING_OFFSET_ = 267,
+ _STRING_IDENTIFIER_WITH_WILDCARD_ = 268,
+ _NUMBER_ = 269,
+ _TEXT_STRING_ = 270,
+ _HEX_STRING_ = 271,
+ _REGEXP_ = 272,
+ _ASCII_ = 273,
+ _WIDE_ = 274,
+ _NOCASE_ = 275,
+ _FULLWORD_ = 276,
+ _AT_ = 277,
+ _FILESIZE_ = 278,
+ _ENTRYPOINT_ = 279,
+ _ALL_ = 280,
+ _ANY_ = 281,
+ _IN_ = 282,
+ _OF_ = 283,
+ _FOR_ = 284,
+ _THEM_ = 285,
+ _INT8_ = 286,
+ _INT16_ = 287,
+ _INT32_ = 288,
+ _UINT8_ = 289,
+ _UINT16_ = 290,
+ _UINT32_ = 291,
+ _MATCHES_ = 292,
+ _CONTAINS_ = 293,
+ _IMPORT_ = 294,
_TRUE_ = 295,
_FALSE_ = 296,
- OR = 297,
- AND = 298,
- IS = 299,
- NEQ = 300,
- EQ = 301,
- GE = 302,
- GT = 303,
- LE = 304,
- LT = 305,
- SHIFT_RIGHT = 306,
- SHIFT_LEFT = 307,
- NOT = 308
+ _OR_ = 297,
+ _AND_ = 298,
+ _IS_ = 299,
+ _NEQ_ = 300,
+ _EQ_ = 301,
+ _GE_ = 302,
+ _GT_ = 303,
+ _LE_ = 304,
+ _LT_ = 305,
+ _SHIFT_RIGHT_ = 306,
+ _SHIFT_LEFT_ = 307,
+ _NOT_ = 308
};
#endif
/* Tokens. */
-#define RULE 258
-#define PRIVATE 259
-#define GLOBAL 260
-#define META 261
-#define STRINGS 262
-#define CONDITION 263
-#define IDENTIFIER 264
-#define STRING_IDENTIFIER 265
-#define STRING_COUNT 266
-#define STRING_OFFSET 267
-#define STRING_IDENTIFIER_WITH_WILDCARD 268
-#define NUMBER 269
-#define TEXT_STRING 270
-#define HEX_STRING 271
-#define REGEXP 272
-#define ASCII 273
-#define WIDE 274
-#define NOCASE 275
-#define FULLWORD 276
-#define AT 277
-#define FILESIZE 278
-#define ENTRYPOINT 279
-#define ALL 280
-#define ANY 281
-#define IN 282
-#define OF 283
-#define FOR 284
-#define THEM 285
-#define INT8 286
-#define INT16 287
-#define INT32 288
-#define UINT8 289
-#define UINT16 290
-#define UINT32 291
-#define MATCHES 292
-#define CONTAINS 293
-#define IMPORT 294
+#define _RULE_ 258
+#define _PRIVATE_ 259
+#define _GLOBAL_ 260
+#define _META_ 261
+#define _STRINGS_ 262
+#define _CONDITION_ 263
+#define _IDENTIFIER_ 264
+#define _STRING_IDENTIFIER_ 265
+#define _STRING_COUNT_ 266
+#define _STRING_OFFSET_ 267
+#define _STRING_IDENTIFIER_WITH_WILDCARD_ 268
+#define _NUMBER_ 269
+#define _TEXT_STRING_ 270
+#define _HEX_STRING_ 271
+#define _REGEXP_ 272
+#define _ASCII_ 273
+#define _WIDE_ 274
+#define _NOCASE_ 275
+#define _FULLWORD_ 276
+#define _AT_ 277
+#define _FILESIZE_ 278
+#define _ENTRYPOINT_ 279
+#define _ALL_ 280
+#define _ANY_ 281
+#define _IN_ 282
+#define _OF_ 283
+#define _FOR_ 284
+#define _THEM_ 285
+#define _INT8_ 286
+#define _INT16_ 287
+#define _INT32_ 288
+#define _UINT8_ 289
+#define _UINT16_ 290
+#define _UINT32_ 291
+#define _MATCHES_ 292
+#define _CONTAINS_ 293
+#define _IMPORT_ 294
#define _TRUE_ 295
#define _FALSE_ 296
-#define OR 297
-#define AND 298
-#define IS 299
-#define NEQ 300
-#define EQ 301
-#define GE 302
-#define GT 303
-#define LE 304
-#define LT 305
-#define SHIFT_RIGHT 306
-#define SHIFT_LEFT 307
-#define NOT 308
+#define _OR_ 297
+#define _AND_ 298
+#define _IS_ 299
+#define _NEQ_ 300
+#define _EQ_ 301
+#define _GE_ 302
+#define _GT_ 303
+#define _LE_ 304
+#define _LT_ 305
+#define _SHIFT_RIGHT_ 306
+#define _SHIFT_LEFT_ 307
+#define _NOT_ 308
diff --git a/libyara/grammar.y b/libyara/grammar.y
index 8ab5246..50d687f 100644
--- a/libyara/grammar.y
+++ b/libyara/grammar.y
@@ -93,55 +93,55 @@ limitations under the License.
%lex-param {yyscan_t yyscanner}
%lex-param {YR_COMPILER* compiler}
-%token RULE
-%token PRIVATE
-%token GLOBAL
-%token META
-%token <string> STRINGS
-%token CONDITION
-%token <c_string> IDENTIFIER
-%token <c_string> STRING_IDENTIFIER
-%token <c_string> STRING_COUNT
-%token <c_string> STRING_OFFSET
-%token <c_string> STRING_IDENTIFIER_WITH_WILDCARD
-%token <integer> NUMBER
-%token <sized_string> TEXT_STRING
-%token <sized_string> HEX_STRING
-%token <sized_string> REGEXP
-%token ASCII
-%token WIDE
-%token NOCASE
-%token FULLWORD
-%token AT
-%token FILESIZE
-%token ENTRYPOINT
-%token ALL
-%token ANY
-%token IN
-%token OF
-%token FOR
-%token THEM
-%token INT8
-%token INT16
-%token INT32
-%token UINT8
-%token UINT16
-%token UINT32
-%token MATCHES
-%token CONTAINS
-%token IMPORT
+%token _RULE_
+%token _PRIVATE_
+%token _GLOBAL_
+%token _META_
+%token <string> _STRINGS_
+%token _CONDITION_
+%token <c_string> _IDENTIFIER_
+%token <c_string> _STRING_IDENTIFIER_
+%token <c_string> _STRING_COUNT_
+%token <c_string> _STRING_OFFSET_
+%token <c_string> _STRING_IDENTIFIER_WITH_WILDCARD_
+%token <integer> _NUMBER_
+%token <sized_string> _TEXT_STRING_
+%token <sized_string> _HEX_STRING_
+%token <sized_string> _REGEXP_
+%token _ASCII_
+%token _WIDE_
+%token _NOCASE_
+%token _FULLWORD_
+%token _AT_
+%token _FILESIZE_
+%token _ENTRYPOINT_
+%token _ALL_
+%token _ANY_
+%token _IN_
+%token _OF_
+%token _FOR_
+%token _THEM_
+%token _INT8_
+%token _INT16_
+%token _INT32_
+%token _UINT8_
+%token _UINT16_
+%token _UINT32_
+%token _MATCHES_
+%token _CONTAINS_
+%token _IMPORT_
%token _TRUE_
%token _FALSE_
-%left OR
-%left AND
+%left _OR_
+%left _AND_
%left '&' '|' '^'
-%left LT LE GT GE EQ NEQ IS
-%left SHIFT_LEFT SHIFT_RIGHT
+%left _LT_ _LE_ _GT_ _GE_ _EQ_ _NEQ_ _IS_
+%left _SHIFT_LEFT_ _SHIFT_RIGHT_
%left '+' '-'
%left '*' '\\' '%'
-%right NOT
+%right _NOT_
%right '~'
%type <string> strings
@@ -173,14 +173,14 @@ limitations under the License.
%type <c_string> arguments_list
-%destructor { yr_free($$); } IDENTIFIER
-%destructor { yr_free($$); } STRING_IDENTIFIER
-%destructor { yr_free($$); } STRING_COUNT
-%destructor { yr_free($$); } STRING_OFFSET
-%destructor { yr_free($$); } STRING_IDENTIFIER_WITH_WILDCARD
-%destructor { yr_free($$); } TEXT_STRING
-%destructor { yr_free($$); } HEX_STRING
-%destructor { yr_free($$); } REGEXP
+%destructor { yr_free($$); } _IDENTIFIER_
+%destructor { yr_free($$); } _STRING_IDENTIFIER_
+%destructor { yr_free($$); } _STRING_COUNT_
+%destructor { yr_free($$); } _STRING_OFFSET_
+%destructor { yr_free($$); } _STRING_IDENTIFIER_WITH_WILDCARD_
+%destructor { yr_free($$); } _TEXT_STRING_
+%destructor { yr_free($$); } _HEX_STRING_
+%destructor { yr_free($$); } _REGEXP_
%union {
SIZED_STRING* sized_string;
@@ -205,7 +205,7 @@ rules
import
- : IMPORT TEXT_STRING
+ : _IMPORT_ _TEXT_STRING_
{
int result = yr_parser_reduce_import(yyscanner, $2);
@@ -217,7 +217,7 @@ import
rule
- : rule_modifiers RULE IDENTIFIER tags '{' meta strings condition '}'
+ : rule_modifiers _RULE_ _IDENTIFIER_ tags '{' meta strings condition '}'
{
int result = yr_parser_reduce_rule_declaration(
yyscanner,
@@ -239,7 +239,7 @@ meta
{
$$ = NULL;
}
- | META ':' meta_declarations
+ | _META_ ':' meta_declarations
{
// Each rule have a list of meta-data info, consisting in a
// sequence of YR_META structures. The last YR_META structure does
@@ -271,7 +271,7 @@ strings
$$ = NULL;
compiler->current_rule_strings = $$;
}
- | STRINGS ':' string_declarations
+ | _STRINGS_ ':' string_declarations
{
// Each rule have a list of strings, consisting in a sequence
// of YR_STRING structures. The last YR_STRING structure does not
@@ -299,7 +299,7 @@ strings
condition
- : CONDITION ':' boolean_expression
+ : _CONDITION_ ':' boolean_expression
;
@@ -310,8 +310,8 @@ rule_modifiers
rule_modifier
- : PRIVATE { $$ = RULE_GFLAGS_PRIVATE; }
- | GLOBAL { $$ = RULE_GFLAGS_GLOBAL; }
+ : _PRIVATE_ { $$ = RULE_GFLAGS_PRIVATE; }
+ | _GLOBAL_ { $$ = RULE_GFLAGS_GLOBAL; }
;
@@ -338,7 +338,7 @@ tags
tag_list
- : IDENTIFIER
+ : _IDENTIFIER_
{
char* identifier;
@@ -351,7 +351,7 @@ tag_list
$$ = identifier;
}
- | tag_list IDENTIFIER
+ | tag_list _IDENTIFIER_
{
char* tag_name = $1;
size_t tag_length = tag_name != NULL ? strlen(tag_name) : 0;
@@ -394,7 +394,7 @@ meta_declarations
meta_declaration
- : IDENTIFIER '=' TEXT_STRING
+ : _IDENTIFIER_ '=' _TEXT_STRING_
{
SIZED_STRING* sized_string = $3;
@@ -410,7 +410,7 @@ meta_declaration
ERROR_IF($$ == NULL);
}
- | IDENTIFIER '=' NUMBER
+ | _IDENTIFIER_ '=' _NUMBER_
{
$$ = yr_parser_reduce_meta_declaration(
yyscanner,
@@ -423,7 +423,7 @@ meta_declaration
ERROR_IF($$ == NULL);
}
- | IDENTIFIER '=' _TRUE_
+ | _IDENTIFIER_ '=' _TRUE_
{
$$ = yr_parser_reduce_meta_declaration(
yyscanner,
@@ -436,7 +436,7 @@ meta_declaration
ERROR_IF($$ == NULL);
}
- | IDENTIFIER '=' _FALSE_
+ | _IDENTIFIER_ '=' _FALSE_
{
$$ = yr_parser_reduce_meta_declaration(
yyscanner,
@@ -459,7 +459,7 @@ string_declarations
string_declaration
- : STRING_IDENTIFIER '=' TEXT_STRING string_modifiers
+ : _STRING_IDENTIFIER_ '=' _TEXT_STRING_ string_modifiers
{
$$ = yr_parser_reduce_string_declaration(
yyscanner,
@@ -472,11 +472,11 @@ string_declaration
ERROR_IF($$ == NULL);
}
- | STRING_IDENTIFIER '='
+ | _STRING_IDENTIFIER_ '='
{
compiler->error_line = yyget_lineno(yyscanner);
}
- REGEXP string_modifiers
+ _REGEXP_ string_modifiers
{
$$ = yr_parser_reduce_string_declaration(
yyscanner,
@@ -489,7 +489,7 @@ string_declaration
ERROR_IF($$ == NULL);
}
- | STRING_IDENTIFIER '=' HEX_STRING
+ | _STRING_IDENTIFIER_ '=' _HEX_STRING_
{
$$ = yr_parser_reduce_string_declaration(
yyscanner,
@@ -512,15 +512,15 @@ string_modifiers
string_modifier
- : WIDE { $$ = STRING_GFLAGS_WIDE; }
- | ASCII { $$ = STRING_GFLAGS_ASCII; }
- | NOCASE { $$ = STRING_GFLAGS_NO_CASE; }
- | FULLWORD { $$ = STRING_GFLAGS_FULL_WORD; }
+ : _WIDE_ { $$ = STRING_GFLAGS_WIDE; }
+ | _ASCII_ { $$ = STRING_GFLAGS_ASCII; }
+ | _NOCASE_ { $$ = STRING_GFLAGS_NO_CASE; }
+ | _FULLWORD_ { $$ = STRING_GFLAGS_FULL_WORD; }
;
identifier
- : IDENTIFIER
+ : _IDENTIFIER_
{
YR_OBJECT* object = NULL;
YR_RULE* rule;
@@ -608,7 +608,7 @@ identifier
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
- | identifier '.' IDENTIFIER
+ | identifier '.' _IDENTIFIER_
{
YR_OBJECT* object = $1;
YR_OBJECT* field = NULL;
@@ -771,7 +771,7 @@ arguments_list
regexp
- : REGEXP
+ : _REGEXP_
{
SIZED_STRING* sized_string = $1;
RE* re;
@@ -852,7 +852,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression MATCHES regexp
+ | primary_expression _MATCHES_ regexp
{
CHECK_TYPE($1, EXPRESSION_TYPE_STRING, "matches");
CHECK_TYPE($3, EXPRESSION_TYPE_REGEXP, "matches");
@@ -867,7 +867,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression CONTAINS primary_expression
+ | primary_expression _CONTAINS_ primary_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_STRING, "contains");
CHECK_TYPE($3, EXPRESSION_TYPE_STRING, "contains");
@@ -881,7 +881,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | STRING_IDENTIFIER
+ | _STRING_IDENTIFIER_
{
int result = yr_parser_reduce_string_identifier(
yyscanner,
@@ -894,7 +894,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | STRING_IDENTIFIER AT primary_expression
+ | _STRING_IDENTIFIER_ _AT_ primary_expression
{
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "at");
@@ -909,7 +909,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | STRING_IDENTIFIER IN range
+ | _STRING_IDENTIFIER_ _IN_ range
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner,
@@ -922,7 +922,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | FOR for_expression IDENTIFIER IN
+ | _FOR_ for_expression _IDENTIFIER_ _IN_
{
int var_index;
@@ -1068,7 +1068,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | FOR for_expression OF string_set ':'
+ | _FOR_ for_expression _OF_ string_set ':'
{
int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;
int8_t* addr;
@@ -1145,25 +1145,25 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | for_expression OF string_set
+ | for_expression _OF_ string_set
{
yr_parser_emit(yyscanner, OP_OF, NULL);
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | NOT boolean_expression
+ | _NOT_ boolean_expression
{
yr_parser_emit(yyscanner, OP_NOT, NULL);
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | boolean_expression AND boolean_expression
+ | boolean_expression _AND_ boolean_expression
{
yr_parser_emit(yyscanner, OP_AND, NULL);
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | boolean_expression OR boolean_expression
+ | boolean_expression _OR_ boolean_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_BOOLEAN, "or");
@@ -1171,7 +1171,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression LT primary_expression
+ | primary_expression _LT_ primary_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, "<");
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "<");
@@ -1180,7 +1180,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression GT primary_expression
+ | primary_expression _GT_ primary_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, ">");
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, ">");
@@ -1189,7 +1189,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression LE primary_expression
+ | primary_expression _LE_ primary_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, "<=");
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "<=");
@@ -1198,7 +1198,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression GE primary_expression
+ | primary_expression _GE_ primary_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, ">=");
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, ">=");
@@ -1207,7 +1207,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression EQ primary_expression
+ | primary_expression _EQ_ primary_expression
{
if ($1 != $3)
{
@@ -1234,7 +1234,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression IS primary_expression
+ | primary_expression _IS_ primary_expression
{
if ($1 != $3)
{
@@ -1261,7 +1261,7 @@ expression
$$ = EXPRESSION_TYPE_BOOLEAN;
}
- | primary_expression NEQ primary_expression
+ | primary_expression _NEQ_ primary_expression
{
if ($1 != $3)
{
@@ -1361,7 +1361,7 @@ string_set
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
}
string_enumeration ')'
- | THEM
+ | _THEM_
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
yr_parser_emit_pushes_for_strings(yyscanner, "$*");
@@ -1376,12 +1376,12 @@ string_enumeration
string_enumeration_item
- : STRING_IDENTIFIER
+ : _STRING_IDENTIFIER_
{
yr_parser_emit_pushes_for_strings(yyscanner, $1);
yr_free($1);
}
- | STRING_IDENTIFIER_WITH_WILDCARD
+ | _STRING_IDENTIFIER_WITH_WILDCARD_
{
yr_parser_emit_pushes_for_strings(yyscanner, $1);
yr_free($1);
@@ -1391,11 +1391,11 @@ string_enumeration_item
for_expression
: primary_expression
- | ALL
+ | _ALL_
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);
}
- | ANY
+ | _ANY_
{
yr_parser_emit_with_arg(yyscanner, OP_PUSH, 1, NULL);
}
@@ -1407,7 +1407,7 @@ primary_expression
{
$$ = $2;
}
- | FILESIZE
+ | _FILESIZE_
{
compiler->last_result = yr_parser_emit(
yyscanner, OP_FILESIZE, NULL);
@@ -1416,7 +1416,7 @@ primary_expression
ERROR_IF(compiler->last_result != ERROR_SUCCESS);
}
- | ENTRYPOINT
+ | _ENTRYPOINT_
{
compiler->last_result = yr_parser_emit(
yyscanner, OP_ENTRYPOINT, NULL);
@@ -1425,7 +1425,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | INT8 '(' primary_expression ')'
+ | _INT8_ '(' primary_expression ')'
{
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "int8");
@@ -1436,7 +1436,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | INT16 '(' primary_expression ')'
+ | _INT16_ '(' primary_expression ')'
{
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "int16");
@@ -1447,7 +1447,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | INT32 '(' primary_expression ')'
+ | _INT32_ '(' primary_expression ')'
{
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "int32");
@@ -1458,7 +1458,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | UINT8 '(' primary_expression ')'
+ | _UINT8_ '(' primary_expression ')'
{
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "uint8");
@@ -1469,7 +1469,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | UINT16 '(' primary_expression ')'
+ | _UINT16_ '(' primary_expression ')'
{
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "uint16");
@@ -1480,7 +1480,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | UINT32 '(' primary_expression ')'
+ | _UINT32_ '(' primary_expression ')'
{
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "uint32");
@@ -1491,7 +1491,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | NUMBER
+ | _NUMBER_
{
compiler->last_result = yr_parser_emit_with_arg(
yyscanner, OP_PUSH, $1, NULL);
@@ -1500,7 +1500,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | TEXT_STRING
+ | _TEXT_STRING_
{
SIZED_STRING* sized_string = $1;
char* string;
@@ -1523,7 +1523,7 @@ primary_expression
$$ = EXPRESSION_TYPE_STRING;
}
- | STRING_COUNT
+ | _STRING_COUNT_
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner,
@@ -1536,7 +1536,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | STRING_OFFSET '[' primary_expression ']'
+ | _STRING_OFFSET_ '[' primary_expression ']'
{
compiler->last_result = yr_parser_reduce_string_identifier(
yyscanner,
@@ -1549,7 +1549,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | STRING_OFFSET
+ | _STRING_OFFSET_
{
compiler->last_result = yr_parser_emit_with_arg(
yyscanner,
@@ -1684,7 +1684,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | primary_expression SHIFT_LEFT primary_expression
+ | primary_expression _SHIFT_LEFT_ primary_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, "<<");
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "<<");
@@ -1693,7 +1693,7 @@ primary_expression
$$ = EXPRESSION_TYPE_INTEGER;
}
- | primary_expression SHIFT_RIGHT primary_expression
+ | primary_expression _SHIFT_RIGHT_ primary_expression
{
CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, ">>");
CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, ">>");
diff --git a/libyara/lexer.c b/libyara/lexer.c
index 1767ee4..41967dc 100644
--- a/libyara/lexer.c
+++ b/libyara/lexer.c
@@ -1018,92 +1018,92 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
#line 85 "lexer.l"
-{ return LT; }
+{ return _LT_; }
YY_BREAK
case 2:
YY_RULE_SETUP
#line 86 "lexer.l"
-{ return GT; }
+{ return _GT_; }
YY_BREAK
case 3:
YY_RULE_SETUP
#line 87 "lexer.l"
-{ return LE; }
+{ return _LE_; }
YY_BREAK
case 4:
YY_RULE_SETUP
#line 88 "lexer.l"
-{ return GE; }
+{ return _GE_; }
YY_BREAK
case 5:
YY_RULE_SETUP
#line 89 "lexer.l"
-{ return EQ; }
+{ return _EQ_; }
YY_BREAK
case 6:
YY_RULE_SETUP
#line 90 "lexer.l"
-{ return NEQ; }
+{ return _NEQ_; }
YY_BREAK
case 7:
YY_RULE_SETUP
#line 91 "lexer.l"
-{ return SHIFT_LEFT; }
+{ return _SHIFT_LEFT_; }
YY_BREAK
case 8:
YY_RULE_SETUP
#line 92 "lexer.l"
-{ return SHIFT_RIGHT; }
+{ return _SHIFT_RIGHT_; }
YY_BREAK
case 9:
YY_RULE_SETUP
#line 93 "lexer.l"
-{ return PRIVATE; }
+{ return _PRIVATE_; }
YY_BREAK
case 10:
YY_RULE_SETUP
#line 94 "lexer.l"
-{ return GLOBAL; }
+{ return _GLOBAL_; }
YY_BREAK
case 11:
YY_RULE_SETUP
#line 95 "lexer.l"
-{ return RULE; }
+{ return _RULE_; }
YY_BREAK
case 12:
YY_RULE_SETUP
#line 96 "lexer.l"
-{ return META; }
+{ return _META_; }
YY_BREAK
case 13:
YY_RULE_SETUP
#line 97 "lexer.l"
-{ return STRINGS; }
+{ return _STRINGS_; }
YY_BREAK
case 14:
YY_RULE_SETUP
#line 98 "lexer.l"
-{ return ASCII; }
+{ return _ASCII_; }
YY_BREAK
case 15:
YY_RULE_SETUP
#line 99 "lexer.l"
-{ return WIDE; }
+{ return _WIDE_; }
YY_BREAK
case 16:
YY_RULE_SETUP
#line 100 "lexer.l"
-{ return FULLWORD; }
+{ return _FULLWORD_; }
YY_BREAK
case 17:
YY_RULE_SETUP
#line 101 "lexer.l"
-{ return NOCASE; }
+{ return _NOCASE_; }
YY_BREAK
case 18:
YY_RULE_SETUP
#line 102 "lexer.l"
-{ return CONDITION; }
+{ return _CONDITION_; }
YY_BREAK
case 19:
YY_RULE_SETUP
@@ -1118,107 +1118,107 @@ YY_RULE_SETUP
case 21:
YY_RULE_SETUP
#line 105 "lexer.l"
-{ return NOT; }
+{ return _NOT_; }
YY_BREAK
case 22:
YY_RULE_SETUP
#line 106 "lexer.l"
-{ return AND; }
+{ return _AND_; }
YY_BREAK
case 23:
YY_RULE_SETUP
#line 107 "lexer.l"
-{ return OR; }
+{ return _OR_; }
YY_BREAK
case 24:
YY_RULE_SETUP
#line 108 "lexer.l"
-{ return AT; }
+{ return _AT_; }
YY_BREAK
case 25:
YY_RULE_SETUP
#line 109 "lexer.l"
-{ return IN; }
+{ return _IN_; }
YY_BREAK
case 26:
YY_RULE_SETUP
#line 110 "lexer.l"
-{ return OF; }
+{ return _OF_; }
YY_BREAK
case 27:
YY_RULE_SETUP
#line 111 "lexer.l"
-{ return THEM; }
+{ return _THEM_; }
YY_BREAK
case 28:
YY_RULE_SETUP
#line 112 "lexer.l"
-{ return FOR; }
+{ return _FOR_; }
YY_BREAK
case 29:
YY_RULE_SETUP
#line 113 "lexer.l"
-{ return ALL; }
+{ return _ALL_; }
YY_BREAK
case 30:
YY_RULE_SETUP
#line 114 "lexer.l"
-{ return ANY; }
+{ return _ANY_; }
YY_BREAK
case 31:
YY_RULE_SETUP
#line 115 "lexer.l"
-{ return ENTRYPOINT; }
+{ return _ENTRYPOINT_; }
YY_BREAK
case 32:
YY_RULE_SETUP
#line 116 "lexer.l"
-{ return FILESIZE; }
+{ return _FILESIZE_; }
YY_BREAK
case 33:
YY_RULE_SETUP
#line 117 "lexer.l"
-{ return UINT8; }
+{ return _UINT8_; }
YY_BREAK
case 34:
YY_RULE_SETUP
#line 118 "lexer.l"
-{ return UINT16; }
+{ return _UINT16_; }
YY_BREAK
case 35:
YY_RULE_SETUP
#line 119 "lexer.l"
-{ return UINT32; }
+{ return _UINT32_; }
YY_BREAK
case 36:
YY_RULE_SETUP
#line 120 "lexer.l"
-{ return INT8; }
+{ return _INT8_; }
YY_BREAK
case 37:
YY_RULE_SETUP
#line 121 "lexer.l"
-{ return INT16; }
+{ return _INT16_; }
YY_BREAK
case 38:
YY_RULE_SETUP
#line 122 "lexer.l"
-{ return INT32; }
+{ return _INT32_; }
YY_BREAK
case 39:
YY_RULE_SETUP
#line 123 "lexer.l"
-{ return MATCHES; }
+{ return _MATCHES_; }
YY_BREAK
case 40:
YY_RULE_SETUP
#line 124 "lexer.l"
-{ return CONTAINS; }
+{ return _CONTAINS_; }
YY_BREAK
case 41:
YY_RULE_SETUP
#line 125 "lexer.l"
-{ return IMPORT; }
+{ return _IMPORT_; }
YY_BREAK
case 42:
YY_RULE_SETUP
@@ -1399,7 +1399,7 @@ YY_RULE_SETUP
yyterminate();
}
- return STRING_IDENTIFIER_WITH_WILDCARD;
+ return _STRING_IDENTIFIER_WITH_WILDCARD_;
}
YY_BREAK
case 50:
@@ -1415,7 +1415,7 @@ YY_RULE_SETUP
yyterminate();
}
- return STRING_IDENTIFIER;
+ return _STRING_IDENTIFIER_;
}
YY_BREAK
case 51:
@@ -1432,7 +1432,7 @@ YY_RULE_SETUP
}
yylval->c_string[0] = '$'; /* replace # by $*/
- return STRING_COUNT;
+ return _STRING_COUNT_;
}
YY_BREAK
case 52:
@@ -1449,7 +1449,7 @@ YY_RULE_SETUP
}
yylval->c_string[0] = '$'; /* replace @ by $*/
- return STRING_OFFSET;
+ return _STRING_OFFSET_;
}
YY_BREAK
case 53:
@@ -1470,7 +1470,7 @@ YY_RULE_SETUP
yyterminate();
}
- return IDENTIFIER;
+ return _IDENTIFIER_;
}
YY_BREAK
case 54:
@@ -1488,7 +1488,7 @@ YY_RULE_SETUP
{
yylval->integer *= 1048576;
}
- return NUMBER;
+ return _NUMBER_;
}
YY_BREAK
case 55:
@@ -1497,7 +1497,7 @@ YY_RULE_SETUP
{
yylval->integer = xtoi(yytext + 2);
- return NUMBER;
+ return _NUMBER_;
}
YY_BREAK
case 56:
@@ -1523,7 +1523,7 @@ YY_RULE_SETUP
memcpy(s->c_string, yyextra->lex_buf, yyextra->lex_buf_len + 1);
yylval->sized_string = s;
- return TEXT_STRING;
+ return _TEXT_STRING_;
}
YY_BREAK
case 57:
@@ -1633,7 +1633,7 @@ YY_RULE_SETUP
yylval->sized_string = s;
- return REGEXP;
+ return _REGEXP_;
}
YY_BREAK
case 66:
@@ -1707,7 +1707,7 @@ YY_RULE_SETUP
strcpy(s->c_string, yytext);
yylval->sized_string = s;
- return HEX_STRING;
+ return _HEX_STRING_;
}
YY_BREAK
case 73:
diff --git a/libyara/lexer.l b/libyara/lexer.l
index e83e2cd..ca62816 100644
--- a/libyara/lexer.l
+++ b/libyara/lexer.l
@@ -82,47 +82,47 @@ hexdigit [a-fA-F0-9]
%%
-"<" { return LT; }
-">" { return GT; }
-"<=" { return LE; }
-">=" { return GE; }
-"==" { return EQ; }
-"!=" { return NEQ; }
-"<<" { return SHIFT_LEFT; }
-">>" { return SHIFT_RIGHT; }
-"private" { return PRIVATE; }
-"global" { return GLOBAL; }
-"rule" { return RULE; }
-"meta" { return META; }
-"strings" { return STRINGS; }
-"ascii" { return ASCII; }
-"wide" { return WIDE; }
-"fullword" { return FULLWORD; }
-"nocase" { return NOCASE; }
-"condition" { return CONDITION; }
+"<" { return _LT_; }
+">" { return _GT_; }
+"<=" { return _LE_; }
+">=" { return _GE_; }
+"==" { return _EQ_; }
+"!=" { return _NEQ_; }
+"<<" { return _SHIFT_LEFT_; }
+">>" { return _SHIFT_RIGHT_; }
+"private" { return _PRIVATE_; }
+"global" { return _GLOBAL_; }
+"rule" { return _RULE_; }
+"meta" { return _META_; }
+"strings" { return _STRINGS_; }
+"ascii" { return _ASCII_; }
+"wide" { return _WIDE_; }
+"fullword" { return _FULLWORD_; }
+"nocase" { return _NOCASE_; }
+"condition" { return _CONDITION_; }
"true" { return _TRUE_; }
"false" { return _FALSE_; }
-"not" { return NOT; }
-"and" { return AND; }
-"or" { return OR; }
-"at" { return AT; }
-"in" { return IN; }
-"of" { return OF; }
-"them" { return THEM; }
-"for" { return FOR; }
-"all" { return ALL; }
-"any" { return ANY; }
-"entrypoint" { return ENTRYPOINT; }
-"filesize" { return FILESIZE; }
-"uint8" { return UINT8; }
-"uint16" { return UINT16; }
-"uint32" { return UINT32; }
-"int8" { return INT8; }
-"int16" { return INT16; }
-"int32" { return INT32; }
-"matches" { return MATCHES; }
-"contains" { return CONTAINS; }
-"import" { return IMPORT; }
+"not" { return _NOT_; }
+"and" { return _AND_; }
+"or" { return _OR_; }
+"at" { return _AT_; }
+"in" { return _IN_; }
+"of" { return _OF_; }
+"them" { return _THEM_; }
+"for" { return _FOR_; }
+"all" { return _ALL_; }
+"any" { return _ANY_; }
+"entrypoint" { return _ENTRYPOINT_; }
+"filesize" { return _FILESIZE_; }
+"uint8" { return _UINT8_; }
+"uint16" { return _UINT16_; }
+"uint32" { return _UINT32_; }
+"int8" { return _INT8_; }
+"int16" { return _INT16_; }
+"int32" { return _INT32_; }
+"matches" { return _MATCHES_; }
+"contains" { return _CONTAINS_; }
+"import" { return _IMPORT_; }
"/*" { BEGIN(comment); }
@@ -277,7 +277,7 @@ $({letter}|{digit}|_)*"*" {
yyterminate();
}
- return STRING_IDENTIFIER_WITH_WILDCARD;
+ return _STRING_IDENTIFIER_WITH_WILDCARD_;
}
@@ -291,7 +291,7 @@ $({letter}|{digit}|_)* {
yyterminate();
}
- return STRING_IDENTIFIER;
+ return _STRING_IDENTIFIER_;
}
@@ -306,7 +306,7 @@ $({letter}|{digit}|_)* {
}
yylval->c_string[0] = '$'; /* replace # by $*/
- return STRING_COUNT;
+ return _STRING_COUNT_;
}
@@ -321,7 +321,7 @@ $({letter}|{digit}|_)* {
}
yylval->c_string[0] = '$'; /* replace @ by $*/
- return STRING_OFFSET;
+ return _STRING_OFFSET_;
}
@@ -340,7 +340,7 @@ $({letter}|{digit}|_)* {
yyterminate();
}
- return IDENTIFIER;
+ return _IDENTIFIER_;
}
@@ -356,14 +356,14 @@ $({letter}|{digit}|_)* {
{
yylval->integer *= 1048576;
}
- return NUMBER;
+ return _NUMBER_;
}
0x{hexdigit}+ {
yylval->integer = xtoi(yytext + 2);
- return NUMBER;
+ return _NUMBER_;
}
@@ -387,7 +387,7 @@ $({letter}|{digit}|_)* {
memcpy(s->c_string, yyextra->lex_buf, yyextra->lex_buf_len + 1);
yylval->sized_string = s;
- return TEXT_STRING;
+ return _TEXT_STRING_;
}
@@ -476,7 +476,7 @@ $({letter}|{digit}|_)* {
yylval->sized_string = s;
- return REGEXP;
+ return _REGEXP_;
}
@@ -534,7 +534,7 @@ $({letter}|{digit}|_)* {
strcpy(s->c_string, yytext);
yylval->sized_string = s;
- return HEX_STRING;
+ return _HEX_STRING_;
}
--
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