Changeset 2265

Timestamp:

Jun 6, 2010, 1:12:10 AM (13 years ago)

Author:

Peter

Message:

adding two functions sort in CommandLine? that can be used to (re)sort the order of option in help output.

Location:

trunk/yat/utility

Files:

• CommandLine.cc (modified) (3 diffs)
• CommandLine.h (modified) (4 diffs)

trunk/yat/utility/CommandLine.cc

@@ -32 +32 @@
 
 #include <algorithm>
+#include <cassert>
 #include <functional>
 #include <fstream>
@@ -197 +198 @@
 
 
+  void CommandLine::sort(void)
+  {
+    sort(OptionCompare());
+  }
+
+
   std::vector<std::string> CommandLine::split(std::string str, char del) const
   {
@@ -237 +244 @@
 
 
+  bool CommandLine::OptionCompare::operator()(const Option* lhs, 
+                                              const Option* rhs) const
+  {
+    assert(lhs);
+    assert(rhs);
+    std::string lhs_str = lhs->long_name();
+    if (lhs_str.empty())
+      lhs_str = lhs->short_name();
+    std::string rhs_str = rhs->long_name();
+    if (rhs_str.empty())
+      rhs_str = rhs->short_name();
+    return lhs_str < rhs_str;
+  }
+
+
 }}} // of namespace utility, yat, and theplu

trunk/yat/utility/CommandLine.h

@@ -23 +23 @@
 */
 
+#include <algorithm>
 #include <cctype>
 #include <map>
@@ -157 +158 @@
 
     /**
+       \brief Sort Options how they will appear in (help) output.
+
+       This function will sort the Options in alphabetical order. If
+       the Option has a long_name, it is used for the sorting;
+       otherwise, the short_name is used.
+
+       \since New in yat 0.7
+     */
+    void sort(void);
+
+    /**
+       Like sort(void) but using \a compare to sort Options.
+
+       The functor Compare must be a <a
+       href="http://www.sgi.com/tech/stl/BinaryFunction.html">Binary
+       Function</a> with both argument types \c const \c Option* and
+       return type \c bool.
+
+       \since New in yat 0.7
+     */
+    template<class Compare>
+    void sort(Compare compare);
+
+    /**
        \return something like "Try `<program_name()> --help` for
        more information."
@@ -176 +201 @@
     bool parsed_;
     std::string program_name_;
+
+    struct OptionCompare
+    {
+      bool operator()(const Option*, const Option*) const;
+    };
+
   };
 
@@ -198 +229 @@
   std::ostream& operator<<(std::ostream&, const CommandLine&);
 
+  template<class Compare>
+  void CommandLine::sort(Compare compare)
+  {
+    std::sort(options_.begin(), options_.end(), compare);
+  }
+
 }}} // end of namespace utility, yat, and theplu