now compiles, still to deal with duplicate symbols

Author: romainfrancois

inst/include/Rcpp/Environment.h

@@ -97,7 +97,7 @@ namespace Rcpp{
          * @return a SEXP (possibly R_NilValue)
          */
         SEXP get(const std::string& name) const {
-            SEXP env = Storage::get_() ;
+            SEXP env = Storage::get__() ;
             SEXP nameSym = Rf_install(name.c_str());
             SEXP res = Rf_findVarInFrame( env, nameSym ) ;
 
@@ -343,6 +343,8 @@ namespace Rcpp{
             return Environment_Impl( Rcpp_eval(Rf_lang3( newEnvSym, Rf_ScalarLogical(hashed), Storage::get__() )) );    
         }
 
+        
+        void update(SEXP){}
     };
 
     typedef Environment_Impl<PreserveStorage> Environment ;

inst/include/Rcpp/Module.h

@@ -395,11 +395,12 @@ namespace Rcpp {
 
     class CppClass : public S4{
     public:
+        typedef XPtr<class_Base> XP_Class ;
         typedef Rcpp::XPtr<Rcpp::Module> XP ;
         CppClass( SEXP x) : S4(x){};
         CppClass( const CppClass& other) : S4(other.get__()){}
 
-        CppClass( Module* p, class_Base* clazz, std::string& ) S4("C++Class") {
+        CppClass( Module* p, class_Base* cl, std::string& buffer ) : S4("C++Class") {
 	        XP_Class clxp( cl, false, R_NilValue, R_NilValue ) ;
 	        slot( "module"  ) = XP( p, false ) ;
 	        slot( "pointer" ) = clxp ;
@@ -427,13 +428,13 @@ namespace Rcpp {
     class CppObject : public S4{
     public:
         typedef Rcpp::XPtr<Rcpp::Module> XP ;
-        CppObject( Module* p, class_Base*, SEXP xp ) : S4("C++Object") {
+        CppObject( Module* p, class_Base* clazz, SEXP xp ) : S4("C++Object") {
             slot( "module" )   = XP( p, false ) ;
             slot( "cppclass" ) = Rcpp::XPtr<class_Base>( clazz, false ) ;
             slot( "pointer" )  = xp ;
         }
         CppObject( const CppObject& other){
-            Storage::copy( other ) ;    
+            Storage::copy__( other ) ;    
         }
 
         CppObject& operator=( const CppObject& other ) {

inst/include/Rcpp/RObject.h

@@ -50,6 +50,7 @@ namespace Rcpp{
             Storage::set__(other) ;    
         }
 
+        void update(SEXP){}
     };
 
     typedef RObject_Impl<PreserveStorage> RObject ;

inst/include/Rcpp/XPtr.h

@@ -122,7 +122,7 @@ class XPtr :
         return (T*)( R_ExternalPtrAddr( Storage::get__() )) ; 
     }
 
-    
+    void update(SEXP){}
 };
 
 } // namespace Rcpp 

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

@@ -0,0 +1,33 @@
+// 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_api_meat_as_h
+#define Rcpp_api_meat_as_h
+
+namespace Rcpp{ 
+namespace internal{
+     
+    inline void* as_module_object_internal(SEXP obj){
+        Environment env(obj) ;
+        SEXP xp = env.get(".pointer") ;
+        return R_ExternalPtrAddr(xp );   
+    }
+        
+}
+}
+
+#endif

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

@@ -38,6 +38,7 @@
 #include <Rcpp/api/meat/Vector.h>
 #include <Rcpp/api/meat/Matrix.h>
 #include <Rcpp/api/meat/is.h>
+#include <Rcpp/api/meat/as.h>
 #include <Rcpp/api/meat/export.h>
 #include <Rcpp/api/meat/protection.h>
 #include <Rcpp/api/meat/wrap.h>

inst/include/Rcpp/api/meat/module/Module.h

@@ -0,0 +1,50 @@
+// Module.h: Rcpp R/C++ interface class library -- Rcpp modules
+//
+// 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_api_meat_Module_h
+#define Rcpp_api_meat_Module_h
+
+namespace Rcpp {
+
+    inline List Module::classes_info(){
+	    int n = classes.size() ;
+	    CharacterVector names(n) ;
+	    List info(n);
+	    CLASS_MAP::iterator it = classes.begin() ;
+	    std::string buffer ;
+	    for( int i=0; i<n; i++, ++it){
+	        names[i] = it->first ;
+	        info[i]  = CppClass( this , it->second, buffer ) ;
+	    }
+	    info.names() = names ;
+	    return info ;
+	}
+        
+    inline CppClass Module::get_class( const std::string& cl ){
+        BEGIN_RCPP
+            CLASS_MAP::iterator it = classes.find(cl) ;
+            if( it == classes.end() ) throw std::range_error( "no such class" ) ;
+            std::string buffer ;
+            return CppClass( this, it->second, buffer ) ;
+        END_RCPP
+    }
+        
+}
+
+#endif

inst/include/Rcpp/as.h

@@ -83,11 +83,8 @@ namespace Rcpp{
             return exporter.get() ;
         }
 
-        inline void* as_module_object_internal(SEXP obj) {
-            Environment env(obj) ;
-            SEXP xp = env.get(".pointer") ;
-            return R_ExternalPtrAddr(xp );   
-        }
+        void* as_module_object_internal(SEXP obj) ; 
+        
         template <typename T> object<T> as_module_object(SEXP x){
             return (T*) as_module_object_internal(x) ;
         }

inst/include/Rcpp/proxy/AttributeProxy.h

@@ -74,10 +74,10 @@ class AttributeProxyPolicy {
     } ;
 
     AttributeProxy attr( const std::string& name){
-        return AttributeProxy( static_cast<CLASS&>( *this ) ) ;    
+        return AttributeProxy( static_cast<CLASS&>( *this ), name ) ;    
     }
     const_AttributeProxy attr( const std::string& name) const {
-        return AttributeProxy( static_cast<const CLASS&>( *this ) ) ;
+        return const_AttributeProxy( static_cast<const CLASS&>( *this ), name ) ;
     }
 
     std::vector<std::string> attributeNames() const {

inst/include/Rcpp/proxy/Binding.h

@@ -94,10 +94,10 @@ class BindingPolicy {
     } ;
 
     const_Binding operator[]( const std::string& name) const {
-        return const_Binding( static_cast<EnvironmentClass&>(*this) ) ;    
+        return const_Binding( static_cast<const EnvironmentClass&>(*this), name ) ;    
     }
     Binding operator[](const std::string& name){
-        return Binding( static_cast<const EnvironmentClass&>(*this) ) ;  
+        return Binding( static_cast<EnvironmentClass&>(*this), name ) ;  
     }
 
 } ;