cvs: ZendEngine2 / flex.skl zend.c zend_globals.h zend_language_scanner.l

zeev Wed Aug 14 20:25:28 2002 EDT Modified files: /ZendEngine2 flex.skl zend.c zend_globals.h zend_language_scanner.l Log: MFZE1 Index: ZendEngine2/flex.skl diff -u ZendEngine2/flex.skl:1.27 ZendEngine2/flex.skl:1.28 --- ZendEngine2/flex.skl:1.27 Mon Apr 22 05:33:24 2002 +++ ZendEngine2/flex.skl Wed Aug 14 20:25:27 2002 @@ -1,7 +1,7 @@ /* A Lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /usr/repository/ZendEngine2/flex.skl,v 1.27 2002/04/22 09:33:24 phanto Exp $ + * $Header: /usr/repository/ZendEngine2/flex.skl,v 1.28 2002/08/15 00:25:27 zeev Exp $ */ #define FLEX_SCANNER @@ -388,9 +388,14 @@ #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_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 @@ #ifndef YY_NO_TOP_STATE %- -static int yy_top_state() +static int yy_top_state(TSRMLS_D) %+ int yyFlexLexer::yy_top_state() %* Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.169 ZendEngine2/zend.c:1.170 --- ZendEngine2/zend.c:1.169 Fri Jul 26 06:38:24 2002 +++ ZendEngine2/zend.c Wed Aug 14 20:25:27 2002 @@ -380,7 +380,9 @@ 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; } Index: ZendEngine2/zend_globals.h diff -u ZendEngine2/zend_globals.h:1.103 ZendEngine2/zend_globals.h:1.104 --- ZendEngine2/zend_globals.h:1.103 Tue Aug 13 21:40:59 2002 +++ ZendEngine2/zend_globals.h Wed Aug 14 20:25:27 2002 @@ -255,6 +255,9 @@ 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 */ Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.56 ZendEngine2/zend_language_scanner.l:1.57 --- ZendEngine2/zend_language_scanner.l:1.56 Thu Aug 8 12:32:34 2002 +++ ZendEngine2/zend_language_scanner.l Wed Aug 14 20:25:27 2002 @@ -125,6 +125,9 @@ { CG(heredoc) = NULL; CG(heredoc_len)=0; + SCNG(yy_start_stack_ptr) = 0; + SCNG(yy_start_stack_depth) = 0; + SCNG(yy_start_stack) = 0; }