Refactoring

Author: codingseb

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1427,6 +1427,32 @@ private bool EvaluateInstanceCreationWithNewKeyword(string expr, string restOfEx
                 if (type == null)
                     throw new ExpressionEvaluatorSyntaxErrorException($"Type or class {completeName}{genericTypes} is unknown");
 
+                void Init(object element, List<string> initArgs)
+                {
+                    if (typeof(IEnumerable).IsAssignableFrom(type) && !typeof(IDictionary).IsAssignableFrom(type))
+                    {
+                        MethodInfo methodInfo = type.GetMethod("Add", BindingFlags.Public | BindingFlags.Instance);
+
+                        initArgs.ForEach(subExpr => methodInfo.Invoke(element, new object[] { Evaluate(subExpr) }));
+                    }
+                    else
+                    {
+                        ExpressionEvaluator initEvaluator = new ExpressionEvaluator(new Dictionary<string, object>() { { "this", element } });
+
+                        initArgs.ForEach(subExpr =>
+                        {
+                            if (subExpr.Contains("="))
+                            {
+                                string trimmedSubExpr = subExpr.TrimStart();
+
+                                initEvaluator.Evaluate($"this{(trimmedSubExpr.StartsWith("[") ? string.Empty : ".")}{trimmedSubExpr}");
+                            }
+                            else
+                                throw new ExpressionEvaluatorSyntaxErrorException($"A '=' char is missing in [{subExpr}]. It is in a object initializer. It must contains one.");
+                        });
+                    }
+                }
+
                 if (instanceCreationMatch.Groups["isfunction"].Success)
                 { 
                     List<string> constructorArgs = GetExpressionsBetweenParenthesesOrOtherImbricableBrackets(expr, ref i, true);
@@ -1444,28 +1470,7 @@ private bool EvaluateInstanceCreationWithNewKeyword(string expr, string restOfEx
 
                         List<string> initArgs = GetExpressionsBetweenParenthesesOrOtherImbricableBrackets(expr, ref i, true, ",", "{", "}");
 
-                        if (typeof(IEnumerable).IsAssignableFrom(type) && !typeof(IDictionary).IsAssignableFrom(type))
-                        {
-                            MethodInfo methodInfo = type.GetMethod("Add", BindingFlags.Public | BindingFlags.Instance);
-
-                            initArgs.ForEach(subExpr => methodInfo.Invoke(element, new object[] { Evaluate(subExpr) }));
-                        }
-                        else
-                        {
-                            ExpressionEvaluator initEvaluator = new ExpressionEvaluator(new Dictionary<string, object>() { { "this", element } });
-
-                            initArgs.ForEach(subExpr =>
-                            {
-                                if (subExpr.Contains("="))
-                                {
-                                    string trimmedSubExpr = subExpr.TrimStart();
-
-                                    initEvaluator.Evaluate($"this{(trimmedSubExpr.StartsWith("[") ? string.Empty : ".")}{trimmedSubExpr}");
-                                }
-                                else
-                                    throw new ExpressionEvaluatorSyntaxErrorException($"A '=' char is missing in [{subExpr}]. It is in a object initializer. It must contains one.");
-                            });
-                        }
+                        Init(element, initArgs);
                     }
                     else
                         i--;
@@ -1474,33 +1479,11 @@ private bool EvaluateInstanceCreationWithNewKeyword(string expr, string restOfEx
                 }
                 else if(instanceCreationMatch.Groups["isInit"].Success)
                 {
-                    List<string> initArgs = GetExpressionsBetweenParenthesesOrOtherImbricableBrackets(expr, ref i, true, ",", "{", "}");
-
                     object element = Activator.CreateInstance(type, new object[0]);
 
-                    if (typeof(IEnumerable).IsAssignableFrom(type) && !typeof(IDictionary).IsAssignableFrom(type))
-                    {
-                        MethodInfo methodInfo = type.GetMethod("Add", BindingFlags.Public | BindingFlags.Instance);
-
-                        initArgs.ForEach(subExpr => methodInfo.Invoke(element, new object[] { Evaluate(subExpr) })); 
-                    }
-                    else
-                    {
-                        ExpressionEvaluator initEvaluator = new ExpressionEvaluator(new Dictionary<string, object>() { { "this", element } });
-
-                        initArgs.ForEach(subExpr =>
-                        {
-                            if (subExpr.Contains("="))
-                            {
-                                string trimmedSubExpr = subExpr.TrimStart();
-
-                                initEvaluator.Evaluate($"this{(trimmedSubExpr.StartsWith("[") ? string.Empty : ".")}{trimmedSubExpr}");
-                            }
-                            else
-                                throw new ExpressionEvaluatorSyntaxErrorException($"A '=' char is missing in [{subExpr}]. It is in a object initializer. It must contains one.");
-                        });
-                    }
+                    List<string> initArgs = GetExpressionsBetweenParenthesesOrOtherImbricableBrackets(expr, ref i, true, ",", "{", "}");
 
+                    Init(element, initArgs);
 
                     stack.Push(element);
                 }