Merge phpdbg into PHP-5.6

1 files changed, 261 insertions, 221 deletions

diff --git a/sapi/phpdbg/phpdbg_parser.c b/sapi/phpdbg/phpdbg_parser.c
index e34c2f48ff..c766868369 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.6.2.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+      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
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.6.2"
+#define YYBISON_VERSION "2.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -58,6 +58,8 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
+/* Using locations.  */
+#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
 #define yyparse         phpdbg_parse
@@ -68,9 +70,11 @@
 #define yydebug         phpdbg_debug
 #define yynerrs         phpdbg_nerrs
 
+
 /* Copy the first part of user declarations.  */
-/* Line 336 of yacc.c  */
-#line 1 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 268 of yacc.c  */
+#line 1 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
 
  
 /*
@@ -97,16 +101,14 @@ static int yyerror(void ***tsrm_ls, const char *msg);
 ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 
 
-/* Line 336 of yacc.c  */
-#line 102 "sapi/phpdbg/phpdbg_parser.c"
 
-# ifndef YY_NULL
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
-#  else
-#   define YY_NULL 0
-#  endif
-# endif
+/* Line 268 of yacc.c  */
+#line 107 "sapi/phpdbg/phpdbg_parser.c"
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -116,20 +118,15 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 # define YYERROR_VERBOSE 1
 #endif
 
-/* In a future release of Bison, this section will be replaced
-   by #include "phpdbg_parser.h".  */
-#ifndef PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H
-# define PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int phpdbg_debug;
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
 #endif
+
 /* "%code requires" blocks.  */
-/* Line 350 of yacc.c  */
-#line 31 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 288 of yacc.c  */
+#line 31 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
 
 #include "phpdbg.h"
 #ifndef YY_TYPEDEF_YY_SCANNER_T
@@ -138,8 +135,9 @@ typedef void* yyscan_t;
 #endif
 
 
-/* Line 350 of yacc.c  */
-#line 143 "sapi/phpdbg/phpdbg_parser.c"
+
+/* Line 288 of yacc.c  */
+#line 141 "sapi/phpdbg/phpdbg_parser.c"
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -164,7 +162,8 @@ typedef void* yyscan_t;
      T_OPCODE = 272,
      T_ID = 273,
      T_INPUT = 274,
-     T_UNEXPECTED = 275
+     T_UNEXPECTED = 275,
+     T_REQ_ID = 276
    };
 #endif
 /* Tokens.  */
@@ -186,6 +185,8 @@ typedef void* yyscan_t;
 #define T_ID 273
 #define T_INPUT 274
 #define T_UNEXPECTED 275
+#define T_REQ_ID 276
+
 
 
 
@@ -197,26 +198,11 @@ typedef int YYSTYPE;
 #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 *tsrm_ls);
-#else
-int phpdbg_parse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-#endif /* !PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H  */
-
 /* Copy the second part of user declarations.  */
 
-/* Line 353 of yacc.c  */
-#line 220 "sapi/phpdbg/phpdbg_parser.c"
+
+/* Line 343 of yacc.c  */
+#line 206 "sapi/phpdbg/phpdbg_parser.c"
 
 #ifdef short
 # undef short
@@ -322,7 +308,6 @@ YYID (yyi)
 #    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
 #     ifndef EXIT_SUCCESS
 #      define EXIT_SUCCESS 0
 #     endif
