X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=0edd74f365ca0c6c28c879cac13c1b10010d837e;hp=20a1836140a0122c25ff83b726345e867f6dc2bc;hb=a7ac1c0a3c855321f21682c127a4b707de33a303;hpb=b029005e56a8913fbb3d17ab497b4a37a00a211c

diff --git a/src/module.c b/src/module.c
index 20a1836..0edd74f 100644
--- a/src/module.c
+++ b/src/module.c
@@ -34,9 +34,7 @@
 #include "php_psi.h"
 #include "token.h"
 #include "parser.h"
-
-#define PSI_CPP_SEARCH
-#include "php_psi_cpp.h"
+#include "cpp.h"
 
 #if HAVE_LIBJIT
 # include "libjit.h"
@@ -51,9 +49,69 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
+//#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
+
+static void OnUpdateBlacklist(const char *str, void (*cb)(const char*, size_t))
+{
+	const char *end;
+
+	do {
+		size_t len;
+
+		end = strchr(str, ',');
+		if (end) {
+			len = end - str;
+		} else {
+			len = strlen(str);
+		}
+		if (len) {
+			cb(str, len);
+		}
+
+		str = end + 1;
+	} while (end);
+}
+
+static void psi_blacklist_add_decl(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedDecls)
+{
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_decl);
+	return SUCCESS;
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedVars)
+{
+	OnUpdateBlacklist(new_value->val, psi_blacklist_add_var);
+	return SUCCESS;
+}
+
+static void OnDisplayBlacklist(struct psi_plist *bl)
+{
+	size_t i = 0;
+	char *item;
+
+	while (psi_plist_get(bl, i++, &item)) {
+		if (i > 1) {
+			PUTS(",");
+		}
+		PUTS(item);
+	}
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedDecls)
+{
+	OnDisplayBlacklist(PSI_G(blacklist).decls);
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedVars)
+{
+	OnDisplayBlacklist(PSI_G(blacklist).vars);
+}
+
 PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
 	STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+	PHP_INI_ENTRY_EX("psi.blacklist.decls", "", PHP_INI_SYSTEM, OnUpdateBlacklistedDecls, OnDisplayBlacklistedDecls)
+	PHP_INI_ENTRY_EX("psi.blacklist.vars", "", PHP_INI_SYSTEM, OnUpdateBlacklistedVars, OnDisplayBlacklistedVars)
 PHP_INI_END();
 
 static zend_object_handlers psi_object_handlers;
@@ -126,6 +184,7 @@ static PHP_FUNCTION(psi_dump)
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
 	ZEND_ARG_INFO(0, file)
 	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
 ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate)
 {
@@ -133,7 +192,9 @@ static PHP_FUNCTION(psi_validate)
 	struct psi_parser_input *I;
 	struct psi_parser P;
 	struct psi_data D = {0};
+	struct psi_validate_scope S = {0};
 	zend_long flags = 0;
+	zval *errcnt = NULL;
 
 #if PHP_DEBUG
 	if (psi_check_env("PSI_DEBUG")) {
@@ -141,7 +202,7 @@ static PHP_FUNCTION(psi_validate)
 	}
 #endif
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|lz", &file, &flags, &errcnt)) {
 		return;
 	}
 
@@ -155,14 +216,27 @@ static PHP_FUNCTION(psi_validate)
 
 	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
-	RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
+	psi_validate_scope_ctor(&S);
+	S.cpp = P.preproc;
+
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
+
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
+	}
+
+	psi_validate_scope_dtor(&S);
 	psi_data_dtor(&D);
 	psi_parser_dtor(&P);
-	free(I);
+	psi_parser_input_free(&I);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
 	ZEND_ARG_INFO(0, string)
+	ZEND_ARG_INFO(0, flags)
+	ZEND_ARG_INFO(1, errcnt)
 ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate_string)
 {
@@ -170,7 +244,9 @@ static PHP_FUNCTION(psi_validate_string)
 	struct psi_parser_input *I;
 	struct psi_parser P;
 	struct psi_data D = {0};
+	struct psi_validate_scope S = {0};
 	zend_long flags = 0;
+	zval *errcnt = NULL;
 
 #if PHP_DEBUG
 	if (psi_check_env("PSI_DEBUG")) {
@@ -178,7 +254,7 @@ static PHP_FUNCTION(psi_validate_string)
 	}
 #endif
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|lz", &string, &flags, &errcnt)) {
 		return;
 	}
 
@@ -192,40 +268,29 @@ static PHP_FUNCTION(psi_validate_string)
 
 	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
-	RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
-	psi_data_dtor(&D);
-	psi_parser_dtor(&P);
-	free(I);
-}
+	psi_validate_scope_ctor(&S);
+	S.cpp = P.preproc;
 
