cpp: fix relative includes

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

diff --git a/src/parser.h b/src/parser.h
index 03484a89b116aeeee4d9169547c597bc097b4363..d4cfb225b8ffe8771aaa1b3a92b6a53d02fb55ad 100644 (file)
--- a/src/parser.h
+++ b/src/parser.h
@@ -26,51 +26,40 @@
 #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;
-       token_t num;
-       unsigned line, col;
-       char *cur, *tok, *lim, *eof, *ctx, *mrk;
-
-       /* internals */
-       void *proc;
 
-       struct {
-               enum psi_parser_input_type {
-                       PSI_PARSE_FILE = 1,
-                       PSI_PARSE_STRING
-               } type;
+       struct psi_cpp *preproc;
+};
 
-               union {
-                       struct {
-                               FILE *handle;
-                               char *buffer;
-#if HAVE_MMAP
-                               size_t length;
-#endif
-                       } file;
-                       struct {
-                               char *buffer;
-                               size_t length;
-                       } string;
-               } data;
-       } input;
+struct psi_parser_input {
+       size_t length;
+       char *file;
+       unsigned lines;
+       char buffer[1];
 };
 
 struct psi_parser *psi_parser_init(struct psi_parser *P, psi_error_cb error, unsigned flags);
-bool psi_parser_open_file(struct psi_parser *P, const char *filename);
-bool psi_parser_open_string(struct psi_parser *P, const char *string, size_t length);
-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 *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);
 void psi_parser_dtor(struct psi_parser *P);
 void psi_parser_free(struct psi_parser **P);
 
+
 #endif