Some minor C# expreesion changes.

Author: dmiller

Clojure/Clojure/CljCompiler/Ast/InstanceOfExpr.cs

@@ -8,31 +8,26 @@
  *   You must not remove this notice, or any other, from this software.
  **/
 
-/**
- *   Author: David Miller
- **/
-
 using System;
 using System.Reflection.Emit;
 
-
 namespace clojure.lang.CljCompiler.Ast
 {
     public sealed class InstanceOfExpr : Expr, MaybePrimitiveExpr
     {
         #region Data
 
         readonly Expr _expr;
-        public Expr Expr { get { return _expr; } }
+        public Expr Expr => _expr;
 
         readonly Type _t;
-        public Type Type { get { return _t; } }
+        public Type Type => _t;
 
         readonly string _source;
-        public string Source { get { return _source; } }
+        public string Source => _source;
 
         readonly IPersistentMap _spanMap;
-        public IPersistentMap SpanMap { get { return _spanMap; } }
+        public IPersistentMap SpanMap => _spanMap;
 
         #endregion
 
@@ -50,15 +45,9 @@ public InstanceOfExpr(string source, IPersistentMap spanMap, Type t, Expr expr)
 
         #region Type mangling
 
-        public bool HasClrType
-        {
-            get { return true; }
-        }
+        public bool HasClrType => true;
 
-        public Type ClrType
-        {
-            get { return typeof(bool); }
-        }
+        public Type ClrType => typeof(bool);
 
         #endregion
 
@@ -81,12 +70,9 @@ public void Emit(RHC rhc, ObjExpr objx, CljILGen ilg)
                 ilg.Emit(OpCodes.Pop);
         }
 
-        public bool HasNormalExit() { return true; }
+        public bool HasNormalExit() => true;
 
-        public bool CanEmitPrimitive
-        {
-            get { return true; }
-        }
+        public bool CanEmitPrimitive => true;
 
         public void EmitUnboxed(RHC rhc, ObjExpr objx, CljILGen ilg)
         {

Clojure/Clojure/CljCompiler/Ast/StaticInvokeExpr.cs

@@ -28,7 +28,7 @@ class StaticInvokeExpr : Expr, MaybePrimitiveExpr
         readonly bool _variadic;
         readonly object _tag;
 
-        public MethodInfo Method { get { return _method; } }
+        public MethodInfo Method => _method;
 
         Type _cachedType;
 
@@ -51,10 +51,7 @@ public StaticInvokeExpr(Type target, MethodInfo method, bool variadic, IPersiste
 
         #region Type mangling
 
-        public bool HasClrType
-        {
-            get { return true; }
-        }
+        public bool HasClrType => true;
 
         public Type ClrType
         {
@@ -72,7 +69,7 @@ public Type ClrType
 
         public static Expr Parse(Var v, ISeq args, object tag)
         {
-            if (!v.isBound || v.get() == null)
+            if (!v.isBound || v.get() is null)
             {
                 //Console.WriteLine("Not bound: {0}", v);
                 return null;
@@ -86,12 +83,12 @@ public static Expr Parse(Var v, ISeq args, object tag)
                 // We do not want to direct link to if we going into a non-PersistedAssemblyBuilder assembly --
                 //   this throws an exception when generating the method call IL in the StaticInvokeExpr.Emit
 
-                if ( Compiler.IsCompiling &&
+                if (Compiler.IsCompiling &&
                      Compiler.CompilerContextVar.deref() is GenContext context &&
-                     ! GenContext.IsInternalAssembly(context.AssemblyBuilder) &&
+                     !GenContext.IsInternalAssembly(context.AssemblyBuilder) &&
                      Compiler.TryGetDirectLink(v, out Type t))
                 {
-                    if (t != null)
+                    if (t is not null)
                         target = t;
                 }
             }
@@ -123,7 +120,7 @@ public static Expr Parse(Var v, ISeq args, object tag)
                 }
             }
 
-            if (method == null)
+            if (method is null)
                 return null;
 
             IPersistentVector argv = PersistentVector.EMPTY;
@@ -152,23 +149,18 @@ public void Emit(RHC rhc, ObjExpr objx, CljILGen ilg)
             EmitUnboxed(rhc, objx, ilg);
             if (rhc != RHC.Statement)
                 HostExpr.EmitBoxReturn(objx, ilg, _retType);
-            if (rhc == RHC.Statement )
+            if (rhc == RHC.Statement)
                 ilg.Emit(OpCodes.Pop);
         }
 
-        public bool HasNormalExit()
-        {
-            return true;
-        }
-
+        public bool HasNormalExit() => true;
 
         public void EmitUnboxed(RHC rhc, ObjExpr objx, CljILGen ilg)
         {
             if (_variadic)
             {
-                
                 ParameterInfo[] pinfos = _method.GetParameters();
-                for (int i =0; i< pinfos.Length-1; i++ )
+                for (int i = 0; i < pinfos.Length - 1; i++)
                 {
                     Expr e = (Expr)_args.nth(i);
                     if (Compiler.MaybePrimitiveType(e) == pinfos[i].ParameterType)
@@ -181,7 +173,7 @@ public void EmitUnboxed(RHC rhc, ObjExpr objx, CljILGen ilg)
                 }
                 IPersistentVector restArgs = RT.subvec(_args, pinfos.Length - 1, _args.count());
                 MethodExpr.EmitArgsAsArray(restArgs, objx, ilg);
-                ilg.EmitCall(Compiler.Method_ArraySeq_create);               
+                ilg.EmitCall(Compiler.Method_ArraySeq_create);
             }
             else
                 MethodExpr.EmitTypedArgs(objx, ilg, _method.GetParameters(), _args);
@@ -198,14 +190,11 @@ public void EmitUnboxed(RHC rhc, ObjExpr objx, CljILGen ilg)
             }
         }
 
-#endregion
+        #endregion
 
         #region MaybePrimitiveExpr Members
 
-        public bool CanEmitPrimitive
-        {
-            get { return _retType.IsPrimitive; }
-        }
+        public bool CanEmitPrimitive => _retType.IsPrimitive;
 
         #endregion
     }