Merge pull request #418 from wasmx/clion

Suggestions made by CLion's analyzer

lib/fizzy/parser.cpp

@@ -100,8 +100,7 @@ inline parser_result<FuncType> parse(const uint8_t* pos, const uint8_t* end)
     return {result, pos};
 }
 
-inline std::tuple<GlobalType, const uint8_t*> parse_global_type(
-    const uint8_t* pos, const uint8_t* end)
+inline parser_result<GlobalType> parse_global_type(const uint8_t* pos, const uint8_t* end)
 {
     GlobalType type;
     std::tie(type.value_type, pos) = parse<ValType>(pos, end);

lib/fizzy/parser.hpp

@@ -7,15 +7,14 @@
 #include "exceptions.hpp"
 #include "leb128.hpp"
 #include "module.hpp"
-#include <tuple>
 
 namespace fizzy
 {
 constexpr uint8_t wasm_prefix_data[]{0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00};
 constexpr bytes_view wasm_prefix{wasm_prefix_data, sizeof(wasm_prefix_data)};
 
 template <typename T>
-using parser_result = std::tuple<T, const uint8_t*>;
+using parser_result = std::pair<T, const uint8_t*>;
 
 Module parse(bytes_view input);
 

lib/fizzy/parser_expr.cpp

@@ -156,8 +156,7 @@ inline void validate_branch_stack_height(
 }
 
 
-void push_branch_immediates(
-    const ControlFrame& branch_frame, int stack_height, bytes& immediates) noexcept
+void push_branch_immediates(const ControlFrame& branch_frame, int stack_height, bytes& immediates)
 {
     const auto arity = get_branch_arity(branch_frame);
 

lib/fizzy/span.hpp

@@ -53,7 +53,7 @@ class span
     constexpr T& operator[](std::size_t index) const noexcept { return m_begin[index]; }
 
     constexpr T* data() const noexcept { return m_begin; }
-    [[nodiscard]] constexpr std::size_t size() const noexcept { return m_size; }
+    constexpr std::size_t size() const noexcept { return m_size; }
 
     constexpr iterator begin() const noexcept { return m_begin; }
     constexpr iterator end() const noexcept { return m_begin + m_size; }

lib/fizzy/stack.hpp

@@ -98,19 +98,19 @@ class OperandStack
     OperandStack& operator=(const OperandStack&) = delete;
 
     /// The current number of items on the stack (aka stack height).
-    [[nodiscard]] size_t size() noexcept { return static_cast<size_t>(m_top + 1 - bottom()); }
+    size_t size() noexcept { return static_cast<size_t>(m_top + 1 - bottom()); }
 
     /// Returns the reference to the top item.
     /// Requires non-empty stack.
-    [[nodiscard]] auto& top() noexcept
+    auto& top() noexcept
     {
         assert(size() != 0);
         return *m_top;
     }
 
     /// Returns the reference to the stack item on given position from the stack top.
     /// Requires index < size().
-    [[nodiscard]] auto& operator[](size_t index) noexcept
+    auto& operator[](size_t index) noexcept
     {
         assert(index < size());
         return *(m_top - index);
@@ -146,9 +146,9 @@ class OperandStack
     }
 
     /// Returns iterator to the bottom of the stack.
-    [[nodiscard]] const uint64_t* rbegin() const noexcept { return bottom(); }
+    const uint64_t* rbegin() const noexcept { return bottom(); }
 
     /// Returns end iterator counting from the bottom of the stack.
-    [[nodiscard]] const uint64_t* rend() const noexcept { return m_top + 1; }
+    const uint64_t* rend() const noexcept { return m_top + 1; }
 };
 }  // namespace fizzy