2010-10-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Added util::strip()
	* src/util.cc
	* src/util.h
	* test/UtilTest.cc

2 files changed, 27 insertions, 0 deletions

diff --git a/src/util.cc b/src/util.cc
index d0e3d9a8..3846e4f9 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -113,6 +113,11 @@ void trimSelf(std::string& str, const std::string& trimCharset)
   }
 }
 
+std::string strip(const std::string& str, const std::string& chars)
+{
+  return stripIter(str.begin(), str.end(), chars);
+}
+
 void split(std::pair<std::string, std::string>& hp, const std::string& src, char delim)
 {
   hp.first = A2STR::NIL;
diff --git a/src/util.h b/src/util.h
index 49c7c578..12af8ed7 100644
--- a/src/util.h
+++ b/src/util.h
@@ -134,6 +134,28 @@ std::string trim(const std::string& src,
 void trimSelf(std::string& str,
               const std::string& trimCharset = DEFAULT_TRIM_CHARSET);
 
+template<typename InputIterator>
+std::string stripIter
+(InputIterator first, InputIterator last,
+ const std::string& chars = DEFAULT_TRIM_CHARSET)
+{
+  if(std::distance(first, last) == 0) {
+    return A2STR::NIL;
+  }
+  for(; first != last &&
+        std::find(chars.begin(), chars.end(), *first) != chars.end(); ++first);
+  if(first == last) {
+    return A2STR::NIL;
+  }
+  InputIterator left = last-1;
+  for(; left != first &&
+        std::find(chars.begin(), chars.end(), *left) != chars.end(); --left);
+  return std::string(first, left+1);
+}
+
+std::string strip
+(const std::string& str, const std::string& chars = DEFAULT_TRIM_CHARSET);
+
 bool startsWith(const std::string& target, const std::string& part);
 
 bool endsWith(const std::string& target, const std::string& part);