Fixed up handling of container indexing, and complex value_types.

Author: highperformancecoder

RESTProcessExample/example.py

@@ -57,9 +57,9 @@ def expectThrow(f):
 assert root.bar.c()=='hello world'
 
 assert root.bar.c1()==['\r','\r']
-assert root.bar.c1[0]()=='\r'
+assert root.bar.c1[0]=='\r'
 root.bar.c1[0]='x'
-assert root.bar.c1[0]()=='x'
+assert root.bar.c1[0]=='x'
 
 assert root.bar.ef()=='ea'
 assert root.bar.ef('eb')=='eb'
@@ -72,21 +72,21 @@ def expectThrow(f):
 
 assert root.bar.d()==[0,1,2]
 assert len(root.bar.d)==3
-assert root.bar.d[1]()==1
+assert root.bar.d[1]==1
 root.bar.d[1]=5
-assert root.bar.d[1]()==5
+assert root.bar.d[1]==5
 
 assert len(root.bar.d1)==2
 assert root.bar.d1[1]()==[3,4,5]
 root.bar.d1[1]=[6,7,8]
 assert root.bar.d1[1]()==[6,7,8]
 assert root.bar.d1()==[[0,1,2],[6,7,8]]
 root.bar.d1[1][2]=10
-assert root.bar.d1[1][2]()==10
+assert root.bar.d1[1][2]==10
 assert root.bar.h()==[2,2,2]
-assert root.bar.h[1]()==2
+assert root.bar.h[1]==2
 root.bar.h[1]=3
-assert root.bar.h[1]()==3
+assert root.bar.h[1]==3
 root.bar.h.insert(5)
 assert root.bar.h()==[2,3,2,5]
 root.bar.h.erase(1)
@@ -96,25 +96,25 @@ def expectThrow(f):
 assert root.bar.h._list()==[".@elem",".@elemNoThrow",".@erase",".@insert",".@size"]
 
 assert root.bar.l()==[2,2,2]
-assert root.bar.l[1]()==2
+assert root.bar.l[1]==2
 root.bar.l[1]=3
-assert root.bar.l[1]()==3
+assert root.bar.l[1]==3
 root.bar.l.insert(5)
 assert root.bar.l()==[2,3,2,5]
 assert root.bar.l([2,2,2,2])()==[2,2,2,2]
 
 assert root.bar.m()==[{"first":0,"second":5},{"first":3,"second":2}]
 assert len(root.bar.m)==2
 assert root.bar.m._signature()==[{"args":[],"ret":"std::map<int,int>"},{"args":["std::map<int,int>"],"ret":"std::map<int,int>"}]
-assert root.bar.m[3]()==2
+assert root.bar.m[3]==2
 root.bar.m[3]=5
-assert root.bar.m[3]()==5
+assert root.bar.m[3]==5
 
 root.bar.m.insert({"first":1,"second":2})
-assert root.bar.m[1]()==2
+assert root.bar.m[1]==2
 assert root.bar.m.contains(1)
 root.bar.m[10]=2
-assert root.bar.m[10]()==2
+assert root.bar.m[10]==2
 assert root.bar.m.contains(10)
 assert root.bar.m._type()=="std::map<int,int>"
 assert root.bar.m._list()==[".@elem",".@elemNoThrow",".@erase",".@insert",".@keys",".@size"]
@@ -129,14 +129,14 @@ def expectThrow(f):
 root.bar.um.insert({"first":1,"second":3})
 assert root.bar.um()==[{"first":1,"second":3}]
 root.bar.um[1]=5
-assert root.bar.um[1]()==5
+assert root.bar.um[1]==5
 
 assert root.bar.llex()==[["hello","hello"],["hello","hello"]]
 root.bar.llex[1]=["baa","baa","blacksheep"]
 assert root.bar.llex[1]()==["baa","baa","blacksheep"]
 assert root.bar.llex()==[["hello","hello"],["baa","baa","blacksheep"]]
 assert root.bar.llex._signature()==[{"args":[],"ret":"std::list<std::list<std::string>>"},{"args":["std::list<std::list<std::string>>"],"ret":"std::list<std::list<std::string>>"}]
-assert root.bar.llex[1][1]()=="baa"
+assert root.bar.llex[1][1]=="baa"
 
 # Should fail
 expectThrow(lambda: root.bar.iex())
@@ -161,9 +161,12 @@ def expectThrow(f):
 assert root.bar1.fooRef().b()==2
 assert root.bar1.f.name()=='Foo'
 
-assert root.bar1.vFoo[1]._properties()['b']==1
+assert root.bar1.vFoo[1]()['b']==1
+assert root.bar1.vFoo[1].b()==1
 expectThrow(lambda: root.bar1.vFoo[10])
 
+assert root.bar.mFoo['foo'].b()==2
+
 assert root.bar1.foo().b(3)==3
 assert root.bar1.foo().b()==2
 assert root.bar1.fooRef().b(3)==3
@@ -191,7 +194,7 @@ def expectThrow(f):
 assert root.bar.sm({"foo":1,"bar":2})._properties()=={"foo":1,"bar":2}
 assert root.bar.sm()=={"foo":1,"bar":2}
 assert root.bar.sm({"foo":1,"foobar":3})._properties()=={"foo":1,"foobar":3}
-assert root.bar.sm['foo']()==1
+assert root.bar.sm['foo']==1
 assert root.bar.sm.contains("foobar")
 root.bar.sm.erase("foobar")
 assert not root.bar.sm.contains("foobar")

