[search] Keyword Matcher rewrite.

1 files changed, 20 insertions, 0 deletions

diff --git a/indexer/search_string_utils.hpp b/indexer/search_string_utils.hpp
index 1503b5d4d8..f845a43bf0 100644
--- a/indexer/search_string_utils.hpp
+++ b/indexer/search_string_utils.hpp
@@ -23,4 +23,24 @@ void SplitUniString(strings::UniString const & uniS, F f, DelimsT const & delims
 
 strings::UniString FeatureTypeToString(uint32_t type);
 
+template <class ContainerT, class DelimsT>
+bool TokenizeStringAndCheckIfLastTokenIsPrefix(strings::UniString const & s,
+                                               ContainerT & tokens,
+                                               DelimsT const & delimiter)
+{
+  SplitUniString(s, MakeBackInsertFunctor(tokens), delimiter);
+  return !s.empty() && !delimiter(s.back());
+}
+
+
+template <class ContainerT, class DelimsT>
+bool TokenizeStringAndCheckIfLastTokenIsPrefix(string const & s,
+                                               ContainerT & tokens,
+                                               DelimsT const & delimiter)
+{
+  return TokenizeStringAndCheckIfLastTokenIsPrefix(NormalizeAndSimplifyString(s),
+                                                   tokens,
+                                                   delimiter);
+}
+
 }  // namespace search