Fix conflicts in phpdbg parser

3 files changed, 472 insertions, 695 deletions

diff --git a/sapi/phpdbg/phpdbg_parser.c b/sapi/phpdbg/phpdbg_parser.c
index ae7533abe4..453fecd31b 100644
--- a/sapi/phpdbg/phpdbg_parser.c
+++ b/sapi/phpdbg/phpdbg_parser.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* 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-2015 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
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.7.12-4996"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -59,18 +59,10 @@
 #define YYPULL 1
 
 
-/* Substitute the variable and function names.  */
-#define yyparse         phpdbg_parse
-#define yylex           phpdbg_lex
-#define yyerror         phpdbg_error
-#define yylval          phpdbg_lval
-#define yychar          phpdbg_char
-#define yydebug         phpdbg_debug
-#define yynerrs         phpdbg_nerrs
+
 
 /* Copy the first part of user declarations.  */
-/* Line 371 of yacc.c  */
-#line 1 "sapi/phpdbg/phpdbg_parser.y"
+#line 1 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:339  */
 
 
 /*
@@ -100,14 +92,13 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 #endif
 
 
-/* Line 371 of yacc.c  */
-#line 107 "sapi/phpdbg/phpdbg_parser.c"
+#line 96 "sapi/phpdbg/phpdbg_parser.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
 
@@ -121,18 +112,17 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 /* In a future release of Bison, this section will be replaced
    by #include "phpdbg_parser.h".  */
-#ifndef YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
-# define YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
-/* Enabling traces.  */
+#ifndef YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
+# define YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
+/* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
 #if YYDEBUG
-extern int phpdbg_debug;
+extern int yydebug;
 #endif
 /* "%code requires" blocks.  */
-/* Line 387 of yacc.c  */
-#line 36 "sapi/phpdbg/phpdbg_parser.y"
+#line 34 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:355  */
 
 #include "phpdbg.h"
 #ifndef YY_TYPEDEF_YY_SCANNER_T
@@ -140,90 +130,52 @@ extern int phpdbg_debug;
 typedef void* yyscan_t;
 #endif
 
+#line 134 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:355  */
 
-/* Line 387 of yacc.c  */
-#line 148 "sapi/phpdbg/phpdbg_parser.c"
-
-/* 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_EVAL = 258,
-     T_RUN = 259,
-     T_SHELL = 260,
-     T_IF = 261,
-     T_TRUTHY = 262,
-     T_FALSY = 263,
-     T_STRING = 264,
-     T_COLON = 265,
-     T_DCOLON = 266,
-     T_POUND = 267,
-     T_SEPARATOR = 268,
-     T_PROTO = 269,
-     T_DIGITS = 270,
-     T_LITERAL = 271,
-     T_ADDR = 272,
-     T_OPCODE = 273,
-     T_ID = 274,
-     T_INPUT = 275,
-     T_UNEXPECTED = 276,
-     T_REQ_ID = 277
-   };
+  enum yytokentype
+  {
+    T_EVAL = 258,
+    T_RUN = 259,
+    T_SHELL = 260,
+    T_IF = 261,
+    T_TRUTHY = 262,
+    T_FALSY = 263,
+    T_STRING = 264,
+    T_COLON = 265,
+    T_DCOLON = 266,
+    T_POUND = 267,
+    T_SEPARATOR = 268,
+    T_PROTO = 269,
+    T_DIGITS = 270,
+    T_LITERAL = 271,
+    T_ADDR = 272,
+    T_OPCODE = 273,
+    T_ID = 274,
+    T_INPUT = 275,
+    T_UNEXPECTED = 276,
+    T_REQ_ID = 277
+  };
 #endif
-/* Tokens.  */
-#define T_EVAL 258
-#define T_RUN 259
-#define T_SHELL 260
-#define T_IF 261
-#define T_TRUTHY 262
-#define T_FALSY 263
-#define T_STRING 264
-#define T_COLON 265
-#define T_DCOLON 266
-#define T_POUND 267
-#define T_SEPARATOR 268
-#define T_PROTO 269
-#define T_DIGITS 270
-#define T_LITERAL 271
-#define T_ADDR 272
-#define T_OPCODE 273
-#define T_ID 274
-#define T_INPUT 275
-#define T_UNEXPECTED 276
-#define T_REQ_ID 277
-
-
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # 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 phpdbg_parse (void *YYPARSE_PARAM);
-#else
-int phpdbg_parse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int phpdbg_parse (void);
-#else
-int phpdbg_parse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED  */
+int yyparse (void);
+
+#endif /* !YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
 
