cvs: Zend(PHP_4_2_0) / flex.skl zend.c zend_globals.h zend_language_scanner.l

zeev Wed Aug 14 20:25:57 2002 EDT Modified files: (Branch: PHP_4_2_0) /Zend flex.skl zend.c zend_globals.h zend_language_scanner.l Log: MFH Index: Zend/flex.skl diff -u Zend/flex.skl:1.26 Zend/flex.skl:1.26.2.1 --- Zend/flex.skl:1.26 Fri Sep 21 20:06:27 2001 +++ Zend/flex.skl Wed Aug 14 20:25:57 2002 @@ -1,7 +1,7 @@ /* A Lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /usr/repository/Zend/flex.skl,v 1.26 2001/09/22 00:06:27 zeev Exp $ + * $Header: /usr/repository/Zend/flex.skl,v 1.26.2.1 2002/08/15 00:25:57 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: Zend/zend.c diff -u Zend/zend.c:1.145 Zend/zend.c:1.145.2.1 --- Zend/zend.c:1.145 Tue Feb 26 13:59:25 2002 +++ Zend/zend.c Wed Aug 14 20:25:57 2002 @@ -369,7 +369,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: Zend/zend_globals.h diff -u Zend/zend_globals.h:1.82 Zend/zend_globals.h:1.82.2.1 --- Zend/zend_globals.h:1.82 Sun Jan 6 10:21:09 2002 +++ Zend/zend_globals.h Wed Aug 14 20:25:57 2002 @@ -235,6 +235,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: Zend/zend_language_scanner.l diff -u Zend/zend_language_scanner.l:1.43 Zend/zend_language_scanner.l:1.43.2.1 --- Zend/zend_language_scanner.l:1.43 Sun Jan 6 10:21:09 2002 +++ Zend/zend_language_scanner.l Wed Aug 14 20:25:57 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; }