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

diff --git a/src/module.c b/src/module.c
index 1fe5bf3..a70a50a 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1,6 +1,7 @@
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
+#else
+# include "php_config.h"
 #endif
 
 #include "php.h"
@@ -10,6 +11,8 @@
 #include "zend_operators.h"
 
 #include "php_psi.h"
+#include "token.h"
+#include "parser.h"
 
 #if HAVE_LIBJIT
 # include "libjit.h"
@@ -37,14 +40,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, struct 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 +76,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 +104,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_context_dump(&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;
+	struct psi_parser P;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P", &file)) {
+		return;
+	}
+
+	if (!psi_parser_init(&P, file->val, psi_error_wrapper, 0)) {
+		RETURN_FALSE;
+	}
+
+	while (0 < psi_parser_scan(&P)) {
+		psi_parser_parse(&P, psi_token_alloc(&P));
+		if (P.num == PSI_T_EOF) {
+			break;
+		}
+	}
+	psi_parser_parse(&P, NULL);
+
+	if (0 == psi_context_validate_data(NULL, PSI_DATA(&P)) && !P.errors) {
+		RETVAL_TRUE;
+	} else {
+		RETVAL_FALSE;
+	}
+	psi_parser_dtor(&P);
+}
+
+static PHP_MINIT_FUNCTION(psi)
 {
-	PSI_ContextOps *ops = NULL;
+	struct psi_context_ops *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();
 
@@ -98,11 +176,11 @@ PHP_MINIT_FUNCTION(psi)
 
 #ifdef HAVE_LIBJIT
 	if (!strcasecmp(PSI_G(engine), "jit")) {
-		ops = PSI_Libjit();
+		ops = psi_libjit_ops();
 	} else
 #endif
 #ifdef HAVE_LIBFFI
-		ops = PSI_Libffi();
+		ops = psi_libffi_ops();
 #endif
 
 	if (!ops) {
@@ -110,19 +188,19 @@ PHP_MINIT_FUNCTION(psi)
 		return FAILURE;
 	}
 
-	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper);
-	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
+	psi_context_init(&PSI_G(context), ops, psi_error_wrapper, flags);
+	psi_context_build(&PSI_G(context), PSI_G(directory));
 
 	if (psi_check_env("PSI_DUMP")) {
-		PSI_ContextDump(&PSI_G(context), STDOUT_FILENO);
+		psi_context_dump(&PSI_G(context), STDOUT_FILENO);
 	}
 
 	return SUCCESS;
 }
 
-PHP_MSHUTDOWN_FUNCTION(psi)
+static PHP_MSHUTDOWN_FUNCTION(psi)
 {
-	PSI_ContextDtor(&PSI_G(context));
+	psi_context_dtor(&PSI_G(context));
 
 	UNREGISTER_INI_ENTRIES();
 
@@ -130,14 +208,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 +223,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
 };