Skip to content

Commit e7a2541

Browse files
hazzikhazzik
committed
Rename ExpressionTreeVisitors to ExpressionVisitors
1 parent cc3fab9 commit e7a2541

15 files changed

+33
-33
lines changed

‎src/NHibernate/Linq/GroupBy/IsNonAggregatingGroupByDetectionVisitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace NHibernate.Linq.GroupBy
88
/// <summary>
99
/// Detects if an expression tree contains naked QuerySourceReferenceExpression
1010
/// </summary>
11-
internal class IsNonAggregatingGroupByDetectionVisitor : NhExpressionTreeVisitor
11+
internal class IsNonAggregatingGroupByDetectionVisitor : NhExpressionVisitor
1212
{
1313
private bool _containsNakedQuerySourceReferenceExpression;
1414

‎src/NHibernate/Linq/GroupJoin/GroupJoinAggregateDetectionVisitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace NHibernate.Linq.GroupJoin
1010
{
11-
internal class GroupJoinAggregateDetectionVisitor : NhExpressionTreeVisitor
11+
internal class GroupJoinAggregateDetectionVisitor : NhExpressionVisitor
1212
{
1313
private readonly HashSet<GroupJoinClause> _groupJoinClauses;
1414
private readonly StackFlag _inAggregate = new StackFlag();

‎src/NHibernate/Linq/LinqLogging.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal static void LogExpression(string msg, Expression expression)
3434
/// proxy with a ParameterExpression. The name of the parameter will be a string
3535
/// representing the proxied entity, without initializing it.
3636
/// </summary>
37-
private class ProxyReplacingExpressionVisitor : NhExpressionTreeVisitor
37+
private class ProxyReplacingExpressionVisitor : NhExpressionVisitor
3838
{
3939
// See also e.g. Remotion.Linq.Clauses.ExpressionVisitors.FormattingExpressionTreeVisitor
4040
// for another example of this technique.

‎src/NHibernate/Linq/NhLinqExpression.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class NhLinqExpression : IQueryExpression
3030

3131
public NhLinqExpression(Expression expression, ISessionFactoryImplementor sessionFactory)
3232
{
33-
_expression = NhPartialEvaluatingExpressionTreeVisitor.EvaluateIndependentSubtrees(expression);
33+
_expression = NhPartialEvaluatingExpressionVisitor.EvaluateIndependentSubtrees(expression);
3434
// We want logging to be as close as possible to the original expression sent from the
3535
// application. But if we log before partial evaluation, the log won't include e.g.
3636
// subquery expressions if those are defined by the application in a variable referenced

‎src/NHibernate/Linq/Visitors/EqualityHqlGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public HqlBooleanExpression Visit(Expression innerKeySelector, Expression outerK
2424
var outerNewExpression = outerKeySelector as NewExpression;
2525
return innerNewExpression != null && outerNewExpression != null
2626
? VisitNew(innerNewExpression, outerNewExpression)
27-
: GenerateEqualityNode(innerKeySelector, outerKeySelector, new HqlGeneratorExpressionTreeVisitor(_parameters));
27+
: GenerateEqualityNode(innerKeySelector, outerKeySelector, new HqlGeneratorExpressionVisitor(_parameters));
2828
}
2929

3030
private HqlBooleanExpression VisitNew(NewExpression innerKeySelector, NewExpression outerKeySelector)
@@ -46,7 +46,7 @@ private HqlBooleanExpression VisitNew(NewExpression innerKeySelector, NewExpress
4646

4747
private HqlEquality GenerateEqualityNode(NewExpression innerKeySelector, NewExpression outerKeySelector, int index)
4848
{
49-
return GenerateEqualityNode(innerKeySelector.Arguments[index], outerKeySelector.Arguments[index], new HqlGeneratorExpressionTreeVisitor(_parameters));
49+
return GenerateEqualityNode(innerKeySelector.Arguments[index], outerKeySelector.Arguments[index], new HqlGeneratorExpressionVisitor(_parameters));
5050
}
5151

5252
private HqlEquality GenerateEqualityNode(Expression leftExpr, Expression rightExpr, IHqlExpressionVisitor visitor)

‎src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs renamed to ‎src/NHibernate/Linq/Visitors/HqlGeneratorExpressionVisitor.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212

1313
namespace NHibernate.Linq.Visitors
1414
{
15-
public class HqlGeneratorExpressionTreeVisitor : IHqlExpressionVisitor
15+
public class HqlGeneratorExpressionVisitor : IHqlExpressionVisitor
1616
{
1717
private readonly HqlTreeBuilder _hqlTreeBuilder = new HqlTreeBuilder();
1818
private readonly VisitorParameters _parameters;
1919
private readonly ILinqToHqlGeneratorsRegistry _functionRegistry;
2020

2121
public static HqlTreeNode Visit(Expression expression, VisitorParameters parameters)
2222
{
23-
return new HqlGeneratorExpressionTreeVisitor(parameters).VisitExpression(expression);
23+
return new HqlGeneratorExpressionVisitor(parameters).VisitExpression(expression);
2424
}
2525

26-
public HqlGeneratorExpressionTreeVisitor(VisitorParameters parameters)
26+
public HqlGeneratorExpressionVisitor(VisitorParameters parameters)
2727
{
2828
_functionRegistry = parameters.SessionFactory.Settings.LinqToHqlGeneratorsRegistry;
2929
_parameters = parameters;
@@ -238,7 +238,7 @@ protected HqlTreeNode VisitNhSum(NhSumExpression expression)
238238

239239
protected HqlTreeNode VisitNhDistinct(NhDistinctExpression expression)
240240
{
241-
var visitor = new HqlGeneratorExpressionTreeVisitor(_parameters);
241+
var visitor = new HqlGeneratorExpressionVisitor(_parameters);
242242
return _hqlTreeBuilder.ExpressionSubTreeHolder(_hqlTreeBuilder.Distinct(), visitor.VisitExpression(expression.Expression));
243243
}
244244

‎src/NHibernate/Linq/Visitors/NhExpressionTreeVisitor.cs renamed to ‎src/NHibernate/Linq/Visitors/NhExpressionVisitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace NHibernate.Linq.Visitors
77
{
8-
public class NhExpressionTreeVisitor : RelinqExpressionVisitor
8+
public class NhExpressionVisitor : RelinqExpressionVisitor
99
{
1010
public override Expression Visit(Expression expression)
1111
{
@@ -95,4 +95,4 @@ protected virtual Expression VisitNhAverage(NhAverageExpression expression)
9595
return this.VisitExtension(expression);
9696
}
9797
}
98-
}
98+
}

‎src/NHibernate/Linq/Visitors/NhPartialEvaluatingExpressionTreeVisitor.cs renamed to ‎src/NHibernate/Linq/Visitors/NhPartialEvaluatingExpressionVisitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace NHibernate.Linq.Visitors
88
{
9-
internal class NhPartialEvaluatingExpressionTreeVisitor : RelinqExpressionVisitor, IPartialEvaluationExceptionExpressionVisitor
9+
internal class NhPartialEvaluatingExpressionVisitor : RelinqExpressionVisitor, IPartialEvaluationExceptionExpressionVisitor
1010
{
1111
protected override Expression VisitConstant(ConstantExpression expression)
1212
{
@@ -22,7 +22,7 @@ protected override Expression VisitConstant(ConstantExpression expression)
2222
public static Expression EvaluateIndependentSubtrees(Expression expression)
2323
{
2424
var evaluatedExpression = PartialEvaluatingExpressionVisitor.EvaluateIndependentSubtrees(expression, new NullEvaluatableExpressionFilter());
25-
return new NhPartialEvaluatingExpressionTreeVisitor().Visit(evaluatedExpression);
25+
return new NhPartialEvaluatingExpressionVisitor().Visit(evaluatedExpression);
2626
}
2727

2828
public Expression VisitPartialEvaluationException(PartialEvaluationExceptionExpression expression)

‎src/NHibernate/Linq/Visitors/QueryModelVisitor.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private void Visit()
143143
public override void VisitMainFromClause(MainFromClause fromClause, QueryModel queryModel)
144144
{
145145
var querySourceName = VisitorParameters.QuerySourceNamer.GetName(fromClause);
146-
var hqlExpressionTree = HqlGeneratorExpressionTreeVisitor.Visit(fromClause.FromExpression, VisitorParameters);
146+
var hqlExpressionTree = HqlGeneratorExpressionVisitor.Visit(fromClause.FromExpression, VisitorParameters);
147147

148148
_hqlTree.AddFromClause(_hqlTree.TreeBuilder.Range(hqlExpressionTree, _hqlTree.TreeBuilder.Alias(querySourceName)));
149149

@@ -175,15 +175,15 @@ public override void VisitAdditionalFromClause(AdditionalFromClause fromClause,
175175
// It's a join
176176
_hqlTree.AddFromClause(
177177
_hqlTree.TreeBuilder.Join(
178-
HqlGeneratorExpressionTreeVisitor.Visit(fromClause.FromExpression, VisitorParameters).AsExpression(),
178+
HqlGeneratorExpressionVisitor.Visit(fromClause.FromExpression, VisitorParameters).AsExpression(),
179179
_hqlTree.TreeBuilder.Alias(querySourceName)));
180180
}
181181
else
182182
{
183183
// TODO - exact same code as in MainFromClause; refactor this out
184184
_hqlTree.AddFromClause(
185185
_hqlTree.TreeBuilder.Range(
186-
HqlGeneratorExpressionTreeVisitor.Visit(fromClause.FromExpression, VisitorParameters),
186+
HqlGeneratorExpressionVisitor.Visit(fromClause.FromExpression, VisitorParameters),
187187
_hqlTree.TreeBuilder.Alias(querySourceName)));
188188

189189
}
@@ -193,7 +193,7 @@ public override void VisitAdditionalFromClause(AdditionalFromClause fromClause,
193193

194194
private void VisitNhJoinClause(string querySourceName, NhJoinClause joinClause)
195195
{
196-
var expression = HqlGeneratorExpressionTreeVisitor.Visit(joinClause.FromExpression, VisitorParameters).AsExpression();
196+
var expression = HqlGeneratorExpressionVisitor.Visit(joinClause.FromExpression, VisitorParameters).AsExpression();
197197
var alias = _hqlTree.TreeBuilder.Alias(querySourceName);
198198

199199
HqlTreeNode hqlJoin;
@@ -208,7 +208,7 @@ private void VisitNhJoinClause(string querySourceName, NhJoinClause joinClause)
208208

209209
foreach (var withClause in joinClause.Restrictions)
210210
{
211-
var booleanExpression = HqlGeneratorExpressionTreeVisitor.Visit(withClause.Predicate, VisitorParameters).ToBooleanExpression();
211+
var booleanExpression = HqlGeneratorExpressionVisitor.Visit(withClause.Predicate, VisitorParameters).ToBooleanExpression();
212212
hqlJoin.AddChild(_hqlTree.TreeBuilder.With(booleanExpression));
213213
}
214214

@@ -259,7 +259,7 @@ public override void VisitWhereClause(WhereClause whereClause, QueryModel queryM
259259
whereClause.Predicate = visitor.Visit(whereClause.Predicate);
260260

261261
// Visit the predicate to build the query
262-
var expression = HqlGeneratorExpressionTreeVisitor.Visit(whereClause.Predicate, VisitorParameters).ToBooleanExpression();
262+
var expression = HqlGeneratorExpressionVisitor.Visit(whereClause.Predicate, VisitorParameters).ToBooleanExpression();
263263
if (whereClause is NhHavingClause)
264264
{
265265
_hqlTree.AddHavingClause(expression);
@@ -274,7 +274,7 @@ public override void VisitOrderByClause(OrderByClause orderByClause, QueryModel
274274
{
275275
foreach (var clause in orderByClause.Orderings)
276276
{
277-
_hqlTree.AddOrderByClause(HqlGeneratorExpressionTreeVisitor.Visit(clause.Expression, VisitorParameters).AsExpression(),
277+
_hqlTree.AddOrderByClause(HqlGeneratorExpressionVisitor.Visit(clause.Expression, VisitorParameters).AsExpression(),
278278
clause.OrderingDirection == OrderingDirection.Asc
279279
? _hqlTree.TreeBuilder.Ascending()
280280
: (HqlDirectionStatement)_hqlTree.TreeBuilder.Descending());
@@ -290,7 +290,7 @@ public override void VisitJoinClause(JoinClause joinClause, QueryModel queryMode
290290

291291
_hqlTree.AddFromClause(
292292
_hqlTree.TreeBuilder.Range(
293-
HqlGeneratorExpressionTreeVisitor.Visit(joinClause.InnerSequence, VisitorParameters),
293+
HqlGeneratorExpressionVisitor.Visit(joinClause.InnerSequence, VisitorParameters),
294294
_hqlTree.TreeBuilder.Alias(joinClause.ItemName)));
295295
}
296296

@@ -305,7 +305,7 @@ public override void VisitNhHavingClause(NhHavingClause havingClause, QueryModel
305305
havingClause.Predicate = visitor.Visit(havingClause.Predicate);
306306

307307
// Visit the predicate to build the query
308-
var expression = HqlGeneratorExpressionTreeVisitor.Visit(havingClause.Predicate, VisitorParameters).AsBooleanExpression();
308+
var expression = HqlGeneratorExpressionVisitor.Visit(havingClause.Predicate, VisitorParameters).AsBooleanExpression();
309309
_hqlTree.AddHavingClause(expression);
310310
}
311311

@@ -315,7 +315,7 @@ public virtual void VisitNhWithClause(NhWithClause withClause, QueryModel queryM
315315
withClause.Predicate = visitor.Visit(withClause.Predicate);
316316

317317
// Visit the predicate to build the query
318-
var expression = HqlGeneratorExpressionTreeVisitor.Visit(withClause.Predicate, VisitorParameters).AsBooleanExpression();
318+
var expression = HqlGeneratorExpressionVisitor.Visit(withClause.Predicate, VisitorParameters).AsBooleanExpression();
319319
_hqlTree.AddWhereClause(expression);
320320
}
321321

‎src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessAll.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class ProcessAll : IResultOperatorProcessor<AllResultOperator>
88
public void Process(AllResultOperator resultOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
99
{
1010
tree.AddWhereClause(tree.TreeBuilder.BooleanNot(
11-
HqlGeneratorExpressionTreeVisitor.Visit(resultOperator.Predicate, queryModelVisitor.VisitorParameters).
11+
HqlGeneratorExpressionVisitor.Visit(resultOperator.Predicate, queryModelVisitor.VisitorParameters).
1212
ToBooleanExpression()));
1313

1414
tree.SetRoot(tree.TreeBuilder.BooleanNot(tree.TreeBuilder.Exists((HqlQuery) tree.Root)));

‎src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessContains.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ProcessContains : IResultOperatorProcessor<ContainsResultOperator>
1010
public void Process(ContainsResultOperator resultOperator, QueryModelVisitor queryModelVisitor, IntermediateHqlTree tree)
1111
{
1212
var itemExpression =
13-
HqlGeneratorExpressionTreeVisitor.Visit(resultOperator.Item, queryModelVisitor.VisitorParameters)
13+
HqlGeneratorExpressionVisitor.Visit(resultOperator.Item, queryModelVisitor.VisitorParameters)
1414
.AsExpression();
1515

1616
var from = GetFromRangeClause(tree.Root);

‎src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessGroupBy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void Process(GroupResultOperator resultOperator, QueryModelVisitor queryM
1616
else
1717
groupByKeys = new[] {resultOperator.KeySelector};
1818

19-
IEnumerable<HqlExpression> hqlGroupByKeys = groupByKeys.Select(k => HqlGeneratorExpressionTreeVisitor.Visit(k, queryModelVisitor.VisitorParameters).AsExpression());
19+
IEnumerable<HqlExpression> hqlGroupByKeys = groupByKeys.Select(k => HqlGeneratorExpressionVisitor.Visit(k, queryModelVisitor.VisitorParameters).AsExpression());
2020

2121
tree.AddGroupByClause(tree.TreeBuilder.GroupBy(hqlGroupByKeys.ToArray()));
2222
}

‎src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessOfType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public void Process(OfTypeResultOperator resultOperator, QueryModelVisitor query
88
{
99
var source = queryModelVisitor.Model.SelectClause.GetOutputDataInfo().ItemExpression;
1010

11-
var expression = new HqlGeneratorExpressionTreeVisitor(queryModelVisitor.VisitorParameters)
11+
var expression = new HqlGeneratorExpressionVisitor(queryModelVisitor.VisitorParameters)
1212
.BuildOfType(source, resultOperator.SearchedItemType);
1313

1414
tree.AddWhereClause(expression);

‎src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ public class SelectClauseVisitor : RelinqExpressionVisitor
1616
private readonly VisitorParameters _parameters;
1717
private int _iColumn;
1818
private List<HqlExpression> _hqlTreeNodes = new List<HqlExpression>();
19-
private readonly HqlGeneratorExpressionTreeVisitor _hqlVisitor;
19+
private readonly HqlGeneratorExpressionVisitor _hqlVisitor;
2020

2121
public SelectClauseVisitor(System.Type inputType, VisitorParameters parameters)
2222
{
2323
_inputParameter = Expression.Parameter(inputType, "input");
2424
_parameters = parameters;
25-
_hqlVisitor = new HqlGeneratorExpressionTreeVisitor(_parameters);
25+
_hqlVisitor = new HqlGeneratorExpressionVisitor(_parameters);
2626
}
2727

2828
public LambdaExpression ProjectionExpression { get; private set; }

‎src/NHibernate/NHibernate.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
<Compile Include="Linq\ExpressionTransformers\SimplifyCompareTransformer.cs" />
332332
<Compile Include="Linq\LinqLogging.cs" />
333333
<Compile Include="Linq\SqlMethods.cs" />
334-
<Compile Include="Linq\Visitors\NhPartialEvaluatingExpressionTreeVisitor.cs" />
334+
<Compile Include="Linq\Visitors\NhPartialEvaluatingExpressionVisitor.cs" />
335335
<Compile Include="Linq\QuerySourceNamer.cs" />
336336
<Compile Include="Linq\ReWriters\AddJoinsReWriter.cs" />
337337
<Compile Include="Linq\ReWriters\MoveOrderByToEndRewriter.cs" />
@@ -1050,11 +1050,11 @@
10501050
<Compile Include="Linq\ExpressionToHqlTranslationResults.cs" />
10511051
<Compile Include="Linq\EnumerableHelper.cs" />
10521052
<Compile Include="Linq\GroupBy\GroupBySelectClauseRewriter.cs" />
1053-
<Compile Include="Linq\Visitors\HqlGeneratorExpressionTreeVisitor.cs" />
1053+
<Compile Include="Linq\Visitors\HqlGeneratorExpressionVisitor.cs" />
10541054
<Compile Include="Linq\LinqExtensionMethods.cs" />
10551055
<Compile Include="Linq\ReWriters\MergeAggregatingResultsRewriter.cs" />
10561056
<Compile Include="Param\NamedParameter.cs" />
1057-
<Compile Include="Linq\Visitors\NhExpressionTreeVisitor.cs" />
1057+
<Compile Include="Linq\Visitors\NhExpressionVisitor.cs" />
10581058
<Compile Include="Linq\Expressions\NhNewExpression.cs" />
10591059
<Compile Include="Linq\NhQueryable.cs" />
10601060
<Compile Include="Linq\ResultOperators\NonAggregatingGroupBy.cs" />

0 commit comments

Comments
 (0)