Merge pull request #90 from codingseb/dev

Dev

Author: codingseb

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.22.0</Version>
-    <AssemblyVersion>1.4.22.0</AssemblyVersion>
-    <FileVersion>1.4.22.0</FileVersion>
+    <Version>1.4.23.0</Version>
+    <AssemblyVersion>1.4.23.0</AssemblyVersion>
+    <FileVersion>1.4.23.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -19,7 +19,8 @@
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Add Support for method call with parameters with default value</PackageReleaseNotes>
+    <PackageReleaseNotes>* Add the option OptionCanDeclareMultiExpressionsLambdaInSimpleExpressionEvaluate (default is true)
+* Allow to declare and call multi expressions lambda in simple expression Evaluate</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.22.0 
+    Version : 1.4.23.0 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -860,6 +860,13 @@ public bool OptionNewFunctionEvaluationActive
         /// </summary>
         public bool OptionDetectExtensionMethodsOverloadsOnExtensionMethodNotFound { get; set; } = true;
 
+        /// <summary>
+        /// If <c>true</c> Allow to define multi expression lambda in Expressions (not in script)<para/>
+        /// If <c>false</c> Can only define simple expression lambda if not in script
+        /// <para>Default value : <c>true</c></para>
+        /// </summary>
+        public bool OptionCanDeclareMultiExpressionsLambdaInSimpleExpressionEvaluate { get; set; } = true;
+
         #endregion
 
         #region Reflection flags
@@ -3096,6 +3103,8 @@ protected virtual bool GetLambdaExpression(string expression, Stack<object> stac
                     .Cast<Match>().ToList()
                     .ConvertAll(argMatch => argMatch.Value);
 
+                bool inScriptAtDeclaration = inScript;
+
                 stack.Push(new InternalDelegate((object[] args) =>
                 {
                     var vars = new Dictionary<string, object>(variables);
@@ -3112,10 +3121,10 @@ protected virtual bool GetLambdaExpression(string expression, Stack<object> stac
 
                     object result = null;
 
-                    if (inScript && lambdaBody.StartsWith("{") && lambdaBody.EndsWith("}"))
+                    if ((OptionCanDeclareMultiExpressionsLambdaInSimpleExpressionEvaluate || inScriptAtDeclaration) 
+                        && lambdaBody.StartsWith("{") && lambdaBody.EndsWith("}"))
                     {
                         result = ScriptEvaluate(lambdaBody.Substring(1, lambdaBody.Length - 2));
-                        inScript = true;
                     }
                     else
                     {