[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/tokenizer tokenizer.c

2005-11-26 Thread Ilia Alshanetsky 
iliaa   Sun Nov 27 01:41:33 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/tokenizer  tokenizer.c 
/php-srcNEWS 
  Log:
  tokenizer fixes for bug #35382
  Bug fixing news
  
  
http://cvs.php.net/diff.php/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.2r2=1.31.2.3ty=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.2 
php-src/ext/tokenizer/tokenizer.c:1.31.2.3
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.2  Thu Nov 10 02:50:59 2005
+++ php-src/ext/tokenizer/tokenizer.c   Sun Nov 27 01:41:31 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: tokenizer.c,v 1.31.2.2 2005/11/10 07:50:59 sniper Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.3 2005/11/27 06:41:31 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -344,6 +344,8 @@
while ((token_type = lex_scan(token TSRMLS_CC))) {
destroy = 1;
switch (token_type) {
+   case EOF:
+   zendleng--; /* don't count EOF */
case T_OPEN_TAG:
case T_OPEN_TAG_WITH_ECHO:
case T_WHITESPACE:
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.227r2=1.2027.2.228ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.227 php-src/NEWS:1.2027.2.228
--- php-src/NEWS:1.2027.2.227   Sat Nov 26 16:04:42 2005
+++ php-src/NEWSSun Nov 27 01:41:32 2005
@@ -1,16 +1,18 @@
 PHPNEWS
 |||
 ?? ??? 2006, PHP 5.1.1
-- Changed reflection constants to class constants. (Johannes)
+- Make reflection constants be both PHP and class constants. (Johannes)
 - Added an additional field $frame['object'] to the result array of
   debug_backtrace() that contains a reference to the respective object when the
   frame was called from an object. (Sebastian)
 - Fixed bug #35413 (Removed -dev flag from Zend Engine version). (Ilia)
+- Fixed bug #35411 (Regression with \{$ handling). (Ilia)
 - Fixed bug #35406 (eval hangs when evall'ed code ends with comment w/o 
   newline). (Marcus)
 - Fixed bug #35402 (New date class causes crash in get_object_vars()). (Tony)
 - Fixed bug #35391 (pdo_mysql::exec does not return number of affected rows). 
   (Tony)
+- Fixed bug #35382 (Comment in end of file produces fatal error). (Ilia)
 - Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash).
   (Dmitry)
 - Fixed bug #35358 (Incorrect error messages for PDO class constants). (Ilia)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/tokenizer tokenizer.c

2005-11-09 Thread Jani Taskinen 
sniper  Thu Nov 10 02:51:00 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-src/ext/tokenizer  tokenizer.c 
/php-srcNEWS 
  Log:
  MFH: - Fixed bug #35179 (tokenizer extension needs T_HALT_COMPILER)
  
http://cvs.php.net/diff.php/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.1r2=1.31.2.2ty=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.1 
php-src/ext/tokenizer/tokenizer.c:1.31.2.2
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.1  Fri Oct 21 05:32:40 2005
+++ php-src/ext/tokenizer/tokenizer.c   Thu Nov 10 02:50:59 2005
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: tokenizer.c,v 1.31.2.1 2005/10/21 09:32:40 dmitry Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.2 2005/11/10 07:50:59 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -282,7 +282,8 @@
REGISTER_LONG_CONSTANT(T_THROW, T_THROW, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(T_TRY, T_TRY, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(T_CLONE, T_CLONE, CONST_CS | CONST_PERSISTENT);
-   
+   REGISTER_LONG_CONSTANT(T_HALT_COMPILER, T_HALT_COMPILER, CONST_CS | 
CONST_PERSISTENT);
+
return SUCCESS;
 }
 /* }}} */
@@ -495,6 +496,7 @@
case T_THROW: return T_THROW;
case T_TRY: return T_TRY;
case T_CLONE: return T_CLONE;
+   case T_HALT_COMPILER: return T_HALT_COMPILER;
}
return UNKNOWN;
 }
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.184r2=1.2027.2.185ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.184 php-src/NEWS:1.2027.2.185
--- php-src/NEWS:1.2027.2.184   Tue Nov  8 11:57:10 2005
+++ php-src/NEWSThu Nov 10 02:50:59 2005
@@ -4,6 +4,7 @@
 - Fixed bug in mysqli extension with unsigned int(11) being represented as 
   signed integer in PHP instead of string in 32bit systems. (Andrey)
 - Fixed initializing and argument checking for posix_mknod(). (Derick)
+- Fixed bug #35179 (tokenizer extension needs T_HALT_COMPILER). (Greg)
 - Fixed bug #35142 (SOAP Client/Server Complex Object Support). (Dmitry)
 - Fixed bug #35135 (PDOStatment without related PDO object may crash). (Ilia)
 - Fixed bug #35091 (SoapClient leaks memory). (Dmitry)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/tokenizer tokenizer.c ZendEngine2 zend_language_scanner.l

2005-10-21 Thread Dmitry Stogov 
dmitry  Fri Oct 21 05:32:40 2005 EDT

  Modified files:  (Branch: PHP_5_1)
/php-srcNEWS 
/ZendEngine2zend_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.148r2=1.2027.2.149ty=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/NEWSFri 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.131r2=1.131.2.1ty=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.31r2=1.31.2.1ty=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