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

make reader a struct

Browse Source
This commit is contained in:
ado 2021-02-07 21:29:12 +01:00
parent c094ede588
commit b626f78a71
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/ss/parser.hpp
View File

@ -295,8 +295,7 @@ private:
++line_number_; ++line_number_;
} }
class reader { struct reader {
public:
reader(const std::string& file_name_, const std::string& delim) reader(const std::string& file_name_, const std::string& delim)
: delim_{delim}, file_{fopen(file_name_.c_str(), "rb")} { : delim_{delim}, file_{fopen(file_name_.c_str(), "rb")} {
} }
@ -304,14 +303,12 @@ private:
reader(reader&& other) reader(reader&& other)
: buffer_{other.buffer_}, : buffer_{other.buffer_},
next_line_buffer_{other.next_line_buffer_}, next_line_buffer_{other.next_line_buffer_},
helper_buffer_{other.helper_buffer_}, helper_buffer_{other.helper_buffer_}, converter_{std::move(
converter_{std::move(other.converter_)}, other.converter_)},
next_line_converter_{std::move(other.next_line_converter_)}, next_line_converter_{std::move(other.next_line_converter_)},
size_{other.size_}, size_{other.size_},
helper_size_{other.helper_size_}, helper_size_{other.helper_size_}, delim_{std::move(other.delim_)},
delim_{std::move(other.delim_)}, file_{other.file_}, crlf_{other.crlf_} {
file_{other.file_},
crlf_{other.crlf_} {
other.buffer_ = nullptr; other.buffer_ = nullptr;
other.next_line_buffer_ = nullptr; other.next_line_buffer_ = nullptr;
other.helper_buffer_ = nullptr; other.helper_buffer_ = nullptr;
@ -395,7 +392,6 @@ private:
std::swap(converter_, next_line_converter_); std::swap(converter_, next_line_converter_);
} }
private:
bool escaped_eol(size_t size) { bool escaped_eol(size_t size) {
const char* curr; const char* curr;
for (curr = next_line_buffer_ + size - 1; for (curr = next_line_buffer_ + size - 1;
@ -461,7 +457,6 @@ private:
//////////////// ////////////////
// members // members
//////////////// ////////////////
public:
char* buffer_{nullptr}; char* buffer_{nullptr};
char* next_line_buffer_{nullptr}; char* next_line_buffer_{nullptr};
char* helper_buffer_{nullptr}; char* helper_buffer_{nullptr};