Update Catch2 dependency

* Allow parsing of numbers beginning with + * Added CSV_BIGINT data type * Use FetchContent to include Catch2
vincentlaucsb · May 20, 2024 · 11378ab · 11378ab
1 parent 35f1849
commit 11378ab
Show file tree

Hide file tree

Showing 25 changed files with 97 additions and 18,003 deletions.
diff --git a/include/internal/CMakeLists.txt b/include/internal/CMakeLists.txt
@@ -20,7 +20,7 @@ target_sources(csv
 		csv_utility.cpp
 		csv_utility.hpp
 		csv_writer.hpp
-		data_type.h
+		"data_type.hpp"
 		)
 
 set_target_properties(csv PROPERTIES LINKER_LANGUAGE CXX)

diff --git a/include/internal/csv_reader.hpp b/include/internal/csv_reader.hpp
@@ -18,7 +18,7 @@
 #include "../external/mio.hpp"
 #include "basic_csv_parser.hpp"
 #include "common.hpp"
-#include "data_type.h"
+#include "data_type.hpp"
 #include "csv_format.hpp"
 
 /** The all encompassing namespace */
@@ -87,8 +87,7 @@ namespace csv {
             CONSTEXPR_14 pointer operator->() { return &(this->row); }
 
             iterator& operator++();   /**< Pre-increment iterator */
-            iterator operator++(int); /**< Post-increment ierator */
-            iterator& operator--();
+            iterator operator++(int); /**< Post-increment iterator */
 
             /** Returns true if iterators were constructed from the same CSVReader
              *  and point to the same row

diff --git a/include/internal/csv_row.hpp b/include/internal/csv_row.hpp
@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "common.hpp"
-#include "data_type.h"
+#include "data_type.hpp"
 #include "col_names.hpp"
 
 namespace csv {

diff --git a/include/internal/csv_utility.hpp b/include/internal/csv_utility.hpp
@@ -2,7 +2,7 @@
 #include "common.hpp"
 #include "csv_format.hpp"
 #include "csv_reader.hpp"
-#include "data_type.h"
+#include "data_type.hpp"
 
 #include <string>
 #include <type_traits>

diff --git a/include/internal/csv_writer.hpp b/include/internal/csv_writer.hpp
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "common.hpp"
-#include "data_type.h"
+#include "data_type.hpp"
 
 namespace csv {
     namespace internals {

diff --git a/include/internal/data_type.h → include/internal/data_type.hpp b/include/internal/data_type.h → include/internal/data_type.hpp
@@ -25,6 +25,7 @@ namespace csv {
         CSV_INT16,  /**< 16-bit integer (short on MSVC/GCC) */
         CSV_INT32,  /**< 32-bit integer (int on MSVC/GCC) */
         CSV_INT64,  /**< 64-bit integer (long long on MSVC/GCC) */
+        CSV_BIGINT, /**< Value too big to fit in a 64-bit in */
         CSV_DOUBLE  /**< Floating point value */
     };
 
@@ -220,7 +221,7 @@ namespace csv {
             else if (number <= internals::CSV_INT64_MAX)
                 return DataType::CSV_INT64;
             else // Conversion to long long will cause an overflow
-                return DataType::CSV_DOUBLE;
+                return DataType::CSV_BIGINT;
         }
 
         /** Distinguishes numeric from other text values. Used by various
@@ -266,6 +267,12 @@ namespace csv {
                             return DataType::CSV_STRING;
                         }
                     }
+                    break;
+                case '+':
+                    if (!ws_allowed) {
+                        return DataType::CSV_STRING;
+                    }
+
                     break;
                 case '-':
                     if (!ws_allowed) {

diff --git a/single_include/csv.hpp b/single_include/csv.hpp
@@ -5085,6 +5085,7 @@ namespace csv {
         CSV_INT16,  /**< 16-bit integer (short on MSVC/GCC) */
         CSV_INT32,  /**< 32-bit integer (int on MSVC/GCC) */
         CSV_INT64,  /**< 64-bit integer (long long on MSVC/GCC) */
