allow inner classes to use \\ now

Author: withinboredom

Zend/zend_compile.c

@@ -38,6 +38,7 @@
 #include "zend_call_stack.h"
 #include "zend_frameless_function.h"
 #include "zend_property_hooks.h"
+#include "zend_namespaces.h"
 
 #define SET_NODE(target, src) do { \
 		target ## _type = (src)->op_type; \
@@ -9188,7 +9189,7 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 			// rename the inner class so we may reference it by name
 			name = zend_string_concat3(
 				ZSTR_VAL(CG(active_class_entry)->name), ZSTR_LEN(CG(active_class_entry)->name),
-				":>", 2,
+				"\\", 1,
 				ZSTR_VAL(unqualified_name), ZSTR_LEN(unqualified_name)
 			);
 
@@ -9222,7 +9223,7 @@ static void zend_compile_class_decl(znode *result, zend_ast *ast, bool toplevel)
 		} else {
 			name = zend_prefix_with_ns(unqualified_name);
 			ce->required_scope = NULL;
-			ce->lexical_scope = NULL;
+			ce->lexical_scope = zend_resolve_namespace(FC(current_namespace));
 		}
 		name = zend_new_interned_string(name);
 		lcname = zend_string_tolower(name);

Zend/zend_compile.h

@@ -1062,6 +1062,7 @@ ZEND_API zend_string *zend_type_to_string(zend_type type);
 
 #define ZEND_INTERNAL_CLASS         1
 #define ZEND_USER_CLASS             2
+#define ZEND_NAMESPACE_CLASS        4
 
 #define ZEND_EVAL				(1<<0)
 #define ZEND_INCLUDE			(1<<1)

Zend/zend_execute_API.c

@@ -1166,6 +1166,27 @@ ZEND_API bool zend_is_valid_class_name(zend_string *name) {
 	return 1;
 }
 
+static zend_string *get_namespace_from_scope(const zend_class_entry *scope) {
+	while (scope && scope->lexical_scope && scope->type != ZEND_NAMESPACE_CLASS) {
+		scope = scope->lexical_scope;
+	}
+	return scope->name;
+}
+
+static zend_string *get_scoped_name(const zend_string *ns, zend_string *name) {
+	// remove the matching prefix from name
+	name = zend_string_tolower(name);
+	if (ns && ZSTR_LEN(ns) && ZSTR_LEN(name) > ZSTR_LEN(ns) + 1 &&
+		memcmp(ZSTR_VAL(name), ZSTR_VAL(ns), ZSTR_LEN(ns)) == 0 &&
+		ZSTR_VAL(name)[ZSTR_LEN(ns)] == '\\') {
+		zend_string *ret = zend_string_init(ZSTR_VAL(name) + ZSTR_LEN(ns) + 1, ZSTR_LEN(name) - ZSTR_LEN(ns) - 1, 0);
+		zend_string_release(name);
+		return ret;
+	}
+	zend_string_release(name);
+	return name;
+}
+
 ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *key, uint32_t flags) /* {{{ */
 {
 	zend_class_entry *ce = NULL;
@@ -1182,6 +1203,31 @@ ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, zend_string *
 		}
 	}
 
