zend_string'ify

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

diff --git a/src/parser.h b/src/parser.h
index b05d1851dec36ccf7be99fd258498c7acde09cc9..261b2b9748e6b6c2f68a826578e0d9ec59c0fc70 100644 (file)
--- a/src/parser.h
+++ b/src/parser.h
@@ -46,27 +46,16 @@ 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;
-};
-
 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);
 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);