resolving ambiguity

Author: romainfrancois

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

@@ -20,29 +20,6 @@
 
 namespace Rcpp{
 
-    template <typename CLASS>
-    typename SlotProxyPolicy<CLASS>::SlotProxy& SlotProxyPolicy<CLASS>::SlotProxy::operator=( const SlotProxy& rhs ){
-        set( rhs.get() ) ;
-        return *this ;    
-    }
-    
-    template <typename CLASS>
-    SEXP SlotProxyPolicy<CLASS>::SlotProxy::get() const {
-        return R_do_slot( parent, slot_name ) ;    
-    }
-    
-    template <typename CLASS>
-    void SlotProxyPolicy<CLASS>::SlotProxy::set( SEXP x) {
-        parent = R_do_slot_assign(parent, slot_name, x);
-    }
-
-    template <typename CLASS>
-    typename SlotProxyPolicy<CLASS>::SlotProxy SlotProxyPolicy<CLASS>::slot(const std::string& name) {
-        SEXP x = static_cast<CLASS&>(*this) ;
-        if( !Rf_isS4(x) ) throw not_s4() ;
-        return SlotProxy( static_cast<CLASS&>(*this) , name ) ;
-    }
- 
     template <typename CLASS>
     template <typename T> 
     typename SlotProxyPolicy<CLASS>::SlotProxy& SlotProxyPolicy<CLASS>::SlotProxy::operator=( const T& rhs ){
@@ -56,36 +33,11 @@ namespace Rcpp{
         return as<T>(get()) ;    
     }
 
-    
-    
     template <typename CLASS>
-    SlotProxyPolicy<CLASS>::const_SlotProxy::const_SlotProxy( const CLASS& v, const std::string& name) 
-        : parent(v), slot_name(Rf_install(name.c_str()))
-    {
-        if( !R_has_slot( v, slot_name) ){
-            throw no_such_slot() ; 
-        }        
-    }
-
-    template <typename CLASS>
-    SEXP SlotProxyPolicy<CLASS>::const_SlotProxy::get() const {
-        return R_do_slot( parent, slot_name ) ;    
-    }
-    
-    template <typename CLASS>
-    typename SlotProxyPolicy<CLASS>::const_SlotProxy SlotProxyPolicy<CLASS>::slot(const std::string& name) const {
-        SEXP x = static_cast<const CLASS&>(*this) ;
-        if( !Rf_isS4(x) ) throw not_s4() ;
-        return const_SlotProxy( static_cast<const CLASS&>(*this) , name ) ;
+    template <typename T>
+    SlotProxyPolicy<CLASS>::const_SlotProxy::operator T() const {
+        return as<T>(get()) ;    
     }
 
-    template <typename CLASS>
-    bool SlotProxyPolicy<CLASS>::hasSlot(const std::string& name) const {
-        SEXP x = static_cast<const CLASS&>(*this).get__() ;
-        if( !Rf_isS4(x) ) throw not_s4() ;
-        return R_has_slot( x, Rf_mkString(name.c_str()) ) ;
-    }
-    
-    
 }
 #endif

inst/include/Rcpp/proxy/SlotProxy.h

@@ -32,19 +32,28 @@ class SlotProxyPolicy {
             }  
         }
 
-        SlotProxy& operator=(const SlotProxy& rhs) ;
+        SlotProxy& operator=(const SlotProxy& rhs){
+            set( rhs.get() ) ;
+            return *this ;    
+        }
 
         template <typename T> SlotProxy& operator=(const T& rhs) ;
 
         template <typename T> operator T() const ;
-        inline operator SEXP() const { return get() ; }
+        inline operator SEXP() const { 
+            return get() ; 
+        }
 
     private:
         CLASS& parent; 
         SEXP slot_name ;
 
-        SEXP get() const ;
-        void set(SEXP x ) ;
+        SEXP get() const {
+            return R_do_slot( parent, slot_name ) ;
+        }
+        void set(SEXP x ) {
+            parent = R_do_slot_assign(parent, slot_name, x);
+        }
     } ;
 
     class const_SlotProxy {
@@ -53,19 +62,35 @@ class SlotProxyPolicy {
         const_SlotProxy& operator=(const const_SlotProxy& rhs) ;
 
         template <typename T> operator T() const ;
-        inline operator SEXP() const { return get() ; }
+        inline operator SEXP() const { 
+            return get() ; 
+        }
 
     private:
         const CLASS& parent; 
         SEXP slot_name ;
 
-        SEXP get() const ;
+        SEXP get() const {
+            return R_do_slot( parent, slot_name ) ;
+        }
     } ;
 
-    SlotProxy slot(const std::string& name) ;
-    const_SlotProxy slot(const std::string& name) const ;
+    SlotProxy slot(const std::string& name){
+        SEXP x = static_cast<CLASS&>(*this) ;
+        if( !Rf_isS4(x) ) throw not_s4() ;
+        return SlotProxy( static_cast<CLASS&>(*this) , name ) ;
+    }
+    const_SlotProxy slot(const std::string& name) const {
+        SEXP x = static_cast<const CLASS&>(*this) ;
+        if( !Rf_isS4(x) ) throw not_s4() ;
+        return const_SlotProxy( static_cast<const CLASS&>(*this) , name ) ;
+    }
 
-    bool hasSlot(const std::string& name) const ;
+    bool hasSlot(const std::string& name) const{
+        SEXP x = static_cast<const CLASS&>(*this).get__() ;
+        if( !Rf_isS4(x) ) throw not_s4() ;
+        return R_has_slot( x, Rf_mkString(name.c_str()) ) ;
+    }
 
 } ;
 

inst/unitTests/cpp/S4.cpp

@@ -66,12 +66,14 @@ bool S4_is_trackCurve(S4 tr){
 
 // [[Rcpp::export]]
 NumericVector S4_get_slot_x(S4 o){
-    return NumericVector(o.slot("x")) ;    
+    NumericVector res = o.slot("x") ;
+    return res ;    
 }
 
 // [[Rcpp::export]]
 CharacterVector S4_get_attr_x(IntegerVector o){
-     return CharacterVector(o.attr("foo")) ; 
+    CharacterVector res = o.attr("foo") ;
+    return res ;
 }
 
 // [[Rcpp::export]]