#236 - Rework parser (remove RPN)

sys27 · Aug 1, 2019 · 1b7e963 · 1b7e963
1 parent c3ae1e2
commit 1b7e963
Show file tree

Hide file tree

Showing 26 changed files with 954 additions and 665 deletions.
diff --git a/xFunc.Benchmark/Benchmarks/ParserBenchmark.cs b/xFunc.Benchmark/Benchmarks/ParserBenchmark.cs
@@ -27,13 +27,13 @@ public void Setup()
                 .Number(100.1)
                 .Operation(Operations.Addition)
                 .OpenBracket()
-                .Function(Functions.Sine, 1)
+                .Function(Functions.Sine)
                 .OpenBracket()
-                .Function(Functions.Cosine, 1)
+                .Function(Functions.Cosine)
                 .OpenBracket()
-                .Function(Functions.Tangent, 1)
+                .Function(Functions.Tangent)
                 .OpenBracket()
-                .Function(Functions.Cotangent, 1)
+                .Function(Functions.Cotangent)
                 .OpenBracket()
                 .VariableX()
                 .CloseBracket()
@@ -59,7 +59,7 @@ public void Setup()
                 .CloseBracket()
                 .Operation(Operations.Subtraction)
                 .OpenBracket()
-                .Function(Functions.Cosine, 1)
+                .Function(Functions.Cosine)
                 .OpenBracket()
                 .VariableY()
                 .CloseBracket()
@@ -78,18 +78,18 @@ public void Setup()
                 .CloseBracket()
                 .Operation(Operations.Addition)
                 .OpenBracket()
-                .Function(Functions.Determinant, 1)
+                .Function(Functions.Determinant)
                 .OpenBracket()
-                .Function(Functions.Matrix, 2)
+                .Function(Functions.Matrix)
                 .OpenBrace()
-                .Function(Functions.Vector, 2)
+                .Function(Functions.Vector)
                 .OpenBrace()
                 .Number(1)
                 .Comma()
                 .Number(2)
                 .CloseBrace()
                 .Comma()
-                .Function(Functions.Vector, 2)
+                .Function(Functions.Vector)
                 .OpenBrace()
                 .Number(3)
                 .Comma()
@@ -98,7 +98,7 @@ public void Setup()
                 .CloseBrace()
                 .CloseBracket()
                 .Operation(Operations.Multiplication)
-                .Function(Functions.Log, 2)
+                .Function(Functions.Log)
                 .OpenBracket()
                 .Number(2)
                 .Comma()

diff --git a/xFunc.DotnetTool/Program.cs b/xFunc.DotnetTool/Program.cs
@@ -6,6 +6,7 @@
 using xFunc.Maths.Analyzers.TypeAnalyzers;
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Expressions.Collections;
+using xFunc.Maths.Tokenization;
 
 namespace xFunc.DotnetTool
 {

diff --git a/xFunc.Maths/ExpressionFactory.cs b/xFunc.Maths/ExpressionFactory.cs
diff --git a/xFunc.Maths/Expressions/BinaryExpression.cs b/xFunc.Maths/Expressions/BinaryExpression.cs
@@ -22,7 +22,7 @@ namespace xFunc.Maths.Expressions
     /// <summary>
     /// The base class for binary operations.
     /// </summary>
-    public abstract class BinaryExpression : IFunctionExpression
+    public abstract class BinaryExpression : IExpression
     {
 
         /// <summary>
@@ -197,14 +197,6 @@ public virtual IExpression Right
         /// </summary>
         public virtual IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public virtual int ParametersCount => 2;
-
     }
 
 }
diff --git a/xFunc.Maths/Expressions/Define.cs b/xFunc.Maths/Expressions/Define.cs
@@ -23,7 +23,7 @@ namespace xFunc.Maths.Expressions
     /// <summary>
     /// Represents the Define operation.
     /// </summary>
-    public class Define : IFunctionExpression
+    public class Define : IExpression
     {
 
         private IExpression key;
@@ -168,14 +168,6 @@ public IExpression Clone()
         /// </summary>
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => 2;
-
         /// <summary>
         /// Gets or sets the key.
         /// </summary>

diff --git a/xFunc.Maths/Expressions/DifferentParametersExpression.cs b/xFunc.Maths/Expressions/DifferentParametersExpression.cs
@@ -23,7 +23,7 @@ namespace xFunc.Maths.Expressions
     /// <summary>
     /// The base class for expressions with different number of parameters.
     /// </summary>
-    public abstract class DifferentParametersExpression : IFunctionExpression
+    public abstract class DifferentParametersExpression : IExpression
     {
 
         /// <summary>

diff --git a/xFunc.Maths/Expressions/IFunctionExpression.cs b/xFunc.Maths/Expressions/IFunctionExpression.cs
diff --git a/xFunc.Maths/Expressions/UnaryExpression.cs b/xFunc.Maths/Expressions/UnaryExpression.cs
@@ -22,7 +22,7 @@ namespace xFunc.Maths.Expressions
     /// <summary>
     /// The abstract base class that represents the unary operation.
     /// </summary>
-    public abstract class UnaryExpression : IFunctionExpression
+    public abstract class UnaryExpression : IExpression
     {
 
         /// <summary>
@@ -165,14 +165,6 @@ public virtual IExpression Argument
         /// </summary>
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public virtual int ParametersCount => 1;
-
     }
 
 }
diff --git a/xFunc.Maths/Expressions/Undefine.cs b/xFunc.Maths/Expressions/Undefine.cs
@@ -24,7 +24,7 @@ namespace xFunc.Maths.Expressions
     /// <summary>
     /// Represents the Undefice operation.
     /// </summary>
-    public class Undefine : IFunctionExpression
+    public class Undefine : IExpression
     {
 
         private IExpression key;
@@ -158,14 +158,6 @@ public IExpression Clone()
         [ExcludeFromCodeCoverage]
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => 1;
-
         /// <summary>
         /// Gets or sets the key.
         /// </summary>

diff --git a/xFunc.Maths/IExpressionFactory.cs b/xFunc.Maths/IExpressionFactory.cs
@@ -12,7 +12,6 @@
 // express or implied. 
 // See the License for the specific language governing permissions and 
 // limitations under the License.
-using System.Collections.Generic;
 using xFunc.Maths.Expressions;
 using xFunc.Maths.Tokenization.Tokens;
 
@@ -31,7 +30,7 @@ public interface IExpressionFactory
         /// <param name="token">The token.</param>
         /// <param name="arguments">The list of arguments.</param>
         /// <returns>The expression.</returns>
-        IExpression Create(IToken token, IEnumerable<IExpression> arguments);
+        IExpression Create(IToken token, params IExpression[] arguments);
 
     }