dmitry Fri Oct 21 05:33:04 2005 EDT
Modified files:
/ZendEngine2 zend_language_scanner.l
/php-src/ext/tokenizer tokenizer.c
Log:
Fixed bug #34782 (token_get_all() gives wrong result)
http://cvs.php.net/diff.php/ZendEngine2/zend_language_scanner.l?r1=1.134&r2=1.135&ty=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.134
ZendEngine2/zend_language_scanner.l:1.135
--- ZendEngine2/zend_language_scanner.l:1.134 Wed Aug 24 16:42:07 2005
+++ ZendEngine2/zend_language_scanner.l Fri Oct 21 05:33:04 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.134 2005/08/24 20:42:07 andrei Exp $ */
+/* $Id: zend_language_scanner.l,v 1.135 2005/10/21 09:33:04 dmitry Exp $ */
#define yyleng SCNG(yy_leng)
#define yytext SCNG(yy_text)
@@ -1005,6 +1005,7 @@
if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE)
{
return FAILURE;
}
+ BEGIN(INITIAL);
zend_highlight(syntax_highlighter_ini TSRMLS_CC);
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
zval_dtor(str);
http://cvs.php.net/diff.php/php-src/ext/tokenizer/tokenizer.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.32
php-src/ext/tokenizer/tokenizer.c:1.33
--- php-src/ext/tokenizer/tokenizer.c:1.32 Mon Aug 15 10:41:31 2005
+++ php-src/ext/tokenizer/tokenizer.c Fri Oct 21 05:33:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tokenizer.c,v 1.32 2005/08/15 14:41:31 dmitry Exp $ */
+/* $Id: tokenizer.c,v 1.33 2005/10/21 09:33:04 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -521,6 +521,8 @@
RETURN_EMPTY_STRING();
}
+ LANG_SCNG(start) = 1;
+
tokenize(return_value TSRMLS_CC);
zend_restore_lexical_state(&original_lex_state TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
