Make handling of MatchExpression more robust
#768
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stakx
commented
Mar 4, 2019
| @@ -33,7 +33,7 @@ public static Expression PartialEval(Expression expression, Func<Expression, boo | |||
| /// <returns>A new tree with sub-trees evaluated and replaced.</returns> | |||
| public static Expression PartialEval(Expression expression) | |||
| { | |||
| return PartialEval(expression, e => e.NodeType != ExpressionType.Parameter); | |||
| return PartialEval(expression, e => e.NodeType != ExpressionType.Parameter && !(e is MatchExpression)); | |||
There was a problem hiding this comment.
Instead of this change, perhaps it would be better to add a check right inside Evaluator that recognizes irreducible Extension nodes.
| @@ -334,6 +334,9 @@ private static bool PartialMatcherAwareEval_ShouldEvaluate(Expression expression | |||
| case ExpressionType.Parameter: | |||
| return false; | |||
|
|
|||
| case ExpressionType.Extension: | |||
| return !(expression is MatchExpression); | |||
|
|
|||
There was a problem hiding this comment.
Instead of this change, perhaps it would be better to add a check right inside Evaluator that recognizes irreducible Extension nodes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is extracted from, and required by, #767. Moq should be able to process expressions containing a
MatchExpressionmore or less everywhere except during compilation (because it doesn't carry enough information to properly allow that scenario).