-// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
#include "PacketParser.ih"
// Custom includes
+#include "../Utils/senfassert.hh"
#include "PacketData.hh"
#define prefix_ inline
return Parser(i,state());
}
+template <class Parser, class Arg>
+prefix_ Parser senf::PacketParserBase::parse(Arg const & arg, data_iterator i)
+ const
+{
+ return Parser(arg, i, state());
+}
+
template <class Parser>
prefix_ Parser senf::PacketParserBase::parse(size_type n)
const
return Parser(boost::next(i(),n),state());
}
-prefix_ void senf::PacketParserBase::defaultInit()
+template <class Parser, class Arg>
+prefix_ Parser senf::PacketParserBase::parse(Arg const & arg, size_type n)
const
-{}
+{
+ return Parser(arg, boost::next(i(),n), state());
+}
///////////////////////////////////////////////////////////////////////////
// namespace members
return detail::packetParserSize(p,0);
}
+#ifndef DOXYGEN
template <class Parser, class Value>
prefix_ typename boost::enable_if_c <
boost::is_base_of<senf::PacketParserBase, Parser>::value
target.value(value);
return target;
}
-
-template <class Parser>
-prefix_ senf::PacketParserBase::size_type
-senf::detail::packetParserSize(Parser p, int, Parser_TakeNum<Parser::fixed_bytes> *)
-{
- return Parser::fixed_bytes;
-}
-
-template <class Parser>
-prefix_ senf::PacketParserBase::size_type senf::detail::packetParserSize(Parser p, ...)
-{
- return p.bytes();
-}
-
-///////////////////////////////////////////////////////////////////////////
-// senf::SafePacketParser<Parser>
-
-template <class Parser>
-prefix_ senf::SafePacketParser<Parser>::SafePacketParser()
- : parser_(), i_()
-{}
-
-template <class Parser>
-prefix_ senf::SafePacketParser<Parser>::SafePacketParser(Parser parser)
- : parser_(parser), i_(parser)
+#else
+template <class Parser, class Value>
+prefix_ Parser senf::operator<<(Parser target, Value const & value)
{}
+#endif
-template <class Parser>
-prefix_ senf::SafePacketParser<Parser> & senf::SafePacketParser<Parser>::operator=(Parser parser)
-{
- parser_ = parser;
- i_ = parser;
- return *this;
-}
-
-template <class Parser>
-prefix_ Parser senf::SafePacketParser<Parser>::operator*()
- const
+#ifndef DOXYGEN
+template <class Parser, class Value>
+prefix_ typename boost::enable_if_c <
+ boost::is_base_of<senf::PacketParserBase, Parser>::value
+ && ! boost::is_base_of<senf::PacketParserBase, Value>::value,
+ Parser >::type senf::operator<<(Parser target, boost::optional<Value> const & value)
{
- BOOST_ASSERT( i_ );
- parser_->i_ = PacketParserBase::data_iterator(i_);
- return *parser_;
+ if (value)
+ target.value(*value);
+ return target;
}
+#else
+template <class Parser, class Value>
+prefix_ Parser senf::operator<<(Parser target, Value const & value)
+{}
+#endif
-template <class Parser>
-prefix_ Parser const * senf::SafePacketParser<Parser>::operator->()
- const
-{
- BOOST_ASSERT( i_ );
- parser_->i_ = PacketParserBase::data_iterator(i_);
- return & (*parser_);
-}
template <class Parser>
-prefix_ bool senf::SafePacketParser<Parser>::boolean_test()
- const
+prefix_ senf::PacketParserBase::size_type
+senf::detail::packetParserSize(Parser p, int, senf::mpl::take_uint<Parser::fixed_bytes> *)
{
- return i_;
+ return Parser::fixed_bytes;
}
///////////////////////////////cti.e///////////////////////////////////////