Merge pull request #96 from codingseb/dev

Dev

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -2466,7 +2466,7 @@ ExpressionEvaluator evaluatorForMethodArgs()
 
                 #endregion
 
-                #region Bug resolution
+                #region Issues/Bug resolution
 
                 yield return new TestCaseData(new ExpressionEvaluator()
                     , "(new List<Regex>()).GetType()"
@@ -2504,6 +2504,17 @@ ExpressionEvaluator evaluatorForMethodArgs()
 
                 // end of bug #65
 
+                // For Issue Manage nested class and enum #95
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)"
+                    , null)
+                    .Returns(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData))
+                    .SetCategory("Bug resolution")
+                    .SetCategory("NestedType");
+
+                // end of issue #95
+
                 #endregion
             }
         }

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -1,6 +1,6 @@
 /******************************************************************************************************
     Title : ExpressionEvaluator (https://github.com/codingseb/ExpressionEvaluator)
-    Version : 1.4.24.0 
+    Version : 1.4.26.0 
     (if last digit (the forth) is not a zero, the version is an intermediate version and can be unstable)
 
     Author : Coding Seb
@@ -2442,6 +2442,7 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi
                             string typeName = $"{varFuncName}{((i < expression.Length && expression.Substring(i)[0] == '?') ? "?" : "") }";
                             Type staticType = GetTypeByFriendlyName(typeName, genericsTypes);
 
+                            // For inline namespace parsing
                             if (staticType == null && OptionInlineNamespacesEvaluationActive)
                             {
                                 int subIndex = 0;
@@ -2471,6 +2472,38 @@ where method.GetParameters()[0].ParameterType == objType // static extMethod(thi
                                 }
                             }
 
+                            // For nested type parsing
+                            if (staticType != null)
+                            {
+                                int subIndex = 0;
+                                Match nestedTypeMatch = varOrFunctionRegEx.Match(expression.Substring(i + subIndex));
+                                Type nestedType = null;
+
+                                while (nestedTypeMatch.Success
+                                    && !nestedTypeMatch.Groups["sign"].Success
+                                    && !nestedTypeMatch.Groups["assignationOperator"].Success
+                                    && !nestedTypeMatch.Groups["postfixOperator"].Success
+                                    && !nestedTypeMatch.Groups["isfunction"].Success
+                                    && i + nestedTypeMatch.Length < expression.Length)
+                                {
+                                    typeName += $"+{nestedTypeMatch.Groups["name"].Value}";
+
+                                    nestedType = GetTypeByFriendlyName(typeName, nestedTypeMatch.Groups["isgeneric"].Value);
+
+                                    if (nestedType != null)
+                                    {
+                                        i += nestedTypeMatch.Length;
+                                        staticType = nestedType;
+                                    }
+                                    else
+                                    {
+                                        break;
+                                    }
+
+                                    nestedTypeMatch = varOrFunctionRegEx.Match(expression.Substring(i + subIndex));
+                                }
+                            }
+
                             if (typeName.EndsWith("?") && staticType != null)
                                 i++;