X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FParsedCommand.cti;h=e37906c81b4a5a91fa8d2e5b7b4d9517defd406e;hb=259da4c692259311c6ec99566b57f5ed1e68e93e;hp=86a78fc4fe140571937815df684c03127d538635;hpb=bf1d8ba5ce6fc6a169a938183f8d01c8bdbccf32;p=senf.git

diff --git a/Console/ParsedCommand.cti b/Console/ParsedCommand.cti
index 86a78fc..e37906c 100644
--- a/Console/ParsedCommand.cti
+++ b/Console/ParsedCommand.cti
@@ -26,25 +26,58 @@
 #include "ParsedCommand.ih"
 
 // Custom includes
+#include "../Utils/membind.hh"
+#include <boost/format.hpp>
+#include <boost/parameter/binding.hpp>
 
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::ArgumentInfoBase
+
+prefix_ senf::console::detail::ArgumentInfoBase::ArgumentInfoBase(std::string const & type_)
+    : type (type_), name (), hasDefault (false)
+{}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::ArgumentInfo<ParameterType>
+
+template <class ParameterType>
+prefix_ typename senf::console::detail::ArgumentInfo<ParameterType>::ptr
+senf::console::detail::ArgumentInfo<ParameterType>::create()
+{
+    return ptr(new ArgumentInfo());
+}
+
+template <class ParameterType>
+prefix_ senf::console::detail::ArgumentInfo<ParameterType>::ArgumentInfo()
+    : ArgumentInfoBase ( ArgumentTraits<ParameterType>::description() ),
+      defaultValue ()
+{}
+
+template <class ParameterType>
+prefix_ std::string senf::console::detail::ArgumentInfo<ParameterType>::defaultValueStr()
+    const
+{
+    return hasDefault ? ArgumentTraits<ParameterType>::str(defaultValue) : "";
+}
+
+///////////////////////////////////////////////////////////////////////////
 // senf::console::ParsedCommandOverloadBase
 
 template <class Type>
