From ee3a76bc67e7d8074e03d067779c61e2bda46a64 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 10 Jul 2018 23:31:20 +0200 Subject: [PATCH] Remove more dead code. --- ICSharpCode.Decompiler/CodeMappings.cs | 57 ------------- .../ICSharpCode.Decompiler.csproj | 2 - .../TypeSystem/TypeSystemExtensions.cs | 25 ------ ICSharpCode.Decompiler/Util/BitVector16.cs | 82 ------------------- 4 files changed, 166 deletions(-) delete mode 100644 ICSharpCode.Decompiler/CodeMappings.cs delete mode 100644 ICSharpCode.Decompiler/Util/BitVector16.cs diff --git a/ICSharpCode.Decompiler/CodeMappings.cs b/ICSharpCode.Decompiler/CodeMappings.cs deleted file mode 100644 index b2dcab862..000000000 --- a/ICSharpCode.Decompiler/CodeMappings.cs +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -using System; -using System.Collections.Generic; -using System.Linq; -using ICSharpCode.Decompiler.ILAst; -using ICSharpCode.NRefactory; -using Mono.Cecil; - -namespace ICSharpCode.Decompiler -{ - /// Maps method's source code to IL - public class MethodDebugSymbols - { - public MethodDefinition CecilMethod { get; set; } - public List LocalVariables { get; set; } - public List SequencePoints { get; set; } - public TextLocation StartLocation { get; set; } - public TextLocation EndLocation { get; set; } - - public MethodDebugSymbols(MethodDefinition methodDef) - { - this.CecilMethod = methodDef; - this.LocalVariables = new List(); - this.SequencePoints = new List(); - } - } - - public class SequencePoint - { - public ILRange[] ILRanges { get; set; } - public TextLocation StartLocation { get; set; } - public TextLocation EndLocation { get; set; } - public int ILOffset { get { return this.ILRanges[0].From; } } - - public override string ToString() - { - return string.Join(" ", this.ILRanges) + " " + this.StartLocation + "-" + this.EndLocation; - } - } -} diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index 73a735d84..ba9bdf7fe 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -503,7 +503,6 @@ - @@ -556,7 +555,6 @@ - diff --git a/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs b/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs index 0e254dd74..529d3a38d 100644 --- a/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs +++ b/ICSharpCode.Decompiler/TypeSystem/TypeSystemExtensions.cs @@ -290,31 +290,6 @@ namespace ICSharpCode.Decompiler.TypeSystem // contains nulls when there are resolve errors. #endregion - #region GetSubTypeDefinitions - public static IEnumerable GetSubTypeDefinitions (this IType baseType) - { - if (baseType == null) - throw new ArgumentNullException ("baseType"); - var def = baseType.GetDefinition (); - if (def == null) - return Enumerable.Empty (); - return def.GetSubTypeDefinitions (); - } - - /// - /// Gets all sub type definitions defined in a context. - /// - public static IEnumerable GetSubTypeDefinitions (this ITypeDefinition baseType) - { - if (baseType == null) - throw new ArgumentNullException ("baseType"); - foreach (var contextType in baseType.Compilation.GetAllTypeDefinitions ()) { - if (contextType.IsDerivedFrom (baseType)) - yield return contextType; - } - } - #endregion - #region IAssembly.GetTypeDefinition() /// /// Retrieves the specified type in this compilation. diff --git a/ICSharpCode.Decompiler/Util/BitVector16.cs b/ICSharpCode.Decompiler/Util/BitVector16.cs deleted file mode 100644 index 655cfdc11..000000000 --- a/ICSharpCode.Decompiler/Util/BitVector16.cs +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright (c) 2010-2013 AlphaSierraPapa for the SharpDevelop Team -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this -// software and associated documentation files (the "Software"), to deal in the Software -// without restriction, including without limitation the rights to use, copy, modify, merge, -// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or -// substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE -// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -using System; -using System.Globalization; - -namespace ICSharpCode.Decompiler.Util -{ - /// - /// Holds 16 boolean values. - /// - [Serializable] - public struct BitVector16 : IEquatable - { - ushort data; - - public bool this[ushort mask] { - get { return (data & mask) != 0; } - set { - if (value) - data |= mask; - else - data &= unchecked((ushort)~mask); - } - } - - public ushort Data { - get { return data; } - set { data = value; } - } - - #region Equals and GetHashCode implementation - public override bool Equals(object obj) - { - if (obj is BitVector16) - return Equals((BitVector16)obj); // use Equals method below - else - return false; - } - - public bool Equals(BitVector16 other) - { - return this.data == other.data; - } - - public override int GetHashCode() - { - return data; - } - - public static bool operator ==(BitVector16 left, BitVector16 right) - { - return left.data == right.data; - } - - public static bool operator !=(BitVector16 left, BitVector16 right) - { - return left.data != right.data; - } - #endregion - - public override string ToString() - { - return data.ToString("x4", CultureInfo.InvariantCulture); - } - } -}