Added name annotation support for unions

c++/src/capnp/c++.capnp

@@ -25,4 +25,4 @@
 $namespace("capnp::annotations");
 
 annotation namespace(file): Text;
-annotation name(field, enumerant, struct, enum, interface, method, param, group): Text;
+annotation name(field, enumerant, struct, enum, interface, method, param, group, union): Text;

c++/src/capnp/c++.capnp.c++

@@ -33,7 +33,7 @@ const ::capnp::_::RawSchema s_b9c6f99ebf805f2c = {
 static const ::capnp::_::AlignedData<19> b_f264a779fef191ce = {
   {   0,   0,   0,   0,   5,   0,   5,   0,
     206, 145, 241, 254, 121, 167, 100, 242,
-     20,   0,   0,   0,   5,   0, 188,   7,
+     20,   0,   0,   0,   5,   0, 252,   7,
     129,  78,  48, 184, 123, 125, 248, 189,
       0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,

c++/src/capnp/encoding-test.c++

@@ -1668,10 +1668,10 @@ TEST(Encoding, NameAnnotation) {
   root.setAnotherGoodFieldName(test::RenamedStruct::RenamedEnum::QUX);
   EXPECT_EQ(test::RenamedStruct::RenamedEnum::QUX, root.getAnotherGoodFieldName());
 
-  EXPECT_FALSE(root.getNamedUnion().isQux());
-  auto quxBuilder = root.getNamedUnion().initQux();
-  EXPECT_TRUE(root.getNamedUnion().isQux());
-  EXPECT_FALSE(root.getNamedUnion().getQux().hasAnotherGoodNestedFieldName());
+  EXPECT_FALSE(root.getRenamedUnion().isQux());
+  auto quxBuilder = root.getRenamedUnion().initQux();
+  EXPECT_TRUE(root.getRenamedUnion().isQux());
+  EXPECT_FALSE(root.getRenamedUnion().getQux().hasAnotherGoodNestedFieldName());
 
   quxBuilder.setGoodNestedFieldName(true);
   EXPECT_EQ(true, quxBuilder.getGoodNestedFieldName());
@@ -1684,6 +1684,10 @@ TEST(Encoding, NameAnnotation) {
   EXPECT_EQ(true, nestedFieldBuilder.getGoodNestedFieldName());
   EXPECT_FALSE(nestedFieldBuilder.hasAnotherGoodNestedFieldName());
 
+  EXPECT_FALSE(root.getRenamedUnion().isRenamedGroup());
+  auto renamedGroupBuilder = root.getRenamedUnion().initRenamedGroup();
+  EXPECT_TRUE(root.getRenamedUnion().isRenamedGroup());
+
   test::RenamedInterface::RenamedMethodParams::Reader renamedInterfaceParams;
   renamedInterfaceParams.getRenamedParam();
 }

c++/src/capnp/test.capnp

@@ -714,9 +714,11 @@ struct TestNameAnnotation $Cxx.name("RenamedStruct") {
     }
   }
 
-  namedUnion :union {
-    foo @3 :Void;
-    bar @4 :Void;
+  badlyNamedUnion :union $Cxx.name("renamedUnion") {
+    badlyNamedGroup :group $Cxx.name("renamedGroup") {
+      foo @3 :Void;
+      bar @4 :Void;
+    }
     baz @5 :NestedStruct $Cxx.name("qux");
   }
 }