fixed Vector(Proxy) ctor. closes #58

Author: romainfrancois

inst/include/Rcpp/proxy/AttributeProxy.h

@@ -19,12 +19,12 @@
 #define Rcpp_proxy_AttributeProxy_h
 
 namespace Rcpp{
-    
+   
 template <typename CLASS>
 class AttributeProxyPolicy {
 public:
 
-    class AttributeProxy {
+    class AttributeProxy : public GenericProxy<AttributeProxy> {
     public:
         AttributeProxy( CLASS& v, const std::string& name) 
             : parent(v), attr_name(Rf_install(name.c_str()))
@@ -55,7 +55,7 @@ class AttributeProxyPolicy {
         }
     } ;
 
-    class const_AttributeProxy {
+    class const_AttributeProxy : public GenericProxy<const_AttributeProxy> {
     public:
         const_AttributeProxy( const CLASS& v, const std::string& name) 
             : parent(v), attr_name(Rf_install(name.c_str())){}

inst/include/Rcpp/proxy/Binding.h

@@ -24,7 +24,7 @@ template <typename EnvironmentClass>
 class BindingPolicy {
 public:
 
-    class Binding {
+    class Binding : public GenericProxy<Binding> {
     public:
         Binding( EnvironmentClass& env_, const std::string& name_) : 
             env(env_), name(name_){}
@@ -67,7 +67,7 @@ class BindingPolicy {
         std::string name ;
     } ;
 
-    class const_Binding {
+    class const_Binding : public GenericProxy<const_Binding> {
     public:
         const_Binding( const EnvironmentClass& env_, const std::string& name_) : 
             env(env_), name(name_){}

inst/include/Rcpp/proxy/DottedPairProxy.h

@@ -24,7 +24,7 @@ template <typename CLASS>
 class DottedPairProxyPolicy {
 public:
 
-    	class DottedPairProxy {
+    	class DottedPairProxy : public GenericProxy<DottedPairProxy> {
 	public:
 		DottedPairProxy( CLASS& v, int index_ ): node(R_NilValue){
             if( index_ >= v.length() ) throw index_out_of_bounds() ;
@@ -69,7 +69,7 @@ class DottedPairProxyPolicy {
 		SEXP node ;
 	} ;
 
-	class const_DottedPairProxy {
+	class const_DottedPairProxy : public GenericProxy<const_DottedPairProxy>{
 	public:
 		const_DottedPairProxy( const CLASS& v, int index_ ): node(R_NilValue){
             if( index_ >= v.length() ) throw index_out_of_bounds() ;

inst/include/Rcpp/proxy/FieldProxy.h

@@ -24,7 +24,7 @@ template <typename CLASS>
 class FieldProxyPolicy {
 public:
 
-    class FieldProxy {
+    class FieldProxy : public GenericProxy<FieldProxy> {
     public:
         FieldProxy( CLASS& v, const std::string& name) : 
             parent(v), field_name(name) {}
@@ -56,7 +56,7 @@ class FieldProxyPolicy {
         }
     } ;
 
-    class const_FieldProxy {
+    class const_FieldProxy : public GenericProxy<const_FieldProxy> {
     public:
         const_FieldProxy( const CLASS& v, const std::string& name) :
             parent(v), field_name(name) {}

inst/include/Rcpp/proxy/GenericProxy.h

@@ -0,0 +1,32 @@
+// Copyright (C) 2013 Romain Francois
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp_proxy_GenericProxy_h
+#define Rcpp_proxy_GenericProxy_h
+
+namespace Rcpp{
+    
+template <typename Proxy>
+struct GenericProxy {
+    inline SEXP get() const {
+        return static_cast<const Proxy&>(*this) ;    
+    }
+} ;
+
+}
+
+#endif

inst/include/Rcpp/proxy/NamesProxy.h

@@ -24,7 +24,7 @@ template <typename CLASS>
 class NamesProxyPolicy{
 public:
 
-    class NamesProxy {
+    class NamesProxy : public GenericProxy<NamesProxy> {
     public:
         NamesProxy( CLASS& v) : parent(v){} ;
 
@@ -62,7 +62,7 @@ class NamesProxyPolicy{
 
     } ;
 
-    class const_NamesProxy {
+    class const_NamesProxy : public GenericProxy<const_NamesProxy>{
     public:
         const_NamesProxy( const CLASS& v) : parent(v){} ;
 

inst/include/Rcpp/proxy/ProtectedProxy.h

@@ -24,7 +24,7 @@ namespace Rcpp{
     class ProtectedProxyPolicy{
     public:
 
-        class ProtectedProxy{
+        class ProtectedProxy : public GenericProxy<ProtectedProxy> {
         public:
             ProtectedProxy( XPtrClass& xp_ ): xp(xp_){}
 
@@ -51,7 +51,7 @@ namespace Rcpp{
 
         } ;
 
-        class const_ProtectedProxy{
+        class const_ProtectedProxy : public GenericProxy<const_ProtectedProxy>{
         public:
             const_ProtectedProxy( const XPtrClass& xp_ ): xp(xp_){}
 

inst/include/Rcpp/proxy/SlotProxy.h

@@ -24,7 +24,7 @@ template <typename CLASS>
 class SlotProxyPolicy {
 public:
 
-    class SlotProxy {
+    class SlotProxy : public GenericProxy<SlotProxy>{
     public:
         SlotProxy( CLASS& v, const std::string& name) : parent(v), slot_name(Rf_install(name.c_str())) {
             if( !R_has_slot( v, slot_name) ){
@@ -56,7 +56,7 @@ class SlotProxyPolicy {
         }
     } ;
 
-    class const_SlotProxy {
+    class const_SlotProxy : public GenericProxy<const_SlotProxy> {
     public:
         const_SlotProxy( const CLASS& v, const std::string& name) ;
         const_SlotProxy& operator=(const const_SlotProxy& rhs) ;

inst/include/Rcpp/proxy/TagProxy.h

@@ -24,7 +24,7 @@ namespace Rcpp{
     class TagProxyPolicy {
     public:
 
-        class TagProxy{
+        class TagProxy : public GenericProxy<TagProxy>{
         public:
             TagProxy( XPtrClass& xp_ ): xp(xp_){}
 
@@ -52,7 +52,7 @@ namespace Rcpp{
 
         } ;
 
-        class const_TagProxy{
+        class const_TagProxy : public GenericProxy<const_TagProxy>{
         public:
             const_TagProxy( XPtrClass& xp_ ): xp(xp_){}
 

inst/include/Rcpp/proxy/proxy.h

@@ -17,6 +17,8 @@
 
 #ifndef Rcpp_proxy_proxy_h
 
+#include <Rcpp/proxy/GenericProxy.h>
+
 #include <Rcpp/proxy/NamesProxy.h>
 #include <Rcpp/proxy/RObjectMethods.h>
 #include <Rcpp/proxy/AttributeProxy.h>