X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fdata.h;h=9caeb5920250dec86ffeab18082ebbb6b321cb77;hp=5356a7ec43d858f8a2f1050a60a0f1291b81f4aa;hb=refs%2Fheads%2Fmaster;hpb=7df12c88a4e14611a2585d6e7c994c59e8d7485a

diff --git a/src/data.h b/src/data.h
index 5356a7e..9caeb59 100644
--- a/src/data.h
+++ b/src/data.h
@@ -29,17 +29,24 @@
 #include "types.h"
 #include "error.h"
 #include "plist.h"
+#include "validate.h"
+#include "dump.h"
+#include "debug.h"
+
+#include <stdarg.h>
+#include <dlfcn.h>
+#include <unistd.h>
 
 #define PSI_DEBUG 0x1
 #define PSI_SILENT 0x2
 
-#include <stdarg.h>
-
-#define PSI_DEBUG_PRINT(ctx, msg, ...) do { \
-	if ((ctx) && (PSI_DATA(ctx)->flags & PSI_DEBUG)) { \
-		fprintf(stderr, msg, __VA_ARGS__); \
-	} \
-} while(0)
+#if PSI_THREADED_PARSER
+zend_string *psi_string_init_interned(const char *buf, size_t len, int p);
+zend_string *psi_new_interned_string(zend_string *str);
+#else
+# define psi_string_init_interned zend_string_init_interned
+# define psi_new_interned_string zend_new_interned_string
+#endif
 
 
 #define PSI_DATA(D) ((struct psi_data *) (D))
@@ -52,12 +59,13 @@
 	struct psi_plist *unions; \
 	struct psi_plist *enums; \
 	struct psi_plist *decls; \
+	struct psi_plist *vars; \
 	struct psi_plist *impls; \
-	struct psi_plist *libs; \
 	psi_error_cb error; \
 	char last_error[0x1000]; \
 	unsigned errors; \
-	unsigned flags
+	unsigned flags; \
+	int debug_fd
 
 struct psi_data {
 	PSI_DATA_MEMBERS;
@@ -66,8 +74,7 @@ struct psi_data {
 struct psi_data *psi_data_ctor(struct psi_data *data, psi_error_cb error, unsigned flags);
 struct psi_data *psi_data_ctor_with_dtors(struct psi_data *data, psi_error_cb error, unsigned flags);
 struct psi_data *psi_data_exchange(struct psi_data *dest, struct psi_data *src);
-bool psi_data_validate(struct psi_data *dst, struct psi_data *src);
 void psi_data_dtor(struct psi_data *data);
-void psi_data_dump(int fd, struct psi_data *data);
+void psi_data_dump(struct psi_dump *dump, struct psi_data *data);
 
 #endif