template<typename C, typename S>
struct CompoundDef: public CompoundTypeDef<C>
{
- S *serializer;
+ S serializer;
CompoundDef(const S &);
- virtual ~CompoundDef();
virtual std::string describe() const;
virtual char *serialize(const C &, char *, char *) const;
const char *deserialize(A &, const char *, const char *) const;
};
+ template<typename C>
+ class CompoundSerializer
+ {
+ public:
+ typedef C ValueType;
+
+ private:
+ const CompoundTypeDef<C> &def;
+
+ public:
+ CompoundSerializer(const Protocol &);
+
+ std::string describe() const { return def.describe(); }
+ char *serialize(const C &, char *, char *) const;
+ const char *deserialize(C &, const char *, const char *) const;
+ };
+
template<typename P, typename Head, typename S>
class Serializer: public Head
{
const CompoundTypeDef<P> &get_compound() const { return *compound; }
- virtual std::string describe() const;
+ virtual std::string describe() const { return compound->describe(); }
char *serialize(const P &, char *, char *) const;
const char *deserialize(P &, const char *, const char *) const;
virtual const char *dispatch(ReceiverBase &, const char *, const char *) const;
void add_packet(PacketDefBase *);
protected:
+ template<typename P>
+ PacketDefBuilder<P, NullSerializer<P> > add(unsigned);
+
template<typename P>
PacketDefBuilder<P, NullSerializer<P> > add();
template<typename P>
-Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add()
+Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add(unsigned id)
{
- PacketTypeDef<P> *pdef = new PacketTypeDef<P>(next_packet_id++);
+ PacketTypeDef<P> *pdef = new PacketTypeDef<P>(id);
add_packet(pdef);
return PacketDefBuilder<P, NullSerializer<P> >(*this, *pdef, NullSerializer<P>());
}
+template<typename P>
+Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add()
+{
+ return add<P>(next_packet_id++);
+}
+
template<typename P>
const Protocol::PacketTypeDef<P> &Protocol::get_packet_by_class() const
{
typedef BasicSerializer<T> Serializer;
};
+template<typename T>
+struct Protocol::Traits
+{
+ static const UInt16 signature = 'C';
+ typedef CompoundSerializer<T> Serializer;
+};
+
template<> struct Protocol::Traits<Int8>: BasicTraits<Int8, 'I'> { };
template<> struct Protocol::Traits<UInt8>: BasicTraits<UInt8, 'U'> { };
template<> struct Protocol::Traits<Int16>: BasicTraits<Int16, 'I'> { };
template<typename C, typename S>
Protocol::CompoundDef<C, S>::CompoundDef(const S &s):
- serializer(new S(s))
+ serializer(s)
{ }
-template<typename C, typename S>
-Protocol::CompoundDef<C, S>::~CompoundDef()
-{
- delete serializer;
-}
-
template<typename C, typename S>
std::string Protocol::CompoundDef<C, S>::describe() const
{
- return "{"+serializer->describe()+"}";
+ return "{"+serializer.describe()+"}";
}
template<typename C, typename S>
char *Protocol::CompoundDef<C, S>::serialize(const C &com, char *buf, char *end) const
{
- return serializer->serialize(com, buf, end);
+ return serializer.serialize(com, buf, end);
}
template<typename C, typename S>
const char *Protocol::CompoundDef<C, S>::deserialize(C &com, const char *buf, const char *end) const
{
- return serializer->deserialize(com, buf, end);
+ return serializer.deserialize(com, buf, end);
}
}
+template<typename C>
+Protocol::CompoundSerializer<C>::CompoundSerializer(const Protocol &proto):
+ def(proto.get_packet_by_class<C>().get_compound())
+{ }
+
+template<typename C>
+char *Protocol::CompoundSerializer<C>::serialize(const C &com, char *buf, char *end) const
+{
+ return def.serialize(com, buf, end);
+}
+
+template<typename C>
+const char *Protocol::CompoundSerializer<C>::deserialize(C &com, const char *buf, const char *end) const
+{
+ return def.deserialize(com, buf, end);
+}
+
+
template<typename P, typename Head, typename S>
Protocol::Serializer<P, Head, S>::Serializer(const Head &h, Pointer p, const Protocol &proto):
Head(h),
}
template<typename P, typename Head, typename S>
-char * Protocol::Serializer<P, Head, S>::serialize(const P &pkt, char *buf, char *end) const
+char *Protocol::Serializer<P, Head, S>::serialize(const P &pkt, char *buf, char *end) const
{
buf = Head::serialize(pkt, buf, end);
return ser.serialize(pkt.*ptr, buf, end);
}
template<typename P, typename Head, typename S>
-const char * Protocol::Serializer<P, Head, S>::deserialize(P &pkt, const char *buf, const char *end) const
+const char *Protocol::Serializer<P, Head, S>::deserialize(P &pkt, const char *buf, const char *end) const
{
buf = Head::deserialize(pkt, buf, end);
return ser.deserialize(pkt.*ptr, buf, end);
}
-template<typename P>
-unsigned Protocol::PacketTypeDef<P>::class_id = 0;
-
template<typename P>
Protocol::PacketTypeDef<P>::PacketTypeDef(unsigned i):
PacketDefBase(i),
compound = new CompoundDef<P, S>(ser);
}
-template<typename P>
-std::string Protocol::PacketTypeDef<P>::describe() const
-{
- return compound->describe();
-}
-
template<typename P>
char *Protocol::PacketTypeDef<P>::serialize(const P &pkt, char *buf, char *end) const
{