From 98c51be27d51482980d585ccc0affc2325088fd8 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 20 Mar 2017 19:22:58 -0700
Subject: [PATCH] fixup! ircd: Add tokens_after() util.

---
 ircd/lexical.cc | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/ircd/lexical.cc b/ircd/lexical.cc
index 6338327ed..5e5f7374c 100644
--- a/ircd/lexical.cc
+++ b/ircd/lexical.cc
@@ -23,20 +23,6 @@
 #include <RB_INC_BOOST_TOKENIZER_HPP
 #include <RB_INC_BOOST_LEXICAL_CAST_HPP
 
-ircd::string_view
-ircd::tokens_after(const string_view &str,
-                   const char *const &sep,
-                   const size_t &i)
-try
-{
-	const auto t(token(str, sep, i + 1));
-	return { t.data(), str.data() + str.size() };
-}
-catch(const std::out_of_range &e)
-{
-	return {};
-}
-
 ircd::string_view
 ircd::token_first(const string_view &str,
                   const char *const &sep)
@@ -44,6 +30,26 @@ ircd::token_first(const string_view &str,
 	return token(str, sep, 0);
 }
 
+ircd::string_view
+ircd::tokens_after(const string_view &str,
+                   const char *const &sep,
+                   const size_t &i)
+{
+	using type = string_view;
+	using iter = typename type::const_iterator;
+	using delim = boost::char_separator<char>;
+
+	const delim d(sep);
+	const boost::tokenizer<delim, iter, type> view(str, d);
+
+	auto it(begin(view));
+	for(size_t j(0); it != end(view); ++it, j++)
+		if(j > i)
+			return string_view{it->data(), str.data() + str.size()};
+
+	return {};
+}
+
 ircd::string_view
 ircd::token_last(const string_view &str,
                  const char *const &sep)