- Some header dependencies cleanup

- Generalize zval_print() and zval_print_r()

diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index 1938e0949b8cbae2cdeec14d1fa86dc5f3edcf8c..c6e7fc3c2327007e4560ef5b871a4c6b0a843230 100644 (file)
--- a/Zend/zend-parser.y
+++ b/Zend/zend-parser.y
@@ -33,8 +33,6 @@
 #include "zend_list.h"
 #include "zend_globals.h"
 #include "zend_API.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 
 #define YYERROR_VERBOSE
 #define YYSTYPE znode

diff --git a/Zend/zend.c b/Zend/zend.c
index 3f18b9284ee53fd1c534cf62dd97f37ca6a86cca..b8f145c4d5cd1b43f486e5b86404920c20d34c50 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -19,8 +19,6 @@
 
 
 #include "zend.h"
-#include "zend_operators.h"
-#include "zend_variables.h"
 #include "zend_extensions.h"
 #include "modules.h"
 #include "zend_constants.h"
@@ -41,7 +39,7 @@
 /* true multithread-shared globals */
 ZEND_API zend_class_entry zend_standard_class_def;
 ZEND_API int (*zend_printf)(const char *format, ...);
-ZEND_API int (*zend_write)(const char *str, uint str_length);
+ZEND_API zend_write_func_t zend_write;
 ZEND_API void (*zend_error)(int type, const char *format, ...);
 ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
 ZEND_API void (*zend_block_interruptions)(void);
@@ -162,6 +160,12 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 
 
 ZEND_API int zend_print_zval(zval *expr, int indent)
+{
+       return zend_print_zval_ex(zend_write, expr, indent);
+}
+
+
+ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent)
 {
        zval expr_copy;
        int use_copy;
@@ -176,7 +180,7 @@ ZEND_API int zend_print_zval(zval *expr, int indent)
                }
                return 0;
        }
-       ZEND_WRITE(expr->value.str.val,expr->value.str.len);
+       write_func(expr->value.str.val,expr->value.str.len);
        if (use_copy) {
                zval_dtor(expr);
        }
@@ -184,7 +188,13 @@ ZEND_API int zend_print_zval(zval *expr, int indent)
 }
 
 
