[Rcpp-commits] r238 - pkg/src

[noreply at r-forge.r-project.org]

Author: edd
Date: 2009-12-30 16:59:22 +0100 (Wed, 30 Dec 2009)
New Revision: 238

Modified:
   pkg/src/Environment.cpp
   pkg/src/RObject.cpp
   pkg/src/exceptions.cpp
Log:
most minor header cleanup and reindentation


Modified: pkg/src/Environment.cpp
===================================================================
--- pkg/src/Environment.cpp	2009-12-30 15:56:56 UTC (rev 237)
+++ pkg/src/Environment.cpp	2009-12-30 15:59:22 UTC (rev 238)
@@ -23,28 +23,28 @@
 
 namespace Rcpp {
 
-	Environment::Environment( SEXP m_sexp = R_GlobalEnv) : RObject::RObject(m_sexp){
-		if( TYPEOF(m_sexp) != ENVSXP ){
-			throw std::runtime_error( "not an environment" ) ;
-		}
-		is_user_database = IS_USER_DATABASE(m_sexp) ;
+    Environment::Environment( SEXP m_sexp = R_GlobalEnv) : RObject::RObject(m_sexp){
+	if( TYPEOF(m_sexp) != ENVSXP ){
+	    throw std::runtime_error( "not an environment" ) ;
 	}
+	is_user_database = IS_USER_DATABASE(m_sexp) ;
+    }
 	
-	Environment::~Environment(){
-		logTxt( "~Environment" ) ;
-	}
+    Environment::~Environment(){
+	logTxt( "~Environment" ) ;
+    }
 	
-	SEXP Environment::ls( bool all = true) const {
-		if( is_user_database ){
-			R_ObjectTable *tb = (R_ObjectTable*)
-				R_ExternalPtrAddr(HASHTAB(m_sexp));
-			return tb->objects(tb) ;
-		} else{
-			Rboolean get_all = all ? TRUE : FALSE ;
-			return R_lsInternal( m_sexp, get_all ) ;
-		}
-		return R_NilValue ;
+    SEXP Environment::ls( bool all = true) const {
+	if( is_user_database ){
+	    R_ObjectTable *tb = (R_ObjectTable*)
+		R_ExternalPtrAddr(HASHTAB(m_sexp));
+	    return tb->objects(tb) ;
+	} else{
+	    Rboolean get_all = all ? TRUE : FALSE ;
+	    return R_lsInternal( m_sexp, get_all ) ;
 	}
+	return R_NilValue ;
+    }
 	
 } // namespace Rcpp
 

Modified: pkg/src/RObject.cpp
===================================================================
--- pkg/src/RObject.cpp	2009-12-30 15:56:56 UTC (rev 237)
+++ pkg/src/RObject.cpp	2009-12-30 15:59:22 UTC (rev 238)
@@ -1,9 +1,8 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
 //
-// RObject.cpp: Rcpp R/C++ interface class library -- SEXP support
+// RObject.cpp: Rcpp R/C++ interface class library -- R Object support
 //
-// Copyright (C) 2009 Dirk Eddelbuettel
-// Copyright (C) 2009 Romain Francois
+// Copyright (C) 2009 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //

Modified: pkg/src/exceptions.cpp
===================================================================
--- pkg/src/exceptions.cpp	2009-12-30 15:56:56 UTC (rev 237)
+++ pkg/src/exceptions.cpp	2009-12-30 15:59:22 UTC (rev 238)
@@ -1,6 +1,6 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
 //
-// exceptions.cpp: R/C++ interface class library -- common functions
+// exceptions.cpp: R/C++ interface class library -- exception handling
 //
 // Copyright (C) 2009 - 2010 Romain Francois
 //