[[ StdMlc ]] Overload is and is not for logic

runrevali · runrevali · commit 6410b91c28b1 · 2014-12-09T14:51:39.000Z
diff --git a/libscript/src/binary.mlc b/libscript/src/binary.mlc
@@ -102,7 +102,7 @@ output:     Returns false if the result of evaluating <Left> is the same as that
 
 */
 
-syntax IsNotEqualTo is neutral binary operator with precedence 1
+syntax IsNotEqualTo is neutral binary operator with precedence 5
     <Left: Expression> "is not" <Right: Expression>
 begin
     MCBinaryEvalIsNotEqualTo(Left, Right, output)
diff --git a/libscript/src/logic.mlc b/libscript/src/logic.mlc
@@ -3,6 +3,8 @@ module com.livecode.logic
 //foreign handler MCLogicEvalAnd(in Left as bool, in Right as bool, out Value as bool) as undefined binds to "<builtin>"
 //foreign handler MCLogicEvalOr(in Left as bool, in Right as bool, out Value as bool) as undefined binds to "<builtin>"
 public foreign handler MCLogicEvalNot(in Operand as bool, out Value as bool) as undefined binds to "<builtin>"
+public foreign handler MCLogicEvalIsEqualTo(in Left as bool, in Right as bool, out Value as bool) as undefined binds to "<builtin>"
+public foreign handler MCLogicEvalIsNotEqualTo(in Left as bool, in Right as bool, out Value as bool) as undefined binds to "<builtin>"
 
 --
 
@@ -54,4 +56,36 @@ end syntax
 
 --
 
+/*
+Summary:    Determines whether <Left> and <Right> are equal or not.
+
+Left:       An expression which evaluates to a bool.
+Right:      An expression which evaluates to a bool.
+
+output:     Returns true if <Left> evaluates to the same value as <Right>.
+
+*/
+
+syntax IsEqualTo is neutral binary operator with precedence 5
+    <Left: Expression> "is" <Right: Expression>
+begin
+    MCLogicEvalIsEqualTo(Left, Right, output)
+end syntax
+
+/*
+Summary:    Determines whether <Left> and <Right> are equal or not.
+
+Left:       An expression which evaluates to a bool.
+Right:      An expression which evaluates to a bool.
+
+output:     Returns true if <Left> evaluates to the opposite boolean value as <Right>.
+
+*/
+
+syntax IsNotEqualTo is neutral binary operator with precedence 5
+    <Left: Expression> "is not" <Right: Expression>
+begin
+    MCLogicEvalIsNotEqualTo(Left, Right, output)
+end syntax
+
 end module
diff --git a/libscript/src/module-logic.cpp b/libscript/src/module-logic.cpp
@@ -17,4 +17,14 @@
 extern "C" void MCLogicEvalNot(bool p_bool, bool& r_result)
 {
     r_result = !p_bool;
+}
+
+extern "C" void MCLogicEvalIsEqualTo(bool p_left, bool p_right, bool& r_result)
+{
+    r_result = (p_left == p_right);
+}
+
+extern "C" void MCLogicEvalIsNotEqualTo(bool p_left, bool p_right, bool& r_result)
+{
+    r_result = (p_left != p_right);
 }
diff --git a/libscript/src/string.mlc b/libscript/src/string.mlc
@@ -200,7 +200,7 @@ Description:
 The ```is not``` operator is case sensitive. 
 */
 
-syntax IsNotEqualTo is neutral binary operator with precedence 1
+syntax IsNotEqualTo is neutral binary operator with precedence 5
     <Left: Expression> "is not" <Right: Expression>
 begin
     MCStringEvalIsNotEqualTo(Left, Right, output)
diff --git a/toolchain/lc-compile/test.mlc b/toolchain/lc-compile/test.mlc
@@ -100,8 +100,7 @@ public handler testArray(inout xResults as list)
 	testLog("Array", "ElementsOf", "value2" is in tElements, xResults)
 	testLog("Array", "ElementsOf", "value3" is in tElements, xResults)
 		
-	testLog("Array", "IsAmongTheKeys", "key1" is among the keys of tArray, xResults)
-	
+	--testLog("Array", "IsAmongTheKeys", "key1" is among the keys of tArray, xResults)
 	--testLog("Array", "IsAmongTheElements", "value1" is among the keys of tArray, xResults)
 	
 	testLog("Array", "ElementOf", tArray["key1"] is "value1", xResults)
@@ -128,10 +127,18 @@ public handler testBitwise(inout xResults as list)
 end handler
 
 public handler testLogic(inout xResults as list)
-    variable tVar as bool
-    put not false into tVar
 
-    testLog("Logic", "Not", tVar, xResults)
+    testLog("Logic", "Not", not false, xResults)
+    testLog("Logic", "Not", not not true, xResults)
+        
+    testLog("Logic", "Is", true is true, xResults)
+    testLog("Logic", "Is", false is false, xResults)
+
+    testLog("Logic", "Is", true is not false, xResults)
+    testLog("Logic", "Is", false is not true, xResults)
+    	
+    testLog("Logic", "Is", not true is false, xResults)
+    testLog("Logic", "Is", not false is true, xResults)
     
     // test boolean short circuit
     
