Fix #211 - Extract properties from IExpression to separate interface

xFunc.Maths/Builder.cs

@@ -912,30 +912,6 @@ public IExpression Parent
             }
         }
 
-        /// <summary>
-        /// Gets the minimum count of parameters.
-        /// </summary>
-        /// <value>
-        /// The minimum count of parameters.
-        /// </value>
-        public int MinParameters => current.MinParameters;
-
-        /// <summary>
-        /// Gets the maximum count of parameters. -1 - Infinity.
-        /// </summary>
-        /// <value>
-        /// The maximum count of parameters.
-        /// </value>
-        public int MaxParameters => current.MaxParameters;
-
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => current.ParametersCount;
-
         #endregion
 
         /// <summary>

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 : IExpression
+    public abstract class BinaryExpression : IFunctionExpression
     {
 
         /// <summary>

xFunc.Maths/Expressions/ComplexNumbers/ComplexNumber.cs

@@ -183,30 +183,6 @@ public IExpression Clone()
         /// </summary>
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the minimum count of parameters.
-        /// </summary>
-        /// <value>
-        /// The minimum count of parameters.
-        /// </value>
-        public int MinParameters => 0;
-
-        /// <summary>
-        /// Gets the maximum count of parameters.
-        /// </summary>
-        /// <value>
-        /// The maximum count of parameters.
-        /// </value>
-        public int MaxParameters => -1;
-
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => 0;
-
     }
 
 }

xFunc.Maths/Expressions/Define.cs

@@ -24,7 +24,7 @@ namespace xFunc.Maths.Expressions
     /// <summary>
     /// Represents the Define operation.
     /// </summary>
-    public class Define : IExpression
+    public class Define : IFunctionExpression
     {
 
         private IExpression key;

xFunc.Maths/Expressions/DelegateExpression.cs

@@ -146,30 +146,6 @@ public IExpression Clone()
         /// </summary>
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the minimum count of parameters.
-        /// </summary>
-        /// <value>
-        /// The minimum count of parameters.
-        /// </value>
-        public int MinParameters => 1;
-
-        /// <summary>
-        /// Gets the maximum count of parameters. -1 - Infinity.
-        /// </summary>
-        /// <value>
-        /// The maximum count of parameters.
-        /// </value>
-        public int MaxParameters => 1;
-
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => 1;
-
     }
 
 }

xFunc.Maths/Expressions/DifferentParametersExpression.cs

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

xFunc.Maths/Expressions/IExpression.cs

@@ -65,28 +65,6 @@ public interface IExpression
         /// </summary>
         IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the minimum count of parameters.
-        /// </summary>
-        /// <value>
-        /// The minimum count of parameters.
-        /// </value>
-        int MinParameters { get; }
-        /// <summary>
-        /// Gets the maximum count of parameters. -1 - Infinity.
-        /// </summary>
-        /// <value>
-        /// The maximum count of parameters.
-        /// </value>
-        int MaxParameters { get; }
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        int ParametersCount { get; }
-
     }
 
 }

xFunc.Maths/Expressions/IFunctionExpression.cs

@@ -0,0 +1,52 @@
+// Copyright 2012-2018 Dmitry Kischenko
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); 
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
+// express or implied. 
+// See the License for the specific language governing permissions and 
+// limitations under the License.
+using System;
+using xFunc.Maths.Analyzers;
+using xFunc.Maths.Analyzers.Formatters;
+
+namespace xFunc.Maths.Expressions
+{
+
+    /// <summary>
+    /// Defines methods to work with expressions.
+    /// </summary>
+    public interface IFunctionExpression : IExpression
+    {
+
+        /// <summary>
+        /// Gets the minimum count of parameters.
+        /// </summary>
+        /// <value>
+        /// The minimum count of parameters.
+        /// </value>
+        int MinParameters { get; }
+        /// <summary>
+        /// Gets the maximum count of parameters. -1 - Infinity.
+        /// </summary>
+        /// <value>
+        /// The maximum count of parameters.
+        /// </value>
+        int MaxParameters { get; }
+        /// <summary>
+        /// Gets the count of parameters.
+        /// </summary>
+        /// <value>
+        /// The count of parameters.
+        /// </value>
+        int ParametersCount { get; }
+
+    }
+
+}

xFunc.Maths/Expressions/LogicalAndBitwise/Bool.cs

@@ -159,30 +159,6 @@ public IExpression Clone()
         /// </summary>
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the minimum count of parameters.
-        /// </summary>
-        /// <value>
-        /// The minimum count of parameters.
-        /// </value>
-        public int MinParameters => 0;
-
-        /// <summary>
-        /// Gets the maximum count of parameters. -1 - Infinity.
-        /// </summary>
-        /// <value>
-        /// The maximum count of parameters.
-        /// </value>
-        public int MaxParameters => -1;
-
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => 0;
-
         /// <summary>
         /// Gets the value of this expression.
         /// </summary>

