Changeset 2248

Timestamp:

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

Author:

Peter

Message:

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

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• test/utility_test.cc (modified) (3 diffs)
• yat/utility/utility.h (modified) (5 diffs)

trunk/NEWS

@@ -4 +4 @@
 
 version 0.7 (released DATE)
+  - utility::load functions now work with std::string as well.
 
   A complete list of closed tickets can be found here [[br]]

trunk/test/utility_test.cc

@@ -47 +47 @@
 void test_errno_error_func(void);
 void test_get_map(test::Suite&);
+void test_load(test::Suite&);
 void test_inverse(test::Suite&);
 
@@ -170 +171 @@
   test_errno_error(suite);
   test_ptr_compare(suite);
+  test_load(suite);
 
   return suite.return_value();
@@ -233 +235 @@
   if (!post_ok && prior_ok)
     suite.err() << "test_less_nan failed\n";
+}
+
+
+void test_load(test::Suite& suite)
+{
+  std::istringstream iss(std::string("1.69 3.14"));
+  std::vector<double> double_vec;
+  utility::load(iss, double_vec);
+  suite.add(double_vec.size()==2);
+
+  std::istringstream iss2(std::string("1 2"));
+  std::vector<double> uint_vec;
+  utility::load(iss2, uint_vec);
+  suite.add(uint_vec.size()==2);
+
+  std::istringstream iss3(std::string("1.69 3.14"));
+  std::vector<std::string> str_vec;
+  utility::load(iss3, str_vec);
+  if (str_vec.size()==2) {
+    if (str_vec[1]!="3.14") {
+      suite.out() << "error: load<string>:" << "\n"
+                  << "  str_vec[1] = " << str_vec[1] << "\n"
+                  << "  expected:  3.14n";
+      suite.add(false);
+    }
+  }
+  else {
+    suite.out() << "str_vec.size() is not 2\n";
+    suite.add(false);
+  }
 }
 

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);
     }
   }