-/* Line 390 of yacc.c  */
-#line 229 "sapi/phpdbg/phpdbg_parser.c"
+#line 179 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -237,11 +189,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)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -261,8 +210,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
@@ -284,11 +232,30 @@ 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
 
@@ -299,25 +266,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)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
+#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
-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.  */
@@ -335,8 +303,7 @@ YYID (yyi)
 #    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
@@ -348,8 +315,8 @@ YYID (yyi)
 # 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
@@ -365,7 +332,7 @@ YYID (yyi)
 #  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
@@ -373,15 +340,13 @@ YYID (yyi)
 #  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
@@ -391,7 +356,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #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
@@ -416,16 +381,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
 
@@ -444,7 +409,7 @@ union yyalloc
           for (yyi = 0; yyi < (Count); yyi++)   \
             (Dst)[yyi] = (Src)[yyi];            \
         }                                       \
-      while (YYID (0))
+      while (0)
 #  endif
 # endif
 #endif /* !YYCOPY_NEEDED */
@@ -452,7 +417,7 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  27
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   50
+#define YYLAST   51
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  23
@@ -460,17 +425,19 @@ union yyalloc
 #define YYNNTS  7
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  30
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  46
 
-/* 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   277
 
-#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,
@@ -504,38 +471,13 @@ 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,     5,     9,    10,    12,    14,    16,    19,
-      22,    26,    31,    36,    42,    46,    52,    56,    59,    61,
-      63,    65,    67,    69,    71,    73,    75,    76,    80,    84,
-      87
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      24,     0,    -1,    25,    -1,    24,    13,    25,    -1,    -1,
-      26,    -1,    29,    -1,    27,    -1,    26,    27,    -1,    26,
-      28,    -1,    19,    10,    15,    -1,    19,    10,    12,    15,
-      -1,    14,    19,    10,    15,    -1,    14,    19,    10,    12,
-      15,    -1,    19,    11,    19,    -1,    19,    11,    19,    12,
-      15,    -1,    19,    12,    15,    -1,     6,    20,    -1,    18,
-      -1,    17,    -1,    16,    -1,     7,    -1,     8,    -1,    15,
-      -1,    19,    -1,    22,    -1,    -1,     3,    28,    20,    -1,
-       5,    28,    20,    -1,     4,    28,    -1,     4,    28,    20,
-      -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,    71,    71,    72,    73,    77,    78,    82,    83,    84,
-      88,    93,    98,   108,   118,   123,   129,   135,   140,   141,
-     142,   143,   144,   145,   146,   150,   151,   155,   160,   165,
-     169
+       0,    69,    69,    70,    71,    75,    76,    80,    81,    82,
+      86,    91,    96,   106,   116,   121,   127,   133,   138,   139,
+     140,   141,   142,   143,   144,   148,   149,   153,   158,   163,
+     167
 };
 #endif
 
@@ -554,13 +496,13 @@ static const char *const yytname[] =
   "\"identifier (command or function name)\"",
   "\"input (input string or data)\"", "\"input\"",
   "\"request id (-r %d)\"", "$accept", "input", "command", "parameters",
-  "parameter", "req_id", "full_expression", YY_NULL
+  "parameter", "req_id", "full_expression", 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,
@@ -569,125 +511,113 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    23,    24,    24,    24,    25,    25,    26,    26,    26,
-      27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
-      27,    27,    27,    27,    27,    28,    28,    29,    29,    29,
-      29
-};
+#define YYPACT_NINF -15
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-15)))
+
+#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,     1,     3,     0,     1,     1,     1,     2,     2,
-       3,     4,     4,     5,     3,     5,     3,     2,     1,     1,
-       1,     1,     1,     1,     1,     1,     0,     3,     3,     2,
-       3
+      -3,   -14,   -14,   -14,   -10,   -15,   -15,    12,   -15,   -15,
+     -15,   -15,    24,     7,   -15,    11,   -15,   -15,   -15,    17,
+      18,    19,   -15,    22,    -6,    21,    26,   -15,    -3,   -15,
+     -15,   -15,   -15,   -15,     9,    27,   -15,    31,   -15,   -15,
+      29,   -15,   -15,    30,   -15,   -15
 };
 
-/* 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[] =
 {
        4,    26,    26,    26,     0,    21,    22,     0,    23,    20,
       19,    18,    24,     0,     2,     5,     7,     6,    25,     0,
-      29,     0,    17,     0,     0,     0,     0,     1,     0,     8,
-       9,    27,    30,    28,     0,     0,    10,    14,    16,     3,
+      29,     0,    17,     0,     0,     0,     0,     1,     0,     9,
+       8,    27,    30,    28,     0,     0,    10,    14,    16,     3,
        0,    12,    11,     0,    13,    15
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] =
-{
-      -1,    13,    14,    15,    16,    19,    17
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -17
-static const yytype_int8 yypact[] =
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
 {
-      -3,   -16,   -16,   -16,   -10,   -17,   -17,     2,   -17,   -17,
-     -17,   -17,    26,     9,   -17,    11,   -17,   -17,   -17,     3,
-       4,    21,   -17,    29,    19,    23,    25,   -17,    -3,   -17,
-     -17,   -17,   -17,   -17,    20,    28,   -17,    32,   -17,   -17,
-      30,   -17,   -17,    31,   -17,   -17
+     -15,   -15,    23,   -15,    32,    20,   -15
 };
 
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
 {
-     -17,   -17,    22,   -17,    33,     5,   -17
+      -1,    13,    14,    15,    16,    19,    17
 };
 
-/* 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[] =
 {
-       1,     2,     3,     4,     5,     6,    18,    20,    21,    27,
+       1,     2,     3,     4,     5,     6,    35,    27,    18,    36,
       22,     7,     8,     9,    10,    11,    12,     4,     5,     6,
-      30,    23,    28,    31,    32,     7,     8,     9,    10,    11,
-      12,    35,    40,    18,    36,    41,    24,    25,    26,    34,
-      38,    33,    37,    42,    43,    44,    45,     0,    29,     0,
-      39
+      28,    40,    20,    21,    41,     7,     8,     9,    10,    11,
+      12,    23,    34,    29,    24,    25,    26,    31,    32,    33,
+      37,    38,    42,    43,    44,    45,     0,    30,     0,     0,
+       0,    39
 };
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-17)))
-
-#define yytable_value_is_error(Yytable_value) \
-  YYID (0)
-
 static const yytype_int8 yycheck[] =
 {
-       3,     4,     5,     6,     7,     8,    22,     2,     3,     0,
+       3,     4,     5,     6,     7,     8,    12,     0,    22,    15,
       20,    14,    15,    16,    17,    18,    19,     6,     7,     8,
-      15,    19,    13,    20,    20,    14,    15,    16,    17,    18,
-      19,    12,    12,    22,    15,    15,    10,    11,    12,    10,
-      15,    20,    19,    15,    12,    15,    15,    -1,    15,    -1,
-      28
+      13,    12,     2,     3,    15,    14,    15,    16,    17,    18,
+      19,    19,    10,    22,    10,    11,    12,    20,    20,    20,
+      19,    15,    15,    12,    15,    15,    -1,    15,    -1,    -1,
+      -1,    28
 };
 
-/* 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,     3,     4,     5,     6,     7,     8,    14,    15,    16,
       17,    18,    19,    24,    25,    26,    27,    29,    22,    28,
-      28,    28,    20,    19,    10,    11,    12,     0,    13,    27,
-      28,    20,    20,    20,    10,    12,    15,    19,    15,    25,
+      28,    28,    20,    19,    10,    11,    12,     0,    13,    22,
+      27,    20,    20,    20,    10,    12,    15,    19,    15,    25,
       12,    15,    15,    12,    15,    15
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
-
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
-
-
-/* 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 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
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    23,    24,    24,    24,    25,    25,    26,    26,    26,
+      27,    27,    27,    27,    27,    27,    27,    27,    27,    27,
+      27,    27,    27,    27,    27,    28,    28,    29,    29,    29,
+      29
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     3,     0,     1,     1,     1,     2,     2,
+       3,     4,     4,     5,     3,     5,     3,     2,     1,     1,
+       1,     1,     1,     1,     1,     1,     0,     3,     3,     2,
+       3
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -704,27 +634,15 @@ do                                                              \
   else                                                          \
     {                                                           \
       yyerror (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)
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -734,40 +652,36 @@ while (YYID (0))
 #  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); \
-      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); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
   FILE *yyo = yyoutput;
   YYUSE (yyo);
@@ -776,8 +690,6 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
   YYUSE (yytype);
 }
@@ -787,22 +699,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | 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)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#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);
   YYFPRINTF (yyoutput, ")");
@@ -813,16 +714,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | 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++)
@@ -833,49 +726,42 @@ yy_stack_print (yybottom, yytop)
   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)
 
 
 /*------------------------------------------------.
 | 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)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  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)])
-		       		       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -889,7 +775,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -912,15 +798,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++)
@@ -936,16 +815,8 @@ yystrlen (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;
@@ -975,27 +846,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	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 (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        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 (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
@@ -1018,11 +889,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
@@ -1030,10 +901,6 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
   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
@@ -1083,7 +950,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   }
                 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;
@@ -1150,26 +1017,17 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 | 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)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
 
@@ -1179,56 +1037,18 @@ yydestruct (yymsg, yytype, yyvaluep)
 | 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 (void)
-#else
-int
-yyparse ()
-
-#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
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1238,8 +1058,8 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
     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.  */
