X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.c;h=2a53df84339bbd0edfdaa5f750fd1ce316787075;hp=b181e270a0151b7342c2a3b9783dd278278a2f81;hb=f854ff4c520183dbd820f61b958c9794cfd3a1fd;hpb=3d77b5b65efb78c1da9485dfde1fcd417066b803

diff --git a/src/cpp.c b/src/cpp.c
index b181e27..2a53df8 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -60,13 +60,14 @@ bool psi_cpp_load_defaults(struct psi_cpp *cpp)
 
 	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);
+		psi_parser_input_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);
@@ -78,17 +79,18 @@ static int dump_def(zval *p)
 	}
 	return ZEND_HASH_APPLY_KEEP;
 }
+#endif
 
 void psi_cpp_free(struct psi_cpp **cpp_ptr)
 {
 	if (*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;
-		if (cpp->parser->flags & PSI_DEBUG) {
-			fprintf(stderr, "PSI: CPP decls:\n");
-			zend_hash_apply(&cpp->defs, dump_def);
-		}
 		zend_hash_destroy(&cpp->defs);
 		zend_hash_destroy(&cpp->once);
 		free(cpp);
@@ -170,7 +172,8 @@ 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';
+					zend_string_release(no_ws->text);
+					no_ws->text = zend_string_init("\xA0", 1, 1);
 					psi_cpp_tokiter_ins_cur(cpp, no_ws);
 					continue;
 				}
@@ -346,7 +349,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;
 	}
@@ -354,8 +357,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
@@ -365,28 +368,40 @@ 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);
 	}
-	zend_hash_str_update_ptr(&cpp->defs, decl->token->text, decl->token->size, 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);
+	}
+	psi_cpp_macro_decl_dump(2, decl);
+	fprintf(stderr, "\n");
+#endif
+	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)
 {
-	if (!psi_num_exp_validate(PSI_DATA(cpp->parser), exp->data.num, NULL, NULL, NULL, NULL, NULL)) {
+	struct psi_validate_scope scope = {0};
+
+	scope.defs = &cpp->defs;
+	if (!psi_num_exp_validate(PSI_DATA(cpp->parser), exp->data.num, &scope)) {
 		return false;
 	}
-	if (!psi_long_num_exp(exp->data.num, NULL, &cpp->defs)) {
+	if (!psi_num_exp_get_long(exp->data.num, NULL, &cpp->defs)) {
 		return false;
 	}
 	return true;
@@ -421,7 +436,7 @@ static inline bool try_include(struct psi_cpp *cpp, const char *path, bool *pars
 				psi_plist_free(tokens);
 			}
 		}
-		free(include);
+		psi_parser_input_free(&include);
 
 		zend_hash_str_add_empty_element(&cpp->once, path, strlen(path));
 		return true;
@@ -431,37 +446,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)) {
@@ -471,7 +485,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;
@@ -485,7 +499,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);
 		}
 
@@ -495,7 +509,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;
 				}