Fix operators and mark failing director tests

Operators require `intent(in)` on classes.

Author: sethrj

Examples/test-suite/fortran/Makefile.in

@@ -56,6 +56,50 @@ FAILING_CPP_TESTS += \
 	cpp11_rvalue_reference2 \
 	cpp11_rvalue_reference3 \
 	cpp11_default_delete \
+	allprotected \
+	apply_strings \
+	apply_signed_char \
+	director_abstract \
+	director_binary_string \
+	director_classic \
+	director_basic \
+	director_default \
+	director_detect \
+	director_classes \
+	director_exception_catches \
+	director_exception_nothrow \
+	director_exception \
+	director_enum \
+	director_frob \
+	director_nested \
+	director_extend \
+	director_nspace_director_name_collision \
+	director_nspace \
+	director_keywords \
+	director_overload \
+	director_namespace_clash \
+	director_pass_by_value \
+	director_ignore \
+	director_ownership \
+	director_protected \
+	director_ref \
+	director_property \
+	director_primitives \
+	director_smartptr \
+	director_unroll \
+	director_overload2 \
+	director_protected_overloaded \
+	director_using \
+	director_redefined \
+	director_wombat \
+	director_void \
+	li_boost_shared_ptr_director \
+	nested_directors \
+	typemap_directorout \
+	director_string \
+	cpp11_director_enums \
+	cpp11_directors \
+	cpp11_function_objects \
 
 FAILING_C_TESTS += \
 	char_constant \

Examples/test-suite/fortran/director_simple_runme.F90

@@ -8,43 +8,44 @@ module director_simple_mod
   use director_simple, only : IntBase, BoolBase
   implicit none
 
- type, extends(IntBase), public :: MyIntDerived
-   integer(C_INT) :: multiply_by = 1
-   integer(C_INT) :: add_to = 0
- contains
-  procedure :: apply => MyIntDerived_apply
- end type MyIntDerived
-  
- type, extends(BoolBase), public :: MyBoolDerived
-   integer :: call_count = 0
- contains
-  procedure :: apply => MyBoolDerived_apply
- end type MyBoolDerived
-  
+  integer :: call_count
+
+  type, extends(IntBase), public :: MyIntDerived
+    integer(C_INT) :: multiply_by = 1
+    integer(C_INT) :: add_to = 0
+  contains
+    procedure :: apply => MyIntDerived_apply
+  end type MyIntDerived
+   
+  type, extends(BoolBase), public :: MyBoolDerived
+    integer :: call_count = 0
+  contains
+    procedure :: apply => MyBoolDerived_apply
+  end type MyBoolDerived
+   
 contains
-
+ 
 function MyIntDerived_apply(self, x) &
-result(myresult)
-use, intrinsic :: ISO_C_BINDING
-class(MyIntDerived) :: self
-integer(C_INT), intent(in) :: x
-integer(C_INT) :: myresult
+  result(myresult)
+  use, intrinsic :: ISO_C_BINDING
+  class(MyIntDerived), intent(in) :: self
+  integer(C_INT), intent(in) :: x
+  integer(C_INT) :: myresult
 
-myresult = x * self%multiply_by + self%add_to
+  myresult = x * self%multiply_by + self%add_to
 end function
 
 function MyBoolDerived_apply(self, a, b) &
-result(myresult)
-use, intrinsic :: ISO_C_BINDING
-class(MyBoolDerived) :: self
-logical, intent(in) :: a
-logical, intent(in) :: b
-logical :: myresult
-
-myresult = a .or. b
-self%call_count = self%call_count + 1
+  result(myresult)
+  use, intrinsic :: ISO_C_BINDING
+  class(MyBoolDerived), intent(in) :: self
+  logical, intent(in) :: a
+  logical, intent(in) :: b
+  logical :: myresult
+  
+  myresult = a .or. b
+  call_count = call_count + 1
 end function
-
 end module
 
 program director_simple_runme
@@ -101,12 +102,13 @@ subroutine test_director_bool
   call swig_initialize(myclass, source=BoolBase())
 
   ! Direct Fortran call
+  call_count = 0
   ASSERT(myclass%apply(.true., .false.))
   ASSERT(.not. myclass%apply(.false., .false.))
   ! Call through C director
   ASSERT(apply(myclass, .true., .false.))
   ASSERT(.not. apply(myclass, .false., .false.))
-  ASSERT(myclass%call_count == 4)
+  ASSERT(call_count == 4)
 
   call myclass%release()
 

Examples/test-suite/fortran/equality_runme.F90

@@ -0,0 +1,22 @@
+! File : equality_runme.F90
+
+#include "fassert.h"
+
+program equality_runme
+  use equality
+  use ISO_C_BINDING
+  implicit none
+  type(EqualOpDefined) :: a
+  type(EqualOpDefined) :: b
+
+  a = EqualOpDefined(5)
+  b = EqualOpDefined() ! default in C++ is 5
+  ASSERT(a%get_x() == b%get_x())
+  ASSERT(a == b)
+  ! ASSERT(a /= b) No inequality operator is defined
+  call b%set_x(4)
+  ASSERT(.not. (a == b))
+
+end program
+
+

Lib/fortran/classes.swg

@@ -352,7 +352,7 @@ SWIGINTERN void SWIG_assign(SwigClassWrapper* self, SwigClassWrapper other) {
 // Raw pointers act mostly like value types, but they don't have to accept the exact type (polymorphic input, non-polymorphic output). Intent is 'in' because
 // we're not modifying the pointer or memory status.
 %apply SWIGTYPE { SWIGTYPE* };
-%typemap(ftype, in="class($fortranclassname)", nofortransubroutine=1) SWIGTYPE*
+%typemap(ftype, in="class($fortranclassname), intent(in)", nofortransubroutine=1) SWIGTYPE*
   "type($fortranclassname)"
 %typemap(in, noblock=1) SWIGTYPE* {
   $1 = ($1_ltype)$input->cptr;