execute new stack now

1 files changed, 132 insertions, 126 deletions

diff --git a/phpdbg_lexer.c b/phpdbg_lexer.c
index e9e243c5e5..9999a63978 100644
--- a/phpdbg_lexer.c
+++ b/phpdbg_lexer.c
@@ -379,16 +379,16 @@ static yyconst flex_int32_t yy_ec[256] =
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    4,    1,    5,    6,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    7,    1,    1,    8,    9,    9,
-        9,    9,    9,    9,    9,    9,    9,   10,    1,    1,
-        1,    1,    1,    1,   11,   12,   13,   14,   15,   16,
-        7,   17,   18,    7,    7,   19,    7,   20,   21,    7,
-        7,   22,   23,   24,   25,   26,    7,    7,   27,    7,
-        1,   28,    1,    1,    7,    1,   29,   30,   13,   31,
-
-       32,   33,    7,   34,   35,    7,    7,   36,    7,   37,
-       38,    7,    7,   39,   40,   41,   42,   43,    7,   44,
-       45,    7,    1,    1,    1,    1,    7,    7,    7,    7,
+        1,    1,    1,    1,    7,    8,    8,    9,   10,   10,
+       10,   10,   10,   10,   10,   10,   10,   11,    1,    1,
+        1,    1,    1,    1,   12,   13,   14,   15,   16,   17,
+        7,   18,   19,    7,    7,   20,    7,   21,   22,    7,
+        7,   23,   24,   25,   26,   27,    7,    7,   28,    7,
+        1,   29,    1,    1,    7,    1,   30,   31,   14,   32,
+
+       33,   34,    7,   35,   36,    7,    7,   37,    7,   38,
+       39,    7,    7,   40,   41,   42,   43,   44,    7,   45,
+       46,    7,    1,    1,    1,    1,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
@@ -405,29 +405,29 @@ static yyconst flex_int32_t yy_ec[256] =
         7,    7,    7,    7,    7
     } ;
 
-static yyconst flex_int32_t yy_meta[46] =
+static yyconst flex_int32_t yy_meta[47] =
     {   0,
-        1,    1,    2,    3,    1,    4,    5,    4,    4,    1,
+        1,    1,    2,    3,    1,    4,    5,    4,    4,    4,
+        1,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+        5,    5,    5,    5,    5,    5,    5,    5,    1,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    1,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5
+        5,    5,    5,    5,    5,    5
     } ;
 
 static yyconst flex_int16_t yy_base[107] =
     {   0,
-        0,    0,   44,   47,  160,  136,   50,   53,   62,   57,
-       85,   60,   63,  433,  113,   63,   91,   64,   89,  112,
-       41,   90,  118,  153,    0,   75,  135,  101,  126,  162,
-      140,  147,  112,   95,  162,  170,  168,   66,  150,  174,
-      190,  178,  211,  171,  199,  218,  195,  197,  198,  219,
-      220,  230,  221,  241,  231,    0,  199,  196,  433,  100,
-      252,  199,    0,  281,    0,  240,  267,  259,  270,  232,
-      280,  285,  278,   90,  320,    0,  289,  314,  296,  319,
-      317,  309,  262,   86,  320,  325,  323,  324,  264,  346,
-      348,  349,  347,  350,  433,  385,  390,  395,  400,  405,
-
-      410,  415,  420,   69,  425,  427
+        0,    0,   45,   48,  148,  133,   51,   54,   57,   59,
+       88,   57,   62,  448,  117,   65,   94,   95,  113,  120,
+      115,   64,  124,  160,    0,   72,   75,  105,   71,  170,
+      173,  174,  116,   94,  177,  104,  181,  119,  123,  184,
+      206,  187,  227,  164,  215,  234,  182,  128,  148,  213,
+      185,  236,  237,  243,  212,    0,  220,  101,  448,   92,
+      266,  272,    0,  295,    0,  280,  255,  289,  266,  214,
+      292,  298,  258,   79,  334,    0,  302,  328,  294,  333,
+      331,  322,  216,   76,  334,  340,  336,  338,  219,  359,
+      362,  364,  361,  363,  448,  400,  405,  410,  415,  420,
+
+      425,  430,  435,   64,  440,  442
     } ;
 
 static yyconst flex_int16_t yy_def[107] =
