Merge pull request #176 from mcorino/develop

Fix some missing type mappings
mcorino · Sep 18, 2023 · 3ea0cf8 · 3ea0cf8
2 parents e62ffe2 + 0aac22c
commit 3ea0cf8
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 5 deletions.
diff --git a/rakelib/lib/core/mapping.rb b/rakelib/lib/core/mapping.rb
@@ -270,18 +270,19 @@ def initialize(map, temp: nil, code: nil, &block)
       end
 
       class ArgOut < Base
-        def initialize(map, as: nil, temp: nil, code: nil, &block)
+        def initialize(map, as: nil, by_ref: false, temp: nil, code: nil, &block)
           super(map, temp: nil, code: code)
           @as = {}
           if as
             map_as(as)
           elsif !map.types.empty?
             map.types.each_pair { |pset, type| @as[pset] = _get_mapped_type(type) }
           end
+          @by_ref = by_ref
           block.call(self) if block
         end
 
-        attr_reader :as
+        attr_reader :as, :by_ref
 
         def map_as(argdef)
           _map_args(argdef, @as)
@@ -434,8 +435,8 @@ def map_freearg(temp: nil, code: nil, &block)
         @check = FreeArg.new(self, temp: temp, code: code, &block)
       end
 
-      def map_argout(as: nil, temp: nil, code: nil, &block)
-        @argout = ArgOut.new(self, as: as, temp: temp, code: code, &block)
+      def map_argout(as: nil, by_ref: false, temp: nil, code: nil, &block)
+        @argout = ArgOut.new(self, as: as, by_ref: by_ref, temp: temp, code: code, &block)
       end
 
       def map_directorin(temp: nil, code: nil, &block)
@@ -541,7 +542,7 @@ def ignores_input?
       end
 
       def maps_input_as_output?
-        !!@argout
+        @argout && !@argout.by_ref
       end
 
       def ignores_output?

diff --git a/rakelib/lib/director/graphics_context.rb b/rakelib/lib/director/graphics_context.rb
@@ -137,6 +137,18 @@ def setup
             }
             __CODE
         end
+        # for GetPartialTextExtents
+        spec.map 'wxArrayDouble &widths' => 'Array<Float>' do
+          map_in ignore: true, temp: 'wxArrayDouble tmp', code: '$1 = &tmp;'
+
+          map_argout code: <<~__CODE
+            $result = rb_ary_new();
+            for (size_t i = 0; i < $1->GetCount(); i++)
+            {
+              rb_ary_push($result,DBL2NUM( $1->Item(i) ) );
+            }
+            __CODE
+        end
         # add convenience method providing efficient gc memory management
         spec.add_extend_code 'wxGraphicsContext', <<~__HEREDOC
           static VALUE draw_on(wxWindow* win)

diff --git a/rakelib/lib/director/pgproperty.rb b/rakelib/lib/director/pgproperty.rb
@@ -51,6 +51,35 @@ def setup
               return (*self)[idx];
             }
           __HEREDOC
+          # for GetIndicesForStrings
+          spec.map 'wxArrayString *unmatched' => 'Array,nil' do
+
+            map_in temp: 'wxArrayString tmp, VALUE rb_unmatched', code: <<~__CODE
+              rb_unmatched = $input;
+              if (!NIL_P(rb_unmatched)) 
+              {
+                if (TYPE(rb_unmatched) == T_ARRAY)
+                {
+                  $1 = &tmp;
+                }
+                else
+                {
+                  SWIG_exception_fail(SWIG_TypeError, Ruby_Format_TypeError( "", "Array", "GetIndicesForStrings", $argnum, $input ));
+                } 
+              }
+              __CODE
+
+            map_argout by_ref: true, code: <<~__CODE
+              if (!NIL_P(rb_unmatched$argnum))
+              {
+                for (size_t i = 0; i < $1->GetCount(); i++)
+                {
+                  rb_ary_push(rb_unmatched$argnum,WXSTR_TO_RSTR( $1->Item(i) ) );
+                }
+              }
+              __CODE
+
+          end
           spec.disown 'wxPGProperty *prop', 'wxPGProperty *childProperty'
           # do not think this useful for wxRuby (Also; caused GC problems)
           spec.ignore 'wxPGProperty::GetCellRenderer'

diff --git a/rakelib/lib/director/richtext_buffer.rb b/rakelib/lib/director/richtext_buffer.rb
@@ -36,6 +36,35 @@ def setup
             %set_constant("$symname", rb_str_new2((const char *)wxString($value).utf8_str()));
           }
           __HEREDOC
+        # for GetExtWildcard
+        spec.map 'wxArrayInt* types' => 'Array,nil' do
+
+          map_in temp: 'wxArrayInt tmp, VALUE rb_types', code: <<~__CODE
+            rb_types = $input;
+            if (!NIL_P(rb_types)) 
+            {
+              if (TYPE(rb_types) == T_ARRAY)
+              {
+                $1 = &tmp;
+              }
+              else
+              {
+                SWIG_exception_fail(SWIG_TypeError, Ruby_Format_TypeError( "", "Array","wxRichTextBuffer::GetExtWildcard", $argnum, $input ));
+              } 
+            }
+            __CODE
+
+          map_argout by_ref: true, code: <<~__CODE
+            if (!NIL_P(rb_types$argnum))
+            {
+              for (size_t i = 0; i < $1->GetCount(); i++)
+              {
+                rb_ary_push(rb_types$argnum,INT2NUM( $1->Item(i) ) );
+              }
+            }
+            __CODE
+
+        end
         spec.do_not_generate(:functions)
         super
       end