#ifndef DOXYGEN
-template <class Sequence>
-prefix_ void senf::console::SequenceArgumentTraits<Sequence>::
-parse(ParseCommandInfo::TokensRange const & tokens, type & out)
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::CollectionArgumentTraitsBase<Collection>
+
+template <class Collection>
+prefix_ std::string
+senf::console::detail::CollectionArgumentTraitsBase<Collection>::description()
+{
+ return senf::prettyBaseName(typeid(Collection)) + "<"
+ + ArgumentTraits<typename Collection::value_type>::description() + ">";
+}
+
+template <class Collection>
+prefix_ std::string
+senf::console::detail::CollectionArgumentTraitsBase<Collection>::str(Collection const & value)
+{
+ std::stringstream ss;
+ senf::console::format(value, ss);
+ return ss.str();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::CollectionArgumentTraits<Collection,Adder>
+
+template <class Collection, class Adder>
+prefix_ void senf::console::detail::CollectionArgumentTraits<Collection,Adder>::
+parse(ParseCommandInfo::TokensRange const & tokens, Collection & out)
+{
+ out.clear();
+ CheckedArgumentIteratorWrapper arg (tokens);
+ while (arg) {
+ typename Collection::value_type v;
+ senf::console::parse( *(arg++), v );
+ Adder::add(out,v);
+ }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::CollectionReturnValueTraits<Collection>
+
+template <class Collection>
+prefix_ void
+senf::console::detail::CollectionReturnValueTraits<Collection>::format(Collection const & value,
+ std::ostream & os)
+{
+ os << "(";
+ typename type::const_iterator i (value.begin());
+ typename type::const_iterator const i_end (value.end());
+ if (i != i_end)
+ for (;;) {
+ os << senf::console::str(*i);
+ if (++i == i_end)
+ break;
+ else
+ os << " ";
+ }
+ os << ")";
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::MapArgumentTraits<Collection>
+
+template <class Collection>
+prefix_ void senf::console::detail::MapArgumentTraits<Collection>::
+parse(ParseCommandInfo::TokensRange const & tokens, Collection & out)
{
out.clear();
CheckedArgumentIteratorWrapper arg (tokens);
while (arg) {
- out.push_back(typename Sequence::value_type());
- senf::console::parse( *(arg++), out.back() );
+ typename Collection::key_type key;
+ typename Collection::mapped_type data;
+ senf::console::parse( *(arg++), key );
+ ParseCommandInfo::TokensRange sep (*(arg++));
+ if (sep.size() != 1 || sep[0].type() != Token::OtherPunctuation || sep[0].value() != "=")
+ throw SyntaxErrorException("'=' expected");
+ senf::console::parse( *(arg++), data );
+ out.insert(std::make_pair(key,data));
}
}
-template <class Sequence>
-prefix_ std::string senf::console::SequenceArgumentTraits<Sequence>::description()
+template <class Collection>
+prefix_ std::string senf::console::detail::MapArgumentTraits<Collection>::description()
{
- std::string type (prettyName(typeid(Sequence)));
- std::string::size_type e (type.find('<'));
- if (e == std::string::npos) e = type.size();
- std::string::size_type b (type.rfind(':', e));
- if (b == std::string::npos) b = 0; else ++b;
- return type.substr(b,e-b) + "<"
- + ArgumentTraits<typename Sequence::value_type>::description() + ">";
+ return senf::prettyBaseName(typeid(Collection)) + "<"
+ + ArgumentTraits<typename Collection::key_type>::description() + ","
+ + ArgumentTraits<typename Collection::mapped_type>::description() + ">";
}
-template <class Sequence>
-prefix_ std::string senf::console::SequenceArgumentTraits<Sequence>::str(type const & value)
+template <class Collection>
+prefix_ std::string
+senf::console::detail::MapArgumentTraits<Collection>::str(Collection const & value)
{
std::stringstream ss;
senf::console::format(value, ss);
return ss.str();
}
-template <class Sequence>
-prefix_ void senf::console::SequenceReturnValueTraits<Sequence>::format(type const & value,
- std::ostream & os)
+///////////////////////////////////////////////////////////////////////////
+// senf::console::detail::MapReturnValueTraits<Collection>
+
+template <class Collection>
+prefix_ void
+senf::console::detail::MapReturnValueTraits<Collection>::format(Collection const & value,
+ std::ostream & os)
{
os << "(";
typename type::const_iterator i (value.begin());
typename type::const_iterator const i_end (value.end());
if (i != i_end)
for (;;) {
- senf::console::format(*i, os);
+ os << senf::console::str(i->first)
+ << "="
+ << senf::console::str(i->second);
if (++i == i_end)
break;
else
os << ")";
}
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ArgumentTraits< std::pair<T1,T2> >
+
template <class T1, class T2>
prefix_ void senf::console::ArgumentTraits< std::pair<T1,T2> >::
parse(ParseCommandInfo::TokensRange const & tokens, type & out)
return ss.str();
}
+///////////////////////////////////////////////////////////////////////////
+// senf::console::ReturnValueTraits< std::pair<T1,T2> >
+
template <class T1, class T2>
prefix_ void senf::console::ReturnValueTraits< std::pair<T1,T2> >::format(type const & value,
std::ostream & os)
{
- os << "(";
- senf::console::format(value.first, os);
- os << " ";
- senf::console::format(value.second, os);
- os << ")";
+ os << "(" << senf::console::str(value.first)
+ << " " << senf::console::str(value.second) << ")";
}
#endif