Merge pull request #50 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -2064,5 +2064,26 @@ public object EvaluateWithSpecificEvaluator(ExpressionEvaluator evaluator, strin
         }
 
         #endregion
+
+        #region With SubExpressions variables
+
+        [Test]
+        public void EvaluateWithSubExpressionsVariables()
+        {
+            ExpressionEvaluator evaluator = new ExpressionEvaluator();
+
+            evaluator.Variables["a"] = 1;
+            evaluator.Variables["b"] = 2;
+            evaluator.Variables["c"] = new SubExpression("a+b");
+            evaluator.Variables["d"] = new SubExpression("c+3");
+
+            evaluator.Evaluate("a").ShouldBe(1);
+            evaluator.Evaluate("b").ShouldBe(2);
+            evaluator.Evaluate("c").ShouldBe(3);
+            evaluator.Evaluate("d").ShouldBe(6);
+            evaluator.Evaluate("d-a").ShouldBe(5);
+        }
+
+        #endregion
     }
 }

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -5,9 +5,9 @@
     <Product>CodingSeb.ExpressionEvaluator</Product>
     <Description>A Simple Math and Pseudo C# Expression Evaluator in One C# File. Can also execute small C# like scripts</Description>
     <Copyright>Copyright © Coding Seb 2017</Copyright>
-    <Version>1.4.8.0</Version>
-    <AssemblyVersion>1.4.8.0</AssemblyVersion>
-    <FileVersion>1.4.8.0</FileVersion>
+    <Version>1.4.9.0</Version>
+    <AssemblyVersion>1.4.9.0</AssemblyVersion>
+    <FileVersion>1.4.9.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -18,7 +18,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Update nuget Microsoft.CSharp dependency to version 4.7.0</PackageReleaseNotes>
+    <PackageReleaseNotes>* You can now create SubExpression variables that are evaluate when met</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <RepositoryUrl>https://github.com/codingseb/ExpressionEvaluator</RepositoryUrl>
   </PropertyGroup>

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.4.8.0 
+    Version : 1.4.9.0 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -2751,6 +2751,7 @@ protected virtual object ProcessStack(Stack<object> stack)
         {
             List<object> list = stack
                 .Select(e => e is ValueTypeNestingTrace valueTypeNestingTrace ? valueTypeNestingTrace.Value : e)
+                .Select(e => e is SubExpression subExpression ? Evaluate(subExpression.Expression) : e)
                 .ToList();
 
             OperatorsEvaluations.ToList().ForEach((IDictionary<ExpressionOperator, Func<dynamic, dynamic, object>> operatorEvalutationsDict) =>
@@ -3787,6 +3788,16 @@ public partial class StronglyTypedVariable
         public object Value { get; set; }
     }
 
+    public partial class SubExpression
+    {
+        public string Expression { get; set; }
+
+        public SubExpression(string expression)
+        {
+            Expression = expression;
+        }
+    }
+
     public partial class ExpressionEvaluatorSyntaxErrorException : Exception
     {
         public ExpressionEvaluatorSyntaxErrorException()