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

diff --git a/src/parser.h b/src/parser.h
index b05d185..0650ef5 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -46,27 +46,27 @@ struct psi_parser {
 
 struct psi_parser_input {
 	size_t length;
-	char *file;
+	zend_string *file;
 	unsigned lines;
 	char buffer[1];
 };
 
-struct psi_parser_data {
-	enum {
-		PSI_PARSER_DATA_SELF,
-		PSI_PARSER_DATA_CPP
-	} type;
-	union {
-		struct psi_parser *parser;
-		struct psi_cpp *cpp;
-	} data;
-};
+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);
+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);