not using ScalarLogical

tidyverse · Jan 16, 2014 · fb43ab2 · fb43ab2
1 parent 3df5fa7
commit fb43ab2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/inst/include/dplyr/BoolResult.h b/inst/include/dplyr/BoolResult.h
@@ -12,9 +12,9 @@ namespace dplyr{
         void set_false( const char* msg ){ result = false; message = msg ; }
 
         inline operator SEXP() const { 
-            Shield<SEXP> res( Rf_ScalarLogical( result ) ) ;
-            Rf_setAttrib( res, Rf_install("comment"), Rf_mkString(message.c_str()) );
-            Rf_setAttrib( res, Rf_install("class"), Rf_mkString("BoolResult") );
+            LogicalVector res = LogicalVector::create( result ) ;
+            res.attr("comment") = message ;
+            res.attr("class")   = "BoolResult" ;
             return res; 
         }
 

diff --git a/inst/tests/test-equality.r b/inst/tests/test-equality.r
@@ -55,4 +55,10 @@ test_that("integers and reals are not equal", {
 
   expect_match(all.equal(df1, df2), 
     "Incompatible type for column x: x integer, y numeric")
+})
+
+test_that("BoolResult does not overwrite singleton R_TrueValue", {
+  dplyr:::equal_data_frame(mtcars, mtcars)
+  expect_equal( class(2 == 2), "logical" )
+
 })