From: Andi Gutmans <andi@php.net>
Date: Tue, 11 Dec 2001 17:56:57 +0000 (+0000)
Subject: - Start making scope change correctly when calling namespace functions.
X-Git-Tag: ChangeLog~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1dcef1e4ea8dd4678ae0558119642fdd9cb95606;p=php

- Start making scope change correctly when calling namespace functions.
- When inside a namespace fallback to global namespace when function
- or constant is not found.
---

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 67c80458b4..5e53d005b3 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1615,13 +1615,24 @@ binary_assign_op_addr: {
 							}
 							active_function_table = &Z_OBJCE_P(EX(object).ptr)->function_table;
 						}
+						if (zend_hash_find(active_function_table, function_name->value.str.val, function_name->value.str.len+1, (void **) &function)==FAILURE) {
+							zend_error(E_ERROR, "Call to undefined function:  %s()", function_name->value.str.val);
+						}
 					} else { /* function pointer */
 						EX(object).ptr = NULL;
-						active_function_table = EG(namespace)?&EG(namespace)->function_table:EG(function_table);
-					}
-					if (zend_hash_find(active_function_table, function_name->value.str.val, function_name->value.str.len+1, (void **) &function)==FAILURE) {
-						zend_error(E_ERROR, "Call to undefined function:  %s()", function_name->value.str.val);
+						do {
+							if (EG(namespace)) {
+								if (zend_hash_find(&EG(namespace)->function_table, function_name->value.str.val, function_name->value.str.len+1, (void **) &function) == SUCCESS) {
+									break;
+								}
+							}
+							if (zend_hash_find(EG(function_table), function_name->value.str.val, function_name->value.str.len+1, (void **) &function)==FAILURE) {
+								zend_error(E_ERROR, "Call to undefined function:  %s()", function_name->value.str.val);
+							}
+							EX(calling_namespace) = NULL;
+						} while (0);
 					}
+					
 					zval_dtor(&tmp);
 					EX(fbc) = function;
 overloaded_function_call_cont:
@@ -2065,20 +2076,25 @@ send_by_ref:
 					if (EX(opline)->op1.op_type == IS_UNUSED) {
 						if (EG(namespace)) {
 							ce = EG(namespace);
-						} else {
-							if (!zend_get_constant(EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len, &EX(Ts)[EX(opline)->result.u.var].tmp_var TSRMLS_CC)) {
-								zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
-											EX(opline)->op2.u.constant.value.str.val,
-											EX(opline)->op2.u.constant.value.str.val);
-								EX(Ts)[EX(opline)->result.u.var].tmp_var = EX(opline)->op2.u.constant;
+							if (zend_hash_find(&ce->constants, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) {
+								zval_update_constant(value, (void *) 1 TSRMLS_CC);
+								EX(Ts)[EX(opline)->result.u.var].tmp_var = **value;
 								zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var);
+								NEXT_OPCODE();
 							}
-							NEXT_OPCODE();
 						}
-					} else {
-						ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry;
+						if (!zend_get_constant(EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len, &EX(Ts)[EX(opline)->result.u.var].tmp_var TSRMLS_CC)) {
+							zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'",
+										EX(opline)->op2.u.constant.value.str.val,
+										EX(opline)->op2.u.constant.value.str.val);
+							EX(Ts)[EX(opline)->result.u.var].tmp_var = EX(opline)->op2.u.constant;
+							zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var);
+						}
+						NEXT_OPCODE();
 					}
 					
+					ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry;
+					
 					if (zend_hash_find(&ce->constants, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) {
 						zval_update_constant(value, (void *) 1 TSRMLS_CC);
 						EX(Ts)[EX(opline)->result.u.var].tmp_var = **value;