@@ -1307,23 +1127,23 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 
 #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;
-
-	/* 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;
+        /* 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);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1331,22 +1151,22 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
 # 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 */
@@ -1355,10 +1175,10 @@ YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
       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));
@@ -1387,7 +1207,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex (&yylval);
     }
 
   if (yychar <= YYEOF)
@@ -1452,7 +1272,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
@@ -1466,229 +1286,228 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-/* Line 1802 of yacc.c  */
-#line 71 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 69 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1292 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 3:
-/* Line 1802 of yacc.c  */
-#line 72 "sapi/phpdbg/phpdbg_parser.y"
-    { phpdbg_stack_separate((yyvsp[(1) - (3)]).top); (yyval) = (yyvsp[(3) - (3)]); }
+#line 70 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { phpdbg_stack_separate((yyvsp[-2]).top); (yyval) = (yyvsp[0]); }
+#line 1298 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 5:
-/* Line 1802 of yacc.c  */
-#line 77 "sapi/phpdbg/phpdbg_parser.y"
+#line 75 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     { (yyval).top = PHPDBG_G(parser_stack)->top; }
+#line 1304 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 6:
-/* Line 1802 of yacc.c  */
-#line 78 "sapi/phpdbg/phpdbg_parser.y"
-    { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[(1) - (1)])); (yyval).top = PHPDBG_G(parser_stack)->top; }
+#line 76 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[0])); (yyval).top = PHPDBG_G(parser_stack)->top; }
+#line 1310 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 7:
-/* Line 1802 of yacc.c  */
-#line 82 "sapi/phpdbg/phpdbg_parser.y"
-    { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[(1) - (1)])); (yyval).top = PHPDBG_G(parser_stack)->top; }
+#line 80 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[0])); (yyval).top = PHPDBG_G(parser_stack)->top; }
+#line 1316 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 8:
-/* Line 1802 of yacc.c  */
-#line 83 "sapi/phpdbg/phpdbg_parser.y"
-    { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[(2) - (2)])); (yyval).top = PHPDBG_G(parser_stack)->top; }
+#line 81 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[0])); (yyval).top = PHPDBG_G(parser_stack)->top; }
+#line 1322 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 9:
-/* Line 1802 of yacc.c  */
-#line 84 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (2)]); }
+#line 82 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[-1]); PHPDBG_G(req_id) = (yyvsp[0]).num; }
+#line 1328 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 10:
-/* Line 1802 of yacc.c  */
-#line 88 "sapi/phpdbg/phpdbg_parser.y"
+#line 86 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = FILE_PARAM;
-		(yyval).file.name = (yyvsp[(2) - (3)]).str;
-		(yyval).file.line = (yyvsp[(3) - (3)]).num;
+		(yyval).file.name = (yyvsp[-1]).str;
+		(yyval).file.line = (yyvsp[0]).num;
 	}
