highperformancecoder
diff --git a/‎function.h‎
Lines changed: 21 additions & 21 deletions b/‎function.h‎
Lines changed: 21 additions & 21 deletions
diff --git a/‎pythonExample/example.py‎
Lines changed: 2 additions & 2 deletions b/‎pythonExample/example.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎python_base.h‎
Lines changed: 17 additions & 9 deletions b/‎python_base.h‎
Lines changed: 17 additions & 9 deletions
@@ -117,27 +117,27 @@ namespace classdesc
 #include "functiondb.h"
 
 #if defined(__cplusplus) && __cplusplus>=201103L 
-    // for generic function objects
-    template <class F> 
-    struct Arity
-    {
-      static const int V=Arity<decltype(&F::operator())>::V;
-      static const int value=V;
-    };
-
-    template <class F> 
-    struct Return
-    {
-      typedef typename Return<decltype(&F::operator())>::T T;
-      typedef T type;
-    };
-
-    template <class F, int i> 
-    struct Arg
-    {
-      typedef typename Arg<decltype(&F::operator()),i>::T T;
-      typedef T type;
-    };
+//    // for generic function objects
+//    template <class F> 
+//    struct Arity
+//    {
+//      static const int V=Arity<decltype(&F::operator())>::V;
+//      static const int value=V;
+//    };
+//
+//    template <class F> 
+//    struct Return
+//    {
+//      typedef typename Return<decltype(&F::operator())>::T T;
+//      typedef T type;
+//    };
+//
+//    template <class F, int i> 
+//    struct Arg
+//    {
+//      typedef typename Arg<decltype(&F::operator()),i>::T T;
+//      typedef T type;
+//    };
 #endif
 
     template <class O, class M>
 
@@ -11,8 +11,8 @@
 assert len(r.bar.c)==len('\r hello & 123 ')
 assert len(r.bar.c1)==2
 # doesn't work???
-#for i in r.bar.c1:
-#    assert i=='\r'
+for i in r.bar.c1:
+    assert i=='\r'
 assert len(r.bar.d)==3
 for i in range(len(r.bar.d)):
     assert r.bar.d[i]==i
 
@@ -56,12 +56,12 @@ namespace classdesc
     {
       typedef boost::mpl::vector<typename Arg<F,Arity<F>::V>::T> T;
     };
-  
+
     template <class F,int N> struct SigArg
     {
       typedef typename boost::mpl::push_front<
-        typename Arg<F,Arity<F>::V-N+1>::T,
-        typename SigArg<F,N-1>::T
+        typename SigArg<F,N-1>::T,
+        typename Arg<F,Arity<F>::V-N+1>::T
         >::type T;
     };
 
@@ -84,13 +84,13 @@ namespace classdesc
     };
 
     template <class T>
-    Len<T> len(T& x) {return Len<T>(x);}
+    size_t len(T& x) {return x.size();}
 
     template <class T> struct GetItem
     {
       T& container;
       GetItem(T& container): container(container) {}
-      typename T::value_type operator()(T&,size_t n) const {
+      typename T::value_type operator()(T& c,size_t n) const {
         if (n>=container.size())
           throw std::out_of_range("index out of bounds");
         typename T::iterator i=container.begin();
@@ -100,7 +100,13 @@ namespace classdesc
     };
 
     template <class T>
-    GetItem<T> getItem(T& x) {return GetItem<T>(x);}
+    typename T::value_type getItem(const T& c, size_t n) {
+        if (n>=c.size())
+          throw std::out_of_range("index out of bounds");
+        typename T::const_iterator i=c.begin();
+        std::advance(i,n);
+        return *i;
+    }
 
     template <class U> struct Sig<Len<U>>
     {
@@ -617,9 +623,11 @@ namespace classdesc
   template <class T>
   typename enable_if<is_sequence<T>,void>::T
   python(python_t& p, const string& d, T& a) {
-    boost::python::class_<T>((tail(d)+"_type").c_str()).
-      def("__len__", detail::len(a)).
-      def("__getitem__", detail::getItem(a));
+    //boost::python::class_<T>((tail(d)+"_type").c_str()).
+    auto& c=p.getClass<T>();
+    if (!c.completed)
+      c.def("__len__", &detail::len<T>).
+      def("__getitem__", &detail::getItem<T>);
     p.addObject(d,a);
   }