X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FParsedCommand.cti;h=72f372ee91568081637551c35f482272fa3519ba;hb=01e02e262ea327678dfa0c3f7a66d50ed91924d5;hp=60b7fdeaee33f454e0464453431c02af1a67971d;hpb=5209d7573f53f4b32730833af00668f5c0e56147;p=senf.git

diff --git a/Console/ParsedCommand.cti b/Console/ParsedCommand.cti
index 60b7fde..72f372e 100644
--- a/Console/ParsedCommand.cti
+++ b/Console/ParsedCommand.cti
@@ -28,6 +28,7 @@
 // Custom includes
 #include "../Utils/membind.hh"
 #include <boost/format.hpp>
+#include <boost/parameter/binding.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
@@ -58,6 +59,158 @@ prefix_ void senf::console::ParsedCommandOverloadBase::addParameter()
 #include BOOST_PP_ITERATE()
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::console::ParsedCommandAttributorBase
+
+template <class Type>
+prefix_ void senf::console::ParsedCommandAttributorBase::defaultValue(Type const & value)
+    const
+{
+    overload().arg<Type>(index_).defaultValue = value;
+    overload().arg(index_).hasDefault = true;
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ParsedCommandAttributor<Overload>
+
+template <class Overload>
+prefix_ Overload & senf::console::ParsedCommandAttributor<Overload>::overload()
+    const
+{
+    return static_cast<Overload &>(ParsedCommandAttributorBase::overload());
+}
+
+template <class Overload>
+prefix_
+senf::console::ParsedCommandAttributor<Overload>::ParsedCommandAttributor(Overload & overload,
+                                                                          unsigned index)
+    : ParsedCommandAttributorBase (overload, index)
+{}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ParsedAttributeAttributorBase<Overload,Self>
+
+template <class Overload, class Self>
+prefix_ Self
+senf::console::ParsedAttributeAttributorBase<Overload,Self>::doc(std::string const & doc)
+    const
+{
+    this->ParsedCommandAttributorBase::nodeDoc(doc);
+    return static_cast<Self const &>(*this);
+}
+
+template <class Overload, class Self>
+prefix_ Self senf::console::ParsedAttributeAttributorBase<Overload,Self>::
+overloadDoc(std::string const & doc)
+    const
+{
+    this->ParsedCommandAttributorBase::overloadDoc(doc);
+    return static_cast<Self const &>(*this);
+}
+
+template <class Overload, class Self>
+prefix_
+senf::console::ParsedAttributeAttributorBase<Overload,Self>::
+ParsedAttributeAttributorBase(Overload & overload, unsigned index)
+    : ParsedCommandAttributor<Overload> (overload, index)
+{}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ParsedAttributeAttributor<Overload,index,flag>
+
+template <class Overload, unsigned index, bool flag>
+template <class ArgumentPack>
+prefix_ typename senf::console::ParsedAttributeAttributor<Overload,index,flag>::next_type
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+argInfo(ArgumentPack const & args)
+    const
+{
+    typedef typename boost::parameter::binding<
+        ArgumentPack, tag::detail::default_value_>::type default_value_t;
+    return argInfo( args, boost::is_same<default_value_t, void>() );
+}
+
+template <class Overload, unsigned index, bool flag>
+template <class ArgumentPack>
+prefix_ typename senf::console::ParsedAttributeAttributor<Overload,index,flag>::next_type
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+argInfo(ArgumentPack const & args, boost::mpl::true_)
+    const
+{
+    return argInfo( args[tag::name_ | ""], 
+                    args[tag::description_ | ""] );
+
+}
+
+template <class Overload, unsigned index, bool flag>
+template <class ArgumentPack>
+prefix_ typename senf::console::ParsedAttributeAttributor<Overload,index,flag>::next_type
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+argInfo(ArgumentPack const & args, boost::mpl::false_)
+    const
+{
+    return argInfo( args[tag::name_ | ""], 
+                    args[tag::description_ | ""], 
+                    args[tag::default_value_ | value_type()] );
+}
+
+template <class Overload, unsigned index, bool flag>
+prefix_ typename senf::console::ParsedAttributeAttributor<Overload,index,flag>::next_type
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::argInfo(std::string const & name,
+                                                                       std::string const & doc)
+    const
+{
+    this->argName(name);
+    this->argDoc(doc);
+    return next();
+}
+
+template <class Overload, unsigned index, bool flag>
+prefix_ typename senf::console::ParsedAttributeAttributor<Overload,index,flag>::next_type
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::argInfo(std::string const & name,
+                                                                       std::string const & doc,
+                                                                       value_type const & value)
+    const
+{
+    this->argName(name);
+    this->argDoc(doc);
+    defaultValue(value);
+    return next();
+}
+
+template <class Overload, unsigned index, bool flag>
+prefix_
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+ParsedAttributeAttributor(Overload & overload)
+    : ParsedAttributeAttributorBase<Overload, ParsedAttributeAttributor> (overload, index)
+{}
+
+template <class Overload, unsigned index, bool flag>
+prefix_ senf::console::ParsedAttributeAttributor<Overload, index+1>
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::next()
+    const
+{
+    return ParsedAttributeAttributor<Overload, index+1>(this->overload());
+}
+
+template <class Overload, unsigned index, bool flag>
+prefix_ void senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+defaultValue(value_type const & value)
+    const
+{
+    ParsedCommandAttributorBase::defaultValue<arg_type>(value);
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ParsedAttributeAttributor<Overload, index, false>
+
+template <class Overload, unsigned index>
+prefix_
+senf::console::ParsedAttributeAttributor<Overload, index, false>::
+ParsedAttributeAttributor(Overload & overload)
+    : ParsedCommandAttributor<Overload> (overload, index)
+{}
+
+///////////////////////////////////////////////////////////////////////////
 // namespace members
 
 namespace {
@@ -98,8 +251,9 @@ namespace {
 }
 
 template <class Function>
-prefix_ senf::console::ParsedCommandOverload<
-    typename senf::console::detail::ParsedCommandTraits<Function>::traits> &
+prefix_ senf::console::ParsedAttributeAttributor<
+    senf::console::ParsedCommandOverload<
+        typename senf::console::detail::ParsedCommandTraits<Function>::traits> >
 senf::console::senf_console_add_node(DirectoryNode & node, std::string const & name,
                                      Function fn, int)
 {
@@ -108,15 +262,19 @@ senf::console::senf_console_add_node(DirectoryNode & node, std::string const & n
         ? dynamic_cast<OverloadedCommandNode &>(node(name))
         : node.add(name, OverloadedCommandNode::create()) );
 
-    typedef senf::console::detail::ParsedCommandTraits<Function> CmdTraits;
+    typedef detail::ParsedCommandTraits<Function> CmdTraits;
+    typedef ParsedCommandOverload<typename CmdTraits::traits> Overload;
+    typedef ParsedAttributeAttributor<Overload> Attributor;
 
-    return cmdNode.add( CreateParsedCommandOverload<
-                            typename CmdTraits::traits, ! CmdTraits::has_ostream_arg>::create(fn) );
+    return Attributor(
+        cmdNode.add( CreateParsedCommandOverload<
+                         typename CmdTraits::traits, ! CmdTraits::has_ostream_arg>::create(fn) ) );
 }
 
 template <class Owner, class Function>
-prefix_ senf::console::ParsedCommandOverload<
-    typename senf::console::detail::ParsedCommandTraits<Function>::traits> &
+prefix_ senf::console::ParsedAttributeAttributor<
+    senf::console::ParsedCommandOverload<
+        typename senf::console::detail::ParsedCommandTraits<Function>::traits> >
 senf::console::
 senf_console_add_node(DirectoryNode & node, Owner & owner, std::string const & name,
                       Function fn, int,
@@ -127,11 +285,14 @@ senf_console_add_node(DirectoryNode & node, Owner & owner, std::string const & n
         ? dynamic_cast<OverloadedCommandNode &>(node(name))
         : node.add(name, OverloadedCommandNode::create()) );
 
-    typedef senf::console::detail::ParsedCommandTraits<Function> CmdTraits;
+    typedef detail::ParsedCommandTraits<Function> CmdTraits;
+    typedef ParsedCommandOverload<typename CmdTraits::traits> Overload;
+    typedef ParsedAttributeAttributor<Overload> Attributor;
 
-    return cmdNode.add( CreateParsedCommandOverload<
-                            typename CmdTraits::traits, ! CmdTraits::has_ostream_arg>::create(
-                                senf::membind(fn,&owner)) );
+    return Attributor(
+        cmdNode.add( CreateParsedCommandOverload<
+                         typename CmdTraits::traits, ! CmdTraits::has_ostream_arg>::create(
+                             senf::membind(fn,&owner)) ) );
 }
 
 ///////////////////////////////cti.e///////////////////////////////////////