@@ -3489,6 +3489,7 @@ static int load_oneyara(YR_RULE *rule, struct cl_engine *engine, unsigned int op

 static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo, unsigned int options, struct cli_dbio *dbio, const char *dbname)

 {

     YR_COMPILER compiler = {0};

+    YR_NAMESPACE ns;

     YR_RULE *rule;

     unsigned int sigs = 0, rules = 0;

     int rc;

@@ -3504,6 +3505,8 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

     rc = yr_hash_table_create(10007, &compiler.rules_table);

     if (rc == ERROR_SUCCESS)

+        rc = yr_hash_table_create(10007, &compiler.objects_table);

+    if (rc == ERROR_SUCCESS)

         rc = yr_arena_create(65536, 0, &compiler.sz_arena);

     if (rc == ERROR_SUCCESS)

         rc = yr_arena_create(65536, 0, &compiler.code_arena);

@@ -3511,7 +3514,9 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

         rc = yr_arena_create(65536, 0, &compiler.strings_arena);

     if (rc != ERROR_SUCCESS)

         return CL_EMEM;

-

+    compiler.loop_for_of_mem_offset = -1;

+    ns.name = "default";

+    compiler.current_namespace = &ns;

     rc = yr_lex_parse_rules_file(fs, &compiler);

     if (rc > 0) { /* rc = number of errors */

@@ -3519,6 +3524,7 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

         cli_errmsg("cli_loadyara: failed to parse rules file %s, error count %i\n", dbname, rc);

 #ifdef YARA_FINISHED

         yr_hash_table_destroy(compiler.rules_table, NULL);

+        yr_hash_table_destroy(compiler.objects_table, NULL);

         yr_arena_destroy(compiler.sz_arena);

         yr_arena_destroy(compiler.code_arena);

         yr_arena_destroy(compiler.strings_arena);

@@ -3544,6 +3550,7 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

     }

     yr_hash_table_destroy(compiler.rules_table, NULL);

+    yr_hash_table_destroy(compiler.objects_table, NULL);

     yr_arena_destroy(compiler.sz_arena);

     yr_arena_destroy(compiler.code_arena);

     yr_arena_destroy(compiler.strings_arena);

@@ -166,6 +166,13 @@ typedef struct _YR_OBJECT

 } YR_OBJECT;

+typedef struct _YR_OBJECT_ARRAY

+{

+  OBJECT_COMMON_FIELDS

+  struct _YR_ARRAY_ITEMS* items;

+

+} YR_OBJECT_ARRAY;

+

 typedef struct _YR_OBJECT_FUNCTION

 {

   OBJECT_COMMON_FIELDS

@@ -179,6 +186,13 @@ typedef struct _YR_OBJECT_FUNCTION

 } YR_OBJECT_FUNCTION;

+typedef struct _YR_ARRAY_ITEMS

+{

+  int count;

+  YR_OBJECT* objects[1];

+

+} YR_ARRAY_ITEMS;

+

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

 #define SIZED_STRING_FLAGS_NO_CASE  1

 #define SIZED_STRING_FLAGS_DOT_ALL  2

@@ -381,6 +395,12 @@ typedef struct _YR_EXTERNAL_VARIABLE

 } YR_EXTERNAL_VARIABLE;

+typedef struct _YR_NAMESPACE

+{

+

+  DECLARE_REFERENCE(char*, name);

+

+} YR_NAMESPACE;

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

 typedef struct RE RE;