+#line 1338 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 11:
-/* Line 1802 of yacc.c  */
-#line 93 "sapi/phpdbg/phpdbg_parser.y"
+#line 91 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = NUMERIC_FILE_PARAM;
-		(yyval).file.name = (yyvsp[(1) - (4)]).str;
-		(yyval).file.line = (yyvsp[(4) - (4)]).num;
+		(yyval).file.name = (yyvsp[-3]).str;
+		(yyval).file.line = (yyvsp[0]).num;
 	}
+#line 1348 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 12:
-/* Line 1802 of yacc.c  */
-#line 98 "sapi/phpdbg/phpdbg_parser.y"
+#line 96 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = FILE_PARAM;
-		(yyval).file.name = malloc((yyvsp[(1) - (4)]).len + (yyvsp[(2) - (4)]).len + 1);
+		(yyval).file.name = malloc((yyvsp[-3]).len + (yyvsp[-2]).len + 1);
 		if ((yyval).file.name) {
-			memcpy(&(yyval).file.name[0], (yyvsp[(1) - (4)]).str, (yyvsp[(1) - (4)]).len);
-			memcpy(&(yyval).file.name[(yyvsp[(1) - (4)]).len], (yyvsp[(2) - (4)]).str, (yyvsp[(2) - (4)]).len);
-			(yyval).file.name[(yyvsp[(1) - (4)]).len + (yyvsp[(2) - (4)]).len] = '\0';
+			memcpy(&(yyval).file.name[0], (yyvsp[-3]).str, (yyvsp[-3]).len);
+			memcpy(&(yyval).file.name[(yyvsp[-3]).len], (yyvsp[-2]).str, (yyvsp[-2]).len);
+			(yyval).file.name[(yyvsp[-3]).len + (yyvsp[-2]).len] = '\0';
 		}
