@@ -2632,7 +2632,7 @@ static int cli_loadyara(FILE *fs, const char *dbname, struct cl_engine *engine,

     uint32_t line = 0;

     uint8_t is_comment;

     uint8_t rule_state;

-    YR_COMPILER compiler;

+    YR_COMPILER compiler = {0};

     YR_RULE * rule;

     YR_STRING * string;

@@ -2641,7 +2641,7 @@ static int cli_loadyara(FILE *fs, const char *dbname, struct cl_engine *engine,

     STAILQ_INIT(&compiler.current_rule_strings);

     //    cli_errmsg("Loading yara signatures\n");

-#if 0 /* for compilation */

+#if 1 /* for compilation */

     yr_lex_parse_rules_file(fs, &compiler);

 #endif

     while (!STAILQ_EMPTY(&compiler.rules)) {

@@ -41,20 +41,15 @@ limitations under the License.

 #define _YARA_CLAM_H_

 #include "shared/queue.h"

- 

-#define LEX_BUF_SIZE  1024

-#define EXTERNAL_VARIABLE_TYPE_NULL          0

-#define EXTERNAL_VARIABLE_TYPE_ANY           1

-#define EXTERNAL_VARIABLE_TYPE_INTEGER       2

-#define EXTERNAL_VARIABLE_TYPE_BOOLEAN       3

-#define EXTERNAL_VARIABLE_TYPE_FIXED_STRING  4

-#define EXTERNAL_VARIABLE_TYPE_MALLOC_STRING 5

-

-#define EXTERNAL_VARIABLE_IS_NULL(x) \

-    ((x) != NULL ? (x)->type == EXTERNAL_VARIABLE_TYPE_NULL : TRUE)

+/* From libyara/include/yara/types.h            */

+#define DECLARE_REFERENCE(type, name) \

+    union { type name; int64_t name##_; }

-#define STRING_TFLAGS_FOUND             0x01

+#define META_TYPE_NULL      0

+#define META_TYPE_INTEGER   1

+#define META_TYPE_STRING    2

+#define META_TYPE_BOOLEAN   3

 #define STRING_GFLAGS_REFERENCED        0x01

 #define STRING_GFLAGS_HEXADECIMAL       0x02

@@ -145,10 +140,43 @@ limitations under the License.

 #define RULE_MATCHES(x) \

     ((x)->t_flags[yr_get_tidx()] & RULE_TFLAGS_MATCH)

+#define EXTERNAL_VARIABLE_TYPE_NULL          0

+#define EXTERNAL_VARIABLE_TYPE_ANY           1

+#define EXTERNAL_VARIABLE_TYPE_INTEGER       2

+#define EXTERNAL_VARIABLE_TYPE_BOOLEAN       3

+#define EXTERNAL_VARIABLE_TYPE_FIXED_STRING  4

+#define EXTERNAL_VARIABLE_TYPE_MALLOC_STRING 5

-#define DECLARE_REFERENCE(type, name) \

-    union { type name; int64_t name##_; }

+#define EXTERNAL_VARIABLE_IS_NULL(x) \

+    ((x) != NULL ? (x)->type == EXTERNAL_VARIABLE_TYPE_NULL : TRUE)

+#define OBJECT_COMMON_FIELDS \

+    int8_t type; \

+    const char* identifier; \

+    void* data; \

+    struct _YR_OBJECT* parent;

+

+

+typedef struct _YR_OBJECT

+{

+  OBJECT_COMMON_FIELDS

+

+} YR_OBJECT;

+

+typedef struct _YR_OBJECT_FUNCTION

+{

+  OBJECT_COMMON_FIELDS

+

+  const char* arguments_fmt;

+

+  YR_OBJECT* return_obj;

+#if REAL_YARA

+  YR_MODULE_FUNC code;

+#endif

+

+} YR_OBJECT_FUNCTION;

+

+/* From libyara/include/yara/sizedstr.h            */

 #define SIZED_STRING_FLAGS_NO_CASE  1

 #define SIZED_STRING_FLAGS_DOT_ALL  2

@@ -216,6 +244,68 @@ typedef struct _SIZED_STRING

 #define RE_FLAGS_DOT_ALL                  0x80

 #define RE_FLAGS_NOT_AT_START            0x100

+/* From libyara/include/yara/exec.h            */

+

+#define UNDEFINED           0xFFFABADAFABADAFFLL

+#define IS_UNDEFINED(x)     ((x) == UNDEFINED)

+

+#define OP_HALT           255

+

+#define OP_AND            1

+#define OP_OR             2

+#define OP_XOR            3

+#define OP_NOT            4

+#define OP_LT             5

+#define OP_GT             6

+#define OP_LE             7

+#define OP_GE             8

+#define OP_EQ             9

+#define OP_NEQ            10

+#define OP_SZ_EQ          11

+#define OP_SZ_NEQ         12

+#define OP_SZ_TO_BOOL     13

+#define OP_ADD            14

+#define OP_SUB            15

+#define OP_MUL            16

+#define OP_DIV            17

+#define OP_MOD            18

+#define OP_NEG            19

+#define OP_SHL            20

+#define OP_SHR            21

+#define OP_PUSH           22

+#define OP_POP            23

+#define OP_CALL           24

+#define OP_OBJ_LOAD       25

+#define OP_OBJ_VALUE      26

+#define OP_OBJ_FIELD      27

+#define OP_INDEX_ARRAY    28

+#define OP_STR_COUNT      29

+#define OP_STR_FOUND      30

+#define OP_STR_FOUND_AT   31

+#define OP_STR_FOUND_IN   32

+#define OP_STR_OFFSET     33

+#define OP_OF             34

+#define OP_PUSH_RULE      35

+#define OP_MATCH_RULE     36

+#define OP_INCR_M         37

+#define OP_CLEAR_M        38

+#define OP_ADD_M          39

+#define OP_POP_M          40

+#define OP_PUSH_M         41

+#define OP_SWAPUNDEF      42

+#define OP_JNUNDEF        43

+#define OP_JLE            44

+#define OP_FILESIZE       45

+#define OP_ENTRYPOINT     46

+#define OP_INT8           47

+#define OP_INT16          48

+#define OP_INT32          49

+#define OP_UINT8          50

+#define OP_UINT16         51

+#define OP_UINT32         52

+#define OP_CONTAINS       53

+#define OP_MATCHES        54

+#define OP_IMPORT         55

 /*

 typedef struct _YR_MATCH

@@ -283,8 +373,7 @@ typedef struct _YR_EXTERNAL_VARIABLE

 } YR_EXTERNAL_VARIABLE;

-//from re.h:

-

+/* From libyara/include/yara/exec.h            */

 typedef struct RE RE;

 typedef struct RE_NODE RE_NODE;

@@ -324,14 +413,44 @@ struct RE {

   int error_code;

 };

-//misc

+/* From libyara/include/yara/compiler.h            */

+#define yr_compiler_set_error_extra_info(compiler, info) \

+    strlcpy( \

+        compiler->last_error_extra_info, \

+        info, \

+        sizeof(compiler->last_error_extra_info));

+

+/* From libyara/include/yara/limits.h            */

+#define MAX_COMPILER_ERROR_EXTRA_INFO   256

+#define MAX_FUNCTION_ARGS               128

+#define LOOP_LOCAL_VARS                      4

+#define LEX_BUF_SIZE                    1024

+

+

+/* From libyara/include/yara/object.h            */

+#define OBJECT_TYPE_INTEGER     1

+#define OBJECT_TYPE_STRING      2

+#define OBJECT_TYPE_STRUCTURE   3

+#define OBJECT_TYPE_ARRAY       4

+#define OBJECT_TYPE_FUNCTION    5

+#define OBJECT_TYPE_REGEXP      6

+

+/* From libyara/include/yara/utils.h */

+#define PTR_TO_UINT64(x)  ((uint64_t) (size_t) x)

+

+/* YARA to ClamAV function mappings */

 #define yr_strdup cli_strdup

 #define yr_malloc cli_malloc

 #define yr_free free

 #define xtoi cli_hex2num

 #define strlcpy cli_strlcpy

+#ifndef HAVE_STRLCAT

+/* below is danger-defeats the purpose of strlcat. we need a cli_strlcat for this ... */

+#define strlcat(d, s, l) strcat((d), (s))

+#endif

+/* YARA-defined structure replacements for ClamAV */

 struct _yc_rule {

     STAILQ_ENTRY(_yc_rule) link;

     STAILQ_HEAD(sq, _yc_string) strings;

@@ -349,12 +468,17 @@ typedef struct _yc_string {

 } yc_string;

 typedef struct _yc_compiler {

-  char                lex_buf[LEX_BUF_SIZE];

-  char*               lex_buf_ptr;

-  unsigned short      lex_buf_len;

-  int last_result;

-  STAILQ_HEAD(rq, _yc_rule) rules;

-  STAILQ_HEAD(cs, _yc_string) current_rule_strings;

+    char                lex_buf[LEX_BUF_SIZE];

+    char*               lex_buf_ptr;

+    unsigned short      lex_buf_len;

+    int                 last_result;

+    char                last_error_extra_info[MAX_COMPILER_ERROR_EXTRA_INFO];

+

+    int                 loop_depth;

+

+    char *              error_msg;   

+    STAILQ_HEAD(rq, _yc_rule) rules;

+    STAILQ_HEAD(cs, _yc_string) current_rule_strings;

 } yc_compiler;

 typedef yc_compiler YR_COMPILER;

@@ -82,7 +82,6 @@ limitations under the License.

       YYERROR; \

     } \

-

 #define CHECK_TYPE_WITH_CLEANUP(actual_type, expected_type, op, cleanup) \

     if (actual_type != expected_type) \

     { \

@@ -218,7 +217,7 @@ limitations under the License.

   int64_t         integer;

   YR_STRING*      string;

   YR_META*        meta;

-    //  YR_OBJECT*      object;

+  YR_OBJECT*      object;

 }

@@ -236,13 +235,11 @@ rules

 import

     : _IMPORT_ _TEXT_STRING_

       {

-#ifdef REAL_YARA

         int result = yr_parser_reduce_import(yyscanner, $2);

         yr_free($2);

         ERROR_IF(result != ERROR_SUCCESS);

-#endif

       }

     ;

@@ -290,10 +287,10 @@ meta

             sizeof(YR_META),

             NULL);

+#endif

         $$ = $3;

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

       }

     ;

@@ -301,8 +298,8 @@ meta

 strings

     : /* empty */

       {

-#ifdef REAL_YARA

         $$ = NULL;

+#ifdef REAL_YARA

         compiler->current_rule_strings = $$;

 #endif

       }

@@ -329,8 +326,8 @@ strings

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         compiler->current_rule_strings = $3;

-        $$ = $3;

 #endif

+        $$ = $3;

       }

     ;

@@ -355,9 +352,7 @@ rule_modifier

 tags

     : /* empty */

       {

-#ifdef REAL_YARA

         $$ = NULL;

-#endif

       }

     | ':' tag_list

       {

@@ -371,9 +366,9 @@ tags

             yyget_extra(yyscanner)->sz_arena, "", NULL);

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

+#endif

         $$ = $2;

-#endif

       }

     ;

@@ -387,10 +382,12 @@ tag_list

         compiler->last_result = yr_arena_write_string(

             yyget_extra(yyscanner)->sz_arena, $1, &identifier);

+#endif

         yr_free($1);

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

+#ifdef REAL_YARA

         $$ = identifier;

 #endif

       }

