dmitry Fri Oct 21 05:32:40 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/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/php-src/NEWS?r1=1.2027.2.148&r2=1.2027.2.149&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.148 php-src/NEWS:1.2027.2.149
--- php-src/NEWS:1.2027.2.148 Fri Oct 21 04:03:25 2005
+++ php-src/NEWS Fri Oct 21 05:32:37 2005
@@ -6,6 +6,7 @@
- Fixed bug #34893 (PHP5.1 overloading, Cannot access private property).
(Dmitry)
- Fixed bug #34899 (Fixed sqlite extension compile failure). (Ilia)
+- Fixed bug #34782 (token_get_all() gives wrong result). (Dmitry)
- Fixed bug #34767 (Zend Engine 1 Compatibility not copying objects correctly).
(Dmitry)
- Fixed bug #34712 (zend.ze1_compatibility_mode = on segfault). (Dmitry)
http://cvs.php.net/diff.php/ZendEngine2/zend_language_scanner.l?r1=1.131&r2=1.131.2.1&ty=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.131
ZendEngine2/zend_language_scanner.l:1.131.2.1
--- ZendEngine2/zend_language_scanner.l:1.131 Wed Aug 3 09:30:54 2005
+++ ZendEngine2/zend_language_scanner.l Fri Oct 21 05:32:40 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.131 2005/08/03 13:30:54 sniper Exp $ */
+/* $Id: zend_language_scanner.l,v 1.131.2.1 2005/10/21 09:32:40 dmitry Exp $ */
#define yyleng SCNG(yy_leng)
#define yytext SCNG(yy_text)
@@ -615,6 +615,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.31&r2=1.31.2.1&ty=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31
php-src/ext/tokenizer/tokenizer.c:1.31.2.1
--- php-src/ext/tokenizer/tokenizer.c:1.31 Wed Aug 3 10:08:19 2005
+++ php-src/ext/tokenizer/tokenizer.c Fri Oct 21 05:32:40 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tokenizer.c,v 1.31 2005/08/03 14:08:19 sniper Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.1 2005/10/21 09:32:40 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
