#include "php_psi.h"
+HashTable psi_cpp_defaults;
+
+PHP_MINIT_FUNCTION(psi_cpp)
+{
+ struct psi_parser parser;
+ struct psi_parser_input *predef;
+
+ 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);
+
+ 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(¯o);
+ }
+ 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(¯o);
+ }
}
}
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)
{
no_ws->type = PSI_T_NO_WHITESPACE;
zend_string_release(no_ws->text);
- no_ws->text = zend_string_init("\xA0", 1, 1);
+ no_ws->text = zend_string_init_interned("\xA0", 1, 1);
psi_cpp_tokiter_add(cpp, no_ws);
continue;
}