Merge pull request #3 from koculu/develop

Fixes logical operator issue.
koculu · Mar 23, 2022 · ac50a33 · ac50a33
2 parents 5ae3029 + 9d89a77
commit ac50a33
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 20 deletions.
diff --git a/src/Tenray.Topaz.Test/ArithmeticAccuracyTests.cs b/src/Tenray.Topaz.Test/ArithmeticAccuracyTests.cs
@@ -54,5 +54,33 @@ public void TestArithmeticComparison()
             foreach (var item in (IEnumerable)(model.a))
                 Assert.IsTrue((bool)item);
         }
+
+
+        [Test]
+        public void TestLogicalOperators()
+        {
+
+            var engine = new TopazEngine();
+            engine.Options.LiteralNumbersAreConvertedToDouble = false;
+            engine.Options.NumbersAreConvertedToDoubleInArithmeticOperations = false;
+            dynamic model = new JsObject();
+            engine.SetValue("model", model);
+            engine.ExecuteScript(@"
+var x = 7
+var y = 3
+var a = y > x
+var b = y < x
+var c = a && b
+var d = b && a
+model.a = a
+model.b = b
+model.c = c
+model.d = d
+");
+            Assert.IsFalse((bool)model.a);
+            Assert.IsTrue((bool)model.b);
+            Assert.IsFalse((bool)model.c);
+            Assert.IsFalse((bool)model.d);
+        }
     }
 }
