Cleanup

Author: andrewvk

CodeJam.Main/Algorithms/Algorithms.UpperBound.IComparable.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 using JetBrains.Annotations;

CodeJam.Main/Arithmetic/OperatorsFactory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -304,6 +305,7 @@ private static Func<T, T, int> EnumComparison<T>(bool nullable)
 			}
 			catch (Exception ex)
 			{
+				Debug.Assert(compareMethod.DeclaringType != null, "compareMethod.DeclaringType");
 				throw MethodNotSupported(compareMethod.DeclaringType, compareMethod.Name, ex);
 			}
 
@@ -319,6 +321,7 @@ private static Func<T, T, int> EnumComparison<T>(bool nullable)
 			}
 			catch (Exception ex)
 			{
+				Debug.Assert(compareMethod.DeclaringType != null, "compareMethod.DeclaringType");
 				throw MethodNotSupported(compareMethod.DeclaringType, compareMethod.Name, ex);
 			}
 		}
@@ -403,7 +406,7 @@ public static Func<T, T, bool> ComparisonOperator<T>(ExpressionType comparisonTy
 			}
 			catch (NotSupportedException ex)
 			{
-				ex.LogToCodeTraceSourceCatched();
+				ex.LogToCodeTraceSourceCaught();
 			}
 			return GetComparerComparison<T>(comparisonType);
 		}

CodeJam.Main/Assertions/CodeExceptions.cs

@@ -91,11 +91,11 @@ internal static TException LogToCodeTraceSourceBeforeThrow<TException>([NotNull]
 			return exception;
 		}
 
-		/// <summary>Logs the catched exception to the <see cref="CodeTraceSource"/>.</summary>
+		/// <summary>Logs the caught exception to the <see cref="CodeTraceSource"/>.</summary>
 		/// <typeparam name="TException">The type of the exception.</typeparam>
 		/// <param name="exception">The exception.</param>
 		/// <returns>The original exception.</returns>
-		internal static TException LogToCodeTraceSourceCatched<TException>([NotNull] this TException exception)
+		internal static TException LogToCodeTraceSourceCaught<TException>([NotNull] this TException exception)
 			where TException : Exception
 		{
 			var sb = new StringBuilder();

CodeJam.Main/Collections/SuffixTree/SuffixTree.cs

@@ -95,7 +95,7 @@ protected override void BuildFor(int begin, int end)
 				{
 					break;
 				}
-				UpdateActiveEdgeAndCurentPosition();
+				UpdateActiveEdgeAndCurrentPosition();
 			}
 		}
 
@@ -189,11 +189,11 @@ private void CreatePendingLink(int toNodeIndex)
 		}
 
 		/// <summary>Updates active edge and current position</summary>