-ZEND_API void zend_print_zval_r(zval *expr, int indent) 
+ZEND_API void zend_print_zval_r(zval *expr, int indent)
+{
+       zend_print_zval_r_ex(zend_write, expr, indent);
+}
+
+
+ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent) 
 {
        switch(expr->type) {
                case IS_ARRAY:
@@ -298,7 +308,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
        /* Set up utility functions and values */
        zend_error = utility_functions->error_function;
        zend_printf = utility_functions->printf_function;
-       zend_write = utility_functions->write_function;
+       zend_write = (zend_write_func_t) utility_functions->write_function;
        zend_fopen = utility_functions->fopen_function;
        if (!zend_fopen) {
                zend_fopen = zend_fopen_wrapper;

diff --git a/Zend/zend.h b/Zend/zend.h
index 64f2c57870b92a4c64d35c2a38b70b70e0a1ff53..bce477c0067ca297f5484cdd299bd20f28cbe689 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -237,6 +237,9 @@ typedef struct _zend_utility_values {
 } zend_utility_values;
 
 
+typedef int (*zend_write_func_t)(const char *str, uint str_length);
+
+
 #undef MIN
 #undef MAX
 #define MAX(a,b)  (((a)>(b))?(a):(b))
@@ -282,7 +285,9 @@ ZEND_API char *get_zend_version(void);
 
 ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_copy);
 ZEND_API int zend_print_zval(zval *expr, int indent);
+ZEND_API int zend_print_zval_ex(zend_write_func_t write_func, zval *expr, int indent);
 ZEND_API void zend_print_zval_r(zval *expr, int indent);
+ZEND_API void zend_print_zval_r_ex(zend_write_func_t write_func, zval *expr, int indent);
 
 ZEND_API extern char *empty_string;
 
@@ -302,9 +307,10 @@ ZEND_API extern char *empty_string;
 #define ZEND_PUTS(str)                                 zend_write((str), strlen((str)))
 #define ZEND_PUTC(c)                                   zend_write(&(c), 1), (c)
 
+
 BEGIN_EXTERN_C()
 extern ZEND_API int (*zend_printf)(const char *format, ...);
-extern ZEND_API int (*zend_write)(const char *str, uint str_length);
+extern ZEND_API zend_write_func_t zend_write;
 extern ZEND_API void (*zend_error)(int type, const char *format, ...);
 extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path);
 extern ZEND_API void (*zend_block_interruptions)(void);

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index ecf62e0f392e91479601a972a738d7ed3790753c..862a2980581cbea9c19b6e95380b3d4060ff668b 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -19,12 +19,10 @@
 
 
 #include "zend.h"
-#include "zend_variables.h"
 #include "zend_execute.h"
 #include "zend_API.h"
 #include "modules.h"
 #include "zend_constants.h"
-#include "zend_operators.h"
 
 #ifdef HAVE_STDARG_H
 # include <stdarg.h>

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index ffb3b212e172eb1280f3a30bcfded82ba4384de6..117eeea8137e77daa2136e54d59f62d4ed417339 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -24,6 +24,8 @@
 #include "modules.h"
 #include "zend_list.h"
 #include "zend_fast_cache.h"
+#include "zend_operators.h"
+#include "zend_variables.h"
 
 
 #define ZEND_NAMED_FUNCTION(name) void name(INTERNAL_FUNCTION_PARAMETERS)

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 9ae62e25021404780df39c861cf41eb6f0d3f280..d8d826c1051ea90c22014aadf917dbede854958c 100644 (file)
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -21,8 +21,6 @@
 #include "zend.h"
 #include "zend_API.h"
 #include "zend_builtin_functions.h"
-#include "zend_operators.h"
-#include "zend_variables.h"
 #include "zend_constants.h"
 
 #undef ZEND_TEST_EXCEPTIONS

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4e77ca438de2e1a70813b3954cd9c35f999de822..85c0a0bb654daa734707156cd5948c8f1304dfa2 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -23,8 +23,6 @@
 #include "zend_compile.h"
 #include "zend_llist.h"
 #include "zend_API.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_fast_cache.h"
 
 

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 47e0795a89961d149832632642843e5f3cb5ae96..1986e1c43a4eb0b88a430b98399d4c27656ec10a 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -27,8 +27,6 @@
 #include "zend_execute.h"
 #include "zend_API.h"
 #include "zend_ptr_stack.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_constants.h"
 #include "zend_extensions.h"
 #include "zend_fast_cache.h"

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index cd254358415c8797858ce2a5f844a9cce615a883..40d62bada199ca35554ee3721ba8408e451e1b81 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -26,8 +26,6 @@
 #include "zend_execute.h"
 #include "zend_API.h"
 #include "zend_ptr_stack.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_constants.h"
 #include "zend_extensions.h"
 #include "zend_execute_locks.h"

diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 92e30acadc07e11ee98f3f6eb1ae039f3f52f267..faaa54f0d02d2c831202dce99361ee8155301e71 100644 (file)
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -23,8 +23,6 @@
 #include "zend.h"
 #include "zend_alloc.h"
 #include "zend_compile.h"
-#include "zend_variables.h"
-#include "zend_operators.h"
 #include "zend_extensions.h"
 #include "zend_API.h"
 

diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c
index a87cb7b1399c459ff33d6a611892844ae013b614..6c0a882cdf5e924d6c7f46f673e12da5ea89ea4b 100644 (file)
--- a/Zend/zend_variables.c
+++ b/Zend/zend_variables.c
@@ -23,7 +23,6 @@
 #include "zend_API.h"
 #include "zend_globals.h"
 #include "zend_constants.h"
-#include "zend_variables.h"
 #include "zend_list.h"
 
 ZEND_API char *empty_string = "";      /* in order to save emalloc() and efree() time for