@@ -414,42 +399,42 @@ union yyalloc
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
+/* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
 #  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
+#   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  25
+#define YYFINAL  26
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   42
+#define YYLAST   48
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  21
+#define YYNTOKENS  22
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  5
+#define YYNNTS  6
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  25
+#define YYNRULES  28
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  38
+#define YYNSTATES  43
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   275
+#define YYMAXUTOK   276
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -484,7 +469,7 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20
+      15,    16,    17,    18,    19,    20,    21
 };
 
 #if YYDEBUG
@@ -492,34 +477,35 @@ static const yytype_uint8 yytranslate[] =
    YYRHS.  */
 static const yytype_uint8 yyprhs[] =
 {
-       0,     0,     3,     5,     7,     8,    10,    13,    17,    22,
-      27,    33,    37,    43,    47,    50,    52,    54,    56,    58,
-      60,    62,    64,    67,    70,    72
+       0,     0,     3,     5,     7,     8,    10,    13,    16,    20,
+      25,    30,    36,    40,    46,    50,    53,    55,    57,    59,
+      61,    63,    65,    67,    69,    70,    74,    78,    81
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      22,     0,    -1,    23,    -1,    25,    -1,    -1,    24,    -1,
-      23,    24,    -1,    18,    10,    14,    -1,    18,    10,    12,
-      14,    -1,    13,    18,    10,    14,    -1,    13,    18,    10,
-      12,    14,    -1,    18,    11,    18,    -1,    18,    11,    18,
-      12,    14,    -1,    18,    12,    14,    -1,     6,    19,    -1,
-      17,    -1,    16,    -1,    15,    -1,     7,    -1,     8,    -1,
-      14,    -1,    18,    -1,     3,    19,    -1,     5,    19,    -1,
-       4,    -1,     4,    19,    -1
+      23,     0,    -1,    24,    -1,    27,    -1,    -1,    25,    -1,
+      24,    25,    -1,    24,    26,    -1,    18,    10,    14,    -1,
+      18,    10,    12,    14,    -1,    13,    18,    10,    14,    -1,
+      13,    18,    10,    12,    14,    -1,    18,    11,    18,    -1,
+      18,    11,    18,    12,    14,    -1,    18,    12,    14,    -1,
+       6,    19,    -1,    17,    -1,    16,    -1,    15,    -1,     7,
+      -1,     8,    -1,    14,    -1,    18,    -1,    21,    -1,    -1,
+       3,    26,    19,    -1,     5,    26,    19,    -1,     4,    26,
+      -1,     4,    26,    19,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    66,    66,    67,    68,    72,    73,    77,    82,    87,
-      97,   107,   112,   118,   124,   129,   130,   131,   132,   133,
-     134,   135,   139,   144,   149,   153
+       0,    67,    67,    68,    69,    73,    74,    75,    79,    84,
+      89,    99,   109,   114,   120,   126,   131,   132,   133,   134,
+     135,   136,   137,   141,   142,   146,   151,   156,   160
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 1
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -531,8 +517,9 @@ static const char *const yytname[] =
   "\":: (double colon)\"", "\"# (pound sign)\"", "\"protocol (file://)\"",
   "\"digits (numbers)\"", "\"literal (string)\"", "\"address\"",
   "\"opcode\"", "\"identifier (command or function name)\"",
-  "\"input (input string or data)\"", "\"input\"", "$accept", "input",
-  "parameters", "parameter", "full_expression", YY_NULL
+  "\"input (input string or data)\"", "\"input\"",
+  "\"request id (-r %d)\"", "$accept", "input", "parameters", "parameter",
+  "req_id", "full_expression", 0
 };
 #endif
 
@@ -543,24 +530,24 @@ static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275
+     275,   276
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    21,    22,    22,    22,    23,    23,    24,    24,    24,
-      24,    24,    24,    24,    24,    24,    24,    24,    24,    24,
-      24,    24,    25,    25,    25,    25
+       0,    22,    23,    23,    23,    24,    24,    24,    25,    25,
+      25,    25,    25,    25,    25,    25,    25,    25,    25,    25,
+      25,    25,    25,    26,    26,    27,    27,    27,    27
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
-       0,     2,     1,     1,     0,     1,     2,     3,     4,     4,
-       5,     3,     5,     3,     2,     1,     1,     1,     1,     1,
-       1,     1,     2,     2,     1,     2
+       0,     2,     1,     1,     0,     1,     2,     2,     3,     4,
+       4,     5,     3,     5,     3,     2,     1,     1,     1,     1,
+       1,     1,     1,     1,     0,     3,     3,     2,     3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -568,33 +555,35 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       4,     0,    24,     0,     0,    18,    19,     0,    20,    17,
-      16,    15,    21,     0,     2,     5,     3,    22,    25,    23,
-      14,     0,     0,     0,     0,     1,     6,     0,     0,     7,
-      11,    13,     0,     9,     8,     0,    10,    12
+       4,    24,    24,    24,     0,    19,    20,     0,    21,    18,
+      17,    16,    22,     0,     2,     5,     3,    23,     0,    27,
+       0,    15,     0,     0,     0,     0,     1,     6,     7,    25,
+      28,    26,     0,     0,     8,    12,    14,     0,    10,     9,
+       0,    11,    13
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,    13,    14,    15,    16
+      -1,    13,    14,    15,    18,    16
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -11
+#define YYPACT_NINF -16
 static const yytype_int8 yypact[] =
 {
-      -3,   -10,    11,    12,    13,   -11,   -11,    15,   -11,   -11,
-     -11,   -11,    -4,    29,    10,   -11,   -11,   -11,   -11,   -11,
-     -11,    24,     7,    17,    22,   -11,   -11,     8,    23,   -11,
-      26,   -11,    25,   -11,   -11,    27,   -11,   -11
+      -3,   -15,   -15,   -15,   -10,   -16,   -16,     3,   -16,   -16,
+     -16,   -16,    22,    29,    10,   -16,   -16,   -16,    11,    17,
+      19,   -16,    30,     8,    21,    27,   -16,   -16,   -16,   -16,
+     -16,   -16,    23,    28,   -16,    31,   -16,    32,   -16,   -16,
+      33,   -16,   -16
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -11,   -11,   -11,    28,   -11
+     -16,   -16,   -16,    34,     5,   -16
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -603,26 +592,26 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-       1,     2,     3,     4,     5,     6,    22,    23,    24,    17,
+       1,     2,     3,     4,     5,     6,    17,    19,    20,    21,
        7,     8,     9,    10,    11,    12,     4,     5,     6,    28,
-      32,    29,    33,     7,     8,     9,    10,    11,    12,    25,
-      18,    19,    20,    21,    27,    30,    31,    34,    35,    36,
-       0,    37,    26
+      33,    22,    34,     7,     8,     9,    10,    11,    12,    26,
+      29,    17,    23,    24,    25,    37,    30,    38,    31,    35,
+      32,    36,    39,    40,     0,     0,    41,    42,    27
 };
 
 #define yypact_value_is_default(yystate) \
