mirror of
https://github.com/red0124/ssp.git
synced 2025-12-14 21:59:55 +01:00
Compare commits
227 Commits
v1.2.0
...
5e32d722e8
| Author | SHA1 | Date | |
|---|---|---|---|
| 5e32d722e8 | |||
| 59f6591da3 | |||
| 9d96a7d47f | |||
| d4fc2ee561 | |||
| d422667477 | |||
| aaa22046a5 | |||
| 775b8c93e2 | |||
| e4fba8a918 | |||
| 11d57bd073 | |||
| 45b840a30a | |||
| 8bb773625b | |||
| 0466c7234c | |||
| d21c387a33 | |||
| d019edb2bf | |||
| a2666816de | |||
| 417a03a8a4 | |||
| baf4317ffa | |||
| 63a618957b | |||
| dbaa8131e7 | |||
| ef8cf30919 | |||
| 42d618ed64 | |||
| 8b07f7d6cb | |||
| 82f8ed12b4 | |||
| e89e268280 | |||
| aacf690640 | |||
| f8c5757d99 | |||
| ce03c371ae | |||
| 6c859959d6 | |||
| 4434db29f6 | |||
|
|
fdd153b63e | ||
| c05ab35a33 | |||
| 8d1637cad1 | |||
| 7530be1c44 | |||
| 7062888d72 | |||
| f04ede3a49 | |||
| 4bedc32b63 | |||
| 7822351a0b | |||
| a755f6c455 | |||
|
|
4db88c0490 | ||
| 8b72deb1ed | |||
| 672b89b213 | |||
| b9d2c2aad9 | |||
| 32cbfe1d17 | |||
| 848689451c | |||
| b7e5dd28b8 | |||
| e316558a7b | |||
| 1c6eacad30 | |||
| 5ac506d8f0 | |||
| 6e27f35209 | |||
| 49a3a20e68 | |||
| 1d0911ab3c | |||
| 7d3d02f11d | |||
| 17c21e260f | |||
| 2504c3574d | |||
| 0bd78120f3 | |||
| ed8f4e3147 | |||
| d4c9227830 | |||
| f232c7d995 | |||
| 14ccb88664 | |||
|
|
34833837ba | ||
| 5f27595ec1 | |||
| 65371d05f3 | |||
| 31b924736f | |||
| ffca94d47d | |||
| 7ba66ff99d | |||
| f1e127dd2b | |||
| 3e3eb1b61c | |||
| b9d8eb860e | |||
| 4139b50cd9 | |||
| 8924ad12e5 | |||
| 254bd24bbd | |||
| 55d1bbcf86 | |||
| 3e3c922624 | |||
| c0e6e56364 | |||
| 66f57ba66a | |||
| d37ec12bb5 | |||
| 9d7441b178 | |||
| dcf7e924ad | |||
| 41c4bf9d35 | |||
| 7b16f24d03 | |||
|
|
db582709d4 | ||
| deee577c1f | |||
| 535138d9b8 | |||
| f106889ada | |||
| e7045ce437 | |||
| d86c8e9fe8 | |||
| c0ef691889 | |||
| 80c189f9c5 | |||
| 07373ea043 | |||
| 236b5da9c2 | |||
| a1f01ec5cb | |||
| cd6c2df359 | |||
| 9afe24785b | |||
| 479cf4bbe7 | |||
| 6d1aa7c7a9 | |||
| 5fd6b561ed | |||
| 1176c42fba | |||
|
|
e3c7db53f7 | ||
| b913344722 | |||
| 7df96d95c7 | |||
| 6b4f456654 | |||
| 9c11f22d79 | |||
| 975ef2e4a5 | |||
| 2c7bc763a5 | |||
| a152a8cb4a | |||
| a378998e34 | |||
| 77a69fbd6d | |||
| 6a3ba48a2c | |||
| 911d81248b | |||
| b6cef9577d | |||
| 48117c038a | |||
| 3c0a440fe9 | |||
| 974257e099 | |||
| 6a832ba11a | |||
| 0e184d07ce | |||
| f17a3bdc59 | |||
| 952ff236ff | |||
| 7d44d503d9 | |||
| 2e1c4c97ec | |||
| 7c9ba953ad | |||
| 3170cb661c | |||
| 03870aa1ba | |||
| 2b132bc33a | |||
| a7ea9e42e5 | |||
| 81484f737f | |||
| 634abdd38b | |||
| c981ed6644 | |||
| 5173e7afbc | |||
| 5963df5ffd | |||
| 19538597e5 | |||
| 7656ba0a55 | |||
| 761445bd36 | |||
| 62e19df343 | |||
| 0858369c7d | |||
| 2fe2c391fe | |||
|
|
57abdb3923 | ||
| 5f46259914 | |||
| fbe19de70c | |||
| 27ef7f2e21 | |||
| 1d94989a4d | |||
| 84a7d46cbf | |||
| 9bf1dd6041 | |||
| ed71d963e0 | |||
| d9384f5d84 | |||
| a7608d825e | |||
| ba45fe1839 | |||
| 37f1fb534f | |||
| e32905b59d | |||
| d6cf9bd006 | |||
| f28f000035 | |||
| 560bf815dc | |||
| f58091cf02 | |||
| a9903f7441 | |||
|
|
78c75abec7 | ||
| 76091263f2 | |||
| d99cba274e | |||
| e70fc05646 | |||
| 21d1096edf | |||
| 72b74a3b64 | |||
| b7f6009eb9 | |||
| bdfd896861 | |||
| d6bc8086b2 | |||
| f762736da2 | |||
| 739077a8db | |||
| 3dcb2ce2ef | |||
| e4d9e10ac3 | |||
| a98742945b | |||
| 5d6c2c4af5 | |||
| 58857fff2d | |||
| e6a7e09975 | |||
| 705ce422f0 | |||
| 75f5ee2a55 | |||
| 6baeb2d598 | |||
| 7b1f49d304 | |||
| 515ddad997 | |||
| fd39b5eef2 | |||
|
|
77185cb366 | ||
| ad991d6a7d | |||
| 31cbd20f8f | |||
|
|
304ca6ef0f | ||
| 103ff33f21 | |||
| 6dfc30d5c9 | |||
| a6db4a7ad2 | |||
| 77631b8c0d | |||
|
|
8b928de086 | ||
| 6edce88d79 | |||
| 7d0a5598a8 | |||
|
|
6196f7796b | ||
| 5672aa635e | |||
| 29c471e33a | |||
| 0ff86630f8 | |||
| 5ab41c0315 | |||
| 03f5b839fc | |||
| 9f4bcb03e1 | |||
| 567995aafb | |||
| 956156b412 | |||
| a7a97b3ba8 | |||
| 41b89d1d3d | |||
| f3225b8b16 | |||
| eeac30651a | |||
| 3eefac93b1 | |||
| 774f452689 | |||
| 448066b173 | |||
|
|
a7eca6064a | ||
| a4ecbd4dc8 | |||
|
|
a9e9783e6a | ||
| 04edf1e532 | |||
|
|
8dcb69aa2c | ||
| db2a72c18b | |||
|
|
0e28a06799 | ||
| 2218b01b81 | |||
| f777b04eb8 | |||
| 7831bbd735 | |||
| 6efb39b2db | |||
| f2b49e6d6c | |||
| 5cb3c65b24 | |||
|
|
d58644fd67 | ||
| 56447eb1d6 | |||
| 86d732e743 | |||
| 031ab5f7fc | |||
| 420625b25c | |||
| 9fa9edb24d | |||
| a2d72cdef3 | |||
| c214975ca0 | |||
| d328f7d59d | |||
| 62055f03c7 | |||
| 999992e579 |
73
.github/workflows/coverage.yml
vendored
Normal file
73
.github/workflows/coverage.yml
vendored
Normal file
@@ -0,0 +1,73 @@
|
||||
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 -fno-elide-constructors -fno-default-inline"
|
||||
|
||||
- name: Build
|
||||
run: cmake --build build -j ${{steps.cores.outputs.count}}
|
||||
|
||||
- name: Run
|
||||
working-directory: build
|
||||
run: ctest --output-on-failure
|
||||
|
||||
- name: Generate coverage report
|
||||
run: |
|
||||
lcov --version
|
||||
lcov --help
|
||||
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
|
||||
51
.github/workflows/single-header.yml
vendored
Normal file
51
.github/workflows/single-header.yml
vendored
Normal file
@@ -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
|
||||
22
.github/workflows/ubuntu-latest-clang.yml
vendored
22
.github/workflows/ubuntu-latest-clang.yml
vendored
@@ -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 }}
|
||||
CXX: clang++-${{ matrix.version }}
|
||||
CC: clang
|
||||
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
|
||||
|
||||
16
.github/workflows/ubuntu-latest-gcc.yml
vendored
16
.github/workflows/ubuntu-latest-gcc.yml
vendored
@@ -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
|
||||
|
||||
62
.github/workflows/ubuntu-latest-icc.yml
vendored
62
.github/workflows/ubuntu-latest-icc.yml
vendored
@@ -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
|
||||
id: cache-install
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
/opt/intel/oneapi/compiler
|
||||
key: >-
|
||||
install-${{ env.LINUX_HPCKIT_URL }}-
|
||||
${{ env.LINUX_CPP_COMPONENTS_WEB }}-
|
||||
compiler-${{ hashFiles('**/scripts/cache_exclude_linux.sh') }}
|
||||
- name: cache install
|
||||
id: cache-install
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
/opt/intel/oneapi/compiler
|
||||
key: >-
|
||||
install-${{env.LINUX_HPCKIT_URL}}-
|
||||
${{env.LINUX_CPP_COMPONENTS_WEB}}-
|
||||
compiler-${{hashFiles('**/scripts/cache_exclude_linux.sh')}}
|
||||
|
||||
- name: Install icc
|
||||
run: script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
|
||||
- name: Install icc
|
||||
run: >-
|
||||
script/ci_install_icc.sh $LINUX_HPCKIT_URL $LINUX_CPP_COMPONENTS_WEB
|
||||
|
||||
- name: CMake
|
||||
run: echo "/host_usr_local/bin" >> $GITHUB_PATH
|
||||
- name: CMake
|
||||
run: echo "/host_usr_local/bin" >> $GITHUB_PATH
|
||||
|
||||
- name: Install dependencies
|
||||
run: script/ci_install_deps.sh
|
||||
- name: Install dependencies
|
||||
run: script/ci_install_deps.sh
|
||||
|
||||
- name: Configure
|
||||
run: >-
|
||||
source script/ci_setup_icc.sh &&
|
||||
cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
|
||||
- name: Configure
|
||||
run: >-
|
||||
source script/ci_setup_icc.sh &&
|
||||
cmake -S test -B build -D CMAKE_BUILD_TYPE=Debug
|
||||
|
||||
- name: Build
|
||||
run: >-
|
||||
source script/ci_setup_icc.sh &&
|
||||
cmake --build build -j ${{ steps.cores.outputs.count }}
|
||||
- name: Build
|
||||
run: >-
|
||||
source script/ci_setup_icc.sh &&
|
||||
cmake --build build -j ${{steps.cores.outputs.count}}
|
||||
|
||||
- name: Run
|
||||
working-directory: build
|
||||
run: ctest --output-on-failure -j ${{ steps.cores.outputs.count }}
|
||||
- name: Run
|
||||
working-directory: build
|
||||
run: ctest --output-on-failure
|
||||
|
||||
65
.github/workflows/win-msvc.yml
vendored
Normal file
65
.github/workflows/win-msvc.yml
vendored
Normal file
@@ -0,0 +1,65 @@
|
||||
name: win-msvc-ci
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
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
|
||||
|
||||
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]
|
||||
|
||||
runs-on: ${{matrix.config.os}}
|
||||
|
||||
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
|
||||
47
.github/workflows/win-msys2-clang.yml
vendored
47
.github/workflows/win-msys2-clang.yml
vendored
@@ -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"
|
||||
install: >-
|
||||
git mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja
|
||||
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
|
||||
|
||||
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 }}
|
||||
install: ${{ matrix.install }}
|
||||
msystem: ${{matrix.config.msystem}}
|
||||
install: ${{matrix.config.install}}
|
||||
|
||||
- name: Install dependencies
|
||||
run: script/ci_install_deps.sh
|
||||
|
||||
- name: Configure
|
||||
run: >-
|
||||
cmake -DCMAKE_CXX_COMPILER=clang++ -S test -B build
|
||||
-DCMAKE_BUILD_TYPE=Debug
|
||||
run: >-
|
||||
cmake -DCMAKE_CXX_COMPILER=clang++ -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
|
||||
|
||||
43
.github/workflows/win-msys2-gcc.yml
vendored
43
.github/workflows/win-msys2-gcc.yml
vendored
@@ -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 }}
|
||||
install: ${{ matrix.install }}
|
||||
msystem: ${{matrix.config.msystem}}
|
||||
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
|
||||
|
||||
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.14)
|
||||
|
||||
project(
|
||||
ssp
|
||||
VERSION 0.0.1
|
||||
DESCRIPTION "Static split parser"
|
||||
VERSION 1.6.2
|
||||
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(
|
||||
fast_float
|
||||
GIT_REPOSITORY https://github.com/red0124/fast_float.git
|
||||
GIT_TAG origin/meson
|
||||
GIT_SHALLOW TRUE)
|
||||
fetchcontent_declare(
|
||||
fast_float
|
||||
GIT_REPOSITORY https://github.com/red0124/fast_float.git
|
||||
GIT_TAG origin/meson
|
||||
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,10 +36,10 @@ 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>"
|
||||
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
|
||||
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/fast_float>"
|
||||
)
|
||||
|
||||
target_compile_features(ssp INTERFACE cxx_std_17)
|
||||
@@ -46,8 +47,8 @@ target_compile_features(ssp INTERFACE cxx_std_17)
|
||||
target_link_libraries(
|
||||
ssp
|
||||
INTERFACE
|
||||
"$<$<AND:$<CXX_COMPILER_ID:AppleClang,Clang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:c++fs>"
|
||||
"$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.1>>:stdc++fs>"
|
||||
"$<$<AND:$<CXX_COMPILER_ID:AppleClang,Clang>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:c++fs>"
|
||||
"$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.1>>:stdc++fs>"
|
||||
)
|
||||
|
||||
# ---- Install ----
|
||||
@@ -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,10 +91,10 @@ install(
|
||||
EXPORT sspTargets
|
||||
FILE ssp-config.cmake
|
||||
NAMESPACE ssp::
|
||||
DESTINATION "${ssp_install_cmakedir}"
|
||||
DESTINATION "${SSP_INSTALL_CMAKEDIR}"
|
||||
COMPONENT ssp_Development
|
||||
)
|
||||
|
||||
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
|
||||
include(CPack)
|
||||
include(CPack)
|
||||
endif()
|
||||
|
||||
258
README.md
258
README.md
@@ -8,25 +8,27 @@
|
||||
```
|
||||
|
||||
[](https://opensource.org/licenses/MIT)
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
[](https://coveralls.io/github/red0124/ssp?branch=master)
|
||||
[](https://github.com/red0124/ssp/actions/workflows/single-header.yml)
|
||||
[](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-gcc.yml)
|
||||
[](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-clang.yml)
|
||||
[](https://github.com/red0124/ssp/actions/workflows/ubuntu-latest-icc.yml)
|
||||
[](https://github.com/red0124/ssp/actions/workflows/win-msys2-gcc.yml)
|
||||
[](https://github.com/red0124/ssp/actions/workflows/win-msys2-clang.yml)
|
||||
[](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)
|
||||
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)
|
||||
|
||||
Conversion for floating point values invoked using [fast-float](https://github.com/fastfloat/fast_float) .
|
||||
Function traits taken from [qt-creator](https://code.woboq.org/qt5/qt-creator/src/libs/utils/functiontraits.h.html) .
|
||||
Conversion for floating point values invoked using [fast-float](https://github.com/fastfloat/fast_float) . \
|
||||
Function traits taken from *qt-creator* .
|
||||
|
||||
# Example
|
||||
Lets say we have a csv file containing students in a given format '$name,$age,$grade' and we want to parse and print all the valid values:
|
||||
Lets say we have a csv file containing students in a given format \<Id,Age,Grade\> and we want to parse and print all the valid values:
|
||||
|
||||
```shell
|
||||
$ cat students.csv
|
||||
James Bailey,65,2.5
|
||||
Brian S. Wolfe,40,1.9
|
||||
Nathan Fielder,37,Really good grades
|
||||
Bill (Heath) Gates,65,3.3
|
||||
```
|
||||
```cpp
|
||||
@@ -34,12 +36,10 @@ Bill (Heath) Gates,65,3.3
|
||||
#include <ss/parser.hpp>
|
||||
|
||||
int main() {
|
||||
ss::parser p{"students.csv", ","};
|
||||
ss::parser<ss::throw_on_error> p{"students.csv"};
|
||||
|
||||
for(const auto& [name, age, grade] : p.iterate<std::string, int, float>()) {
|
||||
if (p.valid()) {
|
||||
std::cout << name << ' ' << age << ' ' << grade << std::endl;
|
||||
}
|
||||
for (const auto& [id, age, grade] : p.iterate<std::string, int, float>()) {
|
||||
std::cout << id << ' ' << age << ' ' << grade << std::endl;
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -53,22 +53,26 @@ 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 any type of delimiter
|
||||
* Can work without 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 any type of delimiter](#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)
|
||||
* [Error handling can be configured](#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
|
||||
|
||||
The library can be used with a single header file **`ssp.hpp`**, but it sufferes a slight performance loss when converting floating point values since the **`fast_float`** library is not present within the file.
|
||||
|
||||
# Installation
|
||||
|
||||
```shell
|
||||
@@ -78,8 +82,8 @@ $ cmake --configure .
|
||||
$ sudo make install
|
||||
```
|
||||
|
||||
*Note, this will also install the fast_float library*
|
||||
The library supports [CMake](#Cmake) and [meson](#Meson) build systems
|
||||
*Note, this will also install the fast_float library.*\
|
||||
The library supports [CMake](#Cmake) and [meson](#Meson) build systems
|
||||
|
||||
# Usage
|
||||
|
||||
@@ -88,20 +92,20 @@ The library supports [CMake](#Cmake) and [meson](#Meson) build systems
|
||||
The parser can be told to use only certain columns by parsing the header. This can be done by using the **`use_fields`** method. It accepts any number of string-like arguments or even an **`std::vector<std::string>`** with the field names. If any of the fields are not found within the header or if any fields are defined multiple times it will result in an error.
|
||||
```shell
|
||||
$ cat students_with_header.csv
|
||||
Name,Age,Grade
|
||||
Id,Age,Grade
|
||||
James Bailey,65,2.5
|
||||
Brian S. Wolfe,40,1.9
|
||||
Bill (Heath) Gates,65,3.3
|
||||
```
|
||||
```cpp
|
||||
// ...
|
||||
ss::parser p{"students.csv", ","};
|
||||
p.use_fields("Name", "Grade");
|
||||
// ...
|
||||
ss::parser<ss::throw_on_error> p{"students_with_header.csv"};
|
||||
p.use_fields("Id", "Grade");
|
||||
|
||||
for(const auto& [name, grade] : p.iterate<std::string, float>()) {
|
||||
std::cout << name << ' ' << grade << std::endl;
|
||||
}
|
||||
// ...
|
||||
for(const auto& [id, grade] : p.iterate<std::string, float>()) {
|
||||
std::cout << id << ' ' << grade << std::endl;
|
||||
}
|
||||
// ...
|
||||
```
|
||||
```shell
|
||||
$ ./a.out
|
||||
@@ -113,20 +117,19 @@ The header can be ignored using the **`ss::ignore_header`** [setup](#Setup) opti
|
||||
```cpp
|
||||
ss::parser<ss::ignore_header> p{file_name};
|
||||
```
|
||||
The fields with which the parser works with can be modified at any given time. The paser can also check if a field is present within the header by using the **`has_field`** method.
|
||||
The fields with which the parser works with can be modified at any given time. The praser can also check if a field is present within the header by using the **`field_exists`** method.
|
||||
```cpp
|
||||
// ...
|
||||
ss::parser p{"students.csv", ","};
|
||||
p.use_fields("Name", "Grade");
|
||||
ss::parser<ss::throw_on_error> p{"students_with_header.csv"};
|
||||
p.use_fields("Id", "Grade");
|
||||
|
||||
const auto& [name, grade] = p.get_next<std::string, float>();
|
||||
std::cout << name << ' ' << grade << std::endl;
|
||||
const auto& [id, grade] = p.get_next<std::string, float>();
|
||||
std::cout << id << ' ' << grade << std::endl;
|
||||
|
||||
if (p.field_exists("Age")) {
|
||||
p.use_fields("Grade", "Name", "Age");
|
||||
for (const auto& [grade, name, age] :
|
||||
p.iterate<float, std::string, int>()) {
|
||||
std::cout << grade << ' ' << name << ' ' << age << std::endl;
|
||||
if (p.field_exists("Id")) {
|
||||
p.use_fields("Grade", "Id");
|
||||
for (const auto& [grade, id] : p.iterate<float, std::string>()) {
|
||||
std::cout << grade << ' ' << id << std::endl;
|
||||
}
|
||||
}
|
||||
// ...
|
||||
@@ -134,21 +137,26 @@ The fields with which the parser works with can be modified at any given time. T
|
||||
```shell
|
||||
$ ./a.out
|
||||
James Bailey 2.5
|
||||
1.9 Brian S. Wolfe 40
|
||||
3.3 Bill (Heath) Gates 65
|
||||
40 Brian S. Wolfe
|
||||
65 Bill (Heath) Gates
|
||||
```
|
||||
## Conversions
|
||||
An alternate loop to the example above would look like:
|
||||
```cpp
|
||||
while(!p.eof()) {
|
||||
auto [name, age, grade] = p.get_next<std::string, int, float>();
|
||||
// ...
|
||||
ss::parser p{"students.csv"};
|
||||
|
||||
while (!p.eof()) {
|
||||
const auto& [id, age, grade] = p.get_next<std::string, int, float>();
|
||||
|
||||
if (p.valid()) {
|
||||
std::cout << name << ' ' << age << ' ' << grade << std::endl;
|
||||
std::cout << id << ' ' << age << ' ' << grade << std::endl;
|
||||
}
|
||||
}
|
||||
// ...
|
||||
```
|
||||
|
||||
The alternate example will be used to show some of the features of the library. The **`get_next`** method returns a tuple of objects specified inside the template type list.
|
||||
The alternate example with exceptions disabled will be used to show some of the features of the library. The **`get_next`** method returns a tuple of objects specified inside the template type list.
|
||||
|
||||
If a conversion could not be applied, the method would return a tuple of default constructed objects, and the **`valid`** method would return **`false`**, for example if the third (grade) column in our csv could not be converted to a float the conversion would fail.
|
||||
|
||||
@@ -157,14 +165,14 @@ If **`get_next`** is called with a **`tuple`** as template parameter it would be
|
||||
using student = std::tuple<std::string, int, float>;
|
||||
|
||||
// returns std::tuple<std::string, int, float>
|
||||
auto [name, age, grade] = p.get_next<student>();
|
||||
auto [id, age, grade] = p.get_next<student>();
|
||||
```
|
||||
*Note, it does not always return a student tuple since the returned tuples parameters may be altered as explained below (no void, no restrictions, ...)*
|
||||
*Note, it does not always return the specified tuple since the returned tuples parameters may be altered as explained below (no void, no restrictions, ...)*
|
||||
|
||||
Whole objects can be returned using the **`get_object`** function which takes the tuple, created in a similar way as **`get_next`** does it, and creates an object out of it:
|
||||
```cpp
|
||||
struct student {
|
||||
std::string name;
|
||||
std::string id;
|
||||
int age;
|
||||
float grade;
|
||||
};
|
||||
@@ -175,24 +183,23 @@ auto student = p.get_object<student, std::string, int, float>();
|
||||
```
|
||||
This works with any object if the constructor could be invoked using the template arguments given to **`get_object`**:
|
||||
```cpp
|
||||
// returns std::vector<std::string> containing 3 elements
|
||||
auto vec = p.get_object<std::vector<std::string>, std::string, std::string,
|
||||
std::string>();
|
||||
// returns std::vector<std::string> containing 2 elements
|
||||
auto vec = p.get_object<std::vector<std::string>, std::string, std::string>();
|
||||
```
|
||||
An iteration loop as in the first example which returns objects would look like:
|
||||
An iterator loop as in the first example which returns objects would look like:
|
||||
```cpp
|
||||
for(const auto& student : p.iterate_object<student, std::string, int, float>()) {
|
||||
// ...
|
||||
for (const student& s : p.iterate_object<student, std::string, int, float>()) {
|
||||
// ...
|
||||
}
|
||||
```
|
||||
And finally, using something I personally like to do, a struct (class) with a **`tied`** method which returns a tuple of references to to the members of the struct.
|
||||
```cpp
|
||||
struct student {
|
||||
std::string name;
|
||||
std::string id;
|
||||
int age;
|
||||
float grade;
|
||||
|
||||
auto tied() { return std::tie(name, age, grade); }
|
||||
auto tied() { return std::tie(id, age, grade); }
|
||||
};
|
||||
```
|
||||
The method can be used to compare the object, serialize it, deserialize it, etc. Now **`get_next`** can accept such a struct and deduce the types to which to convert the csv.
|
||||
@@ -220,7 +227,14 @@ using my_setup = ss::setup<ss::escape<'\\'>, ss::quote<'"'>>;
|
||||
ss::parser<my_setup> p2{file_name};
|
||||
```
|
||||
Invalid setups will be met with **`static_asserts`**.
|
||||
*Note, each setup parameter defined comes with a slight performance loss, so use them only if needed.*
|
||||
*Note, most setup parameters defined come with a slight performance loss, so use them only if needed.*
|
||||
|
||||
### Delimiter
|
||||
By default, **`,`** is used as the delimiter, a custom delimiter can be specified as the second constructor parameter.
|
||||
```cpp
|
||||
ss::parser p{file_name, "--"};
|
||||
```
|
||||
*Note, the delimiter can consist of multiple characters but the parser is slightliy faster when using single character delimiters.*
|
||||
|
||||
### Empty lines
|
||||
Empty lines can be ignored by defining **`ss::ignore_empty`** within the setup parameters:
|
||||
@@ -302,14 +316,11 @@ ss::parser<ss::escape<'\\'>,
|
||||
ss::trim<' ', '\t'>,
|
||||
ss::multiline_restricted<5>> p{file_name};
|
||||
|
||||
while(!p.eof()) {
|
||||
auto [name, age, grade] = p.get_next<std::string, int, float>();
|
||||
if(!p.valid()) {
|
||||
continue;
|
||||
for (const auto& [id, age, grade] : p.iterate<std::string, int, float>()) {
|
||||
if (p.valid()) {
|
||||
std::cout << "'" << id << ' ' << age << ' ' << grade << "'\n";
|
||||
}
|
||||
std::cout << "'" << name << ' ' << age << ' ' << grade << "'" << std::endl;
|
||||
}
|
||||
|
||||
```
|
||||
input:
|
||||
```
|
||||
@@ -330,22 +341,22 @@ Gates 65 3.3'
|
||||
```
|
||||
## Special types
|
||||
|
||||
Passing **`void`** makes the parser ignore a column. In the given example **`void`** could be given as the second template parameter to ignore the second (age) column in the csv, a tuple of only 2 parameters would be retuned:
|
||||
Passing **`void`** makes the parser ignore a column. In the initial example **`void`** could be given as the second template parameter to ignore the second (age) column in the csv, a tuple of only 2 parameters would be retuned:
|
||||
```cpp
|
||||
// returns std::tuple<std::string, float>
|
||||
auto [name, grade] = p.get_next<std::string, void, float>();
|
||||
auto [id, grade] = p.get_next<std::string, void, float>();
|
||||
```
|
||||
Works with different types of conversions too:
|
||||
```cpp
|
||||
using student = std::tuple<std::string, void, float>;
|
||||
|
||||
// returns std::tuple<std::string, float>
|
||||
auto [name, grade] = p.get_next<student>();
|
||||
auto [id, grade] = p.get_next<student>();
|
||||
```
|
||||
Values can also be converted to **`std::string_view`**. It is more efficient then converting values to **`std::string`** but one must be careful with the lifetime of it.
|
||||
```cpp
|
||||
// string_view name stays valid until the next line is read
|
||||
auto [name, age, grade] = p.get_next<std::string_view, int, float>();
|
||||
// string_view id stays valid until the next line is read
|
||||
auto [id, age, grade] = p.get_next<std::string_view, int, float>();
|
||||
```
|
||||
|
||||
To ignore a whole row, **`ignore_next`** could be used, returns **`false`** if **`eof`**:
|
||||
@@ -356,30 +367,30 @@ bool parser::ignore_next();
|
||||
|
||||
```cpp
|
||||
// returns std::tuple<std::string, int, std::optional<float>>
|
||||
auto [name, age, grade] = p.get_next<std::string, int, std::optional<float>();
|
||||
if(grade) {
|
||||
// do something with grade
|
||||
auto [id, age, grade] = p.get_next<std::string, int, std::optional<float>>();
|
||||
if (grade) {
|
||||
std::cout << grade.value() << std::endl;
|
||||
}
|
||||
```
|
||||
Similar to **`std::optional`**, **`std::variant`** could be used to try other conversions if the previous failed _(Note, conversion to std::string will always pass)_:
|
||||
```cpp
|
||||
// returns std::tuple<std::string, int, std::variant<float, char>>
|
||||
auto [name, age, grade] =
|
||||
p.get_next<std::string, int, std::variant<float, char>();
|
||||
if(std::holds_alternative<float>(grade)) {
|
||||
auto [id, age, grade] =
|
||||
p.get_next<std::string, int, std::variant<float, char>>();
|
||||
if (std::holds_alternative<float>(grade)) {
|
||||
// grade set as float
|
||||
} else if(std::holds_alternative<char>(grade)) {
|
||||
} else if (std::holds_alternative<char>(grade)) {
|
||||
// grade set as char
|
||||
}
|
||||
```
|
||||
## 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::ne makes sure that the id is not empty
|
||||
// ss::ir makes sure that the grade will be in range [0, 10]
|
||||
// returns std::tuple<std::string, int, float>
|
||||
auto [name, age, grade] =
|
||||
auto [id, age, grade] =
|
||||
p.get_next<ss::ne<std::string>, int, ss::ir<float, 0, 10>>();
|
||||
```
|
||||
If the restrictions are not met, the conversion will fail. Other predefined restrictions are **`ss::ax`** (all except), **`ss::nx`** (none except) and **`ss::oor`** (out of range), **`ss::lt`** (less than), ...(see *restrictions.hpp*):
|
||||
@@ -406,9 +417,11 @@ struct even {
|
||||
};
|
||||
```
|
||||
```cpp
|
||||
// only even numbers will pass
|
||||
// ...
|
||||
// only even numbers will pass without invoking error handling
|
||||
// returns std::tuple<std::string, int>
|
||||
auto [name, age] = p.get_next<std::string, even<int>, void>();
|
||||
const auto& [id, age] = p.get_next<std::string, even<int>, void>();
|
||||
// ...
|
||||
```
|
||||
## Custom conversions
|
||||
|
||||
@@ -435,21 +448,34 @@ The shape enum will be used in an example below. The **`inline`** is there just
|
||||
|
||||
## Error handling
|
||||
|
||||
By default, the parser handles errors only using the **`valid`** method which would return **`false`** if the file could not be opened, or if the conversion could not be made (invalid types, invalid number of columns, ...).\
|
||||
The **`eof`** method can be used to detect if the end of the file was reached.
|
||||
|
||||
Detailed error messages can be accessed via the **`error_msg`** method, and to enable them **`ss::string_error`** needs to be included in the setup. If **`ss::string_error`** is not defined, the **`error_msg`** method will not be defined either.
|
||||
|
||||
The line number can be fetched using the **`line`** method.
|
||||
|
||||
```cpp
|
||||
const std::string& parser::error_msg();
|
||||
bool parser::valid();
|
||||
bool parser::eof();
|
||||
size_t parser::line();
|
||||
|
||||
// ...
|
||||
ss::parser<ss::string_error> parser;
|
||||
```
|
||||
An error can be detected using the **`valid`** method which would return **`false`** if the file could not be opened, or if the conversion could not be made (invalid types, invalid number of columns, ...). The **`eof`** method can be used to detect if the end of the file was reached.
|
||||
|
||||
The above two methods are preferable if invalid inputs are expected and allows for fast handling, but the parser can also be forced to throw an exception in case of an invalid input using the **`ss::throw_on_error`** setup option. Enabling exceptions also makes the **`valid`** method always return **`true`**.
|
||||
|
||||
```cpp
|
||||
ss::parser<ss::throw_on_error> parser;
|
||||
```
|
||||
*Note, enabling this option will also make the parser throw if the constructor fails.*
|
||||
|
||||
## Substitute conversions
|
||||
|
||||
The parser can also be used to effectively parse files whose rows are not always in the same format (not a classical csv but still csv-like). A more complicated example would be the best way to demonstrate such a scenario.
|
||||
The parser can also be used to effectively parse files whose rows are not always in the same format (not a classical csv but still csv-like). A more complicated example would be the best way to demonstrate such a scenario.\
|
||||
***Important, substitute conversions do not work when throw_on_error is enabled.***
|
||||
|
||||
Supposing we have a file containing different shapes in given formats:
|
||||
* circle RADIUS
|
||||
@@ -468,7 +494,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);
|
||||
}
|
||||
|
||||
@@ -479,11 +504,16 @@ while (!p.eof()) {
|
||||
using udbl = ss::gte<double, 0>;
|
||||
|
||||
auto [circle_or_square, rectangle, triangle] =
|
||||
p.try_next<ss::nx<shape, shape::circle, shape::square>, udbl>()
|
||||
p.try_next<ss::nx<shape, shape::circle, shape::square>, udbl>()
|
||||
.or_else<ss::nx<shape, shape::rectangle>, udbl, udbl>()
|
||||
.or_else<ss::nx<shape, shape::triangle>, udbl, udbl, udbl>()
|
||||
.values();
|
||||
|
||||
if (!p.valid()) {
|
||||
// handle error
|
||||
continue;
|
||||
}
|
||||
|
||||
if (circle_or_square) {
|
||||
auto& [s, x] = circle_or_square.value();
|
||||
double area = (s == shape::circle) ? x * x * M_PI : x * x;
|
||||
@@ -510,7 +540,7 @@ while (!p.eof()) {
|
||||
```
|
||||
It is quite hard to make an error this way since most things will be checked at compile time.
|
||||
|
||||
The **`try_next`** method works in a similar way as **`get_next`** but returns a **`composit`** which holds a **`tuple`** with an **`optional`** to the **`tuple`** returned by **`get_next`**. This **`composite`** has an **`or_else`** method (looks a bit like **`tl::expected`**) which is able to try additional conversions if the previous failed. **`or_else`** also returns a **`composite`**, but in its tuple is the **`optional`** to the **`tuple`** of the previous conversions and an **`optional`** to the **`tuple`** of the new conversion. (sounds more complicated than it is.
|
||||
The **`try_next`** method works in a similar way as **`get_next`** but returns a **`composite`** which holds a **`tuple`** with an **`optional`** to the **`tuple`** returned by **`get_next`**. This **`composite`** has an **`or_else`** method (looks a bit like **`tl::expected`**) which is able to try additional conversions if the previous failed. **`or_else`** also returns a **`composite`**, but in its tuple is the **`optional`** to the **`tuple`** of the previous conversions and an **`optional`** to the **`tuple`** of the new conversion. (sounds more complicated than it is.
|
||||
|
||||
To fetch the **`tuple`** from the **`composite`** the **`values`** method is used. The value of the above used conversion would look something like this:
|
||||
```cpp
|
||||
@@ -527,31 +557,34 @@ Each of those **`composite`** conversions can accept a lambda (or anything calla
|
||||
// non negative double
|
||||
using udbl = ss::gte<double, 0>;
|
||||
|
||||
p.try_next<ss::nx<shape, shape::circle, shape::square>, udbl>(
|
||||
[&](const auto& data) {
|
||||
const auto& [s, x] = data;
|
||||
double area = (s == shape::circle) ? x * x * M_PI : x * x;
|
||||
shapes.emplace_back(s, area);
|
||||
})
|
||||
.or_else<ss::nx<shape, shape::rectangle>, udbl, udbl>(
|
||||
[&](const shape s, const double a, const double b) {
|
||||
shapes.emplace_back(s, a * b);
|
||||
})
|
||||
.or_else<ss::nx<shape, shape::triangle>, udbl, udbl, udbl>(
|
||||
[&](auto&& s, auto& a, const double& b, double& c) {
|
||||
double sh = (a + b + c) / 2;
|
||||
if (sh >= a && sh >= b && sh >= c) {
|
||||
double area = sqrt(sh * (sh - a) * (sh - b) * (sh - c));
|
||||
shapes.emplace_back(s, area);
|
||||
}
|
||||
while (!p.eof()) {
|
||||
p.try_next<ss::nx<shape, shape::circle, shape::square>, udbl>(
|
||||
[&](const auto& data) {
|
||||
const auto& [s, x] = data;
|
||||
double area = (s == shape::circle) ? x * x * M_PI : x * x;
|
||||
shapes.emplace_back(s, area);
|
||||
})
|
||||
.or_else<ss::nx<shape, shape::rectangle>, udbl, udbl>(
|
||||
[&](shape s, double a, double b) { shapes.emplace_back(s, a * b); })
|
||||
.or_else<ss::nx<shape, shape::triangle>, udbl, udbl, udbl>(
|
||||
[&](auto s, auto a, auto b, auto c) {
|
||||
double sh = (a + b + c) / 2;
|
||||
if (sh >= a && sh >= b && sh >= c) {
|
||||
double area = sqrt(sh * (sh - a) * (sh - b) * (sh - c));
|
||||
shapes.emplace_back(s, area);
|
||||
}
|
||||
})
|
||||
.on_error([] {
|
||||
// handle error
|
||||
});
|
||||
}
|
||||
```
|
||||
It is a bit less readable, but it removes the need to check which conversion was invoked. The **`composite`** also has an **`on_error`** method which accepts a lambda which will be invoked if no previous conversions were successful. The lambda can take no arguments or just one argument, an **`std::string`**, in which the error message is stored if **`string_error`** is enabled:
|
||||
```cpp
|
||||
p.try_next<int>()
|
||||
.on_error([](const std::string& e) { /* int conversion failed */ })
|
||||
.or_object<x, double>()
|
||||
.on_error([] { /* int and x (all) conversions failed */ });
|
||||
.on_error([] { /* int and x conversions failed (all previous failed) */ });
|
||||
```
|
||||
*See unit tests for more examples.*
|
||||
|
||||
@@ -580,7 +613,7 @@ if (c.valid()) {
|
||||
All setup parameters, special types and restrictions work on the converter too.
|
||||
Error handling is also identical to error handling of the parser.
|
||||
|
||||
The converter has also the ability to just split the line, ~~tho it does not change it (kinda statically), hence the name of the library~~ and depending if either quoting or escaping are enabled it may change the line, rather than creating a copy, for performance reasons (the name of the library does not apply anymore, I may change it). It returns an **`std::vector`** of **`std::pair`**s of pointers, begin and end, each pair representing a split segment (column) of the whole string. The vector can then be used in a overloaded **`convert`** method. This allows the reuse of the same line without splitting it on every conversion.
|
||||
The converter has also the ability to just split the line, and depending if either quoting or escaping are enabled it may change the line, rather than creating a copy, for performance reasons. It returns an **`std::vector`** of **`std::pair`**s of pointers, begin and end, each pair representing a split segment (column) of the whole string. The vector can then be used in a overloaded **`convert`** method. This allows the reuse of the same line without splitting it on every conversion.
|
||||
```cpp
|
||||
ss::converter c;
|
||||
auto split_line = c.split("circle 10", " ");
|
||||
@@ -628,6 +661,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')
|
||||
```
|
||||
|
||||
@@ -12,6 +12,7 @@ using string_range = std::pair<const char*, const char*>;
|
||||
using split_data = std::vector<string_range>;
|
||||
|
||||
constexpr inline auto default_delimiter = ",";
|
||||
constexpr static auto get_line_initial_buffer_size = 128;
|
||||
|
||||
template <bool StringError>
|
||||
inline void assert_string_error_defined() {
|
||||
@@ -19,13 +20,19 @@ inline void assert_string_error_defined() {
|
||||
"'string_error' needs to be enabled to use 'error_msg'");
|
||||
}
|
||||
|
||||
template <bool ThrowOnError>
|
||||
inline void assert_throw_on_error_not_defined() {
|
||||
static_assert(!ThrowOnError, "cannot handle errors manually if "
|
||||
"'throw_on_error' is enabled");
|
||||
}
|
||||
|
||||
#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;
|
||||
|
||||
@@ -40,7 +47,7 @@ inline ssize_t get_line(char** lineptr, size_t* n, FILE* stream) {
|
||||
}
|
||||
|
||||
if (*lineptr == nullptr) {
|
||||
*lineptr = static_cast<char*>(malloc(128));
|
||||
*lineptr = static_cast<char*>(malloc(get_line_initial_buffer_size));
|
||||
if (*lineptr == nullptr) {
|
||||
return -1;
|
||||
}
|
||||
@@ -51,8 +58,8 @@ inline ssize_t get_line(char** lineptr, size_t* n, FILE* stream) {
|
||||
while (c != EOF) {
|
||||
if (pos + 1 >= *n) {
|
||||
size_t new_size = *n + (*n >> 2);
|
||||
if (new_size < 128) {
|
||||
new_size = 128;
|
||||
if (new_size < get_line_initial_buffer_size) {
|
||||
new_size = get_line_initial_buffer_size;
|
||||
}
|
||||
char* new_ptr = static_cast<char*>(
|
||||
realloc(static_cast<void*>(*lineptr), new_size));
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#pragma once
|
||||
#include "exception.hpp"
|
||||
#include "extract.hpp"
|
||||
#include "function_traits.hpp"
|
||||
#include "restrictions.hpp"
|
||||
@@ -95,14 +96,15 @@ constexpr bool tied_class_v = tied_class<Ts...>::value;
|
||||
// converter
|
||||
////////////////
|
||||
|
||||
template <typename... Matchers>
|
||||
template <typename... Options>
|
||||
class converter {
|
||||
using line_ptr_type = typename splitter<Matchers...>::line_ptr_type;
|
||||
using line_ptr_type = typename splitter<Options...>::line_ptr_type;
|
||||
|
||||
constexpr static auto string_error = setup<Matchers...>::string_error;
|
||||
constexpr static auto string_error = setup<Options...>::string_error;
|
||||
constexpr static auto throw_on_error = setup<Options...>::throw_on_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
|
||||
@@ -119,7 +121,12 @@ public:
|
||||
no_void_validator_tup_t<Ts...> convert(
|
||||
line_ptr_type line, const std::string& delim = default_delimiter) {
|
||||
split(line, delim);
|
||||
return convert<Ts...>(splitter_.split_data_);
|
||||
if (splitter_.valid()) {
|
||||
return convert<Ts...>(splitter_.split_data_);
|
||||
} else {
|
||||
handle_error_bad_split();
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
// parses already split line, returns 'T' object with extracted values
|
||||
@@ -162,6 +169,8 @@ public:
|
||||
bool valid() const {
|
||||
if constexpr (string_error) {
|
||||
return error_.empty();
|
||||
} else if constexpr (throw_on_error) {
|
||||
return true;
|
||||
} else {
|
||||
return !error_;
|
||||
}
|
||||
@@ -194,7 +203,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);
|
||||
}
|
||||
|
||||
@@ -225,98 +234,111 @@ private:
|
||||
return error;
|
||||
}
|
||||
|
||||
void set_error_unterminated_quote() {
|
||||
void handle_error_bad_split() {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append(splitter_.error_msg());
|
||||
} else {
|
||||
} else if constexpr (!throw_on_error) {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_unterminated_escape() {
|
||||
void handle_error_unterminated_escape() {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
splitter_.set_error_unterminated_escape();
|
||||
splitter_.handle_error_unterminated_escape();
|
||||
error_.append(splitter_.error_msg());
|
||||
} else if constexpr (throw_on_error) {
|
||||
splitter_.handle_error_unterminated_escape();
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_multiline_limit_reached() {
|
||||
void handle_error_unterminated_quote() {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("multiline limit reached.");
|
||||
splitter_.handle_error_unterminated_quote();
|
||||
error_.append(splitter_.error_msg());
|
||||
} else if constexpr (throw_on_error) {
|
||||
splitter_.handle_error_unterminated_quote();
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_invalid_conversion(const string_range msg, size_t pos) {
|
||||
void handle_error_multiline_limit_reached() {
|
||||
constexpr static auto error_msg = "multiline limit reached";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("invalid conversion for parameter ")
|
||||
.append(error_sufix(msg, pos));
|
||||
error_.append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_validate(const char* const error, const string_range msg,
|
||||
size_t pos) {
|
||||
void handle_error_invalid_conversion(const string_range msg, size_t pos) {
|
||||
constexpr static auto error_msg = "invalid conversion for parameter ";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append(error_msg).append(error_sufix(msg, pos));
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg + error_sufix(msg, pos)};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void handle_error_validation_failed(const char* const error,
|
||||
const string_range msg, size_t pos) {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append(error).append(" ").append(error_sufix(msg, pos));
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error + (" " + error_sufix(msg, pos))};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_number_of_columns(size_t expected_pos, size_t pos) {
|
||||
void handle_error_number_of_columns(size_t expected_pos, size_t pos) {
|
||||
constexpr static auto error_msg1 =
|
||||
"invalid number of columns, expected: ";
|
||||
constexpr static auto error_msg2 = ", got: ";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("invalid number of columns, expected: ")
|
||||
error_.append(error_msg1)
|
||||
.append(std::to_string(expected_pos))
|
||||
.append(", got: ")
|
||||
.append(error_msg2)
|
||||
.append(std::to_string(pos));
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg1 + std::to_string(expected_pos) +
|
||||
error_msg2 + std::to_string(pos)};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_incompatible_mapping(size_t argument_size,
|
||||
size_t mapping_size) {
|
||||
void handle_error_incompatible_mapping(size_t argument_size,
|
||||
size_t mapping_size) {
|
||||
constexpr static auto error_msg1 =
|
||||
"number of arguments does not match mapping, expected: ";
|
||||
constexpr static auto error_msg2 = ", got: ";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_
|
||||
.append(
|
||||
"number of arguments does not match mapping, expected: ")
|
||||
error_.append(error_msg1)
|
||||
.append(std::to_string(mapping_size))
|
||||
.append(", got: ")
|
||||
.append(error_msg2)
|
||||
.append(std::to_string(argument_size));
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_invalid_mapping() {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("received empty mapping");
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_mapping_out_of_range(size_t maximum_index,
|
||||
size_t number_of_columnts) {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("maximum index: ")
|
||||
.append(std::to_string(maximum_index))
|
||||
.append(", greater then number of columns: ")
|
||||
.append(std::to_string(number_of_columnts));
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg1 + std::to_string(mapping_size) +
|
||||
error_msg2 + std::to_string(argument_size)};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
@@ -329,36 +351,34 @@ private:
|
||||
template <typename... Ts>
|
||||
no_void_validator_tup_t<Ts...> convert_impl(const split_data& elems) {
|
||||
clear_error();
|
||||
using return_type = no_void_validator_tup_t<Ts...>;
|
||||
|
||||
if (!splitter_.valid()) {
|
||||
set_error_unterminated_quote();
|
||||
no_void_validator_tup_t<Ts...> ret{};
|
||||
return ret;
|
||||
handle_error_bad_split();
|
||||
return {};
|
||||
}
|
||||
|
||||
if (!columns_mapped()) {
|
||||
if (sizeof...(Ts) != elems.size()) {
|
||||
set_error_number_of_columns(sizeof...(Ts), elems.size());
|
||||
return return_type{};
|
||||
handle_error_number_of_columns(sizeof...(Ts), elems.size());
|
||||
return {};
|
||||
}
|
||||
} else {
|
||||
if (sizeof...(Ts) != column_mappings_.size()) {
|
||||
set_error_incompatible_mapping(sizeof...(Ts),
|
||||
column_mappings_.size());
|
||||
return return_type{};
|
||||
handle_error_incompatible_mapping(sizeof...(Ts),
|
||||
column_mappings_.size());
|
||||
return {};
|
||||
}
|
||||
|
||||
if (elems.size() != number_of_columns_) {
|
||||
set_error_number_of_columns(number_of_columns_, elems.size());
|
||||
return return_type{};
|
||||
handle_error_number_of_columns(number_of_columns_,
|
||||
elems.size());
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
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...>*) {
|
||||
@@ -380,19 +400,9 @@ private:
|
||||
return column_mappings_[tuple_position];
|
||||
}
|
||||
|
||||
// assumes positions are valid and the vector is not empty
|
||||
void set_column_mapping(std::vector<size_t> positions,
|
||||
size_t number_of_columns) {
|
||||
if (positions.empty()) {
|
||||
set_error_invalid_mapping();
|
||||
return;
|
||||
}
|
||||
|
||||
auto max_index = *std::max_element(positions.begin(), positions.end());
|
||||
if (max_index >= number_of_columns) {
|
||||
set_error_mapping_out_of_range(max_index, number_of_columns);
|
||||
return;
|
||||
}
|
||||
|
||||
column_mappings_ = positions;
|
||||
number_of_columns_ = number_of_columns;
|
||||
}
|
||||
@@ -419,16 +429,17 @@ private:
|
||||
}
|
||||
|
||||
if (!extract(msg.first, msg.second, dst)) {
|
||||
set_error_invalid_conversion(msg, pos);
|
||||
handle_error_invalid_conversion(msg, pos);
|
||||
return;
|
||||
}
|
||||
|
||||
if constexpr (has_m_ss_valid_t<T>) {
|
||||
if (T validator; !validator.ss_valid(dst)) {
|
||||
if constexpr (has_m_error_t<T>) {
|
||||
set_error_validate(validator.error(), msg, pos);
|
||||
handle_error_validation_failed(validator.error(), msg, pos);
|
||||
} else {
|
||||
set_error_validate("validation error", msg, pos);
|
||||
handle_error_validation_failed("validation error", msg,
|
||||
pos);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -472,7 +483,7 @@ private:
|
||||
////////////////
|
||||
|
||||
error_type error_{};
|
||||
splitter<Matchers...> splitter_;
|
||||
splitter<Options...> splitter_;
|
||||
|
||||
template <typename...>
|
||||
friend class parser;
|
||||
|
||||
23
include/ss/exception.hpp
Normal file
23
include/ss/exception.hpp
Normal file
@@ -0,0 +1,23 @@
|
||||
#pragma once
|
||||
#include <exception>
|
||||
#include <string>
|
||||
|
||||
namespace ss {
|
||||
|
||||
////////////////
|
||||
// exception
|
||||
////////////////
|
||||
|
||||
class exception : public std::exception {
|
||||
std::string msg_;
|
||||
|
||||
public:
|
||||
exception(const std::string& msg): msg_{msg} {
|
||||
}
|
||||
|
||||
virtual char const* what() const noexcept {
|
||||
return msg_.c_str();
|
||||
}
|
||||
};
|
||||
|
||||
} /* ss */
|
||||
@@ -1,22 +1,29 @@
|
||||
#pragma once
|
||||
|
||||
#include "type_traits.hpp"
|
||||
#include <charconv>
|
||||
#include <cstring>
|
||||
#include <fast_float/fast_float.h>
|
||||
#include <functional>
|
||||
#include <limits>
|
||||
#include <optional>
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
#include <variant>
|
||||
|
||||
#ifndef SSP_DISABLE_FAST_FLOAT
|
||||
#include <fast_float/fast_float.h>
|
||||
#else
|
||||
#include <algorithm>
|
||||
#include <cstdlib>
|
||||
#endif
|
||||
|
||||
namespace ss {
|
||||
|
||||
////////////////
|
||||
// number converters
|
||||
////////////////
|
||||
|
||||
#ifndef SSP_DISABLE_FAST_FLOAT
|
||||
|
||||
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) {
|
||||
@@ -29,194 +36,57 @@ std::enable_if_t<std::is_floating_point_v<T>, std::optional<T>> to_num(
|
||||
return ret;
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
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_owerflow) {
|
||||
if (mul_overflow<T>(value, 10) || add_last_digit_owerflow(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;
|
||||
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");
|
||||
|
||||
T expected_old_value = (value - digit) / 10;
|
||||
if (old_value != expected_old_value) {
|
||||
return true;
|
||||
constexpr static auto buff_max = 64;
|
||||
char short_buff[buff_max];
|
||||
size_t string_range = std::distance(begin, end);
|
||||
std::string long_buff;
|
||||
|
||||
char* buff;
|
||||
if (string_range > buff_max) {
|
||||
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);
|
||||
}
|
||||
return false;
|
||||
|
||||
T ret;
|
||||
char* parse_end = nullptr;
|
||||
|
||||
if constexpr (std::is_same_v<T, float>) {
|
||||
ret = std::strtof(buff, &parse_end);
|
||||
} else if constexpr (std::is_same_v<T, double>) {
|
||||
ret = std::strtod(buff, &parse_end);
|
||||
}
|
||||
|
||||
if (parse_end != buff + string_range) {
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
template <typename T>
|
||||
std::enable_if_t<std::is_integral_v<T>, std::optional<T>> to_num(
|
||||
const char* begin, const char* end) {
|
||||
if (begin == end) {
|
||||
const char* const begin, const char* const 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;
|
||||
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_owerflow =
|
||||
(is_negative) ? sub_overflow<T> : add_overflow<T>;
|
||||
#else
|
||||
auto add_last_digit_owerflow = 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_owerflow)) {
|
||||
return std::nullopt;
|
||||
}
|
||||
}
|
||||
|
||||
return value;
|
||||
return ret;
|
||||
}
|
||||
|
||||
////////////////
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "common.hpp"
|
||||
#include "converter.hpp"
|
||||
#include "exception.hpp"
|
||||
#include "extract.hpp"
|
||||
#include "restrictions.hpp"
|
||||
#include <cstdlib>
|
||||
@@ -12,22 +13,23 @@
|
||||
|
||||
namespace ss {
|
||||
|
||||
template <typename... Matchers>
|
||||
template <typename... Options>
|
||||
class parser {
|
||||
constexpr static auto string_error = setup<Matchers...>::string_error;
|
||||
constexpr static auto string_error = setup<Options...>::string_error;
|
||||
constexpr static auto throw_on_error = setup<Options...>::throw_on_error;
|
||||
|
||||
using multiline = typename setup<Matchers...>::multiline;
|
||||
using error_type = ss::ternary_t<string_error, std::string, bool>;
|
||||
using multiline = typename setup<Options...>::multiline;
|
||||
using error_type = std::conditional_t<string_error, std::string, bool>;
|
||||
|
||||
constexpr static bool escaped_multiline_enabled =
|
||||
multiline::enabled && setup<Matchers...>::escape::enabled;
|
||||
multiline::enabled && setup<Options...>::escape::enabled;
|
||||
|
||||
constexpr static bool quoted_multiline_enabled =
|
||||
multiline::enabled && setup<Matchers...>::quote::enabled;
|
||||
multiline::enabled && setup<Options...>::quote::enabled;
|
||||
|
||||
constexpr static bool ignore_header = setup<Matchers...>::ignore_header;
|
||||
constexpr static bool ignore_header = setup<Options...>::ignore_header;
|
||||
|
||||
constexpr static bool ignore_empty = setup<Matchers...>::ignore_empty;
|
||||
constexpr static bool ignore_empty = setup<Options...>::ignore_empty;
|
||||
|
||||
public:
|
||||
parser(const std::string& file_name,
|
||||
@@ -38,10 +40,27 @@ public:
|
||||
if constexpr (ignore_header) {
|
||||
ignore_next();
|
||||
} else {
|
||||
header_ = reader_.get_next_row();
|
||||
raw_header_ = reader_.get_buffer();
|
||||
}
|
||||
} else {
|
||||
set_error_file_not_open();
|
||||
handle_error_file_not_open();
|
||||
eof_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
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} {
|
||||
if (csv_data_buffer) {
|
||||
read_line();
|
||||
if constexpr (ignore_header) {
|
||||
ignore_next();
|
||||
} else {
|
||||
raw_header_ = reader_.get_buffer();
|
||||
}
|
||||
} else {
|
||||
handle_error_null_buffer();
|
||||
eof_ = true;
|
||||
}
|
||||
}
|
||||
@@ -56,6 +75,8 @@ public:
|
||||
bool valid() const {
|
||||
if constexpr (string_error) {
|
||||
return error_.empty();
|
||||
} else if constexpr (throw_on_error) {
|
||||
return true;
|
||||
} else {
|
||||
return !error_;
|
||||
}
|
||||
@@ -80,22 +101,56 @@ public:
|
||||
}
|
||||
|
||||
size_t line() const {
|
||||
return valid() ? reader_.line_number_ - 1 : 0;
|
||||
return reader_.line_number_ > 1 ? reader_.line_number_ - 1
|
||||
: reader_.line_number_;
|
||||
}
|
||||
|
||||
template <typename T, typename... Ts>
|
||||
no_void_validator_tup_t<T, Ts...> get_next() {
|
||||
std::optional<std::string> error;
|
||||
|
||||
if (!eof_) {
|
||||
if constexpr (throw_on_error) {
|
||||
try {
|
||||
reader_.parse();
|
||||
} catch (const ss::exception& e) {
|
||||
read_line();
|
||||
decorate_rethrow(e);
|
||||
}
|
||||
} else {
|
||||
reader_.parse();
|
||||
}
|
||||
}
|
||||
|
||||
reader_.update();
|
||||
clear_error();
|
||||
if (eof_) {
|
||||
set_error_eof_reached();
|
||||
if (!reader_.converter_.valid()) {
|
||||
handle_error_invalid_conversion();
|
||||
read_line();
|
||||
return {};
|
||||
}
|
||||
|
||||
clear_error();
|
||||
|
||||
if (eof_) {
|
||||
handle_error_eof_reached();
|
||||
return {};
|
||||
}
|
||||
|
||||
if constexpr (throw_on_error) {
|
||||
try {
|
||||
auto value = reader_.converter_.template convert<T, Ts...>();
|
||||
read_line();
|
||||
return value;
|
||||
} catch (const ss::exception& e) {
|
||||
read_line();
|
||||
decorate_rethrow(e);
|
||||
}
|
||||
}
|
||||
|
||||
auto value = reader_.converter_.template convert<T, Ts...>();
|
||||
|
||||
if (!reader_.converter_.valid()) {
|
||||
set_error_invalid_conversion();
|
||||
handle_error_invalid_conversion();
|
||||
}
|
||||
|
||||
read_line();
|
||||
@@ -103,33 +158,47 @@ public:
|
||||
}
|
||||
|
||||
bool field_exists(const std::string& field) {
|
||||
if (header_.empty()) {
|
||||
split_header_data();
|
||||
}
|
||||
|
||||
return header_index(field).has_value();
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void use_fields(const Ts&... fields_args) {
|
||||
if constexpr (ignore_header) {
|
||||
set_error_header_ignored();
|
||||
handle_error_header_ignored();
|
||||
return;
|
||||
}
|
||||
|
||||
if (header_.empty() && !eof()) {
|
||||
split_header_data();
|
||||
}
|
||||
|
||||
if (!valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto fields = std::vector<std::string>{fields_args...};
|
||||
|
||||
if (fields.empty()) {
|
||||
handle_error_empty_mapping();
|
||||
return;
|
||||
}
|
||||
|
||||
std::vector<size_t> column_mappings;
|
||||
|
||||
for (const auto& field : fields) {
|
||||
if (std::count(fields.begin(), fields.end(), field) != 1) {
|
||||
set_error_field_used_multiple_times(field);
|
||||
handle_error_field_used_multiple_times(field);
|
||||
return;
|
||||
}
|
||||
|
||||
auto index = header_index(field);
|
||||
|
||||
if (!index) {
|
||||
set_error_invalid_field(field);
|
||||
handle_error_invalid_field(field);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -139,7 +208,8 @@ public:
|
||||
reader_.converter_.set_column_mapping(column_mappings, header_.size());
|
||||
reader_.next_line_converter_.set_column_mapping(column_mappings,
|
||||
header_.size());
|
||||
if (line() == 0) {
|
||||
|
||||
if (line() == 1) {
|
||||
ignore_next();
|
||||
}
|
||||
}
|
||||
@@ -151,23 +221,28 @@ 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} {
|
||||
iterator() : parser_{nullptr}, value_{} {
|
||||
}
|
||||
iterator(parser<Matchers...>* parser) : parser_{parser} {
|
||||
|
||||
iterator(parser<Options...>* parser) : parser_{parser}, value_{} {
|
||||
}
|
||||
|
||||
iterator(const iterator& other) = default;
|
||||
iterator(iterator&& other) = default;
|
||||
|
||||
value& operator*() {
|
||||
return value_;
|
||||
}
|
||||
|
||||
value* operator->() {
|
||||
return &value_;
|
||||
}
|
||||
|
||||
iterator& operator++() {
|
||||
if (parser_->eof()) {
|
||||
if (!parser_ || parser_->eof()) {
|
||||
parser_ = nullptr;
|
||||
} else {
|
||||
if constexpr (get_object) {
|
||||
@@ -196,22 +271,23 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
parser<Options...>* parser_;
|
||||
value value_;
|
||||
parser<Matchers...>* parser_;
|
||||
};
|
||||
|
||||
iterable(parser<Matchers...>* parser) : parser_{parser} {
|
||||
iterable(parser<Options...>* parser) : parser_{parser} {
|
||||
}
|
||||
|
||||
iterator begin() {
|
||||
return ++iterator{parser_};
|
||||
}
|
||||
|
||||
iterator end() {
|
||||
return iterator{};
|
||||
}
|
||||
|
||||
private:
|
||||
parser<Matchers...>* parser_;
|
||||
parser<Options...>* parser_;
|
||||
};
|
||||
|
||||
template <typename... Ts>
|
||||
@@ -264,6 +340,7 @@ public:
|
||||
|
||||
template <typename Fun>
|
||||
auto on_error(Fun&& fun) {
|
||||
assert_throw_on_error_not_defined<throw_on_error>();
|
||||
if (!parser_.valid()) {
|
||||
if constexpr (std::is_invocable_v<Fun>) {
|
||||
fun();
|
||||
@@ -291,20 +368,22 @@ public:
|
||||
|
||||
template <typename U, typename... Us, typename Fun = none>
|
||||
void try_convert_and_invoke(std::optional<U>& value, Fun&& fun) {
|
||||
if (!parser_.valid()) {
|
||||
auto tuple_output = try_same<Us...>();
|
||||
if (!parser_.valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if constexpr (!std::is_same_v<U, decltype(tuple_output)>) {
|
||||
value = to_object<U>(std::move(tuple_output));
|
||||
} else {
|
||||
value = std::move(tuple_output);
|
||||
}
|
||||
|
||||
parser_.try_invoke(*value, std::forward<Fun>(fun));
|
||||
if (parser_.valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto tuple_output = try_same<Us...>();
|
||||
if (!parser_.valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if constexpr (!std::is_same_v<U, decltype(tuple_output)>) {
|
||||
value = to_object<U>(std::move(tuple_output));
|
||||
} else {
|
||||
value = std::move(tuple_output);
|
||||
}
|
||||
|
||||
parser_.try_invoke(*value, std::forward<Fun>(fun));
|
||||
}
|
||||
|
||||
template <typename U, typename... Us>
|
||||
@@ -313,7 +392,7 @@ public:
|
||||
auto value =
|
||||
parser_.reader_.converter_.template convert<U, Us...>();
|
||||
if (!parser_.reader_.converter_.valid()) {
|
||||
parser_.set_error_invalid_conversion();
|
||||
parser_.handle_error_invalid_conversion();
|
||||
}
|
||||
return value;
|
||||
}
|
||||
@@ -331,6 +410,7 @@ public:
|
||||
template <typename... Ts, typename Fun = none>
|
||||
composite<std::optional<no_void_validator_tup_t<Ts...>>> try_next(
|
||||
Fun&& fun = none{}) {
|
||||
assert_throw_on_error_not_defined<throw_on_error>();
|
||||
using Ret = no_void_validator_tup_t<Ts...>;
|
||||
return try_invoke_and_make_composite<
|
||||
std::optional<Ret>>(get_next<Ts...>(), std::forward<Fun>(fun));
|
||||
@@ -340,6 +420,7 @@ public:
|
||||
// tuple
|
||||
template <typename T, typename... Ts, typename Fun = none>
|
||||
composite<std::optional<T>> try_object(Fun&& fun = none{}) {
|
||||
assert_throw_on_error_not_defined<throw_on_error>();
|
||||
return try_invoke_and_make_composite<
|
||||
std::optional<T>>(get_object<T, Ts...>(), std::forward<Fun>(fun));
|
||||
}
|
||||
@@ -358,7 +439,7 @@ private:
|
||||
constexpr bool returns_void = std::is_same_v<Ret, void>;
|
||||
if constexpr (!returns_void) {
|
||||
if (!try_invoke_impl(arg, std::forward<Fun>(fun))) {
|
||||
set_error_failed_check();
|
||||
handle_error_failed_check();
|
||||
}
|
||||
} else {
|
||||
try_invoke_impl(arg, std::forward<Fun>(fun));
|
||||
@@ -399,6 +480,22 @@ private:
|
||||
// header
|
||||
////////////////
|
||||
|
||||
void split_header_data() {
|
||||
ss::splitter<Options...> splitter;
|
||||
std::string raw_header_copy = raw_header_;
|
||||
splitter.split(raw_header_copy.data(), reader_.delim_);
|
||||
for (const auto& [begin, end] : splitter.split_data_) {
|
||||
std::string field{begin, end};
|
||||
if (std::find(header_.begin(), header_.end(), field) !=
|
||||
header_.end()) {
|
||||
handle_error_invalid_header(field);
|
||||
header_.clear();
|
||||
return;
|
||||
}
|
||||
header_.push_back(std::move(field));
|
||||
}
|
||||
}
|
||||
|
||||
std::optional<size_t> header_index(const std::string& field) {
|
||||
auto it = std::find(header_.begin(), header_.end(), field);
|
||||
|
||||
@@ -421,77 +518,148 @@ private:
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_failed_check() {
|
||||
void handle_error_failed_check() {
|
||||
constexpr static auto error_msg = " failed check";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.append(file_name_).append(" failed check.");
|
||||
error_.clear();
|
||||
error_.append(file_name_).append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{file_name_ + error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_file_not_open() {
|
||||
void handle_error_null_buffer() {
|
||||
constexpr static auto error_msg = " received null data buffer";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.append(file_name_).append(" could not be opened.");
|
||||
error_.clear();
|
||||
error_.append(file_name_).append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{file_name_ + error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_eof_reached() {
|
||||
void handle_error_file_not_open() {
|
||||
constexpr static auto error_msg = " could not be opened";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.append(file_name_).append(" reached end of file.");
|
||||
error_.clear();
|
||||
error_.append(file_name_).append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{file_name_ + error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_invalid_conversion() {
|
||||
void handle_error_eof_reached() {
|
||||
constexpr static auto error_msg = " read on end of file";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append(file_name_).append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{file_name_ + error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void handle_error_invalid_conversion() {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append(file_name_)
|
||||
.append(" ")
|
||||
.append(std::to_string(reader_.line_number_))
|
||||
.append(": ")
|
||||
.append(reader_.converter_.error_msg())
|
||||
.append(": \"")
|
||||
.append(reader_.buffer_)
|
||||
.append("\"");
|
||||
.append(reader_.converter_.error_msg());
|
||||
} else if constexpr (!throw_on_error) {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void handle_error_header_ignored() {
|
||||
constexpr static auto error_msg =
|
||||
": the header row is ignored within the setup it cannot be used";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append(file_name_).append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{file_name_ + error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_header_ignored() {
|
||||
void handle_error_invalid_field(const std::string& field) {
|
||||
constexpr static auto error_msg =
|
||||
": header does not contain given field: ";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.append(file_name_)
|
||||
.append(": \"")
|
||||
.append("the header row is ignored within the setup, it cannot "
|
||||
"be used")
|
||||
.append("\"");
|
||||
error_.clear();
|
||||
error_.append(file_name_).append(error_msg).append(field);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{file_name_ + error_msg + field};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_invalid_field(const std::string& field) {
|
||||
void handle_error_field_used_multiple_times(const std::string& field) {
|
||||
constexpr static auto error_msg = ": given field used multiple times: ";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.append(file_name_)
|
||||
.append(": header does not contain given field: ")
|
||||
.append(field);
|
||||
error_.clear();
|
||||
error_.append(file_name_).append(error_msg).append(field);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{file_name_ + error_msg + field};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_field_used_multiple_times(const std::string& field) {
|
||||
void handle_error_empty_mapping() {
|
||||
constexpr static auto error_msg = "received empty mapping";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.append(file_name_)
|
||||
.append(": given field used multiple times: ")
|
||||
.append(field);
|
||||
error_.clear();
|
||||
error_.append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void handle_error_invalid_header(const std::string& field) {
|
||||
constexpr static auto error_msg = "header contains duplicates: ";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append(error_msg).append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg + field};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void decorate_rethrow(const ss::exception& e) const {
|
||||
static_assert(throw_on_error,
|
||||
"throw_on_error needs to be enabled to use this method");
|
||||
throw ss::exception{std::string{file_name_}
|
||||
.append(" ")
|
||||
.append(std::to_string(line()))
|
||||
.append(": ")
|
||||
.append(e.what())};
|
||||
}
|
||||
|
||||
////////////////
|
||||
// line reading
|
||||
////////////////
|
||||
@@ -505,16 +673,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(
|
||||
other.converter_)},
|
||||
helper_buffer_{other.helper_buffer_},
|
||||
converter_{std::move(other.converter_)},
|
||||
next_line_converter_{std::move(other.next_line_converter_)},
|
||||
size_{other.size_}, next_line_size_{other.next_line_size_},
|
||||
helper_size_{other.helper_size_}, delim_{std::move(other.delim_)},
|
||||
file_{other.file_}, crlf_{other.crlf_}, line_number_{
|
||||
other.line_number_} {
|
||||
buffer_size_{other.buffer_size_},
|
||||
next_line_buffer_size_{other.next_line_buffer_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_} {
|
||||
other.buffer_ = nullptr;
|
||||
other.next_line_buffer_ = nullptr;
|
||||
other.helper_buffer_ = nullptr;
|
||||
@@ -528,13 +707,17 @@ private:
|
||||
helper_buffer_ = other.helper_buffer_;
|
||||
converter_ = std::move(other.converter_);
|
||||
next_line_converter_ = std::move(other.next_line_converter_);
|
||||
size_ = other.size_;
|
||||
next_line_size_ = other.next_line_size_;
|
||||
helper_size_ = other.helper_size_;
|
||||
buffer_size_ = other.buffer_size_;
|
||||
next_line_buffer_size_ = other.next_line_buffer_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_;
|
||||
|
||||
other.buffer_ = nullptr;
|
||||
other.next_line_buffer_ = nullptr;
|
||||
@@ -559,16 +742,73 @@ private:
|
||||
reader(const reader& other) = delete;
|
||||
reader& operator=(const reader& other) = delete;
|
||||
|
||||
bool read_next() {
|
||||
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;
|
||||
|
||||
ssize_t ssize;
|
||||
if (curr_char >= csv_data_size) {
|
||||
return -1;
|
||||
}
|
||||
c = buffer[curr_char++];
|
||||
|
||||
if (*lineptr == nullptr) {
|
||||
*lineptr =
|
||||
static_cast<char*>(malloc(get_line_initial_buffer_size));
|
||||
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);
|
||||
if (new_size < get_line_initial_buffer_size) {
|
||||
new_size = get_line_initial_buffer_size;
|
||||
}
|
||||
char* new_ptr = static_cast<char*>(
|
||||
realloc(static_cast<void*>(*lineptr), new_size));
|
||||
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();
|
||||
ssize_t ssize = 0;
|
||||
size_t size = 0;
|
||||
while (size == 0) {
|
||||
++line_number_;
|
||||
if (next_line_size_ > 0) {
|
||||
if (next_line_buffer_size_ > 0) {
|
||||
next_line_buffer_[0] = '\0';
|
||||
}
|
||||
ssize = get_line(&next_line_buffer_, &next_line_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;
|
||||
@@ -581,17 +821,23 @@ private:
|
||||
}
|
||||
}
|
||||
|
||||
next_line_size_ = size;
|
||||
return true;
|
||||
}
|
||||
|
||||
void parse() {
|
||||
size_t limit = 0;
|
||||
|
||||
if constexpr (escaped_multiline_enabled) {
|
||||
while (escaped_eol(size)) {
|
||||
while (escaped_eol(next_line_size_)) {
|
||||
if (multiline_limit_reached(limit)) {
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
if (!append_next_line_to_buffer(next_line_buffer_, size)) {
|
||||
remove_eol(next_line_buffer_, ssize);
|
||||
next_line_converter_.set_error_unterminated_escape();
|
||||
return true;
|
||||
|
||||
if (!append_next_line_to_buffer(next_line_buffer_,
|
||||
next_line_size_)) {
|
||||
next_line_converter_.handle_error_unterminated_escape();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -600,46 +846,49 @@ private:
|
||||
|
||||
if constexpr (quoted_multiline_enabled) {
|
||||
while (unterminated_quote()) {
|
||||
next_line_size_ -= next_line_converter_.size_shifted();
|
||||
|
||||
if (multiline_limit_reached(limit)) {
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
if (!append_next_line_to_buffer(next_line_buffer_, size)) {
|
||||
remove_eol(next_line_buffer_, ssize);
|
||||
return true;
|
||||
|
||||
if (!append_next_line_to_buffer(next_line_buffer_,
|
||||
next_line_size_)) {
|
||||
next_line_converter_.handle_error_unterminated_quote();
|
||||
return;
|
||||
}
|
||||
|
||||
if constexpr (escaped_multiline_enabled) {
|
||||
while (escaped_eol(size)) {
|
||||
while (escaped_eol(next_line_size_)) {
|
||||
if (multiline_limit_reached(limit)) {
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!append_next_line_to_buffer(next_line_buffer_,
|
||||
size)) {
|
||||
remove_eol(next_line_buffer_, ssize);
|
||||
next_line_size_)) {
|
||||
next_line_converter_
|
||||
.set_error_unterminated_escape();
|
||||
return true;
|
||||
.handle_error_unterminated_escape();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
next_line_converter_.resplit(next_line_buffer_, size);
|
||||
next_line_converter_.resplit(next_line_buffer_,
|
||||
next_line_size_, delim_);
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void update() {
|
||||
std::swap(buffer_, next_line_buffer_);
|
||||
std::swap(size_, next_line_size_);
|
||||
std::swap(buffer_size_, next_line_buffer_size_);
|
||||
std::swap(converter_, next_line_converter_);
|
||||
}
|
||||
|
||||
bool multiline_limit_reached(size_t& limit) {
|
||||
if constexpr (multiline::size > 0) {
|
||||
if (limit++ >= multiline::size) {
|
||||
next_line_converter_.set_error_multiline_limit_reached();
|
||||
next_line_converter_.handle_error_multiline_limit_reached();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -650,23 +899,17 @@ private:
|
||||
const char* curr;
|
||||
for (curr = next_line_buffer_ + size - 1;
|
||||
curr >= next_line_buffer_ &&
|
||||
setup<Matchers...>::escape::match(*curr);
|
||||
setup<Options...>::escape::match(*curr);
|
||||
--curr) {
|
||||
}
|
||||
return (next_line_buffer_ - curr + size) % 2 == 0;
|
||||
}
|
||||
|
||||
bool unterminated_quote() {
|
||||
if (next_line_converter_.unterminated_quote()) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return next_line_converter_.unterminated_quote();
|
||||
}
|
||||
|
||||
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;
|
||||
@@ -676,24 +919,34 @@ private:
|
||||
}
|
||||
}
|
||||
|
||||
size_t remove_eol(char*& buffer, size_t size) {
|
||||
size_t new_size = size - 1;
|
||||
if (size >= 2 && buffer[size - 2] == '\r') {
|
||||
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;
|
||||
new_size--;
|
||||
size--;
|
||||
} else {
|
||||
crlf_ = false;
|
||||
}
|
||||
|
||||
buffer[new_size] = '\0';
|
||||
return new_size;
|
||||
buffer[size] = '\0';
|
||||
return size;
|
||||
}
|
||||
|
||||
void realloc_concat(char*& first, size_t& first_size,
|
||||
const char* const second, size_t second_size) {
|
||||
next_line_size_ = first_size + second_size + 3;
|
||||
first = static_cast<char*>(
|
||||
realloc(static_cast<void*>(first), next_line_size_));
|
||||
size_t& buffer_size, const char* const second,
|
||||
size_t second_size) {
|
||||
buffer_size = first_size + second_size + 3;
|
||||
auto new_first = static_cast<char*>(
|
||||
realloc(static_cast<void*>(first), buffer_size));
|
||||
if (!new_first) {
|
||||
throw std::bad_alloc{};
|
||||
}
|
||||
|
||||
first = new_first;
|
||||
std::copy_n(second, second_size + 1, first + first_size);
|
||||
first_size += second_size;
|
||||
}
|
||||
@@ -701,25 +954,30 @@ private:
|
||||
bool append_next_line_to_buffer(char*& buffer, size_t& size) {
|
||||
undo_remove_eol(buffer, size);
|
||||
|
||||
ssize_t next_ssize =
|
||||
get_line(&helper_buffer_, &helper_size_, file_);
|
||||
ssize_t next_ssize;
|
||||
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;
|
||||
}
|
||||
|
||||
++line_number_;
|
||||
size_t next_size = remove_eol(helper_buffer_, next_ssize);
|
||||
realloc_concat(buffer, size, helper_buffer_, next_size);
|
||||
realloc_concat(buffer, size, next_line_buffer_size_, helper_buffer_,
|
||||
next_size);
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector<std::string> get_next_row() const {
|
||||
std::vector<std::string> next_row;
|
||||
auto& next_row_raw = next_line_converter_.splitter_.split_data_;
|
||||
for (const auto& [begin, end] : next_row_raw) {
|
||||
next_row.emplace_back(begin, end);
|
||||
}
|
||||
return next_row;
|
||||
std::string get_buffer() {
|
||||
return std::string{next_line_buffer_, next_line_buffer_size_};
|
||||
}
|
||||
|
||||
////////////////
|
||||
@@ -729,18 +987,24 @@ private:
|
||||
char* next_line_buffer_{nullptr};
|
||||
char* helper_buffer_{nullptr};
|
||||
|
||||
converter<Matchers...> converter_;
|
||||
converter<Matchers...> next_line_converter_;
|
||||
converter<Options...> converter_;
|
||||
converter<Options...> next_line_converter_;
|
||||
|
||||
size_t size_{0};
|
||||
size_t next_line_size_{0};
|
||||
size_t helper_size_{0};
|
||||
size_t buffer_size_{0};
|
||||
size_t next_line_buffer_size_{0};
|
||||
size_t helper_buffer_size{0};
|
||||
|
||||
std::string delim_;
|
||||
FILE* file_{nullptr};
|
||||
|
||||
bool crlf_;
|
||||
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};
|
||||
|
||||
size_t next_line_size_{0};
|
||||
};
|
||||
|
||||
////////////////
|
||||
@@ -751,6 +1015,7 @@ private:
|
||||
error_type error_{};
|
||||
reader reader_;
|
||||
std::vector<std::string> header_;
|
||||
std::string raw_header_;
|
||||
bool eof_{false};
|
||||
};
|
||||
|
||||
|
||||
@@ -109,10 +109,10 @@ 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,
|
||||
typename get_matcher<Matcher, Ts...>::type>;
|
||||
using type = std::conditional_t<is_matcher<T>::value, T,
|
||||
typename get_matcher<Matcher, Ts...>::type>;
|
||||
};
|
||||
|
||||
template <template <char...> class Matcher>
|
||||
@@ -149,8 +149,8 @@ struct get_multiline;
|
||||
|
||||
template <typename T, typename... Ts>
|
||||
struct get_multiline<T, Ts...> {
|
||||
using type = ternary_t<is_instance_of_multiline<T>::value, T,
|
||||
typename get_multiline<Ts...>::type>;
|
||||
using type = std::conditional_t<is_instance_of_multiline<T>::value, T,
|
||||
typename get_multiline<Ts...>::type>;
|
||||
};
|
||||
|
||||
template <>
|
||||
@@ -179,20 +179,26 @@ class ignore_header;
|
||||
|
||||
class ignore_empty;
|
||||
|
||||
////////////////
|
||||
// throw_on_error
|
||||
////////////////
|
||||
|
||||
class throw_on_error;
|
||||
|
||||
////////////////
|
||||
// setup implementation
|
||||
////////////////
|
||||
|
||||
template <typename... Ts>
|
||||
template <typename... Options>
|
||||
struct setup {
|
||||
private:
|
||||
template <typename T>
|
||||
template <typename Option>
|
||||
struct is_matcher
|
||||
: std::disjunction<is_instance_of_matcher_t<T, quote>,
|
||||
is_instance_of_matcher_t<T, escape>,
|
||||
is_instance_of_matcher_t<T, trim>,
|
||||
is_instance_of_matcher_t<T, trim_left>,
|
||||
is_instance_of_matcher_t<T, trim_right>> {};
|
||||
: std::disjunction<is_instance_of_matcher_t<Option, quote>,
|
||||
is_instance_of_matcher_t<Option, escape>,
|
||||
is_instance_of_matcher_t<Option, trim>,
|
||||
is_instance_of_matcher_t<Option, trim_left>,
|
||||
is_instance_of_matcher_t<Option, trim_right>> {};
|
||||
|
||||
template <typename T>
|
||||
struct is_string_error : std::is_same<T, string_error> {};
|
||||
@@ -203,37 +209,48 @@ private:
|
||||
template <typename T>
|
||||
struct is_ignore_empty : std::is_same<T, ignore_empty> {};
|
||||
|
||||
constexpr static auto count_matcher = count_v<is_matcher, Ts...>;
|
||||
template <typename T>
|
||||
struct is_throw_on_error : std::is_same<T, throw_on_error> {};
|
||||
|
||||
constexpr static auto count_matcher = count_v<is_matcher, Options...>;
|
||||
|
||||
constexpr static auto count_multiline =
|
||||
count_v<is_instance_of_multiline, Ts...>;
|
||||
count_v<is_instance_of_multiline, Options...>;
|
||||
|
||||
constexpr static auto count_string_error = count_v<is_string_error, Ts...>;
|
||||
constexpr static auto count_string_error =
|
||||
count_v<is_string_error, Options...>;
|
||||
|
||||
constexpr static auto count_ignore_header =
|
||||
count_v<is_ignore_header, Ts...>;
|
||||
count_v<is_ignore_header, Options...>;
|
||||
|
||||
constexpr static auto count_ignore_empty = count_v<is_ignore_empty, Ts...>;
|
||||
constexpr static auto count_throw_on_error =
|
||||
count_v<is_throw_on_error, Options...>;
|
||||
|
||||
constexpr static auto count_ignore_empty =
|
||||
count_v<is_ignore_empty, Options...>;
|
||||
|
||||
constexpr static auto number_of_valid_setup_types =
|
||||
count_matcher + count_multiline + count_string_error +
|
||||
count_ignore_header + count_ignore_empty;
|
||||
count_ignore_header + count_ignore_empty + count_throw_on_error;
|
||||
|
||||
using trim_left_only = get_matcher_t<trim_left, Ts...>;
|
||||
using trim_right_only = get_matcher_t<trim_right, Ts...>;
|
||||
using trim_all = get_matcher_t<trim, Ts...>;
|
||||
using trim_left_only = get_matcher_t<trim_left, Options...>;
|
||||
using trim_right_only = get_matcher_t<trim_right, Options...>;
|
||||
using trim_all = get_matcher_t<trim, Options...>;
|
||||
|
||||
public:
|
||||
using quote = get_matcher_t<quote, Ts...>;
|
||||
using escape = get_matcher_t<escape, Ts...>;
|
||||
using quote = get_matcher_t<quote, Options...>;
|
||||
using escape = get_matcher_t<escape, Options...>;
|
||||
|
||||
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...>;
|
||||
using multiline = get_multiline_t<Options...>;
|
||||
constexpr static bool string_error = (count_string_error == 1);
|
||||
constexpr static bool ignore_header = (count_ignore_header == 1);
|
||||
constexpr static bool ignore_empty = (count_ignore_empty == 1);
|
||||
constexpr static bool throw_on_error = (count_throw_on_error == 1);
|
||||
|
||||
private:
|
||||
#define ASSERT_MSG "cannot have the same match character in multiple matchers"
|
||||
@@ -252,21 +269,28 @@ private:
|
||||
static_assert(
|
||||
!multiline::enabled ||
|
||||
(multiline::enabled && (quote::enabled || escape::enabled)),
|
||||
"to enable multiline either quote or escape need to be enabled");
|
||||
"to enable multiline either quote or escape needs to be enabled");
|
||||
|
||||
static_assert(!(trim_all::enabled && trim_left_only::enabled) &&
|
||||
!(trim_all::enabled && trim_right_only::enabled),
|
||||
"ambiguous trim setup");
|
||||
|
||||
static_assert(count_multiline <= 1, "mutliline defined multiple times");
|
||||
|
||||
static_assert(count_string_error <= 1,
|
||||
"string_error defined multiple times");
|
||||
|
||||
static_assert(number_of_valid_setup_types == sizeof...(Ts),
|
||||
static_assert(count_throw_on_error <= 1,
|
||||
"throw_on_error defined multiple times");
|
||||
|
||||
static_assert(count_throw_on_error + count_string_error <= 1,
|
||||
"cannot define both throw_on_error and string_error");
|
||||
|
||||
static_assert(number_of_valid_setup_types == sizeof...(Options),
|
||||
"one or multiple invalid setup parameters defined");
|
||||
};
|
||||
|
||||
template <typename... Ts>
|
||||
struct setup<setup<Ts...>> : setup<Ts...> {};
|
||||
template <typename... Options>
|
||||
struct setup<setup<Options...>> : setup<Options...> {};
|
||||
|
||||
} /* ss */
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#pragma once
|
||||
#include "common.hpp"
|
||||
#include "exception.hpp"
|
||||
#include "setup.hpp"
|
||||
#include "type_traits.hpp"
|
||||
#include <algorithm>
|
||||
@@ -11,26 +12,29 @@
|
||||
|
||||
namespace ss {
|
||||
|
||||
template <typename... Ts>
|
||||
template <typename... Options>
|
||||
class splitter {
|
||||
private:
|
||||
using quote = typename setup<Ts...>::quote;
|
||||
using trim_left = typename setup<Ts...>::trim_left;
|
||||
using trim_right = typename setup<Ts...>::trim_right;
|
||||
using escape = typename setup<Ts...>::escape;
|
||||
using multiline = typename setup<Ts...>::multiline;
|
||||
using quote = typename setup<Options...>::quote;
|
||||
using trim_left = typename setup<Options...>::trim_left;
|
||||
using trim_right = typename setup<Options...>::trim_right;
|
||||
using escape = typename setup<Options...>::escape;
|
||||
using multiline = typename setup<Options...>::multiline;
|
||||
|
||||
constexpr static auto string_error = setup<Ts...>::string_error;
|
||||
constexpr static auto string_error = setup<Options...>::string_error;
|
||||
constexpr static auto throw_on_error = setup<Options...>::throw_on_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) {
|
||||
return error_.empty();
|
||||
} else if constexpr (throw_on_error) {
|
||||
return true;
|
||||
} else {
|
||||
return !error_;
|
||||
}
|
||||
@@ -77,7 +81,7 @@ private:
|
||||
// resplitting, continue from last slice
|
||||
if (!quote::enabled || !multiline::enabled || split_data_.empty() ||
|
||||
!unterminated_quote()) {
|
||||
set_error_invalid_resplit();
|
||||
handle_error_invalid_resplit();
|
||||
return split_data_;
|
||||
}
|
||||
|
||||
@@ -86,7 +90,7 @@ private:
|
||||
|
||||
// safety measure
|
||||
if (new_size != -1 && static_cast<size_t>(new_size) < begin) {
|
||||
set_error_invalid_resplit();
|
||||
handle_error_invalid_resplit();
|
||||
return split_data_;
|
||||
}
|
||||
|
||||
@@ -112,55 +116,75 @@ private:
|
||||
void clear_error() {
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
} else {
|
||||
} else if constexpr (!throw_on_error) {
|
||||
error_ = false;
|
||||
}
|
||||
unterminated_quote_ = false;
|
||||
}
|
||||
|
||||
void set_error_empty_delimiter() {
|
||||
void handle_error_empty_delimiter() {
|
||||
constexpr static auto error_msg = "empty delimiter";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("empt delimiter");
|
||||
error_.append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_mismatched_quote(size_t n) {
|
||||
void handle_error_mismatched_quote(size_t n) {
|
||||
constexpr static auto error_msg = "mismatched quote at position: ";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("mismatched quote at position: " + std::to_string(n));
|
||||
error_.append(error_msg + std::to_string(n));
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg + std::to_string(n)};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_unterminated_escape() {
|
||||
void handle_error_unterminated_escape() {
|
||||
constexpr static auto error_msg =
|
||||
"unterminated escape at the end of the line";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("unterminated escape at the end of the line");
|
||||
error_.append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_unterminated_quote() {
|
||||
unterminated_quote_ = true;
|
||||
void handle_error_unterminated_quote() {
|
||||
constexpr static auto error_msg = "unterminated quote";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("unterminated quote");
|
||||
error_.append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void set_error_invalid_resplit() {
|
||||
unterminated_quote_ = false;
|
||||
void handle_error_invalid_resplit() {
|
||||
constexpr static auto error_msg =
|
||||
"invalid resplit, new line must be longer"
|
||||
"than the end of the last slice";
|
||||
|
||||
if constexpr (string_error) {
|
||||
error_.clear();
|
||||
error_.append("invalid resplit, new line must be longer"
|
||||
"than the end of the last slice");
|
||||
error_.append(error_msg);
|
||||
} else if constexpr (throw_on_error) {
|
||||
throw ss::exception{error_msg};
|
||||
} else {
|
||||
error_ = true;
|
||||
}
|
||||
@@ -235,7 +259,9 @@ private:
|
||||
if constexpr (escape::enabled) {
|
||||
if (escape::match(*curr)) {
|
||||
if (curr[1] == '\0') {
|
||||
set_error_unterminated_escape();
|
||||
if constexpr (!multiline::enabled) {
|
||||
handle_error_unterminated_escape();
|
||||
}
|
||||
done_ = true;
|
||||
return;
|
||||
}
|
||||
@@ -282,7 +308,7 @@ private:
|
||||
clear_error();
|
||||
switch (delimiter.size()) {
|
||||
case 0:
|
||||
set_error_empty_delimiter();
|
||||
handle_error_empty_delimiter();
|
||||
return split_data_;
|
||||
case 1:
|
||||
return split_impl(delimiter[0]);
|
||||
@@ -362,7 +388,9 @@ private:
|
||||
if (end_[1] == '\0') {
|
||||
// eol, unterminated escape
|
||||
// eg: ... "hel\\0
|
||||
set_error_unterminated_escape();
|
||||
if constexpr (!multiline::enabled) {
|
||||
handle_error_unterminated_escape();
|
||||
}
|
||||
done_ = true;
|
||||
break;
|
||||
}
|
||||
@@ -379,7 +407,10 @@ private:
|
||||
// eg: ..."hell\0 -> quote not terminated
|
||||
if (*end_ == '\0') {
|
||||
shift_and_set_current();
|
||||
set_error_unterminated_quote();
|
||||
unterminated_quote_ = true;
|
||||
if constexpr (!multiline::enabled) {
|
||||
handle_error_unterminated_quote();
|
||||
}
|
||||
split_data_.emplace_back(line_, begin_);
|
||||
done_ = true;
|
||||
break;
|
||||
@@ -418,7 +449,7 @@ private:
|
||||
} else {
|
||||
// mismatched quote
|
||||
// eg: ...,"hel"lo,... -> error
|
||||
set_error_mismatched_quote(end_ - line_);
|
||||
handle_error_mismatched_quote(end_ - line_);
|
||||
split_data_.emplace_back(line_, begin_);
|
||||
}
|
||||
done_ = true;
|
||||
|
||||
@@ -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
|
||||
////////////////
|
||||
|
||||
19
meson.build
19
meson.build
@@ -1,17 +1,24 @@
|
||||
project('ssp', 'cpp',
|
||||
project(
|
||||
'ssp',
|
||||
['cpp'],
|
||||
default_options :
|
||||
['warning_level=3',
|
||||
'cpp_std=c++17',
|
||||
'buildtype=debugoptimized'])
|
||||
['warning_level=3',
|
||||
'cpp_std=c++17',
|
||||
'buildtype=debugoptimized',
|
||||
'wrap_mode=forcefallback'],
|
||||
version: '1.6.2',
|
||||
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
|
||||
|
||||
|
||||
@@ -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} \
|
||||
|
||||
35
script/single_header_generator.py
Executable file
35
script/single_header_generator.py
Executable file
@@ -0,0 +1,35 @@
|
||||
#!/bin/python3
|
||||
|
||||
headers_dir = 'include/ss/'
|
||||
headers = ['type_traits.hpp',
|
||||
'exception.hpp',
|
||||
'function_traits.hpp',
|
||||
'restrictions.hpp',
|
||||
'common.hpp',
|
||||
'setup.hpp',
|
||||
'splitter.hpp',
|
||||
'extract.hpp',
|
||||
'converter.hpp',
|
||||
'parser.hpp']
|
||||
|
||||
combined_file = []
|
||||
includes = []
|
||||
|
||||
for header in headers:
|
||||
with open(headers_dir + header) as f:
|
||||
for line in f.read().splitlines():
|
||||
if '#include "' in line or '#include <fast_float' in line:
|
||||
continue
|
||||
|
||||
if '#include <' in line:
|
||||
includes.append(line)
|
||||
continue
|
||||
|
||||
if '#pragma once' not in line:
|
||||
combined_file.append(line)
|
||||
|
||||
includes = sorted(set(includes))
|
||||
|
||||
print('\n'.join(includes))
|
||||
print('#define SSP_DISABLE_FAST_FLOAT')
|
||||
print('\n'.join(combined_file))
|
||||
@@ -1,3 +1,3 @@
|
||||
[wrap-git]
|
||||
url = https://github.com/onqtam/doctest
|
||||
revision = 2.4.4
|
||||
url = https://github.com/red0124/doctest
|
||||
revision = master
|
||||
|
||||
@@ -4,34 +4,43 @@ 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)
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
||||
target_compile_options(ssp INTERFACE -Wall -Wextra)
|
||||
target_compile_options(ssp INTERFACE -Wall -Wextra)
|
||||
endif()
|
||||
|
||||
find_package(doctest 2.4.4 CONFIG REQUIRED)
|
||||
# for doctest_discover_tests
|
||||
include(doctest)
|
||||
if (MSVC)
|
||||
add_compile_options(/bigobj)
|
||||
elseif (MINGW)
|
||||
add_compile_options(-Wa,-mbig-obj)
|
||||
endif ()
|
||||
|
||||
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 ----
|
||||
|
||||
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}")
|
||||
foreach(name IN ITEMS test_splitter test_parser1_1 test_parser1_2
|
||||
test_parser1_3 test_parser1_4 test_converter
|
||||
test_extractions test_parser2_1 test_parser2_2
|
||||
test_parser2_3 test_parser2_4 test_parser2_5
|
||||
test_parser2_6 test_extractions_without_fast_float)
|
||||
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)
|
||||
add_test(NAME "${name}" COMMAND "${name}")
|
||||
endforeach()
|
||||
|
||||
@@ -1,19 +1,32 @@
|
||||
test_sources = files([
|
||||
'test_main.cpp',
|
||||
'test_splitter.cpp',
|
||||
'test_converter.cpp',
|
||||
'test_parser.cpp',
|
||||
'test_extractions.cpp',
|
||||
])
|
||||
doctest_dep = dependency('doctest')
|
||||
add_project_arguments('-DDOCTEST_CONFIG_IMPLEMENT_WITH_MAIN', language: 'cpp')
|
||||
|
||||
doctest_proj = subproject('doctest')
|
||||
doctest_dep = doctest_proj.get_variable('doctest_dep')
|
||||
tests = [
|
||||
'parser1_1',
|
||||
'parser1_2',
|
||||
'parser1_3',
|
||||
'parser1_4',
|
||||
'splitter',
|
||||
'converter',
|
||||
'extractions',
|
||||
'parser2_1',
|
||||
'parser2_2',
|
||||
'parser2_3',
|
||||
'parser2_4',
|
||||
'parser2_5',
|
||||
'parser2_6',
|
||||
'extractions_without_fast_float',
|
||||
]
|
||||
|
||||
test_exe = executable(
|
||||
'test_ssp',
|
||||
sources: test_sources,
|
||||
dependencies: [doctest_dep, ssp_dep],
|
||||
cpp_args: '-lstdc++fs'
|
||||
)
|
||||
foreach name : tests
|
||||
test_name = 'test_' + name
|
||||
|
||||
exe = executable(
|
||||
test_name,
|
||||
test_name + '.cpp',
|
||||
dependencies: [doctest_dep, ssp_dep]
|
||||
)
|
||||
|
||||
test(test_name, exe, timeout: 60)
|
||||
endforeach
|
||||
|
||||
test('test_ssp', test_exe)
|
||||
|
||||
@@ -22,6 +22,30 @@ TEST_CASE("converter test split") {
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test split with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
try {
|
||||
for (const auto& [s, expected, delim] :
|
||||
// clang-format off
|
||||
{std::make_tuple("a,b,c,d", std::vector{"a", "b", "c", "d"}, ","),
|
||||
{"", {}, " "},
|
||||
{" x x x x | x ", {" x x x x ", " x "}, "|"},
|
||||
{"a::b::c::d", {"a", "b", "c", "d"}, "::"},
|
||||
{"x\t-\ty", {"x", "y"}, "\t-\t"},
|
||||
{"x", {"x"}, ","}} // clang-format on
|
||||
) {
|
||||
auto split = c.split(s, delim);
|
||||
CHECK_EQ(split.size(), expected.size());
|
||||
for (size_t i = 0; i < split.size(); ++i) {
|
||||
auto s = std::string(split[i].first, split[i].second);
|
||||
CHECK_EQ(s, expected[i]);
|
||||
}
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test valid conversions") {
|
||||
ss::converter c;
|
||||
|
||||
@@ -116,12 +140,153 @@ TEST_CASE("converter test valid conversions") {
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test valid conversions with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
try {
|
||||
auto tup = c.convert<int>("5");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 5);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<int, void>("5,junk");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 5);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<void, int>("junk,5");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 5);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<int, void, void>("5\njunk\njunk", "\n");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 5);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<void, int, void>("junk 5 junk", " ");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 5);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<void, void, int>("junk\tjunk\t5", "\t");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 5);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup =
|
||||
c.convert<void, void, std::optional<int>>("junk\tjunk\t5", "\t");
|
||||
REQUIRE(c.valid());
|
||||
REQUIRE(tup.has_value());
|
||||
CHECK_EQ(tup, 5);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<int, double, void>("5,6.6,junk");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(5, 6.6));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<int, void, double>("5,junk,6.6");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(5, 6.6));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<void, int, double>("junk;5;6.6", ";");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(5, 6.6));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup =
|
||||
c.convert<void, std::optional<int>, double>("junk;5;6.6", ";");
|
||||
REQUIRE(c.valid());
|
||||
REQUIRE(std::get<0>(tup).has_value());
|
||||
CHECK_EQ(tup, std::make_tuple(5, 6.6));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup =
|
||||
c.convert<void, std::optional<int>, double>("junk;5.4;6.6", ";");
|
||||
REQUIRE(c.valid());
|
||||
REQUIRE_FALSE(std::get<0>(tup).has_value());
|
||||
CHECK_EQ(tup, std::make_tuple(std::optional<int>{}, 6.6));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup =
|
||||
c.convert<void, std::variant<int, double>, double>("junk;5;6.6",
|
||||
";");
|
||||
REQUIRE(c.valid());
|
||||
REQUIRE(std::holds_alternative<int>(std::get<0>(tup)));
|
||||
CHECK_EQ(tup, std::make_tuple(std::variant<int, double>{5}, 6.6));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup =
|
||||
c.convert<void, std::variant<int, double>, double>("junk;5.5;6.6",
|
||||
";");
|
||||
REQUIRE(c.valid());
|
||||
REQUIRE(std::holds_alternative<double>(std::get<0>(tup)));
|
||||
CHECK_EQ(tup, std::make_tuple(std::variant<int, double>{5.5}, 6.6));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
auto tup = c.convert<void, std::string_view, double,
|
||||
std::string_view>("junk;s1;6.6;s2", ";");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(std::string_view{"s1"}, 6.6,
|
||||
std::string_view{"s2"}));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test invalid conversions") {
|
||||
ss::converter c;
|
||||
|
||||
c.convert<int>("");
|
||||
REQUIRE_FALSE(c.valid());
|
||||
|
||||
c.convert<int>("1", "");
|
||||
REQUIRE_FALSE(c.valid());
|
||||
|
||||
c.convert<int>("10", "");
|
||||
REQUIRE_FALSE(c.valid());
|
||||
|
||||
@@ -150,6 +315,23 @@ TEST_CASE("converter test invalid conversions") {
|
||||
REQUIRE_FALSE(c.valid());
|
||||
}
|
||||
|
||||
TEST_CASE("converter test invalid conversions with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
REQUIRE_EXCEPTION(c.convert<int>(""));
|
||||
REQUIRE_EXCEPTION(c.convert<int>("1", ""));
|
||||
REQUIRE_EXCEPTION(c.convert<int>("10", ""));
|
||||
REQUIRE_EXCEPTION(c.convert<int, void>(""));
|
||||
REQUIRE_EXCEPTION(c.convert<int, void>(",junk"));
|
||||
REQUIRE_EXCEPTION(c.convert<void, int>("junk,"));
|
||||
REQUIRE_EXCEPTION(c.convert<int>("x"));
|
||||
REQUIRE_EXCEPTION(c.convert<int, void>("x"));
|
||||
REQUIRE_EXCEPTION(c.convert<int, void>("x,junk"));
|
||||
REQUIRE_EXCEPTION(c.convert<void, int>("junk,x"));
|
||||
REQUIRE_EXCEPTION(
|
||||
c.convert<void, std::variant<int, double>, double>("junk;.5.5;6", ";"));
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:ax restriction (all except)") {
|
||||
ss::converter c;
|
||||
|
||||
@@ -181,6 +363,32 @@ TEST_CASE("converter test ss:ax restriction (all except)") {
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:ax restriction (all except) with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ax<int, 0>>("0"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ax<int, 0, 1, 2>>("1"));
|
||||
REQUIRE_EXCEPTION(c.convert<void, char, ss::ax<int, 0, 1, 2>>("junk,c,1"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ax<int, 1>, char>("1,c"));
|
||||
|
||||
try {
|
||||
{
|
||||
int tup = c.convert<ss::ax<int, 1>>("3");
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
{
|
||||
std::tuple<char, int> tup = c.convert<char, ss::ax<int, 1>>("c,3");
|
||||
CHECK_EQ(tup, std::make_tuple('c', 3));
|
||||
}
|
||||
{
|
||||
std::tuple<int, char> tup = c.convert<ss::ax<int, 1>, char>("3,c");
|
||||
CHECK_EQ(tup, std::make_tuple(3, 'c'));
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:nx restriction (none except)") {
|
||||
ss::converter c;
|
||||
|
||||
@@ -215,6 +423,39 @@ TEST_CASE("converter test ss:nx restriction (none except)") {
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:nx restriction (none except) with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
REQUIRE_EXCEPTION(c.convert<ss::nx<int, 1>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<char, ss::nx<int, 1, 2, 69>>("c,3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::nx<int, 1>, char>("3,c"));
|
||||
|
||||
try {
|
||||
{
|
||||
auto tup = c.convert<ss::nx<int, 3>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
{
|
||||
auto tup = c.convert<ss::nx<int, 0, 1, 2>>("2");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 2);
|
||||
}
|
||||
{
|
||||
auto tup = c.convert<char, void, ss::nx<int, 0, 1, 2>>("c,junk,1");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple('c', 1));
|
||||
}
|
||||
{
|
||||
auto tup = c.convert<ss::nx<int, 1>, char>("1,c");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(1, 'c'));
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:ir restriction (in range)") {
|
||||
ss::converter c;
|
||||
|
||||
@@ -249,6 +490,39 @@ TEST_CASE("converter test ss:ir restriction (in range)") {
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:ir restriction (in range) with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ir<int, 0, 2>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<char, ss::ir<int, 4, 69>>("c,3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ir<int, 1, 2>, char>("3,c"));
|
||||
|
||||
try {
|
||||
{
|
||||
auto tup = c.convert<ss::ir<int, 1, 5>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
{
|
||||
auto tup = c.convert<ss::ir<int, 0, 2>>("2");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 2);
|
||||
}
|
||||
{
|
||||
auto tup = c.convert<char, void, ss::ir<int, 0, 1>>("c,junk,1");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple('c', 1));
|
||||
}
|
||||
{
|
||||
auto tup = c.convert<ss::ir<int, 1, 20>, char>("1,c");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(1, 'c'));
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:oor restriction (out of range)") {
|
||||
ss::converter c;
|
||||
|
||||
@@ -283,7 +557,38 @@ TEST_CASE("converter test ss:oor restriction (out of range)") {
|
||||
}
|
||||
}
|
||||
|
||||
const std::vector<int> extracted_vector = {1, 2, 3};
|
||||
TEST_CASE("converter test ss:oor restriction (out of range) with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
REQUIRE_EXCEPTION(c.convert<ss::oor<int, 1, 5>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::oor<int, 0, 2>>("2"));
|
||||
REQUIRE_EXCEPTION(c.convert<char, ss::oor<int, 0, 1>, void>("c,1,junk"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::oor<int, 1, 20>, char>("1,c"));
|
||||
|
||||
try {
|
||||
{
|
||||
auto tup = c.convert<ss::oor<int, 0, 2>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
|
||||
{
|
||||
auto tup = c.convert<char, void, ss::oor<int, 4, 69>>("c,junk,3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple('c', 3));
|
||||
}
|
||||
|
||||
{
|
||||
auto tup = c.convert<ss::oor<int, 1, 2>, char>("3,c");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(3, 'c'));
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
const inline std::vector<int> extracted_vector = {1, 2, 3};
|
||||
|
||||
// custom extract
|
||||
template <>
|
||||
@@ -331,6 +636,37 @@ TEST_CASE("converter test ss:ne restriction (not empty)") {
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:ne restriction (not empty) with exceptions") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ne<std::string>>(""));
|
||||
REQUIRE_EXCEPTION(c.convert<int, ss::ne<std::string>>("3,"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ne<std::string>, int>(",3"));
|
||||
REQUIRE_EXCEPTION(c.convert<void, ss::ne<std::string>, int>("junk,,3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::ne<std::vector<int>>>(""));
|
||||
|
||||
try {
|
||||
{
|
||||
auto tup = c.convert<ss::ne<std::string>>("s");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, "s");
|
||||
}
|
||||
{
|
||||
auto tup =
|
||||
c.convert<std::optional<int>, ss::ne<std::string>>("1,s");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple(1, "s"));
|
||||
}
|
||||
{
|
||||
auto tup = c.convert<ss::ne<std::vector<int>>>("{1 2 3}");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, extracted_vector);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE(
|
||||
"converter test ss:lt ss::lte ss::gt ss::gte restriction (in range)") {
|
||||
ss::converter c;
|
||||
@@ -390,6 +726,58 @@ TEST_CASE(
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test ss:lt ss::lte ss::gt ss::gte restriction (in range) "
|
||||
"with exception") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
REQUIRE_EXCEPTION(c.convert<ss::lt<int, 3>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::lt<int, 2>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::gt<int, 3>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::gt<int, 4>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::lte<int, 2>>("3"));
|
||||
REQUIRE_EXCEPTION(c.convert<ss::gte<int, 4>>("3"));
|
||||
|
||||
try {
|
||||
{
|
||||
auto tup = c.convert<ss::lt<int, 4>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
|
||||
{
|
||||
auto tup = c.convert<ss::gt<int, 2>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
|
||||
{
|
||||
auto tup = c.convert<ss::lte<int, 4>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
|
||||
{
|
||||
auto tup = c.convert<ss::lte<int, 3>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
|
||||
{
|
||||
auto tup = c.convert<ss::gte<int, 2>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
|
||||
{
|
||||
auto tup = c.convert<ss::gte<int, 3>>("3");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, 3);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test error mode") {
|
||||
ss::converter<ss::string_error> c;
|
||||
c.convert<int>("junk");
|
||||
@@ -397,6 +785,11 @@ TEST_CASE("converter test error mode") {
|
||||
CHECK_FALSE(c.error_msg().empty());
|
||||
}
|
||||
|
||||
TEST_CASE("converter test throw on error mode") {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
REQUIRE_EXCEPTION(c.convert<int>("junk"));
|
||||
}
|
||||
|
||||
TEST_CASE("converter test converter with quotes spacing and escaping") {
|
||||
{
|
||||
ss::converter c;
|
||||
@@ -444,6 +837,66 @@ TEST_CASE("converter test converter with quotes spacing and escaping") {
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test converter with quotes spacing and escaping with "
|
||||
"exceptions") {
|
||||
try {
|
||||
ss::converter<ss::throw_on_error> c;
|
||||
|
||||
auto tup = c.convert<std::string, std::string, std::string>(
|
||||
R"("just","some","strings")");
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple("\"just\"", "\"some\"", "\"strings\""));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>> c;
|
||||
|
||||
auto tup = c.convert<std::string, std::string, double, char>(
|
||||
buff(R"("just",some,"12.3","a")"));
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple("just", "some", 12.3, 'a'));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::throw_on_error, ss::trim<' '>> c;
|
||||
|
||||
auto tup = c.convert<std::string, std::string, double, char>(
|
||||
buff(R"( just , some , 12.3 ,a )"));
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple("just", "some", 12.3, 'a'));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::throw_on_error, ss::escape<'\\'>> c;
|
||||
|
||||
auto tup =
|
||||
c.convert<std::string, std::string>(buff(R"(ju\,st,strings)"));
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple("ju,st", "strings"));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::throw_on_error, ss::escape<'\\'>, ss::trim<' '>,
|
||||
ss::quote<'"'>>
|
||||
c;
|
||||
|
||||
auto tup = c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"( ju\,st , "so,me" , 12.34 , "str""ings")"));
|
||||
REQUIRE(c.valid());
|
||||
CHECK_EQ(tup, std::make_tuple("ju,st", "so,me", 12.34, "str\"ings"));
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test invalid split conversions") {
|
||||
ss::converter<ss::string_error, ss::escape<'\\'>, ss::trim<' '>,
|
||||
ss::quote<'"'>>
|
||||
@@ -451,7 +904,7 @@ TEST_CASE("converter test invalid split conversions") {
|
||||
|
||||
{
|
||||
// mismatched quote
|
||||
auto tup = c.convert<std::string, std::string, double, char>(
|
||||
c.convert<std::string, std::string, double, char>(
|
||||
buff(R"( "just , some , "12.3","a" )"));
|
||||
CHECK_FALSE(c.valid());
|
||||
CHECK_FALSE(c.unterminated_quote());
|
||||
@@ -460,7 +913,7 @@ TEST_CASE("converter test invalid split conversions") {
|
||||
|
||||
{
|
||||
// unterminated quote
|
||||
auto tup = c.convert<std::string, std::string, double, std::string>(
|
||||
c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"( ju\,st , "so,me" , 12.34 , "str""ings)"));
|
||||
CHECK_FALSE(c.valid());
|
||||
CHECK(c.unterminated_quote());
|
||||
@@ -469,7 +922,7 @@ TEST_CASE("converter test invalid split conversions") {
|
||||
|
||||
{
|
||||
// unterminated escape
|
||||
auto tup = c.convert<std::string, std::string, double, std::string>(
|
||||
c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"(just,some,2,strings\)"));
|
||||
CHECK_FALSE(c.valid());
|
||||
CHECK_FALSE(c.unterminated_quote());
|
||||
@@ -478,7 +931,7 @@ TEST_CASE("converter test invalid split conversions") {
|
||||
|
||||
{
|
||||
// unterminated escape while quoting
|
||||
auto tup = c.convert<std::string, std::string, double, std::string>(
|
||||
c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"(just,some,2,"strings\)"));
|
||||
CHECK_FALSE(c.valid());
|
||||
CHECK_FALSE(c.unterminated_quote());
|
||||
@@ -487,10 +940,42 @@ TEST_CASE("converter test invalid split conversions") {
|
||||
|
||||
{
|
||||
// unterminated escaped quote
|
||||
auto tup = c.convert<std::string, std::string, double, std::string>(
|
||||
c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"(just,some,2,"strings\")"));
|
||||
CHECK_FALSE(c.valid());
|
||||
CHECK(c.unterminated_quote());
|
||||
CHECK_FALSE(c.error_msg().empty());
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("converter test invalid split conversions with exceptions") {
|
||||
ss::converter<ss::escape<'\\'>, ss::trim<' '>, ss::quote<'"'>,
|
||||
ss::throw_on_error>
|
||||
c;
|
||||
|
||||
// mismatched quote
|
||||
REQUIRE_EXCEPTION(c.convert<std::string, std::string, double, char>(
|
||||
buff(R"( "just , some , "12.3","a" )")));
|
||||
CHECK_FALSE(c.unterminated_quote());
|
||||
|
||||
// unterminated quote
|
||||
REQUIRE_EXCEPTION(c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"( ju\,st , "so,me" , 12.34 , "str""ings)")));
|
||||
CHECK(c.unterminated_quote());
|
||||
|
||||
// unterminated escape
|
||||
REQUIRE_EXCEPTION(c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"(just,some,2,strings\)")));
|
||||
CHECK_FALSE(c.unterminated_quote());
|
||||
|
||||
// unterminated escape while quoting
|
||||
REQUIRE_EXCEPTION(c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"(just,some,2,"strings\)")));
|
||||
CHECK_FALSE(c.unterminated_quote());
|
||||
|
||||
// unterminated escaped quote
|
||||
REQUIRE_EXCEPTION(c.convert<std::string, std::string, double, std::string>(
|
||||
buff(R"(just,some,2,"strings\")")));
|
||||
CHECK(c.unterminated_quote());
|
||||
}
|
||||
|
||||
|
||||
@@ -2,32 +2,15 @@
|
||||
#include <algorithm>
|
||||
#include <ss/extract.hpp>
|
||||
|
||||
#define CHECK_FLOATING_CONVERSION(input, type) \
|
||||
{ \
|
||||
auto eps = std::numeric_limits<type>::min(); \
|
||||
std::string s = #input; \
|
||||
auto t = ss::to_num<type>(s.c_str(), s.c_str() + s.size()); \
|
||||
REQUIRE(t.has_value()); \
|
||||
CHECK_LT(std::abs(t.value() - type(input)), eps); \
|
||||
} \
|
||||
{ \
|
||||
/* check negative too */ \
|
||||
auto eps = std::numeric_limits<type>::min(); \
|
||||
auto s = std::string("-") + #input; \
|
||||
auto t = ss::to_num<type>(s.c_str(), s.c_str() + s.size()); \
|
||||
REQUIRE(t.has_value()); \
|
||||
CHECK_LT(std::abs(t.value() - type(-input)), eps); \
|
||||
}
|
||||
|
||||
TEST_CASE("testing extract functions for floating point values") {
|
||||
CHECK_FLOATING_CONVERSION(123.456, float);
|
||||
CHECK_FLOATING_CONVERSION(123.456, double);
|
||||
|
||||
CHECK_FLOATING_CONVERSION(69, float);
|
||||
CHECK_FLOATING_CONVERSION(69, double);
|
||||
CHECK_FLOATING_CONVERSION(59, float);
|
||||
CHECK_FLOATING_CONVERSION(59, double);
|
||||
|
||||
CHECK_FLOATING_CONVERSION(420., float);
|
||||
CHECK_FLOATING_CONVERSION(420., double);
|
||||
CHECK_FLOATING_CONVERSION(4210., float);
|
||||
CHECK_FLOATING_CONVERSION(4210., double);
|
||||
|
||||
CHECK_FLOATING_CONVERSION(0.123, float);
|
||||
CHECK_FLOATING_CONVERSION(0.123, double);
|
||||
@@ -70,13 +53,6 @@ TEST_CASE("extract test functions for decimal values") {
|
||||
CHECK_DECIMAL_CONVERSION(1234567891011, ull);
|
||||
}
|
||||
|
||||
#define CHECK_INVALID_CONVERSION(input, type) \
|
||||
{ \
|
||||
std::string s = input; \
|
||||
auto t = ss::to_num<type>(s.c_str(), s.c_str() + s.size()); \
|
||||
CHECK_FALSE(t.has_value()); \
|
||||
}
|
||||
|
||||
TEST_CASE("extract test functions for numbers with invalid inputs") {
|
||||
// negative unsigned value
|
||||
CHECK_INVALID_CONVERSION("-1234", ul);
|
||||
@@ -200,15 +176,6 @@ TEST_CASE("extract test functions for std::optional") {
|
||||
}
|
||||
}
|
||||
|
||||
#define REQUIRE_VARIANT(var, el, type) \
|
||||
{ \
|
||||
auto ptr = std::get_if<type>(&var); \
|
||||
REQUIRE(ptr); \
|
||||
REQUIRE_EQ(el, *ptr); \
|
||||
}
|
||||
|
||||
#define CHECK_NOT_VARIANT(var, type) CHECK(!std::holds_alternative<type>(var));
|
||||
|
||||
TEST_CASE("extract test functions for std::variant") {
|
||||
{
|
||||
std::string s = "22";
|
||||
@@ -308,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);
|
||||
}
|
||||
}
|
||||
|
||||
149
test/test_extractions_without_fast_float.cpp
Normal file
149
test/test_extractions_without_fast_float.cpp
Normal file
@@ -0,0 +1,149 @@
|
||||
#include "test_helpers.hpp"
|
||||
#include <algorithm>
|
||||
|
||||
#define SSP_DISABLE_FAST_FLOAT
|
||||
#include <ss/extract.hpp>
|
||||
|
||||
TEST_CASE(
|
||||
"testing extract functions for floating point values without fast float") {
|
||||
CHECK_FLOATING_CONVERSION(123.456, float);
|
||||
CHECK_FLOATING_CONVERSION(123.456, double);
|
||||
|
||||
CHECK_FLOATING_CONVERSION(59, float);
|
||||
CHECK_FLOATING_CONVERSION(59, double);
|
||||
|
||||
CHECK_FLOATING_CONVERSION(4210., float);
|
||||
CHECK_FLOATING_CONVERSION(4210., double);
|
||||
|
||||
CHECK_FLOATING_CONVERSION(0.123, float);
|
||||
CHECK_FLOATING_CONVERSION(0.123, double);
|
||||
|
||||
CHECK_FLOATING_CONVERSION(123e4, float);
|
||||
CHECK_FLOATING_CONVERSION(123e4, double);
|
||||
}
|
||||
|
||||
TEST_CASE("extract test functions for numbers with invalid inputs without fast "
|
||||
"float") {
|
||||
// floating pint for int
|
||||
CHECK_INVALID_CONVERSION("123.4", int);
|
||||
|
||||
// random input for float
|
||||
CHECK_INVALID_CONVERSION("xxx1", float);
|
||||
}
|
||||
|
||||
TEST_CASE("extract test functions for std::variant without fast float") {
|
||||
{
|
||||
std::string s = "22";
|
||||
{
|
||||
std::variant<int, double, std::string> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, double);
|
||||
CHECK_NOT_VARIANT(var, std::string);
|
||||
REQUIRE_VARIANT(var, 22, int);
|
||||
}
|
||||
{
|
||||
std::variant<double, int, std::string> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, std::string);
|
||||
REQUIRE_VARIANT(var, 22, double);
|
||||
}
|
||||
{
|
||||
std::variant<std::string, double, int> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, double);
|
||||
REQUIRE_VARIANT(var, "22", std::string);
|
||||
}
|
||||
{
|
||||
std::variant<int> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
REQUIRE_VARIANT(var, 22, int);
|
||||
}
|
||||
}
|
||||
{
|
||||
std::string s = "22.2";
|
||||
{
|
||||
std::variant<int, double, std::string> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, std::string);
|
||||
REQUIRE_VARIANT(var, 22.2, double);
|
||||
}
|
||||
{
|
||||
std::variant<double, int, std::string> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, std::string);
|
||||
REQUIRE_VARIANT(var, 22.2, double);
|
||||
}
|
||||
{
|
||||
std::variant<std::string, double, int> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, double);
|
||||
REQUIRE_VARIANT(var, "22.2", std::string);
|
||||
}
|
||||
}
|
||||
{
|
||||
std::string s = "2.2.2";
|
||||
{
|
||||
std::variant<int, double, std::string> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, double);
|
||||
REQUIRE_VARIANT(var, "2.2.2", std::string);
|
||||
}
|
||||
{
|
||||
std::variant<double, std::string, int> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, double);
|
||||
REQUIRE_VARIANT(var, "2.2.2", std::string);
|
||||
}
|
||||
{
|
||||
std::variant<std::string, double, int> var;
|
||||
REQUIRE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
CHECK_NOT_VARIANT(var, double);
|
||||
REQUIRE_VARIANT(var, "2.2.2", std::string);
|
||||
}
|
||||
{
|
||||
std::variant<int, double> var;
|
||||
REQUIRE_FALSE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
|
||||
REQUIRE_VARIANT(var, int{}, int);
|
||||
CHECK_NOT_VARIANT(var, double);
|
||||
}
|
||||
{
|
||||
std::variant<double, int> var;
|
||||
REQUIRE_FALSE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
|
||||
REQUIRE_VARIANT(var, double{}, double);
|
||||
CHECK_NOT_VARIANT(var, int);
|
||||
}
|
||||
{
|
||||
std::variant<int> var;
|
||||
REQUIRE_FALSE(ss::extract(s.c_str(), s.c_str() + s.size(), var));
|
||||
|
||||
REQUIRE_VARIANT(var, int{}, int);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,12 @@
|
||||
#pragma once
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <ctime>
|
||||
#include <filesystem>
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
#include <fstream>
|
||||
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
#include <doctest/doctest.h>
|
||||
@@ -8,41 +14,181 @@
|
||||
#include <doctest.h>
|
||||
#endif
|
||||
|
||||
namespace ss {
|
||||
template <typename... Ts>
|
||||
class parser;
|
||||
} /* ss */
|
||||
|
||||
namespace {
|
||||
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;
|
||||
|
||||
[[maybe_unused]] std::string time_now_rand() {
|
||||
srand(time(nullptr));
|
||||
std::stringstream ss;
|
||||
auto t = std::time(nullptr);
|
||||
auto tm = *std::localtime(&t);
|
||||
ss << std::put_time(&tm, "%d%m%Y%H%M%S");
|
||||
srand(time(nullptr));
|
||||
return ss.str() + std::to_string(rand());
|
||||
}
|
||||
|
||||
struct unique_file_name {
|
||||
static inline int i = 0;
|
||||
|
||||
std::string name;
|
||||
|
||||
unique_file_name(const std::string& test) {
|
||||
do {
|
||||
name = "random_" + test + "_" + std::to_string(i++) + "_" +
|
||||
time_now_rand() + "_file.csv";
|
||||
} while (std::filesystem::exists(name));
|
||||
}
|
||||
|
||||
~unique_file_name() {
|
||||
std::filesystem::remove(name);
|
||||
}
|
||||
};
|
||||
|
||||
#define CHECK_FLOATING_CONVERSION(input, type) \
|
||||
{ \
|
||||
auto eps = std::numeric_limits<type>::min(); \
|
||||
std::string s = #input; \
|
||||
auto t = ss::to_num<type>(s.c_str(), s.c_str() + s.size()); \
|
||||
REQUIRE(t.has_value()); \
|
||||
CHECK_LT(std::abs(t.value() - type(input)), eps); \
|
||||
} \
|
||||
{ \
|
||||
/* check negative too */ \
|
||||
auto eps = std::numeric_limits<type>::min(); \
|
||||
auto s = std::string("-") + #input; \
|
||||
auto t = ss::to_num<type>(s.c_str(), s.c_str() + s.size()); \
|
||||
REQUIRE(t.has_value()); \
|
||||
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; \
|
||||
auto t = ss::to_num<type>(s.c_str(), s.c_str() + s.size()); \
|
||||
CHECK_FALSE(t.has_value()); \
|
||||
}
|
||||
|
||||
#define REQUIRE_VARIANT(var, el, type) \
|
||||
{ \
|
||||
auto ptr = std::get_if<type>(&var); \
|
||||
REQUIRE(ptr); \
|
||||
REQUIRE_EQ(el, *ptr); \
|
||||
}
|
||||
|
||||
#define CHECK_NOT_VARIANT(var, type) CHECK(!std::holds_alternative<type>(var));
|
||||
|
||||
#define REQUIRE_EXCEPTION(...) \
|
||||
try { \
|
||||
__VA_ARGS__; \
|
||||
FAIL("Expected exception"); \
|
||||
} catch (ss::exception & e) { \
|
||||
CHECK_FALSE(std::string{e.what()}.empty()); \
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
[[maybe_unused]] std::vector<std::vector<T>> vector_combinations(
|
||||
const std::vector<T>& v, size_t n) {
|
||||
std::vector<std::vector<T>> ret;
|
||||
if (n <= 1) {
|
||||
for (const auto& i : v) {
|
||||
ret.push_back({i});
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
auto inner_combinations = vector_combinations(v, n - 1);
|
||||
for (const auto& i : v) {
|
||||
for (auto j : inner_combinations) {
|
||||
j.insert(j.begin(), i);
|
||||
ret.push_back(std::move(j));
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
[[maybe_unused]] std::string make_buffer(const std::string& file_name) {
|
||||
std::ifstream in{file_name, std::ios::binary};
|
||||
std::string tmp;
|
||||
std::string out;
|
||||
|
||||
auto copy_if_whitespaces = [&] {
|
||||
std::string matches = "\n\r\t ";
|
||||
while (std::any_of(matches.begin(), matches.end(),
|
||||
[&](auto c) { return in.peek() == c; })) {
|
||||
if (in.peek() == '\r') {
|
||||
out += "\r\n";
|
||||
in.ignore(2);
|
||||
} else {
|
||||
out += std::string{static_cast<char>(in.peek())};
|
||||
in.ignore(1);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
out.reserve(sizeof(out) + 1);
|
||||
|
||||
copy_if_whitespaces();
|
||||
while (in >> tmp) {
|
||||
out += tmp;
|
||||
copy_if_whitespaces();
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
[[maybe_unused]] 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);
|
||||
if (delim.empty()) {
|
||||
return {ss::parser<Ts...>{buffer.data(), buffer.size()},
|
||||
std::move(buffer)};
|
||||
} else {
|
||||
return {ss::parser<Ts...>{buffer.data(), buffer.size(), delim},
|
||||
std::move(buffer)};
|
||||
}
|
||||
} else {
|
||||
if (delim.empty()) {
|
||||
return {ss::parser<Ts...>{file_name}, std::string{}};
|
||||
} else {
|
||||
return {ss::parser<Ts...>{file_name, delim}, std::string{}};
|
||||
}
|
||||
}
|
||||
}
|
||||
} /* namespace */
|
||||
|
||||
1140
test/test_parser.cpp
1140
test/test_parser.cpp
File diff suppressed because it is too large
Load Diff
112
test/test_parser1.hpp
Normal file
112
test/test_parser1.hpp
Normal file
@@ -0,0 +1,112 @@
|
||||
#pragma once
|
||||
|
||||
#include "test_helpers.hpp"
|
||||
#include <algorithm>
|
||||
#include <filesystem>
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <ss/parser.hpp>
|
||||
#include <sstream>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
namespace {
|
||||
[[maybe_unused]] void replace_all(std::string& s, const std::string& from,
|
||||
const std::string& to) {
|
||||
if (from.empty()) return;
|
||||
size_t start_pos = 0;
|
||||
while ((start_pos = s.find(from, start_pos)) != std::string::npos) {
|
||||
s.replace(start_pos, from.length(), to);
|
||||
start_pos += to.length();
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void expect_error_on_command(ss::parser<Ts...>& p,
|
||||
const std::function<void()> command) {
|
||||
if (ss::setup<Ts...>::throw_on_error) {
|
||||
try {
|
||||
command();
|
||||
} catch (const std::exception& e) {
|
||||
CHECK_FALSE(std::string{e.what()}.empty());
|
||||
}
|
||||
} else {
|
||||
command();
|
||||
CHECK(!p.valid());
|
||||
if constexpr (ss::setup<Ts...>::string_error) {
|
||||
CHECK_FALSE(p.error_msg().empty());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[[maybe_unused]] void update_if_crlf(std::string& s) {
|
||||
#ifdef _WIN32
|
||||
replace_all(s, "\r\n", "\n");
|
||||
#else
|
||||
(void)(s);
|
||||
#endif
|
||||
}
|
||||
|
||||
struct X {
|
||||
constexpr static auto delim = ",";
|
||||
constexpr static auto empty = "_EMPTY_";
|
||||
int i;
|
||||
double d;
|
||||
std::string s;
|
||||
|
||||
std::string to_string() const {
|
||||
if (s == empty) {
|
||||
return "";
|
||||
}
|
||||
|
||||
return std::to_string(i)
|
||||
.append(delim)
|
||||
.append(std::to_string(d))
|
||||
.append(delim)
|
||||
.append(s);
|
||||
}
|
||||
auto tied() const {
|
||||
return std::tie(i, d, s);
|
||||
}
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
std::enable_if_t<ss::has_m_tied_t<T>, bool> operator==(const T& lhs,
|
||||
const T& rhs) {
|
||||
return lhs.tied() == rhs.tied();
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static void make_and_write(const std::string& file_name,
|
||||
const std::vector<T>& data,
|
||||
const std::vector<std::string>& header = {},
|
||||
bool new_line_eof = true) {
|
||||
std::ofstream out{file_name};
|
||||
|
||||
#ifdef _WIN32
|
||||
std::vector<const char*> new_lines = {"\n"};
|
||||
#else
|
||||
std::vector<const char*> new_lines = {"\n", "\r\n"};
|
||||
#endif
|
||||
|
||||
for (const auto& i : header) {
|
||||
if (&i != &header.front()) {
|
||||
out << T::delim;
|
||||
}
|
||||
out << i;
|
||||
}
|
||||
|
||||
if (!header.empty()) {
|
||||
out << new_lines.front();
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < data.size(); ++i) {
|
||||
out << data[i].to_string();
|
||||
if (new_line_eof || i + 1 < data.size()) {
|
||||
out << new_lines[i % new_lines.size()];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} /* namespace */
|
||||
582
test/test_parser1_1.cpp
Normal file
582
test/test_parser1_1.cpp
Normal file
@@ -0,0 +1,582 @@
|
||||
#include "test_parser1.hpp"
|
||||
|
||||
TEST_CASE("test file not found") {
|
||||
unique_file_name f{"test_parser"};
|
||||
|
||||
{
|
||||
ss::parser p{f.name, ","};
|
||||
CHECK_FALSE(p.valid());
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::string_error> p{f.name, ","};
|
||||
CHECK_FALSE(p.valid());
|
||||
}
|
||||
|
||||
try {
|
||||
ss::parser<ss::throw_on_error> p{f.name, ","};
|
||||
FAIL("Expected exception...");
|
||||
} catch (const std::exception& e) {
|
||||
CHECK_FALSE(std::string{e.what()}.empty());
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("test null buffer") {
|
||||
{
|
||||
ss::parser p{nullptr, 10, ","};
|
||||
CHECK_FALSE(p.valid());
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::string_error> p{nullptr, 10, ","};
|
||||
CHECK_FALSE(p.valid());
|
||||
}
|
||||
|
||||
try {
|
||||
ss::parser<ss::throw_on_error> p{nullptr, 10, ","};
|
||||
FAIL("Expected exception...");
|
||||
} catch (const std::exception& e) {
|
||||
CHECK_FALSE(std::string{e.what()}.empty());
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
ss::parser p0{std::move(p)};
|
||||
p = std::move(p0);
|
||||
std::vector<X> i;
|
||||
|
||||
auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i2;
|
||||
|
||||
auto move_rotate = [&p = p, &p0 = p0] {
|
||||
auto p1 = std::move(p);
|
||||
p0 = std::move(p1);
|
||||
p = std::move(p0);
|
||||
};
|
||||
|
||||
while (!p.eof()) {
|
||||
move_rotate();
|
||||
auto a = p.template get_next<int, double, std::string>();
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
for (const auto& a : p2.template iterate<int, double, std::string>()) {
|
||||
i2.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
CHECK_EQ(i2, data);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i2;
|
||||
|
||||
auto [p3, ___] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i3;
|
||||
|
||||
std::vector<X> expected = {std::begin(data) + 1, std::end(data)};
|
||||
using tup = std::tuple<int, double, std::string>;
|
||||
|
||||
p.ignore_next();
|
||||
while (!p.eof()) {
|
||||
auto a = p.template get_next<tup>();
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
p2.ignore_next();
|
||||
for (const auto& a : p2.template iterate<tup>()) {
|
||||
i2.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
p3.ignore_next();
|
||||
for (auto it = p3.template iterate<tup>().begin();
|
||||
it != p3.template iterate<tup>().end(); ++it) {
|
||||
i3.emplace_back(ss::to_object<X>(*it));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, expected);
|
||||
CHECK_EQ(i2, expected);
|
||||
CHECK_EQ(i3, expected);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i2;
|
||||
|
||||
while (!p.eof()) {
|
||||
i.push_back(p.template get_object<X, int, double, std::string>());
|
||||
}
|
||||
|
||||
for (auto&& a :
|
||||
p2.template iterate_object<X, int, double, std::string>()) {
|
||||
i2.push_back(std::move(a));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
CHECK_EQ(i2, data);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
for (auto&& a :
|
||||
p.template iterate_object<X, int, double, std::string>()) {
|
||||
i.push_back(std::move(a));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
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.template get_object<X, tup>());
|
||||
}
|
||||
|
||||
for (auto it = p2.template iterate_object<X, tup>().begin();
|
||||
it != p2.template iterate_object<X, tup>().end(); it++) {
|
||||
i2.push_back({it->i, it->d, it->s});
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
CHECK_EQ(i2, data);
|
||||
}
|
||||
|
||||
{
|
||||
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.template iterate_object<X, tup>()) {
|
||||
i.push_back(std::move(a));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
while (!p.eof()) {
|
||||
i.push_back(p.template get_next<X>());
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
for (auto&& a : p.template iterate<X>()) {
|
||||
i.push_back(std::move(a));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
{
|
||||
constexpr int excluded = 3;
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i2;
|
||||
|
||||
while (!p.eof()) {
|
||||
try {
|
||||
auto a = p.template get_object<X, ss::ax<int, excluded>, double,
|
||||
std::string>();
|
||||
if (p.valid()) {
|
||||
i.push_back(a);
|
||||
}
|
||||
} catch (...) {
|
||||
// ignore
|
||||
};
|
||||
}
|
||||
|
||||
if (!ss::setup<Ts...>::throw_on_error) {
|
||||
for (auto&& a : p2.template iterate_object<X, ss::ax<int, excluded>,
|
||||
double, std::string>()) {
|
||||
if (p2.valid()) {
|
||||
i2.push_back(std::move(a));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<X> expected;
|
||||
for (auto& x : data) {
|
||||
if (x.i != excluded) {
|
||||
expected.push_back(x);
|
||||
}
|
||||
}
|
||||
|
||||
std::copy_if(data.begin(), data.end(), expected.begin(),
|
||||
[&](const X& x) { return x.i != excluded; });
|
||||
CHECK_EQ(i, expected);
|
||||
|
||||
if (!ss::setup<Ts...>::throw_on_error) {
|
||||
CHECK_EQ(i2, expected);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
auto [p2, __] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i2;
|
||||
|
||||
while (!p.eof()) {
|
||||
try {
|
||||
auto a = p.template get_object<X, ss::nx<int, 3>, double,
|
||||
std::string>();
|
||||
if (p.valid()) {
|
||||
i.push_back(a);
|
||||
}
|
||||
} catch (...) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
if (!ss::setup<Ts...>::throw_on_error) {
|
||||
for (auto&& a : p2.template iterate_object<X, ss::nx<int, 3>,
|
||||
double, std::string>()) {
|
||||
if (p2.valid()) {
|
||||
i2.push_back(std::move(a));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<X> expected = {{3, 4, "y"}};
|
||||
CHECK_EQ(i, expected);
|
||||
if (!ss::setup<Ts...>::throw_on_error) {
|
||||
CHECK_EQ(i2, expected);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
unique_file_name empty_f{"test_parser"};
|
||||
std::vector<X> empty_data = {};
|
||||
|
||||
make_and_write(empty_f.name, empty_data);
|
||||
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(empty_f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
auto [p2, __] = make_parser<buffer_mode, Ts...>(empty_f.name, ",");
|
||||
std::vector<X> i2;
|
||||
|
||||
while (!p.eof()) {
|
||||
i.push_back(p.template get_next<X>());
|
||||
}
|
||||
|
||||
for (auto&& a : p2.template iterate<X>()) {
|
||||
i2.push_back(std::move(a));
|
||||
}
|
||||
|
||||
CHECK(i.empty());
|
||||
CHECK(i2.empty());
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("parser test various cases") {
|
||||
test_various_cases<false>();
|
||||
test_various_cases<false, ss::string_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>;
|
||||
struct test_struct {
|
||||
int i;
|
||||
double d;
|
||||
char c;
|
||||
auto tied() {
|
||||
return std::tie(i, d, c);
|
||||
}
|
||||
};
|
||||
|
||||
static inline void expect_test_struct(const test_struct&) {
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_composite_conversion() {
|
||||
unique_file_name f{"test_parser"};
|
||||
{
|
||||
std::ofstream out{f.name};
|
||||
for (auto& i :
|
||||
{"10,a,11.1", "10,20,11.1", "junk", "10,11.1", "1,11.1,a", "junk",
|
||||
"10,junk", "11,junk", "10,11.1,c", "10,20", "10,22.2,f"}) {
|
||||
out << i << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
auto fail = [] { FAIL(""); };
|
||||
auto expect_error = [](auto error) { CHECK(!error.empty()); };
|
||||
auto ignore_error = [] {};
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE_FALSE(p.eof());
|
||||
|
||||
{
|
||||
constexpr static auto expectedData = std::tuple{10, 'a', 11.1};
|
||||
|
||||
auto [d1, d2, d3, d4] =
|
||||
p.template try_next<int, int, double>(fail)
|
||||
.template or_else<test_struct>(fail)
|
||||
.template or_else<int, char, double>(
|
||||
[&](auto&& data) { CHECK_EQ(data, expectedData); })
|
||||
.on_error(fail)
|
||||
.template or_else<test_tuple>(fail)
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE_FALSE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
REQUIRE(d3);
|
||||
REQUIRE_FALSE(d4);
|
||||
CHECK_EQ(*d3, expectedData);
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
constexpr static auto expectedData = std::tuple{10, 20, 11.1};
|
||||
|
||||
auto [d1, d2, d3, d4] =
|
||||
p.template try_next<int, int, double>(
|
||||
[&](auto& i1, auto i2, double d) {
|
||||
CHECK_EQ(std::tie(i1, i2, d), expectedData);
|
||||
})
|
||||
.on_error(fail)
|
||||
.template or_object<test_struct, int, double, char>(fail)
|
||||
.on_error(fail)
|
||||
.template or_else<test_tuple>(fail)
|
||||
.on_error(fail)
|
||||
.template or_else<int, char, double>(fail)
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
REQUIRE_FALSE(d3);
|
||||
REQUIRE_FALSE(d4);
|
||||
CHECK_EQ(*d1, expectedData);
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
|
||||
auto [d1, d2, d3, d4, d5] =
|
||||
p.template try_object<test_struct, int, double, char>(fail)
|
||||
.on_error(expect_error)
|
||||
.template or_else<int, char, char>(fail)
|
||||
.template or_else<test_struct>(fail)
|
||||
.template or_else<test_tuple>(fail)
|
||||
.template or_else<int, char, double>(fail)
|
||||
.values();
|
||||
|
||||
REQUIRE_FALSE(p.valid());
|
||||
REQUIRE_FALSE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
REQUIRE_FALSE(d3);
|
||||
REQUIRE_FALSE(d4);
|
||||
REQUIRE_FALSE(d5);
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
|
||||
auto [d1, d2] =
|
||||
p.template try_next<int, double>([](auto& i, auto& d) {
|
||||
REQUIRE_EQ(std::tie(i, d), std::tuple{10, 11.1});
|
||||
})
|
||||
.template or_else<int, double>([](auto&, auto&) { FAIL(""); })
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
|
||||
auto [d1, d2] =
|
||||
p.template try_next<int, double>([](auto&, auto&) { FAIL(""); })
|
||||
.template or_else<test_struct>(expect_test_struct)
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE_FALSE(d1);
|
||||
REQUIRE(d2);
|
||||
CHECK_EQ(d2->tied(), std::tuple{1, 11.1, 'a'});
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
|
||||
auto [d1, d2, d3, d4, d5] =
|
||||
p.template try_next<int, int, double>(fail)
|
||||
.template or_object<test_struct, int, double, char>()
|
||||
.template or_else<test_struct>(expect_test_struct)
|
||||
.template or_else<test_tuple>(fail)
|
||||
.template or_else<std::tuple<int, double>>(fail)
|
||||
.on_error(ignore_error)
|
||||
.on_error(expect_error)
|
||||
.values();
|
||||
|
||||
REQUIRE_FALSE(p.valid());
|
||||
REQUIRE_FALSE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
REQUIRE_FALSE(d3);
|
||||
REQUIRE_FALSE(d4);
|
||||
REQUIRE_FALSE(d5);
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
|
||||
auto [d1, d2] =
|
||||
p.template try_next<int, std::optional<int>>()
|
||||
.on_error(ignore_error)
|
||||
.on_error(fail)
|
||||
.template or_else<std::tuple<int, std::string>>(fail)
|
||||
.on_error(ignore_error)
|
||||
.on_error(fail)
|
||||
.on_error(ignore_error)
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
CHECK_EQ(*d1, std::tuple{10, std::nullopt});
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE_FALSE(p.eof());
|
||||
|
||||
auto [d1, d2] =
|
||||
p.template try_next<int, std::variant<int, std::string>>()
|
||||
.on_error(fail)
|
||||
.template or_else<std::tuple<int, std::string>>(fail)
|
||||
.on_error(fail)
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
CHECK_EQ(*d1, std::tuple{11, std::variant<int, std::string>{"junk"}});
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
|
||||
auto [d1, d2] = p.template try_object<test_struct, int, double, char>()
|
||||
.template or_else<int>(fail)
|
||||
.values();
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
CHECK_EQ(d1->tied(), std::tuple{10, 11.1, 'c'});
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE_FALSE(p.eof());
|
||||
|
||||
auto [d1, d2, d3, d4] =
|
||||
p.template try_next<int, int>([] { return false; })
|
||||
.template or_else<int, double>([](auto&) { return false; })
|
||||
.template or_else<int, int>()
|
||||
.template or_else<int, int>(fail)
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE_FALSE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
REQUIRE(d3);
|
||||
REQUIRE_FALSE(d4);
|
||||
CHECK_EQ(d3.value(), std::tuple{10, 20});
|
||||
}
|
||||
|
||||
{
|
||||
REQUIRE(!p.eof());
|
||||
|
||||
auto [d1, d2, d3, d4] =
|
||||
p.template try_object<test_struct, int, double, char>(
|
||||
[] { return false; })
|
||||
.template or_else<int, double>([](auto&) { return false; })
|
||||
.template or_object<test_struct, int, double, char>()
|
||||
.template or_else<int, int>(fail)
|
||||
.values();
|
||||
|
||||
REQUIRE(p.valid());
|
||||
REQUIRE_FALSE(d1);
|
||||
REQUIRE_FALSE(d2);
|
||||
REQUIRE(d3);
|
||||
REQUIRE_FALSE(d4);
|
||||
CHECK_EQ(d3->tied(), std::tuple{10, 22.2, 'f'});
|
||||
}
|
||||
|
||||
CHECK(p.eof());
|
||||
}
|
||||
|
||||
// various scenarios
|
||||
TEST_CASE("parser test composite conversion") {
|
||||
test_composite_conversion<false, ss::string_error>();
|
||||
test_composite_conversion<true, ss::string_error>();
|
||||
}
|
||||
|
||||
template <bool buffer_mode>
|
||||
void test_no_new_line_at_eof_impl(const std::vector<X>& data) {
|
||||
unique_file_name f{"test_parser"};
|
||||
make_and_write(f.name, data, {}, false);
|
||||
|
||||
auto [p, _] = make_parser<buffer_mode>(f.name);
|
||||
std::vector<X> parsed_data;
|
||||
|
||||
for (const auto& el : p.template iterate<X>()) {
|
||||
parsed_data.push_back(el);
|
||||
}
|
||||
|
||||
CHECK_EQ(data, parsed_data);
|
||||
}
|
||||
|
||||
template <bool buffer_mode>
|
||||
void test_no_new_line_at_eof() {
|
||||
test_no_new_line_at_eof_impl<buffer_mode>({});
|
||||
test_no_new_line_at_eof_impl<buffer_mode>({{1, 2, "X"}});
|
||||
test_no_new_line_at_eof_impl<buffer_mode>({{1, 2, "X"}, {3, 4, "YY"}});
|
||||
test_no_new_line_at_eof_impl<buffer_mode>(
|
||||
{{1, 2, "X"}, {3, 4, "YY"}, {5, 6, "ZZZ"}, {7, 8, "UUU"}});
|
||||
}
|
||||
|
||||
TEST_CASE("test no new line at end of data") {
|
||||
test_no_new_line_at_eof<false>();
|
||||
test_no_new_line_at_eof<true>();
|
||||
}
|
||||
309
test/test_parser1_2.cpp
Normal file
309
test/test_parser1_2.cpp
Normal file
@@ -0,0 +1,309 @@
|
||||
#include "test_parser1.hpp"
|
||||
|
||||
struct my_string {
|
||||
char* data{nullptr};
|
||||
|
||||
my_string() = default;
|
||||
|
||||
~my_string() {
|
||||
delete[] data;
|
||||
}
|
||||
|
||||
// make sure no object is copied
|
||||
my_string(const my_string&) = delete;
|
||||
my_string& operator=(const my_string&) = delete;
|
||||
|
||||
my_string(my_string&& other) : data{other.data} {
|
||||
other.data = nullptr;
|
||||
}
|
||||
|
||||
my_string& operator=(my_string&& other) {
|
||||
data = other.data;
|
||||
return *this;
|
||||
}
|
||||
};
|
||||
|
||||
template <>
|
||||
inline bool ss::extract(const char* begin, const char* end, my_string& s) {
|
||||
size_t size = end - begin;
|
||||
s.data = new char[size + 1];
|
||||
strncpy(s.data, begin, size);
|
||||
s.data[size] = '\0';
|
||||
return true;
|
||||
}
|
||||
|
||||
struct xyz {
|
||||
my_string x;
|
||||
my_string y;
|
||||
my_string z;
|
||||
auto tied() {
|
||||
return std::tie(x, y, z);
|
||||
}
|
||||
};
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_moving_of_parsed_composite_values() {
|
||||
// to compile is enough
|
||||
return;
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>("", "");
|
||||
p.template try_next<my_string, my_string, my_string>()
|
||||
.template or_else<my_string, my_string, my_string, my_string>(
|
||||
[](auto&&) {})
|
||||
.template or_else<my_string>([](auto&) {})
|
||||
.template or_else<xyz>([](auto&&) {})
|
||||
.template or_object<xyz, my_string, my_string, my_string>([](auto&&) {})
|
||||
.template or_else<std::tuple<my_string, my_string, my_string>>(
|
||||
[](auto&, auto&, auto&) {});
|
||||
}
|
||||
|
||||
TEST_CASE("parser test the moving of parsed composite values") {
|
||||
test_moving_of_parsed_composite_values<false>();
|
||||
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") {
|
||||
unique_file_name f{"test_parser"};
|
||||
{
|
||||
std::ofstream out{f.name};
|
||||
out << "junk" << std::endl;
|
||||
out << "junk" << std::endl;
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<false, ss::string_error>(f.name, ",");
|
||||
|
||||
REQUIRE_FALSE(p.eof());
|
||||
p.get_next<int>();
|
||||
CHECK_FALSE(p.valid());
|
||||
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") {
|
||||
unique_file_name f{"test_parser"};
|
||||
{
|
||||
std::ofstream out{f.name};
|
||||
out << "junk" << std::endl;
|
||||
out << "junk" << std::endl;
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<false, ss::throw_on_error>(f.name, ",");
|
||||
|
||||
REQUIRE_FALSE(p.eof());
|
||||
try {
|
||||
p.get_next<int>();
|
||||
FAIL("Expected exception...");
|
||||
} catch (const std::exception& e) {
|
||||
CHECK_FALSE(std::string{e.what()}.empty());
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<true, ss::throw_on_error>(f.name, ",");
|
||||
|
||||
REQUIRE_FALSE(p.eof());
|
||||
try {
|
||||
p.get_next<int>();
|
||||
FAIL("Expected exception...");
|
||||
} catch (const std::exception& e) {
|
||||
CHECK_FALSE(std::string{e.what()}.empty());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline std::string no_quote(const std::string& s) {
|
||||
if (!s.empty() && s[0] == '"') {
|
||||
return {std::next(begin(s)), std::prev(end(s))};
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_quote_multiline() {
|
||||
unique_file_name f{"test_parser"};
|
||||
std::vector<X> data = {{1, 2, "\"x\r\nx\nx\""},
|
||||
{3, 4, "\"y\ny\r\ny\""},
|
||||
{5, 6, "\"z\nz\""},
|
||||
{7, 8, "\"u\"\"\""},
|
||||
{9, 10, "v"},
|
||||
{11, 12, "\"w\n\""}};
|
||||
for (auto& [_, __, s] : data) {
|
||||
update_if_crlf(s);
|
||||
}
|
||||
|
||||
make_and_write(f.name, data);
|
||||
for (auto& [_, __, s] : data) {
|
||||
s = no_quote(s);
|
||||
if (s[0] == 'u') {
|
||||
s = "u\"";
|
||||
}
|
||||
}
|
||||
|
||||
auto [p, _] =
|
||||
make_parser<buffer_mode, ss::multiline, ss::quote<'"'>, Ts...>(f.name,
|
||||
",");
|
||||
|
||||
std::vector<X> i;
|
||||
|
||||
while (!p.eof()) {
|
||||
auto a = p.template get_next<int, double, std::string>();
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
for (auto& [_, __, s] : i) {
|
||||
update_if_crlf(s);
|
||||
}
|
||||
CHECK_EQ(i, data);
|
||||
|
||||
auto [p_no_multiline, __] =
|
||||
make_parser<buffer_mode, ss::quote<'"'>, Ts...>(f.name, ",");
|
||||
while (!p.eof()) {
|
||||
auto command = [&p_no_multiline = p_no_multiline] {
|
||||
p_no_multiline.template get_next<int, double, std::string>();
|
||||
};
|
||||
expect_error_on_command(p_no_multiline, command);
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("parser test csv on multiple lines with quotes") {
|
||||
test_quote_multiline<false>();
|
||||
test_quote_multiline<false, ss::string_error>();
|
||||
test_quote_multiline<false, ss::throw_on_error>();
|
||||
test_quote_multiline<true>();
|
||||
test_quote_multiline<true, ss::string_error>();
|
||||
test_quote_multiline<true, ss::throw_on_error>();
|
||||
}
|
||||
|
||||
static inline std::string no_escape(std::string& s) {
|
||||
s.erase(std::remove(begin(s), end(s), '\\'), end(s));
|
||||
return s;
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_escape_multiline() {
|
||||
unique_file_name f{"test_parser"};
|
||||
std::vector<X> data = {{1, 2, "x\\\nx\\\r\nx"},
|
||||
{5, 6, "z\\\nz\\\nz"},
|
||||
{7, 8, "u"},
|
||||
{3, 4, "y\\\ny\\\ny"},
|
||||
{9, 10, "v\\\\"},
|
||||
{11, 12, "w\\\n"}};
|
||||
for (auto& [_, __, s] : data) {
|
||||
update_if_crlf(s);
|
||||
}
|
||||
|
||||
make_and_write(f.name, data);
|
||||
for (auto& [_, __, s] : data) {
|
||||
s = no_escape(s);
|
||||
if (s == "v") {
|
||||
s = "v\\";
|
||||
}
|
||||
}
|
||||
|
||||
auto [p, _] =
|
||||
make_parser<buffer_mode, ss::multiline, ss::escape<'\\'>, Ts...>(f.name,
|
||||
",");
|
||||
std::vector<X> i;
|
||||
|
||||
while (!p.eof()) {
|
||||
auto a = p.template get_next<int, double, std::string>();
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
for (auto& [_, __, s] : i) {
|
||||
update_if_crlf(s);
|
||||
}
|
||||
CHECK_EQ(i, data);
|
||||
|
||||
auto [p_no_multiline, __] =
|
||||
make_parser<buffer_mode, ss::escape<'\\'>, Ts...>(f.name, ",");
|
||||
while (!p.eof()) {
|
||||
auto command = [&p_no_multiline = p_no_multiline] {
|
||||
auto a =
|
||||
p_no_multiline.template get_next<int, double, std::string>();
|
||||
};
|
||||
expect_error_on_command(p_no_multiline, command);
|
||||
}
|
||||
}
|
||||
|
||||
TEST_CASE("parser test csv on multiple lines with escapes") {
|
||||
test_escape_multiline<false>();
|
||||
test_escape_multiline<false, ss::string_error>();
|
||||
test_escape_multiline<false, ss::throw_on_error>();
|
||||
test_escape_multiline<true>();
|
||||
test_escape_multiline<true, ss::string_error>();
|
||||
test_escape_multiline<true, ss::throw_on_error>();
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_quote_escape_multiline() {
|
||||
unique_file_name f{"test_parser"};
|
||||
{
|
||||
std::ofstream out{f.name};
|
||||
out << "1,2,\"just\\\n\nstrings\"" << std::endl;
|
||||
#ifndef _WIN32
|
||||
out << "3,4,\"just\r\nsome\\\r\n\n\\\nstrings\"" << std::endl;
|
||||
out << "5,6,\"just\\\n\\\r\n\r\n\nstrings" << std::endl;
|
||||
#else
|
||||
out << "3,4,\"just\nsome\\\n\n\\\nstrings\"" << std::endl;
|
||||
out << "5,6,\"just\\\n\\\n\n\nstrings" << std::endl;
|
||||
#endif
|
||||
out << "7,8,\"just strings\"" << std::endl;
|
||||
out << "9,10,just strings" << std::endl;
|
||||
}
|
||||
size_t bad_lines = 1;
|
||||
auto num_errors = 0;
|
||||
|
||||
auto [p, _] = make_parser<buffer_mode, ss::multiline, ss::escape<'\\'>,
|
||||
ss::quote<'"'>, Ts...>(f.name);
|
||||
std::vector<X> i;
|
||||
|
||||
while (!p.eof()) {
|
||||
try {
|
||||
auto a = p.template get_next<int, double, std::string>();
|
||||
if (p.valid()) {
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
} else {
|
||||
++num_errors;
|
||||
}
|
||||
} catch (const std::exception& e) {
|
||||
++num_errors;
|
||||
}
|
||||
}
|
||||
|
||||
CHECK(bad_lines == num_errors);
|
||||
|
||||
std::vector<X> data = {{1, 2, "just\n\nstrings"},
|
||||
#ifndef _WIN32
|
||||
{3, 4, "just\r\nsome\r\n\n\nstrings"},
|
||||
#else
|
||||
{3, 4, "just\nsome\n\n\nstrings"},
|
||||
#endif
|
||||
{9, 10, "just strings"}};
|
||||
|
||||
for (auto& [_, __, s] : i) {
|
||||
update_if_crlf(s);
|
||||
}
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
TEST_CASE("parser test csv on multiple lines with quotes and escapes") {
|
||||
test_quote_escape_multiline<false>();
|
||||
test_quote_escape_multiline<false, ss::string_error>();
|
||||
test_quote_escape_multiline<false, ss::throw_on_error>();
|
||||
test_quote_escape_multiline<true>();
|
||||
test_quote_escape_multiline<true, ss::string_error>();
|
||||
test_quote_escape_multiline<true, ss::throw_on_error>();
|
||||
}
|
||||
330
test/test_parser1_3.cpp
Normal file
330
test/test_parser1_3.cpp
Normal file
@@ -0,0 +1,330 @@
|
||||
#include "test_parser1.hpp"
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_multiline_restricted() {
|
||||
unique_file_name f{"test_parser"};
|
||||
{
|
||||
std::ofstream out{f.name};
|
||||
out << "1,2,\"just\n\nstrings\"" << std::endl;
|
||||
#ifndef _WIN32
|
||||
out << "3,4,\"ju\n\r\n\nnk\"" << std::endl;
|
||||
out << "5,6,just\\\n\\\r\nstrings" << std::endl;
|
||||
#else
|
||||
out << "3,4,\"ju\n\n\nnk\"" << std::endl;
|
||||
out << "5,6,just\\\n\\\nstrings" << std::endl;
|
||||
#endif
|
||||
out << "7,8,ju\\\n\\\n\\\nnk" << std::endl;
|
||||
out << "9,10,\"just\\\n\nstrings\"" << std::endl;
|
||||
out << "11,12,\"ju\\\n|\n\n\n\n\nk\"" << std::endl;
|
||||
out << "13,14,\"ju\\\n\\\n15,16\"\\\n\\\\\n\nnk\"" << std::endl;
|
||||
out << "17,18,\"ju\\\n\\\n\\\n\\\\\n\nnk\"" << std::endl;
|
||||
out << "19,20,just strings" << std::endl;
|
||||
}
|
||||
auto bad_lines = 15;
|
||||
auto num_errors = 0;
|
||||
|
||||
auto [p, _] =
|
||||
make_parser<buffer_mode, ss::multiline_restricted<2>, ss::quote<'"'>,
|
||||
ss::escape<'\\'>, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
|
||||
while (!p.eof()) {
|
||||
try {
|
||||
auto a = p.template get_next<int, double, std::string>();
|
||||
if (p.valid()) {
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
} else {
|
||||
++num_errors;
|
||||
}
|
||||
} catch (const std::exception& e) {
|
||||
++num_errors;
|
||||
}
|
||||
}
|
||||
|
||||
CHECK(bad_lines == num_errors);
|
||||
|
||||
std::vector<X> data = {{1, 2, "just\n\nstrings"},
|
||||
#ifndef _WIN32
|
||||
{5, 6, "just\n\r\nstrings"},
|
||||
#else
|
||||
{5, 6, "just\n\nstrings"},
|
||||
#endif
|
||||
{9, 10, "just\n\nstrings"},
|
||||
{19, 20, "just strings"}};
|
||||
|
||||
for (auto& [_, __, s] : i) {
|
||||
update_if_crlf(s);
|
||||
}
|
||||
|
||||
if (i.size() != data.size()) {
|
||||
CHECK_EQ(i.size(), data.size());
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
TEST_CASE("parser test multiline restricted") {
|
||||
test_multiline_restricted<false>();
|
||||
test_multiline_restricted<false, ss::string_error>();
|
||||
test_multiline_restricted<false, ss::throw_on_error>();
|
||||
test_multiline_restricted<true>();
|
||||
test_multiline_restricted<true, ss::string_error>();
|
||||
test_multiline_restricted<true, ss::throw_on_error>();
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_unterminated_line_impl(const std::vector<std::string>& lines,
|
||||
size_t bad_line) {
|
||||
unique_file_name f{"test_parser"};
|
||||
std::ofstream out{f.name};
|
||||
for (const auto& line : lines) {
|
||||
out << line << std::endl;
|
||||
}
|
||||
out.close();
|
||||
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name);
|
||||
size_t line = 0;
|
||||
while (!p.eof()) {
|
||||
auto command = [&p = p] {
|
||||
p.template get_next<int, double, std::string>();
|
||||
};
|
||||
|
||||
if (line == bad_line) {
|
||||
expect_error_on_command(p, command);
|
||||
break;
|
||||
} else {
|
||||
command();
|
||||
CHECK(p.valid());
|
||||
++line;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_unterminated_line(const std::vector<std::string>& lines,
|
||||
size_t bad_line) {
|
||||
test_unterminated_line_impl<false, Ts...>(lines, bad_line);
|
||||
test_unterminated_line_impl<false, Ts..., ss::string_error>(lines,
|
||||
bad_line);
|
||||
test_unterminated_line_impl<false, Ts..., ss::throw_on_error>(lines,
|
||||
bad_line);
|
||||
test_unterminated_line_impl<true, Ts...>(lines, bad_line);
|
||||
test_unterminated_line_impl<true, Ts..., ss::string_error>(lines, bad_line);
|
||||
test_unterminated_line_impl<true, Ts..., ss::throw_on_error>(lines,
|
||||
bad_line);
|
||||
}
|
||||
|
||||
TEST_CASE("parser test csv on multiline with errors") {
|
||||
using multiline = ss::multiline_restricted<3>;
|
||||
using escape = ss::escape<'\\'>;
|
||||
using quote = ss::quote<'"'>;
|
||||
|
||||
// unterminated escape
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,just\\"};
|
||||
test_unterminated_line<multiline, escape>(lines, 0);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,just\\", "9,8,second"};
|
||||
test_unterminated_line<multiline, escape>(lines, 0);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "1,2,just\\"};
|
||||
test_unterminated_line<multiline, escape>(lines, 1);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "1,2,just\\",
|
||||
"3,4,third"};
|
||||
test_unterminated_line<multiline, escape>(lines, 1);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first",
|
||||
"1,2,just\\\nstrings\\",
|
||||
"3,4,th\\\nird"};
|
||||
test_unterminated_line<multiline, escape>(lines, 1);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "3,4,second",
|
||||
"1,2,just\\"};
|
||||
test_unterminated_line<multiline, escape>(lines, 2);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 2);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,\\first", "3,4,second",
|
||||
"1,2,jus\\t\\"};
|
||||
test_unterminated_line<multiline, escape>(lines, 2);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 2);
|
||||
}
|
||||
|
||||
// unterminated quote
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\"just"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
test_unterminated_line<multiline, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\"just", "9,8,second"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
test_unterminated_line<multiline, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "1,2,\"just"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
test_unterminated_line<multiline, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "1,2,\"just",
|
||||
"3,4,th\\,ird"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
test_unterminated_line<multiline, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "3,4,second",
|
||||
"1,2,\"just"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 2);
|
||||
test_unterminated_line<multiline, quote>(lines, 2);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,\"first\"",
|
||||
"\"3\",4,\"sec,ond\"",
|
||||
"1,2,\"ju\"\"st"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 2);
|
||||
test_unterminated_line<multiline, quote>(lines, 2);
|
||||
}
|
||||
|
||||
// unterminated quote and escape
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\"just\\"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\"just\\\n\\"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\"just\n\\"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "1,2,\"just\n\\"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first", "1,2,\"just\n\\",
|
||||
"4,3,thrid"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,f\\\nirst", "1,2,\"just\n\\",
|
||||
"4,3,thrid"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,\"f\ni\nrst\"",
|
||||
"1,2,\"just\n\\", "4,3,thrid"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
// multiline limmit reached escape
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\\\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape>(lines, 0);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first",
|
||||
"1,2,\\\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape>(lines, 1);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,fi\\\nrs\\\nt",
|
||||
"1,2,\\\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape>(lines, 1);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first",
|
||||
"1,2,\\\n\\\n\\\n\\\njust",
|
||||
"4,3,third"};
|
||||
test_unterminated_line<multiline, escape>(lines, 1);
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
// multiline limmit reached quote
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\"\n\n\n\n\njust\""};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
test_unterminated_line<multiline, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first",
|
||||
"1,2,\"\n\n\n\n\njust\""};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
test_unterminated_line<multiline, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,\"fir\nst\"",
|
||||
"1,2,\"\n\n\n\n\njust\""};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
test_unterminated_line<multiline, quote>(lines, 1);
|
||||
}
|
||||
|
||||
// multiline limmit reached quote and escape
|
||||
{
|
||||
const std::vector<std::string> lines{"1,2,\"\\\n\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 0);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,first",
|
||||
"1,2,\"\\\n\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,fi\\\nrst",
|
||||
"1,2,\"\\\n\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,\"fi\nrst\"",
|
||||
"1,2,\"\\\n\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
|
||||
{
|
||||
const std::vector<std::string> lines{"9,8,\"fi\nr\\\nst\"",
|
||||
"1,2,\"\\\n\n\\\n\\\n\\\njust"};
|
||||
test_unterminated_line<multiline, escape, quote>(lines, 1);
|
||||
}
|
||||
}
|
||||
501
test/test_parser1_4.cpp
Normal file
501
test/test_parser1_4.cpp
Normal file
@@ -0,0 +1,501 @@
|
||||
#include "test_parser1.hpp"
|
||||
|
||||
template <typename T, typename Tuple>
|
||||
struct has_type;
|
||||
|
||||
template <typename T, typename... Us>
|
||||
struct has_type<T, std::tuple<Us...>>
|
||||
: std::disjunction<std::is_same<T, Us>...> {};
|
||||
|
||||
template <bool buffer_mode, typename Setup, typename... Ts>
|
||||
static void test_fields_impl(const std::string file_name,
|
||||
const std::vector<X>& data,
|
||||
const std::vector<std::string>& fields) {
|
||||
using CaseType = std::tuple<Ts...>;
|
||||
|
||||
auto [p, _] = make_parser<buffer_mode, Setup>(file_name, ",");
|
||||
CHECK_FALSE(p.field_exists("Unknown"));
|
||||
p.use_fields(fields);
|
||||
std::vector<CaseType> i;
|
||||
|
||||
for (const auto& a : p.template iterate<CaseType>()) {
|
||||
i.push_back(a);
|
||||
}
|
||||
|
||||
CHECK_EQ(i.size(), data.size());
|
||||
for (size_t j = 0; j < i.size(); ++j) {
|
||||
if constexpr (has_type<int, CaseType>::value) {
|
||||
CHECK_EQ(std::get<int>(i[j]), data[j].i);
|
||||
}
|
||||
if constexpr (has_type<double, CaseType>::value) {
|
||||
CHECK_EQ(std::get<double>(i[j]), data[j].d);
|
||||
}
|
||||
if constexpr (has_type<std::string, CaseType>::value) {
|
||||
CHECK_EQ(std::get<std::string>(i[j]), data[j].s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
static void test_fields(const std::string file_name, const std::vector<X>& data,
|
||||
const std::vector<std::string>& fields) {
|
||||
test_fields_impl<false, ss::setup<>, Ts...>(file_name, data, fields);
|
||||
test_fields_impl<false, ss::setup<ss::string_error>, Ts...>(file_name, data,
|
||||
fields);
|
||||
test_fields_impl<false, ss::setup<ss::throw_on_error>, Ts...>(file_name,
|
||||
data, fields);
|
||||
test_fields_impl<true, ss::setup<>, Ts...>(file_name, data, fields);
|
||||
test_fields_impl<true, ss::setup<ss::string_error>, Ts...>(file_name, data,
|
||||
fields);
|
||||
test_fields_impl<true, ss::setup<ss::throw_on_error>, Ts...>(file_name,
|
||||
data, fields);
|
||||
}
|
||||
|
||||
TEST_CASE("parser test various cases with header") {
|
||||
unique_file_name f{"test_parser"};
|
||||
constexpr static auto Int = "Int";
|
||||
constexpr static auto Dbl = "Double";
|
||||
constexpr static auto Str = "String";
|
||||
using str = std::string;
|
||||
|
||||
std::vector<std::string> header{Int, Dbl, Str};
|
||||
|
||||
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, header);
|
||||
const auto& o = f.name;
|
||||
const auto& d = data;
|
||||
|
||||
{
|
||||
ss::parser<ss::string_error> p{f.name, ","};
|
||||
std::vector<X> i;
|
||||
|
||||
for (const auto& a : p.iterate<int, double, std::string>()) {
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
CHECK_NE(i, data);
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::string_error> p{f.name, ","};
|
||||
std::vector<X> i;
|
||||
|
||||
p.ignore_next();
|
||||
for (const auto& a : p.iterate<int, double, std::string>()) {
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::ignore_header> p{f.name, ","};
|
||||
std::vector<X> i;
|
||||
|
||||
for (const auto& a : p.iterate<int, double, std::string>()) {
|
||||
i.emplace_back(ss::to_object<X>(a));
|
||||
}
|
||||
|
||||
CHECK_EQ(i, data);
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::ignore_header, ss::string_error> p{f.name, ","};
|
||||
p.use_fields(Int, Dbl, Str);
|
||||
CHECK_FALSE(p.valid());
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::ignore_header, ss::string_error> p{f.name, ","};
|
||||
CHECK_FALSE(p.field_exists("Unknown"));
|
||||
|
||||
p.use_fields(Int, "Unknown");
|
||||
CHECK_FALSE(p.valid());
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::ignore_header, ss::string_error> p{f.name, ","};
|
||||
p.use_fields(Int, Int);
|
||||
CHECK_FALSE(p.valid());
|
||||
}
|
||||
|
||||
{
|
||||
ss::parser<ss::string_error> p{f.name, ","};
|
||||
p.use_fields(Int, Dbl);
|
||||
|
||||
{
|
||||
auto [int_, double_] = p.get_next<int, double>();
|
||||
CHECK_EQ(int_, data[0].i);
|
||||
CHECK_EQ(double_, data[0].d);
|
||||
}
|
||||
|
||||
p.use_fields(Dbl, Int);
|
||||
|
||||
{
|
||||
auto [double_, int_] = p.get_next<double, int>();
|
||||
CHECK_EQ(int_, data[1].i);
|
||||
CHECK_EQ(double_, data[1].d);
|
||||
}
|
||||
|
||||
p.use_fields(Str);
|
||||
|
||||
{
|
||||
auto string_ = p.get_next<std::string>();
|
||||
CHECK_EQ(string_, data[2].s);
|
||||
}
|
||||
|
||||
p.use_fields(Str, Int, Dbl);
|
||||
|
||||
{
|
||||
auto [string_, int_, double_] =
|
||||
p.get_next<std::string, int, double>();
|
||||
CHECK_EQ(double_, data[3].d);
|
||||
CHECK_EQ(int_, data[3].i);
|
||||
CHECK_EQ(string_, data[3].s);
|
||||
}
|
||||
}
|
||||
|
||||
/* python used to generate permutations
|
||||
import itertools
|
||||
|
||||
header = {'str': 'Str',
|
||||
'double': 'Dbl',
|
||||
'int': 'Int'}
|
||||
|
||||
keys = ['str', 'int', 'double']
|
||||
|
||||
for r in range (1, 3):
|
||||
combinations = list(itertools.permutations(keys, r = r))
|
||||
|
||||
for combination in combinations:
|
||||
template_params = []
|
||||
arg_params = []
|
||||
for type in combination:
|
||||
template_params.append(type)
|
||||
arg_params.append(header[type])
|
||||
call = 'testFields<' + ', '.join(template_params) + \
|
||||
'>(o, d, {' + ', '.join(arg_params) + '});'
|
||||
print(call)
|
||||
*/
|
||||
|
||||
test_fields<str>(o, d, {Str});
|
||||
test_fields<int>(o, d, {Int});
|
||||
test_fields<double>(o, d, {Dbl});
|
||||
test_fields<str, int>(o, d, {Str, Int});
|
||||
test_fields<str, double>(o, d, {Str, Dbl});
|
||||
test_fields<int, str>(o, d, {Int, Str});
|
||||
test_fields<int, double>(o, d, {Int, Dbl});
|
||||
test_fields<double, str>(o, d, {Dbl, Str});
|
||||
test_fields<double, int>(o, d, {Dbl, Int});
|
||||
test_fields<str, int, double>(o, d, {Str, Int, Dbl});
|
||||
test_fields<str, double, int>(o, d, {Str, Dbl, Int});
|
||||
test_fields<int, str, double>(o, d, {Int, Str, Dbl});
|
||||
test_fields<int, double, str>(o, d, {Int, Dbl, Str});
|
||||
test_fields<double, str, int>(o, d, {Dbl, Str, Int});
|
||||
test_fields<double, int, str>(o, d, {Dbl, Int, Str});
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_invalid_fields_impl(const std::vector<std::string>& lines,
|
||||
const std::vector<std::string>& fields) {
|
||||
unique_file_name f{"test_parser"};
|
||||
{
|
||||
std::ofstream out{f.name};
|
||||
for (const auto& line : lines) {
|
||||
out << line << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
// No fields specified
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
auto command = [&p = p] { p.use_fields(); };
|
||||
expect_error_on_command(p, command);
|
||||
}
|
||||
|
||||
{
|
||||
// Unknown field
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
auto command = [&p = p] { p.use_fields("Unknown"); };
|
||||
expect_error_on_command(p, command);
|
||||
}
|
||||
|
||||
{
|
||||
// Field used multiple times
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
auto command = [&p = p, &fields = fields] {
|
||||
p.use_fields(fields.at(0), fields.at(0));
|
||||
};
|
||||
if (!fields.empty()) {
|
||||
expect_error_on_command(p, command);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
// Mapping out of range
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
auto command = [&p = p, &fields = fields] {
|
||||
p.use_fields(fields.at(0));
|
||||
p.template get_next<std::string, std::string>();
|
||||
};
|
||||
if (!fields.empty()) {
|
||||
expect_error_on_command(p, command);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
// Invalid header
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
auto command = [&p = p, &fields = fields] { p.use_fields(fields); };
|
||||
|
||||
if (!fields.empty()) {
|
||||
// Pass if there are no duplicates, fail otherwise
|
||||
if (std::unordered_set<std::string>{fields.begin(), fields.end()}
|
||||
.size() != fields.size()) {
|
||||
expect_error_on_command(p, command);
|
||||
} else {
|
||||
command();
|
||||
CHECK(p.valid());
|
||||
if (!p.valid()) {
|
||||
if constexpr (ss::setup<Ts...>::string_error) {
|
||||
std::cout << p.error_msg() << std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_invalid_fields(const std::vector<std::string>& lines,
|
||||
const std::vector<std::string>& fields) {
|
||||
test_invalid_fields_impl<false>(lines, fields);
|
||||
test_invalid_fields_impl<false, ss::string_error>(lines, fields);
|
||||
test_invalid_fields_impl<false, ss::throw_on_error>(lines, fields);
|
||||
test_invalid_fields_impl<true>(lines, fields);
|
||||
test_invalid_fields_impl<true, ss::string_error>(lines, fields);
|
||||
test_invalid_fields_impl<true, ss::throw_on_error>(lines, fields);
|
||||
}
|
||||
|
||||
TEST_CASE("parser test invalid header fields usage") {
|
||||
test_invalid_fields({}, {});
|
||||
|
||||
test_invalid_fields({"Int"}, {"Int"});
|
||||
test_invalid_fields({"Int", "1"}, {"Int"});
|
||||
test_invalid_fields({"Int", "1", "2"}, {"Int"});
|
||||
|
||||
test_invalid_fields({"Int,String"}, {"Int", "String"});
|
||||
test_invalid_fields({"Int,String", "1,hi"}, {"Int", "String"});
|
||||
test_invalid_fields({"Int,String", "2,hello"}, {"Int", "String"});
|
||||
|
||||
test_invalid_fields({"Int,String,Double"}, {"Int", "String", "Double"});
|
||||
test_invalid_fields({"Int,String,Double", "1,hi,2.34"},
|
||||
{"Int", "String", "Double"});
|
||||
test_invalid_fields({"Int,String,Double", "1,hi,2.34", "2,hello,3.45"},
|
||||
{"Int", "String", "Double"});
|
||||
|
||||
test_invalid_fields({"Int,Int,Int"}, {"Int", "Int", "Int"});
|
||||
test_invalid_fields({"Int,Int,Int", "1,2,3"}, {"Int", "Int", "Int"});
|
||||
|
||||
test_invalid_fields({"Int,String,Int"}, {"Int", "String", "Int"});
|
||||
test_invalid_fields({"Int,String,Int", "1,hi,3"}, {"Int", "String", "Int"});
|
||||
}
|
||||
|
||||
template <bool buffer_mode, 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;
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(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);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(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);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(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<false>();
|
||||
test_invalid_rows_with_header<false, ss::string_error>();
|
||||
test_invalid_rows_with_header<false, ss::throw_on_error>();
|
||||
test_invalid_rows_with_header<true>();
|
||||
test_invalid_rows_with_header<true, ss::string_error>();
|
||||
test_invalid_rows_with_header<true, ss::throw_on_error>();
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_ignore_empty_impl(const std::vector<X>& data) {
|
||||
unique_file_name f{"test_parser"};
|
||||
make_and_write(f.name, data);
|
||||
|
||||
std::vector<X> expected;
|
||||
for (const auto& d : data) {
|
||||
if (d.s != X::empty) {
|
||||
expected.push_back(d);
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] =
|
||||
make_parser<buffer_mode, ss::ignore_empty, Ts...>(f.name, ",");
|
||||
|
||||
std::vector<X> i;
|
||||
for (const auto& a : p.template iterate<X>()) {
|
||||
i.push_back(a);
|
||||
}
|
||||
|
||||
CHECK_EQ(i, expected);
|
||||
}
|
||||
|
||||
{
|
||||
auto [p, _] = make_parser<buffer_mode, Ts...>(f.name, ",");
|
||||
std::vector<X> i;
|
||||
size_t n = 0;
|
||||
while (!p.eof()) {
|
||||
try {
|
||||
++n;
|
||||
const auto& a = p.template get_next<X>();
|
||||
if (data.at(n - 1).s == X::empty) {
|
||||
CHECK_FALSE(p.valid());
|
||||
continue;
|
||||
}
|
||||
i.push_back(a);
|
||||
} catch (...) {
|
||||
CHECK_EQ(data.at(n - 1).s, X::empty);
|
||||
}
|
||||
}
|
||||
|
||||
CHECK_EQ(i, expected);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_ignore_empty(const std::vector<X>& data) {
|
||||
test_ignore_empty_impl<false>(data);
|
||||
test_ignore_empty_impl<false, ss::string_error>(data);
|
||||
test_ignore_empty_impl<false, ss::throw_on_error>(data);
|
||||
test_ignore_empty_impl<true>(data);
|
||||
test_ignore_empty_impl<true, ss::string_error>(data);
|
||||
test_ignore_empty_impl<true, ss::throw_on_error>(data);
|
||||
}
|
||||
|
||||
TEST_CASE("parser test various cases with empty lines") {
|
||||
test_ignore_empty({{1, 2, "x"}, {3, 4, "y"}, {9, 10, "v"}, {11, 12, "w"}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, X::empty}, {3, 4, "y"}, {9, 10, "v"}, {11, 12, "w"}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, "x"}, {3, 4, "y"}, {9, 10, "v"}, {11, 12, X::empty}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, "x"}, {5, 6, X::empty}, {9, 10, "v"}, {11, 12, "w"}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, X::empty}, {5, 6, X::empty}, {9, 10, "v"}, {11, 12, "w"}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, X::empty}, {3, 4, "y"}, {9, 10, "v"}, {11, 12, X::empty}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, "x"}, {3, 4, "y"}, {9, 10, X::empty}, {11, 12, X::empty}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, X::empty}, {3, 4, "y"}, {9, 10, X::empty}, {11, 12, X::empty}});
|
||||
|
||||
test_ignore_empty({{1, 2, X::empty},
|
||||
{3, 4, X::empty},
|
||||
{9, 10, X::empty},
|
||||
{11, 12, X::empty}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, "x"}, {3, 4, X::empty}, {9, 10, X::empty}, {11, 12, X::empty}});
|
||||
|
||||
test_ignore_empty(
|
||||
{{1, 2, X::empty}, {3, 4, X::empty}, {9, 10, X::empty}, {11, 12, "w"}});
|
||||
|
||||
test_ignore_empty({{11, 12, X::empty}});
|
||||
|
||||
test_ignore_empty({});
|
||||
}
|
||||
669
test/test_parser2.hpp
Normal file
669
test/test_parser2.hpp
Normal file
@@ -0,0 +1,669 @@
|
||||
#include "test_helpers.hpp"
|
||||
#include <algorithm>
|
||||
#include <filesystem>
|
||||
#include <fstream>
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <regex>
|
||||
#include <ss/parser.hpp>
|
||||
#include <sstream>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
#ifndef SEGMENT_NAME
|
||||
#error "SEGMENT_NAME must be defined"
|
||||
#endif
|
||||
|
||||
// parser tests v2
|
||||
|
||||
namespace {
|
||||
struct random_number_generator {
|
||||
size_t z1 = 12341;
|
||||
size_t z2 = 12342;
|
||||
size_t z3 = 12343;
|
||||
size_t z4 = 12344;
|
||||
|
||||
size_t rand() {
|
||||
uint32_t b;
|
||||
b = ((z1 << 6) ^ z1) >> 13;
|
||||
z1 = ((z1 & 4294967294U) << 18) ^ b;
|
||||
b = ((z2 << 2) ^ z2) >> 27;
|
||||
z2 = ((z2 & 4294967288U) << 2) ^ b;
|
||||
b = ((z3 << 13) ^ z3) >> 21;
|
||||
z3 = ((z3 & 4294967280U) << 7) ^ b;
|
||||
b = ((z4 << 3) ^ z4) >> 12;
|
||||
z4 = ((z4 & 4294967168U) << 13) ^ b;
|
||||
return (z1 ^ z2 ^ z3 ^ z4);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
size_t rand_index(const T& s) {
|
||||
REQUIRE(!s.empty());
|
||||
return rand() % s.size();
|
||||
}
|
||||
|
||||
bool rand_bool() {
|
||||
return (rand() % 100) > 50;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void rand_insert(std::string& dst, const T& src) {
|
||||
dst.insert(rand_index(dst), std::string{src});
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
void rand_insert_n(std::string& dst, const T& src, size_t n_max) {
|
||||
size_t n = rand() % n_max;
|
||||
for (size_t i = 0; i < n; ++i) {
|
||||
rand_insert(dst, src);
|
||||
}
|
||||
}
|
||||
} rng;
|
||||
|
||||
struct field {
|
||||
std::string value;
|
||||
bool is_string = false;
|
||||
bool has_spaces_left = false;
|
||||
bool has_spaces_right = false;
|
||||
bool has_new_line = false;
|
||||
|
||||
field(const std::string& input) {
|
||||
value = input;
|
||||
is_string = true;
|
||||
|
||||
has_spaces_left = !input.empty() && input.front() == ' ';
|
||||
has_spaces_right = !input.empty() && input.back() == ' ';
|
||||
has_new_line = input.find_first_of('\n') != std::string::npos;
|
||||
}
|
||||
|
||||
field(int input) {
|
||||
value = std::to_string(input);
|
||||
}
|
||||
|
||||
field(double input) {
|
||||
value = std::to_string(input);
|
||||
}
|
||||
};
|
||||
|
||||
struct column {
|
||||
std::string header;
|
||||
std::vector<field> fields;
|
||||
};
|
||||
|
||||
template <typename... Ts>
|
||||
column make_column(const std::string& input_header,
|
||||
const std::vector<field>& input_fields) {
|
||||
using setup = ss::setup<Ts...>;
|
||||
std::vector<field> filtered_fields;
|
||||
|
||||
for (const auto& el : input_fields) {
|
||||
if (!setup::multiline::enabled && el.has_new_line) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!setup::escape::enabled && !setup::quote::enabled) {
|
||||
if (setup::trim_left::enabled && el.has_spaces_left) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (setup::trim_right::enabled && el.has_spaces_right) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
filtered_fields.push_back(el);
|
||||
}
|
||||
|
||||
column c;
|
||||
c.header = input_header;
|
||||
c.fields = filtered_fields;
|
||||
return c;
|
||||
}
|
||||
|
||||
[[maybe_unused]] void replace_all2(std::string& s, const std::string& old_value,
|
||||
const std::string& new_value) {
|
||||
for (size_t i = 0; i < 999; ++i) {
|
||||
size_t pos = s.find(old_value);
|
||||
if (pos == std::string::npos) {
|
||||
return;
|
||||
}
|
||||
s.replace(pos, old_value.size(), new_value);
|
||||
}
|
||||
FAIL("bad replace");
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
std::vector<std::string> generate_csv_data(const std::vector<field>& data,
|
||||
const std::string& delim) {
|
||||
(void)delim;
|
||||
using setup = ss::setup<Ts...>;
|
||||
constexpr static auto escape = '\\';
|
||||
constexpr static auto quote = '"';
|
||||
constexpr static auto space = ' ';
|
||||
constexpr static auto new_line = '\n';
|
||||
constexpr static auto helper0 = '#';
|
||||
constexpr static auto helper1 = '$';
|
||||
// constexpr static auto helper3 = '&';
|
||||
|
||||
std::vector<std::string> output;
|
||||
|
||||
if (setup::escape::enabled && setup::quote::enabled) {
|
||||
for (const auto& el : data) {
|
||||
auto value = el.value;
|
||||
|
||||
replace_all2(value, {escape, quote}, {helper1});
|
||||
|
||||
bool quote_newline = rng.rand_bool();
|
||||
bool quote_spacings = rng.rand_bool();
|
||||
bool has_spaces = el.has_spaces_right || el.has_spaces_left;
|
||||
|
||||
// handle escape
|
||||
replace_all2(value, {escape}, {helper0});
|
||||
rng.rand_insert_n(value, escape, 2);
|
||||
if (!quote_newline) {
|
||||
replace_all2(value, {new_line}, {helper1});
|
||||
replace_all2(value, {helper1}, {escape, new_line});
|
||||
}
|
||||
replace_all2(value, {escape, escape}, {escape});
|
||||
replace_all2(value, {escape, helper0}, {helper0});
|
||||
replace_all2(value, {helper0, escape}, {helper0});
|
||||
replace_all2(value, {helper0}, {escape, escape});
|
||||
|
||||
replace_all2(value, {helper1}, {escape, quote});
|
||||
|
||||
replace_all2(value, {escape, quote}, {helper1});
|
||||
|
||||
if (rng.rand_bool() || quote_newline ||
|
||||
(quote_spacings && has_spaces)) {
|
||||
replace_all2(value, {quote}, {helper0});
|
||||
if (rng.rand_bool()) {
|
||||
replace_all2(value, {helper0}, {escape, quote});
|
||||
} else {
|
||||
replace_all2(value, {helper0}, {quote, quote});
|
||||
}
|
||||
value = std::string{quote} + value + std::string{quote};
|
||||
}
|
||||
|
||||
replace_all2(value, {helper1}, {escape, quote});
|
||||
|
||||
if (!quote_spacings && has_spaces) {
|
||||
replace_all2(value, {escape, space}, {helper0});
|
||||
replace_all2(value, {space}, {helper0});
|
||||
replace_all2(value, {helper0}, {escape, space});
|
||||
}
|
||||
|
||||
output.push_back(value);
|
||||
}
|
||||
} else if (setup::escape::enabled) {
|
||||
for (const auto& el : data) {
|
||||
auto value = el.value;
|
||||
|
||||
replace_all2(value, {escape}, {helper0});
|
||||
rng.rand_insert_n(value, escape, 3);
|
||||
replace_all2(value, {new_line}, {helper1});
|
||||
replace_all2(value, {helper1}, {escape, new_line});
|
||||
|
||||
replace_all2(value, {escape, escape}, {escape});
|
||||
replace_all2(value, {escape, helper0}, {helper0});
|
||||
|
||||
replace_all2(value, {helper0, escape}, {helper0});
|
||||
replace_all2(value, {helper0}, {escape, escape});
|
||||
|
||||
if (setup::trim_right::enabled || setup::trim_left::enabled) {
|
||||
// escape space
|
||||
replace_all2(value, {escape, space}, {helper0});
|
||||
replace_all2(value, {space}, {helper0});
|
||||
replace_all2(value, {helper0}, {escape, space});
|
||||
}
|
||||
|
||||
output.push_back(value);
|
||||
}
|
||||
} else if (setup::quote::enabled) {
|
||||
for (const auto& el : data) {
|
||||
auto value = el.value;
|
||||
if (rng.rand_bool() || el.has_new_line || el.has_spaces_left ||
|
||||
el.has_spaces_right) {
|
||||
replace_all2(value, {quote}, {helper0});
|
||||
replace_all2(value, {helper0}, {quote, quote});
|
||||
value = std::string{quote} + value + std::string{quote};
|
||||
}
|
||||
output.push_back(value);
|
||||
}
|
||||
} else {
|
||||
for (const auto& el : data) {
|
||||
output.push_back(el.value);
|
||||
}
|
||||
}
|
||||
|
||||
if (setup::trim_right::enabled) {
|
||||
for (auto& el : output) {
|
||||
size_t n = rng.rand();
|
||||
for (size_t i = 0; i < n % 3; ++i) {
|
||||
el = el + " ";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (setup::trim_left::enabled) {
|
||||
for (auto& el : output) {
|
||||
size_t n = rng.rand();
|
||||
for (size_t i = 0; i < n % 3; ++i) {
|
||||
el = " " + el;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
[[maybe_unused]] void write_to_file(const std::vector<std::string>& data,
|
||||
const std::string& delim,
|
||||
const std::string& file_name) {
|
||||
std::ofstream out{file_name, std::ios_base::app};
|
||||
std::string line;
|
||||
for (size_t i = 0; i < data.size(); ++i) {
|
||||
line += data[i];
|
||||
if (i != data.size() - 1) {
|
||||
line += delim;
|
||||
}
|
||||
}
|
||||
|
||||
out << line << std::endl;
|
||||
}
|
||||
|
||||
#define CHECK_EQ_CRLF(V1, V2) \
|
||||
if (V1 != V2) { \
|
||||
auto tmp1 = V1; \
|
||||
auto tmp2 = V2; \
|
||||
replace_all2(tmp1, "\r\n", "\n"); \
|
||||
replace_all2(tmp2, "\r\n", "\n"); \
|
||||
\
|
||||
CHECK(tmp1 == tmp2); \
|
||||
\
|
||||
if (tmp1 != tmp2) { \
|
||||
replace_all2(tmp1, "\r", "(r)"); \
|
||||
replace_all2(tmp2, "\r", "(r)"); \
|
||||
\
|
||||
replace_all2(tmp1, "\n", "(n)"); \
|
||||
replace_all2(tmp2, "\n", "(n)"); \
|
||||
\
|
||||
replace_all2(tmp1, " ", "_"); \
|
||||
replace_all2(tmp2, " ", "_"); \
|
||||
\
|
||||
std::cout << "<" << tmp1 << ">" << std::endl; \
|
||||
std::cout << "<" << tmp2 << ">" << std::endl; \
|
||||
std::cout << "file: " << f.name << std::endl; \
|
||||
std::cout << "----------------" << std::endl; \
|
||||
} \
|
||||
\
|
||||
} else { \
|
||||
CHECK(V1 == V2); \
|
||||
}
|
||||
|
||||
template <bool buffer_mode, typename... Ts>
|
||||
void test_data_combinations(const std::vector<column>& input_data,
|
||||
const std::string& delim, bool include_header) {
|
||||
using setup = ss::setup<Ts...>;
|
||||
|
||||
if (setup::ignore_header && !include_header) {
|
||||
return;
|
||||
}
|
||||
|
||||
unique_file_name f{"test_parser2" + std::string{SEGMENT_NAME}};
|
||||
std::vector<std::vector<field>> expected_data;
|
||||
std::vector<std::string> header;
|
||||
std::vector<field> field_header;
|
||||
|
||||
auto add_blank_if_ignore_empty = [&] {
|
||||
if constexpr (setup::ignore_empty) {
|
||||
size_t n = rng.rand() % 3;
|
||||
for (size_t i = 0; i < n; ++i) {
|
||||
write_to_file({}, delim, f.name);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
for (const auto& el : input_data) {
|
||||
header.push_back(el.header);
|
||||
field_header.push_back(field{el.header});
|
||||
}
|
||||
|
||||
if (include_header) {
|
||||
auto header_data = generate_csv_data<Ts...>(field_header, delim);
|
||||
write_to_file(header_data, delim, f.name);
|
||||
}
|
||||
|
||||
std::vector<int> layout;
|
||||
size_t n = 1 + rng.rand() % 5;
|
||||
|
||||
for (size_t i = 0; i < input_data.size(); ++i) {
|
||||
layout.push_back(i);
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < n; ++i) {
|
||||
std::vector<field> raw_data;
|
||||
for (const auto& el : input_data) {
|
||||
const auto& fields = el.fields;
|
||||
if (fields.empty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
raw_data.push_back(fields[rng.rand_index(fields)]);
|
||||
}
|
||||
|
||||
add_blank_if_ignore_empty();
|
||||
|
||||
expected_data.push_back(raw_data);
|
||||
auto data = generate_csv_data<Ts...>(raw_data, delim);
|
||||
write_to_file(data, delim, f.name);
|
||||
|
||||
/*
|
||||
std::cout << "[.";
|
||||
for (const auto& el : data) {
|
||||
std::cout << el << '.';
|
||||
}
|
||||
std::cout << "]" << std::endl;
|
||||
*/
|
||||
}
|
||||
|
||||
auto layout_combinations = include_header && !setup::ignore_header
|
||||
? vector_combinations(layout, layout.size())
|
||||
: std::vector<std::vector<int>>{layout};
|
||||
|
||||
auto remove_duplicates = [](const auto& vec) {
|
||||
std::vector<int> unique_vec;
|
||||
std::unordered_set<int> vec_set;
|
||||
for (const auto& el : vec) {
|
||||
if (vec_set.find(el) == vec_set.end()) {
|
||||
vec_set.insert(el);
|
||||
unique_vec.push_back(el);
|
||||
}
|
||||
}
|
||||
|
||||
return unique_vec;
|
||||
};
|
||||
|
||||
std::vector<std::vector<int>> unique_layout_combinations;
|
||||
for (const auto& layout : layout_combinations) {
|
||||
unique_layout_combinations.push_back(remove_duplicates(layout));
|
||||
}
|
||||
|
||||
for (const auto& layout : unique_layout_combinations) {
|
||||
auto [p, _] = make_parser<buffer_mode, setup>(f.name, delim);
|
||||
|
||||
if (include_header && !setup::ignore_header) {
|
||||
std::vector<std::string> fields;
|
||||
for (const auto& index : layout) {
|
||||
fields.push_back(header[index]);
|
||||
}
|
||||
|
||||
p.use_fields(fields);
|
||||
|
||||
if (!p.valid()) {
|
||||
if constexpr (setup::string_error) {
|
||||
std::cout << p.error_msg() << std::endl;
|
||||
} else {
|
||||
std::cout << "use_fields failed" << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
REQUIRE(p.valid());
|
||||
}
|
||||
|
||||
auto check_error = [&p = p] {
|
||||
CHECK(p.valid());
|
||||
if (!p.valid()) {
|
||||
if constexpr (setup::string_error) {
|
||||
std::cout << p.error_msg() << std::endl;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
int num_columns = layout.size();
|
||||
for (size_t i = 0; i < n + 1; ++i) {
|
||||
try {
|
||||
switch (num_columns) {
|
||||
case 1: {
|
||||
auto s0 = p.template get_next<std::string>();
|
||||
if (i < n) {
|
||||
check_error();
|
||||
// std::cout << s0 << std::endl;
|
||||
CHECK_EQ_CRLF(s0, expected_data[i][layout[0]].value);
|
||||
} else {
|
||||
CHECK(p.eof());
|
||||
CHECK(!p.valid());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 2: {
|
||||
auto [s0, s1] =
|
||||
p.template get_next<std::string, std::string>();
|
||||
if (i < n) {
|
||||
check_error();
|
||||
// std::cout << s0 << ' ' << s1 << std::endl;
|
||||
CHECK_EQ_CRLF(s0, expected_data[i][layout[0]].value);
|
||||
CHECK_EQ_CRLF(s1, expected_data[i][layout[1]].value);
|
||||
} else {
|
||||
CHECK(p.eof());
|
||||
CHECK(!p.valid());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 3: {
|
||||
auto [s0, s1, s2] =
|
||||
p.template get_next<std::string, std::string,
|
||||
std::string>();
|
||||
if (i < n) {
|
||||
check_error();
|
||||
// std::cout << s0 << ' ' << s1 << ' ' << s2 <<
|
||||
// std::endl;
|
||||
CHECK_EQ_CRLF(s0, expected_data[i][layout[0]].value);
|
||||
CHECK_EQ_CRLF(s1, expected_data[i][layout[1]].value);
|
||||
CHECK_EQ_CRLF(s2, expected_data[i][layout[2]].value);
|
||||
} else {
|
||||
CHECK(p.eof());
|
||||
CHECK(!p.valid());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
auto [s0, s1, s2, s3] =
|
||||
p.template get_next<std::string, std::string,
|
||||
std::string, std::string>();
|
||||
if (i < n) {
|
||||
check_error();
|
||||
/*
|
||||
std::cout << s0 << ' ' << s1 << ' ' << s2 << ' ' << s3
|
||||
<< std::endl;
|
||||
*/
|
||||
CHECK_EQ_CRLF(s0, expected_data[i][layout[0]].value);
|
||||
CHECK_EQ_CRLF(s1, expected_data[i][layout[1]].value);
|
||||
CHECK_EQ_CRLF(s2, expected_data[i][layout[2]].value);
|
||||
CHECK_EQ_CRLF(s3, expected_data[i][layout[3]].value);
|
||||
} else {
|
||||
CHECK(p.eof());
|
||||
CHECK(!p.valid());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
auto [s0, s1, s2, s3, s4] =
|
||||
p.template get_next<std::string, std::string,
|
||||
std::string, std::string,
|
||||
std::string>();
|
||||
if (i < n) {
|
||||
check_error();
|
||||
// std::cout << s0 << ' ' << s1 << ' ' << s2 << ' ' <<
|
||||
// s3
|
||||
// << ' ' << s4 << std::endl;
|
||||
CHECK_EQ_CRLF(s0, expected_data[i][layout[0]].value);
|
||||
CHECK_EQ_CRLF(s1, expected_data[i][layout[1]].value);
|
||||
CHECK_EQ_CRLF(s2, expected_data[i][layout[2]].value);
|
||||
CHECK_EQ_CRLF(s3, expected_data[i][layout[3]].value);
|
||||
CHECK_EQ_CRLF(s4, expected_data[i][layout[4]].value);
|
||||
} else {
|
||||
CHECK(p.eof());
|
||||
CHECK(!p.valid());
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
FAIL(("Invalid number of columns: " +
|
||||
std::to_string(num_columns)));
|
||||
break;
|
||||
}
|
||||
} catch (const std::exception& e) {
|
||||
if (i < n) {
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_option_combinations() {
|
||||
column ints0 =
|
||||
make_column<Ts...>("ints0", {field{123}, field{45}, field{6}});
|
||||
column ints1 =
|
||||
make_column<Ts...>("ints1", {field{123}, field{45}, field{6}});
|
||||
column ints2 =
|
||||
make_column<Ts...>("ints2", {field{123}, field{45}, field{6}});
|
||||
|
||||
column floats0 =
|
||||
make_column<Ts...>("floats0", {field{1.23}, field{456.7}, field{0.8},
|
||||
field{910}, field{123456789.987654321}});
|
||||
column floats1 =
|
||||
make_column<Ts...>("floats1", {field{1.23}, field{456.7}, field{0.8},
|
||||
field{910}, field{123456789.987654321}});
|
||||
column floats2 =
|
||||
make_column<Ts...>("floats2", {field{1.23}, field{456.7}, field{0.8},
|
||||
field{910}, field{123456789.987654321}});
|
||||
|
||||
column strings0 =
|
||||
make_column<Ts...>("strings0", {field{"just"}, field{"some"},
|
||||
field{"random"}, field{"string"}});
|
||||
|
||||
column strings1 =
|
||||
make_column<Ts...>("strings1", {field{"st\"rings"}, field{"w\"\"ith"},
|
||||
field{"qu\"otes\\"}, field{"\\a\\n\\d"},
|
||||
field{"escapes\""}});
|
||||
|
||||
column strings2 =
|
||||
make_column<Ts...>("strings2",
|
||||
{field{" with "}, field{" spaces"},
|
||||
field{"and "}, field{"\nnew"}, field{" \nlines"},
|
||||
field{" a\n\nn\n\nd "}, field{" \nso\n "},
|
||||
field{"on"}});
|
||||
|
||||
auto columns0 = std::vector{ints0, strings0, floats0, strings1, strings2};
|
||||
auto columns1 = std::vector{strings2, strings1, floats0, strings0, ints0};
|
||||
auto columns2 = std::vector{floats0, strings1, ints0, strings2, strings0};
|
||||
auto columns3 = std::vector{ints0, ints1, ints2};
|
||||
auto columns4 = std::vector{floats0, floats1, floats2};
|
||||
auto columns5 = std::vector{strings1, strings2};
|
||||
auto columns6 = std::vector{strings1};
|
||||
auto columns7 = std::vector{strings2};
|
||||
|
||||
for (size_t i = 0; i < 3; ++i) {
|
||||
for (const auto& delimiter : {",", "-", "--"}) {
|
||||
for (const auto& columns :
|
||||
{columns0, columns1, columns2, columns3, columns4, columns5,
|
||||
columns6, columns7}) {
|
||||
try {
|
||||
test_data_combinations<false, Ts...>(columns, delimiter,
|
||||
false);
|
||||
test_data_combinations<false, Ts...>(columns, delimiter,
|
||||
true);
|
||||
test_data_combinations<true, Ts...>(columns, delimiter,
|
||||
false);
|
||||
test_data_combinations<true, Ts...>(columns, delimiter,
|
||||
true);
|
||||
} catch (std::exception& e) {
|
||||
std::cout << typeid(ss::parser<Ts...>).name() << std::endl;
|
||||
FAIL_CHECK(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_option_combinations0() {
|
||||
test_option_combinations<Ts...>();
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
test_option_combinations<Ts..., ss::ignore_empty>();
|
||||
#endif
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_option_combinations1() {
|
||||
test_option_combinations0<Ts...>();
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
test_option_combinations0<Ts..., ss::ignore_header>();
|
||||
#endif
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_option_combinations2() {
|
||||
test_option_combinations1<Ts...>();
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
test_option_combinations1<Ts..., ss::string_error>();
|
||||
test_option_combinations1<Ts..., ss::throw_on_error>();
|
||||
#endif
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_option_combinations3() {
|
||||
using trim = ss::trim<' '>;
|
||||
|
||||
test_option_combinations2<Ts...>();
|
||||
test_option_combinations2<Ts..., trim>();
|
||||
}
|
||||
|
||||
} /* namespace */
|
||||
|
||||
// Tests split into multiple compilation units
|
||||
#if 0
|
||||
|
||||
TEST_CASE("parser test various cases version 2 segment 1") {
|
||||
using quote = ss::quote<'"'>;
|
||||
using escape = ss::escape<'\\'>;
|
||||
using multiline = ss::multiline;
|
||||
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
using multiline_r = ss::multiline_restricted<10>;
|
||||
using trimr = ss::trim_right<' '>;
|
||||
using triml = ss::trim_left<' '>;
|
||||
using trim = ss::trim<' '>;
|
||||
|
||||
// segment 1
|
||||
test_option_combinations3<>();
|
||||
test_option_combinations3<escape>();
|
||||
|
||||
// segment 2
|
||||
test_option_combinations3<quote>();
|
||||
test_option_combinations3<escape, quote>();
|
||||
|
||||
// segment 3
|
||||
test_option_combinations3<escape, multiline>();
|
||||
test_option_combinations3<quote, multiline>();
|
||||
|
||||
// segment 4
|
||||
test_option_combinations3<escape, quote, multiline>();
|
||||
test_option_combinations3<escape, quote, multiline_r>();
|
||||
|
||||
// segment 5
|
||||
test_option_combinations<escape, quote, multiline, triml>();
|
||||
test_option_combinations<escape, quote, multiline, trimr>();
|
||||
|
||||
// segment 6
|
||||
test_option_combinations3<escape, quote, multiline>();
|
||||
test_option_combinations3<escape, quote, multiline, trim>();
|
||||
#else
|
||||
|
||||
test_option_combinations3<escape, quote, multiline>();
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif
|
||||
12
test/test_parser2_1.cpp
Normal file
12
test/test_parser2_1.cpp
Normal file
@@ -0,0 +1,12 @@
|
||||
#define SEGMENT_NAME "segment1"
|
||||
#include "test_parser2.hpp"
|
||||
|
||||
TEST_CASE("parser test various cases version 2 segment 1") {
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
using escape = ss::escape<'\\'>;
|
||||
|
||||
test_option_combinations3<>();
|
||||
test_option_combinations3<escape>();
|
||||
#endif
|
||||
}
|
||||
|
||||
13
test/test_parser2_2.cpp
Normal file
13
test/test_parser2_2.cpp
Normal file
@@ -0,0 +1,13 @@
|
||||
#define SEGMENT_NAME "segment2"
|
||||
#include "test_parser2.hpp"
|
||||
|
||||
TEST_CASE("parser test various cases version 2 segment 2") {
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
using quote = ss::quote<'"'>;
|
||||
using escape = ss::escape<'\\'>;
|
||||
|
||||
test_option_combinations3<quote>();
|
||||
test_option_combinations3<escape, quote>();
|
||||
#endif
|
||||
}
|
||||
|
||||
14
test/test_parser2_3.cpp
Normal file
14
test/test_parser2_3.cpp
Normal file
@@ -0,0 +1,14 @@
|
||||
#define SEGMENT_NAME "segment3"
|
||||
#include "test_parser2.hpp"
|
||||
|
||||
TEST_CASE("parser test various cases version 2 segment 3") {
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
using quote = ss::quote<'"'>;
|
||||
using escape = ss::escape<'\\'>;
|
||||
using multiline = ss::multiline;
|
||||
|
||||
test_option_combinations3<escape, multiline>();
|
||||
test_option_combinations3<quote, multiline>();
|
||||
#endif
|
||||
}
|
||||
|
||||
15
test/test_parser2_4.cpp
Normal file
15
test/test_parser2_4.cpp
Normal file
@@ -0,0 +1,15 @@
|
||||
#define SEGMENT_NAME "segment4"
|
||||
#include "test_parser2.hpp"
|
||||
|
||||
TEST_CASE("parser test various cases version 2 segment 4") {
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
using quote = ss::quote<'"'>;
|
||||
using escape = ss::escape<'\\'>;
|
||||
using multiline = ss::multiline;
|
||||
using multiline_r = ss::multiline_restricted<10>;
|
||||
|
||||
test_option_combinations3<escape, quote, multiline>();
|
||||
test_option_combinations3<escape, quote, multiline_r>();
|
||||
#endif
|
||||
}
|
||||
|
||||
16
test/test_parser2_5.cpp
Normal file
16
test/test_parser2_5.cpp
Normal file
@@ -0,0 +1,16 @@
|
||||
#define SEGMENT_NAME "segment5"
|
||||
#include "test_parser2.hpp"
|
||||
|
||||
TEST_CASE("parser test various cases version 2 segment 5") {
|
||||
#ifdef CMAKE_GITHUB_CI
|
||||
using quote = ss::quote<'"'>;
|
||||
using escape = ss::escape<'\\'>;
|
||||
using multiline = ss::multiline;
|
||||
using trimr = ss::trim_right<' '>;
|
||||
using triml = ss::trim_left<' '>;
|
||||
|
||||
test_option_combinations<escape, quote, multiline, triml>();
|
||||
test_option_combinations<escape, quote, multiline, trimr>();
|
||||
#endif
|
||||
}
|
||||
|
||||
11
test/test_parser2_6.cpp
Normal file
11
test/test_parser2_6.cpp
Normal file
@@ -0,0 +1,11 @@
|
||||
#define SEGMENT_NAME "segment6"
|
||||
#include "test_parser2.hpp"
|
||||
|
||||
TEST_CASE("parser test various cases version 2 segment 6") {
|
||||
using quote = ss::quote<'"'>;
|
||||
using escape = ss::escape<'\\'>;
|
||||
using multiline = ss::multiline;
|
||||
|
||||
test_option_combinations3<escape, quote, multiline>();
|
||||
}
|
||||
|
||||
14
test/test_single_header.sh
Executable file
14
test/test_single_header.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -x
|
||||
set -e
|
||||
|
||||
python3 script/single_header_generator.py > ssp.cpp
|
||||
|
||||
echo 'int main(){ ss::parser p{""}; p.get_next<int, float>(); return 0; }' \
|
||||
>> ssp.cpp
|
||||
|
||||
g++ -std=c++17 ssp.cpp -o ssp.bin -Wall -Wextra
|
||||
./ssp.bin
|
||||
|
||||
rm ssp.cpp ssp.bin
|
||||
@@ -5,15 +5,15 @@
|
||||
#include <ss/splitter.hpp>
|
||||
|
||||
namespace {
|
||||
constexpr static auto combinations_size_default = 4;
|
||||
size_t combinations_size = combinations_size_default;
|
||||
constexpr static auto num_combinations_default = 4;
|
||||
size_t num_combinations = num_combinations_default;
|
||||
|
||||
struct set_combinations_size {
|
||||
set_combinations_size(size_t size) {
|
||||
combinations_size = size;
|
||||
struct set_num_combinations {
|
||||
set_num_combinations(size_t size) {
|
||||
num_combinations = size;
|
||||
}
|
||||
~set_combinations_size() {
|
||||
combinations_size = combinations_size_default;
|
||||
~set_num_combinations() {
|
||||
num_combinations = num_combinations_default;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -127,33 +127,13 @@ std::vector<std::string> combinations(const std::vector<std::string>& v,
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::vector<std::vector<std::string>> vector_combinations(
|
||||
const std::vector<std::string>& v, size_t n) {
|
||||
std::vector<std::vector<std::string>> ret;
|
||||
if (n <= 1) {
|
||||
for (const auto& i : v) {
|
||||
ret.push_back({i});
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
auto inner_combinations = vector_combinations(v, n - 1);
|
||||
for (const auto& i : v) {
|
||||
for (auto j : inner_combinations) {
|
||||
j.insert(j.begin(), i);
|
||||
ret.push_back(move(j));
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::pair<std::vector<std::string>, std::vector<std::vector<std::string>>>
|
||||
make_combinations(const std::vector<std::string>& input,
|
||||
const std::vector<std::string>& output,
|
||||
const std::string& delim) {
|
||||
std::vector<std::string> lines;
|
||||
std::vector<std::vector<std::string>> expectations;
|
||||
for (size_t i = 0; i < combinations_size; ++i) {
|
||||
for (size_t i = 0; i < num_combinations; ++i) {
|
||||
auto l = combinations(input, delim, i);
|
||||
lines.reserve(lines.size() + l.size());
|
||||
lines.insert(lines.end(), l.begin(), l.end());
|
||||
@@ -173,9 +153,12 @@ make_combinations(const std::vector<std::string>& input,
|
||||
using matches_type = std::vector<std::pair<case_type, std::string>>;
|
||||
|
||||
template <typename... Matchers>
|
||||
void test_combinations(matches_type& matches, std::vector<std::string> delims) {
|
||||
static inline void test_combinations(matches_type& matches,
|
||||
std::vector<std::string> delims) {
|
||||
|
||||
ss::splitter<Matchers...> s;
|
||||
ss::splitter<Matchers..., ss::throw_on_error> st;
|
||||
|
||||
std::vector<std::string> inputs;
|
||||
std::vector<std::string> outputs;
|
||||
for (const auto& [cases, e] : matches) {
|
||||
@@ -194,6 +177,13 @@ void test_combinations(matches_type& matches, std::vector<std::string> delims) {
|
||||
auto vec = s.split(buff(lines[i].c_str()), delim);
|
||||
CHECK(s.valid());
|
||||
CHECK_EQ(words(vec), expectations[i]);
|
||||
|
||||
try {
|
||||
auto vec = st.split(buff(lines[i].c_str()), delim);
|
||||
CHECK_EQ(words(vec), expectations[i]);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -253,7 +243,7 @@ TEST_CASE("splitter test with quote") {
|
||||
}
|
||||
|
||||
TEST_CASE("splitter test with trim") {
|
||||
auto guard = set_combinations_size(3);
|
||||
auto guard = set_num_combinations(3);
|
||||
case_type case1 = spaced({R"(x)"}, " ");
|
||||
case_type case2 = spaced({R"(yy)"}, " ");
|
||||
case_type case3 = spaced({R"(y y)"}, " ");
|
||||
@@ -320,7 +310,7 @@ TEST_CASE("splitter test with escape") {
|
||||
}
|
||||
|
||||
TEST_CASE("splitter test with quote and trim") {
|
||||
auto guard = set_combinations_size(3);
|
||||
auto guard = set_num_combinations(3);
|
||||
case_type case1 = spaced({R"("""")"}, " ");
|
||||
case_type case2 = spaced({R"("x""x")", R"(x"x)"}, " ");
|
||||
case_type case3 = spaced({R"("")", R"()"}, " ");
|
||||
@@ -438,7 +428,7 @@ TEST_CASE("splitter test with escape and trim") {
|
||||
}
|
||||
|
||||
TEST_CASE("splitter test with quote and escape and trim") {
|
||||
auto guard = set_combinations_size(3);
|
||||
auto guard = set_num_combinations(3);
|
||||
case_type case1 = spaced({R"("\"")", R"(\")", R"("""")"}, " ");
|
||||
case_type case2 =
|
||||
spaced({R"("x\"x")", R"(x\"x)", R"(x"x)", R"("x""x")"}, " ");
|
||||
@@ -509,6 +499,15 @@ TEST_CASE("splitter test error mode") {
|
||||
CHECK_FALSE(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
CHECK_FALSE(s.error_msg().empty());
|
||||
|
||||
try {
|
||||
ss::splitter<ss::throw_on_error> s;
|
||||
s.split(buff("just,some,strings"), "");
|
||||
FAIL("expected exception");
|
||||
} catch (ss::exception& e) {
|
||||
CHECK_FALSE(std::string{e.what()}.empty());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
@@ -522,11 +521,17 @@ TEST_CASE("splitter test error mode") {
|
||||
}
|
||||
|
||||
template <typename Splitter>
|
||||
auto expect_unterminated_quote(Splitter& s, const std::string& line) {
|
||||
auto vec = s.split(buff(line.c_str()));
|
||||
CHECK_FALSE(s.valid());
|
||||
CHECK(s.unterminated_quote());
|
||||
return vec;
|
||||
static inline auto expect_unterminated_quote(Splitter& s,
|
||||
const std::string& line) {
|
||||
try {
|
||||
auto vec = s.split(buff(line.c_str()));
|
||||
CHECK(s.valid());
|
||||
CHECK(s.unterminated_quote());
|
||||
return vec;
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
return decltype(s.split(buff(line.c_str()))){};
|
||||
}
|
||||
}
|
||||
|
||||
namespace ss {
|
||||
@@ -550,7 +555,9 @@ TEST_CASE("splitter test resplit unterminated quote") {
|
||||
{
|
||||
ss::converter<ss::quote<'"'>, ss::multiline, ss::escape<'\\'>> c;
|
||||
auto& s = c.splitter;
|
||||
|
||||
auto vec = expect_unterminated_quote(s, R"("x)");
|
||||
|
||||
CHECK_EQ(vec.size(), 1);
|
||||
REQUIRE(s.unterminated_quote());
|
||||
|
||||
@@ -631,7 +638,7 @@ TEST_CASE("splitter test resplit unterminated quote") {
|
||||
{
|
||||
auto new_line = buff.append(R"(,dom)");
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK_FALSE(s.valid());
|
||||
CHECK(s.valid());
|
||||
CHECK(s.unterminated_quote());
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
@@ -768,54 +775,374 @@ 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 invalid splits") {
|
||||
ss::converter<ss::string_error, ss::quote<'"'>, ss::trim<' '>,
|
||||
ss::escape<'\\'>>
|
||||
c;
|
||||
TEST_CASE("splitter test resplit unterminated quote with exceptions") {
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::multiline, ss::escape<'\\'>,
|
||||
ss::throw_on_error>
|
||||
c;
|
||||
auto& s = c.splitter;
|
||||
|
||||
auto vec = expect_unterminated_quote(s, R"("x)");
|
||||
|
||||
CHECK_EQ(vec.size(), 1);
|
||||
REQUIRE(s.unterminated_quote());
|
||||
|
||||
{
|
||||
auto new_linet =
|
||||
buff.append_overwrite_last(R"(a\x)", c.size_shifted());
|
||||
|
||||
vec = c.resplit(new_linet, strlen(new_linet));
|
||||
|
||||
CHECK(s.unterminated_quote());
|
||||
CHECK_EQ(vec.size(), 1);
|
||||
}
|
||||
|
||||
{
|
||||
auto new_linet =
|
||||
buff.append_overwrite_last(R"(")", c.size_shifted());
|
||||
|
||||
vec = c.resplit(new_linet, strlen(new_linet));
|
||||
REQUIRE(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
REQUIRE_EQ(vec.size(), 1);
|
||||
CHECK_EQ(words(vec)[0], "xax");
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::multiline, ss::throw_on_error> c;
|
||||
auto& s = c.splitter;
|
||||
auto vec = expect_unterminated_quote(s, "\"just");
|
||||
CHECK_EQ(vec.size(), 1);
|
||||
|
||||
auto new_line = buff.append(R"(",strings)");
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
std::vector<std::string> expected{"just", "strings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::multiline, ss::throw_on_error> c;
|
||||
auto& s = c.splitter;
|
||||
auto vec = expect_unterminated_quote(s, "just,some,\"random");
|
||||
std::vector<std::string> expected{"just", "some", "just,some,\""};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
|
||||
auto new_line = buff.append(R"(",strings)");
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"just", "some", "random", "strings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::multiline, ss::throw_on_error> c;
|
||||
auto& s = c.splitter;
|
||||
auto vec = expect_unterminated_quote(s, R"("just","some","ran"")");
|
||||
std::vector<std::string> expected{"just", "some", R"("just","some",")"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
|
||||
auto new_line =
|
||||
buff.append_overwrite_last(R"(,dom","strings")", c.size_shifted());
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"just", "some", "ran\",dom", "strings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::multiline, ss::throw_on_error> c;
|
||||
auto& s = c.splitter;
|
||||
auto vec = expect_unterminated_quote(s, R"("just","some","ran)");
|
||||
std::vector<std::string> expected{"just", "some", R"("just","some",")"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
REQUIRE(s.unterminated_quote());
|
||||
|
||||
{
|
||||
auto new_line = buff.append(R"(,dom)");
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK(s.unterminated_quote());
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
|
||||
{
|
||||
auto new_line = buff.append(R"(",strings)");
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"just", "some", "ran,dom", "strings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::escape<'\\'>, ss::multiline,
|
||||
ss::throw_on_error>
|
||||
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)");
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"just\"some", "ran,dom", "str\"ings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::escape<'\\'>, ss::multiline,
|
||||
ss::throw_on_error>
|
||||
c;
|
||||
auto& s = c.splitter;
|
||||
auto vec =
|
||||
expect_unterminated_quote(s, "3,4,"
|
||||
"\"just0\\\n1\\\n22\\\n33333x\\\n4");
|
||||
|
||||
std::vector<std::string> expected{"3", "4"};
|
||||
auto w = words(vec);
|
||||
w.pop_back();
|
||||
CHECK_EQ(w, expected);
|
||||
REQUIRE(s.unterminated_quote());
|
||||
{
|
||||
auto new_line =
|
||||
buff.append_overwrite_last("\nx5strings\"", c.size_shifted());
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"3", "4", "just0\n1\n22\n33333x\n4\nx5strings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::escape<'\\'>, ss::multiline,
|
||||
ss::throw_on_error>
|
||||
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_overwrite_last(R"(n,dom",str\"ings)",
|
||||
c.size_shifted());
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"just\"some", "ra\"n,dom", "str\"ings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::escape<'\\'>, ss::multiline,
|
||||
ss::throw_on_error>
|
||||
c;
|
||||
auto& s = c.splitter;
|
||||
auto vec = expect_unterminated_quote(s, R"("just\"some","r\a\a\\\a\")");
|
||||
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_overwrite_last(R"(n,dom",str\"ings)",
|
||||
c.size_shifted());
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"just\"some", "raa\\a\"n,dom", "str\"ings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::trim<' '>, ss::multiline,
|
||||
ss::throw_on_error>
|
||||
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" , strings )");
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"just", "some", "ra n,dom", "strings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
|
||||
try {
|
||||
ss::converter<ss::quote<'"'>, ss::trim<' '>, ss::escape<'\\'>,
|
||||
ss::multiline>
|
||||
c;
|
||||
auto& s = c.splitter;
|
||||
auto vec = expect_unterminated_quote(s, R"( "ju\"st" ,some, "ra \")");
|
||||
std::vector<std::string> expected{"ju\"st", "some"};
|
||||
auto w = words(vec);
|
||||
w.pop_back();
|
||||
CHECK_EQ(w, expected);
|
||||
REQUIRE(s.unterminated_quote());
|
||||
{
|
||||
auto new_line =
|
||||
buff.append_overwrite_last(R"( n,dom" , strings )",
|
||||
c.size_shifted());
|
||||
vec = c.resplit(new_line, strlen(new_line));
|
||||
CHECK(s.valid());
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
expected = {"ju\"st", "some", "ra \" n,dom", "strings"};
|
||||
CHECK_EQ(words(vec), expected);
|
||||
}
|
||||
} catch (ss::exception& e) {
|
||||
FAIL(std::string{e.what()});
|
||||
}
|
||||
}
|
||||
|
||||
template <typename... Ts>
|
||||
void test_invalid_splits() {
|
||||
ss::converter<ss::quote<'"'>, ss::trim<' '>, ss::escape<'\\'>, Ts...> 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";
|
||||
auto a = c.resplit(new_line, strlen(new_line));
|
||||
c.resplit(new_line, strlen(new_line));
|
||||
CHECK_FALSE(s.valid());
|
||||
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") {
|
||||
ss::converter<ss::throw_on_error, ss::quote<'"'>, ss::trim<' '>,
|
||||
ss::escape<'\\'>>
|
||||
c;
|
||||
auto& s = c.splitter;
|
||||
|
||||
// empty delimiter
|
||||
REQUIRE_EXCEPTION(s.split(buff("some,random,strings"), ""));
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
CHECK_FALSE(s.error_msg().empty());
|
||||
|
||||
// mismatched delimiter
|
||||
REQUIRE_EXCEPTION(s.split(buff(R"(some,"random,"strings")")));
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
|
||||
// unterminated escape
|
||||
REQUIRE_EXCEPTION(s.split(buff(R"(some,random,strings\)")));
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
|
||||
// unterminated escape
|
||||
REQUIRE_EXCEPTION(s.split(buff(R"(some,random,"strings\)")));
|
||||
CHECK_FALSE(s.unterminated_quote());
|
||||
|
||||
// unterminated quote
|
||||
REQUIRE_EXCEPTION(s.split(buff("some,random,\"strings")));
|
||||
CHECK(s.unterminated_quote());
|
||||
|
||||
// invalid resplit
|
||||
char new_line[] = "some";
|
||||
REQUIRE_EXCEPTION(c.resplit(new_line, strlen(new_line)));
|
||||
}
|
||||
|
||||
TEST_CASE("splitter test with trim_left") {
|
||||
auto guard = set_combinations_size(3);
|
||||
auto guard = set_num_combinations(3);
|
||||
case_type case1 = spaced_left({R"(x )"}, " ");
|
||||
case_type case2 = spaced_left({R"(yy )"}, " ");
|
||||
case_type case3 = spaced_left({R"(y y )"}, " ");
|
||||
@@ -845,7 +1172,7 @@ TEST_CASE("splitter test with trim_left") {
|
||||
}
|
||||
|
||||
TEST_CASE("splitter test with trim_right") {
|
||||
auto guard = set_combinations_size(3);
|
||||
auto guard = set_num_combinations(3);
|
||||
case_type case1 = spaced_right({R"( x)"}, " ");
|
||||
case_type case2 = spaced_right({R"( yy)"}, " ");
|
||||
case_type case3 = spaced_right({R"( y y)"}, " ");
|
||||
@@ -876,7 +1203,7 @@ TEST_CASE("splitter test with trim_right") {
|
||||
}
|
||||
|
||||
TEST_CASE("splitter test with trim_right and trim_left") {
|
||||
auto guard = set_combinations_size(3);
|
||||
auto guard = set_num_combinations(3);
|
||||
case_type case1 = spaced_right({R"(-x)"}, "-");
|
||||
case_type case2 = spaced_left({R"(yy_)"}, "_");
|
||||
case_type case3 = spaced_right({R"(-y y)"}, "-");
|
||||
@@ -894,7 +1221,7 @@ TEST_CASE("splitter test with trim_right and trim_left") {
|
||||
}
|
||||
|
||||
TEST_CASE("splitter test with quote and escape, trim_left and trim_right") {
|
||||
auto guard = set_combinations_size(3);
|
||||
auto guard = set_num_combinations(3);
|
||||
case_type case1 = spaced_left({R"("\"")", R"(\")", R"("""")"}, "_");
|
||||
case_type case2 =
|
||||
spaced_left({R"("x\"x")", R"(x\"x)", R"(x"x)", R"("x""x")"}, "_");
|
||||
|
||||
Reference in New Issue
Block a user