Fix #284 - Implicit mul and exponentiation cannot be parsed (#285)

* Fix #284 - Implicit mul and exponentiation cannot be parsed * Update ReportGenerator
sys27 · Aug 29, 2020 · e50b5e1 · e50b5e1
1 parent 59e04ad
commit e50b5e1
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 3 deletions.
diff --git a/xFunc.Maths/Parser.cs b/xFunc.Maths/Parser.cs
@@ -518,8 +518,7 @@ private IExpression MulImplicitLeftUnary(TokenReader tokenReader)
             var number = Number(tokenReader);
             if (number != null)
             {
-                var rightUnary = Function(tokenReader) ??
-                                 Variable(tokenReader) ??
+                var rightUnary = MulImplicitExponentiation(tokenReader) ??
                                  ParenthesesExpression(tokenReader) ??
                                  Matrix(tokenReader) ??
                                  Vector(tokenReader);
@@ -539,6 +538,23 @@ private IExpression MulImplicitLeftUnary(TokenReader tokenReader)
             return null;
         }
 
+        private IExpression MulImplicitExponentiation(TokenReader tokenReader)
+        {
+            var left = Function(tokenReader) ??
+                       Variable(tokenReader);
+            if (left == null)
+                return null;
+
+            var @operator = tokenReader.Operator(OperatorToken.Exponentiation);
+            if (@operator == null)
+                return left;
+
+            var right = Exponentiation(tokenReader) ??
+                        throw new ParseException(Resource.ExponentParseException);
+
+            return CreateExponentiation(left, right);
+        }
+
         private IExpression LeftUnary(TokenReader tokenReader)
         {
             var token = (tokenReader.Operator(OperatorToken.Not) ??

diff --git a/xFunc.Tests/ParserTests/ParserTest.cs b/xFunc.Tests/ParserTests/ParserTest.cs
@@ -2151,5 +2151,46 @@ public void ParseCosWithoutOperator()
 
             ParseErrorTest(tokens);
         }
+
+        [Fact]
+        public void ImplicitMulAndPowerFunction()
+        {
+            var tokens = Builder()
+                .Number(2)
+                .Id("sin")
+                .OpenParenthesis()
+                .VariableX()
+                .CloseParenthesis()
+                .Operation(OperatorToken.Exponentiation)
+                .Number(2)
+                .Tokens;
+
+            var exp = parser.Parse(tokens);
+            var expected = new Mul(
+                Number.Two,
+                new Pow(new Sin(Variable.X), Number.Two)
+            );
+
+            Assert.Equal(expected, exp);
+        }
+
+        [Fact]
+        public void ImplicitMulAndPowerVariable()
+        {
+            var tokens = Builder()
+                .Number(2)
+                .VariableX()
+                .Operation(OperatorToken.Exponentiation)
+                .Number(2)
+                .Tokens;
+
+            var exp = parser.Parse(tokens);
+            var expected = new Mul(
+                Number.Two,
+                new Pow(Variable.X, Number.Two)
+            );
+
+            Assert.Equal(expected, exp);
+        }
     }
 }
diff --git a/xFunc.Tests/xFunc.Tests.csproj b/xFunc.Tests/xFunc.Tests.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="4.4.7" />
+    <DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="4.6.5" />
   </ItemGroup>
 
   <ItemGroup>