Fix static cast and add typenames.

Author: cfis

lib/ruby-bindgen/visitors/rice/rice.rb

@@ -951,7 +951,15 @@ def arguments(cursor)
             if copyable_type?(param.type)
               # Use type_spelling to get fully qualified type name
               qualified_type = type_spelling(param.type)
-              result << " = static_cast<#{qualified_type}>(#{default_value})"
+              # Can't static_cast to array types (e.g., using StepArray = int[3])
+              decl = param.type.declaration
+              is_array_alias = (decl.kind == :cursor_type_alias_decl || decl.kind == :cursor_typedef_decl) &&
+                               [:type_constant_array, :type_incomplete_array].include?(decl.underlying_type.canonical.kind)
+              if is_array_alias
+                result << " = #{default_value}"
+              else
+                result << " = static_cast<#{qualified_type}>(#{default_value})"
+              end
             end
           end
           result
@@ -1117,9 +1125,10 @@ def qualify_class_template_typedefs(spelling, class_template)
         return spelling if typedef_info[:names].empty?
 
         result = spelling.dup
+        qualified_parent = typedef_info[:qualified_parent]
         typedef_info[:names].each do |name|
-          # Replace unqualified typedef names (not preceded by :: or word char)
-          result = result.gsub(/(?<![:\w])#{Regexp.escape(name)}(?![:\w])/, "#{typedef_info[:qualified_parent]}::#{name}")
+          unqualified = /(?<![:\w])#{Regexp.escape(name)}(?![:\w])/
+          result = result.gsub(unqualified, "typename #{qualified_parent}::#{name}")
         end
 
         result

test/bindings/cpp/classes-rb.cpp

@@ -72,7 +72,7 @@ void Init_Classes()
     define_constructor(Constructor<Outer::Inner::GpuMatND, Outer::Inner::GpuMatND::SizeArray, int>(),
       Arg("size"), Arg("type")).
     define_constructor(Constructor<Outer::Inner::GpuMatND, Outer::Inner::GpuMatND::SizeArray, int, void*, Outer::Inner::GpuMatND::StepArray>(),
-      Arg("size"), Arg("type"), ArgBuffer("data"), Arg("step") = static_cast<Outer::Inner::GpuMatND::StepArray>(Outer::Inner::GpuMatND::defaultStepArray()));
+      Arg("size"), Arg("type"), ArgBuffer("data"), Arg("step") = Outer::Inner::GpuMatND::defaultStepArray());
 
   Rice::Data_Type<Outer::Inner::Stream> rb_cOuterInnerStream = define_class_under<Outer::Inner::Stream>(rb_mOuterInner, "Stream").
     define_constructor(Constructor<Outer::Inner::Stream>()).

test/bindings/cpp/iterators-rb.ipp

@@ -5,7 +5,7 @@ inline Rice::Data_Type<iter::TemplateContainer<T>> TemplateContainer_instantiate
     define_constructor(Constructor<iter::TemplateContainer<T>>()).
     template define_iterator<typename iter::TemplateContainer<T>::iterator(iter::TemplateContainer<T>::*)()>(&iter::TemplateContainer<T>::begin, &iter::TemplateContainer<T>::end, "each").
     template define_iterator<typename iter::TemplateContainer<T>::const_iterator(iter::TemplateContainer<T>::*)() const>(&iter::TemplateContainer<T>::begin, &iter::TemplateContainer<T>::end, "each_const").
-    template define_iterator<std::reverse_iterator<iter::TemplateContainer<T>::iterator>(iter::TemplateContainer<T>::*)()>(&iter::TemplateContainer<T>::rbegin, &iter::TemplateContainer<T>::rend, "each_reverse").
-    template define_iterator<std::reverse_iterator<iter::TemplateContainer<T>::const_iterator>(iter::TemplateContainer<T>::*)() const>(&iter::TemplateContainer<T>::rbegin, &iter::TemplateContainer<T>::rend, "each_reverse_const");
+    template define_iterator<std::reverse_iterator<typename iter::TemplateContainer<T>::iterator>(iter::TemplateContainer<T>::*)()>(&iter::TemplateContainer<T>::rbegin, &iter::TemplateContainer<T>::rend, "each_reverse").
+    template define_iterator<std::reverse_iterator<typename iter::TemplateContainer<T>::const_iterator>(iter::TemplateContainer<T>::*)() const>(&iter::TemplateContainer<T>::rbegin, &iter::TemplateContainer<T>::rend, "each_reverse_const");
 }
 

test/bindings/cpp/templates-rb.ipp

@@ -5,8 +5,8 @@ inline Rice::Data_Type<Internal::Data<Rows, Columns>> Data_instantiate(Rice::Mod
     define_constructor(Constructor<Internal::Data<Rows, Columns>>()).
     define_constructor(Constructor<Internal::Data<Rows, Columns>, char*>(),
       Arg("type")).
-    define_attr("rows", &Internal::Data<Rows, Columns>::Rows).
-    define_attr("columns", &Internal::Data<Rows, Columns>::Columns).
+    define_attr("rows", &Internal::Data<Rows, Columns>::rows).
+    define_attr("columns", &Internal::Data<Rows, Columns>::columns).
     template define_method<int(Internal::Data<Rows, Columns>::*)()>("get_rows", &Internal::Data<Rows, Columns>::getRows).
     template define_method<int(Internal::Data<Rows, Columns>::*)()>("get_columns", &Internal::Data<Rows, Columns>::getColumns);
 }

test/headers/cpp/templates.hpp

@@ -6,8 +6,8 @@ namespace Internal
       public:
         Data();
         Data(char* type);
-        int Rows;
-        int Columns;
+        int rows;
+        int columns;
         int getRows();
         int getColumns();
     };