cvs: ZendEngine2 / zend.h zend_language_scanner.l

andrei Mon Jun 12 17:06:39 2006 UTC Modified files: /ZendEngine2 zend.h zend_language_scanner.l Log: Be more explicit. http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.h?r1=1.322&r2=1.323&diff_format=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.322 ZendEngine2/zend.h:1.323 --- ZendEngine2/zend.h:1.322 Fri May 19 06:11:02 2006 +++ ZendEngine2/zend.h Mon Jun 12 17:06:39 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.322 2006/05/19 06:11:02 dmitry Exp $ */ +/* $Id: zend.h,v 1.323 2006/06/12 17:06:39 andrei Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -471,6 +471,9 @@ #define OE_IS_OBJECT (1<<1) #define OE_IS_METHOD (1<<2) +/* default engine string type */ +#define ZEND_STR_TYPE (UG(unicode)?IS_UNICODE:IS_STRING) + int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions); void zend_shutdown(TSRMLS_D); void zend_register_standard_ini_entries(TSRMLS_D); http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_language_scanner.l?r1=1.154&r2=1.155&diff_format=u Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.154 ZendEngine2/zend_language_scanner.l:1.155 --- ZendEngine2/zend_language_scanner.l:1.154 Thu May 11 18:22:09 2006 +++ ZendEngine2/zend_language_scanner.l Mon Jun 12 17:06:39 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.l,v 1.154 2006/05/11 18:22:09 andrei Exp $ */ +/* $Id: zend_language_scanner.l,v 1.155 2006/06/12 17:06:39 andrei Exp $ */ #define yyleng SCNG(yy_leng) #define yytext SCNG(yy_text) @@ -428,7 +428,7 @@ } else { Z_STRVAL_P(zendlval) = (char *)estrndup(str, str_len); Z_STRLEN_P(zendlval) = str_len; - Z_TYPE_P(zendlval) = type; + Z_TYPE_P(zendlval) = IS_STRING; } return 1;