X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=b253e0a68d1b632d129b6f95d2969a52d95bc77b;hp=8201d5a19bc77c004473d1f4ce7507be419ca9d7;hb=f15288e185e65bcdfde87c217fb6bd7ff12eb653;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/module.c b/src/module.c
index 8201d5a..b253e0a 100644
--- a/src/module.c
+++ b/src/module.c
@@ -101,7 +101,8 @@ zend_object *psi_object_init(zend_class_entry *ce)
 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) {
+static PHP_FUNCTION(psi_dump)
+{
 	php_stream *s;
 	zval *r = NULL;
 	int fd = STDOUT_FILENO;
@@ -121,17 +122,61 @@ 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_END_ARG_INFO();
-static PHP_FUNCTION(psi_validate) {
+static PHP_FUNCTION(psi_validate)
+{
 	zend_string *file;
 	struct psi_parser P;
 	struct psi_data D = {0};
+	zend_long flags = 0;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P", &file)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
 		return;
 	}
 
-	if (!psi_parser_init(&P, file->val, psi_error_wrapper, 0)) {
+	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+		RETURN_FALSE;
+	}
+	if (!psi_parser_open_file(&P, file->val)) {
+		psi_parser_dtor(&P);
+		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);
+
+	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);
+}
+
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
+	ZEND_ARG_INFO(0, string)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate_string)
+{
+	zend_string *string;
+	struct psi_parser P;
+	struct psi_data D = {0};
+	zend_long flags = 0;
+
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
+		return;
+	}
+
+	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
+		RETURN_FALSE;
+	}
+	if (!psi_parser_open_string(&P, string->val, string->len)) {
+		psi_parser_dtor(&P);
 		RETURN_FALSE;
 	}
 
@@ -156,15 +201,11 @@ static PHP_MINIT_FUNCTION(psi)
 	zend_class_entry ce = {0};
 	unsigned flags = 0;
 
-	if (psi_check_env("PSI_DEBUG")) {
-		flags |= PSI_DEBUG;
-	}
-	if (psi_check_env("PSI_SILENT")) {
-		flags |= PSI_SILENT;
-	}
-
 	REGISTER_INI_ENTRIES();
 
+	zend_register_long_constant(ZEND_STRL("PSI_DEBUG"), PSI_DEBUG, CONST_CS|CONST_PERSISTENT, module_number);
+	zend_register_long_constant(ZEND_STRL("PSI_SILENT"), PSI_SILENT, CONST_CS|CONST_PERSISTENT, module_number);
+
 	INIT_NS_CLASS_ENTRY(ce, "psi", "object", NULL);
 	psi_class_entry = zend_register_internal_class_ex(&ce, NULL);
 	psi_class_entry->create_object = psi_object_init;
@@ -188,6 +229,13 @@ static PHP_MINIT_FUNCTION(psi)
 		return FAILURE;
 	}
 
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+	if (psi_check_env("PSI_SILENT")) {
+		flags |= PSI_SILENT;
+	}
+
 	PSI_G(context) = psi_context_init(NULL, ops, psi_error_wrapper, flags);
 	psi_context_build(PSI_G(context), PSI_G(directory));
 
@@ -247,6 +295,7 @@ static PHP_MINFO_FUNCTION(psi)
 static const zend_function_entry psi_functions[] = {
 	PHP_FE(psi_dump, ai_psi_dump)
 	PHP_FE(psi_validate, ai_psi_validate)
+	PHP_FE(psi_validate_string, ai_psi_validate_string)
 	PHP_FE_END
 };