@@ -421,12 +418,12 @@ tag_list

           compiler->last_result = yr_arena_write_string(

               yyget_extra(yyscanner)->sz_arena, $2, NULL);

+#endif

         yr_free($2);

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = $1;

-#endif

       }

     ;

@@ -441,7 +438,6 @@ meta_declarations

 meta_declaration

     : _IDENTIFIER_ '=' _TEXT_STRING_

       {

-#ifdef REAL_YARA

         SIZED_STRING* sized_string = $3;

         $$ = yr_parser_reduce_meta_declaration(

@@ -455,11 +451,9 @@ meta_declaration

         yr_free($3);

         ERROR_IF($$ == NULL);

-#endif

       }

     | _IDENTIFIER_ '=' _NUMBER_

       {

-#ifdef REAL_YARA

         $$ = yr_parser_reduce_meta_declaration(

             yyscanner,

             META_TYPE_INTEGER,

@@ -470,11 +464,9 @@ meta_declaration

         yr_free($1);

         ERROR_IF($$ == NULL);

-#endif

       }

     | _IDENTIFIER_ '=' _TRUE_

       {

-#ifdef REAL_YARA

         $$ = yr_parser_reduce_meta_declaration(

             yyscanner,

             META_TYPE_BOOLEAN,

@@ -485,11 +477,9 @@ meta_declaration

         yr_free($1);

         ERROR_IF($$ == NULL);

-#endif

       }

     | _IDENTIFIER_ '=' _FALSE_

       {

-#ifdef REAL_YARA

         $$ = yr_parser_reduce_meta_declaration(

             yyscanner,

             META_TYPE_BOOLEAN,

@@ -500,7 +490,6 @@ meta_declaration

         yr_free($1);

         ERROR_IF($$ == NULL);

-#endif

       }

     ;

@@ -577,7 +566,7 @@ string_modifier

 identifier

     : _IDENTIFIER_

       {

-#ifdef REAL_YARA

+          //#ifdef REAL_YARA

         YR_OBJECT* object = NULL;

         YR_RULE* rule;

@@ -602,25 +591,28 @@ identifier

         {

           // Search for identifier within the global namespace, where the

           // externals variables reside.

-

+#if REAL_YARA

           object = (YR_OBJECT*) yr_hash_table_lookup(

                 compiler->objects_table,

                 $1,

                 NULL);

-

+#endif

           if (object == NULL)

           {

             // If not found, search within the current namespace.

+#if REAL_YARA

             ns = compiler->current_namespace->name;

             object = (YR_OBJECT*) yr_hash_table_lookup(

                 compiler->objects_table,

                 $1,

                 ns);

+#endif

           }

           if (object != NULL)

           {

+#if REAL_YARA

             compiler->last_result = yr_arena_write_string(

                 compiler->sz_arena,

                 $1,

@@ -632,12 +624,14 @@ identifier

                   OP_OBJ_LOAD,

                   PTR_TO_UINT64(id),

                   NULL);

+#endif

             $$ = object;

           }

           else

           {

-            rule = (YR_RULE*) yr_hash_table_lookup(

+ #if REAL_YARA

+           rule = (YR_RULE*) yr_hash_table_lookup(

                 compiler->rules_table,

                 $1,

                 compiler->current_namespace->name);

@@ -655,6 +649,7 @@ identifier

               yr_compiler_set_error_extra_info(compiler, $1);

               compiler->last_result = ERROR_UNDEFINED_IDENTIFIER;

             }

+#endif

             $$ = (YR_OBJECT*) -2;

           }

@@ -663,7 +658,7 @@ identifier

         yr_free($1);

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

+        //#endif

       }

     | identifier '.' _IDENTIFIER_

       {

@@ -784,13 +779,10 @@ identifier

 arguments_list

     : /* empty */

       {

-#ifdef REAL_YARA

         $$ = yr_strdup("");

-#endif

       }

     | expression

       {

-#ifdef REAL_YARA

         $$ = yr_malloc(MAX_FUNCTION_ARGS + 1);

         switch($1)

@@ -810,11 +802,9 @@ arguments_list

         }

         ERROR_IF($$ == NULL);

-#endif

       }

     | arguments_list ',' expression

       {

-#ifdef REAL_YARA

         if (strlen($1) == MAX_FUNCTION_ARGS)

         {

           compiler->last_result = ERROR_TOO_MANY_ARGUMENTS;

@@ -841,7 +831,6 @@ arguments_list

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = $1;

-#endif

       }

     ;

@@ -886,9 +875,9 @@ regexp

         yr_re_destroy(re);

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

+#endif

         $$ = EXPRESSION_TYPE_REGEXP;

-#endif

       }

     ;

@@ -896,7 +885,6 @@ regexp

 boolean_expression

     : expression

       {

-#ifdef REAL_YARA

         if ($1 == EXPRESSION_TYPE_STRING)

         {

           compiler->last_result = yr_parser_emit(

@@ -909,36 +897,30 @@ boolean_expression

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     ;

 expression

     : _TRUE_

       {

-#ifdef REAL_YARA

         compiler->last_result = yr_parser_emit_with_arg(

             yyscanner, OP_PUSH, 1, NULL);

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | _FALSE_

       {

-#ifdef REAL_YARA

         compiler->last_result = yr_parser_emit_with_arg(

             yyscanner, OP_PUSH, 0, NULL);

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _MATCHES_ regexp

       {

-#ifdef REAL_YARA

         CHECK_TYPE($1, EXPRESSION_TYPE_STRING, "matches");

         CHECK_TYPE($3, EXPRESSION_TYPE_REGEXP, "matches");

@@ -951,11 +933,9 @@ expression

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _CONTAINS_ primary_expression

       {

-#ifdef REAL_YARA

         CHECK_TYPE($1, EXPRESSION_TYPE_STRING, "contains");

         CHECK_TYPE($3, EXPRESSION_TYPE_STRING, "contains");

@@ -967,11 +947,9 @@ expression

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | _STRING_IDENTIFIER_

       {

-#ifdef REAL_YARA

         int result = yr_parser_reduce_string_identifier(

             yyscanner,

             $1,

@@ -982,11 +960,9 @@ expression

         ERROR_IF(result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | _STRING_IDENTIFIER_ _AT_ primary_expression

       {

-#ifdef REAL_YARA

         CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "at");

         compiler->last_result = yr_parser_reduce_string_identifier(

@@ -999,11 +975,9 @@ expression

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | _STRING_IDENTIFIER_ _IN_ range

       {

-#ifdef REAL_YARA

         compiler->last_result = yr_parser_reduce_string_identifier(

             yyscanner,

             $1,

@@ -1014,7 +988,6 @@ expression

         ERROR_IF(compiler->last_result!= ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | _FOR_ for_expression _IDENTIFIER_ _IN_

       {

@@ -1040,7 +1013,7 @@ expression

           compiler->last_result = \

               ERROR_DUPLICATE_LOOP_IDENTIFIER;

         }

-

+#endif

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         // Push end-of-list marker

@@ -1055,6 +1028,7 @@ expression

       integer_set ':'

       {

         int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;

+

         int8_t* addr;

         // Clear counter for number of expressions evaluating

@@ -1082,10 +1056,11 @@ expression

           yr_parser_emit_with_arg(

               yyscanner, OP_POP_M, mem_offset, NULL);

         }

-

+#ifdef REAL_YARA

         compiler->loop_address[compiler->loop_depth] = addr;

         compiler->loop_identifier[compiler->loop_depth] = $3;

         compiler->loop_depth++;

+#endif

       }

       '(' boolean_expression ')'

       {

@@ -1110,8 +1085,12 @@ expression

           yr_parser_emit_with_arg_reloc(

               yyscanner,

               OP_JNUNDEF,

+#ifdef REAL_YARA

               PTR_TO_UINT64(

                   compiler->loop_address[compiler->loop_depth]),

+#else

+              0,

+#endif

               NULL);

         }

         else // INTEGER_SET_RANGE

@@ -1128,6 +1107,7 @@ expression

           yr_parser_emit_with_arg(

               yyscanner, OP_PUSH_M, mem_offset + 3, NULL);

+#ifdef REAL_YARA

           // Compare higher bound with lower bound, do loop again

           // if lower bound is still lower or equal than higher bound

           yr_parser_emit_with_arg_reloc(

@@ -1136,6 +1116,7 @@ expression

               PTR_TO_UINT64(

                 compiler->loop_address[compiler->loop_depth]),

               NULL);

+#endif

           yr_parser_emit(yyscanner, OP_POP, NULL);

           yr_parser_emit(yyscanner, OP_POP, NULL);

@@ -1158,11 +1139,12 @@ expression

         yr_parser_emit(yyscanner, OP_LE, NULL);

+#ifdef REAL_YARA

         compiler->loop_identifier[compiler->loop_depth] = NULL;

+#endif

         yr_free($3);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | _FOR_ for_expression _OF_ string_set ':'

       {

@@ -1240,92 +1222,74 @@ expression

             yyscanner, OP_PUSH_M, mem_offset + 1, NULL);

         yr_parser_emit(yyscanner, OP_LE, NULL);

-

+#endif

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | for_expression _OF_ string_set

       {

-#ifdef REAL_YARA

         yr_parser_emit(yyscanner, OP_OF, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | _NOT_ boolean_expression

       {

-#ifdef REAL_YARA

         yr_parser_emit(yyscanner, OP_NOT, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | boolean_expression _AND_ boolean_expression

       {

-#ifdef REAL_YARA

         yr_parser_emit(yyscanner, OP_AND, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | boolean_expression _OR_ boolean_expression

       {

-#ifdef REAL_YARA

         CHECK_TYPE($1, EXPRESSION_TYPE_BOOLEAN, "or");

         yr_parser_emit(yyscanner, OP_OR, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _LT_ primary_expression

       {

-#ifdef REAL_YARA

         CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, "<");

         CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "<");

         yr_parser_emit(yyscanner, OP_LT, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _GT_ primary_expression

       {

-#ifdef REAL_YARA

         CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, ">");

         CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, ">");

         yr_parser_emit(yyscanner, OP_GT, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _LE_ primary_expression

       {

-#ifdef REAL_YARA

         CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, "<=");

         CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, "<=");

         yr_parser_emit(yyscanner, OP_LE, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _GE_ primary_expression

       {

-#ifdef REAL_YARA

         CHECK_TYPE($1, EXPRESSION_TYPE_INTEGER, ">=");

         CHECK_TYPE($3, EXPRESSION_TYPE_INTEGER, ">=");

         yr_parser_emit(yyscanner, OP_GE, NULL);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _EQ_ primary_expression

       {

-#ifdef REAL_YARA

         if ($1 != $3)

         {

           yr_compiler_set_error_extra_info(

@@ -1350,11 +1314,9 @@ expression

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _IS_ primary_expression

       {

-#ifdef REAL_YARA

         if ($1 != $3)

         {

           yr_compiler_set_error_extra_info(

@@ -1379,11 +1341,9 @@ expression

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression _NEQ_ primary_expression

       {

-#ifdef REAL_YARA

         if ($1 != $3)

         {

           yr_compiler_set_error_extra_info(

@@ -1408,19 +1368,14 @@ expression

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

         $$ = EXPRESSION_TYPE_BOOLEAN;

-#endif

       }

     | primary_expression

       {

-#ifdef REAL_YARA

         $$ = $1;

-#endif

       }

     |'(' expression ')'

       {

-#ifdef REAL_YARA

         $$ = $2;

-#endif

       }

     ;

@@ -1434,7 +1389,6 @@ integer_set

 range

     : '(' primary_expression '.' '.'  primary_expression ')'

       {

-#ifdef REAL_YARA

         if ($2 != EXPRESSION_TYPE_INTEGER)

         {

           yr_compiler_set_error_extra_info(

@@ -1450,7 +1404,6 @@ range

         }

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

       }

     ;

@@ -1458,7 +1411,6 @@ range

 integer_enumeration

     : primary_expression

       {

-#ifdef REAL_YARA

         if ($1 != EXPRESSION_TYPE_INTEGER)

         {

           yr_compiler_set_error_extra_info(

@@ -1468,11 +1420,9 @@ integer_enumeration

         }

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

       }

     | integer_enumeration ',' primary_expression

       {

-#ifdef REAL_YARA

         if ($3 != EXPRESSION_TYPE_INTEGER)

         {

           yr_compiler_set_error_extra_info(

@@ -1481,7 +1431,6 @@ integer_enumeration

         }

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

       }

     ;

@@ -1489,18 +1438,14 @@ integer_enumeration

 string_set

     : '('

       {

-#ifdef REAL_YARA

         // Push end-of-list marker

         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);

-#endif

       }

       string_enumeration ')'

     | _THEM_

       {

-#ifdef REAL_YARA

         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);

         yr_parser_emit_pushes_for_strings(yyscanner, "$*");

-#endif

       }

     ;

@@ -1514,17 +1459,13 @@ string_enumeration

 string_enumeration_item

     : _STRING_IDENTIFIER_

       {

-#ifdef REAL_YARA

         yr_parser_emit_pushes_for_strings(yyscanner, $1);