-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;
+ char *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);
+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);