From: Michael Wallner <mike@php.net>
Date: Fri, 7 Dec 2018 14:29:26 +0000 (+0100)
Subject: fix macro expansion
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=16e375c9503246b179550cd97c0739c916dc802a;p=m6w6%2Fext-psi

fix macro expansion
---

diff --git a/src/cpp.c b/src/cpp.c
index 4b11c25..034f8a2 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -317,12 +317,7 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp)
 		}
 
 		if (do_expansion && psi_cpp_defined(cpp, current)) {
-			bool expanded = false;
-
 			if (psi_cpp_tokiter_expand(cpp)) {
-				expanded = true;
-			}
-			if (expanded) {
 				continue;
 			}
 		}
@@ -334,13 +329,7 @@ static bool psi_cpp_stage2(struct psi_cpp *cpp)
 			bool parsed;
 
 			cpp->do_cpp = false;
-
 			parsed = psi_parser_process(cpp->parser, cpp->tokens.exec, &processed);
-
-			/* leave EOLs in the input stream, else we might end up
-			 * with a hash not preceded with a new line after include */
-			psi_cpp_tokiter_add(cpp, current);
-			psi_plist_pop(cpp->tokens.exec, NULL);
 			psi_plist_clean(cpp->tokens.exec);
 
 			if (!parsed) {
diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c
index 0e4a0db..fdf6e86 100644
--- a/src/cpp_tokiter.c
+++ b/src/cpp_tokiter.c
@@ -45,11 +45,7 @@ void psi_cpp_tokiter_dump(struct psi_dump *dump, struct psi_cpp *cpp)
 	}
 	while (psi_plist_get(cpp->tokens.iter, i, &T)) {
 		PSI_DUMP(dump, "PSI: CPP tokens %5zu %c ", i, cpp->index == i ? '*' : ' ');
-		if (T) {
-			psi_token_dump(dump, T);
-		} else {
-			PSI_DUMP(dump, "TOKEN deleted\n");
-		}
+		psi_token_dump(dump, T);
 		if (i >= cpp->index + 40) {
 			PSI_DUMP(dump, "PSI: CPP tokens .....\n");
 			break;
@@ -60,16 +56,6 @@ void psi_cpp_tokiter_dump(struct psi_dump *dump, struct psi_cpp *cpp)
 
 void psi_cpp_tokiter_reset(struct psi_cpp *cpp)
 {
-#if PSI_CPP_DEBUG
-	PSI_DEBUG_PRINT(cpp->parser,
-			"PSI: CPP reset -> iter.count=%zu, next.count=%zu, exec.count=%zu\n",
-			psi_plist_count(cpp->tokens.iter),
-			psi_plist_count(cpp->tokens.next),
-			psi_plist_count(cpp->tokens.exec));
-#	if PSI_CPP_DEBUG > 1
-	PSI_DEBUG_DUMP(cpp->parser, psi_cpp_tokiter_dump, cpp);
-#	endif
-#endif
 	cpp->index = 0;
 	cpp->expanded = 0;
 	cpp->skip = 0;
@@ -88,6 +74,16 @@ void psi_cpp_tokiter_reset(struct psi_cpp *cpp)
 	} else {
 		cpp->tokens.exec = psi_plist_init((psi_plist_dtor) psi_token_free);
 	}
+#if PSI_CPP_DEBUG
+	PSI_DEBUG_PRINT(cpp->parser,
+			"PSI: CPP reset -> iter.count=%zu, next.count=%zu, exec.count=%zu\n",
+			psi_plist_count(cpp->tokens.iter),
+			psi_plist_count(cpp->tokens.next),
+			psi_plist_count(cpp->tokens.exec));
+#	if PSI_CPP_DEBUG > 1
+	PSI_DEBUG_DUMP(cpp->parser, psi_cpp_tokiter_dump, cpp);
+#	endif
+#endif
 }
 
 bool psi_cpp_tokiter_seek(struct psi_cpp *cpp, size_t index)
@@ -194,9 +190,10 @@ void psi_cpp_tokiter_next(struct psi_cpp *cpp)
 
 bool psi_cpp_tokiter_valid(struct psi_cpp *cpp)
 {
-#if 0 && PSI_CPP_DEBUG
-	PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP valid -> index=%zu -> %d\n",
-			cpp->index, cpp->index < psi_plist_count(cpp->tokens.iter));
+#if PSI_CPP_DEBUG > 1
+	PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP valid -> index=%zu -> %s\n",
+			cpp->index, cpp->index < psi_plist_count(cpp->tokens.iter)
+			? "true" : "false");
 #endif
 	return cpp->index < psi_plist_count(cpp->tokens.iter);
 }
