sniper Tue Jun 28 19:16:51 2005 EDT
Modified files:
/php-src/ext/standard url_scanner_ex.c var_unserializer.c
Log:
- Regenerated with re2c 0.9.8
http://cvs.php.net/diff.php/php-src/ext/standard/url_scanner_ex.c?r1=1.93&r2=1.94&ty=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.93
php-src/ext/standard/url_scanner_ex.c:1.94
--- php-src/ext/standard/url_scanner_ex.c:1.93 Sat Jun 11 19:53:21 2005
+++ php-src/ext/standard/url_scanner_ex.c Tue Jun 28 19:16:49 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Sun Jun 12 02:51:22 2005 */
+/* 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"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: url_scanner_ex.c,v 1.93 2005/06/11 23:53:21 sniper Exp $ */
+/* $Id: url_scanner_ex.c,v 1.94 2005/06/28 23:16:49 sniper Exp $ */
#include "php.h"
@@ -109,11 +109,7 @@
q = (p = url->c) + url->len;
scan:
-
-#line 7 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
@@ -148,6 +144,10 @@
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
};
+
+#line 149 "<stdout>"
+{
+ YYCTYPE yych;
goto yy0;
++YYCURSOR;
yy0:
@@ -164,19 +164,19 @@
yy3:
#line 115 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ smart_str_append(dest, url); return; }
-#line 61 "<stdout>"
+#line 168 "<stdout>"
yy4: ++YYCURSOR;
goto yy5;
yy5:
#line 116 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ sep = separator; goto scan; }
-#line 67 "<stdout>"
+#line 174 "<stdout>"
yy6: ++YYCURSOR;
goto yy7;
yy7:
#line 117 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ bash = p - 1; goto done; }
-#line 73 "<stdout>"
+#line 180 "<stdout>"
yy8: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -188,7 +188,8 @@
yy10:
#line 118 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ goto scan; }
-#line 86 "<stdout>"
+#line 192 "<stdout>"
+}
}
#line 119 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
@@ -358,11 +359,7 @@
state_plain:
start = YYCURSOR;
-
-#line 90 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
@@ -397,6 +394,10 @@
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
};
+
+#line 399 "<stdout>"
+{
+ YYCTYPE yych;
goto yy11;
++YYCURSOR;
yy11:
@@ -411,7 +412,7 @@
yy14:
#line 287 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 142 "<stdout>"
+#line 416 "<stdout>"
yy15: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -423,18 +424,15 @@
yy17:
#line 288 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain; }
-#line 155 "<stdout>"
+#line 428 "<stdout>"
+}
}
#line 289 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
state_tag:
start = YYCURSOR;
-
-#line 159 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -469,6 +467,10 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
+
+#line 472 "<stdout>"
+{
+ YYCTYPE yych;
goto yy18;
++YYCURSOR;
yy18:
@@ -485,13 +487,13 @@
yy21:
#line 294 "/usr/src/php/php5/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 212 "<stdout>"
+#line 491 "<stdout>"
yy22: ++YYCURSOR;
goto yy23;
yy23:
#line 295 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; }
-#line 218 "<stdout>"
+#line 497 "<stdout>"
yy24: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -501,6 +503,7 @@
}
goto yy21;
}
+}
#line 296 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
@@ -509,11 +512,7 @@
state_next_arg:
start = YYCURSOR;
-
-#line 231 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 128, 128, 128, 0, 0, 0, 0,
@@ -548,6 +547,10 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
+
+#line 552 "<stdout>"
+{
+ YYCTYPE yych;
goto yy26;
++YYCURSOR;
yy26:
@@ -577,26 +580,26 @@
yy29:
#line 304 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
-#line 298 "<stdout>"
+#line 584 "<stdout>"
yy30: ++YYCURSOR;
yych = *YYCURSOR;
goto yy37;
yy31:
#line 305 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg; }
-#line 304 "<stdout>"
+#line 591 "<stdout>"
yy32: ++YYCURSOR;
goto yy33;
yy33:
#line 306 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
-#line 310 "<stdout>"
+#line 597 "<stdout>"
yy34: ++YYCURSOR;
goto yy35;
yy35:
#line 307 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; }
-#line 316 "<stdout>"
+#line 603 "<stdout>"
yy36: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -606,16 +609,13 @@
}
goto yy31;
}
+}
#line 308 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
state_arg:
start = YYCURSOR;
-
-#line 329 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -650,6 +650,10 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
+
+#line 655 "<stdout>"
+{
+ YYCTYPE yych;
goto yy38;
++YYCURSOR;
yy38:
@@ -666,13 +670,13 @@
yy41:
#line 313 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto
state_before_val; }
-#line 382 "<stdout>"
+#line 674 "<stdout>"
yy42: ++YYCURSOR;
goto yy43;
yy43:
#line 314 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
-#line 388 "<stdout>"
+#line 680 "<stdout>"
yy44: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -682,16 +686,13 @@
}
goto yy41;
}
+}
#line 315 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
state_before_val:
start = YYCURSOR;
-
-#line 401 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -726,6 +727,11 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
+
+#line 732 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
goto yy46;
++YYCURSOR;
yy46:
@@ -742,14 +748,14 @@
yy49:
#line 321 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ --YYCURSOR; goto state_next_arg_begin; }
-#line 455 "<stdout>"
+#line 752 "<stdout>"
yy50: ++YYCURSOR;
yych = *YYCURSOR;
goto yy54;
yy51:
#line 320 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
-#line 461 "<stdout>"
+#line 759 "<stdout>"
yy52: yych = *++YYCURSOR;
goto yy49;
yy53: ++YYCURSOR;
@@ -772,17 +778,14 @@
case 0: goto yy49;
}
}
+}
#line 322 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
state_val:
start = YYCURSOR;
-
-#line 488 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
248, 248, 248, 248, 248, 248, 248, 248,
248, 160, 160, 248, 248, 248, 248, 248,
@@ -817,6 +820,11 @@
248, 248, 248, 248, 248, 248, 248, 248,
248, 248, 248, 248, 248, 248, 248, 248,
};
+
+#line 825 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
goto yy58;
++YYCURSOR;
yy58:
@@ -846,7 +854,7 @@
yy61:
#line 330 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 0, '\0'); goto state_next_arg_begin; }
-#line 555 "<stdout>"
+#line 858 "<stdout>"
yy62: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
goto yy69;
@@ -857,7 +865,7 @@
yy65:
#line 331 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg_begin; }
-#line 566 "<stdout>"
+#line 869 "<stdout>"
yy66: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -886,7 +894,7 @@
yy71:
#line 329 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
-#line 595 "<stdout>"
+#line 898 "<stdout>"
yy72: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -922,7 +930,7 @@
yy79:
#line 328 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-#line 631 "<stdout>"
+#line 934 "<stdout>"
yy80: ++YYCURSOR;
if(YYLIMIT == YYCURSOR) YYFILL(1);
yych = *YYCURSOR;
@@ -936,6 +944,7 @@
yych = *YYCURSOR;
goto yy79;
}
+}
#line 332 "/usr/src/php/php5/ext/standard/url_scanner_ex.re"
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.68&r2=1.69&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.68
php-src/ext/standard/var_unserializer.c:1.69
--- php-src/ext/standard/var_unserializer.c:1.68 Sat Jun 11 19:53:21 2005
+++ php-src/ext/standard/var_unserializer.c Tue Jun 28 19:16:49 2005
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.6 on Sun Jun 12 02:52:01 2005 */
+/* Generated by re2c 0.9.8 on Wed Jun 29 02:16:55 2005 */
#line 1 "/usr/src/php/php5/ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.68 2005/06/11 23:53:21 sniper Exp $ */
+/* $Id: var_unserializer.c,v 1.69 2005/06/28 23:16:49 sniper Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -354,11 +354,7 @@
-
-#line 7 "<stdout>"
{
- YYCTYPE yych;
- unsigned int yyaccept;
static unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -393,6 +389,11 @@
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
+
+#line 394 "<stdout>"
+{
+ YYCTYPE yych;
+ unsigned int yyaccept;
goto yy0;
++YYCURSOR;
yy0:
@@ -451,7 +452,7 @@
yy4:
#line 626 "/usr/src/php/php5/ext/standard/var_unserializer.re"
{ return 0; }
-#line 103 "<stdout>"
+#line 456 "<stdout>"
yy5: yyaccept = 0;
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy81;
@@ -496,7 +497,7 @@
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 148 "<stdout>"
+#line 501 "<stdout>"
yy16: yych = *++YYCURSOR;
goto yy4;
yy17: yych = *++YYCURSOR;
@@ -637,7 +638,7 @@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 290 "<stdout>"
+#line 642 "<stdout>"
yy24: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -674,7 +675,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU,
ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 328 "<stdout>"
+#line 679 "<stdout>"
yy31: yych = *++YYCURSOR;
if(yych == '+') goto yy32;
if(yych <= '/') goto yy2;
@@ -720,7 +721,7 @@
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 375 "<stdout>"
+#line 725 "<stdout>"
yy38: yych = *++YYCURSOR;
if(yych == '+') goto yy39;
if(yych <= '/') goto yy2;
@@ -772,7 +773,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 428 "<stdout>"
+#line 777 "<stdout>"
yy45: yych = *++YYCURSOR;
if(yych <= '/'){
if(yych <= ','){
@@ -868,7 +869,7 @@
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 526 "<stdout>"
+#line 873 "<stdout>"
yy57: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -943,7 +944,7 @@
return 1;
}
-#line 603 "<stdout>"
+#line 948 "<stdout>"
yy68: yych = *++YYCURSOR;
if(yych == 'N') goto yy65;
goto yy2;
@@ -979,7 +980,7 @@
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 640 "<stdout>"
+#line 984 "<stdout>"
yy75: yych = *++YYCURSOR;
if(yych <= '/') goto yy2;
if(yych >= '2') goto yy2;
@@ -997,7 +998,7 @@
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 658 "<stdout>"
+#line 1002 "<stdout>"
yy79: ++YYCURSOR;
goto yy80;
yy80:
@@ -1008,7 +1009,7 @@
ZVAL_NULL(*rval);
return 1;
}
-#line 669 "<stdout>"
+#line 1013 "<stdout>"
yy81: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -1057,7 +1058,7 @@
return 1;
}
-#line 719 "<stdout>"
+#line 1062 "<stdout>"
yy87: yych = *++YYCURSOR;
if(yych <= ','){
if(yych != '+') goto yy2;
@@ -1104,7 +1105,8 @@
return 1;
}
-#line 767 "<stdout>"
+#line 1109 "<stdout>"
+}
}
#line 628 "/usr/src/php/php5/ext/standard/var_unserializer.re"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
