Support for the binary and operation

pieterderycke · Aug 15, 2018 · 196dbec · 196dbec
1 parent f3712bc
commit 196dbec
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 13 deletions.
diff --git a/Jace.Tests/CalculationEngineTests.cs b/Jace.Tests/CalculationEngineTests.cs
@@ -823,5 +823,21 @@ public void TestCustomFunctionDynamicFuncNestedDynamicCompiled()
             double expected = (11 * (11 + 1)) / 2.0;
             Assert.AreEqual(expected, result);
         }
+
+        [TestMethod]
+        public void TestAndCompiled()
+        {
+            CalculationEngine engine = new CalculationEngine(CultureInfo.InvariantCulture, ExecutionMode.Compiled, true, false);
+            double result = engine.Calculate("(1&0)");
+            Assert.AreEqual(0, result);
+        }
+
+        [TestMethod]
+        public void TestAndInterpreted()
+        {
+            CalculationEngine engine = new CalculationEngine(CultureInfo.InvariantCulture, ExecutionMode.Interpreted, true, false);
+            double result = engine.Calculate("(1&0)");
+            Assert.AreEqual(0, result);
+        }
     }
 }
diff --git a/Jace/AstBuilder.cs b/Jace/AstBuilder.cs
@@ -25,19 +25,20 @@ public AstBuilder(IFunctionRegistry functionRegistry)
             this.functionRegistry = functionRegistry;
 
             operationPrecedence.Add('(', 0);
-            operationPrecedence.Add('<', 1);
-            operationPrecedence.Add('>', 1);
-            operationPrecedence.Add('≤', 1);
-            operationPrecedence.Add('≥', 1);
-            operationPrecedence.Add('≠', 1);
-            operationPrecedence.Add('=', 1);
-            operationPrecedence.Add('+', 2);
-            operationPrecedence.Add('-', 2);
-            operationPrecedence.Add('*', 3);
-            operationPrecedence.Add('/', 3);
-            operationPrecedence.Add('%', 3);
-            operationPrecedence.Add('_', 5);
-            operationPrecedence.Add('^', 4);
+            operationPrecedence.Add('&', 1);
+            operationPrecedence.Add('<', 2);
+            operationPrecedence.Add('>', 2);
+            operationPrecedence.Add('≤', 2);
+            operationPrecedence.Add('≥', 2);
+            operationPrecedence.Add('≠', 2);
+            operationPrecedence.Add('=', 2);
+            operationPrecedence.Add('+', 3);
+            operationPrecedence.Add('-', 3);
+            operationPrecedence.Add('*', 4);
+            operationPrecedence.Add('/', 4);
+            operationPrecedence.Add('%', 4);
+            operationPrecedence.Add('_', 6);
+            operationPrecedence.Add('^', 5);
         }
 
         public Operation Build(IList<Token> tokens)
@@ -213,6 +214,11 @@ private Operation ConvertOperation(Token operationToken)
                         Operation @base = resultStack.Pop();
 
                         return new Exponentiation(DataType.FloatingPoint, @base, exponent);
+                    case '&':
+                        argument2 = resultStack.Pop();
+                        argument1 = resultStack.Pop();
+                        dataType = RequiredDataType(argument1, argument2);
+                        return new And(dataType, argument1, argument2);
                     case '<':
                         argument2 = resultStack.Pop();
                         argument1 = resultStack.Pop();

diff --git a/Jace/Execution/DynamicCompiler.cs b/Jace/Execution/DynamicCompiler.cs
@@ -164,6 +164,16 @@ public double Execute(Operation operation, IFunctionRegistry functionRegistry)
                 Expression argument = GenerateMethodBody(unaryMinus.Argument, contextParameter, functionRegistry);
                 return Expression.Negate(argument);
             }
+            else if (operation.GetType() == typeof(And))
+            {
+                And and = (And)operation;
+                Expression argument1 = Expression.NotEqual(GenerateMethodBody(and.Argument1, contextParameter, functionRegistry), Expression.Constant(0.0));
+                Expression argument2 = Expression.NotEqual(GenerateMethodBody(and.Argument2, contextParameter, functionRegistry), Expression.Constant(0.0));
+
+                return Expression.Condition(Expression.And(argument1, argument2),
+                    Expression.Constant(1.0),
+                    Expression.Constant(0.0));
+            }
             else if (operation.GetType() == typeof(LessThan))
             {
                 LessThan lessThan = (LessThan)operation;

diff --git a/Jace/Execution/Interpreter.cs b/Jace/Execution/Interpreter.cs
@@ -88,6 +88,11 @@ public double Execute(Operation operation, IFunctionRegistry functionRegistry)
                 UnaryMinus unaryMinus = (UnaryMinus)operation;
                 return -Execute(unaryMinus.Argument, functionRegistry, variables);
             }
+            else if (operation.GetType() == typeof(And))
+            {
+                And lessThan = (And)operation;
+                return ((Execute(lessThan.Argument1, functionRegistry, variables) != 0) && (Execute(lessThan.Argument2, functionRegistry, variables) != 0)) ? 1.0 : 0.0;
+            }
             else if(operation.GetType() == typeof(LessThan))
             {
                 LessThan lessThan = (LessThan)operation;

diff --git a/Jace/Operations/And.cs b/Jace/Operations/And.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Jace.Operations
+{
+    public class And : Operation
+    {
+        public And(DataType dataType, Operation argument1, Operation argument2)
+            : base(dataType, argument1.DependsOnVariables || argument2.DependsOnVariables)
+        {
+            this.Argument1 = argument1;
+            this.Argument2 = argument2;
+        }
+
+        public Operation Argument1 { get; internal set; }
+        public Operation Argument2 { get; internal set; }
+    }
+}
diff --git a/Jace/Tokenizer/TokenReader.cs b/Jace/Tokenizer/TokenReader.cs
@@ -126,6 +126,7 @@ public List<Token> Read(string formula)
                         case '≤':
                         case '≥':
                         case '≠':
+                        case '&':
                             if (IsUnaryMinus(characters[i], tokens))
                             {
                                 // We use the token '_' for a unary minus in the AST builder