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

minor refactoring

Browse Source
This commit is contained in:
ado 2021-02-06 21:08:59 +01:00
parent 5cd458e2bc
commit a1ca012203
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/ss/parser.hpp
View File

@ -10,7 +10,6 @@
#include <vector> #include <vector>
// TODO rule of 5-3-1 // TODO rule of 5-3-1
// TODO threads
namespace ss { namespace ss {
template <typename... Matchers> template <typename... Matchers>
@ -261,24 +260,18 @@ private:
bool crlf; bool crlf;
bool escaped_eol(size_t size) { bool escaped_eol(size_t size) {
if constexpr (setup<Matchers...>::escape::enabled) { const char* curr;
const char* curr; for (curr = next_line_buffer_ + size - 1;
for (curr = next_line_buffer_ + size - 1; curr >= next_line_buffer_ &&
curr >= next_line_buffer_ && setup<Matchers...>::escape::match(*curr);
setup<Matchers...>::escape::match(*curr); --curr) {
--curr) {
}
return (next_line_buffer_ - curr + size) % 2 == 0;
} }
return (next_line_buffer_ - curr + size) % 2 == 0;
return false;
} }
bool unterminated_quote() { bool unterminated_quote() {
if constexpr (ss::setup<Matchers...>::quote::enabled) { if (next_line_converter_.unterminated_quote()) {
if (next_line_converter_.unterminated_quote()) { return true;
return true;
}
} }
return false; return false;
} }
@ -347,19 +340,23 @@ private:
size_t size = remove_eol(next_line_buffer_, ssize); size_t size = remove_eol(next_line_buffer_, ssize);
while (escaped_eol(size)) { if constexpr (setup<Matchers...>::escape::enabled) {
if (!append_line(file, next_line_buffer_, size)) { while (escaped_eol(size)) {
return false; if (!append_line(file, next_line_buffer_, size)) {
return false;
}
} }
} }
next_line_converter_.split(next_line_buffer_, delim_); next_line_converter_.split(next_line_buffer_, delim_);
while (unterminated_quote()) { if constexpr (setup<Matchers...>::quote::enabled) {
if (!append_line(file, next_line_buffer_, size)) { while (unterminated_quote()) {
return false; if (!append_line(file, next_line_buffer_, size)) {
return false;
}
next_line_converter_.resplit(next_line_buffer_, size);
} }
next_line_converter_.resplit(next_line_buffer_, size);
} }
return true; return true;

30
include/ss/splitter.hpp
View File

@ -169,14 +169,6 @@ private:
} }
} }
void shift_if_escaped(line_ptr_type& curr) {
if constexpr (escape::enabled) {
if (escape::match(*curr)) {
shift_and_jump_escape();
}
}
}
template <typename Delim> template <typename Delim>
std::tuple<size_t, bool> match_delimiter(line_ptr_type begin, std::tuple<size_t, bool> match_delimiter(line_ptr_type begin,
const Delim& delim) { const Delim& delim) {
@ -207,12 +199,14 @@ private:
//////////////// ////////////////
void shift_and_set_current() { void shift_and_set_current() {
if (escaped_ > 0) { if constexpr (!is_const_line) {
if constexpr (!is_const_line) { if (escaped_ > 0) {
std::copy_n(curr_ + escaped_, end_ - curr_, curr_); std::copy_n(curr_ + escaped_, end_ - curr_, curr_);
curr_ = end_ - escaped_;
return;
} }
} }
curr_ = end_ - escaped_; curr_ = end_;
} }
void shift_and_push() { void shift_and_push() {
@ -220,10 +214,20 @@ private:
split_input_.emplace_back(begin_, curr_); split_input_.emplace_back(begin_, curr_);
} }
void shift_if_escaped(line_ptr_type& curr) {
if constexpr (escape::enabled) {
if (escape::match(*curr)) {
shift_and_jump_escape();
}
}
}
void shift_and_jump_escape() { void shift_and_jump_escape() {
shift_and_set_current(); shift_and_set_current();
if constexpr (!is_const_line) {
++escaped_;
}
++end_; ++end_;
++escaped_;
} }
void shift_push_and_start_next(size_t n) { void shift_push_and_start_next(size_t n) {
@ -381,7 +385,7 @@ private:
size_t escaped_{0}; size_t escaped_{0};
split_input split_input_; split_input split_input_;
template <typename ...> template <typename...>
friend class converter; friend class converter;
}; };