+        CSV_BIGINT, /**< Value too big to fit in a 64-bit in */
         CSV_DOUBLE  /**< Floating point value */
     };
 
@@ -5280,7 +5281,7 @@ namespace csv {
             else if (number <= internals::CSV_INT64_MAX)
                 return DataType::CSV_INT64;
             else // Conversion to long long will cause an overflow
-                return DataType::CSV_DOUBLE;
+                return DataType::CSV_BIGINT;
         }
 
         /** Distinguishes numeric from other text values. Used by various
@@ -5326,6 +5327,12 @@ namespace csv {
                             return DataType::CSV_STRING;
                         }
                     }
+                    break;
+                case '+':
+                    if (!ws_allowed) {
+                        return DataType::CSV_STRING;
+                    }
+
                     break;
                 case '-':
                     if (!ws_allowed) {
@@ -6274,8 +6281,7 @@ namespace csv {
             CONSTEXPR_14 pointer operator->() { return &(this->row); }
 
             iterator& operator++();   /**< Pre-increment iterator */
-            iterator operator++(int); /**< Post-increment ierator */
-            iterator& operator--();
+            iterator operator++(int); /**< Post-increment iterator */
 
             /** Returns true if iterators were constructed from the same CSVReader
              *  and point to the same row

diff --git a/single_include_test/csv.hpp b/single_include_test/csv.hpp
@@ -5085,6 +5085,7 @@ namespace csv {
         CSV_INT16,  /**< 16-bit integer (short on MSVC/GCC) */
         CSV_INT32,  /**< 32-bit integer (int on MSVC/GCC) */
         CSV_INT64,  /**< 64-bit integer (long long on MSVC/GCC) */
+        CSV_BIGINT, /**< Value too big to fit in a 64-bit in */
         CSV_DOUBLE  /**< Floating point value */
     };
 
@@ -5280,7 +5281,7 @@ namespace csv {
             else if (number <= internals::CSV_INT64_MAX)
                 return DataType::CSV_INT64;
             else // Conversion to long long will cause an overflow
-                return DataType::CSV_DOUBLE;
+                return DataType::CSV_BIGINT;
         }
 
         /** Distinguishes numeric from other text values. Used by various
@@ -5326,6 +5327,12 @@ namespace csv {
                             return DataType::CSV_STRING;
                         }
                     }
+                    break;
+                case '+':
+                    if (!ws_allowed) {
+                        return DataType::CSV_STRING;
+                    }
+
                     break;
                 case '-':
                     if (!ws_allowed) {
@@ -6274,8 +6281,7 @@ namespace csv {
             CONSTEXPR_14 pointer operator->() { return &(this->row); }
 
             iterator& operator++();   /**< Pre-increment iterator */
-            iterator operator++(int); /**< Post-increment ierator */
-            iterator& operator--();
+            iterator operator++(int); /**< Post-increment iterator */
 
             /** Returns true if iterators were constructed from the same CSVReader
              *  and point to the same row

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,8 +1,17 @@
+include(FetchContent)
+
+FetchContent_Declare(
+  Catch2
+  GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+  GIT_TAG v3.6.0
+) 
+
+FetchContent_MakeAvailable(Catch2)
+
 add_executable(csv_test "")
 target_sources(csv_test
     PRIVATE
         ${CSV_INCLUDE_DIR}/csv.hpp
-        catch.hpp
         main.cpp
         test_csv_field.cpp
         test_csv_field_array.cpp
@@ -20,6 +29,7 @@ target_sources(csv_test
         test_round_trip.cpp
     )
 target_link_libraries(csv_test csv)
+target_link_libraries(csv_test Catch2::Catch2WithMain)
 
 if(MSVC)
     # Workaround to enable debugging unit tests in Visual Studio