This commit was manufactured by cvs2svn to create tag 'php_4_0b1'.php-4.0b1

7 files changed, 10 insertions, 16 deletions

diff --git a/Zend/buildconf b/Zend/buildconf
index deb6aedb79..3a896bcb1a 100755
--- a/Zend/buildconf
+++ b/Zend/buildconf
@@ -3,10 +3,10 @@
 mv aclocal.m4 aclocal.m4.old 2>/dev/null
 aclocal
 if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then
-    echo "buildconf: keeping ${1}aclocal.m4"
+    echo keeping ${1}aclocal.m4
     mv aclocal.m4.old aclocal.m4
 else
-    echo "buildconf: created or modified ${1}aclocal.m4"
+    echo created or modified ${1}aclocal.m4
 fi
 
 autoheader
@@ -16,9 +16,9 @@ automake --add-missing --include-deps
 mv configure configure.old 2>/dev/null
 autoconf
 if cmp configure.old configure > /dev/null 2>&1; then
-    echo "buildconf: keeping ${1}configure"
+    echo keeping ${1}configure
     mv configure.old configure
 else
-    echo "buildconf: created or modified ${1}configure"
+    echo created or modified ${1}configure
 fi
 
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 5a224a8b7e..452763fe11 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -933,6 +933,7 @@ void do_early_binding(CLS_D)
 	opline->opcode = ZEND_NOP;
 	SET_UNUSED(opline->op1);
 	SET_UNUSED(opline->op2);
+	//CG(active_op_array)->last--;
 }
 
 
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 0dab84dab4..0718aa6ea7 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -121,13 +121,8 @@ void zend_register_standard_constants(ELS_D)
 #endif
 	REGISTER_MAIN_LONG_CONSTANT("E_ERROR", E_ERROR, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_WARNING", E_WARNING, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_NOTICE", E_NOTICE, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_CORE_ERROR", E_CORE_ERROR, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_CORE_WARNING", E_CORE_WARNING, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_ERROR", E_COMPILE_ERROR, CONST_PERSISTENT | CONST_CS);
-	REGISTER_MAIN_LONG_CONSTANT("E_COMPILE_WARNING", E_COMPILE_WARNING, CONST_PERSISTENT | CONST_CS);
-
+	REGISTER_MAIN_LONG_CONSTANT("E_PARSE", E_PARSE, CONST_PERSISTENT | CONST_CS);
 	REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
 
 	/* true/false constants */
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index ca8a7303bc..0faca55e89 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -21,10 +21,6 @@
 #include <stdio.h>
 #include <signal.h>
 
-#if (HAVE_ALLOCA && HAVE_ALLOCA_H)
-#include <alloca.h>
-#endif
-
 #include "zend.h"
 #include "zend_compile.h"
 #include "zend_execute.h"
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index a5b94889c9..d5f7c111ea 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -313,6 +313,7 @@ int call_user_function(HashTable *function_table, zval *object, zval *function_n
 		*param = *(params[i]);
 		INIT_PZVAL(param);
 		zval_copy_ctor(param);
+		//zend_hash_next_index_insert_ptr(function_state.function_symbol_table, param, sizeof(zval *), NULL);
 		zend_ptr_stack_push(&EG(argument_stack), param);
 	}
 
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 44992abd3e..3f1d01327e 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -48,7 +48,7 @@ static inline int zend_list_do_delete(HashTable *list,int id)
 	ELS_FETCH();
 	
 	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
-/*		printf("del(%d): %d->%d\n", id, le->refcount, le->refcount-1); */
+//		printf("del(%d): %d->%d\n", id, le->refcount, le->refcount-1);
 		if (--le->refcount<=0) {
 			return zend_hash_index_del(&EG(regular_list), id);
 		} else {
@@ -96,7 +96,7 @@ ZEND_API int zend_list_addref(int id)
 	ELS_FETCH();
 	
 	if (zend_hash_index_find(&EG(regular_list), id, (void **) &le)==SUCCESS) {
-/*		printf("add(%d): %d->%d\n", id, le->refcount, le->refcount+1); */
+//		printf("add(%d): %d->%d\n", id, le->refcount, le->refcount+1);
 		le->refcount++;
 		return SUCCESS;
 	} else {
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index d73feecd83..8e202f255b 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -936,6 +936,7 @@ ZEND_API int is_not_equal_function(zval *result, zval *op1, zval *op2)
 
 ZEND_API int is_smaller_function(zval *result, zval *op1, zval *op2)
 {
+	//printf("Comparing %d and %d\n", op1->value.lval, op2->value.lval);
 	if (compare_function(result, op1, op2) == FAILURE) {
 		return FAILURE;
 	}