Regenerate scanners using re2c version >= 1.0.0 (newer version, at least, produce less code)

This commit is contained in:
Dmitry Stogov 2018-07-25 12:49:03 +03:00
parent aed3de1bc5
commit a29a800cb0
7 changed files with 3436 additions and 3487 deletions

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.16 */
/* Generated by re2c 1.0.3 */
#line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE {

View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.16 */
/* Generated by re2c 1.0.3 */
/*
+----------------------------------------------------------------------+
| PHP Version 7 |
@ -105,7 +105,7 @@ void php_json_scanner_init(php_json_scanner *s, char *str, size_t str_len, int o
int php_json_scan(php_json_scanner *s)
{
ZVAL_NULL(&s->value);
std:
s->token = s->cursor;
@ -130,38 +130,38 @@ std:
yyc_JS:
{
static const unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 64, 0, 0, 0, 64, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
64, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 64, 0, 0, 0, 64, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
64, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
};
yych = *YYCURSOR;
if (yych <= ']') {
@ -265,8 +265,7 @@ yy5:
return PHP_JSON_T_ERROR;
}
yy7:
++YYCURSOR;
yych = *YYCURSOR;
yych = *++YYCURSOR;
yy8:
if (yybm[0+yych] & 64) {
goto yy7;
@ -274,7 +273,7 @@ yy8:
yy9:
{ goto std; }
yy10:
yych = *++YYCURSOR;
++YYCURSOR;
goto yy9;
yy11:
yych = *++YYCURSOR;
@ -341,8 +340,7 @@ yy20:
}
yy21:
yyaccept = 0;
YYMARKER = ++YYCURSOR;
yych = *YYCURSOR;
yych = *(YYMARKER = ++YYCURSOR);
if (yybm[0+yych] & 128) {
goto yy21;
}
@ -486,8 +484,7 @@ yy52:
goto yy46;
yy53:
yyaccept = 3;
YYMARKER = ++YYCURSOR;
yych = *YYCURSOR;
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= 'D') {
if (yych <= '/') goto yy55;
if (yych <= '9') goto yy53;
@ -505,8 +502,7 @@ yy56:
if (yych <= '/') goto yy46;
if (yych >= ':') goto yy46;
yy57:
++YYCURSOR;
yych = *YYCURSOR;
yych = *++YYCURSOR;
if (yych <= '/') goto yy55;
if (yych <= '9') goto yy57;
goto yy55;
@ -943,7 +939,7 @@ yy114:
return PHP_JSON_T_ERROR;
}
yy115:
yych = *++YYCURSOR;
++YYCURSOR;
goto yy114;
yy116:
yych = *++YYCURSOR;

View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.16 */
/* Generated by re2c 1.0.3 */
enum YYCONDTYPE {
yycJS,

View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.16 */
/* Generated by re2c 1.0.3 */
#line 1 "ext/pdo/pdo_sql_parser.re"
/*
+----------------------------------------------------------------------+
@ -45,11 +45,11 @@ static int scan(Scanner *s)
char *cursor = s->cur;
s->tok = cursor;
#line 55 "ext/pdo/pdo_sql_parser.re"
#line 53 "ext/pdo/pdo_sql_parser.re"
#line 55 "ext/pdo/pdo_sql_parser.c"
#line 53 "ext/pdo/pdo_sql_parser.c"
{
YYCTYPE yych;
if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@ -94,22 +94,22 @@ yy3:
default: goto yy3;
}
yy5:
#line 65 "ext/pdo/pdo_sql_parser.re"
#line 63 "ext/pdo/pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
#line 102 "ext/pdo/pdo_sql_parser.c"
#line 100 "ext/pdo/pdo_sql_parser.c"
yy6:
yych = *(YYMARKER = ++YYCURSOR);
if (yych >= 0x01) goto yy16;
yy7:
#line 63 "ext/pdo/pdo_sql_parser.re"
#line 61 "ext/pdo/pdo_sql_parser.re"
{ SKIP_ONE(PDO_PARSER_TEXT); }
#line 109 "ext/pdo/pdo_sql_parser.c"
#line 107 "ext/pdo/pdo_sql_parser.c"
yy8:
yych = *(YYMARKER = ++YYCURSOR);
if (yych <= 0x00) goto yy7;
goto yy21;
yy9:
yych = *++YYCURSOR;
++YYCURSOR;
goto yy7;
yy10:
yych = *++YYCURSOR;
@ -118,7 +118,7 @@ yy10:
default: goto yy7;
}
yy11:
yych = *(YYMARKER = ++YYCURSOR);
yych = *++YYCURSOR;
switch (yych) {
case '*': goto yy28;
default: goto yy7;
@ -193,15 +193,15 @@ yy12:
default: goto yy7;
}
yy13:
++YYCURSOR;
switch ((yych = *YYCURSOR)) {
yych = *++YYCURSOR;
switch (yych) {
case '?': goto yy36;
default: goto yy14;
}
yy14:
#line 62 "ext/pdo/pdo_sql_parser.re"
#line 60 "ext/pdo/pdo_sql_parser.re"
{ RET(PDO_PARSER_BIND_POS); }
#line 207 "ext/pdo/pdo_sql_parser.c"
#line 205 "ext/pdo/pdo_sql_parser.c"
yy15:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -215,9 +215,9 @@ yy16:
}
yy17:
++YYCURSOR;
#line 58 "ext/pdo/pdo_sql_parser.re"
#line 56 "ext/pdo/pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
#line 223 "ext/pdo/pdo_sql_parser.c"
#line 221 "ext/pdo/pdo_sql_parser.c"
yy19:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -237,9 +237,9 @@ yy21:
}
yy22:
++YYCURSOR;
#line 59 "ext/pdo/pdo_sql_parser.re"
#line 57 "ext/pdo/pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
#line 245 "ext/pdo/pdo_sql_parser.c"
#line 243 "ext/pdo/pdo_sql_parser.c"
yy24:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -256,9 +256,9 @@ yy25:
default: goto yy25;
}
yy27:
#line 64 "ext/pdo/pdo_sql_parser.re"
#line 62 "ext/pdo/pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
#line 264 "ext/pdo/pdo_sql_parser.c"
#line 262 "ext/pdo/pdo_sql_parser.c"
yy28:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -338,9 +338,9 @@ yy30:
default: goto yy32;
}
yy32:
#line 61 "ext/pdo/pdo_sql_parser.re"
#line 59 "ext/pdo/pdo_sql_parser.re"
{ RET(PDO_PARSER_BIND); }
#line 346 "ext/pdo/pdo_sql_parser.c"
#line 344 "ext/pdo/pdo_sql_parser.c"
yy33:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -350,9 +350,9 @@ yy33:
default: goto yy35;
}
yy35:
#line 60 "ext/pdo/pdo_sql_parser.re"
#line 58 "ext/pdo/pdo_sql_parser.re"
{ RET(PDO_PARSER_TEXT); }
#line 358 "ext/pdo/pdo_sql_parser.c"
#line 356 "ext/pdo/pdo_sql_parser.c"
yy36:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -372,10 +372,9 @@ yy38:
}
yy40:
++YYCURSOR;
yych = *YYCURSOR;
goto yy27;
}
#line 66 "ext/pdo/pdo_sql_parser.re"
#line 64 "ext/pdo/pdo_sql_parser.re"
}

View file

@ -1,4 +1,4 @@
/* Generated by re2c 0.16 */
/* Generated by re2c 1.0.3 */
#line 1 "ext/standard/url_scanner_ex.re"
/*
+----------------------------------------------------------------------+
@ -172,7 +172,7 @@ PHP_INI_BEGIN()
STD_PHP_INI_ENTRY("url_rewriter.hosts", "", PHP_INI_ALL, OnUpdateOutputHosts, url_adapt_session_hosts_ht, php_basic_globals, basic_globals)
PHP_INI_END()
#line 181 "ext/standard/url_scanner_ex.re"
#line 179 "ext/standard/url_scanner_ex.re"
#define YYFILL(n) goto done
@ -520,7 +520,7 @@ state_plain_begin:
state_plain:
start = YYCURSOR;
#line 526 "ext/standard/url_scanner_ex.c"
#line 524 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@ -570,22 +570,22 @@ yy2:
if (yybm[0+yych] & 128) {
goto yy2;
}
#line 529 "ext/standard/url_scanner_ex.re"
#line 527 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain; }
#line 578 "ext/standard/url_scanner_ex.c"
#line 576 "ext/standard/url_scanner_ex.c"
yy5:
++YYCURSOR;
#line 528 "ext/standard/url_scanner_ex.re"
#line 526 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
#line 583 "ext/standard/url_scanner_ex.c"
#line 581 "ext/standard/url_scanner_ex.c"
}
#line 530 "ext/standard/url_scanner_ex.re"
#line 528 "ext/standard/url_scanner_ex.re"
state_tag:
start = YYCURSOR;
#line 591 "ext/standard/url_scanner_ex.c"
#line 589 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@ -628,9 +628,9 @@ state_tag:
goto yy11;
}
++YYCURSOR;
#line 536 "ext/standard/url_scanner_ex.re"
#line 534 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; }
#line 636 "ext/standard/url_scanner_ex.c"
#line 634 "ext/standard/url_scanner_ex.c"
yy11:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -638,11 +638,11 @@ yy11:
if (yybm[0+yych] & 128) {
goto yy11;
}
#line 535 "ext/standard/url_scanner_ex.re"
#line 533 "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 646 "ext/standard/url_scanner_ex.c"
#line 644 "ext/standard/url_scanner_ex.c"
}
#line 537 "ext/standard/url_scanner_ex.re"
#line 535 "ext/standard/url_scanner_ex.re"
state_next_arg_begin:
@ -651,7 +651,7 @@ state_next_arg_begin:
state_next_arg:
start = YYCURSOR;
#line 657 "ext/standard/url_scanner_ex.c"
#line 655 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@ -707,9 +707,9 @@ state_next_arg:
yy16:
++YYCURSOR;
yy17:
#line 548 "ext/standard/url_scanner_ex.re"
#line 546 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_plain_begin; }
#line 715 "ext/standard/url_scanner_ex.c"
#line 713 "ext/standard/url_scanner_ex.c"
yy18:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -717,30 +717,30 @@ yy18:
if (yybm[0+yych] & 128) {
goto yy18;
}
#line 546 "ext/standard/url_scanner_ex.re"
#line 544 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg; }
#line 725 "ext/standard/url_scanner_ex.c"
#line 723 "ext/standard/url_scanner_ex.c"
yy21:
yych = *++YYCURSOR;
if (yych != '>') goto yy17;
yy22:
++YYCURSOR;
#line 545 "ext/standard/url_scanner_ex.re"
#line 543 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
#line 733 "ext/standard/url_scanner_ex.c"
#line 731 "ext/standard/url_scanner_ex.c"
yy24:
++YYCURSOR;
#line 547 "ext/standard/url_scanner_ex.re"
#line 545 "ext/standard/url_scanner_ex.re"
{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
#line 738 "ext/standard/url_scanner_ex.c"
#line 736 "ext/standard/url_scanner_ex.c"
}
#line 549 "ext/standard/url_scanner_ex.re"
#line 547 "ext/standard/url_scanner_ex.re"
state_arg:
start = YYCURSOR;
#line 746 "ext/standard/url_scanner_ex.c"
#line 744 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@ -785,9 +785,9 @@ state_arg:
if (yych <= 'z') goto yy30;
yy28:
++YYCURSOR;
#line 555 "ext/standard/url_scanner_ex.re"
#line 553 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
#line 793 "ext/standard/url_scanner_ex.c"
#line 791 "ext/standard/url_scanner_ex.c"
yy30:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -795,17 +795,17 @@ yy30:
if (yybm[0+yych] & 128) {
goto yy30;
}
#line 554 "ext/standard/url_scanner_ex.re"
#line 552 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
#line 803 "ext/standard/url_scanner_ex.c"
#line 801 "ext/standard/url_scanner_ex.c"
}
#line 556 "ext/standard/url_scanner_ex.re"
#line 554 "ext/standard/url_scanner_ex.re"
state_before_val:
start = YYCURSOR;
#line 811 "ext/standard/url_scanner_ex.c"
#line 809 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@ -848,9 +848,9 @@ state_before_val:
if (yych == '=') goto yy38;
++YYCURSOR;
yy36:
#line 562 "ext/standard/url_scanner_ex.re"
#line 560 "ext/standard/url_scanner_ex.re"
{ --YYCURSOR; goto state_next_arg_begin; }
#line 856 "ext/standard/url_scanner_ex.c"
#line 854 "ext/standard/url_scanner_ex.c"
yy37:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == ' ') goto yy41;
@ -862,9 +862,9 @@ yy38:
if (yybm[0+yych] & 128) {
goto yy38;
}
#line 561 "ext/standard/url_scanner_ex.re"
#line 559 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
#line 870 "ext/standard/url_scanner_ex.c"
#line 868 "ext/standard/url_scanner_ex.c"
yy41:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -874,14 +874,14 @@ yy41:
YYCURSOR = YYMARKER;
goto yy36;
}
#line 563 "ext/standard/url_scanner_ex.re"
#line 561 "ext/standard/url_scanner_ex.re"
state_val:
start = YYCURSOR;
#line 887 "ext/standard/url_scanner_ex.c"
#line 885 "ext/standard/url_scanner_ex.c"
{
YYCTYPE yych;
static const unsigned char yybm[] = {
@ -934,15 +934,15 @@ yy46:
if (yybm[0+yych] & 32) {
goto yy46;
}
#line 571 "ext/standard/url_scanner_ex.re"
#line 569 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
#line 942 "ext/standard/url_scanner_ex.c"
#line 940 "ext/standard/url_scanner_ex.c"
yy49:
++YYCURSOR;
yy50:
#line 572 "ext/standard/url_scanner_ex.re"
#line 570 "ext/standard/url_scanner_ex.re"
{ passthru(STD_ARGS); goto state_next_arg_begin; }
#line 948 "ext/standard/url_scanner_ex.c"
#line 946 "ext/standard/url_scanner_ex.c"
yy51:
yych = *(YYMARKER = ++YYCURSOR);
if (yych == '>') goto yy50;
@ -965,9 +965,9 @@ yy55:
goto yy50;
yy56:
++YYCURSOR;
#line 569 "ext/standard/url_scanner_ex.re"
#line 567 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
#line 973 "ext/standard/url_scanner_ex.c"
#line 971 "ext/standard/url_scanner_ex.c"
yy58:
++YYCURSOR;
if (YYLIMIT <= YYCURSOR) YYFILL(1);
@ -978,11 +978,11 @@ yy59:
}
if (yych >= '(') goto yy55;
++YYCURSOR;
#line 570 "ext/standard/url_scanner_ex.re"
#line 568 "ext/standard/url_scanner_ex.re"
{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
#line 986 "ext/standard/url_scanner_ex.c"
#line 984 "ext/standard/url_scanner_ex.c"
}
#line 573 "ext/standard/url_scanner_ex.re"
#line 571 "ext/standard/url_scanner_ex.re"
stop:

File diff suppressed because it is too large Load diff