Merge pull request #451 from jwillemsen/jwi-ddsx11impliedidlbitset

Starter support for bitset
RemedyIT · Nov 26, 2024 · 3077a6f · 3077a6f
2 parents 4558782 + 6cca23e
commit 3077a6f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/ridlbe/ccmx11/facets/dds/templates/idl/dds/bitset.erb b/ridlbe/ccmx11/facets/dds/templates/idl/dds/bitset.erb
@@ -0,0 +1,11 @@
+
+// generated from <%= ridl_template_path %>
+/// @copydoc <%= doc_scoped_name %>
+% annotations.each do |_a|
+<%= _a.idl_stringified %>
+% end
+%# todo bitfield annotations and type
+bitset <%= unescaped_name %><% unless base.nil? %> : <%= base.unescaped_name %><% end %> {
+  <%= bitfields.collect {|e| "/// @copydoc #{e.doc_scoped_name}\n  bitfield<#{e.bits}> #{e.name}" }.join(",\n  ") %>
+};
+
diff --git a/ridlbe/ccmx11/facets/dds/writers/ddsidl.rb b/ridlbe/ccmx11/facets/dds/writers/ddsidl.rb
@@ -66,7 +66,12 @@ def visit_enum(node)
 
         def visit_bitmask(node)
           check_namespace_begin
-          visitor(BitMaskVisitor).visit_bitmask(node)
+          visitor(BitmaskVisitor).visit_bitmask(node)
+        end
+
+        def visit_bitset(node)
+          check_namespace_begin
+          visitor(BitsetVisitor).visit_bitset(node)
         end
 
         def declare_union(node)

diff --git a/ridlbe/ccmx11/visitors/import.rb b/ridlbe/ccmx11/visitors/import.rb
@@ -27,6 +27,7 @@ module CCMX11
     SequenceVisitor = Cxx11::SequenceVisitor
     EnumVisitor = Cxx11::EnumVisitor
     BitmaskVisitor = Cxx11::BitmaskVisitor
+    BitsetVisitor = Cxx11::BitsetVisitor
     ArrayVisitor = Cxx11::ArrayVisitor
     TypedefVisitor = Cxx11::TypedefVisitor
     UnionVisitor = Cxx11::UnionVisitor