-		private void UpdateActiveEdgeAndCurentPosition()
+		private void UpdateActiveEdgeAndCurrentPosition()
 		{
 			if (_nextSuffixOffset > _currentOffset)
 			{
-				// all pending proper subsuffixes have been processed
+				// all pending proper sub-suffixes have been processed
 				// start from the root
 				_currentOffset = _nextSuffixOffset;
 				_branchNodeIndex = RootNodeIndex;

CodeJam.Main/Dates/DateTimeRangeExtensions.cs

@@ -158,7 +158,7 @@ public static IEnumerable<DateTime> YearsBetween(this Range<DateTime> range)
 
 		/// <summary>Splits the range by months.</summary>
 		/// <param name="range">The date range.</param>
-		/// <returns>Ranges splitted by first day of months in range.</returns>
+		/// <returns>Ranges split by first day of months in range.</returns>
 		[NotNull]
 		public static IEnumerable<Range<DateTime>> SplitByMonths(this Range<DateTime> range)
 		{
@@ -180,7 +180,7 @@ public static IEnumerable<Range<DateTime>> SplitByMonths(this Range<DateTime> ra
 
 		/// <summary>Splits the range by years.</summary>
 		/// <param name="range">The date range.</param>
-		/// <returns>Ranges splitted by first day of years in range.</returns>
+		/// <returns>Ranges split by first day of years in range.</returns>
 		[NotNull]
 		public static IEnumerable<Range<DateTime>> SplitByYears(this Range<DateTime> range)
 		{

CodeJam.Main/Disposable.cs

@@ -26,7 +26,7 @@ public void Dispose() { }
 		/// The <see cref="IDisposable"/> implementation that calls supplied action on <see cref="Dispose"/>.
 		/// </summary>
 		/// DONTTOUCH: DO NOT make it a struct, passing the structure by value will result in multiple Dispose() calls.
-		/// SEALSO: https://blogs.msdn.microsoft.com/ericlippert/2011/03/14/to-box-or-not-to-box-that-is-the-question/
+		/// SEEALSO: https://blogs.msdn.microsoft.com/ericlippert/2011/03/14/to-box-or-not-to-box-that-is-the-question/
 		private sealed class AnonymousDisposable : IDisposable
 		{
 			private Action _disposeAction;
@@ -64,7 +64,7 @@ private bool OnException(Action disposeAction)
 		/// The <see cref="IDisposable"/> implementation that calls supplied action on <see cref="Dispose"/>.
 		/// </summary>
 		/// DONTTOUCH: DO NOT make it a struct, passing the structure by value will result in multiple Dispose() calls.
-		/// SEALSO: https://blogs.msdn.microsoft.com/ericlippert/2011/03/14/to-box-or-not-to-box-that-is-the-question/
+		/// SEEALSO: https://blogs.msdn.microsoft.com/ericlippert/2011/03/14/to-box-or-not-to-box-that-is-the-question/
 		private sealed class AnonymousDisposable<T> : IDisposable
 		{
 			private Action<T> _disposeAction;

CodeJam.Main/DisposableExtensions.cs

@@ -50,7 +50,7 @@ public static void DisposeAll(
 				}
 				catch (Exception ex) when (exceptionHandler(ex))
 				{
-					ex.LogToCodeTraceSourceCatched();
+					ex.LogToCodeTraceSourceCaught();
 				}
 			}
 		}

CodeJam.Main/EnumHelper.cs

@@ -332,7 +332,7 @@ private static class Holder<TEnum>
 			where TEnum : struct, Enum
 		{
 			#region Static fields
-			[NotNull, ItemNotNull]
+			[NotNull]
 			private static readonly HashSet<TEnum> _values = new HashSet<TEnum>((TEnum[])Enum.GetValues(typeof(TEnum)));
 			[NotNull]
 			private static readonly IReadOnlyDictionary<string, TEnum> _nameValues = GetNameValuesCore(ignoreCase: false);

CodeJam.Main/Expressions/ExpressionExtensions.GetMembers.cs

@@ -141,11 +141,11 @@ public static string GetPropertyName([NotNull] this LambdaExpression expression)
 			GetMemberExpression(expression).Member.Name;
 
 		/// <summary>
-		/// Returns a composited name of the property.
+		/// Returns a composed name of the property.
 		/// </summary>
 		/// <param name="expression">The expression to analyze.</param>
 		/// <returns>
-		/// A composited name of the property.
+		/// A composed name of the property.
 		/// </returns>
 		[NotNull, Pure]
 		public static string GetFullPropertyName([NotNull] this LambdaExpression expression) =>
@@ -210,24 +210,24 @@ private static IEnumerable<MemberInfo> GetMembers([NotNull] Expression expressio
 							if (lastMember == null)
 								goto default;
 
-							var cexpr = (MethodCallExpression)expression;
-							var expr = cexpr.Object;
+							var cExpr = (MethodCallExpression)expression;
+							var expr = cExpr.Object;
 
 							if (expr == null)
 							{
-								if (cexpr.Arguments.Count == 0)
+								if (cExpr.Arguments.Count == 0)
 									goto default;
 
-								expr = cexpr.Arguments[0];
+								expr = cExpr.Arguments[0];
 							}
 
 							if (expr.NodeType != ExpressionType.MemberAccess)
 								goto default;
 
 							var member = ((MemberExpression)expr).Member;
-							var mtype = member.GetMemberType();
+							var mType = member.GetMemberType();
 
-							if (lastMember.ReflectedType != mtype.GetItemType())
+							if (lastMember.ReflectedType != mType.GetItemType())
 								goto default;
 
 							expression = expr;
@@ -237,12 +237,12 @@ private static IEnumerable<MemberInfo> GetMembers([NotNull] Expression expressio
 
 					case ExpressionType.MemberAccess:
 						{
-							var mexpr = (MemberExpression)expression;
-							var member = lastMember = mexpr.Member;
+							var mExpr = (MemberExpression)expression;
+							var member = lastMember = mExpr.Member;
 
 							yield return member;
 
-							expression = mexpr.Expression;
+							expression = mExpr.Expression;
 
 							break;
 						}

CodeJam.Main/Expressions/ExpressionExtensions.cs

@@ -190,15 +190,15 @@ void Action(MemberBinding b)
 								VisitInternal(((MemberListBinding)b).Initializers, p => VisitInternal(p.Arguments, func));
 								break;
 							case MemberBindingType.MemberBinding:
-								VisitInternal(((MemberMemberBinding)b).Bindings, (Action<MemberBinding>)Action);
+								VisitInternal(((MemberMemberBinding)b).Bindings, Action);
 								break;
 						}
 					}
 
 					var e = (MemberInitExpression)expr;
 
 					VisitInternal(e.NewExpression, func);
-					VisitInternal(e.Bindings, (Action<MemberBinding>)Action);
+					VisitInternal(e.Bindings, Action);
 
 					break;
 				}
@@ -1053,7 +1053,7 @@ public static Expression Transform([CanBeNull] this Expression expr, [NotNull] F
 			return TransformInternal(expr, func);
 		}
 
-		[CanBeNull]
+		[ContractAnnotation("expr: null => null; expr: notnull => notnull")]
 		private static Expression TransformInternal([CanBeNull] this Expression expr, [NotNull] Func<Expression, Expression> func)
 		{
 			if (expr == null)
@@ -1189,6 +1189,7 @@ private static Expression TransformInternal([CanBeNull] this Expression expr, [N
 				case ExpressionType.MemberAccess:
 				{
 					var e = (MemberExpression)expr;
+					DebugCode.BugIf(e.Expression == null, "e.Expression == null");
 					return e.Update(TransformInternal(e.Expression, func));
 				}
 
@@ -1280,6 +1281,7 @@ MemberBinding Modify(MemberBinding b)
 				case ExpressionType.Index:
 				{
 					var e = (IndexExpression)expr;
+					DebugCode.BugIf(e.Object == null, "e.Object == null");
 					return e.Update(
 						TransformInternal(e.Object, func),
 						TransformInternal(e.Arguments, func));