better STL support, see CHANGES.current

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5755 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Lib/python/std_deque.i

@@ -1,23 +1,152 @@
-/* Default std_deque wrapper */
-%module std_deque
+//
+// std::deque
+// Python implementation
 
-%rename(__getitem__) std::deque::getitem;
-%rename(__setitem__) std::deque::setitem;
-%rename(__delitem__) std::deque::delitem;
-%rename(__getslice__) std::deque::getslice;
-%rename(__setslice__) std::deque::setslice;
-%rename(__delslice__) std::deque::delslice;
+%include std_container.i
 
-%extend std::deque {
-   int __len__() {
-       return (int) self->size();
-   }
-   int __nonzero__() {
-       return ! self->empty();
-   }
-   void append(const T &x) {
-       self->push_back(x);
-   }
-};
+// Deque
+
+%define %std_deque_methods(deque)  
+  %std_sequence_methods(deque)
+
+  void pop_front();
+  void push_front(const value_type& x);
+%enddef
+
+%define %std_deque_methods_val(deque)
+  %std_sequence_methods_val(deque)
+
+  void pop_front();
+  void push_front(value_type x);
+%enddef
+
+// ------------------------------------------------------------------------
+// std::deque
+// 
+// The aim of all that follows would be to integrate std::deque with 
+// Python as much as possible, namely, to allow the user to pass and 
+// be returned Python tuples or lists.
+// const declarations are used to guess the intent of the function being
+// exported; therefore, the following rationale is applied:
+// 
+//   -- f(std::deque<T>), f(const std::deque<T>&):
+//      the parameter being read-only, either a Python sequence or a
+//      previously wrapped std::deque<T> can be passed.
+//   -- f(std::deque<T>&), f(std::deque<T>*):
+//      the parameter may be modified; therefore, only a wrapped std::deque
+//      can be passed.
+//   -- std::deque<T> f(), const std::deque<T>& f():
+//      the deque is returned by copy; therefore, a Python sequence of T:s 
+//      is returned which is most easily used in other Python functions
+//   -- std::deque<T>& f(), std::deque<T>* f():
+//      the deque is returned by reference; therefore, a wrapped std::deque
+//      is returned
+//   -- const std::deque<T>* f(), f(const std::deque<T>*):
+//      for consistency, they expect and return a plain deque pointer.
+// ------------------------------------------------------------------------
+
+%{
+#include <deque>
+%}
+
+%fragment("StdDequeTraits","header",fragment="StdSequenceTraits")
+%{
+  namespace swigpy {
+    template <class T>
+    struct traits_asptr<std::deque<T> >  {
+      typedef std::deque<T> deque_type;
+      typedef T value_type;
+      static int asptr(PyObject *obj, deque_type **vec) {
+	return traits_asptr_stdseq<deque_type>::asptr(obj, vec);
+      }
+    };
+
+    template <class T>
+    struct traits_from<std::deque<T> > {
+      typedef std::deque<T> deque_type;
+      static PyObject *from(const deque_type& vec) {
+	return traits_from_stdseq<deque_type>::from(vec);
+      }
+    };
+  }
+%}
+
+// exported classes
+
+namespace std {
+
+  template<class T > class deque {
+  public:
+    typedef size_t size_type;
+    typedef ptrdiff_t difference_type;
+    typedef T value_type;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type& reference;
+    typedef const value_type& const_reference;
+
+    %traits_swigtype(T);
+
+    %fragment(SWIG_Traits_frag(std::deque<T >), "header",
+	      fragment=SWIG_Traits_frag(T),
+	      fragment="StdDequeTraits") {
+      namespace swigpy {
+	template <>  struct traits<std::deque<T > > {
+	  typedef pointer_category category;
+	  static const char* type_name() {
+	    return "std::deque<" #T " >";
+	  }
+	};
+      }
+    }
+
+    %typemap_traits_ptr(SWIG_CCode(DEQUE), std::deque<T >);
+  
+    %std_deque_methods(std::deque<T >);
+    %pysequence_methods(std::deque<T >);
+  };
+
+  template<class T > class deque<T*> {
+  public:
+    typedef size_t size_type;
+    typedef ptrdiff_t difference_type;
+    typedef T* value_type;
+    typedef value_type* pointer;
+    typedef const value_type* const_pointer;
+    typedef value_type reference;
+    typedef value_type const_reference;
+
+    %fragment(SWIG_Traits_frag(std::deque<T* >), "header",
+	      fragment="StdDequeTraits") {
+      namespace swigpy {
+	template <>  struct traits<std::deque<T* > > {
+	  typedef value_category category;
+	  static const char* type_name() {
+	    return "std::deque<" #T " * >";
+	  }
+	};
+      }
+    }
+
+    %typemap_traits_ptr(SWIG_CCode(DEQUE), std::deque<T* >);
+
+    %std_deque_methods_val(std::deque<T* >);
+    %pysequence_methods_val(std::deque<T* >);
+  };
+
+  // Add the order operations <,>,<=,=> as needed
+  
+  %define %std_order_deque(T)
+    %std_comp_methods(deque<T>);
+  %enddef
+  
+  %apply_otypes(%std_order_deque);
+}
+
+
+%define %std_deque_ptypen(...) 
+%template() std::deque<__VA_ARGS__ >;
+%enddef
+
+%apply_cpptypes(%std_deque_ptypen);
 
-%include "_std_deque.i"