Corrections Types

Author: codingseb

ExpressionEvaluator.cs

@@ -182,7 +182,7 @@ private enum ExpressionOperator
             {ExpressionOperator.Greater, (dynamic left, dynamic right) => left > right },
             {ExpressionOperator.LowerOrEqual, (dynamic left, dynamic right) => left <= right },
             {ExpressionOperator.GreaterOrEqual, (dynamic left, dynamic right) => left >= right },
-            {ExpressionOperator.Is, (dynamic left, dynamic right) => (((ClassOrTypeName)right).Type).IsAssignableFrom(left.GetType()) },
+            {ExpressionOperator.Is, (dynamic left, dynamic right) => ((Type)right).IsAssignableFrom(left.GetType()) },
         },
         new Dictionary<ExpressionOperator, Func<dynamic, dynamic, object>>()
         {
@@ -600,7 +600,7 @@ private bool EvaluateVarOrFunc(string expr, string restOfExpression, Stack<objec
 
                             if (staticType != null)
                             {
-                                stack.Push(new ClassOrTypeName() { Type = staticType });
+                                stack.Push(staticType);
                             }
                             else
                             {
@@ -1045,9 +1045,9 @@ private MethodInfo MakeConcreteMethodIfGeneric(MethodInfo methodInfo)
 
     private BindingFlags DetermineInstanceOrStatic(ref Type objType, ref object obj)
     {
-        if (obj is ClassOrTypeName classOrTypeName)
+        if (obj is Type)
         {
-            objType = classOrTypeName.Type;
+            objType = obj as Type;
             obj = null;
             return staticBindingFlag;
         }
@@ -1243,11 +1243,6 @@ private string GetCodeUntilEndOfStringInterpolation(string subExpr)
         return result;
     }
 
-    private class ClassOrTypeName
-    {
-        public Type Type { get; set; }
-    }
-
     private class DelegateEncaps
     {
         private lambdaExpressionDelegate lambda;