cvs: ZendEngine2 / zend_compile.c
| From: | Zeev Suraski | Date: | Tue, 10 Dec 2002 09:04:13 +0000 |
| Subject: | cvs: ZendEngine2 / zend_compile.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-704@lists.php.net to get a copy of this message | ||
zeev Tue Dec 10 04:04:13 2002 EDT
Modified files:
/ZendEngine2 zend_compile.c
Log:
Fix check to allow for static+access level modifiers
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.334 ZendEngine2/zend_compile.c:1.335
--- ZendEngine2/zend_compile.c:1.334 Mon Dec 9 07:10:17 2002
+++ ZendEngine2/zend_compile.c Tue Dec 10 04:04:12 2002
@@ -912,7 +912,8 @@
int zend_do_verify_access_types(znode *current_access_type, znode *new_modifier)
{
- if (current_access_type->u.constant.value.lval & ZEND_ACC_PPP_MASK) {
+ if ((new_modifier->u.constant.value.lval & ZEND_ACC_PPP_MASK)
+ && ((current_access_type->u.constant.value.lval & ZEND_ACC_PPP_MASK) !=
(new_modifier->u.constant.value.lval & ZEND_ACC_PPP_MASK))) {
zend_error(E_COMPILE_ERROR, "Multiple access type modifiers are not allowed");
}
return (current_access_type->u.constant.value.lval | new_modifier->u.constant.value.lval);