-static ZEND_RESULT_CODE psi_ops_load()
-{
-	struct psi_context_ops *ops = NULL;
-#ifdef HAVE_LIBJIT
-	if (!strcasecmp(PSI_G(engine), "jit")) {
-		ops = psi_libjit_ops();
-	} else
-#endif
-#ifdef HAVE_LIBFFI
-		ops = psi_libffi_ops();
-#endif
+	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
 
-	if (!ops) {
-		php_error(E_WARNING, "No PSI engine found");
-		return FAILURE;
+	if (errcnt) {
+		ZVAL_DEREF(errcnt);
+		convert_to_long(errcnt);
+		ZVAL_LONG(errcnt, P.errors);
 	}
 
-	PSI_G(ops) = ops;
-	if (ops->load) {
-		return ops->load();
-	}
-	return SUCCESS;
+	psi_validate_scope_dtor(&S);
+	psi_data_dtor(&D);
+	psi_parser_dtor(&P);
+	psi_parser_input_free(&I);
 }
 
+PHP_MINIT_FUNCTION(psi_cpp);
+PHP_MINIT_FUNCTION(psi_builtin);
+PHP_MINIT_FUNCTION(psi_context);
 static PHP_MINIT_FUNCTION(psi)
 {
 	zend_class_entry ce = {0};
-	unsigned flags = 0;
 
 	REGISTER_INI_ENTRIES();
 
@@ -241,37 +306,27 @@ static PHP_MINIT_FUNCTION(psi)
 	psi_object_handlers.free_obj = psi_object_free;
 	psi_object_handlers.clone_obj = NULL;
 
-	if (SUCCESS != psi_ops_load()) {
+	if (SUCCESS != PHP_MINIT(psi_builtin)(type, module_number)) {
 		return FAILURE;
 	}
-
-	if (psi_check_env("PSI_DEBUG")) {
-		flags |= PSI_DEBUG;
+	if (SUCCESS != PHP_MINIT(psi_cpp)(type, module_number)) {
+		return FAILURE;
 	}
-	if (psi_check_env("PSI_SILENT")) {
-		flags |= PSI_SILENT;
+	if (SUCCESS != PHP_MINIT(psi_context)(type, module_number)) {
+		return FAILURE;
 	}
 
-	PSI_G(search_path) = pemalloc(strlen(PSI_G(directory)) + strlen(psi_cpp_search) + 1 + 1, 1);
-	sprintf(PSI_G(search_path), "%s:%s", PSI_G(directory), psi_cpp_search);
-
-	PSI_G(context) = psi_context_init(NULL, PSI_G(ops), psi_error_wrapper, flags);
-	psi_context_build(PSI_G(context), PSI_G(directory));
-
 	return SUCCESS;
 }
 
+PHP_MSHUTDOWN_FUNCTION(psi_cpp);
+PHP_MSHUTDOWN_FUNCTION(psi_builtin);
+PHP_MSHUTDOWN_FUNCTION(psi_context);
 static PHP_MSHUTDOWN_FUNCTION(psi)
 {
-	if (psi_check_env("PSI_DUMP")) {
-		psi_context_dump(PSI_G(context), STDOUT_FILENO);
-	}
-
-	psi_context_free(&PSI_G(context));
-
-	if (PSI_G(ops)->free) {
-		PSI_G(ops)->free();
-	}
+	PHP_MSHUTDOWN(psi_context)(type, module_number);
+	PHP_MSHUTDOWN(psi_cpp)(type, module_number);
+	PHP_MSHUTDOWN(psi_builtin)(type, module_number);
 
 	UNREGISTER_INI_ENTRIES();
 
@@ -322,6 +377,22 @@ static void ptr_free(void *ptr)
 	free(*(void **) ptr);
 }
 
+static void psi_blacklist_add_decl(const char *pattern, size_t len)
+{
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **decls = &PSI_G(blacklist).decls;
+
+	*decls = psi_plist_add(*decls, &tmp);
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len)
+{
+	char *tmp = strndup(pattern, len);
+	struct psi_plist **vars = &PSI_G(blacklist).vars;
+
+	*vars = psi_plist_add(*vars, &tmp);
+}
+
 static PHP_GINIT_FUNCTION(psi)
 {
 	char *tmp;
@@ -373,8 +444,15 @@ static const zend_function_entry psi_functions[] = {
 	PHP_FE_END
 };
 
+static const zend_module_dep psi_deps[] = {
+	ZEND_MOD_REQUIRED("standard")
+	{0}
+};
+
 zend_module_entry psi_module_entry = {
-	STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER_EX,
+	NULL,
+	psi_deps,
 	"psi",
 	psi_functions,
 	PHP_MINIT(psi),