Fix parsing of nested function with multiple parameters

bcwood · Dec 10, 2020 · 9eda1ac · 9eda1ac
1 parent d6effa6
commit 9eda1ac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/Tests/FunctionTests.cs b/Tests/FunctionTests.cs
@@ -189,6 +189,13 @@ public void NestedFunctions(double a)
 			Assert.AreEqual(Math.Sin(Math.Cos(Math.Tan(a))), compiler.Calculate());
 		}
 
+        [Test]
+        public void NestedFunctionsWithMultipleParameters()
+        {
+            var compiler = new EquationCompiler("max(1,min(2,3))");
+			Assert.AreEqual(2, compiler.Calculate());
+        }
+
 		[Test]
 		public void RangeTest()
 		{
@@ -288,6 +295,13 @@ public void IfWithEquation(string condition, bool result, double a, double b, do
             Assert.AreEqual((result ? a : b + c), compiler.Calculate());
         }
 
+        [Test]
+        public void NestedIf()
+        {
+			var compiler = new EquationCompiler("if(1, if(1, 2, 3), 4)");
+			Assert.AreEqual(2, compiler.Calculate());
+        }
+
         [Test]
 		public void MultipleFunctionsPerObject()
 		{

diff --git a/dotMath/EquationCompiler.cs b/dotMath/EquationCompiler.cs
@@ -188,6 +188,9 @@ private CValue Paren()
 							isFunction = true;
 
 							value = function.SetParameters(parameters);
+
+							if (string.Equals(_currentToken, ")") && parameters.Count > 1)
+								NextToken();
 						}
 						else
 							value = GetVariableByName(_currentToken.ToString());