regenerate bison/flex stuff for BPredicate

generated/bison_BPredicate.c

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.  */
+/* A Bison parser, made by GNU Bison 2.6.2.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6"
+#define YYBISON_VERSION "2.6.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -62,7 +62,6 @@
 
 
 /* Copy the first part of user declarations.  */
-
 /* Line 336 of yacc.c  */
 #line 34 "predicate/BPredicate.y"
 
@@ -252,9 +251,8 @@ fail:
 }
 
 
-
 /* Line 336 of yacc.c  */
-#line 258 "generated//bison_BPredicate.c"
+#line 256 "generated//bison_BPredicate.c"
 
 # ifndef YY_NULL
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -309,7 +307,6 @@ extern int yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-
 /* Line 350 of yacc.c  */
 #line 227 "predicate/BPredicate.y"
 
@@ -320,9 +317,8 @@ typedef union YYSTYPE
     struct arguments_arg arg_arg;
 
 
-
 /* Line 350 of yacc.c  */
-#line 326 "generated//bison_BPredicate.c"
+#line 322 "generated//bison_BPredicate.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -361,9 +357,8 @@ int yyparse ();
 
 /* Copy the second part of user declarations.  */
 
-
 /* Line 353 of yacc.c  */
-#line 367 "generated//bison_BPredicate.c"
+#line 362 "generated//bison_BPredicate.c"
 
 #ifdef short
 # undef short
