Merge pull request #145 from swig-fortran/std-set

Update std::set to look more like std::vector

Author: sethrj

Examples/test-suite/fortran/li_std_set_runme.F90

@@ -16,7 +16,7 @@ subroutine test_multiset_int
   use li_std_set, only : multiset_int => set_int
   implicit none
   type(multiset_int) :: s
-  integer(c_size_t) :: num_erased
+  integer :: num_erased
 
   s = multiset_int()
   ASSERT(s%empty())

Lib/fortran/std_multiset.i

@@ -5,36 +5,13 @@
  * keys.
  * ------------------------------------------------------------------------- */
 
-%{
-#include <set>
-%}
-
-%fortransubroutine std::multiset::erase;
+%include "std_set.i"
 
 namespace std {
-
 template<class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> >
 class multiset {
-public:
-  typedef _Key value_type;
-  typedef _Key key_type;
-  typedef std::size_t size_type;
-  typedef ptrdiff_t difference_type;
-  typedef value_type *pointer;
-  typedef const value_type *const_pointer;
-  typedef value_type &reference;
-  typedef const value_type &const_reference;
-  typedef _Alloc allocator_type;
-
-public:
-  set();
-
-  bool empty() const;
-  size_type size() const;
-  void clear();
-  size_type erase(const key_type& x);
-  size_type count(const key_type& x) const;
-  void insert(const_reference x);
+  SWIG_STD_SET_COMMON(multiset, _Key, _Compare, _Alloc)
 };
-} // namespace std
+} // end namespace std
+
 

Lib/fortran/std_set.i

@@ -2,17 +2,16 @@
  * std_set.i
  * ------------------------------------------------------------------------- */
 
+%include "std_common.i"
+
 %{
 #include <set>
 %}
 
-%fortransubroutine std::set::erase;
-
-namespace std {
+%define SWIG_STD_SET_COMMON(CLASS, _Key, _Compare, _Alloc)
 
-template<class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> >
-class set {
 public:
+  // Typedefs
   typedef _Key value_type;
   typedef _Key key_type;
   typedef std::size_t size_type;
@@ -24,14 +23,27 @@ public:
   typedef _Alloc allocator_type;
 
 public:
-  set();
+  CLASS();
+
+  // - Use native Fortran integers in proxy code
+  %apply int FORTRAN_INT {size_type};
 
   bool empty() const;
   size_type size() const;
   void clear();
+
+  %fortransubroutine erase;
+
   size_type erase(const key_type& x);
   size_type count(const key_type& x) const;
   void insert(const_reference x);
+
+%enddef
+
+namespace std {
+template<class _Key, class _Compare = std::less<_Key>, class _Alloc = std::allocator<_Key> >
+class set {
+  SWIG_STD_SET_COMMON(set, _Key, _Compare, _Alloc)
 };
+} // end namespace std
 
-} // namespace std