X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FParsedCommand.ih;h=90231c20dfeb69d4673b84a90e6b12945bf2c6a2;hb=fa5eaa97c8593e3587c87f25adb14f7f91f31f37;hp=d8a72d28ab5715739957ddca477e4aa97c8d3138;hpb=63c40810b93b4d8f3d6dad5f987adc5f2bf5b5ed;p=senf.git

diff --git a/Console/ParsedCommand.ih b/Console/ParsedCommand.ih
index d8a72d2..90231c2 100644
--- a/Console/ParsedCommand.ih
+++ b/Console/ParsedCommand.ih
@@ -27,15 +27,33 @@
 #define IH_ParsedCommand_ 1
 
 // Custom includes
+#include <boost/function.hpp>
+#include <boost/intrusive_ptr.hpp>
+#include "Parse.hh"
 
 ///////////////////////////////ih.p////////////////////////////////////////
 
 namespace senf {
 namespace console {
+
+    template < class FunctionTraits, 
+               class ReturnType=typename FunctionTraits::result_type, 
+              unsigned arity=FunctionTraits::arity >
+    class ParsedCommandOverload;
+
+    template < class Overload, 
+               unsigned index=0, 
+               bool flag=(index < unsigned(Overload::traits::arity)) >
+    class ParsedArgumentAttributor;
+
 namespace detail {
 
-#ifndef DOXYGEN
+    /** \brief Internal: Argument information structure
+        
+        This class is used to hold argument information for automatically parsed commands. 
 
+        \see ParsedCommandOverloadBase
+     */
     struct ArgumentInfoBase
         : public intrusive_refcount
     {
@@ -43,6 +61,7 @@ namespace detail {
         
         std::string type;
         std::string name;
+        std::string defaultDoc;
         bool hasDefault;
         std::string doc;
         
@@ -51,23 +70,30 @@ namespace detail {
         virtual std::string defaultValueStr() const = 0;
     };
     
+    /** \brief Internal: Argument information structure
+        
+        This class is used to hold argument information for automatically parsed commands. 
+
+        \see ParsedCommandOverloadBase
+     */
     template <class ParameterType>
     struct ArgumentInfo 
         : public ArgumentInfoBase
     {
         typedef boost::intrusive_ptr<ArgumentInfo> ptr;
+        typedef boost::function<void (ParseCommandInfo::TokensRange const &, 
+                                      ParameterType &)> Parser;
 
         static ptr create();
         ArgumentInfo();
 
         ParameterType defaultValue;
+        Parser parser;
 
         virtual std::string defaultValueStr() const;
     };
     
-    template <class Function, bool isFN=senf::is_any_function<Function>::value>
-    struct ParsedCommandTraits
-    {};
+#ifndef DOXYGEN
 
     // FirstArgType returns void, if the function has no arguments, otherwise it returns arg1_type
 
@@ -83,10 +109,14 @@ namespace detail {
         typedef typename Traits::arg1_type type;
     };
 
-    template <class Function>
-    struct ParsedCommandTraits<Function, true>
+    template <class FnunctionP, class Function, bool isFN=boost::is_function<Function>::value>
+    struct ParsedCommandTraits_i
+    {};
+
+    template <class FunctionP, class Function>
+    struct ParsedCommandTraits_i<FunctionP, Function, true>
     {
-        typedef Function base_type;
+        typedef FunctionP base_type;
         typedef typename senf::remove_any_pointer<base_type>::type function_type;
         typedef boost::function_traits<function_type> base_traits;
         typedef typename FirstArgType<base_traits>::type first_arg_type;
@@ -99,24 +129,28 @@ namespace detail {
             base_traits>
         ::type traits;
 
+        typedef typename senf::remove_cvref<typename base_traits::result_type>::type result_type;
+
         static const bool is_member = boost::is_member_pointer<base_type>::value;
         
         typedef typename senf::member_class<base_type>::type class_type;
-    };
 
-    template <class Type>
-    struct CheckVoidReturn
-    {
-        template <class Fn>
-        static void call(Fn fn, std::ostream & os);
+        typedef ParsedCommandOverload<traits> Overload;
+        typedef ParsedArgumentAttributor<Overload> Attributor;
     };
 
-    template <>
-    struct CheckVoidReturn<void>
-    {
-        template <class Fn>
-        static void call(Fn fn, std::ostream & os);
-    };
+    // Disable auto-parsing for ParseCommandInfo arg -> register manually parsed command
+    template <class FunctionP>
+    struct ParsedCommandTraits_i<FunctionP, void (std::ostream &, ParseCommandInfo const &), true>
+    {};
+
+    template <class FunctionP>
+    struct ParsedCommandTraits
+        : public ParsedCommandTraits_i< FunctionP, 
+                                        typename senf::remove_any_pointer<FunctionP>::type >
+    {};
+
+    struct ParsedCommandAddNodeAccess;
 
 #endif