X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.h;h=5ace4bfd2a76c4c8fcabfa60c71bdc0a81eb8be7;hp=9c74588c35e2708d7f200c03bd0270aec525a792;hb=f24325648c601d4b0835074f271072f4832e4478;hpb=ba906e039ffe9e57842ce5135aa43efa00b8a4c6

diff --git a/src/cpp.h b/src/cpp.h
index 9c74588..5ace4bf 100644
--- a/src/cpp.h
+++ b/src/cpp.h
@@ -36,7 +36,10 @@ struct psi_cpp {
 	HashTable defs;
 	HashTable once;
 	struct psi_parser *parser;
-	struct psi_plist *tokens;
+	struct {
+		struct psi_plist *iter;
+		struct psi_plist *next;
+	} tokens;
 	const char *search;
 	size_t index;
 	unsigned level;
@@ -59,7 +62,7 @@ bool psi_cpp_undef(struct psi_cpp *cpp, struct psi_token *tok);
 #define PSI_CPP_INCLUDE_NEXT 0x1
 #define PSI_CPP_INCLUDE_ONCE 0x2
 
-bool psi_cpp_include(struct psi_cpp *cpp, const char *file, unsigned flags);
+bool psi_cpp_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags);
 
 void psi_cpp_tokiter_reset(struct psi_cpp *cpp);
 bool psi_cpp_tokiter_seek(struct psi_cpp *cpp, size_t index);
@@ -72,10 +75,14 @@ void psi_cpp_tokiter_next(struct psi_cpp *cpp);
 void psi_cpp_tokiter_prev(struct psi_cpp *cpp);
 bool psi_cpp_tokiter_valid(struct psi_cpp *cpp);
 bool psi_cpp_tokiter_del_cur(struct psi_cpp *cpp, bool free_token);
+bool psi_cpp_tokiter_del_prev(struct psi_cpp *cpp, bool free_token);
 bool psi_cpp_tokiter_del_range(struct psi_cpp *cpp, size_t offset,
 		size_t num_eles, bool free_tokens);
-bool psi_cpp_tokiter_ins_cur(struct psi_cpp *cpp, struct psi_token *tok);
-bool psi_cpp_tokiter_ins_range(struct psi_cpp *cpp, size_t offset,
+bool psi_cpp_tokiter_add(struct psi_cpp *cpp, struct psi_token *tok);
+bool psi_cpp_tokiter_add_cur(struct psi_cpp *cpp);
+bool psi_cpp_tokiter_add_range(struct psi_cpp *cpp,
+		size_t num_eles, void **eles);
+bool psi_cpp_tokiter_ins_range(struct psi_cpp *cpp,
 		size_t num_eles, void **eles);
 bool psi_cpp_tokiter_defined(struct psi_cpp *cpp);
 bool psi_cpp_tokiter_expand(struct psi_cpp *cpp);