Merge branch 'patch-1' into dev

codingseb · codingseb · commit 4ec84cec4cbc · 2019-04-07T20:12:05.000+02:00
diff --git a/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs b/CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs
@@ -1848,7 +1848,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                     {
                         stack.Push(varValueToPush);
                     }
-                    else if ((Variables.TryGetValue(varFuncName, out dynamic cusVarValueToPush) || varFuncMatch.Groups["assignationOperator"].Success)
+                    else if ((Variables.TryGetValue(varFuncName, out object cusVarValueToPush) || varFuncMatch.Groups["assignationOperator"].Success)
                         && !varFuncMatch.Groups["inObject"].Success
                         && (cusVarValueToPush == null || !TypesToBlock.Contains(cusVarValueToPush.GetType())))
                     {
@@ -1888,12 +1888,12 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
                             }
                             else if (varFuncMatch.Groups["postfixOperator"].Success)
                             {
-                                cusVarValueToPush = varFuncMatch.Groups["postfixOperator"].Value.Equals("++") ? cusVarValueToPush + 1 : cusVarValueToPush - 1;
+                                cusVarValueToPush = varFuncMatch.Groups["postfixOperator"].Value.Equals("++") ? (dynamic)cusVarValueToPush + 1 : (dynamic)cusVarValueToPush - 1;
                             }
                             else if (varFuncMatch.Groups["prefixOperator"].Success)
                             {
                                 stack.Pop();
-                                cusVarValueToPush = varFuncMatch.Groups["prefixOperator"].Value.Equals("++") ? cusVarValueToPush + 1 : cusVarValueToPush - 1;
+                                cusVarValueToPush = varFuncMatch.Groups["prefixOperator"].Value.Equals("++") ? (dynamic)cusVarValueToPush + 1 : (dynamic)cusVarValueToPush - 1;
                                 stack.Push(cusVarValueToPush);
                             }
                             else

Original file line number	Diff line number	Diff line change
`@@ -1848,7 +1848,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec`
`1848`	`1848`	`{`
`1849`	`1849`	`stack.Push(varValueToPush);`
`1850`	`1850`	`}`
`1851`		`- else if ((Variables.TryGetValue(varFuncName, out dynamic cusVarValueToPush) \|\| varFuncMatch.Groups["assignationOperator"].Success)`
	`1851`	`+ else if ((Variables.TryGetValue(varFuncName, out object cusVarValueToPush) \|\| varFuncMatch.Groups["assignationOperator"].Success)`
`1852`	`1852`	`&& !varFuncMatch.Groups["inObject"].Success`
`1853`	`1853`	`&& (cusVarValueToPush == null \|\| !TypesToBlock.Contains(cusVarValueToPush.GetType())))`
`1854`	`1854`	`{`
`@@ -1888,12 +1888,12 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec`
`1888`	`1888`	`}`
`1889`	`1889`	`else if (varFuncMatch.Groups["postfixOperator"].Success)`
`1890`	`1890`	`{`
`1891`		`- cusVarValueToPush = varFuncMatch.Groups["postfixOperator"].Value.Equals("++") ? cusVarValueToPush + 1 : cusVarValueToPush - 1;`
	`1891`	`+ cusVarValueToPush = varFuncMatch.Groups["postfixOperator"].Value.Equals("++") ? (dynamic)cusVarValueToPush + 1 : (dynamic)cusVarValueToPush - 1;`
`1892`	`1892`	`}`
`1893`	`1893`	`else if (varFuncMatch.Groups["prefixOperator"].Success)`
`1894`	`1894`	`{`
`1895`	`1895`	`stack.Pop();`
`1896`		`- cusVarValueToPush = varFuncMatch.Groups["prefixOperator"].Value.Equals("++") ? cusVarValueToPush + 1 : cusVarValueToPush - 1;`
	`1896`	`+ cusVarValueToPush = varFuncMatch.Groups["prefixOperator"].Value.Equals("++") ? (dynamic)cusVarValueToPush + 1 : (dynamic)cusVarValueToPush - 1;`
`1897`	`1897`	`stack.Push(cusVarValueToPush);`
`1898`	`1898`	`}`
`1899`	`1899`	`else`