fix to update autogenerated files for machines that do not have bison installed. also eliminating warning in .y file at the same time by removing ifdef from yara_parser.h

libclamav/yara_grammar.h

@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.5. */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
-   
+
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -26,69 +26,79 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+#ifndef YY_YARA_YY_YARA_GRAMMAR_H_INCLUDED
+# define YY_YARA_YY_YARA_GRAMMAR_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int yara_yydebug;
+#endif
 
-/* Tokens.  */
+#include "yara_compiler.h"
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* 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,
-     _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
-   };
+  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,
+    _TRUE_ = 295,
+    _FALSE_ = 296,
+    _OR_ = 297,
+    _AND_ = 298,
+    _LT_ = 299,
+    _LE_ = 300,
+    _GT_ = 301,
+    _GE_ = 302,
+    _EQ_ = 303,
+    _NEQ_ = 304,
+    _IS_ = 305,
+    _SHIFT_LEFT_ = 306,
+    _SHIFT_RIGHT_ = 307,
+    _NOT_ = 308
+  };
 #endif
 /* Tokens.  */
 #define _RULE_ 258
@@ -132,26 +142,23 @@
 #define _FALSE_ 296
 #define _OR_ 297
 #define _AND_ 298
-#define _IS_ 299
-#define _NEQ_ 300
-#define _EQ_ 301
+#define _LT_ 299
+#define _LE_ 300
+#define _GT_ 301
 #define _GE_ 302
-#define _GT_ 303
-#define _LE_ 304
-#define _LT_ 305
-#define _SHIFT_RIGHT_ 306
-#define _SHIFT_LEFT_ 307
+#define _EQ_ 303
+#define _NEQ_ 304
+#define _IS_ 305
+#define _SHIFT_LEFT_ 306
+#define _SHIFT_RIGHT_ 307
 #define _NOT_ 308
 
-
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-{
 
-/* Line 2068 of yacc.c  */
-#line 214 "yara_grammar.y"
+union YYSTYPE
+{
+#line 214 "yara_grammar.y" /* yacc.c:1915  */
 
   SIZED_STRING*   sized_string;
   char*           c_string;
@@ -161,16 +168,16 @@ typedef union YYSTYPE
   YR_META*        meta;
   YR_OBJECT*      object;
 
+#line 170 "yara_grammar.h" /* yacc.c:1915  */
+};
 
-
-/* Line 2068 of yacc.c  */
-#line 168 "yara_grammar.h"
-} YYSTYPE;
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
+int yara_yyparse (void *yyscanner, YR_COMPILER* compiler);
 
+#endif /* !YY_YARA_YY_YARA_GRAMMAR_H_INCLUDED  */

libclamav/yara_parser.h

@@ -37,12 +37,10 @@ int yr_parser_emit_with_arg_reloc(
     int64_t argument,
     int8_t** instruction_address);
 
-#if REAL_YARA
 int yr_parser_check_types(
     YR_COMPILER* compiler,
     YR_OBJECT_FUNCTION* function,
     const char* actual_args_fmt);
-#endif
 
 YR_STRING* yr_parser_lookup_string(
   yyscan_t yyscanner,