@@ -496,7 +516,8 @@ typedef struct _yc_compiler {

     YR_ARENA*           strings_arena;

     YR_ARENA*           code_arena;

     YR_HASH_TABLE*      rules_table;

-

+    YR_HASH_TABLE*      objects_table;

+    YR_NAMESPACE*       current_namespace;

     yc_string*          current_rule_strings;

     uint32_t            current_rule_flags;

@@ -658,14 +658,14 @@ static const yytype_uint16 yyrline[] =

      270,   300,   304,   332,   337,   338,   343,   344,   350,   353,

      373,   390,   429,   430,   435,   451,   464,   477,   494,   495,

      500,   514,   513,   530,   547,   548,   553,   554,   555,   556,

-     561,   658,   709,   734,   776,   779,   801,   834,   881,   899,

-     908,   917,   932,   946,   959,   974,   988,  1022,   987,  1133,

-    1132,  1208,  1214,  1220,  1226,  1234,  1243,  1252,  1261,  1270,

-    1297,  1324,  1351,  1355,  1363,  1364,  1369,  1391,  1403,  1419,

-    1418,  1424,  1436,  1437,  1442,  1447,  1456,  1457,  1464,  1475,

-    1479,  1488,  1503,  1514,  1525,  1536,  1547,  1558,  1569,  1578,

-    1603,  1616,  1629,  1649,  1684,  1693,  1702,  1711,  1720,  1729,

-    1738,  1747,  1756,  1764,  1773,  1782

+     561,   646,   695,   718,   758,   761,   783,   816,   863,   881,

+     890,   899,   914,   928,   941,   956,   970,  1004,   969,  1115,

+    1114,  1190,  1196,  1202,  1208,  1216,  1225,  1234,  1243,  1252,

+    1279,  1306,  1333,  1337,  1345,  1346,  1351,  1373,  1385,  1401,

+    1400,  1406,  1418,  1419,  1424,  1429,  1438,  1439,  1446,  1457,

+    1461,  1470,  1485,  1496,  1507,  1518,  1529,  1540,  1551,  1560,

+    1585,  1598,  1611,  1631,  1666,  1675,  1684,  1693,  1702,  1711,

+    1720,  1729,  1738,  1746,  1755,  1764

 };

 #endif

