Fix msvc build

Feature/coverage ci

.github/workflows/coverage.yml

@@ -0,0 +1,71 @@
+name: coverage-ci
+
+on:
+  workflow_dispatch:
+
+  push:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+  pull_request:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+jobs:
+  test_coverage:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+
+    runs-on: ubuntu-latest
+
+    name: "Coverage"
+
+    container:
+      image: gcc:latest
+      options: -v /usr/local:/host_usr_local
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: friendlyanon/fetch-core-count@v1
+        id: cores
+
+      - name: CMake
+        run: echo "/host_usr_local/bin" >> $GITHUB_PATH
+
+      - name: Install dependencies
+        run: script/ci_install_deps.sh
+
+      - name: Install test coverage tools
+        run: |
+          apt update
+          apt install -y gcovr lcov
+
+      - name: Configure
+        run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug -D CMAKE_CXX_FLAGS="-Wall -fprofile-arcs -ftest-coverage --coverage"
+
+      - name: Build
+        run: cmake --build build -j ${{steps.cores.outputs.count}}
+
+      - name: Run
+        working-directory: build
+        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}
+
+      - name: Generate coverage report
+        run: |
+          lcov -d . -c -o out.info --rc lcov_branch_coverage=1 --no-external
+          lcov -e out.info '*include/ss*hpp' -o filtered.info
+
+      - name: Invoke coveralls
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          file: filtered.info
+          format: lcov

.github/workflows/single-header.yml

@@ -0,0 +1,51 @@
+name: single-header-ci
+
+on:
+  workflow_dispatch:
+
+  push:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+  pull_request:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+jobs:
+  single_header_tests:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+
+    runs-on: ubuntu-latest
+
+    name: "Single Header Test"
+
+    container:
+      image: gcc:latest
+      options: -v /usr/local:/host_usr_local
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - uses: friendlyanon/fetch-core-count@v1
+        id: cores
+
+      - name: Install dependencies
+        run: |
+          apt-get update
+          apt-get install -y git
+
+      - name: Single header update check
+        run: |
+          script/single_header_generator.py > tmp.hpp
+          diff ssp.hpp tmp.hpp
+
+      - name: Single header compile check
+        run: ./test/test_single_header.sh

.github/workflows/ubuntu-latest-clang.yml

@@ -1,6 +1,8 @@
 name: ubuntu-latest-clang-ci
 
 on:
+  workflow_dispatch:
+
   push:
     branches:
       - master
@@ -23,20 +25,22 @@ jobs:
 
     strategy:
       matrix:
-        version: [11, 10, 9, 8, 7]
+        # cmake clang12 is not able to compile a simple test program.
+        # /usr/bin/ld: cannot find -lunwind
+        version: ['latest', '15', '14', '13', '11', '10', '9', '8', '7']
+        type: [Release, Debug]
 
     runs-on: ubuntu-latest
 
-    name: Clang ${{ matrix.version }}
+    name: "Clang ${{matrix.version}}: ${{matrix.type}}"
 
     container:
-      image: teeks99/clang-ubuntu:${{ matrix.version }}
+      image: silkeh/clang:${{matrix.version}}
-
       options: -v /usr/local:/host_usr_local
 
     env:
-      CC: clang-${{ matrix.version }}
+      CC: clang
-      CXX: clang++-${{ matrix.version }}
+      CXX: clang++
       CXXFLAGS: -stdlib=libc++
 
     steps:
@@ -55,11 +59,11 @@ jobs:
           script/ci_install_deps.sh
 
       - name: Configure
-        run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
+        run: cmake -S test -B build -DCMAKE_BUILD_TYPE=${{matrix.type}}
 
       - name: Build
-        run: cmake --build build -j ${{ steps.cores.outputs.count }}
+        run: cmake --build build -j ${{steps.cores.outputs.count}}
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
+        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}

.github/workflows/ubuntu-latest-gcc.yml

@@ -1,6 +1,8 @@
 name: ubuntu-latest-gcc-ci
 
 on:
+  workflow_dispatch:
+
   push:
     branches:
       - master
@@ -23,15 +25,15 @@ jobs:
 
     strategy:
       matrix:
-        version: [10, 9, 8]
+        version: ['latest', '12', '11', '10', '9', '8']
+        type: [Release, Debug]
 
     runs-on: ubuntu-latest
 
-    name: GCC ${{ matrix.version }}
+    name: "GCC ${{matrix.version}}: ${{matrix.type}}"
 
     container:
-      image: gcc:${{ matrix.version }}
+      image: gcc:${{matrix.version}}
-
       options: -v /usr/local:/host_usr_local
 
     steps:
@@ -47,11 +49,11 @@ jobs:
         run: script/ci_install_deps.sh
 
       - name: Configure
-        run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
+        run: cmake -S test -B build -D CMAKE_BUILD_TYPE=${{matrix.type}}
 
       - name: Build
-        run: cmake --build build -j ${{ steps.cores.outputs.count }}
+        run: cmake --build build -j ${{steps.cores.outputs.count}}
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
+        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}

.github/workflows/ubuntu-latest-icc.yml

@@ -1,6 +1,8 @@
 name: ubuntu-latest-icc-ci
 
 on:
+  workflow_dispatch:
+
   push:
     branches:
       - master
@@ -17,7 +19,7 @@ on:
 
 env:
   LINUX_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17431/l_BaseKit_p_2021.1.0.2659_offline.sh
-  LINUX_HPCKIT_URL: 
+  LINUX_HPCKIT_URL:
     https://registrationcenter-download.intel.com/akdlm/irc_nas/17427/l_HPCKit_p_2021.1.0.2684_offline.sh
 
 jobs:
@@ -27,6 +29,7 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
 
     runs-on: ubuntu-latest
+
     defaults:
       run:
         shell: bash
@@ -36,38 +39,39 @@ jobs:
       options: -v /usr/local:/host_usr_local
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: cache install
+      - name: cache install
-      id: cache-install
+        id: cache-install
-      uses: actions/cache@v2
+        uses: actions/cache@v2
-      with:
+        with:
-        path: |
+          path: |
-          /opt/intel/oneapi/compiler
+            /opt/intel/oneapi/compiler
-        key: >-
+          key: >-
-          install-${{ env.LINUX_HPCKIT_URL }}-
+            install-${{env.LINUX_HPCKIT_URL}}-
-          ${{ env.LINUX_CPP_COMPONENTS_WEB }}-
+            ${{env.LINUX_CPP_COMPONENTS_WEB}}-
-          compiler-${{ hashFiles('**/scripts/cache_exclude_linux.sh') }}
+            compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}}
 
-    - name: Install icc
+      - name: Install icc
-      run: script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
+        run: >-
+          script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
 
-    - name: CMake
+      - name: CMake
-      run: echo "/host_usr_local/bin" >> $GITHUB_PATH
+        run: echo "/host_usr_local/bin" >> $GITHUB_PATH
 
-    - name: Install dependencies
+      - name: Install dependencies
-      run: script/ci_install_deps.sh
+        run: script/ci_install_deps.sh
 
