From: foobar Date: Thu, 1 Dec 2005 09:34:20 +0000 (+0000) Subject: MFH: - Fix paths for --enable-gcov X-Git-Tag: php-5.1.2RC1~280 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c7f03c8a4157436ffc007e8bd0761f350fd7b91;p=php MFH: - Fix paths for --enable-gcov --- diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag index ca7ff9bd8d..1d76617505 100644 --- a/ext/standard/Makefile.frag +++ b/ext/standard/Makefile.frag @@ -1,9 +1,9 @@ $(srcdir)/var_unserializer.c: $(srcdir)/var_unserializer.re - @$(RE2C) -b $(srcdir)/var_unserializer.re > $@ + @(cd $(top_srcdir); $(RE2C) -b -o ext/standard/var_unserializer.c ext/standard/var_unserializer.re) $(srcdir)/url_scanner_ex.c: $(srcdir)/url_scanner_ex.re - @$(RE2C) -b $(srcdir)/url_scanner_ex.re > $@ + @(cd $(top_srcdir); $(RE2C) -b -o ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.re) $(builddir)/info.lo: $(builddir)/../../main/build-defs.h diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 27b90bd959..994f57d8eb 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.9.8 on Wed Jun 29 02:16:53 2005 */ -#line 1 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +/* Generated by re2c 0.9.10 on Thu Dec 1 11:31:45 2005 */ +#line 1 "ext/standard/url_scanner_ex.re" /* +----------------------------------------------------------------------+ | PHP Version 5 | @@ -91,7 +91,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("url_rewriter.tags", "a=href,area=href,frame=src,form=,fieldset=", PHP_INI_ALL, OnUpdateTags, url_adapt_state_ex, php_basic_globals, basic_globals) PHP_INI_END() -#line 97 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 97 "ext/standard/url_scanner_ex.re" #define YYFILL(n) goto done @@ -145,7 +145,7 @@ scan: 128, 128, 128, 128, 128, 128, 128, 128, }; -#line 149 "" +#line 149 "ext/standard/url_scanner_ex.c" { YYCTYPE yych; goto yy0; @@ -162,21 +162,21 @@ yy0: yy2: ++YYCURSOR; goto yy3; yy3: -#line 115 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 115 "ext/standard/url_scanner_ex.re" { smart_str_append(dest, url); return; } -#line 168 "" +#line 168 "ext/standard/url_scanner_ex.c" yy4: ++YYCURSOR; goto yy5; yy5: -#line 116 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 116 "ext/standard/url_scanner_ex.re" { sep = separator; goto scan; } -#line 174 "" +#line 174 "ext/standard/url_scanner_ex.c" yy6: ++YYCURSOR; goto yy7; yy7: -#line 117 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 117 "ext/standard/url_scanner_ex.re" { bash = p - 1; goto done; } -#line 180 "" +#line 180 "ext/standard/url_scanner_ex.c" yy8: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -186,12 +186,12 @@ yy9: if(yybm[0+yych] & 128) { } goto yy10; yy10: -#line 118 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 118 "ext/standard/url_scanner_ex.re" { goto scan; } -#line 192 "" +#line 192 "ext/standard/url_scanner_ex.c" } } -#line 119 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 119 "ext/standard/url_scanner_ex.re" done: @@ -395,7 +395,7 @@ state_plain: 128, 128, 128, 128, 128, 128, 128, 128, }; -#line 399 "" +#line 399 "ext/standard/url_scanner_ex.c" { YYCTYPE yych; goto yy11; @@ -410,9 +410,9 @@ yy11: yy13: ++YYCURSOR; goto yy14; yy14: -#line 287 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 287 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; } -#line 416 "" +#line 416 "ext/standard/url_scanner_ex.c" yy15: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -422,12 +422,12 @@ yy16: if(yybm[0+yych] & 128) { } goto yy17; yy17: -#line 288 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 288 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); goto state_plain; } -#line 428 "" +#line 428 "ext/standard/url_scanner_ex.c" } } -#line 289 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 289 "ext/standard/url_scanner_ex.re" state_tag: @@ -468,7 +468,7 @@ state_tag: 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 472 "" +#line 472 "ext/standard/url_scanner_ex.c" { YYCTYPE yych; goto yy18; @@ -485,15 +485,15 @@ yy20: ++YYCURSOR; yych = *YYCURSOR; goto yy25; yy21: -#line 294 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 294 "ext/standard/url_scanner_ex.re" { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; } -#line 491 "" +#line 491 "ext/standard/url_scanner_ex.c" yy22: ++YYCURSOR; goto yy23; yy23: -#line 295 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 295 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); goto state_plain_begin; } -#line 497 "" +#line 497 "ext/standard/url_scanner_ex.c" yy24: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -504,7 +504,7 @@ yy25: if(yybm[0+yych] & 128) { goto yy21; } } -#line 296 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 296 "ext/standard/url_scanner_ex.re" state_next_arg_begin: @@ -548,7 +548,7 @@ state_next_arg: 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 552 "" +#line 552 "ext/standard/url_scanner_ex.c" { YYCTYPE yych; goto yy26; @@ -578,28 +578,28 @@ yy26: yy28: ++YYCURSOR; goto yy29; yy29: -#line 304 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 304 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; } -#line 584 "" +#line 584 "ext/standard/url_scanner_ex.c" yy30: ++YYCURSOR; yych = *YYCURSOR; goto yy37; yy31: -#line 305 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 305 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); goto state_next_arg; } -#line 591 "" +#line 591 "ext/standard/url_scanner_ex.c" yy32: ++YYCURSOR; goto yy33; yy33: -#line 306 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 306 "ext/standard/url_scanner_ex.re" { --YYCURSOR; STATE = STATE_ARG; goto state_arg; } -#line 597 "" +#line 597 "ext/standard/url_scanner_ex.c" yy34: ++YYCURSOR; goto yy35; yy35: -#line 307 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 307 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); goto state_plain_begin; } -#line 603 "" +#line 603 "ext/standard/url_scanner_ex.c" yy36: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -610,7 +610,7 @@ yy37: if(yybm[0+yych] & 128) { goto yy31; } } -#line 308 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 308 "ext/standard/url_scanner_ex.re" state_arg: @@ -651,7 +651,7 @@ state_arg: 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 655 "" +#line 655 "ext/standard/url_scanner_ex.c" { YYCTYPE yych; goto yy38; @@ -668,15 +668,15 @@ yy40: ++YYCURSOR; yych = *YYCURSOR; goto yy45; yy41: -#line 313 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 313 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; } -#line 674 "" +#line 674 "ext/standard/url_scanner_ex.c" yy42: ++YYCURSOR; goto yy43; yy43: -#line 314 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 314 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; } -#line 680 "" +#line 680 "ext/standard/url_scanner_ex.c" yy44: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -687,7 +687,7 @@ yy45: if(yybm[0+yych] & 128) { goto yy41; } } -#line 315 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 315 "ext/standard/url_scanner_ex.re" state_before_val: @@ -728,7 +728,7 @@ state_before_val: 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 732 "" +#line 732 "ext/standard/url_scanner_ex.c" { YYCTYPE yych; unsigned int yyaccept; @@ -746,16 +746,16 @@ yy48: yyaccept = 0; if(yych == '=') goto yy53; goto yy49; yy49: -#line 321 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 321 "ext/standard/url_scanner_ex.re" { --YYCURSOR; goto state_next_arg_begin; } -#line 752 "" +#line 752 "ext/standard/url_scanner_ex.c" yy50: ++YYCURSOR; yych = *YYCURSOR; goto yy54; yy51: -#line 320 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 320 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; } -#line 759 "" +#line 759 "ext/standard/url_scanner_ex.c" yy52: yych = *++YYCURSOR; goto yy49; yy53: ++YYCURSOR; @@ -779,7 +779,7 @@ yy57: YYCURSOR = YYMARKER; } } } -#line 322 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 322 "ext/standard/url_scanner_ex.re" @@ -821,7 +821,7 @@ state_val: 248, 248, 248, 248, 248, 248, 248, 248, }; -#line 825 "" +#line 825 "ext/standard/url_scanner_ex.c" { YYCTYPE yych; unsigned int yyaccept; @@ -852,9 +852,9 @@ yy60: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy77; yy61: -#line 330 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 330 "ext/standard/url_scanner_ex.re" { handle_val(STD_ARGS, 0, '\0'); goto state_next_arg_begin; } -#line 858 "" +#line 858 "ext/standard/url_scanner_ex.c" yy62: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); goto yy69; @@ -863,9 +863,9 @@ yy63: yych = *++YYCURSOR; yy64: ++YYCURSOR; goto yy65; yy65: -#line 331 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 331 "ext/standard/url_scanner_ex.re" { passthru(STD_ARGS); goto state_next_arg_begin; } -#line 869 "" +#line 869 "ext/standard/url_scanner_ex.c" yy66: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -892,9 +892,9 @@ yy70: ++YYCURSOR; } goto yy71; yy71: -#line 329 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 329 "ext/standard/url_scanner_ex.re" { handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; } -#line 898 "" +#line 898 "ext/standard/url_scanner_ex.c" yy72: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -928,9 +928,9 @@ yy78: ++YYCURSOR; } goto yy79; yy79: -#line 328 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 328 "ext/standard/url_scanner_ex.re" { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; } -#line 934 "" +#line 934 "ext/standard/url_scanner_ex.c" yy80: ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; @@ -945,7 +945,7 @@ yy82: ++YYCURSOR; goto yy79; } } -#line 332 "/usr/src/php/php5/ext/standard/url_scanner_ex.re" +#line 332 "ext/standard/url_scanner_ex.re" stop: diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 833e83cf50..00e4e64b13 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,5 +1,5 @@ -/* Generated by re2c 0.9.10 on Mon Sep 5 19:22:38 2005 */ -#line 1 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +/* Generated by re2c 0.9.10 on Thu Dec 1 11:31:25 2005 */ +#line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ | PHP Version 5 | @@ -147,7 +147,7 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx) #define YYMARKER marker -#line 155 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 155 "ext/standard/var_unserializer.re" @@ -390,7 +390,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) 0, 0, 0, 0, 0, 0, 0, 0, }; -#line 394 "" +#line 394 "ext/standard/var_unserializer.c" { YYCTYPE yych; unsigned int yyaccept; @@ -418,9 +418,9 @@ yy2: yyaccept = 0; if(yych == ':') goto yy87; goto yy3; yy3: -#line 626 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 626 "ext/standard/var_unserializer.re" { return 0; } -#line 424 "" +#line 424 "ext/standard/var_unserializer.c" yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if(yych == ':') goto yy81; @@ -459,13 +459,13 @@ yy12: yyaccept = 0; yy13: ++YYCURSOR; goto yy14; yy14: -#line 620 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 620 "ext/standard/var_unserializer.re" { /* this is the case where we have less data than planned */ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data"); return 0; /* not sure if it should be 0 or 1 here? */ } -#line 469 "" +#line 469 "ext/standard/var_unserializer.c" yy15: yych = *++YYCURSOR; goto yy3; yy16: yych = *++YYCURSOR; @@ -498,7 +498,7 @@ yy21: yych = *++YYCURSOR; yy22: ++YYCURSOR; goto yy23; yy23: -#line 508 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 508 "ext/standard/var_unserializer.re" { size_t len, len2, len3, maxlen; long elements; @@ -610,7 +610,7 @@ yy23: return object_common2(UNSERIALIZE_PASSTHRU, elements); } -#line 614 "" +#line 614 "ext/standard/var_unserializer.c" yy24: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy17; @@ -639,7 +639,7 @@ yy28: yych = *++YYCURSOR; yy29: ++YYCURSOR; goto yy30; yy30: -#line 500 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 500 "ext/standard/var_unserializer.re" { INIT_PZVAL(*rval); @@ -647,7 +647,7 @@ yy30: return object_common2(UNSERIALIZE_PASSTHRU, object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR)); } -#line 651 "" +#line 651 "ext/standard/var_unserializer.c" yy31: yych = *++YYCURSOR; if(yych == '+') goto yy32; if(yych <= '/') goto yy17; @@ -671,7 +671,7 @@ yy35: yych = *++YYCURSOR; yy36: ++YYCURSOR; goto yy37; yy37: -#line 478 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 478 "ext/standard/var_unserializer.re" { long elements = parse_iv(start + 2); /* use iv() not uiv() in order to check data range */ @@ -693,7 +693,7 @@ yy37: return finish_nested_data(UNSERIALIZE_PASSTHRU); } -#line 697 "" +#line 697 "ext/standard/var_unserializer.c" yy38: yych = *++YYCURSOR; if(yych == '+') goto yy39; if(yych <= '/') goto yy17; @@ -717,7 +717,7 @@ yy42: yych = *++YYCURSOR; yy43: ++YYCURSOR; goto yy44; yy44: -#line 450 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 450 "ext/standard/var_unserializer.re" { size_t len, maxlen; char *str; @@ -745,7 +745,7 @@ yy44: ZVAL_STRINGL(*rval, str, len, 1); return 1; } -#line 749 "" +#line 749 "ext/standard/var_unserializer.c" yy45: yych = *++YYCURSOR; if(yych <= '/'){ if(yych <= ','){ @@ -834,14 +834,14 @@ yy54: if(yych <= ';'){ yy55: ++YYCURSOR; goto yy56; yy56: -#line 443 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 443 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL)); return 1; } -#line 845 "" +#line 845 "ext/standard/var_unserializer.c" yy57: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy17; @@ -901,7 +901,7 @@ yy65: yych = *++YYCURSOR; yy66: ++YYCURSOR; goto yy67; yy67: -#line 428 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 428 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); @@ -916,7 +916,7 @@ yy67: return 1; } -#line 920 "" +#line 920 "ext/standard/var_unserializer.c" yy68: yych = *++YYCURSOR; if(yych == 'N') goto yy65; goto yy17; @@ -945,14 +945,14 @@ yy72: if(yych <= '/') goto yy17; yy73: ++YYCURSOR; goto yy74; yy74: -#line 421 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 421 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_LONG(*rval, parse_iv(start + 2)); return 1; } -#line 956 "" +#line 956 "ext/standard/var_unserializer.c" yy75: yych = *++YYCURSOR; if(yych <= '/') goto yy17; if(yych >= '2') goto yy17; @@ -963,25 +963,25 @@ yy76: yych = *++YYCURSOR; yy77: ++YYCURSOR; goto yy78; yy78: -#line 414 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 414 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_BOOL(*rval, parse_iv(start + 2)); return 1; } -#line 974 "" +#line 974 "ext/standard/var_unserializer.c" yy79: ++YYCURSOR; goto yy80; yy80: -#line 407 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 407 "ext/standard/var_unserializer.re" { *p = YYCURSOR; INIT_PZVAL(*rval); ZVAL_NULL(*rval); return 1; } -#line 985 "" +#line 985 "ext/standard/var_unserializer.c" yy81: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy17; @@ -1007,7 +1007,7 @@ yy84: if(yych <= '/') goto yy17; yy85: ++YYCURSOR; goto yy86; yy86: -#line 384 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 384 "ext/standard/var_unserializer.re" { long id; @@ -1030,7 +1030,7 @@ yy86: return 1; } -#line 1034 "" +#line 1034 "ext/standard/var_unserializer.c" yy87: yych = *++YYCURSOR; if(yych <= ','){ if(yych != '+') goto yy17; @@ -1056,7 +1056,7 @@ yy90: if(yych <= '/') goto yy17; yy91: ++YYCURSOR; goto yy92; yy92: -#line 363 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 363 "ext/standard/var_unserializer.re" { long id; @@ -1077,10 +1077,10 @@ yy92: return 1; } -#line 1081 "" +#line 1081 "ext/standard/var_unserializer.c" } } -#line 628 "/usr/src/php/php_5_1/ext/standard/var_unserializer.re" +#line 628 "ext/standard/var_unserializer.re" return 0;