From 055709538cb280aa0b0940f6f2dcacb376aa392d Mon Sep 17 00:00:00 2001
From: Andi Gutmans <andi@php.net>
Date: Thu, 6 Dec 2001 18:05:18 +0000
Subject: [PATCH] - Support constants. The following works now: <? 	class
 foo { 		const GC = "foo constant\n"; 	}

	define("GC", "Global constant\n");

	namespace;
	print GC;
	namespace foo;
	print GC;
	namespace;
	print foo::GC;

?>
---
 Zend/zend_execute.c | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 72ad7aef59..bbfc99390d 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2042,18 +2042,27 @@ send_by_ref:
 				}
 				NEXT_OPCODE();
 			case ZEND_FETCH_CONSTANT:
-				if (EX(opline)->op1.op_type == IS_UNUSED) {
-					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);
-					}
-				} else {
-					zend_class_entry *ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry;
+				{
+					zend_class_entry *ce;
 					zval **value;
 
+					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;
+								zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var);
+							}
+							NEXT_OPCODE();
+						}
+					} else {
+						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;
-- 
2.40.0