[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/Zend/ zend_compile.c
felipe Sat, 09 Jul 2011 14:35:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313089
Log:
- WS
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-07-09 14:02:42 UTC
(rev 313088)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-07-09 14:35:37 UTC
(rev 313089)
@@ -5804,7 +5804,7 @@
znode dummy, value_node;
zend_bool assign_by_ref=0;
- opline = CG(active_op_array)-opcodes[as_token-u.op. opline_num];
+ opline = CG(active_op_array)-opcodes[as_token-u.op.opline_num];
if (key-op_type != IS_UNUSED) {
znode *tmp;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c branches/PHP_5_4/Zend/zend_compile.h branches/PHP_5_4/Zend/zend_language_parser.y trunk/Zend/zend_compile.c trunk/Zend/zend_compile.h
felipe Sat, 09 Jul 2011 17:27:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313094
Log:
- Changed zend_resolve_class_name() prototype
# No needed to pass fetch_type as pointer here
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/branches/PHP_5_4/Zend/zend_compile.h
U php/php-src/branches/PHP_5_4/Zend/zend_language_parser.y
U php/php-src/trunk/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.h
U php/php-src/trunk/Zend/zend_language_parser.y
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-07-09 17:21:59 UTC (rev 313093)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-07-09 17:27:59 UTC (rev 313094)
@@ -699,9 +699,7 @@
if (class_name-op_type == IS_CONST
ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_name-u.constant), Z_STRLEN(class_name-u.constant))) {
- ulong fetch_type = ZEND_FETCH_CLASS_GLOBAL;
-
- zend_resolve_class_name(class_name, fetch_type, 1 TSRMLS_CC);
+ zend_resolve_class_name(class_name, ZEND_FETCH_CLASS_GLOBAL, 1 TSRMLS_CC);
class_node = *class_name;
} else {
zend_do_fetch_class(class_node, class_name TSRMLS_CC);
@@ -1856,7 +1854,7 @@
if (class_type-u.constant.type != IS_NULL) {
cur_arg_info-type_hint = IS_OBJECT;
if (ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_type-u.constant), Z_STRLEN(class_type-u.constant))) {
-zend_resolve_class_name(class_type, opline-extended_value, 1 TSRMLS_CC);
+zend_resolve_class_name(class_type, opline-extended_value, 1 TSRMLS_CC);
}
class_type-u.constant.value.str.val = zend_new_interned_string(class_type-u.constant.value.str.val, class_type-u.constant.value.str.len + 1, 1 TSRMLS_CC);
cur_arg_info-class_name = class_type-u.constant.value.str.val;
@@ -2063,7 +2061,7 @@
}
/* }}} */
-void zend_resolve_class_name(znode *class_name, ulong *fetch_type, int check_ns_name TSRMLS_DC) /* {{{ */
+void zend_resolve_class_name(znode *class_name, ulong fetch_type, int check_ns_name TSRMLS_DC) /* {{{ */
{
char *compound;
char *lcname;
@@ -2171,7 +2169,7 @@
zval_dtor(class_name-u.constant);
break;
default:
-zend_resolve_class_name(class_name, opline-extended_value, 0 TSRMLS_CC);
+zend_resolve_class_name(class_name, opline-extended_value, 0 TSRMLS_CC);
opline-op2_type = IS_CONST;
opline-op2.constant =
zend_add_class_name_literal(CG(active_op_array), class_name-u.constant TSRMLS_CC);
@@ -2329,7 +2327,6 @@
znode class_node;
unsigned char *ptr = NULL;
zend_op *opline;
- ulong fetch_type = 0;
if (method_name-op_type == IS_CONST) {
char *lcname = zend_str_tolower_dup(Z_STRVAL(method_name-u.constant), Z_STRLEN(method_name-u.constant));
@@ -2343,8 +2340,7 @@
if (class_name-op_type == IS_CONST
ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_name-u.constant), Z_STRLEN(class_name-u.constant))) {
- fetch_type = ZEND_FETCH_CLASS_GLOBAL;
- zend_resolve_class_name(class_name, fetch_type, 1 TSRMLS_CC);
+ zend_resolve_class_name(class_name, ZEND_FETCH_CLASS_GLOBAL, 1 TSRMLS_CC);
class_node = *class_name;
opline = get_next_op(CG(active_op_array) TSRMLS_CC);
} else {
@@ -2687,9 +2683,7 @@
if (class_name-op_type == IS_CONST
ZEND_FETCH_CLASS_DEFAULT == zend_get_class_fetch_type(Z_STRVAL(class_name-u.constant), Z_STRLEN(class_name-u.constant))) {
- ulong fetch_type = ZEND_FETCH_CLASS_GLOBAL;
-
- zend_resolve_class_name(class_name, fetch_type, 1 TSRMLS_CC);
+ zend_resolve_class_name(class_name, ZEND_FETCH_CLASS_GLOBAL, 1 TSRMLS_CC);
catch_class = *class_name;
} else {
zend_error(E_COMPILE_ERROR, Bad class name in the catch statement);
@@ -4042,8 +4036,7 @@
/* REM: There should not be a need for copying,
zend_do_begin_class_declaration is also just using that string */
if (class_name) {
- ulong fetch_type = ZEND_FETCH_CLASS_GLOBAL;
- zend_resolve_class_name(class_name, fetch_type, 1 TSRMLS_CC);
+ zend_resolve_class_name(class_name, ZEND_FETCH_CLASS_GLOBAL, 1 TSRMLS_CC);
method_ref-class_name = Z_STRVAL(class_name-u.constant);
method_ref-cname_len = Z_STRLEN(class_name-u.constant);
} else {
@@ -4735,7 +4728,7 @@
opline = get_next_op(CG(active_op_array) TSRMLS_CC);
opline-opcode = ZEND_ADD_INTERFACE;
SET_NODE(opline-op1, CG(implementing_class));
- zend_resolve_class_name(interface_name, opline-extended_value, 0 TSRMLS_CC);
+ zend_resolve_class_name(interface_name, opline-extended_value, 0 TSRMLS_CC);
opline-extended_value = (opline-extended_value ~ZEND_FETCH_CLASS_MASK) | ZEND_FETCH_CLASS_INTERFACE;
opline-op2_type = IS_CONST;
opline-op2.constant = zend_add_class_name_literal(CG(active_op_array), interface_name-u.constant TSRMLS_CC);
@@ -4760,7 +4753,7 @@
opline =
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_API.c trunk/Zend/zend_API.c
felipe Sun, 10 Jul 2011 02:00:00 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=313100
Log:
- Minor optimization, use the computed hash when available
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_API.c
U php/php-src/trunk/Zend/zend_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_API.c2011-07-10 01:07:50 UTC
(rev 313099)
+++ php/php-src/branches/PHP_5_4/Zend/zend_API.c2011-07-10 02:00:00 UTC
(rev 313100)
@@ -2023,10 +2023,18 @@
}
fname_len = strlen(ptr-fname);
lowercase_name =
zend_new_interned_string(zend_str_tolower_dup(ptr-fname, fname_len), fname_len
+ 1, 1 TSRMLS_CC);
- if (zend_hash_add(target_function_table, lowercase_name,
fname_len+1, function, sizeof(zend_function), (void**)reg_function) ==
FAILURE) {
- unload=1;
- str_efree(lowercase_name);
- break;
+ if (IS_INTERNED(lowercase_name)) {
+ if (zend_hash_quick_add(target_function_table,
lowercase_name, fname_len+1, INTERNED_HASH(lowercase_name), function,
sizeof(zend_function), (void**)reg_function) == FAILURE) {
+ unload=1;
+ str_efree(lowercase_name);
+ break;
+ }
+ } else {
+ if (zend_hash_add(target_function_table,
lowercase_name, fname_len+1, function, sizeof(zend_function),
(void**)reg_function) == FAILURE) {
+ unload=1;
+ str_efree(lowercase_name);
+ break;
+ }
}
if (scope) {
/* Look for ctor, dtor, clone
Modified: php/php-src/trunk/Zend/zend_API.c
===
--- php/php-src/trunk/Zend/zend_API.c 2011-07-10 01:07:50 UTC (rev 313099)
+++ php/php-src/trunk/Zend/zend_API.c 2011-07-10 02:00:00 UTC (rev 313100)
@@ -2023,10 +2023,18 @@
}
fname_len = strlen(ptr-fname);
lowercase_name =
zend_new_interned_string(zend_str_tolower_dup(ptr-fname, fname_len), fname_len
+ 1, 1 TSRMLS_CC);
- if (zend_hash_add(target_function_table, lowercase_name,
fname_len+1, function, sizeof(zend_function), (void**)reg_function) ==
FAILURE) {
- unload=1;
- str_efree(lowercase_name);
- break;
+ if (IS_INTERNED(lowercase_name)) {
+ if (zend_hash_quick_add(target_function_table,
lowercase_name, fname_len+1, INTERNED_HASH(lowercase_name), function,
sizeof(zend_function), (void**)reg_function) == FAILURE) {
+ unload=1;
+ str_efree(lowercase_name);
+ break;
+ }
+ } else {
+ if (zend_hash_add(target_function_table,
lowercase_name, fname_len+1, function, sizeof(zend_function),
(void**)reg_function) == FAILURE) {
+ unload=1;
+ str_efree(lowercase_name);
+ break;
+ }
}
if (scope) {
/* Look for ctor, dtor, clone
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/win32/build/libs_version.txt trunk/win32/build/libs_version.txt
pajoye Sun, 10 Jul 2011 02:20:34 + Revision: http://svn.php.net/viewvc?view=revisionrevision=313101 Log: - update libpng to 1.2.45 Changed paths: U php/php-src/branches/PHP_5_4/win32/build/libs_version.txt U php/php-src/trunk/win32/build/libs_version.txt Modified: php/php-src/branches/PHP_5_4/win32/build/libs_version.txt === --- php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-07-10 02:00:00 UTC (rev 313100) +++ php/php-src/branches/PHP_5_4/win32/build/libs_version.txt 2011-07-10 02:20:34 UTC (rev 313101) @@ -1 +1,2 @@ libcurl-7.21.6 +libpng-1.2.45 \ No newline at end of file Modified: php/php-src/trunk/win32/build/libs_version.txt === --- php/php-src/trunk/win32/build/libs_version.txt 2011-07-10 02:00:00 UTC (rev 313100) +++ php/php-src/trunk/win32/build/libs_version.txt 2011-07-10 02:20:34 UTC (rev 313101) @@ -1 +1,2 @@ libcurl-7.21.6 +libpng-1.2.45 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
