 retrieving revision 1.600
 diff -u -r1.600 zend_compile.c
 --- Zend/zend_compile.c	16 Oct 2004 23:17:58 -0000	1.600
-+++ Zend/zend_compile.c	17 Oct 2004 17:30:54 -0000
-@@ -125,7 +125,9 @@
++++ Zend/zend_compile.c	17 Oct 2004 18:22:07 -0000
+@@ -125,7 +125,10 @@
  	zend_stack_init(&CG(foreach_copy_stack));
  	zend_stack_init(&CG(object_stack));
  	zend_stack_init(&CG(declare_stack));
 +	zend_stack_init(&CG(annotation_stack));
++    zend_stack_init(&CG(class_stack));
  	CG(active_class_entry) = NULL;
 +	CG(active_package_entry) = NULL;
  	zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0);
  	zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0);
  	zend_stack_init(&CG(list_stack));
-@@ -164,6 +166,7 @@
+@@ -164,6 +167,8 @@
  	zend_stack_destroy(&CG(foreach_copy_stack));
  	zend_stack_destroy(&CG(object_stack));
  	zend_stack_destroy(&CG(declare_stack));
 +	zend_stack_destroy(&CG(annotation_stack));
++    zend_stack_destroy(&CG(class_stack));
  	zend_stack_destroy(&CG(list_stack));
  	zend_hash_destroy(&CG(filenames_table));
  	zend_llist_destroy(&CG(open_files));
-@@ -508,6 +511,55 @@
+@@ -508,6 +513,55 @@
  	}
  }
  

retrieving revision 1.139
diff -u -r1.139 zend_globals.h
--- Zend/zend_globals.h	23 Sep 2004 06:23:36 -0000	1.139
+++ Zend/zend_globals.h	17 Oct 2004 17:30:56 -0000
@@ -73,8 +73,10 @@
 	zend_stack foreach_copy_stack;
 	zend_stack object_stack;
 	zend_stack declare_stack;
+	zend_stack annotation_stack;
 
 	zend_class_entry *active_class_entry;
+	zend_package_entry *active_package_entry;

 		&& parent->common.scope != (child->common.prototype ? child->common.prototype->common.scope : child->common.scope)
 		&& child->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_IMPLEMENTED_ABSTRACT)) {
 		zend_error(E_COMPILE_ERROR, "Can't inherit abstract function %s::%s() (previously declared abstract in %s)", 
@@ -2529,13 +2600,16 @@
 	zend_op *opline;
 	int doing_inheritance = 0;
 	zend_class_entry *new_class_entry = emalloc(sizeof(zend_class_entry));
