Skip to content

Commit 90c6fa4

Browse files
jstedfastjstedfast
committed
code cleanup and fixed line endings
1 parent de4bb2b commit 90c6fa4

File tree

2 files changed

+68
-65
lines changed

2 files changed

+68
-65
lines changed

‎Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExpressionEvaluatorVisitor.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,8 @@ static bool CheckReferenceEquality (EvaluationContext ctx, object v1, object v2)
189189
return false;
190190

191191
object objectType = ctx.Adapter.GetType (ctx, "System.Object");
192-
object[] argTypes = new object[] {
193-
objectType, objectType
194-
};
195-
object[] args = new object[] {
196-
v1, v2
197-
};
192+
object[] argTypes = { objectType, objectType };
193+
object[] args = { v1, v2 };
198194

199195
object result = ctx.Adapter.RuntimeInvoke (ctx, objectType, null, "ReferenceEquals", argTypes, args);
200196
var literal = LiteralValueReference.CreateTargetObjectLiteral (ctx, "result", result);
@@ -213,20 +209,20 @@ static bool CheckEquality (EvaluationContext ctx, bool negate, object targetVal1
213209
string method = negate ? "op_Inequality" : "op_Equality";
214210
object v1type = ctx.Adapter.GetValueType (ctx, targetVal1);
215211
object v2type = ctx.Adapter.GetValueType (ctx, targetVal2);
216-
object[] argTypes = new object[] { v2type };
212+
object[] argTypes = { v2type };
217213
object target, targetType;
218214
object[] args;
219215

220216
if (ctx.Adapter.HasMethod (ctx, v1type, method, argTypes, BindingFlags.Instance | BindingFlags.Public)) {
221-
args = new object[] { targetVal2 };
217+
args = new [] { targetVal2 };
222218
targetType = v1type;
223219
target = targetVal1;
224220
negate = false;
225221
} else {
226222
method = ctx.Adapter.IsValueType (v1type) ? "Equals" : "ReferenceEquals";
227223
targetType = ctx.Adapter.GetType (ctx, "System.Object");
228-
argTypes = new object[] { targetType, targetType };
229-
args = new object[] { targetVal1, targetVal2 };
224+
argTypes = new [] { targetType, targetType };
225+
args = new [] { targetVal1, targetVal2 };
230226
target = null;
231227
}
232228

@@ -341,45 +337,49 @@ ValueReference EvaluateBinaryOperatorExpression (BinaryOperatorType op, ValueRef
341337
static string ResolveType (EvaluationContext ctx, TypeReferenceExpression mre, List<object> args)
342338
{
343339
var memberType = mre.Type as MemberType;
344-
if (memberType != null) {
345-
string name = memberType.MemberName;
346-
347-
if (memberType.TypeArguments.Count > 0) {
348-
name += "`" + memberType.TypeArguments.Count;
349-
foreach (var arg in memberType.TypeArguments) {
350-
object resolved = arg.Resolve (ctx);
351-
340+
341+
if (memberType != null) {
342+
var name = memberType.MemberName;
343+
344+
if (memberType.TypeArguments.Count > 0) {
345+
name += "`" + memberType.TypeArguments.Count;
346+
347+
foreach (var arg in memberType.TypeArguments) {
348+
var resolved = arg.Resolve (ctx);
349+
352350
if (resolved == null)
353-
return null;
354-
355-
args.Add (resolved);
356-
}
351+
return null;
352+
353+
args.Add (resolved);
354+
}
357355
}
356+
358357
return name;
359358
}
360359

361-
return mre.ToString ();
360+
return mre.ToString ();
362361
}
363362

364363
static string ResolveType (EvaluationContext ctx, MemberReferenceExpression mre, List<object> args)
365364
{
366365
string parent, name;
367366

368367
if (mre.Target is MemberReferenceExpression) {
369-
parent = ResolveType (ctx, (MemberReferenceExpression)mre.Target, args);
368+
parent = ResolveType (ctx, (MemberReferenceExpression) mre.Target, args);
369+
} else if (mre.Target is TypeReferenceExpression) {
370+
parent = ResolveType (ctx, (TypeReferenceExpression) mre.Target, args);
370371
} else if (mre.Target is IdentifierExpression) {
371-
parent = ((IdentifierExpression)mre.Target).Identifier;
372-
} else if (mre.Target is TypeReferenceExpression)
373-
parent = ResolveType (ctx, (TypeReferenceExpression)mre.Target, args);
374-
else {
372+
parent = ((IdentifierExpression) mre.Target).Identifier;
373+
} else {
375374
return null;
376375
}
377376

378377
name = parent + "." + mre.MemberName;
379378
if (mre.TypeArguments.Count > 0) {
380379
name += "`" + mre.TypeArguments.Count;
380+
381381
foreach (var arg in mre.TypeArguments) {
382-
object resolved = arg.Resolve (ctx);
382+
var resolved = arg.Resolve (ctx);
383383

384384
if (resolved == null)
385385
return null;

‎Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExpressionResolverVisitor.cs‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -61,50 +61,52 @@ internal string GetResolvedExpression ()
6161
if (replacements.Count == 0)
6262
return expression;
6363

64-
replacements.Sort ((Replacement r1, Replacement r2) => r1.Offset.CompareTo (r2.Offset));
65-
StringBuilder sb = new StringBuilder ();
64+
replacements.Sort ((r1, r2) => r1.Offset.CompareTo (r2.Offset));
65+
var resolved = new StringBuilder ();
6666
int i = 0;
6767

68-
foreach (Replacement r in replacements) {
69-
sb.Append (expression, i, r.Offset - i);
70-
sb.Append (r.NewText);
71-
i = r.Offset + r.Length;
68+
foreach (var replacement in replacements) {
69+
resolved.Append (expression, i, replacement.Offset - i);
70+
resolved.Append (replacement.NewText);
71+
i = replacement.Offset + replacement.Length;
7272
}
7373

74-
Replacement last = replacements [replacements.Count - 1];
75-
sb.Append (expression, last.Offset + last.Length, expression.Length - (last.Offset + last.Length));
74+
var last = replacements[replacements.Count - 1];
75+
resolved.Append (expression, last.Offset + last.Length, expression.Length - (last.Offset + last.Length));
7676

77-
return sb.ToString ();
77+
return resolved.ToString ();
7878
}
7979

8080
void ReplaceType (string name, int offset, int length)
8181
{
82-
string type = session.ResolveIdentifierAsType (name, location);
82+
var type = session.ResolveIdentifierAsType (name, location);
83+
8384
if (!string.IsNullOrEmpty (type)) {
8485
type = "global::" + type;
85-
Replacement r = new Replacement () { Offset = offset, Length = length, NewText = type };
86-
replacements.Add (r);
86+
var replacement = new Replacement { Offset = offset, Length = length, NewText = type };
87+
replacements.Add (replacement);
8788
}
8889
}
8990

9091
void ReplaceType (AstType type)
9192
{
9293
int length = type.EndLocation.Column - type.StartLocation.Column;
93-
int offset = type.StartLocation.Column - 1;
94-
94+
int offset = type.StartLocation.Column - 1;
95+
9596
ReplaceType(type.ToString(), offset, length);
96-
}
97-
98-
public override void VisitIdentifierExpression(IdentifierExpression identifierExpression)
99-
{
100-
base.VisitIdentifierExpression (identifierExpression);
101-
102-
int length = identifierExpression.IdentifierToken.EndLocation.Column - identifierExpression.IdentifierToken.StartLocation.Column;
103-
int offset = identifierExpression.IdentifierToken.StartLocation.Column - 1;
97+
}
98+
99+
public override void VisitIdentifierExpression (IdentifierExpression identifierExpression)
100+
{
101+
base.VisitIdentifierExpression (identifierExpression);
102+
103+
int length = identifierExpression.IdentifierToken.EndLocation.Column - identifierExpression.IdentifierToken.StartLocation.Column;
104+
int offset = identifierExpression.IdentifierToken.StartLocation.Column - 1;
105+
104106
if (identifierExpression.TypeArguments.Count > 0)
105107
ReplaceType (identifierExpression.Identifier + "`" + identifierExpression.TypeArguments.Count, offset, length);
106108
else
107-
ReplaceType (identifierExpression.Identifier, offset, length);
109+
ReplaceType (identifierExpression.Identifier, offset, length);
108110
}
109111

110112
public override void VisitTypeReferenceExpression (TypeReferenceExpression typeReferenceExpression)
@@ -118,25 +120,26 @@ public override void VisitComposedType (ComposedType composedType)
118120
// call VisitMemberType() or VisitSimpleType() on the ComposedType.BaseType which is all we really
119121
// care to resolve.
120122
base.VisitComposedType (composedType);
121-
}
122-
123-
public override void VisitMemberType(MemberType memberType)
124-
{
125-
int length = memberType.MemberNameToken.EndLocation.Column - memberType.MemberNameToken.StartLocation.Column;
126-
int offset = memberType.MemberNameToken.StartLocation.Column - 1;
127-
123+
}
124+
125+
public override void VisitMemberType (MemberType memberType)
126+
{
127+
int length = memberType.MemberNameToken.EndLocation.Column - memberType.MemberNameToken.StartLocation.Column;
128+
int offset = memberType.MemberNameToken.StartLocation.Column - 1;
129+
128130
if (memberType.TypeArguments.Count > 0)
129131
ReplaceType (memberType.MemberName + "`" + memberType.TypeArguments.Count, offset, length);
130132
else
131-
ReplaceType (memberType.MemberName, offset, length);
133+
ReplaceType (memberType.MemberName, offset, length);
132134
}
133135

134136
public override void VisitSimpleType (SimpleType simpleType)
135-
{
136-
base.VisitSimpleType (simpleType);
137-
int length = simpleType.IdentifierToken.EndLocation.Column - simpleType.IdentifierToken.StartLocation.Column;
138-
int offset = simpleType.IdentifierToken.StartLocation.Column - 1;
139-
137+
{
138+
base.VisitSimpleType (simpleType);
139+
140+
int length = simpleType.IdentifierToken.EndLocation.Column - simpleType.IdentifierToken.StartLocation.Column;
141+
int offset = simpleType.IdentifierToken.StartLocation.Column - 1;
142+
140143
if (simpleType.TypeArguments.Count > 0)
141144
ReplaceType (simpleType.Identifier + "`" + simpleType.TypeArguments.Count, offset, length);
142145
else

0 commit comments

Comments
 (0)