pythonBuffer.h

@@ -30,13 +30,18 @@
 #include <numeric>
 #include <Python.h>
 
-#define CLASSDESC_PY_EXCEPTION_ABSORB(ret)              \
-  catch (const std::exception& ex)                      \
-    {                                                   \
-      PyErr_SetString(PyExc_RuntimeError, ex.what());   \
-      return ret;                                       \
+#define CLASSDESC_PY_EXCEPTION_ABSORB(ret)                              \
+  catch (const std::exception& ex)                                      \
+    {                                                                   \
+      PyErr_SetString(PyExc_RuntimeError, ex.what());                   \
+      return ret;                                                       \
+    }                                                                   \
+  catch (...)                                                           \
+    {                                                                   \
+      PyErr_SetString(PyExc_RuntimeError, "Unknown exception");         \
+      return ret;                                                   \
     }
-
+  
 namespace classdesc
 {
   // map of registries, one per module
@@ -407,10 +412,6 @@ namespace classdesc
     return b;
   }
 
-  /// call \a command on \a registry with \a arguments
-  /// returns a python object representing function's return value.
-  PyObject* callOnRegistry(const RPPtr& command, const string& remainder, const PythonBuffer& arguments);
-
   /// C++ wrapper to default initialise the PyObject
   struct CppPyObject: public PyObject
   {
@@ -421,7 +422,6 @@ namespace classdesc
   class CppWrapper;
   void attachRegistryObjects(const RESTProcess_t& registry, CppWrapper& object,const std::string& prefix);
 
-    
   struct CppWrapper: public CppPyObject
   {
     const bool special; // if true, command takes a key as an argument
@@ -430,6 +430,27 @@ namespace classdesc
     static CppWrapper* create(const RPPtr& command, bool special) {return new CppWrapper(command,special);}
     CppWrapper(CppWrapper&&)=default;
 
+    static PyObject* returnResult(const RPPtr& result)
+    {
+      PythonBuffer resultBuffer(result->asBuffer());
+      auto pyResult=resultBuffer.getPyObject();
+      switch (resultBuffer.type())
+        {
+        case RESTProcessType::object:
+        case RESTProcessType::array:
+          {
+            auto r=CppWrapper::create(result, false);
+            PyObjectRef ref(r);
+            attachRegistryObjects(result->list(),*r,".");
+            return ref.release();
+          }
+        default: break;
+        }
+      if (PyErr_Occurred())
+        PyErr_Print();
+      return pyResult.release();
+    }
+    
     static PyObject* list(CppWrapper* self, PyObject*)
       try
         {
@@ -511,7 +532,7 @@ namespace classdesc
     {"contains",(PyCFunction)CppWrapper::contains,METH_O,"Retrun true/false whether map/set contains a key"},
     {nullptr, nullptr, 0, nullptr}
   };
-      
+
   struct CppWrapperType: public PyTypeObject
   {
     // container commands that take a key as as an argument
@@ -538,7 +559,11 @@ namespace classdesc
           arguments.push_back(PySequence_GetItem(args,i));
       if (PyErr_Occurred())
         PyErr_Print();
-      return callOnRegistry(command, remainder, arguments);
+      try
+        {
+          return CppWrapper::returnResult(command->process(remainder,arguments.get<json_pack_t>()));
+        }
+      CLASSDESC_PY_EXCEPTION_ABSORB(nullptr);
     }
 
     static void deleteCppWrapper(PyObject* x) {
@@ -588,14 +613,9 @@ namespace classdesc
         auto cppWrapper=static_cast<CppWrapper*>(self);
         try
           {
-            auto result=cppWrapper->command->getElem(PythonBuffer(key).get<json_pack_t>());
-            return CppWrapper::create(result, false);
-          }
-        catch (const std::exception& ex)
-          {
-            PyErr_SetString(PyExc_RuntimeError, ex.what());
-            return nullptr;
+            return CppWrapper::returnResult(cppWrapper->command->getElem(PythonBuffer(key).get<json_pack_t>()));
           }
+        CLASSDESC_PY_EXCEPTION_ABSORB(nullptr);
       }
 
       static int setElem(PyObject* self, PyObject* key, PyObject* val)
@@ -665,41 +685,6 @@ namespace classdesc
       }
   }
 
-  inline PyObject* callOnRegistry(const RPPtr& command, const std::string& remainder, const PythonBuffer& arguments)
-  {
-    try
-      {
-        auto args=arguments.get<json_pack_t>();
-        auto result=command->process(remainder,args);
-        PythonBuffer resultBuffer(result->asBuffer());
-        auto pyResult=resultBuffer.getPyObject();
-        switch (resultBuffer.type())
-          {
-          case RESTProcessType::object:
-          case RESTProcessType::array:
-            {
-              auto r=CppWrapper::create(result, false);
-              PyObjectRef ref(r);
-              attachRegistryObjects(result->list(),*r,".");
-              return ref.release();
-            }
-          }
-        if (PyErr_Occurred())
-          PyErr_Print();
-        return pyResult.release();
-      }
-    catch (const std::exception& ex)
-      {
-        PyErr_SetString(PyExc_RuntimeError, ex.what());
-        return nullptr;
-      }
-    catch (...)
-      {
-        PyErr_SetString(PyExc_RuntimeError, "Unknown exception");
-        return nullptr;
-      }
-  }
-
   template <class F>
   struct RESTProcessFactory: public RESTProcessFunction<F>
   {