Refactor Expression to Accept the Visitor

hazzik · hazzik · commit 6385662acfa2 · 2017-03-16T13:00:44.000+13:00
diff --git a/src/NHibernate/Linq/Expressions/NhAggregatedExpression.cs b/src/NHibernate/Linq/Expressions/NhAggregatedExpression.cs
@@ -1,8 +1,9 @@
 ﻿using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
-	public abstract class NhAggregatedExpression : Expression
+	public abstract class NhAggregatedExpression : NhExpression
 	{
 		protected NhAggregatedExpression(Expression expression, NhExpressionType nodeType)
 			: this(expression, expression.Type, nodeType)
@@ -32,5 +33,10 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 		}
 
 		public abstract Expression CreateNew(Expression expression);
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhAggregate(this);
+		}
 	}
 }
diff --git a/src/NHibernate/Linq/Expressions/NhAverageExpression.cs b/src/NHibernate/Linq/Expressions/NhAverageExpression.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 using NHibernate.Util;
 
 namespace NHibernate.Linq.Expressions
@@ -39,5 +40,10 @@ public override Expression CreateNew(Expression expression)
 		{
 			return new NhAverageExpression(expression);
 		}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhAverage(this);
+		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Expressions/NhCountExpression.cs b/src/NHibernate/Linq/Expressions/NhCountExpression.cs
@@ -1,11 +1,17 @@
 ﻿using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
 	public abstract class NhCountExpression : NhAggregatedExpression
 	{
 		protected NhCountExpression(Expression expression, System.Type type)
 			: base(expression, type, NhExpressionType.Count) {}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhCount(this);
+		}
 	}
 
 	public class NhShortCountExpression : NhCountExpression
@@ -29,4 +35,4 @@ public override Expression CreateNew(Expression expression)
 			return new NhLongCountExpression(expression);
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Expressions/NhDistinctExpression.cs b/src/NHibernate/Linq/Expressions/NhDistinctExpression.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
@@ -13,5 +14,10 @@ public override Expression CreateNew(Expression expression)
 		{
 			return new NhDistinctExpression(expression);
 		}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhDistinct(this);
+		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Expressions/NhExpression.cs b/src/NHibernate/Linq/Expressions/NhExpression.cs
@@ -0,0 +1,19 @@
+﻿using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
+
+namespace NHibernate.Linq.Expressions
+{
+	public abstract class NhExpression : Expression
+	{
+		protected sealed override Expression Accept(ExpressionVisitor visitor)
+		{
+			var nhVisitor = visitor as NhExpressionVisitor;
+			if (nhVisitor != null)
+				return Accept(nhVisitor);
+
+			return base.Accept(visitor);
+		}
+
+		protected abstract Expression Accept(NhExpressionVisitor visitor);
+	}
+}
diff --git a/src/NHibernate/Linq/Expressions/NhMaxExpression.cs b/src/NHibernate/Linq/Expressions/NhMaxExpression.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
@@ -13,5 +14,10 @@ public override Expression CreateNew(Expression expression)
 		{
 			return new NhMaxExpression(expression);
 		}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhMax(this);
+		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Expressions/NhMinExpression.cs b/src/NHibernate/Linq/Expressions/NhMinExpression.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
@@ -13,5 +14,10 @@ public override Expression CreateNew(Expression expression)
 		{
 			return new NhMinExpression(expression);
 		}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhMin(this);
+		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Expressions/NhNewExpression.cs b/src/NHibernate/Linq/Expressions/NhNewExpression.cs
@@ -1,10 +1,11 @@
 ﻿using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
-	public class NhNewExpression : Expression
+	public class NhNewExpression : NhExpression
 	{
 		public NhNewExpression(IList<string> members, IList<Expression> arguments)
 		{
@@ -28,5 +29,10 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 				? new NhNewExpression(Members, arguments)
 				: this;
 		}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhNew(this);
+		}
 	}
 }
diff --git a/src/NHibernate/Linq/Expressions/NhNominatedExpression.cs b/src/NHibernate/Linq/Expressions/NhNominatedExpression.cs
@@ -11,7 +11,7 @@ namespace NHibernate.Linq.Expressions
 	///     Used in the nomination of GroupBy key expressions to ensure that matching select clauses
 	///     are generated the same way.
 	/// </remarks>