-  ((yystate) == (-11))
+  ((yystate) == (-16))
 
 #define yytable_value_is_error(yytable_value) \
   YYID (0)
 
 static const yytype_int8 yycheck[] =
 {
-       3,     4,     5,     6,     7,     8,    10,    11,    12,    19,
-      13,    14,    15,    16,    17,    18,     6,     7,     8,    12,
-      12,    14,    14,    13,    14,    15,    16,    17,    18,     0,
-      19,    19,    19,    18,    10,    18,    14,    14,    12,    14,
-      -1,    14,    14
+       3,     4,     5,     6,     7,     8,    21,     2,     3,    19,
+      13,    14,    15,    16,    17,    18,     6,     7,     8,    14,
+      12,    18,    14,    13,    14,    15,    16,    17,    18,     0,
+      19,    21,    10,    11,    12,    12,    19,    14,    19,    18,
+      10,    14,    14,    12,    -1,    -1,    14,    14,    14
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -630,9 +619,10 @@ static const yytype_int8 yycheck[] =
 static const yytype_uint8 yystos[] =
 {
        0,     3,     4,     5,     6,     7,     8,    13,    14,    15,
-      16,    17,    18,    22,    23,    24,    25,    19,    19,    19,
-      19,    18,    10,    11,    12,     0,    24,    10,    12,    14,
-      18,    14,    12,    14,    14,    12,    14,    14
+      16,    17,    18,    23,    24,    25,    27,    21,    26,    26,
+      26,    19,    18,    10,    11,    12,     0,    25,    26,    19,
+      19,    19,    10,    12,    14,    18,    14,    12,    14,    14,
+      12,    14,    14
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -662,18 +652,17 @@ static const yytype_uint8 yystos[] =
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
+#define YYBACKUP(Token, Value)					\
+do								\
+  if (yychar == YYEMPTY && yylen == 1)				\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
+      YYPOPSTACK (1);						\
+      goto yybackup;						\
+    }								\
+  else								\
+    {								\
       yyerror (tsrm_ls, YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
@@ -683,33 +672,32 @@ while (YYID (0))
 #define YYTERROR	1
 #define YYERRCODE	256
 
+
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-    do                                                                  \
-      if (YYID (N))                                                     \
-        {                                                               \
-          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-        }                                                               \
-      else                                                              \
-        {                                                               \
-          (Current).first_line   = (Current).last_line   =              \
-            YYRHSLOC (Rhs, 0).last_line;                                \
-          (Current).first_column = (Current).last_column =              \
-            YYRHSLOC (Rhs, 0).last_column;                              \
-        }                                                               \
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (YYID (N))                                                    \
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
     while (YYID (0))
 #endif
 
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-
-
 
 /* This macro is provided for backward compatibility. */
 
@@ -770,8 +758,6 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep, tsrm_ls)
     void *tsrm_ls;
 #endif
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
   if (!yyvaluep)
     return;
   YYUSE (tsrm_ls);
@@ -1026,12 +1012,12 @@ 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 (0, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
   YYSIZE_T yysize1;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
+  const char *yyformat = 0;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per
@@ -1091,7 +1077,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                     break;
                   }
                 yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
+                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
                 if (! (yysize <= yysize1
                        && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
                   return 2;
@@ -1185,6 +1171,20 @@ yydestruct (yymsg, yytype, yyvaluep, tsrm_ls)
 }
 
 
+/* Prevent warnings from -Wmissing-prototypes.  */
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *tsrm_ls);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
 
 
 /*----------.
@@ -1230,7 +1230,7 @@ YYSTYPE yylval;
        `yyss': related to states.
        `yyvs': related to semantic values.
 
-       Refer to the stacks through separate pointers, to allow yyoverflow
+       Refer to the stacks thru separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1284,6 +1284,7 @@ YYSTYPE yylval;
      The wasted elements are never initialized.  */
   yyssp = yyss;
   yyvsp = yyvs;
+
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1461,26 +1462,37 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-/* Line 1802 of yacc.c  */
-#line 67 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 68 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[(1) - (1)])); }
     break;
 
   case 5:
-/* Line 1802 of yacc.c  */
-#line 72 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 73 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[(1) - (1)])); }
     break;
 
   case 6:
-/* Line 1802 of yacc.c  */
-#line 73 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 74 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { phpdbg_stack_push(PHPDBG_G(parser_stack), &(yyvsp[(2) - (2)])); }
     break;
 
   case 7:
-/* Line 1802 of yacc.c  */
-#line 77 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 75 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
+    { (yyval) = (yyvsp[(1) - (2)]); }
+    break;
+
+  case 8:
+
+/* Line 1806 of yacc.c  */
+#line 79 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { 	
 		(yyval).type = FILE_PARAM;
 		(yyval).file.name = (yyvsp[(2) - (3)]).str;
@@ -1488,9 +1500,10 @@ yyreduce:
 	}
     break;
 
-  case 8:
-/* Line 1802 of yacc.c  */
-#line 82 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 9:
+
+/* Line 1806 of yacc.c  */
+#line 84 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     {
 		(yyval).type = NUMERIC_FILE_PARAM;
 		(yyval).file.name = (yyvsp[(1) - (4)]).str;
@@ -1498,9 +1511,10 @@ yyreduce:
 	}
     break;
 
