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

replace error_mode String and Bool with error_string and error_bool

Browse Source
This commit is contained in:
ado
2021-01-01 21:57:14 +01:00
parent 0ec0c7dd6a
commit 0487f33eb1
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/ss/converter.hpp
View File

@@ -104,7 +104,7 @@ template <typename... Ts>
constexpr bool tied_class_v = tied_class<Ts...>::value;
// the error can be set inside a string, or a bool
enum class error_mode { String, Bool };
enum class error_mode { error_string, error_bool };
////////////////
// converter
@@ -163,8 +163,8 @@ public:
}
bool valid() const {
return (error_mode_ == error_mode::String) ? string_error_.empty()
: bool_error_ == false;
return (error_mode_ == error_mode::error_string) ? string_error_.empty()
: bool_error_ == false;
}
const std::string& error_msg() const {
@@ -216,7 +216,7 @@ private:
}
void set_error_invalid_conversion(const string_range msg, size_t pos) {
if (error_mode_ == error_mode::String) {
if (error_mode_ == error_mode::error_string) {
string_error_.clear();
string_error_.append("invalid conversion for parameter ")
.append(error_sufix(msg, pos));
@@ -227,7 +227,7 @@ private:
void set_error_validate(const char* const error, const string_range msg,
size_t pos) {
if (error_mode_ == error_mode::String) {
if (error_mode_ == error_mode::error_string) {
string_error_.clear();
string_error_.append(error).append(" ").append(
error_sufix(msg, pos));
@@ -237,7 +237,7 @@ private:
}
void set_error_number_of_colums(size_t expected_pos, size_t pos) {
if (error_mode_ == error_mode::String) {
if (error_mode_ == error_mode::error_string) {
string_error_.clear();
string_error_.append("invalid number of columns, expected: ")
.append(std::to_string(expected_pos))
@@ -370,7 +370,7 @@ private:
std::vector<string_range> input_;
std::string string_error_;
bool bool_error_;
enum error_mode error_mode_ { error_mode::Bool };
enum error_mode error_mode_ { error_mode::error_bool };
};
template <>

12
include/ss/parser.hpp
View File

@@ -33,8 +33,8 @@ public:
}
bool valid() const {
return (error_mode_ == error_mode::String) ? string_error_.empty()
: bool_error_ == false;
return (error_mode_ == error_mode::error_string) ? string_error_.empty()
: bool_error_ == false;
}
void set_error_mode(error_mode mode) {
@@ -285,7 +285,7 @@ private:
}
void set_error_failed_check() {
if (error_mode_ == error_mode::String) {
if (error_mode_ == error_mode::error_string) {
string_error_.append(file_name_).append(" failed check.");
} else {
bool_error_ = true;
@@ -298,7 +298,7 @@ private:
}
void set_error_eof_reached() {
if (error_mode_ == error_mode::String) {
if (error_mode_ == error_mode::error_string) {
string_error_.append(file_name_).append(" reached end of file.");
} else {
bool_error_ = true;
@@ -306,7 +306,7 @@ private:
}
void set_error_invalid_conversion() {
if (error_mode_ == error_mode::String) {
if (error_mode_ == error_mode::error_string) {
string_error_.append(file_name_)
.append(" ")
.append(std::to_string(line_number_))
@@ -328,7 +328,7 @@ private:
const std::string delim_;
std::string string_error_;
bool bool_error_;
error_mode error_mode_{error_mode::Bool};
error_mode error_mode_{error_mode::error_bool};
converter converter_;
converter::split_input split_input_;
FILE* file_{nullptr};