-		(yyval).file.line = (yyvsp[(4) - (4)]).num;
+		(yyval).file.line = (yyvsp[0]).num;
 	}
+#line 1363 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 13:
-/* Line 1802 of yacc.c  */
-#line 108 "sapi/phpdbg/phpdbg_parser.y"
+#line 106 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = NUMERIC_FILE_PARAM;
-		(yyval).file.name = malloc((yyvsp[(1) - (5)]).len + (yyvsp[(2) - (5)]).len + 1);
+		(yyval).file.name = malloc((yyvsp[-4]).len + (yyvsp[-3]).len + 1);
 		if ((yyval).file.name) {
-			memcpy(&(yyval).file.name[0], (yyvsp[(1) - (5)]).str, (yyvsp[(1) - (5)]).len);
-			memcpy(&(yyval).file.name[(yyvsp[(1) - (5)]).len], (yyvsp[(2) - (5)]).str, (yyvsp[(2) - (5)]).len);
-			(yyval).file.name[(yyvsp[(1) - (5)]).len + (yyvsp[(2) - (5)]).len] = '\0';
+			memcpy(&(yyval).file.name[0], (yyvsp[-4]).str, (yyvsp[-4]).len);
+			memcpy(&(yyval).file.name[(yyvsp[-4]).len], (yyvsp[-3]).str, (yyvsp[-3]).len);
+			(yyval).file.name[(yyvsp[-4]).len + (yyvsp[-3]).len] = '\0';
 		}
-		(yyval).file.line = (yyvsp[(5) - (5)]).num;
+		(yyval).file.line = (yyvsp[0]).num;
 	}
+#line 1378 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 14:
-/* Line 1802 of yacc.c  */
-#line 118 "sapi/phpdbg/phpdbg_parser.y"
+#line 116 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = METHOD_PARAM;
-		(yyval).method.class = (yyvsp[(1) - (3)]).str;
-		(yyval).method.name = (yyvsp[(3) - (3)]).str;
+		(yyval).method.class = (yyvsp[-2]).str;
+		(yyval).method.name = (yyvsp[0]).str;
 	}
+#line 1388 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 15:
-/* Line 1802 of yacc.c  */
-#line 123 "sapi/phpdbg/phpdbg_parser.y"
+#line 121 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = NUMERIC_METHOD_PARAM;
-		(yyval).method.class = (yyvsp[(1) - (5)]).str;
-		(yyval).method.name = (yyvsp[(3) - (5)]).str;
-		(yyval).num = (yyvsp[(5) - (5)]).num;
+		(yyval).method.class = (yyvsp[-4]).str;
+		(yyval).method.name = (yyvsp[-2]).str;
+		(yyval).num = (yyvsp[0]).num;
 	}
+#line 1399 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 16:
-/* Line 1802 of yacc.c  */
-#line 129 "sapi/phpdbg/phpdbg_parser.y"
+#line 127 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = NUMERIC_FUNCTION_PARAM;
-		(yyval).str = (yyvsp[(1) - (3)]).str;
-		(yyval).len = (yyvsp[(1) - (3)]).len;
-		(yyval).num = (yyvsp[(3) - (3)]).num;
+		(yyval).str = (yyvsp[-2]).str;
+		(yyval).len = (yyvsp[-2]).len;
+		(yyval).num = (yyvsp[0]).num;
 	}
