#include "php_psi.h"
-static void free_cpp_def(zval *p)
+HashTable psi_cpp_defaults;
+
+PHP_MINIT_FUNCTION(psi_cpp)
{
- if (Z_TYPE_P(p) == IS_PTR) {
- psi_cpp_macro_decl_free((void *) &Z_PTR_P(p));
+ 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;
}
-struct psi_cpp *psi_cpp_init(struct psi_parser *P)
+PHP_MSHUTDOWN_FUNCTION(psi_cpp)
{
- struct psi_cpp *cpp = calloc(1, sizeof(*cpp));
+ struct psi_cpp_macro_decl *macro;
- 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_FOREACH_PTR(&psi_cpp_defaults, macro)
+ {
+ psi_cpp_macro_decl_free(¯o);
+ }
+ ZEND_HASH_FOREACH_END();
- return cpp;
+ zend_hash_destroy(&psi_cpp_defaults);
+
+ return SUCCESS;
}
-bool psi_cpp_load_defaults(struct psi_cpp *cpp)
+static void free_cpp_def(zval *p)
{
- struct psi_parser_input *predef;
+ if (Z_TYPE_P(p) == IS_PTR) {
+ struct psi_cpp_macro_decl *macro = Z_PTR_P(p);
- 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;
+ if (!zend_hash_exists(&psi_cpp_defaults, macro->token->text)) {
+ psi_cpp_macro_decl_free(¯o);
+ }
}
+}
- return false;
+struct psi_cpp *psi_cpp_init(struct psi_parser *P)
+{
+ struct psi_cpp *cpp = pecalloc(1, sizeof(*cpp), 1);
+
+ cpp->parser = P;
+ 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;
}
#if PSI_CPP_DEBUG
struct psi_cpp_macro_decl *decl = Z_PTR_P(p);
if (decl) {
- dprintf(2, "#define ");
+ fflush(stderr);
+ dprintf(2, "PSI: CPP decl -> #define ");
psi_cpp_macro_decl_dump(2, decl);
dprintf(2, "\n");
}
struct psi_cpp *cpp = *cpp_ptr;
#if PSI_CPP_DEBUG
- fprintf(stderr, "PSI: CPP decls:\n");
zend_hash_apply(&cpp->defs, dump_def);
#endif
*cpp_ptr = NULL;
/* line continuations */
if (token->type == PSI_T_EOL) {
if (esc) {
- psi_cpp_tokiter_del_range(cpp, psi_cpp_tokiter_index(cpp) - 1, 2, true);
- psi_cpp_tokiter_prev(cpp);
+ psi_cpp_tokiter_del_prev(cpp, true);
+ psi_cpp_tokiter_del_cur(cpp, true);
esc = false;
continue;
}
no_ws->type = PSI_T_NO_WHITESPACE;
zend_string_release(no_ws->text);
- no_ws->text = zend_string_init("\xA0", 1, 1);
- psi_cpp_tokiter_ins_cur(cpp, no_ws);
+ no_ws->text = zend_string_init_interned("\xA0", 1, 1);
+ psi_cpp_tokiter_add(cpp, no_ws);
continue;
}
}
}
ws = false;
+ psi_cpp_tokiter_add_cur(cpp);
psi_cpp_tokiter_next(cpp);
}
}
if (cpp->skip) {
- /* FIXME: del_range */
if (!do_cpp) {
#if PSI_CPP_DEBUG
fprintf(stderr, "PSI: CPP skip ");
continue;
}
+ psi_cpp_tokiter_add_cur(cpp);
psi_cpp_tokiter_next(cpp);
}
bool parsed = false;
struct psi_cpp temp = *cpp;
- cpp->tokens = *tokens;
+ cpp->tokens.iter = *tokens;
+ cpp->tokens.next = NULL;
+
if (psi_cpp_stage1(cpp) && psi_cpp_stage2(cpp)) {
parsed = true;
}
- *tokens = cpp->tokens;
- if (temp.tokens) {
- cpp->tokens = temp.tokens;
+ if (cpp->tokens.next) {
+ free(cpp->tokens.iter);
+ cpp->tokens.iter = cpp->tokens.next;
+ cpp->tokens.next = NULL;
+ }
+
+ *tokens = cpp->tokens.iter;
+
+ if (temp.tokens.iter) {
+ cpp->tokens.iter = temp.tokens.iter;
+ cpp->tokens.next = temp.tokens.next;
cpp->index = temp.index;
}
}
#if PSI_CPP_DEBUG
if (decl->exp) {
- fprintf(stderr, "MACRO: num_exp: ", decl->token->text);
- } else if (decl->tokens) {
- fprintf(stderr, "MACRO: decl : ", decl->token->text);
+ fprintf(stderr, "PSI: CPP MACRO num_exp -> %s ", decl->token->text->val);
+ } else {
+ fprintf(stderr, "PSI: CPP MACRO decl -> %s ", decl->token->text->val);
}
psi_cpp_macro_decl_dump(2, decl);
fprintf(stderr, "\n");
size_t num_tokens = psi_plist_count(tokens);
++cpp->expanded;
- psi_cpp_tokiter_ins_range(cpp, cpp->index,
- num_tokens, psi_plist_eles(tokens));
- /* skip already processed tokens */
- cpp->index += num_tokens;
+ psi_cpp_tokiter_add_range(cpp, num_tokens, psi_plist_eles(tokens));
free(tokens);
} else {
psi_plist_free(tokens);