xFunc.Maths/Expressions/Matrices/Matrix.cs

@@ -237,9 +237,18 @@ public override IExpression[] Arguments
             {
                 if (value != null && value.Length > 0)
                 {
-                    var size = value[0].ParametersCount;
-
-                    if (value.Any(exp => exp.ParametersCount != size))
+                    var vectors = new Vector[value.Length];
+                    for (var i = 0; i < vectors.Length; i++)
+                    {
+                        var vector = value[i] as Vector;
+                        if (vector == null)
+                            throw new MatrixIsInvalidException();
+
+                        vectors[i] = vector;
+                    }
+
+                    var size = vectors[0].ParametersCount;
+                    if (vectors.Any(exp => exp.ParametersCount != size))
                         throw new MatrixIsInvalidException();
                 }
 
@@ -253,7 +262,17 @@ public override IExpression[] Arguments
         /// <value>
         /// The size of vectors.
         /// </value>
-        public int SizeOfVectors => m_arguments[0].ParametersCount;
+        public int SizeOfVectors
+        {
+            get
+            {
+                var value = m_arguments[0] as Vector;
+                if (value == null)
+                    throw new MatrixIsInvalidException();
+
+                return value.ParametersCount;
+            }
+        }
 
         /// <summary>
         /// Gets the minimum count of parameters.

xFunc.Maths/Expressions/Number.cs

@@ -154,30 +154,6 @@ public IExpression Clone()
         /// </summary>
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the minimum count of parameters. 
-        /// </summary>
-        /// <value>
-        /// The minimum count of parameters.
-        /// </value>
-        public int MinParameters => 0;
-
-        /// <summary>
-        /// Gets the maximum count of parameters. -1 - Infinity.
-        /// </summary>
-        /// <value>
-        /// The maximum count of parameters.
-        /// </value>
-        public int MaxParameters => -1;
-
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => 0;
-
     }
 
 }

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 : IExpression
+    public abstract class UnaryExpression : IFunctionExpression
     {
 
         /// <summary>

xFunc.Maths/Expressions/Undefine.cs

@@ -24,7 +24,7 @@ namespace xFunc.Maths.Expressions
     /// <summary>
     /// Represents the Undefice operation.
     /// </summary>
-    public class Undefine : IExpression
+    public class Undefine : IFunctionExpression
     {
 
         private IExpression key;

xFunc.Maths/Expressions/Variable.cs

@@ -158,30 +158,6 @@ public IExpression Clone()
         /// </summary>
         public IExpression Parent { get; set; }
 
-        /// <summary>
-        /// Gets the minimum count of parameters. -1 - Infinity.
-        /// </summary>
-        /// <value>
-        /// The minimum count of parameters.
-        /// </value>
-        public int MinParameters => 0;
-
-        /// <summary>
-        /// Gets the maximum count of parameters. -1 - Infinity.
-        /// </summary>
-        /// <value>
-        /// The maximum count of parameters.
-        /// </value>
-        public int MaxParameters => -1;
-
-        /// <summary>
-        /// Gets the count of parameters.
-        /// </summary>
-        /// <value>
-        /// The count of parameters.
-        /// </value>
-        public int ParametersCount => 0;
-
     }
 
 }

xFunc.Maths/Parser.cs

@@ -129,11 +129,11 @@ private IEnumerable<IExpression> ConvertTokensToExpressions(IEnumerable<IToken>
                 if (exp == null)
                     throw new ParserException(Resource.ErrorWhileParsingTree);
 
-                if (token is FunctionToken t)
+                if (token is FunctionToken t && exp is IFunctionExpression funcExp)
                 {
-                    if (t.CountOfParams < exp.MinParameters)
+                    if (t.CountOfParams < funcExp.MinParameters)
                         throw new ParserException(Resource.LessParams);
-                    if (exp.MaxParameters != -1 && t.CountOfParams > exp.MaxParameters)
+                    if (funcExp.MaxParameters != -1 && t.CountOfParams > funcExp.MaxParameters)
                         throw new ParserException(Resource.MoreParams);
                 }
 

xFunc.Tests/Analyzers/TypeAnalyzerTests/MatrixTests.cs

@@ -68,12 +68,10 @@ public void TestMatrixUndefinedElement()
         [Fact]
         public void TestMatrixNotVectorElement()
         {
-            DifferentParametersExpression exp = new Matrix(2, 2)
+            Assert.Throws<MatrixIsInvalidException>(() => new Matrix(2, 2)
             {
                 Arguments = new[] { new Number(2) }
-            };
-
-            TestDiffParamException(exp);
+            });
         }
 
         [Fact]