cvs: ZendEngine2 / zend_compile.c
| From: | Marcus Boerger | Date: | Tue, 30 May 2006 23:10:55 +0000 |
| Subject: | cvs: ZendEngine2 / zend_compile.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4949@lists.php.net to get a copy of this message | ||
helly Tue May 30 23:10:55 2006 UTC
Modified files:
/ZendEngine2 zend_compile.c
Log:
- Fix test logic
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_compile.c?r1=1.711&r2=1.712&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.711 ZendEngine2/zend_compile.c:1.712
--- ZendEngine2/zend_compile.c:1.711 Tue May 30 19:40:19 2006
+++ ZendEngine2/zend_compile.c Tue May 30 23:10:55 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.711 2006/05/30 19:40:19 helly Exp $ */
+/* $Id: zend_compile.c,v 1.712 2006/05/30 23:10:55 helly Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -2163,7 +2163,7 @@
if (parent_flags & ZEND_ACC_ABSTRACT) {
child->common.fn_flags |= ZEND_ACC_IMPLEMENTED_ABSTRACT;
child->common.prototype = parent;
- } else if (!(parent->common.fn_flags & ZEND_ACC_CTOR) || (parent->common.prototype
&& parent->common.prototype->common.scope->ce_flags && ZEND_ACC_INTERFACE))
{
+ } else if (!(parent->common.fn_flags & ZEND_ACC_CTOR) || (parent->common.prototype
&& (parent->common.prototype->common.scope->ce_flags & ZEND_ACC_INTERFACE))) {
/* ctors only have a prototype if it comes from an interface */
child->common.prototype = parent->common.prototype ? parent->common.prototype : parent;
}