//#include "PacketParser.test.ih"
// Custom includes
-#include "PacketParser.hh"
-#include "PacketInterpreter.hh"
-#include "PacketType.hh"
-#include "ParseInt.hh"
+#include "Packets.hh"
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
#include <boost/test/test_tools.hpp>
#define prefix_
struct SimpleParser : public senf::PacketParserBase
{
- SENF_PACKET_PARSER_INIT(SimpleParser);
+# include SENF_FIXED_PARSER()
+ SENF_PARSER_FINALIZE(SimpleParser);
using senf::PacketParserBase::check;
using senf::PacketParserBase::validate;
struct FooParser : public senf::PacketParserBase
{
- SENF_PACKET_PARSER_INIT(FooParser);
+# include SENF_FIXED_PARSER()
- SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
- ((Field)( name, senf::Parse_UInt16 ))
- ((Field)( id, senf::Parse_Int32 )) );
+ SENF_PARSER_FIELD( name, senf::Parse_UInt16 );
+ SENF_PARSER_FIELD( id, senf::Parse_Int32 );
+
+ SENF_PARSER_FINALIZE(FooParser);
};
struct BarParser : public senf::PacketParserBase
{
- SENF_PACKET_PARSER_INIT(BarParser);
+# include SENF_PARSER()
+
+ SENF_PARSER_FIELD( name, senf::Parse_UInt16 );
+ SENF_PARSER_FIELD( id, senf::Parse_Int32 );
- SENF_PACKET_PARSER_DEFINE_FIELDS(
- ((Field)( name, senf::Parse_UInt16 ))
- ((Field)( id, senf::Parse_Int32 )) );
+ SENF_PARSER_FINALIZE(BarParser);
};
}