Skip to content

Commit 3535aeb

Browse files
author
rstam
committed
Changed ExpressionPrettyPrinter and ExpressionVisitor to put methods in alphabetical order.
1 parent 99b6543 commit 3535aeb

File tree

2 files changed

+304
-304
lines changed

2 files changed

+304
-304
lines changed

Driver/Linq/Expressions/ExpressionPrettyPrinter.cs

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -56,33 +56,6 @@ public string PrettyPrint(Expression node)
5656
}
5757

5858
// protected methods
59-
/// <summary>
60-
/// Visits an ElementInit node.
61-
/// </summary>
62-
/// <param name="node">The ElementInit node.</param>
63-
/// <returns>The ElementInit node.</returns>
64-
protected override ElementInit VisitElementInit(ElementInit node)
65-
{
66-
throw new NotImplementedException();
67-
}
68-
69-
/// <summary>
70-
/// Visits a UnaryExpression.
71-
/// </summary>
72-
/// <param name="node">The UnaryExpression.</param>
73-
/// <returns>The UnaryExpression.</returns>
74-
protected override Expression VisitUnary(UnaryExpression node)
75-
{
76-
WriteHeader(node);
77-
using (new Indentation(this))
78-
{
79-
WriteLine("Method={0}", node.Method == null ? "null" : node.Method.Name);
80-
WriteLine("Operand:");
81-
VisitIndented(node.Operand);
82-
}
83-
return node;
84-
}
85-
8659
/// <summary>
8760
/// Visits a BinaryExpression.
8861
/// </summary>
@@ -103,11 +76,11 @@ protected override Expression VisitBinary(BinaryExpression node)
10376
}
10477

10578
/// <summary>
106-
/// Visits a TypeBinaryExpression.
79+
/// Visits a ConditionalExpression.
10780
/// </summary>
108-
/// <param name="node">The TypeBinaryExpression.</param>
109-
/// <returns>The TypeBinaryExpression.</returns>
110-
protected override Expression VisitTypeBinary(TypeBinaryExpression node)
81+
/// <param name="node">The ConditionalExpression.</param>
82+
/// <returns>The ConditionalExpression.</returns>
83+
protected override Expression VisitConditional(ConditionalExpression node)
11184
{
11285
throw new NotImplementedException();
11386
}
@@ -128,31 +101,67 @@ protected override Expression VisitConstant(ConstantExpression node)
128101
}
129102

130103
/// <summary>
131-
/// Visits a ConditionalExpression.
104+
/// Visits an ElementInit node.
132105
/// </summary>
133-
/// <param name="node">The ConditionalExpression.</param>
134-
/// <returns>The ConditionalExpression.</returns>
135-
protected override Expression VisitConditional(ConditionalExpression node)
106+
/// <param name="node">The ElementInit node.</param>
107+
/// <returns>The ElementInit node.</returns>
108+
protected override ElementInit VisitElementInit(ElementInit node)
136109
{
137110
throw new NotImplementedException();
138111
}
139112

140113
/// <summary>
141-
/// Visits a ParameterExpression.
114+
/// Visits an ElementInit list.
142115
/// </summary>
143-
/// <param name="node">The ParameterExpression.</param>
144-
/// <returns>The ParameterExpression.</returns>
145-
protected override Expression VisitParameter(ParameterExpression node)
116+
/// <param name="nodes">The ElementInit list.</param>
117+
/// <returns>The ElementInit list.</returns>
118+
protected override IEnumerable<ElementInit> VisitElementInitList(
119+
ReadOnlyCollection<ElementInit> nodes)
120+
{
121+
throw new NotImplementedException();
122+
}
123+
124+
/// <summary>
125+
/// Visits an InvocationExpression.
126+
/// </summary>
127+
/// <param name="node">The InvocationExpression.</param>
128+
/// <returns>The InvocationExpression.</returns>
129+
protected override Expression VisitInvocation(InvocationExpression node)
130+
{
131+
throw new NotImplementedException();
132+
}
133+
134+
/// <summary>
135+
/// Visits a LambdaExpression.
136+
/// </summary>
137+
/// <param name="node">The LambdaExpression.</param>
138+
/// <returns>The LambdaExpression.</returns>
139+
protected override Expression VisitLambda(LambdaExpression node)
146140
{
147141
WriteHeader(node);
148142
using (new Indentation(this))
149143
{
150-
WriteLine("Name={0}", node.Name);
151-
WriteLine("Type={0}", FriendlyClassName(node.Type));
144+
WriteLine("Parameters:");
145+
foreach (var parameter in node.Parameters)
146+
{
147+
VisitIndented(parameter);
148+
}
149+
WriteLine("Body:");
150+
VisitIndented(node.Body);
152151
}
153152
return node;
154153
}
155154

