WIP (Core): Yet more code cleanup -- inlining var decls, simplifying null checks, marking fields readonly, using pattern matching for type checks, etc. AND one minor fix in LispReader.

Author: dmiller

Clojure/Clojure.Source/clojure/samples/genclass/C.cs

@@ -6,9 +6,11 @@
 namespace dm
 {
 #pragma warning disable IDE1006 // Naming Styles
+#pragma warning disable IDE0051 // Remove unused private members
+#pragma warning disable CA1822 // mark as static
     public class C1
     {
-        protected int x = 0;
+        protected int x;
         protected string y = String.Empty;
 
 
@@ -23,6 +25,7 @@ public class C1
         protected int m3(int x) { Message("m3", x.ToString()); return x + 1; }
 
         protected int m4(int x) { Message("m4", x.ToString()); return x + 1; }
+
         private int m5(int x) { Message("m5", x.ToString()); return x + 1; }
 
         public C1(int x, string y) { Message("ctor1", x.ToString(), y); this.x = x; this.y = y; }
@@ -41,6 +44,8 @@ public interface I1
         int m2(string x);
         int m2(int x);
     }
-    
+
 #pragma warning restore IDE1006 // Naming Styles
+#pragma warning restore IDE0051 // Remove unused private members
+#pragma warning restore CA1822 // mark as static
 }

Clojure/Clojure.Source/clojure/samples/interop/C.cs

@@ -40,6 +40,7 @@ public class C1
         public string m6(ref int x) { x += 111; return x.ToString(); }
         public string m6(ref string x) { x += "abc"; return x; }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "<Pending>")]
         public void m7(string format, params object[] args) { Console.WriteLine("Count is {0}", args.Length); }
     }
 
@@ -65,8 +66,12 @@ public class C4
     // For playing with c-tors
     public class C5
     {
+#pragma warning disable IDE0044 // Add readonly modifier
+#pragma warning disable IDE0052 // Remove unread private members
         string _msg;
         object _data;
+#pragma warning restore IDE0052 // Remove unread private members
+#pragma warning restore IDE0044 // Add readonly modifier
 
         public override string ToString()
         {

Clojure/Clojure.Tests/ReflectorTryCatchFixture.cs

@@ -37,7 +37,7 @@ public static void fail(double y)
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "ClojureJVM name match")]
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE0060:Remove unused parameter", Justification = "Part of API")]
-        public void failWithCause(Double y)
+        public static void failWithCause(Double y)
         {
             throw new Cookies("Wrapped", new Cookies("Cause"));
         }

Clojure/Clojure/CljCompiler/Ast/DynInitHelper.cs

