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

make split_input private, make resplit private, update tests and the converter

Browse Source
This commit is contained in:
ado
2021-02-06 01:44:46 +01:00
parent 42629c39c4
commit 9b90803f6f
4 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/ss/converter.hpp
View File

@@ -127,7 +127,7 @@ 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_.input_);
return convert<Ts...>(splitter_.split_input_);
}
// parses already split line, returns 'T' object with extracted values
@@ -169,7 +169,7 @@ public:
// same as above, but uses cached split line
template <typename T, typename... Ts>
no_void_validator_tup_t<T, Ts...> convert() {
return convert<T, Ts...>(splitter_.input_);
return convert<T, Ts...>(splitter_.split_input_);
}
bool valid() const {
@@ -194,20 +194,25 @@ public:
// contain the beginnings and the ends of each column of the string
const split_input& split(line_ptr_type line,
const std::string& delim = default_delimiter) {
splitter_.input_.clear();
splitter_.split_input_.clear();
if (line[0] == '\0') {
return splitter_.input_;
return splitter_.split_input_;
}
return splitter_.split(line, delim);
}
private:
////////////////
// resplit
////////////////
const split_input& resplit(line_ptr_type new_line, ssize_t new_size,
const std::string& delim = default_delimiter) {
return splitter_.resplit(new_line, new_size, delim);
}
private:
////////////////
// error
////////////////
@@ -373,6 +378,9 @@ private:
bool bool_error_;
enum error_mode error_mode_ { error_mode::error_bool };
splitter<Matchers...> splitter_;
template <typename ...>
friend class parser;
};
} /* ss */