Repair recent self-inflicted damage to Object primitives

rubinius · Aug 1, 2008 · e3e1abb · e3e1abb
1 parent affa52e
commit e3e1abb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/vm/builtin/object.hpp b/vm/builtin/object.hpp
@@ -187,11 +187,11 @@ namespace rubinius {
     }
 
     // Ruby.primitive :object_frozen_p
-    bool frozen_p() {
+    OBJECT frozen_p() {
       if(this->IsFrozen && reference_p()) {
-        return true;
+        return Qtrue;
       } else {
-        return false;
+        return Qfalse;
       }
     }
 

diff --git a/vm/test/test_object.hpp b/vm/test/test_object.hpp
@@ -123,22 +123,22 @@ class TestObject : public CxxTest::TestSuite {
   void test_tainted_p() {
     OBJECT obj = state->om->new_object(G(object), NormalObject::fields);
 
-    TS_ASSERT(!obj->tainted_p());
-
+    TS_ASSERT_EQUALS(obj->tainted_p(), Qfalse);
     obj->IsTainted = TRUE;
-
-    TS_ASSERT(obj->tainted_p());
+    TS_ASSERT_EQUALS(obj->tainted_p(), Qtrue);
   }
 
   void test_taint() {
     OBJECT obj = state->om->new_object(G(object), NormalObject::fields);
+
     TS_ASSERT(!obj->IsTainted);
     obj->taint();
     TS_ASSERT(obj->IsTainted);
   }
 
   void test_untaint() {
     OBJECT obj = state->om->new_object(G(object), NormalObject::fields);
+
     obj->IsTainted = TRUE;
     TS_ASSERT(obj->IsTainted);
     obj->untaint();
@@ -148,21 +148,19 @@ class TestObject : public CxxTest::TestSuite {
   void test_frozen_p() {
     OBJECT obj = state->om->new_object(G(object), NormalObject::fields);
 
-    TS_ASSERT(!obj->frozen_p());
-
+    TS_ASSERT_EQUALS(obj->frozen_p(), Qfalse);
     obj->IsFrozen = TRUE;
-
-    TS_ASSERT(obj->frozen_p());
+    TS_ASSERT_EQUALS(obj->frozen_p(), Qtrue);
   }
 
   void test_freeze() {
     OBJECT obj = state->om->new_object(G(object), NormalObject::fields);
+
     TS_ASSERT(!obj->IsFrozen);
     obj->freeze();
     TS_ASSERT(obj->IsFrozen);
   }
 
-
   void test_nil_class() {
     TS_ASSERT_EQUALS(Qnil->class_object(state), G(nil_class));
   }