Merge pull request #26 from red0124/bugfix/terminated_escape_on_quoted_multiline

Fix bug where the parsing of data containing escaped new lines within…
Fix bug where the parsing of data containing escaped new lines within quotes would produce bad outputs
2025-12-15 22:29:55 +01:00 · 2023-07-31 23:05:52 +02:00 · 2023-07-31 21:49:15 +02:00 · 2023-07-29 16:51:34 +02:00 · 2023-07-29 16:25:26 +02:00 · 2023-07-29 16:11:27 +02:00
16 changed files with 232 additions and 261 deletions
--- a/.github/workflows/win-msvc.yml
+++ b/.github/workflows/win-msvc.yml
@@ -0,0 +1,63 @@
+name: win-msvc-ci
+
+on:
+  push:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+  pull_request:
+    branches:
+      - master
+      - feature/**
+      - improvement/**
+      - bugfix/**
+
+jobs:
+  ci:
+    if: >-
+      ! contains(toJSON(github.event.commits.*.message), '[skip ci]') &&
+      ! contains(toJSON(github.event.commits.*.message), '[skip github]')
+
+    defaults:
+      run:
+        shell: bash
+
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - os: windows-2019
+            vs: "Visual Studio 16 2019"
+
+          - os: windows-latest
+            vs: "Visual Studio 17 2022"
+
+        build: [Debug, Release]
+        platform: [Win32, x64]
+
+    name: "${{matrix.config.vs}}:${{matrix.platform}}:${{matrix.build}}"
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: script/ci_install_deps.sh
+
+      - name: Configure
+        run: >-
+          cmake -S test -B build -D CMAKE_BUILD_TYPE=${{matrix.build}}
+          -G "${{matrix.config.vs}}" -A ${{matrix.platform}}
+
+      - name: Build
+        run: cmake --build build -j ${{steps.cores.outputs.count}}
+
+      - name: Run
+        working-directory: build
+        run: >-
+          ctest -C Debug --output-on-failure -j ${{steps.cores.outputs.count}}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.14)

 project(
    ssp
-    VERSION 0.0.1
-    DESCRIPTION "Static split parser"
+    VERSION 1.4.0
+    DESCRIPTION "csv parser"
    HOMEPAGE_URL "https://github.com/red0124/ssp"
    LANGUAGES CXX
 )
@@ -11,22 +11,23 @@ project(
 # ---- Warning guard ----

 # Protect dependents from this project's warnings if the guard isn't disabled
-set(ssp_warning_guard SYSTEM)
-if(ssp_INCLUDE_WITHOUT_SYSTEM)
-  set(ssp_warning_guard "")
+set(SSP_WARNING_GUARD SYSTEM)
+if(SSP_INCLUDE_WITHOUT_SYSTEM)
+    set(SSP_WARNING_GUARD "")
 endif()

 # ---- Dependencies ----

 include(FetchContent)
-FetchContent_Declare(
+fetchcontent_declare(
    fast_float
    GIT_REPOSITORY https://github.com/red0124/fast_float.git
    GIT_TAG origin/meson
-  GIT_SHALLOW TRUE)
+    GIT_SHALLOW TRUE
+)

-FetchContent_MakeAvailable(fast_float)
-set(fast_float_source_dir "${FETCHCONTENT_BASE_DIR}/fast_float-src")
+fetchcontent_makeavailable(fast_float)
+set(FAST_FLOAT_SOURCE_DIR "${FETCHCONTENT_BASE_DIR}/fast_float-src")

 # ---- Declare library ----

@@ -35,7 +36,7 @@ add_library(ssp::ssp ALIAS ssp)

 target_include_directories(
    ssp
-    ${ssp_warning_guard}
+    ${SSP_WARNING_GUARD}
    INTERFACE
        "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
        "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/fast_float>"
@@ -55,19 +56,21 @@ target_link_libraries(
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)

-set(ssp_directory "ssp-${PROJECT_VERSION}")
-set(ssp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}")
+set(SSP_DIRECTORY "ssp-${PROJECT_VERSION}")
+set(SSP_INCLUDE_DIRECTORY "${CMAKE_INSTALL_INCLUDEDIR}")

 install(
-    DIRECTORY "${PROJECT_SOURCE_DIR}/include/" "${fast_float_source_dir}/include/"
-    DESTINATION "${ssp_include_directory}"
+    DIRECTORY
+        "${PROJECT_SOURCE_DIR}/include/"
+        "${FAST_FLOAT_SOURCE_DIR}/include/"
+    DESTINATION "${SSP_INCLUDE_DIRECTORY}"
    COMPONENT ssp_Development
 )

 install(
    TARGETS ssp
    EXPORT sspTargets
-    INCLUDES DESTINATION "${ssp_include_directory}"
+    INCLUDES DESTINATION "${SSP_INCLUDE_DIRECTORY}"
 )

 write_basic_package_version_file(
@@ -76,11 +79,11 @@ write_basic_package_version_file(
    ARCH_INDEPENDENT
 )

-set(ssp_install_cmakedir "${CMAKE_INSTALL_LIBDIR}/cmake/${ssp_directory}")
+set(SSP_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${SSP_DIRECTORY}")

 install(
    FILES "${PROJECT_BINARY_DIR}/ssp-config-version.cmake"
-    DESTINATION "${ssp_install_cmakedir}"
+    DESTINATION "${SSP_INSTALL_CMAKEDIR}"
    COMPONENT ssp_Development
 )

@@ -88,7 +91,7 @@ install(
    EXPORT sspTargets
    FILE ssp-config.cmake
    NAMESPACE ssp::
-    DESTINATION "${ssp_install_cmakedir}"
+    DESTINATION "${SSP_INSTALL_CMAKEDIR}"
    COMPONENT ssp_Development
 )

--- a/README.md
+++ b/README.md
@@ -8,11 +8,12 @@
 ```

 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
-![ubuntu-latest-gcc](https://github.com/red0124/ssp/workflows/ubuntu-latest-gcc-ci/badge.svg)
-![ubuntu-latest-clang](https://github.com/red0124/ssp/workflows/ubuntu-latest-clang-ci/badge.svg)
-![ubuntu-latest-icc](https://github.com/red0124/ssp/workflows/ubuntu-latest-icc-ci/badge.svg)
-![windows-msys2-gcc](https://github.com/red0124/ssp/workflows/win-msys2-gcc-ci/badge.svg)
-![windows-msys2-clang](https://github.com/red0124/ssp/workflows/win-msys2-clang-ci/badge.svg)   
+[![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)

 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)

@@ -53,20 +54,20 @@ Brian S. Wolfe 40 1.9
 Bill (Heath) Gates 65 3.3
 ```
 # Features
- * [Works on any type](#Custom-conversions)
+ * [Works on any type](#custom-conversions)
 * Easy to use
 * No exceptions
- * [Works with headers](#Headers)
- * [Works with quotes, escapes and spacings](#Setup)
- * [Works with values containing new lines](#Multiline)
- * [Columns and rows can be ignored](#Special-types)
+ * [Works with headers](#headers)
+ * [Works with quotes, escapes and spacings](#setup)
+ * [Works with values containing new lines](#multiline)
+ * [Columns and rows can be ignored](#special-types)
 * Works with any type of delimiter
 * Can return whole objects composed of converted values
- * [Descriptive error handling can be enabled](#Error-handling)
- * [Restrictions can be added for each column](#Restrictions)
- * [Works with `std::optional` and `std::variant`](#Special-types)
+ * [Descriptive error handling can be enabled](#error-handling)
+ * [Restrictions can be added for each column](#restrictions)
+ * [Works with `std::optional` and `std::variant`](#special-types)
 * Works with **`CRLF`** and **`LF`**
- * [Conversions can be chained if invalid](#Substitute-conversions)
+ * [Conversions can be chained if invalid](#substitute-conversions)
 * Fast

 # Single header
@@ -378,7 +379,7 @@ if(std::holds_alternative<float>(grade)) {
 ```
 ## Restrictions

-Custom **`restrictions`** can be used to narrow down the conversions of unwanted values. **`ss::ir`** (in range) and **`ss::ne`** (none empty) are one of those:
+Custom **`restrictions`** can be used to narrow down the conversions of unwanted values. **`ss::ir`** (in range) and **`ss::ne`** (none empty) are some of those:
 ```cpp
 // ss::ne makes sure that the name is not empty
 // ss::ir makes sure that the grade will be in range [0, 10]
@@ -472,7 +473,6 @@ The delimiter is " ", and the number of columns varies depending on which shape
 ```cpp
 ss::parser p{"shapes.txt", " "};
 if (!p.valid()) {
-    std::cout << p.error_msg() << std::endl;
    exit(EXIT_FAILURE);
 }

@@ -632,6 +632,5 @@ revision = origin/master
 ```
 Then simply fetch the dependency and it is ready to be used:
 ```meson
-ssp_sub = subproject('ssp')
-ssp_dep = ssp_sub.get_variable('ssp_dep')
+ssp_dep = dependency('ssp')
 ```
--- a/include/ss/converter.hpp
+++ b/include/ss/converter.hpp
@@ -102,7 +102,7 @@ class converter {
    constexpr static auto string_error = setup<Matchers...>::string_error;
    constexpr static auto default_delimiter = ",";

-    using error_type = ss::ternary_t<string_error, std::string, bool>;
+    using error_type = std::conditional_t<string_error, std::string, bool>;

 public:
    // parses line with given delimiter, returns a 'T' object created with
@@ -194,7 +194,7 @@ private:
    ////////////////

    const split_data& resplit(line_ptr_type new_line, ssize_t new_size,
-                              const std::string& delim = default_delimiter) {
+                              const std::string& delim) {
        return splitter_.resplit(new_line, new_size, delim);
    }

--- a/include/ss/parser.hpp
+++ b/include/ss/parser.hpp
@@ -17,7 +17,7 @@ class parser {
    constexpr static auto string_error = setup<Matchers...>::string_error;

    using multiline = typename setup<Matchers...>::multiline;
-    using error_type = ss::ternary_t<string_error, std::string, bool>;
+    using error_type = std::conditional_t<string_error, std::string, bool>;

    constexpr static bool escaped_multiline_enabled =
        multiline::enabled && setup<Matchers...>::escape::enabled;
@@ -151,8 +151,8 @@ public:
    template <bool get_object, typename T, typename... Ts>
    struct iterable {
        struct iterator {
-            using value =
-                ss::ternary_t<get_object, T, no_void_validator_tup_t<T, Ts...>>;
+            using value = std::conditional_t<get_object, T,
+                                             no_void_validator_tup_t<T, Ts...>>;

            iterator() : parser_{nullptr} {
            }
@@ -600,6 +600,8 @@ private:

            if constexpr (quoted_multiline_enabled) {
                while (unterminated_quote()) {
+                    size -= next_line_converter_.size_shifted();
+
                    if (multiline_limit_reached(limit)) {
                        return true;
                    }
@@ -623,7 +625,8 @@ private:
                        }
                    }

-                    next_line_converter_.resplit(next_line_buffer_, size);
+                    next_line_converter_.resplit(next_line_buffer_, size,
+                                                 delim_);
                }
            }

@@ -664,9 +667,6 @@ private:
        }

        void undo_remove_eol(char* buffer, size_t& string_end) {
-            if (next_line_converter_.unterminated_quote()) {
-                string_end -= next_line_converter_.size_shifted();
-            }
            if (crlf_) {
                std::copy_n("\r\n\0", 3, buffer + string_end);
                string_end += 2;
--- a/include/ss/setup.hpp
+++ b/include/ss/setup.hpp
@@ -109,9 +109,9 @@ struct get_matcher<Matcher, T, Ts...> {
    struct is_matcher : is_instance_of_matcher<U, Matcher> {};

    static_assert(count_v<is_matcher, T, Ts...> <= 1,
-                  "the same matcher is cannot"
+                  "the same matcher cannot"
                  "be defined multiple times");
-    using type = ternary_t<is_matcher<T>::value, T,
+    using type = std::conditional_t<is_matcher<T>::value, T,
                                    typename get_matcher<Matcher, Ts...>::type>;
 };

@@ -149,7 +149,7 @@ struct get_multiline;

 template <typename T, typename... Ts>
 struct get_multiline<T, Ts...> {
-    using type = ternary_t<is_instance_of_multiline<T>::value, T,
+    using type = std::conditional_t<is_instance_of_multiline<T>::value, T,
                                    typename get_multiline<Ts...>::type>;
 };

@@ -227,8 +227,10 @@ public:
    using quote = get_matcher_t<quote, Ts...>;
    using escape = get_matcher_t<escape, Ts...>;

-    using trim_left = ternary_t<trim_all::enabled, trim_all, trim_left_only>;
-    using trim_right = ternary_t<trim_all::enabled, trim_all, trim_right_only>;
+    using trim_left =
+        std::conditional_t<trim_all::enabled, trim_all, trim_left_only>;
+    using trim_right =
+        std::conditional_t<trim_all::enabled, trim_all, trim_right_only>;

    using multiline = get_multiline_t<Ts...>;
    constexpr static bool string_error = (count_string_error == 1);
--- a/include/ss/splitter.hpp
+++ b/include/ss/splitter.hpp
@@ -23,10 +23,10 @@ private:
    constexpr static auto string_error = setup<Ts...>::string_error;
    constexpr static auto is_const_line = !quote::enabled && !escape::enabled;

-    using error_type = ss::ternary_t<string_error, std::string, bool>;
+    using error_type = std::conditional_t<string_error, std::string, bool>;

 public:
-    using line_ptr_type = ternary_t<is_const_line, const char*, char*>;
+    using line_ptr_type = std::conditional_t<is_const_line, const char*, char*>;

    bool valid() const {
        if constexpr (string_error) {
--- a/include/ss/type_traits.hpp
+++ b/include/ss/type_traits.hpp
@@ -357,26 +357,6 @@ struct is_instance_of<Template, Template<Ts...>> {
 template <template <typename...> class Template, typename... Ts>
 constexpr bool is_instance_of_v = is_instance_of<Template, Ts...>::value;

-////////////////
-// ternary
-////////////////
-
-template <bool B, typename T, typename U>
-struct ternary;
-
-template <typename T, typename U>
-struct ternary<true, T, U> {
-    using type = T;
-};
-
-template <typename T, typename U>
-struct ternary<false, T, U> {
-    using type = U;
-};
-
-template <bool B, typename T, typename U>
-using ternary_t = typename ternary<B, T, U>::type;
-
 ////////////////
 // tuple to struct
 ////////////////
--- a/meson.build
+++ b/meson.build
@@ -1,17 +1,24 @@
-project('ssp', 'cpp', 
+project(
+  'ssp', 
+  ['cpp'], 
  default_options : 
    ['warning_level=3', 
      'cpp_std=c++17', 
-    'buildtype=debugoptimized'])
+      'buildtype=debugoptimized',
+      'wrap_mode=forcefallback'],
+  version: '1.4.0',
+  meson_version:'>=0.54.0')

-fast_float_sub = subproject('fast_float')
-fast_float_dep = fast_float_sub.get_variable('fast_float_dep')
+fast_float_dep = dependency('fast_float')

 ssp_dep = declare_dependency(
  include_directories: include_directories('include'),
  dependencies: fast_float_dep
  )

+meson.override_dependency('ssp', ssp_dep)
+
 if not meson.is_subproject()
  subdir('test')
 endif
+
--- a/script/ci_install_deps.sh
+++ b/script/ci_install_deps.sh
@@ -5,7 +5,7 @@ BUILD_TYPE=Debug

 set -eux

-git clone https://github.com/onqtam/doctest -b 2.4.4 --depth 1
+git clone https://github.com/red0124/doctest -b master --depth 1

 cmake -S doctest -B doctest/build \
    -D CMAKE_BUILD_TYPE=${BUILD_TYPE} \
--- a/ssp.hpp
+++ b/ssp.hpp
@@ -372,26 +372,6 @@ struct is_instance_of<Template, Template<Ts...>> {
 template <template <typename...> class Template, typename... Ts>
 constexpr bool is_instance_of_v = is_instance_of<Template, Ts...>::value;

-////////////////
-// ternary
-////////////////
-
-template <bool B, typename T, typename U>
-struct ternary;
-
-template <typename T, typename U>
-struct ternary<true, T, U> {
-    using type = T;
-};
-
-template <typename T, typename U>
-struct ternary<false, T, U> {
-    using type = U;
-};
-
-template <bool B, typename T, typename U>
-using ternary_t = typename ternary<B, T, U>::type;
-
 ////////////////
 // tuple to struct
 ////////////////
@@ -797,9 +777,9 @@ struct get_matcher<Matcher, T, Ts...> {
    struct is_matcher : is_instance_of_matcher<U, Matcher> {};

    static_assert(count_v<is_matcher, T, Ts...> <= 1,
-                  "the same matcher is cannot"
+                  "the same matcher cannot"
                  "be defined multiple times");
-    using type = ternary_t<is_matcher<T>::value, T,
+    using type = std::conditional_t<is_matcher<T>::value, T,
                                    typename get_matcher<Matcher, Ts...>::type>;
 };

@@ -837,7 +817,7 @@ struct get_multiline;

 template <typename T, typename... Ts>
 struct get_multiline<T, Ts...> {
-    using type = ternary_t<is_instance_of_multiline<T>::value, T,
+    using type = std::conditional_t<is_instance_of_multiline<T>::value, T,
                                    typename get_multiline<Ts...>::type>;
 };

@@ -915,8 +895,10 @@ public:
    using quote = get_matcher_t<quote, Ts...>;
    using escape = get_matcher_t<escape, Ts...>;

-    using trim_left = ternary_t<trim_all::enabled, trim_all, trim_left_only>;
-    using trim_right = ternary_t<trim_all::enabled, trim_all, trim_right_only>;
+    using trim_left =
+        std::conditional_t<trim_all::enabled, trim_all, trim_left_only>;
+    using trim_right =
+        std::conditional_t<trim_all::enabled, trim_all, trim_right_only>;

    using multiline = get_multiline_t<Ts...>;
    constexpr static bool string_error = (count_string_error == 1);
@@ -973,10 +955,10 @@ private:
    constexpr static auto string_error = setup<Ts...>::string_error;
    constexpr static auto is_const_line = !quote::enabled && !escape::enabled;

-    using error_type = ss::ternary_t<string_error, std::string, bool>;
+    using error_type = std::conditional_t<string_error, std::string, bool>;

 public:
-    using line_ptr_type = ternary_t<is_const_line, const char*, char*>;
+    using line_ptr_type = std::conditional_t<is_const_line, const char*, char*>;

    bool valid() const {
        if constexpr (string_error) {
@@ -1838,7 +1820,7 @@ class converter {
    constexpr static auto string_error = setup<Matchers...>::string_error;
    constexpr static auto default_delimiter = ",";

-    using error_type = ss::ternary_t<string_error, std::string, bool>;
+    using error_type = std::conditional_t<string_error, std::string, bool>;

 public:
    // parses line with given delimiter, returns a 'T' object created with
@@ -1930,7 +1912,7 @@ private:
    ////////////////

    const split_data& resplit(line_ptr_type new_line, ssize_t new_size,
-                              const std::string& delim = default_delimiter) {
+                              const std::string& delim) {
        return splitter_.resplit(new_line, new_size, delim);
    }

@@ -2227,7 +2209,7 @@ class parser {
    constexpr static auto string_error = setup<Matchers...>::string_error;

    using multiline = typename setup<Matchers...>::multiline;
-    using error_type = ss::ternary_t<string_error, std::string, bool>;
+    using error_type = std::conditional_t<string_error, std::string, bool>;

    constexpr static bool escaped_multiline_enabled =
        multiline::enabled && setup<Matchers...>::escape::enabled;
@@ -2361,8 +2343,8 @@ public:
    template <bool get_object, typename T, typename... Ts>
    struct iterable {
        struct iterator {
-            using value =
-                ss::ternary_t<get_object, T, no_void_validator_tup_t<T, Ts...>>;
+            using value = std::conditional_t<get_object, T,
+                                             no_void_validator_tup_t<T, Ts...>>;

            iterator() : parser_{nullptr} {
            }
@@ -2810,6 +2792,8 @@ private:

            if constexpr (quoted_multiline_enabled) {
                while (unterminated_quote()) {
+                    size -= next_line_converter_.size_shifted();
+
                    if (multiline_limit_reached(limit)) {
                        return true;
                    }
@@ -2833,7 +2817,8 @@ private:
                        }
                    }

-                    next_line_converter_.resplit(next_line_buffer_, size);
+                    next_line_converter_.resplit(next_line_buffer_, size,
+                                                 delim_);
                }
            }

@@ -2874,9 +2859,6 @@ private:
        }

        void undo_remove_eol(char* buffer, size_t& string_end) {
-            if (next_line_converter_.unterminated_quote()) {
-                string_end -= next_line_converter_.size_shifted();
-            }
            if (crlf_) {
                std::copy_n("\r\n\0", 3, buffer + string_end);
                string_end += 2;
--- a/subprojects/doctest.wrap
+++ b/subprojects/doctest.wrap
@@ -1,3 +1,3 @@
 [wrap-git]
-url = https://github.com/onqtam/doctest
-revision = 2.4.4
+url = https://github.com/red0124/doctest
+revision = master
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,25 +4,24 @@ project(ssp_tests CXX)

 # ---- Dependencies ----

-set(
-    ssp_INCLUDE_WITHOUT_SYSTEM
-    YES
-    CACHE
-    INTERNAL
-    "Turn the warning guard off to have errors appear in test builds"
-)
-
 include(FetchContent)
-FetchContent_Declare(ssp SOURCE_DIR "${PROJECT_SOURCE_DIR}/..")
-FetchContent_MakeAvailable(ssp)
+fetchcontent_declare(ssp SOURCE_DIR "${PROJECT_SOURCE_DIR}/..")
+fetchcontent_makeavailable(ssp)

 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
    target_compile_options(ssp INTERFACE -Wall -Wextra)
 endif()

-find_package(doctest 2.4.4 CONFIG REQUIRED)
-# for doctest_discover_tests
-include(doctest)
+include(FetchContent)
+fetchcontent_declare(
+    DOCTEST
+    GIT_REPOSITORY https://github.com/red0124/doctest
+    GIT_TAG origin/master
+    GIT_SHALLOW TRUE
+)
+
+fetchcontent_makeavailable(DOCTEST)
+set(DOCTEST "${FETCHCONTENT_BASE_DIR}/doctest-src")

 # ---- Test ----

@@ -30,8 +29,13 @@ enable_testing()

 foreach(name IN ITEMS test_splitter test_parser test_converter test_extractions)
    add_executable("${name}" "${name}.cpp")
-  target_link_libraries("${name}" PRIVATE ssp::ssp fast_float doctest::doctest)
-  target_compile_definitions("${name}" PRIVATE
-    DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN CMAKE_GITHUB_CI)
-  doctest_discover_tests("${name}")
+    target_link_libraries(
+        "${name}"
+        PRIVATE ssp::ssp fast_float doctest::doctest
+    )
+    target_compile_definitions(
+        "${name}"
+        PRIVATE DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN CMAKE_GITHUB_CI
+    )
+    add_test(NAME "${name}" COMMAND "${name}")
 endforeach()
--- a/test/meson.build
+++ b/test/meson.build
@@ -7,8 +7,7 @@ test_sources = files([
      'test_extractions_without_fast_float.cpp',
      ])

-doctest_proj = subproject('doctest')
-doctest_dep = doctest_proj.get_variable('doctest_dep')
+doctest_dep = dependency('doctest')

 test_exe = executable(
  'test_ssp',
--- a/test/test_helpers.hpp
+++ b/test/test_helpers.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include <cstdlib>
-#include <cstring>
+
+#include <string>

 #ifdef CMAKE_GITHUB_CI
 #include <doctest/doctest.h>
@@ -9,40 +9,22 @@
 #endif

 struct buffer {
-    char* data_{nullptr};
+  std::string data_;

-    char* operator()(const char* data) {
-        if (data_) {
-            delete[] data_;
-        }
-        data_ = new char[strlen(data) + 1];
-        strcpy(data_, data);
-        return data_;
+  char *operator()(const std::string &data) {
+    data_ = data;
+    return data_.data();
  }

-    char* append(const char* data) {
-        if (data_) {
-            char* new_data_ = new char[strlen(data_) + strlen(data) + 1];
-            strcpy(new_data_, data_);
-            strcat(new_data_, data);
-            delete[] data_;
-            data_ = new_data_;
-            return data_;
-        } else {
-            return operator()(data);
-        }
+  char *append(const std::string &data) {
+    data_ += data;
+    return data_.data();
  }

-    char* append_overwrite_last(const char* data, size_t size) {
-        data_[strlen(data_) - size] = '\0';
+  char *append_overwrite_last(const std::string &data, size_t size) {
+    data_.resize(data_.size() - size);
    return append(data);
  }
-
-    ~buffer() {
-        if (data_) {
-            delete[] data_;
-        }
-    }
 };

 [[maybe_unused]] inline buffer buff;
--- a/test/test_parser.cpp
+++ b/test/test_parser.cpp
@@ -283,7 +283,7 @@ TEST_CASE("parser test various cases") {
        }

        std::copy_if(data.begin(), data.end(), expected.begin(),
-                     [](const X& x) { return x.i != excluded; });
+                     [&](const X& x) { return x.i != excluded; });
        CHECK_EQ(i, expected);
        CHECK_EQ(i2, expected);
    }
@@ -378,7 +378,7 @@ TEST_CASE("parser test composite conversion") {
            p.try_next<int, int, double>(fail)
                .or_else<test_struct>(fail)
                .or_else<int, char, double>(
-                    [](auto&& data) { CHECK_EQ(data, expectedData); })
+                    [&](auto&& data) { CHECK_EQ(data, expectedData); })
                .on_error(fail)
                .or_else<test_tuple>(fail)
                .values();
@@ -396,7 +396,7 @@ TEST_CASE("parser test composite conversion") {
        constexpr static auto expectedData = std::tuple{10, 20, 11.1};

        auto [d1, d2, d3, d4] =
-            p.try_next<int, int, double>([](auto& i1, auto i2, double d) {
+            p.try_next<int, int, double>([&](auto& i1, auto i2, double d) {
                 CHECK_EQ(std::tie(i1, i2, d), expectedData);
             })
                .on_error(fail)
@@ -564,8 +564,6 @@ TEST_CASE("parser test composite conversion") {
    CHECK(p.eof());
 }

-size_t move_called = 0;
-
 struct my_string {
    char* data{nullptr};

@@ -580,12 +578,10 @@ struct my_string {
    my_string& operator=(const my_string&) = delete;

    my_string(my_string&& other) : data{other.data} {
-        move_called++;
        other.data = nullptr;
    }

    my_string& operator=(my_string&& other) {
-        move_called++;
        data = other.data;
        return *this;
    }
@@ -609,52 +605,6 @@ struct xyz {
    }
 };

-TEST_CASE("parser test the moving of parsed values") {
-    size_t move_called_one_col;
-
-    {
-        unique_file_name f;
-        {
-            std::ofstream out{f.name};
-            out << "x" << std::endl;
-        }
-
-        ss::parser p{f.name, ","};
-        auto x = p.get_next<my_string>();
-        CHECK_LT(move_called, 3);
-        move_called_one_col = move_called;
-        move_called = 0;
-    }
-
-    unique_file_name f;
-    {
-        std::ofstream out{f.name};
-        out << "a,b,c" << std::endl;
-    }
-
-    {
-
-        ss::parser p{f.name, ","};
-        auto x = p.get_next<my_string, my_string, my_string>();
-        CHECK_LE(move_called, 3 * move_called_one_col);
-        move_called = 0;
-    }
-
-    {
-        ss::parser p{f.name, ","};
-        auto x = p.get_object<xyz, my_string, my_string, my_string>();
-        CHECK_LE(move_called, 6 * move_called_one_col);
-        move_called = 0;
-    }
-
-    {
-        ss::parser p{f.name, ","};
-        auto x = p.get_next<xyz>();
-        CHECK_LE(move_called, 6 * move_called_one_col);
-        move_called = 0;
-    }
-}
-
 TEST_CASE("parser test the moving of parsed composite values") {
    // to compile is enough
    return;
Author	SHA1	Message	Date
red0124	57abdb3923	Merge pull request #26 from red0124/bugfix/terminated_escape_on_quoted_multiline Fix bug where the parsing of data containing escaped new lines within…	2023-07-31 23:05:52 +02:00
ado	27ef7f2e21	Fix bug where the parsing of data containing escaped new lines within quotes would produce bad outputs	2023-07-31 21:49:15 +02:00
ado	f58091cf02	Fix test_parser.cpp formating	2023-07-29 16:51:34 +02:00
red0124	78c75abec7	Merge pull request #25 from red0124/feature/win_msvc_ci Feature/win msvc ci	2023-07-29 16:25:26 +02:00
ado	76091263f2	Fix win-msvc ci badge	2023-07-29 16:11:27 +02:00
ado	d99cba274e	Add win-msvc ci badge	2023-07-29 16:08:33 +02:00
ado	e70fc05646	Fix msvc ci configure step	2023-07-29 15:39:51 +02:00
ado	21d1096edf	Fix msvc ci yaml issues	2023-07-29 15:37:53 +02:00
ado	72b74a3b64	Fix msvc ci configure step	2023-07-29 15:35:29 +02:00
ado	b7f6009eb9	Fix msvc ci yaml issues	2023-07-29 15:30:05 +02:00
ado	bdfd896861	Fix msvc vs 16 ci	2023-07-29 15:17:39 +02:00
ado	d6bc8086b2	Fix msvc ci configure step	2023-07-29 15:03:25 +02:00
ado	f762736da2	Fix msvc ci configure step	2023-07-29 14:59:49 +02:00
ado	739077a8db	Fix msvc ci vs version names	2023-07-29 14:54:25 +02:00
ado	3dcb2ce2ef	Add vs16 for msvc ci	2023-07-29 14:22:41 +02:00
ado	e4d9e10ac3	Update msvc ci	2023-07-29 14:14:02 +02:00
ado	a98742945b	Update test helpers	2023-07-29 13:56:00 +02:00
ado	5d6c2c4af5	Remove move count unit test from parser tests	2023-07-29 01:44:19 +02:00
ado	58857fff2d	Add config option for ctest within win-msvc.yml	2023-07-29 01:18:11 +02:00
ado	e6a7e09975	Add config option for ctest within win-msvc.yml	2023-07-29 01:18:01 +02:00
ado	705ce422f0	Add constexpr values to lambda to handle msvc issue with respect to captured constexpr values	2023-07-29 01:11:29 +02:00
ado	75f5ee2a55	Add _CRT_SECURE_NO_WARNINGS define to remove msvc warnings	2023-07-29 00:56:08 +02:00
ado	6baeb2d598	Add _CRT_SECURE_NO_WARNINGS define to remove msvc warnings	2023-07-29 00:53:04 +02:00
ado	7b1f49d304	Add _CRT_SECURE_NO_WARNINGS define to remove msvc warnings	2023-07-29 00:49:06 +02:00
ado	515ddad997	Add _CRT_SECURE_NO_WARNINGS define to remove msvc warnings	2023-07-29 00:45:33 +02:00
ado	fd39b5eef2	Try msvc ci	2023-07-29 00:38:27 +02:00
red0124	77185cb366	Merge pull request #24 from red0124/improvement/markdown_cicd_badge_link Add hyperlink for cicd badges	2023-07-28 21:30:10 +02:00
ado	ad991d6a7d	Add hyperlink for cicd badges	2023-07-28 21:28:32 +02:00
red0124	304ca6ef0f	Merge pull request #23 from red0124/bugfix/single_header_include_update Update ssp.hpp to handle issue fixed in the previous commit	2023-07-25 11:24:54 +02:00
ado	103ff33f21	Update ssp.hpp to handle issue fixed in the previous commit	2023-07-25 11:13:32 +02:00
red0124	8b928de086	Merge pull request #22 from red0124/bugfix/multiline_on_custom_delimiter Fix bug where the default delimiter would be used for multiline data	2023-07-25 00:46:43 +02:00
ado	6edce88d79	Fix bug where the default delimiter would be used for multiline data	2023-07-25 00:36:53 +02:00
red0124	6196f7796b	Merge pull request #21 from red0124/improvement/markdown_labels Update README links to sections	2023-07-20 00:21:38 +02:00
ado	5672aa635e	Update README links to sections	2023-07-20 00:19:31 +02:00
ado	3eefac93b1	Fix README issues	2023-05-25 01:10:37 +02:00
ado	774f452689	fix typo	2023-03-19 19:48:22 +01:00
ado	448066b173	Update version	2023-02-18 14:20:32 +01:00
red0124	a7eca6064a	Merge pull request #20 from red0124/improvement/conditional_t Replace ss::ternary_t with std::conditional_t	2023-02-12 12:57:36 +01:00
ado	a4ecbd4dc8	Replace ss::ternary_t with std::conditional_t	2023-02-12 12:45:49 +01:00
red0124	a9e9783e6a	Merge pull request #19 from red0124/improvement/doctest_update Make project used forked doctest	2023-02-12 12:38:34 +01:00
ado	04edf1e532	Make project used forked doctest	2023-02-12 12:23:25 +01:00
red0124	8dcb69aa2c	Merge pull request #18 from red0124/improvement/cmake_update Update CMake files	2023-02-09 20:20:27 +01:00
ado	db2a72c18b	Update CMake files	2023-02-08 21:54:44 +01:00
red0124	0e28a06799	Merge pull request #17 from red0124/improvement/meson_update Improvement/meson update	2023-02-07 23:29:29 +01:00
ado	2218b01b81	Merge remote-tracking branch 'origin/master' into improvement/meson_update	2023-02-07 23:22:36 +01:00
ado	f777b04eb8	Fix failing mingw unit test	2023-02-01 22:45:50 +01:00
ado	7831bbd735	Add forcefallback wrap_mode option in meson.build	2023-02-01 01:22:43 +01:00
ado	6efb39b2db	Add version number to meson.build	2023-02-01 00:57:32 +01:00
ado	f2b49e6d6c	Update meson dependency usage	2023-02-01 00:52:23 +01:00
ado	5cb3c65b24	Update doctest revision	2023-01-31 21:23:04 +01:00