Add support for C complex variables

Author: sethrj

Examples/test-suite/fortran/Makefile.in

@@ -36,6 +36,7 @@ C_TEST_CASES = \
 	fortran_bindc_c \
 	fortran_callback_c \
 	fortran_global_const \
+	complextest_c \
 
 FAILING_CPP_TESTS += \
 	contract \

Examples/test-suite/fortran/complextest_c_runme.F90

@@ -0,0 +1,25 @@
+! File : complextest_c_runme.F90
+
+#include "fassert.h"
+
+program complextest_c_runme
+  use complextest_c
+  use ISO_C_BINDING
+  implicit none
+  complex(C_FLOAT_COMPLEX) :: cflt
+  complex(C_DOUBLE_COMPLEX) :: cdbl 
+
+  cflt = (1, 3) ! 1 + 3i
+  cflt = Conjf(cflt)
+  ASSERT(cflt == (1, -3))
+
+  cdbl = (4.0000000001d0, 1d0)
+  ASSERT(Conj(cdbl) == (4.0000000001d0, -1d0))
+
+  cdbl = (4, 5)
+  cdbl = Conj2(cdbl)
+  ASSERT(cdbl == (4d0, -5d0))
+
+end program
+
+

Lib/fortran/ccomplex.i

@@ -8,8 +8,20 @@
 #define SWIG_ccomplex_construct(REAL, IMAG) ((REAL) + I * (IMAG))
 %}
 
-%define %fortran_typemap_ccomplex(CPLX_TYPE, CTYPE, FKIND)
-  %fortran_typemap_complex(CPLX_TYPE, SWIG_ccomplex_construct, CTYPE, FKIND)
+/* TODO: SWIG's parser defines "complex" but does *not* define _Complex;
+ * this is the reverse of the standard. */
+#define _Complex complex
+
+%define %fortran_typemap_ccomplex(CTYPE, FKIND)
+  %fortran_typemap_complex(complex CTYPE, SWIG_ccomplex_construct, CTYPE, FKIND)
 %enddef
 
-#error "C complex numbers are not currently supported"
+%fortran_typemap_ccomplex(float, C_FLOAT_COMPLEX)
+%fortran_typemap_ccomplex(double, C_DOUBLE_COMPLEX)
+
+%typemap(out, fragment="SWIG_complex_float", noblock=1) complex float
+{$result = SWIG_create_complex_float(crealf($1), cimagf($1));}
+%typemap(out, fragment="SWIG_complex_double", noblock=1) complex double
+{$result = SWIG_create_complex_double(creal($1), cimag($1));}
+
+

Lib/fortran/complex.i

@@ -1,12 +1,16 @@
 %define %fortran_typemap_complex(CPPTYPE, CONSTRUCT_CPPTYPE, CTYPE, FKIND)
 
 %fragment("SWIG_complex_"{CTYPE}, "header", noblock=1) {
+#ifdef __cplusplus
 extern "C" {
+#endif
 typedef struct {
   CTYPE real;
   CTYPE imag;
 } SwigComplex_ ## CTYPE;
+#ifdef __cplusplus
 }
+#endif
 
 SWIGINTERN SwigComplex_ ## CTYPE SWIG_create_complex_ ## CTYPE(CTYPE real, CTYPE imag) {
   SwigComplex_ ## CTYPE result;
@@ -18,11 +22,11 @@ SWIGINTERN SwigComplex_ ## CTYPE SWIG_create_complex_ ## CTYPE(CTYPE real, CTYPE
 
 struct SwigComplex_ ## CTYPE;
 
-%naturalvar CPPTYPE;
-
 %fortran_intrinsic(SwigComplex_ ## CTYPE, complex, FKIND)
 %fortran_apply_typemaps(SwigComplex_ ## CTYPE, CPPTYPE)
 
+// _Complex and std::complex are required to have the same layout as
+// struct { double real, imag; };, so array interfaces should be equivalent
 %apply SwigComplex_ ## CTYPE { CPPTYPE };
 %apply SwigComplex_ ## CTYPE[] { CPPTYPE[] };
 %apply SwigComplex_ ## CTYPE ARRAY[] { CPPTYPE ARRAY[] };
@@ -34,9 +38,6 @@ struct SwigComplex_ ## CTYPE;
 %typemap(in, noblock=1) CPPTYPE {
   $1 = CONSTRUCT_CPPTYPE($input->real, $input->imag);
 }
-%typemap(out, fragment="SWIG_complex_"{CTYPE}, noblock=1) CPPTYPE
-{$result = SWIG_create_complex_ ## CTYPE($1.real(), $1.imag());}
-
 %typemap(out, noblock=1) CPPTYPE&
 {$result = (SwigComplex_ ## CTYPE*)($1);}
 
@@ -45,9 +46,6 @@ struct SwigComplex_ ## CTYPE;
   temp = CONSTRUCT_CPPTYPE($input->real, $input->imag);
   $1 = &temp;
 }
-%typemap(out, noblock=1) const CPPTYPE&
-{$result = SWIG_create_complex_ ## CTYPE($1->real(), $1->imag());}
-
 %enddef // %fortran_typemap_complex
 
 #ifdef __cplusplus

Lib/fortran/std_complex.i

@@ -13,7 +13,14 @@ namespace std {
 
 %define %fortran_typemap_std_complex(CTYPE, FKIND)
   %template() std::complex<CTYPE>;
+  %naturalvar std::complex<CTYPE>;
   %fortran_typemap_complex(std::complex<CTYPE>, std::complex<CTYPE>, CTYPE, FKIND)
+
+  %typemap(out, fragment="SWIG_complex_"{CTYPE}, noblock=1) std::complex<CTYPE>
+{$result = SWIG_create_complex_ ## CTYPE($1.real(), $1.imag());}
+  %typemap(out, noblock=1) const std::complex<CTYPE>&
+{$result = SWIG_create_complex_ ## CTYPE($1->real(), $1->imag());}
+
 %enddef
 
 %fortran_typemap_std_complex(float, C_FLOAT_COMPLEX)