Merge pull request RemedyIT#364 from jwillemsen/jwi-typecodevisitor

Move typecode generation out of the various type template

ridlbe/base/visitorbase.rb

@@ -367,10 +367,6 @@ def in_module_scope?
         @node.enclosure.is_a?(IDL::AST::Module)
       end
 
-      def in_interface_scope?
-        @node.enclosure.is_a?(IDL::AST::Interface)
-      end
-
       def repository_id
         @node.repository_id
       end

ridlbe/c++11/templates/cli/hdr/ami/attribute.erb

@@ -3,12 +3,9 @@
 /// @copydoc <%= doc_scoped_name %>
 //@{
 void get_<%= name %> (<%= scoped_cxx_in_type %> ami_return_val);
-
 void get_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
 % unless is_readonly?
-
 void set_<%= name %> ();
-
 void set_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder);
 % end
 //@}

ridlbe/c++11/templates/cli/hdr/ami/attribute_amic.erb

@@ -1,10 +1,6 @@
 
 // generated from <%= ridl_template_path %>
-void <%= sendc_prefix_get %><%= name %> (
-  <%= interface.handler_scoped_cxx_in_type %> ami_handler);
+void <%= sendc_prefix_get %><%= name %> (<%= interface.handler_scoped_cxx_in_type %> ami_handler);
 % unless is_readonly?
-
-void <%= sendc_prefix_set %><%= name %> (
-  <%= interface.handler_scoped_cxx_in_type %> ami_handler,
-  <%= cxx_in_type %> _x11_<%= cxxname %>);
+void <%= sendc_prefix_set %><%= name %> (<%= interface.handler_scoped_cxx_in_type %> ami_handler, <%= cxx_in_type %> _x11_<%= cxxname %>);
 % end

ridlbe/c++11/templates/cli/hdr/ami/interface_amic_fwd.erb

@@ -8,4 +8,3 @@ using <%= amic_cxxname %>_idl_t = <%= amic_cxxname %>; // IDL traits typename
 class <%= proxy_cxxname %>;
 using <%= proxy_cxxname %>_ptr = <%= proxy_cxxname %>*;
 #endif // !_INTF_AMI<%= _intf_fwd_incl_guard_ %>_AMIC_FWD_
-%#

ridlbe/c++11/templates/cli/hdr/ami/interface_amic_post.erb

@@ -23,5 +23,3 @@ private:
   <%= proxy_cxxname %>_ptr <%= proxy_cxxname.downcase %>_{};
   //@}
 }; // class <%= amic_cxxname %>
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/ami/interface_fwd.erb

@@ -15,5 +15,3 @@ namespace POA
 %   end
 % end
 #endif // !_INTF_<%= _intf_fwd_incl_guard_ %>_FWD_
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/attribute.erb

@@ -8,11 +8,8 @@
 % _op_end << ' override' if is_override?
 % _op_end << ' = 0' if (interface.is_local? || in_valuetype?)
 % _op_end << ';'
-virtual <%= cxx_return_type %>
-<%= cxxname %> ()<%= _op_end %>
+virtual <%= cxx_return_type %> <%= cxxname %> ()<%= _op_end %>
 % unless is_readonly?
-
-virtual void
-<%= cxxname %> (<%= cxx_in_type %> _v)<%= _op_end %>
+virtual void <%= cxxname %> (<%= cxx_in_type %> _v)<%= _op_end %>
 //@}
 % end

ridlbe/c++11/templates/cli/hdr/bitmask.erb

@@ -13,5 +13,3 @@ inline <%= cxx_return_type %> operator& (<%= cxx_in_type %> _taox11_t, <%= cxx_i
 inline <%= cxx_return_type %> operator |= (<%= cxx_inout_type %> _taox11_lhs, <%= cxx_in_type %> _taox11_rhs) { _taox11_lhs = _taox11_lhs | _taox11_rhs; return _taox11_lhs; }
 inline <%= cxx_return_type %> operator &= (<%= cxx_inout_type %> _taox11_lhs, <%= cxx_in_type %> _taox11_rhs) { _taox11_lhs = _taox11_lhs & _taox11_rhs; return _taox11_lhs; }
 inline <%= cxx_return_type %> operator ^= (<%= cxx_inout_type %> _taox11_lhs, <%= cxx_in_type %> _taox11_rhs) { _taox11_lhs = _taox11_lhs ^ _taox11_rhs; return _taox11_lhs; }
-
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/bitset.erb

@@ -46,5 +46,3 @@ private:
 }; // <%= cxxname %>
 
 inline void swap (<%= scoped_cxx_out_type %> m1, <%= scoped_cxx_out_type %> m2) { m1.swap (m2); }
-
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/enum.erb

@@ -13,4 +13,3 @@ enum class <%= cxxname %> : <%= bitbound.cxx_type %>
 % end
 };// <%= cxxname %>
 
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/except_post.erb

@@ -36,10 +36,11 @@
 
 protected:
   void _info (std::ostream&) const override;
+% if member_count > 0
 
 private:
-% members.each do |_m|
+%  members.each do |_m|
   <%= _m.cxx_member_type %> <%= _m.cxxname %>_<%= _m.value_initializer %>;
+%  end
 % end
 }; // class <%= cxxname %>
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/interface_fwd.erb

@@ -9,5 +9,3 @@ class <%= proxy_cxxname %>;
 using <%= proxy_cxxname %>_ptr = <%= proxy_cxxname %>*;
 % end
 #endif // !_INTF_<%= _intf_fwd_incl_guard_ %>_FWD_
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/interface_post.erb

@@ -97,5 +97,3 @@ private:
   //@}
 % end
 }; // class <%= cxxname %>
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/struct_fwd.erb

