Consistently converting Quoted linq expressions

Author: SteveWilkes

ReadableExpressions.Visualizers.Core/CommonVisualizerAssemblyInfo.cs

@@ -5,6 +5,6 @@
 [assembly: AssemblyTitle("AgileObjects.ReadableExpressions.Visualizers")]
 [assembly: AssemblyCompany("AgileObjects")]
 [assembly: AssemblyProduct("ReadableExpressions.Visualizers")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyCopyright("Copyright © 2018")]
 [assembly: NeutralResourcesLanguage("en")]
 [assembly: CLSCompliant(true)]

ReadableExpressions/Translators/LinqExpressionToDlrExpressionConverter.cs

@@ -3,7 +3,6 @@ namespace AgileObjects.ReadableExpressions.Translators
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using System.Reflection;
     using Extensions;
     using Microsoft.Scripting.Ast;
@@ -195,7 +194,7 @@ private Expression Convert(LinqExp.InvocationExpression linqInvoke)
             {
                 return Expression.Invoke(
                     ConvertExp(linqInvoke.Expression),
-                    linqInvoke.Arguments.Project(ConvertExp));
+                    Convert(linqInvoke.Arguments));
             }
 
             private Expression Convert(LinqExp.TypeBinaryExpression linqTypeBinary)
@@ -213,25 +212,25 @@ private NewExpression Convert(LinqExp.NewExpression linqNew)
                 return (linqNew.Members != null)
                     ? Expression.New(
                           linqNew.Constructor,
-                          linqNew.Arguments.Project(ConvertExp),
+                          Convert(linqNew.Arguments),
                           linqNew.Members)
                     : Expression.New(
                           linqNew.Constructor,
-                          linqNew.Arguments.Project(ConvertExp));
+                          Convert(linqNew.Arguments));
             }
 
             private ElementInit Convert(LinqExp.ElementInit linqElementInit)
             {
                 return Expression.ElementInit(
                     linqElementInit.AddMethod,
-                    linqElementInit.Arguments.Project(ConvertExp));
+                    Convert(linqElementInit.Arguments));
             }
 
             private Expression Convert(LinqExp.NewArrayExpression linqNewArray, Func<Type, IEnumerable<Expression>, Expression> factory)
             {
                 return factory.Invoke(
                     linqNewArray.Type.GetElementType(),
-                    linqNewArray.Expressions.Project(ConvertExp));
+                    Convert(linqNewArray.Expressions));
             }
 
             private Expression Convert(LinqExp.ConditionalExpression linqConditional)
@@ -317,15 +316,10 @@ private static Expression Convert(LinqExp.ConstantExpression linqConstant)
 
             private Expression Convert(LinqExp.MethodCallExpression linqCall)
             {
-                var arguments = linqCall.Arguments.Project(arg =>
-                    (arg.NodeType == LinqExp.ExpressionType.Quote)
-                        ? Expression.Constant(((LinqExp.UnaryExpression)arg).Operand, arg.Type)
-                        : ConvertExp(arg));
-
                 return Expression.Call(
                     ConvertExp(linqCall.Object),
                     linqCall.Method,
-                    arguments);
+                    Convert(linqCall.Arguments));
             }
 
             private Expression Convert(LinqExp.MemberExpression linqMemberAccess)
@@ -352,6 +346,14 @@ private ParameterExpression Convert(LinqExp.ParameterExpression linqParam)
 
                 return _parameters[linqParam] = Expression.Parameter(linqParam.Type, linqParam.Name);
             }
+
+            private IEnumerable<Expression> Convert(IEnumerable<LinqExp.Expression> linqExpressions)
+            {
+                return linqExpressions.Project(arg =>
+                    (arg.NodeType == LinqExp.ExpressionType.Quote)
+                        ? Expression.Constant(((LinqExp.UnaryExpression)arg).Operand, arg.Type)
+                        : ConvertExp(arg));
+            }
         }
     }
 }