regenerate Bison parser for BPredicate with new Bison version

generated/bison_BPredicate.c

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.2.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.2"
+#define YYBISON_VERSION "2.7"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -62,7 +62,7 @@
 
 
 /* Copy the first part of user declarations.  */
-/* Line 336 of yacc.c  */
+/* Line 371 of yacc.c  */
 #line 34 "predicate/BPredicate.y"
 
 
@@ -251,7 +251,7 @@ fail:
 }
 
 
-/* Line 336 of yacc.c  */
+/* Line 371 of yacc.c  */
 #line 256 "generated//bison_BPredicate.c"
 
 # ifndef YY_NULL
@@ -272,8 +272,8 @@ fail:
 
 /* In a future release of Bison, this section will be replaced
    by #include "bison_BPredicate.h".  */
-#ifndef YY_GENERATED_BISON_BPREDICATE_H
-# define YY_GENERATED_BISON_BPREDICATE_H
+#ifndef YY_YY_GENERATED_BISON_BPREDICATE_H_INCLUDED
+# define YY_YY_GENERATED_BISON_BPREDICATE_H_INCLUDED
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -307,7 +307,7 @@ extern int yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 350 of yacc.c  */
+/* Line 387 of yacc.c  */
 #line 227 "predicate/BPredicate.y"
 
     char *text;
@@ -317,7 +317,7 @@ typedef union YYSTYPE
     struct arguments_arg arg_arg;
 
 
-/* Line 350 of yacc.c  */
+/* Line 387 of yacc.c  */
 #line 322 "generated//bison_BPredicate.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -353,11 +353,11 @@ int yyparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_GENERATED_BISON_BPREDICATE_H  */
+#endif /* !YY_YY_GENERATED_BISON_BPREDICATE_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-/* Line 353 of yacc.c  */
+/* Line 390 of yacc.c  */
 #line 362 "generated//bison_BPredicate.c"
 
 #ifdef short
@@ -411,24 +411,24 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
 /* Identity function, used to suppress warnings about constant conditions.  */
 #ifndef lint
-# define YYID(n) (n)
+# define YYID(N) (N)
 #else
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
@@ -747,10 +747,10 @@ static const yytype_uint8 yytable[] =
        0,     4,     5,    18,    19,     0,     0,    25
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-10))
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-10)))
 
-#define yytable_value_is_error(yytable_value) \
+#define yytable_value_is_error(Yytable_value) \
   YYID (0)
 
 static const yytype_int8 yycheck[] =
@@ -815,10 +815,11 @@ do                                                              \
     }								\
 while (YYID (0))
 
-
+/* Error token number */
 #define YYTERROR	1
 #define YYERRCODE	256
 
+
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
@@ -846,17 +847,52 @@ while (YYID (0))
 #define YYRHSLOC(Rhs, K) ((Rhs)[K])
 
 
-
 /* YY_LOCATION_PRINT -- Print the location on the stream.
    This macro was not mandated originally: define only if we know
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
 # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
+
+/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
+
+__attribute__((__unused__))
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static unsigned
+yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
+#else
+static unsigned
+yy_location_print_ (yyo, yylocp)
+    FILE *yyo;
+    YYLTYPE const * const yylocp;
+#endif
+{
+  unsigned res = 0;
+  int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
+  if (0 <= yylocp->first_line)
+    {
+      res += fprintf (yyo, "%d", yylocp->first_line);
+      if (0 <= yylocp->first_column)
+        res += fprintf (yyo, ".%d", yylocp->first_column);
+    }
+  if (0 <= yylocp->last_line)
+    {
+      if (yylocp->first_line < yylocp->last_line)
+        {
+          res += fprintf (yyo, "-%d", yylocp->last_line);
+          if (0 <= end_col)
+            res += fprintf (yyo, ".%d", end_col);
+        }
+      else if (0 <= end_col && yylocp->first_column < end_col)
+        res += fprintf (yyo, "-%d", end_col);
+    }
+  return res;
+ }
+
+#  define YY_LOCATION_PRINT(File, Loc)          \
+  yy_location_print_ (File, &(Loc))
+
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
@@ -864,7 +900,6 @@ while (YYID (0))
 
 
 /* YYLEX -- calling `yylex' with the right arguments.  */
-
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
 #else
@@ -933,7 +968,7 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner, result)
   switch (yytype)
     {
       default:
-	break;
+        break;
     }
 }
 
