ado/ssp
1
1
Fork 0
mirror of https://github.com/red0124/ssp.git synced 2025-12-14 21:59:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

write unit tests for resplit, fix some issues with resplit

Browse Source
This commit is contained in:
ado
2021-01-30 21:52:32 +01:00
parent a5c9216824
commit 1bf6b9d595
3 changed files with 129 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/ss/splitter.hpp
View File

@@ -135,11 +135,10 @@ public:
split_input& resplit(line_ptr_type new_line, ssize_t new_size,
const std::string& delimiter = default_delimiter) {
clear_error();
line_ = new_line;
// resplitting, continue from last slice
if (!output_.empty()) {
if (!output_.empty() && unterminated_quote()) {
const auto& last = std::prev(output_.end());
const auto [old_line, old_begin] = *last;
size_t begin = old_begin - old_line - 1;
@@ -152,7 +151,7 @@ public:
return output_;
}
line_ += begin;
begin_ = line_ + begin;
}
return split_impl_select_delim(delimiter);
@@ -287,6 +286,7 @@ private:
split_input& split_impl_select_delim(
const std::string& delimiter = default_delimiter) {
clear_error();
switch (delimiter.size()) {
case 0:
set_error_empty_delimiter();
@@ -301,7 +301,10 @@ private:
template <typename Delim>
split_input& split_impl(const Delim& delim) {
state_ = state::begin;
begin_ = line_;
if (output_.empty()) {
begin_ = line_;
}
trim_if_enabled(begin_);