X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=de8b50ee500b40eca180309bc284e9b7e7fad6f4;hp=9de278f96cf8ca66c0d2a3de5f71b53128559770;hb=cd0567b4052ee24259bc6b8a9858af9d26f3de48;hpb=09529efcde471127419e141807b83b37077003a0

diff --git a/src/module.c b/src/module.c
index 9de278f..de8b50e 100644
--- a/src/module.c
+++ b/src/module.c
@@ -23,7 +23,11 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/
 
-#include "php_psi_stdinc.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# include "php_config.h"
+#endif
 
 #include "php.h"
 #include "php_ini.h"
@@ -117,6 +121,7 @@ PHP_INI_END();
 static zend_object_handlers psi_object_handlers;
 static zend_class_entry *psi_class_entry;
 
+zend_class_entry *psi_object_get_class_entry();
 zend_class_entry *psi_object_get_class_entry()
 {
 	return psi_class_entry;
@@ -166,19 +171,18 @@ static PHP_FUNCTION(psi_dump)
 {
 	php_stream *s;
 	zval *r = NULL;
-	int fd = STDOUT_FILENO;
+	struct psi_dump dump = {.fun = (psi_dump_cb) php_stream_printf};
 
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
 		return;
 	}
 	if (r) {
 		php_stream_from_zval(s, r);
-
-		if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) {
-			RETURN_FALSE;
-		}
+		dump.ctx.hn = s;
+	} else {
+		dump.ctx.hn = php_stream_open_wrapper("php://output", "w", REPORT_ERRORS, NULL);
 	}
-	psi_context_dump(PSI_G(context), fd);
+	psi_context_dump(&dump, PSI_G(context));
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
@@ -217,7 +221,7 @@ static PHP_FUNCTION(psi_validate)
 	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
 	psi_validate_scope_ctor(&S);
-	S.defs = &P.preproc->defs;
+	S.cpp = P.preproc;
 
 	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
 
@@ -269,7 +273,7 @@ static PHP_FUNCTION(psi_validate_string)
 	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
 	psi_validate_scope_ctor(&S);
-	S.defs = &P.preproc->defs;
+	S.cpp = P.preproc;
 
 	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
 
@@ -285,7 +289,9 @@ static PHP_FUNCTION(psi_validate_string)
 	psi_parser_input_free(&I);
 }
 
+PHP_MINIT_FUNCTION(psi_debug);
 PHP_MINIT_FUNCTION(psi_cpp);
+PHP_MINIT_FUNCTION(psi_builtin);
 PHP_MINIT_FUNCTION(psi_context);
 static PHP_MINIT_FUNCTION(psi)
 {
@@ -305,6 +311,12 @@ static PHP_MINIT_FUNCTION(psi)
 	psi_object_handlers.free_obj = psi_object_free;
 	psi_object_handlers.clone_obj = NULL;
 
+	if (SUCCESS != PHP_MINIT(psi_debug)(type, module_number)) {
+		return FAILURE;
+	}
+	if (SUCCESS != PHP_MINIT(psi_builtin)(type, module_number)) {
+		return FAILURE;
+	}
 	if (SUCCESS != PHP_MINIT(psi_cpp)(type, module_number)) {
 		return FAILURE;
 	}
@@ -316,11 +328,15 @@ static PHP_MINIT_FUNCTION(psi)
 }
 
 PHP_MSHUTDOWN_FUNCTION(psi_cpp);
+PHP_MSHUTDOWN_FUNCTION(psi_builtin);
 PHP_MSHUTDOWN_FUNCTION(psi_context);
+PHP_MSHUTDOWN_FUNCTION(psi_debug);
 static PHP_MSHUTDOWN_FUNCTION(psi)
 {
 	PHP_MSHUTDOWN(psi_context)(type, module_number);
 	PHP_MSHUTDOWN(psi_cpp)(type, module_number);
+	PHP_MSHUTDOWN(psi_builtin)(type, module_number);
+	PHP_MSHUTDOWN(psi_debug)(type, module_number);
 
 	UNREGISTER_INI_ENTRIES();