@@ -446,116 +446,122 @@ static yyconst flex_int16_t yy_def[107] =
        95,   95,   95,   95,   95,   95
     } ;
 
-static yyconst flex_int16_t yy_nxt[479] =
+static yyconst flex_int16_t yy_nxt[495] =
     {   0,
-        6,    7,    8,    9,   10,    6,   11,   12,   13,   14,
-       11,   11,   11,   15,   16,   17,   11,   18,   11,   19,
-       20,   11,   21,   22,   11,   11,   23,   24,   11,   11,
-       15,   16,   17,   11,   18,   11,   19,   20,   11,   21,
-       22,   11,   11,   11,   23,   26,   27,   26,   26,   27,
-       26,   30,   30,   31,   30,   30,   31,   52,   38,   29,
-       33,   34,   29,   31,   31,   31,   35,   42,   42,   29,
-       42,   42,   29,   74,   52,   38,   57,   31,   57,   48,
-       38,   38,   45,   38,   36,   28,   28,   28,   46,   28,
-       37,   83,   39,   39,   40,   83,   48,   38,   38,   45,
-
-       38,   47,   95,   43,   29,   46,   38,   38,   38,   49,
-       29,   53,   41,   28,   28,   28,   59,   28,   37,   47,
-       39,   39,   40,   38,   38,   38,   49,   50,   53,   38,
-       44,   51,   54,   58,   58,   38,   31,   31,   31,   60,
-       41,   31,   31,   31,   50,   29,   38,   44,   51,   54,
-       33,   34,   38,   28,   28,   28,   35,   28,   28,   95,
-       28,   28,   29,   30,   30,   31,   59,   38,   95,   61,
-       61,   29,   28,   33,   36,   62,   62,   29,   95,   35,
-       28,   58,   58,   63,   38,   42,   42,   29,   38,   60,
-       28,   28,   28,   66,   28,   28,   95,   28,   28,   29,
-
-       57,   31,   57,   58,   58,   38,   62,   62,   29,   67,
-       66,   95,   38,   69,   38,   38,   38,   28,   65,   65,
-       29,   65,   65,   65,   65,   65,   65,   67,   68,   38,
-       69,   38,   38,   38,   70,   38,   38,   38,   38,   65,
-       65,   65,   65,   65,   71,   72,   68,   38,   38,   38,
-       77,   70,   38,   38,   38,   38,   59,   38,   38,   61,
-       61,   71,   72,   73,   38,   38,   38,   95,   77,   89,
-       89,   89,   89,   95,   38,   38,   38,   79,   78,   60,
-       73,   28,   28,   28,   38,   28,   28,   38,   76,   76,
-       40,   95,   80,   38,   79,   38,   78,   38,   81,   82,
-
-       85,   38,   38,   95,   38,   95,   38,   95,   41,   80,
-       95,   95,   38,   38,   38,   81,   82,   95,   85,   38,
-       28,   28,   28,   38,   28,   28,   38,   76,   76,   40,
-       38,   38,   86,   87,   38,   88,   38,   38,   90,   91,
-       38,   38,   38,   38,   95,   95,   95,   41,   38,   86,
-       87,   38,   88,   38,   38,   90,   91,   38,   38,   38,
-       92,   93,   94,   38,   38,   38,   38,   38,   95,   95,
-       95,   95,   95,   95,   95,   95,   95,   92,   93,   94,
-       38,   38,   38,   38,   38,   25,   25,   25,   25,   25,
-       28,   28,   95,   28,   28,   32,   32,   32,   32,   32,
-
-       38,   38,   95,   38,   38,   55,   55,   95,   55,   55,
-       56,   95,   56,   56,   56,   33,   33,   33,   33,   33,
-       64,   64,   95,   64,   64,   75,   75,   95,   75,   75,
-       84,   84,    5,   95,   95,   95,   95,   95,   95,   95,
+        6,    7,    8,    9,   10,    6,   11,    6,   12,   13,
+       14,   11,   11,   11,   15,   16,   17,   11,   18,   11,
+       19,   20,   11,   21,   22,   11,   11,   23,   24,   11,
+       11,   15,   16,   17,   11,   18,   11,   19,   20,   11,
+       21,   22,   11,   11,   11,   23,   26,   27,   26,   26,
+       27,   26,   30,   30,   31,   30,   30,   31,   31,   31,
+       31,   29,   33,   34,   29,   42,   42,   29,   74,   35,
+       42,   42,   29,   57,   31,   57,   31,   31,   31,   58,
+       58,   83,   38,   38,   83,   45,   53,   36,   28,   28,
+       28,   46,   28,   37,   95,   39,   39,   39,   40,   38,
+
+       38,   43,   45,   53,   29,   47,   28,   33,   46,   58,
+       58,   48,   38,   38,   35,   29,   41,   28,   28,   28,
+       59,   28,   37,   47,   39,   39,   39,   40,   48,   38,
+       38,   38,   52,   38,   49,   44,   50,   38,   38,   54,
+       51,   38,   38,   29,   60,   41,   38,   95,   38,   52,
+       38,   49,   44,   50,   38,   38,   54,   51,   38,   38,
+       28,   28,   28,   38,   28,   28,   38,   28,   28,   28,
+       29,   30,   30,   31,   31,   31,   31,   33,   34,   95,
+       29,   59,   38,   38,   35,   61,   61,   66,   28,   62,
+       62,   29,   58,   58,   63,   42,   42,   29,   95,   38,
+
+       38,   69,   36,   38,   66,   60,   28,   28,   28,   95,
+       28,   28,   95,   28,   28,   28,   29,   38,   69,   95,
+       38,   57,   31,   57,   89,   89,   67,   89,   89,   70,
+       38,   38,   38,   38,   28,   65,   65,   29,   65,   65,
+       65,   65,   65,   65,   67,   68,   70,   38,   38,   38,
+       38,   71,   38,   95,   38,   38,   65,   65,   65,   65,
+       65,   38,   72,   68,   95,   95,   73,   78,   71,   38,
+       59,   38,   38,   38,   61,   61,   38,   95,   38,   72,
+       62,   62,   29,   73,   38,   78,   95,   95,   95,   80,
+       38,   77,   95,   38,   60,   28,   28,   28,   38,   28,
+
+       28,   38,   76,   76,   76,   40,   80,   38,   79,   77,
+       38,   81,   38,   82,   85,   38,   38,   95,   95,   95,
+       38,   95,   95,   41,   38,   79,   95,   38,   81,   38,
+       82,   95,   85,   38,   28,   28,   28,   38,   28,   28,
+       38,   76,   76,   76,   40,   95,   38,   86,   87,   38,
+       88,   38,   38,   90,   38,   91,   38,   38,   38,   95,
+       95,   95,   41,   38,   86,   87,   38,   88,   38,   38,
+       90,   38,   91,   38,   92,   38,   93,   38,   94,   38,
+       38,   38,   38,   95,   95,   95,   95,   95,   95,   95,
+       95,   92,   95,   93,   38,   94,   38,   38,   38,   38,
+
+       25,   25,   25,   25,   25,   28,   28,   95,   28,   28,
+       32,   32,   32,   32,   32,   38,   38,   95,   38,   38,
+       55,   55,   95,   55,   55,   56,   95,   56,   56,   56,
+       33,   33,   33,   33,   33,   64,   64,   95,   64,   64,
+       75,   75,   95,   75,   75,   84,   84,    5,   95,   95,
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
        95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
        95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
        95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
-       95,   95,   95,   95,   95,   95,   95,   95
+       95,   95,   95,   95
+
     } ;
 
