X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Console%2FParsedCommand.cti;h=9abe00dc94db72123cdb54d42984234c95e41900;hb=f47679431aa3461936ee4a85c0c4216e44292b55;hp=72f372ee91568081637551c35f482272fa3519ba;hpb=ef4c5558d6a52367bd7040530d40c7616f6f5b71;p=senf.git

diff --git a/Console/ParsedCommand.cti b/Console/ParsedCommand.cti
index 72f372e..9abe00d 100644
--- a/Console/ParsedCommand.cti
+++ b/Console/ParsedCommand.cti
@@ -118,63 +118,67 @@ ParsedAttributeAttributorBase(Overload & overload, unsigned 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)
+senf::console::ParsedAttributeAttributor<Overload,index,flag>::arg()
     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>() );
+    return next();
 }
 
 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_)
+argInfo(ArgumentPack const & args)
     const
 {
-    return argInfo( args[tag::name_ | ""], 
-                    args[tag::description_ | ""] );
+#   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::ParsedAttributeAttributor<Overload,index,flag>::
+argInfo(Kw const &, ArgumentPack const &, boost::mpl::true_)
+    const
+{}
+
+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_)
+prefix_ void senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+argInfo(boost::parameter::keyword<kw::type::name> const &, ArgumentPack const & args,
+        boost::mpl::false_)
     const
 {
-    return argInfo( args[tag::name_ | ""], 
-                    args[tag::description_ | ""], 
-                    args[tag::default_value_ | value_type()] );
+    this->argName(args[kw::name]);
 }
 
 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)
+template <class ArgumentPack>
+prefix_ void senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+argInfo(boost::parameter::keyword<kw::type::description> const &, ArgumentPack const & args,
+        boost::mpl::false_)
     const
 {
-    this->argName(name);
-    this->argDoc(doc);
-    return next();
+    this->argDoc(args[kw::description]);
 }
 
 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)
+template <class ArgumentPack>
+prefix_ void senf::console::ParsedAttributeAttributor<Overload,index,flag>::
+argInfo(boost::parameter::keyword<kw::type::default_value> const &, ArgumentPack const & args,
+        boost::mpl::false_)
     const
 {
-    this->argName(name);
-    this->argDoc(doc);
-    defaultValue(value);
-    return next();
+    this->defaultValue(args[kw::default_value]);
 }
 
 template <class Overload, unsigned index, bool flag>
@@ -185,7 +189,7 @@ ParsedAttributeAttributor(Overload & overload)
 {}
 
 template <class Overload, unsigned index, bool flag>
-prefix_ senf::console::ParsedAttributeAttributor<Overload, index+1>
+prefix_ typename senf::console::ParsedAttributeAttributor<Overload,index,flag>::next_type
 senf::console::ParsedAttributeAttributor<Overload,index,flag>::next()
     const
 {
@@ -207,7 +211,8 @@ template <class Overload, unsigned index>
 prefix_
 senf::console::ParsedAttributeAttributor<Overload, index, false>::
 ParsedAttributeAttributor(Overload & overload)
-    : ParsedCommandAttributor<Overload> (overload, index)
+    : ParsedAttributeAttributorBase< Overload, 
+                                     ParsedAttributeAttributor<Overload, index, false> > (overload, index)
 {}
 
 ///////////////////////////////////////////////////////////////////////////