#include <senf/Utils/Format.hh>
#define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::GenericTLVParserBase<Base>
template <class Base>
template <class Parser>
prefix_ Parser senf::GenericTLVParserBase<Base>::init()
-{
- senf::PacketParserBase::size_type oldSize (bytes() );
- senf::PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
+{
+ PacketParserBase::size_type oldSize (bytes() );
+ PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
this->resize( oldSize, newParserSize);
std::fill(this->i(), boost::next(this->i(), newParserSize), 0u);
Parser concreteParser = Parser(this->i(), this->state() );
template <class Base>
prefix_ void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
- const
+ const
{
if (Base::Registry::instance().isRegistered( *this)) {
Base::Registry::instance().dump( *this, os);
} else {
boost::io::ios_all_saver ias(os);
os << " GenericTLVParser<" << prettyName(typeid(Base)) << ">\n"
- << " type: " << senf::format::dumpint(this->type()) << "\n"
- << " length: " << senf::format::dumpint(this->length()) << "\n"
+ << " type: " << format::dumpint(this->type()) << "\n"
+ << " length: " << format::dumpint(this->length()) << "\n"
<< " value:\n";
hexdump(value().begin(), value().end(), os);
}
}
template <class Base>
-prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
- const
+prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
+ const
{
- senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
+ PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
}
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::GenericTLVParserRegistry<BaseParser,Keytype>
template <class BaseParser, class Keytype>
map_.insert(key, new detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>() );
}
+// Wow ... this is stupid .. Boost 1.33 ptr_map API is broken ...
+
+#if BOOST_VERSION < 103400
+#define PTRMAP_GET_CONTENTS(v) (v)
+#else
+#define PTRMAP_GET_CONTENTS(v) (*(v).second)
+#endif
+
template <class BaseParser, class Keytype>
prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
- GenericTLVParserBase<BaseParser> const & parser, std::ostream & os)
+ GenericTLVParser const & parser, std::ostream & os)
const
{
typename Map::const_iterator i (map_.find( parser.type()));
if (i != map_.end())
- (i->second)->dump(parser, os);
+ PTRMAP_GET_CONTENTS(*i).dump(parser, os);
}
template <class BaseParser, class Keytype>
prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
- GenericTLVParserBase<BaseParser> const & parser, Keytype const & key, std::ostream & os)
+ GenericTLVParser const & parser, Keytype const & key, std::ostream & os)
+ const
+{
+ typename Map::const_iterator i (map_.find( key));
+ if (i != map_.end())
+ PTRMAP_GET_CONTENTS(*i).dump(parser, os);
+}
+
+template <class BaseParser, class Keytype>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BaseParser,Keytype>::bytes(
+ GenericTLVParser const & parser)
+ const
+{
+ typename Map::const_iterator i (map_.find( parser.type()));
+ if (i != map_.end())
+ return PTRMAP_GET_CONTENTS(*i).bytes(parser);
+ else
+ throw TLVParserNotRegisteredException();
+}
+
+template <class BaseParser, class Keytype>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BaseParser,Keytype>::bytes(
+ GenericTLVParser const & parser, Keytype const & key)
const
{
typename Map::const_iterator i (map_.find( key));
if (i != map_.end())
- (i->second)->dump(parser, os);
+ return PTRMAP_GET_CONTENTS(*i).bytes(parser);
+ else
+ throw TLVParserNotRegisteredException();
}
-///////////////////////////////ct.e////////////////////////////////////////
+#undef PTRMAP_GET_CONTENTS
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f