+#line 1410 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 17:
-/* Line 1802 of yacc.c  */
-#line 135 "sapi/phpdbg/phpdbg_parser.y"
+#line 133 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = COND_PARAM;
-		(yyval).str = (yyvsp[(2) - (2)]).str;
-		(yyval).len = (yyvsp[(2) - (2)]).len;
+		(yyval).str = (yyvsp[0]).str;
+		(yyval).len = (yyvsp[0]).len;
 	}
+#line 1420 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 18:
-/* Line 1802 of yacc.c  */
-#line 140 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 138 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1426 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 19:
-/* Line 1802 of yacc.c  */
-#line 141 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 139 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1432 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 20:
-/* Line 1802 of yacc.c  */
-#line 142 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 140 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1438 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 21:
-/* Line 1802 of yacc.c  */
-#line 143 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 141 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1444 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 22:
-/* Line 1802 of yacc.c  */
-#line 144 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 142 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1450 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 23:
-/* Line 1802 of yacc.c  */
-#line 145 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 143 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1456 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 24:
-/* Line 1802 of yacc.c  */
-#line 146 "sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
+#line 144 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { (yyval) = (yyvsp[0]); }
+#line 1462 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 25:
-/* Line 1802 of yacc.c  */
-#line 150 "sapi/phpdbg/phpdbg_parser.y"
-    { PHPDBG_G(req_id) = (yyvsp[(1) - (1)]).num; }
+#line 148 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
+    { PHPDBG_G(req_id) = (yyvsp[0]).num; }
+#line 1468 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 27:
-/* Line 1802 of yacc.c  */
-#line 155 "sapi/phpdbg/phpdbg_parser.y"
+#line 153 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = EVAL_PARAM;
-		(yyval).str = (yyvsp[(3) - (3)]).str;
-		(yyval).len = (yyvsp[(3) - (3)]).len;
+		(yyval).str = (yyvsp[0]).str;
+		(yyval).len = (yyvsp[0]).len;
 	}
+#line 1478 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 28:
-/* Line 1802 of yacc.c  */
-#line 160 "sapi/phpdbg/phpdbg_parser.y"
+#line 158 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = SHELL_PARAM;
-		(yyval).str = (yyvsp[(3) - (3)]).str;
-		(yyval).len = (yyvsp[(3) - (3)]).len;
+		(yyval).str = (yyvsp[0]).str;
+		(yyval).len = (yyvsp[0]).len;
 	}
+#line 1488 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 29:
-/* Line 1802 of yacc.c  */
-#line 165 "sapi/phpdbg/phpdbg_parser.y"
+#line 163 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = RUN_PARAM;
 		(yyval).len = 0;
 	}
+#line 1497 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
   case 30:
-/* Line 1802 of yacc.c  */
-#line 169 "sapi/phpdbg/phpdbg_parser.y"
+#line 167 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1646  */
     {
 		(yyval).type = RUN_PARAM;
-		(yyval).str = (yyvsp[(3) - (3)]).str;
-		(yyval).len = (yyvsp[(3) - (3)]).len;
+		(yyval).str = (yyvsp[0]).str;
+		(yyval).len = (yyvsp[0]).len;
 	}
+#line 1507 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
     break;
 
 
-/* Line 1802 of yacc.c  */
-#line 1694 "sapi/phpdbg/phpdbg_parser.c"
+#line 1511 "sapi/phpdbg/phpdbg_parser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1710,7 +1529,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.  */
 
@@ -1725,9 +1544,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.  */
@@ -1778,20 +1597,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);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -1810,7 +1629,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;
@@ -1823,29 +1642,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);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -1896,14 +1715,14 @@ yyreturn:
       yydestruct ("Cleanup: discarding lookahead",
                   yytoken, &yylval);
     }
