scanner: sort out scanner logging functions

[platform/upstream/libxkbcommon.git] / src / xkbcomp / parser-priv.h

diff --git a/src/xkbcomp/parser-priv.h b/src/xkbcomp/parser-priv.h
index 17db6ed..0675e55 100644 (file)
--- a/src/xkbcomp/parser-priv.h
+++ b/src/xkbcomp/parser-priv.h
@@ -27,22 +27,18 @@
 #ifndef XKBCOMP_PARSER_PRIV_H
 #define XKBCOMP_PARSER_PRIV_H
 
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-
-struct scanner_extra;
-
-struct parser_param {
-    struct xkb_context *ctx;
-    void *scanner;
-    XkbFile *rtrn;
-};
+struct parser_param;
 
+#include "scanner-utils.h"
 #include "parser.h"
 
-void
-scanner_error(YYLTYPE *loc, void *scanner, const char *msg);
+int
+_xkbcommon_lex(YYSTYPE *yylval, struct scanner *scanner);
+
+XkbFile *
+parse(struct xkb_context *ctx, struct scanner *scanner, const char *map);
 
 int
-yylex(YYSTYPE *val, YYLTYPE *loc, void *scanner);
+keyword_to_token(const char *string, unsigned int len);
 
 #endif