X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.c;h=0f048b4209d0cfd01c554a1d61e9feffe098af30;hp=5ab649247d17a4a2f468d7411a825e2c9333541c;hb=09529efcde471127419e141807b83b37077003a0;hpb=c9384515a81cb64d345b299908b2852f51bb8e6e

diff --git a/src/cpp.c b/src/cpp.c
index 5ab6492..0f048b4 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -36,10 +36,63 @@
 
 #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(&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,32 +101,21 @@ 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);
-		free(predef);
-		return parsed;
-	}
-
-	return false;
-}
-
 #if PSI_CPP_DEBUG
 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;
 			}
@@ -172,8 +213,9 @@ static bool psi_cpp_stage1(struct psi_cpp *cpp)
 					struct psi_token *no_ws = psi_token_copy(token);
 
 					no_ws->type = PSI_T_NO_WHITESPACE;
-					no_ws->text[0] = '\xA0';
-					psi_cpp_tokiter_ins_cur(cpp, no_ws);
+					zend_string_release(no_ws->text);
+					no_ws->text = zend_string_init_interned("\xA0", 1, 1);
+					psi_cpp_tokiter_add(cpp, no_ws);
 					continue;
 				}
 			}
@@ -184,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);
 	}
 
@@ -265,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 ");
@@ -316,6 +358,7 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp)
 			continue;
 		}
 
+		psi_cpp_tokiter_add_cur(cpp);
 		psi_cpp_tokiter_next(cpp);
 	}
 
@@ -329,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;
 	}
 
@@ -348,7 +401,7 @@ bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok)
 	bool defined;
 
 	if (tok->type == PSI_T_NAME) {
-		defined = zend_hash_str_exists(&cpp->defs, tok->text, tok->size);
+		defined = zend_hash_exists(&cpp->defs, tok->text);
 	} else {
 		defined = false;
 	}
@@ -356,8 +409,8 @@ bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok)
 #if PSI_CPP_DEBUG
 	fprintf(stderr, "PSI: CPP defined -> %s ", defined ? "true" : "false");
 	if (defined) {
-		struct psi_cpp_macro_decl *macro = zend_hash_str_find_ptr(&cpp->defs, tok->text, tok->size);
-		fprintf(stderr, " @ %s:%u ", macro->token->file, macro->token->line);
+		struct psi_cpp_macro_decl *macro = zend_hash_find_ptr(&cpp->defs, tok->text);
+		fprintf(stderr, " @ %s:%u ", macro->token->file->val, macro->token->line);
 	}
 	psi_token_dump(2, tok);
 #endif
@@ -367,29 +420,29 @@ bool psi_cpp_defined(struct psi_cpp *cpp, struct psi_token *tok)
 
 void psi_cpp_define(struct psi_cpp *cpp, struct psi_cpp_macro_decl *decl)
 {
-	struct psi_cpp_macro_decl *old = zend_hash_str_find_ptr(&cpp->defs, decl->token->text, decl->token->size);
+	struct psi_cpp_macro_decl *old = zend_hash_find_ptr(&cpp->defs, decl->token->text);
 
 	if (old && !psi_cpp_macro_decl_equal(old, decl)) {
 		cpp->parser->error(PSI_DATA(cpp->parser), decl->token, PSI_WARNING,
-				"'%s' redefined", decl->token->text);
+				"'%s' redefined", decl->token->text->val);
 		cpp->parser->error(PSI_DATA(cpp->parser), old->token, PSI_WARNING,
-				"'%s' previously defined", old->token->text);
+				"'%s' previously defined", old->token->text->val);
 	}
 #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");
 #endif
-	zend_hash_str_update_ptr(&cpp->defs, decl->token->text, decl->token->size, decl);
+	zend_hash_update_ptr(&cpp->defs, decl->token->text, decl);
 }
 
 bool psi_cpp_undef(struct psi_cpp *cpp, struct psi_token *tok)
 {
-	return SUCCESS == zend_hash_str_del(&cpp->defs, tok->text, tok->size);
+	return SUCCESS == zend_hash_del(&cpp->defs, tok->text);
 }
 
 bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp)
@@ -426,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;
@@ -445,37 +495,36 @@ static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *pars
 
 static inline void include_path(const struct psi_token *file, char **path)
 {
-	if (*file->text == '/') {
-		*path = file->text;
+	if (file->text->val[0] == '/') {
+		*path = file->text->val;
 	} else {
 		char *dir;
 		size_t len;
 
-		strncpy(*path, file->file, PATH_MAX);
+		strncpy(*path, file->file->val, PATH_MAX);
 
 		dir = dirname(*path);
 		len = strlen(dir);
 
-		assert(len + file->size + 1 < PATH_MAX);
+		assert(len + file->text->len + 1 < PATH_MAX);
 
 		memmove(*path, dir, len);
 		(*path)[len] = '/';
-		memcpy(&(*path)[len + 1], file->text, file->size + 1);
+		memcpy(&(*path)[len + 1], file->text->val, file->text->len + 1);
 	}
 }
 
 bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags)
 {
 	bool parsed = false;
-	int f_len = strlen(file->text);
 
-	if (!(flags & PSI_CPP_INCLUDE_NEXT) || *file->text == '/') {
+	if (file->type == PSI_T_QUOTED_STRING && (!(flags & PSI_CPP_INCLUDE_NEXT) || file->text->val[0] == '/')) {
 		/* first try as is, full or relative path */
 		char temp[PATH_MAX], *path = temp;
 
 		include_path(file, &path);
 
-		if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, f_len)) {
+		if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, strlen(path))) {
 			return true;
 		}
 		if (try_include(cpp, path, &parsed)) {
@@ -485,7 +534,7 @@ bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned
 	}
 
 	/* look through search paths */
-	if (*file->text != '/') {
+	if (file->text->val[0] != '/') {
 		char path[PATH_MAX];
 		const char *sep;
 		int p_len;
@@ -499,7 +548,7 @@ bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned
 			}
 		}
 
-		if (!(flags & PSI_CPP_INCLUDE_NEXT) || !cpp->search) {
+		if (!(flags & PSI_CPP_INCLUDE_NEXT)) {
 			cpp->search = PSI_G(search_path);
 		}
 
@@ -509,7 +558,7 @@ bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned
 			sep = strchr(cpp->search, ':');
 			d_len = sep ? sep - cpp->search : strlen(cpp->search);
 
-			if (PATH_MAX > (p_len = snprintf(path, PATH_MAX, "%.*s/%.*s", d_len, cpp->search, f_len, file->text))) {
+			if (PATH_MAX > (p_len = snprintf(path, PATH_MAX, "%.*s/%.*s", d_len, cpp->search, (int) file->text->len, file->text->val))) {
 				if ((flags & PSI_CPP_INCLUDE_ONCE) && zend_hash_str_exists(&cpp->once, path, p_len)) {
 					return true;
 				}