diff --git a/src/Tenray.Topaz/AstHandlers/Expressions/BinaryExpressionHandler.cs b/src/Tenray.Topaz/AstHandlers/Expressions/BinaryExpressionHandler.cs
@@ -46,9 +46,7 @@ private static object ExecuteBinaryOperatorDouble(
                 BinaryOperator.InstanceOf => Exceptions.ThrowRightHandSideOfInstanceOfIsNotObject(),
                 BinaryOperator.In => Exceptions.ThrowCannotUseInOperatorToSearchForIn(d1, d2),
                 BinaryOperator.LogicalAnd =>
-                    (JavascriptTypeUtility.IsObjectTrue(d1)
-                    &&
-                    JavascriptTypeUtility.IsObjectTrue(d2)) ? d2 : d1,
+                    JavascriptTypeUtility.AndLogicalOperator(d1, d2),
                 BinaryOperator.LogicalOr =>
                     JavascriptTypeUtility.IsObjectTrue(d1) ? d1 : d2,
                 BinaryOperator.Exponentiation => Math.Pow(d1, d2),
@@ -89,9 +87,7 @@ private static object ExecuteBinaryOperatorLong(
                         BinaryOperator.InstanceOf => Exceptions.ThrowRightHandSideOfInstanceOfIsNotObject(),
                         BinaryOperator.In => Exceptions.ThrowCannotUseInOperatorToSearchForIn(d1, d2),
                         BinaryOperator.LogicalAnd =>
-                            (JavascriptTypeUtility.IsObjectTrue(d1)
-                            &&
-                            JavascriptTypeUtility.IsObjectTrue(d2)) ? d2 : d1,
+                            JavascriptTypeUtility.AndLogicalOperator(d1, d2),
                         BinaryOperator.LogicalOr =>
                             JavascriptTypeUtility.IsObjectTrue(d1) ? d1 : d2,
                         BinaryOperator.Exponentiation => Math.Pow(d1, d2),
@@ -138,9 +134,7 @@ private static object ExecuteBinaryOperatorInt(
                         BinaryOperator.InstanceOf => Exceptions.ThrowRightHandSideOfInstanceOfIsNotObject(),
                         BinaryOperator.In => Exceptions.ThrowCannotUseInOperatorToSearchForIn(d1, d2),
                         BinaryOperator.LogicalAnd =>
-                            (JavascriptTypeUtility.IsObjectTrue(d1)
-                            &&
-                            JavascriptTypeUtility.IsObjectTrue(d2)) ? d2 : d1,
+                            JavascriptTypeUtility.AndLogicalOperator(d1, d2),
                         BinaryOperator.LogicalOr =>
                             JavascriptTypeUtility.IsObjectTrue(d1) ? d1 : d2,
                         BinaryOperator.Exponentiation => Math.Pow(d1, d2),
@@ -181,9 +175,7 @@ private static object ExecuteBinaryOperatorString(BinaryOperator binaryOperator,
                 BinaryOperator.InstanceOf => d1?.GetType().FullName == d2,
                 BinaryOperator.In => Exceptions.ThrowCannotUseInOperatorToSearchForIn(d1, d2),
                 BinaryOperator.LogicalAnd =>
-                    (JavascriptTypeUtility.IsObjectTrue(d1)
-                    &&
-                    JavascriptTypeUtility.IsObjectTrue(d2)) ? d2 : d1,
+                    JavascriptTypeUtility.AndLogicalOperator(d1, d2),
                 BinaryOperator.LogicalOr =>
                     JavascriptTypeUtility.IsObjectTrue(d1) ? d1 : d2,
                 BinaryOperator.Exponentiation => Exceptions.ThrowBinaryOperatorIsNotSupportedOn(binaryOperator, d1, d2),
@@ -218,9 +210,7 @@ private static object ExecuteBinaryOperatorString(BinaryOperator binaryOperator,
                 BinaryOperator.InstanceOf => d1?.GetType().FullName == d2?.ToString(),
                 BinaryOperator.In => Exceptions.ThrowCannotUseInOperatorToSearchForIn(d1, d2),
                 BinaryOperator.LogicalAnd =>
-                    (JavascriptTypeUtility.IsObjectTrue(d1)
-                    &&
-                    JavascriptTypeUtility.IsObjectTrue(d2)) ? d2 : d1,
+                   JavascriptTypeUtility.AndLogicalOperator(d1, d2),
                 BinaryOperator.LogicalOr =>
                     JavascriptTypeUtility.IsObjectTrue(d1) ? d1 : d2,
                 BinaryOperator.Exponentiation => Exceptions.ThrowBinaryOperatorIsNotSupportedOn(binaryOperator, d1, d2),
@@ -333,9 +323,7 @@ private static object ExecuteBinaryOperatorDynamic(
                         right.Contains(left) :
                         Exceptions.ThrowCannotUseInOperatorToSearchForIn(left, right),
                 BinaryOperator.LogicalAnd =>
-                    (JavascriptTypeUtility.IsObjectTrue(left)
-                    &&
-                    JavascriptTypeUtility.IsObjectTrue(right)) ? right : left,
+                    JavascriptTypeUtility.AndLogicalOperator(left, right),
                 BinaryOperator.LogicalOr =>
                     JavascriptTypeUtility.IsObjectTrue(left) ? left : right,
                 BinaryOperator.Exponentiation => allowNumeric ? Math.Pow(left ?? 0, right ?? 0) : 0,

diff --git a/src/Tenray.Topaz/Directory.Build.props b/src/Tenray.Topaz/Directory.Build.props
@@ -5,8 +5,8 @@
     <Authors>Ahmed Yasin Koculu</Authors>
     <PackageId>Topaz</PackageId>
     <Title>Topaz</Title>
-    <ProductVersion>1.2.3.0</ProductVersion>
-    <Version>1.2.3.0</Version>
+    <ProductVersion>1.2.4.0</ProductVersion>
+    <Version>1.2.4.0</Version>
     <Authors>Ahmed Yasin Koculu</Authors>
     <AssemblyTitle>Topaz</AssemblyTitle>
     <Description>Multithreaded Javascript Engine for .NET</Description>

diff --git a/src/Tenray.Topaz/Utility/JavascriptTypeUtility.cs b/src/Tenray.Topaz/Utility/JavascriptTypeUtility.cs
@@ -5,6 +5,13 @@ namespace Tenray.Topaz
 {
     internal class JavascriptTypeUtility
     {
+        internal static object AndLogicalOperator(object left, object right)
+        {
+            if (IsObjectFalse(left))
+                return left;
+            return right;
+        }
+
         internal static bool IsObjectTrue(object value)
         {
             // https://developer.mozilla.org/en-US/docs/Glossary/Truthy