travis: update

[m6w6/ext-psi] / src / parser.h

diff --git a/src/parser.h b/src/parser.h
index b05d1851dec36ccf7be99fd258498c7acde09cc9..68bebb54ac4dd90654ac36319140a619806c7ede 100644 (file)
--- a/src/parser.h
+++ b/src/parser.h
@@ -38,35 +38,37 @@ struct psi_parser;
 
 struct psi_cpp;
 
+struct psi_parser_input {
+       size_t length;
+       zend_string *file;
+       time_t lmod;
+       char buffer[1];
+};
+
 struct psi_parser {
        PSI_DATA_MEMBERS;
 
        struct psi_cpp *preproc;
+       struct psi_parser_input *input;
 };
 
-struct psi_parser_input {
-       size_t length;
-       char *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;
 
-struct psi_parser_data {
-       enum {
-               PSI_PARSER_DATA_SELF,
-               PSI_PARSER_DATA_CPP
-       } type;
-       union {
-               struct psi_parser *parser;
-               struct psi_cpp *cpp;
-       } data;
-};
+               *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);
+void psi_parser_postprocess(struct psi_parser *P);
 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);