@@ -2338,28 +2338,23 @@ yyreduce:

         {

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

           // externals variables reside.

-#if REAL_YARA //externals/objects/modules not supported

           object = (YR_OBJECT*) yr_hash_table_lookup(

                 compiler->objects_table,

                 (yyvsp[(1) - (1)].c_string),

                 NULL);

-#endif

           if (object == NULL)

           {

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

-#if REAL_YARA //externals/objects/modules not supported

             ns = compiler->current_namespace->name;

             object = (YR_OBJECT*) yr_hash_table_lookup(

                 compiler->objects_table,

                 (yyvsp[(1) - (1)].c_string),

                 ns);

-#endif

           }

           if (object != NULL)

           {

-#if REAL_YARA //externals/objects/modules not supported

             compiler->last_result = yr_arena_write_string(

                 compiler->sz_arena,

                 (yyvsp[(1) - (1)].c_string),

@@ -2371,21 +2366,15 @@ yyreduce:

                   OP_OBJ_LOAD,

                   PTR_TO_UINT64(id),

                   NULL);

-#endif

             (yyval.object) = object;

           }

           else

           {

-              //#if REAL_YARA

            rule = (YR_RULE*) yr_hash_table_lookup(

                 compiler->rules_table,

                 (yyvsp[(1) - (1)].c_string),

-#if REAL_YARA

                 compiler->current_namespace->name);

-#else

-                NULL);

-#endif

             if (rule != NULL)

             {

               compiler->last_result = yr_parser_emit_with_arg_reloc(

@@ -2399,7 +2388,6 @@ yyreduce:

               yr_compiler_set_error_extra_info(compiler, (yyvsp[(1) - (1)].c_string));

               compiler->last_result = ERROR_UNDEFINED_IDENTIFIER;

             }

-            //#endif

             (yyval.object) = (YR_OBJECT*) -2;

           }

@@ -2414,9 +2402,8 @@ yyreduce:

   case 41:

 /* Line 1806 of yacc.c  */

-#line 659 "yara_grammar.y"

+#line 647 "yara_grammar.y"

     {

-#ifdef REAL_YARA //externals/objects/modules not supported

         YR_OBJECT* object = (yyvsp[(1) - (3)].object);

         YR_OBJECT* field = NULL;

@@ -2463,16 +2450,14 @@ yyreduce:

         yr_free((yyvsp[(3) - (3)].c_string));

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

       }

     break;

   case 42:

 /* Line 1806 of yacc.c  */

-#line 710 "yara_grammar.y"

+#line 696 "yara_grammar.y"

     {

-#ifdef REAL_YARA //externals/objects/modules not supported

         if ((yyvsp[(1) - (4)].object) != NULL && (yyvsp[(1) - (4)].object)->type == OBJECT_TYPE_ARRAY)

         {

           compiler->last_result = yr_parser_emit(

@@ -2480,7 +2465,7 @@ yyreduce:

               OP_INDEX_ARRAY,

               NULL);

-X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->items->objects[0];

+          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->items->objects[0];

         }

         else

         {

@@ -2492,16 +2477,14 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

         }

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

       }

     break;

   case 43:

 /* Line 1806 of yacc.c  */

-#line 735 "yara_grammar.y"

+#line 719 "yara_grammar.y"

     {

-#ifdef REAL_YARA //externals/objects/modules not supported

         int args_count;

         if ((yyvsp[(1) - (4)].object) != NULL && (yyvsp[(1) - (4)].object)->type == OBJECT_TYPE_FUNCTION)

@@ -2534,14 +2517,13 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

         yr_free((yyvsp[(3) - (4)].c_string));

         ERROR_IF(compiler->last_result != ERROR_SUCCESS);

-#endif

       }

     break;

   case 44:

 /* Line 1806 of yacc.c  */

-#line 776 "yara_grammar.y"

+#line 758 "yara_grammar.y"

     {

         (yyval.c_string) = yr_strdup("");

       }

@@ -2550,7 +2532,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 45:

 /* Line 1806 of yacc.c  */

-#line 780 "yara_grammar.y"

+#line 762 "yara_grammar.y"

     {

         (yyval.c_string) = yr_malloc(MAX_FUNCTION_ARGS + 1);

@@ -2577,7 +2559,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 46:

 /* Line 1806 of yacc.c  */

-#line 802 "yara_grammar.y"

+#line 784 "yara_grammar.y"

     {

         if (strlen((yyvsp[(1) - (3)].c_string)) == MAX_FUNCTION_ARGS)

         {

@@ -2611,7 +2593,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 47:

 /* Line 1806 of yacc.c  */

-#line 835 "yara_grammar.y"

+#line 817 "yara_grammar.y"

     {

 #ifdef REAL_YARA

         SIZED_STRING* sized_string = (yyvsp[(1) - (1)].sized_string);

@@ -2659,7 +2641,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 48:

 /* Line 1806 of yacc.c  */

-#line 882 "yara_grammar.y"

+#line 864 "yara_grammar.y"

     {

         if ((yyvsp[(1) - (1)].expression_type) == EXPRESSION_TYPE_STRING)

         {

@@ -2679,7 +2661,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 49:

 /* Line 1806 of yacc.c  */

-#line 900 "yara_grammar.y"

+#line 882 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_emit_with_arg(

             yyscanner, OP_PUSH, 1, NULL);

@@ -2693,7 +2675,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 50:

 /* Line 1806 of yacc.c  */

-#line 909 "yara_grammar.y"

+#line 891 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_emit_with_arg(

             yyscanner, OP_PUSH, 0, NULL);

@@ -2707,7 +2689,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 51:

 /* Line 1806 of yacc.c  */

-#line 918 "yara_grammar.y"

+#line 900 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_STRING, "matches");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_REGEXP, "matches");

@@ -2727,7 +2709,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 52:

 /* Line 1806 of yacc.c  */

-#line 933 "yara_grammar.y"

+#line 915 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_STRING, "contains");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_STRING, "contains");

@@ -2746,7 +2728,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 53:

 /* Line 1806 of yacc.c  */

-#line 947 "yara_grammar.y"

+#line 929 "yara_grammar.y"

     {

         int result = yr_parser_reduce_string_identifier(

             yyscanner,

@@ -2764,7 +2746,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 54:

 /* Line 1806 of yacc.c  */

-#line 960 "yara_grammar.y"

+#line 942 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "at");

@@ -2784,7 +2766,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 55:

 /* Line 1806 of yacc.c  */

-#line 975 "yara_grammar.y"

+#line 957 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_reduce_string_identifier(

             yyscanner,

@@ -2802,7 +2784,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 56:

 /* Line 1806 of yacc.c  */

-#line 988 "yara_grammar.y"

+#line 970 "yara_grammar.y"

     {

         int var_index;

@@ -2841,7 +2823,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 57:

 /* Line 1806 of yacc.c  */

-#line 1022 "yara_grammar.y"

+#line 1004 "yara_grammar.y"

     {

         int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;

@@ -2881,7 +2863,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 58:

 /* Line 1806 of yacc.c  */

-#line 1057 "yara_grammar.y"

+#line 1039 "yara_grammar.y"

     {

         int mem_offset;

@@ -2962,7 +2944,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 59:

 /* Line 1806 of yacc.c  */

-#line 1133 "yara_grammar.y"

+#line 1115 "yara_grammar.y"

     {

         int mem_offset = LOOP_LOCAL_VARS * compiler->loop_depth;

         int8_t* addr;

@@ -2997,7 +2979,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 60:

 /* Line 1806 of yacc.c  */

-#line 1163 "yara_grammar.y"

+#line 1145 "yara_grammar.y"

     {

         int mem_offset;

@@ -3048,7 +3030,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 61:

 /* Line 1806 of yacc.c  */

-#line 1209 "yara_grammar.y"

+#line 1191 "yara_grammar.y"

     {

         yr_parser_emit(yyscanner, OP_OF, NULL);

@@ -3059,7 +3041,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 62:

 /* Line 1806 of yacc.c  */

-#line 1215 "yara_grammar.y"

+#line 1197 "yara_grammar.y"

     {

         yr_parser_emit(yyscanner, OP_NOT, NULL);

@@ -3070,7 +3052,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 63:

 /* Line 1806 of yacc.c  */

-#line 1221 "yara_grammar.y"

+#line 1203 "yara_grammar.y"

     {

         yr_parser_emit(yyscanner, OP_AND, NULL);

@@ -3081,7 +3063,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 64:

 /* Line 1806 of yacc.c  */

-#line 1227 "yara_grammar.y"

+#line 1209 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_BOOLEAN, "or");

@@ -3094,7 +3076,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 65:

 /* Line 1806 of yacc.c  */

-#line 1235 "yara_grammar.y"

+#line 1217 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<");

@@ -3108,7 +3090,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 66:

 /* Line 1806 of yacc.c  */

-#line 1244 "yara_grammar.y"

+#line 1226 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">");

@@ -3122,7 +3104,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 67:

 /* Line 1806 of yacc.c  */

-#line 1253 "yara_grammar.y"

+#line 1235 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<=");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<=");

@@ -3136,7 +3118,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 68:

 /* Line 1806 of yacc.c  */

-#line 1262 "yara_grammar.y"

+#line 1244 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">=");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">=");

@@ -3150,7 +3132,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 69:

 /* Line 1806 of yacc.c  */

-#line 1271 "yara_grammar.y"

+#line 1253 "yara_grammar.y"

     {

         if ((yyvsp[(1) - (3)].expression_type) != (yyvsp[(3) - (3)].expression_type))

         {

@@ -3182,7 +3164,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 70:

 /* Line 1806 of yacc.c  */

-#line 1298 "yara_grammar.y"

+#line 1280 "yara_grammar.y"

     {

         if ((yyvsp[(1) - (3)].expression_type) != (yyvsp[(3) - (3)].expression_type))

         {

@@ -3214,7 +3196,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 71:

 /* Line 1806 of yacc.c  */

-#line 1325 "yara_grammar.y"

+#line 1307 "yara_grammar.y"

     {

         if ((yyvsp[(1) - (3)].expression_type) != (yyvsp[(3) - (3)].expression_type))

         {

@@ -3246,7 +3228,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 72:

 /* Line 1806 of yacc.c  */

-#line 1352 "yara_grammar.y"

+#line 1334 "yara_grammar.y"

     {

         (yyval.expression_type) = (yyvsp[(1) - (1)].expression_type);

       }

@@ -3255,7 +3237,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 73:

 /* Line 1806 of yacc.c  */

-#line 1356 "yara_grammar.y"

+#line 1338 "yara_grammar.y"

     {

         (yyval.expression_type) = (yyvsp[(2) - (3)].expression_type);

       }

@@ -3264,21 +3246,21 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 74:

 /* Line 1806 of yacc.c  */

-#line 1363 "yara_grammar.y"

+#line 1345 "yara_grammar.y"

     { (yyval.integer) = INTEGER_SET_ENUMERATION; }

     break;

   case 75:

 /* Line 1806 of yacc.c  */

-#line 1364 "yara_grammar.y"

+#line 1346 "yara_grammar.y"

     { (yyval.integer) = INTEGER_SET_RANGE; }

     break;

   case 76:

 /* Line 1806 of yacc.c  */

-#line 1370 "yara_grammar.y"

+#line 1352 "yara_grammar.y"

     {

         if ((yyvsp[(2) - (6)].expression_type) != EXPRESSION_TYPE_INTEGER)

         {

@@ -3301,7 +3283,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 77:

 /* Line 1806 of yacc.c  */

-#line 1392 "yara_grammar.y"

+#line 1374 "yara_grammar.y"

     {

         if ((yyvsp[(1) - (1)].expression_type) != EXPRESSION_TYPE_INTEGER)

         {

@@ -3318,7 +3300,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 78:

 /* Line 1806 of yacc.c  */

-#line 1404 "yara_grammar.y"

+#line 1386 "yara_grammar.y"

     {

         if ((yyvsp[(3) - (3)].expression_type) != EXPRESSION_TYPE_INTEGER)

         {

@@ -3334,7 +3316,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 79:

 /* Line 1806 of yacc.c  */

-#line 1419 "yara_grammar.y"

+#line 1401 "yara_grammar.y"

     {

         // Push end-of-list marker

         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);

@@ -3344,7 +3326,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 81:

 /* Line 1806 of yacc.c  */

-#line 1425 "yara_grammar.y"

+#line 1407 "yara_grammar.y"

     {

         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);

         yr_parser_emit_pushes_for_strings(yyscanner, "$*");

@@ -3357,7 +3339,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 84:

 /* Line 1806 of yacc.c  */

-#line 1443 "yara_grammar.y"

+#line 1425 "yara_grammar.y"

     {

         yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[(1) - (1)].c_string));

         yr_free((yyvsp[(1) - (1)].c_string));

@@ -3367,7 +3349,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 85:

 /* Line 1806 of yacc.c  */

-#line 1448 "yara_grammar.y"

+#line 1430 "yara_grammar.y"

     {

         yr_parser_emit_pushes_for_strings(yyscanner, (yyvsp[(1) - (1)].c_string));

         yr_free((yyvsp[(1) - (1)].c_string));

@@ -3377,7 +3359,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 87:

 /* Line 1806 of yacc.c  */

-#line 1458 "yara_grammar.y"

+#line 1440 "yara_grammar.y"

     {

         yr_parser_emit_with_arg(yyscanner, OP_PUSH, UNDEFINED, NULL);

 #ifdef YARA_PROTO

@@ -3389,7 +3371,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 88:

 /* Line 1806 of yacc.c  */

-#line 1465 "yara_grammar.y"

+#line 1447 "yara_grammar.y"

     {

         yr_parser_emit_with_arg(yyscanner, OP_PUSH, 1, NULL);

 #ifdef YARA_PROTO

@@ -3401,7 +3383,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 89:

 /* Line 1806 of yacc.c  */

-#line 1476 "yara_grammar.y"

+#line 1458 "yara_grammar.y"

     {

         (yyval.expression_type) = (yyvsp[(2) - (3)].expression_type);

       }

@@ -3410,7 +3392,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 90:

 /* Line 1806 of yacc.c  */

-#line 1480 "yara_grammar.y"

+#line 1462 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_emit(

             yyscanner, OP_FILESIZE, NULL);

@@ -3424,7 +3406,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 91:

 /* Line 1806 of yacc.c  */

-#line 1489 "yara_grammar.y"

+#line 1471 "yara_grammar.y"

     {

 #ifndef YARA_PROTO

         yywarning(yyscanner,

@@ -3444,7 +3426,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 92:

 /* Line 1806 of yacc.c  */

-#line 1504 "yara_grammar.y"

+#line 1486 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "int8");

@@ -3460,7 +3442,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 93:

 /* Line 1806 of yacc.c  */

-#line 1515 "yara_grammar.y"

+#line 1497 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "int16");

@@ -3476,7 +3458,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 94:

 /* Line 1806 of yacc.c  */

-#line 1526 "yara_grammar.y"

+#line 1508 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "int32");

@@ -3492,7 +3474,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 95:

 /* Line 1806 of yacc.c  */

-#line 1537 "yara_grammar.y"

+#line 1519 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "uint8");

@@ -3508,7 +3490,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 96:

 /* Line 1806 of yacc.c  */

-#line 1548 "yara_grammar.y"

+#line 1530 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "uint16");

@@ -3524,7 +3506,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 97:

 /* Line 1806 of yacc.c  */

-#line 1559 "yara_grammar.y"

+#line 1541 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(3) - (4)].expression_type), EXPRESSION_TYPE_INTEGER, "uint32");

@@ -3540,7 +3522,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 98:

 /* Line 1806 of yacc.c  */

-#line 1570 "yara_grammar.y"

+#line 1552 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_emit_with_arg(

             yyscanner, OP_PUSH, (yyvsp[(1) - (1)].integer), NULL);

@@ -3554,7 +3536,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 99:

 /* Line 1806 of yacc.c  */

-#line 1579 "yara_grammar.y"

+#line 1561 "yara_grammar.y"

     {

         SIZED_STRING* sized_string = (yyvsp[(1) - (1)].sized_string);

         char* string;

@@ -3584,7 +3566,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 100:

 /* Line 1806 of yacc.c  */

-#line 1604 "yara_grammar.y"

+#line 1586 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_reduce_string_identifier(

             yyscanner,

@@ -3602,7 +3584,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 101:

 /* Line 1806 of yacc.c  */

-#line 1617 "yara_grammar.y"

+#line 1599 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_reduce_string_identifier(

             yyscanner,

@@ -3620,7 +3602,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 102:

 /* Line 1806 of yacc.c  */

-#line 1630 "yara_grammar.y"

+#line 1612 "yara_grammar.y"

     {

         compiler->last_result = yr_parser_emit_with_arg(

             yyscanner,

@@ -3645,7 +3627,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 103:

 /* Line 1806 of yacc.c  */

-#line 1650 "yara_grammar.y"

+#line 1632 "yara_grammar.y"

     {

         if ((yyvsp[(1) - (1)].object) == (YR_OBJECT*) -1)  // loop identifier

         {

@@ -3685,7 +3667,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 104:

 /* Line 1806 of yacc.c  */

-#line 1685 "yara_grammar.y"

+#line 1667 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "+");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "+");

@@ -3699,7 +3681,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 105:

 /* Line 1806 of yacc.c  */

-#line 1694 "yara_grammar.y"

+#line 1676 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "-");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "-");

@@ -3713,7 +3695,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 106:

 /* Line 1806 of yacc.c  */

-#line 1703 "yara_grammar.y"

+#line 1685 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "*");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "*");

@@ -3727,7 +3709,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 107:

 /* Line 1806 of yacc.c  */

-#line 1712 "yara_grammar.y"

+#line 1694 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "\\");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "\\");

@@ -3741,7 +3723,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 108:

 /* Line 1806 of yacc.c  */

-#line 1721 "yara_grammar.y"

+#line 1703 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "%");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "%");

@@ -3755,7 +3737,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 109:

 /* Line 1806 of yacc.c  */

-#line 1730 "yara_grammar.y"

+#line 1712 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");

@@ -3769,7 +3751,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 110:

 /* Line 1806 of yacc.c  */

-#line 1739 "yara_grammar.y"

+#line 1721 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "^");

@@ -3783,7 +3765,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 111:

 /* Line 1806 of yacc.c  */

-#line 1748 "yara_grammar.y"

+#line 1730 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "|");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "|");

@@ -3797,7 +3779,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 112:

 /* Line 1806 of yacc.c  */

-#line 1757 "yara_grammar.y"

+#line 1739 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(2) - (2)].expression_type), EXPRESSION_TYPE_INTEGER, "~");

@@ -3810,7 +3792,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 113:

 /* Line 1806 of yacc.c  */

-#line 1765 "yara_grammar.y"

+#line 1747 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<<");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, "<<");

@@ -3824,7 +3806,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 114:

 /* Line 1806 of yacc.c  */

-#line 1774 "yara_grammar.y"

+#line 1756 "yara_grammar.y"

     {

         CHECK_TYPE((yyvsp[(1) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">>");

         CHECK_TYPE((yyvsp[(3) - (3)].expression_type), EXPRESSION_TYPE_INTEGER, ">>");

@@ -3838,7 +3820,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

   case 115:

 /* Line 1806 of yacc.c  */

-#line 1783 "yara_grammar.y"

+#line 1765 "yara_grammar.y"

     {

         (yyval.expression_type) = (yyvsp[(1) - (1)].expression_type);

       }

@@ -3847,7 +3829,7 @@ X          (yyval.object) = ((YR_OBJECT_ARRAY*) (yyvsp[(1) - (4)].object))->item

 /* Line 1806 of yacc.c  */

-#line 3851 "yara_grammar.c"

+#line 3833 "yara_grammar.c"

       default: break;

     }

   /* User semantic actions sometimes alter yychar, and that requires

@@ -4078,6 +4060,6 @@ yyreturn:

 /* Line 2067 of yacc.c  */

-#line 1788 "yara_grammar.y"

+#line 1770 "yara_grammar.y"

@@ -584,28 +584,23 @@ identifier

         {

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

           // externals variables reside.

-#if REAL_YARA //externals/objects/modules not supported

           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 //externals/objects/modules not supported

             ns = compiler->current_namespace->name;

             object = (YR_OBJECT*) yr_hash_table_lookup(

                 compiler->objects_table,

                 $1,

                 ns);

-#endif

           }

           if (object != NULL)

           {

-#if REAL_YARA //externals/objects/modules not supported

             compiler->last_result = yr_arena_write_string(

                 compiler->sz_arena,

                 $1,

@@ -617,21 +612,15 @@ identifier

                   OP_OBJ_LOAD,

                   PTR_TO_UINT64(id),

                   NULL);

-#endif

             $$ = object;

           }

           else

           {

-              //#if REAL_YARA

            rule = (YR_RULE*) yr_hash_table_lookup(

                 compiler->rules_table,

                 $1,

-#if REAL_YARA

                 compiler->current_namespace->name);

-#else

-                NULL);

-#endif

             if (rule != NULL)