@@ -1,5 +1,3 @@
 
 // generated from <%= ridl_template_path %>
 class <%= cxxname %>;
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/struct_post.erb

@@ -49,5 +49,3 @@ private:
 };// <%= cxxname %>
 
 inline void swap (<%= scoped_cxx_out_type %> m1, <%= scoped_cxx_out_type %> m2) { m1.swap (m2); }
-
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/typecode.erb

@@ -1,10 +1,11 @@
+%# Generate the typecode for any type which is declared not at module level (could be part of an union or interface)
+%if generate_typecode_support?
+% unless in_module_scope?
 
 // generated from <%= ridl_template_path %>
 #if !defined (__TAOX11_TYPECODE_<%= scoped_cxxname.to_include_guard %>_DECL__)
 #define __TAOX11_TYPECODE_<%= scoped_cxxname.to_include_guard %>_DECL__
-% if in_module_scope?
-extern <%= anytypecode_export_macro %>TAOX11_NAMESPACE::CORBA::typecode_reference const <%= cxx_typecode %>;
-% else
 static TAOX11_NAMESPACE::CORBA::typecode_reference const <%= cxx_typecode %>;
-% end
 #endif
+% end
+%end

ridlbe/c++11/templates/cli/hdr/typecode_module.erb

@@ -0,0 +1,9 @@
+%# Generate the typecode for any type at module level
+%if in_module_scope?
+
+// generated from <%= ridl_template_path %>
+#if !defined (__TAOX11_TYPECODE_<%= scoped_cxxname.to_include_guard %>_DECL__)
+#define __TAOX11_TYPECODE_<%= scoped_cxxname.to_include_guard %>_DECL__
+extern <%= anytypecode_export_macro %>TAOX11_NAMESPACE::CORBA::typecode_reference const <%= cxx_typecode %>;
+#endif
+%end

ridlbe/c++11/templates/cli/hdr/typedef.erb

@@ -2,4 +2,3 @@
 // generated from <%= ridl_template_path %>
 /// @copydoc <%= doc_scoped_name %>
 using <%= cxxname %> = <%= cxxtype %>;
-% visit_template('typecode') if generate_typecode_support? && !is_native?

ridlbe/c++11/templates/cli/hdr/union_fwd.erb

@@ -1,5 +1,3 @@
 
 // generated from <%= ridl_template_path %>
 class <%= stub_export_macro %><%= cxxname %>;
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/union_post.erb

@@ -91,4 +91,3 @@ private:
 
 inline void swap (<%= scoped_cxx_out_type %> m1, <%= scoped_cxx_out_type %> m2) { m1.swap (m2); }
 
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/valuebox_def.erb

@@ -45,5 +45,3 @@ protected:
 
   bool _obv_marshal_v (TAO_OutputCDR &) const override;
 };
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/valuebox_fwd.erb

@@ -1,5 +1,3 @@
 
 // generated from <%= ridl_template_path %>
 class <%= cxxname %>;
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/valuetype_fwd.erb

@@ -16,5 +16,3 @@ class <%= stub_export_macro %><%= factory_cxxname %>;
 % end
 
 #endif // !_VALUETYPE_<%= _vt_fwd_incl_guard_ %>_FWD_
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/cli/hdr/valuetype_post.erb

@@ -58,5 +58,3 @@ protected:
   _obv_unmarshal_<%= scoped_cxxname.scope_to_cxxname %>_v (TAO_InputCDR &, TAO_ChunkInfo &) = 0;
 % end
 }; // class <%= cxxname %>
-%#
-% visit_template('typecode') if generate_typecode_support?

ridlbe/c++11/templates/srv/hdr/ami/attribute.erb

@@ -1,16 +1,8 @@
 
 // generated from <%= ridl_template_path %>
-virtual void
-get_<%= name %> (<%= scoped_cxx_in_type %> ami_return_val) = 0;
-
-virtual void
-get_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder) = 0;
-
+virtual void get_<%= name %> (<%= scoped_cxx_in_type %> ami_return_val) = 0;
+virtual void get_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder) = 0;
 % unless is_readonly?
-virtual void
-set_<%= name %> () = 0;
-
-virtual void
-set_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder) = 0;
-
+virtual void set_<%= name %> () = 0;
+virtual void set_<%= name %>_excep (IDL::traits<TAOX11_NAMESPACE::Messaging::ExceptionHolder>::ref_type excep_holder) = 0;
 % end

ridlbe/c++11/writers/amistubheader.rb

@@ -67,6 +67,8 @@ def post_visit(parser)
 
         visit_anyops(parser) if params[:gen_any_ops]
 
+        visit_typecodes(parser) if params[:gen_typecodes]
+
         # generate inline methods
         visit_inlines(parser)
 
@@ -162,6 +164,8 @@ def leave_interface(node)
 
         dec_nest
         ami_handler_interface.visit_post(node)
+
+        ami_handler_interface.visit_typecode_module(node) if params[:gen_typecodes]
         super
       end
 
@@ -192,6 +196,10 @@ def visit_anyops(parser)
         writer(AmiStubHeaderAnyOpWriter).visit_nodes(parser)
       end
 
+      def visit_typecodes(parser)
+        # No separate writer for typecodes
+      end
+
       def visit_traits_specializations(parser)
         writer(AmiStubHeaderTraitsWriter).visit_nodes(parser)
       end
@@ -389,7 +397,7 @@ def declare_interface(node)
 
       def enter_interface(node)
         if needs_ami_generation?(node)
-        ami_handler_interface.visit_anyop(node)
+          ami_handler_interface.visit_anyop(node)
         end
       end
     end # AmiStubHeaderAnyOpWriter