Enhance is check for module object

tqchen · tqchen · commit 463d4e959010 · 2015-10-08T21:23:43.000-07:00
diff --git a/inst/include/Rcpp/api/meat/is.h b/inst/include/Rcpp/api/meat/is.h
@@ -150,10 +150,13 @@ namespace Rcpp {
 
     inline bool is_module_object_internal(SEXP obj, const char* clazz){
         Environment env(obj);
-        XPtr<class_Base> xp( env.get(".cppclass"));
+        SEXP sexp = env.get(".cppclass");
+        if (TYPEOF(sexp) != EXTPTRSXP) return false;
+        XPtr<class_Base> xp(sexp);
         return xp->has_typeinfo_name(clazz);
     }
     template <typename T> bool is__module__object(SEXP x) {
+        if (!is__simple<S4>(x)) return false;
         typedef typename Rcpp::traits::un_pointer<T>::type CLASS;
         return is_module_object_internal(x, typeid(CLASS).name());
     }

Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,13 @@ namespace Rcpp {`
`150`	`150`
`151`	`151`	`inline bool is_module_object_internal(SEXP obj, const char* clazz){`
`152`	`152`	`Environment env(obj);`
`153`		`- XPtr<class_Base> xp( env.get(".cppclass"));`
	`153`	`+ SEXP sexp = env.get(".cppclass");`
	`154`	`+ if (TYPEOF(sexp) != EXTPTRSXP) return false;`
	`155`	`+ XPtr<class_Base> xp(sexp);`
`154`	`156`	`return xp->has_typeinfo_name(clazz);`
`155`	`157`	`}`
`156`	`158`	`template <typename T> bool is__module__object(SEXP x) {`
	`159`	`+ if (!is__simple<S4>(x)) return false;`
`157`	`160`	`typedef typename Rcpp::traits::un_pointer<T>::type CLASS;`
`158`	`161`	`return is_module_object_internal(x, typeid(CLASS).name());`
`159`	`162`	`}`