Finish meat reintroduction for proxies; add tests (#165)

Author: kevinushey

ChangeLog

@@ -1,3 +1,10 @@
+2014-09-02  Kevin Ushey  <[email protected]>
+
+        * inst/include/Rcpp/api/meat/proxy.h: Finish meat reintroduction + tests
+        * inst/unitTests/runit.wrap.R: Idem
+        * inst/unitTests/cpp/wrap.cpp: Idem
+        * inst/include/Rcpp/proxy/FieldProxy.h: Idem
+
 2014-08-13  Kevin Ushey  <[email protected]>
 
         * inst/include/Rcpp/api/meat/meat.h: Reintroduce meat

inst/include/Rcpp/api/meat/proxy.h

@@ -154,6 +154,13 @@ namespace Rcpp {
         return *this;
     }
 
+    template <typename CLASS>
+    template <typename T>
+    typename DottedPairProxyPolicy<CLASS>::DottedPairProxy&
+    DottedPairProxyPolicy<CLASS>::DottedPairProxy::operator=(const traits::named_object<T>& rhs) {
+        return set(wrap(rhs.object), rhs.name);
+    }
+
     template <typename CLASS>
     template <typename T>
     DottedPairProxyPolicy<CLASS>::DottedPairProxy::operator T() const {
@@ -166,6 +173,36 @@ namespace Rcpp {
         return as<T>(get());
     }
 
+    // Field proxies
+    template <typename CLASS>
+    typename FieldProxyPolicy<CLASS>::FieldProxy&
+    FieldProxyPolicy<CLASS>::FieldProxy::operator=(const FieldProxyPolicy<CLASS>::FieldProxy& rhs) {
+        if (this != &rhs) set(rhs.get());
+        return *this;
+    }
+
+    template <typename CLASS>
+    template <typename T>
+    typename FieldProxyPolicy<CLASS>::FieldProxy&
+    FieldProxyPolicy<CLASS>::FieldProxy::operator=(const T& rhs) {
+        SEXP tmp = PROTECT(wrap(rhs));
+        set(tmp);
+        UNPROTECT(1);
+        return *this;
+    }
+
+    template <typename CLASS>
+    template <typename T>
+    FieldProxyPolicy<CLASS>::FieldProxy::operator T() const {
+      return as<T>(get());
+    }
+
+    template <typename CLASS>
+    template <typename T>
+    FieldProxyPolicy<CLASS>::const_FieldProxy::operator T() const {
+      return as<T>(get());
+    }
+
 }
 
 #endif

inst/include/Rcpp/proxy/FieldProxy.h

@@ -29,24 +29,12 @@ class FieldProxyPolicy {
         FieldProxy( CLASS& v, const std::string& name) :
             parent(v), field_name(name) {}
 
-        FieldProxy& operator=(const FieldProxy& rhs){
-            if( this != &rhs ) set( rhs.get() ) ;
-            return *this ;
-        }
+        FieldProxy& operator=(const FieldProxy& rhs);
 
-        template <typename T> FieldProxy& operator=(const T& rhs) {
-            SEXP tmp = PROTECT( wrap(rhs) );
-            set(tmp);
-            UNPROTECT(1);
-            return *this;
-        }
+        template <typename T> FieldProxy& operator=(const T& rhs);
 
-        template <typename T> operator T() const {
-          return as<T>( get() );
-        }
-        inline operator SEXP() const {
-            return get() ;
-        }
+        template <typename T> operator T() const;
+        inline operator SEXP() const { return get(); }
 
     private:
         CLASS& parent;
@@ -68,9 +56,7 @@ class FieldProxyPolicy {
         const_FieldProxy( const CLASS& v, const std::string& name) :
             parent(v), field_name(name) {}
 
-        template <typename T> operator T() const {
-          return as<T>( get() );
-        }
+        template <typename T> operator T() const;
         inline operator SEXP() const {
             return get() ;
         }

inst/unitTests/cpp/wrap.cpp

@@ -19,8 +19,34 @@
 // You should have received a copy of the GNU General Public License
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
+// Testing 'wrap', 'as' with custom class -- see
+// https://github.com/RcppCore/Rcpp/issues/165
+template<typename T>
+class Bar {
+    public:
+        Bar(T t) : t(t) {}
+        ~Bar() {}
+        T t;
+};
+
+#include <RcppCommon.h>
+namespace Rcpp {
+    template<typename T> SEXP wrap(const Bar<T> &b);
+}
+
 #include <Rcpp.h>
-using namespace Rcpp ;
+
+template<typename T> SEXP Rcpp::wrap(const Bar<T> &b) {
+    return Rcpp::wrap(b.t);
+}
+
+// [[Rcpp::export]]
+Bar<int> test_wrap_custom_class() {
+    Bar<int> b(42);
+    return b;
+}
+
+using namespace Rcpp;
 
 // [[Rcpp::export]]
 IntegerVector map_string_int(){
@@ -255,4 +281,3 @@ SEXP vector_Foo(){
     vec[1] = Foo( 3 ) ;
     return wrap(vec) ;
 }
-

inst/unitTests/runit.wrap.R

@@ -183,5 +183,9 @@ if (.runThisTest) {
             )    
     }
 
+    test.wrap.custom.class <- function() {
+        checkEquals(test_wrap_custom_class(), 42)
+    }
+
 }