Make char* take native Fortran character type

Author: sethrj

Examples/test-suite/fortran/char_binary_runme.F90

@@ -6,7 +6,7 @@ program char_binary_runme
   use char_binary
   use ISO_C_BINDING
   implicit none
-  character(kind=C_CHAR, len=*), parameter :: withnull = "hil" // C_NULL_CHAR
+  character(len=*), parameter :: withnull = "hil" // C_NULL_CHAR
   type(Test) :: t
 
   if (len(withnull) /= 4) stop 2

Examples/test-suite/fortran/extend_template_method_runme.F90

@@ -9,7 +9,7 @@ program extend_template_method_runme
   type(ExtendMe) :: em
   type(TemplateExtend) :: tm
   real(C_DOUBLE) :: dbl
-  character(kind=C_CHAR, len=:), allocatable :: str
+  character(len=:), allocatable :: str
 
   em = ExtendMe()
   dbl = em%do_stuff_double(1, 1.1d0)

Examples/test-suite/fortran/inctest_runme.F90

@@ -6,7 +6,7 @@ program inctest_runme
   use inctest
   use ISO_C_BINDING
   implicit none
-  character(kind=C_CHAR, len=:), allocatable :: instr, outstr
+  character(len=:), allocatable :: instr, outstr
   ! If the 'includes' fail, these will produce compiler errors
   type(A) :: ai
   type(B) :: bi

Lib/fortran/fortranstrings.swg

@@ -15,14 +15,14 @@
 %fragment("SWIG_fin"{char*}, "fsubprograms", fragment="SwigArrayWrapper_f", noblock=1) {
 subroutine %fortrantm(fin, char*)(finp, iminp, temp)
   use, intrinsic :: ISO_C_BINDING
-  character(kind=C_CHAR, len=*), intent(in) :: finp
+  character(len=*), intent(in) :: finp
   type(SwigArrayWrapper), intent(out) :: iminp
   character(kind=C_CHAR), dimension(:), target, allocatable, intent(out) :: temp
   integer :: i
 
   allocate(character(kind=C_CHAR) :: temp(len(finp) + 1))
   do i=1,len(finp)
-    temp(i) = finp(i:i)
+    temp(i) = char(ichar(finp(i:i)), kind=C_CHAR)
   end do
   i = len(finp) + 1
   temp(i) = C_NULL_CHAR ! C finp compatibility
@@ -36,13 +36,13 @@ end subroutine
 subroutine %fortrantm(fout, char*)(imout, fout)
   use, intrinsic :: ISO_C_BINDING
   type(SwigArrayWrapper), intent(in) :: imout
-  character(kind=C_CHAR, len=:), allocatable, intent(out) :: fout
+  character(len=:), allocatable, intent(out) :: fout
   character(kind=C_CHAR), dimension(:), pointer :: chars
   integer(kind=C_SIZE_T) :: i
   call c_f_pointer(imout%data, chars, [imout%size])
   allocate(character(kind=C_CHAR, len=imout%size) :: fout)
   do i=1, imout%size
-    fout(i:i) = chars(i)
+    fout(i:i) = char(ichar(chars(i)))
   end do
 end subroutine
 }
@@ -69,8 +69,8 @@ end subroutine
 }
 
 // Fortran proxy code: return allocatable string
-%typemap(ftype, in="character(kind=C_CHAR, len=*), target") char *
-  "character(kind=C_CHAR, len=:), allocatable"
+%typemap(ftype, in="character(len=*), target") char *
+  "character(len=:), allocatable"
 
 %typemap(fin, fragment="SWIG_fin"{char*}, noblock=1,
          temp="character(kind=C_CHAR), dimension(:), allocatable, target"
@@ -107,8 +107,8 @@ end subroutine
   $2 = $input->size;
 }
 
-%typemap(ftype, in="character(kind=C_CHAR, len=*), target") (char *STRING, size_t LENGTH)
-  "character(kind=C_CHAR, len=:), allocatable"
+%typemap(ftype, in="character(len=*), target") (char *STRING, size_t LENGTH)
+  "character(len=:), allocatable"
 
 %typemap(fin, fragment="SWIG_fin"{char*}, noblock=1,
          temp="character(kind=C_CHAR), dimension(:), allocatable, target")