Skip to content

Revert fix for bug 76813 and re2c version bump #6593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert fix for bug 76813 and re2c version bump #6593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ PHP_RUNPATH_SWITCH
dnl Checks for some support/generator progs.
PHP_PROG_AWK
PHP_PROG_BISON([3.0.0])
PHP_PROG_RE2C([0.13.7])
PHP_PROG_RE2C([0.13.4])

PHP_ARG_ENABLE([re2c-cgoto],
[whether to enable computed goto gcc extension with re2c],
Expand Down
6 changes: 1 addition & 5 deletions sapi/phpdbg/phpdbg_lexer.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) {

YYSETCONDITION(INITIAL);

LEX(text) = YYCURSOR = YYMARKER = (unsigned char *) input;
LEX(text) = YYCURSOR = (unsigned char *) input;
LEX(len) = strlen(input);
}

Expand Down Expand Up @@ -165,10 +165,6 @@ INPUT ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])+["]|[']("\\"[']|"\\\\"|[^\
return T_ID;
}

<NORMAL>* {
return T_UNEXPECTED;
}

<RAW>{INPUT} {
phpdbg_init_param(yylval, STR_PARAM);
yylval->str = estrdup(yytext);
Expand Down
8 changes: 2 additions & 6 deletions sapi/phpdbg/phpdbg_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,9 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
%% /* Rules */

input
: non_empty_input { $$ = $1; }
| %empty
;

non_empty_input
: command { $$ = $1; }
| non_empty_input T_SEPARATOR command { phpdbg_stack_separate($1.top); $$ = $3; }
| input T_SEPARATOR command { phpdbg_stack_separate($1.top); $$ = $3; }
| %empty
;

command
Expand Down
10 changes: 0 additions & 10 deletions sapi/phpdbg/tests/bug76813.phpt
View file
Open in desktop

This file was deleted.