Changeset 2248 for trunk/yat/utility/utility.h

Timestamp:

Apr 22, 2010, 2:57:13 AM (12 years ago)

Author:

Peter

Message:

extend load functions to work also for T=std::string

File:

• trunk/yat/utility/utility.h (modified) (5 diffs)

trunk/yat/utility/utility.h

@@ -149 +149 @@
 
      \note Requirement on T: utility::convert<T> must be supported
+     (from yat 0.7 T=string is also supported)
 
      \since New in yat 0.6
@@ -173 +174 @@
      
      \note Requirement on T: utility::convert<T> must be supported
+     (from yat 0.7 T=string is also supported)
 
      \since New in yat 0.6
@@ -179 +181 @@
   void load(std::istream& is, std::vector<T>& vec, char sep='\0');
   
+// private namespace
+namespace detail {
+  /**
+     Functor used in load function
+   */
+  template<typename T>
+  struct VectorPusher
+  {
+    /**
+       convert element to T and push on vec's back
+
+       \internal
+     */
+    void operator()(const std::string& element, std::vector<T>& vec)
+    { 
+      if (!element.size())
+        vec.push_back(std::numeric_limits<T>::quiet_NaN());
+      else {
+        vec.push_back(theplu::yat::utility::convert<T>(element));
+      }
+    }
+  };
+
+  /**
+     specialization for string
+
+     \internal
+   */
+  template<>
+  struct VectorPusher<std::string>
+  {
+    /**
+       push element on vec's back
+     */
+    void operator()(const std::string& element, std::vector<std::string>& vec)
+    { 
+      vec.push_back(element);
+    }
+  };
+
+} // end of namespace detail
+
+
   // template implementations
 
@@ -287 +332 @@
   void load(std::istream& is, std::vector<T>& vec, char sep='\0')
   {
+    detail::VectorPusher<T> pusher;
     std::string element;
     bool ok=true;
-    while(ok) {
+    while(true) {
       if(sep=='\0')
         ok=(is>>element);
@@ -297 +343 @@
         break;
       
-      if (!element.size())
-        vec.push_back(std::numeric_limits<T>::quiet_NaN());
-      else {
-        vec.push_back(convert<T>(element));
-      }
+      pusher(element, vec);
     }
   }