X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=aff784dbc28235c13f65583f69c58f6962638d25;hp=1fe5bf32bb390cee6e0cd35223917999afc7e923;hb=d3171526ab7658114cac4ebe1098af4b038e576e;hpb=b4a3c33fc143fd57288fcfe0878e7a22eeaf61bf

diff --git a/src/module.c b/src/module.c
index 1fe5bf3..aff784d 100644
--- a/src/module.c
+++ b/src/module.c
@@ -37,14 +37,34 @@ zend_class_entry *psi_object_get_class_entry()
 	return psi_class_entry;
 }
 
-void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...)
+void psi_error_wrapper(void *context, PSI_Token *t, int type, const char *msg, ...)
 {
 	va_list argv;
+	const char *fn = NULL;
+	unsigned ln = 0;
+
+	if (context) {
+		if (PSI_DATA(context)->flags & PSI_PARSER_SILENT) {
+			return;
+		}
+	}
+
+	if (t) {
+		fn = t->file;
+		ln = t->line;
+	} else if (zend_is_executing()) {
+		fn = zend_get_executed_filename();
+		ln = zend_get_executed_lineno();
+	} else if (zend_is_compiling()) {
+		fn = zend_get_compiled_filename()->val;
+		ln = zend_get_compiled_lineno();
+	}
 
 	va_start(argv, msg);
-	psi_verror(type, t?t->file:"Unknown", t?t->line:0, msg, argv);
+	psi_verror(type, fn, ln, msg, argv);
 	va_end(argv);
 }
+
 void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
 {
 	va_list argv;
@@ -53,6 +73,7 @@ void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
 	psi_verror(type, fn, ln, msg, argv);
 	va_end(argv);
 }
+
 void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
 {
 	zend_error_cb(type, fn, ln, msg, argv);
@@ -80,10 +101,64 @@ static zend_object *psi_object_init(zend_class_entry *ce)
 	return &o->std;
 }
 
-PHP_MINIT_FUNCTION(psi)
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_dump, 0, 0, 0)
+	ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_dump) {
+	php_stream *s;
+	zval *r = NULL;
+	int fd = STDOUT_FILENO;
+
+	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;
+		}
+	}
+	PSI_ContextDump(&PSI_G(context), fd);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
+	ZEND_ARG_INFO(0, file)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate) {
+	zend_string *file;
+	PSI_Parser P;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P", &file)) {
+		return;
+	}
+
+	if (!PSI_ParserInit(&P, file->val, psi_error_wrapper, 0)) {
+		RETURN_FALSE;
+	}
+
+	while (0 < PSI_ParserScan(&P)) {
+		PSI_ParserParse(&P, PSI_TokenAlloc(&P));
+		if (P.num == PSI_T_EOF) {
+			break;
+		}
+	}
+	PSI_ParserParse(&P, NULL);
+
+	if (0 == PSI_ContextValidateData(NULL, PSI_DATA(&P)) && !P.errors) {
+		RETVAL_TRUE;
+	} else {
+		RETVAL_FALSE;
+	}
+	PSI_ParserDtor(&P);
+}
+
+static PHP_MINIT_FUNCTION(psi)
 {
 	PSI_ContextOps *ops = NULL;
 	zend_class_entry ce = {0};
+	unsigned flags = psi_check_env("PSI_DEBUG") ? PSI_PARSER_DEBUG : (
+			psi_check_env("PSI_SILENT") ? PSI_PARSER_SILENT : 0);
 
 	REGISTER_INI_ENTRIES();
 
@@ -110,7 +185,7 @@ PHP_MINIT_FUNCTION(psi)
 		return FAILURE;
 	}
 
-	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper);
+	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper, flags);
 	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
 
 	if (psi_check_env("PSI_DUMP")) {
@@ -120,7 +195,7 @@ PHP_MINIT_FUNCTION(psi)
 	return SUCCESS;
 }
 
-PHP_MSHUTDOWN_FUNCTION(psi)
+static PHP_MSHUTDOWN_FUNCTION(psi)
 {
 	PSI_ContextDtor(&PSI_G(context));
 
@@ -130,14 +205,14 @@ PHP_MSHUTDOWN_FUNCTION(psi)
 }
 
 #if defined(COMPILE_DL_PSI) && defined(ZTS)
-PHP_RINIT_FUNCTION(psi)
+static PHP_RINIT_FUNCTION(psi)
 {
 	ZEND_TSRMLS_CACHE_UPDATE();
 	return SUCCESS;
 }
 #endif
 
-PHP_MINFO_FUNCTION(psi)
+static PHP_MINFO_FUNCTION(psi)
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "psi support", "enabled");
@@ -145,7 +220,10 @@ PHP_MINFO_FUNCTION(psi)
 
 	DISPLAY_INI_ENTRIES();
 }
-const zend_function_entry psi_functions[] = {
+
+static const zend_function_entry psi_functions[] = {
+	PHP_FE(psi_dump, ai_psi_dump)
+	PHP_FE(psi_validate, ai_psi_validate)
 	PHP_FE_END
 };