@@ -31,15 +31,15 @@ class DynInitHelper
     {
         #region Data
 
-        int _id = 0;
-        readonly AssemblyGen _assemblyGen = null;
-        TypeBuilder _typeBuilder =  null;
-        TypeGen _typeGen = null;
+        int _id;
+        readonly AssemblyGen _assemblyGen;
+        TypeBuilder _typeBuilder;
+        TypeGen _typeGen;
 
         readonly string _typeName;
 
 
-        List<SiteInfo> _siteInfos = null;
+        List<SiteInfo> _siteInfos;
 
         public class SiteInfo
         {
@@ -225,14 +225,14 @@ internal Type MakeDelegateType(string name, Type[] parameters, Type returnType)
         //private int _index;
         internal TypeBuilder DefineType(string name, Type parent, TypeAttributes attr, bool preserveName)
         {
-            ContractUtils.RequiresNotNull(name, "name");
-            ContractUtils.RequiresNotNull(parent, "parent");
+            ContractUtils.RequiresNotNull(name, nameof(name));
+            ContractUtils.RequiresNotNull(parent, nameof(parent));
 
             StringBuilder sb = new StringBuilder(name);
             if (!preserveName)
             {
                 int index = RT.nextID(); //Interlocked.Increment(ref _index);
-                sb.Append("$");
+                sb.Append('$');
                 sb.Append(index);
             }
 

Clojure/Clojure/Lib/BigInteger.cs

@@ -60,7 +60,7 @@ public class BigInteger: IComparable, IConvertible, IEquatable<BigInteger>
         /// </remarks>
         private readonly uint[] _data;
 
-        private static readonly BigInteger _zero = new BigInteger(0, new uint[] { });
+        private static readonly BigInteger _zero = new BigInteger(0, Array.Empty<uint>());
         private static readonly BigInteger _one = new BigInteger(1, new uint[] { 1 });
         private static readonly BigInteger _two = new BigInteger(1, new uint[] { 2 });
         private static readonly BigInteger _five = new BigInteger(1, new uint[] { 5 });
@@ -472,7 +472,7 @@ public string ToString(uint radix)
             StringBuilder sb = new StringBuilder(rems.Count * RadixDigitsPerDigit[radix] + 1);
 
             if (_sign < 0)
-                sb.Append("-");
+                sb.Append('-');
 
             char[] charBuf = new char[RadixDigitsPerDigit[radix]];
 
@@ -1575,10 +1575,7 @@ public int CompareTo(object obj)
                 return 1;
 
 
-            if (!(obj is BigInteger o))
-                throw new ArgumentException("Expected a BigInteger to compare against");
-
-            return Compare(this, o);
+            return obj is BigInteger o ? Compare(this, o) : throw new ArgumentException("Expected a BigInteger to compare against");
         }
 
         #endregion
@@ -2009,7 +2006,7 @@ public BigInteger Abs()
         public BigInteger Power(int exp)
         {
             if (exp < 0)
-                throw new ArgumentOutOfRangeException("exp","Exponent must be non-negative");
+                throw new ArgumentOutOfRangeException(nameof(exp),"Exponent must be non-negative");
 
             if (exp == 0)
                 return One;
@@ -2043,7 +2040,7 @@ public BigInteger ModPow(BigInteger power, BigInteger mod)
         {
             // TODO: Look at Java implementation for a more efficient version
             if (power < 0)
-                throw new ArgumentOutOfRangeException("power","must be non-negative");
+                throw new ArgumentOutOfRangeException(nameof(power),"must be non-negative");
 
             if (power._sign == 0)
                 return One;
@@ -3014,8 +3011,8 @@ private static void DivMod(uint[] x, uint[] y, out uint[] q, out uint[] r)
             // Special case: dividend == 0
             if (xlen == 0)
             {
-                q = new uint[0];
-                r = new uint[0];
+                q = Array.Empty<uint>();
+                r = Array.Empty<uint>();
                 return;
             }
 
@@ -3032,7 +3029,7 @@ private static void DivMod(uint[] x, uint[] y, out uint[] q, out uint[] r)
             // Special case: dividend < divisor
             if (cmp < 0 )
             {
-                q = new uint[0];
+                q = Array.Empty<uint>();
                 r = (uint[])x.Clone();
                 return;
             }

Clojure/Clojure/Lib/EdnReader.cs

@@ -165,10 +165,9 @@ public static object read(PushbackTextReader r,
                 if (isRecursive)
                     throw;
 
-                if (!(r is LineNumberingTextReader lntr))
-                    throw;
-
-                throw new ReaderException(lntr.LineNumber, lntr.ColumnNumber, e);
+                if (r is LineNumberingTextReader lntr)
+                    throw new ReaderException(lntr.LineNumber, lntr.ColumnNumber, e);
+                throw;
             }
         }
 
@@ -1158,7 +1157,7 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
             {
                 if (info == null)
                 {
-                    throw new ArgumentNullException("info");
+                    throw new ArgumentNullException(nameof(info));
                 }
                 base.GetObjectData(info, context);
                 info.AddValue("Line", this._line, typeof(int));

Clojure/Clojure/Lib/ExceptionInfo.cs

@@ -54,7 +54,7 @@ public ExceptionInfo(String s, IPersistentMap data, Exception innerException)
             if (data != null)
                 this.data = data;
             else
-                throw new ArgumentException("Additional data must be non-nil.", "data");
+                throw new ArgumentException("Additional data must be non-nil.", nameof(data));
         }
 
         public ExceptionInfo()
@@ -86,7 +86,7 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
         {
             if (info == null)
             {
-                throw new ArgumentNullException("info");
+                throw new ArgumentNullException(nameof(info));
             }
             base.GetObjectData(info, context);
             info.AddValue("data", this.data, typeof(IPersistentMap));

Clojure/Clojure/Lib/Future.cs

@@ -31,7 +31,7 @@ public class Future : IDeref, IBlockingDeref, IPending, IDisposable
         object _value;
         Exception _error;
         bool _cancelled;
-        bool _disposed = false;
+        bool _disposed;
 
         #endregion
 

Clojure/Clojure/Lib/Keyword.cs

@@ -149,10 +149,7 @@ public override bool Equals(object obj)
             if ( ReferenceEquals(this,obj) ) 
                 return true;
 
-            if (!(obj is Keyword keyword))
-                return false;
-
-            return _sym.Equals(keyword.Symbol);
+            return obj is Keyword keyword && _sym.Equals(keyword.Symbol);
         }
 
         /// <summary>
@@ -252,10 +249,9 @@ public sealed override object invoke(object arg1, object notFound)
         /// <returns>neg,zero,pos for &lt; = &gt;</returns>
         public int CompareTo(object obj)
         {
-            if (!(obj is Keyword k))
-                throw new ArgumentException("Cannot compare to null or non-Keyword", "obj");
-
-            return _sym.CompareTo(k._sym);
+            return obj is Keyword k
+                ? _sym.CompareTo(k._sym)
+                : throw new ArgumentException("Cannot compare to null or non-Keyword", nameof(obj));
         }
 
         #endregion
@@ -290,7 +286,7 @@ public int CompareTo(object obj)
                 return false;
 
             if (k1 is null)
-                throw new ArgumentNullException("k1");
+                throw new ArgumentNullException(nameof(k1));
 
             return k1.CompareTo(k2) < 0;
         }
@@ -301,7 +297,7 @@ public int CompareTo(object obj)
                 return false;
 
             if (k1 is null)
-                throw new ArgumentNullException("k1");
+                throw new ArgumentNullException(nameof(k1));
 
             return k1.CompareTo(k2) > 0;
         }

Clojure/Clojure/Lib/LazySeq.cs

@@ -259,13 +259,13 @@ public object this[int index]
             get
             {
                 if (index < 0)
-                    throw new ArgumentOutOfRangeException("index","Index must be non-negative.");
+                    throw new ArgumentOutOfRangeException(nameof(index),"Index must be non-negative.");
 
                 ISeq s = seq();
                 for (int i = 0; s != null; s = s.next(), i++)
                     if (i == index)
                         return s.first();
-                throw new ArgumentOutOfRangeException("index", "Index past end of sequence.");
+                throw new ArgumentOutOfRangeException(nameof(index), "Index past end of sequence.");
             }
             set
             {
@@ -280,13 +280,13 @@ public object this[int index]
         public void CopyTo(object[] array, int arrayIndex)
         {
             if (array == null)
-                throw new ArgumentNullException("array");
+                throw new ArgumentNullException(nameof(array));
             if (arrayIndex < 0)
-                throw new ArgumentOutOfRangeException("arrayIndex", "must be non-negative.");
+                throw new ArgumentOutOfRangeException(nameof(arrayIndex), "must be non-negative.");
             if (array.Rank > 1)
-                throw new ArgumentException("must not be multidimensional","array" );
+                throw new ArgumentException("must not be multidimensional",nameof(array));
             if (arrayIndex >= array.Length)
-                throw new ArgumentException("must be less than the length", "arrayIndex");
+                throw new ArgumentException("must be less than the length", nameof(arrayIndex));
             if (count() > array.Length - arrayIndex)
                 throw new InvalidOperationException("Not enough available space from index to end of the array.");
 
@@ -298,13 +298,13 @@ public void CopyTo(object[] array, int arrayIndex)
         public void CopyTo(Array array, int index)
         {
             if (array == null)
-                throw new ArgumentNullException("array");
+                throw new ArgumentNullException(nameof(array));
             if (index < 0)
-                throw new ArgumentOutOfRangeException("index","must be non-negative.");
+                throw new ArgumentOutOfRangeException(nameof(index),"must be non-negative.");
             if (array.Rank > 1)
-                throw new ArgumentException("must not be multidimensional.", "array");
+                throw new ArgumentException("must not be multidimensional.", nameof(array));
             if (index >= array.Length)
-                throw new ArgumentException("must be less than the length", "index");
+                throw new ArgumentException("must be less than the length", nameof(index));
             if (count() > array.Length - index)
                 throw new InvalidOperationException("Not enough available space from index to end of the array.");