From f6982bf4c582b32e0e88602b5b92e755ec505c03 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Mon, 10 Oct 2011 20:44:40 +0000 Subject: [PATCH] Update autogenerated code. Now generated with bison 2.5 instead of 2.4.1 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1181231 13f79535-47bb-0310-9956-ffa450edef68 --- server/util_expr_parse.c | 909 +++++++++++++++++++++------------------ server/util_expr_parse.h | 24 +- server/util_expr_scan.c | 50 +-- 3 files changed, 519 insertions(+), 464 deletions(-) diff --git a/server/util_expr_parse.c b/server/util_expr_parse.c index f5051e931d..80f47374e4 100644 --- a/server/util_expr_parse.c +++ b/server/util_expr_parse.c @@ -1,21 +1,19 @@ +/* A Bison parser, made by GNU Bison 2.5. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - +/* Bison implementation for Yacc-like parsers in C + + Copyright (C) 1984, 1989-1990, 2000-2011 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 . */ @@ -28,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. */ @@ -46,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.5" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -75,14 +73,14 @@ /* Copy the first part of user declarations. */ -/* Line 189 of yacc.c */ +/* Line 268 of yacc.c */ #line 31 "util_expr_parse.y" #include "util_expr_private.h" -/* Line 189 of yacc.c */ -#line 86 "util_expr_parse.c" +/* Line 268 of yacc.c */ +#line 84 "util_expr_parse.c" /* Enabling traces. */ #ifndef YYDEBUG @@ -154,7 +152,7 @@ typedef union YYSTYPE { -/* Line 214 of yacc.c */ +/* Line 293 of yacc.c */ #line 35 "util_expr_parse.y" char *cpVal; @@ -163,8 +161,8 @@ typedef union YYSTYPE -/* Line 214 of yacc.c */ -#line 168 "util_expr_parse.c" +/* Line 293 of yacc.c */ +#line 166 "util_expr_parse.c" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -174,7 +172,7 @@ typedef union YYSTYPE /* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ +/* Line 343 of yacc.c */ #line 102 "util_expr_parse.y" #include "util_expr_private.h" @@ -183,8 +181,8 @@ typedef union YYSTYPE int ap_expr_yylex(YYSTYPE *lvalp, void *scanner); -/* Line 264 of yacc.c */ -#line 188 "util_expr_parse.c" +/* Line 343 of yacc.c */ +#line 186 "util_expr_parse.c" #ifdef short # undef short @@ -234,7 +232,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -287,11 +285,11 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -314,24 +312,24 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif @@ -360,23 +358,7 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of @@ -396,19 +378,39 @@ union yyalloc #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 27 +#define YYFINAL 28 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 120 +#define YYLAST 128 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 45 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 14 /* YYNRULES -- Number of rules. */ -#define YYNRULES 52 +#define YYNRULES 53 /* YYNRULES -- Number of states. */ -#define YYNSTATES 95 +#define YYNSTATES 96 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -458,11 +460,11 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint8 yyprhs[] = { 0, 0, 3, 6, 9, 11, 13, 15, 18, 22, - 26, 28, 31, 35, 39, 43, 47, 51, 55, 59, - 63, 67, 71, 75, 79, 83, 87, 91, 95, 99, - 101, 105, 107, 111, 114, 116, 118, 120, 122, 124, - 128, 134, 136, 140, 142, 144, 146, 150, 153, 155, - 157, 159, 164 + 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. */ @@ -471,31 +473,32 @@ static const yytype_int8 yyrhs[] = 46, 0, -1, 5, 47, -1, 6, 51, -1, 7, -1, 3, -1, 4, -1, 38, 47, -1, 47, 36, 47, -1, 47, 37, 47, -1, 48, -1, 14, 54, - -1, 54, 15, 54, -1, 39, 47, 40, -1, 54, - 20, 54, -1, 54, 21, 54, -1, 54, 22, 54, - -1, 54, 23, 54, -1, 54, 24, 54, -1, 54, - 25, 54, -1, 54, 29, 54, -1, 54, 30, 54, - -1, 54, 31, 54, -1, 54, 32, 54, -1, 54, - 33, 54, -1, 54, 34, 54, -1, 54, 28, 49, - -1, 54, 26, 55, -1, 54, 27, 55, -1, 57, - -1, 41, 50, 42, -1, 54, -1, 50, 43, 54, - -1, 51, 52, -1, 52, -1, 7, -1, 10, -1, - 53, -1, 56, -1, 18, 9, 19, -1, 18, 9, - 44, 51, 19, -1, 8, -1, 54, 35, 54, -1, - 53, -1, 56, -1, 58, -1, 16, 51, 17, -1, - 16, 17, -1, 11, -1, 12, -1, 13, -1, 9, - 39, 54, 40, -1, 9, 39, 54, 40, -1 + -1, 54, 15, 54, -1, 39, 47, 40, -1, 7, + -1, 54, 20, 54, -1, 54, 21, 54, -1, 54, + 22, 54, -1, 54, 23, 54, -1, 54, 24, 54, + -1, 54, 25, 54, -1, 54, 29, 54, -1, 54, + 30, 54, -1, 54, 31, 54, -1, 54, 32, 54, + -1, 54, 33, 54, -1, 54, 34, 54, -1, 54, + 28, 49, -1, 54, 26, 55, -1, 54, 27, 55, + -1, 57, -1, 41, 50, 42, -1, 54, -1, 50, + 43, 54, -1, 51, 52, -1, 52, -1, 7, -1, + 10, -1, 53, -1, 56, -1, 18, 9, 19, -1, + 18, 9, 44, 51, 19, -1, 8, -1, 54, 35, + 54, -1, 53, -1, 56, -1, 58, -1, 16, 51, + 17, -1, 16, 17, -1, 11, -1, 12, -1, 13, + -1, 9, 39, 54, 40, -1, 9, 39, 54, 40, + -1 }; /* 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, - 122, 123, 124, 125, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 145, - 146, 149, 150, 153, 154, 155, 158, 159, 160, 163, - 164, 167, 168, 169, 170, 171, 172, 173, 176, 185, - 196, 203, 206 + 122, 123, 124, 125, 126, 129, 130, 131, 132, 133, + 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 }; #endif @@ -535,125 +538,130 @@ static const yytype_uint16 yytoknum[] = static const yytype_uint8 yyr1[] = { 0, 45, 46, 46, 46, 47, 47, 47, 47, 47, - 47, 47, 47, 47, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 48, 48, 49, - 49, 50, 50, 51, 51, 51, 52, 52, 52, 53, - 53, 54, 54, 54, 54, 54, 54, 54, 55, 55, - 56, 57, 58 + 47, 47, 47, 47, 47, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, + 49, 49, 50, 50, 51, 51, 51, 52, 52, 52, + 53, 53, 54, 54, 54, 54, 54, 54, 54, 55, + 55, 56, 57, 58 }; /* YYR2[YYN] -- Number of symbols composing 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, 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 + 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 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero +/* 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. */ static const yytype_uint8 yydefact[] = { - 0, 0, 0, 4, 0, 5, 6, 41, 0, 50, - 0, 0, 0, 0, 0, 2, 10, 43, 0, 44, - 45, 35, 36, 3, 34, 37, 38, 1, 0, 11, - 47, 0, 0, 7, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 4, 0, 5, 6, 14, 42, 0, + 51, 0, 0, 0, 0, 0, 2, 10, 44, 0, + 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, 33, 0, 46, 39, 0, 13, - 8, 9, 12, 14, 15, 16, 17, 18, 19, 48, - 49, 27, 28, 0, 0, 26, 29, 20, 21, 22, - 23, 24, 25, 42, 52, 0, 0, 0, 31, 40, - 0, 30, 0, 51, 32 + 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 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 4, 15, 16, 75, 87, 23, 24, 17, 18, - 71, 19, 76, 20 + -1, 4, 16, 17, 76, 88, 24, 25, 18, 19, + 72, 20, 77, 21 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -22 +#define YYPACT_NINF -35 static const yytype_int8 yypact[] = { - 21, 50, 60, -22, 8, -22, -22, -22, 2, -22, - 98, 7, 65, 50, 50, 81, -22, -22, 70, -22, - -22, -22, -22, 42, -22, -22, -22, -22, 98, 16, - -22, 62, -13, -22, -21, 50, 50, 98, 98, 98, - 98, 98, 98, 98, 108, 108, 9, 98, 98, 98, - 98, 98, 98, 98, -22, 36, -22, -22, 60, -22, - 40, -22, 16, 16, 16, 16, 16, 16, 16, -22, - -22, -22, -22, 43, 98, -22, -22, 16, 16, 16, - 16, 16, 16, -22, -22, -6, 98, 67, 16, -22, - 73, -22, 98, -22, 16 + 48, 60, 73, -35, 7, -35, -35, -35, -35, -34, + -35, 43, 8, 11, 60, 60, 86, -35, -35, 80, + -35, -35, -35, -35, 108, -35, -35, -35, -35, 43, + 25, -35, 79, -17, -35, -8, 60, 60, 43, 43, + 43, 43, 43, 43, 43, 5, 5, 0, 43, 43, + 43, 43, 43, 43, 43, -35, -27, -35, -35, 73, + -35, 3, -35, 25, 25, 25, 25, 25, 25, 25, + -35, -35, -35, -35, 23, 43, -35, -35, 25, 25, + 25, 25, 25, 25, -35, -35, 106, 43, 85, 25, + -35, -21, -35, 43, -35, 25 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -22, -22, 26, -22, -22, -22, -9, -20, -2, -5, - 41, -1, -22, -22 + -35, -35, 57, -35, -35, -35, -9, -20, -2, -5, + -4, -1, -35, -35 }; /* 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 zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ + number is the opposite. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -1 static const yytype_uint8 yytable[] = { - 25, 26, 31, 54, 22, 29, 57, 9, 27, 25, - 26, 54, 12, 89, 21, 35, 36, 22, 73, 59, - 9, 25, 26, 55, 30, 12, 1, 2, 3, 25, - 26, 58, 62, 63, 64, 65, 66, 67, 68, 33, - 34, 28, 77, 78, 79, 80, 81, 82, 83, 85, - 74, 53, 22, 5, 6, 9, 25, 26, 7, 8, - 12, 60, 61, 9, 10, 54, 11, 21, 12, 88, - 22, 53, 22, 9, 32, 9, 84, 36, 12, 56, - 12, 90, 86, 25, 26, 37, 72, 94, 13, 14, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 7, 8, 53, 91, - 92, 9, 0, 93, 11, 0, 12, 35, 36, 69, - 70 + 26, 27, 58, 32, 55, 29, 30, 28, 54, 74, + 26, 27, 55, 85, 54, 22, 70, 71, 23, 94, + 33, 10, 26, 27, 56, 31, 13, 59, 36, 37, + 26, 27, 60, 63, 64, 65, 66, 67, 68, 69, + 37, 75, 73, 78, 79, 80, 81, 82, 83, 84, + 86, 8, 9, 1, 2, 3, 10, 26, 27, 12, + 54, 13, 87, 5, 6, 0, 55, 7, 8, 9, + 89, 34, 35, 10, 11, 0, 12, 0, 13, 0, + 22, 0, 91, 23, 26, 27, 10, 0, 95, 23, + 0, 13, 10, 61, 62, 38, 57, 13, 14, 15, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 23, 0, 23, 10, + 0, 10, 36, 37, 13, 90, 13, 92, 93 }; +#define yypact_value_is_default(yystate) \ + ((yystate) == (-35)) + +#define yytable_value_is_error(yytable_value) \ + YYID (0) + static const yytype_int8 yycheck[] = { - 2, 2, 11, 23, 10, 10, 19, 13, 0, 11, - 11, 31, 18, 19, 7, 36, 37, 10, 9, 40, - 13, 23, 23, 28, 17, 18, 5, 6, 7, 31, - 31, 44, 37, 38, 39, 40, 41, 42, 43, 13, - 14, 39, 47, 48, 49, 50, 51, 52, 53, 58, - 41, 35, 10, 3, 4, 13, 58, 58, 8, 9, - 18, 35, 36, 13, 14, 85, 16, 7, 18, 74, - 10, 35, 10, 13, 9, 13, 40, 37, 18, 17, - 18, 86, 39, 85, 85, 15, 45, 92, 38, 39, + 2, 2, 19, 12, 24, 39, 11, 0, 35, 9, + 12, 12, 32, 40, 35, 7, 11, 12, 10, 40, + 9, 13, 24, 24, 29, 17, 18, 44, 36, 37, + 32, 32, 40, 38, 39, 40, 41, 42, 43, 44, + 37, 41, 46, 48, 49, 50, 51, 52, 53, 54, + 59, 8, 9, 5, 6, 7, 13, 59, 59, 16, + 35, 18, 39, 3, 4, -1, 86, 7, 8, 9, + 75, 14, 15, 13, 14, -1, 16, -1, 18, -1, + 7, -1, 87, 10, 86, 86, 13, -1, 93, 10, + -1, 18, 13, 36, 37, 15, 17, 18, 38, 39, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 8, 9, 35, 42, - 43, 13, -1, 40, 16, -1, 18, 36, 37, 11, - 12 + 30, 31, 32, 33, 34, 35, 10, -1, 10, 13, + -1, 13, 36, 37, 18, 19, 18, 42, 43 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 5, 6, 7, 46, 3, 4, 8, 9, 13, - 14, 16, 18, 38, 39, 47, 48, 53, 54, 56, - 58, 7, 10, 51, 52, 53, 56, 0, 39, 54, - 17, 51, 9, 47, 47, 36, 37, 15, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 52, 54, 17, 19, 44, 40, - 47, 47, 54, 54, 54, 54, 54, 54, 54, 11, - 12, 55, 55, 9, 41, 49, 57, 54, 54, 54, - 54, 54, 54, 54, 40, 51, 39, 50, 54, 19, - 54, 42, 43, 40, 54 + 0, 5, 6, 7, 46, 3, 4, 7, 8, 9, + 13, 14, 16, 18, 38, 39, 47, 48, 53, 54, + 56, 58, 7, 10, 51, 52, 53, 56, 0, 39, + 54, 17, 51, 9, 47, 47, 36, 37, 15, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 52, 54, 17, 19, 44, + 40, 47, 47, 54, 54, 54, 54, 54, 54, 54, + 11, 12, 55, 55, 9, 41, 49, 57, 54, 54, + 54, 54, 54, 54, 54, 40, 51, 39, 50, 54, + 19, 54, 42, 43, 40, 54 }; #define yyerrok (yyerrstatus = 0) @@ -668,9 +676,18 @@ static const yytype_uint8 yystos[] = /* 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. */ + 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 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 YYRECOVERING() (!!yyerrstatus) @@ -680,7 +697,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -722,19 +738,10 @@ while (YYID (0)) #endif -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ +/* This macro is provided for backward compatibility. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif @@ -930,7 +937,6 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - #if YYERROR_VERBOSE @@ -1033,115 +1039,142 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) +{ + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = 0; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + 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 + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } - if (yysize_overflow) - return YYSIZE_MAXIMUM; + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -1176,6 +1209,7 @@ yydestruct (yymsg, yytype, yyvaluep, ctx) } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus @@ -1192,12 +1226,9 @@ int yyparse (); #endif /* ! YYPARSE_PARAM */ - - - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -1384,7 +1415,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -1415,8 +1446,8 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } @@ -1471,330 +1502,337 @@ yyreduce: { case 2: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 112 "util_expr_parse.y" - { ctx->expr = (yyvsp[(2) - (2)].exVal); ;} + { ctx->expr = (yyvsp[(2) - (2)].exVal); } break; case 3: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 113 "util_expr_parse.y" - { ctx->expr = (yyvsp[(2) - (2)].exVal); ;} + { ctx->expr = (yyvsp[(2) - (2)].exVal); } break; case 4: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 114 "util_expr_parse.y" - { YYABORT; ;} + { YYABORT; } break; case 5: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 117 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_True, NULL, NULL, ctx); ;} + { (yyval.exVal) = ap_expr_make(op_True, NULL, NULL, ctx); } break; case 6: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 118 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_False, NULL, NULL, ctx); ;} + { (yyval.exVal) = ap_expr_make(op_False, NULL, NULL, ctx); } break; case 7: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 119 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_Not, (yyvsp[(2) - (2)].exVal), NULL, ctx); ;} + { (yyval.exVal) = ap_expr_make(op_Not, (yyvsp[(2) - (2)].exVal), NULL, ctx); } break; case 8: -/* Line 1455 of yacc.c */ +/* Line 1806 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); ;} + { (yyval.exVal) = ap_expr_make(op_Or, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 9: -/* Line 1455 of yacc.c */ +/* Line 1806 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); ;} + { (yyval.exVal) = ap_expr_make(op_And, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 10: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 122 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_Comp, (yyvsp[(1) - (1)].exVal), NULL, ctx); ;} + { (yyval.exVal) = ap_expr_make(op_Comp, (yyvsp[(1) - (1)].exVal), NULL, ctx); } break; case 11: -/* Line 1455 of yacc.c */ +/* Line 1806 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); ;} + { (yyval.exVal) = ap_expr_unary_op_make( (yyvsp[(1) - (2)].cpVal), (yyvsp[(2) - (2)].exVal), ctx); } break; case 12: -/* Line 1455 of yacc.c */ +/* Line 1806 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); ;} + { (yyval.exVal) = ap_expr_binary_op_make((yyvsp[(2) - (3)].cpVal), (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 13: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 125 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); ;} + { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); } break; case 14: -/* Line 1455 of yacc.c */ -#line 128 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_EQ, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} +/* Line 1806 of yacc.c */ +#line 126 "util_expr_parse.y" + { YYABORT; } break; case 15: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 129 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_NE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_EQ, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 16: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 130 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_LT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_NE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 17: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 131 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_LE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_LT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 18: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 132 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_GT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_LE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 19: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 133 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_GE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_GT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 20: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 134 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_STR_EQ, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_GE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 21: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 135 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_STR_NE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_STR_EQ, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 22: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 136 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_STR_LT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_STR_NE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 23: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 137 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_STR_LE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_STR_LT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 24: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 138 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_STR_GT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_STR_LE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 25: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 139 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_STR_GE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_STR_GT, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 26: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 140 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_IN, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_STR_GE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 27: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 141 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_REG, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_IN, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 28: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 142 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_NRE, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_REG, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 29: -/* Line 1455 of yacc.c */ -#line 145 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); ;} +/* Line 1806 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); } break; case 30: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 146 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); ;} + { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); } break; case 31: -/* Line 1455 of yacc.c */ -#line 149 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_ListElement, (yyvsp[(1) - (1)].exVal), NULL, ctx); ;} +/* Line 1806 of yacc.c */ +#line 147 "util_expr_parse.y" + { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); } break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 150 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_ListElement, (yyvsp[(3) - (3)].exVal), (yyvsp[(1) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_ListElement, (yyvsp[(1) - (1)].exVal), NULL, ctx); } break; case 33: -/* Line 1455 of yacc.c */ -#line 153 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[(1) - (2)].exVal), (yyvsp[(2) - (2)].exVal), ctx); ;} +/* Line 1806 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); } break; case 34: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 154 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); ;} + { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[(1) - (2)].exVal), (yyvsp[(2) - (2)].exVal), ctx); } break; case 35: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 155 "util_expr_parse.y" - { YYABORT; ;} + { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); } break; case 36: -/* Line 1455 of yacc.c */ -#line 158 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_String, (yyvsp[(1) - (1)].cpVal), NULL, ctx); ;} +/* Line 1806 of yacc.c */ +#line 156 "util_expr_parse.y" + { YYABORT; } break; case 37: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 159 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); ;} + { (yyval.exVal) = ap_expr_make(op_String, (yyvsp[(1) - (1)].cpVal), NULL, ctx); } break; case 38: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 160 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); ;} + { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); } break; case 39: -/* Line 1455 of yacc.c */ -#line 163 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_var_make((yyvsp[(2) - (3)].cpVal), ctx); ;} +/* Line 1806 of yacc.c */ +#line 161 "util_expr_parse.y" + { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); } break; case 40: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 164 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_str_func_make((yyvsp[(2) - (5)].cpVal), (yyvsp[(4) - (5)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_var_make((yyvsp[(2) - (3)].cpVal), ctx); } break; case 41: -/* Line 1455 of yacc.c */ -#line 167 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_Digit, (yyvsp[(1) - (1)].cpVal), NULL, ctx); ;} +/* Line 1806 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); } break; case 42: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 168 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); ;} + { (yyval.exVal) = ap_expr_make(op_Digit, (yyvsp[(1) - (1)].cpVal), NULL, ctx); } break; case 43: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 169 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); ;} + { (yyval.exVal) = ap_expr_make(op_Concat, (yyvsp[(1) - (3)].exVal), (yyvsp[(3) - (3)].exVal), ctx); } break; case 44: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 170 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); ;} + { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); } break; case 45: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 171 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); ;} + { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); } break; case 46: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 172 "util_expr_parse.y" - { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); ;} + { (yyval.exVal) = (yyvsp[(1) - (1)].exVal); } break; case 47: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 173 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_make(op_String, "", NULL, ctx); ;} + { (yyval.exVal) = (yyvsp[(2) - (3)].exVal); } break; case 48: -/* Line 1455 of yacc.c */ -#line 176 "util_expr_parse.y" +/* Line 1806 of yacc.c */ +#line 174 "util_expr_parse.y" + { (yyval.exVal) = ap_expr_make(op_String, "", NULL, ctx); } + break; + + case 49: + +/* Line 1806 of yacc.c */ +#line 177 "util_expr_parse.y" { ap_regex_t *regex; if ((regex = ap_pregcomp(ctx->pool, (yyvsp[(1) - (1)].cpVal), @@ -1803,13 +1841,13 @@ yyreduce: YYERROR; } (yyval.exVal) = ap_expr_make(op_Regex, regex, NULL, ctx); - ;} + } break; - case 49: + case 50: -/* Line 1455 of yacc.c */ -#line 185 "util_expr_parse.y" +/* Line 1806 of yacc.c */ +#line 186 "util_expr_parse.y" { ap_regex_t *regex; if ((regex = ap_pregcomp(ctx->pool, (yyvsp[(1) - (1)].cpVal), @@ -1818,40 +1856,51 @@ yyreduce: YYERROR; } (yyval.exVal) = ap_expr_make(op_Regex, regex, NULL, ctx); - ;} + } break; - case 50: + case 51: -/* Line 1455 of yacc.c */ -#line 196 "util_expr_parse.y" +/* Line 1806 of yacc.c */ +#line 197 "util_expr_parse.y" { int *n = apr_palloc(ctx->pool, sizeof(int)); *n = (yyvsp[(1) - (1)].num); (yyval.exVal) = ap_expr_make(op_RegexBackref, n, NULL, ctx); - ;} + } break; - case 51: + case 52: -/* Line 1455 of yacc.c */ -#line 203 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_list_func_make((yyvsp[(1) - (4)].cpVal), (yyvsp[(3) - (4)].exVal), ctx); ;} +/* Line 1806 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); } break; - case 52: + case 53: -/* Line 1455 of yacc.c */ -#line 206 "util_expr_parse.y" - { (yyval.exVal) = ap_expr_str_func_make((yyvsp[(1) - (4)].cpVal), (yyvsp[(3) - (4)].exVal), ctx); ;} +/* Line 1806 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); } break; -/* Line 1455 of yacc.c */ -#line 1853 "util_expr_parse.c" +/* Line 1806 of yacc.c */ +#line 1891 "util_expr_parse.c" default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -1879,6 +1928,10 @@ yyreduce: | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -1886,37 +1939,36 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (ctx, YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (ctx, yymsg); - } - else - { - yyerror (ctx, YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (ctx, yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } @@ -1975,7 +2027,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -2034,8 +2086,13 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, ctx); + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, ctx); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -2060,11 +2117,11 @@ yyreturn: -/* Line 1675 of yacc.c */ -#line 209 "util_expr_parse.y" +/* Line 2067 of yacc.c */ +#line 210 "util_expr_parse.y" -void yyerror(ap_expr_parse_ctx_t *ctx, char *s) +void yyerror(ap_expr_parse_ctx_t *ctx, const char *s) { /* s is allocated on the stack */ ctx->error = apr_pstrdup(ctx->ptemp, s); diff --git a/server/util_expr_parse.h b/server/util_expr_parse.h index d9c8f9c5e7..8540ec6e2d 100644 --- a/server/util_expr_parse.h +++ b/server/util_expr_parse.h @@ -1,21 +1,19 @@ +/* A Bison parser, made by GNU Bison 2.5. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - +/* Bison interface for Yacc-like parsers in C + + Copyright (C) 1984, 1989-1990, 2000-2011 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 . */ @@ -28,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. */ @@ -84,7 +82,7 @@ typedef union YYSTYPE { -/* Line 1676 of yacc.c */ +/* Line 2068 of yacc.c */ #line 35 "util_expr_parse.y" char *cpVal; @@ -93,8 +91,8 @@ typedef union YYSTYPE -/* Line 1676 of yacc.c */ -#line 98 "util_expr_parse.h" +/* Line 2068 of yacc.c */ +#line 96 "util_expr_parse.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/server/util_expr_scan.c b/server/util_expr_scan.c index b3edbf02f6..ba759f2236 100644 --- a/server/util_expr_scan.c +++ b/server/util_expr_scan.c @@ -34,7 +34,7 @@ #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. + * if you want the limit (max/min) macros for int types. */ #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS 1 @@ -51,7 +51,7 @@ typedef uint32_t flex_uint32_t; typedef signed char flex_int8_t; typedef short int flex_int16_t; typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; +typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; @@ -184,7 +184,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) - + /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ @@ -246,7 +246,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -673,7 +673,7 @@ static int yy_init_globals (yyscan_t yyscanner ); /* This must go here because YYSTYPE and YYLTYPE are included * from bison output in section 1.*/ # define yylval yyg->yylval_r - + int ap_expr_yylex_init (yyscan_t* scanner); int ap_expr_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); @@ -742,9 +742,9 @@ static int input (yyscan_t yyscanner ); #endif static void yy_push_state (int new_state ,yyscan_t yyscanner); - + static void yy_pop_state (yyscan_t yyscanner ); - + /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE #ifdef __ia64__ @@ -967,7 +967,7 @@ case 1: /* rule 1 can match eol */ YY_RULE_SETUP #line 103 "util_expr_scan.l" -{ +{ /* NOP */ } YY_BREAK @@ -2001,7 +2001,7 @@ static void ap_expr_yy_load_buffer_state (yyscan_t yyscanner) YY_BUFFER_STATE ap_expr_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - + b = (YY_BUFFER_STATE) ap_expr_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in ap_expr_yy_create_buffer()" ); @@ -2067,7 +2067,7 @@ static void ap_expr_yy_load_buffer_state (yyscan_t yyscanner) } b->yy_is_interactive = 0; - + errno = oerrno; } @@ -2173,9 +2173,9 @@ static void ap_expr_yyensure_buffer_stack (yyscan_t yyscanner) , yyscanner); if ( ! yyg->yy_buffer_stack ) YY_FATAL_ERROR( "out of dynamic memory in ap_expr_yyensure_buffer_stack()" ); - + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_top = 0; return; @@ -2204,12 +2204,12 @@ static void ap_expr_yyensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE ap_expr_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) @@ -2245,7 +2245,7 @@ YY_BUFFER_STATE ap_expr_yy_scan_buffer (char * base, yy_size_t size , yyscan_t */ YY_BUFFER_STATE ap_expr_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) { - + return ap_expr_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); } @@ -2262,7 +2262,7 @@ YY_BUFFER_STATE ap_expr_yy_scan_bytes (yyconst char * yybytes, int _yybytes_le char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; buf = (char *) ap_expr_yyalloc(n ,yyscanner ); @@ -2364,10 +2364,10 @@ YY_EXTRA_TYPE ap_expr_yyget_extra (yyscan_t yyscanner) int ap_expr_yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; - + return yylineno; } @@ -2432,8 +2432,8 @@ void ap_expr_yyset_lineno (int line_number , yyscan_t yyscanner) /* 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" , yyscanner); + yylineno = line_number; } @@ -2533,20 +2533,20 @@ int ap_expr_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_glob errno = EINVAL; return 1; } - + *ptr_yy_globals = (yyscan_t) ap_expr_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - + ap_expr_yyset_extra (yy_user_defined, *ptr_yy_globals); - + return yy_init_globals ( *ptr_yy_globals ); } -- 2.40.0