Merge pull request #347 from jwillemsen/jwi-defaultliteral

Implement and test default_literal annotation for enum

ridlbe/c++11/config/cxx_type.rb

@@ -860,6 +860,16 @@ def value_to_s(v, scope = nil)
       def is_pod?
         true
       end
+
+      def value_initializer
+        res = '{}'
+        node.enumerators.each do |e|
+          unless e.annotations[:default_literal].first.nil?
+            res = '{' + cxx_type + '::' + e.scoped_cxxname + '}'
+          end
+        end
+        return res
+      end
     end
 
     class Bitmask

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

@@ -133,7 +133,7 @@ def value_initializer
             end
             res_idl_type = res_idl_type.node.idltype
           end
-          _resolved_idltype.zero_initializer
+          _resolved_idltype.value_initializer
         end
       end
 

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

@@ -24,8 +24,8 @@ def bitbound
       def bitbound_bits
         node.bitbound_bits
       end
-      # template mapping
 
+      # template mapping
       map_template :enum, :enum
       map_template :typecode, :typecode
       map_template :tao_typecode, :enum_typecode

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

@@ -70,7 +70,7 @@ def value_initializer
             end
             res_idl_type = res_idl_type.node.idltype
           end
-          _resolved_idltype.zero_initializer
+          _resolved_idltype.value_initializer
         end
       end
 

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

@@ -171,7 +171,7 @@ def value_initializer
             end
             res_idl_type = res_idl_type.node.idltype
           end
-          _resolved_idltype.zero_initializer
+          _resolved_idltype.value_initializer
         end
       end
     end

tests/idl4/default/client.cpp

@@ -88,5 +88,13 @@ int main (int /*argc*/, char* /*argv*/[])
     ++retval;
   }
 
+  Shape shape;
+  TAOX11_TEST_INFO << "shape: " << shape << std::endl;
+  if (shape.color_red() != Color::RED)
+  {
+    TAOX11_TEST_ERROR << "shape.color_red() not RED but: " << shape.color_red() << std::endl;
+    ++retval;
+  }
+
   return retval;
 }

tests/idl4/default/test.idl

@@ -34,3 +34,13 @@ union TestUnion_Octet switch(short) {
   case 1:
     long SecondCase;
 };
+
+enum Color {
+  GREEN,
+  @default_literal RED,
+  BLUE
+};
+
+struct Shape {
+    Color color_red;
+};