tony2001 Wed, 02 Nov 2011 21:12:13 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=318706
Log:
fix folding, ws and cs
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/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.c 2011-11-02 21:05:36 UTC
(rev 318705)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-11-02 21:12:13 UTC
(rev 318706)
@@ -3787,8 +3787,11 @@
}
/* }}} */
-static void zend_add_magic_methods(zend_class_entry* ce, const char* mname,
uint mname_len, zend_function* fe TSRMLS_DC) {
- if ( !strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE; }
+static void zend_add_magic_methods(zend_class_entry* ce, const char* mname,
uint mname_len, zend_function* fe TSRMLS_DC) /* {{{ */
+{
+ if (!strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
+ ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE;
+ }
else if (!strncmp(mname, ZEND_CONSTRUCTOR_FUNC_NAME, mname_len)) {
if (ce->constructor) {
zend_error(E_COMPILE_ERROR, "%s has colliding
constructor definitions coming from traits", ce->name);
@@ -3817,8 +3820,8 @@
str_efree(lowercase_name);
}
}
+/* }}} */
-
static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC,
int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
{
zend_class_entry *ce = va_arg(args, zend_class_entry*);
Modified: php/php-src/trunk/Zend/zend_compile.c
===================================================================
--- php/php-src/trunk/Zend/zend_compile.c 2011-11-02 21:05:36 UTC (rev
318705)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-11-02 21:12:13 UTC (rev
318706)
@@ -3787,8 +3787,11 @@
}
/* }}} */
-static void zend_add_magic_methods(zend_class_entry* ce, const char* mname,
uint mname_len, zend_function* fe TSRMLS_DC) {
- if ( !strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE; }
+static void zend_add_magic_methods(zend_class_entry* ce, const char* mname,
uint mname_len, zend_function* fe TSRMLS_DC) /* {{{ */
+{
+ if (!strncmp(mname, ZEND_CLONE_FUNC_NAME, mname_len)) {
+ ce->clone = fe; fe->common.fn_flags |= ZEND_ACC_CLONE;
+ }
else if (!strncmp(mname, ZEND_CONSTRUCTOR_FUNC_NAME, mname_len)) {
if (ce->constructor) {
zend_error(E_COMPILE_ERROR, "%s has colliding
constructor definitions coming from traits", ce->name);
@@ -3817,8 +3820,8 @@
str_efree(lowercase_name);
}
}
+/* }}} */
-
static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC,
int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
{
zend_class_entry *ce = va_arg(args, zend_class_entry*);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
