Fix up polymorphic handling within RESTProcess.

Author: highperformancecoder

RESTProcessExample/RESTProcessExample.h

@@ -86,14 +86,15 @@ struct Bar: Foo
   int f;
   EnumFoo barfoo;
   std::vector<Foo> vFoo;
+  std::map<std::string,Foo> mFoo;
   Bar& overloadExample() {return *this;}
   int overloadExample(int x, int y=0) const {return x+y;}
   // test overloading
   BarE barE(BarE e) const {return e;}
   BarE barE() const {return a;}
   GlobE globE() const {return ga;}
   Bar() {}
-  Bar(int i): Foo(i), f(20), barfoo(eb), vFoo(3,1) {}
+  Bar(int i): Foo(i), f(20), barfoo(eb), vFoo(3,1) {mFoo["foo"]=Foo(2);}
 
   // overload triggers bug
   void rvalueRef(Foo&& f) {}

RESTProcessExample/RESTProcessExpected.txt

@@ -1,4 +1,4 @@
-/root=>{"bar":{"a":0.10000000000000001,"af":0.20000000298023224,"b":3,"barfoo":"eb","bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","f":20,"h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vFoo":[{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]},"bar1":{"barfoo":"ec","f":{"a":0.10000000000000001,"af":0.20000000298023224,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},"fp":{"a":0,"af":0,"b":0,"bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","h":[],"l":[],"llex":[],"m":[],"sef":{},"sm":{},"um":[],"vs":[]},"g":2,"vFoo":[{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}]},"defaultless":{},"sbar":{"a":0,"af":0,"b":0,"barfoo":"ea","bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","f":0,"h":[],"l":[],"llex":[],"m":[],"sef":{},"sm":{},"um":[],"vFoo":[],"vs":[]},"spoly":{}}
+/root=>{"bar":{"a":0.10000000000000001,"af":0.20000000298023224,"b":3,"barfoo":"eb","bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","f":20,"h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"mFoo":[{"first":"foo","second":{"a":0.10000000000000001,"af":0.20000000298023224,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}}],"sef":"ea","sm":{},"um":[],"vFoo":[{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]},"bar1":{"barfoo":"ec","f":{"a":0.10000000000000001,"af":0.20000000298023224,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},"fp":{"a":0,"af":0,"b":0,"bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","h":[],"l":[],"llex":[],"m":[],"sef":{},"sm":{},"um":[],"vs":[]},"g":2,"vFoo":[{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}]},"defaultless":{},"sbar":{"a":0,"af":0,"b":0,"barfoo":"ea","bf":false,"bt":false,"c":"","c1":[],"ch":"\u0000","d":[0,0,0],"d1":[[0,0],[0,0],[0,0]],"ef":"ea","f":0,"h":[],"l":[],"llex":[],"m":[],"mFoo":[],"sef":{},"sm":{},"um":[],"vFoo":[],"vs":[]},"spoly":{}}
 /root/bar/csi=>20
 /root/bar/csi=>Exception: attempt to alter a const variable
 /root/bar/si=>0
@@ -102,7 +102,7 @@
 /root/bar/shello=>"hello"
 /root/bar/seqLength=>3
 /root/bar/name=>"Bar"
-/root/bar/overloadExample=>{"a":0.20000000000000001,"af":0.30000001192092896,"b":1,"barfoo":"eb","bf":true,"bt":false,"c":"hello world","c1":["x","\r"],"ch":"M","d":[0,5,2],"d1":[[0,1],[2,6],[7,10]],"ef":"ea","f":20,"h":[2,2,2,2],"l":[2,2,2,2],"llex":[["hello","hello"],["baa","baa","blacksheep"]],"m":[{"first":0,"second":5},{"first":3,"second":5}],"sef":"eb","sm":{},"um":[{"first":1,"second":5}],"vFoo":[{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]}
+/root/bar/overloadExample=>{"a":0.20000000000000001,"af":0.30000001192092896,"b":1,"barfoo":"eb","bf":true,"bt":false,"c":"hello world","c1":["x","\r"],"ch":"M","d":[0,5,2],"d1":[[0,1],[2,6],[7,10]],"ef":"ea","f":20,"h":[2,2,2,2],"l":[2,2,2,2],"llex":[["hello","hello"],["baa","baa","blacksheep"]],"m":[{"first":0,"second":5},{"first":3,"second":5}],"mFoo":[{"first":"foo","second":{"a":0.10000000000000001,"af":0.20000000298023224,"b":2,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}}],"sef":"eb","sm":{},"um":[{"first":1,"second":5}],"vFoo":[{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]},{"a":0.10000000000000001,"af":0.20000000298023224,"b":1,"bf":false,"bt":true,"c":"\r hello & 123 ","c1":["\r","\r"],"ch":"M","d":[0,1,2],"d1":[[0,1],[2,3],[4,5]],"ef":"ea","h":[2,2,2],"l":[2,2,2],"llex":[["hello","hello"],["hello","hello"]],"m":[{"first":0,"second":5},{"first":3,"second":2}],"sef":"ea","sm":{},"um":[],"vs":[" hello"," hello"]}],"vs":[" hello"," hello"]}
 /root/bar/barE=>"a"
 /root/bar/barE=>"b"
 /root/bar/globE=>"ga"

RESTProcess_base.h

@@ -583,8 +583,10 @@ namespace classdesc
     json_pack_t process(const string& remainder, const json_pack_t& arguments) override;
     json_pack_t signature() const override;
     json_pack_t list() const override {
-      if (ptr) return RESTProcessObject<typename T::element_type>(*ptr).list();
-      else return json_pack_t(json_spirit::mArray());
+      if (ptr)
+        return const_cast<RESTProcessPtr<T>*>(this)->process("/@list",{});
+      else
+        return json_pack_t(json_spirit::mArray());
     }
     json_pack_t type() const override {return json_pack_t(typeName<T>());}
   };

RESTProcess_epilogue.h

@@ -135,10 +135,7 @@ namespace classdesc
   json_pack_t RESTProcessPtr<T>::process(const string& remainder, const json_pack_t& arguments)
   {
     if (ptr)
-      if (remainder.empty())
-        return rProcess(*ptr, remainder, arguments);
-      else
-        return mapAndProcess(remainder,arguments,*ptr);
+      return rProcess(*ptr, remainder, arguments);
     else
       return {};
   }