Skip to content

Commit 39a6af6

Browse files
vincentlaucsbvincentlaucsb
authored
CSV Parser 2.1.2: July 26, 2021 Patch (#177)
* Fix C++-14 compile issues * CSV Parser should now build with std=c++11 on g++-7.5 * Fixed issues with floating point writing * Fixed newlines not being escaped * Update single header
1 parent a9561e0 commit 39a6af6

File tree

13 files changed

+332
-187
lines changed

13 files changed

+332
-187
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ In addition to the [Features & Examples](#features--examples) below, a [fully-fl
6060

6161
## Integration
6262

63-
This library was developed with Microsoft Visual Studio and is compatible with >g++ 6.0 and clang.
63+
This library was developed with Microsoft Visual Studio and is compatible with >g++ 7.5 and clang.
6464
All of the code required to build this library, aside from the C++ standard library, is contained under `include/`.
6565

6666
### C++ Version
@@ -342,6 +342,7 @@ stringstream ss; // Can also use ofstream, etc.
342342
auto writer = make_csv_writer(ss);
343343
// auto writer = make_tsv_writer(ss); // For tab-separated files
344344
// DelimWriter<stringstream, '|', '"'> writer(ss); // Your own custom format
345+
// set_decimal_places(2); // How many places after the decimal will be written for floats
345346

346347
writer << vector<string>({ "A", "B", "C" })
347348
<< deque<string>({ "I'm", "too", "tired" })

‎include/csv.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
CSV for C++, version 2.1.0
2+
CSV for C++, version 2.1.2
33
https://github.com/vincentlaucsb/csv-parser
44
55
MIT License

‎include/internal/basic_csv_parser.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace csv {
2727
* ASCII number for a character and, v[i + 128] labels it according to
2828
* the CSVReader::ParseFlags enum
2929
*/
30-
HEDLEY_CONST CONSTEXPR ParseFlagMap make_parse_flags(char delimiter) {
30+
HEDLEY_CONST CONSTEXPR_17 ParseFlagMap make_parse_flags(char delimiter) {
3131
std::array<ParseFlags, 256> ret = {};
3232
for (int i = -128; i < 128; i++) {
3333
const int arr_idx = i + 128;
@@ -48,7 +48,7 @@ namespace csv {
4848
* ASCII number for a character and, v[i + 128] labels it according to
4949
* the CSVReader::ParseFlags enum
5050
*/
51-
HEDLEY_CONST CONSTEXPR ParseFlagMap make_parse_flags(char delimiter, char quote_char) {
51+
HEDLEY_CONST CONSTEXPR_17 ParseFlagMap make_parse_flags(char delimiter, char quote_char) {
5252
std::array<ParseFlags, 256> ret = make_parse_flags(delimiter);
5353
ret[(size_t)quote_char + 128] = ParseFlags::QUOTE;
5454
return ret;
@@ -58,7 +58,7 @@ namespace csv {
5858
* ASCII number for a character c and, v[i + 128] is true if
5959
* c is a whitespace character
6060
*/
61-
HEDLEY_CONST CONSTEXPR WhitespaceMap make_ws_flags(const char* ws_chars, size_t n_chars) {
61+
HEDLEY_CONST CONSTEXPR_14 WhitespaceMap make_ws_flags(const char* ws_chars, size_t n_chars) {
6262
std::array<bool, 256> ret = {};
6363
for (int i = -128; i < 128; i++) {
6464
const int arr_idx = i + 128;
@@ -210,11 +210,11 @@ namespace csv {
210210
/** Indicate the last block of data has been parsed */
211211
void end_feed();
212212

213-
CONSTEXPR ParseFlags parse_flag(const char ch) const noexcept {
213+
CONSTEXPR_17 ParseFlags parse_flag(const char ch) const noexcept {
214214
return _parse_flags.data()[ch + 128];
215215
}
216216

217-
CONSTEXPR ParseFlags compound_parse_flag(const char ch) const noexcept {
217+
CONSTEXPR_17 ParseFlags compound_parse_flag(const char ch) const noexcept {
218218
return quote_escape_flag(parse_flag(ch), this->quote_escape);
219219
}
220220

@@ -274,7 +274,7 @@ namespace csv {
274274
/** Where complete rows should be pushed to */
275275
RowCollection* _records = nullptr;
276276

277-
CONSTEXPR bool ws_flag(const char ch) const noexcept {
277+
CONSTEXPR_17 bool ws_flag(const char ch) const noexcept {
278278
return _ws_flags.data()[ch + 128];
279279
}
280280

‎include/internal/common.hpp

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,31 +74,41 @@ namespace csv {
7474
#endif
7575

7676
#ifdef CSV_HAS_CXX17
77-
#define IF_CONSTEXPR if constexpr
78-
#define CONSTEXPR_VALUE constexpr
77+
#define IF_CONSTEXPR if constexpr
78+
#define CONSTEXPR_VALUE constexpr
79+
80+
#define CONSTEXPR_17 constexpr
7981
#else
80-
#define IF_CONSTEXPR if
81-
#define CONSTEXPR_VALUE const
82+
#define IF_CONSTEXPR if
83+
#define CONSTEXPR_VALUE const
84+
85+
#define CONSTEXPR_17 inline
8286
#endif
8387

8488
#ifdef CSV_HAS_CXX14
8589
template<bool B, class T = void>
8690
using enable_if_t = std::enable_if_t<B, T>;
91+
92+
#define CONSTEXPR_14 constexpr
93+
#define CONSTEXPR_VALUE_14 constexpr
8794
#else
8895
template<bool B, class T = void>
8996
using enable_if_t = typename std::enable_if<B, T>::type;
97+
98+
#define CONSTEXPR_14 inline
99+
#define CONSTEXPR_VALUE_14 const
90100
#endif
91101

92102
// Resolves g++ bug with regard to constexpr methods
93103
// See: https://stackoverflow.com/questions/36489369/constexpr-non-static-member-function-with-non-constexpr-constructor-gcc-clang-d
94104
#if defined __GNUC__ && !defined __clang__
95-
#if (__GNUC__ >= 7 &&__GNUC_MINOR__ >= 2) || (__GNUC__ >= 8)
96-
#define CONSTEXPR constexpr
97-
#endif
98-
#else
99-
#ifdef CSV_HAS_CXX17
100-
#define CONSTEXPR constexpr
101-
#endif
105+
#if (__GNUC__ >= 7 &&__GNUC_MINOR__ >= 2) || (__GNUC__ >= 8)
106+
#define CONSTEXPR constexpr
107+
#endif
108+
#else
109+
#ifdef CSV_HAS_CXX17
110+
#define CONSTEXPR constexpr
111+
#endif
102112
#endif
103113

104114
#ifndef CONSTEXPR

‎include/internal/csv_format.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ namespace csv {
9393
}
9494

9595
/** Tells the parser how to handle columns of a different length than the others */
96-
CONSTEXPR CSVFormat& variable_columns(VariableColumnPolicy policy = VariableColumnPolicy::IGNORE_ROW) {
96+
CONSTEXPR_14 CSVFormat& variable_columns(VariableColumnPolicy policy = VariableColumnPolicy::IGNORE_ROW) {
9797
this->variable_column_policy = policy;
9898
return *this;
9999
}
100100

101101
/** Tells the parser how to handle columns of a different length than the others */
102-
CONSTEXPR CSVFormat& variable_columns(bool policy) {
102+
CONSTEXPR_14 CSVFormat& variable_columns(bool policy) {
103103
this->variable_column_policy = (VariableColumnPolicy)policy;
104104
return *this;
105105
}

‎include/internal/csv_reader.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ namespace csv {
8181
iterator(CSVReader*, CSVRow&&);
8282

8383
/** Access the CSVRow held by the iterator */
84-
CONSTEXPR reference operator*() { return this->row; }
84+
CONSTEXPR_14 reference operator*() { return this->row; }
8585

8686
/** Return a pointer to the CSVRow the iterator has stopped at */
87-
CONSTEXPR pointer operator->() { return &(this->row); }
87+
CONSTEXPR_14 pointer operator->() { return &(this->row); }
8888

8989
iterator& operator++(); /**< Pre-increment iterator */
9090
iterator operator++(int); /**< Post-increment ierator */

‎include/internal/csv_row.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -253,24 +253,24 @@ namespace csv {
253253
CONSTEXPR csv::string_view get_sv() const noexcept { return this->sv; }
254254

255255
/** Returns true if field is an empty string or string of whitespace characters */
256-
CONSTEXPR bool is_null() noexcept { return type() == DataType::CSV_NULL; }
256+
CONSTEXPR_14 bool is_null() noexcept { return type() == DataType::CSV_NULL; }
257257

258258
/** Returns true if field is a non-numeric, non-empty string */
259-
CONSTEXPR bool is_str() noexcept { return type() == DataType::CSV_STRING; }
259+
CONSTEXPR_14 bool is_str() noexcept { return type() == DataType::CSV_STRING; }
260260

261261
/** Returns true if field is an integer or float */
262-
CONSTEXPR bool is_num() noexcept { return type() >= DataType::CSV_INT8; }
262+
CONSTEXPR_14 bool is_num() noexcept { return type() >= DataType::CSV_INT8; }
263263

264264
/** Returns true if field is an integer */
265-
CONSTEXPR bool is_int() noexcept {
265+
CONSTEXPR_14 bool is_int() noexcept {
266266
return (type() >= DataType::CSV_INT8) && (type() <= DataType::CSV_INT64);
267267
}
268268

269269
/** Returns true if field is a floating point value */
270-
CONSTEXPR bool is_float() noexcept { return type() == DataType::CSV_DOUBLE; };
270+
CONSTEXPR_14 bool is_float() noexcept { return type() == DataType::CSV_DOUBLE; };
271271

272272
/** Return the type of the underlying CSV data */
273-
CONSTEXPR DataType type() noexcept {
273+
CONSTEXPR_14 DataType type() noexcept {
274274
this->get_value();
275275
return _type;
276276
}
@@ -279,7 +279,7 @@ namespace csv {
279279
long double value = 0; /**< Cached numeric value */
280280
csv::string_view sv = ""; /**< A pointer to this field's text */
281281
DataType _type = DataType::UNKNOWN; /**< Cached data type value */
282-
CONSTEXPR void get_value() noexcept {
282+
CONSTEXPR_14 void get_value() noexcept {
283283
/* Check to see if value has been cached previously, if not
284284
* evaluate it
285285
*/
@@ -419,13 +419,13 @@ namespace csv {
419419
* CSVRow is still alive.
420420
*/
421421
template<>
422-
CONSTEXPR csv::string_view CSVField::get<csv::string_view>() {
422+
CONSTEXPR_14 csv::string_view CSVField::get<csv::string_view>() {
423423
return this->sv;
424424
}
425425

426426
/** Retrieve this field's value as a long double */
427427
template<>
428-
CONSTEXPR long double CSVField::get<long double>() {
428+
CONSTEXPR_14 long double CSVField::get<long double>() {
429429
if (!is_num())
430430
throw std::runtime_error(internals::ERROR_NAN);
431431

‎include/internal/csv_writer.hpp

Lines changed: 45 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
namespace csv {
1717
namespace internals {
18+
static int DECIMAL_PLACES = 5;
19+
1820
/** to_string() for unsigned integers */
1921
template<typename T,
2022
csv::enable_if_t<std::is_unsigned<T>::value, int> = 0>
@@ -48,25 +50,52 @@ namespace csv {
4850
typename T,
4951
csv::enable_if_t<std::is_floating_point<T>::value, int> = 0
5052
>
51-
inline std::string to_string(T value) {
52-
std::string result;
53+
inline std::string to_string(T value) {
54+
std::string result;
5355

54-
if (value < 0) result = "-";
55-
56-
// Integral part
57-
size_t integral = (size_t)(std::abs(value));
58-
result += (integral == 0) ? "0" : to_string(integral);
56+
T integral_part;
57+
T fractional_part = std::abs(std::modf(value, &integral_part));
58+
integral_part = std::abs(integral_part);
59+
60+
// Integral part
61+
if (value < 0) result = "-";
62+
63+
if (integral_part == 0) {
64+
result = "0";
65+
}
66+
else {
67+
for (short n_digits = log(integral_part) / log(10); n_digits + 1 > 0; n_digits --) {
68+
short digit = std::fmod(integral_part, pow10(n_digits + 1)) / pow10(n_digits);
69+
result += (char)('0' + digit);
70+
}
71+
}
5972

60-
// Decimal part
61-
size_t decimal = (size_t)(((double)std::abs(value) - (double)integral) * 100000);
73+
// Decimal part
74+
result += ".";
6275

63-
result += ".";
64-
result += (decimal == 0) ? "0" : to_string(decimal);
76+
if (fractional_part > 0) {
77+
fractional_part *= pow10(DECIMAL_PLACES);
78+
for (short n_digits = DECIMAL_PLACES; n_digits > 0; n_digits--) {
79+
short digit = std::fmod(fractional_part, pow10(n_digits)) / pow10(n_digits - 1);
80+
result += (char)('0' + digit);
81+
}
82+
}
83+
else {
84+
result += "0";
85+
}
6586

66-
return result;
87+
return result;
6788
}
6889
}
6990

91+
/** Sets how many places after the decimal will be written for floating point numbers
92+
*
93+
* @param precision Number of decimal places
94+
*/
95+
inline static void set_decimal_places(int precision) {
96+
internals::DECIMAL_PLACES = precision;
97+
}
98+
7099
/** @name CSV Writing */
71100
///@{
72101
/**
@@ -102,6 +131,7 @@ namespace csv {
102131
* @param _out Stream to write to
103132
* @param _quote_minimal Limit field quoting to only when necessary
104133
*/
134+
105135
DelimWriter(OutputStream& _out, bool _quote_minimal = true)
106136
: out(_out), quote_minimal(_quote_minimal) {};
107137

@@ -213,7 +243,7 @@ namespace csv {
213243
bool quote_escape = false;
214244

215245
for (auto ch : in) {
216-
if (ch == Quote || ch == Delim) {
246+
if (ch == Quote || ch == Delim || ch == '\r' || ch == '\n') {
217247
quote_escape = true;
218248
break;
219249
}
@@ -222,9 +252,10 @@ namespace csv {
222252
if (!quote_escape) {
223253
if (quote_minimal) return std::string(in);
224254
else {
225-
std::string ret(Quote, 1);
255+
std::string ret(1, Quote);
226256
ret += in.data();
227257
ret += Quote;
258+
return ret;
228259
}
229260
}
230261

0 commit comments

Comments
 (0)