util_expr: sync bison generated source files with according

to changes on server/util_expr_parse.y from r1642154.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643929 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 70 insertions, 62 deletions

diff --git a/server/util_expr_parse.c b/server/util_expr_parse.c
index c4ffb28866..d5891c6f61 100644
--- a/server/util_expr_parse.c
+++ b/server/util_expr_parse.c
@@ -426,16 +426,16 @@ 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
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  14
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  53
+#define YYNRULES  54
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  96
+#define YYNSTATES  98
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -489,7 +489,7 @@ static const yytype_uint8 yyprhs[] =
       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
+     157,   159,   161,   166,   171
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -512,7 +512,7 @@ static const yytype_int8 yyrhs[] =
       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
+      -1,     9,    44,    55,    45,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -523,7 +523,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
 
@@ -574,7 +574,7 @@ static const yytype_uint8 yyr1[] =
       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
+      60,    61,    62,    63,    63
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -585,7 +585,7 @@ static const yytype_uint8 yyr2[] =
        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,     1,     4,     4,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -598,42 +598,42 @@ 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[] =
 {
-      -1,     4,    16,    17,    76,    88,    24,    25,    18,    19,
-      72,    20,    77,    21
+      -1,     4,    16,    17,    77,    56,    24,    25,    18,    19,
+      73,    20,    78,    21
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -30
+#define YYPACT_NINF -41
 static const yytype_int8 yypact[] =
 {
-       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
+      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
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -30,   -30,     4,   -30,   -30,   -30,    -9,   -20,    -2,    -5,
-      33,    -1,   -30,   -30
+     -41,   -41,    39,   -41,   -41,     1,   -10,   -20,    -2,    -5,
+      35,    -1,   -41,   -41
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -642,42 +642,44 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 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)))
+  (!!((Yystate) == (-41)))
 
 #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
@@ -689,11 +691,11 @@ 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)
@@ -1835,9 +1837,15 @@ yyreduce:
     { (yyval.exVal) = ap_expr_str_func_make((yyvsp[(1) - (4)].cpVal), (yyvsp[(3) - (4)].exVal), ctx); }
     break;
 
+  case 54:
+/* Line 1787 of yacc.c  */
+#line 208 "util_expr_parse.y"
+    { (yyval.exVal) = ap_expr_str_func_make((yyvsp[(1) - (4)].cpVal), (yyvsp[(3) - (4)].exVal), ctx); }
+    break;
+
 
 /* Line 1787 of yacc.c  */
-#line 1841 "util_expr_parse.c"
+#line 1849 "util_expr_parse.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2069,7 +2077,7 @@ yyreturn:
 
 
 /* Line 2050 of yacc.c  */
-#line 210 "util_expr_parse.y"
+#line 211 "util_expr_parse.y"
 
 
 void yyerror(ap_expr_parse_ctx_t *ctx, const char *s)