-    - name: Configure
+      - name: Configure
-      run: >-
+        run: >-
-        source script/ci_setup_icc.sh &&
+          source script/ci_setup_icc.sh &&
-        cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
+          cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
 
-    - name: Build
+      - name: Build
-      run: >-
+        run: >-
-        source script/ci_setup_icc.sh &&
+          source script/ci_setup_icc.sh &&
-        cmake --build build -j ${{ steps.cores.outputs.count }}
+          cmake --build build -j ${{steps.cores.outputs.count}}
 
-    - name: Run
+      - name: Run
-      working-directory: build
+        working-directory: build
-      run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
+        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}

.github/workflows/win-msvc.yml

@@ -1,6 +1,8 @@
 name: win-msvc-ci
 
 on:
+  workflow_dispatch:
+
   push:
     branches:
       - master
@@ -25,8 +27,6 @@ jobs:
       run:
         shell: bash
 
-    runs-on: ${{ matrix.config.os }}
-
     strategy:
       fail-fast: false
       matrix:
@@ -40,7 +40,9 @@ jobs:
         build: [Debug, Release]
         platform: [Win32, x64]
 
-    name: "${{matrix.config.vs}}:${{matrix.platform}}:${{matrix.build}}"
+    runs-on: ${{matrix.config.os}}
+
+    name: "${{matrix.config.vs}}: ${{matrix.platform}}: ${{matrix.build}}"
 
     steps:
       - name: checkout

.github/workflows/win-msys2-clang.yml

@@ -1,6 +1,8 @@
 name: win-msys2-clang-ci
 
 on:
+  workflow_dispatch:
+
   push:
     branches:
       - master
@@ -21,57 +23,54 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
 
-    name: ${{ matrix.msystem }}
-    runs-on: windows-latest
     defaults:
       run:
         shell: msys2 {0}
+
     strategy:
       fail-fast: false
+
       matrix:
-        include:
+        os: [windows-2019, windows-latest]
+        type: [Release, Debug]
+        config:
           - msystem: "MINGW64"
             install: >-
-              git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja 
+              git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
               mingw-w64-x86_64-clang
-            type: Release
+
           - msystem: "MINGW32"
             install: >-
-              git mingw-w64-i686-cmake mingw-w64-i686-ninja 
+              git mingw-w64-i686-cmake mingw-w64-i686-ninja
               mingw-w64-i686-clang
-            type: Release
+
-          - msystem: "MINGW64"
+    runs-on: ${{matrix.os}}
-            install: >- 
+
-              git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja 
+    name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
-              mingw-w64-x86_64-clang
+
-            type: Debug
-          - msystem: "MINGW32"
-            install: >-
-              git mingw-w64-i686-cmake mingw-w64-i686-ninja 
-              mingw-w64-i686-clang
-            type: Debug
     env:
       CMAKE_GENERATOR: Ninja
 
     steps:
       - uses: actions/checkout@v2
+
       - uses: msys2/setup-msys2@v2
         with:
           update: true
-          msystem: ${{ matrix.msystem }}
+          msystem: ${{matrix.config.msystem}}
-          install: ${{ matrix.install }}
+          install: ${{matrix.config.install}}
 
       - name: Install dependencies
         run: script/ci_install_deps.sh
 
       - name: Configure
-        run: >- 
+        run: >-
-          cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build 
+          cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build
-          -DCMAKE_BUILD_TYPE=Debug
+          -DCMAKE_BUILD_TYPE=${{matrix.type}}
 
       - name: Build
-        run: cmake --build build -j ${{ steps.cores.outputs.count }}
+        run: cmake --build build -j ${{steps.cores.outputs.count}}
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
+        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}

.github/workflows/win-msys2-gcc.yml

@@ -1,6 +1,8 @@
 name: win-msys2-gcc-ci
 
 on:
+  workflow_dispatch:
+
   push:
     branches:
       - master
@@ -21,55 +23,52 @@ jobs:
       ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
       ! contains(toJSON(github.event.commits.*.message), '[skip github]')
 
-    name: ${{ matrix.msystem }}
-    runs-on: windows-latest
     defaults:
       run:
         shell: msys2 {0}
+
     strategy:
       fail-fast: false
+
       matrix:
-        include:
+        os: [windows-2019, windows-latest]
+        type: [Release, Debug]
+        config:
           - msystem: "MINGW64"
             install: >-
-              git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja 
+              git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
               mingw-w64-x86_64-gcc
-            type: Release
+
-          - msystem: "MINGW32"
-            install: >- 
-              git mingw-w64-i686-cmake mingw-w64-i686-ninja 
-              mingw-w64-i686-gcc
-            type: Release
-          - msystem: "MINGW64"
-            install: >- 
-              git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja 
-              mingw-w64-x86_64-gcc
-            type: Debug
           - msystem: "MINGW32"
             install: >-
-              git mingw-w64-i686-cmake mingw-w64-i686-ninja 
+              git mingw-w64-i686-cmake mingw-w64-i686-ninja
               mingw-w64-i686-gcc
-            type: Debug
+
+    runs-on: ${{matrix.os}}
+
+    name: "${{matrix.config.msystem}}: ${{matrix.os}}: ${{matrix.type}}"
+
     env:
       CMAKE_GENERATOR: Ninja
 
     steps:
       - uses: actions/checkout@v2
+
       - uses: msys2/setup-msys2@v2
         with:
           update: true
-          msystem: ${{ matrix.msystem }}
+          msystem: ${{matrix.config.msystem}}
-          install: ${{ matrix.install }}
+          install: ${{matrix.config.install}}
 
       - name: Install dependencies
         run: script/ci_install_deps.sh
 
       - name: Configure
-        run: cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
+        run: cmake -S test -B build -D CMAKE_BUILD_TYPE=${{matrix.type}}
 
       - name: Build
-        run: cmake --build build -j ${{ steps.cores.outputs.count }}
+        run: cmake --build build -j ${{steps.cores.outputs.count}}
 
       - name: Run
         working-directory: build
