X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.c;h=e01c3e6ff93a4b616f7589467f662474df66e98d;hp=5a1130c73031f323908e94f3b4a5f601b36016c2;hb=216e7ac3b97aed5a5d65c511dc061c78be90e79d;hpb=2fa436074ca9a5e87f39b696de832fa2188fcfc6 diff --git a/src/cpp.c b/src/cpp.c index 5a1130c..e01c3e6 100644 --- a/src/cpp.c +++ b/src/cpp.c @@ -36,35 +36,76 @@ #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); - 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 @@ -73,7 +114,8 @@ static int dump_def(zval *p) 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"); } @@ -87,7 +129,6 @@ void psi_cpp_free(struct psi_cpp **cpp_ptr) 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; @@ -117,8 +158,8 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp) /* 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; } @@ -173,8 +214,8 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp) 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; } } @@ -185,6 +226,7 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp) } ws = false; + psi_cpp_tokiter_add_cur(cpp); psi_cpp_tokiter_next(cpp); } @@ -266,7 +308,6 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp) } if (cpp->skip) { - /* FIXME: del_range */ if (!do_cpp) { #if PSI_CPP_DEBUG fprintf(stderr, "PSI: CPP skip "); @@ -317,6 +358,7 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp) continue; } + psi_cpp_tokiter_add_cur(cpp); psi_cpp_tokiter_next(cpp); } @@ -330,14 +372,24 @@ bool psi_cpp_process(struct psi_cpp *cpp, struct psi_plist **tokens) 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; } @@ -378,9 +430,9 @@ void psi_cpp_define(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl) } #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"); @@ -427,16 +479,13 @@ static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *pars 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); } } - free(include); + psi_parser_input_free(&include); zend_hash_str_add_empty_element(&cpp->once, path, strlen(path)); return true;