-	internal class NhNominatedExpression : Expression
+	class NhNominatedExpression : Expression
 	{
 		public NhNominatedExpression(Expression expression)
 		{
diff --git a/src/NHibernate/Linq/Expressions/NhStarExpression.cs b/src/NHibernate/Linq/Expressions/NhStarExpression.cs
@@ -1,8 +1,9 @@
 using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
-	public class NhStarExpression : Expression
+	public class NhStarExpression : NhExpression
 	{
 		public NhStarExpression(Expression expression)
 		{
@@ -23,5 +24,10 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)
 				? new NhStarExpression(newExpression)
 				: this;
 		}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhStar(this);
+		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Expressions/NhSumExpression.cs b/src/NHibernate/Linq/Expressions/NhSumExpression.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq.Expressions;
+using NHibernate.Linq.Visitors;
 
 namespace NHibernate.Linq.Expressions
 {
@@ -13,5 +14,10 @@ public override Expression CreateNew(Expression expression)
 		{
 			return new NhSumExpression(expression);
 		}
+
+		protected override Expression Accept(NhExpressionVisitor visitor)
+		{
+			return visitor.VisitNhSum(this);
+		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/GroupBy/IsNonAggregatingGroupByDetectionVisitor.cs b/src/NHibernate/Linq/GroupBy/IsNonAggregatingGroupByDetectionVisitor.cs
@@ -28,7 +28,7 @@ protected override Expression VisitMember(MemberExpression expression)
 					   : base.VisitMember(expression);
 		}
 
-		protected override Expression VisitNhAggregate(NhAggregatedExpression expression)
+		protected internal override Expression VisitNhAggregate(NhAggregatedExpression expression)
 		{
 			return expression;
 		}
@@ -39,4 +39,4 @@ protected override Expression VisitQuerySourceReference(QuerySourceReferenceExpr
 			return expression;
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/GroupJoin/GroupJoinAggregateDetectionVisitor.cs b/src/NHibernate/Linq/GroupJoin/GroupJoinAggregateDetectionVisitor.cs
@@ -38,7 +38,7 @@ protected override Expression VisitSubQuery(SubQueryExpression expression)
 			return expression;
 		}
 
-		protected override Expression VisitNhAggregate(NhAggregatedExpression expression)
+		protected internal override Expression VisitNhAggregate(NhAggregatedExpression expression)
 		{
 			using (_inAggregate.SetFlag())
 			{
@@ -113,4 +113,4 @@ public void Dispose()
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Linq/Visitors/NhExpressionVisitor.cs b/src/NHibernate/Linq/Visitors/NhExpressionVisitor.cs
@@ -14,15 +14,15 @@ public override Expression Visit(Expression expression)
 				return null;
 			}
 
-			switch ((NhExpressionType)expression.NodeType)
+			switch ((NhExpressionType) expression.NodeType)
 			{
 				case NhExpressionType.Average:
 				case NhExpressionType.Min:
 				case NhExpressionType.Max:
 				case NhExpressionType.Sum:
 				case NhExpressionType.Count:
 				case NhExpressionType.Distinct:
-					return VisitNhAggregate((NhAggregatedExpression)expression);
+					return VisitNhAggregate((NhAggregatedExpression) expression);
 				case NhExpressionType.New:
 					return VisitNhNew((NhNewExpression)expression);
 				case NhExpressionType.Star:
@@ -34,17 +34,17 @@ public override Expression Visit(Expression expression)
 			return expr;
 		}
 
-		protected virtual Expression VisitNhStar(NhStarExpression expression)
+		protected internal virtual Expression VisitNhStar(NhStarExpression expression)
 		{
-			return VisitExtension(expression);
+			return expression;
 		}
 
-		protected virtual Expression VisitNhNew(NhNewExpression expression)
+		protected internal virtual Expression VisitNhNew(NhNewExpression expression)
 		{
-			return VisitExtension(expression);
+			return expression;
 		}
 
-		protected virtual Expression VisitNhAggregate(NhAggregatedExpression expression)
+		protected internal virtual Expression VisitNhAggregate(NhAggregatedExpression expression)
 		{
 			switch ((NhExpressionType)expression.NodeType)
 			{
@@ -65,34 +65,34 @@ protected virtual Expression VisitNhAggregate(NhAggregatedExpression expression)
 			}
 		}
 
-		protected virtual Expression VisitNhDistinct(NhDistinctExpression expression)
+		protected internal virtual Expression VisitNhDistinct(NhDistinctExpression expression)
 		{
-			return VisitExtension(expression);
+			return expression;
 		}
 
-		protected virtual Expression VisitNhCount(NhCountExpression expression)
+		protected internal virtual Expression VisitNhCount(NhCountExpression expression)
 		{
-			return VisitExtension(expression);
+			return expression;
 		}
 
-		protected virtual Expression VisitNhSum(NhSumExpression expression)
+		protected internal virtual Expression VisitNhSum(NhSumExpression expression)
 		{
-			return VisitExtension(expression);
+			return expression;
 		}
 
-		protected virtual Expression VisitNhMax(NhMaxExpression expression)
+		protected internal virtual Expression VisitNhMax(NhMaxExpression expression)
 		{
-			return VisitExtension(expression);
+			return expression;
 		}
 
-		protected virtual Expression VisitNhMin(NhMinExpression expression)
+		protected internal virtual Expression VisitNhMin(NhMinExpression expression)
 		{
-			return this.VisitExtension(expression);
+			return expression;
 		}
 
-		protected virtual Expression VisitNhAverage(NhAverageExpression expression)
+		protected internal virtual Expression VisitNhAverage(NhAverageExpression expression)
 		{
-			return this.VisitExtension(expression);
+			return expression;
 		}
 	}
 }
diff --git a/src/NHibernate/NHibernate.csproj b/src/NHibernate/NHibernate.csproj
@@ -151,6 +151,7 @@
     <Compile Include="Connection\IConnectionProvider.cs" />
     <Compile Include="Connection\UserSuppliedConnectionProvider.cs" />
     <Compile Include="Linq\Clauses\INhQueryModelVisitor.cs" />
+    <Compile Include="Linq\Expressions\NhExpression.cs" />
     <Compile Include="Linq\Expressions\NhStarExpression.cs" />
     <Compile Include="Util\DelegateHelper.cs" />
     <Compile Include="Dialect\BitwiseFunctionOperation.cs" />

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`using System.Linq.Expressions;`
	`2`	`+using NHibernate.Linq.Visitors;`
`2`	`3`
`3`	`4`	`namespace NHibernate.Linq.Expressions`
`4`	`5`	`{`
`5`		`- public abstract class NhAggregatedExpression : Expression`
	`6`	`+ public abstract class NhAggregatedExpression : NhExpression`
`6`	`7`	`{`
`7`	`8`	`protected NhAggregatedExpression(Expression expression, NhExpressionType nodeType)`
`8`	`9`	`: this(expression, expression.Type, nodeType)`
`@@ -32,5 +33,10 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`public abstract Expression CreateNew(Expression expression);`
	`36`	`+`
	`37`	`+ protected override Expression Accept(NhExpressionVisitor visitor)`
	`38`	`+ {`
	`39`	`+ return visitor.VisitNhAggregate(this);`
	`40`	`+ }`
`35`	`41`	`}`
`36`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq.Expressions;`
	`3`	`+using NHibernate.Linq.Visitors;`
`3`	`4`	`using NHibernate.Util;`
`4`	`5`
`5`	`6`	`namespace NHibernate.Linq.Expressions`
`@@ -39,5 +40,10 @@ public override Expression CreateNew(Expression expression)`
`39`	`40`	`{`
`40`	`41`	`return new NhAverageExpression(expression);`
`41`	`42`	`}`
	`43`	`+`
	`44`	`+ protected override Expression Accept(NhExpressionVisitor visitor)`
	`45`	`+ {`
	`46`	`+ return visitor.VisitNhAverage(this);`
	`47`	`+ }`
`42`	`48`	`}`
`43`		`-}`
	`49`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,17 @@`
`1`	`1`	`using System.Linq.Expressions;`
	`2`	`+using NHibernate.Linq.Visitors;`
`2`	`3`
`3`	`4`	`namespace NHibernate.Linq.Expressions`
`4`	`5`	`{`
`5`	`6`	`public abstract class NhCountExpression : NhAggregatedExpression`
`6`	`7`	`{`
`7`	`8`	`protected NhCountExpression(Expression expression, System.Type type)`
`8`	`9`	`: base(expression, type, NhExpressionType.Count) {}`
	`10`	`+`
	`11`	`+ protected override Expression Accept(NhExpressionVisitor visitor)`
	`12`	`+ {`
	`13`	`+ return visitor.VisitNhCount(this);`
	`14`	`+ }`
`9`	`15`	`}`
`10`	`16`
`11`	`17`	`public class NhShortCountExpression : NhCountExpression`
`@@ -29,4 +35,4 @@ public override Expression CreateNew(Expression expression)`
`29`	`35`	`return new NhLongCountExpression(expression);`
`30`	`36`	`}`
`31`	`37`	`}`
`32`		`-}`
	`38`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Linq.Expressions;`
	`2`	`+using NHibernate.Linq.Visitors;`
