csv2::Reader::rows(): Add argument determining whether to ignore empty lines.

Author: AmirInt

include/csv2/reader.hpp

@@ -273,22 +273,25 @@ class Reader {
   /**
    * @returns The number of rows (excluding the header)
   */
-  size_t rows() const {
+  size_t rows(bool ignore_empty_lines = false) const {
     size_t result{0};
     if (!buffer_ || buffer_size_ == 0)
       return result;
 
     // Count the first row if not header
     if (not first_row_is_header::value
-        and *(static_cast<const char*>(buffer_)) != '\r')
+        and (not ignore_empty_lines
+        or *(static_cast<const char*>(buffer_)) != '\r'))
       ++result;
 
     for (const char *p = buffer_
         ; (p = static_cast<const char *>(memchr(p, '\n', (buffer_ + buffer_size_) - p)))
         ; ++p) {
-      if (p < buffer_ + buffer_size_ - 1
-          and *(p + 1) != '\r')
-        ++result;
+      if (ignore_empty_lines
+          and (p >= buffer_ + buffer_size_ - 1
+          or *(p + 1) == '\r'))
+        continue;
+      ++result;
     }
     return result;
   }

single_include/csv2/csv2.hpp

@@ -1904,22 +1904,25 @@ class Reader {
   /**
    * @returns The number of rows (excluding the header)
   */
-  size_t rows() const {
+  size_t rows(bool ignore_empty_lines = false) const {
     size_t result{0};
     if (!buffer_ || buffer_size_ == 0)
       return result;
 
     // Count the first row if not header
     if (not first_row_is_header::value
-        and *(static_cast<const char*>(buffer_)) != '\r')
+        and (not ignore_empty_lines
+        or *(static_cast<const char*>(buffer_)) != '\r'))
       ++result;
 
     for (const char *p = buffer_
         ; (p = static_cast<const char *>(memchr(p, '\n', (buffer_ + buffer_size_) - p)))
         ; ++p) {
-      if (p < buffer_ + buffer_size_ - 1
-          and *(p + 1) != '\r')
-        ++result;
+      if (ignore_empty_lines
+          and (p >= buffer_ + buffer_size_ - 1
+          or *(p + 1) == '\r'))
+        continue;
+      ++result;
     }
     return result;
   }