parseInteger

grunt-lucas · Sep 8, 2023 · 469b48a · 469b48a
1 parent fb5efab
commit 469b48a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/include/utilities.h b/include/utilities.h
@@ -5,15 +5,17 @@
 #include <string>
 #include <unordered_map>
 
+#define FMT_HEADER_ONLY
+#include <fmt/color.h>
+
 #include "errors_warnings.h"
 #include "ptcontext.h"
 #include "types.h"
 
 namespace porytiles {
 
-template <typename T> static T parseInteger(const char *integerString)
+template <typename T> T parseInteger(const char *integerString)
 {
-  // TODO : rewrite cli_parser::parseIntegralOption to use this function
   try {
     size_t pos;
     T arg = std::stoi(integerString, &pos, 0);

diff --git a/src/cli_parser.cpp b/src/cli_parser.cpp
@@ -51,12 +51,7 @@ template <typename T>
 static T parseIntegralOption(const ErrorsAndWarnings &err, const std::string &optionName, const char *optarg)
 {
   try {
-    size_t pos;
-    T arg = std::stoi(optarg, &pos, 0);
-    if (std::string{optarg}.size() != pos) {
-      // throw here so it catches below and prints an error message
-      throw std::runtime_error{""};
-    }
+    T arg = parseInteger<T>(optarg);
     return arg;
   }
   catch (const std::exception &e) {