cvs: ZendEngine2 / zend_compile.c zend_language_scanner.h zend_language_scanner.l

From: Date: Sat, 17 Jan 2004 00:26:13 +0000
Subject: cvs: ZendEngine2 / zend_compile.c zend_language_scanner.h zend_language_scanner.l
Groups: php.zend-engine.cvs 
Request: Send a blank email to php-zend-engine-cvs+get-2214@lists.php.net to get a copy of this message
sniper Fri Jan 16 19:26:13 2004 EDT Modified files: /ZendEngine2 zend_compile.c zend_language_scanner.h zend_language_scanner.l Log: Nuke compile warning by using the LANG_SCNG macro instead Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.514 ZendEngine2/zend_compile.c:1.515 --- ZendEngine2/zend_compile.c:1.514 Wed Jan 14 09:00:11 2004 +++ ZendEngine2/zend_compile.c Fri Jan 16 19:26:12 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.514 2004/01/14 14:00:11 zeev Exp $ */ +/* $Id: zend_compile.c,v 1.515 2004/01/17 00:26:12 sniper Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -68,7 +68,7 @@ uint char_pos_len; char *filename; - char_pos_len = zend_sprintf(char_pos_buf, "%x", zend_get_last_accepting_character_position(TSRMLS_C)); + char_pos_len = zend_sprintf(char_pos_buf, "%x", (unsigned int) LANG_SCNG(_yy_last_accepting_cpos)); if (CG(active_op_array)->filename) { filename = CG(active_op_array)->filename; } else { Index: ZendEngine2/zend_language_scanner.h diff -u ZendEngine2/zend_language_scanner.h:1.17 ZendEngine2/zend_language_scanner.h:1.18 --- ZendEngine2/zend_language_scanner.h:1.17 Sun Jan 11 16:39:40 2004 +++ ZendEngine2/zend_language_scanner.h Fri Jan 16 19:26:12 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.h,v 1.17 2004/01/11 21:39:40 wez Exp $ */ +/* $Id: zend_language_scanner.h,v 1.18 2004/01/17 00:26:12 sniper Exp $ */ #ifndef ZEND_SCANNER_H #define ZEND_SCANNER_H @@ -53,7 +53,6 @@ ZEND_API void zend_save_lexical_state(zend_lex_state *lex_state TSRMLS_DC); ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC); ZEND_API int zend_prepare_string_for_scanning(zval *str, char *filename TSRMLS_DC); -char *zend_get_last_accepting_character_position(TSRMLS_D); END_EXTERN_C() Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.101 ZendEngine2/zend_language_scanner.l:1.102 --- ZendEngine2/zend_language_scanner.l:1.101 Sun Jan 11 16:39:40 2004 +++ ZendEngine2/zend_language_scanner.l Fri Jan 16 19:26:12 2004 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.l,v 1.101 2004/01/11 21:39:40 wez Exp $ */ +/* $Id: zend_language_scanner.l,v 1.102 2004/01/17 00:26:12 sniper Exp $ */ #define yyleng SCNG(yy_leng) #define yytext SCNG(yy_text) @@ -178,11 +178,6 @@ #endif /* ZEND_MULTIBYTE */ } -char *zend_get_last_accepting_character_position(TSRMLS_D) -{ - return SCNG(_yy_last_accepting_cpos); -} - ZEND_API void zend_restore_lexical_state(zend_lex_state *lex_state TSRMLS_DC) { YY_BUFFER_STATE original_buffer_state = YY_CURRENT_BUFFER;

« previous php.zend-engine.cvs (#2214) next »