`2`	`3`
`3`	`4`	`namespace NHibernate.Linq.Expressions`
`4`	`5`	`{`
`@@ -13,5 +14,10 @@ public override Expression CreateNew(Expression expression)`
`13`	`14`	`{`
`14`	`15`	`return new NhDistinctExpression(expression);`
`15`	`16`	`}`
	`17`	`+`
	`18`	`+ protected override Expression Accept(NhExpressionVisitor visitor)`
	`19`	`+ {`
	`20`	`+ return visitor.VisitNhDistinct(this);`
	`21`	`+ }`
`16`	`22`	`}`
`17`		`-}`
	`23`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using System.Collections.ObjectModel;`
`3`	`3`	`using System.Linq.Expressions;`
	`4`	`+using NHibernate.Linq.Visitors;`
`4`	`5`
`5`	`6`	`namespace NHibernate.Linq.Expressions`
`6`	`7`	`{`
`7`		`- public class NhNewExpression : Expression`
	`8`	`+ public class NhNewExpression : NhExpression`
`8`	`9`	`{`
`9`	`10`	`public NhNewExpression(IList<string> members, IList<Expression> arguments)`
`10`	`11`	`{`
`@@ -28,5 +29,10 @@ protected override Expression VisitChildren(ExpressionVisitor visitor)`
`28`	`29`	`? new NhNewExpression(Members, arguments)`
`29`	`30`	`: this;`
`30`	`31`	`}`
	`32`	`+`
	`33`	`+ protected override Expression Accept(NhExpressionVisitor visitor)`
	`34`	`+ {`
	`35`	`+ return visitor.VisitNhNew(this);`
	`36`	`+ }`
`31`	`37`	`}`
`32`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace NHibernate.Linq.Expressions`
`11`	`11`	`/// Used in the nomination of GroupBy key expressions to ensure that matching select clauses`
`12`	`12`	`/// are generated the same way.`
`13`	`13`	`/// </remarks>`
`14`		`- internal class NhNominatedExpression : Expression`
	`14`	`+ class NhNominatedExpression : Expression`
`15`	`15`	`{`
`16`	`16`	`public NhNominatedExpression(Expression expression)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected override Expression VisitMember(MemberExpression expression)`
`28`	`28`	`: base.VisitMember(expression);`
`29`	`29`	`}`
`30`	`30`
`31`		`- protected override Expression VisitNhAggregate(NhAggregatedExpression expression)`
	`31`	`+ protected internal override Expression VisitNhAggregate(NhAggregatedExpression expression)`
`32`	`32`	`{`
`33`	`33`	`return expression;`
`34`	`34`	`}`
`@@ -39,4 +39,4 @@ protected override Expression VisitQuerySourceReference(QuerySourceReferenceExpr`
`39`	`39`	`return expression;`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`-}`
	`42`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected override Expression VisitSubQuery(SubQueryExpression expression)`
`38`	`38`	`return expression;`
`39`	`39`	`}`
`40`	`40`
`41`		`- protected override Expression VisitNhAggregate(NhAggregatedExpression expression)`
	`41`	`+ protected internal override Expression VisitNhAggregate(NhAggregatedExpression expression)`
`42`	`42`	`{`
`43`	`43`	`using (_inAggregate.SetFlag())`
`44`	`44`	`{`
`@@ -113,4 +113,4 @@ public void Dispose()`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`}`
`116`		`-}`
	`116`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ public override Expression Visit(Expression expression)`