-static yyconst flex_int16_t yy_chk[479] =
+static yyconst flex_int16_t yy_chk[495] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    3,    3,    3,    4,    4,
-        4,    7,    7,    7,    8,    8,    8,   21,   21,    7,
-       10,   10,    8,    9,    9,    9,   10,   12,   12,   12,
-       13,   13,   13,  104,   21,   21,   26,   26,   26,   18,
-       16,   18,   16,   38,   10,   11,   11,   11,   16,   11,
-       11,   84,   11,   11,   11,   74,   18,   16,   18,   16,
-
-       38,   17,   60,   12,   34,   16,   19,   22,   17,   19,
-       28,   22,   11,   15,   15,   15,   33,   15,   15,   17,
-       15,   15,   15,   19,   22,   17,   19,   20,   22,   20,
-       15,   20,   23,   29,   29,   23,   27,   27,   27,   33,
-       15,   31,   31,   31,   20,    6,   20,   15,   20,   23,
-       32,   32,   23,   24,   24,   24,   32,   24,   24,    5,
-       24,   24,   24,   30,   30,   30,   35,   39,    0,   35,
-       35,   30,   36,   36,   32,   37,   37,   37,    0,   36,
-       24,   40,   40,   40,   39,   42,   42,   42,   44,   35,
-       41,   41,   41,   44,   41,   41,    0,   41,   41,   41,
-
-       57,   57,   57,   58,   58,   44,   62,   62,   62,   45,
-       44,    0,   47,   47,   48,   49,   45,   41,   43,   43,
-       43,   43,   43,   43,   43,   43,   43,   45,   46,   47,
-       47,   48,   49,   45,   50,   46,   50,   51,   53,   43,
-       43,   43,   43,   43,   52,   53,   46,   52,   55,   70,
-       66,   50,   46,   50,   51,   53,   61,   66,   54,   61,
-       61,   52,   53,   54,   52,   55,   70,    0,   66,   83,
-       83,   89,   89,    0,   66,   54,   68,   68,   67,   61,
-       54,   64,   64,   64,   67,   64,   64,   69,   64,   64,
-       64,    0,   69,   68,   68,   73,   67,   71,   71,   72,
-
-       77,   67,   72,    0,   69,    0,   77,    0,   64,   69,
-        0,    0,   73,   79,   71,   71,   72,    0,   77,   72,
-       75,   75,   75,   77,   75,   75,   82,   75,   75,   75,
-       79,   78,   78,   80,   81,   81,   80,   85,   85,   86,
-       87,   88,   86,   82,    0,    0,    0,   75,   78,   78,
-       80,   81,   81,   80,   85,   85,   86,   87,   88,   86,
-       90,   91,   92,   90,   93,   91,   92,   94,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   90,   91,   92,
-       90,   93,   91,   92,   94,   96,   96,   96,   96,   96,
-       97,   97,    0,   97,   97,   98,   98,   98,   98,   98,
-
-       99,   99,    0,   99,   99,  100,  100,    0,  100,  100,
-      101,    0,  101,  101,  101,  102,  102,  102,  102,  102,
-      103,  103,    0,  103,  103,  105,  105,    0,  105,  105,
-      106,  106,   95,   95,   95,   95,   95,   95,   95,   95,
+        1,    1,    1,    1,    1,    1,    3,    3,    3,    4,
+        4,    4,    7,    7,    7,    8,    8,    8,    9,    9,
+        9,    7,   10,   10,    8,   12,   12,   12,  104,   10,
+       13,   13,   13,   26,   26,   26,   27,   27,   27,   29,
+       29,   84,   22,   16,   74,   16,   22,   10,   11,   11,
+       11,   16,   11,   11,   60,   11,   11,   11,   11,   22,
+
+       16,   12,   16,   22,   34,   17,   36,   36,   16,   58,
+       58,   18,   17,   18,   36,   28,   11,   15,   15,   15,
+       33,   15,   15,   17,   15,   15,   15,   15,   18,   17,
+       18,   19,   21,   21,   19,   15,   20,   38,   20,   23,
+       20,   39,   23,    6,   33,   15,   48,    5,   19,   21,
+       21,   19,   15,   20,   38,   20,   23,   20,   39,   23,
+       24,   24,   24,   48,   24,   24,   49,   24,   24,   24,
+       24,   30,   30,   30,   31,   31,   31,   32,   32,    0,
+       30,   35,   44,   49,   32,   35,   35,   44,   24,   37,
+       37,   37,   40,   40,   40,   42,   42,   42,    0,   44,
+
+       47,   47,   32,   51,   44,   35,   41,   41,   41,    0,
+       41,   41,    0,   41,   41,   41,   41,   47,   47,    0,
+       51,   57,   57,   57,   83,   83,   45,   89,   89,   50,
+       55,   50,   70,   45,   41,   43,   43,   43,   43,   43,
+       43,   43,   43,   43,   45,   46,   50,   55,   50,   70,
+       45,   52,   46,    0,   52,   53,   43,   43,   43,   43,
+       43,   54,   53,   46,    0,    0,   54,   67,   52,   46,
+       61,   52,   53,   67,   61,   61,   73,    0,   54,   53,
+       62,   62,   62,   54,   69,   67,    0,    0,    0,   69,
+       67,   66,    0,   73,   61,   64,   64,   64,   66,   64,
+
+       64,   69,   64,   64,   64,   64,   69,   68,   68,   66,
+       71,   71,   79,   72,   77,   66,   72,    0,    0,    0,
+       77,    0,    0,   64,   68,   68,    0,   71,   71,   79,
+       72,    0,   77,   72,   75,   75,   75,   77,   75,   75,
+       82,   75,   75,   75,   75,    0,   78,   78,   80,   81,
+       81,   80,   85,   85,   87,   86,   88,   82,   86,    0,
+        0,    0,   75,   78,   78,   80,   81,   81,   80,   85,
+       85,   87,   86,   88,   90,   86,   91,   90,   92,   93,
+       91,   94,   92,    0,    0,    0,    0,    0,    0,    0,
+        0,   90,    0,   91,   90,   92,   93,   91,   94,   92,
+
+       96,   96,   96,   96,   96,   97,   97,    0,   97,   97,
+       98,   98,   98,   98,   98,   99,   99,    0,   99,   99,
+      100,  100,    0,  100,  100,  101,    0,  101,  101,  101,
+      102,  102,  102,  102,  102,  103,  103,    0,  103,  103,
+      105,  105,    0,  105,  105,  106,  106,   95,   95,   95,
        95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
        95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
        95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
-       95,   95,   95,   95,   95,   95,   95,   95
+       95,   95,   95,   95,   95,   95,   95,   95,   95,   95,
+       95,   95,   95,   95
+
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -581,7 +587,7 @@ static yyconst flex_int16_t yy_chk[479] =
 #include <string.h>
 
 #define YY_NO_UNISTD_H 1
-#line 585 "sapi/phpdbg/phpdbg_lexer.c"
+#line 591 "sapi/phpdbg/phpdbg_lexer.c"
 
 #define INITIAL 0
 #define RAW 1
@@ -821,7 +827,7 @@ YY_DECL
 
 #line 47 "sapi/phpdbg/dev/phpdbg_lexer.l"
 
-#line 825 "sapi/phpdbg/phpdbg_lexer.c"
+#line 831 "sapi/phpdbg/phpdbg_lexer.c"
 
     yylval = yylval_param;
 
@@ -1060,7 +1066,7 @@ YY_RULE_SETUP
 #line 136 "sapi/phpdbg/dev/phpdbg_lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 1064 "sapi/phpdbg/phpdbg_lexer.c"
+#line 1070 "sapi/phpdbg/phpdbg_lexer.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(RAW):
 	yyterminate();