Refactor the API for defining packets in Protocol

[libs/net.git] / source / net / protocol.h

diff --git a/source/net/protocol.h b/source/net/protocol.h
index ae1c3c010c0671a8c88968b359220f9142449a92..35d3cb2cbfe177de4214816d70643f9ff97e32bd 100644 (file)
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -171,9 +171,12 @@ private:
 
        public:
                PacketDefBuilder(const Protocol &, PacketTypeDef<P> &, const S &);
-               
+
                template<typename T>
-               PacketDefBuilder<P, typename S::template Next<T>> operator()(T P::*);
+               PacketDefBuilder<P, typename S::template Next<T>> fields(T P::*);
+
+               template<typename T1, typename T2, typename... Rest>
+               auto fields(T1 P::*first, T2 P::*second, Rest P::*...rest) { return fields(first).fields(second, rest...); }
        };
 
        struct PacketHeader
@@ -209,9 +212,15 @@ protected:
        template<typename P>
        PacketDefBuilder<P, Serializer<P>> add(unsigned);
 
+       template<typename P, typename T, typename... Rest>
+       auto add(unsigned id, T P::*field, Rest P::*...rest) { return add<P>(id).fields(field, rest...); }
+
        template<typename P>
        PacketDefBuilder<P, Serializer<P>> add();
 
+       template<typename P, typename T, typename... Rest>
+       auto add(T P::*field, Rest P::*...rest) { return add<P>().fields(field, rest...); }
+
        const PacketDefBase &get_packet_by_class_id(unsigned) const;
        const PacketDefBase &get_packet_by_id(unsigned) const;
 
@@ -455,7 +464,7 @@ Protocol::PacketDefBuilder<P, S>::PacketDefBuilder(const Protocol &p, PacketType
 
 template<typename P, typename S>
 template<typename T>
-Protocol::PacketDefBuilder<P, typename S::template Next<T>> Protocol::PacketDefBuilder<P, S>::operator()(T P::*ptr)
+Protocol::PacketDefBuilder<P, typename S::template Next<T>> Protocol::PacketDefBuilder<P, S>::fields(T P::*ptr)
 {
        typename S::template Next<T> next_ser(serializer, ptr, protocol);
        pktdef.set_serializer(next_ser);