X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FListBParser.ih;h=fe61177aeef3954143709ccb083a1316f4e78701;hb=3863d46dd898b7bc35ea8c6ccd8563b18762a6b6;hp=9439ef2e92c55ee07d648fb297412249ea9119e6;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git diff --git a/Packets/ListBParser.ih b/Packets/ListBParser.ih index 9439ef2..fe61177 100644 --- a/Packets/ListBParser.ih +++ b/Packets/ListBParser.ih @@ -23,10 +23,11 @@ /** \file \brief ListBParser internal header */ -#ifndef IH_ListBParser_ -#define IH_ListBParser_ 1 +#ifndef IH_SENF_Packets_ListBParser_ +#define IH_SENF_Packets_ListBParser_ 1 // Custom includes +#include "ListParser.ih" ///////////////////////////////ih.p//////////////////////////////////////// @@ -37,15 +38,17 @@ namespace detail { \internal \see \ref ListBParser */ - template + template struct ListBParser_Policy + : public AuxPolicy { // This policy needs to work around a serious problem with this type of list: When we change - // the size of any (direct or indirect) subelement of the list, This will change will render - // the list completely invalid and unparseable since the 'byte' field will now be invalid. + // the size of any (direct or indirect) sub-element of the list, this will change will + // render the list completely invalid and un-parseable since the 'byte' field will now be + // invalid. // // The solution we apply is to store the *size* (i.e. the number of elements) of the list - // when creating the container wrapper. We also maintain this value accross insert/erase + // when creating the container wrapper. We also maintain this value across insert/erase // statements. Additionally we also safe the complete size of the data container (the vector // holding the bytes). Since we only allow packet changes through this container while it // exists, any change in the container size must be a change within this list and therefore @@ -66,60 +69,83 @@ namespace detail { struct container_policy; - typedef PacketParserBase::data_iterator iterator; + typedef PacketParserBase::data_iterator data_iterator; typedef PacketParserBase::state_type state_type; typedef PacketParserBase::size_type size_type; + typedef ElementParser element_type; typedef ListParser< ListBParser_Policy > parser_type; typedef ListParser_Container< container_policy > container_type; - static const size_type init_bytes = BytesParser::fixed_bytes; + static const size_type init_bytes = AuxPolicy::aux_bytes; - size_type bytes (iterator i, state_type s) const; - size_type size (iterator i, state_type s) const; - void init (iterator i, state_type s) const; + ListBParser_Policy(); + template ListBParser_Policy(Arg const & arg); - /** \brief Internal: ListBParser_Policy's iterator policy - \internal - */ - struct iterator_policy - { - iterator setBegin (iterator i, state_type s); - iterator setEnd (iterator i, state_type s); - void setFromPosition (iterator i, state_type s, iterator p); - iterator next (iterator i, state_type s); - iterator raw (iterator i, state_type s) const; - }; + size_type bytes (data_iterator i, state_type s) const; + size_type size (data_iterator i, state_type s) const; + void init (data_iterator i, state_type s) const; - /** \brief Internal: ListBParser_Policy's container policy - \internal - */ + /** \brief Internal: ListBParser container/wrapper policy */ struct container_policy + : public AuxPolicy { - typedef typename ListBParser_Policy< - ElementParser,BytesParser>::iterator_policy iterator_policy; - typedef typename ListBParser_Policy< - ElementParser,BytesParser>::parser_type parser_type; - typedef typename ListBParser_Policy< - ElementParser,BytesParser>::element_type element_type; + typedef PacketParserBase::data_iterator data_iterator; + typedef PacketParserBase::state_type state_type; + typedef PacketParserBase::size_type size_type; + + typedef ListBParser_Policy parser_policy; + typedef typename parser_policy::element_type element_type; + typedef typename parser_policy::parser_type parser_type; + typedef typename parser_policy::container_type container_type; + + static const size_type init_bytes = parser_policy::init_bytes; - static const size_type init_bytes = ListBParser_Policy< - ElementParser,BytesParser>::init_bytes; + container_policy(parser_policy const & p); - container_policy(parser_type const & list); + size_type bytes (data_iterator i, state_type s) const; + size_type size (data_iterator i, state_type s) const; + void init (data_iterator i, state_type s); - size_type bytes (iterator i, state_type s) const; - size_type size (iterator i, state_type s) const; - void erase (iterator i, state_type s, iterator p); - void insert (iterator i, state_type s, iterator p); - void init (iterator i, state_type s); - void update (iterator i, state_type s) const; + void erase (container_type & c, data_iterator p); + void insert (container_type & c, data_iterator p); + void update (container_type const & c) const; + + /** \brief Internal: ListBParser specific iterator data */ + struct iterator_data {}; + + data_iterator setBegin (container_type const & c, iterator_data & d) const; + data_iterator setEnd (container_type const & c, iterator_data & d) const; + void setFromPosition (container_type const & c, iterator_data & d, + data_iterator p) const; + + data_iterator next (container_type const & c, iterator_data & d) const; + data_iterator raw (container_type const & c, iterator_data const & d) const; size_type n_; mutable size_type container_size_; }; }; +#ifndef DOXYGEN + + template + struct ListParserPolicy + { + typedef ListBParser_Policy type; + }; + + template + struct ListParserPolicy > + { + typedef ListBParser_Policy< ElementParser, + TransformAuxParserPolicy > type; + }; + +#endif + }} ///////////////////////////////ih.e////////////////////////////////////////