cvs: ZendEngine2 / zend_compile.c

zeev Tue Feb 25 05:03:28 2003 EDT Modified files: /ZendEngine2 zend_compile.c Log: Get the bits right - final/private fix Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.374 ZendEngine2/zend_compile.c:1.375 --- ZendEngine2/zend_compile.c:1.374 Mon Feb 24 08:35:47 2003 +++ ZendEngine2/zend_compile.c Tue Feb 25 05:03:26 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.374 2003/02/24 13:35:47 stas Exp $ */ +/* $Id: zend_compile.c,v 1.375 2003/02/25 10:03:26 zeev Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -916,7 +916,7 @@ && ((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"); } - if ((current_access_type->u.constant.value.lval | new_modifier->u.constant.value.lval) && (ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)) { + if (((current_access_type->u.constant.value.lval | new_modifier->u.constant.value.lval) & (ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)) == (ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)) { zend_error(E_COMPILE_ERROR, "Cannot use the final modifier on a private class member"); } return (current_access_type->u.constant.value.lval | new_modifier->u.constant.value.lval);