Merge pull request #30 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs

@@ -1283,6 +1283,12 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests
                     .SetCategory("#26")
                     .Returns(false);
 
+                yield return new TestCaseData(Resources.Script0050, null, null, null)
+                    .SetCategory("Script")
+                    .SetCategory("conflict variable assignation vs on the fly in object with same name")
+                    .SetCategory("Bug")
+                    .Returns("{\"Hello\":3,\"No\":\"Yes\"}");
+
                 #endregion
             }
         }

CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs

@@ -265,4 +265,7 @@
   <data name="Script0049" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>resources\script0049.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="Script0050" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>resources\script0050.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
 </root>

CodingSeb.ExpressionEvaluator.Tests/Resources.resx

@@ -0,0 +1,8 @@
+/* Script0050 */
+Json = "hye";
+
+x = new ExpandoObject();
+x.Hello = 3;
+x.No = "Yes";
+
+x.Json;

CodingSeb.ExpressionEvaluator.Tests/Resources/Script0050.txt

@@ -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.3.5.0</Version>
-    <AssemblyVersion>1.3.5.0</AssemblyVersion>
-    <FileVersion>1.3.5.0</FileVersion>
+    <Version>1.3.6.0</Version>
+    <AssemblyVersion>1.3.6.0</AssemblyVersion>
+    <FileVersion>1.3.6.0</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <Authors>Coding Seb</Authors>
     <PackageId>CodingSeb.ExpressionEvaluator</PackageId>
@@ -18,9 +18,8 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageIconUrl>https://github.com/codingseb/ExpressionEvaluator/blob/master/Icon.png?raw=true</PackageIconUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>* Add OptionForceIntegerNumbersEvaluationsAsDoubleByDefault (if true 1/2 = 0.5 otherwise 1/2 = 0)
-* Correction of a conflict between &lt;&gt; operators and &lt;&gt; used for generics
-* Correction of a bug when imbricate different brackets with comma separators</PackageReleaseNotes>
+    <PackageReleaseNotes>* Change Variables In IDictionary&lt;string,object&gt;
+* Correction of a conflict when variable assignation vs on the fly in object with the same name</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>full</DebugType>

CodingSeb.ExpressionEvaluator/CodingSeb.ExpressionEvaluator.csproj

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.3.5.0 
+    Version : 1.3.6.0 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -797,15 +797,15 @@ public BindingFlags StaticBindingFlag
 
         #region Custom and on the fly variables and methods
 
-        private Dictionary<string, object> variables = new Dictionary<string, object>(StringComparer.Ordinal);
+        private IDictionary<string, object> variables = new Dictionary<string, object>(StringComparer.Ordinal);
 
         /// <summary>
         /// The Values of the variable use in the expressions
         /// </summary>
-        public Dictionary<string, object> Variables
+        public IDictionary<string, object> Variables
         {
             get { return variables; }
-            set { variables = value == null ? new Dictionary<string, object>() : new Dictionary<string, object>(value, StringComparerForCasing); }
+            set { variables = value == null ? new Dictionary<string, object>(StringComparerForCasing) : new Dictionary<string, object>(value, StringComparerForCasing); }
         }
 
         /// <summary>
@@ -840,7 +840,7 @@ public ExpressionEvaluator()
         /// Constructor with variable initialize
         /// </summary>
         /// <param name="variables">The Values of the variable use in the expressions</param>
-        public ExpressionEvaluator(Dictionary<string, object> variables) : this()
+        public ExpressionEvaluator(IDictionary<string, object> variables) : this()
         {
             Variables = variables;
         }
@@ -1830,8 +1830,8 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                     {
                         stack.Push(varValueToPush);
                     }
-                    else if ((Variables.TryGetValue(varFuncName, out dynamic cusVarValueToPush)
-                            || (!varFuncMatch.Groups["inObject"].Success && varFuncMatch.Groups["assignationOperator"].Success))
+                    else if ((Variables.TryGetValue(varFuncName, out dynamic cusVarValueToPush) || varFuncMatch.Groups["assignationOperator"].Success)
+                        && !varFuncMatch.Groups["inObject"].Success
                         && (cusVarValueToPush == null || !TypesToBlock.Contains(cusVarValueToPush.GetType())))
                     {
                         stack.Push(cusVarValueToPush);