X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser.h;h=0650ef5d003607995ce8097b2b658c700c19af4e;hp=7c64b252b52b880e656c7f9448c0e7c845e26f08;hb=a7ac1c0a3c855321f21682c127a4b707de33a303;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/parser.h b/src/parser.h
index 7c64b25..0650ef5 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -26,29 +26,51 @@
 #ifndef PSI_PARSER_H
 #define PSI_PARSER_H
 
-#include <stdarg.h>
+struct psi_parser;
 
-#define BSIZE 256
+#include "parser_proc.h"
+#undef YYDEBUG
 
+#include "data.h"
 #include "token.h"
 #include "types.h"
-#include "data.h"
+#include "cpp.h"
+
+struct psi_cpp;
 
 struct psi_parser {
 	PSI_DATA_MEMBERS;
-	FILE *fp;
-	token_t num;
-	void *proc;
-	unsigned line, col;
-	char *cur, *tok, *lim, *eof, *ctx, *mrk, buf[BSIZE];
+
+	struct psi_cpp *preproc;
 };
 
-struct psi_parser *psi_parser_init(struct psi_parser *P, const char *filename, psi_error_cb error, unsigned flags);
-void psi_parser_syntax_error(struct psi_parser *P, const char *fn, size_t ln, const char *msg, ...);
-ssize_t psi_parser_fill(struct psi_parser *P, size_t n);
-token_t psi_parser_scan(struct psi_parser *P);
-void psi_parser_parse(struct psi_parser *P, struct psi_token *src);
+struct psi_parser_input {
+	size_t length;
+	zend_string *file;
+	unsigned lines;
+	char buffer[1];
+};
+
+static inline void psi_parser_input_free(struct psi_parser_input **I) {
+	if (*I) {
+		struct psi_parser_input *i = *I;
+
+		*I = NULL;
+		zend_string_release(i->file);
+		free(i);
+	}
+}
+
+struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, unsigned flags);
+struct psi_parser_input *psi_parser_open_file(struct psi_parser *P, const char *filename, bool report_errors);
+struct psi_parser_input *psi_parser_open_string(struct psi_parser *P, const char *string, size_t length);
+size_t psi_parser_maxfill(void);
+struct psi_plist *psi_parser_scan(struct psi_parser *P, struct psi_parser_input *I);
+struct psi_plist *psi_parser_preprocess(struct psi_parser *P, struct psi_plist **tokens);
+bool psi_parser_process(struct psi_parser *P, struct psi_plist *tokens, size_t *processed);
+bool psi_parser_parse(struct psi_parser *P, struct psi_parser_input *I);
 void psi_parser_dtor(struct psi_parser *P);
 void psi_parser_free(struct psi_parser **P);
 
+
 #endif