From 4a007259fc92227df4821c07463421f00428c51a Mon Sep 17 00:00:00 2001 From: Andrew Hlynskyi Date: Wed, 9 Aug 2023 01:53:08 +0300 Subject: [PATCH] Fix warning from #2454 in more clear way --- cli/src/generate/render.rs | 1 - lib/include/tree_sitter/parser.h | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cli/src/generate/render.rs b/cli/src/generate/render.rs index f7e6c18e..3a7130aa 100644 --- a/cli/src/generate/render.rs +++ b/cli/src/generate/render.rs @@ -764,7 +764,6 @@ 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 17b4fde9..d2103259 100644 --- a/lib/include/tree_sitter/parser.h +++ b/lib/include/tree_sitter/parser.h @@ -129,16 +129,9 @@ 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; \ @@ -146,7 +139,8 @@ struct TSLanguage { lexer->advance(lexer, skip); \ start: \ skip = false; \ - lookahead = lexer->lookahead; + lookahead = lexer->lookahead; \ + eof = lexer->eof(lexer); #define ADVANCE(state_value) \ { \