X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketParser.cti;h=7872f83d5e0991625b6be791d8a9c76fcf532f17;hb=16d94efc2159cba35fc44e5b26747ae0a2ab237b;hp=826f06654499acfe6d4b83b60c239a23788bd846;hpb=f13c1275e48e97dceb7de7925793a4c69a5aeb61;p=senf.git

diff --git a/Packets/PacketParser.cti b/Packets/PacketParser.cti
index 826f066..7872f83 100644
--- a/Packets/PacketParser.cti
+++ b/Packets/PacketParser.cti
@@ -1,6 +1,8 @@
-// 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
@@ -24,6 +26,7 @@
 #include "PacketParser.ih"
 
 // Custom includes
+#include "../Utils/senfassert.hh"
 #include "PacketData.hh"
 
 #define prefix_ inline
@@ -46,10 +49,6 @@ prefix_ Parser senf::PacketParserBase::parse(size_type n)
     return Parser(boost::next(i(),n),state());
 }
 
-prefix_ void senf::PacketParserBase::defaultInit()
-    const
-{}
-
 ///////////////////////////////////////////////////////////////////////////
 // namespace members
 
@@ -59,6 +58,7 @@ prefix_ senf::PacketParserBase::size_type senf::bytes(Parser p)
     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 
@@ -68,10 +68,33 @@ prefix_ typename boost::enable_if_c <
     target.value(value);
     return target;
 }
+#else
+template <class Parser, class Value>
+prefix_ Parser senf::operator<<(Parser target, Value const & value)
+{}
+#endif
+
+#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)
+{
+    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_ senf::PacketParserBase::size_type
-senf::detail::packetParserSize(Parser p, int, Parser_TakeNum<Parser::fixed_bytes> *)
+senf::detail::packetParserSize(Parser p, int, senf::mpl::take_uint<Parser::fixed_bytes> *)
 {
     return Parser::fixed_bytes;
 }
@@ -83,20 +106,20 @@ prefix_ senf::PacketParserBase::size_type senf::detail::packetParserSize(Parser
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::SafePacketParser<Parser>
+// senf::SafePacketParserWrapper<Parser>
 
 template <class Parser>
-prefix_ senf::SafePacketParser<Parser>::SafePacketParser()
-    : i_()
+prefix_ senf::SafePacketParserWrapper<Parser>::SafePacketParserWrapper()
+    : parser_(), i_()
 {}
 
 template <class Parser>
-prefix_ senf::SafePacketParser<Parser>::SafePacketParser(Parser parser)
+prefix_ senf::SafePacketParserWrapper<Parser>::SafePacketParserWrapper(Parser parser)
     : parser_(parser), i_(parser)
 {}
 
 template <class Parser>
-prefix_ senf::SafePacketParser<Parser> & senf::SafePacketParser<Parser>::operator=(Parser parser)
+prefix_ senf::SafePacketParserWrapper<Parser> & senf::SafePacketParserWrapper<Parser>::operator=(Parser parser)
 {
     parser_ = parser;
     i_ = parser;
@@ -104,25 +127,25 @@ prefix_ senf::SafePacketParser<Parser> & senf::SafePacketParser<Parser>::operato
 }
 
 template <class Parser>
-prefix_ Parser senf::SafePacketParser<Parser>::operator*()
+prefix_ Parser senf::SafePacketParserWrapper<Parser>::operator*()
     const
 {
-    BOOST_ASSERT( i_ );
+    SENF_ASSERT( i_ );
     parser_->i_ = PacketParserBase::data_iterator(i_);
     return *parser_;
 }
 
 template <class Parser>
-prefix_ Parser const * senf::SafePacketParser<Parser>::operator->()
+prefix_ Parser const * senf::SafePacketParserWrapper<Parser>::operator->()
     const
 {
-    BOOST_ASSERT( i_ );
+    SENF_ASSERT( i_ );
     parser_->i_ = PacketParserBase::data_iterator(i_);
     return & (*parser_);
 }
 
 template <class Parser>
-prefix_ bool senf::SafePacketParser<Parser>::boolean_test()
+prefix_ bool senf::SafePacketParserWrapper<Parser>::boolean_test()
     const
 {
     return i_;