#95 part 2' Cast in nested type ok + Cast int to enum OK

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -2513,6 +2513,13 @@ ExpressionEvaluator evaluatorForMethodArgs()
                     .SetCategory("Bug resolution")
                     .SetCategory("NestedType");
 
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "Environment.GetFolderPath((Environment.SpecialFolder)5)"
+                    , null)
+                    .Returns(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments))
+                    .SetCategory("Bug resolution")
+                    .SetCategory("NestedType");
+
                 yield return new TestCaseData(new ExpressionEvaluator()
                     , "new CodingSeb.ExpressionEvaluator.Tests.OtherNamespace.ClassInOtherNameSpace1.ANestedClass().Value1"
                     , null)

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -56,7 +56,7 @@ public partial class ExpressionEvaluator
         protected static readonly Regex functionArgKeywordsRegex = new Regex(@"^\s*(?<keyword>out|ref|in)\s+((?<typeName>[\p{L}_][\p{L}_0-9\.\[\]<>]*[?]?)\s+(?=[\p{L}_]))?(?<toEval>(?<varName>[\p{L}_](?>[\p{L}_0-9]*))\s*(=.*)?)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         protected static readonly Regex instanceCreationWithNewKeywordRegex = new Regex(@"^new(?>\s*)((?<isAnonymous>[{{])|((?<name>[\p{L}_][\p{L}_0-9\.]*)(?>\s*)(?<isgeneric>[<](?>[^<>]+|(?<gentag>[<])|(?<-gentag>[>]))*(?(gentag)(?!))[>])?(?>\s*)((?<isfunction>[(])|(?<isArray>\[)|(?<isInit>[{{]))?))", RegexOptions.IgnoreCase | RegexOptions.Compiled);
-        protected string CastRegexPattern { get { return @"^\((?>\s*)(?<typeName>[\p{L}_][\p{L}_0-9" + (OptionInlineNamespacesEvaluationActive ? @"\." : string.Empty) + @"\[\]<>]*[?]?)(?>\s*)\)"; } }
+        protected string CastRegexPattern { get { return @"^\((?>\s*)(?<typeName>[\p{L}_][\p{L}_0-9\.\[\]<>]*[?]?)(?>\s*)\)"; } }
 
         // To remove comments in scripts based on https://stackoverflow.com/questions/3524317/regex-to-strip-line-comments-from-c-sharp/3524689#3524689
         protected const string blockComments = @"/\*(.*?)\*/";
@@ -1641,7 +1641,8 @@ protected virtual bool EvaluateCast(string expression, Stack<object> stack, ref
             {
                 string typeName = castMatch.Groups["typeName"].Value;
 
-                Type type = GetTypeByFriendlyName(typeName);
+                int typeIndex = 0;
+                Type type = EvaluateType(typeName, ref typeIndex);
 
                 if (type != null)
                 {
@@ -4006,6 +4007,10 @@ protected static object ChangeType(object value, Type conversionType)
                 NullableConverter nullableConverter = new NullableConverter(conversionType);
                 conversionType = nullableConverter.UnderlyingType;
             }
+            if(conversionType.IsEnum)
+            {
+                return Enum.ToObject(conversionType, value);
+            }
             return Convert.ChangeType(value, conversionType);
         }