diff options
| -rw-r--r-- | Zend/flex.skl | 9 | ||||
| -rw-r--r-- | Zend/zend.c | 4 | ||||
| -rw-r--r-- | Zend/zend_globals.h | 3 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.l | 3 |
4 files changed, 16 insertions, 3 deletions
diff --git a/Zend/flex.skl b/Zend/flex.skl index 20ccb2113c..65ed5ca2a5 100644 --- a/Zend/flex.skl +++ b/Zend/flex.skl @@ -388,9 +388,14 @@ static int input YY_PROTO(( TSRMLS_D )); #endif #if YY_STACK_USED +#define yy_start_stack_ptr SCNG(yy_start_stack_ptr) +#define yy_start_stack_depth SCNG(yy_start_stack_depth) +#define yy_start_stack SCNG(yy_start_stack) +/* static int yy_start_stack_ptr = 0; static int yy_start_stack_depth = 0; static int *yy_start_stack = 0; +*/ #ifndef YY_NO_PUSH_STATE static void yy_push_state YY_PROTO(( int new_state TSRMLS_DC )); #endif @@ -398,7 +403,7 @@ static void yy_push_state YY_PROTO(( int new_state TSRMLS_DC )); static void yy_pop_state YY_PROTO(( TSRMLS_D )); #endif #ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); +static int yy_top_state YY_PROTO(( TSRMLS_D )); #endif #else @@ -1495,7 +1500,7 @@ void yyFlexLexer::yy_pop_state(TSRMLS_D) #ifndef YY_NO_TOP_STATE %- -static int yy_top_state() +static int yy_top_state(TSRMLS_D) %+ int yyFlexLexer::yy_top_state() %* diff --git a/Zend/zend.c b/Zend/zend.c index 8871ce00e8..a37274a1de 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -380,7 +380,9 @@ static void scanner_globals_ctor(zend_scanner_globals *scanner_globals_p TSRMLS_ scanner_globals_p->yy_out = NULL; scanner_globals_p->_yy_more_flag = 0; scanner_globals_p->_yy_more_len = 0; - + scanner_globals_p->yy_start_stack_ptr = 0; + scanner_globals_p->yy_start_stack_depth = 0; + scanner_globals_p->yy_start_stack = 0; } diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index fa9cde9cf1..6de7392e18 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -255,6 +255,9 @@ struct _zend_scanner_globals { char *_yy_last_accepting_cpos; int _yy_more_flag; int _yy_more_len; + int yy_start_stack_ptr; + int yy_start_stack_depth; + int *yy_start_stack; }; #endif /* ZEND_GLOBALS_H */ diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 599b87b58e..6baf43e40f 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -125,6 +125,9 @@ void startup_scanner(TSRMLS_D) { CG(heredoc) = NULL; CG(heredoc_len)=0; + SCNG(yy_start_stack_ptr) = 0; + SCNG(yy_start_stack_depth) = 0; + SCNG(yy_start_stack) = 0; } |