155+
/// <summary>
156+
/// Visits a ListInitExpression.
157+
/// </summary>
158+
/// <param name="node">The ListInitExpression.</param>
159+
/// <returns>The ListInitExpression.</returns>
160+
protected override Expression VisitListInit(ListInitExpression node)
161+
{
162+
throw new NotImplementedException();
163+
}
164+
156165
/// <summary>
157166
/// Visits a MemberExpression.
158167
/// </summary>
@@ -170,29 +179,6 @@ protected override Expression VisitMember(MemberExpression node)
170179
return node;
171180
}
172181

173-
/// <summary>
174-
/// Visits a MethodCallExpression.
175-
/// </summary>
176-
/// <param name="node">The MethodCallExpression.</param>
177-
/// <returns>The MethodCallExpression.</returns>
178-
protected override Expression VisitMethodCall(MethodCallExpression node)
179-
{
180-
WriteHeader(node);
181-
using (new Indentation(this))
182-
{
183-
WriteLine("Method={0}", node.Method.Name);
184-
WriteLine("Arguments:");
185-
using (new Indentation(this))
186-
{
187-
foreach (var arg in node.Arguments)
188-
{
189-
Visit(arg);
190-
}
191-
}
192-
}
193-
return node;
194-
}
195-
196182
/// <summary>
197183
/// Visits a MemberAssignment.
198184
/// </summary>
@@ -214,63 +200,64 @@ protected override MemberBinding VisitMemberBinding(MemberBinding node)
214200
}
215201

216202
/// <summary>
217-
/// Visits a MemberMemberBinding.
203+
/// Visits a MemberBinding list.
218204
/// </summary>
219-
/// <param name="node">The MemberMemberBinding.</param>
220-
/// <returns>The MemberMemberBinding.</returns>
221-
protected override MemberMemberBinding VisitMemberMemberBinding(MemberMemberBinding node)
205+
/// <param name="nodes">The MemberBinding list.</param>
206+
/// <returns>The MemberBinding list.</returns>
207+
protected override IEnumerable<MemberBinding> VisitMemberBindingList(ReadOnlyCollection<MemberBinding> nodes)
222208
{
223209
throw new NotImplementedException();
224210
}
225211

226212
/// <summary>
227-
/// Visits a MemberListBinding.
213+
/// Visits a MemberInitExpression.
228214
/// </summary>
229-
/// <param name="node">The MemberListBinding.</param>
230-
/// <returns>The MemberListBinding.</returns>
231-
protected override MemberListBinding VisitMemberListBinding(MemberListBinding node)
215+
/// <param name="node">The MemberInitExpression.</param>
216+
/// <returns>The MemberInitExpression.</returns>
217+
protected override Expression VisitMemberInit(MemberInitExpression node)
232218
{
233219
throw new NotImplementedException();
234220
}
235221

236222
/// <summary>
237-
/// Visits a MemberBinding list.
223+
/// Visits a MemberListBinding.
238224
/// </summary>
239-
/// <param name="nodes">The MemberBinding list.</param>
240-
/// <returns>The MemberBinding list.</returns>
241-
protected override IEnumerable<MemberBinding> VisitMemberBindingList(ReadOnlyCollection<MemberBinding> nodes)
225+
/// <param name="node">The MemberListBinding.</param>
226+
/// <returns>The MemberListBinding.</returns>
227+
protected override MemberListBinding VisitMemberListBinding(MemberListBinding node)
242228
{
243229
throw new NotImplementedException();
244230
}
245231

246232
/// <summary>
247-
/// Visits an ElementInit list.
233+
/// Visits a MemberMemberBinding.
248234
/// </summary>
249-
/// <param name="nodes">The ElementInit list.</param>
250-
/// <returns>The ElementInit list.</returns>
251-
protected override IEnumerable<ElementInit> VisitElementInitializerList(
252-
ReadOnlyCollection<ElementInit> nodes)
235+
/// <param name="node">The MemberMemberBinding.</param>
236+
/// <returns>The MemberMemberBinding.</returns>
237+
protected override MemberMemberBinding VisitMemberMemberBinding(MemberMemberBinding node)
253238
{
254239
throw new NotImplementedException();
255240
}
256241

