Removed obsolete functions.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

base/string_utils.cpp

@@ -294,13 +294,6 @@ bool IsASCIISpace(UniChar c)
   return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
 }
 
-bool IsASCIINumeric(std::string const & str)
-{
-  if (str.empty())
-    return false;
-  return std::all_of(str.begin(), str.end(), strings::IsASCIIDigit);
-}
-
 bool IsASCIILatin(UniChar c) { return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); }
 
 bool StartsWith(UniString const & s, UniString const & p)

base/string_utils.hpp

@@ -128,7 +128,11 @@ UniString MakeUniString(std::string_view utf8s);
 std::string ToUtf8(UniString const & s);
 bool IsASCIIString(std::string_view sv);
 bool IsASCIIDigit(UniChar c);
-bool IsASCIINumeric(std::string const & str);
+template <class StringT> bool IsASCIINumeric(StringT const & str)
+{
+  return !std::empty(str) && std::all_of(std::begin(str), std::end(str), &IsASCIIDigit);
+}
+inline bool IsASCIINumeric(char const * s) { return IsASCIINumeric(std::string_view(s)); }
 bool IsASCIISpace(UniChar c);
 bool IsASCIILatin(UniChar c);
 

indexer/feature_data.cpp

@@ -2,7 +2,6 @@
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature.hpp"
-#include "indexer/feature_impl.hpp"
 #include "indexer/ftypes_matcher.hpp"
 
 #include "base/assert.hpp"
@@ -347,7 +346,7 @@ bool FeatureParams::AddHouseNumber(string houseNumber)
     ++i;
   houseNumber.erase(0, i);
 
-  if (any_of(houseNumber.cbegin(), houseNumber.cend(), IsDigit))
+  if (any_of(houseNumber.cbegin(), houseNumber.cend(), &strings::IsASCIIDigit))
   {
     house.Set(houseNumber);
     return true;

indexer/feature_impl.cpp

@@ -1,66 +1,15 @@
 #include "indexer/feature_impl.hpp"
 
 #include "base/string_utils.hpp"
-#include "base/logging.hpp"
 #include "base/math.hpp"
 
-#include <algorithm>
-
-using namespace std;
-
 namespace feature
 {
-
-bool IsDigit(int c)
-{
-  return (int('0') <= c && c <= int('9'));
-}
-
-bool IsNumber(strings::UniString const & s)
-{
-  for (size_t i = 0; i < s.size(); ++i)
-  {
-    // android production ndk-r8d has bug. "еда" detected as a number.
-    if (!IsDigit(s[i]))
-      return false;
-  }
-  return true;
-}
-
-bool IsStreetNumber(strings::UniString const & s)
-{
-  if (s.size() < 2)
-    return false;
-
-  /// add different localities in future, if it's a problem.
-  for (auto const & streetEnding : {"st", "nd", "rd", "th"})
-  {
-    if (strings::EndsWith(strings::ToUtf8(s), streetEnding))
-      return true;
-  }
-  return false;
-}
-
-bool IsHouseNumberDeepCheck(strings::UniString const & s)
-{
-  size_t const count = s.size();
-  if (count == 0)
-    return false;
-  if (!IsDigit(s[0]))
-    return false;
-  if (IsStreetNumber(s))
-    return false;
-  return (count < 8);
-}
+using namespace std;
 
 bool IsHouseNumber(string const & s)
 {
-  return (!s.empty() && IsDigit(s[0]));
-}
-
-bool IsHouseNumber(strings::UniString const & s)
-{
-  return (!s.empty() && IsDigit(s[0]));
+  return !s.empty() && strings::IsASCIIDigit(s[0]);
 }
 
 uint8_t PopulationToRank(uint64_t p)

indexer/feature_impl.hpp

@@ -3,7 +3,6 @@
 #include "indexer/scales.hpp"
 
 #include "base/assert.hpp"
-#include "base/macros.hpp"
 
 #include <cstring>
 #include <string>
@@ -12,27 +11,17 @@ namespace strings { class UniString; }
 
 namespace feature
 {
-static int const g_arrWorldScales[] = {3, 5, 7, 9};
-static_assert(9 == scales::GetUpperWorldScale(), "");
-static int const g_arrCountryScales[] = {10, 12, 14, 17};
-static_assert(17 == scales::GetUpperScale(), "");
+int constexpr g_arrWorldScales[] = { 3, 5, 7, scales::GetUpperWorldScale() };
+int constexpr g_arrCountryScales[] = { 10, 12, 14, scales::GetUpperScale() };
+static_assert(std::size(g_arrWorldScales) == std::size(g_arrCountryScales));
 
 inline std::string GetTagForIndex(std::string const & prefix, size_t ind)
 {
-  static char const arrChar[] = {'0', '1', '2', '3'};
-  static_assert(ARRAY_SIZE(arrChar) >= ARRAY_SIZE(g_arrWorldScales), "");
-  static_assert(ARRAY_SIZE(arrChar) >= ARRAY_SIZE(g_arrCountryScales), "");
-  ASSERT(ind < ARRAY_SIZE(arrChar), (ind));
-
-  return prefix + arrChar[ind];
+  ASSERT(ind < std::size(g_arrWorldScales) && ind < std::size(g_arrCountryScales), (ind));
+  return prefix + char('0' + ind);
 }
 
-bool IsDigit(int c);
-bool IsNumber(strings::UniString const & s);
-
 bool IsHouseNumber(std::string const & s);
-bool IsHouseNumber(strings::UniString const & s);
-bool IsHouseNumberDeepCheck(strings::UniString const & s);
 
 uint8_t PopulationToRank(uint64_t p);
 uint64_t RankToPopulation(uint8_t r);

search/query_params.cpp

@@ -151,7 +151,7 @@ bool QueryParams::IsNumberTokens(TokenRange const & range) const
 
   for (size_t i : range)
   {
-    if (!GetToken(i).AnyOfOriginalOrSynonyms([](String const & s) { return feature::IsNumber(s); }))
+    if (!GetToken(i).AnyOfOriginalOrSynonyms([](String const & s) { return strings::IsASCIINumeric(s); }))
       return false;
   }