cvs: ZendEngine2(PHP_5_3) / zend_compile.c

dmitry		Fri Aug 29 10:17:09 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_compile.c 
  Log:
  Imporoved compile-time constant substitution (Matt)
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.84&r2=1.647.2.27.2.41.2.85&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.84 ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.85
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.84	Sun Aug 24 18:22:33 2008
+++ ZendEngine2/zend_compile.c	Fri Aug 29 10:17:08 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.84 2008/08/24 18:22:33 colder Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.85 2008/08/29 10:17:08 dmitry Exp $ */
 
 #include <zend_language_parser.h>
 #include "zend.h"
@@ -1392,7 +1392,7 @@
 	zend_do_begin_function_declaration(function_token, &function_name, 0, return_reference, NULL TSRMLS_CC);
 
 	result->op_type = IS_TMP_VAR;
-	result->u.var = get_temporary_variable(current_op_array);;
+	result->u.var = get_temporary_variable(current_op_array);
 
 	current_op = &current_op_array->opcodes[current_op_number];
 	current_op->opcode = ZEND_DECLARE_LAMBDA_FUNCTION;
@@ -3767,7 +3767,7 @@
 	*result = CG(active_op_array)->opcodes[new_token->u.opline_num].result;
 }
 
-static zend_constant* zend_get_ct_const(const zval *const_name, int mode TSRMLS_DC) /* {{{ */
+static zend_constant* zend_get_ct_const(const zval *const_name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */
 {
 	zend_constant *c = NULL;
 
@@ -3786,9 +3786,8 @@
 	if (c->flags & CONST_CT_SUBST) {
 		return c;
 	}
-	if (mode == ZEND_RT &&
+	if (all_internal_constants_substitution &&
 	    (c->flags & CONST_PERSISTENT) &&
-	    !CG(current_namespace) &&
 	    !(CG(compiler_options) & ZEND_COMPILE_NO_CONSTANT_SUBSTITUTION) &&
 	    Z_TYPE(c->value) != IS_CONSTANT &&
 	    Z_TYPE(c->value) != IS_CONSTANT_ARRAY) {
@@ -3798,9 +3797,9 @@
 }
 /* }}} */
 
-static int zend_constant_ct_subst(znode *result, zval *const_name, int mode TSRMLS_DC) /* {{{ */
+static int zend_constant_ct_subst(znode *result, zval *const_name, int all_internal_constants_substitution TSRMLS_DC) /* {{{ */
 {
-	zend_constant *c = zend_get_ct_const(const_name, mode TSRMLS_CC);
+	zend_constant *c = zend_get_ct_const(const_name, all_internal_constants_substitution TSRMLS_CC);
 
 	if (c) {
 		zval_dtor(const_name);
@@ -3827,7 +3826,7 @@
 		zval_dtor(&constant_container->u.constant);
 		check_namespace = 1;
 		constant_container = NULL;
-		fetch_type = ZEND_FETCH_CLASS_RT_NS_CHECK | IS_CONSTANT_RT_NS_CHECK;;
+		fetch_type = ZEND_FETCH_CLASS_RT_NS_CHECK | IS_CONSTANT_RT_NS_CHECK;
 	}
 
 	switch (mode) {
@@ -3843,7 +3842,7 @@
 				zend_do_build_full_name(NULL, constant_container, constant_name TSRMLS_CC);
 				*result = *constant_container;
 				result->u.constant.type = IS_CONSTANT | fetch_type;
-			} else if (fetch_type || !zend_constant_ct_subst(result, &constant_name->u.constant, ZEND_CT TSRMLS_CC)) {
+			} else if (fetch_type || !zend_constant_ct_subst(result, &constant_name->u.constant, 0 TSRMLS_CC)) {
 				if (check_namespace && CG(current_namespace)) {
 					/* We assume we use constant from the current namespace
 					   if it is not prefixed. */
@@ -3860,7 +3859,7 @@
 			break;
 		case ZEND_RT:
 			if (constant_container ||
-			    !zend_constant_ct_subst(result, &constant_name->u.constant, ZEND_RT TSRMLS_CC)) {
+			    !zend_constant_ct_subst(result, &constant_name->u.constant, (!CG(current_namespace) || !check_namespace) TSRMLS_CC)) {
 				zend_op *opline;
 
 				if (constant_container) {
@@ -5166,7 +5165,7 @@
 		zend_error(E_COMPILE_ERROR, "Arrays are not allowed as constants");
 	}
 
-	if (zend_get_ct_const(&name->u.constant, ZEND_CT TSRMLS_CC)) {
+	if (zend_get_ct_const(&name->u.constant, 0 TSRMLS_CC)) {
 		zend_error(E_COMPILE_ERROR, "Cannot redeclare constant '%s'", Z_STRVAL(name->u.constant));
 	}