+	if (!zend_is_compiling()) {
+		const zend_class_entry *scope = zend_get_executed_scope();
+		if (scope && scope->lexical_scope && scope->lexical_scope->type != ZEND_NAMESPACE_CLASS) {
+			zend_string *ns_name = get_namespace_from_scope(scope);
+			zend_string *scoped_name = get_scoped_name(ns_name, name);
+			while (scope->type != ZEND_NAMESPACE_CLASS) {
+				zend_string *try_name = zend_string_concat3(ZSTR_VAL(scope->name), ZSTR_LEN(scope->name), "\\", 1, ZSTR_VAL(scoped_name), ZSTR_LEN(scoped_name));
+				lc_name = zend_string_tolower(try_name);
+				ce = zend_hash_find_ptr(EG(class_table), lc_name);
+				if (ce) {
+					zend_string_release(lc_name);
+					zend_string_release(scoped_name);
+					zend_string_release(ns_name);
+					zend_string_release(try_name);
+					return ce;
+				}
+				scope = scope->lexical_scope;
+				zend_string_release(lc_name);
+				zend_string_release(try_name);
+			}
+			zend_string_release(ns_name);
+			zend_string_release(scoped_name);
+		}
+	}
+
 	if (key) {
 		lc_name = key;
 	} else {

Zend/zend_namespaces.c

@@ -0,0 +1,123 @@
+/*
++----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) Zend Technologies Ltd. (http://www.zend.com)           |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Rob Landers <rob@bottled.codes>                             |
+   |                                                                      |
+   +----------------------------------------------------------------------+
+*/
+
+#include "zend_namespaces.h"
+
+#include <zend_smart_str.h>
+
+#include "zend_API.h"
+#include "zend_hash.h"
+
+static zend_class_entry *global_namespace = NULL;
+static HashTable namespaces;
+
+static zend_class_entry *create_namespace(zend_string *name) {
+	zend_class_entry *ns = pemalloc(sizeof(zend_class_entry), 1);
+	memset(ns, 0, sizeof(zend_class_entry));
+	zend_initialize_class_data(ns, 1);
+	ns->type = ZEND_NAMESPACE_CLASS;
+
+	zend_string *interned_name = zend_new_interned_string(zend_string_copy(name));
+	ns->name = interned_name;
+
+	return ns;
+}
+
+static zend_class_entry *insert_namespace(const zend_string *name) {
+	zend_class_entry *ns = NULL;
+	zend_class_entry *parent_ns = global_namespace;
+	zend_string *part = NULL;
+	const char *start = ZSTR_VAL(name);
+	const char *end = start + ZSTR_LEN(name);
+	const char *pos = start;
+	size_t len = 0;
+
+	smart_str current_ns = {0};
+
+	while (pos <= end) {
+		if (pos == end || *pos == '\\') {
+			len = pos - start;
+			part = zend_string_init(start, len, 0);
+
+			if (current_ns.s) {
+				smart_str_appendc(&current_ns, '\\');
+			}
+			smart_str_appendl(&current_ns, ZSTR_VAL(part), ZSTR_LEN(part));
+			smart_str_0(&current_ns);
+
+			zend_string *needle = zend_string_init(ZSTR_VAL(current_ns.s), ZSTR_LEN(current_ns.s), 0);
+			ns = zend_hash_find_ptr(&namespaces, needle);
+
+			if (!ns) {
+				ns = create_namespace(needle);
+				ns->parent = parent_ns;
+				zend_hash_add_ptr(&namespaces, current_ns.s, ns);
+			}
+
+			zend_string_release(part);
+			zend_string_release(needle);
+
+			parent_ns = ns;
+			start = pos + 1;
+		}
+		pos++;
+	}
+
+	smart_str_free(&current_ns);
+
+	return ns;
+}
+
+zend_class_entry *zend_resolve_namespace(zend_string *name) {
+	if (global_namespace == NULL) {
+		global_namespace = create_namespace(zend_empty_string);
+		zend_hash_init(&namespaces, 8, NULL, ZEND_CLASS_DTOR, 1);
+		zend_hash_add_ptr(&namespaces, zend_empty_string, global_namespace);
+	}
+
+	if (name == NULL || ZSTR_LEN(name) == 0) {
+		return global_namespace;
+	}
+
+	zend_string *lc_name = zend_string_tolower(name);
+	zend_class_entry *ns = zend_hash_find_ptr(&namespaces, lc_name);
+
+	if (!ns) {
+		ns = insert_namespace(lc_name);
+	}
+
+	zend_string_release(lc_name);
+
+	return ns;
+}
+
+void zend_destroy_namespaces() {
+	if (global_namespace == NULL) {
+		return;
+	}
+
+	const zend_class_entry *ns = NULL;
+	ZEND_HASH_FOREACH_PTR(&namespaces, ns) {
+		zend_string_release(ns->name);
+	} ZEND_HASH_FOREACH_END();
+
+	zend_hash_destroy(&namespaces);
+	zend_string_release(global_namespace->name);
+	pefree(global_namespace, 1);
+}

Zend/zend_namespaces.h

@@ -0,0 +1,29 @@
+/*
++----------------------------------------------------------------------+
+   | Zend Engine                                                          |
+   +----------------------------------------------------------------------+
+   | Copyright (c) Zend Technologies Ltd. (http://www.zend.com)           |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.00 of the Zend license,     |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.zend.com/license/2_00.txt.                                |
+   | If you did not receive a copy of the Zend license and are unable to  |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@zend.com so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Rob Landers <rob@bottled.codes>                             |
+   |                                                                      |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_NAMESPACES_H
+#define ZEND_NAMESPACES_H
+
+#include "zend.h"
+#include "zend_compile.h"
+
+zend_class_entry *zend_resolve_namespace(zend_string *name);
+void zend_destroy_namespaces(void);
+
+#endif //ZEND_NAMESPACES_H

configure.ac

@@ -1757,6 +1757,7 @@ PHP_ADD_SOURCES([Zend], m4_normalize([
     zend_opcode.c
     zend_operators.c
     zend_property_hooks.c
+    zend_namespaces.c
     zend_ptr_stack.c
     zend_signal.c
     zend_smart_str.c

main/main.c

@@ -66,6 +66,8 @@
 #include <sys/wait.h>
 #endif
 
+#include <zend_namespaces.h>
+
 #include "zend_compile.h"
 #include "zend_execute.h"
 #include "zend_highlight.h"
@@ -1966,6 +1968,8 @@ void php_request_shutdown(void *dummy)
 		zend_post_deactivate_modules();
 	} zend_end_try();
 
+	zend_destroy_namespaces();
+
 	/* 12. SAPI related shutdown*/
 	zend_try {
 		sapi_deactivate_module();