Fix various Windows issues (e.g. dir separators)

diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c
index 4a27b3deac47be799931604050e987c6a1b11455..60c68e2cc35a45f9cdd8f3df87714d553819bccf 100644 (file)
--- a/sapi/phpdbg/phpdbg_bp.c
+++ b/sapi/phpdbg/phpdbg_bp.c
@@ -310,7 +310,13 @@ PHPDBG_API HashTable *phpdbg_resolve_pending_file_break_ex(const char *file, uin
 {
        phpdbg_debug("file: %s, filelen: %u, cur: %s, curlen %u, pos: %c, memcmp: %d\n", file, filelen, ZSTR_VAL(cur), ZSTR_LEN(cur), filelen > ZSTR_LEN(cur) ? file[filelen - ZSTR_LEN(cur) - 1] : '?', filelen > ZSTR_LEN(cur) ? memcmp(file + filelen - ZSTR_LEN(cur), ZSTR_VAL(cur), ZSTR_LEN(cur)) : 0);
 
-       if (((ZSTR_LEN(cur) < filelen && file[filelen - ZSTR_LEN(cur) - 1] == '/') || filelen == ZSTR_LEN(cur)) && !memcmp(file + filelen - ZSTR_LEN(cur), ZSTR_VAL(cur), ZSTR_LEN(cur))) {
+#ifdef _WIN32
+# define WIN32_PATH_CHECK file[filelen - ZSTR_LEN(cur) - 1] == '\\'
+#else
+# define WIN32_PATH_CHECK 0
+#endif
+
+       if (((ZSTR_LEN(cur) < filelen && (file[filelen - ZSTR_LEN(cur) - 1] == '/' || WIN32_PATH_CHECK)) || filelen == ZSTR_LEN(cur)) && !memcmp(file + filelen - ZSTR_LEN(cur), ZSTR_VAL(cur), ZSTR_LEN(cur))) {
                phpdbg_breakfile_t *brake, new_brake;
                HashTable *master;
 

diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c
index d1474dc252cbf21a368e067513076b9149486c27..6b503f04ed879a46988f8b7902db2374f3746cc0 100644 (file)
--- a/sapi/phpdbg/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c
@@ -1,5 +1,5 @@
 /* Generated by re2c 0.13.5 */
-#line 1 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 1 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
 /*
  * phpdbg_lexer.l
  */
@@ -16,6 +16,7 @@
 #define YYGETCONDITION() LEX(state)
 #define YYCURSOR LEX(cursor)
 #define YYMARKER LEX(marker)
+#define YYCTXMARKER LEX(ctxmarker)
 #define yyleng LEX(len)
 #define yytext ((char*) LEX(text))
 #undef YYDEBUG
@@ -44,7 +45,7 @@ restart:
        LEX(text) = YYCURSOR;
 
 
-#line 49 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 49 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
@@ -65,38 +66,38 @@ restart:
 yyc_INITIAL:
        {
                static const unsigned char yybm[] = {
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0, 192,  96,   0,   0, 192,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                       192,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0, 192,  96,   0,   0, 192,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                       192,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
                };
 
                YYDEBUG(0, *YYCURSOR);
@@ -149,14 +150,14 @@ yy2:
 yy3:
                YYDEBUG(3, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 176 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 176 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(NORMAL);
 
        YYCURSOR = LEX(text);
        goto restart;
 }
-#line 161 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 161 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy4:
                YYDEBUG(4, *YYCURSOR);
                ++YYCURSOR;
@@ -171,11 +172,11 @@ yy4:
 yy6:
                YYDEBUG(6, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 180 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 180 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy7:
                YYDEBUG(7, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -242,13 +243,13 @@ yy16:
                }
                YYDEBUG(18, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 163 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 163 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(PRE_RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_RUN;
 }
-#line 253 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 253 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy19:
                YYDEBUG(19, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -275,13 +276,13 @@ yy20:
 yy22:
                YYDEBUG(22, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 158 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 158 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(PRE_RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_SHELL;
 }
-#line 286 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 286 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy23:
                YYDEBUG(23, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -308,13 +309,13 @@ yy24:
 yy26:
                YYDEBUG(26, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 153 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 153 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(PRE_RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_EVAL;
 }
-#line 319 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 319 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy27:
                YYDEBUG(27, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -333,50 +334,50 @@ yy29:
                if (yych == '\n') goto yy4;
                YYDEBUG(30, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 147 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 344 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 344 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
        }
 /* *********************************** */
 yyc_NORMAL:
        {
                static const unsigned char yybm[] = {
-                         0,   8,   8,   8,   8,   8,   8,   8,
-                         8,  66,  68,   8,   8,  66,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                        66,   8,   8,   0,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,  24,   8,
-                       152, 152, 152, 152, 152, 152, 152, 152,
-                       152, 152,   0,   8,   8,   8,   8,   8,
-                         8, 168, 168, 168, 168, 168, 168,  40,
-                        40,  40,  40,  40,  40,  40,  40,  40,
-                        40,  40,  40,  40,  40,  40,  40,  40,
-                        40,  40,  40,   8,   8,   8,   8,   8,
-                         8, 168, 168, 168, 168, 168, 168,  40,
-                        40,  40,  40,  40,  40,  40,  40,  40,
-                        40,  40,  40,  40,  40,  40,  40,  40,
-                        40,  40,  40,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
-                         8,   8,   8,   8,   8,   8,   8,   8,
+                         0,   8,   8,   8,   8,   8,   8,   8, 
+                         8,  66,  68,   8,   8,  66,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                        66,   8,   8,   0,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,  24,   8, 
+                       152, 152, 152, 152, 152, 152, 152, 152, 
+                       152, 152,   0,   8,   8,   8,   8,   8, 
+                         8, 168, 168, 168, 168, 168, 168,  40, 
+                        40,  40,  40,  40,  40,  40,  40,  40, 
+                        40,  40,  40,  40,  40,  40,  40,  40, 
+                        40,  40,  40,   8,   8,   8,   8,   8, 
+                         8, 168, 168, 168, 168, 168, 168,  40, 
+                        40,  40,  40,  40,  40,  40,  40,  40, 
+                        40,  40,  40,  40,  40,  40,  40,  40, 
+                        40,  40,  40,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
+                         8,   8,   8,   8,   8,   8,   8,   8, 
                };
                YYDEBUG(31, *YYCURSOR);
                YYFILL(11);
@@ -482,13 +483,13 @@ yy33:
                if (yych == '\n') goto yy36;
                YYDEBUG(35, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 147 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 493 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 493 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy36:
                YYDEBUG(36, *YYCURSOR);
                ++YYCURSOR;
@@ -503,11 +504,11 @@ yy36:
 yy38:
                YYDEBUG(38, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 512 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 512 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy39:
                YYDEBUG(39, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -519,25 +520,25 @@ yy40:
                if (yybm[0+yych] & 16) {
                        goto yy45;
                }
-               if (yych == 'r') goto yy113;
+               if (yych == 'r') goto yy114;
                goto yy44;
 yy41:
                YYDEBUG(41, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 133 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 133 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, STR_PARAM);
        yylval->str = zend_strndup(yytext, yyleng);
        yylval->len = yyleng;
        return T_ID;
 }
-#line 536 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 536 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy42:
                YYDEBUG(42, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'F') goto yy109;
-               if (yych == 'f') goto yy109;
+               if (yych == 'F') goto yy110;
+               if (yych == 'f') goto yy110;
                goto yy44;
 yy43:
                YYDEBUG(43, *YYCURSOR);
@@ -551,7 +552,7 @@ yy44:
                        goto yy43;
                }
                if (yych <= '9') goto yy41;
-               goto yy65;
+               goto yy67;
 yy45:
                YYDEBUG(45, *YYCURSOR);
                yyaccept = 1;
@@ -574,20 +575,20 @@ yy45:
                                if (yych <= ' ') goto yy47;
                                if (yych <= '"') goto yy43;
                        } else {
-                               if (yych == ':') goto yy65;
+                               if (yych == ':') goto yy67;
                                goto yy43;
                        }
                }
 yy47:
                YYDEBUG(47, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 114 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 114 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, NUMERIC_PARAM);
        yylval->num = atoi(yytext);
        return T_DIGITS;
 }
-#line 592 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 592 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy48:
                YYDEBUG(48, *YYCURSOR);
                yyaccept = 1;
@@ -610,7 +611,7 @@ yy48:
                                if (yych <= '"') goto yy44;
                                goto yy47;
                        } else {
-                               if (yych == 'x') goto yy105;
+                               if (yych == 'x') goto yy106;
                                goto yy44;
                        }
                }
@@ -618,44 +619,44 @@ yy49:
                YYDEBUG(49, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'I') goto yy99;
-               if (yych == 'i') goto yy99;
+               if (yych == 'I') goto yy100;
+               if (yych == 'i') goto yy100;
                goto yy44;
 yy50:
                YYDEBUG(50, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'N') goto yy94;
-               if (yych == 'n') goto yy94;
+               if (yych == 'N') goto yy95;
+               if (yych == 'n') goto yy95;
                goto yy44;
 yy51:
                YYDEBUG(51, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'A') goto yy91;
-               if (yych == 'a') goto yy91;
+               if (yych == 'A') goto yy92;
+               if (yych == 'a') goto yy92;
                goto yy44;
 yy52:
                YYDEBUG(52, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'O') goto yy87;
-               if (yych == 'o') goto yy87;
+               if (yych == 'O') goto yy88;
+               if (yych == 'o') goto yy88;
                goto yy44;
 yy53:
                YYDEBUG(53, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= 'N') {
-                       if (yych == 'F') goto yy86;
+                       if (yych == 'F') goto yy87;
                        if (yych <= 'M') goto yy44;
-                       goto yy80;
+                       goto yy81;
                } else {
                        if (yych <= 'f') {
                                if (yych <= 'e') goto yy44;
-                               goto yy86;
+                               goto yy87;
                        } else {
-                               if (yych == 'n') goto yy80;
+                               if (yych == 'n') goto yy81;
                                goto yy44;
                        }
                }
@@ -663,71 +664,46 @@ yy54:
                YYDEBUG(54, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'R') goto yy84;
-               if (yych == 'r') goto yy84;
+               if (yych == 'R') goto yy85;
+               if (yych == 'r') goto yy85;
                goto yy44;
 yy55:
                YYDEBUG(55, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'E') goto yy79;
-               if (yych == 'e') goto yy79;
+               if (yych == 'E') goto yy80;
+               if (yych == 'e') goto yy80;
                goto yy44;
 yy56:
                YYDEBUG(56, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'E') goto yy76;
+               if (yych == 'E') goto yy77;
                goto yy44;
 yy57:
                YYDEBUG(57, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'e') goto yy64;
+               if (yych == 'e') goto yy66;
                goto yy44;
 yy58:
                YYDEBUG(58, *YYCURSOR);
                ++YYCURSOR;
                YYDEBUG(59, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 92 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 92 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        return T_POUND;
 }
-#line 699 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 699 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy60:
                YYDEBUG(60, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == ':') goto yy62;
-               YYDEBUG(61, *YYCURSOR);
-               yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 98 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
-               {
-       return T_COLON;
-}
-#line 710 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy62:
-               YYDEBUG(62, *YYCURSOR);
-               ++YYCURSOR;
-               YYDEBUG(63, *YYCURSOR);
-               yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 95 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
-               {
-       return T_DCOLON;
-}
-#line 720 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy64:
-               YYDEBUG(64, *YYCURSOR);
-               yyaccept = 0;
-               yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'n') goto yy70;
-               goto yy44;
-yy65:
-               YYDEBUG(65, *YYCURSOR);
+               YYCTXMARKER = YYCURSOR + 1;
                yych = *++YYCURSOR;
-               if (yych == '/') goto yy67;
-yy66:
-               YYDEBUG(66, *YYCURSOR);
+               if (yych == ':') goto yy64;
+               if (yych != '\\') goto yy62;
+yy61:
+               YYDEBUG(61, *YYCURSOR);
                YYCURSOR = YYMARKER;
                if (yyaccept <= 2) {
                        if (yyaccept <= 1) {
@@ -737,351 +713,381 @@ yy66:
                                        goto yy47;
                                }
                        } else {
-                               goto yy75;
+                               goto yy76;
                        }
                } else {
                        if (yyaccept <= 3) {
-                               goto yy108;
+                               goto yy109;
                        } else {
-                               goto yy119;
+                               goto yy120;
                        }
                }
+yy62:
+               YYDEBUG(62, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(63, *YYCURSOR);
+               YYCURSOR = YYCTXMARKER;
+               yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 98 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+               {
+       return T_COLON;
+}
+#line 736 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy64:
+               YYDEBUG(64, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(65, *YYCURSOR);
+               yyleng = (size_t) YYCURSOR - (size_t) yytext;
+#line 95 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+               {
+       return T_DCOLON;
+}
+#line 746 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy66:
+               YYDEBUG(66, *YYCURSOR);
+               yyaccept = 0;
+               yych = *(YYMARKER = ++YYCURSOR);
+               if (yych == 'n') goto yy71;
+               goto yy44;
 yy67:
                YYDEBUG(67, *YYCURSOR);
                yych = *++YYCURSOR;
-               if (yych != '/') goto yy66;
+               if (yych != '/') goto yy61;
                YYDEBUG(68, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
+               if (yych != '/') goto yy61;
                YYDEBUG(69, *YYCURSOR);
+               ++YYCURSOR;
+               YYDEBUG(70, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 86 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 86 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, STR_PARAM);
        yylval->str = zend_strndup(yytext, yyleng);
        yylval->len = yyleng;
        return T_PROTO;
 }
-#line 766 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy70:
-               YYDEBUG(70, *YYCURSOR);
+#line 771 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy71:
+               YYDEBUG(71, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych != 'd') goto yy44;
-               YYDEBUG(71, *YYCURSOR);
+               YYDEBUG(72, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych != '_') goto yy44;
-yy72:
-               YYDEBUG(72, *YYCURSOR);
+yy73:
+               YYDEBUG(73, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy73;
+                       goto yy74;
                }
                goto yy44;
-yy73:
-               YYDEBUG(73, *YYCURSOR);
+yy74:
+               YYDEBUG(74, *YYCURSOR);
                yyaccept = 2;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(74, *YYCURSOR);
+               YYDEBUG(75, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy73;
+                       goto yy74;
                }
                if (yych <= 0x1F) {
                        if (yych <= '\n') {
-                               if (yych <= 0x00) goto yy75;
+                               if (yych <= 0x00) goto yy76;
                                if (yych <= 0x08) goto yy43;
                        } else {
                                if (yych != '\r') goto yy43;
                        }
                } else {
                        if (yych <= '#') {
-                               if (yych <= ' ') goto yy75;
+                               if (yych <= ' ') goto yy76;
                                if (yych <= '"') goto yy43;
                        } else {
-                               if (yych == ':') goto yy65;
+                               if (yych == ':') goto yy67;
                                goto yy43;
                        }
                }
-yy75:
-               YYDEBUG(75, *YYCURSOR);
+yy76:
+               YYDEBUG(76, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 126 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 126 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, OP_PARAM);
        yylval->str = zend_strndup(yytext, yyleng);
        yylval->len = yyleng;
        return T_OPCODE;
 }
-#line 820 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy76:
-               YYDEBUG(76, *YYCURSOR);
+#line 825 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy77:
+               YYDEBUG(77, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych != 'N') goto yy44;
-               YYDEBUG(77, *YYCURSOR);
+               YYDEBUG(78, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych != 'D') goto yy44;
-               YYDEBUG(78, *YYCURSOR);
+               YYDEBUG(79, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == '_') goto yy72;
+               if (yych == '_') goto yy73;
                goto yy44;
-yy79:
-               YYDEBUG(79, *YYCURSOR);
+yy80:
+               YYDEBUG(80, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'S') goto yy80;
+               if (yych == 'S') goto yy81;
                if (yych != 's') goto yy44;
-yy80:
-               YYDEBUG(80, *YYCURSOR);
+yy81:
+               YYDEBUG(81, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy81;
+                       goto yy82;
                }
                goto yy44;
-yy81:
-               YYDEBUG(81, *YYCURSOR);
+yy82:
+               YYDEBUG(82, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(82, *YYCURSOR);
+               YYDEBUG(83, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy81;
+                       goto yy82;
                }
-               YYDEBUG(83, *YYCURSOR);
+               YYDEBUG(84, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 102 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 102 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, NUMERIC_PARAM);
        yylval->num = 1;
        return T_TRUTHY;
 }
-#line 866 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy84:
-               YYDEBUG(84, *YYCURSOR);
-               yyaccept = 0;
-               yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'U') goto yy85;
-               if (yych != 'u') goto yy44;
+#line 871 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy85:
                YYDEBUG(85, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'E') goto yy80;
-               if (yych == 'e') goto yy80;
-               goto yy44;
+               if (yych == 'U') goto yy86;
+               if (yych != 'u') goto yy44;
 yy86:
                YYDEBUG(86, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'F') goto yy87;
-               if (yych != 'f') goto yy44;
+               if (yych == 'E') goto yy81;
+               if (yych == 'e') goto yy81;
+               goto yy44;
 yy87:
                YYDEBUG(87, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
+               if (yych == 'F') goto yy88;
+               if (yych != 'f') goto yy44;
+yy88:
+               YYDEBUG(88, *YYCURSOR);
+               yyaccept = 0;
+               yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '\f') {
                        if (yych <= 0x08) goto yy44;
                        if (yych >= '\v') goto yy44;
                } else {
-                       if (yych <= '\r') goto yy88;
+                       if (yych <= '\r') goto yy89;
                        if (yych != ' ') goto yy44;
                }
-yy88:
-               YYDEBUG(88, *YYCURSOR);
+yy89:
+               YYDEBUG(89, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(89, *YYCURSOR);
+               YYDEBUG(90, *YYCURSOR);
                if (yych <= '\f') {
-                       if (yych <= 0x08) goto yy90;
-                       if (yych <= '\n') goto yy88;
+                       if (yych <= 0x08) goto yy91;
+                       if (yych <= '\n') goto yy89;
                } else {
-                       if (yych <= '\r') goto yy88;
-                       if (yych == ' ') goto yy88;
+                       if (yych <= '\r') goto yy89;
+                       if (yych == ' ') goto yy89;
                }
-yy90:
-               YYDEBUG(90, *YYCURSOR);
+yy91:
+               YYDEBUG(91, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 108 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 108 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, NUMERIC_PARAM);
        yylval->num = 0;
        return T_FALSY;
 }
-#line 919 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy91:
-               YYDEBUG(91, *YYCURSOR);
-               yyaccept = 0;
-               yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'L') goto yy92;
-               if (yych != 'l') goto yy44;
+#line 924 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy92:
                YYDEBUG(92, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'S') goto yy93;
-               if (yych != 's') goto yy44;
+               if (yych == 'L') goto yy93;
+               if (yych != 'l') goto yy44;
 yy93:
                YYDEBUG(93, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'E') goto yy87;
-               if (yych == 'e') goto yy87;
-               goto yy44;
+               if (yych == 'S') goto yy94;
+               if (yych != 's') goto yy44;
 yy94:
                YYDEBUG(94, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'A') goto yy95;
-               if (yych != 'a') goto yy44;
+               if (yych == 'E') goto yy88;
+               if (yych == 'e') goto yy88;
+               goto yy44;
 yy95:
                YYDEBUG(95, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'B') goto yy96;
-               if (yych != 'b') goto yy44;
+               if (yych == 'A') goto yy96;
+               if (yych != 'a') goto yy44;
 yy96:
                YYDEBUG(96, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'L') goto yy97;
-               if (yych != 'l') goto yy44;
+               if (yych == 'B') goto yy97;
+               if (yych != 'b') goto yy44;
 yy97:
                YYDEBUG(97, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'E') goto yy98;
-               if (yych != 'e') goto yy44;
+               if (yych == 'L') goto yy98;
+               if (yych != 'l') goto yy44;
 yy98:
                YYDEBUG(98, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'D') goto yy80;
-               if (yych == 'd') goto yy80;
-               goto yy44;
+               if (yych == 'E') goto yy99;
+               if (yych != 'e') goto yy44;
 yy99:
                YYDEBUG(99, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'S') goto yy100;
-               if (yych != 's') goto yy44;
+               if (yych == 'D') goto yy81;
+               if (yych == 'd') goto yy81;
+               goto yy44;
 yy100:
                YYDEBUG(100, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'A') goto yy101;
-               if (yych != 'a') goto yy44;
+               if (yych == 'S') goto yy101;
+               if (yych != 's') goto yy44;
 yy101:
                YYDEBUG(101, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'B') goto yy102;
-               if (yych != 'b') goto yy44;
+               if (yych == 'A') goto yy102;
+               if (yych != 'a') goto yy44;
 yy102:
                YYDEBUG(102, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'L') goto yy103;
-               if (yych != 'l') goto yy44;
+               if (yych == 'B') goto yy103;
+               if (yych != 'b') goto yy44;
 yy103:
                YYDEBUG(103, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'E') goto yy104;
-               if (yych != 'e') goto yy44;
+               if (yych == 'L') goto yy104;
+               if (yych != 'l') goto yy44;
 yy104:
                YYDEBUG(104, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'D') goto yy87;
-               if (yych == 'd') goto yy87;
-               goto yy44;
+               if (yych == 'E') goto yy105;
+               if (yych != 'e') goto yy44;
 yy105:
                YYDEBUG(105, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yybm[0+yych] & 128) {
-                       goto yy106;
-               }
+               if (yych == 'D') goto yy88;
+               if (yych == 'd') goto yy88;
                goto yy44;
 yy106:
                YYDEBUG(106, *YYCURSOR);
+               yyaccept = 0;
+               yych = *(YYMARKER = ++YYCURSOR);
+               if (yybm[0+yych] & 128) {
+                       goto yy107;
+               }
+               goto yy44;
+yy107:
+               YYDEBUG(107, *YYCURSOR);
                yyaccept = 3;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(107, *YYCURSOR);
+               YYDEBUG(108, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy106;
+                       goto yy107;
                }
                if (yych <= 0x1F) {
                        if (yych <= '\n') {
-                               if (yych <= 0x00) goto yy108;
+                               if (yych <= 0x00) goto yy109;
                                if (yych <= 0x08) goto yy43;
                        } else {
                                if (yych != '\r') goto yy43;
                        }
                } else {
                        if (yych <= '#') {
-                               if (yych <= ' ') goto yy108;
+                               if (yych <= ' ') goto yy109;
                                if (yych <= '"') goto yy43;
                        } else {
-                               if (yych == ':') goto yy65;
+                               if (yych == ':') goto yy67;
                                goto yy43;
                        }
                }
-yy108:
-               YYDEBUG(108, *YYCURSOR);
+yy109:
+               YYDEBUG(109, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 120 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 120 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, ADDR_PARAM);
        yylval->addr = strtoul(yytext, 0, 16);
        return T_ADDR;
 }
-#line 1050 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy109:
-               YYDEBUG(109, *YYCURSOR);
+#line 1055 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy110:
+               YYDEBUG(110, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= '\f') {
                        if (yych <= 0x08) goto yy44;
                        if (yych >= '\v') goto yy44;
                } else {
-                       if (yych <= '\r') goto yy110;
+                       if (yych <= '\r') goto yy111;
                        if (yych != ' ') goto yy44;
                }
-yy110:
-               YYDEBUG(110, *YYCURSOR);
+yy111:
+               YYDEBUG(111, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(111, *YYCURSOR);
+               YYDEBUG(112, *YYCURSOR);
                if (yych <= '\f') {
-                       if (yych <= 0x08) goto yy112;
-                       if (yych <= '\n') goto yy110;
+                       if (yych <= 0x08) goto yy113;
+                       if (yych <= '\n') goto yy111;
                } else {
-                       if (yych <= '\r') goto yy110;
-                       if (yych == ' ') goto yy110;
+                       if (yych <= '\r') goto yy111;
+                       if (yych == ' ') goto yy111;
                }
-yy112:
-               YYDEBUG(112, *YYCURSOR);
+yy113:
+               YYDEBUG(113, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 80 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 80 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_IF;
 }
-#line 1084 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy113:
-               YYDEBUG(113, *YYCURSOR);
+#line 1089 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy114:
+               YYDEBUG(114, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
                if (yych <= ' ') {
@@ -1089,430 +1095,430 @@ yy113:
                                if (yych <= 0x08) goto yy44;
                                if (yych >= '\v') goto yy44;
                        } else {
-                               if (yych <= '\r') goto yy114;
+                               if (yych <= '\r') goto yy115;
                                if (yych <= 0x1F) goto yy44;
                        }
                } else {
                        if (yych <= '.') {
                                if (yych <= ',') goto yy44;
-                               if (yych <= '-') goto yy116;
-                               goto yy117;
+                               if (yych <= '-') goto yy117;
+                               goto yy118;
                        } else {
                                if (yych <= '/') goto yy44;
-                               if (yych <= '9') goto yy117;
+                               if (yych <= '9') goto yy118;
                                goto yy44;
                        }
                }
-yy114:
-               YYDEBUG(114, *YYCURSOR);
+yy115:
+               YYDEBUG(115, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(115, *YYCURSOR);
+               YYDEBUG(116, *YYCURSOR);
                if (yych <= ' ') {
                        if (yych <= '\f') {
-                               if (yych <= 0x08) goto yy66;
-                               if (yych <= '\n') goto yy114;
-                               goto yy66;
+                               if (yych <= 0x08) goto yy61;
+                               if (yych <= '\n') goto yy115;
+                               goto yy61;
                        } else {
-                               if (yych <= '\r') goto yy114;
-                               if (yych <= 0x1F) goto yy66;
-                               goto yy114;
+                               if (yych <= '\r') goto yy115;
+                               if (yych <= 0x1F) goto yy61;
+                               goto yy115;
                        }
                } else {
                        if (yych <= '.') {
-                               if (yych <= ',') goto yy66;
-                               if (yych <= '-') goto yy120;
-                               goto yy121;
+                               if (yych <= ',') goto yy61;
+                               if (yych <= '-') goto yy121;
+                               goto yy122;
                        } else {
-                               if (yych <= '/') goto yy66;
-                               if (yych <= '9') goto yy121;
-                               goto yy66;
+                               if (yych <= '/') goto yy61;
+                               if (yych <= '9') goto yy122;
+                               goto yy61;
                        }
                }
-yy116:
-               YYDEBUG(116, *YYCURSOR);
+yy117:
+               YYDEBUG(117, *YYCURSOR);
                yyaccept = 0;
                yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == '.') goto yy117;
+               if (yych == '.') goto yy118;
                if (yych <= '/') goto yy44;
                if (yych >= ':') goto yy44;
-yy117:
-               YYDEBUG(117, *YYCURSOR);
+yy118:
+               YYDEBUG(118, *YYCURSOR);
                yyaccept = 4;
                YYMARKER = ++YYCURSOR;
                YYFILL(3);
                yych = *YYCURSOR;
-               YYDEBUG(118, *YYCURSOR);
+               YYDEBUG(119, *YYCURSOR);
                if (yych <= ' ') {
                        if (yych <= '\n') {
-                               if (yych <= 0x00) goto yy119;
+                               if (yych <= 0x00) goto yy120;
                                if (yych <= 0x08) goto yy43;
                        } else {
-                               if (yych == '\r') goto yy119;
+                               if (yych == '\r') goto yy120;
                                if (yych <= 0x1F) goto yy43;
                        }
                } else {
                        if (yych <= '.') {
-                               if (yych == '#') goto yy119;
+                               if (yych == '#') goto yy120;
                                if (yych <= '-') goto yy43;
-                               goto yy117;
+                               goto yy118;
                        } else {
                                if (yych <= '/') goto yy43;
-                               if (yych <= '9') goto yy117;
-                               if (yych <= ':') goto yy65;
+                               if (yych <= '9') goto yy118;
+                               if (yych <= ':') goto yy67;
                                goto yy43;
                        }
                }
-yy119:
-               YYDEBUG(119, *YYCURSOR);
+yy120:
+               YYDEBUG(120, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 73 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 73 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        char *text = yytext + 2;
        while (*++text < '0');
        yylval->num = atoi(text);
        return T_REQ_ID;
 }
-#line 1179 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy120:
-               YYDEBUG(120, *YYCURSOR);
-               yych = *++YYCURSOR;
-               if (yych == '.') goto yy121;
-               if (yych <= '/') goto yy66;
-               if (yych >= ':') goto yy66;
+#line 1184 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy121:
                YYDEBUG(121, *YYCURSOR);
+               yych = *++YYCURSOR;
+               if (yych == '.') goto yy122;
+               if (yych <= '/') goto yy61;
+               if (yych >= ':') goto yy61;
+yy122:
+               YYDEBUG(122, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(122, *YYCURSOR);
-               if (yych == '.') goto yy121;
-               if (yych <= '/') goto yy119;
-               if (yych <= '9') goto yy121;
-               goto yy119;
+               YYDEBUG(123, *YYCURSOR);
+               if (yych == '.') goto yy122;
+               if (yych <= '/') goto yy120;
+               if (yych <= '9') goto yy122;
+               goto yy120;
        }
 /* *********************************** */
 yyc_PRE_RAW:
        {
                static const unsigned char yybm[] = {
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0, 160,  48,   0,   0, 160,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                       160,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,  64,   0,
-                        64,  64,  64,  64,  64,  64,  64,  64,
-                        64,  64,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
-                         0,   0,   0,   0,   0,   0,   0,   0,
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0, 160,  48,   0,   0, 160,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                       160,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,  64,   0, 
+                        64,  64,  64,  64,  64,  64,  64,  64, 
+                        64,  64,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
+                         0,   0,   0,   0,   0,   0,   0,   0, 
                };
-               YYDEBUG(123, *YYCURSOR);
+               YYDEBUG(124, *YYCURSOR);
                YYFILL(2);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 16) {
-                       goto yy127;
+                       goto yy128;
                }
                if (yych <= '\r') {
                        if (yych <= 0x08) {
-                               if (yych <= 0x00) goto yy130;
-                               goto yy132;
+                               if (yych <= 0x00) goto yy131;
+                               goto yy133;
                        } else {
-                               if (yych <= '\t') goto yy125;
-                               if (yych <= '\f') goto yy132;
+                               if (yych <= '\t') goto yy126;
+                               if (yych <= '\f') goto yy133;
                        }
                } else {
                        if (yych <= ' ') {
-                               if (yych <= 0x1F) goto yy132;
+                               if (yych <= 0x1F) goto yy133;
                        } else {
-                               if (yych == '-') goto yy131;
-                               goto yy132;
+                               if (yych == '-') goto yy132;
+                               goto yy133;
                        }
                }
-yy125:
-               YYDEBUG(125, *YYCURSOR);
+yy126:
+               YYDEBUG(126, *YYCURSOR);
                ++YYCURSOR;
                if ((yych = *YYCURSOR) <= '\f') {
-                       if (yych <= 0x00) goto yy142;
-                       if (yych <= 0x08) goto yy126;
-                       if (yych <= '\n') goto yy142;
+                       if (yych <= 0x00) goto yy143;
+                       if (yych <= 0x08) goto yy127;
+                       if (yych <= '\n') goto yy143;
                } else {
-                       if (yych <= '\r') goto yy142;
-                       if (yych == ' ') goto yy142;
+                       if (yych <= '\r') goto yy143;
+                       if (yych == ' ') goto yy143;
                }
-yy126:
-               YYDEBUG(126, *YYCURSOR);
+yy127:
+               YYDEBUG(127, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 169 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 169 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(RAW);
 
        YYCURSOR = LEX(text);
        goto restart;
 }
-#line 1277 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy127:
-               YYDEBUG(127, *YYCURSOR);
+#line 1282 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy128:
+               YYDEBUG(128, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(128, *YYCURSOR);
+               YYDEBUG(129, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy141;
+                       goto yy142;
                }
-               if (yych <= 0x00) goto yy140;
-               if (yych == '\n') goto yy127;
-yy129:
-               YYDEBUG(129, *YYCURSOR);
+               if (yych <= 0x00) goto yy141;
+               if (yych == '\n') goto yy128;
+yy130:
+               YYDEBUG(130, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 1296 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy130:
-               YYDEBUG(130, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy126;
+#line 1301 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy131:
                YYDEBUG(131, *YYCURSOR);
-               yyaccept = 0;
-               yych = *(YYMARKER = ++YYCURSOR);
-               if (yych == 'r') goto yy133;
-               goto yy126;
+               yych = *++YYCURSOR;
+               goto yy127;
 yy132:
                YYDEBUG(132, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy126;
+               yyaccept = 0;
+               yych = *(YYMARKER = ++YYCURSOR);
+               if (yych == 'r') goto yy134;
+               goto yy127;
 yy133:
                YYDEBUG(133, *YYCURSOR);
+               yych = *++YYCURSOR;
+               goto yy127;
+yy134:
+               YYDEBUG(134, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(2);
                yych = *YYCURSOR;
-               YYDEBUG(134, *YYCURSOR);
+               YYDEBUG(135, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy133;
+                       goto yy134;
                }
                if (yych <= '.') {
-                       if (yych <= ',') goto yy135;
-                       if (yych <= '-') goto yy136;
-                       goto yy137;
+                       if (yych <= ',') goto yy136;
+                       if (yych <= '-') goto yy137;
+                       goto yy138;
                } else {
-                       if (yych <= '/') goto yy135;
-                       if (yych <= '9') goto yy137;
+                       if (yych <= '/') goto yy136;
+                       if (yych <= '9') goto yy138;
                }
-yy135:
-               YYDEBUG(135, *YYCURSOR);
-               YYCURSOR = YYMARKER;
-               goto yy126;
 yy136:
                YYDEBUG(136, *YYCURSOR);
+               YYCURSOR = YYMARKER;
+               goto yy127;
+yy137:
+               YYDEBUG(137, *YYCURSOR);
                yych = *++YYCURSOR;
                if (yybm[0+yych] & 64) {
-                       goto yy137;
+                       goto yy138;
                }
-               goto yy135;
-yy137:
-               YYDEBUG(137, *YYCURSOR);
+               goto yy136;
+yy138:
+               YYDEBUG(138, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(138, *YYCURSOR);
+               YYDEBUG(139, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy137;
+                       goto yy138;
                }
-               YYDEBUG(139, *YYCURSOR);
+               YYDEBUG(140, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 73 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 73 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        char *text = yytext + 2;
        while (*++text < '0');
        yylval->num = atoi(text);
        return T_REQ_ID;
 }
-#line 1357 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy140:
-               YYDEBUG(140, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy129;
+#line 1362 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy141:
                YYDEBUG(141, *YYCURSOR);
+               yych = *++YYCURSOR;
+               goto yy130;
+yy142:
+               YYDEBUG(142, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-yy142:
-               YYDEBUG(142, *YYCURSOR);
+yy143:
+               YYDEBUG(143, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy141;
+                       goto yy142;
                }
-               if (yych <= 0x00) goto yy140;
-               if (yych == '\n') goto yy127;
-               YYDEBUG(143, *YYCURSOR);
+               if (yych <= 0x00) goto yy141;
+               if (yych == '\n') goto yy128;
+               YYDEBUG(144, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 147 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 1382 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 1387 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
        }
 /* *********************************** */
 yyc_RAW:
        {
                static const unsigned char yybm[] = {
-                         0, 128, 128, 128, 128, 128, 128, 128,
-                       128, 160,  64, 128, 128, 160, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       160, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
-                       128, 128, 128, 128, 128, 128, 128, 128,
+                         0, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 160,  64, 128, 128, 160, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       160, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
+                       128, 128, 128, 128, 128, 128, 128, 128, 
                };
-               YYDEBUG(144, *YYCURSOR);
+               YYDEBUG(145, *YYCURSOR);
                YYFILL(1);
                yych = *YYCURSOR;
                if (yybm[0+yych] & 32) {
-                       goto yy146;
+                       goto yy147;
                }
-               if (yych <= 0x00) goto yy152;
-               if (yych == '\n') goto yy149;
-               goto yy153;
-yy146:
-               YYDEBUG(146, *YYCURSOR);
+               if (yych <= 0x00) goto yy153;
+               if (yych == '\n') goto yy150;
+               goto yy154;
+yy147:
+               YYDEBUG(147, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(147, *YYCURSOR);
+               YYDEBUG(148, *YYCURSOR);
                if (yybm[0+yych] & 32) {
-                       goto yy146;
+                       goto yy147;
                }
-               if (yych <= 0x00) goto yy152;
-               if (yych == '\n') goto yy149;
-               goto yy153;
-yy148:
-               YYDEBUG(148, *YYCURSOR);
+               if (yych <= 0x00) goto yy153;
+               if (yych == '\n') goto yy150;
+               goto yy154;
+yy149:
+               YYDEBUG(149, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 140 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 140 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, STR_PARAM);
        yylval->str = zend_strndup(yytext, yyleng);
        yylval->len = yyleng;
        return T_INPUT;
 }
-#line 1452 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy149:
-               YYDEBUG(149, *YYCURSOR);
+#line 1457 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+yy150:
+               YYDEBUG(150, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(150, *YYCURSOR);
+               YYDEBUG(151, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy149;
+                       goto yy150;
                }
                if (yych <= '\f') {
-                       if (yych <= 0x00) goto yy152;
-                       if (yych == '\t') goto yy155;
+                       if (yych <= 0x00) goto yy153;
+                       if (yych == '\t') goto yy156;
                } else {
-                       if (yych <= '\r') goto yy155;
-                       if (yych == ' ') goto yy155;
+                       if (yych <= '\r') goto yy156;
+                       if (yych == ' ') goto yy156;
                }
-yy151:
-               YYDEBUG(151, *YYCURSOR);
+yy152:
+               YYDEBUG(152, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 1476 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
-yy152:
-               YYDEBUG(152, *YYCURSOR);
-               yych = *++YYCURSOR;
-               goto yy151;
+#line 1481 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
 yy153:
                YYDEBUG(153, *YYCURSOR);
+               yych = *++YYCURSOR;
+               goto yy152;
+yy154:
+               YYDEBUG(154, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(154, *YYCURSOR);
+               YYDEBUG(155, *YYCURSOR);
                if (yybm[0+yych] & 128) {
-                       goto yy153;
+                       goto yy154;
                }
-               goto yy148;
-yy155:
-               YYDEBUG(155, *YYCURSOR);
+               goto yy149;
+yy156:
+               YYDEBUG(156, *YYCURSOR);
                ++YYCURSOR;
                YYFILL(1);
                yych = *YYCURSOR;
-               YYDEBUG(156, *YYCURSOR);
+               YYDEBUG(157, *YYCURSOR);
                if (yybm[0+yych] & 64) {
-                       goto yy149;
+                       goto yy150;
                }
                if (yych <= '\f') {
-                       if (yych <= 0x00) goto yy152;
-                       if (yych == '\t') goto yy155;
+                       if (yych <= 0x00) goto yy153;
+                       if (yych == '\t') goto yy156;
                } else {
-                       if (yych <= '\r') goto yy155;
-                       if (yych == ' ') goto yy155;
+                       if (yych <= '\r') goto yy156;
+                       if (yych == ' ') goto yy156;
                }
-               YYDEBUG(157, *YYCURSOR);
+               YYDEBUG(158, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 147 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 1515 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.c"
+#line 1520 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
        }
 }
-#line 183 "/Users/Bob/php-src-5.6/sapi/phpdbg/phpdbg_lexer.l"
+#line 183 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
 
 }

diff --git a/sapi/phpdbg/phpdbg_lexer.h b/sapi/phpdbg/phpdbg_lexer.h
index 89ef7668e572845e4a573745aa424ba035d1d0f6..f9b75b95bf3835e7db0d370c45eb8d5f23340783 100644 (file)
--- a/sapi/phpdbg/phpdbg_lexer.h
+++ b/sapi/phpdbg/phpdbg_lexer.h
@@ -28,6 +28,7 @@ typedef struct {
         unsigned char *text;
         unsigned char *cursor;
         unsigned char *marker;
+        unsigned char *ctxmarker;
         int state;
 } phpdbg_lexer_data;
 

diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l
index b9cdc65d224739d8603019b995f46414e80f7a67..7fca70f57af6ebe8f40e24e3d01218022f7dfd90 100644 (file)
--- a/sapi/phpdbg/phpdbg_lexer.l
+++ b/sapi/phpdbg/phpdbg_lexer.l
@@ -14,6 +14,7 @@
 #define YYGETCONDITION() LEX(state)
 #define YYCURSOR LEX(cursor)
 #define YYMARKER LEX(marker)
+#define YYCTXMARKER LEX(ctxmarker)
 #define yyleng LEX(len)
 #define yytext ((char*) LEX(text))
 #undef YYDEBUG
@@ -94,7 +95,7 @@ INPUT       [^\n\000]+
 <NORMAL>[:]{2} {
        return T_DCOLON;
 }
-<NORMAL>[:]{1} {
+<NORMAL>[:]{1}/[^\\] {
        return T_COLON;
 }
 

diff --git a/sapi/phpdbg/tests/print_002.phpt b/sapi/phpdbg/tests/print_002.phpt
index eede27050e0bb7bb3cf2e48a8781a5b807dcfde4..1b6e96e42616148cac57244a31f03b2f797ef24d 100644 (file)
--- a/sapi/phpdbg/tests/print_002.phpt
+++ b/sapi/phpdbg/tests/print_002.phpt
@@ -24,7 +24,7 @@ L14-16 foo() %s - %s + 8 ops
  L15   #5     SEND_VAR                @0                   1                                        
  L15   #6     DO_ICALL                                                                              
  L15   #7     RETURN                  null                                                          
-prompt> [L15         %s INIT_FCALL              112                  "var_dump"                                %s]
+prompt> [L15 %s INIT_FCALL              112                  "var_dump"                                %s]
 prompt> 
 --FILE--
 <?php

diff --git a/sapi/phpdbg/tests/run_001.phpt b/sapi/phpdbg/tests/run_001.phpt
index c6a7ee8c4fe80daa86d6021ab5845eb73f4eac2b..30aab1f17ad271ae70130341bb8dd2c724f9fc07 100644 (file)
--- a/sapi/phpdbg/tests/run_001.phpt
+++ b/sapi/phpdbg/tests/run_001.phpt
@@ -49,7 +49,7 @@ array(5) {
 [Script ended normally]
 prompt> 
 --ARGS--
-'1' '2' '3'
+1 2 3
 --FILE--
 <?php