From d56b51a11d720fac15bb046800b501d476e8ab16 Mon Sep 17 00:00:00 2001 From: Andrew Hlynskyi Date: Wed, 29 Nov 2023 11:20:05 +0200 Subject: [PATCH] Revert "Alt #2454" --- cli/src/generate/render.rs | 1 + lib/include/tree_sitter/parser.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cli/src/generate/render.rs b/cli/src/generate/render.rs index 69fa3c48..2d0197e6 100644 --- a/cli/src/generate/render.rs +++ b/cli/src/generate/render.rs @@ -766,6 +766,7 @@ impl Generator { indent!(self); add_line!(self, "START_LEXER();"); + add_line!(self, "eof = lexer->eof(lexer);"); add_line!(self, "switch (state) {{"); indent!(self); diff --git a/lib/include/tree_sitter/parser.h b/lib/include/tree_sitter/parser.h index d2103259..17b4fde9 100644 --- a/lib/include/tree_sitter/parser.h +++ b/lib/include/tree_sitter/parser.h @@ -129,9 +129,16 @@ struct TSLanguage { * Lexer Macros */ +#ifdef _MSC_VER +#define UNUSED __pragma(warning(suppress : 4101)) +#else +#define UNUSED __attribute__((unused)) +#endif + #define START_LEXER() \ bool result = false; \ bool skip = false; \ + UNUSED \ bool eof = false; \ int32_t lookahead; \ goto start; \ @@ -139,8 +146,7 @@ struct TSLanguage { lexer->advance(lexer, skip); \ start: \ skip = false; \ - lookahead = lexer->lookahead; \ - eof = lexer->eof(lexer); + lookahead = lexer->lookahead; #define ADVANCE(state_value) \ { \