Merge pull request #342 from jwillemsen/jwi-uniondefault

Support and test for using @default for a union member

ridlbe/c++11/visitors/union.rb

@@ -157,6 +157,23 @@ def is_array?
       def has_multiple_discriminators?
         labels.size > 1 || is_default?
       end
+
+      def value_initializer
+        # When we have an annotation directly applied to this node we are using it
+        unless node.annotations[:default].first.nil?
+          "{#{node.annotations[:default].first.fields[:value]}}"
+        else
+          # Check whether it is a typedef, if so, we need to see if there is an annotation applied to the typedef (or its typedef)
+          res_idl_type = _idltype
+          while res_idl_type.is_a?(IDL::Type::ScopedName)
+            unless res_idl_type.node.annotations[:default].first.nil?
+              return "{#{res_idl_type.node.annotations[:default].first.fields[:value]}}"
+            end
+            res_idl_type = res_idl_type.node.idltype
+          end
+          _resolved_idltype.zero_initializer
+        end
+      end
     end
   end
 end

tests/idl4/default/client.cpp

@@ -80,5 +80,13 @@ int main (int /*argc*/, char* /*argv*/[])
     ++retval;
   }
 
+  TestUnion_Octet tuo;
+  if (tuo.FirstCase() != 5)
+  {
+    TAOX11_TEST_ERROR << "tuo.FirstCase() not 5 but: " << tuo.FirstCase() << std::endl;
+    ++retval;
+  }
+
+
   return retval;
 }

tests/idl4/default/test.idl

@@ -27,3 +27,10 @@ exception foo
   @default(9) typedef_short_type_8 typedef_short_9;
   @default(5) unsigned short ushort_5;
 };
+
+union TestUnion_Octet switch(octet) {
+  case 1:
+    @default(5) short FirstCase;
+  case 2:
+    long SecondCase;
+};