Fix return-by-array-pointer, and for const versions

Author: sethrj

Examples/test-suite/fortran/Makefile.in

@@ -26,6 +26,7 @@ CPP_TEST_CASES = \
 	fortran_naming \
 	fortran_onlywrapped \
 	fortran_overloads \
+	fortran_std_span \
 	fortran_subroutine \
 	li_std_set \
 	complextest \

Examples/test-suite/fortran_std_span.i

@@ -11,16 +11,16 @@ class span
   typedef int index_type;
   typedef _Tp* pointer;
 
-  span() : d_ptr(NULL), d_size(0) {}
-  span(pointer d, index_type s) : d_ptr(d), d_size(s) {}
-  span(pointer first, pointer last) : d_ptr(first), d_size(last - first) {}
+  span() : ptr_(NULL), size_(0) {}
+  span(pointer d, index_type s) : ptr_(d), size_(s) {}
+  span(pointer first, pointer last) : ptr_(first), size_(last - first) {}
 
-  pointer data() const { return d_ptr; }
-  index_type size() const { return d_size; }
+  pointer data() const { return ptr_; }
+  index_type size() const { return size_; }
 
  private:
-  pointer d_ptr;
-  index_type d_size;
+  pointer ptr_;
+  index_type size_;
 };
 } // namespace std
 
@@ -30,6 +30,8 @@ class span
 
 %template() std::span<int>;
 %template() std::span<const int>;
+%template() std::span<unsigned int>;
+%template() std::span<const unsigned int>;
 
 %inline %{
 std::span<int> get_by_value() {

Lib/fortran/fortranarray.swg

@@ -97,7 +97,8 @@ end subroutine}
   %typemap(imtype) CPPTYPE& = CPPTYPE;
   %typemap(ctype) CPPTYPE& = CPPTYPE;
 
-  // Update the resulting Fortran pointer.
-  //%typemap(fargout, match="argout", noblock=1) CPPTYPE& = VTYPE[]&;
+  // Update the resulting Fortran pointer, but only by reference (not const ref)
+  %typemap(fargout, match="fin", noblock=1) CPPTYPE& = VTYPE ARRAY[];
+  %typemap(fargout, noblock=1) const CPPTYPE& {};
 %enddef
 

Lib/fortran/fundamental.swg

@@ -203,7 +203,10 @@ end subroutine}
 
   // Define proxy code typemaps for an array of this type
   %fortran_typemap_finout(CTYPE[], CTYPE ARRAY[])
-
+  %typemap(fargout, fragment="SWIG_fout"{CTYPE[]}, noblock=1) CTYPE ARRAY[] {
+  call %fortrantm(fout, CTYPE[])($1, $input)
+  }
+  %typemap(fargout) CTYPE const ARRAY[] = CTYPE ARRAY[];
 %enddef
 
 /*!
@@ -225,6 +228,8 @@ end subroutine}
 
   %typemap(fin) DSTTYPE ARRAY[] = SRCTYPE ARRAY[];
   %typemap(fout) DSTTYPE ARRAY[] = SRCTYPE ARRAY[];
+  %typemap(fargout) DSTTYPE ARRAY[] = SRCTYPE ARRAY[];
+  %typemap(fargout) DSTTYPE const ARRAY[] = SRCTYPE const ARRAY[];
 %enddef
 
 /* -------------------------------------------------------------------------