Merge pull request #422 from jwillemsen/jwi-ddsidlannotations

Reworked annotation generation for implied DDS IDL

ridlbe/ccmx11/facets/dds/templates/idl/dds/bitmask.erb

@@ -1,7 +1,9 @@
 
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
-@bit_bound(<%= bitbound_bits %>)
+% annotations.each do |_a|
+@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
 bitmask <%= unescaped_name %> {
   <%= bitvalues.collect {|e| "/// @copydoc #{e.doc_scoped_name}\n  #{e.name}" }.join(",\n  ") %>
 };

ridlbe/ccmx11/facets/dds/templates/idl/dds/enum.erb

@@ -1,7 +1,9 @@
 
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
-@bit_bound(<%= bitbound_bits %>)
+% annotations.each do |_a|
+@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
 enum <%= unescaped_name %> {
   <%= enumerators.collect {|e| "/// @copydoc #{e.doc_scoped_name}\n  #{e.name}" }.join(",\n  ") %>
 };

ridlbe/ccmx11/facets/dds/templates/idl/dds/struct.erb

@@ -1,10 +1,14 @@
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
-@nested(<% if has_toplevel_annotation? %>FALSE<% else %>TRUE<% end %>)
-@<%= extensibility_annotation %>
+% annotations.each do |_a|
+@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
 struct <%= unescaped_name %><% unless base.nil? %> : <%= base.unescaped_name %><% end %> {
 % members.each do |_m|
   /// @copydoc <%= _m.doc_scoped_name %>
-  <% if _m.has_key_annotation? %>@key <% end %><%= strip_global_scope(_m.idltype_unescaped_name) %> <%= _m.unescaped_name %>;
+% _m.annotations.each do |_a|
+  @<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
+  <%= strip_global_scope(_m.idltype_unescaped_name) %> <%= _m.unescaped_name %>;
 % end
 };

ridlbe/ccmx11/facets/dds/templates/idl/dds/union.erb

@@ -1,8 +1,9 @@
 
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
-@nested(<% if has_toplevel_annotation? %>FALSE<% else %>TRUE<% end %>)
-@<%= extensibility_annotation %>
+% annotations.each do |_a|
+@<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
 union <%= unescaped_name %> switch (<%= strip_global_scope(switchtype.idltype_unescaped_name) %>) {
 % members.each do |_m|
 %   if _m.is_default?
@@ -13,6 +14,9 @@ union <%= unescaped_name %> switch (<%= strip_global_scope(switchtype.idltype_un
 %     end
 %   end
     /// @copydoc <%= _m.doc_scoped_name %>
+% _m.annotations.each do |_a|
+    @<%= _a.id %><% unless _a.fields.empty? %>(<% _a.fields.values.each do |f| %><%= f %><% end %>)<% end %>
+% end
     <%= strip_global_scope(_m.idltype_unescaped_name) %> <%= _m.unescaped_name %>;
 % end
 };

ridlbe/ccmx11/facets/dds/visitorbase.rb

@@ -57,19 +57,12 @@ def strip_global_scope(typename)
 
       def has_toplevel_annotation?
         # 20190730 Add support for AXCIOMA 2 top-level annotation, issue #4729
-        annot = self.annotations[:'top-level'].first || self.annotations[:TopLevel].first
+        annot = node.annotations[:'top-level'].first || node.annotations[:TopLevel].first
         return false if annot.nil?
 
         annot.fields[:value].nil? || annot.fields[:value]
       end
 
-      def extensibility_annotation
-        # DDS X-Types defines that the default for extensibility is appendable
-        return :final if self.annotations[:'final'].first
-
-        :appendable
-      end
-
       def typesupport_export_include?
         params[:typesupport_export_include]
       end

ridlbe/ccmx11/facets/dds/visitors/struct.rb

@@ -17,12 +17,19 @@ class StructVisitor < Cxx11::NodeVisitorBase
       include CcmNames
 
       optional_template :life_cycle_traits
-    end # StructVisitor
 
-    class StructMemberVisitor
-      def has_key_annotation?
-        !self.annotations[:key].empty?
+      def annotations
+        # Add appendable when it is not final available
+         ann = node.annotations.dup
+         unless ann[:'final'].first
+           ann << IDL::AST::Annotation.new('appendable', {})
+         end
+         # Determine correct value for DDS nested annotation
+         nested = 'TRUE'
+         nested = 'FALSE' if has_toplevel_annotation?
+         ann << IDL::AST::Annotation.new('nested', {v: nested})
+         ann
       end
-    end
+    end # StructVisitor
   end # CCMX11
 end # IDL

ridlbe/ccmx11/facets/dds/visitors/union.rb

@@ -32,6 +32,19 @@ def native_scoped_switch_cxxtype
       end
 
       optional_template :life_cycle_traits
+
+      def annotations
+        # Add appendable when it is not final available
+         ann = node.annotations.dup
+         unless ann[:'final'].first
+           ann << IDL::AST::Annotation.new('appendable', {})
+         end
+         # Determine correct value for DDS nested annotation
+         nested = 'TRUE'
+         nested = 'FALSE' if has_toplevel_annotation?
+         ann << IDL::AST::Annotation.new('nested', {v: nested})
+         ann
+      end
     end
   end # CCMX11
 end # IDL