257242
/// <summary>
258-
/// Visits a LambdaExpression.
243+
/// Visits a MethodCallExpression.
259244
/// </summary>
260-
/// <param name="node">The LambdaExpression.</param>
261-
/// <returns>The LambdaExpression.</returns>
262-
protected override Expression VisitLambda(LambdaExpression node)
245+
/// <param name="node">The MethodCallExpression.</param>
246+
/// <returns>The MethodCallExpression.</returns>
247+
protected override Expression VisitMethodCall(MethodCallExpression node)
263248
{
264249
WriteHeader(node);
265250
using (new Indentation(this))
266251
{
267-
WriteLine("Parameters:");
268-
foreach (var parameter in node.Parameters)
252+
WriteLine("Method={0}", node.Method.Name);
253+
WriteLine("Arguments:");
254+
using (new Indentation(this))
269255
{
270-
VisitIndented(parameter);
256+
foreach (var arg in node.Arguments)
257+
{
258+
Visit(arg);
259+
}
271260
}
272-
WriteLine("Body:");
273-
VisitIndented(node.Body);
274261
}
275262
return node;
276263
}
@@ -295,43 +282,56 @@ protected override NewExpression VisitNew(NewExpression node)
295282
}
296283

297284
/// <summary>
298-
/// Visits a MemberInitExpression.
285+
/// Visits a NewArrayExpression.
299286
/// </summary>
300-
/// <param name="node">The MemberInitExpression.</param>
301-
/// <returns>The MemberInitExpression.</returns>
302-
protected override Expression VisitMemberInit(MemberInitExpression node)
287+
/// <param name="node">The NewArrayExpression.</param>
288+
/// <returns>The NewArrayExpression.</returns>
289+
protected override Expression VisitNewArray(NewArrayExpression node)
303290
{
304291
throw new NotImplementedException();
305292
}
306293

307294
/// <summary>
308-
/// Visits a ListInitExpression.
295+
/// Visits a ParameterExpression.
309296
/// </summary>
310-
/// <param name="node">The ListInitExpression.</param>
311-
/// <returns>The ListInitExpression.</returns>
312-
protected override Expression VisitListInit(ListInitExpression node)
297+
/// <param name="node">The ParameterExpression.</param>
298+
/// <returns>The ParameterExpression.</returns>
299+
protected override Expression VisitParameter(ParameterExpression node)
313300
{
314-
throw new NotImplementedException();
301+
WriteHeader(node);
302+
using (new Indentation(this))
303+
{
304+
WriteLine("Name={0}", node.Name);
305+
WriteLine("Type={0}", FriendlyClassName(node.Type));
306+
}
307+
return node;
315308
}
316309

317310
/// <summary>
318-
/// Visits a NewArrayExpression.
311+
/// Visits a TypeBinaryExpression.
319312
/// </summary>
320-
/// <param name="node">The NewArrayExpression.</param>
321-
/// <returns>The NewArrayExpression.</returns>
322-
protected override Expression VisitNewArray(NewArrayExpression node)
313+
/// <param name="node">The TypeBinaryExpression.</param>
314+
/// <returns>The TypeBinaryExpression.</returns>
315+
protected override Expression VisitTypeBinary(TypeBinaryExpression node)
323316
{
324317
throw new NotImplementedException();
325318
}
326319

327320
/// <summary>
328-
/// Visits an InvocationExpression.
321+
/// Visits a UnaryExpression.
329322
/// </summary>
330-
/// <param name="node">The InvocationExpression.</param>
331-
/// <returns>The InvocationExpression.</returns>
332-
protected override Expression VisitInvocation(InvocationExpression node)
323+
/// <param name="node">The UnaryExpression.</param>
324+
/// <returns>The UnaryExpression.</returns>
325+
protected override Expression VisitUnary(UnaryExpression node)
333326
{
334-
throw new NotImplementedException();
327+
WriteHeader(node);
328+
using (new Indentation(this))
329+
{
330+
WriteLine("Method={0}", node.Method == null ? "null" : node.Method.Name);
331+
WriteLine("Operand:");
332+
VisitIndented(node.Operand);
333+
}
334+
return node;
335335
}
336336

337337
// private methods

0 commit comments

Comments
 (0)