Packets: Adjust SENF_PARSER_VARIANT implementation for better public/private support

[senf.git] / Packets / VariantParser.test.cc

diff --git a/Packets/VariantParser.test.cc b/Packets/VariantParser.test.cc
index 948a42f..e215a89 100644 (file)
--- a/Packets/VariantParser.test.cc
+++ b/Packets/VariantParser.test.cc
@@ -38,11 +38,8 @@
 BOOST_AUTO_UNIT_TEST(VariantParser)
 {
     typedef senf::ArrayParser<10, senf::UInt8Parser> Array10;
-    typedef senf::DirectVariantParser< senf::UInt8Parser, 1, senf::detail::VariantParser_IdentityTranslator,
-        senf::VoidPacketParser,
-        Array10, 
-        senf:: UInt32Parser 
-        >::parser Variant;
+    typedef senf::VariantParser< senf::detail::FixedAuxParserPolicy<senf::UInt8Parser, 1>,
+        boost::mpl::vector<senf::VoidPacketParser, Array10, senf:: UInt32Parser> > Variant;
     
     unsigned char data[] = { 0x01, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
                              0x19, 0x1A, 0x1B };
@@ -96,14 +93,14 @@ namespace {
     struct TestParser : public senf::PacketParserBase
     {
 #       include SENF_PARSER()
-        
-        SENF_PARSER_SKIP_BITS( 4 );
-        SENF_PARSER_PRIVATE_BITFIELD( type_, 4, unsigned );
-        SENF_PARSER_PRIVATE_VARIANT( content_, type_, (senf::VoidPacketParser)(SubParser) );
 
-        bool hasContent() const { return content_().variant() == 1; }
-        void hasContent(bool v) const { if (v) content_().init<1>(); else content_().init<0>(); }
-        SubParser content() const { return content_().get<1>(); }
+        SENF_PARSER_SKIP_BITS( 4 );
+        SENF_PARSER_BITFIELD_RO( type, 4, unsigned );
+        SENF_PARSER_VARIANT( content_, type,
+                                         ( novalue( nocontent
+, key(10, senf::VoidPacketParser)) )
+                                         (      id( content,           SubParser              ) )
+            );
 
         SENF_PARSER_FINALIZE(TestParser);
     };
@@ -116,17 +113,21 @@ BOOST_AUTO_UNIT_TEST(VariantParserMacro)
     
     {
         TestParser v (p.data().begin(), & p.data());
-    
-        BOOST_CHECK( ! v.hasContent() );
+        v.init();
+        BOOST_CHECK( ! v.has_content() );
         BOOST_CHECK_EQUAL( senf::bytes(v), 1u );
-        v.hasContent(true);
+        BOOST_CHECK_EQUAL( v.type(), 10u );
+        v.init_content();
         // Parser invalidated
     }
     {
         TestParser v (p.data().begin(), & p.data());
-        BOOST_CHECK( v.hasContent() );
+        BOOST_CHECK( v.has_content() );
         BOOST_CHECK_EQUAL( senf::bytes(v), 7u );
         BOOST_CHECK_EQUAL( v.content().foo(), 0u );
+        BOOST_CHECK_EQUAL( v.type(), 1u );
+        v.nocontent();
+        // Parser invalidated
     }
 }