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

diff --git a/src/module.c b/src/module.c
index 9de278f..0edd74f 100644
--- a/src/module.c
+++ b/src/module.c
@@ -217,7 +217,7 @@ static PHP_FUNCTION(psi_validate)
 	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
 	psi_validate_scope_ctor(&S);
-	S.defs = &P.preproc->defs;
+	S.cpp = P.preproc;
 
 	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
 
@@ -269,7 +269,7 @@ static PHP_FUNCTION(psi_validate_string)
 	psi_parser_parse(&P, I);
 	psi_data_ctor(&D, P.error, P.flags);
 	psi_validate_scope_ctor(&S);
-	S.defs = &P.preproc->defs;
+	S.cpp = P.preproc;
 
 	RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)));
 
@@ -286,6 +286,7 @@ static PHP_FUNCTION(psi_validate_string)
 }
 
 PHP_MINIT_FUNCTION(psi_cpp);
+PHP_MINIT_FUNCTION(psi_builtin);
 PHP_MINIT_FUNCTION(psi_context);
 static PHP_MINIT_FUNCTION(psi)
 {
@@ -305,6 +306,9 @@ static PHP_MINIT_FUNCTION(psi)
 	psi_object_handlers.free_obj = psi_object_free;
 	psi_object_handlers.clone_obj = NULL;
 
+	if (SUCCESS != PHP_MINIT(psi_builtin)(type, module_number)) {
+		return FAILURE;
+	}
 	if (SUCCESS != PHP_MINIT(psi_cpp)(type, module_number)) {
 		return FAILURE;
 	}
@@ -316,11 +320,13 @@ static PHP_MINIT_FUNCTION(psi)
 }
 
 PHP_MSHUTDOWN_FUNCTION(psi_cpp);
+PHP_MSHUTDOWN_FUNCTION(psi_builtin);
 PHP_MSHUTDOWN_FUNCTION(psi_context);
 static PHP_MSHUTDOWN_FUNCTION(psi)
 {
 	PHP_MSHUTDOWN(psi_context)(type, module_number);
 	PHP_MSHUTDOWN(psi_cpp)(type, module_number);
+	PHP_MSHUTDOWN(psi_builtin)(type, module_number);
 
 	UNREGISTER_INI_ENTRIES();