X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.c;h=05efac150ebaed144a05750338f6b49119e2b7e9;hp=1300d57e9513e5b5a43410386ce5733df2bf47d8;hb=c0873cbbe9e5a83305adbc2bbd94aede5437f33d;hpb=2559f07a178b681dc240e20153ff5abdff54cb34

diff --git a/src/cpp.c b/src/cpp.c
index 1300d57..05efac1 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -36,10 +36,60 @@
 
 #include "php_psi.h"
 
+HashTable psi_cpp_defaults;
+
+PHP_MINIT_FUNCTION(psi_cpp)
+{
+	struct psi_parser parser;
+	struct psi_parser_input *predef;
+
+	if (!psi_parser_init(&parser, NULL, 0)) {
+		return FAILURE;
+	}
+
+	if (!(predef = psi_parser_open_string(&parser, psi_cpp_predef, sizeof(psi_cpp_predef) - 1))) {
+		psi_parser_dtor(&parser);
+		return FAILURE;
+	}
+
+	if (!psi_parser_parse(&parser, predef)) {
+		psi_parser_input_free(&predef);
+		psi_parser_dtor(&parser);
+		return FAILURE;
+	}
+	psi_parser_input_free(&predef);
+
+	zend_hash_init(&psi_cpp_defaults, 0, NULL, NULL, 1);
+	zend_hash_copy(&psi_cpp_defaults, &parser.preproc->defs, NULL);
+
+	psi_parser_dtor(&parser);
+
+	return SUCCESS;
+}
+
+PHP_MSHUTDOWN_FUNCTION(psi_cpp)
+{
+	struct psi_cpp_macro_decl *macro;
+
+	ZEND_HASH_FOREACH_PTR(&psi_cpp_defaults, macro)
+	{
+		psi_cpp_macro_decl_free(&macro);
+	}
+	ZEND_HASH_FOREACH_END();
+
+	zend_hash_destroy(&psi_cpp_defaults);
+
+	return SUCCESS;
+}
+
 static void free_cpp_def(zval *p)
 {
 	if (Z_TYPE_P(p) == IS_PTR) {
-		psi_cpp_macro_decl_free((void *) &Z_PTR_P(p));
+		struct psi_cpp_macro_decl *macro = Z_PTR_P(p);
+
+		if (!zend_hash_exists(&psi_cpp_defaults, macro->token->text)) {
+			psi_cpp_macro_decl_free(&macro);
+		}
 	}
 }
 
@@ -48,25 +98,13 @@ struct psi_cpp *psi_cpp_init(struct psi_parser *P)
 	struct psi_cpp *cpp = calloc(1, sizeof(*cpp));
 
 	cpp->parser = P;
-	zend_hash_init(&cpp->defs, 0, NULL, free_cpp_def, 1);
 	zend_hash_init(&cpp->once, 0, NULL, NULL, 1);
+	zend_hash_init(&cpp->defs, 0, NULL, free_cpp_def, 1);
+	zend_hash_copy(&cpp->defs, &psi_cpp_defaults, NULL);
 
 	return cpp;
 }
 
-bool psi_cpp_load_defaults(struct psi_cpp *cpp)
-{
-	struct psi_parser_input *predef;
-
-	if ((predef = psi_parser_open_string(cpp->parser, psi_cpp_predef, sizeof(psi_cpp_predef) - 1))) {
-		bool parsed = psi_parser_parse(cpp->parser, predef);
-		psi_parser_input_free(&predef);
-		return parsed;
-	}
-
-	return false;
-}
-
 #if PSI_CPP_DEBUG
 static int dump_def(zval *p)
 {