(FabianNitsche) Interpreter constants fix pieterderycke#72

mrxrsd · Feb 7, 2021 · bbba562 · bbba562
1 parent 6da2088
commit bbba562
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 2 deletions.
diff --git a/Jace.Tests/DecimalCalculationEngineTests.cs b/Jace.Tests/DecimalCalculationEngineTests.cs
@@ -588,6 +588,32 @@ public void TestVariableCaseFuncInterpreted()
             decimal result = formula(variables);
         }
 
+        [TestMethod]
+        public void TestConstantBuildCompiled()
+        {
+            var engine = CreateEngineHelper<decimal>(CultureInfo.InvariantCulture, ExecutionMode.Compiled);
+            Func<Dictionary<string, decimal>, decimal> formula = engine.Build("pi");
+
+            var variables = new Dictionary<string, decimal>();
+
+            decimal result = formula(variables);
+
+            Assert.AreEqual((decimal) Math.PI , result);
+        }
+
+        [TestMethod]
+        public void TestConstantBuildInterpreted()
+        {
+            var engine = CreateEngineHelper<decimal>(CultureInfo.InvariantCulture, ExecutionMode.Interpreted);
+            Func<Dictionary<string, decimal>, decimal> formula = engine.Build("pi");
+
+            Dictionary<string, decimal> variables = new Dictionary<string, decimal>();
+
+            decimal result = formula(variables);
+
+            Assert.AreEqual((decimal)Math.PI, result);
+        }
+
         [TestMethod]
         public void TestVariableCaseFuncCompiled()
         {

diff --git a/Jace.Tests/DoubleCalculationEngineTests.cs b/Jace.Tests/DoubleCalculationEngineTests.cs
@@ -588,6 +588,32 @@ public void TestVariableCaseFuncInterpreted()
             double result = formula(variables);
         }
 
+        [TestMethod]
+        public void TestConstantBuildCompiled()
+        {
+            var engine = CreateEngineHelper<double>(CultureInfo.InvariantCulture, ExecutionMode.Compiled);
+            Func<Dictionary<string, double>, double> formula = engine.Build("pi");
+
+            var variables = new Dictionary<string, double>();
+
+            double result = formula(variables);
+
+            Assert.AreEqual(Math.PI, result);
+        }
+
+        [TestMethod]
+        public void TestConstantBuildInterpreted()
+        {
+            var engine = CreateEngineHelper<double>(CultureInfo.InvariantCulture, ExecutionMode.Interpreted);
+            Func<Dictionary<string, double>, double> formula = engine.Build("pi");
+
+            Dictionary<string, double> variables = new Dictionary<string, double>();
+
+            double result = formula(variables);
+
+            Assert.AreEqual(Math.PI, result);
+        }
+
         [TestMethod]
         public void TestVariableCaseFuncCompiled()
         {

diff --git a/Jace/Execution/Interpreter.cs b/Jace/Execution/Interpreter.cs
@@ -69,8 +69,11 @@ public T Execute(Operation operation,
 
                 if (variableFound)
                     return value;
-                else
-                    throw new VariableNotDefinedException(string.Format("The variable \"{0}\" used is not defined.", variable.Name));
+
+                if (constantRegistry.IsConstantName(variable.Name))
+                    return constantRegistry.GetConstantInfo(variable.Name).Value;
+
+                throw new VariableNotDefinedException(string.Format("The variable \"{0}\" used is not defined.", variable.Name));
             }
             else if (operation.GetType() == typeof(Multiplication))
             {