@@ -272,8 +269,10 @@ bool psi_cpp_tokiter_del_range(struct psi_cpp *cpp, size_t offset, size_t num_el
 			return false;
 		}
 #if PSI_CPP_DEBUG
-		PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP del_range -> 	");
-		PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, ptr);
+		PSI_DEBUG_LOCK(cpp->parser,
+				PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP del_range -> 	");
+				PSI_DEBUG_DUMP(cpp->parser, psi_token_dump, ptr);
+		);
 #endif
 		psi_plist_unset(cpp->tokens.iter, i);
 		if (free_tokens && ptr) {
@@ -598,7 +597,7 @@ static inline bool psi_cpp_tokiter_expand_builtin(struct psi_cpp *cpp,
 			return false;
 		}
 	} else {
-		psi_cpp_tokiter_next(cpp);
+		psi_cpp_tokiter_del_cur(cpp, false);
 	}
 
 	psi_cpp_tokiter_expand_builtin_tokens(cpp, target, builtin, arg_tokens_list);
@@ -615,9 +614,6 @@ static inline bool psi_cpp_tokiter_expand_builtin(struct psi_cpp *cpp,
 static inline bool psi_cpp_tokiter_expand_def(struct psi_cpp *cpp,
 		struct psi_token *target, struct psi_cpp_macro_decl *macro)
 {
-	/* delete current token from stream */
-	psi_cpp_tokiter_del_cur(cpp, false);
-
 	if (macro->tokens) {
 		struct psi_plist *tokens = psi_plist_copy(macro->tokens,
 					(void (*)(void *)) psi_token_copy_ctor);
@@ -631,7 +627,7 @@ static inline bool psi_cpp_tokiter_expand_def(struct psi_cpp *cpp,
 		++cpp->expanded;
 	}
 
-	psi_token_free(&target);
+	psi_cpp_tokiter_del_cur(cpp, true);
 	return true;
 }
 
@@ -655,12 +651,6 @@ static inline bool psi_cpp_tokiter_expand_decl(struct psi_cpp *cpp,
 		return false;
 	}
 
-	/* don't expand itself */
-//	if (zend_string_equals(macro->token->text, target->text)) {
-//		PSI_DEBUG_PRINT(cpp->parser, "PSI: CPP expand ~ skipping self token\n");
-//		return false;
-//	}
-
 	if (macro->sig) {
 		return psi_cpp_tokiter_expand_call(cpp, target, macro);
 	} else if (psi_cpp_tokiter_expand_cmp(target, macro)) {
diff --git a/src/token.c b/src/token.c
index f3beb2c..18c7437 100644
--- a/src/token.c
+++ b/src/token.c
@@ -196,6 +196,11 @@ void psi_token_dump(struct psi_dump *dump, struct psi_token *t)
 {
 	size_t i;
 
+	if (!t) {
+		PSI_DUMP(dump, "TOKEN deleted\n");
+		return;
+	}
+
 	PSI_DUMP(dump, "TOKEN %p (%u) ", t, t->type);
 	if (t->type == PSI_T_EOF) {
 		PSI_DUMP(dump, "EOF");