Correction of conflict variable assignation vs on the fly in object with same name

Sébastien Geiser · Sébastien Geiser · commit 8a208899893a · 2019-04-02T16:47:59.000+02:00
diff --git a/CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorScriptEvaluateTests.cs b/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
             }
         }
diff --git a/CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs b/CodingSeb.ExpressionEvaluator.Tests/Resources.Designer.cs
diff --git a/CodingSeb.ExpressionEvaluator.Tests/Resources.resx b/CodingSeb.ExpressionEvaluator.Tests/Resources.resx
@@ -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>
diff --git a/CodingSeb.ExpressionEvaluator.Tests/Resources/Script0050.txt b/CodingSeb.ExpressionEvaluator.Tests/Resources/Script0050.txt
@@ -0,0 +1,8 @@
+﻿/* Script0050 */
+Json = "hye";
+
+x = new ExpandoObject();
+x.Hello = 3;
+x.No = "Yes";
+
+x.Json;
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1283,6 +1283,12 @@ public static IEnumerable<TestCaseData> TestCasesForScriptEvaluateTests`
`1283`	`1283`	`.SetCategory("#26")`
`1284`	`1284`	`.Returns(false);`
`1285`	`1285`
	`1286`	`+ yield return new TestCaseData(Resources.Script0050, null, null, null)`
	`1287`	`+ .SetCategory("Script")`
	`1288`	`+ .SetCategory("conflict variable assignation vs on the fly in object with same name")`
	`1289`	`+ .SetCategory("Bug")`
	`1290`	`+ .Returns("{\"Hello\":3,\"No\":\"Yes\"}");`
	`1291`	`+`
`1286`	`1292`	`#endregion`
`1287`	`1293`	`}`
`1288`	`1294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1830,8 +1830,8 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec`
`1830`	`1830`	`{`
`1831`	`1831`	`stack.Push(varValueToPush);`
`1832`	`1832`	`}`
`1833`		`- else if ((Variables.TryGetValue(varFuncName, out dynamic cusVarValueToPush)`
`1834`		`- \|\| (!varFuncMatch.Groups["inObject"].Success && varFuncMatch.Groups["assignationOperator"].Success))`
	`1833`	`+ else if ((Variables.TryGetValue(varFuncName, out dynamic cusVarValueToPush) \|\| varFuncMatch.Groups["assignationOperator"].Success)`
	`1834`	`+ && !varFuncMatch.Groups["inObject"].Success`
`1835`	`1835`	`&& (cusVarValueToPush == null \|\| !TypesToBlock.Contains(cusVarValueToPush.GetType())))`
`1836`	`1836`	`{`
`1837`	`1837`	`stack.Push(cusVarValueToPush);`