@@ -3516,12 +3516,14 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

     rc = yr_lex_parse_rules_file(fs, &compiler);

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

         /* TODO - handle the various errors? */

-        cli_errmsg("cli_loadyara: failed to parse rules file\n");

+        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_arena_destroy(compiler.sz_arena);

         yr_arena_destroy(compiler.code_arena);

         yr_arena_destroy(compiler.strings_arena);

         return CL_EMALFDB;

+#endif

     }

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

@@ -3534,7 +3536,7 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

         /* TODO - PUA and engine->ignored */

         rc = load_oneyara(rule, engine, options, &sigs);

         if (rc != CL_SUCCESS) {

-            cli_warnmsg("cli_loadyara: problem parsing yara rule %s\n", rule->id);

+            cli_warnmsg("cli_loadyara: problem parsing yara file %s, yara rule %s\n", dbname, rule->id);

 #ifdef YARA_FINISHED

             break;

 #endif

@@ -3037,6 +3037,7 @@ void yyerror(

   compiler->last_result = ERROR_SUCCESS;

 #else

+  compiler->errors++;

   if (error_message != NULL)

     cli_errmsg("yara_lexer:yyerror() %s\n", error_message);

   else if (compiler->error_msg != NULL)

@@ -3045,9 +3046,17 @@ void yyerror(

     cli_errmsg("yara_lexer:yyerror() %s\n", compiler->last_error_extra_info);

   else

     cli_errmsg("yara_lexer:yyerror() error unknown\n");

+  if (compiler->last_result != ERROR_SUCCESS)

+    cli_errmsg("yara_lexer:yyerror() last result is %i\n", compiler->last_result);

+  if (compiler->last_result != ERROR_SUCCESS)

+    cli_errmsg("yara_lexer:yyerror() last result is %i\n", compiler->last_result);

+  if (compiler->error_line != 0)

+    cli_errmsg("yara_lexer:yyerror() error line %i\n", compiler->error_line);

+

   compiler->last_error_extra_info[0] = (char) 0;

   compiler->error_msg = NULL;

   compiler->last_result = ERROR_SUCCESS;

+  compiler->error_line = 0;

 #endif

 }

@@ -3110,10 +3119,6 @@ int yr_lex_parse_rules_file(

   yyparse(yyscanner, compiler);

   yara_yylex_destroy(yyscanner);

-#ifdef REAL_YARA

   return compiler->errors;

-#else

-  return 0;

-#endif

 }

@@ -703,6 +703,7 @@ void yyerror(

   compiler->last_result = ERROR_SUCCESS;

 #else

+  compiler->errors++;

   if (error_message != NULL)

     cli_errmsg("yara_lexer:yyerror() %s\n", error_message);

   else if (compiler->error_msg != NULL)

@@ -711,9 +712,17 @@ void yyerror(

     cli_errmsg("yara_lexer:yyerror() %s\n", compiler->last_error_extra_info);

   else

     cli_errmsg("yara_lexer:yyerror() error unknown\n");

+  if (compiler->last_result != ERROR_SUCCESS)

+    cli_errmsg("yara_lexer:yyerror() last result is %i\n", compiler->last_result);

+  if (compiler->last_result != ERROR_SUCCESS)

+    cli_errmsg("yara_lexer:yyerror() last result is %i\n", compiler->last_result);

+  if (compiler->error_line != 0)

+    cli_errmsg("yara_lexer:yyerror() error line %i\n", compiler->error_line);

+

   compiler->last_error_extra_info[0] = (char) 0;

   compiler->error_msg = NULL;

   compiler->last_result = ERROR_SUCCESS;

+  compiler->error_line = 0;

 #endif

 }

@@ -776,9 +785,5 @@ int yr_lex_parse_rules_file(

   yyparse(yyscanner, compiler);

   yylex_destroy(yyscanner);

-#ifdef REAL_YARA

   return compiler->errors;

-#else

-  return 0;

-#endif

 }

@@ -199,7 +199,6 @@ int yr_parser_check_types(

   int i;

   char message[MAX_COMPILER_ERROR_EXTRA_INFO];

-#ifdef REAL_YARA

   const char* expected = function->arguments_fmt;

   const char* actual = actual_args_fmt;

@@ -243,9 +242,6 @@ int yr_parser_check_types(

   }

   return compiler->last_result;

-#else

-  return ERROR_SUCCESS;

-#endif

 }