-  case 9:
-/* Line 1802 of yacc.c  */
-#line 87 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 10:
+
+/* Line 1806 of yacc.c  */
+#line 89 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     {
 		(yyval).type = FILE_PARAM;
 		(yyval).file.name = malloc((yyvsp[(1) - (4)]).len + (yyvsp[(2) - (4)]).len + 1);
@@ -1513,9 +1527,10 @@ yyreduce:
 	}
     break;
 
-  case 10:
-/* Line 1802 of yacc.c  */
-#line 97 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 11:
+
+/* Line 1806 of yacc.c  */
+#line 99 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     {
 		(yyval).type = NUMERIC_FILE_PARAM;
 		(yyval).file.name = malloc((yyvsp[(1) - (5)]).len + (yyvsp[(2) - (5)]).len + 1);
@@ -1528,9 +1543,10 @@ yyreduce:
 	}
     break;
 
-  case 11:
-/* Line 1802 of yacc.c  */
-#line 107 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 12:
+
+/* Line 1806 of yacc.c  */
+#line 109 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { 
 		(yyval).type = METHOD_PARAM;
 		(yyval).method.class = (yyvsp[(1) - (3)]).str;
@@ -1538,9 +1554,10 @@ yyreduce:
 	}
     break;
 
-  case 12:
-/* Line 1802 of yacc.c  */
-#line 112 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 13:
+
+/* Line 1806 of yacc.c  */
+#line 114 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { 
 		(yyval).type = NUMERIC_METHOD_PARAM;
 		(yyval).method.class = (yyvsp[(1) - (5)]).str;
@@ -1549,9 +1566,10 @@ yyreduce:
 	}
     break;
 
-  case 13:
-/* Line 1802 of yacc.c  */
-#line 118 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 14:
+
+/* Line 1806 of yacc.c  */
+#line 120 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     {
 		(yyval).type = NUMERIC_FUNCTION_PARAM;
 		(yyval).str = (yyvsp[(1) - (3)]).str;
@@ -1560,9 +1578,10 @@ yyreduce:
 	}
     break;
 
-  case 14:
-/* Line 1802 of yacc.c  */
-#line 124 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 15:
+
+/* Line 1806 of yacc.c  */
+#line 126 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     {
 		(yyval).type = COND_PARAM; 
 		(yyval).str = (yyvsp[(2) - (2)]).str;
