From 8ae875a3e10c5b35e4cb3d67b2789a4a7f5df1e5 Mon Sep 17 00:00:00 2001 From: mmd-osm Date: Sun, 30 Jun 2024 23:41:16 +0200 Subject: [PATCH] sjparser: linter fixes --- .../library/sjparser/internals/dispatcher.cpp | 2 +- .../library/sjparser/internals/dispatcher.h | 2 +- .../sjparser/internals/key_value_parser.h | 6 ++--- .../library/sjparser/internals/token_parser.h | 12 +++++----- .../library/sjparser/s_custom_object.h | 2 +- .../sjparser/library/sjparser/yajl_parser.cpp | 24 +++++++++---------- .../sjparser/library/sjparser/yajl_parser.h | 4 ++-- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/contrib/sjparser/library/sjparser/internals/dispatcher.cpp b/contrib/sjparser/library/sjparser/internals/dispatcher.cpp index 8ab72c5e..c10358c5 100644 --- a/contrib/sjparser/library/sjparser/internals/dispatcher.cpp +++ b/contrib/sjparser/library/sjparser/internals/dispatcher.cpp @@ -47,7 +47,7 @@ void Dispatcher::popParser() { } } -bool Dispatcher::emptyParsersStack() { +bool Dispatcher::emptyParsersStack() const { return _parsers.empty(); } diff --git a/contrib/sjparser/library/sjparser/internals/dispatcher.h b/contrib/sjparser/library/sjparser/internals/dispatcher.h index 451b00fd..c602ed4d 100644 --- a/contrib/sjparser/library/sjparser/internals/dispatcher.h +++ b/contrib/sjparser/library/sjparser/internals/dispatcher.h @@ -36,7 +36,7 @@ class Dispatcher { explicit Dispatcher(TokenParser *parser); void pushParser(TokenParser *parser); void popParser(); - [[nodiscard]] bool emptyParsersStack(); + [[nodiscard]] bool emptyParsersStack() const; void reset(); template void on(TokenT value); diff --git a/contrib/sjparser/library/sjparser/internals/key_value_parser.h b/contrib/sjparser/library/sjparser/internals/key_value_parser.h index 36087148..d17b7e80 100644 --- a/contrib/sjparser/library/sjparser/internals/key_value_parser.h +++ b/contrib/sjparser/library/sjparser/internals/key_value_parser.h @@ -93,7 +93,7 @@ class KeyValueParser : public TokenParser { MemberParser(MemberParser &&other) noexcept = default; MemberParser &operator=(MemberParser &&other) noexcept = default; - MemberParser(Member &xs) + explicit MemberParser(Member &xs) : parser(std::forward(xs.parser)), name(std::move(xs.name)), optional(xs.optional), @@ -129,7 +129,7 @@ class KeyValueParser : public TokenParser { void registerParser(ParserT &parser, NameT &name, ParsersMapType &parsers_map); - void check_duplicate(bool inserted, NameT &name); + void check_duplicate(bool inserted, NameT &name) const; [[nodiscard]] auto to_member_parser_tuple( std::tuple...> &members) { @@ -310,7 +310,7 @@ void KeyValueParser::MemberParsers::registerParser( template void KeyValueParser::MemberParsers::check_duplicate( - bool inserted, NameT &name) { + bool inserted, NameT &name) const { if (!inserted) { std::stringstream error; error << "Member " << name << " appears more than once"; diff --git a/contrib/sjparser/library/sjparser/internals/token_parser.h b/contrib/sjparser/library/sjparser/internals/token_parser.h index 8a14c4ea..ad5c15a6 100644 --- a/contrib/sjparser/library/sjparser/internals/token_parser.h +++ b/contrib/sjparser/library/sjparser/internals/token_parser.h @@ -69,8 +69,8 @@ class Dispatcher; class TokenParser { public: virtual void setDispatcher(Dispatcher *dispatcher) noexcept; - [[nodiscard]] inline bool isSet() const noexcept; - [[nodiscard]] inline bool isEmpty() const noexcept; + [[nodiscard]] bool isSet() const noexcept; + [[nodiscard]] bool isEmpty() const noexcept; virtual void reset(); void endParsing(); virtual void finish() = 0; @@ -100,7 +100,7 @@ class TokenParser { protected: inline void checkSet() const; inline void unset() noexcept; - static inline void unexpectedToken(const std::string &type); + [[noreturn]] static inline void unexpectedToken(const std::string &type); inline void setNotEmpty() noexcept; [[nodiscard]] inline Dispatcher *dispatcher() noexcept; @@ -112,11 +112,11 @@ class TokenParser { /****************************** Implementations *******************************/ -bool TokenParser::isSet() const noexcept { +inline bool TokenParser::isSet() const noexcept { return _set; } -bool TokenParser::isEmpty() const noexcept { +inline bool TokenParser::isEmpty() const noexcept { return _empty; } @@ -130,7 +130,7 @@ void TokenParser::unset() noexcept { _set = false; } -void TokenParser::unexpectedToken(const std::string &type) { +[[noreturn]] void TokenParser::unexpectedToken(const std::string &type) { throw std::runtime_error("Unexpected token " + type); } diff --git a/contrib/sjparser/library/sjparser/s_custom_object.h b/contrib/sjparser/library/sjparser/s_custom_object.h index 5b827b9a..4bc32dc1 100644 --- a/contrib/sjparser/library/sjparser/s_custom_object.h +++ b/contrib/sjparser/library/sjparser/s_custom_object.h @@ -235,7 +235,7 @@ void SCustomObject::finish() { try { typename Object::template MemberChecker<0, ParserTs...>(*this); - } catch (std::exception &e) { + } catch (std::exception &) { TokenParser::unset(); throw; } diff --git a/contrib/sjparser/library/sjparser/yajl_parser.cpp b/contrib/sjparser/library/sjparser/yajl_parser.cpp index d29cba01..c94c4e0c 100644 --- a/contrib/sjparser/library/sjparser/yajl_parser.cpp +++ b/contrib/sjparser/library/sjparser/yajl_parser.cpp @@ -74,7 +74,7 @@ void YajlParser::finish() { } } -void YajlParser::checkDispatcherStack() { +void YajlParser::checkDispatcherStack() const { if (_dispatcher->emptyParsersStack()) { return; } @@ -82,7 +82,7 @@ void YajlParser::checkDispatcherStack() { throw ParsingError("Dispatcher parsers stack is not empty in the end"); } -void YajlParser::throwParsingError() { +[[noreturn]] void YajlParser::throwParsingError() { std::string yajl_error; if (auto *yajl_error_ptr = yajl_get_error(_yajl_handle.get(), 1, _data, _len); @@ -105,47 +105,47 @@ void YajlParser::throwParsingError() { } int YajlParser::yajlOnNull(void *ctx) { - return reinterpret_cast(ctx)->on(NullT{}); + return static_cast(ctx)->on(NullT{}); } int YajlParser::yajlOnBool(void *ctx, int value) { - return reinterpret_cast(ctx)->on(static_cast(value)); + return static_cast(ctx)->on(static_cast(value)); } // Disable google-runtime-int long long -> int64_t int YajlParser::yajlOnInt(void *ctx, long long value) { // NOLINT - return reinterpret_cast(ctx)->on(static_cast(value)); + return static_cast(ctx)->on(static_cast(value)); } int YajlParser::yajlOnDouble(void *ctx, double value) { - return reinterpret_cast(ctx)->on(value); + return static_cast(ctx)->on(value); } int YajlParser::yajlOnString(void *ctx, const unsigned char *value, size_t len) { - return reinterpret_cast(ctx)->on( + return static_cast(ctx)->on( std::string_view(reinterpret_cast(value), len)); } int YajlParser::yajlOnMapStart(void *ctx) { - return reinterpret_cast(ctx)->on(MapStartT{}); + return static_cast(ctx)->on(MapStartT{}); } int YajlParser::yajlOnMapKey(void *ctx, const unsigned char *value, size_t len) { - return reinterpret_cast(ctx)->on( + return static_cast(ctx)->on( MapKeyT{std::string_view(reinterpret_cast(value), len)}); } int YajlParser::yajlOnMapEnd(void *ctx) { - return reinterpret_cast(ctx)->on(MapEndT{}); + return static_cast(ctx)->on(MapEndT{}); } int YajlParser::yajlOnArrayStart(void *ctx) { - return reinterpret_cast(ctx)->on(ArrayStartT{}); + return static_cast(ctx)->on(ArrayStartT{}); } int YajlParser::yajlOnArrayEnd(void *ctx) { - return reinterpret_cast(ctx)->on(ArrayEndT{}); + return static_cast(ctx)->on(ArrayEndT{}); } } // namespace SJParser diff --git a/contrib/sjparser/library/sjparser/yajl_parser.h b/contrib/sjparser/library/sjparser/yajl_parser.h index 08f6a0c3..78793bdc 100644 --- a/contrib/sjparser/library/sjparser/yajl_parser.h +++ b/contrib/sjparser/library/sjparser/yajl_parser.h @@ -111,8 +111,8 @@ class YajlParser { private: void resetYajlHandle(); void freeYajlHandle(); - void checkDispatcherStack(); - void throwParsingError(); + void checkDispatcherStack() const; + [[noreturn]] void throwParsingError(); template int on(TokenT token) noexcept;