@@ -1342,142 +1337,120 @@ yydestruct (yymsg, yytype, yyvaluep, yylocationp, scanner, result)
 
   switch (yytype)
     {
-      case 3: /* "STRING" */
-
+      case 3: /* STRING */
 /* Line 1381 of yacc.c  */
 #line 240 "predicate/BPredicate.y"
 	{
-    free((yyvaluep->text));
+    free(((*yyvaluep).text));
 };
-
 /* Line 1381 of yacc.c  */
-#line 1355 "generated//bison_BPredicate.c"
+#line 1348 "generated//bison_BPredicate.c"
 	break;
-      case 4: /* "NAME" */
-
+      case 4: /* NAME */
 /* Line 1381 of yacc.c  */
 #line 240 "predicate/BPredicate.y"
 	{
-    free((yyvaluep->text));
+    free(((*yyvaluep).text));
 };
-
 /* Line 1381 of yacc.c  */
-#line 1366 "generated//bison_BPredicate.c"
+#line 1357 "generated//bison_BPredicate.c"
 	break;
-      case 17: /* "predicate" */
-
+      case 17: /* predicate */
 /* Line 1381 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->node)) {
-        free_predicate_node((yyvaluep->node));
+    if (((*yyvaluep).node)) {
+        free_predicate_node(((*yyvaluep).node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1379 "generated//bison_BPredicate.c"
+#line 1368 "generated//bison_BPredicate.c"
 	break;
-      case 18: /* "constant" */
-
+      case 18: /* constant */
 /* Line 1381 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->node)) {
-        free_predicate_node((yyvaluep->node));
+    if (((*yyvaluep).node)) {
+        free_predicate_node(((*yyvaluep).node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1392 "generated//bison_BPredicate.c"
+#line 1379 "generated//bison_BPredicate.c"
 	break;
-      case 19: /* "parentheses" */
-
+      case 19: /* parentheses */
 /* Line 1381 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->node)) {
-        free_predicate_node((yyvaluep->node));
+    if (((*yyvaluep).node)) {
+        free_predicate_node(((*yyvaluep).node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1405 "generated//bison_BPredicate.c"
+#line 1390 "generated//bison_BPredicate.c"
 	break;
-      case 20: /* "neg" */
-
+      case 20: /* neg */
 /* Line 1381 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->node)) {
-        free_predicate_node((yyvaluep->node));
+    if (((*yyvaluep).node)) {
+        free_predicate_node(((*yyvaluep).node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1418 "generated//bison_BPredicate.c"
+#line 1401 "generated//bison_BPredicate.c"
 	break;
-      case 21: /* "conjunct" */
-
+      case 21: /* conjunct */
 /* Line 1381 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->node)) {
-        free_predicate_node((yyvaluep->node));
+    if (((*yyvaluep).node)) {
+        free_predicate_node(((*yyvaluep).node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1431 "generated//bison_BPredicate.c"
+#line 1412 "generated//bison_BPredicate.c"
 	break;
-      case 22: /* "disjunct" */
-
+      case 22: /* disjunct */
 /* Line 1381 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->node)) {
-        free_predicate_node((yyvaluep->node));
+    if (((*yyvaluep).node)) {
+        free_predicate_node(((*yyvaluep).node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1444 "generated//bison_BPredicate.c"
+#line 1423 "generated//bison_BPredicate.c"
 	break;
-      case 23: /* "function" */
-
+      case 23: /* function */
 /* Line 1381 of yacc.c  */
 #line 250 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->node)) {
-        free_predicate_node((yyvaluep->node));
+    if (((*yyvaluep).node)) {
+        free_predicate_node(((*yyvaluep).node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1457 "generated//bison_BPredicate.c"
+#line 1434 "generated//bison_BPredicate.c"
 	break;
-      case 24: /* "arguments" */
-
+      case 24: /* arguments */
 /* Line 1381 of yacc.c  */
 #line 257 "predicate/BPredicate.y"
 	{
-    if ((yyvaluep->arg_node)) {
-        free_arguments_node((yyvaluep->arg_node));
+    if (((*yyvaluep).arg_node)) {
+        free_arguments_node(((*yyvaluep).arg_node));
     }
 };
-
 /* Line 1381 of yacc.c  */
-#line 1470 "generated//bison_BPredicate.c"
+#line 1445 "generated//bison_BPredicate.c"
 	break;
-      case 25: /* "argument" */
-
+      case 25: /* argument */
 /* Line 1381 of yacc.c  */
 #line 264 "predicate/BPredicate.y"
 	{
-    free_argument((yyvaluep->arg_arg));
+    free_argument(((*yyvaluep).arg_arg));
 };
-
 /* Line 1381 of yacc.c  */
-#line 1481 "generated//bison_BPredicate.c"
+#line 1454 "generated//bison_BPredicate.c"
 	break;
 
       default:
@@ -1607,7 +1580,6 @@ YYLTYPE yylloc;
   yylloc.first_line   = yylloc.last_line   = 1;
   yylloc.first_column = yylloc.last_column = 1;
 #endif
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1791,8 +1763,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 276 "predicate/BPredicate.y"
     {
         *result = (yyvsp[(1) - (1)].node);
@@ -1800,8 +1771,7 @@ yyreduce:
     break;
 
   case 9:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 284 "predicate/BPredicate.y"
     {
         (yyval.node) = make_constant(1);
@@ -1809,8 +1779,7 @@ yyreduce:
     break;
 
   case 10:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 288 "predicate/BPredicate.y"
     {
         (yyval.node) = make_constant(0);
@@ -1818,8 +1787,7 @@ yyreduce:
     break;
 
   case 11:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 294 "predicate/BPredicate.y"
     {
         (yyval.node) = (yyvsp[(2) - (3)].node);
@@ -1827,8 +1795,7 @@ yyreduce:
     break;
 
   case 12:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 300 "predicate/BPredicate.y"
     {
         (yyval.node) = make_negation((yyvsp[(2) - (2)].node));
@@ -1836,8 +1803,7 @@ yyreduce:
     break;
 
   case 13:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 306 "predicate/BPredicate.y"
     {
         (yyval.node) = make_conjunction((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
@@ -1845,8 +1811,7 @@ yyreduce:
     break;
 
   case 14:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 312 "predicate/BPredicate.y"
     {
         (yyval.node) = make_disjunction((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node));
@@ -1854,8 +1819,7 @@ yyreduce:
     break;
 
   case 15:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 318 "predicate/BPredicate.y"
     {
         (yyval.node) = make_function((yyvsp[(1) - (3)].text), NULL, 0);
@@ -1863,8 +1827,7 @@ yyreduce:
     break;
 
   case 16:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 322 "predicate/BPredicate.y"
     {
         (yyval.node) = make_function((yyvsp[(1) - (4)].text), (yyvsp[(3) - (4)].arg_node), 1);
@@ -1872,8 +1835,7 @@ yyreduce:
     break;
 
   case 17:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 328 "predicate/BPredicate.y"
     {
         (yyval.arg_node) = make_arguments((yyvsp[(1) - (1)].arg_arg), NULL, 0);
@@ -1881,8 +1843,7 @@ yyreduce:
     break;
 
   case 18:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 332 "predicate/BPredicate.y"
     {
         (yyval.arg_node) = make_arguments((yyvsp[(1) - (3)].arg_arg), (yyvsp[(3) - (3)].arg_node), 1);
@@ -1890,8 +1851,7 @@ yyreduce:
     break;
 
   case 19:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 338 "predicate/BPredicate.y"
     {
         (yyval.arg_arg) = make_argument_predicate((yyvsp[(1) - (1)].node));
@@ -1899,8 +1859,7 @@ yyreduce:
     break;
 
   case 20:
-
-/* Line 1788 of yacc.c  */
+/* Line 1787 of yacc.c  */
 #line 342 "predicate/BPredicate.y"
     {
         (yyval.arg_arg) = make_argument_string((yyvsp[(1) - (1)].text));
@@ -1908,9 +1867,8 @@ yyreduce:
     break;
 
 
-
-/* Line 1788 of yacc.c  */
-#line 1914 "generated//bison_BPredicate.c"
+/* Line 1787 of yacc.c  */
+#line 1872 "generated//bison_BPredicate.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2146,4 +2104,3 @@ yyreturn:
 }
 
 
-

generated/bison_BPredicate.h

@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 2.6.  */
+/* A Bison parser, made by GNU Bison 2.6.2.  */
 
 /* Bison interface for Yacc-like parsers in C
    
@@ -65,8 +65,7 @@ extern int yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
-
-/* Line 2050 of yacc.c  */
+/* Line 2049 of yacc.c  */
 #line 227 "predicate/BPredicate.y"
 
     char *text;
@@ -76,9 +75,8 @@ typedef union YYSTYPE
     struct arguments_arg arg_arg;
 
 
-
-/* Line 2050 of yacc.c  */
-#line 82 "generated//bison_BPredicate.h"
+/* Line 2049 of yacc.c  */
+#line 80 "generated//bison_BPredicate.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

generated/flex_BPredicate.c

@@ -9,7 +9,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -159,15 +159,7 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -179,6 +171,11 @@ typedef void* yyscan_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
@@ -201,11 +198,6 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -223,7 +215,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -302,7 +294,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner );
 
 YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
 YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
 
 void *yyalloc (yy_size_t ,yyscan_t yyscanner );
 void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -334,7 +326,7 @@ void yyfree (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define yywrap(n) 1
+#define yywrap(yyscanner) 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -507,7 +499,7 @@ static yyconst flex_int16_t yy_chk[70] =
     res = (bytes_read == 0 ? YY_NULL : bytes_read);
 
 #define YY_NO_UNISTD_H 1
-#line 511 "generated//flex_BPredicate.c"
+#line 503 "generated//flex_BPredicate.c"
 
 #define INITIAL 0
 
@@ -536,8 +528,8 @@ struct yyguts_t
     size_t yy_buffer_stack_max; /**< capacity of stack. */
     YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
     char yy_hold_char;
-    int yy_n_chars;
-    int yyleng_r;
+    yy_size_t yy_n_chars;
+    yy_size_t yyleng_r;
     char *yy_c_buf_p;
     int yy_init;
     int yy_start;
@@ -594,7 +586,7 @@ FILE *yyget_out (yyscan_t yyscanner );
 
 void yyset_out  (FILE * out_str ,yyscan_t yyscanner );
 
-int yyget_leng (yyscan_t yyscanner );
+yy_size_t yyget_leng (yyscan_t yyscanner );
 
 char *yyget_text (yyscan_t yyscanner );
 
@@ -602,6 +594,10 @@ int yyget_lineno (yyscan_t yyscanner );
 
 void yyset_lineno (int line_number ,yyscan_t yyscanner );
 
+int yyget_column  (yyscan_t yyscanner );
+
+void yyset_column (int column_no ,yyscan_t yyscanner );
+
 YYSTYPE * yyget_lval (yyscan_t yyscanner );
 
 void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -650,12 +646,7 @@ static int input (yyscan_t yyscanner );
     
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -761,7 +752,7 @@ YY_DECL
 
 #line 52 "predicate/BPredicate.l"
 
-#line 765 "generated//flex_BPredicate.c"
+#line 756 "generated//flex_BPredicate.c"
 
     yylval = yylval_param;
 
@@ -929,7 +920,7 @@ YY_RULE_SETUP
 #line 83 "predicate/BPredicate.l"
 ECHO;
 	YY_BREAK
-#line 933 "generated//flex_BPredicate.c"
+#line 924 "generated//flex_BPredicate.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1117,21 +1108,21 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
 			int yy_c_buf_p_offset =
 				(int) (yyg->yy_c_buf_p - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1162,7 +1153,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
+			yyg->yy_n_chars, num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
 		}
@@ -1259,6 +1250,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 33);
 
+	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
 }
 
@@ -1275,7 +1267,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yyg->yy_n_chars + 2;
+		register yy_size_t number_to_move = yyg->yy_n_chars + 2;
 		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
@@ -1325,7 +1317,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 		else
 			{ /* need more input */
-			int offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
+			yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
 			++yyg->yy_c_buf_p;
 
 			switch ( yy_get_next_buffer( yyscanner ) )
@@ -1605,7 +1597,7 @@ void yypop_buffer_state (yyscan_t yyscanner)
  */
 static void yyensure_buffer_stack (yyscan_t yyscanner)
 {
-	int num_to_alloc;
+	yy_size_t num_to_alloc;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
 	if (!yyg->yy_buffer_stack) {
@@ -1703,7 +1695,7 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner)
 {
 	YY_BUFFER_STATE b;
 	char *buf;
@@ -1858,7 +1850,7 @@ FILE *yyget_out  (yyscan_t yyscanner)
 /** Get the length of the current token.
  * @param yyscanner The scanner object.
  */
-int yyget_leng  (yyscan_t yyscanner)
+yy_size_t yyget_leng  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
     return yyleng;
@@ -1894,7 +1886,7 @@ void yyset_lineno (int  line_number , yyscan_t yyscanner)
 
         /* lineno is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); 
+           YY_FATAL_ERROR( "yyset_lineno called with no buffer" );
     
     yylineno = line_number;
 }
@@ -1909,7 +1901,7 @@ void yyset_column (int  column_no , yyscan_t yyscanner)
 
         /* column is only valid if an input buffer exists. */
         if (! YY_CURRENT_BUFFER )
-           yy_fatal_error( "yyset_column called with no buffer" , yyscanner); 
+           YY_FATAL_ERROR( "yyset_column called with no buffer" );
     
     yycolumn = column_no;
 }

generated/flex_BPredicate.h

@@ -13,7 +13,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -132,15 +132,7 @@ typedef void* yyscan_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif
 
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
@@ -170,7 +162,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -214,7 +206,7 @@ void yypop_buffer_state (yyscan_t yyscanner );
 
 YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner );
 YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner );
 
 void *yyalloc (yy_size_t ,yyscan_t yyscanner );
 void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -222,7 +214,7 @@ void yyfree (void * ,yyscan_t yyscanner );
 
 /* Begin user sect3 */
 
-#define yywrap(n) 1
+#define yywrap(yyscanner) 1
 #define YY_SKIP_YYWRAP
 
 #define yytext_ptr yytext_r
@@ -269,7 +261,7 @@ FILE *yyget_out (yyscan_t yyscanner );
 
 void yyset_out  (FILE * out_str ,yyscan_t yyscanner );
 
-int yyget_leng (yyscan_t yyscanner );
+yy_size_t yyget_leng (yyscan_t yyscanner );
 
 char *yyget_text (yyscan_t yyscanner );
 
@@ -277,6 +269,10 @@ int yyget_lineno (yyscan_t yyscanner );
 
 void yyset_lineno (int line_number ,yyscan_t yyscanner );
 
+int yyget_column  (yyscan_t yyscanner );
+
+void yyset_column (int column_no ,yyscan_t yyscanner );
+
 YYSTYPE * yyget_lval (yyscan_t yyscanner );
 
 void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -311,12 +307,7 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner);
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif
 
 /* Number of entries by which start-condition stack grows. */
@@ -354,6 +345,6 @@ extern int yylex \
 #line 83 "predicate/BPredicate.l"
 
 
-#line 358 "generated//flex_BPredicate.h"
+#line 349 "generated//flex_BPredicate.h"
 #undef yyIN_HEADER
 #endif /* yyHEADER_H */