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

2008-07-24 Thread Moriyoshi Koizumi 
moriyoshi   Fri Jul 25 03:42:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/tokenizer  tokenizer.c 
  Log:
  - MFH: suppress signedness warnings
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7.2.7r2=1.31.2.5.2.7.2.8diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.7 
php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.8
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.7  Mon Jun 23 17:28:06 2008
+++ php-src/ext/tokenizer/tokenizer.c   Fri Jul 25 03:42:01 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.7 2008/06/23 17:28:06 felipe Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.8 2008/07/25 03:42:01 moriyoshi Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -140,12 +140,12 @@
add_next_index_stringl(keyword, 
Z_STRVAL(token), Z_STRLEN(token), 1);
efree(Z_STRVAL(token));
} else {
-   add_next_index_stringl(keyword, zendtext, 
zendleng, 1);
+   add_next_index_stringl(keyword, (char 
*)zendtext, zendleng, 1);
}
add_next_index_long(keyword, token_line);
add_next_index_zval(return_value, keyword);
} else {
-   add_next_index_stringl(return_value, zendtext, 
zendleng, 1);
+   add_next_index_stringl(return_value, (char *)zendtext, 
zendleng, 1);
}
if (destroy  Z_TYPE(token) != IS_NULL) {
zval_dtor(token);



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

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

2008-06-23 Thread Felipe Pena 
felipe  Mon Jun 23 17:17:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/tokenizer  tokenizer.c 
  Log:
  - Added arginfo
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7.2.5r2=1.31.2.5.2.7.2.6diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.5 
php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.6
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.5  Wed Jun 11 07:45:44 2008
+++ php-src/ext/tokenizer/tokenizer.c   Mon Jun 23 17:17:46 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.5 2008/06/11 07:45:44 dmitry Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.6 2008/06/23 17:17:46 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -35,13 +35,25 @@
 #define zendtext LANG_SCNG(yy_text)
 #define zendleng LANG_SCNG(yy_leng)
 
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_token_get_all, 0, 0, 1)
+   ZEND_ARG_INFO(0, source)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_token_name, 0, 0, 1)
+   ZEND_ARG_INFO(0, token)
+ZEND_END_ARG_INFO()
+
+
 /* {{{ tokenizer_functions[]
  *
  * Every user visible function must have an entry in tokenizer_functions[].
  */
 const zend_function_entry tokenizer_functions[] = {
-   PHP_FE(token_get_all,   NULL)
-   PHP_FE(token_name,  NULL)
+   PHP_FE(token_get_all,   arginfo_token_get_all)
+   PHP_FE(token_name,  arginfo_token_name)
{NULL, NULL, NULL}  /* Must be the last line in 
tokenizer_functions[] */
 };
 /* }}} */



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

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

2008-06-11 Thread Dmitry Stogov 
dmitry  Wed Jun 11 07:45:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/tokenizer  tokenizer.c 
  Log:
  Fixed memory leak
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7.2.4r2=1.31.2.5.2.7.2.5diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.4 
php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.5
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.4  Sun Mar 16 21:06:53 2008
+++ php-src/ext/tokenizer/tokenizer.c   Wed Jun 11 07:45:44 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.4 2008/03/16 21:06:53 helly Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.5 2008/06/11 07:45:44 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -168,6 +168,10 @@
 
tokenize(return_value TSRMLS_CC);

+   while (!zend_stack_is_empty(LANG_SCNG(state_stack))) {
+   zend_stack_del_top(LANG_SCNG(state_stack));
+   }
+
zend_restore_lexical_state(original_lex_state TSRMLS_CC);
zval_dtor(source_z);
 }



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

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

2008-02-12 Thread Dmitry Stogov 
dmitry  Tue Feb 12 09:28:01 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/tokenizer  tokenizer.c 
  Log:
  Added NOWDOC
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7.2.2r2=1.31.2.5.2.7.2.3diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.2 
php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.3
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.2  Mon Dec 31 07:17:16 2007
+++ php-src/ext/tokenizer/tokenizer.c   Tue Feb 12 09:28:01 2008
@@ -16,7 +16,7 @@
+--+
 */
 
-/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.2 2007/12/31 07:17:16 sebastian Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.3 2008/02/12 09:28:01 dmitry Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -178,7 +178,7 @@
MAKE_STD_ZVAL(keyword);
array_init(keyword);
add_next_index_long(keyword, token_type);
-   if (token_type == T_END_HEREDOC) {
+   if (token_type == T_END_HEREDOC || token_type == 
T_END_NOWDOC) {
if (CG(increment_lineno)) {
token_line = ++CG(zend_lineno);
CG(increment_lineno) = 0;

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