Changeset 212

Timestamp:

06/02/06 14:42:48 (3 years ago)

Author:

hans

Message:

* Removed two unused vars from the internal datastructures
* Fixed constructor inheritance. This fixes handling of implicit constructors and solves ticket #89

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (3 diffs)
• eaccelerator/trunk/eaccelerator.h (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-06-02  Hans Rakers <hans at parse dot nl>
+        * Removed two unused vars from the internal datastructures
+        * Fixed constructor inheritance. This fixes handling of implicit
+          constructors and solves ticket #89
+
-2006-05-14  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/ea_restore.c

@@ -726 +726 @@
-#ifdef ZEND_ENGINE_2
-                to->parent = *parent_ptr;
-                to->constructor = to->parent->constructor;
-                to->destructor = to->parent->destructor;
-                to->clone = to->parent->clone;
-#endif
-                DBG(ea_debug_printf, (EA_DEBUG, "restore_class_parent: found parent %s..\n", to->parent->name));
@@ -746 +743 @@
-        char *fname_lc = NULL;
-        zend_function *f = NULL;
-        zend_function *old_ctor = to->constructor;
-        Bucket *p = to->function_table.pListHead;
-
@@ -753 +749 @@
-                fname_len = strlen(f->common.function_name);
-                fname_lc = zend_str_tolower_dup(f->common.function_name, fname_len);
-
-
-
+
+
-                        to->constructor = f;
-                } else if (fname_lc[0] == '_' && fname_lc[1] == '_' && f->common.scope != to->parent) {

eaccelerator/trunk/eaccelerator.h

@@ -195 +195 @@
-#endif
-        char *function_name;
-        char *function_name_lc;
-#ifdef ZEND_ENGINE_2
-        char *scope_name;
@@ -225 +224 @@
-        char type;
-        char *name;
-        char *name_lc;
-        zend_uint name_length;
-        char *parent;