- Make sure the generated files have relative paths in the #line directives

diff --git a/ext/standard/Makefile.frag b/ext/standard/Makefile.frag
index ca7ff9bd8d715a74f3d6f92c74400716300b35ff..b9bcc05116b802934e494d7381d3a036ea77b683 100644 (file)
--- 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 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 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 27b90bd95904d1efabb5a3902244431038295f7d..3a4b5900b90e545c6fd938e9f03f74986158d1a5 100644 (file)
--- 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 Tue Nov  8 02:01:27 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
@@ -162,19 +162,19 @@ 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 "<stdout>"
 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 "<stdout>"
 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 "<stdout>"
 yy8:   ++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 "<stdout>"
 }
 }
-#line 119 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
+#line 119 "ext/standard/url_scanner_ex.re"
 
 done:
        
@@ -410,7 +410,7 @@ 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 "<stdout>"
 yy15:  ++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 "<stdout>"
 }
 }
-#line 289 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
+#line 289 "ext/standard/url_scanner_ex.re"
 
 
 state_tag:     
@@ -485,13 +485,13 @@ 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 "<stdout>"
 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 "<stdout>"
 yy24:  ++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:
@@ -578,26 +578,26 @@ 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 "<stdout>"
 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 "<stdout>"
 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 "<stdout>"
 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 "<stdout>"
 yy36:  ++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:
@@ -668,13 +668,13 @@ 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 "<stdout>"
 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 "<stdout>"
 yy44:  ++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:
@@ -746,14 +746,14 @@ 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 "<stdout>"
 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 "<stdout>"
 yy52:  yych = *++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"
 
 
 
@@ -852,7 +852,7 @@ 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 "<stdout>"
 yy62:  yyaccept = 0;
@@ -863,7 +863,7 @@ 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 "<stdout>"
 yy66:  ++YYCURSOR;
@@ -892,7 +892,7 @@ 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 "<stdout>"
 yy72:  ++YYCURSOR;
@@ -928,7 +928,7 @@ 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 "<stdout>"
 yy80:  ++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 7693e74bb58cce5daa30bb9c729620c636485f8b..da18e2deac5f32e37830bc3e8651362578d8d052 100644 (file)
--- 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:20:33 2005 */
-#line 1 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+/* Generated by re2c 0.9.10 on Tue Nov  8 02:01:41 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/php6/ext/standard/var_unserializer.re"
+#line 155 "ext/standard/var_unserializer.re"
 
 
 
@@ -418,7 +418,7 @@ yy2:        yyaccept = 0;
        if(yych == ':') goto yy87;
        goto yy3;
 yy3:
-#line 626 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 626 "ext/standard/var_unserializer.re"
 { return 0; }
 #line 424 "<stdout>"
 yy4:   yyaccept = 0;
@@ -459,7 +459,7 @@ yy12:       yyaccept = 0;
 yy13:  ++YYCURSOR;
        goto yy14;
 yy14:
-#line 620 "/usr/src/php/php6/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");
@@ -498,7 +498,7 @@ yy21:       yych = *++YYCURSOR;
 yy22:  ++YYCURSOR;
        goto yy23;
 yy23:
-#line 508 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 508 "ext/standard/var_unserializer.re"
 {
        size_t len, len2, len3, maxlen;
        long elements;
@@ -639,7 +639,7 @@ yy28:       yych = *++YYCURSOR;
 yy29:  ++YYCURSOR;
        goto yy30;
 yy30:
-#line 500 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 500 "ext/standard/var_unserializer.re"
 {
 
        INIT_PZVAL(*rval);
@@ -671,7 +671,7 @@ yy35:       yych = *++YYCURSOR;
 yy36:  ++YYCURSOR;
        goto yy37;
 yy37:
-#line 478 "/usr/src/php/php6/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 */
@@ -717,7 +717,7 @@ yy42:       yych = *++YYCURSOR;
 yy43:  ++YYCURSOR;
        goto yy44;
 yy44:
-#line 450 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 450 "ext/standard/var_unserializer.re"
 {
        size_t len, maxlen;
        char *str;
@@ -834,7 +834,7 @@ yy54:       if(yych <= ';'){
 yy55:  ++YYCURSOR;
        goto yy56;
 yy56:
-#line 443 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 443 "ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -901,7 +901,7 @@ yy65:       yych = *++YYCURSOR;
 yy66:  ++YYCURSOR;
        goto yy67;
 yy67:
-#line 428 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 428 "ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -945,7 +945,7 @@ yy72:       if(yych <= '/') goto yy17;
 yy73:  ++YYCURSOR;
        goto yy74;
 yy74:
-#line 421 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 421 "ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -963,7 +963,7 @@ yy76:       yych = *++YYCURSOR;
 yy77:  ++YYCURSOR;
        goto yy78;
 yy78:
-#line 414 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 414 "ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -974,7 +974,7 @@ yy78:
 yy79:  ++YYCURSOR;
        goto yy80;
 yy80:
-#line 407 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 407 "ext/standard/var_unserializer.re"
 {
        *p = YYCURSOR;
        INIT_PZVAL(*rval);
@@ -1007,7 +1007,7 @@ yy84:     if(yych <= '/') goto yy17;
 yy85:  ++YYCURSOR;
        goto yy86;
 yy86:
-#line 384 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 384 "ext/standard/var_unserializer.re"
 {
        long id;
 
@@ -1056,7 +1056,7 @@ yy90:     if(yych <= '/') goto yy17;
 yy91:  ++YYCURSOR;
        goto yy92;
 yy92:
-#line 363 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 363 "ext/standard/var_unserializer.re"
 {
        long id;
 
@@ -1080,7 +1080,7 @@ yy92:
 #line 1081 "<stdout>"
 }
 }
-#line 628 "/usr/src/php/php6/ext/standard/var_unserializer.re"
+#line 628 "ext/standard/var_unserializer.re"
 
 
        return 0;