clean

Author: andiwand

src/odr/internal/common/table_cursor.cpp

@@ -7,12 +7,12 @@ namespace odr::internal {
 TableCursor::TableCursor() noexcept { m_sparse.emplace_back(); }
 
 void TableCursor::add_column(const uint32_t repeat) noexcept {
-  m_col += repeat;
+  m_column += repeat;
 }
 
 void TableCursor::add_row(const std::uint32_t repeat) noexcept {
   m_row += repeat;
-  m_col = 0;
+  m_column = 0;
   if (repeat > 1) {
     // TODO assert trivial
     m_sparse.clear();
@@ -28,7 +28,7 @@ void TableCursor::add_row(const std::uint32_t repeat) noexcept {
 void TableCursor::add_cell(const std::uint32_t colspan,
                            const std::uint32_t rowspan,
                            const std::uint32_t repeat) noexcept {
-  const auto new_next_cols = m_col + colspan * repeat;
+  const std::uint32_t next_column = m_column + colspan * repeat;
 
   // handle rowspan
   auto it = std::begin(m_sparse);
@@ -37,24 +37,26 @@ void TableCursor::add_cell(const std::uint32_t colspan,
       m_sparse.emplace_back();
     }
     ++it;
-    it->emplace_back(Range{m_col, new_next_cols});
+    it->emplace_back(Range{m_column, next_column});
   }
 
-  m_col = new_next_cols;
+  m_column = next_column;
   handle_rowspan_();
 }
 
-TablePosition TableCursor::position() const noexcept { return {m_col, m_row}; }
+TablePosition TableCursor::position() const noexcept {
+  return {m_column, m_row};
+}
 
-std::uint32_t TableCursor::column() const noexcept { return m_col; }
+std::uint32_t TableCursor::column() const noexcept { return m_column; }
 
 std::uint32_t TableCursor::row() const noexcept { return m_row; }
 
 void TableCursor::handle_rowspan_() noexcept {
   auto &s = m_sparse.front();
   auto it = std::begin(s);
-  while (it != std::end(s) && m_col == it->start) {
-    m_col = it->end;
+  while (it != std::end(s) && m_column == it->start) {
+    m_column = it->end;
     ++it;
   }
   s.erase(std::begin(s), it);

src/odr/internal/common/table_cursor.hpp

@@ -22,11 +22,11 @@ class TableCursor final {
 
 private:
   struct Range {
-    std::uint32_t start;
-    std::uint32_t end;
+    std::uint32_t start{0};
+    std::uint32_t end{0};
   };
 
-  std::uint32_t m_col{0};
+  std::uint32_t m_column{0};
   std::uint32_t m_row{0};
   std::list<std::list<Range>> m_sparse;
 

src/odr/internal/common/table_range.hpp

@@ -2,7 +2,6 @@
 
 #include <odr/table_position.hpp>
 
-#include <cstdint>
 #include <string>
 
 namespace odr::internal {

src/odr/table_dimension.cpp

@@ -2,10 +2,10 @@
 
 namespace odr {
 
-TableDimensions::TableDimensions() = default;
+TableDimensions::TableDimensions() noexcept = default;
 
 TableDimensions::TableDimensions(const std::uint32_t rows,
-                                 const std::uint32_t columns)
+                                 const std::uint32_t columns) noexcept
     : rows{rows}, columns{columns} {}
 
 } // namespace odr

src/odr/table_dimension.hpp

@@ -9,8 +9,8 @@ struct TableDimensions {
   std::uint32_t rows{0};
   std::uint32_t columns{0};
 
-  TableDimensions();
-  TableDimensions(std::uint32_t rows, std::uint32_t columns);
+  TableDimensions() noexcept;
+  TableDimensions(std::uint32_t rows, std::uint32_t columns) noexcept;
 };
 
 } // namespace odr