-        run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
+        run: ctest --output-on-failure -j ${{steps.cores.outputs.count}}

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.14)
 
 project(
     ssp
-    VERSION 1.5.0
+    VERSION 1.6.1
     DESCRIPTION "csv parser"
     HOMEPAGE_URL "https://github.com/red0124/ssp"
     LANGUAGES CXX

README.md

@@ -8,12 +8,14 @@
 ```
 
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+[![coverage](https://coveralls.io/repos/github/red0124/ssp/badge.svg?branch=master)](https://coveralls.io/github/red0124/ssp?branch=master)
+[![single-header](https://github.com/red0124/ssp/workflows/single-header-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/single-header.yml)
 [![ubuntu-latest-gcc](https://github.com/red0124/ssp/workflows/ubuntu-latest-gcc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-gcc.yml)
 [![ubuntu-latest-clang](https://github.com/red0124/ssp/workflows/ubuntu-latest-clang-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-clang.yml)
 [![ubuntu-latest-icc](https://github.com/red0124/ssp/workflows/ubuntu-latest-icc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-icc.yml)
 [![windows-msys2-gcc](https://github.com/red0124/ssp/workflows/win-msys2-gcc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msys2-gcc.yml)
 [![windows-msys2-clang](https://github.com/red0124/ssp/workflows/win-msys2-clang-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msys2-clang.yml)
-[![win-msvc-ci](https://github.com/red0124/ssp/workflows/win-msvc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msvc.yml)
+[![windows-msvc](https://github.com/red0124/ssp/workflows/win-msvc-ci/badge.svg)](https://github.com/red0124/ssp/actions/workflows/win-msvc.yml)
 
 A header only "csv" parser which is fast and versatile with modern C++ api. Requires compiler with C++17 support. [Can also be used to convert strings to specific types.](#the-converter)
 

include/ss/common.hpp

@@ -26,12 +26,12 @@ inline void assert_throw_on_error_not_defined() {
 }
 
 #if __unix__
-inline ssize_t get_line(char** lineptr, size_t* n, FILE* stream) {
+inline ssize_t get_line_file(char** lineptr, size_t* n, FILE* stream) {
     return getline(lineptr, n, stream);
 }
 #else
 using ssize_t = int64_t;
-inline ssize_t get_line(char** lineptr, size_t* n, FILE* stream) {
+inline ssize_t get_line_file(char** lineptr, size_t* n, FILE* stream) {
     size_t pos;
     int c;
 

include/ss/converter.hpp

@@ -379,7 +379,6 @@ private:
         return extract_tuple<Ts...>(elems);
     }
 
-    // do not know how to specialize by return type :(
     template <typename... Ts>
     no_void_validator_tup_t<std::tuple<Ts...>> convert_impl(
         const split_data& elems, const std::tuple<Ts...>*) {

include/ss/extract.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "type_traits.hpp"
+#include <charconv>
 #include <cstring>
 #include <functional>
 #include <optional>
 #include <string>
 #include <string_view>
 #include <variant>
-#include <charconv>
 
 #ifndef SSP_DISABLE_FAST_FLOAT
 #include <fast_float/fast_float.h>
@@ -16,7 +16,6 @@
 #include <cstdlib>
 #endif
 
-// TODO try from_chars for integer conversions
 namespace ss {
 
 ////////////////
@@ -42,17 +41,24 @@ std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
 template <typename T>
 std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
     const char* const begin, const char* const end) {
+    static_assert(!std::is_same_v<T, long double>,
+                  "Conversion to long double is disabled");
+
     constexpr static auto buff_max = 64;
-    char buff[buff_max];
+    char short_buff[buff_max];
     size_t string_range = std::distance(begin, end);
+    std::string long_buff;
 
+    char* buff;
     if (string_range > buff_max) {
-        return std::nullopt;
+        long_buff = std::string{begin, end};
+        buff = long_buff.data();
+    } else {
+        buff = short_buff;
+        buff[string_range] = '\0';
+        std::copy_n(begin, string_range, buff);
     }
 
-    std::copy_n(begin, string_range, buff);
-    buff[string_range] = '\0';
-
     T ret;
     char* parse_end = nullptr;
 
@@ -60,8 +66,6 @@ std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
         ret = std::strtof(buff, &parse_end);
     } else if constexpr (std::is_same_v<T, double>) {
         ret = std::strtod(buff, &parse_end);
-    } else if constexpr (std::is_same_v<T, long double>) {
-        ret = std::strtold(buff, &parse_end);
     }
 
     if (parse_end != buff + string_range) {

include/ss/parser.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-// TODO add single header tests
 #include "common.hpp"
 #include "converter.hpp"
 #include "exception.hpp"
@@ -49,6 +48,18 @@ public:
         }
     }
 
+    parser(const char* const csv_data_buffer, size_t csv_data_size,
+           const std::string& delim = ss::default_delimiter)
+        : file_name_{"buffer line"},
+          reader_{csv_data_buffer, csv_data_size, delim} {
+        read_line();
+        if constexpr (ignore_header) {
+            ignore_next();
+        } else {
+            raw_header_ = reader_.get_buffer();
+        }
+    }
+
     parser(parser&& other) = default;
     parser& operator=(parser&& other) = default;
 
@@ -642,18 +653,27 @@ private:
             : delim_{delim}, file_{fopen(file_name_.c_str(), "rb")} {
         }
 
+        reader(const char* const buffer, size_t csv_data_size,
+               const std::string& delim)
+            : delim_{delim}, csv_data_buffer_{buffer},
+              csv_data_size_{csv_data_size} {
+        }
+
         reader(reader&& other)
             : buffer_{other.buffer_},
               next_line_buffer_{other.next_line_buffer_},
-              helper_buffer_{other.helper_buffer_}, converter_{std::move(
+              helper_buffer_{other.helper_buffer_},
-                                                        other.converter_)},
+              converter_{std::move(other.converter_)},
               next_line_converter_{std::move(other.next_line_converter_)},
               buffer_size_{other.buffer_size_},
               next_line_buffer_size_{other.next_line_buffer_size_},
-              helper_size_{other.helper_size_}, delim_{std::move(other.delim_)},
+              helper_buffer_size{other.helper_buffer_size},
-              file_{other.file_}, crlf_{other.crlf_},
+              delim_{std::move(other.delim_)}, file_{other.file_},
-              line_number_{other.line_number_}, next_line_size_{
+              csv_data_buffer_{other.csv_data_buffer_},
-                                                    other.next_line_size_} {
+              csv_data_size_{other.csv_data_size_},
+              curr_char_{other.curr_char_}, crlf_{other.crlf_},
+              line_number_{other.line_number_},
+              next_line_size_{other.next_line_size_} {
             other.buffer_ = nullptr;
             other.next_line_buffer_ = nullptr;
             other.helper_buffer_ = nullptr;
@@ -669,9 +689,12 @@ private:
                 next_line_converter_ = std::move(other.next_line_converter_);
                 buffer_size_ = other.buffer_size_;
                 next_line_buffer_size_ = other.next_line_buffer_size_;
-                helper_size_ = other.helper_size_;
+                helper_buffer_size = other.helper_buffer_size;
                 delim_ = std::move(other.delim_);
                 file_ = other.file_;
+                csv_data_buffer_ = other.csv_data_buffer_;
+                csv_data_size_ = other.csv_data_size_;
+                curr_char_ = other.curr_char_;
                 crlf_ = other.crlf_;
                 line_number_ = other.line_number_;
                 next_line_size_ = other.next_line_size_;
@@ -699,6 +722,60 @@ private:
         reader(const reader& other) = delete;
         reader& operator=(const reader& other) = delete;
 
+        ssize_t get_line_buffer(char** lineptr, size_t* n,
+                                const char* const buffer, size_t csv_data_size,
+                                size_t& curr_char) {
+            size_t pos;
+            int c;
+
+            // TODO remove check
+            if (lineptr == nullptr || buffer == nullptr || n == nullptr) {
+                return -1;
+            }
+
+            c = buffer[curr_char++];
+            if (curr_char >= csv_data_size) {
+                return -1;
+            }
+
+            // TODO maybe remove this too
+            if (*lineptr == nullptr) {
+                *lineptr = static_cast<char*>(malloc(128));
+                if (*lineptr == nullptr) {
+                    return -1;
+                }
+                *n = 128;
+            }
+
+            pos = 0;
+            while (curr_char <= csv_data_size) {
+                if (pos + 1 >= *n) {
+                    size_t new_size = *n + (*n >> 2);
+                    // TODO maybe remove this too
+                    if (new_size < 128) {
+                        new_size = 128;
+                    }
+                    char* new_ptr = static_cast<char*>(
+                        realloc(static_cast<void*>(*lineptr), new_size));
+                    // TODO check for failed malloc in the callee
+                    if (new_ptr == nullptr) {
+                        return -1;
+                    }
+                    *n = new_size;
+                    *lineptr = new_ptr;
+                }
+
+                (*lineptr)[pos++] = c;
+                if (c == '\n') {
+                    break;
+                }
+                c = buffer[curr_char++];
+            }
+
+            (*lineptr)[pos] = '\0';
+            return pos;
+        }
+
         // read next line each time in order to set eof_
         bool read_next() {
             next_line_converter_.clear_error();
@@ -709,8 +786,16 @@ private:
                 if (next_line_buffer_size_ > 0) {
                     next_line_buffer_[0] = '\0';
                 }
-                ssize = get_line(&next_line_buffer_, &next_line_buffer_size_,
+
-                                 file_);
+                if (file_) {
+                    ssize = get_line_file(&next_line_buffer_,
+                                          &next_line_buffer_size_, file_);
+                } else {
+                    ssize = get_line_buffer(&next_line_buffer_,
+                                            &next_line_buffer_size_,
+                                            csv_data_buffer_, csv_data_size_,
+                                            curr_char_);
+                }
 
                 if (ssize == -1) {
                     return false;
@@ -822,6 +907,10 @@ private:
         }
 
         size_t remove_eol(char*& buffer, size_t ssize) {
+            if (buffer[ssize - 1] != '\n') {
+                return ssize;
+            }
+
             size_t size = ssize - 1;
             if (ssize >= 2 && buffer[ssize - 2] == '\r') {
                 crlf_ = true;
@@ -852,8 +941,17 @@ private:
         bool append_next_line_to_buffer(char*& buffer, size_t& size) {
             undo_remove_eol(buffer, size);
 
-            ssize_t next_ssize =
+            ssize_t next_ssize;
-                get_line(&helper_buffer_, &helper_size_, file_);
+            if (file_) {
+                next_ssize =
+                    get_line_file(&helper_buffer_, &helper_buffer_size, file_);
+            } else {
+                next_ssize =
+                    get_line_buffer(&helper_buffer_, &helper_buffer_size,
+                                    csv_data_buffer_, csv_data_size_,
+                                    curr_char_);
+            }
+
             if (next_ssize == -1) {
                 return false;
             }
@@ -880,11 +978,15 @@ private:
 
         size_t buffer_size_{0};
         size_t next_line_buffer_size_{0};
-        size_t helper_size_{0};
+        size_t helper_buffer_size{0};
 
         std::string delim_;
         FILE* file_{nullptr};
 
+        const char* csv_data_buffer_{nullptr};
+        size_t csv_data_size_{0};
+        size_t curr_char_{0};
+
         bool crlf_{false};
         size_t line_number_{0};
 

meson.build

@@ -6,7 +6,7 @@ project(
       'cpp_std=c++17', 
       'buildtype=debugoptimized',
       'wrap_mode=forcefallback'],
-  version: '1.5.0',
+  version: '1.6.1',
   meson_version:'>=0.54.0')
 
 fast_float_dep = dependency('fast_float')

ssp.hpp

@@ -1,12 +1,12 @@
 #include <algorithm>
 #include <array>
+#include <charconv>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <exception>
 #include <functional>
-#include <limits>
 #include <memory>
 #include <optional>
 #include <string>
@@ -1465,7 +1465,6 @@ public:
 #else
 #endif
 
-// TODO try from_chars for integer conversions
 namespace ss {
 
 ////////////////
@@ -1491,17 +1490,24 @@ std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
 template <typename T>
 std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
     const char* const begin, const char* const end) {
+    static_assert(!std::is_same_v<T, long double>,
+                  "Conversion to long double is disabled");
+
     constexpr static auto buff_max = 64;
-    char buff[buff_max];
+    char short_buff[buff_max];
     size_t string_range = std::distance(begin, end);
+    std::string long_buff;
 
+    char* buff;
     if (string_range > buff_max) {
-        return std::nullopt;
+        long_buff = std::string{begin, end};
+        buff = long_buff.data();
+    } else {
+        buff = short_buff;
+        buff[string_range] = '\0';
+        std::copy_n(begin, string_range, buff);
     }
 
-    std::copy_n(begin, string_range, buff);
-    buff[string_range] = '\0';
-
     T ret;
     char* parse_end = nullptr;
 
@@ -1509,8 +1515,6 @@ std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
         ret = std::strtof(buff, &parse_end);
     } else if constexpr (std::is_same_v<T, double>) {
         ret = std::strtod(buff, &parse_end);
-    } else if constexpr (std::is_same_v<T, long double>) {
-        ret = std::strtold(buff, &parse_end);
     }
 
     if (parse_end != buff + string_range) {
@@ -1522,195 +1526,16 @@ std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
 
 #endif
 
-inline std::optional<short> from_char(char c) {
-    if (c >= '0' && c <= '9') {
-        return c - '0';
-    }
-    return std::nullopt;
-}
-
-#if defined(__clang__) && defined(__MINGW32__) && !defined(__MINGW64__)
-#define MINGW32_CLANG
-#endif
-
-// mingw32 clang does not support some of the builtin functions
-#if (defined(__clang__) || defined(__GNUC__) || defined(__GUNG__)) &&          \
-    !defined(MINGW32_CLANG)
-////////////////
-// mul overflow detection
-////////////////
-template <typename T>
-bool mul_overflow(T& result, T operand) {
-    return __builtin_mul_overflow(result, operand, &result);
-}
-
-template <>
-inline bool mul_overflow(int& result, int operand) {
-    return __builtin_smul_overflow(result, operand, &result);
-}
-
-template <>
-inline bool mul_overflow(long& result, long operand) {
-    return __builtin_smull_overflow(result, operand, &result);
-}
-
-template <>
-inline bool mul_overflow(long long& result, long long operand) {
-    return __builtin_smulll_overflow(result, operand, &result);
-}
-
-template <>
-inline bool mul_overflow(unsigned int& result, unsigned int operand) {
-    return __builtin_umul_overflow(result, operand, &result);
-}
-
-template <>
-inline bool mul_overflow(unsigned long& result, unsigned long operand) {
-    return __builtin_umull_overflow(result, operand, &result);
-}
-
-template <>
-inline bool mul_overflow(unsigned long long& result,
-                         unsigned long long operand) {
-    return __builtin_umulll_overflow(result, operand, &result);
-}
-
-////////////////
-// addition overflow detection
-////////////////
-
-template <typename T>
-inline bool add_overflow(T& result, T operand) {
-    return __builtin_add_overflow(result, operand, &result);
-}
-
-template <>
-inline bool add_overflow(int& result, int operand) {
-    return __builtin_sadd_overflow(result, operand, &result);
-}
-
-template <>
-inline bool add_overflow(long& result, long operand) {
-    return __builtin_saddl_overflow(result, operand, &result);
-}
-
-template <>
-inline bool add_overflow(long long& result, long long operand) {
-    return __builtin_saddll_overflow(result, operand, &result);
-}
-
-template <>
-inline bool add_overflow(unsigned int& result, unsigned int operand) {
-    return __builtin_uadd_overflow(result, operand, &result);
-}
-
-template <>
-inline bool add_overflow(unsigned long& result, unsigned long operand) {
-    return __builtin_uaddl_overflow(result, operand, &result);
-}
-
-template <>
-inline bool add_overflow(unsigned long long& result,
-                         unsigned long long operand) {
-    return __builtin_uaddll_overflow(result, operand, &result);
-}
-
-////////////////
-// substraction overflow detection
-////////////////
-template <typename T>
-inline bool sub_overflow(T& result, T operand) {
-    return __builtin_sub_overflow(result, operand, &result);
-}
-
-template <>
-inline bool sub_overflow(int& result, int operand) {
-    return __builtin_ssub_overflow(result, operand, &result);
-}
-
-template <>
-inline bool sub_overflow(long& result, long operand) {
-    return __builtin_ssubl_overflow(result, operand, &result);
-}
-
-template <>
-inline bool sub_overflow(long long& result, long long operand) {
-    return __builtin_ssubll_overflow(result, operand, &result);
-}
-
-// Note: sub_overflow function should be unreachable for unsigned values
-template <>
-inline bool sub_overflow(unsigned int& result, unsigned int operand) {
-    return __builtin_usub_overflow(result, operand, &result);
-}
-
-template <>
-inline bool sub_overflow(unsigned long& result, unsigned long operand) {
-    return __builtin_usubl_overflow(result, operand, &result);
-}
-
-template <>
-inline bool sub_overflow(unsigned long long& result,
-                         unsigned long long operand) {
-    return __builtin_usubll_overflow(result, operand, &result);
-}
-
-template <typename T, typename F>
-bool shift_and_add_overflow(T& value, T digit, F add_last_digit_overflow) {
-    if (mul_overflow<T>(value, 10) || add_last_digit_overflow(value, digit)) {
-        return true;
-    }
-    return false;
-}
-#else
-
-template <typename T, typename U>
-bool shift_and_add_overflow(T& value, T digit, U is_negative) {
-    digit = (is_negative) ? -digit : digit;
-    T old_value = value;
-    value = 10 * value + digit;
-
-    T expected_old_value = (value - digit) / 10;
-    if (old_value != expected_old_value) {
-        return true;
-    }
-    return false;
-}
-
-#endif
-
 template <typename T>
 std::enable_if_t<std::is_integral_v<T>, std::optional<T>> to_num(
-    const char* begin, const char* end) {
+    const char* const begin, const char* const end) {
-    if (begin == end) {
+    T ret;
+    auto [ptr, ec] = std::from_chars(begin, end, ret);
+
+    if (ec != std::errc() || ptr != end) {
         return std::nullopt;
     }
-    bool is_negative = false;
+    return ret;
-    if constexpr (std::is_signed_v<T>) {
-        is_negative = *begin == '-';
-        if (is_negative) {
-            ++begin;
-        }
-    }
-
-#if (defined(__clang__) || defined(__GNUC__) || defined(__GUNG__)) &&          \
-    !defined(MINGW32_CLANG)
-    auto add_last_digit_overflow =
-        (is_negative) ? sub_overflow<T> : add_overflow<T>;
-#else
-    auto add_last_digit_overflow = is_negative;
-#endif
-
-    T value = 0;
-    for (auto i = begin; i != end; ++i) {
-        if (auto digit = from_char(*i);
-            !digit || shift_and_add_overflow<T>(value, digit.value(),
-                                                add_last_digit_overflow)) {
-            return std::nullopt;
-        }
-    }
-
-    return value;
 }
 
 ////////////////
@@ -2196,7 +2021,6 @@ private:
         return extract_tuple<Ts...>(elems);
     }
 
-    // do not know how to specialize by return type :(
     template <typename... Ts>
     no_void_validator_tup_t<std::tuple<Ts...>> convert_impl(
         const split_data& elems, const std::tuple<Ts...>*) {
@@ -2312,7 +2136,6 @@ private:
 
 } /* ss */
 
-// TODO add single header tests
 
 namespace ss {
 

test/test_extractions.cpp

@@ -275,3 +275,20 @@ TEST_CASE("extract test functions for std::variant") {
         }
     }
 }
+
+TEST_CASE("extract test with long number string") {
+    {
+        std::string string_num =
+            std::string(20, '1') + "." + std::string(20, '2');
+
+        CHECK_FLOATING_CONVERSION_LONG_NUMBER(string_num, float, stof);
+        CHECK_FLOATING_CONVERSION_LONG_NUMBER(string_num, double, stod);
+    }
+
+    {
+        std::string string_num =
+            std::string(50, '1') + "." + std::string(50, '2');
+
+        CHECK_FLOATING_CONVERSION_LONG_NUMBER(string_num, double, stod);
+    }
+}

test/test_extractions_without_fast_float.cpp

@@ -9,11 +9,11 @@ TEST_CASE(
     CHECK_FLOATING_CONVERSION(123.456, float);
     CHECK_FLOATING_CONVERSION(123.456, double);
 
-    CHECK_FLOATING_CONVERSION(69, float);
+    CHECK_FLOATING_CONVERSION(59, float);
-    CHECK_FLOATING_CONVERSION(69, double);
+    CHECK_FLOATING_CONVERSION(59, double);
 
-    CHECK_FLOATING_CONVERSION(420., float);
+    CHECK_FLOATING_CONVERSION(4210., float);
-    CHECK_FLOATING_CONVERSION(420., double);
+    CHECK_FLOATING_CONVERSION(4210., double);
 
     CHECK_FLOATING_CONVERSION(0.123, float);
     CHECK_FLOATING_CONVERSION(0.123, double);
@@ -130,3 +130,20 @@ TEST_CASE("extract test functions for std::variant without fast float") {
         }
     }
 }
+
+TEST_CASE("extract test with long number string without fast float") {
+    {
+        std::string string_num =
+            std::string(20, '1') + "." + std::string(20, '2');
+
+        CHECK_FLOATING_CONVERSION_LONG_NUMBER(string_num, float, stof);
+        CHECK_FLOATING_CONVERSION_LONG_NUMBER(string_num, double, stod);
+    }
+
+    {
+        std::string string_num =
+            std::string(50, '1') + "." + std::string(50, '2');
+
+        CHECK_FLOATING_CONVERSION_LONG_NUMBER(string_num, double, stod);
+    }
+}

test/test_helpers.hpp

@@ -1,10 +1,10 @@
 #pragma once
 #include <ctime>
+#include <filesystem>
 #include <iomanip>
 #include <sstream>
 #include <string>
 #include <vector>
-#include <filesystem>
 
 #ifdef CMAKE_GITHUB_CI
 #include <doctest/doctest.h>
@@ -75,6 +75,18 @@ struct unique_file_name {
         CHECK_LT(std::abs(t.value() - type(-input)), eps);                     \
     }
 
+#define CHECK_FLOATING_CONVERSION_LONG_NUMBER(STRING_NUMBER, TYPE, CONVERTER)  \
+    {                                                                          \
+        auto begin = STRING_NUMBER.c_str();                                    \
+        auto end = begin + STRING_NUMBER.size();                               \
+                                                                               \
+        auto number = ss::to_num<TYPE>(begin, end);                            \
+        REQUIRE(number.has_value());                                           \
+                                                                               \
+        auto expected_number = CONVERTER(STRING_NUMBER);                       \
+        CHECK_EQ(number.value(), expected_number);                             \
+    }
+
 #define CHECK_INVALID_CONVERSION(input, type)                                  \
     {                                                                          \
         std::string s = input;                                                 \

test/test_parser.cpp

@@ -38,7 +38,7 @@ void expect_error_on_command(ss::parser<Ts...>& p,
     }
 }
 
-void update_if_crlf(std::string& s) {
+[[maybe_unused]] void update_if_crlf(std::string& s) {
 #ifdef _WIN32
     replace_all(s, "\r\n", "\n");
 #else
@@ -102,6 +102,31 @@ static void make_and_write(const std::string& file_name,
         out << data[i].to_string() << new_lines[i % new_lines.size()];
     }
 }
+
+std::string make_buffer(const std::string& file_name) {
+    std::ifstream in{file_name, std::ios::binary};
+    std::string tmp;
+    std::string out;
+    out.reserve(sizeof(out) + 1);
+    while (in >> tmp) {
+        out += tmp;
+        out.append("\n");
+    }
+    return out;
+}
+
+template <bool buffer_mode, typename... Ts>
+std::tuple<ss::parser<Ts...>, std::string> make_parser(
+    const std::string& file_name, const std::string& delim) {
+    if (buffer_mode) {
+        auto buffer = make_buffer(file_name);
+        return {ss::parser<Ts...>{buffer.data(), buffer.size(), delim},
+                std::move(buffer)};
+    } else {
+        return {ss::parser<Ts...>{file_name, delim}, std::string{}};
+    }
+}
+
 } /* namespace */
 
 TEST_CASE("test file not found") {
@@ -125,22 +150,23 @@ TEST_CASE("test file not found") {
     }
 }
 
-template <typename... Ts>
+template <bool buffer_mode, typename... Ts>
 void test_various_cases() {
     unique_file_name f{"test_parser"};
     std::vector<X> data = {{1, 2, "x"}, {3, 4, "y"},  {5, 6, "z"},
                            {7, 8, "u"}, {9, 10, "v"}, {11, 12, "w"}};
     make_and_write(f.name, data);
+    auto csv_data_buffer = make_buffer(f.name);
     {
-        ss::parser<Ts...> p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         ss::parser p0{std::move(p)};
         p = std::move(p0);
         std::vector<X> i;
 
-        ss::parser<ss::string_error> p2{f.name, ","};
+        auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i2;
 
-        auto move_rotate = [&] {
+        auto move_rotate = [&p = p, &p0 = p0] {
             auto p1 = std::move(p);
             p0 = std::move(p1);
             p = std::move(p0);
@@ -152,7 +178,7 @@ void test_various_cases() {
             i.emplace_back(ss::to_object<X>(a));
         }
 
-        for (const auto& a : p2.iterate<int, double, std::string>()) {
+        for (const auto& a : p2.template iterate<int, double, std::string>()) {
             i2.emplace_back(ss::to_object<X>(a));
         }
 
@@ -161,13 +187,13 @@ void test_various_cases() {
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
-        ss::parser p2{f.name, ","};
+        auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i2;
 
-        ss::parser p3{f.name, ","};
+        auto [p3, ___] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i3;
 
         std::vector<X> expected = {std::begin(data) + 1, std::end(data)};
@@ -175,18 +201,18 @@ void test_various_cases() {
 
         p.ignore_next();
         while (!p.eof()) {
-            auto a = p.get_next<tup>();
+            auto a = p.template get_next<tup>();
             i.emplace_back(ss::to_object<X>(a));
         }
 
         p2.ignore_next();
-        for (const auto& a : p2.iterate<tup>()) {
+        for (const auto& a : p2.template iterate<tup>()) {
             i2.emplace_back(ss::to_object<X>(a));
         }
 
         p3.ignore_next();
-        for (auto it = p3.iterate<tup>().begin(); it != p3.iterate<tup>().end();
+        for (auto it = p3.template iterate<tup>().begin();
-             ++it) {
+             it != p3.template iterate<tup>().end(); ++it) {
             i3.emplace_back(ss::to_object<X>(*it));
         }
 
@@ -196,16 +222,17 @@ void test_various_cases() {
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
-        ss::parser p2{f.name, ","};
+        auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i2;
 
         while (!p.eof()) {
-            i.push_back(p.get_object<X, int, double, std::string>());
+            i.push_back(p.template get_object<X, int, double, std::string>());
         }
 
-        for (auto&& a : p2.iterate_object<X, int, double, std::string>()) {
+        for (auto&& a :
+             p2.template iterate_object<X, int, double, std::string>()) {
             i2.push_back(std::move(a));
         }
 
@@ -214,10 +241,11 @@ void test_various_cases() {
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
-        for (auto&& a : p.iterate_object<X, int, double, std::string>()) {
+        for (auto&& a :
+             p.template iterate_object<X, int, double, std::string>()) {
             i.push_back(std::move(a));
         }
 
@@ -225,19 +253,19 @@ void test_various_cases() {
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
-        ss::parser p2{f.name, ","};
+        auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i2;
 
         using tup = std::tuple<int, double, std::string>;
         while (!p.eof()) {
-            i.push_back(p.get_object<X, tup>());
+            i.push_back(p.template get_object<X, tup>());
         }
 
-        for (auto it = p2.iterate_object<X, tup>().begin();
+        for (auto it = p2.template iterate_object<X, tup>().begin();
-             it != p2.iterate_object<X, tup>().end(); it++) {
+             it != p2.template iterate_object<X, tup>().end(); it++) {
             i2.push_back({it->i, it->d, it->s});
         }
 
@@ -246,11 +274,11 @@ void test_various_cases() {
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
         using tup = std::tuple<int, double, std::string>;
-        for (auto&& a : p.iterate_object<X, tup>()) {
+        for (auto&& a : p.template iterate_object<X, tup>()) {
             i.push_back(std::move(a));
         }
 
@@ -258,21 +286,21 @@ void test_various_cases() {
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
         while (!p.eof()) {
-            i.push_back(p.get_next<X>());
+            i.push_back(p.template get_next<X>());
         }
 
         CHECK_EQ(i, data);
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
-        for (auto&& a : p.iterate<X>()) {
+        for (auto&& a : p.template iterate<X>()) {
             i.push_back(std::move(a));
         }
 
@@ -281,24 +309,30 @@ void test_various_cases() {
 
     {
         constexpr int excluded = 3;
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
-        ss::parser p2{f.name, ","};
+        auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i2;
 
         while (!p.eof()) {
-            auto a =
+            try {
-                p.get_object<X, ss::ax<int, excluded>, double, std::string>();
+                auto a = p.template get_object<X, ss::ax<int, excluded>, double,
-            if (p.valid()) {
+                                               std::string>();
-                i.push_back(a);
+                if (p.valid()) {
-            }
+                    i.push_back(a);
+                }
+            } catch (...) {
+                // ignore
+            };
         }
 
-        for (auto&& a : p2.iterate_object<X, ss::ax<int, excluded>, double,
+        if (!ss::setup<Ts...>::throw_on_error) {
-                                          std::string>()) {
+            for (auto&& a : p2.template iterate_object<X, ss::ax<int, excluded>,
-            if (p2.valid()) {
+                                                       double, std::string>()) {
-                i2.push_back(std::move(a));
+                if (p2.valid()) {
+                    i2.push_back(std::move(a));
+                }
             }
         }
 
@@ -312,33 +346,45 @@ void test_various_cases() {
         std::copy_if(data.begin(), data.end(), expected.begin(),
                      [&](const X& x) { return x.i != excluded; });
         CHECK_EQ(i, expected);
-        CHECK_EQ(i2, expected);
+
+        if (!ss::setup<Ts...>::throw_on_error) {
+            CHECK_EQ(i2, expected);
+        }
     }
 
     {
-        ss::parser p{f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i;
 
-        ss::parser p2{f.name, ","};
+        auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
         std::vector<X> i2;
 
         while (!p.eof()) {
-            auto a = p.get_object<X, ss::nx<int, 3>, double, std::string>();
+            try {
-            if (p.valid()) {
+                auto a = p.template get_object<X, ss::nx<int, 3>, double,
-                i.push_back(a);
+                                               std::string>();
+                if (p.valid()) {
+                    i.push_back(a);
+                }
+            } catch (...) {
+                // ignore
             }
         }
 
-        for (auto&& a :
+        if (!ss::setup<Ts...>::throw_on_error) {
-             p2.iterate_object<X, ss::nx<int, 3>, double, std::string>()) {
+            for (auto&& a : p2.template iterate_object<X, ss::nx<int, 3>,
-            if (p2.valid()) {
+                                                       double, std::string>()) {
-                i2.push_back(std::move(a));
+                if (p2.valid()) {
+                    i2.push_back(std::move(a));
+                }
             }
         }
 
         std::vector<X> expected = {{3, 4, "y"}};
         CHECK_EQ(i, expected);
-        CHECK_EQ(i2, expected);
+        if (!ss::setup<Ts...>::throw_on_error) {
+            CHECK_EQ(i2, expected);
+        }
     }
 
     {
@@ -347,17 +393,17 @@ void test_various_cases() {
 
         make_and_write(empty_f.name, empty_data);
 
-        ss::parser p{empty_f.name, ","};
+        auto [p, _] = make_parser<buffer_mode, Ts...>(empty_f.name, ",");
         std::vector<X> i;
 
-        ss::parser p2{empty_f.name, ","};
+        auto [p2, __] = make_parser<buffer_mode, Ts...>(empty_f.name, ",");
         std::vector<X> i2;
 
         while (!p.eof()) {
-            i.push_back(p.get_next<X>());
+            i.push_back(p.template get_next<X>());
         }
 
-        for (auto&& a : p2.iterate<X>()) {
+        for (auto&& a : p2.template iterate<X>()) {
             i2.push_back(std::move(a));
         }
 
@@ -367,9 +413,12 @@ void test_various_cases() {
 }
 
 TEST_CASE("parser test various cases") {
-    test_various_cases();
+    test_various_cases<false>();
-    test_various_cases<ss::string_error>();
+    test_various_cases<false, ss::string_error>();
-    test_various_cases<ss::throw_on_error>();
+    test_various_cases<false, ss::throw_on_error>();
+    test_various_cases<true>();
+    test_various_cases<true, ss::string_error>();
+    test_various_cases<true, ss::throw_on_error>();
 }
 
 using test_tuple = std::tuple<double, char, double>;
@@ -385,7 +434,7 @@ struct test_struct {
 static inline void expect_test_struct(const test_struct&) {
 }
 
-template <typename... Ts>
+template <bool buffer_mode, typename... Ts>
 void test_composite_conversion() {
     unique_file_name f{"test_parser"};
     {
@@ -397,7 +446,7 @@ void test_composite_conversion() {
         }
     }
 
-    ss::parser<Ts...> p{f.name, ","};
+    auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
     auto fail = [] { FAIL(""); };
     auto expect_error = [](auto error) { CHECK(!error.empty()); };
     auto ignore_error = [] {};
@@ -609,7 +658,8 @@ void test_composite_conversion() {
 
 // various scenarios
 TEST_CASE("parser test composite conversion") {
-    test_composite_conversion<ss::string_error>();
+    test_composite_conversion<false, ss::string_error>();
+    test_composite_conversion<true, ss::string_error>();
 }
 
 struct my_string {
@@ -653,7 +703,7 @@ struct xyz {
     }
 };
 
-template <typename... Ts>
+template <bool buffer_mode, typename... Ts>
 void test_moving_of_parsed_composite_values() {
     // to compile is enough
     return;
@@ -669,8 +719,10 @@ void test_moving_of_parsed_composite_values() {
 }
 
 TEST_CASE("parser test the moving of parsed composite values") {
-    test_moving_of_parsed_composite_values();
+    test_moving_of_parsed_composite_values<false>();
-    test_moving_of_parsed_composite_values<ss::string_error>();
+    test_moving_of_parsed_composite_values<false, ss::string_error>();
+    test_moving_of_parsed_composite_values<true>();
+    test_moving_of_parsed_composite_values<true, ss::string_error>();
 }
 
 TEST_CASE("parser test error mode") {
@@ -681,12 +733,23 @@ TEST_CASE("parser test error mode") {
         out << "junk" << std::endl;
     }
 
-    ss::parser<ss::string_error> p(f.name, ",");
+    {
+        auto [p, _] = make_parser<false, ss::string_error>(f.name, ",");
 
-    REQUIRE_FALSE(p.eof());
+        REQUIRE_FALSE(p.eof());
-    p.get_next<int>();
+        p.get_next<int>();
-    CHECK_FALSE(p.valid());
+        CHECK_FALSE(p.valid());
-    CHECK_FALSE(p.error_msg().empty());
+        CHECK_FALSE(p.error_msg().empty());
+    }
+
+    {
+        auto [p, _] = make_parser<true, ss::string_error>(f.name, ",");
+
+        REQUIRE_FALSE(p.eof());
+        p.get_next<int>();
+        CHECK_FALSE(p.valid());
+        CHECK_FALSE(p.error_msg().empty());
+    }
 }
 
 TEST_CASE("parser throw on error mode") {
@@ -1491,6 +1554,104 @@ TEST_CASE("parser test invalid header fields usage") {
     test_invalid_fields({"Int,String,Int", "1,hi,3"}, {"Int", "String", "Int"});
 }
 
+template <typename... Ts>
+void test_invalid_rows_with_header() {
+    unique_file_name f{"test_parser"};
+    {
+        std::ofstream out{f.name};
+        out << "Int,String,Double" << std::endl;
+        out << "1,line1,2.34" << std::endl;
+        out << "2,line2" << std::endl;
+        out << "3,line3,67.8" << std::endl;
+        out << "4,line4,67.8,9" << std::endl;
+        out << "5,line5,9.10" << std::endl;
+        out << "six,line6,10.11" << std::endl;
+    }
+
+    {
+        ss::parser<Ts...> p{f.name};
+
+        p.use_fields("Int", "String", "Double");
+        using data = std::tuple<int, std::string, double>;
+        std::vector<data> i;
+
+        CHECK(p.valid());
+
+        while (!p.eof()) {
+            try {
+                const auto& t = p.template get_next<data>();
+                if (p.valid()) {
+                    i.push_back(t);
+                }
+            } catch (const ss::exception&) {
+                continue;
+            }
+        }
+
+        std::vector<data> expected = {{1, "line1", 2.34},
+                                      {3, "line3", 67.8},
+                                      {5, "line5", 9.10}};
+        CHECK_EQ(i, expected);
+    }
+
+    {
+        ss::parser<Ts...> p{f.name};
+
+        p.use_fields("Double", "Int");
+        using data = std::tuple<double, int>;
+        std::vector<data> i;
+
+        CHECK(p.valid());
+
+        while (!p.eof()) {
+            try {
+                const auto& t = p.template get_next<data>();
+                if (p.valid()) {
+                    i.push_back(t);
+                }
+            } catch (const ss::exception&) {
+                continue;
+            }
+        }
+
+        std::vector<data> expected = {{2.34, 1}, {67.8, 3}, {9.10, 5}};
+        CHECK_EQ(i, expected);
+    }
+
+    {
+        ss::parser<Ts...> p{f.name};
+
+        p.use_fields("String", "Double");
+        using data = std::tuple<std::string, double>;
+        std::vector<data> i;
+
+        CHECK(p.valid());
+
+        while (!p.eof()) {
+            try {
+                const auto& t = p.template get_next<data>();
+                if (p.valid()) {
+                    i.push_back(t);
+                }
+            } catch (const ss::exception&) {
+                continue;
+            }
+        }
+
+        std::vector<data> expected = {{"line1", 2.34},
+                                      {"line3", 67.8},
+                                      {"line5", 9.10},
+                                      {"line6", 10.11}};
+        CHECK_EQ(i, expected);
+    }
+}
+
+TEST_CASE("parser test invalid rows with header") {
+    test_invalid_rows_with_header();
+    test_invalid_rows_with_header<ss::string_error>();
+    test_invalid_rows_with_header<ss::throw_on_error>();
+}
+
 template <typename... Ts>
 void test_ignore_empty_impl(const std::vector<X>& data) {
     unique_file_name f{"test_parser"};
@@ -1582,3 +1743,4 @@ TEST_CASE("parser test various cases with empty lines") {
 
     test_ignore_empty({});
 }
+

test/test_splitter.cpp

@@ -775,6 +775,23 @@ TEST_CASE("splitter test resplit unterminated quote") {
             CHECK_EQ(words(vec), expected);
         }
     }
+
+    {
+        ss::converter<ss::quote<'"'>, ss::escape<'\\'>, ss::multiline> c;
+        auto& s = c.splitter;
+        auto vec = expect_unterminated_quote(s, R"("just\"some","ra)");
+        std::vector<std::string> expected{"just\"some"};
+        auto w = words(vec);
+        w.pop_back();
+        CHECK_EQ(w, expected);
+        REQUIRE(s.unterminated_quote());
+        {
+            auto new_line = buff.append(R"(n,dom",str\"ings)");
+            // invalid resplit size
+            vec = c.resplit(new_line, 4);
+            CHECK(!s.valid());
+        }
+    }
 }
 
 TEST_CASE("splitter test resplit unterminated quote with exceptions") {
@@ -1040,47 +1057,57 @@ TEST_CASE("splitter test resplit unterminated quote with exceptions") {
     }
 }
 
-TEST_CASE("splitter test invalid splits") {
+template <typename... Ts>
-    ss::converter<ss::string_error, ss::quote<'"'>, ss::trim<' '>,
+void test_invalid_splits() {
-                  ss::escape<'\\'>>
+    ss::converter<ss::quote<'"'>, ss::trim<' '>, ss::escape<'\\'>, Ts...> c;
-        c;
     auto& s = c.splitter;
 
+    auto check_error_msg = [&] {
+        if constexpr (ss::setup<Ts...>::string_error) {
+            CHECK_FALSE(s.error_msg().empty());
+        }
+    };
+
     // empty delimiter
     s.split(buff("some,random,strings"), "");
     CHECK_FALSE(s.valid());
     CHECK_FALSE(s.unterminated_quote());
-    CHECK_FALSE(s.error_msg().empty());
+    check_error_msg();
 
     // mismatched delimiter
     s.split(buff(R"(some,"random,"strings")"));
     CHECK_FALSE(s.valid());
     CHECK_FALSE(s.unterminated_quote());
-    CHECK_FALSE(s.error_msg().empty());
+    check_error_msg();
 
     // unterminated escape
     s.split(buff(R"(some,random,strings\)"));
     CHECK_FALSE(s.valid());
     CHECK_FALSE(s.unterminated_quote());
-    CHECK_FALSE(s.error_msg().empty());
+    check_error_msg();
 
     // unterminated escape
     s.split(buff(R"(some,random,"strings\)"));
     CHECK_FALSE(s.valid());
     CHECK_FALSE(s.unterminated_quote());
-    CHECK_FALSE(s.error_msg().empty());
+    check_error_msg();
 
     // unterminated quote
     s.split(buff("some,random,\"strings"));
     CHECK_FALSE(s.valid());
     CHECK(s.unterminated_quote());
-    CHECK_FALSE(s.error_msg().empty());
+    check_error_msg();
 
     // invalid resplit
     char new_line[] = "some";
     c.resplit(new_line, strlen(new_line));
     CHECK_FALSE(s.valid());
-    CHECK_FALSE(s.error_msg().empty());
+    check_error_msg();
+}
+
+TEST_CASE("splitter test invalid splits") {
+    test_invalid_splits();
+    test_invalid_splits<ss::string_error>();
 }
 
 TEST_CASE("splitter test invalid splits with exceptions") {