X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=38eca72a9eb315e3d01b1db4858b0f80ad5efbae;hp=b253e0a68d1b632d129b6f95d2969a52d95bc77b;hb=848d77002c2c0451ccb76b9059cb352fabbdd8bc;hpb=7df12c88a4e14611a2585d6e7c994c59e8d7485a

diff --git a/src/module.c b/src/module.c
index b253e0a..38eca72 100644
--- a/src/module.c
+++ b/src/module.c
@@ -35,6 +35,9 @@
 #include "token.h"
 #include "parser.h"
 
+#define PSI_CPP_SEARCH
+#include "php_psi_cpp.h"
+
 #if HAVE_LIBJIT
 # include "libjit.h"
 # ifndef HAVE_LIBFFI
@@ -127,10 +130,17 @@ ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate)
 {
 	zend_string *file;
+	struct psi_parser_input *I;
 	struct psi_parser P;
 	struct psi_data D = {0};
 	zend_long flags = 0;
 
+#if PHP_DEBUG
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+#endif
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P|l", &file, &flags)) {
 		return;
 	}
@@ -138,24 +148,17 @@ static PHP_FUNCTION(psi_validate)
 	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
 		RETURN_FALSE;
 	}
-	if (!psi_parser_open_file(&P, file->val)) {
+	if (!(I = psi_parser_open_file(&P, file->val, true))) {
 		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_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);
 }
 
 ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate_string, 0, 0, 1)
@@ -164,10 +167,17 @@ ZEND_END_ARG_INFO();
 static PHP_FUNCTION(psi_validate_string)
 {
 	zend_string *string;
+	struct psi_parser_input *I;
 	struct psi_parser P;
 	struct psi_data D = {0};
 	zend_long flags = 0;
 
+#if PHP_DEBUG
+	if (psi_check_env("PSI_DEBUG")) {
+		flags |= PSI_DEBUG;
+	}
+#endif
+
 	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &string, &flags)) {
 		return;
 	}
@@ -175,24 +185,17 @@ static PHP_FUNCTION(psi_validate_string)
 	if (!psi_parser_init(&P, psi_error_wrapper, flags)) {
 		RETURN_FALSE;
 	}
-	if (!psi_parser_open_string(&P, string->val, string->len)) {
+	if (!(I = psi_parser_open_string(&P, string->val, string->len))) {
 		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_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);
 }
 
 static PHP_MINIT_FUNCTION(psi)
@@ -236,18 +239,21 @@ static PHP_MINIT_FUNCTION(psi)
 		flags |= PSI_SILENT;
 	}
 
+	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, ops, psi_error_wrapper, flags);
 	psi_context_build(PSI_G(context), PSI_G(directory));
 
-	if (psi_check_env("PSI_DUMP")) {
-		psi_context_dump(PSI_G(context), STDOUT_FILENO);
-	}
-
 	return SUCCESS;
 }
 
 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));
 
 	UNREGISTER_INI_ENTRIES();
@@ -268,7 +274,9 @@ static PHP_MINFO_FUNCTION(psi)
 	php_info_print_table_start();
 	php_info_print_table_header(2, "PSI Support", "enabled");
 	php_info_print_table_row(2, "Extension Version", PHP_PSI_VERSION);
+	php_info_print_table_row(2, "Search Path", PSI_G(search_path));
 	php_info_print_table_end();
+
 	php_info_print_table_start();
 	php_info_print_table_header(3, "Used Library", "Compiled", "Linked");
 	php_info_print_table_row(3, "libffi",