Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ public class ExpressionParser
public string ItName { get; private set; } = KeywordsHelper.KEYWORD_IT;

/// <summary>
/// There was a problem when an expression contained multiple lambdas where
/// the ItName was not cleared and freed for the next lambda. This variable
/// stores the ItName of the last parsed lambda.
/// There was a problem when an expression contained multiple lambdas where the ItName was not cleared and freed for the next lambda.
/// This variable stores the ItName of the last parsed lambda.
/// Not used internally by ExpressionParser, but used to preserve compatibility of parsingConfig.RenameParameterExpression
/// which was designed to only work with mono-lambda expressions.
/// </summary>
Expand Down Expand Up @@ -269,17 +268,19 @@ private Expression ParseNullCoalescingOperator()
// => operator - Added Support for projection operator
private Expression ParseLambdaOperator()
{
Expression expr = ParseOrOperator();
var expr = ParseOrOperator();

if (_textParser.CurrentToken.Id == TokenId.Lambda && _it?.Type == expr.Type)
{
_textParser.NextToken();
if (_textParser.CurrentToken.Id == TokenId.Identifier || _textParser.CurrentToken.Id == TokenId.OpenParen)
if (_textParser.CurrentToken.Id is TokenId.Identifier or TokenId.OpenParen)
{
var right = ParseConditionalOperator();
return Expression.Lambda(right, new[] { (ParameterExpression)expr });
}
_textParser.ValidateToken(TokenId.OpenParen, Res.OpenParenExpected);
}

return expr;
}

Expand Down Expand Up @@ -1061,7 +1062,9 @@ private Expression ParseIt()
{
throw ParseError(Res.NoItInScope);
}

_textParser.NextToken();

return _it;
}

Expand Down Expand Up @@ -1784,6 +1787,12 @@ private Expression ParseMemberAccess(Type? type, Expression? expression, string?
_textParser.NextToken();
}

// Parse as Lambda
if (_textParser.CurrentToken.Id == TokenId.Lambda && _it?.Type == type)
{
return ParseAsLambda(id);
}

if (_textParser.CurrentToken.Id == TokenId.OpenParen)
{
var isStaticAccess = expression == null;
Expand Down Expand Up @@ -1866,11 +1875,6 @@ private Expression ParseMemberAccess(Type? type, Expression? expression, string?
return _expressionHelper.ConvertToExpandoObjectAndCreateDynamicExpression(expression!, type, id);
}
#endif
// Parse as Lambda
if (_textParser.CurrentToken.Id == TokenId.Lambda && _it?.Type == type)
{
return ParseAsLambda(id);
}

// This could be enum like "A.B.C.MyEnum.Value1" or "A.B.C+MyEnum.Value1".
//
Expand Down Expand Up @@ -2118,7 +2122,7 @@ private Expression ParseEnumerable(Expression instance, Type elementType, string
}
else
{
if (new[] { "Concat", "Contains", "DefaultIfEmpty", "Except", "Intersect", "Skip", "Take", "Union" }.Contains(methodName))
if (new[] { "Concat", "Contains", "ContainsKey", "DefaultIfEmpty", "Except", "Intersect", "Skip", "Take", "Union" }.Contains(methodName))
{
args = new[] { instance, args[0] };
}
Expand Down
Loading