com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_c ompile.c
| From: | Bob Weinand | Date: | Mon, 16 Jun 2014 09:18:45 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5' into PHP-5.6: Zend/zend_c ompile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78911@lists.php.net to get a copy of this message | ||
Commit: 3c2b42ac41d01f856548b350945018ad2b485942
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 16 Jun 2014 11:18:45 +0200
Parents: 6788f14f5ef441a17e0a430846e65ead4b7e6025 e93f8e74d43d524a482ce43e5a62ca1980fe56c7
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3c2b42ac41d01f856548b350945018ad2b485942
Log:
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_compile.c
Changed paths:
MM Zend/zend_compile.c
Diff:
diff --cc Zend/zend_compile.c
index f1c8a67,0ac3bce..7c979d5
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -3487,12 -3362,9 +3487,12 @@@ static char * zend_get_function_declara
*(offset++) = '.';
}
*(offset++) = '\'';
- } else if (Z_TYPE_P(zv) == IS_ARRAY || (Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) ==
IS_CONSTANT_ARRAY) {
+ } else if (Z_TYPE_P(zv) == IS_ARRAY) {
memcpy(offset, "Array", 5);
offset += 5;
- } else if (Z_TYPE_P(zv) == IS_CONSTANT_AST) {
++ } else if ((Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_AST) {
+ memcpy(offset, "<expression>", 12);
+ offset += 12;
} else {
zend_make_printable_zval(zv, &zv_copy, &use_copy);
REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN(zv_copy));