`14`	`14`	`return null;`
`15`	`15`	`}`
`16`	`16`
`17`		`- switch ((NhExpressionType)expression.NodeType)`
	`17`	`+ switch ((NhExpressionType) expression.NodeType)`
`18`	`18`	`{`
`19`	`19`	`case NhExpressionType.Average:`
`20`	`20`	`case NhExpressionType.Min:`
`21`	`21`	`case NhExpressionType.Max:`
`22`	`22`	`case NhExpressionType.Sum:`
`23`	`23`	`case NhExpressionType.Count:`
`24`	`24`	`case NhExpressionType.Distinct:`
`25`		`- return VisitNhAggregate((NhAggregatedExpression)expression);`
	`25`	`+ return VisitNhAggregate((NhAggregatedExpression) expression);`
`26`	`26`	`case NhExpressionType.New:`
`27`	`27`	`return VisitNhNew((NhNewExpression)expression);`
`28`	`28`	`case NhExpressionType.Star:`
`@@ -34,17 +34,17 @@ public override Expression Visit(Expression expression)`
`34`	`34`	`return expr;`
`35`	`35`	`}`
`36`	`36`
`37`		`- protected virtual Expression VisitNhStar(NhStarExpression expression)`
	`37`	`+ protected internal virtual Expression VisitNhStar(NhStarExpression expression)`
