namespaces: add support

This adds a new EG to support the addition of using namespaces as a
class's lexical scope

Author: withinboredom

Zend/zend_compile.h

@@ -1061,6 +1061,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        3
 
 #define ZEND_EVAL				(1<<0)
 #define ZEND_INCLUDE			(1<<1)

Zend/zend_globals.h

@@ -191,6 +191,8 @@ struct _zend_executor_globals {
 	HashTable *function_table;	/* function symbol table */
 	HashTable *class_table;		/* class table */
 	HashTable *zend_constants;	/* constants table */
+	HashTable *namespaces;		/* namespace table */
+	zend_class_entry *global_namespace;
 
 	zval          *vm_stack_top;
 	zval          *vm_stack_end;

Zend/zend_namespaces.c

@@ -0,0 +1,95 @@
+/*
++----------------------------------------------------------------------+
+   | 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          |
+   | [email protected] so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Rob Landers <[email protected]>                             |
+   |                                                                      |
+   +----------------------------------------------------------------------+
+*/
+
+#include "zend_namespaces.h"
+#include "zend_API.h"
+#include "zend_hash.h"
+
+zend_class_entry *create_namespace(zend_string *name) {
+   zend_class_entry *ns = pemalloc(sizeof(zend_class_entry *), 0);
+   zend_initialize_class_data(ns, 1);
+   ns->type = ZEND_NAMESPACE_CLASS;
+   ns->ce_flags |= ZEND_ACC_UNINSTANTIABLE;
+   ns->name = zend_string_copy(name);
+
+   return ns;
+}
+
+static zend_class_entry *insert_namespace(const zend_string *name) {
+   zend_class_entry *parent_ns = EG(global_namespace);
+   zend_class_entry *ns = parent_ns;
+   const char *start = ZSTR_VAL(name);
+   const char *end = start + ZSTR_LEN(name);
+   const char *pos = start;
+   size_t len = 0;
+
+   while (pos <= end) {
+      if (pos == end || *pos == '\\') {
+         len = pos - start;
+         zend_string *needle = zend_string_init(ZSTR_VAL(name), len, 0);
+
+         ns = zend_hash_find_ptr(EG(namespaces), needle);
+
+         if (!ns) {
+            zend_string *interned_name = zend_new_interned_string(needle);
+            ns = create_namespace(interned_name);
+            ns->lexical_scope = parent_ns;
+            zend_hash_add_ptr(EG(namespaces), interned_name, ns);
+         }
+         zend_string_release(needle);
+
+         parent_ns = ns;
+      }
+      pos ++;
+   }
+
+   return ns;
+}
+
+zend_class_entry *zend_resolve_namespace(zend_string *name) {
+   if (EG(global_namespace) == NULL) {
+      EG(global_namespace) = create_namespace(zend_empty_string);
+      EG(global_namespace)->lexical_scope = NULL;
+      zend_hash_init(EG(namespaces), 8, NULL, ZEND_CLASS_DTOR, 0);
+      zend_hash_add_ptr(EG(namespaces), zend_empty_string, EG(global_namespace));
+   }
+
+   if (name == NULL || ZSTR_LEN(name) == 0) {
+      return EG(global_namespace);
+   }
+
+   zend_string *lc_name = zend_string_tolower(name);
+   zend_class_entry *ns = zend_hash_find_ptr(EG(namespaces), lc_name);
+
+   if (!ns) {
+      ns = insert_namespace(lc_name);
+   }
+
+   zend_string_release(lc_name);
+
+   return ns;
+}
+
+zend_class_entry *zend_lookup_namespace(zend_string *name) {
+   zend_string *lc_name = zend_string_tolower(name);
+   zend_class_entry *ns = zend_hash_find_ptr(EG(namespaces), lc_name);
+   zend_string_release(lc_name);
+
+   return ns;
+}

Zend/zend_namespaces.h

@@ -0,0 +1,28 @@
+/*
++----------------------------------------------------------------------+
+   | 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          |
+   | [email protected] so we can mail you a copy immediately.              |
+   +----------------------------------------------------------------------+
+   | Authors: Rob Landers <[email protected]>                             |
+   |                                                                      |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_NAMESPACES_H
+#define ZEND_NAMESPACES_H
+
+#include "zend_compile.h"
+
+ZEND_API zend_class_entry *zend_resolve_namespace(zend_string *name);
+ZEND_API zend_class_entry *zend_lookup_namespace(zend_string *name);
+
+#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

win32/build/config.w32

@@ -240,7 +240,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
 	zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c zend_weakrefs.c \
 	zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c \
 	zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_observer.c zend_system_id.c \
-	zend_enum.c zend_fibers.c zend_atomic.c zend_hrtime.c zend_frameless_function.c zend_property_hooks.c \
+	zend_enum.c zend_fibers.c zend_atomic.c zend_hrtime.c zend_frameless_function.c zend_property_hooks.c zend_namespaces.c \
 	zend_lazy_objects.c");
 ADD_SOURCES("Zend\\Optimizer", "zend_optimizer.c pass1.c pass3.c optimize_func_calls.c block_pass.c optimize_temp_vars_5.c nop_removal.c compact_literals.c zend_cfg.c zend_dfg.c dfa_pass.c zend_ssa.c zend_inference.c zend_func_info.c zend_call_graph.c zend_dump.c escape_analysis.c compact_vars.c dce.c sccp.c scdf.c");