Changeset 1058

Timestamp:

Apr 24, 2010, 6:36:59 PM (13 years ago)

Author:

Peter Johansson

Message:

update to latest yat

Location:

trunk/lib

Files:

• OptionVersion.cc (modified) (2 diffs)
• OptionVersion.h (modified) (2 diffs)
• yat/CommandLine.h (modified) (2 diffs)
• yat/OptionHelp.cc (modified) (2 diffs)
• yat/utility.h (modified) (6 diffs)

trunk/lib/OptionVersion.cc

@@ -37 +37 @@
 #endif
 
+#include <cstdlib>
 #include <iostream>
 #include <sstream>
@@ -91 +92 @@
 #endif
     }
-    exit(0);
+    exit(EXIT_SUCCESS);
   }
 

trunk/lib/OptionVersion.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2008, 2009 Peter Johansson
+  Copyright (C) 2008, 2009, 2010 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -57 +57 @@
                   OptionSwitch* const verbose=NULL); 
 
+    /**
+       \brief set version string
+    */
+    void version(const std::string&);
+
   private:
     OptionSwitch* const verbose_;

trunk/lib/yat/CommandLine.h

@@ -2 +2 @@
 #define _theplu_yat_utility_commandline_
 
-//$Id: CommandLine.h 2202 2010-02-21 18:39:13Z peter $
+//$Id: CommandLine.h 2247 2010-04-22 00:54:34Z peter $
 
 /*
@@ -164 +164 @@
   private:
     friend std::ostream& operator<<(std::ostream& os, const CommandLine& cl);
-    void add_private(std::string, Option&);
     bool is_long_option(std::string str) const;
     bool is_short_option(std::string str) const;

trunk/lib/yat/OptionHelp.cc

@@ -1 @@
-// $Id: OptionHelp.cc 2121 2009-12-13 16:17:07Z peter $
+// $Id: OptionHelp.cc 2246 2010-04-22 00:53:23Z peter $
 
 /*
@@ -50 +50 @@
     std::cout << cmd() << "\n"; 
     std::cout << post_cmd_;
-    exit(0);
+    exit(EXIT_SUCCESS);
   }
 

trunk/lib/yat/utility.h

@@ -2 +2 @@
 #define _theplu_yat_utility_utility_ 
 
-// $Id: utility.h 2210 2010-03-05 22:59:01Z peter $
+// $Id: utility.h 2248 2010-04-22 00:57:13Z peter $
 
 /*
@@ -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);
     }
   }