From 8d466ead300782fbdf704b86b7a2d9a7d2e36591 Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Fri, 11 Oct 2024 21:08:51 +0300 Subject: [PATCH] build: tune compiler warnings (cherry picked from commit 7715001692ba2955d762028e919c6a9ba59765f8) --- lib/CMakeLists.txt | 6 ++++-- lib/src/parser.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d6e758b0..a505ef48 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -21,8 +21,10 @@ add_library(tree-sitter ${TS_SOURCE_FILES}) target_include_directories(tree-sitter PRIVATE src src/wasm include) -if(NOT MSVC) - target_compile_options(tree-sitter PRIVATE -Wall -Wextra -Wshadow -Wno-unused-parameter -pedantic) +if(MSVC) + target_compile_options(tree-sitter PRIVATE /W4 /wd4018 /wd4701 /wd4702 /wd4100 /wd4232 /wd4244) +else() + target_compile_options(tree-sitter PRIVATE -Wall -Wextra -Wshadow -pedantic) endif() if(TREE_SITTER_FEATURE_WASM) diff --git a/lib/src/parser.c b/lib/src/parser.c index d38ace38..5fccc2ec 100644 --- a/lib/src/parser.c +++ b/lib/src/parser.c @@ -350,7 +350,7 @@ static bool ts_parser__call_main_lex_fn(TSParser *self, TSLexMode lex_mode) { } } -static bool ts_parser__call_keyword_lex_fn(TSParser *self, TSLexMode lex_mode) { +static bool ts_parser__call_keyword_lex_fn(TSParser *self) { if (ts_language_is_wasm(self->language)) { return ts_wasm_store_call_lex_keyword(self->wasm_store, 0); } else { @@ -651,7 +651,7 @@ static Subtree ts_parser__lex( ts_lexer_reset(&self->lexer, self->lexer.token_start_position); ts_lexer_start(&self->lexer); - is_keyword = ts_parser__call_keyword_lex_fn(self, lex_mode); + is_keyword = ts_parser__call_keyword_lex_fn(self); if ( is_keyword &&