-prefix_ senf::console::detail::ParameterInfo<Type> &
+prefix_ senf::console::detail::ArgumentInfo<Type> &
 senf::console::ParsedCommandOverloadBase::arg(unsigned n)
     const
 {
-    return static_cast<detail::ParameterInfo<Type> &>(arg(n));
+    return dynamic_cast<detail::ArgumentInfo<Type> &>(arg(n));
 }
 
 template <class Type>
 prefix_ void senf::console::ParsedCommandOverloadBase::addParameter()
 {
-    parameters_.push_back(detail::ParameterInfo<Type>::create());
+    parameters_.push_back(detail::ArgumentInfo<Type>::create());
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -56,6 +89,163 @@ 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::ParsedArgumentAttributorBase<Overload,Self>
+
+template <class Overload, class Self>
+prefix_ Self
+senf::console::ParsedArgumentAttributorBase<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::ParsedArgumentAttributorBase<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::ParsedArgumentAttributorBase<Overload,Self>::
+ParsedArgumentAttributorBase(Overload & overload, unsigned index)
+    : ParsedCommandAttributor<Overload> (overload, index)
+{}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ParsedArgumentAttributor<Overload,index,flag>
+
+template <class Overload, unsigned index, bool flag>
+prefix_ typename senf::console::ParsedArgumentAttributor<Overload,index,flag>::next_type
+senf::console::ParsedArgumentAttributor<Overload,index,flag>::arg()
+    const
+{
+    return next();
+}
+
+template <class Overload, unsigned index, bool flag>
+template <class ArgumentPack>
+prefix_ typename senf::console::ParsedArgumentAttributor<Overload,index,flag>::next_type
+senf::console::ParsedArgumentAttributor<Overload,index,flag>::
+argInfo(ArgumentPack const & args)
+    const
+{
+#   define HaveArg(tag) boost::is_same< \
+        typename boost::parameter::binding<ArgumentPack, tag>::type, void >()
+
+    argInfo( kw::name,          args, HaveArg(kw::type::name)          );
+    argInfo( kw::description,   args, HaveArg(kw::type::description)   );
+    argInfo( kw::default_value, args, HaveArg(kw::type::default_value) );
+
+    return next();
+
+#   undef HaveArg
+}
+
+template <class Overload, unsigned index, bool flag>
+template <class Kw, class ArgumentPack>
+prefix_ void senf::console::ParsedArgumentAttributor<Overload,index,flag>::
+argInfo(Kw const &, ArgumentPack const &, boost::mpl::true_)
+    const
+{}
+
+template <class Overload, unsigned index, bool flag>
+template <class ArgumentPack>
+prefix_ void senf::console::ParsedArgumentAttributor<Overload,index,flag>::
+argInfo(boost::parameter::keyword<kw::type::name> const &, ArgumentPack const & args,
+        boost::mpl::false_)
+    const
+{
+    this->argName(args[kw::name]);
+}
+
+template <class Overload, unsigned index, bool flag>
+template <class ArgumentPack>
+prefix_ void senf::console::ParsedArgumentAttributor<Overload,index,flag>::
+argInfo(boost::parameter::keyword<kw::type::description> const &, ArgumentPack const & args,
+        boost::mpl::false_)
+    const
+{
+    this->argDoc(args[kw::description]);
+}
+
+template <class Overload, unsigned index, bool flag>
+template <class ArgumentPack>
+prefix_ void senf::console::ParsedArgumentAttributor<Overload,index,flag>::
+argInfo(boost::parameter::keyword<kw::type::default_value> const &, ArgumentPack const & args,
+        boost::mpl::false_)
+    const
+{
+    this->defaultValue(args[kw::default_value]);
+}
+
+template <class Overload, unsigned index, bool flag>
+prefix_
+senf::console::ParsedArgumentAttributor<Overload,index,flag>::
+ParsedArgumentAttributor(Overload & overload)
+    : ParsedArgumentAttributorBase<Overload, ParsedArgumentAttributor> (overload, index)
+{}
+
+template <class Overload, unsigned index, bool flag>
+prefix_ typename senf::console::ParsedArgumentAttributor<Overload,index,flag>::next_type
+senf::console::ParsedArgumentAttributor<Overload,index,flag>::next()
+    const
+{
+    return ParsedArgumentAttributor<Overload, index+1>(this->overload());
+}
+
+template <class Overload, unsigned index, bool flag>
+prefix_ void senf::console::ParsedArgumentAttributor<Overload,index,flag>::
+defaultValue(value_type const & value)
+    const
+{
+    ParsedCommandAttributorBase::defaultValue<arg_type>(value);
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ParsedArgumentAttributor<Overload, index, false>
+
+template <class Overload, unsigned index>
+prefix_
+senf::console::ParsedArgumentAttributor<Overload, index, false>::
+ParsedArgumentAttributor(Overload & overload)
+    : ParsedArgumentAttributorBase< Overload, 
+                                     ParsedArgumentAttributor<Overload, index, false> > (overload, index)
+{}
+
+///////////////////////////////////////////////////////////////////////////
 // namespace members
 
 namespace {
@@ -96,8 +286,9 @@ namespace {
 }
 
 template <class Function>
-prefix_ senf::console::ParsedCommandOverload<
-    typename senf::console::detail::ParsedCommandTraits<Function>::traits> &
+prefix_ senf::console::ParsedArgumentAttributor<
+    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)
 {
@@ -106,10 +297,54 @@ 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 ParsedArgumentAttributor<Overload> Attributor;
+
+    return Attributor(
+        cmdNode.add( CreateParsedCommandOverload<
+                         typename CmdTraits::traits, ! CmdTraits::has_ostream_arg>::create(fn) ) );
+}
 
-    return cmdNode.add( CreateParsedCommandOverload<
-                            typename CmdTraits::traits, ! CmdTraits::has_ostream_arg>::create(fn) );
+template <class Owner, class Function>
+prefix_ senf::console::ParsedArgumentAttributor<
+    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,
+                      typename boost::enable_if_c<detail::ParsedCommandTraits<Function>::is_member>::type *)
+{
+    OverloadedCommandNode & cmdNode (
+        node.hasChild(name) 
+        ? dynamic_cast<OverloadedCommandNode &>(node(name))
+        : node.add(name, OverloadedCommandNode::create()) );
+
+    typedef detail::ParsedCommandTraits<Function> CmdTraits;
+    typedef ParsedCommandOverload<typename CmdTraits::traits> Overload;
+    typedef ParsedArgumentAttributor<Overload> Attributor;
+
+    return Attributor(
+        cmdNode.add( CreateParsedCommandOverload<
+                         typename CmdTraits::traits, ! CmdTraits::has_ostream_arg>::create(
+                             senf::membind(fn,&owner)) ) );
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::CheckVoidReturn<Type>
+
+template <class Type>
+template <class Fn>
+prefix_ void senf::console::detail::CheckVoidReturn<Type>::call(Fn fn, std::ostream & os)
+{
+    ReturnValueTraits<Type>::format(fn(),os);
+    os << "\n";
+}
+
+template <class Fn>
+prefix_ void senf::console::detail::CheckVoidReturn<void>::call(Fn fn, std::ostream & os)
+{
+    fn();
 }
 
 ///////////////////////////////cti.e///////////////////////////////////////