diff --git a/src/text.cpp b/src/text.cpp index 581e55051..a68091e85 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -80,26 +80,6 @@ void split ( results.push_back (input.substr (start)); } -//////////////////////////////////////////////////////////////////////////////// -void split_minimal ( - std::vector& results, - const std::string& input, - const char delimiter) -{ - results.clear (); - std::string::size_type start = 0; - std::string::size_type i; - while ((i = input.find (delimiter, start)) != std::string::npos) - { - if (i != start) - results.push_back (input.substr (start, i - start)); - start = i + 1; - } - - if (start < input.length ()) - results.push_back (input.substr (start)); -} - //////////////////////////////////////////////////////////////////////////////// void split ( std::vector& results, diff --git a/src/text.h b/src/text.h index 70003ee33..bb4aeb2ed 100644 --- a/src/text.h +++ b/src/text.h @@ -41,7 +41,6 @@ int longestLine (const std::string&); bool extractLine (std::string&, const std::string&, int, bool, unsigned int&); void split (std::vector&, const std::string&, const char); void split (std::vector&, const std::string&, const std::string&); -void split_minimal (std::vector&, const std::string&, const char); void join (std::string&, const std::string&, const std::vector&); void join (std::string&, const std::string&, const std::vector&); std::string commify (const std::string&); diff --git a/test/text.t.cpp b/test/text.t.cpp index 192183bd5..b11373bbe 100644 --- a/test/text.t.cpp +++ b/test/text.t.cpp @@ -37,7 +37,7 @@ Context context; //////////////////////////////////////////////////////////////////////////////// int main (int argc, char** argv) { - UnitTest t (221); + UnitTest t (216); // Ensure environment has no influence. unsetenv ("TASKDATA"); @@ -124,9 +124,6 @@ int main (int argc, char** argv) t.is (items[0], "", "split '-' '-' -> [0] ''"); t.is (items[1], "", "split '-' '-' -> [1] ''"); - split_minimal (items, unsplit, '-'); - t.is (items.size (), (size_t) 0, "split '-' '-' ->"); - unsplit = "-a-bc-def"; split (items, unsplit, '-'); t.is (items.size (), (size_t) 4, "split '-a-bc-def' '-' -> '' 'a' 'bc' 'def'"); @@ -135,12 +132,6 @@ int main (int argc, char** argv) t.is (items[2], "bc", "split '-a-bc-def' '-' -> [2] 'bc'"); t.is (items[3], "def", "split '-a-bc-def' '-' -> [3] 'def'"); - split_minimal (items, unsplit, '-'); - t.is (items.size (), (size_t) 3, "split '-a-bc-def' '-' -> 'a' 'bc' 'def'"); - t.is (items[0], "a", "split '-a-bc-def' '-' -> [1] 'a'"); - t.is (items[1], "bc", "split '-a-bc-def' '-' -> [2] 'bc'"); - t.is (items[2], "def", "split '-a-bc-def' '-' -> [3] 'def'"); - // void split (std::vector& results, const std::string& input, const std::string& delimiter) unsplit = ""; split (items, unsplit, "--");