X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FParseVec.hh;h=157b061bf7e0de9a68d321972aaa17822cc83e4b;hb=65066c0e037d1de437d6121903e1dd511b41e940;hp=fe01842d721dfedcabe5bbdda8c465c1f40327f5;hpb=145f6a7d0f3a6aaa77b3625351c952d24cb0b8a1;p=senf.git diff --git a/Packets/ParseVec.hh b/Packets/ParseVec.hh index fe01842..157b061 100644 --- a/Packets/ParseVec.hh +++ b/Packets/ParseVec.hh @@ -24,10 +24,11 @@ #define HH_ParseVec_ 1 // Custom includes -#include // for std::pair #include -#include // for boost::noncopyable -#include "ParserBase.hh" +#include +#include +#include +#include "PacketParser.hh" #include "ParseArray.hh" // for Parse_Array_iterator //#include "ParseVec.mpp" @@ -35,92 +36,104 @@ namespace senf { + template class Parse_Vector_Container; - template class Parse_Vector_wrapper; - - template - struct Parse_Vector : public ParserBase + /** \brief + + \todo Make the sizer a private baseclass to profit from the empty-base-class optimization + */ + template + struct Parse_Vector : public PacketParserBase { - typedef typename SizeParser::template rebind::parser size_parser; - - /////////////////////////////////////////////////////////////////////////// - // Parser interface - - template - struct rebind { typedef Parse_Vector parser; }; - typedef Iterator byte_iterator; - - explicit Parse_Vector(SizeParser const & size); - Parse_Vector(size_parser const & size, Iterator const & i); + Parse_Vector(data_iterator i, state_type s); + Parse_Vector(Sizer sizer, data_iterator i, state_type s); - unsigned bytes() const; - void check(Iterator const & e) const; + size_type bytes() const; void init() const; + static const size_type init_bytes = Sizer::init_bytes; + /////////////////////////////////////////////////////////////////////////// // Container interface - typedef typename Parser::template rebind::parser value_type; - typedef impl::Parse_Array_iterator iterator; - typedef unsigned size_type; - typedef int difference_type; - typedef std::pair range_type; - - template - struct wrapper { typedef Parse_Vector_wrapper t; }; + typedef ElementParser value_type; + typedef detail::Parse_Array_iterator iterator; + typedef iterator const_iterator; + typedef Parse_Vector_Container container; size_type size() const; bool empty() const; iterator begin() const; iterator end() const; - range_type range() const; - range_type value() const; value_type operator[](difference_type i) const; + value_type front() const; + value_type back() const; + + // Mutators + + // The mutators provided here are those which don't take an iterator argument. + // If you need to pass an iterator it is much simpler and cleaner to use the + // 'container' wrapper + + template void push_back (Value value, size_type n=1) const; + void push_back_space (size_type n=1) const; + template void push_front (Value value, size_type n=1) const; + void push_front_space (size_type n=1) const; + void resize (size_type n) const; + template void resize (size_type n, Value value) const; private: - size_parser size_; + Sizer sizer_; + + friend class Parse_Vector_Container; + }; + + namespace detail { template class Parse_VectorN_Sizer; } - template friend class Parse_Vector_wrapper; + template + struct Parse_VectorN + { + typedef Parse_Vector< ElementParser, + detail::Parse_VectorN_Sizer > parser; }; /** \brief Holds a reference to the container ! */ - template - class Parse_Vector_wrapper - : public boost::noncopyable + template + class Parse_Vector_Container { public: /////////////////////////////////////////////////////////////////////////// // Types - typedef Container container; - typedef SizeParser size_parser; - typedef typename Parser::byte_iterator byte_iterator; - typedef Parser value_type; - typedef impl::Parse_Array_iterator iterator; - typedef unsigned size_type; - typedef int difference_type; - typedef std::pair range_type; + typedef Parse_Vector parser_type; + typedef PacketParserBase::data_iterator data_iterator; + typedef PacketParserBase::size_type size_type; + typedef PacketParserBase::difference_type difference_type; + typedef ElementParser value_type; + typedef detail::Parse_Array_iterator iterator; + typedef iterator const_iterator; + typedef PacketParserBase::state_type state_type; /////////////////////////////////////////////////////////////////////////// ///\name Structors and default members ///@{ - template - Parse_Vector_wrapper(Parse_Vector const & vector, Container & container); - // no default constructor - // no copy + // default copy // default destructor - // no conversion constructors + // conversion constructors + + Parse_Vector_Container(parser_type const & vector); ///@} /////////////////////////////////////////////////////////////////////////// - ///\name APacketRegistry.essors + + ///\name Accessors ///@{ size_type size() const; @@ -128,41 +141,66 @@ namespace senf { iterator begin() const; iterator end() const; - range_type range() const; value_type operator[](difference_type i) const; + value_type front() const; + value_type back() const; ///@} - /////////////////////////////////////////////////////////////////////////// ///\name Mutators ///@{ - void shift(iterator pos, size_type n=1); + iterator shift(iterator pos, size_type n=1); template void insert(iterator pos, Value const & t); template void insert(iterator pos, size_type n, Value const & t); - template - void insert(iterator pos, InputIterator f, InputIterator l); + template + void insert(iterator pos, ForwardIterator f, ForwardIterator l, + typename boost::disable_if< boost::is_convertible >::type * = 0); void erase(iterator pos, size_type n=1); void erase(iterator f, iterator l); void clear(); + template void push_back (Value value, size_type n=1); + void push_back_space (size_type n=1); + template void push_front (Value value, size_type n=1); + void push_front_space (size_type n=1); + void resize (size_type n); + template void resize (size_type n, Value value); + + ///@} + + ///\name Parser interface + ///@{ + + parser_type parser() const; + data_iterator i() const; + state_type state() const; + PacketData & data() const; + + size_type bytes() const; + void init() const; + ///@} protected: private: + void setSize(size_type value); + Sizer sizer_; + state_type state_; size_type i_; - size_type size_i_; - Container & container_; }; } ///////////////////////////////hh.e//////////////////////////////////////// +#endif +#if !defined(SENF_PACKETS_DECL_ONLY) && !defined(HH_ParseVec_i_) +#define HH_ParseVec_i_ //#include "ParseVec.cci" #include "ParseVec.ct" #include "ParseVec.cti"