Code cleanup

Author: Lamparter

IronPythonAnalyzer/IronPythonAnalyzer/IronPythonAnalyzerAnalyzer.cs

@@ -2,14 +2,10 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using System.Threading;
+
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 

Src/IronPython.Modules/IterTools.cs

@@ -8,16 +8,16 @@
 using System.Numerics;
 using System.Runtime.InteropServices;
 
-using Microsoft.Scripting;
-using Microsoft.Scripting.Runtime;
-using Microsoft.Scripting.Utils;
-
 using IronPython.Runtime;
 using IronPython.Runtime.Binding;
 using IronPython.Runtime.Exceptions;
 using IronPython.Runtime.Operations;
 using IronPython.Runtime.Types;
 
+using Microsoft.Scripting;
+using Microsoft.Scripting.Runtime;
+using Microsoft.Scripting.Utils;
+
 [assembly: PythonModule("itertools", typeof(IronPython.Modules.PythonIterTools))]
 namespace IronPython.Modules {
     public static class PythonIterTools {
@@ -219,7 +219,7 @@ private static void EnsureIterator(CodeContext/*!*/ context, object iter) {
                 if (iter == null ||
                     !PythonOps.HasAttr(context, iter, "__iter__") &&
                     !PythonOps.HasAttr(context, iter, "__getitem__")) {
-                        throw PythonOps.TypeError("'{0}' object is not iterable", PythonOps.GetPythonTypeName(iter));
+                    throw PythonOps.TypeError("'{0}' object is not iterable", PythonOps.GetPythonTypeName(iter));
                 }
             }
 
@@ -262,13 +262,13 @@ public count(BigInteger start) {
                 InnerEnumerator = BigIntYielder(this, start, 1);
             }
 
-            public count(int start=0, int step=1) {
+            public count(int start = 0, int step = 1) {
                 _curInt = start;
                 _step = step;
                 InnerEnumerator = IntYielder(this, start, step);
             }
 
-            public count([DefaultParameterValue(0)]int start, BigInteger step) {
+            public count([DefaultParameterValue(0)] int start, BigInteger step) {
                 _curInt = start;
                 _step = step;
                 InnerEnumerator = IntYielder(this, start, step);
@@ -286,7 +286,7 @@ public count(BigInteger start, BigInteger step) {
                 InnerEnumerator = BigIntYielder(this, start, step);
             }
 
-            public count(CodeContext/*!*/ context, [DefaultParameterValue(0)]object start, [DefaultParameterValue(1)]object step) {
+            public count(CodeContext/*!*/ context, [DefaultParameterValue(0)] object start, [DefaultParameterValue(1)] object step) {
                 EnsureNumeric(context, start);
                 EnsureNumeric(context, step);
                 _cur = start;
@@ -301,7 +301,7 @@ private static void EnsureNumeric(CodeContext/*!*/ context, object num) {
                 if (num == null ||
                     !PythonOps.HasAttr(context, num, "__int__") &&
                     !PythonOps.HasAttr(context, num, "__float__")) {
-                        throw PythonOps.TypeError("a number is required");
+                    throw PythonOps.TypeError("a number is required");
                 }
             }
 
@@ -517,9 +517,9 @@ private IEnumerator<object> Yielder(IEnumerator iter) {
                 if (MoveNextHelper(iter)) {
                     while (!_fFinished) {
                         while (PythonContext.Equal(GetKey(iter.Current), curKey)) {
-                            if (!MoveNextHelper(iter)) { 
-                                _fFinished = true; 
-                                yield break; 
+                            if (!MoveNextHelper(iter)) {
+                                _fFinished = true;
+                                yield break;
                             }
                         }
                         curKey = GetKey(iter.Current);
@@ -531,9 +531,9 @@ private IEnumerator<object> Yielder(IEnumerator iter) {
             private IEnumerator<object> Grouper(IEnumerator iter, object curKey) {
                 while (PythonContext.Equal(GetKey(iter.Current), curKey)) {
                     yield return iter.Current;
-                    if (!MoveNextHelper(iter)) { 
-                        _fFinished = true; 
-                        yield break; 
+                    if (!MoveNextHelper(iter)) {
+                        _fFinished = true;
+                        yield break;
                     }
                 }
             }
@@ -658,7 +658,7 @@ public zip_longest(params object[] iterables) {
                 }
             }
 
-            public zip_longest([ParamDictionary]IDictionary<object, object> paramDict, params object[] iterables) {
+            public zip_longest([ParamDictionary] IDictionary<object, object> paramDict, params object[] iterables) {
                 object fill;
 
                 if (paramDict.TryGetValue("fillvalue", out fill)) {
@@ -747,7 +747,7 @@ public product(CodeContext context, params object[] iterables) {
                 InnerEnumerator = Yielder(ArrayUtils.ConvertAll(iterables, x => new PythonList(context, PythonOps.GetEnumerator(x))));
             }
 
-            public product(CodeContext context, [ParamDictionary]IDictionary<object, object> paramDict, params object[] iterables) {
+            public product(CodeContext context, [ParamDictionary] IDictionary<object, object> paramDict, params object[] iterables) {
                 object repeat;
                 int iRepeat = 1;
                 if (paramDict.TryGetValue("repeat", out repeat)) {
@@ -970,7 +970,7 @@ public permutations(CodeContext context, object iterable) {
 
             public permutations(CodeContext context, object iterable, object r) {
                 _data = new PythonList(context, iterable);
-                
+
                 InnerEnumerator = Yielder(GetR(r, _data));
             }
 
@@ -1133,9 +1133,9 @@ IEnumerator IEnumerable.GetEnumerator() {
 
             #endregion
         }
-        
+
         [PythonType]
-        public class starmap : IterBase {            
+        public class starmap : IterBase {
             public starmap(CodeContext context, object function, object iterable) {
                 InnerEnumerator = Yielder(context, function, PythonOps.GetEnumerator(iterable));
             }
@@ -1194,7 +1194,7 @@ public void __setstate__(object state) {
 
             private IEnumerator<object> Yielder(object predicate, IEnumerator iter) {
                 while (MoveNextHelper(iter)) {
-                    if(!Converter.ConvertToBoolean(
+                    if (!Converter.ConvertToBoolean(
                         _context.LanguageContext.CallSplat(predicate, iter.Current)
                     )) {
                         break;

Src/IronPython.Modules/ModuleOps.cs

@@ -10,14 +10,13 @@
 using System.Numerics;
 using System.Runtime.InteropServices;
 
-using Microsoft.Scripting;
-using Microsoft.Scripting.Utils;
-
 using IronPython.Runtime;
 using IronPython.Runtime.Exceptions;
 using IronPython.Runtime.Operations;
 using IronPython.Runtime.Types;
 
+using Microsoft.Scripting.Utils;
+
 namespace IronPython.Modules {
     /// <summary>
     /// Provides helper functions which need to be called from generated code to implement various 
@@ -92,7 +91,7 @@ public static CTypes.CData CheckSimpleCDataType(object o, object type) {
             bool valid = true;
             // if we have an array, we can also send a pointer as long as the element types
             // for the pointer and array are the same
-            if(res != null && res.NativeType is CTypes.ArrayType at) {
+            if (res != null && res.NativeType is CTypes.ArrayType at) {
                 valid = ((type is CTypes.ArrayType t) && (t.ElementType == at.ElementType)) ||
                     ((type is CTypes.PointerType p) && (p._type == at.ElementType));
             }
@@ -109,7 +108,7 @@ public static CTypes.CData CheckSimpleCDataType(object o, object type) {
             if (res == null && PythonOps.TryGetBoundAttr(o, "_as_parameter_", out object asParam)) {
                 res = asParam as CTypes._CFuncPtr;
             }
-            
+
             if (res == null || res.NativeType != type) {
                 throw ArgumentError(type, ((PythonType)type).Name, o);
             }
@@ -297,14 +296,14 @@ public static IntPtr GetPointer(object value) {
             }
 
             if (value is int iVal) {
-                if(iVal > int.MaxValue) {
+                if (iVal > int.MaxValue) {
                     iVal = -1;
                 }
                 return new IntPtr(iVal);
             }
 
             if (value is BigInteger bigVal) {
-                if(bigVal > long.MaxValue) {
+                if (bigVal > long.MaxValue) {
                     bigVal = -1;
                 }
                 return new IntPtr((long)bigVal);

Src/IronPython.Modules/NtSignalState.cs

@@ -102,7 +102,7 @@ internal static class NativeSignal {
 
             [DllImport("Kernel32")]
             [return: MarshalAs(UnmanagedType.Bool)]
-            internal static extern bool SetConsoleCtrlHandler(WinSignalsHandler Handler, [MarshalAs(UnmanagedType.Bool)]bool Add);
+            internal static extern bool SetConsoleCtrlHandler(WinSignalsHandler Handler, [MarshalAs(UnmanagedType.Bool)] bool Add);
 
             [DllImport("Kernel32")]
             [return: MarshalAs(UnmanagedType.Bool)]

Src/IronPython.Modules/Properties/AssemblyInfo.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
 

Src/IronPython.Modules/ResourceMetaPathImporter.cs

@@ -3,9 +3,11 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+
 using IronPython.Runtime;
 using IronPython.Runtime.Exceptions;
 using IronPython.Zlib;
+
 using Microsoft.Scripting;
 using Microsoft.Scripting.Runtime;
 
@@ -131,8 +133,7 @@ public object load_module(CodeContext /*!*/ context, string fullname) {
             modules.Add(fullname, mod);
             try {
                 script.Run(mod.Scope);
-            }
-            catch (Exception) {
+            } catch (Exception) {
                 modules.Remove(fullname);
                 throw;
             }
@@ -175,8 +176,7 @@ private byte[] GetCodeFromData(CodeContext /*!*/ context, bool isbytecode, Packe
             if (data != null) {
                 if (isbytecode) {
                     // would put in code to unmarshal the bytecode here...                                     
-                }
-                else {
+                } else {
                     code = data;
                 }
             }
@@ -221,8 +221,8 @@ public static PackedResourceInfo Create(string fullName, int compress,
 #if DEBUG
             public override string ToString() {
                 var sizeDesc = String.Format("{0} bytes", _fileSize);
-                if (Convert.ToDouble(_fileSize)/1024.0 > 1.0)
-                    sizeDesc = String.Format("{0} KB", Math.Round(Convert.ToDouble(_fileSize)/1024.0, 1));
+                if (Convert.ToDouble(_fileSize) / 1024.0 > 1.0)
+                    sizeDesc = String.Format("{0} KB", Math.Round(Convert.ToDouble(_fileSize) / 1024.0, 1));
                 return String.Format("{0} ({1})", FullName, sizeDesc);
             }
 #endif
@@ -259,26 +259,25 @@ where isPyFile
                         let path = lineage.Take(lineage.Length - 1).ToArray()
                         orderby fileName
                         select new {
-                                       name = fileName,
-                                       path,
-                                       dottedPath = String.Join(".", path),
-                                       entry
-                                   };
+                            name = fileName,
+                            path,
+                            dottedPath = String.Join(".", path),
+                            entry
+                        };
                     var moduleContents =
                         from source in parsedSources
                         orderby source.dottedPath
                         group source by source.dottedPath
                         into moduleGroup
                         select new {
-                                       moduleGroup.Key,
-                                       Items = moduleGroup.Select(item => item.entry).ToArray()
-                                   };
+                            moduleGroup.Key,
+                            Items = moduleGroup.Select(item => item.entry).ToArray()
+                        };
                     modules = moduleContents.ToDictionary(
                         moduleGroup => moduleGroup.Key,
                         moduleGroup => moduleGroup.Items);
                     return true;
-                }
-                catch (Exception exception) {
+                } catch (Exception exception) {
                     files = null;
                     modules = null;
                     unpackingError = String.Format("{0}: {1}", exception.GetType().Name, exception.Message);
@@ -310,7 +309,7 @@ private bool ReadZipDirectory(out IDictionary<string, PackedResourceInfo> result
                         var endofCentralDir = new byte[22];
 
                         reader.BaseStream.Seek(-22, SeekOrigin.End);
-                        var headerPosition = (int) reader.BaseStream.Position;
+                        var headerPosition = (int)reader.BaseStream.Position;
                         if (reader.Read(endofCentralDir, 0, 22) != 22) {
                             unpackingError = "Can't read ZIP resource: Invalid ZIP Directory.";
                             return false;
@@ -332,8 +331,7 @@ private bool ReadZipDirectory(out IDictionary<string, PackedResourceInfo> result
                             .ToDictionary(entry => entry.FullName);
                         return true;
                     }
-                }
-                catch (Exception exception) {
+                } catch (Exception exception) {
                     unpackingError = String.Format("{0}: {1}", exception.GetType().Name, exception.Message);
                     return false;
                 }
@@ -410,21 +408,19 @@ public bool GetData(PackedResourceInfo tocEntry, out byte[] result, out string u
                         byte[] rawData;
                         try {
                             rawData = reader.ReadBytes(compress == 0 ? dataSize : dataSize + 1);
-                        }
-                        catch {
+                        } catch {
                             unpackingError = "Can't read data";
                             return false;
                         }
 
                         if (compress != 0) {
-                            rawData[dataSize] = (byte) 'Z';
+                            rawData[dataSize] = (byte)'Z';
                         }
 
                         result = compress == 0 ? rawData : ZlibModule.Decompress(rawData, -15);
                         return true;
                     }
-                }
-                catch (Exception exception) {
+                } catch (Exception exception) {
                     unpackingError = String.Format("{0}: {1}", exception.GetType().Name, exception.Message);
                     return false;
                 }

Src/IronPython.Modules/SimpleSignalState.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+
 using IronPython.Runtime;
 
 #if FEATURE_PROCESS
@@ -16,7 +14,7 @@ public SimpleSignalState(PythonContext pc)
 
             private void Console_CancelKeyPress(object sender, ConsoleCancelEventArgs e) {
                 int pySignal;
-                switch(e.SpecialKey) {
+                switch (e.SpecialKey) {
                     case ConsoleSpecialKey.ControlC:
                         pySignal = SIGINT;
                         break;
@@ -28,7 +26,7 @@ private void Console_CancelKeyPress(object sender, ConsoleCancelEventArgs e) {
                     default:
                         throw new InvalidOperationException("unreachable");
                 }
-                
+
                 lock (PySignalToPyHandler) {
                     if (PySignalToPyHandler[pySignal].GetType() == typeof(int)) {
                         int tempId = (int)PySignalToPyHandler[pySignal];