-  /* 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);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -1914,13 +1733,9 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-/* Line 2050 of yacc.c  */
-#line 176 "sapi/phpdbg/phpdbg_parser.y"
+#line 174 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1906  */
 
 
 static int yyerror(const char *msg) {
diff --git a/sapi/phpdbg/phpdbg_parser.h b/sapi/phpdbg/phpdbg_parser.h
index 2a27a4e7df..c5b31167ad 100644
--- a/sapi/phpdbg/phpdbg_parser.h
+++ b/sapi/phpdbg/phpdbg_parser.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* 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-2015 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
@@ -30,18 +30,17 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-#ifndef YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
-# define YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
-/* Enabling traces.  */
+#ifndef YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
+# define YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED
+/* Debug traces.  */
 #ifndef YYDEBUG
 # define YYDEBUG 0
 #endif
 #if YYDEBUG
-extern int phpdbg_debug;
+extern int yydebug;
 #endif
 /* "%code requires" blocks.  */
-/* Line 2060 of yacc.c  */
-#line 36 "sapi/phpdbg/phpdbg_parser.y"
+#line 34 "sapi/phpdbg/phpdbg_parser.y" /* yacc.c:1909  */
 
 #include "phpdbg.h"
 #ifndef YY_TYPEDEF_YY_SCANNER_T
@@ -49,82 +48,45 @@ extern int phpdbg_debug;
 typedef void* yyscan_t;
 #endif
 
+#line 52 "sapi/phpdbg/phpdbg_parser.h" /* yacc.c:1909  */
 
-/* Line 2060 of yacc.c  */
-#line 55 "sapi/phpdbg/phpdbg_parser.h"
-
-/* 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_EVAL = 258,
-     T_RUN = 259,
-     T_SHELL = 260,
-     T_IF = 261,
-     T_TRUTHY = 262,
-     T_FALSY = 263,
-     T_STRING = 264,
-     T_COLON = 265,
-     T_DCOLON = 266,
-     T_POUND = 267,
-     T_SEPARATOR = 268,
-     T_PROTO = 269,
-     T_DIGITS = 270,
-     T_LITERAL = 271,
-     T_ADDR = 272,
-     T_OPCODE = 273,
-     T_ID = 274,
-     T_INPUT = 275,
-     T_UNEXPECTED = 276,
-     T_REQ_ID = 277
-   };
+  enum yytokentype
+  {
+    T_EVAL = 258,
+    T_RUN = 259,
+    T_SHELL = 260,
+    T_IF = 261,
+    T_TRUTHY = 262,
+    T_FALSY = 263,
+    T_STRING = 264,
+    T_COLON = 265,
+    T_DCOLON = 266,
+    T_POUND = 267,
+    T_SEPARATOR = 268,
+    T_PROTO = 269,
+    T_DIGITS = 270,
+    T_LITERAL = 271,
+    T_ADDR = 272,
+    T_OPCODE = 273,
+    T_ID = 274,
+    T_INPUT = 275,
+    T_UNEXPECTED = 276,
+    T_REQ_ID = 277
+  };
 #endif
-/* Tokens.  */
-#define T_EVAL 258
-#define T_RUN 259
-#define T_SHELL 260
-#define T_IF 261
-#define T_TRUTHY 262
-#define T_FALSY 263
-#define T_STRING 264
-#define T_COLON 265
-#define T_DCOLON 266
-#define T_POUND 267
-#define T_SEPARATOR 268
-#define T_PROTO 269
-#define T_DIGITS 270
-#define T_LITERAL 271
-#define T_ADDR 272
-#define T_OPCODE 273
-#define T_ID 274
-#define T_INPUT 275
-#define T_UNEXPECTED 276
-#define T_REQ_ID 277
-
-
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # 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 phpdbg_parse (void *YYPARSE_PARAM);
-#else
-int phpdbg_parse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int phpdbg_parse (void);
-#else
-int phpdbg_parse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
-#endif /* !YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED  */
+int yyparse (void);
+
+#endif /* !YY_YY_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED  */
diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y
index b61c9c0a26..9d969fffd0 100644
--- a/sapi/phpdbg/phpdbg_parser.y
+++ b/sapi/phpdbg/phpdbg_parser.y
@@ -79,7 +79,7 @@ command
 parameters
 	: parameter { phpdbg_stack_push(PHPDBG_G(parser_stack), &$1); $$.top = PHPDBG_G(parser_stack)->top; }
 	| parameters parameter { phpdbg_stack_push(PHPDBG_G(parser_stack), &$2); $$.top = PHPDBG_G(parser_stack)->top; }
-	| parameters req_id { $$ = $1; }
+	| parameters T_REQ_ID { $$ = $1; PHPDBG_G(req_id) = $2.num; }
 	;
 
 parameter