X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcpp_tokiter.c;h=2fa1763dceb05b1b5dec1a204b6656b1ee6ad532;hb=5d2ec37a8679b0fe71f07622cc3ab83c14548b50;hp=d980e61fde38353c33dba25d3ef613c8be9a638d;hpb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2;p=m6w6%2Fext-psi

diff --git a/src/cpp_tokiter.c b/src/cpp_tokiter.c
index d980e61..2fa1763 100644
--- a/src/cpp_tokiter.c
+++ b/src/cpp_tokiter.c
@@ -28,17 +28,28 @@
 #include "cpp.h"
 #include "parser.h"
 
-
+#if PSI_CPP_DEBUG > 1
 void psi_cpp_tokiter_dump(int fd, struct psi_cpp *cpp)
 {
-	size_t i;
+	size_t i = cpp->index;
 	struct psi_token *T;
 
-	for (i = 0; psi_plist_get(cpp->tokens, i, &T); ++i) {
+	if (i > 20) {
+		i -= 20;
+	} else {
+		i = 0;
+	}
+	while (psi_plist_get(cpp->tokens, i, &T)) {
 		dprintf(fd, "PSI: CPP tokens %5zu %c ", i, cpp->index == i ? '*' : ' ');
 		psi_token_dump(fd, T);
+		if (i >= cpp->index + 10) {
+			dprintf(fd, "PSI: CPP tokens .....\n");
+			break;
+		}
+		++i;
 	}
 }
+#endif
 
 void psi_cpp_tokiter_reset(struct psi_cpp *cpp)
 {
@@ -150,9 +161,16 @@ bool psi_cpp_tokiter_del_range(struct psi_cpp *cpp, size_t offset, size_t num_el
 	deleted = psi_plist_del_r(cpp->tokens, offset, num_eles, (void *) ptr);
 
 	if (deleted) {
-		if (cpp->index >= psi_plist_count(cpp->tokens)) {
-			cpp->index = MAX(0, psi_plist_count(cpp->tokens)-1);
+		size_t count = psi_plist_count(cpp->tokens);
+
+		if (cpp->index >= count) {
+			if (count > 0) {
+				cpp->index = count - 1;
+			} else {
+				cpp->index = 0;
+			}
 		}
+
 		if (free_tokens) {
 			while (num_eles--) {
 				if (ptr[num_eles]) {
@@ -215,7 +233,8 @@ bool psi_cpp_tokiter_defined(struct psi_cpp *cpp)
 	return false;
 }
 
-void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_plist *tokens)
+void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_token *target,
+		struct psi_plist *tokens)
 {
 	if (tokens && psi_plist_count(tokens)) {
 		size_t i = 0, n = 0;
@@ -225,35 +244,40 @@ void psi_cpp_tokiter_expand_tokens(struct psi_cpp *cpp, struct psi_plist *tokens
 		while (psi_plist_get(tokens, i++, &tok)) {
 			struct psi_token *new_tok;
 
+			if (tok->type == PSI_T_EOL) {
+				continue;
+			}
 			if (tok->type == PSI_T_HASH) {
-				if (stringify) {
-					stringify = false;
-					paste = true;
-				} else {
-					stringify = true;
-				}
+				stringify = true;
+				continue;
+			}
+			if (tok->type == PSI_T_CPP_PASTE) {
+				paste = true;
 				continue;
 			}
 
-			if (paste && n > 0 && exp_tokens[n - 1] &&
-					(new_tok = psi_token_cat(NULL, 2, exp_tokens[n - 1], tok))) {
-				free(exp_tokens[n - 1]);
+			if (paste && n > 0 && exp_tokens[n - 1]) {
+				struct psi_token *old_tok = exp_tokens[n - 1];
+
+				new_tok = psi_token_init(old_tok->type, "", 0,
+						target->col, target->line, target->file);
+
+				new_tok = psi_token_cat(NULL, 2, new_tok, old_tok, tok);
+				free(old_tok);
+
 				exp_tokens[n - 1] = new_tok;
 			} else {
-				struct psi_token *cpy = psi_token_copy(tok);
+				new_tok = psi_token_init(stringify ? PSI_T_QUOTED_STRING : tok->type,
+						tok->text, tok->size, target->col, target->line, target->file);
 
-				if (stringify) {
-					cpy = psi_token_append(NULL,
-							psi_token_prepend(NULL, cpy, 1, "\""), 1, "\"");
-					cpy->type = PSI_T_QUOTED_STRING;
-				}
-				exp_tokens[n++] = cpy;
+				exp_tokens[n++] = new_tok;
 			}
 
 #if PSI_CPP_DEBUG
 			fprintf(stderr, "PSI: CPP expand > ");
 			psi_token_dump(2, tok);
 #endif
+
 			paste = false;
 			stringify = false;
 		}
@@ -355,7 +379,8 @@ fail:
 }
 
 static void psi_cpp_tokiter_expand_call_tokens(struct psi_cpp *cpp,
-		struct psi_cpp_macro_decl *macro, struct psi_plist **arg_tokens_list)
+		struct psi_token *target, struct psi_cpp_macro_decl *macro,
+		struct psi_plist **arg_tokens_list)
 {
 	size_t i;
 	struct psi_token *tok;
@@ -385,12 +410,12 @@ static void psi_cpp_tokiter_expand_call_tokens(struct psi_cpp *cpp,
 		}
 	}
 
-	psi_cpp_tokiter_expand_tokens(cpp, tokens);
+	psi_cpp_tokiter_expand_tokens(cpp, target, tokens);
 	psi_plist_free(tokens);
 }
 
 static bool psi_cpp_tokiter_expand_call(struct psi_cpp *cpp,
-		struct psi_cpp_macro_decl *macro)
+		struct psi_token *target, struct psi_cpp_macro_decl *macro)
 {
 	/* function-like macro
 	 * #define FOO(a,b) a>b // macro->sig == {a, b}, macro->tokens = {a, >, b}
@@ -411,7 +436,7 @@ static bool psi_cpp_tokiter_expand_call(struct psi_cpp *cpp,
 	psi_cpp_tokiter_seek(cpp, start);
 
 	/* insert and expand macro tokens */
-	psi_cpp_tokiter_expand_call_tokens(cpp, macro, arg_tokens_list);
+	psi_cpp_tokiter_expand_call_tokens(cpp, target, macro, arg_tokens_list);
 	psi_cpp_tokiter_free_call_tokens(arg_tokens_list, psi_plist_count(macro->sig), true);
 
 	/* back to where we took off */
@@ -427,7 +452,7 @@ bool psi_cpp_tokiter_expand(struct psi_cpp *cpp)
 
 		if (current) {
 			struct psi_cpp_macro_decl *macro = zend_hash_str_find_ptr(
-					cpp->defs, current->text, current->size);
+					&cpp->defs, current->text, current->size);
 
 			/* don't expand itself */
 			if (macro && macro->token != current) {
@@ -436,20 +461,21 @@ bool psi_cpp_tokiter_expand(struct psi_cpp *cpp)
 				psi_token_dump(2, current);
 #endif
 				if (macro->sig) {
-					return psi_cpp_tokiter_expand_call(cpp, macro);
+					return psi_cpp_tokiter_expand_call(cpp, current, macro);
 				} else {
 					size_t index = psi_cpp_tokiter_index(cpp);
 
 					/* delete current token from stream */
-					psi_cpp_tokiter_del_cur(cpp, true);
+					psi_cpp_tokiter_del_cur(cpp, false);
 
 					if (index != psi_cpp_tokiter_index(cpp)) {
 						/* might have been last token */
 						psi_cpp_tokiter_next(cpp);
 					}
 					/* replace with tokens from macro */
-					psi_cpp_tokiter_expand_tokens(cpp, macro->tokens);
+					psi_cpp_tokiter_expand_tokens(cpp, current, macro->tokens);
 
+					free(current);
 					++cpp->expanded;
 					return true;
 				}