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 2e02db6..0675e55 100644 (file)
--- a/src/xkbcomp/parser-priv.h
+++ b/src/xkbcomp/parser-priv.h
@@ -27,21 +27,18 @@
 #ifndef XKBCOMP_PARSER_PRIV_H
 #define XKBCOMP_PARSER_PRIV_H
 
-struct scanner_extra;
 struct parser_param;
 
-#pragma GCC diagnostic ignored "-Wredundant-decls"
-#pragma GCC diagnostic push
+#include "scanner-utils.h"
 #include "parser.h"
-#pragma GCC diagnostic pop
-
-void
-scanner_error(YYLTYPE *loc, void *scanner, const char *msg);
 
 int
-_xkbcommon_lex(YYSTYPE *val, YYLTYPE *loc, void *scanner);
+_xkbcommon_lex(YYSTYPE *yylval, struct scanner *scanner);
 
 XkbFile *
-parse(struct xkb_context *ctx, void *scanner, const char *map);
+parse(struct xkb_context *ctx, struct scanner *scanner, const char *map);
+
+int
+keyword_to_token(const char *string, unsigned int len);
 
 #endif