2 files changed, 60 insertions, 12 deletions

diff --git a/src/common/String.cpp b/src/common/String.cpp
index 908f64b6..bb31b987 100644
--- a/src/common/String.cpp
+++ b/src/common/String.cpp
@@ -2,6 +2,7 @@
 #include <double-conversion/double-conversion.h>
 #include <double-conversion/string-to-double.h>
 #include "cru/common/Exception.h"
+#include "cru/common/StringToNumberConverter.h"
 #include "cru/common/StringUtil.h"
 
 #include <cmath>
@@ -313,6 +314,16 @@ Range String::RangeFromCodePointToCodeUnit(Range code_point_range) const {
   return View().RangeFromCodePointToCodeUnit(code_point_range);
 }
 
+int String::ParseToInt(Index* processed_characters_count, unsigned flags,
+                       int base) const {
+  return View().ParseToInt(processed_characters_count, flags, base);
+}
+
+long long String::ParseToLongLong(Index* processed_characters_count,
+                                  unsigned flags, int base) const {
+  return View().ParseToLongLong(processed_characters_count, flags, base);
+}
+
 float String::ParseToFloat(Index* processed_characters_count,
                            unsigned flags) const {
   return View().ParseToFloat(processed_characters_count, flags);
@@ -517,6 +528,16 @@ std::string StringView::ToUtf8() const {
   return result;
 }
 
+int StringView::ParseToInt(Index* processed_characters_count, unsigned flags,
+                           int base) const {
+  return ParseToInteger<int>(processed_characters_count, flags, base);
+}
+
+long long StringView::ParseToLongLong(Index* processed_characters_count,
+                                      unsigned flags, int base) const {
+  return ParseToInteger<long long>(processed_characters_count, flags, base);
+}
+
 static int MapStringToDoubleFlags(int flags) {
   int f = double_conversion::StringToDoubleConverter::ALLOW_CASE_INSENSIBILITY;
   if (flags & StringToNumberFlags::kAllowLeadingSpaces) {
@@ -544,6 +565,11 @@ float StringView::ParseToFloat(Index* processed_characters_count,
   if (processed_characters_count != nullptr) {
     *processed_characters_count = pcc;
   }
+
+  if (flags & StringToNumberFlags::kThrowOnError && std::isnan(result)) {
+    throw Exception(u"Result of string to float conversion is NaN");
+  }
+
   return result;
 }
 
@@ -555,6 +581,11 @@ double StringView::ParseToDouble(Index* processed_characters_count,
   if (processed_characters_count != nullptr) {
     *processed_characters_count = pcc;
   }
+
+  if (flags & StringToNumberFlags::kThrowOnError && std::isnan(result)) {
+    throw Exception(u"Result of string to double conversion is NaN");
+  }
+
   return result;
 }
 
diff --git a/src/common/StringToNumberConverter.cpp b/src/common/StringToNumberConverter.cpp
index 526c2712..e20e436c 100644
--- a/src/common/StringToNumberConverter.cpp
+++ b/src/common/StringToNumberConverter.cpp
@@ -10,20 +10,24 @@ static bool IsSpace(char c) {
   return c == ' ' || c == '\t' || c == '\n' || c == '\r';
 }
 
-StringToIntegerConverterImplResult StringToIntegerConverterImpl::Parse(
-    const char* const str, const Index size,
-    Index* processed_characters_count) const {
+namespace {
+template <typename T>
+StringToIntegerConverterImplResult GenericParseInteger(
+    const StringToIntegerConverterImpl* converter, const T* const str,
+    const Index size, Index* processed_characters_count) {
   if (str == nullptr) throw std::invalid_argument("Invalid str.");
   if (size < 0) throw std::invalid_argument("Invalid size.");
-  if (!CheckParams()) throw std::invalid_argument("Invalid parsing flags.");
+  if (!converter->CheckParams())
+    throw std::invalid_argument("Invalid parsing flags.");
 
-  const bool throw_on_error = (flags & StringToNumberFlags::kThrowOnError) != 0;
+  const bool throw_on_error =
+      (converter->flags & StringToNumberFlags::kThrowOnError) != 0;
 
-  const char* const end = str + size;
+  auto const end = str + size;
 
-  const char* current = str;
+  auto current = str;
 
-  if (flags & StringToNumberFlags::kAllowLeadingSpaces) {
+  if (converter->flags & StringToNumberFlags::kAllowLeadingSpaces) {
     while (current != end && IsSpace(*current)) {
       current++;
     }
@@ -60,7 +64,7 @@ StringToIntegerConverterImplResult StringToIntegerConverterImpl::Parse(
     }
   }
 
-  int base = this->base;
+  int base = converter->base;
 
   if (base == 0) {
     if (*current == '0') {
@@ -96,7 +100,7 @@ StringToIntegerConverterImplResult StringToIntegerConverterImpl::Parse(
   }
 
   const bool allow_leading_zero =
-      flags & StringToNumberFlags::kAllowLeadingZeroForInteger;
+      converter->flags & StringToNumberFlags::kAllowLeadingZeroForInteger;
 
   while (current != end && *current == '0') {
     current++;
@@ -110,9 +114,9 @@ StringToIntegerConverterImplResult StringToIntegerConverterImpl::Parse(
   }
 
   const bool allow_trailing_junk =
-      flags & StringToNumberFlags::kAllowTrailingJunk;
+      converter->flags & StringToNumberFlags::kAllowTrailingJunk;
   const bool allow_trailing_spaces =
-      flags & StringToNumberFlags::kAllowTrailingSpaces;
+      converter->flags & StringToNumberFlags::kAllowTrailingSpaces;
   unsigned long long result = 0;
 
   while (current != end) {
@@ -165,4 +169,17 @@ StringToIntegerConverterImplResult StringToIntegerConverterImpl::Parse(
 
   return {negate, result};
 }
+}  // namespace
+
+StringToIntegerConverterImplResult StringToIntegerConverterImpl::Parse(
+    const char* const str, const Index size,
+    Index* processed_characters_count) const {
+  return GenericParseInteger(this, str, size, processed_characters_count);
+}
+
+StringToIntegerConverterImplResult StringToIntegerConverterImpl::Parse(
+    const char16_t* const str, const Index size,
+    Index* processed_characters_count) const {
+  return GenericParseInteger(this, str, size, processed_characters_count);
+}
 }  // namespace cru