@@ -1570,90 +1589,109 @@ yyreduce:
 	}
     break;
 
-  case 15:
-/* Line 1802 of yacc.c  */
-#line 129 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
-    { (yyval) = (yyvsp[(1) - (1)]); }
-    break;
-
   case 16:
-/* Line 1802 of yacc.c  */
-#line 130 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 131 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 17:
-/* Line 1802 of yacc.c  */
-#line 131 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 132 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 18:
-/* Line 1802 of yacc.c  */
-#line 132 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 133 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 19:
-/* Line 1802 of yacc.c  */
-#line 133 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 134 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 20:
-/* Line 1802 of yacc.c  */
-#line 134 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 135 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 21:
-/* Line 1802 of yacc.c  */
-#line 135 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 136 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { (yyval) = (yyvsp[(1) - (1)]); }
     break;
 
   case 22:
-/* Line 1802 of yacc.c  */
-#line 139 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 1806 of yacc.c  */
+#line 137 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
+    { (yyval) = (yyvsp[(1) - (1)]); }
+    break;
+
+  case 23:
+
+/* Line 1806 of yacc.c  */
+#line 141 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
+    { PHPDBG_G(req_id) = (yyvsp[(1) - (1)]).num; }
+    break;
+
+  case 25:
+
+/* Line 1806 of yacc.c  */
+#line 146 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { 
 		(yyval).type = EVAL_PARAM; 
-		(yyval).str = (yyvsp[(2) - (2)]).str;
-		(yyval).len = (yyvsp[(2) - (2)]).len;
+		(yyval).str = (yyvsp[(3) - (3)]).str;
+		(yyval).len = (yyvsp[(3) - (3)]).len;
 	}
     break;
 
-  case 23:
-/* Line 1802 of yacc.c  */
-#line 144 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 26:
+
+/* Line 1806 of yacc.c  */
+#line 151 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { 	
 		(yyval).type = SHELL_PARAM; 
-		(yyval).str = (yyvsp[(2) - (2)]).str;
-		(yyval).len = (yyvsp[(2) - (2)]).len;
+		(yyval).str = (yyvsp[(3) - (3)]).str;
+		(yyval).len = (yyvsp[(3) - (3)]).len;
 	}
     break;
 
-  case 24:
-/* Line 1802 of yacc.c  */
-#line 149 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 27:
+
+/* Line 1806 of yacc.c  */
+#line 156 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     {
 		(yyval).type = RUN_PARAM;
 		(yyval).len = 0;
 	}
     break;
 
-  case 25:
-/* Line 1802 of yacc.c  */
-#line 153 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+  case 28:
+
+/* Line 1806 of yacc.c  */
+#line 160 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
     { 	
 		(yyval).type = RUN_PARAM; 
-		(yyval).str = (yyvsp[(2) - (2)]).str;
-		(yyval).len = (yyvsp[(2) - (2)]).len;
+		(yyval).str = (yyvsp[(3) - (3)]).str;
+		(yyval).len = (yyvsp[(3) - (3)]).len;
 	}
     break;
 
 
-/* Line 1802 of yacc.c  */
-#line 1657 "sapi/phpdbg/phpdbg_parser.c"
+
+/* Line 1806 of yacc.c  */
+#line 1695 "sapi/phpdbg/phpdbg_parser.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -1840,7 +1878,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined yyoverflow || YYERROR_VERBOSE
+#if !defined(yyoverflow) || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -1882,12 +1920,13 @@ yyreturn:
 }
 
 
-/* Line 2048 of yacc.c  */
-#line 160 "/var/root/php-src/sapi/phpdbg/phpdbg_parser.y"
+
+/* Line 2067 of yacc.c  */
+#line 167 "/root/php-src-xml-data-phpdbg/sapi/phpdbg/phpdbg_parser.y"
 
 
 static int yyerror(void ***tsrm_ls, const char *msg) {
-	phpdbg_error("Parse Error: %s", msg);
+	phpdbg_error("command", "type=\"parseerror\" msg=\"%s\"", "Parse Error: %s", msg);
 
 	{
 		const phpdbg_param_t *top = PHPDBG_G(parser_stack);
@@ -1909,3 +1948,4 @@ int phpdbg_do_parse(phpdbg_param_t *stack, char *input TSRMLS_DC) {
 	return yyparse(NULL);
 #endif
 }
+