add == and != to bool class

MoeOrganization · Apr 14, 2013 · c32c265 · c32c265
1 parent 0a0c1c2
commit c32c265
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git a/src/main/scala/org/moe/runtime/builtins/BoolClass.scala b/src/main/scala/org/moe/runtime/builtins/BoolClass.scala
@@ -24,6 +24,26 @@ object BoolClass {
 
     import r.NativeObjects._
 
+    // equality operators
+
+    boolClass.addMethod(
+      new MoeMethod(
+        "infix:<==>",
+        new MoeSignature(List(new MoePositionalParameter("$other"))),
+        env,
+        (e) => self(e).equal_to(r, e.get("$other").get)
+      )
+    )
+
+    boolClass.addMethod(
+      new MoeMethod(
+        "infix:<!=>",
+        new MoeSignature(List(new MoePositionalParameter("$other"))),
+        env,
+        (e) => self(e).not_equal_to(r, e.get("$other").get)
+      )
+    )
+
     // coercion
 
     boolClass.addMethod(

diff --git a/src/main/scala/org/moe/runtime/nativeobjects/MoeBoolObject.scala b/src/main/scala/org/moe/runtime/nativeobjects/MoeBoolObject.scala
@@ -11,6 +11,14 @@ class MoeBoolObject(
 
   // runtime methods
 
+  def equal_to (r: MoeRuntime, other: MoeObject): MoeBoolObject = r.NativeObjects.getBool(
+    (isTrue && other.isTrue) || (isFalse && other.isFalse)
+  )
+
+  def not_equal_to (r: MoeRuntime, other: MoeObject): MoeBoolObject = r.NativeObjects.getBool(
+    (isTrue && other.isFalse) || (isFalse && other.isTrue)
+  )
+
   // MoeNativeObject overrides
 
   override def copy = new MoeBoolObject(getNativeValue, getAssociatedClass)

diff --git a/src/test/scala/org/moe/parser/BooleanLiteralTestSuite.scala b/src/test/scala/org/moe/parser/BooleanLiteralTestSuite.scala
@@ -19,9 +19,28 @@ class BooleanLiteralTestSuite extends FunSuite with BeforeAndAfter with ParserTe
     val result = interpretCode("false")
     assert(result.unboxToBoolean.get === false)
   }
-  test("... basic test with a not true") {
-    val result = interpretCode(" false ")
+
+  test("... basic test with equality (true == true)") {
+    val result = interpretCode("true == true")
+    assert(result.unboxToBoolean.get === true)
+  }
+
+  test("... basic test with equality (true == false") {
+    val result = interpretCode("true == false")
+    assert(result.unboxToBoolean.get === false)
+  }
+
+  test("... basic test with equality (false == false") {
+    val result = interpretCode("false == false")
+    assert(result.unboxToBoolean.get === true)
+  }
+
+  test("... basic test with equality (false == true") {
+    val result = interpretCode("false == true")
     assert(result.unboxToBoolean.get === false)
   }
 
+
+
+
 }