Use relative paths in phpdbg_lexer.c

diff --git a/sapi/phpdbg/Makefile.frag b/sapi/phpdbg/Makefile.frag
index 36c7512d6971f74441426eced947c0d2d5d5b266..e0cdfe25ef359097f6006154a3ab371036368961 100644 (file)
--- a/sapi/phpdbg/Makefile.frag
+++ b/sapi/phpdbg/Makefile.frag
@@ -14,7 +14,7 @@ $(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 $(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
 
 $(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l
-       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo $(srcdir)/phpdbg_lexer.c $(srcdir)/phpdbg_lexer.l)
+       @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l)
 
 $(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
 $(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y

diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c
index 6b503f04ed879a46988f8b7902db2374f3746cc0..9d71d36371ad209ce25874bdfe9f3cf87b4dbeda 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-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 1 "sapi/phpdbg/phpdbg_lexer.l"
 /*
  * phpdbg_lexer.l
  */
@@ -45,7 +45,7 @@ restart:
        LEX(text) = YYCURSOR;
 
 
-#line 49 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 49 "sapi/phpdbg/phpdbg_lexer.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept = 0;
@@ -150,14 +150,14 @@ yy2:
 yy3:
                YYDEBUG(3, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 176 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 176 "sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(NORMAL);
 
        YYCURSOR = LEX(text);
        goto restart;
 }
-#line 161 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 161 "sapi/phpdbg/phpdbg_lexer.c"
 yy4:
                YYDEBUG(4, *YYCURSOR);
                ++YYCURSOR;
@@ -172,11 +172,11 @@ yy4:
 yy6:
                YYDEBUG(6, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 180 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 180 "sapi/phpdbg/phpdbg_lexer.c"
 yy7:
                YYDEBUG(7, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -243,13 +243,13 @@ yy16:
                }
                YYDEBUG(18, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 163 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 163 "sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(PRE_RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_RUN;
 }
-#line 253 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 253 "sapi/phpdbg/phpdbg_lexer.c"
 yy19:
                YYDEBUG(19, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -276,13 +276,13 @@ yy20:
 yy22:
                YYDEBUG(22, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 158 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 158 "sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(PRE_RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_SHELL;
 }
-#line 286 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 286 "sapi/phpdbg/phpdbg_lexer.c"
 yy23:
                YYDEBUG(23, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -309,13 +309,13 @@ yy24:
 yy26:
                YYDEBUG(26, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 153 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 153 "sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(PRE_RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_EVAL;
 }
-#line 319 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 319 "sapi/phpdbg/phpdbg_lexer.c"
 yy27:
                YYDEBUG(27, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -334,13 +334,13 @@ yy29:
                if (yych == '\n') goto yy4;
                YYDEBUG(30, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 147 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 344 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 344 "sapi/phpdbg/phpdbg_lexer.c"
        }
 /* *********************************** */
 yyc_NORMAL:
@@ -483,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-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 493 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 493 "sapi/phpdbg/phpdbg_lexer.c"
 yy36:
                YYDEBUG(36, *YYCURSOR);
                ++YYCURSOR;
@@ -504,11 +504,11 @@ yy36:
 yy38:
                YYDEBUG(38, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 512 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 512 "sapi/phpdbg/phpdbg_lexer.c"
 yy39:
                YYDEBUG(39, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -525,14 +525,14 @@ yy40:
 yy41:
                YYDEBUG(41, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 133 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 133 "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-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 536 "sapi/phpdbg/phpdbg_lexer.c"
 yy42:
                YYDEBUG(42, *YYCURSOR);
                yyaccept = 0;
@@ -582,13 +582,13 @@ yy45:
 yy47:
                YYDEBUG(47, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 114 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 114 "sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, NUMERIC_PARAM);
        yylval->num = atoi(yytext);
        return T_DIGITS;
 }
-#line 592 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 592 "sapi/phpdbg/phpdbg_lexer.c"
 yy48:
                YYDEBUG(48, *YYCURSOR);
                yyaccept = 1;
@@ -691,11 +691,11 @@ yy58:
                ++YYCURSOR;
                YYDEBUG(59, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 92 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 92 "sapi/phpdbg/phpdbg_lexer.l"
                {
        return T_POUND;
 }
-#line 699 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 699 "sapi/phpdbg/phpdbg_lexer.c"
 yy60:
                YYDEBUG(60, *YYCURSOR);
                YYCTXMARKER = YYCURSOR + 1;
@@ -728,21 +728,21 @@ yy62:
                YYDEBUG(63, *YYCURSOR);
                YYCURSOR = YYCTXMARKER;
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 98 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 98 "sapi/phpdbg/phpdbg_lexer.l"
                {
        return T_COLON;
 }
-#line 736 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 736 "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"
+#line 95 "sapi/phpdbg/phpdbg_lexer.l"
                {
        return T_DCOLON;
 }
-#line 746 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 746 "sapi/phpdbg/phpdbg_lexer.c"
 yy66:
                YYDEBUG(66, *YYCURSOR);
                yyaccept = 0;
@@ -760,14 +760,14 @@ yy67:
                ++YYCURSOR;
                YYDEBUG(70, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 86 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 86 "sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, STR_PARAM);
        yylval->str = zend_strndup(yytext, yyleng);
        yylval->len = yyleng;
        return T_PROTO;
 }
-#line 771 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 771 "sapi/phpdbg/phpdbg_lexer.c"
 yy71:
                YYDEBUG(71, *YYCURSOR);
                yyaccept = 0;
@@ -814,14 +814,14 @@ yy74:
 yy76:
                YYDEBUG(76, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 126 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 126 "sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, OP_PARAM);
        yylval->str = zend_strndup(yytext, yyleng);
        yylval->len = yyleng;
        return T_OPCODE;
 }
-#line 825 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 825 "sapi/phpdbg/phpdbg_lexer.c"
 yy77:
                YYDEBUG(77, *YYCURSOR);
                yyaccept = 0;
@@ -861,13 +861,13 @@ yy82:
                }
                YYDEBUG(84, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 102 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 102 "sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, NUMERIC_PARAM);
        yylval->num = 1;
        return T_TRUTHY;
 }
-#line 871 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 871 "sapi/phpdbg/phpdbg_lexer.c"
 yy85:
                YYDEBUG(85, *YYCURSOR);
                yyaccept = 0;
@@ -914,13 +914,13 @@ yy89:
 yy91:
                YYDEBUG(91, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 108 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 108 "sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, NUMERIC_PARAM);
        yylval->num = 0;
        return T_FALSY;
 }
-#line 924 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 924 "sapi/phpdbg/phpdbg_lexer.c"
 yy92:
                YYDEBUG(92, *YYCURSOR);
                yyaccept = 0;
@@ -1045,13 +1045,13 @@ yy107:
 yy109:
                YYDEBUG(109, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 120 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 120 "sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, ADDR_PARAM);
        yylval->addr = strtoul(yytext, 0, 16);
        return T_ADDR;
 }
-#line 1055 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1055 "sapi/phpdbg/phpdbg_lexer.c"
 yy110:
                YYDEBUG(110, *YYCURSOR);
                yyaccept = 0;
@@ -1079,13 +1079,13 @@ yy111:
 yy113:
                YYDEBUG(113, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 80 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 80 "sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(RAW);
        phpdbg_init_param(yylval, EMPTY_PARAM);
        return T_IF;
 }
-#line 1089 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1089 "sapi/phpdbg/phpdbg_lexer.c"
 yy114:
                YYDEBUG(114, *YYCURSOR);
                yyaccept = 0;
@@ -1173,14 +1173,14 @@ yy118:
 yy120:
                YYDEBUG(120, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 73 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 73 "sapi/phpdbg/phpdbg_lexer.l"
                {
        char *text = yytext + 2;
        while (*++text < '0');
        yylval->num = atoi(text);
        return T_REQ_ID;
 }
-#line 1184 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1184 "sapi/phpdbg/phpdbg_lexer.c"
 yy121:
                YYDEBUG(121, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1271,14 +1271,14 @@ yy126:
 yy127:
                YYDEBUG(127, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 169 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 169 "sapi/phpdbg/phpdbg_lexer.l"
                {
        YYSETCONDITION(RAW);
 
        YYCURSOR = LEX(text);
        goto restart;
 }
-#line 1282 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1282 "sapi/phpdbg/phpdbg_lexer.c"
 yy128:
                YYDEBUG(128, *YYCURSOR);
                ++YYCURSOR;
@@ -1293,11 +1293,11 @@ yy128:
 yy130:
                YYDEBUG(130, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 1301 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1301 "sapi/phpdbg/phpdbg_lexer.c"
 yy131:
                YYDEBUG(131, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1351,14 +1351,14 @@ yy138:
                }
                YYDEBUG(140, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 73 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 73 "sapi/phpdbg/phpdbg_lexer.l"
                {
        char *text = yytext + 2;
        while (*++text < '0');
        yylval->num = atoi(text);
        return T_REQ_ID;
 }
-#line 1362 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1362 "sapi/phpdbg/phpdbg_lexer.c"
 yy141:
                YYDEBUG(141, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1377,13 +1377,13 @@ yy143:
                if (yych == '\n') goto yy128;
                YYDEBUG(144, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 147 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 1387 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1387 "sapi/phpdbg/phpdbg_lexer.c"
        }
 /* *********************************** */
 yyc_RAW:
@@ -1446,14 +1446,14 @@ yy147:
 yy149:
                YYDEBUG(149, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 140 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 140 "sapi/phpdbg/phpdbg_lexer.l"
                {
        phpdbg_init_param(yylval, STR_PARAM);
        yylval->str = zend_strndup(yytext, yyleng);
        yylval->len = yyleng;
        return T_INPUT;
 }
-#line 1457 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1457 "sapi/phpdbg/phpdbg_lexer.c"
 yy150:
                YYDEBUG(150, *YYCURSOR);
                ++YYCURSOR;
@@ -1473,11 +1473,11 @@ yy150:
 yy152:
                YYDEBUG(152, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 69 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 69 "sapi/phpdbg/phpdbg_lexer.l"
                {
        return 0;
 }
-#line 1481 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1481 "sapi/phpdbg/phpdbg_lexer.c"
 yy153:
                YYDEBUG(153, *YYCURSOR);
                yych = *++YYCURSOR;
@@ -1510,15 +1510,15 @@ yy156:
                }
                YYDEBUG(158, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
-#line 147 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 147 "sapi/phpdbg/phpdbg_lexer.l"
                {
        /* ignore whitespace */
 
        goto restart;
 }
-#line 1520 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.c"
+#line 1520 "sapi/phpdbg/phpdbg_lexer.c"
        }
 }
-#line 183 "/Users/Bob/php-src-X/sapi/phpdbg/phpdbg_lexer.l"
+#line 183 "sapi/phpdbg/phpdbg_lexer.l"
 
 }

diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c
index bd6718f521340f3cae31ac3d1151e321505ca5c0..00788a09986f14a67d3f5dd039627b19e01ec2f8 100644 (file)
--- a/sapi/phpdbg/phpdbg_list.c
+++ b/sapi/phpdbg/phpdbg_list.c
@@ -289,7 +289,7 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) {
        zend_file_handle_dtor(&fake);
 
        dataptr->op_array = ret;
-       if (data->op_array) {
+       if (dataptr->op_array) {
                if (dataptr->op_array->refcount) {
                        ++*dataptr->op_array->refcount;
                } else {