sjparser: linter fixes

zerebubuth · Jul 6, 2024 · 8ae875a · 8ae875a
1 parent dd5abb9
commit 8ae875a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git 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
@@ -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 <typename TokenT> 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
@@ -93,7 +93,7 @@ class KeyValueParser : public TokenParser {
     MemberParser(MemberParser &&other) noexcept = default;
     MemberParser &operator=(MemberParser &&other) noexcept = default;
 
-    MemberParser(Member<NameT, ParserT> &xs)
+    explicit MemberParser(Member<NameT, ParserT> &xs)
         : parser(std::forward<ParserT>(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<Member<NameT, ParserTs>...> &members) {
@@ -310,7 +310,7 @@ void KeyValueParser<NameT, ParserTs...>::MemberParsers::registerParser(
 
 template <typename NameT, typename... ParserTs>
 void KeyValueParser<NameT, ParserTs...>::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
@@ -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
@@ -235,7 +235,7 @@ void SCustomObject<TypeT, ParserTs...>::finish() {
 
   try {
     typename Object<ParserTs...>::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
@@ -74,15 +74,15 @@ void YajlParser::finish() {
   }
 }
 
-void YajlParser::checkDispatcherStack() {
+void YajlParser::checkDispatcherStack() const {
   if (_dispatcher->emptyParsersStack()) {
     return;
   }
 
   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<YajlParser *>(ctx)->on(NullT{});
+  return static_cast<YajlParser *>(ctx)->on(NullT{});
 }
 
 int YajlParser::yajlOnBool(void *ctx, int value) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(static_cast<bool>(value));
+  return static_cast<YajlParser *>(ctx)->on(static_cast<bool>(value));
 }
 
 // Disable google-runtime-int long long -> int64_t
 int YajlParser::yajlOnInt(void *ctx, long long value) {  // NOLINT
-  return reinterpret_cast<YajlParser *>(ctx)->on(static_cast<int64_t>(value));
+  return static_cast<YajlParser *>(ctx)->on(static_cast<int64_t>(value));
 }
 
 int YajlParser::yajlOnDouble(void *ctx, double value) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(value);
+  return static_cast<YajlParser *>(ctx)->on(value);
 }
 
 int YajlParser::yajlOnString(void *ctx, const unsigned char *value,
                              size_t len) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(
+  return static_cast<YajlParser *>(ctx)->on(
       std::string_view(reinterpret_cast<const char *>(value), len));
 }
 
 int YajlParser::yajlOnMapStart(void *ctx) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(MapStartT{});
+  return static_cast<YajlParser *>(ctx)->on(MapStartT{});
 }
 
 int YajlParser::yajlOnMapKey(void *ctx, const unsigned char *value,
                              size_t len) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(
+  return static_cast<YajlParser *>(ctx)->on(
       MapKeyT{std::string_view(reinterpret_cast<const char *>(value), len)});
 }
 
 int YajlParser::yajlOnMapEnd(void *ctx) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(MapEndT{});
+  return static_cast<YajlParser *>(ctx)->on(MapEndT{});
 }
 
 int YajlParser::yajlOnArrayStart(void *ctx) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(ArrayStartT{});
+  return static_cast<YajlParser *>(ctx)->on(ArrayStartT{});
 }
 
 int YajlParser::yajlOnArrayEnd(void *ctx) {
-  return reinterpret_cast<YajlParser *>(ctx)->on(ArrayEndT{});
+  return static_cast<YajlParser *>(ctx)->on(ArrayEndT{});
 }
 }  // namespace SJParser
diff --git 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 <typename TokenT> int on(TokenT token) noexcept;
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ void Dispatcher::popParser() { @@
       }
     }
-    bool Dispatcher::emptyParsersStack() {
+    bool Dispatcher::emptyParsersStack() const {
       return _parsers.empty();
     }
@@ Expand Down @@