Open-Harbor/dotnet-dynamic-linq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fiou something that works finally. :)

Browse Source
This commit is contained in:
David Lebee
2018-03-27 19:06:04 -05:00
parent 3a24d6086e
commit 2f4c406503
2 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PoweredSoft.DynamicLinq/ExpressionPathPart.cs
+18 -6
View File
@@ -9,7 +9,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
{
public ExpressionParameterGroup Parent { get; set; }
public ParameterExpression Parameter { get; set; }
public List<ExpressionPiece> Parts { get; set; } = new List<ExpressionPiece>();
public List<ExpressionPiece> Pieces { get; set; } = new List<ExpressionPiece>();
public ExpressionParameterGroup(ParameterExpression parameter)
{
@@ -18,7 +18,18 @@ namespace PoweredSoft.DynamicLinq.Helpers
public void AddSubPart(ExpressionPiece expressionPart)
{
Parts.Add(expressionPart);
Pieces.Add(expressionPart);
}
public Expression LastExpression() => LastPiece().Expression;
public ExpressionPiece LastPiece() => Pieces.Last();
public LambdaExpression CreateLambda()
{
var lastExpression = LastPiece().Expression;
var lambda = Expression.Lambda(lastExpression, Parameter);
return lambda;
}
}
@@ -26,7 +37,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
{
public ExpressionParameterGroup Parameter { get; set; }
public ExpressionPiece Parent { get; set; }
public Expression Part { get; set; }
public Expression Expression { get; set; }
public ExpressionPiece(ExpressionParameterGroup parameter, ExpressionPiece parent = null)
{
@@ -36,11 +47,11 @@ namespace PoweredSoft.DynamicLinq.Helpers
public void Resolve(string piece)
{
Part = Expression.PropertyOrField(Parent?.Part ?? Parameter.Parameter, piece);
Expression = Expression.PropertyOrField(Parent?.Expression ?? Parameter.Parameter, piece);
}
public bool IsGenericEnumerable() => QueryableHelpers.IsGenericEnumerable(Part);
public Type GetGenericEnumerableType() => Part.Type.GenericTypeArguments.First();
public bool IsGenericEnumerable() => QueryableHelpers.IsGenericEnumerable(Expression);
public Type GetGenericEnumerableType() => Expression.Type.GenericTypeArguments.First();
}
public class ExpressionParser
@@ -75,6 +86,7 @@ namespace PoweredSoft.DynamicLinq.Helpers
var currentGroup = CreateAndAddParameterGroup(Parameter);
ExpressionPiece parentPiece = null;
int step = 0;
pieces.ForEach(piece =>
{
var expressionPiece = new ExpressionPiece(currentGroup, parentPiece);