Merge sequential checks (#174)

IronLanguages · Feb 17, 2019 · c29f32c · c29f32c
1 parent 5ab5ab0
commit c29f32c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Src/Microsoft.Dynamic/ComInterop/IDispatchComObject.cs b/Src/Microsoft.Dynamic/ComInterop/IDispatchComObject.cs
@@ -475,7 +475,7 @@ private static ComTypes.ITypeInfo GetCoClassTypeInfo(object rcw, ComTypes.ITypeI
         }
 
         private void EnsureScanDefinedMethods() {
-            if (_comTypeDesc != null && _comTypeDesc.Funcs != null) {
+            if (_comTypeDesc?.Funcs != null) {
                 return;
             }
 

diff --git a/Src/Microsoft.Dynamic/zlib.net/Inflate.cs b/Src/Microsoft.Dynamic/zlib.net/Inflate.cs
@@ -259,7 +259,7 @@ internal int inflate(ZStream z, FlushStrategy flush)
 		{
 		    int internalFlush = (int)flush;
 
-		    if (z == null || z.istate == null || z.next_in == null)
+		    if (z?.istate == null || z.next_in == null)
                 return (int)ZLibResultCode.Z_STREAM_ERROR;
 		    int res_temp = internalFlush == (int)FlushStrategy.Z_FINISH
 		        ? (int)ZLibResultCode.Z_BUF_ERROR
@@ -668,4 +668,4 @@ private IEnumerable<object> StartHeaderSkipping(ZStream z) {
             }
         }
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             private void EnsureScanDefinedMethods() {
-                if (_comTypeDesc != null && _comTypeDesc.Funcs != null) {
+                if (_comTypeDesc?.Funcs != null) {
                     return;
                 }
@@ Expand Down @@