Finished std::pair and std::map support.

li_std_pair_extra test fails, because the _runme.py uses the
secret 'this' member variable, which doesn't exist when the
-builtin option is used.  Seems like a flaw in the test.

Test suite now fails on li_std_string_extra, because static
member variables are not fully implemented.



git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/szager-python-builtin@12351 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Lib/python/std_map.i

@@ -119,6 +119,17 @@
       return new SwigPyMapKeyIterator_T<OutIter>(current, begin, end, seq);
     }
 
+    template<typename Sequence>
+    inline PyObject* make_output_key_iterator_builtin (PyObject *pyself)
+    {
+      SwigPyObject *builtin_obj = (SwigPyObject*) pyself;
+      Sequence *seq = reinterpret_cast< Sequence * >(builtin_obj->ptr);
+      if (!seq)
+        return SWIG_Py_Void();
+      SwigPyIterator *iter = make_output_key_iterator(seq->begin(), seq->begin(), seq->end(), pyself);
+      return SWIG_NewPointerObj(iter, SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN);
+    }
+
     template<class OutIterator,
 	     class FromOper = from_value_oper<typename OutIterator::value_type> >
     struct SwigPyMapValueITerator_T : SwigPyMapIterator_T<OutIterator, FromOper>
@@ -136,6 +147,7 @@
     {
       return new SwigPyMapValueITerator_T<OutIter>(current, begin, end, seq);
     }
+
   }
 }
 
@@ -143,6 +155,37 @@
   %swig_sequence_iterator(Map);
   %swig_container_methods(Map)
 
+#if defined(SWIGPYTHON_BUILTIN)
+  %feature("pyslot", "mp_length", functype="lenfunc") __len__;
+  %feature("pyslot", "mp_subscript", functype="binaryfunc") __getitem__;
+  %feature("tp_iter") Map "&swig::make_output_key_iterator_builtin< Map >";
+
+  %extend {
+    %newobject iterkeys(PyObject **PYTHON_SELF);
+    swig::SwigPyIterator* iterkeys(PyObject **PYTHON_SELF) {
+      return swig::make_output_key_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+      
+    %newobject itervalues(PyObject **PYTHON_SELF);
+    swig::SwigPyIterator* itervalues(PyObject **PYTHON_SELF) {
+      return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+
+    %newobject iteritems(PyObject **PYTHON_SELF);
+    swig::SwigPyIterator* iteritems(PyObject **PYTHON_SELF) {
+      return swig::make_output_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
+    }
+  }
+
+#else
+  %extend {
+    %pythoncode {def __iter__(self): return self.key_iterator()}    
+    %pythoncode {def iterkeys(self): return self.key_iterator()}
+    %pythoncode {def itervalues(self): return self.value_iterator()}
+    %pythoncode {def iteritems(self): return self.iterator()}
+  }
+#endif
+
   %extend {
     mapped_type __getitem__(const key_type& key) const throw (std::out_of_range) {
       Map::const_iterator i = self->find(key);
@@ -151,7 +194,7 @@
       else
 	throw std::out_of_range("key not found");
     }
-    
+
     void __delitem__(const key_type& key) throw (std::out_of_range) {
       Map::iterator i = self->find(key);
       if (i != self->end())
@@ -236,16 +279,24 @@
     swig::SwigPyIterator* value_iterator(PyObject **PYTHON_SELF) {
       return swig::make_output_value_iterator(self->begin(), self->begin(), self->end(), *PYTHON_SELF);
     }
-
-    %pythoncode {def __iter__(self): return self.key_iterator()}    
-    %pythoncode {def iterkeys(self): return self.key_iterator()}
-    %pythoncode {def itervalues(self): return self.value_iterator()}
-    %pythoncode {def iteritems(self): return self.iterator()}
   }
+
 %enddef
 
 %define %swig_map_methods(Map...)
   %swig_map_common(Map)
+
+#if defined(SWIGPYTHON_BUILTIN)
+  %feature("pyslot", "mp_ass_subscript", functype="objobjargproc") __setitem__;
+
+  %extend {
+      // This will be called through the mp_ass_subscript slot to delete an entry.
+      void __setitem__(const key_type& key) {
+	  self->erase(key);
+      }
+   }
+#endif
+
   %extend {
     void __setitem__(const key_type& key, const mapped_type& x) throw (std::out_of_range) {
       (*self)[key] = x;