  	if (!(strcmp(lcname, "self") && strcmp(lcname, "parent"))) {
  		efree(lcname);
  		zend_error(E_COMPILE_ERROR, "Cannot use '%s' as class name as it is reserved", class_name->u.constant.value.str.val);
-@@ -2620,6 +2658,27 @@
+@@ -2638,6 +2677,27 @@
  	CG(active_class_entry) = NULL;
  }
  

retrieving revision 1.197
diff -u -r1.197 zend_operators.c
--- Zend/zend_operators.c	30 Sep 2004 18:36:03 -0000	1.197
+++ Zend/zend_operators.c	5 Oct 2004 20:13:06 -0000
@@ -101,6 +101,55 @@
 	return result;
 }

retrieving revision 1.151
diff -u -r1.151 zend_language_parser.y
--- Zend/zend_language_parser.y	4 Oct 2004 19:54:34 -0000	1.151
+++ Zend/zend_language_parser.y	9 Oct 2004 14:52:23 -0000
@@ -111,6 +111,7 @@
 %token T_TRY
 %token T_CATCH
