dmitry Fri Oct 21 05:33:22 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.111.2.10&r2=1.111.2.11&ty=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.111.2.10
ZendEngine2/zend_language_scanner.l:1.111.2.11
--- ZendEngine2/zend_language_scanner.l:1.111.2.10 Thu Jun 9 04:54:24 2005
+++ ZendEngine2/zend_language_scanner.l Fri Oct 21 05:33:22 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.111.2.10 2005/06/09 08:54:24 dmitry Exp $
*/
+/* $Id: zend_language_scanner.l,v 1.111.2.11 2005/10/21 09:33:22 dmitry Exp $
*/
#define yyleng SCNG(yy_leng)
#define yytext SCNG(yy_text)
@@ -598,6 +598,7 @@
if (zend_prepare_string_for_scanning(str, str_name TSRMLS_CC)==FAILURE)
{
return FAILURE;
}
+ BEGIN(INITIAL);
zend_highlight(syntax_highlighter_ini TSRMLS_CC);
#ifdef ZEND_MULTIBYTE
if (SCNG(script_org)) {
http://cvs.php.net/diff.php/php-src/ext/tokenizer/tokenizer.c?r1=1.29.2.1&r2=1.29.2.2&ty=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.29.2.1
php-src/ext/tokenizer/tokenizer.c:1.29.2.2
--- php-src/ext/tokenizer/tokenizer.c:1.29.2.1 Thu Dec 30 10:23:07 2004
+++ php-src/ext/tokenizer/tokenizer.c Fri Oct 21 05:33:22 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tokenizer.c,v 1.29.2.1 2004/12/30 15:23:07 sniper Exp $ */
+/* $Id: tokenizer.c,v 1.29.2.2 2005/10/21 09:33:22 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -519,6 +519,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
