Correction for #100 (Array types in cast or typeof generate an exception)

Author: codingseb

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -2640,6 +2640,67 @@ ExpressionEvaluator evaluatorForMethodArgs()
 
                 #endregion
 
+                #region for issue #100
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(double[])"
+                    , null)
+                    .Returns(typeof(double[]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(double[ ])"
+                    , null)
+                    .Returns(typeof(double[]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(double[][])"
+                    , null)
+                    .Returns(typeof(double[][]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(double[,])"
+                    , null)
+                    .Returns(typeof(double[,]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(int[])"
+                    , null)
+                    .Returns(typeof(int[]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(Int32[])"
+                    , null)
+                    .Returns(typeof(Int32[]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(string[])"
+                    , null)
+                    .Returns(typeof(string[]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator()
+                    , "typeof(Regex[])"
+                    , null)
+                    .Returns(typeof(Regex[]))
+                    .SetCategory("Bug resolution");
+
+                yield return new TestCaseData(new ExpressionEvaluator(new ObjectContainer()
+                    {
+                        AnObjectProperty = new double[] {1.1, 2.3, 4.3}
+                    })
+                    , "(double[])AnObjectProperty"
+                    , null)
+                    .Returns(new double[] { 1.1, 2.3, 4.3 })
+                    .SetCategory("Bug resolution");
+
+                #endregion
+
                 #endregion
             }
         }

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -2581,6 +2581,18 @@ protected virtual Type EvaluateType(string expression,ref int i, string currentN
                 }
             }
 
+            Match arrayTypeMatch;
+
+            if(i < expression.Length && (arrayTypeMatch = Regex.Match(expression.Substring(i), @"^(\s*(\[(?>(?>\s+)|[,])*)\])+")).Success)
+            {
+                Type arrayType = GetTypeByFriendlyName(staticType + arrayTypeMatch.Value);
+                if(arrayType != null)
+                {
+                    i += arrayTypeMatch.Length;
+                    staticType = arrayType;
+                }
+            }
+
             return staticType;
         }