`38`	`38`	`{`
`39`		`- return VisitExtension(expression);`
	`39`	`+ return expression;`
`40`	`40`	`}`
`41`	`41`
`42`		`- protected virtual Expression VisitNhNew(NhNewExpression expression)`
	`42`	`+ protected internal virtual Expression VisitNhNew(NhNewExpression expression)`
`43`	`43`	`{`
`44`		`- return VisitExtension(expression);`
	`44`	`+ return expression;`
`45`	`45`	`}`
`46`	`46`
`47`		`- protected virtual Expression VisitNhAggregate(NhAggregatedExpression expression)`
	`47`	`+ protected internal virtual Expression VisitNhAggregate(NhAggregatedExpression expression)`
`48`	`48`	`{`
`49`	`49`	`switch ((NhExpressionType)expression.NodeType)`
`50`	`50`	`{`
`@@ -65,34 +65,34 @@ protected virtual Expression VisitNhAggregate(NhAggregatedExpression expression)`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- protected virtual Expression VisitNhDistinct(NhDistinctExpression expression)`
	`68`	`+ protected internal virtual Expression VisitNhDistinct(NhDistinctExpression expression)`
`69`	`69`	`{`
`70`		`- return VisitExtension(expression);`
	`70`	`+ return expression;`
`71`	`71`	`}`
`72`	`72`
`73`		`- protected virtual Expression VisitNhCount(NhCountExpression expression)`
	`73`	`+ protected internal virtual Expression VisitNhCount(NhCountExpression expression)`
`74`	`74`	`{`
`75`		`- return VisitExtension(expression);`
	`75`	`+ return expression;`
`76`	`76`	`}`
`77`	`77`
`78`		`- protected virtual Expression VisitNhSum(NhSumExpression expression)`
	`78`	`+ protected internal virtual Expression VisitNhSum(NhSumExpression expression)`
`79`	`79`	`{`
`80`		`- return VisitExtension(expression);`
	`80`	`+ return expression;`
`81`	`81`	`}`
`82`	`82`
`83`		`- protected virtual Expression VisitNhMax(NhMaxExpression expression)`
	`83`	`+ protected internal virtual Expression VisitNhMax(NhMaxExpression expression)`
`84`	`84`	`{`
`85`		`- return VisitExtension(expression);`
	`85`	`+ return expression;`
`86`	`86`	`}`
`87`	`87`
`88`		`- protected virtual Expression VisitNhMin(NhMinExpression expression)`
	`88`	`+ protected internal virtual Expression VisitNhMin(NhMinExpression expression)`
`89`	`89`	`{`
`90`		`- return this.VisitExtension(expression);`
	`90`	`+ return expression;`
`91`	`91`	`}`
`92`	`92`
`93`		`- protected virtual Expression VisitNhAverage(NhAverageExpression expression)`
	`93`	`+ protected internal virtual Expression VisitNhAverage(NhAverageExpression expression)`
`94`	`94`	`{`
`95`		`- return this.VisitExtension(expression);`
	`95`	`+ return expression;`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`	`}`