On Mon, Dec 8, 2014 at 9:16 PM, Eric Covener <[email protected]> wrote:
> On Mon, Dec 8, 2014 at 3:12 PM, Yann Ylavic <[email protected]> wrote:
>> Reverted in r1643901.
>>
>> Someone with a bison version above 2.7.12-4996 should do this (mine is 2.5).
>
> Every system I try, it leaps from 2.4 to 3.0. Maybe best to just make
> the jump forward now?
FYI, just tried on an other system with bison-3.0.2 and flex-2.5.39
(they seem to work together on newer systems...).
The diff on generated C files (attached) is even bigger, and these
warnings threw during build :
[...]
flex -Pap_expr_yy -o
/home/yle/src/ap/svn/httpd/trunk/server/util_expr_scan.c
/home/yle/src/ap/svn/httpd/trunk/server/util_expr_scan.l
server/util_expr_scan.l|413| warning, -s option given but default rule
can be matched
[...]
server/util_expr_scan.c|2350 col 13| warning: 'yy_fatal_error' defined
but not used [-Wunused-function]
static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner)
^
That would probably need more work/review...
Index: server/util_expr_parse.c
===================================================================
--- server/util_expr_parse.c (revision 1643903)
+++ server/util_expr_parse.c (working copy)
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
+/* A Bison parser, made by GNU Bison 3.0.2. */
/* Bison implementation for Yacc-like parsers in C
-
- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-
+
+ Copyright (C) 1984, 1989-1990, 2000-2013 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,7 +26,7 @@
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. */
@@ -44,7 +44,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.7.12-4996"
+#define YYBISON_VERSION "3.0.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -63,25 +63,22 @@
#define yyparse ap_expr_yyparse
#define yylex ap_expr_yylex
#define yyerror ap_expr_yyerror
-#define yylval ap_expr_yylval
-#define yychar ap_expr_yychar
#define yydebug ap_expr_yydebug
#define yynerrs ap_expr_yynerrs
+
/* Copy the first part of user declarations. */
-/* Line 371 of yacc.c */
-#line 31 "util_expr_parse.y"
+#line 31 "util_expr_parse.y" /* yacc.c:339 */
#include "util_expr_private.h"
-/* Line 371 of yacc.c */
-#line 79 "util_expr_parse.c"
+#line 76 "util_expr_parse.c" /* yacc.c:339 */
-# ifndef YY_NULL
+# ifndef YY_NULLPTR
# if defined __cplusplus && 201103L <= __cplusplus
-# define YY_NULL nullptr
+# define YY_NULLPTR nullptr
# else
-# define YY_NULL 0
+# define YY_NULLPTR 0
# endif
# endif
@@ -97,7 +94,7 @@
by #include "util_expr_parse.h". */
#ifndef YY_AP_EXPR_YY_UTIL_EXPR_PARSE_H_INCLUDED
# define YY_AP_EXPR_YY_UTIL_EXPR_PARSE_H_INCLUDED
-/* Enabling traces. */
+/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
@@ -105,91 +102,75 @@
extern int ap_expr_yydebug;
#endif
-/* Tokens. */
+/* Token type. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- T_TRUE = 258,
- T_FALSE = 259,
- T_EXPR_BOOL = 260,
- T_EXPR_STRING = 261,
- T_ERROR = 262,
- T_DIGIT = 263,
- T_ID = 264,
- T_STRING = 265,
- T_REGEX = 266,
- T_REGEX_I = 267,
- T_REGEX_BACKREF = 268,
- T_OP_UNARY = 269,
- T_OP_BINARY = 270,
- T_STR_BEGIN = 271,
- T_STR_END = 272,
- T_VAR_BEGIN = 273,
- T_VAR_END = 274,
- T_OP_EQ = 275,
- T_OP_NE = 276,
- T_OP_LT = 277,
- T_OP_LE = 278,
- T_OP_GT = 279,
- T_OP_GE = 280,
- T_OP_REG = 281,
- T_OP_NRE = 282,
- T_OP_IN = 283,
- T_OP_STR_EQ = 284,
- T_OP_STR_NE = 285,
- T_OP_STR_LT = 286,
- T_OP_STR_LE = 287,
- T_OP_STR_GT = 288,
- T_OP_STR_GE = 289,
- T_OP_CONCAT = 290,
- T_OP_OR = 291,
- T_OP_AND = 292,
- T_OP_NOT = 293
- };
+ enum yytokentype
+ {
+ T_TRUE = 258,
+ T_FALSE = 259,
+ T_EXPR_BOOL = 260,
+ T_EXPR_STRING = 261,
+ T_ERROR = 262,
+ T_DIGIT = 263,
+ T_ID = 264,
+ T_STRING = 265,
+ T_REGEX = 266,
+ T_REGEX_I = 267,
+ T_REGEX_BACKREF = 268,
+ T_OP_UNARY = 269,
+ T_OP_BINARY = 270,
+ T_STR_BEGIN = 271,
+ T_STR_END = 272,
+ T_VAR_BEGIN = 273,
+ T_VAR_END = 274,
+ T_OP_EQ = 275,
+ T_OP_NE = 276,
+ T_OP_LT = 277,
+ T_OP_LE = 278,
+ T_OP_GT = 279,
+ T_OP_GE = 280,
+ T_OP_REG = 281,
+ T_OP_NRE = 282,
+ T_OP_IN = 283,
+ T_OP_STR_EQ = 284,
+ T_OP_STR_NE = 285,
+ T_OP_STR_LT = 286,
+ T_OP_STR_LE = 287,
+ T_OP_STR_GT = 288,
+ T_OP_STR_GE = 289,
+ T_OP_CONCAT = 290,
+ T_OP_OR = 291,
+ T_OP_AND = 292,
+ T_OP_NOT = 293
+ };
#endif
-
+/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
{
-/* Line 387 of yacc.c */
-#line 35 "util_expr_parse.y"
+#line 35 "util_expr_parse.y" /* yacc.c:355 */
char *cpVal;
ap_expr_t *exVal;
int num;
-
-/* Line 387 of yacc.c */
-#line 167 "util_expr_parse.c"
-} YYSTYPE;
+#line 161 "util_expr_parse.c" /* yacc.c:355 */
+};
# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int ap_expr_yyparse (void *YYPARSE_PARAM);
-#else
-int ap_expr_yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
+
int ap_expr_yyparse (ap_expr_parse_ctx_t *ctx);
-#else
-int ap_expr_yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
#endif /* !YY_AP_EXPR_YY_UTIL_EXPR_PARSE_H_INCLUDED */
/* Copy the second part of user declarations. */
-/* Line 390 of yacc.c */
-#line 102 "util_expr_parse.y"
+#line 102 "util_expr_parse.y" /* yacc.c:358 */
#include "util_expr_private.h"
#define yyscanner ctx->scanner
@@ -196,8 +177,7 @@ int ap_expr_yyparse (ap_expr_parse_ctx_t *ctx);
int ap_expr_yylex(YYSTYPE *lvalp, void *scanner);
-/* Line 390 of yacc.c */
-#line 201 "util_expr_parse.c"
+#line 181 "util_expr_parse.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -211,11 +191,8 @@ typedef unsigned char yytype_uint8;
#ifdef YYTYPE_INT8
typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+#else
typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
#endif
#ifdef YYTYPE_UINT16
@@ -235,8 +212,7 @@ typedef short int yytype_int16;
# define YYSIZE_T __SIZE_TYPE__
# elif defined size_t
# define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
@@ -258,14 +234,33 @@ typedef short int yytype_int16;
# endif
#endif
-#ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later. */
-# if (! defined __GNUC__ || __GNUC__ < 2 \
- || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
-# define __attribute__(Spec) /* empty */
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__ \
+ && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \
+ || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+# define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+# define YY_ATTRIBUTE(Spec) /* empty */
# endif
#endif
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+ && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+# define _Noreturn __declspec (noreturn)
+# else
+# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
# define YYUSE(E) ((void) (E))
@@ -273,25 +268,26 @@ typedef short int yytype_int16;
# define YYUSE(E) /* empty */
#endif
-
-/* Identity function, used to suppress warnings about constant conditions. */
-#ifndef lint
-# define YYID(N) (N)
+#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
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
- int yyi;
+# define YY_INITIAL_VALUE(Value) Value
#endif
-{
- return yyi;
-}
+#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
+
#if ! defined yyoverflow || YYERROR_VERBOSE
/* The parser invokes alloca or malloc; define the necessary symbols. */
@@ -309,8 +305,7 @@ typedef short int yytype_int16;
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ ||
defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
/* Use EXIT_SUCCESS as a witness for stdlib.h. */
# ifndef EXIT_SUCCESS
@@ -322,8 +317,8 @@ typedef short int yytype_int16;
# endif
# ifdef YYSTACK_ALLOC
- /* Pacify GCC's `empty if-body' warning. */
-# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+ /* Pacify GCC's 'empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
# ifndef YYSTACK_ALLOC_MAXIMUM
/* The OS might guarantee only one guard page at the bottom of the stack,
and a page size can be as small as 4096 bytes. So we cannot safely
@@ -339,7 +334,7 @@ typedef short int yytype_int16;
# endif
# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0
@@ -347,15 +342,13 @@ typedef short int yytype_int16;
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ ||
defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined malloc && ! defined EXIT_SUCCESS
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ ||
defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+# if ! defined free && ! defined EXIT_SUCCESS
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
@@ -365,7 +358,7 @@ void free (void *); /* INFRINGES ON USER NAME SPAC
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
@@ -390,16 +383,16 @@ union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
- do \
- {
\
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- }
\
- while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (0)
#endif
@@ -418,7 +411,7 @@ union yyalloc
for (yyi = 0; yyi < (Count); yyi++) \
(Dst)[yyi] = (Src)[yyi]; \
} \
- while (YYID (0))
+ while (0)
# endif
# endif
#endif /* !YYCOPY_NEEDED */
@@ -426,7 +419,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 28
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 129
+#define YYLAST 134
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 50
@@ -433,18 +426,20 @@ union yyalloc
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 14
/* YYNRULES -- Number of rules. */
-#define YYNRULES 53
-/* YYNRULES -- Number of states. */
-#define YYNSTATES 96
+#define YYNRULES 54
+/* YYNSTATES -- Number of states. */
+#define YYNSTATES 98
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+ by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 298
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, without out-of-bounds checking. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -480,42 +475,7 @@ static const yytype_uint8 yytranslate[] =
};
#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint8 yyprhs[] =
-{
- 0, 0, 3, 6, 9, 11, 13, 15, 18, 22,
- 26, 28, 31, 35, 39, 41, 45, 49, 53, 57,
- 61, 65, 69, 73, 77, 81, 85, 89, 93, 97,
- 101, 103, 107, 109, 113, 116, 118, 120, 122, 124,
- 126, 130, 136, 138, 142, 144, 146, 148, 152, 155,
- 157, 159, 161, 166
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int8 yyrhs[] =
-{
- 51, 0, -1, 5, 52, -1, 6, 56, -1, 7,
- -1, 3, -1, 4, -1, 38, 52, -1, 52, 36,
- 52, -1, 52, 37, 52, -1, 53, -1, 14, 59,
- -1, 59, 15, 59, -1, 44, 52, 45, -1, 7,
- -1, 59, 20, 59, -1, 59, 21, 59, -1, 59,
- 22, 59, -1, 59, 23, 59, -1, 59, 24, 59,
- -1, 59, 25, 59, -1, 59, 29, 59, -1, 59,
- 30, 59, -1, 59, 31, 59, -1, 59, 32, 59,
- -1, 59, 33, 59, -1, 59, 34, 59, -1, 59,
- 28, 54, -1, 59, 26, 60, -1, 59, 27, 60,
- -1, 62, -1, 46, 55, 47, -1, 59, -1, 55,
- 48, 59, -1, 56, 57, -1, 57, -1, 7, -1,
- 10, -1, 58, -1, 61, -1, 18, 9, 19, -1,
- 18, 9, 49, 56, 19, -1, 8, -1, 59, 35,
- 59, -1, 58, -1, 61, -1, 63, -1, 16, 56,
- 17, -1, 16, 17, -1, 11, -1, 12, -1, 13,
- -1, 9, 44, 59, 45, -1, 9, 44, 59, 45,
- -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
0, 112, 112, 113, 114, 117, 118, 119, 120, 121,
@@ -523,7 +483,7 @@ static const yytype_uint8 yyrline[] =
134, 135, 136, 137, 138, 139, 140, 141, 142, 143,
146, 147, 150, 151, 154, 155, 156, 159, 160, 161,
164, 165, 168, 169, 170, 171, 172, 173, 174, 177,
- 186, 197, 204, 207
+ 186, 197, 204, 207, 208
};
#endif
@@ -549,13 +509,13 @@ static const char *const yytname[] =
"\"listfunction\"", "\"stringpart\"", "\"variable\"", "\"rebackref\"",
"'('", "')'", "'{'", "'}'", "','", "':'", "$accept", "root", "expr",
"comparison", "wordlist", "words", "string", "strpart", "var", "word",
- "regex", "backref", "lstfunccall", "strfunccall", YY_NULL
+ "regex", "backref", "lstfunccall", "strfunccall", YY_NULLPTR
};
#endif
# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+ (internal) symbol number NUM (which must be that of a token). */
static const yytype_uint16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
@@ -566,31 +526,35 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1[] =
-{
- 0, 50, 51, 51, 51, 52, 52, 52, 52, 52,
- 52, 52, 52, 52, 52, 53, 53, 53, 53, 53,
- 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
- 54, 54, 55, 55, 56, 56, 56, 57, 57, 57,
- 58, 58, 59, 59, 59, 59, 59, 59, 59, 60,
- 60, 61, 62, 63
-};
+#define YYPACT_NINF -41
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+ (!!((Yystate) == (-41)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+ 0
+
+ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+static const yytype_int8 yypact[] =
{
- 0, 2, 2, 2, 1, 1, 1, 2, 3, 3,
- 1, 2, 3, 3, 1, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 1, 3, 1, 3, 2, 1, 1, 1, 1, 1,
- 3, 5, 1, 3, 1, 1, 1, 3, 2, 1,
- 1, 1, 4, 4
+ 22, 48, 60, -41, 16, -41, -41, -41, -41, -24,
+ -41, 102, 8, 32, 48, 48, -23, -41, -41, 74,
+ -41, -41, -41, -41, 50, -41, -41, -41, -41, 102,
+ -3, -41, 116, 23, -41, 87, 48, 48, 102, 102,
+ 102, 102, 102, 102, 102, 68, 68, -6, 102, 102,
+ 102, 102, 102, 102, 102, -41, -40, -28, -41, -41,
+ 60, -41, -23, 28, -3, -3, -3, -3, -3, -3,
+ -3, -41, -41, -41, -41, 30, 102, -41, -41, -3,
+ -3, -3, -3, -3, -3, -3, -41, 102, -41, 103,
+ 102, 36, -3, -3, -41, -26, -41, -41
};
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
- Performed when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
+ /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE does not specify something else to do. Zero
+ means the default is an error. */
static const yytype_uint8 yydefact[] =
{
0, 0, 0, 4, 0, 5, 6, 14, 42, 0,
@@ -598,90 +562,68 @@ static const yytype_uint8 yydefact[] =
45, 46, 36, 37, 3, 35, 38, 39, 1, 0,
11, 48, 0, 0, 7, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 34, 0, 47, 40, 0,
- 13, 8, 9, 12, 15, 16, 17, 18, 19, 20,
- 49, 50, 28, 29, 0, 0, 27, 30, 21, 22,
- 23, 24, 25, 26, 43, 53, 0, 0, 0, 32,
- 41, 0, 31, 0, 52, 33
+ 0, 0, 0, 0, 0, 34, 0, 32, 47, 40,
+ 0, 13, 8, 9, 12, 15, 16, 17, 18, 19,
+ 20, 49, 50, 28, 29, 0, 0, 27, 30, 21,
+ 22, 23, 24, 25, 26, 43, 54, 0, 53, 0,
+ 0, 0, 32, 33, 41, 0, 31, 52
};
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int8 yydefgoto[] =
+ /* YYPGOTO[NTERM-NUM]. */
+static const yytype_int8 yypgoto[] =
{
- -1, 4, 16, 17, 76, 88, 24, 25, 18, 19,
- 72, 20, 77, 21
+ -41, -41, 39, -41, -41, 1, -10, -20, -2, -5,
+ 35, -1, -41, -41
};
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -30
-static const yytype_int8 yypact[] =
+ /* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int8 yydefgoto[] =
{
- 2, 60, 7, -30, 13, -30, -30, -30, -30, -29,
- -30, 43, 73, 12, 60, 60, -8, -30, -30, 85,
- -30, -30, -30, -30, 79, -30, -30, -30, -30, 43,
- 25, -30, 111, -17, -30, 17, 60, 60, 43, 43,
- 43, 43, 43, 43, 43, 114, 114, -4, 43, 43,
- 43, 43, 43, 43, 43, -30, -19, -30, -30, 7,
- -30, -8, -10, 25, 25, 25, 25, 25, 25, 25,
- -30, -30, -30, -30, 31, 43, -30, -30, 25, 25,
- 25, 25, 25, 25, 25, -30, 83, 43, 24, 25,
- -30, 20, -30, 43, -30, 25
+ -1, 4, 16, 17, 77, 56, 24, 25, 18, 19,
+ 73, 20, 78, 21
};
-/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int8 yypgoto[] =
-{
- -30, -30, 4, -30, -30, -30, -9, -20, -2, -5,
- 33, -1, -30, -30
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -1
+ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule whose
+ number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_uint8 yytable[] =
{
- 26, 27, 58, 32, 55, 74, 30, 1, 2, 3,
- 26, 27, 55, 28, 22, 29, 54, 23, 34, 35,
- 10, 33, 26, 27, 56, 13, 85, 37, 36, 37,
- 26, 27, 59, 63, 64, 65, 66, 67, 68, 69,
- 61, 62, 75, 78, 79, 80, 81, 82, 83, 84,
- 86, 8, 9, 36, 37, 54, 10, 26, 27, 12,
- 54, 13, 60, 5, 6, 94, 55, 7, 8, 9,
- 89, 92, 93, 10, 11, 87, 12, 0, 13, 73,
- 22, 0, 91, 23, 26, 27, 10, 0, 95, 23,
- 31, 13, 10, 23, 0, 0, 10, 13, 14, 0,
- 38, 13, 90, 0, 15, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 23, 0, 0, 10, 70, 71, 0, 57, 13
+ 26, 27, 32, 75, 55, 86, 30, 54, 87, 54,
+ 26, 27, 55, 36, 37, 22, 28, 88, 23, 97,
+ 29, 10, 26, 27, 57, 31, 13, 1, 2, 3,
+ 26, 27, 54, 64, 65, 66, 67, 68, 69, 70,
+ 76, 33, 59, 79, 80, 81, 82, 83, 84, 85,
+ 89, 5, 6, 34, 35, 7, 8, 9, 26, 27,
+ 23, 10, 11, 10, 12, 37, 13, 22, 13, 55,
+ 23, 92, 60, 10, 90, 62, 63, 91, 13, 71,
+ 72, 74, 93, 96, 87, 95, 14, 26, 27, 38,
+ 0, 0, 15, 0, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 8, 9, 0, 23, 0, 10, 10, 0, 12, 0,
+ 13, 13, 94, 36, 37, 0, 23, 0, 0, 10,
+ 0, 0, 61, 58, 13
};
-#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-30)))
-
-#define yytable_value_is_error(Yytable_value) \
- YYID (0)
-
static const yytype_int8 yycheck[] =
{
- 2, 2, 19, 12, 24, 9, 11, 5, 6, 7,
- 12, 12, 32, 0, 7, 44, 35, 10, 14, 15,
- 13, 9, 24, 24, 29, 18, 45, 37, 36, 37,
- 32, 32, 49, 38, 39, 40, 41, 42, 43, 44,
- 36, 37, 46, 48, 49, 50, 51, 52, 53, 54,
- 59, 8, 9, 36, 37, 35, 13, 59, 59, 16,
- 35, 18, 45, 3, 4, 45, 86, 7, 8, 9,
- 75, 47, 48, 13, 14, 44, 16, -1, 18, 46,
- 7, -1, 87, 10, 86, 86, 13, -1, 93, 10,
- 17, 18, 13, 10, -1, -1, 13, 18, 38, -1,
- 15, 18, 19, -1, 44, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- 35, 10, -1, -1, 13, 11, 12, -1, 17, 18
+ 2, 2, 12, 9, 24, 45, 11, 35, 48, 35,
+ 12, 12, 32, 36, 37, 7, 0, 45, 10, 45,
+ 44, 13, 24, 24, 29, 17, 18, 5, 6, 7,
+ 32, 32, 35, 38, 39, 40, 41, 42, 43, 44,
+ 46, 9, 19, 48, 49, 50, 51, 52, 53, 54,
+ 60, 3, 4, 14, 15, 7, 8, 9, 60, 60,
+ 10, 13, 14, 13, 16, 37, 18, 7, 18, 89,
+ 10, 76, 49, 13, 44, 36, 37, 76, 18, 11,
+ 12, 46, 87, 47, 48, 90, 38, 89, 89, 15,
+ -1, -1, 44, -1, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+ 8, 9, -1, 10, -1, 13, 13, -1, 16, -1,
+ 18, 18, 19, 36, 37, -1, 10, -1, -1, 13,
+ -1, -1, 45, 17, 18
};
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
+ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
0, 5, 6, 7, 51, 3, 4, 7, 8, 9,
@@ -689,38 +631,46 @@ static const yytype_uint8 yystos[] =
61, 63, 7, 10, 56, 57, 58, 61, 0, 44,
59, 17, 56, 9, 52, 52, 36, 37, 15, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 57, 59, 17, 19, 49,
- 45, 52, 52, 59, 59, 59, 59, 59, 59, 59,
- 11, 12, 60, 60, 9, 46, 54, 62, 59, 59,
- 59, 59, 59, 59, 59, 45, 56, 44, 55, 59,
- 19, 59, 47, 48, 45, 59
+ 31, 32, 33, 34, 35, 57, 55, 59, 17, 19,
+ 49, 45, 52, 52, 59, 59, 59, 59, 59, 59,
+ 59, 11, 12, 60, 60, 9, 46, 54, 62, 59,
+ 59, 59, 59, 59, 59, 59, 45, 48, 45, 56,
+ 44, 55, 59, 59, 19, 59, 47, 45
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
+ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint8 yyr1[] =
+{
+ 0, 50, 51, 51, 51, 52, 52, 52, 52, 52,
+ 52, 52, 52, 52, 52, 53, 53, 53, 53, 53,
+ 53, 53, 53, 53, 53, 53, 53, 53, 53, 53,
+ 54, 54, 55, 55, 56, 56, 56, 57, 57, 57,
+ 58, 58, 59, 59, 59, 59, 59, 59, 59, 60,
+ 60, 61, 62, 63, 63
+};
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
+ /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
+static const yytype_uint8 yyr2[] =
+{
+ 0, 2, 2, 2, 1, 1, 1, 2, 3, 3,
+ 1, 2, 3, 3, 1, 3, 3, 3, 3, 3,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+ 1, 3, 1, 3, 2, 1, 1, 1, 1, 1,
+ 3, 5, 1, 3, 1, 1, 1, 3, 2, 1,
+ 1, 1, 4, 4, 4
+};
-/* Like YYERROR except do call yyerror. This remains here temporarily
- to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. However,
- YYFAIL appears to be in use. Nevertheless, it is formally deprecated
- in Bison 2.4.2's NEWS entry, where a plan to phase it out is
- discussed. */
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
-#define YYFAIL goto yyerrlab
-#if defined YYFAIL
- /* This is here to suppress warnings from the GCC cpp's
- -Wunused-macros. Normally we don't worry about that warning, but
- some users do, and we want to make it easy for users to remove
- YYFAIL uses, which will produce warnings from Bison 2.5. */
-#endif
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
+
#define YYRECOVERING() (!!yyerrstatus)
#define YYBACKUP(Token, Value) \
@@ -736,28 +686,16 @@ do
else \
{ \
yyerror (ctx, YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
-while (YYID (0))
+ YYERROR; \
+ } \
+while (0)
/* Error token number */
-#define YYTERROR 1
-#define YYERRCODE 256
+#define YYTERROR 1
+#define YYERRCODE 256
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-/* YYLEX -- calling `yylex' with the right arguments. */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval, yyscanner)
-#endif
-
/* Enable debugging if requested. */
#if YYDEBUG
@@ -766,52 +704,45 @@ do
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
-} while (YYID (0))
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
+} while (0)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title);
\
- yy_symbol_print (stderr, \
- Type, Value, ctx); \
- YYFPRINTF (stderr, "\n");
\
- } \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value, ctx); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (0)
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT. |
+`----------------------------------------*/
+
static void
yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const
yyvaluep, ap_expr_parse_ctx_t *ctx)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep, ctx)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
- ap_expr_parse_ctx_t *ctx;
-#endif
{
FILE *yyo = yyoutput;
YYUSE (yyo);
+ YYUSE (ctx);
if (!yyvaluep)
return;
- YYUSE (ctx);
# ifdef YYPRINT
if (yytype < YYNTOKENS)
YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
- YYUSE (yyoutput);
# endif
YYUSE (yytype);
}
@@ -821,23 +752,11 @@ yy_symbol_value_print (FILE *yyoutput, int yytype,
| Print this symbol on YYOUTPUT. |
`--------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep,
ap_expr_parse_ctx_t *ctx)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep, ctx)
- FILE *yyoutput;
- int yytype;
- YYSTYPE const * const yyvaluep;
- ap_expr_parse_ctx_t *ctx;
-#endif
{
- if (yytype < YYNTOKENS)
- YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
- else
- YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+ YYFPRINTF (yyoutput, "%s %s (",
+ yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
yy_symbol_value_print (yyoutput, yytype, yyvaluep, ctx);
YYFPRINTF (yyoutput, ")");
@@ -848,16 +767,8 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTY
| TOP (included). |
`------------------------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
- yytype_int16 *yybottom;
- yytype_int16 *yytop;
-#endif
{
YYFPRINTF (stderr, "Stack now");
for (; yybottom <= yytop; yybottom++)
@@ -868,11 +779,11 @@ yy_stack_print (yytype_int16 *yybottom, yytype_int
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
+} while (0)
/*------------------------------------------------.
@@ -879,39 +790,31 @@ yy_stack_print (yytype_int16 *yybottom, yytype_int
| Report that the YYRULE is going to be reduced. |
`------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule, ap_expr_parse_ctx_t *ctx)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule, ctx)
- YYSTYPE *yyvsp;
- int yyrule;
- ap_expr_parse_ctx_t *ctx;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule,
ap_expr_parse_ctx_t *ctx)
{
+ unsigned long int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
- unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
YYFPRINTF (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- , ctx);
+ yy_symbol_print (stderr,
+ yystos[yyssp[yyi + 1 - yynrhs]],
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ , ctx);
YYFPRINTF (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
- yy_reduce_print (yyvsp, Rule, ctx); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (yyssp, yyvsp, Rule, ctx); \
+} while (0)
/* Nonzero means print parse trace. It is left uninitialized so that
multiple parsers can coexist. */
@@ -925,7 +828,7 @@ int yydebug;
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
@@ -948,15 +851,8 @@ int yydebug;
# define yystrlen strlen
# else
/* Return the length of YYSTR. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static YYSIZE_T
yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
- const char *yystr;
-#endif
{
YYSIZE_T yylen;
for (yylen = 0; yystr[yylen]; yylen++)
@@ -972,16 +868,8 @@ yystrlen (const char *yystr)
# else
/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
YYDEST. */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static char *
yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
- char *yydest;
- const char *yysrc;
-#endif
{
char *yyd = yydest;
const char *yys = yysrc;
@@ -1011,27 +899,27 @@ yytnamerr (char *yyres, const char *yystr)
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
@@ -1054,11 +942,11 @@ static int
yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
yytype_int16 *yyssp, int yytoken)
{
- YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
+ YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
YYSIZE_T yysize = yysize0;
enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
/* Internationalized format string. */
- const char *yyformat = YY_NULL;
+ const char *yyformat = YY_NULLPTR;
/* Arguments of yyformat. */
char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
/* Number of reported tokens (one for the "unexpected", one per
@@ -1066,10 +954,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yyms
int yycount = 0;
/* There are many possibilities here to consider:
- - Assume YYFAIL is not used. It's too flawed to consider. See
- <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
- for details. YYERROR is fine as it does not invoke this
- function.
- If this state is a consistent state with a default action, then
the only way this function was invoked is if the default action
is an error action. In that case, don't check for expected
@@ -1119,7 +1003,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yyms
}
yyarg[yycount++] = yytname[yyx];
{
- YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL,
yytname[yyx]);
+ YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR,
yytname[yyx]);
if (! (yysize <= yysize1
&& yysize1 <= YYSTACK_ALLOC_MAXIMUM))
return 2;
@@ -1186,28 +1070,18 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yyms
| Release the memory associated to this symbol. |
`-----------------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
static void
yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep,
ap_expr_parse_ctx_t *ctx)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep, ctx)
- const char *yymsg;
- int yytype;
- YYSTYPE *yyvaluep;
- ap_expr_parse_ctx_t *ctx;
-#endif
{
YYUSE (yyvaluep);
YYUSE (ctx);
-
if (!yymsg)
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
YYUSE (yytype);
+ YY_IGNORE_MAYBE_UNINITIALIZED_END
}
@@ -1217,57 +1091,19 @@ yydestruct (const char *yymsg, int yytype, YYSTYPE
| yyparse. |
`----------*/
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
- void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
- || defined __cplusplus || defined _MSC_VER)
-int
yyparse (ap_expr_parse_ctx_t *ctx)
-#else
-int
-yyparse (ctx)
- ap_expr_parse_ctx_t *ctx;
-#endif
-#endif
{
/* 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
+/* The semantic value of the lookahead symbol. */
/* Default value used for initialization, for pacifying older GCCs
or non-GCC compilers. */
-static YYSTYPE yyval_default;
-# define YY_INITIAL_VALUE(Value) = Value
-#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
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
-/* The semantic value of the lookahead symbol. */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-
/* Number of syntax errors so far. */
int yynerrs;
@@ -1276,8 +1112,8 @@ int yychar;
int yyerrstatus;
/* The stacks and their tools:
- `yyss': related to states.
- `yyvs': related to semantic values.
+ 'yyss': related to states.
+ 'yyvs': related to semantic values.
Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
@@ -1345,23 +1181,23 @@ int yychar;
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
- &yystacksize);
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yystacksize);
- yyss = yyss1;
- yyvs = yyvs1;
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
@@ -1369,22 +1205,22 @@ int yychar;
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
@@ -1393,10 +1229,10 @@ int yychar;
yyvsp = yyvs + yysize - 1;
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1425,7 +1261,7 @@ yybackup:
if (yychar == YYEMPTY)
{
YYDPRINTF ((stderr, "Reading a token: "));
- yychar = YYLEX;
+ yychar = yylex (&yylval, yyscanner);
}
if (yychar <= YYEOF)
@@ -1490,7 +1326,7 @@ yyreduce:
yylen = yyr2[yyn];
/* If YYLEN is nonzero, implement the default value of the action:
- `$$ = $1'.
+ '$$ = $1'.
Otherwise, the following line sets YYVAL to garbage.
This behavior is undocumented and Bison
@@ -1504,293 +1340,292 @@ yyreduce:
switch (yyn)
{
case 2:
-/* Line 1787 of yacc.c */
-#line 112 "util_expr_parse.y"
- { ctx->expr = (yyvsp[(2) - (2)].exVal); }
+#line 112 "util_expr_parse.y" /* yacc.c:1646 */
+ { ctx->expr = (yyvsp[0].exVal); }
+#line 1346 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 3:
-/* Line 1787 of yacc.c */
-#line 113 "util_expr_parse.y"
- { ctx->expr = (yyvsp[(2) - (2)].exVal); }
+#line 113 "util_expr_parse.y" /* yacc.c:1646 */
+ { ctx->expr = (yyvsp[0].exVal); }
+#line 1352 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 4:
-/* Line 1787 of yacc.c */
-#line 114 "util_expr_parse.y"
+#line 114 "util_expr_parse.y" /* yacc.c:1646 */
{ YYABORT; }
+#line 1358 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 5:
-/* Line 1787 of yacc.c */
-#line 117 "util_expr_parse.y"
+#line 117 "util_expr_parse.y" /* yacc.c:1646 */
{ (yyval.exVal) = ap_expr_make(op_True, NULL, NULL, ctx); }
+#line 1364 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 6:
-/* Line 1787 of yacc.c */
-#line 118 "util_expr_parse.y"
+#line 118 "util_expr_parse.y" /* yacc.c:1646 */
{ (yyval.exVal) = ap_expr_make(op_False, NULL, NULL, ctx); }
+#line 1370 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 7:
-/* Line 1787 of yacc.c */
-#line 119 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_Not, (yyvsp[(2) - (2)].exVal),
NULL, ctx); }
+#line 119 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_Not, (yyvsp[0].exVal), NULL,
ctx); }
+#line 1376 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 8:
-/* Line 1787 of yacc.c */
-#line 120 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_Or, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 120 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_Or, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1382 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 9:
-/* Line 1787 of yacc.c */
-#line 121 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_And, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 121 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_And, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1388 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 10:
-/* Line 1787 of yacc.c */
-#line 122 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_Comp, (yyvsp[(1) - (1)].exVal),
NULL, ctx); }
+#line 122 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_Comp, (yyvsp[0].exVal), NULL,
ctx); }
+#line 1394 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 11:
-/* Line 1787 of yacc.c */
-#line 123 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_unary_op_make( (yyvsp[(1) - (2)].cpVal),
(yyvsp[(2) - (2)].exVal), ctx); }
+#line 123 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_unary_op_make( (yyvsp[-1].cpVal),
(yyvsp[0].exVal), ctx); }
+#line 1400 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 12:
-/* Line 1787 of yacc.c */
-#line 124 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_binary_op_make((yyvsp[(2) - (3)].cpVal),
(yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); }
+#line 124 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_binary_op_make((yyvsp[-1].cpVal),
(yyvsp[-2].exVal), (yyvsp[0].exVal), ctx); }
+#line 1406 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 13:
-/* Line 1787 of yacc.c */
-#line 125 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); }
+#line 125 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[-1].exVal); }
+#line 1412 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 14:
-/* Line 1787 of yacc.c */
-#line 126 "util_expr_parse.y"
+#line 126 "util_expr_parse.y" /* yacc.c:1646 */
{ YYABORT; }
+#line 1418 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 15:
-/* Line 1787 of yacc.c */
-#line 129 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_EQ, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 129 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_EQ, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1424 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 16:
-/* Line 1787 of yacc.c */
-#line 130 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_NE, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 130 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_NE, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1430 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 17:
-/* Line 1787 of yacc.c */
-#line 131 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_LT, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 131 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_LT, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1436 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 18:
-/* Line 1787 of yacc.c */
-#line 132 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_LE, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 132 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_LE, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1442 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 19:
-/* Line 1787 of yacc.c */
-#line 133 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_GT, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 133 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_GT, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1448 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 20:
-/* Line 1787 of yacc.c */
-#line 134 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_GE, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 134 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_GE, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1454 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 21:
-/* Line 1787 of yacc.c */
-#line 135 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_STR_EQ, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 135 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_STR_EQ, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1460 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 22:
-/* Line 1787 of yacc.c */
-#line 136 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_STR_NE, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 136 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_STR_NE, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1466 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 23:
-/* Line 1787 of yacc.c */
-#line 137 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_STR_LT, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 137 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_STR_LT, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1472 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 24:
-/* Line 1787 of yacc.c */
-#line 138 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_STR_LE, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 138 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_STR_LE, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1478 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 25:
-/* Line 1787 of yacc.c */
-#line 139 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_STR_GT, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 139 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_STR_GT, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1484 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 26:
-/* Line 1787 of yacc.c */
-#line 140 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_STR_GE, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 140 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_STR_GE, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1490 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 27:
-/* Line 1787 of yacc.c */
-#line 141 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_IN, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 141 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_IN, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1496 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 28:
-/* Line 1787 of yacc.c */
-#line 142 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_REG, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 142 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_REG, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1502 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 29:
-/* Line 1787 of yacc.c */
-#line 143 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_NRE, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 143 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_NRE, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1508 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 30:
-/* Line 1787 of yacc.c */
-#line 146 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); }
+#line 146 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[0].exVal); }
+#line 1514 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 31:
-/* Line 1787 of yacc.c */
-#line 147 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); }
+#line 147 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[-1].exVal); }
+#line 1520 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 32:
-/* Line 1787 of yacc.c */
-#line 150 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_ListElement, (yyvsp[(1) - (1)].exVal),
NULL, ctx); }
+#line 150 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_ListElement, (yyvsp[0].exVal), NULL,
ctx); }
+#line 1526 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 33:
-/* Line 1787 of yacc.c */
-#line 151 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_ListElement, (yyvsp[(3) - (3)].exVal),
(yyvsp[(1) - (3)].exVal), ctx); }
+#line 151 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_ListElement, (yyvsp[0].exVal),
(yyvsp[-2].exVal), ctx); }
+#line 1532 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 34:
-/* Line 1787 of yacc.c */
-#line 154 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[(1) - (2)].exVal),
(yyvsp[(2) - (2)].exVal), ctx); }
+#line 154 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[-1].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1538 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 35:
-/* Line 1787 of yacc.c */
-#line 155 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); }
+#line 155 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[0].exVal); }
+#line 1544 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 36:
-/* Line 1787 of yacc.c */
-#line 156 "util_expr_parse.y"
+#line 156 "util_expr_parse.y" /* yacc.c:1646 */
{ YYABORT; }
+#line 1550 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 37:
-/* Line 1787 of yacc.c */
-#line 159 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_String, (yyvsp[(1) - (1)].cpVal), NULL,
ctx); }
+#line 159 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_String, (yyvsp[0].cpVal), NULL, ctx); }
+#line 1556 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 38:
-/* Line 1787 of yacc.c */
-#line 160 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); }
+#line 160 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[0].exVal); }
+#line 1562 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 39:
-/* Line 1787 of yacc.c */
-#line 161 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); }
+#line 161 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[0].exVal); }
+#line 1568 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 40:
-/* Line 1787 of yacc.c */
-#line 164 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_var_make((yyvsp[(2) - (3)].cpVal), ctx); }
+#line 164 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_var_make((yyvsp[-1].cpVal), ctx); }
+#line 1574 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 41:
-/* Line 1787 of yacc.c */
-#line 165 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_str_func_make((yyvsp[(2) - (5)].cpVal),
(yyvsp[(4) - (5)].exVal), ctx); }
+#line 165 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_str_func_make((yyvsp[-3].cpVal),
(yyvsp[-1].exVal), ctx); }
+#line 1580 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 42:
-/* Line 1787 of yacc.c */
-#line 168 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_Digit, (yyvsp[(1) - (1)].cpVal), NULL,
ctx); }
+#line 168 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_Digit, (yyvsp[0].cpVal), NULL, ctx); }
+#line 1586 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 43:
-/* Line 1787 of yacc.c */
-#line 169 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[(1) - (3)].exVal),
(yyvsp[(3) - (3)].exVal), ctx); }
+#line 169 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[-2].exVal),
(yyvsp[0].exVal), ctx); }
+#line 1592 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 44:
-/* Line 1787 of yacc.c */
-#line 170 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); }
+#line 170 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[0].exVal); }
+#line 1598 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 45:
-/* Line 1787 of yacc.c */
-#line 171 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); }
+#line 171 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[0].exVal); }
+#line 1604 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 46:
-/* Line 1787 of yacc.c */
-#line 172 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); }
+#line 172 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[0].exVal); }
+#line 1610 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 47:
-/* Line 1787 of yacc.c */
-#line 173 "util_expr_parse.y"
- { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); }
+#line 173 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = (yyvsp[-1].exVal); }
+#line 1616 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 48:
-/* Line 1787 of yacc.c */
-#line 174 "util_expr_parse.y"
+#line 174 "util_expr_parse.y" /* yacc.c:1646 */
{ (yyval.exVal) = ap_expr_make(op_String, "", NULL, ctx); }
+#line 1622 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 49:
-/* Line 1787 of yacc.c */
-#line 177 "util_expr_parse.y"
+#line 177 "util_expr_parse.y" /* yacc.c:1646 */
{
ap_regex_t *regex;
- if ((regex = ap_pregcomp(ctx->pool, (yyvsp[(1) - (1)].cpVal),
+ if ((regex = ap_pregcomp(ctx->pool, (yyvsp[0].cpVal),
AP_REG_EXTENDED|AP_REG_NOSUB)) ==
NULL) {
ctx->error = "Failed to compile regular expression";
YYERROR;
@@ -1797,14 +1632,14 @@ yyreduce:
}
(yyval.exVal) = ap_expr_make(op_Regex, regex, NULL, ctx);
}
+#line 1636 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 50:
-/* Line 1787 of yacc.c */
-#line 186 "util_expr_parse.y"
+#line 186 "util_expr_parse.y" /* yacc.c:1646 */
{
ap_regex_t *regex;
- if ((regex = ap_pregcomp(ctx->pool, (yyvsp[(1) - (1)].cpVal),
+ if ((regex = ap_pregcomp(ctx->pool, (yyvsp[0].cpVal),
AP_REG_EXTENDED|AP_REG_NOSUB|AP_REG_ICASE)) == NULL) {
ctx->error = "Failed to compile regular expression";
YYERROR;
@@ -1811,33 +1646,39 @@ yyreduce:
}
(yyval.exVal) = ap_expr_make(op_Regex, regex, NULL, ctx);
}
+#line 1650 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 51:
-/* Line 1787 of yacc.c */
-#line 197 "util_expr_parse.y"
+#line 197 "util_expr_parse.y" /* yacc.c:1646 */
{
int *n = apr_palloc(ctx->pool, sizeof(int));
- *n = (yyvsp[(1) - (1)].num);
+ *n = (yyvsp[0].num);
(yyval.exVal) = ap_expr_make(op_RegexBackref, n, NULL, ctx);
}
+#line 1660 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 52:
-/* Line 1787 of yacc.c */
-#line 204 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_list_func_make((yyvsp[(1) - (4)].cpVal),
(yyvsp[(3) - (4)].exVal), ctx); }
+#line 204 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_list_func_make((yyvsp[-3].cpVal),
(yyvsp[-1].exVal), ctx); }
+#line 1666 "util_expr_parse.c" /* yacc.c:1646 */
break;
case 53:
-/* Line 1787 of yacc.c */
-#line 207 "util_expr_parse.y"
- { (yyval.exVal) = ap_expr_str_func_make((yyvsp[(1) - (4)].cpVal),
(yyvsp[(3) - (4)].exVal), ctx); }
+#line 207 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_str_func_make((yyvsp[-3].cpVal),
(yyvsp[-1].exVal), ctx); }
+#line 1672 "util_expr_parse.c" /* yacc.c:1646 */
break;
+ case 54:
+#line 208 "util_expr_parse.y" /* yacc.c:1646 */
+ { (yyval.exVal) = ap_expr_str_func_make((yyvsp[-3].cpVal),
(yyvsp[-1].exVal), ctx); }
+#line 1678 "util_expr_parse.c" /* yacc.c:1646 */
+ break;
-/* Line 1787 of yacc.c */
-#line 1841 "util_expr_parse.c"
+
+#line 1682 "util_expr_parse.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -1859,7 +1700,7 @@ yyreduce:
*++yyvsp = yyval;
- /* Now `shift' the result of the reduction. Determine what state
+ /* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
@@ -1874,9 +1715,9 @@ yyreduce:
goto yynewstate;
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error. |
+`--------------------------------------*/
yyerrlab:
/* Make sure we have latest lookahead translation. See comments at
user semantic actions for why this is necessary. */
@@ -1927,20 +1768,20 @@ yyerrlab:
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse lookahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval, ctx);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval, ctx);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse lookahead token after shifting the error
@@ -1959,7 +1800,7 @@ yyerrorlab:
if (/*CONSTCOND*/ 0)
goto yyerrorlab;
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
yylen = 0;
@@ -1972,29 +1813,29 @@ yyerrorlab:
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (!yypact_value_is_default (yyn))
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp, ctx);
+ yystos[yystate], yyvsp, ctx);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
@@ -2045,7 +1886,7 @@ yyreturn:
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval, ctx);
}
- /* Do not reclaim the symbols of the rule which action triggered
+ /* Do not reclaim the symbols of the rule whose action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
YY_STACK_PRINT (yyss, yyssp);
@@ -2052,7 +1893,7 @@ yyreturn:
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp, ctx);
+ yystos[*yyssp], yyvsp, ctx);
YYPOPSTACK (1);
}
#ifndef yyoverflow
@@ -2063,15 +1904,11 @@ yyreturn:
if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg);
#endif
- /* Make sure YYID is used. */
- return YYID (yyresult);
+ return yyresult;
}
+#line 211 "util_expr_parse.y" /* yacc.c:1906 */
-/* Line 2050 of yacc.c */
-#line 210 "util_expr_parse.y"
-
-
void yyerror(ap_expr_parse_ctx_t *ctx, const char *s)
{
/* s is allocated on the stack */
Index: server/util_expr_parse.h
===================================================================
--- server/util_expr_parse.h (revision 1643903)
+++ server/util_expr_parse.h (working copy)
@@ -1,19 +1,19 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996. */
+/* A Bison parser, made by GNU Bison 3.0.2. */
/* Bison interface for Yacc-like parsers in C
-
- Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
-
+
+ Copyright (C) 1984, 1989-1990, 2000-2013 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,13 +26,13 @@
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_AP_EXPR_YY_UTIL_EXPR_PARSE_H_INCLUDED
# define YY_AP_EXPR_YY_UTIL_EXPR_PARSE_H_INCLUDED
-/* Enabling traces. */
+/* Debug traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
@@ -40,84 +40,69 @@
extern int ap_expr_yydebug;
#endif
-/* Tokens. */
+/* Token type. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- T_TRUE = 258,
- T_FALSE = 259,
- T_EXPR_BOOL = 260,
- T_EXPR_STRING = 261,
- T_ERROR = 262,
- T_DIGIT = 263,
- T_ID = 264,
- T_STRING = 265,
- T_REGEX = 266,
- T_REGEX_I = 267,
- T_REGEX_BACKREF = 268,
- T_OP_UNARY = 269,
- T_OP_BINARY = 270,
- T_STR_BEGIN = 271,
- T_STR_END = 272,
- T_VAR_BEGIN = 273,
- T_VAR_END = 274,
- T_OP_EQ = 275,
- T_OP_NE = 276,
- T_OP_LT = 277,
- T_OP_LE = 278,
- T_OP_GT = 279,
- T_OP_GE = 280,
- T_OP_REG = 281,
- T_OP_NRE = 282,
- T_OP_IN = 283,
- T_OP_STR_EQ = 284,
- T_OP_STR_NE = 285,
- T_OP_STR_LT = 286,
- T_OP_STR_LE = 287,
- T_OP_STR_GT = 288,
- T_OP_STR_GE = 289,
- T_OP_CONCAT = 290,
- T_OP_OR = 291,
- T_OP_AND = 292,
- T_OP_NOT = 293
- };
+ enum yytokentype
+ {
+ T_TRUE = 258,
+ T_FALSE = 259,
+ T_EXPR_BOOL = 260,
+ T_EXPR_STRING = 261,
+ T_ERROR = 262,
+ T_DIGIT = 263,
+ T_ID = 264,
+ T_STRING = 265,
+ T_REGEX = 266,
+ T_REGEX_I = 267,
+ T_REGEX_BACKREF = 268,
+ T_OP_UNARY = 269,
+ T_OP_BINARY = 270,
+ T_STR_BEGIN = 271,
+ T_STR_END = 272,
+ T_VAR_BEGIN = 273,
+ T_VAR_END = 274,
+ T_OP_EQ = 275,
+ T_OP_NE = 276,
+ T_OP_LT = 277,
+ T_OP_LE = 278,
+ T_OP_GT = 279,
+ T_OP_GE = 280,
+ T_OP_REG = 281,
+ T_OP_NRE = 282,
+ T_OP_IN = 283,
+ T_OP_STR_EQ = 284,
+ T_OP_STR_NE = 285,
+ T_OP_STR_LT = 286,
+ T_OP_STR_LE = 287,
+ T_OP_STR_GT = 288,
+ T_OP_STR_GE = 289,
+ T_OP_CONCAT = 290,
+ T_OP_OR = 291,
+ T_OP_AND = 292,
+ T_OP_NOT = 293
+ };
#endif
-
+/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
+typedef union YYSTYPE YYSTYPE;
+union YYSTYPE
{
-/* Line 2053 of yacc.c */
-#line 35 "util_expr_parse.y"
+#line 35 "util_expr_parse.y" /* yacc.c:1909 */
char *cpVal;
ap_expr_t *exVal;
int num;
-
-/* Line 2053 of yacc.c */
-#line 102 "util_expr_parse.h"
-} YYSTYPE;
+#line 99 "util_expr_parse.h" /* yacc.c:1909 */
+};
# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
#endif
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int ap_expr_yyparse (void *YYPARSE_PARAM);
-#else
-int ap_expr_yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
+
int ap_expr_yyparse (ap_expr_parse_ctx_t *ctx);
-#else
-int ap_expr_yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
#endif /* !YY_AP_EXPR_YY_UTIL_EXPR_PARSE_H_INCLUDED */
Index: server/util_expr_scan.c
===================================================================
--- server/util_expr_scan.c (revision 1643903)
+++ server/util_expr_scan.c (working copy)
@@ -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 39
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -179,11 +179,17 @@ 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
#define YY_LESS_LINENO(n)
+ #define YY_LINENO_REWIND_TO(ptr)
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
@@ -201,11 +207,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 +224,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 +303,7 @@ static void ap_expr_yy_init_buffer (YY_BUFFER_STAT
YY_BUFFER_STATE ap_expr_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t
yyscanner );
YY_BUFFER_STATE ap_expr_yy_scan_string (yyconst char *yy_str ,yyscan_t
yyscanner );
-YY_BUFFER_STATE ap_expr_yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t
yyscanner );
+YY_BUFFER_STATE ap_expr_yy_scan_bytes (yyconst char *bytes,yy_size_t len
,yyscan_t yyscanner );
void *ap_expr_yyalloc (yy_size_t ,yyscan_t yyscanner );
void *ap_expr_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner );
@@ -334,7 +335,7 @@ void ap_expr_yyfree (void * ,yyscan_t yyscanner );
/* Begin user sect3 */
-#define ap_expr_yywrap(n) 1
+#define ap_expr_yywrap(yyscanner) 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -626,7 +627,7 @@ static yyconst flex_int16_t yy_chk[319] =
PERROR("String too long"); \
} while (0)
-#line 630 "util_expr_scan.c"
+#line 631 "util_expr_scan.c"
#define INITIAL 0
#define str 1
@@ -660,8 +661,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;
@@ -714,7 +715,7 @@ FILE *ap_expr_yyget_out (yyscan_t yyscanner );
void ap_expr_yyset_out (FILE * out_str ,yyscan_t yyscanner );
-int ap_expr_yyget_leng (yyscan_t yyscanner );
+yy_size_t ap_expr_yyget_leng (yyscan_t yyscanner );
char *ap_expr_yyget_text (yyscan_t yyscanner );
@@ -722,6 +723,10 @@ int ap_expr_yyget_lineno (yyscan_t yyscanner );
void ap_expr_yyset_lineno (int line_number ,yyscan_t yyscanner );
+int ap_expr_yyget_column (yyscan_t yyscanner );
+
+void ap_expr_yyset_column (int column_no ,yyscan_t yyscanner );
+
YYSTYPE * ap_expr_yyget_lval (yyscan_t yyscanner );
void ap_expr_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@@ -871,34 +876,6 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 93 "util_expr_scan.l"
-
-
- char regex_buf[MAX_STRING_LEN];
- char *regex_ptr = NULL;
- char regex_del = '\0';
-
-
- /*
- * Set initial state for string expressions
- */
- if (yyextra->at_start) {
- yyextra->at_start = 0;
- if (yyextra->flags & AP_EXPR_FLAG_STRING_RESULT) {
- BEGIN(str);
- return T_EXPR_STRING;
- }
- else {
- return T_EXPR_BOOL;
- }
- }
-
-
- /*
- * Whitespaces
- */
-#line 901 "util_expr_scan.c"
-
yylval = yylval_param;
if ( !yyg->yy_init )
@@ -927,6 +904,35 @@ YY_DECL
ap_expr_yy_load_buffer_state(yyscanner );
}
+ {
+#line 93 "util_expr_scan.l"
+
+
+ char regex_buf[MAX_STRING_LEN];
+ char *regex_ptr = NULL;
+ char regex_del = '\0';
+
+
+ /*
+ * Set initial state for string expressions
+ */
+ if (yyextra->at_start) {
+ yyextra->at_start = 0;
+ if (yyextra->flags & AP_EXPR_FLAG_STRING_RESULT) {
+ BEGIN(str);
+ return T_EXPR_STRING;
+ }
+ else {
+ return T_EXPR_BOOL;
+ }
+ }
+
+
+ /*
+ * Whitespaces
+ */
+#line 935 "util_expr_scan.c"
+
while ( 1 ) /* loops until end-of-file is reached */
{
yy_cp = yyg->yy_c_buf_p;
@@ -943,7 +949,7 @@ YY_DECL
yy_match:
do
{
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+ register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
if ( yy_accept[yy_current_state] )
{
yyg->yy_last_accepting_state = yy_current_state;
@@ -1534,7 +1540,7 @@ YY_RULE_SETUP
#line 413 "util_expr_scan.l"
YY_FATAL_ERROR( "flex scanner jammed" );
YY_BREAK
-#line 1538 "util_expr_scan.c"
+#line 1544 "util_expr_scan.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(regex):
yyterminate();
@@ -1667,6 +1673,7 @@ case YY_STATE_EOF(regex):
"fatal flex scanner internal error--no action found" );
} /* end of action switch */
} /* end of scanning one token */
+ } /* end of user's declarations */
} /* end of ap_expr_yylex */
/* yy_get_next_buffer - try to read in a new buffer
@@ -1723,7 +1730,7 @@ 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 )
@@ -1730,7 +1737,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
{ /* 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);
@@ -1737,7 +1744,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
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;
@@ -1768,7 +1775,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;
}
@@ -1865,6 +1872,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 == 123);
+ (void)yyg;
return yy_is_jam ? 0 : yy_current_state;
}
@@ -1893,7 +1901,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 ) )
@@ -2173,7 +2181,7 @@ void ap_expr_yypop_buffer_state (yyscan_t yyscanne
*/
static void ap_expr_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) {
@@ -2271,12 +2279,12 @@ YY_BUFFER_STATE ap_expr_yy_scan_string (yyconst ch
* @param yyscanner The scanner object.
* @return the newly allocated buffer state object.
*/
-YY_BUFFER_STATE ap_expr_yy_scan_bytes (yyconst char * yybytes, int
_yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE ap_expr_yy_scan_bytes (yyconst char * yybytes, yy_size_t
_yybytes_len , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
char *buf;
yy_size_t n;
- int i;
+ yy_size_t i;
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
@@ -2411,7 +2419,7 @@ FILE *ap_expr_yyget_out (yyscan_t yyscanner)
/** Get the length of the current token.
* @param yyscanner The scanner object.
*/
-int ap_expr_yyget_leng (yyscan_t yyscanner)
+yy_size_t ap_expr_yyget_leng (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
return yyleng;
@@ -2447,7 +2455,7 @@ void ap_expr_yyset_lineno (int line_number , yysc
/* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
- yy_fatal_error( "ap_expr_yyset_lineno called with no buffer" ,
yyscanner);
+ YY_FATAL_ERROR( "ap_expr_yyset_lineno called with no buffer" );
yylineno = line_number;
}
@@ -2676,7 +2684,7 @@ void ap_expr_yyfree (void * ptr , yyscan_t yyscann
#define YYTABLES_NAME "yytables"
-#line 413 "util_expr_scan.l"
+#line 412 "util_expr_scan.l"