@@ -1183,7 +1218,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 {
   YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
   const char *yyformat = YY_NULL;
@@ -1246,11 +1280,13 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
               }
         }
     }
@@ -1270,10 +1306,12 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 # undef YYCASE_
     }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
   if (*yymsg_alloc < yysize)
     {
@@ -1338,123 +1376,123 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, scanner, result)
   switch (yytype)
     {
       case 3: /* STRING */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 240 "predicate/BPredicate.y"
-	{
+        {
     free(((*yyvaluep).text));
 };
-/* Line 1381 of yacc.c  */
-#line 1348 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1386 "generated//bison_BPredicate.c"
+        break;
       case 4: /* NAME */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 240 "predicate/BPredicate.y"
-	{
+        {
     free(((*yyvaluep).text));
 };
-/* Line 1381 of yacc.c  */
-#line 1357 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1395 "generated//bison_BPredicate.c"
+        break;
       case 17: /* predicate */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).node)) {
         free_predicate_node(((*yyvaluep).node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1368 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1406 "generated//bison_BPredicate.c"
+        break;
       case 18: /* constant */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).node)) {
         free_predicate_node(((*yyvaluep).node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1379 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1417 "generated//bison_BPredicate.c"
+        break;
       case 19: /* parentheses */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).node)) {
         free_predicate_node(((*yyvaluep).node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1390 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1428 "generated//bison_BPredicate.c"
+        break;
       case 20: /* neg */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).node)) {
         free_predicate_node(((*yyvaluep).node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1401 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1439 "generated//bison_BPredicate.c"
+        break;
       case 21: /* conjunct */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).node)) {
         free_predicate_node(((*yyvaluep).node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1412 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1450 "generated//bison_BPredicate.c"
+        break;
       case 22: /* disjunct */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).node)) {
         free_predicate_node(((*yyvaluep).node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1423 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1461 "generated//bison_BPredicate.c"
+        break;
       case 23: /* function */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).node)) {
         free_predicate_node(((*yyvaluep).node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1434 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1472 "generated//bison_BPredicate.c"
+        break;
       case 24: /* arguments */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 257 "predicate/BPredicate.y"
-	{
+        {
     if (((*yyvaluep).arg_node)) {
         free_arguments_node(((*yyvaluep).arg_node));
     }
 };
-/* Line 1381 of yacc.c  */
-#line 1445 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1483 "generated//bison_BPredicate.c"
+        break;
       case 25: /* argument */
-/* Line 1381 of yacc.c  */
+/* Line 1398 of yacc.c  */
 #line 264 "predicate/BPredicate.y"
-	{
+        {
     free_argument(((*yyvaluep).arg_arg));
 };
-/* Line 1381 of yacc.c  */
-#line 1454 "generated//bison_BPredicate.c"
-	break;
+/* Line 1398 of yacc.c  */
+#line 1492 "generated//bison_BPredicate.c"
+        break;
 
       default:
-	break;
+        break;
     }
 }
 
@@ -1491,11 +1529,40 @@ yyparse (scanner, result)
 /* The lookahead symbol.  */
 int yychar;
 
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+static YYSTYPE yyval_default;
+# define YY_INITIAL_VALUE(Value) = Value
+#endif
+static YYLTYPE yyloc_default
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
+  = { 1, 1, 1, 1 }
+# endif
+;
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
+YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 
 /* Location data for the lookahead symbol.  */
-YYLTYPE yylloc;
+YYLTYPE yylloc = yyloc_default;
+
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1535,7 +1602,7 @@ YYLTYPE yylloc;
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1554,10 +1621,9 @@ YYLTYPE yylloc;
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
-  yyls = yylsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yylsp = yyls = yylsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1566,20 +1632,7 @@ YYLTYPE yylloc;
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-  yylsp = yyls;
-
-#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-  /* Initialize the default location before parsing starts.  */
-  yylloc.first_line   = yylloc.last_line   = 1;
-  yylloc.first_column = yylloc.last_column = 1;
-#endif
+  yylsp[0] = yylloc;
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1725,7 +1778,9 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
   *++yylsp = yylloc;
   goto yynewstate;
 
@@ -1763,7 +1818,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 276 "predicate/BPredicate.y"
     {
         *result = (yyvsp[(1) - (1)].node);
@@ -1771,7 +1826,7 @@ yyreduce:
     break;
 
   case 9:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 284 "predicate/BPredicate.y"
     {
         (yyval.node) = make_constant(1);
@@ -1779,7 +1834,7 @@ yyreduce:
     break;
 
   case 10:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 288 "predicate/BPredicate.y"
     {
         (yyval.node) = make_constant(0);
@@ -1787,7 +1842,7 @@ yyreduce:
     break;
 
   case 11:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 294 "predicate/BPredicate.y"
     {
         (yyval.node) = (yyvsp[(2) - (3)].node);
@@ -1795,7 +1850,7 @@ yyreduce:
     break;
 
   case 12:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 300 "predicate/BPredicate.y"
     {
         (yyval.node) = make_negation((yyvsp[(2) - (2)].node));
@@ -1803,7 +1858,7 @@ yyreduce:
     break;
 
   case 13:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 306 "predicate/BPredicate.y"
     {
         (yyval.node) = make_conjunction((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
@@ -1811,7 +1866,7 @@ yyreduce:
     break;
 
   case 14:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 312 "predicate/BPredicate.y"
     {
         (yyval.node) = make_disjunction((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
@@ -1819,7 +1874,7 @@ yyreduce:
     break;
 
   case 15:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 318 "predicate/BPredicate.y"
     {
         (yyval.node) = make_function((yyvsp[(1) - (3)].text), NULL, 0);
@@ -1827,7 +1882,7 @@ yyreduce:
     break;
 
   case 16:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 322 "predicate/BPredicate.y"
     {
         (yyval.node) = make_function((yyvsp[(1) - (4)].text), (yyvsp[(3) - (4)].arg_node), 1);
@@ -1835,7 +1890,7 @@ yyreduce:
     break;
 
   case 17:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 328 "predicate/BPredicate.y"
     {
         (yyval.arg_node) = make_arguments((yyvsp[(1) - (1)].arg_arg), NULL, 0);
@@ -1843,7 +1898,7 @@ yyreduce:
     break;
 
   case 18:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 332 "predicate/BPredicate.y"
     {
         (yyval.arg_node) = make_arguments((yyvsp[(1) - (3)].arg_arg), (yyvsp[(3) - (3)].arg_node), 1);
@@ -1851,7 +1906,7 @@ yyreduce:
     break;
 
   case 19:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 338 "predicate/BPredicate.y"
     {
         (yyval.arg_arg) = make_argument_predicate((yyvsp[(1) - (1)].node));
@@ -1859,7 +1914,7 @@ yyreduce:
     break;
 
   case 20:
-/* Line 1787 of yacc.c  */
+/* Line 1792 of yacc.c  */
 #line 342 "predicate/BPredicate.y"
     {
         (yyval.arg_arg) = make_argument_string((yyvsp[(1) - (1)].text));
@@ -1867,8 +1922,8 @@ yyreduce:
     break;
 
 
-/* Line 1787 of yacc.c  */
-#line 1872 "generated//bison_BPredicate.c"
+/* Line 1792 of yacc.c  */
+#line 1927 "generated//bison_BPredicate.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2033,7 +2088,9 @@ yyerrlab1:
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   yyerror_range[2] = yylloc;
   /* Using YYLLOC is tempting, but would change the location of

generated/bison_BPredicate.h

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.2.  */
+/* A Bison parser, made by GNU Bison 2.7.  */
 
 /* Bison interface for Yacc-like parsers in C
    
@@ -30,8 +30,8 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_GENERATED_BISON_BPREDICATE_H
-# define YY_GENERATED_BISON_BPREDICATE_H
+#ifndef YY_YY_GENERATED_BISON_BPREDICATE_H_INCLUDED
+# define YY_YY_GENERATED_BISON_BPREDICATE_H_INCLUDED
 /* Enabling traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
@@ -65,7 +65,7 @@ extern int yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-/* Line 2049 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 227 "predicate/BPredicate.y"
 
     char *text;
@@ -75,7 +75,7 @@ typedef union YYSTYPE
     struct arguments_arg arg_arg;
 
 
-/* Line 2049 of yacc.c  */
+/* Line 2058 of yacc.c  */
 #line 80 "generated//bison_BPredicate.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
@@ -111,4 +111,4 @@ int yyparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_GENERATED_BISON_BPREDICATE_H  */
+#endif /* !YY_YY_GENERATED_BISON_BPREDICATE_H_INCLUDED  */