X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcpp.h;h=66a14fb3b3b36dfca4f361111c017eca56c5ec5d;hp=81f27b3a348a510e6e033a3c941c46adfa6c7450;hb=44bd65fe60fb83fa4c3bbb0d4c679d2b70a096df;hpb=6ebcb60416cad353f5aeacebe919cb6990ef5a7d

diff --git a/src/cpp.h b/src/cpp.h
index 81f27b3..66a14fb 100644
--- a/src/cpp.h
+++ b/src/cpp.h
@@ -29,41 +29,67 @@
 #include "data.h"
 
 #ifndef PSI_CPP_DEBUG
-# define PSI_CPP_DEBUG 1
+# define PSI_CPP_DEBUG 0
 #endif
 
-struct psi_cpp_data {
+struct psi_cpp {
 	HashTable defs;
+	HashTable once;
+	struct psi_parser *parser;
+	struct {
+		struct psi_plist *iter;
+		struct psi_plist *next;
+		struct psi_plist *exec;
+	} tokens;
+	HashTable expanding;
+	const char *search;
+	size_t index;
 	unsigned level;
 	unsigned skip;
 	unsigned seen;
-	size_t index;
-	struct psi_plist *tokens;
 	unsigned expanded;
-	struct psi_cpp_exp *exp;
+	unsigned counter;
+	bool do_cpp;
 };
 
-bool psi_cpp_preprocess(struct psi_parser *P, struct psi_cpp_data *cpp);
-bool psi_cpp_if(struct psi_cpp_exp *exp, HashTable *defs, struct psi_data *D);
-bool psi_cpp_defined(struct psi_cpp_data *cpp, struct psi_token *tok);
-void psi_cpp_define(struct psi_cpp_data *cpp, struct psi_cpp_macro_decl *decl);
-bool psi_cpp_undef(struct psi_cpp_data *cpp, struct psi_token *tok);
+struct psi_cpp *psi_cpp_init(struct psi_parser *parser);
+bool psi_cpp_process(struct psi_cpp *cpp, struct psi_plist **tokens,
+		struct psi_token *expanding);
+void psi_cpp_free(struct psi_cpp **cpp_ptr);
+
+bool psi_cpp_if(struct psi_cpp *cpp, struct psi_cpp_exp *exp);
+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);
+bool psi_cpp_undef(struct psi_cpp *cpp, struct psi_token *tok);
+
+#define PSI_CPP_INCLUDE 0x0
+#define PSI_CPP_INCLUDE_NEXT 0x1
+#define PSI_CPP_INCLUDE_ONCE 0x2
 
-void psi_cpp_tokiter_reset(struct psi_cpp_data *cpp);
-bool psi_cpp_tokiter_seek(struct psi_cpp_data *cpp, size_t index);
-void psi_cpp_tokiter_dump(int fd, struct psi_cpp_data *cpp);
-struct psi_token *psi_cpp_tokiter_current(struct psi_cpp_data *cpp);
-size_t psi_cpp_tokiter_index(struct psi_cpp_data *cpp);
-void psi_cpp_tokiter_next(struct psi_cpp_data *cpp);
-void psi_cpp_tokiter_prev(struct psi_cpp_data *cpp);
-bool psi_cpp_tokiter_valid(struct psi_cpp_data *cpp);
-bool psi_cpp_tokiter_del_cur(struct psi_cpp_data *cpp, bool free_token);
-bool psi_cpp_tokiter_del_range(struct psi_cpp_data *cpp, size_t offset,
+bool psi_cpp_has_include(struct psi_cpp *cpp, const struct psi_token *file, unsigned flags, char *path);
+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);
+#if PSI_CPP_DEBUG > 1
+void psi_cpp_tokiter_dump(struct psi_dump *dump, struct psi_cpp *cpp);
+#endif
+struct psi_token *psi_cpp_tokiter_current(struct psi_cpp *cpp);
+size_t psi_cpp_tokiter_index(struct psi_cpp *cpp);
+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_data *cpp, struct psi_token *tok);
-bool psi_cpp_tokiter_ins_range(struct psi_cpp_data *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_data *cpp);
-bool psi_cpp_tokiter_expand(struct psi_cpp_data *cpp);
+bool psi_cpp_tokiter_defined(struct psi_cpp *cpp);
+bool psi_cpp_tokiter_expand(struct psi_cpp *cpp);
 
 #endif