Update C complex support

Author: sethrj

Examples/test-suite/complextest_c.i

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

Examples/test-suite/fortran/Makefile.in

@@ -1,9 +1,9 @@
-! File : complextest_c_runme.F90
+! File : ccomplextest_runme.F90
 
 #include "fassert.h"
 
-program complextest_c_runme
-  use complextest_c
+program ccomplextest_runme
+  use ccomplextest
   use ISO_C_BINDING
   implicit none
   complex(C_FLOAT_COMPLEX) :: cflt

Examples/test-suite/fortran/complextest_c_runme.F90 renamed to Examples/test-suite/fortran/ccomplextest_runme.F90

@@ -8,20 +8,21 @@
 #define SWIG_ccomplex_construct(REAL, IMAG) ((REAL) + I * (IMAG))
 %}
 
-/* TODO: SWIG's parser defines "complex" but does *not* define _Complex;
- * this is the reverse of the standard. */
-#define _Complex complex
+// Avoid substituting the fortran type 'complex' until we've set up the typemaps
+#undef complex
 
 %define %fortran_typemap_ccomplex(CTYPE, FKIND)
-  %fortran_typemap_complex(complex CTYPE, SWIG_ccomplex_construct, CTYPE, FKIND)
+  %fortran_typemap_complex(CTYPE _Complex, SWIG_ccomplex_construct, CTYPE, FKIND)
 %enddef
 
 %fortran_typemap_ccomplex(float, C_FLOAT_COMPLEX)
 %fortran_typemap_ccomplex(double, C_DOUBLE_COMPLEX)
 
-%typemap(out, fragment="SWIG_complex_float", noblock=1) complex float
+%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
+%typemap(out, fragment="SWIG_complex_double", noblock=1) _Complex double
 {$result = SWIG_create_complex_double(creal($1), cimag($1));}
 
+/* Including <complex.h> defines 'complex' as _Complex */
+#define complex _Complex
 

Lib/fortran/ccomplex.i

@@ -32,7 +32,7 @@ struct SwigComplex_ ## CTYPE;
 %apply SwigComplex_ ## CTYPE ARRAY[] { CPPTYPE ARRAY[] };
 %apply SwigComplex_ ## CTYPE[ANY] { CPPTYPE[ANY] };
 
-%typemap(ctype, in={SwigComplex_ ## CTYPE*}, null={SWIG_create_complex_ ## CTYPE(0, 0)}, fragment="SWIG_complex_"{CTYPE}, noblock=1) CPPTYPE {
+%typemap(ctype, in="SwigComplex_" #CTYPE "*", null="SWIG_create_complex_" # CTYPE "(0, 0)", fragment="SWIG_complex_"{CTYPE}, noblock=1) CPPTYPE {
   SwigComplex_ ## CTYPE
 }
 %typemap(in, noblock=1) CPPTYPE {