diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryBlock.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryBlock.cs index 28e0409479e7ea675a1dd38d54ada09717716edc..a431f4df192a1d0160d17898b72f0fbb14218581 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryBlock.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryBlock.cs @@ -11,28 +11,28 @@ namespace System.Reflection.Internal /// internal sealed class ByteArrayMemoryBlock : AbstractMemoryBlock { - private ByteArrayMemoryProvider provider; - private readonly int start; - private readonly int size; + private ByteArrayMemoryProvider _provider; + private readonly int _start; + private readonly int _size; internal ByteArrayMemoryBlock(ByteArrayMemoryProvider provider, int start, int size) { - this.provider = provider; - this.size = size; - this.start = start; + _provider = provider; + _size = size; + _start = start; } protected override void Dispose(bool disposing) { Debug.Assert(disposing); - provider = null; + _provider = null; } public unsafe override byte* Pointer { get { - return provider.Pointer + start; + return _provider.Pointer + _start; } } @@ -40,13 +40,13 @@ public override int Size { get { - return size; + return _size; } } public override ImmutableArray GetContent(int offset) { - return ImmutableArray.Create(provider.array, start + offset, size - offset); + return ImmutableArray.Create(_provider.array, _start + offset, _size - offset); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryProvider.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryProvider.cs index 8bfceeb0f4eca995dd43ef885cc1698d93a08797..1219291083198924c763171c3591b5d5e1cbd091 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryProvider.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ByteArrayMemoryProvider.cs @@ -12,7 +12,7 @@ namespace System.Reflection.Internal internal sealed class ByteArrayMemoryProvider : MemoryBlockProvider { internal readonly ImmutableArray array; - private StrongBox pinned; + private StrongBox _pinned; public ByteArrayMemoryProvider(ImmutableArray array) { @@ -26,10 +26,10 @@ public ByteArrayMemoryProvider(ImmutableArray array) protected override void Dispose(bool disposing) { - if (pinned != null) + if (_pinned != null) { - pinned.Value.Free(); - pinned = null; + _pinned.Value.Free(); + _pinned = null; } } @@ -56,19 +56,19 @@ public override Stream GetStream(out StreamConstraints constraints) { get { - if (pinned == null) + if (_pinned == null) { var newPinned = new StrongBox( GCHandle.Alloc(ImmutableByteArrayInterop.DangerousGetUnderlyingArray(array), GCHandleType.Pinned)); - if (Interlocked.CompareExchange(ref pinned, newPinned, null) != null) + if (Interlocked.CompareExchange(ref _pinned, newPinned, null) != null) { // another thread has already allocated the handle: newPinned.Value.Free(); } } - return (byte*)pinned.Value.AddrOfPinnedObject(); + return (byte*)_pinned.Value.AddrOfPinnedObject(); } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlock.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlock.cs index 08caa13ee38343b473f2003fa584623e332fc623..a775fdb445f66005d75483a972a8d96876f2a552 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlock.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlock.cs @@ -12,39 +12,39 @@ namespace System.Reflection.Internal internal unsafe sealed class ExternalMemoryBlock : AbstractMemoryBlock { // keeps the owner of the memory alive as long as the block is alive: - private readonly object memoryOwner; + private readonly object _memoryOwner; - private byte* buffer; - private int size; + private byte* _buffer; + private int _size; public ExternalMemoryBlock(object memoryOwner, byte* buffer, int size) { - this.memoryOwner = memoryOwner; - this.buffer = buffer; - this.size = size; + _memoryOwner = memoryOwner; + _buffer = buffer; + _size = size; } protected override void Dispose(bool disposing) { Debug.Assert(disposing); - this.buffer = null; - this.size = 0; + _buffer = null; + _size = 0; } public override byte* Pointer { - get { return this.buffer; } + get { return _buffer; } } public override int Size { - get { return this.size; } + get { return _size; } } public override ImmutableArray GetContent(int offset) { - var result = CreateImmutableArray((this.buffer + offset), this.size - offset); - GC.KeepAlive(memoryOwner); + var result = CreateImmutableArray((_buffer + offset), _size - offset); + GC.KeepAlive(_memoryOwner); return result; } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlockProvider.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlockProvider.cs index b077bf5114580e844127bb711aee3549c9fe49e5..ad300ffcf9596f5cfeee0e92bafe1d40249d35d5 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlockProvider.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/ExternalMemoryBlockProvider.cs @@ -11,32 +11,32 @@ namespace System.Reflection.Internal /// internal unsafe sealed class ExternalMemoryBlockProvider : MemoryBlockProvider { - private byte* memory; - private int size; + private byte* _memory; + private int _size; public unsafe ExternalMemoryBlockProvider(byte* memory, int size) { - this.memory = memory; - this.size = size; + _memory = memory; + _size = size; } public override int Size { get { - return size; + return _size; } } protected override AbstractMemoryBlock GetMemoryBlockImpl(int start, int size) { - return new ExternalMemoryBlock(this, memory + start, size); + return new ExternalMemoryBlock(this, _memory + start, size); } public override Stream GetStream(out StreamConstraints constraints) { - constraints = new StreamConstraints(null, 0, size); - return new ReadOnlyUnmanagedMemoryStream(memory, size); + constraints = new StreamConstraints(null, 0, _size); + return new ReadOnlyUnmanagedMemoryStream(_memory, _size); } protected override void Dispose(bool disposing) @@ -44,15 +44,15 @@ protected override void Dispose(bool disposing) Debug.Assert(disposing); // we don't own the memory, just null out the pointer. - memory = null; - size = 0; + _memory = null; + _size = 0; } public byte* Pointer { get { - return memory; + return _memory; } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/MemoryMappedFileBlock.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/MemoryMappedFileBlock.cs index bbf08112f7f2b70a358104eb2dc17efaf9bf6b18..90d15b478c6534ed4150ca1bd410347304e38f05 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/MemoryMappedFileBlock.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/MemoryMappedFileBlock.cs @@ -8,16 +8,16 @@ namespace System.Reflection.Internal { internal unsafe sealed class MemoryMappedFileBlock : AbstractMemoryBlock { - private readonly int size; - private IDisposable accessor; // MemoryMappedViewAccessor - private byte* pointer; - private SafeBuffer safeBuffer; + private readonly int _size; + private IDisposable _accessor; // MemoryMappedViewAccessor + private byte* _pointer; + private SafeBuffer _safeBuffer; internal unsafe MemoryMappedFileBlock(IDisposable accessor, int size) { - this.accessor = accessor; - this.pointer = MemoryMapLightUp.AcquirePointer(accessor, out safeBuffer); - this.size = size; + _accessor = accessor; + _pointer = MemoryMapLightUp.AcquirePointer(accessor, out _safeBuffer); + _size = size; } ~MemoryMappedFileBlock() @@ -27,29 +27,29 @@ internal unsafe MemoryMappedFileBlock(IDisposable accessor, int size) protected override void Dispose(bool disposing) { - if (safeBuffer != null) + if (_safeBuffer != null) { - safeBuffer.ReleasePointer(); - safeBuffer = null; + _safeBuffer.ReleasePointer(); + _safeBuffer = null; } - if (accessor != null) + if (_accessor != null) { - accessor.Dispose(); - accessor = null; + _accessor.Dispose(); + _accessor = null; } - pointer = null; + _pointer = null; } public override byte* Pointer { - get { return this.pointer; } + get { return _pointer; } } public override int Size { - get { return size; } + get { return _size; } } public override ImmutableArray GetContent(int offset) diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/NativeHeapMemoryBlock.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/NativeHeapMemoryBlock.cs index d39d1b95ccc2a8b2736b512a4d3396738a53e8a1..8c1b9790b938cd19dc6650ba073e8d1e401f35cc 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/NativeHeapMemoryBlock.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/NativeHeapMemoryBlock.cs @@ -14,13 +14,13 @@ namespace System.Reflection.Internal /// internal unsafe sealed class NativeHeapMemoryBlock : AbstractMemoryBlock { - private byte* pointer; - private readonly int size; + private byte* _pointer; + private readonly int _size; internal NativeHeapMemoryBlock(int size) { - this.pointer = (byte*)Marshal.AllocHGlobal(size); - this.size = size; + _pointer = (byte*)Marshal.AllocHGlobal(size); + _size = size; } ~NativeHeapMemoryBlock() @@ -30,23 +30,23 @@ internal NativeHeapMemoryBlock(int size) protected override void Dispose(bool disposing) { - Marshal.FreeHGlobal((IntPtr)pointer); - pointer = null; + Marshal.FreeHGlobal((IntPtr)_pointer); + _pointer = null; } public override byte* Pointer { - get { return pointer; } + get { return _pointer; } } public override int Size { - get { return size; } + get { return _size; } } public override ImmutableArray GetContent(int offset) { - var result = CreateImmutableArray(this.pointer + offset, this.size - offset); + var result = CreateImmutableArray(_pointer + offset, _size - offset); GC.KeepAlive(this); return result; } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/StreamMemoryBlockProvider.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/StreamMemoryBlockProvider.cs index c8c32acad42ec8f927bbfc2d5a8ebebb84cdc642..356d5612280bb14ed7b463f3c456858ea89e656a 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/StreamMemoryBlockProvider.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/MemoryBlocks/StreamMemoryBlockProvider.cs @@ -22,45 +22,45 @@ internal sealed class StreamMemoryBlockProvider : MemoryBlockProvider // The stream is user specified and might not be thread-safe. // Any read from the stream must be protected by streamGuard. - private Stream stream; - private readonly object streamGuard; + private Stream _stream; + private readonly object _streamGuard; - private readonly bool leaveOpen; - private bool useMemoryMap; - private readonly bool isFileStream; + private readonly bool _leaveOpen; + private bool _useMemoryMap; + private readonly bool _isFileStream; - private readonly long imageStart; - private readonly int imageSize; + private readonly long _imageStart; + private readonly int _imageSize; // MemoryMappedFile - private IDisposable lazyMemoryMap; + private IDisposable _lazyMemoryMap; public StreamMemoryBlockProvider(Stream stream, long imageStart, int imageSize, bool isFileStream, bool leaveOpen) { Debug.Assert(stream.CanSeek && stream.CanRead); - this.stream = stream; - this.streamGuard = new object(); - this.imageStart = imageStart; - this.imageSize = imageSize; - this.leaveOpen = leaveOpen; - this.isFileStream = isFileStream; - this.useMemoryMap = isFileStream && MemoryMapLightUp.IsAvailable; + _stream = stream; + _streamGuard = new object(); + _imageStart = imageStart; + _imageSize = imageSize; + _leaveOpen = leaveOpen; + _isFileStream = isFileStream; + _useMemoryMap = isFileStream && MemoryMapLightUp.IsAvailable; } protected override void Dispose(bool disposing) { Debug.Assert(disposing); - if (!leaveOpen && stream != null) + if (!_leaveOpen && _stream != null) { - stream.Dispose(); - stream = null; + _stream.Dispose(); + _stream = null; } - if (lazyMemoryMap != null) + if (_lazyMemoryMap != null) { - lazyMemoryMap.Dispose(); - lazyMemoryMap = null; + _lazyMemoryMap.Dispose(); + _lazyMemoryMap = null; } } @@ -68,7 +68,7 @@ public override int Size { get { - return this.imageSize; + return _imageSize; } } @@ -101,9 +101,9 @@ internal static unsafe NativeHeapMemoryBlock ReadMemoryBlockNoLock(Stream stream /// Error while reading from the stream. protected override AbstractMemoryBlock GetMemoryBlockImpl(int start, int size) { - long absoluteStart = this.imageStart + start; + long absoluteStart = _imageStart + start; - if (useMemoryMap && size > MemoryMapThreshold) + if (_useMemoryMap && size > MemoryMapThreshold) { IDisposable accessor; if (TryCreateMemoryMapAccessor(absoluteStart, size, out accessor)) @@ -111,32 +111,32 @@ protected override AbstractMemoryBlock GetMemoryBlockImpl(int start, int size) return new MemoryMappedFileBlock(accessor, size); } - useMemoryMap = false; + _useMemoryMap = false; } - lock (streamGuard) + lock (_streamGuard) { - return ReadMemoryBlockNoLock(stream, isFileStream, absoluteStart, size); + return ReadMemoryBlockNoLock(_stream, _isFileStream, absoluteStart, size); } } public override Stream GetStream(out StreamConstraints constraints) { - constraints = new StreamConstraints(streamGuard, imageStart, imageSize); - return this.stream; + constraints = new StreamConstraints(_streamGuard, _imageStart, _imageSize); + return _stream; } private bool TryCreateMemoryMapAccessor(long start, int size, out IDisposable accessor) { - if (lazyMemoryMap == null) + if (_lazyMemoryMap == null) { // leave the underlying stream open. It will be closed by the Dispose method. IDisposable newMemoryMap; // CreateMemoryMap might modify the stream (calls FileStream.Flush) - lock (this.streamGuard) + lock (_streamGuard) { - newMemoryMap = MemoryMapLightUp.CreateMemoryMap(this.stream); + newMemoryMap = MemoryMapLightUp.CreateMemoryMap(_stream); } if (newMemoryMap == null) @@ -145,13 +145,13 @@ private bool TryCreateMemoryMapAccessor(long start, int size, out IDisposable ac return false; } - if (Interlocked.CompareExchange(ref lazyMemoryMap, newMemoryMap, null) != null) + if (Interlocked.CompareExchange(ref _lazyMemoryMap, newMemoryMap, null) != null) { newMemoryMap.Dispose(); } } - accessor = MemoryMapLightUp.CreateViewAccessor(lazyMemoryMap, start, size); + accessor = MemoryMapLightUp.CreateViewAccessor(_lazyMemoryMap, start, size); return accessor != null; } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/EncodingHelper.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/EncodingHelper.cs index efc77fc4c40ac370c992f50726a47db79134f76e..711ab92f0aed091dc3e8b62d63e41d2739a95ddc 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/EncodingHelper.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/EncodingHelper.cs @@ -55,7 +55,7 @@ internal unsafe static class EncodingHelper // The pooled buffers for (2) and (3) above. Use AcquireBuffer(int) and ReleaseBuffer(byte[]) // instead of the pool directly to implement the size check. - private static readonly ObjectPool pool = new ObjectPool(() => new byte[PooledBufferSize]); + private static readonly ObjectPool s_pool = new ObjectPool(() => new byte[PooledBufferSize]); public static string DecodeUtf8(byte* bytes, int byteCount, byte[] prefix, MetadataStringDecoder utf8Decoder) { @@ -107,14 +107,14 @@ private static byte[] AcquireBuffer(int byteCount) return new byte[byteCount]; } - return pool.Allocate(); + return s_pool.Allocate(); } private static void ReleaseBuffer(byte[] buffer) { if (buffer.Length == PooledBufferSize) { - pool.Free(buffer); + s_pool.Free(buffer); } } @@ -125,18 +125,18 @@ private static void ReleaseBuffer(byte[] buffer) internal delegate string Encoding_GetString(Encoding encoding, byte* bytes, int byteCount); // only internal for test hook private delegate string String_CreateStringFromEncoding(byte* bytes, int byteCount, Encoding encoding); - private static Encoding_GetString getStringPlatform = LoadGetStringPlatform(); // only non-readonly for test hook + private static Encoding_GetString s_getStringPlatform = LoadGetStringPlatform(); // only non-readonly for test hook public static string GetString(this Encoding encoding, byte* bytes, int byteCount) { Debug.Assert(encoding != null); - if (getStringPlatform == null) + if (s_getStringPlatform == null) { return GetStringPortable(encoding, bytes, byteCount); } - return getStringPlatform(encoding, bytes, byteCount); + return s_getStringPlatform(encoding, bytes, byteCount); } private static unsafe string GetStringPortable(Encoding encoding, byte* bytes, int byteCount) @@ -266,8 +266,8 @@ private static Encoding_GetString LoadGetStringPlatform() // Test hook to force portable implementation and ensure light is functioning. internal static bool TestOnly_LightUpEnabled { - get { return getStringPlatform != null; } - set { getStringPlatform = value ? LoadGetStringPlatform() : null; } + get { return s_getStringPlatform != null; } + set { s_getStringPlatform = value ? LoadGetStringPlatform() : null; } } #endregion } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ImmutableMemoryStream.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ImmutableMemoryStream.cs index 8ce4c6514519fc14a6c3c1ec66f6476ba25640eb..0ce387b2a7d3b7557f242942cee561512d753a20 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ImmutableMemoryStream.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ImmutableMemoryStream.cs @@ -9,18 +9,18 @@ namespace System.Reflection.Internal { internal sealed class ImmutableMemoryStream : Stream { - private readonly ImmutableArray array; - private int position; + private readonly ImmutableArray _array; + private int _position; internal ImmutableMemoryStream(ImmutableArray array) { Debug.Assert(!array.IsDefault); - this.array = array; + _array = array; } public ImmutableArray GetBuffer() { - return array; + return _array; } public override bool CanRead @@ -40,23 +40,23 @@ public override bool CanWrite public override long Length { - get { return array.Length; } + get { return _array.Length; } } public override long Position { get { - return position; + return _position; } set { - if (value < 0 || value >= array.Length) + if (value < 0 || value >= _array.Length) { throw new ArgumentOutOfRangeException("value"); } - position = (int)value; + _position = (int)value; } } @@ -66,9 +66,9 @@ public override void Flush() public override int Read(byte[] buffer, int offset, int count) { - int result = Math.Min(count, array.Length - position); - array.CopyTo(position, buffer, offset, result); - position += result; + int result = Math.Min(count, _array.Length - _position); + _array.CopyTo(_position, buffer, offset, result); + _position += result; return result; } @@ -84,11 +84,11 @@ public override long Seek(long offset, SeekOrigin origin) break; case SeekOrigin.Current: - target = checked(offset + position); + target = checked(offset + _position); break; case SeekOrigin.End: - target = checked(offset + array.Length); + target = checked(offset + _array.Length); break; default: @@ -100,12 +100,12 @@ public override long Seek(long offset, SeekOrigin origin) throw new ArgumentOutOfRangeException("offset"); } - if (target < 0 || target >= array.Length) + if (target < 0 || target >= _array.Length) { throw new ArgumentOutOfRangeException("offset"); } - position = (int)target; + _position = (int)target; return target; } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/MemoryMapLightUp.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/MemoryMapLightUp.cs index fd12487ffa6a6c882a05b5b68e5d22a16a24096d..17dbd102cad19a772e95e66f8f25ae0788a9a27c 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/MemoryMapLightUp.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/MemoryMapLightUp.cs @@ -11,38 +11,38 @@ namespace System.Reflection.Internal { internal static class MemoryMapLightUp { - private static Type lazyMemoryMappedFileType; - private static Type lazyMemoryMappedViewAccessorType; - private static Type lazyMemoryMappedFileAccessType; - private static Type lazyMemoryMappedFileSecurityType; - private static Type lazyHandleInheritabilityType; - private static MethodInfo lazyCreateFromFile; - private static MethodInfo lazyCreateViewAccessor; - private static PropertyInfo lazySafeMemoryMappedViewHandle; - private static PropertyInfo lazyPointerOffset; - private static FieldInfo lazyInternalViewField; - private static PropertyInfo lazyInternalPointerOffset; - - private static readonly object MemoryMappedFileAccess_Read = 1; - private static readonly object HandleInheritability_None = 0; - private static readonly object LongZero = (long)0; - private static readonly object True = true; + private static Type s_lazyMemoryMappedFileType; + private static Type s_lazyMemoryMappedViewAccessorType; + private static Type s_lazyMemoryMappedFileAccessType; + private static Type s_lazyMemoryMappedFileSecurityType; + private static Type s_lazyHandleInheritabilityType; + private static MethodInfo s_lazyCreateFromFile; + private static MethodInfo s_lazyCreateViewAccessor; + private static PropertyInfo s_lazySafeMemoryMappedViewHandle; + private static PropertyInfo s_lazyPointerOffset; + private static FieldInfo s_lazyInternalViewField; + private static PropertyInfo s_lazyInternalPointerOffset; + + private static readonly object s_MemoryMappedFileAccess_Read = 1; + private static readonly object s_HandleInheritability_None = 0; + private static readonly object s_LongZero = (long)0; + private static readonly object s_True = true; // test only: internal static bool Test450Compat; - private static bool? lazyIsAvailable; + private static bool? s_lazyIsAvailable; internal static bool IsAvailable { get { - if (!lazyIsAvailable.HasValue) + if (!s_lazyIsAvailable.HasValue) { - lazyIsAvailable = TryLoadTypes(); + s_lazyIsAvailable = TryLoadTypes(); } - return lazyIsAvailable.Value; + return s_lazyIsAvailable.Value; } } @@ -65,67 +65,67 @@ private static bool TryLoadTypes() const string SystemCoreRef = "System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; return FileStreamReadLightUp.FileStreamType.Value != null - && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedFile, " + SystemCoreRef, out lazyMemoryMappedFileType) - && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedViewAccessor, " + SystemCoreRef, out lazyMemoryMappedViewAccessorType) - && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedFileAccess, " + SystemCoreRef, out lazyMemoryMappedFileAccessType) - && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedFileSecurity, " + SystemCoreRef, out lazyMemoryMappedFileSecurityType) - && TryLoadType("System.IO.HandleInheritability, " + SystemCoreRef, out lazyHandleInheritabilityType) + && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedFile, " + SystemCoreRef, out s_lazyMemoryMappedFileType) + && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedViewAccessor, " + SystemCoreRef, out s_lazyMemoryMappedViewAccessorType) + && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedFileAccess, " + SystemCoreRef, out s_lazyMemoryMappedFileAccessType) + && TryLoadType("System.IO.MemoryMappedFiles.MemoryMappedFileSecurity, " + SystemCoreRef, out s_lazyMemoryMappedFileSecurityType) + && TryLoadType("System.IO.HandleInheritability, " + SystemCoreRef, out s_lazyHandleInheritabilityType) && TryLoadMembers(); } private static bool TryLoadMembers() { - lazyCreateFromFile = - (from m in lazyMemoryMappedFileType.GetTypeInfo().GetDeclaredMethods("CreateFromFile") + s_lazyCreateFromFile = + (from m in s_lazyMemoryMappedFileType.GetTypeInfo().GetDeclaredMethods("CreateFromFile") let ps = m.GetParameters() where ps.Length == 7 && ps[0].ParameterType == FileStreamReadLightUp.FileStreamType.Value && ps[1].ParameterType == typeof(string) && ps[2].ParameterType == typeof(long) && - ps[3].ParameterType == lazyMemoryMappedFileAccessType && - ps[4].ParameterType == lazyMemoryMappedFileSecurityType && - ps[5].ParameterType == lazyHandleInheritabilityType && + ps[3].ParameterType == s_lazyMemoryMappedFileAccessType && + ps[4].ParameterType == s_lazyMemoryMappedFileSecurityType && + ps[5].ParameterType == s_lazyHandleInheritabilityType && ps[6].ParameterType == typeof(bool) select m).SingleOrDefault(); - if (lazyCreateFromFile == null) + if (s_lazyCreateFromFile == null) { return false; } - lazyCreateViewAccessor = - (from m in lazyMemoryMappedFileType.GetTypeInfo().GetDeclaredMethods("CreateViewAccessor") + s_lazyCreateViewAccessor = + (from m in s_lazyMemoryMappedFileType.GetTypeInfo().GetDeclaredMethods("CreateViewAccessor") let ps = m.GetParameters() where ps.Length == 3 && ps[0].ParameterType == typeof(long) && ps[1].ParameterType == typeof(long) && - ps[2].ParameterType == lazyMemoryMappedFileAccessType + ps[2].ParameterType == s_lazyMemoryMappedFileAccessType select m).SingleOrDefault(); - if (lazyCreateViewAccessor == null) + if (s_lazyCreateViewAccessor == null) { return false; } - lazySafeMemoryMappedViewHandle = lazyMemoryMappedViewAccessorType.GetTypeInfo().GetDeclaredProperty("SafeMemoryMappedViewHandle"); - if (lazySafeMemoryMappedViewHandle == null) + s_lazySafeMemoryMappedViewHandle = s_lazyMemoryMappedViewAccessorType.GetTypeInfo().GetDeclaredProperty("SafeMemoryMappedViewHandle"); + if (s_lazySafeMemoryMappedViewHandle == null) { return false; } // Available on FW >= 4.5.1: - lazyPointerOffset = Test450Compat ? null : lazyMemoryMappedViewAccessorType.GetTypeInfo().GetDeclaredProperty("PointerOffset"); - if (lazyPointerOffset == null) + s_lazyPointerOffset = Test450Compat ? null : s_lazyMemoryMappedViewAccessorType.GetTypeInfo().GetDeclaredProperty("PointerOffset"); + if (s_lazyPointerOffset == null) { // FW < 4.5.1 - lazyInternalViewField = lazyMemoryMappedViewAccessorType.GetTypeInfo().GetDeclaredField("m_view"); - if (lazyInternalViewField == null) + s_lazyInternalViewField = s_lazyMemoryMappedViewAccessorType.GetTypeInfo().GetDeclaredField("m_view"); + if (s_lazyInternalViewField == null) { return false; } - lazyInternalPointerOffset = lazyInternalViewField.FieldType.GetTypeInfo().GetDeclaredProperty("PointerOffset"); - if (lazyInternalPointerOffset == null) + s_lazyInternalPointerOffset = s_lazyInternalViewField.FieldType.GetTypeInfo().GetDeclaredProperty("PointerOffset"); + if (s_lazyInternalPointerOffset == null) { return false; } @@ -136,24 +136,24 @@ private static bool TryLoadMembers() internal static IDisposable CreateMemoryMap(Stream stream) { - Debug.Assert(lazyIsAvailable.GetValueOrDefault()); + Debug.Assert(s_lazyIsAvailable.GetValueOrDefault()); try { - return (IDisposable)lazyCreateFromFile.Invoke(null, new object[7] + return (IDisposable)s_lazyCreateFromFile.Invoke(null, new object[7] { stream, // fileStream null, // mapName - LongZero, // capacity - MemoryMappedFileAccess_Read, // access + s_LongZero, // capacity + s_MemoryMappedFileAccess_Read, // access null, // memoryMappedFileSecurity - HandleInheritability_None, // inheritability - True, // leaveOpen + s_HandleInheritability_None, // inheritability + s_True, // leaveOpen }); } catch (MemberAccessException) { - lazyIsAvailable = false; + s_lazyIsAvailable = false; return null; } catch (TargetInvocationException ex) @@ -165,19 +165,19 @@ internal static IDisposable CreateMemoryMap(Stream stream) internal static IDisposable CreateViewAccessor(object memoryMap, long start, int size) { - Debug.Assert(lazyIsAvailable.GetValueOrDefault()); + Debug.Assert(s_lazyIsAvailable.GetValueOrDefault()); try { - return (IDisposable)lazyCreateViewAccessor.Invoke(memoryMap, new object[3] + return (IDisposable)s_lazyCreateViewAccessor.Invoke(memoryMap, new object[3] { start, // start (long)size, // size - MemoryMappedFileAccess_Read, // access + s_MemoryMappedFileAccess_Read, // access }); } catch (MemberAccessException) { - lazyIsAvailable = false; + s_lazyIsAvailable = false; return null; } catch (TargetInvocationException ex) @@ -189,22 +189,22 @@ internal static IDisposable CreateViewAccessor(object memoryMap, long start, int internal unsafe static byte* AcquirePointer(object accessor, out SafeBuffer safeBuffer) { - Debug.Assert(lazyIsAvailable.GetValueOrDefault()); + Debug.Assert(s_lazyIsAvailable.GetValueOrDefault()); - safeBuffer = (SafeBuffer)lazySafeMemoryMappedViewHandle.GetValue(accessor); + safeBuffer = (SafeBuffer)s_lazySafeMemoryMappedViewHandle.GetValue(accessor); byte* ptr = null; safeBuffer.AcquirePointer(ref ptr); long offset; - if (lazyPointerOffset != null) + if (s_lazyPointerOffset != null) { - offset = (long)lazyPointerOffset.GetValue(accessor); + offset = (long)s_lazyPointerOffset.GetValue(accessor); } else { - object internalView = lazyInternalViewField.GetValue(accessor); - offset = (long)lazyInternalPointerOffset.GetValue(internalView); + object internalView = s_lazyInternalViewField.GetValue(accessor); + offset = (long)s_lazyInternalPointerOffset.GetValue(internalView); } return ptr + offset; diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ObjectPool`1.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ObjectPool`1.cs index 6b844f6cd448808ea1a1496fbb90ac434c032680..8fd87a4034af89b20c2a4debfdf3540841bdf2ea 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ObjectPool`1.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ObjectPool`1.cs @@ -30,12 +30,12 @@ private struct Element } // storage for the pool objects. - private readonly Element[] items; + private readonly Element[] _items; // factory is stored for the lifetime of the pool. We will call this only when pool needs to // expand. compared to "new T()", Func gives more flexibility to implementers and faster // than "new T()". - private readonly Func factory; + private readonly Func _factory; internal ObjectPool(Func factory) @@ -44,13 +44,13 @@ internal ObjectPool(Func factory) internal ObjectPool(Func factory, int size) { - this.factory = factory; - this.items = new Element[size]; + _factory = factory; + _items = new Element[size]; } private T CreateInstance() { - var inst = factory(); + var inst = _factory(); return inst; } @@ -64,7 +64,7 @@ private T CreateInstance() /// internal T Allocate() { - var items = this.items; + var items = _items; T inst; for (int i = 0; i < items.Length; i++) @@ -98,7 +98,7 @@ internal T Allocate() /// internal void Free(T obj) { - var items = this.items; + var items = _items; for (int i = 0; i < items.Length; i++) { if (items[i].Value == null) diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ReadOnlyUnmanagedMemoryStream.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ReadOnlyUnmanagedMemoryStream.cs index dd48b3d523c95d09527abc16c6ec1f9348d8e2c9..ec5b7e32867f1475283361b1a5d168ae1f1b4fb4 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ReadOnlyUnmanagedMemoryStream.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/ReadOnlyUnmanagedMemoryStream.cs @@ -8,31 +8,31 @@ namespace System.Reflection.Internal { internal unsafe sealed class ReadOnlyUnmanagedMemoryStream : Stream { - private readonly byte* data; - private readonly int length; - private int position; + private readonly byte* _data; + private readonly int _length; + private int _position; public ReadOnlyUnmanagedMemoryStream(byte* data, int length) { - this.data = data; - this.length = length; + _data = data; + _length = length; } public unsafe override int ReadByte() { - if (position == length) + if (_position == _length) { return -1; } - return data[position++]; + return _data[_position++]; } public override int Read(byte[] buffer, int offset, int count) { - int bytesRead = Math.Min(count, length - position); - Marshal.Copy((IntPtr)(this.data + this.position), buffer, offset, bytesRead); - this.position += bytesRead; + int bytesRead = Math.Min(count, _length - _position); + Marshal.Copy((IntPtr)(_data + _position), buffer, offset, bytesRead); + _position += bytesRead; return bytesRead; } @@ -68,7 +68,7 @@ public override long Length { get { - return length; + return _length; } } @@ -76,7 +76,7 @@ public override long Position { get { - return position; + return _position; } set @@ -97,11 +97,11 @@ public override long Seek(long offset, SeekOrigin origin) break; case SeekOrigin.Current: - target = checked(offset + position); + target = checked(offset + _position); break; case SeekOrigin.End: - target = checked(offset + length); + target = checked(offset + _length); break; default: @@ -113,12 +113,12 @@ public override long Seek(long offset, SeekOrigin origin) throw new ArgumentOutOfRangeException("offset"); } - if (target < 0 || target >= length) + if (target < 0 || target >= _length) { throw new ArgumentOutOfRangeException("offset"); } - position = (int)target; + _position = (int)target; return target; } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyDefinition.cs index 47979b8b692c096e154190c98e1e42855beb1e03..4ad0ea87e68ecb1592a747386fa9a767c7692e07 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyDefinition.cs @@ -7,12 +7,12 @@ namespace System.Reflection.Metadata { public struct AssemblyDefinition { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; internal AssemblyDefinition(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; + _reader = reader; } private Handle Handle @@ -27,7 +27,7 @@ public AssemblyHashAlgorithm HashAlgorithm { get { - return reader.AssemblyTable.GetHashAlgorithm(); + return _reader.AssemblyTable.GetHashAlgorithm(); } } @@ -35,7 +35,7 @@ public Version Version { get { - return reader.AssemblyTable.GetVersion(); + return _reader.AssemblyTable.GetVersion(); } } @@ -43,7 +43,7 @@ public AssemblyFlags Flags { get { - return reader.AssemblyTable.GetFlags(); + return _reader.AssemblyTable.GetFlags(); } } @@ -51,7 +51,7 @@ public StringHandle Name { get { - return reader.AssemblyTable.GetName(); + return _reader.AssemblyTable.GetName(); } } @@ -59,7 +59,7 @@ public StringHandle Culture { get { - return reader.AssemblyTable.GetCulture(); + return _reader.AssemblyTable.GetCulture(); } } @@ -67,18 +67,18 @@ public BlobHandle PublicKey { get { - return reader.AssemblyTable.GetPublicKey(); + return _reader.AssemblyTable.GetPublicKey(); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } public DeclarativeSecurityAttributeHandleCollection GetDeclarativeSecurityAttributes() { - return new DeclarativeSecurityAttributeHandleCollection(reader, Handle); + return new DeclarativeSecurityAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyFile.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyFile.cs index 81af0657a910df9d56b4083879c2c99698c17c67..5d51f06cc5f4e9213160d11b24e235e91ec39c83 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyFile.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyFile.cs @@ -7,23 +7,23 @@ namespace System.Reflection.Metadata { public struct AssemblyFile { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal AssemblyFile(MetadataReader reader, AssemblyFileHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private AssemblyFileHandle Handle { - get { return AssemblyFileHandle.FromRowId(rowId); } + get { return AssemblyFileHandle.FromRowId(_rowId); } } /// @@ -34,7 +34,7 @@ private AssemblyFileHandle Handle /// public bool ContainsMetadata { - get { return reader.FileTable.GetFlags(Handle) == 0; } + get { return _reader.FileTable.GetFlags(Handle) == 0; } } /// @@ -45,7 +45,7 @@ public bool ContainsMetadata /// public StringHandle Name { - get { return reader.FileTable.GetName(Handle); } + get { return _reader.FileTable.GetName(Handle); } } /// @@ -56,12 +56,12 @@ public StringHandle Name /// public BlobHandle HashValue { - get { return reader.FileTable.GetHashValue(Handle); } + get { return _reader.FileTable.GetHashValue(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyReference.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyReference.cs index 3a9eaa5573e7de0cb03b9e11e9b73f4c63eb5163..2df4def981b67302ac21b8eb10846289d6944084 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyReference.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/AssemblyReference.cs @@ -8,13 +8,13 @@ namespace System.Reflection.Metadata { public struct AssemblyReference { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use raw uint. - private readonly uint treatmentAndRowId; + private readonly uint _treatmentAndRowId; - private static readonly Version version_1_1_0_0 = new Version(1, 1, 0, 0); - private static readonly Version version_4_0_0_0 = new Version(4, 0, 0, 0); + private static readonly Version s_version_1_1_0_0 = new Version(1, 1, 0, 0); + private static readonly Version s_version_4_0_0_0 = new Version(4, 0, 0, 0); internal AssemblyReference(MetadataReader reader, uint treatmentAndRowId) { @@ -24,18 +24,18 @@ internal AssemblyReference(MetadataReader reader, uint treatmentAndRowId) // only virtual bit can be set in highest byte: Debug.Assert((treatmentAndRowId & ~(TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0); - this.reader = reader; - this.treatmentAndRowId = treatmentAndRowId; + _reader = reader; + _treatmentAndRowId = treatmentAndRowId; } private uint RowId { - get { return treatmentAndRowId & TokenTypeIds.RIDMask; } + get { return _treatmentAndRowId & TokenTypeIds.RIDMask; } } private bool IsVirtual { - get { return (treatmentAndRowId & TokenTypeIds.VirtualTokenMask) != 0; } + get { return (_treatmentAndRowId & TokenTypeIds.VirtualTokenMask) != 0; } } public Version Version @@ -48,12 +48,12 @@ public Version Version } // change mscorlib version: - if (RowId == reader.WinMDMscorlibRef) + if (RowId == _reader.WinMDMscorlibRef) { - return version_4_0_0_0; + return s_version_4_0_0_0; } - return reader.AssemblyRefTable.GetVersion(RowId); + return _reader.AssemblyRefTable.GetVersion(RowId); } } @@ -66,7 +66,7 @@ public AssemblyFlags Flags return GetVirtualFlags(); } - return reader.AssemblyRefTable.GetFlags(RowId); + return _reader.AssemblyRefTable.GetFlags(RowId); } } @@ -79,7 +79,7 @@ public StringHandle Name return GetVirtualName(); } - return reader.AssemblyRefTable.GetName(RowId); + return _reader.AssemblyRefTable.GetName(RowId); } } @@ -92,7 +92,7 @@ public StringHandle Culture return GetVirtualCulture(); } - return reader.AssemblyRefTable.GetCulture(RowId); + return _reader.AssemblyRefTable.GetCulture(RowId); } } @@ -105,7 +105,7 @@ public BlobHandle PublicKeyOrToken return GetVirtualPublicKeyOrToken(); } - return reader.AssemblyRefTable.GetPublicKeyOrToken(RowId); + return _reader.AssemblyRefTable.GetPublicKeyOrToken(RowId); } } @@ -118,7 +118,7 @@ public BlobHandle HashValue return GetVirtualHashValue(); } - return reader.AssemblyRefTable.GetHashValue(RowId); + return _reader.AssemblyRefTable.GetHashValue(RowId); } } @@ -129,7 +129,7 @@ public CustomAttributeHandleCollection GetCustomAttributes() return GetVirtualCustomAttributes(); } - return new CustomAttributeHandleCollection(reader, AssemblyReferenceHandle.FromRowId(RowId)); + return new CustomAttributeHandleCollection(_reader, AssemblyReferenceHandle.FromRowId(RowId)); } #region Virtual Rows @@ -138,16 +138,16 @@ private Version GetVirtualVersion() switch ((AssemblyReferenceHandle.VirtualIndex)RowId) { case AssemblyReferenceHandle.VirtualIndex.System_Numerics_Vectors: - return version_1_1_0_0; + return s_version_1_1_0_0; default: - return version_4_0_0_0; + return s_version_4_0_0_0; } } private AssemblyFlags GetVirtualFlags() { // use flags from mscorlib ref (specifically PublicKey flag): - return reader.AssemblyRefTable.GetFlags(reader.WinMDMscorlibRef); + return _reader.AssemblyRefTable.GetFlags(_reader.WinMDMscorlibRef); } private StringHandle GetVirtualName() @@ -194,11 +194,11 @@ private BlobHandle GetVirtualPublicKeyOrToken() case AssemblyReferenceHandle.VirtualIndex.System_Runtime_WindowsRuntime: case AssemblyReferenceHandle.VirtualIndex.System_Runtime_WindowsRuntime_UI_Xaml: // use key or token from mscorlib ref: - return reader.AssemblyRefTable.GetPublicKeyOrToken(reader.WinMDMscorlibRef); + return _reader.AssemblyRefTable.GetPublicKeyOrToken(_reader.WinMDMscorlibRef); default: // use contract assembly key or token: - var hasFullKey = (reader.AssemblyRefTable.GetFlags(reader.WinMDMscorlibRef) & AssemblyFlags.PublicKey) != 0; + var hasFullKey = (_reader.AssemblyRefTable.GetFlags(_reader.WinMDMscorlibRef) & AssemblyFlags.PublicKey) != 0; return BlobHandle.FromVirtualIndex(hasFullKey ? BlobHandle.VirtualIndex.ContractPublicKey : BlobHandle.VirtualIndex.ContractPublicKeyToken, 0); } } @@ -211,7 +211,7 @@ private BlobHandle GetVirtualHashValue() private CustomAttributeHandleCollection GetVirtualCustomAttributes() { // return custom attributes applied on mscorlib ref - return new CustomAttributeHandleCollection(reader, AssemblyReferenceHandle.FromRowId(reader.WinMDMscorlibRef)); + return new CustomAttributeHandleCollection(_reader, AssemblyReferenceHandle.FromRowId(_reader.WinMDMscorlibRef)); } #endregion } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobReader.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobReader.cs index 2696418b25c155f1db69c8b9e93261bc57a65312..6eda985652e26e1c4e7dd2265ac30d1a96ea80db 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobReader.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobReader.cs @@ -13,15 +13,15 @@ public unsafe struct BlobReader { /// An array containing the '\0' character. private static readonly char[] _nullCharArray = new char[1] { '\0' }; - + internal const int InvalidCompressedInteger = Int32.MaxValue; - private readonly MemoryBlock block; + private readonly MemoryBlock _block; // Points right behind the last byte of the block. - private readonly byte* endPointer; + private readonly byte* _endPointer; - private byte* currentPointer; + private byte* _currentPointer; public unsafe BlobReader(byte* buffer, int length) { @@ -47,25 +47,25 @@ public unsafe BlobReader(byte* buffer, int length) internal BlobReader(MemoryBlock block) { Debug.Assert(BitConverter.IsLittleEndian && block.Length >= 0 && (block.Pointer != null || block.Length == 0)); - this.block = block; - this.currentPointer = block.Pointer; - this.endPointer = block.Pointer + block.Length; + _block = block; + _currentPointer = block.Pointer; + _endPointer = block.Pointer + block.Length; } private string GetDebuggerDisplay() { - if (block.Pointer == null) + if (_block.Pointer == null) { return ""; } int displayedBytes; - string display = block.GetDebuggerDisplay(out displayedBytes); + string display = _block.GetDebuggerDisplay(out displayedBytes); if (this.Offset < displayedBytes) { display = display.Insert(this.Offset * 3, "*"); } - else if (displayedBytes == block.Length) + else if (displayedBytes == _block.Length) { display += "*"; } @@ -83,7 +83,7 @@ public int Length { get { - return block.Length; + return _block.Length; } } @@ -91,7 +91,7 @@ public int Offset { get { - return (int)(this.currentPointer - block.Pointer); + return (int)(_currentPointer - _block.Pointer); } } @@ -99,23 +99,23 @@ public int RemainingBytes { get { - return (int)(this.endPointer - this.currentPointer); + return (int)(_endPointer - _currentPointer); } } public void Reset() { - this.currentPointer = block.Pointer; + _currentPointer = _block.Pointer; } internal bool SeekOffset(int offset) { - if (unchecked((uint)offset) >= (uint)block.Length) + if (unchecked((uint)offset) >= (uint)_block.Length) { return false; } - this.currentPointer = block.Pointer + offset; + _currentPointer = _block.Pointer + offset; return true; } @@ -146,7 +146,7 @@ internal bool TryAlign(byte alignment) { return false; } - this.currentPointer += bytesToSkip; + _currentPointer += bytesToSkip; } return true; } @@ -154,7 +154,7 @@ internal bool TryAlign(byte alignment) internal MemoryBlock GetMemoryBlockAt(int offset, int length) { CheckBounds(offset, length); - return new MemoryBlock(this.currentPointer + offset, length); + return new MemoryBlock(_currentPointer + offset, length); } #endregion @@ -169,7 +169,7 @@ private static void ThrowOutOfBounds() [MethodImpl(MethodImplOptions.AggressiveInlining)] private void CheckBounds(int offset, int byteCount) { - if (unchecked((ulong)(uint)offset + (uint)byteCount) > (ulong)(this.endPointer - this.currentPointer)) + if (unchecked((ulong)(uint)offset + (uint)byteCount) > (ulong)(_endPointer - _currentPointer)) { ThrowOutOfBounds(); } @@ -178,7 +178,7 @@ private void CheckBounds(int offset, int byteCount) [MethodImpl(MethodImplOptions.AggressiveInlining)] private void CheckBounds(int byteCount) { - if (unchecked((uint)byteCount) > (this.endPointer - this.currentPointer)) + if (unchecked((uint)byteCount) > (_endPointer - _currentPointer)) { ThrowOutOfBounds(); } @@ -187,28 +187,28 @@ private void CheckBounds(int byteCount) [MethodImpl(MethodImplOptions.AggressiveInlining)] private byte* GetCurrentPointerAndAdvance(int length) { - byte* p = this.currentPointer; + byte* p = _currentPointer; - if (unchecked((uint)length) > (uint)(this.endPointer - p)) + if (unchecked((uint)length) > (uint)(_endPointer - p)) { ThrowOutOfBounds(); } - this.currentPointer = p + length; + _currentPointer = p + length; return p; } [MethodImpl(MethodImplOptions.AggressiveInlining)] private byte* GetCurrentPointerAndAdvance1() { - byte* p = this.currentPointer; + byte* p = _currentPointer; - if (p == this.endPointer) + if (p == _endPointer) { ThrowOutOfBounds(); } - this.currentPointer = p + 1; + _currentPointer = p + 1; return p; } @@ -289,8 +289,8 @@ public SignatureHeader ReadSignatureHeader() /// bytes not available. public string ReadUTF8(int byteCount) { - string s = this.block.PeekUtf8(this.Offset, byteCount); - this.currentPointer += byteCount; + string s = _block.PeekUtf8(this.Offset, byteCount); + _currentPointer += byteCount; return s; } @@ -302,8 +302,8 @@ public string ReadUTF8(int byteCount) /// bytes not available. public string ReadUTF16(int byteCount) { - string s = this.block.PeekUtf16(this.Offset, byteCount); - this.currentPointer += byteCount; + string s = _block.PeekUtf16(this.Offset, byteCount); + _currentPointer += byteCount; return s; } @@ -315,24 +315,24 @@ public string ReadUTF16(int byteCount) /// bytes not available. public byte[] ReadBytes(int byteCount) { - byte[] bytes = this.block.PeekBytes(this.Offset, byteCount); - this.currentPointer += byteCount; + byte[] bytes = _block.PeekBytes(this.Offset, byteCount); + _currentPointer += byteCount; return bytes; } internal string ReadUtf8NullTerminated() { int bytesRead; - string value = this.block.PeekUtf8NullTerminated(this.Offset, null, MetadataStringDecoder.DefaultUTF8, out bytesRead, '\0'); - this.currentPointer += bytesRead; + string value = _block.PeekUtf8NullTerminated(this.Offset, null, MetadataStringDecoder.DefaultUTF8, out bytesRead, '\0'); + _currentPointer += bytesRead; return value; } private int ReadCompressedIntegerOrInvalid() { int bytesRead; - int value = this.block.PeekCompressedInteger(this.Offset, out bytesRead); - this.currentPointer += bytesRead; + int value = _block.PeekCompressedInteger(this.Offset, out bytesRead); + _currentPointer += bytesRead; return value; } @@ -373,7 +373,7 @@ public int ReadCompressedInteger() public bool TryReadCompressedSignedInteger(out int value) { int bytesRead; - value = this.block.PeekCompressedInteger(this.Offset, out bytesRead); + value = _block.PeekCompressedInteger(this.Offset, out bytesRead); if (value == InvalidCompressedInteger) { @@ -400,7 +400,7 @@ public bool TryReadCompressedSignedInteger(out int value) } } - this.currentPointer += bytesRead; + _currentPointer += bytesRead; return true; } @@ -500,7 +500,7 @@ public string ReadSerializedString() public Handle ReadTypeHandle() { uint value = (uint)ReadCompressedIntegerOrInvalid(); - uint tokenType = corEncodeTokenArray[value & 0x3]; + uint tokenType = s_corEncodeTokenArray[value & 0x3]; if (value == InvalidCompressedInteger || tokenType == 0) { @@ -510,7 +510,7 @@ public Handle ReadTypeHandle() return new Handle(tokenType | (value >> 2)); } - private static readonly uint[] corEncodeTokenArray = new uint[] { TokenTypeIds.TypeDef, TokenTypeIds.TypeRef, TokenTypeIds.TypeSpec, 0 }; + private static readonly uint[] s_corEncodeTokenArray = new uint[] { TokenTypeIds.TypeDef, TokenTypeIds.TypeRef, TokenTypeIds.TypeSpec, 0 }; #endregion } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Constant.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Constant.cs index de06e16aff4f80ad6016faf328b7349ca285baf2..d5a2349d29e19ba58c21131e3db5257a86eda233 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Constant.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Constant.cs @@ -7,25 +7,25 @@ namespace System.Reflection.Metadata { public struct Constant { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal Constant(MetadataReader reader, uint rowId) { Debug.Assert(reader != null); Debug.Assert(rowId != 0); - this.reader = reader; - this.rowId = rowId; + _reader = reader; + _rowId = rowId; } private ConstantHandle Handle { get { - return ConstantHandle.FromRowId(rowId); + return ConstantHandle.FromRowId(_rowId); } } @@ -39,7 +39,7 @@ public ConstantTypeCode TypeCode { get { - return reader.ConstantTable.GetType(Handle); + return _reader.ConstantTable.GetType(Handle); } } @@ -53,7 +53,7 @@ public BlobHandle Value { get { - return reader.ConstantTable.GetValue(Handle); + return _reader.ConstantTable.GetValue(Handle); } } @@ -67,7 +67,7 @@ public Handle Parent { get { - return reader.ConstantTable.GetParent(Handle); + return _reader.ConstantTable.GetParent(Handle); } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/CustomAttribute.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/CustomAttribute.cs index 6a129618e50a6b3c20d1c877f230c5347091c41a..efe430da86bcd4e38d89a32e3673d72e5927c9cb 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/CustomAttribute.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/CustomAttribute.cs @@ -8,23 +8,23 @@ namespace System.Reflection.Metadata { public struct CustomAttribute { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint treatmentAndRowId; + private readonly uint _treatmentAndRowId; internal CustomAttribute(MetadataReader reader, uint treatmentAndRowId) { Debug.Assert(reader != null); Debug.Assert(treatmentAndRowId != 0); - this.reader = reader; - this.treatmentAndRowId = treatmentAndRowId; + _reader = reader; + _treatmentAndRowId = treatmentAndRowId; } private uint RowId { - get { return treatmentAndRowId & TokenTypeIds.RIDMask; } + get { return _treatmentAndRowId & TokenTypeIds.RIDMask; } } private CustomAttributeHandle Handle @@ -34,7 +34,7 @@ private CustomAttributeHandle Handle private MethodDefTreatment Treatment { - get { return (MethodDefTreatment)(treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } + get { return (MethodDefTreatment)(_treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } } /// @@ -47,7 +47,7 @@ public Handle Constructor { get { - return reader.CustomAttributeTable.GetConstructor(Handle); + return _reader.CustomAttributeTable.GetConstructor(Handle); } } @@ -61,7 +61,7 @@ public Handle Parent { get { - return reader.CustomAttributeTable.GetParent(Handle); + return _reader.CustomAttributeTable.GetParent(Handle); } } @@ -77,7 +77,7 @@ public BlobHandle Value { if (Treatment == 0) { - return reader.CustomAttributeTable.GetValue(Handle); + return _reader.CustomAttributeTable.GetValue(Handle); } return GetProjectedValue(); @@ -97,10 +97,10 @@ private BlobHandle GetProjectedValue() // avoid calculating the treatment when the CustomAttributeHandle is looked up and CustomAttribute struct // is initialized. - CustomAttributeValueTreatment treatment = reader.CalculateCustomAttributeValueTreatment(Handle); + CustomAttributeValueTreatment treatment = _reader.CalculateCustomAttributeValueTreatment(Handle); if (treatment == 0) { - return reader.CustomAttributeTable.GetValue(Handle); + return _reader.CustomAttributeTable.GetValue(Handle); } return GetProjectedValue(treatment); @@ -137,8 +137,8 @@ private BlobHandle GetProjectedValue(CustomAttributeValueTreatment treatment) // 01 00 - Fixed prolog for CA's // xx xx xx xx - The Windows.Foundation.Metadata.AttributeTarget value // 00 00 - Indicates 0 name/value pairs following. - var rawBlob = reader.CustomAttributeTable.GetValue(Handle); - var rawBlobReader = reader.GetBlobReader(rawBlob); + var rawBlob = _reader.CustomAttributeTable.GetValue(Handle); + var rawBlobReader = _reader.GetBlobReader(rawBlob); if (rawBlobReader.Length != 8) { return rawBlob; diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/DeclarativeSecurityAttribute.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/DeclarativeSecurityAttribute.cs index e5935ce0b52a2cfee81845da381e748b6668c69e..a1b4a60ccb345ffb81a2b3a5a69fc79fa08b86af 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/DeclarativeSecurityAttribute.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/DeclarativeSecurityAttribute.cs @@ -8,23 +8,23 @@ namespace System.Reflection.Metadata { public struct DeclarativeSecurityAttribute { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal DeclarativeSecurityAttribute(MetadataReader reader, uint rowId) { Debug.Assert(reader != null); Debug.Assert(rowId != 0); - this.reader = reader; - this.rowId = rowId; + _reader = reader; + _rowId = rowId; } private uint RowId { - get { return rowId & TokenTypeIds.RIDMask; } + get { return _rowId & TokenTypeIds.RIDMask; } } private DeclarativeSecurityAttributeHandle Handle @@ -34,14 +34,14 @@ private DeclarativeSecurityAttributeHandle Handle private MethodDefTreatment Treatment { - get { return (MethodDefTreatment)(rowId >> TokenTypeIds.RowIdBitCount); } + get { return (MethodDefTreatment)(_rowId >> TokenTypeIds.RowIdBitCount); } } public DeclarativeSecurityAction Action { get { - return reader.DeclSecurityTable.GetAction(rowId); + return _reader.DeclSecurityTable.GetAction(_rowId); } } @@ -49,7 +49,7 @@ public Handle Parent { get { - return reader.DeclSecurityTable.GetParent(rowId); + return _reader.DeclSecurityTable.GetParent(_rowId); } } @@ -57,7 +57,7 @@ public BlobHandle PermissionSet { get { - return reader.DeclSecurityTable.GetPermissionSet(rowId); + return _reader.DeclSecurityTable.GetPermissionSet(_rowId); } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/EventDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/EventDefinition.cs index 74c6fa798d227d795d69f00369a8d02e27133d1c..4f6075b573e9a0452bcdccefd34e640f44e74add 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/EventDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/EventDefinition.cs @@ -7,30 +7,30 @@ namespace System.Reflection.Metadata { public struct EventDefinition { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal EventDefinition(MetadataReader reader, EventDefinitionHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private EventDefinitionHandle Handle { - get { return EventDefinitionHandle.FromRowId(rowId); } + get { return EventDefinitionHandle.FromRowId(_rowId); } } public StringHandle Name { get { - return reader.EventTable.GetName(Handle); + return _reader.EventTable.GetName(Handle); } } @@ -38,7 +38,7 @@ public EventAttributes Attributes { get { - return reader.EventTable.GetFlags(Handle); + return _reader.EventTable.GetFlags(Handle); } } @@ -46,13 +46,13 @@ public Handle Type { get { - return reader.EventTable.GetEventType(Handle); + return _reader.EventTable.GetEventType(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } public EventAccessors GetAccessors() @@ -62,22 +62,22 @@ public EventAccessors GetAccessors() uint fire = 0; ushort methodCount; - var firstRowId = reader.MethodSemanticsTable.FindSemanticMethodsForEvent(Handle, out methodCount); + var firstRowId = _reader.MethodSemanticsTable.FindSemanticMethodsForEvent(Handle, out methodCount); for (ushort i = 0; i < methodCount; i++) { uint rowId = firstRowId + i; - switch (reader.MethodSemanticsTable.GetSemantics(rowId)) + switch (_reader.MethodSemanticsTable.GetSemantics(rowId)) { case MethodSemanticsAttributes.Adder: - adder = reader.MethodSemanticsTable.GetMethod(rowId).RowId; + adder = _reader.MethodSemanticsTable.GetMethod(rowId).RowId; break; case MethodSemanticsAttributes.Remover: - remover = reader.MethodSemanticsTable.GetMethod(rowId).RowId; + remover = _reader.MethodSemanticsTable.GetMethod(rowId).RowId; break; case MethodSemanticsAttributes.Raiser: - fire = reader.MethodSemanticsTable.GetMethod(rowId).RowId; + fire = _reader.MethodSemanticsTable.GetMethod(rowId).RowId; break; // TODO: expose 'Other' collection on EventAccessors for completeness. } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ExceptionRegion.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ExceptionRegion.cs index d0803b8193e541a7b4aa48a4d0768d474c7666e4..ac486ce2a4ce9c3776a45e73445c96a1c1204fbb 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ExceptionRegion.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ExceptionRegion.cs @@ -5,12 +5,12 @@ namespace System.Reflection.Metadata { public struct ExceptionRegion { - private readonly ExceptionRegionKind kind; - private readonly int tryOffset; - private readonly int tryLength; - private readonly int handlerOffset; - private readonly int handlerLength; - private readonly int classTokenOrFilterOffset; + private readonly ExceptionRegionKind _kind; + private readonly int _tryOffset; + private readonly int _tryLength; + private readonly int _handlerOffset; + private readonly int _handlerLength; + private readonly int _classTokenOrFilterOffset; internal ExceptionRegion( ExceptionRegionKind kind, @@ -20,17 +20,17 @@ public struct ExceptionRegion int handlerLength, int classTokenOrFilterOffset) { - this.kind = kind; - this.tryOffset = tryOffset; - this.tryLength = tryLength; - this.handlerOffset = handlerOffset; - this.handlerLength = handlerLength; - this.classTokenOrFilterOffset = classTokenOrFilterOffset; + _kind = kind; + _tryOffset = tryOffset; + _tryLength = tryLength; + _handlerOffset = handlerOffset; + _handlerLength = handlerLength; + _classTokenOrFilterOffset = classTokenOrFilterOffset; } public ExceptionRegionKind Kind { - get { return kind; } + get { return _kind; } } /// @@ -38,7 +38,7 @@ public ExceptionRegionKind Kind /// public int TryOffset { - get { return tryOffset; } + get { return _tryOffset; } } /// @@ -46,7 +46,7 @@ public int TryOffset /// public int TryLength { - get { return tryLength; } + get { return _tryLength; } } /// @@ -54,7 +54,7 @@ public int TryLength /// public int HandlerOffset { - get { return handlerOffset; } + get { return _handlerOffset; } } /// @@ -62,7 +62,7 @@ public int HandlerOffset /// public int HandlerLength { - get { return handlerLength; } + get { return _handlerLength; } } /// @@ -70,7 +70,7 @@ public int HandlerLength /// public int FilterOffset { - get { return (Kind == ExceptionRegionKind.Filter) ? classTokenOrFilterOffset : -1; } + get { return (Kind == ExceptionRegionKind.Filter) ? _classTokenOrFilterOffset : -1; } } /// @@ -78,7 +78,7 @@ public int FilterOffset /// public Handle CatchType { - get { return (Kind == ExceptionRegionKind.Catch) ? new Handle((uint)classTokenOrFilterOffset) : default(Handle); } + get { return (Kind == ExceptionRegionKind.Catch) ? new Handle((uint)_classTokenOrFilterOffset) : default(Handle); } } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/FieldDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/FieldDefinition.cs index 93057a5dc48fb4ea26c1adf2a6cd70d7765b37b0..26e331c937431243290a33228ce6c133da73479a 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/FieldDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/FieldDefinition.cs @@ -8,28 +8,28 @@ namespace System.Reflection.Metadata { public struct FieldDefinition { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint treatmentAndRowId; + private readonly uint _treatmentAndRowId; internal FieldDefinition(MetadataReader reader, uint treatmentAndRowId) { Debug.Assert(reader != null); Debug.Assert(treatmentAndRowId != 0); - this.reader = reader; - this.treatmentAndRowId = treatmentAndRowId; + _reader = reader; + _treatmentAndRowId = treatmentAndRowId; } private uint RowId { - get { return treatmentAndRowId & TokenTypeIds.RIDMask; } + get { return _treatmentAndRowId & TokenTypeIds.RIDMask; } } private FieldDefTreatment Treatment { - get { return (FieldDefTreatment)(treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } + get { return (FieldDefTreatment)(_treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } } private FieldDefinitionHandle Handle @@ -43,7 +43,7 @@ public StringHandle Name { if (Treatment == 0) { - return reader.FieldTable.GetName(Handle); + return _reader.FieldTable.GetName(Handle); } return GetProjectedName(); @@ -56,7 +56,7 @@ public FieldAttributes Attributes { if (Treatment == 0) { - return reader.FieldTable.GetFlags(Handle); + return _reader.FieldTable.GetFlags(Handle); } return GetProjectedFlags(); @@ -69,7 +69,7 @@ public BlobHandle Signature { if (Treatment == 0) { - return reader.FieldTable.GetSignature(Handle); + return _reader.FieldTable.GetSignature(Handle); } return GetProjectedSignature(); @@ -78,23 +78,23 @@ public BlobHandle Signature public TypeDefinitionHandle GetDeclaringType() { - return reader.GetDeclaringType(Handle); + return _reader.GetDeclaringType(Handle); } public ConstantHandle GetDefaultValue() { - return reader.ConstantTable.FindConstant(Handle); + return _reader.ConstantTable.FindConstant(Handle); } public int GetRelativeVirtualAddress() { - uint fieldRvaRowId = reader.FieldRvaTable.FindFieldRVARowId(Handle.RowId); + uint fieldRvaRowId = _reader.FieldRvaTable.FindFieldRVARowId(Handle.RowId); if (fieldRvaRowId == 0) { return 0; } - return reader.FieldRvaTable.GetRVA(fieldRvaRowId); + return _reader.FieldRvaTable.GetRVA(fieldRvaRowId); } /// @@ -102,13 +102,13 @@ public int GetRelativeVirtualAddress() /// public int GetOffset() { - uint layoutRowId = reader.FieldLayoutTable.FindFieldLayoutRowId(Handle); + uint layoutRowId = _reader.FieldLayoutTable.FindFieldLayoutRowId(Handle); if (layoutRowId == 0) { return -1; } - uint offset = reader.FieldLayoutTable.GetOffset(layoutRowId); + uint offset = _reader.FieldLayoutTable.GetOffset(layoutRowId); if (offset > int.MaxValue) { // CLI spec says: @@ -124,18 +124,18 @@ public int GetOffset() public BlobHandle GetMarshallingDescriptor() { - uint marshalRowId = reader.FieldMarshalTable.FindFieldMarshalRowId(Handle); + uint marshalRowId = _reader.FieldMarshalTable.FindFieldMarshalRowId(Handle); if (marshalRowId == 0) { return default(BlobHandle); } - return reader.FieldMarshalTable.GetNativeType(marshalRowId); + return _reader.FieldMarshalTable.GetNativeType(marshalRowId); } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } #region Projections @@ -143,12 +143,12 @@ public CustomAttributeHandleCollection GetCustomAttributes() private StringHandle GetProjectedName() { // no change: - return reader.FieldTable.GetName(Handle); + return _reader.FieldTable.GetName(Handle); } private FieldAttributes GetProjectedFlags() { - var flags = reader.FieldTable.GetFlags(Handle); + var flags = _reader.FieldTable.GetFlags(Handle); if (Treatment == FieldDefTreatment.EnumValue) { @@ -160,7 +160,7 @@ private FieldAttributes GetProjectedFlags() private BlobHandle GetProjectedSignature() { - return reader.FieldTable.GetSignature(Handle); + return _reader.FieldTable.GetSignature(Handle); } #endregion } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameter.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameter.cs index 54cb8f41743040e04783a238128c1334b39efbe4..6f6839b2abfde2432b89b8845686417a99b505b6 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameter.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameter.cs @@ -7,23 +7,23 @@ namespace System.Reflection.Metadata { public struct GenericParameter { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal GenericParameter(MetadataReader reader, GenericParameterHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private GenericParameterHandle Handle { - get { return GenericParameterHandle.FromRowId(rowId); } + get { return GenericParameterHandle.FromRowId(_rowId); } } /// @@ -36,7 +36,7 @@ public Handle Parent { get { - return reader.GenericParamTable.GetOwner(Handle); + return _reader.GenericParamTable.GetOwner(Handle); } } @@ -50,7 +50,7 @@ public GenericParameterAttributes Attributes { get { - return reader.GenericParamTable.GetFlags(Handle); + return _reader.GenericParamTable.GetFlags(Handle); } } @@ -64,7 +64,7 @@ public int Index { get { - return reader.GenericParamTable.GetNumber(Handle); + return _reader.GenericParamTable.GetNumber(Handle); } } @@ -78,18 +78,18 @@ public StringHandle Name { get { - return reader.GenericParamTable.GetName(Handle); + return _reader.GenericParamTable.GetName(Handle); } } public GenericParameterConstraintHandleCollection GetConstraints() { - return reader.GenericParamConstraintTable.FindConstraintsForGenericParam(Handle); + return _reader.GenericParamConstraintTable.FindConstraintsForGenericParam(Handle); } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameterConstraint.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameterConstraint.cs index bdf4a0e0f67bb42d53ed76475884c0d45db1a4aa..fe479b6ba045bb72d5e2055e14b7e6976b41a61c 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameterConstraint.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/GenericParameterConstraint.cs @@ -7,23 +7,23 @@ namespace System.Reflection.Metadata { public struct GenericParameterConstraint { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal GenericParameterConstraint(MetadataReader reader, GenericParameterConstraintHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private GenericParameterConstraintHandle Handle { - get { return GenericParameterConstraintHandle.FromRowId(rowId); } + get { return GenericParameterConstraintHandle.FromRowId(_rowId); } } /// @@ -34,7 +34,7 @@ private GenericParameterConstraintHandle Handle /// public GenericParameterHandle Parameter { - get { return reader.GenericParamConstraintTable.GetOwner(Handle); } + get { return _reader.GenericParamConstraintTable.GetOwner(Handle); } } /// @@ -47,12 +47,12 @@ public GenericParameterHandle Parameter /// public Handle Type { - get { return reader.GenericParamConstraintTable.GetConstraint(Handle); } + get { return _reader.GenericParamConstraintTable.GetConstraint(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/HandleCollections.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/HandleCollections.cs index 4ee82952ea5344e12defdeddc4df09ad93d53acb..1f3d2144108839ea0c54b5be1a1987636946e782 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/HandleCollections.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/HandleCollections.cs @@ -14,20 +14,20 @@ namespace System.Reflection.Metadata /// public struct GenericParameterHandleCollection : IReadOnlyList { - private readonly int firstRowId; - private readonly ushort count; + private readonly int _firstRowId; + private readonly ushort _count; internal GenericParameterHandleCollection(int firstRowId, ushort count) { - this.firstRowId = firstRowId; - this.count = count; + _firstRowId = firstRowId; + _count = count; } public int Count { get { - return count; + return _count; } } @@ -35,12 +35,12 @@ public int Count { get { - if (index < 0 || index >= count) + if (index < 0 || index >= _count) { ThrowIndexOutOfRange(); } - return GenericParameterHandle.FromRowId((uint)(firstRowId + index)); + return GenericParameterHandle.FromRowId((uint)(_firstRowId + index)); } } @@ -52,7 +52,7 @@ private static void ThrowIndexOutOfRange() public Enumerator GetEnumerator() { - return new Enumerator(firstRowId, firstRowId + count - 1); + return new Enumerator(_firstRowId, _firstRowId + _count - 1); } IEnumerator IEnumerable.GetEnumerator() @@ -67,19 +67,19 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; // inclusive + private readonly int _lastRowId; // inclusive // first parameter rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int firstRowId, int lastRowId) { - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public GenericParameterHandle Current @@ -87,7 +87,7 @@ public GenericParameterHandle Current get { // PERF: keep this code small to enable inlining. - return GenericParameterHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return GenericParameterHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -95,14 +95,14 @@ public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -128,20 +128,20 @@ void IDisposable.Dispose() /// public struct GenericParameterConstraintHandleCollection : IReadOnlyList { - private readonly int firstRowId; - private readonly ushort count; + private readonly int _firstRowId; + private readonly ushort _count; internal GenericParameterConstraintHandleCollection(int firstRowId, ushort count) { - this.firstRowId = firstRowId; - this.count = count; + _firstRowId = firstRowId; + _count = count; } public int Count { get { - return count; + return _count; } } @@ -149,12 +149,12 @@ public int Count { get { - if (index < 0 || index >= count) + if (index < 0 || index >= _count) { ThrowIndexOutOfRange(); } - return GenericParameterConstraintHandle.FromRowId((uint)(firstRowId + index)); + return GenericParameterConstraintHandle.FromRowId((uint)(_firstRowId + index)); } } @@ -166,7 +166,7 @@ private static void ThrowIndexOutOfRange() public Enumerator GetEnumerator() { - return new Enumerator(firstRowId, firstRowId + count - 1); + return new Enumerator(_firstRowId, _firstRowId + _count - 1); } IEnumerator IEnumerable.GetEnumerator() @@ -181,19 +181,19 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; // inclusive + private readonly int _lastRowId; // inclusive // first parameter rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int firstRowId, int lastRowId) { - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public GenericParameterConstraintHandle Current @@ -201,7 +201,7 @@ public GenericParameterConstraintHandle Current get { // PERF: keep this code small to enable inlining. - return GenericParameterConstraintHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return GenericParameterConstraintHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -209,14 +209,14 @@ public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -239,17 +239,17 @@ void IDisposable.Dispose() public struct CustomAttributeHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal CustomAttributeHandleCollection(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; - this.firstRowId = 1; - this.lastRowId = (int)reader.CustomAttributeTable.NumberOfRows; + _reader = reader; + _firstRowId = 1; + _lastRowId = (int)reader.CustomAttributeTable.NumberOfRows; } internal CustomAttributeHandleCollection(MetadataReader reader, Handle handle) @@ -257,21 +257,21 @@ internal CustomAttributeHandleCollection(MetadataReader reader, Handle handle) Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - reader.CustomAttributeTable.GetAttributeRange(handle, out firstRowId, out lastRowId); + _reader = reader; + reader.CustomAttributeTable.GetAttributeRange(handle, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -286,21 +286,21 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; // inclusive + private readonly MetadataReader _reader; + private readonly int _lastRowId; // inclusive // first custom attribute rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _reader = reader; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public CustomAttributeHandle Current @@ -309,13 +309,13 @@ public CustomAttributeHandle Current { // PERF: keep this code small to enable inlining. - if (reader.CustomAttributeTable.PtrTable != null) + if (_reader.CustomAttributeTable.PtrTable != null) { return GetCurrentCustomAttributeIndirect(); } else { - return CustomAttributeHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return CustomAttributeHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } } @@ -323,21 +323,21 @@ public CustomAttributeHandle Current private CustomAttributeHandle GetCurrentCustomAttributeIndirect() { return CustomAttributeHandle.FromRowId( - reader.CustomAttributeTable.PtrTable[(currentRowId & (int)TokenTypeIds.RIDMask) - 1]); + _reader.CustomAttributeTable.PtrTable[(_currentRowId & (int)TokenTypeIds.RIDMask) - 1]); } public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -360,17 +360,17 @@ void IDisposable.Dispose() public struct DeclarativeSecurityAttributeHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal DeclarativeSecurityAttributeHandleCollection(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; - this.firstRowId = 1; - this.lastRowId = (int)reader.DeclSecurityTable.NumberOfRows; + _reader = reader; + _firstRowId = 1; + _lastRowId = (int)reader.DeclSecurityTable.NumberOfRows; } internal DeclarativeSecurityAttributeHandleCollection(MetadataReader reader, Handle handle) @@ -378,21 +378,21 @@ internal DeclarativeSecurityAttributeHandleCollection(MetadataReader reader, Han Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - reader.DeclSecurityTable.GetAttributeRange(handle, out firstRowId, out lastRowId); + _reader = reader; + reader.DeclSecurityTable.GetAttributeRange(handle, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -407,21 +407,21 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; // inclusive + private readonly MetadataReader _reader; + private readonly int _lastRowId; // inclusive // first custom attribute rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _reader = reader; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public DeclarativeSecurityAttributeHandle Current @@ -429,7 +429,7 @@ public DeclarativeSecurityAttributeHandle Current get { // PERF: keep this code small to enable inlining. - return DeclarativeSecurityAttributeHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return DeclarativeSecurityAttributeHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -437,14 +437,14 @@ public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -467,17 +467,17 @@ void IDisposable.Dispose() public struct MethodDefinitionHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal MethodDefinitionHandleCollection(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; - this.firstRowId = 1; - this.lastRowId = (int)reader.MethodDefTable.NumberOfRows; + _reader = reader; + _firstRowId = 1; + _lastRowId = (int)reader.MethodDefTable.NumberOfRows; } internal MethodDefinitionHandleCollection(MetadataReader reader, TypeDefinitionHandle containingType) @@ -485,21 +485,21 @@ internal MethodDefinitionHandleCollection(MetadataReader reader, TypeDefinitionH Debug.Assert(reader != null); Debug.Assert(!containingType.IsNil); - this.reader = reader; - reader.GetMethodRange(containingType, out firstRowId, out lastRowId); + _reader = reader; + reader.GetMethodRange(containingType, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -514,21 +514,21 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; // inclusive + private readonly MetadataReader _reader; + private readonly int _lastRowId; // inclusive // first method rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _reader = reader; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public MethodDefinitionHandle Current @@ -537,34 +537,34 @@ public MethodDefinitionHandle Current { // PERF: keep this code small to enable inlining. - if (reader.UseMethodPtrTable) + if (_reader.UseMethodPtrTable) { return GetCurrentMethodIndirect(); } else { - return MethodDefinitionHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return MethodDefinitionHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } } private MethodDefinitionHandle GetCurrentMethodIndirect() { - return reader.MethodPtrTable.GetMethodFor(currentRowId & (int)TokenTypeIds.RIDMask); + return _reader.MethodPtrTable.GetMethodFor(_currentRowId & (int)TokenTypeIds.RIDMask); } public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -587,17 +587,17 @@ void IDisposable.Dispose() public struct FieldDefinitionHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal FieldDefinitionHandleCollection(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; - this.firstRowId = 1; - this.lastRowId = (int)reader.FieldTable.NumberOfRows; + _reader = reader; + _firstRowId = 1; + _lastRowId = (int)reader.FieldTable.NumberOfRows; } internal FieldDefinitionHandleCollection(MetadataReader reader, TypeDefinitionHandle containingType) @@ -605,21 +605,21 @@ internal FieldDefinitionHandleCollection(MetadataReader reader, TypeDefinitionHa Debug.Assert(reader != null); Debug.Assert(!containingType.IsNil); - this.reader = reader; - reader.GetFieldRange(containingType, out firstRowId, out lastRowId); + _reader = reader; + reader.GetFieldRange(containingType, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -634,21 +634,21 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; // inclusive + private readonly MetadataReader _reader; + private readonly int _lastRowId; // inclusive // first field rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _reader = reader; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public FieldDefinitionHandle Current @@ -657,34 +657,34 @@ public FieldDefinitionHandle Current { // PERF: keep this code small to enable inlining. - if (reader.UseFieldPtrTable) + if (_reader.UseFieldPtrTable) { return GetCurrentFieldIndirect(); } else { - return FieldDefinitionHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return FieldDefinitionHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } } private FieldDefinitionHandle GetCurrentFieldIndirect() { - return reader.FieldPtrTable.GetFieldFor(currentRowId & (int)TokenTypeIds.RIDMask); + return _reader.FieldPtrTable.GetFieldFor(_currentRowId & (int)TokenTypeIds.RIDMask); } public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -707,17 +707,17 @@ void IDisposable.Dispose() public struct PropertyDefinitionHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal PropertyDefinitionHandleCollection(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; - this.firstRowId = 1; - this.lastRowId = (int)reader.PropertyTable.NumberOfRows; + _reader = reader; + _firstRowId = 1; + _lastRowId = (int)reader.PropertyTable.NumberOfRows; } internal PropertyDefinitionHandleCollection(MetadataReader reader, TypeDefinitionHandle containingType) @@ -725,21 +725,21 @@ internal PropertyDefinitionHandleCollection(MetadataReader reader, TypeDefinitio Debug.Assert(reader != null); Debug.Assert(!containingType.IsNil); - this.reader = reader; - reader.GetPropertyRange(containingType, out firstRowId, out lastRowId); + _reader = reader; + reader.GetPropertyRange(containingType, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -754,21 +754,21 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; // inclusive + private readonly MetadataReader _reader; + private readonly int _lastRowId; // inclusive // first Property rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _reader = reader; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public PropertyDefinitionHandle Current @@ -777,34 +777,34 @@ public PropertyDefinitionHandle Current { // PERF: keep this code small to enable inlining. - if (reader.UsePropertyPtrTable) + if (_reader.UsePropertyPtrTable) { return GetCurrentPropertyIndirect(); } else { - return PropertyDefinitionHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return PropertyDefinitionHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } } private PropertyDefinitionHandle GetCurrentPropertyIndirect() { - return reader.PropertyPtrTable.GetPropertyFor(currentRowId & (int)TokenTypeIds.RIDMask); + return _reader.PropertyPtrTable.GetPropertyFor(_currentRowId & (int)TokenTypeIds.RIDMask); } public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -827,17 +827,17 @@ void IDisposable.Dispose() public struct EventDefinitionHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal EventDefinitionHandleCollection(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; - this.firstRowId = 1; - this.lastRowId = (int)reader.EventTable.NumberOfRows; + _reader = reader; + _firstRowId = 1; + _lastRowId = (int)reader.EventTable.NumberOfRows; } internal EventDefinitionHandleCollection(MetadataReader reader, TypeDefinitionHandle containingType) @@ -845,21 +845,21 @@ internal EventDefinitionHandleCollection(MetadataReader reader, TypeDefinitionHa Debug.Assert(reader != null); Debug.Assert(!containingType.IsNil); - this.reader = reader; - reader.GetEventRange(containingType, out firstRowId, out lastRowId); + _reader = reader; + reader.GetEventRange(containingType, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -874,21 +874,21 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; + private readonly MetadataReader _reader; + private readonly int _lastRowId; // first rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _reader = reader; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public EventDefinitionHandle Current @@ -897,34 +897,34 @@ public EventDefinitionHandle Current { // PERF: keep this code small to enable inlining. - if (reader.UseEventPtrTable) + if (_reader.UseEventPtrTable) { return GetCurrentEventIndirect(); } else { - return EventDefinitionHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return EventDefinitionHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } } private EventDefinitionHandle GetCurrentEventIndirect() { - return reader.EventPtrTable.GetEventFor(currentRowId & (int)TokenTypeIds.RIDMask); + return _reader.EventPtrTable.GetEventFor(_currentRowId & (int)TokenTypeIds.RIDMask); } public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -947,8 +947,8 @@ void IDisposable.Dispose() public struct MethodImplementationHandleCollection : IReadOnlyCollection { - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal MethodImplementationHandleCollection(MetadataReader reader, TypeDefinitionHandle containingType) { @@ -956,12 +956,12 @@ internal MethodImplementationHandleCollection(MetadataReader reader, TypeDefinit if (containingType.IsNil) { - this.firstRowId = 1; - this.lastRowId = (int)reader.MethodImplTable.NumberOfRows; + _firstRowId = 1; + _lastRowId = (int)reader.MethodImplTable.NumberOfRows; } else { - reader.MethodImplTable.GetMethodImplRange(containingType, out firstRowId, out lastRowId); + reader.MethodImplTable.GetMethodImplRange(containingType, out _firstRowId, out _lastRowId); } } @@ -969,13 +969,13 @@ public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(firstRowId, lastRowId); + return new Enumerator(_firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -990,26 +990,26 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; // inclusive + private readonly int _lastRowId; // inclusive // first impl rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int firstRowId, int lastRowId) { - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public MethodImplementationHandle Current { get { - return MethodImplementationHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return MethodImplementationHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1017,14 +1017,14 @@ public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1050,31 +1050,31 @@ void IDisposable.Dispose() /// public struct ParameterHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal ParameterHandleCollection(MetadataReader reader, MethodDefinitionHandle containingMethod) { Debug.Assert(reader != null); Debug.Assert(!containingMethod.IsNil); - this.reader = reader; + _reader = reader; - reader.GetParameterRange(containingMethod, out firstRowId, out lastRowId); + reader.GetParameterRange(containingMethod, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1089,21 +1089,21 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; // inclusive + private readonly MetadataReader _reader; + private readonly int _lastRowId; // inclusive // first Parameter rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.lastRowId = lastRowId; - this.currentRowId = firstRowId - 1; + _reader = reader; + _lastRowId = lastRowId; + _currentRowId = firstRowId - 1; } public ParameterHandle Current @@ -1112,34 +1112,34 @@ public ParameterHandle Current { // PERF: keep this code small to enable inlining. - if (reader.UseParamPtrTable) + if (_reader.UseParamPtrTable) { return GetCurrentParameterIndirect(); } else { - return ParameterHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return ParameterHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } } private ParameterHandle GetCurrentParameterIndirect() { - return reader.ParamPtrTable.GetParamFor(currentRowId & (int)TokenTypeIds.RIDMask); + return _reader.ParamPtrTable.GetParamFor(_currentRowId & (int)TokenTypeIds.RIDMask); } public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1162,31 +1162,31 @@ void IDisposable.Dispose() public struct InterfaceImplementationHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; - private readonly int firstRowId; - private readonly int lastRowId; + private readonly int _firstRowId; + private readonly int _lastRowId; internal InterfaceImplementationHandleCollection(MetadataReader reader, TypeDefinitionHandle implementingType) { Debug.Assert(reader != null); Debug.Assert(!implementingType.IsNil); - this.reader = reader; + _reader = reader; - reader.InterfaceImplTable.GetInterfaceImplRange(implementingType, out firstRowId, out lastRowId); + reader.InterfaceImplTable.GetInterfaceImplRange(implementingType, out _firstRowId, out _lastRowId); } public int Count { get { - return lastRowId - firstRowId + 1; + return _lastRowId - _firstRowId + 1; } } public Enumerator GetEnumerator() { - return new Enumerator(reader, firstRowId, lastRowId); + return new Enumerator(_reader, _firstRowId, _lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1201,28 +1201,28 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; - private readonly int lastRowId; // inclusive + private readonly MetadataReader _reader; + private readonly int _lastRowId; // inclusive // first rid - 1: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(MetadataReader reader, int firstRowId, int lastRowId) { - this.reader = reader; - this.currentRowId = firstRowId - 1; - this.lastRowId = lastRowId; + _reader = reader; + _currentRowId = firstRowId - 1; + _lastRowId = lastRowId; } public InterfaceImplementationHandle Current { get { - return InterfaceImplementationHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return InterfaceImplementationHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1230,14 +1230,14 @@ public bool MoveNext() { // PERF: keep this code small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1263,22 +1263,22 @@ void IDisposable.Dispose() /// public struct TypeDefinitionHandleCollection : IReadOnlyCollection { - private readonly int lastRowId; + private readonly int _lastRowId; // Creates collection that represents the entire TypeDef table. internal TypeDefinitionHandleCollection(int lastRowId) { - this.lastRowId = lastRowId; + _lastRowId = lastRowId; } public int Count { - get { return lastRowId; } + get { return _lastRowId; } } public Enumerator GetEnumerator() { - return new Enumerator(lastRowId); + return new Enumerator(_lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1293,26 +1293,26 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; + private readonly int _lastRowId; // 0: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int lastRowId) { - this.lastRowId = lastRowId; - this.currentRowId = 0; + _lastRowId = lastRowId; + _currentRowId = 0; } public TypeDefinitionHandle Current { get { - return TypeDefinitionHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return TypeDefinitionHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1320,14 +1320,14 @@ public bool MoveNext() { // PERF: keep this method small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1353,22 +1353,22 @@ void IDisposable.Dispose() /// public struct TypeReferenceHandleCollection : IReadOnlyCollection { - private readonly int lastRowId; + private readonly int _lastRowId; // Creates collection that represents the entire TypeRef table. internal TypeReferenceHandleCollection(int lastRowId) { - this.lastRowId = lastRowId; + _lastRowId = lastRowId; } public int Count { - get { return lastRowId; } + get { return _lastRowId; } } public Enumerator GetEnumerator() { - return new Enumerator(lastRowId); + return new Enumerator(_lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1383,26 +1383,26 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; + private readonly int _lastRowId; // 0: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int lastRowId) { - this.lastRowId = lastRowId; - this.currentRowId = 0; + _lastRowId = lastRowId; + _currentRowId = 0; } public TypeReferenceHandle Current { get { - return TypeReferenceHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return TypeReferenceHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1410,14 +1410,14 @@ public bool MoveNext() { // PERF: keep this method small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1443,22 +1443,22 @@ void IDisposable.Dispose() /// public struct ExportedTypeHandleCollection : IReadOnlyCollection { - private readonly int lastRowId; + private readonly int _lastRowId; // Creates collection that represents the entire TypeRef table. internal ExportedTypeHandleCollection(int lastRowId) { - this.lastRowId = lastRowId; + _lastRowId = lastRowId; } public int Count { - get { return lastRowId; } + get { return _lastRowId; } } public Enumerator GetEnumerator() { - return new Enumerator(lastRowId); + return new Enumerator(_lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1473,26 +1473,26 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; + private readonly int _lastRowId; // 0: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int lastRowId) { - this.lastRowId = lastRowId; - this.currentRowId = 0; + _lastRowId = lastRowId; + _currentRowId = 0; } public ExportedTypeHandle Current { get { - return ExportedTypeHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return ExportedTypeHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1500,14 +1500,14 @@ public bool MoveNext() { // PERF: keep this method small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1533,22 +1533,22 @@ void IDisposable.Dispose() /// public struct MemberReferenceHandleCollection : IReadOnlyCollection { - private readonly int lastRowId; + private readonly int _lastRowId; // Creates collection that represents the entire TypeRef table. internal MemberReferenceHandleCollection(int lastRowId) { - this.lastRowId = lastRowId; + _lastRowId = lastRowId; } public int Count { - get { return lastRowId; } + get { return _lastRowId; } } public Enumerator GetEnumerator() { - return new Enumerator(lastRowId); + return new Enumerator(_lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1563,26 +1563,26 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; + private readonly int _lastRowId; // 0: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int lastRowId) { - this.lastRowId = lastRowId; - this.currentRowId = 0; + _lastRowId = lastRowId; + _currentRowId = 0; } public MemberReferenceHandle Current { get { - return MemberReferenceHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return MemberReferenceHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1590,14 +1590,14 @@ public bool MoveNext() { // PERF: keep this method small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1622,16 +1622,16 @@ public struct PropertyAccessors { // Workaround: JIT doesn't generate good code for nested structures, so use uints. - private readonly uint getterRowId; - private readonly uint setterRowId; + private readonly uint _getterRowId; + private readonly uint _setterRowId; - public MethodDefinitionHandle Getter { get { return MethodDefinitionHandle.FromRowId(getterRowId); } } - public MethodDefinitionHandle Setter { get { return MethodDefinitionHandle.FromRowId(setterRowId); } } + public MethodDefinitionHandle Getter { get { return MethodDefinitionHandle.FromRowId(_getterRowId); } } + public MethodDefinitionHandle Setter { get { return MethodDefinitionHandle.FromRowId(_setterRowId); } } internal PropertyAccessors(uint getterRowId, uint setterRowId) { - this.getterRowId = getterRowId; - this.setterRowId = setterRowId; + _getterRowId = getterRowId; + _setterRowId = setterRowId; } } @@ -1639,19 +1639,19 @@ public struct EventAccessors { // Workaround: JIT doesn't generate good code for nested structures, so use uints. - private readonly uint adderRowId; - private readonly uint removerRowId; - private readonly uint raiserRowId; + private readonly uint _adderRowId; + private readonly uint _removerRowId; + private readonly uint _raiserRowId; - public MethodDefinitionHandle Adder { get { return MethodDefinitionHandle.FromRowId(adderRowId); } } - public MethodDefinitionHandle Remover { get { return MethodDefinitionHandle.FromRowId(removerRowId); } } - public MethodDefinitionHandle Raiser { get { return MethodDefinitionHandle.FromRowId(raiserRowId); } } + public MethodDefinitionHandle Adder { get { return MethodDefinitionHandle.FromRowId(_adderRowId); } } + public MethodDefinitionHandle Remover { get { return MethodDefinitionHandle.FromRowId(_removerRowId); } } + public MethodDefinitionHandle Raiser { get { return MethodDefinitionHandle.FromRowId(_raiserRowId); } } internal EventAccessors(uint adderRowId, uint removerRowId, uint raiserRowId) { - this.adderRowId = adderRowId; - this.removerRowId = removerRowId; - this.raiserRowId = raiserRowId; + _adderRowId = adderRowId; + _removerRowId = removerRowId; + _raiserRowId = raiserRowId; } } @@ -1660,25 +1660,25 @@ internal EventAccessors(uint adderRowId, uint removerRowId, uint raiserRowId) /// public struct AssemblyReferenceHandleCollection : IReadOnlyCollection { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; internal AssemblyReferenceHandleCollection(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; + _reader = reader; } public int Count { get { - return reader.AssemblyRefTable.NumberOfNonVirtualRows + reader.AssemblyRefTable.NumberOfVirtualRows; + return _reader.AssemblyRefTable.NumberOfNonVirtualRows + _reader.AssemblyRefTable.NumberOfVirtualRows; } } public Enumerator GetEnumerator() { - return new Enumerator(reader); + return new Enumerator(_reader); } IEnumerator IEnumerable.GetEnumerator() @@ -1693,60 +1693,60 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // 0: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; - private int virtualRowId; + private int _virtualRowId; internal Enumerator(MetadataReader reader) { - this.reader = reader; - this.currentRowId = 0; - this.virtualRowId = -1; + _reader = reader; + _currentRowId = 0; + _virtualRowId = -1; } public AssemblyReferenceHandle Current { get { - if (virtualRowId >= 0) + if (_virtualRowId >= 0) { - if (virtualRowId == EnumEnded) + if (_virtualRowId == EnumEnded) { return default(AssemblyReferenceHandle); } - return AssemblyReferenceHandle.FromVirtualIndex((AssemblyReferenceHandle.VirtualIndex)((uint)virtualRowId)); + return AssemblyReferenceHandle.FromVirtualIndex((AssemblyReferenceHandle.VirtualIndex)((uint)_virtualRowId)); } else { - return AssemblyReferenceHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return AssemblyReferenceHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } } public bool MoveNext() { - if (this.currentRowId < reader.AssemblyRefTable.NumberOfNonVirtualRows) + if (_currentRowId < _reader.AssemblyRefTable.NumberOfNonVirtualRows) { - this.currentRowId++; + _currentRowId++; return true; } - if (this.virtualRowId < reader.AssemblyRefTable.NumberOfVirtualRows - 1) + if (_virtualRowId < _reader.AssemblyRefTable.NumberOfVirtualRows - 1) { - this.virtualRowId++; + _virtualRowId++; return true; } - this.currentRowId = EnumEnded; - this.virtualRowId = EnumEnded; + _currentRowId = EnumEnded; + _virtualRowId = EnumEnded; return false; } @@ -1771,22 +1771,22 @@ void IDisposable.Dispose() /// public struct ManifestResourceHandleCollection : IReadOnlyCollection { - private readonly int lastRowId; + private readonly int _lastRowId; // Creates collection that represents the entire ManifestResource table. internal ManifestResourceHandleCollection(int lastRowId) { - this.lastRowId = lastRowId; + _lastRowId = lastRowId; } public int Count { - get { return lastRowId; } + get { return _lastRowId; } } public Enumerator GetEnumerator() { - return new Enumerator(lastRowId); + return new Enumerator(_lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1801,26 +1801,26 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; + private readonly int _lastRowId; // 0: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int lastRowId) { - this.lastRowId = lastRowId; - this.currentRowId = 0; + _lastRowId = lastRowId; + _currentRowId = 0; } public ManifestResourceHandle Current { get { - return ManifestResourceHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return ManifestResourceHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1828,14 +1828,14 @@ public bool MoveNext() { // PERF: keep this method small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } @@ -1861,22 +1861,22 @@ void IDisposable.Dispose() /// public struct AssemblyFileHandleCollection : IReadOnlyCollection { - private readonly int lastRowId; + private readonly int _lastRowId; // Creates collection that represents the entire AssemblyFile table. internal AssemblyFileHandleCollection(int lastRowId) { - this.lastRowId = lastRowId; + _lastRowId = lastRowId; } public int Count { - get { return lastRowId; } + get { return _lastRowId; } } public Enumerator GetEnumerator() { - return new Enumerator(lastRowId); + return new Enumerator(_lastRowId); } IEnumerator IEnumerable.GetEnumerator() @@ -1891,26 +1891,26 @@ IEnumerator IEnumerable.GetEnumerator() public struct Enumerator : IEnumerator, IEnumerator { - private readonly int lastRowId; + private readonly int _lastRowId; // 0: initial state // EnumEnded: enumeration ended - private int currentRowId; + private int _currentRowId; // greater than any RowId and with last 24 bits clear, so that Current returns nil token private const int EnumEnded = (int)TokenTypeIds.RIDMask + 1; internal Enumerator(int lastRowId) { - this.lastRowId = lastRowId; - this.currentRowId = 0; + _lastRowId = lastRowId; + _currentRowId = 0; } public AssemblyFileHandle Current { get { - return AssemblyFileHandle.FromRowId((uint)currentRowId & TokenTypeIds.RIDMask); + return AssemblyFileHandle.FromRowId((uint)_currentRowId & TokenTypeIds.RIDMask); } } @@ -1918,14 +1918,14 @@ public bool MoveNext() { // PERF: keep this method small to enable inlining. - if (this.currentRowId >= lastRowId) + if (_currentRowId >= _lastRowId) { - this.currentRowId = EnumEnded; + _currentRowId = EnumEnded; return false; } else { - this.currentRowId++; + _currentRowId++; return true; } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Handles.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Handles.cs index 5f57d400560d31d83e173a3d3442f18d47c1e224..9dba5a69544ee6cb50b046f11414024d4a588620 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Handles.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Handles.cs @@ -99,12 +99,12 @@ internal static void ThrowInvalidCodedIndex() public struct ModuleDefinitionHandle : IEquatable { private const uint tokenType = TokenTypeIds.Module; - private readonly uint rowId; + private readonly uint _rowId; internal ModuleDefinitionHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static ModuleDefinitionHandle FromRowId(uint rowId) @@ -114,7 +114,7 @@ internal static ModuleDefinitionHandle FromRowId(uint rowId) public static implicit operator Handle(ModuleDefinitionHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator ModuleDefinitionHandle(Handle handle) @@ -135,43 +135,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(ModuleDefinitionHandle left, ModuleDefinitionHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is ModuleDefinitionHandle && ((ModuleDefinitionHandle)obj).rowId == this.rowId; + return obj is ModuleDefinitionHandle && ((ModuleDefinitionHandle)obj)._rowId == _rowId; } public bool Equals(ModuleDefinitionHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(ModuleDefinitionHandle left, ModuleDefinitionHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct AssemblyDefinitionHandle : IEquatable { private const uint tokenType = TokenTypeIds.Assembly; - private readonly uint rowId; + private readonly uint _rowId; internal AssemblyDefinitionHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static AssemblyDefinitionHandle FromRowId(uint rowId) @@ -181,7 +181,7 @@ internal static AssemblyDefinitionHandle FromRowId(uint rowId) public static implicit operator Handle(AssemblyDefinitionHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator AssemblyDefinitionHandle(Handle handle) @@ -202,43 +202,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(AssemblyDefinitionHandle left, AssemblyDefinitionHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is AssemblyDefinitionHandle && ((AssemblyDefinitionHandle)obj).rowId == this.rowId; + return obj is AssemblyDefinitionHandle && ((AssemblyDefinitionHandle)obj)._rowId == _rowId; } public bool Equals(AssemblyDefinitionHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(AssemblyDefinitionHandle left, AssemblyDefinitionHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct InterfaceImplementationHandle : IEquatable { private const uint tokenType = TokenTypeIds.InterfaceImpl; - private readonly uint rowId; + private readonly uint _rowId; internal InterfaceImplementationHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static InterfaceImplementationHandle FromRowId(uint rowId) @@ -248,7 +248,7 @@ internal static InterfaceImplementationHandle FromRowId(uint rowId) public static implicit operator Handle(InterfaceImplementationHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator InterfaceImplementationHandle(Handle handle) @@ -269,43 +269,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(InterfaceImplementationHandle left, InterfaceImplementationHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is InterfaceImplementationHandle && ((InterfaceImplementationHandle)obj).rowId == this.rowId; + return obj is InterfaceImplementationHandle && ((InterfaceImplementationHandle)obj)._rowId == _rowId; } public bool Equals(InterfaceImplementationHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(InterfaceImplementationHandle left, InterfaceImplementationHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct MethodDefinitionHandle : IEquatable { private const uint tokenType = TokenTypeIds.MethodDef; - private readonly uint rowId; + private readonly uint _rowId; private MethodDefinitionHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static MethodDefinitionHandle FromRowId(uint rowId) @@ -315,7 +315,7 @@ internal static MethodDefinitionHandle FromRowId(uint rowId) public static implicit operator Handle(MethodDefinitionHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator MethodDefinitionHandle(Handle handle) @@ -336,43 +336,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(MethodDefinitionHandle left, MethodDefinitionHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is MethodDefinitionHandle && ((MethodDefinitionHandle)obj).rowId == this.rowId; + return obj is MethodDefinitionHandle && ((MethodDefinitionHandle)obj)._rowId == _rowId; } public bool Equals(MethodDefinitionHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(MethodDefinitionHandle left, MethodDefinitionHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct MethodImplementationHandle : IEquatable { private const uint tokenType = TokenTypeIds.MethodImpl; - private readonly uint rowId; + private readonly uint _rowId; private MethodImplementationHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static MethodImplementationHandle FromRowId(uint rowId) @@ -382,7 +382,7 @@ internal static MethodImplementationHandle FromRowId(uint rowId) public static implicit operator Handle(MethodImplementationHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator MethodImplementationHandle(Handle handle) @@ -403,43 +403,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(MethodImplementationHandle left, MethodImplementationHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is MethodImplementationHandle && ((MethodImplementationHandle)obj).rowId == this.rowId; + return obj is MethodImplementationHandle && ((MethodImplementationHandle)obj)._rowId == _rowId; } public bool Equals(MethodImplementationHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(MethodImplementationHandle left, MethodImplementationHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct MethodSpecificationHandle : IEquatable { private const uint tokenType = TokenTypeIds.MethodSpec; - private readonly uint rowId; + private readonly uint _rowId; private MethodSpecificationHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static MethodSpecificationHandle FromRowId(uint rowId) @@ -449,7 +449,7 @@ internal static MethodSpecificationHandle FromRowId(uint rowId) public static implicit operator Handle(MethodSpecificationHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator MethodSpecificationHandle(Handle handle) @@ -470,43 +470,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(MethodSpecificationHandle left, MethodSpecificationHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is MethodSpecificationHandle && ((MethodSpecificationHandle)obj).rowId == this.rowId; + return obj is MethodSpecificationHandle && ((MethodSpecificationHandle)obj)._rowId == _rowId; } public bool Equals(MethodSpecificationHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(MethodSpecificationHandle left, MethodSpecificationHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct TypeDefinitionHandle : IEquatable { private const uint tokenType = TokenTypeIds.TypeDef; - private readonly uint rowId; + private readonly uint _rowId; private TypeDefinitionHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static TypeDefinitionHandle FromRowId(uint rowId) @@ -516,7 +516,7 @@ internal static TypeDefinitionHandle FromRowId(uint rowId) public static implicit operator Handle(TypeDefinitionHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator TypeDefinitionHandle(Handle handle) @@ -537,43 +537,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(TypeDefinitionHandle left, TypeDefinitionHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is TypeDefinitionHandle && ((TypeDefinitionHandle)obj).rowId == this.rowId; + return obj is TypeDefinitionHandle && ((TypeDefinitionHandle)obj)._rowId == _rowId; } public bool Equals(TypeDefinitionHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(TypeDefinitionHandle left, TypeDefinitionHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct ExportedTypeHandle : IEquatable { private const uint tokenType = TokenTypeIds.ExportedType; - private readonly uint rowId; + private readonly uint _rowId; private ExportedTypeHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static ExportedTypeHandle FromRowId(uint rowId) @@ -583,7 +583,7 @@ internal static ExportedTypeHandle FromRowId(uint rowId) public static implicit operator Handle(ExportedTypeHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator ExportedTypeHandle(Handle handle) @@ -604,43 +604,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(ExportedTypeHandle left, ExportedTypeHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is ExportedTypeHandle && ((ExportedTypeHandle)obj).rowId == this.rowId; + return obj is ExportedTypeHandle && ((ExportedTypeHandle)obj)._rowId == _rowId; } public bool Equals(ExportedTypeHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(ExportedTypeHandle left, ExportedTypeHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct TypeReferenceHandle : IEquatable { private const uint tokenType = TokenTypeIds.TypeRef; - private readonly uint rowId; + private readonly uint _rowId; private TypeReferenceHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static TypeReferenceHandle FromRowId(uint rowId) @@ -650,7 +650,7 @@ internal static TypeReferenceHandle FromRowId(uint rowId) public static implicit operator Handle(TypeReferenceHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator TypeReferenceHandle(Handle handle) @@ -671,43 +671,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(TypeReferenceHandle left, TypeReferenceHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is TypeReferenceHandle && ((TypeReferenceHandle)obj).rowId == this.rowId; + return obj is TypeReferenceHandle && ((TypeReferenceHandle)obj)._rowId == _rowId; } public bool Equals(TypeReferenceHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(TypeReferenceHandle left, TypeReferenceHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct TypeSpecificationHandle : IEquatable { private const uint tokenType = TokenTypeIds.TypeSpec; - private readonly uint rowId; + private readonly uint _rowId; private TypeSpecificationHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static TypeSpecificationHandle FromRowId(uint rowId) @@ -717,7 +717,7 @@ internal static TypeSpecificationHandle FromRowId(uint rowId) public static implicit operator Handle(TypeSpecificationHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator TypeSpecificationHandle(Handle handle) @@ -738,43 +738,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(TypeSpecificationHandle left, TypeSpecificationHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is TypeSpecificationHandle && ((TypeSpecificationHandle)obj).rowId == this.rowId; + return obj is TypeSpecificationHandle && ((TypeSpecificationHandle)obj)._rowId == _rowId; } public bool Equals(TypeSpecificationHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(TypeSpecificationHandle left, TypeSpecificationHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct MemberReferenceHandle : IEquatable { private const uint tokenType = TokenTypeIds.MemberRef; - private readonly uint rowId; + private readonly uint _rowId; private MemberReferenceHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static MemberReferenceHandle FromRowId(uint rowId) @@ -784,7 +784,7 @@ internal static MemberReferenceHandle FromRowId(uint rowId) public static implicit operator Handle(MemberReferenceHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator MemberReferenceHandle(Handle handle) @@ -805,43 +805,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(MemberReferenceHandle left, MemberReferenceHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is MemberReferenceHandle && ((MemberReferenceHandle)obj).rowId == this.rowId; + return obj is MemberReferenceHandle && ((MemberReferenceHandle)obj)._rowId == _rowId; } public bool Equals(MemberReferenceHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(MemberReferenceHandle left, MemberReferenceHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct FieldDefinitionHandle : IEquatable { private const uint tokenType = TokenTypeIds.FieldDef; - private readonly uint rowId; + private readonly uint _rowId; private FieldDefinitionHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static FieldDefinitionHandle FromRowId(uint rowId) @@ -851,7 +851,7 @@ internal static FieldDefinitionHandle FromRowId(uint rowId) public static implicit operator Handle(FieldDefinitionHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator FieldDefinitionHandle(Handle handle) @@ -872,43 +872,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(FieldDefinitionHandle left, FieldDefinitionHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is FieldDefinitionHandle && ((FieldDefinitionHandle)obj).rowId == this.rowId; + return obj is FieldDefinitionHandle && ((FieldDefinitionHandle)obj)._rowId == _rowId; } public bool Equals(FieldDefinitionHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(FieldDefinitionHandle left, FieldDefinitionHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct EventDefinitionHandle : IEquatable { private const uint tokenType = TokenTypeIds.Event; - private readonly uint rowId; + private readonly uint _rowId; private EventDefinitionHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static EventDefinitionHandle FromRowId(uint rowId) @@ -918,7 +918,7 @@ internal static EventDefinitionHandle FromRowId(uint rowId) public static implicit operator Handle(EventDefinitionHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator EventDefinitionHandle(Handle handle) @@ -939,43 +939,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(EventDefinitionHandle left, EventDefinitionHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is EventDefinitionHandle && ((EventDefinitionHandle)obj).rowId == this.rowId; + return obj is EventDefinitionHandle && ((EventDefinitionHandle)obj)._rowId == _rowId; } public bool Equals(EventDefinitionHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(EventDefinitionHandle left, EventDefinitionHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct PropertyDefinitionHandle : IEquatable { private const uint tokenType = TokenTypeIds.Property; - private readonly uint rowId; + private readonly uint _rowId; private PropertyDefinitionHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static PropertyDefinitionHandle FromRowId(uint rowId) @@ -985,7 +985,7 @@ internal static PropertyDefinitionHandle FromRowId(uint rowId) public static implicit operator Handle(PropertyDefinitionHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator PropertyDefinitionHandle(Handle handle) @@ -1006,43 +1006,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(PropertyDefinitionHandle left, PropertyDefinitionHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is PropertyDefinitionHandle && ((PropertyDefinitionHandle)obj).rowId == this.rowId; + return obj is PropertyDefinitionHandle && ((PropertyDefinitionHandle)obj)._rowId == _rowId; } public bool Equals(PropertyDefinitionHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(PropertyDefinitionHandle left, PropertyDefinitionHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct StandaloneSignatureHandle : IEquatable { private const uint tokenType = TokenTypeIds.Signature; - private readonly uint rowId; + private readonly uint _rowId; private StandaloneSignatureHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static StandaloneSignatureHandle FromRowId(uint rowId) @@ -1052,7 +1052,7 @@ internal static StandaloneSignatureHandle FromRowId(uint rowId) public static implicit operator Handle(StandaloneSignatureHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator StandaloneSignatureHandle(Handle handle) @@ -1073,43 +1073,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(StandaloneSignatureHandle left, StandaloneSignatureHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is StandaloneSignatureHandle && ((StandaloneSignatureHandle)obj).rowId == this.rowId; + return obj is StandaloneSignatureHandle && ((StandaloneSignatureHandle)obj)._rowId == _rowId; } public bool Equals(StandaloneSignatureHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(StandaloneSignatureHandle left, StandaloneSignatureHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct ParameterHandle : IEquatable { private const uint tokenType = TokenTypeIds.ParamDef; - private readonly uint rowId; + private readonly uint _rowId; private ParameterHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static ParameterHandle FromRowId(uint rowId) @@ -1119,7 +1119,7 @@ internal static ParameterHandle FromRowId(uint rowId) public static implicit operator Handle(ParameterHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator ParameterHandle(Handle handle) @@ -1140,43 +1140,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(ParameterHandle left, ParameterHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is ParameterHandle && ((ParameterHandle)obj).rowId == this.rowId; + return obj is ParameterHandle && ((ParameterHandle)obj)._rowId == _rowId; } public bool Equals(ParameterHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(ParameterHandle left, ParameterHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct GenericParameterHandle : IEquatable { private const uint tokenType = TokenTypeIds.GenericParam; - private readonly uint rowId; + private readonly uint _rowId; private GenericParameterHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static GenericParameterHandle FromRowId(uint rowId) @@ -1186,7 +1186,7 @@ internal static GenericParameterHandle FromRowId(uint rowId) public static implicit operator Handle(GenericParameterHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator GenericParameterHandle(Handle handle) @@ -1207,43 +1207,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(GenericParameterHandle left, GenericParameterHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is GenericParameterHandle && ((GenericParameterHandle)obj).rowId == this.rowId; + return obj is GenericParameterHandle && ((GenericParameterHandle)obj)._rowId == _rowId; } public bool Equals(GenericParameterHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(GenericParameterHandle left, GenericParameterHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct GenericParameterConstraintHandle : IEquatable { private const uint tokenType = TokenTypeIds.GenericParamConstraint; - private readonly uint rowId; + private readonly uint _rowId; private GenericParameterConstraintHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static GenericParameterConstraintHandle FromRowId(uint rowId) @@ -1253,7 +1253,7 @@ internal static GenericParameterConstraintHandle FromRowId(uint rowId) public static implicit operator Handle(GenericParameterConstraintHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator GenericParameterConstraintHandle(Handle handle) @@ -1274,43 +1274,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(GenericParameterConstraintHandle left, GenericParameterConstraintHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is GenericParameterConstraintHandle && ((GenericParameterConstraintHandle)obj).rowId == this.rowId; + return obj is GenericParameterConstraintHandle && ((GenericParameterConstraintHandle)obj)._rowId == _rowId; } public bool Equals(GenericParameterConstraintHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(GenericParameterConstraintHandle left, GenericParameterConstraintHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct ModuleReferenceHandle : IEquatable { private const uint tokenType = TokenTypeIds.ModuleRef; - private readonly uint rowId; + private readonly uint _rowId; private ModuleReferenceHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static ModuleReferenceHandle FromRowId(uint rowId) @@ -1320,7 +1320,7 @@ internal static ModuleReferenceHandle FromRowId(uint rowId) public static implicit operator Handle(ModuleReferenceHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator ModuleReferenceHandle(Handle handle) @@ -1341,31 +1341,31 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(ModuleReferenceHandle left, ModuleReferenceHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is ModuleReferenceHandle && ((ModuleReferenceHandle)obj).rowId == this.rowId; + return obj is ModuleReferenceHandle && ((ModuleReferenceHandle)obj)._rowId == _rowId; } public bool Equals(ModuleReferenceHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(ModuleReferenceHandle left, ModuleReferenceHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } @@ -1377,7 +1377,7 @@ public struct AssemblyReferenceHandle : IEquatable // 0..24: Heap index or Virtual index // 25..30: TokenTypeId: AssemblyRef // 31: IsVirtual - private readonly uint token; + private readonly uint _token; internal enum VirtualIndex { @@ -1393,7 +1393,7 @@ internal enum VirtualIndex private AssemblyReferenceHandle(uint token) { - this.token = token; + _token = token; } internal static AssemblyReferenceHandle FromRowId(uint rowId) @@ -1410,7 +1410,7 @@ internal static AssemblyReferenceHandle FromVirtualIndex(VirtualIndex virtualInd public static implicit operator Handle(AssemblyReferenceHandle handle) { - return new Handle(handle.token); + return new Handle(handle._token); } public static explicit operator AssemblyReferenceHandle(Handle handle) @@ -1427,54 +1427,54 @@ public bool IsNil { get { - return (token & TokenTypeIds.VirtualBitAndRowIdMask) == 0; + return (_token & TokenTypeIds.VirtualBitAndRowIdMask) == 0; } } internal bool IsVirtual { - get { return (token & TokenTypeIds.VirtualTokenMask) != 0; } + get { return (_token & TokenTypeIds.VirtualTokenMask) != 0; } } - internal uint Token { get { return token; } } + internal uint Token { get { return _token; } } - internal uint RowId { get { return token & TokenTypeIds.RIDMask; } } + internal uint RowId { get { return _token & TokenTypeIds.RIDMask; } } public static bool operator ==(AssemblyReferenceHandle left, AssemblyReferenceHandle right) { - return left.token == right.token; + return left._token == right._token; } public override bool Equals(object obj) { - return obj is AssemblyReferenceHandle && ((AssemblyReferenceHandle)obj).token == this.token; + return obj is AssemblyReferenceHandle && ((AssemblyReferenceHandle)obj)._token == _token; } public bool Equals(AssemblyReferenceHandle other) { - return this.token == other.token; + return _token == other._token; } public override int GetHashCode() { - return this.token.GetHashCode(); + return _token.GetHashCode(); } public static bool operator !=(AssemblyReferenceHandle left, AssemblyReferenceHandle right) { - return left.token != right.token; + return left._token != right._token; } } public struct CustomAttributeHandle : IEquatable { private const uint tokenType = TokenTypeIds.CustomAttribute; - private readonly uint rowId; + private readonly uint _rowId; private CustomAttributeHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static CustomAttributeHandle FromRowId(uint rowId) @@ -1484,7 +1484,7 @@ internal static CustomAttributeHandle FromRowId(uint rowId) public static implicit operator Handle(CustomAttributeHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator CustomAttributeHandle(Handle handle) @@ -1501,47 +1501,47 @@ public bool IsNil { get { - return rowId == 0; + return _rowId == 0; } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(CustomAttributeHandle left, CustomAttributeHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is CustomAttributeHandle && ((CustomAttributeHandle)obj).rowId == this.rowId; + return obj is CustomAttributeHandle && ((CustomAttributeHandle)obj)._rowId == _rowId; } public bool Equals(CustomAttributeHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(CustomAttributeHandle left, CustomAttributeHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct DeclarativeSecurityAttributeHandle : IEquatable { private const uint tokenType = TokenTypeIds.DeclSecurity; - private readonly uint rowId; + private readonly uint _rowId; private DeclarativeSecurityAttributeHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static DeclarativeSecurityAttributeHandle FromRowId(uint rowId) @@ -1551,7 +1551,7 @@ internal static DeclarativeSecurityAttributeHandle FromRowId(uint rowId) public static implicit operator Handle(DeclarativeSecurityAttributeHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator DeclarativeSecurityAttributeHandle(Handle handle) @@ -1568,47 +1568,47 @@ public bool IsNil { get { - return rowId == 0; + return _rowId == 0; } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(DeclarativeSecurityAttributeHandle left, DeclarativeSecurityAttributeHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is DeclarativeSecurityAttributeHandle && ((DeclarativeSecurityAttributeHandle)obj).rowId == this.rowId; + return obj is DeclarativeSecurityAttributeHandle && ((DeclarativeSecurityAttributeHandle)obj)._rowId == _rowId; } public bool Equals(DeclarativeSecurityAttributeHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(DeclarativeSecurityAttributeHandle left, DeclarativeSecurityAttributeHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct ConstantHandle : IEquatable { private const uint tokenType = TokenTypeIds.Constant; - private readonly uint rowId; + private readonly uint _rowId; private ConstantHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static ConstantHandle FromRowId(uint rowId) @@ -1618,7 +1618,7 @@ internal static ConstantHandle FromRowId(uint rowId) public static implicit operator Handle(ConstantHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator ConstantHandle(Handle handle) @@ -1639,43 +1639,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(ConstantHandle left, ConstantHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is ConstantHandle && ((ConstantHandle)obj).rowId == this.rowId; + return obj is ConstantHandle && ((ConstantHandle)obj)._rowId == _rowId; } public bool Equals(ConstantHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(ConstantHandle left, ConstantHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct ManifestResourceHandle : IEquatable { private const uint tokenType = TokenTypeIds.ManifestResource; - private readonly uint rowId; + private readonly uint _rowId; private ManifestResourceHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static ManifestResourceHandle FromRowId(uint rowId) @@ -1685,7 +1685,7 @@ internal static ManifestResourceHandle FromRowId(uint rowId) public static implicit operator Handle(ManifestResourceHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator ManifestResourceHandle(Handle handle) @@ -1706,43 +1706,43 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(ManifestResourceHandle left, ManifestResourceHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is ManifestResourceHandle && ((ManifestResourceHandle)obj).rowId == this.rowId; + return obj is ManifestResourceHandle && ((ManifestResourceHandle)obj)._rowId == _rowId; } public bool Equals(ManifestResourceHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(ManifestResourceHandle left, ManifestResourceHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } public struct AssemblyFileHandle : IEquatable { private const uint tokenType = TokenTypeIds.File; - private readonly uint rowId; + private readonly uint _rowId; private AssemblyFileHandle(uint rowId) { Debug.Assert(TokenTypeIds.IsValidRowId(rowId)); - this.rowId = rowId; + _rowId = rowId; } internal static AssemblyFileHandle FromRowId(uint rowId) @@ -1752,7 +1752,7 @@ internal static AssemblyFileHandle FromRowId(uint rowId) public static implicit operator Handle(AssemblyFileHandle handle) { - return new Handle(handle.rowId | tokenType); + return new Handle(handle._rowId | tokenType); } public static explicit operator AssemblyFileHandle(Handle handle) @@ -1773,31 +1773,31 @@ public bool IsNil } } - internal uint RowId { get { return rowId; } } + internal uint RowId { get { return _rowId; } } public static bool operator ==(AssemblyFileHandle left, AssemblyFileHandle right) { - return left.rowId == right.rowId; + return left._rowId == right._rowId; } public override bool Equals(object obj) { - return obj is AssemblyFileHandle && ((AssemblyFileHandle)obj).rowId == this.rowId; + return obj is AssemblyFileHandle && ((AssemblyFileHandle)obj)._rowId == _rowId; } public bool Equals(AssemblyFileHandle other) { - return this.rowId == other.rowId; + return _rowId == other._rowId; } public override int GetHashCode() { - return this.rowId.GetHashCode(); + return _rowId.GetHashCode(); } public static bool operator !=(AssemblyFileHandle left, AssemblyFileHandle right) { - return left.rowId != right.rowId; + return left._rowId != right._rowId; } } @@ -1805,12 +1805,12 @@ public override int GetHashCode() public struct UserStringHandle : IEquatable { private const uint tokenType = TokenTypeIds.UserString; - private readonly uint token; + private readonly uint _token; private UserStringHandle(uint token) { Debug.Assert((token & TokenTypeIds.TokenTypeMask) == tokenType); - this.token = token; + _token = token; } internal static UserStringHandle FromIndex(uint heapIndex) @@ -1820,7 +1820,7 @@ internal static UserStringHandle FromIndex(uint heapIndex) public static implicit operator Handle(UserStringHandle handle) { - return new Handle(handle.token); + return new Handle(handle._token); } public static explicit operator UserStringHandle(Handle handle) @@ -1837,7 +1837,7 @@ public bool IsNil { get { - return (token & TokenTypeIds.RIDMask) == 0; + return (_token & TokenTypeIds.RIDMask) == 0; } } @@ -1845,33 +1845,33 @@ internal int Index { get { - return (int)(token & TokenTypeIds.RIDMask); + return (int)(_token & TokenTypeIds.RIDMask); } } public static bool operator ==(UserStringHandle left, UserStringHandle right) { - return left.token == right.token; + return left._token == right._token; } public override bool Equals(object obj) { - return obj is UserStringHandle && ((UserStringHandle)obj).token == this.token; + return obj is UserStringHandle && ((UserStringHandle)obj)._token == _token; } public bool Equals(UserStringHandle other) { - return this.token == other.token; + return _token == other._token; } public override int GetHashCode() { - return this.token.GetHashCode(); + return _token.GetHashCode(); } public static bool operator !=(UserStringHandle left, UserStringHandle right) { - return left.token != right.token; + return left._token != right._token; } } @@ -1882,7 +1882,7 @@ public struct StringHandle : IEquatable // 0..24: Heap index or Virtual index // 25..30: TokenTypeId: String, WinRTPrefixedString // 31: IsVirtual - private readonly uint token; + private readonly uint _token; internal enum VirtualIndex { @@ -1968,7 +1968,7 @@ private StringHandle(uint token) Debug.Assert((token & TokenTypeIds.TokenTypeMask) == TokenTypeIds.String || (token & TokenTypeIds.TokenTypeMask) == TokenTypeIds.WinRTPrefixedString || (token & TokenTypeIds.TokenTypeMask) == TokenTypeIds.DotTerminatedString); - this.token = token; + _token = token; } internal static StringHandle FromIndex(uint heapIndex) @@ -2003,7 +2003,7 @@ internal StringHandle SuffixRaw(int prefixByteLength) public static implicit operator Handle(StringHandle handle) { - return new Handle(handle.token); + return new Handle(handle._token); } public static explicit operator StringHandle(Handle handle) @@ -2020,20 +2020,20 @@ public bool IsNil { get { - return (token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; + return (_token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; } } internal bool IsVirtual { - get { return (token & TokenTypeIds.VirtualTokenMask) != 0; } + get { return (_token & TokenTypeIds.VirtualTokenMask) != 0; } } internal int Index { get { - return (int)(token & TokenTypeIds.RIDMask); + return (int)(_token & TokenTypeIds.RIDMask); } } @@ -2041,33 +2041,33 @@ internal StringKind StringKind { get { - return (StringKind)((token & TokenTypeIds.StringOrNamespaceKindMask) >> TokenTypeIds.RowIdBitCount); + return (StringKind)((_token & TokenTypeIds.StringOrNamespaceKindMask) >> TokenTypeIds.RowIdBitCount); } } public static bool operator ==(StringHandle left, StringHandle right) { - return left.token == right.token; + return left._token == right._token; } public override bool Equals(object obj) { - return obj is StringHandle && ((StringHandle)obj).token == this.token; + return obj is StringHandle && ((StringHandle)obj)._token == _token; } public bool Equals(StringHandle other) { - return this.token == other.token; + return _token == other._token; } public override int GetHashCode() { - return this.token.GetHashCode(); + return _token.GetHashCode(); } public static bool operator !=(StringHandle left, StringHandle right) { - return left.token != right.token; + return left._token != right._token; } } @@ -2092,14 +2092,14 @@ public struct NamespaceDefinitionHandle : IEquatable // in the string heap. This is used to represent namespaces that are parents of other namespaces // but no type definitions or forwarders of their own. // - private readonly uint token; + private readonly uint _token; private NamespaceDefinitionHandle(uint token) { Debug.Assert((token & TokenTypeIds.TokenTypeMask) == TokenTypeIds.Namespace || (token & TokenTypeIds.TokenTypeMask) == TokenTypeIds.SyntheticNamespace); - this.token = token; + _token = token; } internal static NamespaceDefinitionHandle FromIndexOfFullName(uint stringHeapIndex) @@ -2116,7 +2116,7 @@ internal static NamespaceDefinitionHandle FromIndexOfSimpleName(uint stringHeapI public static implicit operator Handle(NamespaceDefinitionHandle handle) { - return new Handle(handle.token); + return new Handle(handle._token); } public static explicit operator NamespaceDefinitionHandle(Handle handle) @@ -2133,7 +2133,7 @@ public bool IsNil { get { - return (token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; + return (_token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; } } @@ -2141,7 +2141,7 @@ internal int Index { get { - return (int)(token & TokenTypeIds.RIDMask); + return (int)(_token & TokenTypeIds.RIDMask); } } @@ -2149,7 +2149,7 @@ internal bool IsVirtual { get { - return (token & TokenTypeIds.VirtualTokenMask) != 0; + return (_token & TokenTypeIds.VirtualTokenMask) != 0; } } @@ -2157,7 +2157,7 @@ internal NamespaceKind NamespaceKind { get { - return (NamespaceKind)((token & TokenTypeIds.StringOrNamespaceKindMask) >> TokenTypeIds.RowIdBitCount); + return (NamespaceKind)((_token & TokenTypeIds.StringOrNamespaceKindMask) >> TokenTypeIds.RowIdBitCount); } } @@ -2165,7 +2165,7 @@ internal bool HasFullName { get { - return (token & (TokenTypeIds.TokenTypeMask)) != TokenTypeIds.SyntheticNamespace; + return (_token & (TokenTypeIds.TokenTypeMask)) != TokenTypeIds.SyntheticNamespace; } } @@ -2178,32 +2178,32 @@ internal StringHandle GetFullName() public static bool operator ==(NamespaceDefinitionHandle left, NamespaceDefinitionHandle right) { - return left.token == right.token; + return left._token == right._token; } public int CompareTo(NamespaceDefinitionHandle other) { - return TokenTypeIds.CompareTokens(this.token, other.token); + return TokenTypeIds.CompareTokens(_token, other._token); } public override bool Equals(object obj) { - return obj is NamespaceDefinitionHandle && ((NamespaceDefinitionHandle)obj).token == this.token; + return obj is NamespaceDefinitionHandle && ((NamespaceDefinitionHandle)obj)._token == _token; } public bool Equals(NamespaceDefinitionHandle other) { - return this.token == other.token; + return _token == other._token; } public override int GetHashCode() { - return this.token.GetHashCode(); + return _token.GetHashCode(); } public static bool operator !=(NamespaceDefinitionHandle left, NamespaceDefinitionHandle right) { - return left.token != right.token; + return left._token != right._token; } } @@ -2216,7 +2216,7 @@ public struct BlobHandle : IEquatable // 0..24: Heap index or Virtual Value (16 bits) + Virtual Index (8 bits) // 25..30: TokenTypeId: Blob // 31: IsVirtual - private readonly uint token; + private readonly uint _token; internal enum VirtualIndex : byte { @@ -2240,7 +2240,7 @@ internal enum VirtualIndex : byte private BlobHandle(uint token) { Debug.Assert((token & TokenTypeIds.TokenTypeMask) == tokenType); - this.token = token; + _token = token; } internal static BlobHandle FromIndex(uint heapIndex) @@ -2269,7 +2269,7 @@ internal unsafe void SubstituteTemplateParameters(byte[] blob) public static implicit operator Handle(BlobHandle handle) { - return new Handle(handle.token); + return new Handle(handle._token); } public static explicit operator BlobHandle(Handle handle) @@ -2286,7 +2286,7 @@ public bool IsNil { get { - return (token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; + return (_token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; } } @@ -2295,7 +2295,7 @@ internal int Index get { Debug.Assert(!IsVirtual); - return (int)(token & TokenTypeIds.RIDMask); + return (int)(_token & TokenTypeIds.RIDMask); } } @@ -2303,44 +2303,44 @@ internal bool IsVirtual { get { - return (token & TokenTypeIds.VirtualTokenMask) != 0; + return (_token & TokenTypeIds.VirtualTokenMask) != 0; } } internal VirtualIndex GetVirtualIndex() { Debug.Assert(IsVirtual); - return (VirtualIndex)(token & 0xff); + return (VirtualIndex)(_token & 0xff); } private ushort VirtualValue { - get { return unchecked((ushort)(this.token >> 8)); } + get { return unchecked((ushort)(_token >> 8)); } } public static bool operator ==(BlobHandle left, BlobHandle right) { - return left.token == right.token; + return left._token == right._token; } public override bool Equals(object obj) { - return obj is BlobHandle && ((BlobHandle)obj).token == this.token; + return obj is BlobHandle && ((BlobHandle)obj)._token == _token; } public bool Equals(BlobHandle other) { - return this.token == other.token; + return _token == other._token; } public override int GetHashCode() { - return this.token.GetHashCode(); + return _token.GetHashCode(); } public static bool operator !=(BlobHandle left, BlobHandle right) { - return left.token != right.token; + return left._token != right._token; } } @@ -2348,12 +2348,12 @@ public override int GetHashCode() public struct GuidHandle : IEquatable { private const uint tokenType = TokenTypeIds.Guid; - private readonly uint token; + private readonly uint _token; private GuidHandle(uint token) { Debug.Assert((token & TokenTypeIds.TokenTypeMask) == tokenType); - this.token = token; + _token = token; } internal static GuidHandle FromIndex(uint heapIndex) @@ -2363,7 +2363,7 @@ internal static GuidHandle FromIndex(uint heapIndex) public static implicit operator Handle(GuidHandle handle) { - return new Handle(handle.token); + return new Handle(handle._token); } public static explicit operator GuidHandle(Handle handle) @@ -2380,7 +2380,7 @@ public bool IsNil { get { - return (token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; + return (_token & (TokenTypeIds.VirtualTokenMask | TokenTypeIds.RIDMask)) == 0; } } @@ -2388,33 +2388,33 @@ internal int Index { get { - return (int)(token & TokenTypeIds.RIDMask); + return (int)(_token & TokenTypeIds.RIDMask); } } public static bool operator ==(GuidHandle left, GuidHandle right) { - return left.token == right.token; + return left._token == right._token; } public override bool Equals(object obj) { - return obj is GuidHandle && ((GuidHandle)obj).token == this.token; + return obj is GuidHandle && ((GuidHandle)obj)._token == _token; } public bool Equals(GuidHandle other) { - return this.token == other.token; + return _token == other._token; } public override int GetHashCode() { - return this.token.GetHashCode(); + return _token.GetHashCode(); } public static bool operator !=(GuidHandle left, GuidHandle right) { - return left.token != right.token; + return left._token != right._token; } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/InterfaceImplementation.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/InterfaceImplementation.cs index 983841765945d8b5df6289aad544819c2a8901c1..3daecf8033efc83acb7c3423511a253162b72d4b 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/InterfaceImplementation.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/InterfaceImplementation.cs @@ -7,23 +7,23 @@ namespace System.Reflection.Metadata { public struct InterfaceImplementation { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal InterfaceImplementation(MetadataReader reader, InterfaceImplementationHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private InterfaceImplementationHandle Handle { - get { return InterfaceImplementationHandle.FromRowId(rowId); } + get { return InterfaceImplementationHandle.FromRowId(_rowId); } } @@ -33,12 +33,12 @@ private InterfaceImplementationHandle Handle /// public Handle Interface { - get { return reader.InterfaceImplTable.GetInterface(rowId); } + get { return _reader.InterfaceImplTable.GetInterface(_rowId); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Heaps.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Heaps.cs index 5236abc9fb5d0404701d83aaf591c03a37f6836a..170e643af2ca76a823cb7ac73ec839634cf7bc16 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Heaps.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Heaps.cs @@ -11,13 +11,13 @@ namespace System.Reflection.Metadata.Ecma335 { internal struct StringStreamReader { - private static string[] virtualValues; + private static string[] s_virtualValues; internal readonly MemoryBlock Block; internal StringStreamReader(MemoryBlock block, MetadataKind metadataKind) { - if (virtualValues == null && metadataKind != MetadataKind.Ecma335) + if (s_virtualValues == null && metadataKind != MetadataKind.Ecma335) { // Note: // Virtual values shall not contain surrogates, otherwise StartsWith might be inconsistent @@ -98,7 +98,7 @@ internal StringStreamReader(MemoryBlock block, MetadataKind metadataKind) values[(int)StringHandle.VirtualIndex.Windows_UI_Xaml_Media_Animation] = "Windows.UI.Xaml.Media.Animation"; values[(int)StringHandle.VirtualIndex.Windows_UI_Xaml_Media_Media3D] = "Windows.UI.Xaml.Media.Media3D"; - virtualValues = values; + s_virtualValues = values; AssertFilled(); } @@ -108,9 +108,9 @@ internal StringStreamReader(MemoryBlock block, MetadataKind metadataKind) [Conditional("DEBUG")] private static void AssertFilled() { - for (int i = 0; i < virtualValues.Length; i++) + for (int i = 0; i < s_virtualValues.Length; i++) { - Debug.Assert(virtualValues[i] != null, "Missing virtual value for StringHandle.VirtualIndex." + (StringHandle.VirtualIndex)i); + Debug.Assert(s_virtualValues[i] != null, "Missing virtual value for StringHandle.VirtualIndex." + (StringHandle.VirtualIndex)i); } } @@ -144,7 +144,7 @@ private static MemoryBlock TrimEnd(MemoryBlock block) internal string GetVirtualValue(StringHandle.VirtualIndex index) { - return virtualValues[(int)index]; + return s_virtualValues[(int)index]; } internal string GetString(StringHandle handle, MetadataStringDecoder utf8Decoder) @@ -157,7 +157,7 @@ internal string GetString(StringHandle handle, MetadataStringDecoder utf8Decoder switch (handle.StringKind) { case StringKind.Plain: - return virtualValues[index]; + return s_virtualValues[index]; case StringKind.WinRTPrefixed: prefix = MetadataReader.WinRTPrefix; @@ -316,17 +316,17 @@ public VirtualHeapBlobTable() // Since the number of virtual blobs we need is small (the number of attribute classes in .winmd files) // we can create a pinned handle for each of them. // If we needed many more blobs we could create and pin a single byte[] and allocate blobs there. - private VirtualHeapBlobTable lazyVirtualHeapBlobs; - private static byte[][] virtualHeapBlobs; + private VirtualHeapBlobTable _lazyVirtualHeapBlobs; + private static byte[][] s_virtualHeapBlobs; internal readonly MemoryBlock Block; internal BlobStreamReader(MemoryBlock block, MetadataKind metadataKind) { - this.lazyVirtualHeapBlobs = null; + _lazyVirtualHeapBlobs = null; this.Block = block; - if (virtualHeapBlobs == null && metadataKind != MetadataKind.Ecma335) + if (s_virtualHeapBlobs == null && metadataKind != MetadataKind.Ecma335) { var blobs = new byte[(int)BlobHandle.VirtualIndex.Count][]; @@ -389,7 +389,7 @@ internal BlobStreamReader(MemoryBlock block, MetadataKind metadataKind) 0x01 }; - virtualHeapBlobs = blobs; + s_virtualHeapBlobs = blobs; } } @@ -416,21 +416,21 @@ internal BlobReader GetBlobReader(BlobHandle handle) { if (handle.IsVirtual) { - if (lazyVirtualHeapBlobs == null) + if (_lazyVirtualHeapBlobs == null) { - Interlocked.CompareExchange(ref lazyVirtualHeapBlobs, new VirtualHeapBlobTable(), null); + Interlocked.CompareExchange(ref _lazyVirtualHeapBlobs, new VirtualHeapBlobTable(), null); } int index = (int)handle.GetVirtualIndex(); - int length = virtualHeapBlobs[index].Length; + int length = s_virtualHeapBlobs[index].Length; VirtualHeapBlob virtualBlob; - lock (lazyVirtualHeapBlobs) + lock (_lazyVirtualHeapBlobs) { - if (!lazyVirtualHeapBlobs.Table.TryGetValue(handle, out virtualBlob)) + if (!_lazyVirtualHeapBlobs.Table.TryGetValue(handle, out virtualBlob)) { virtualBlob = new VirtualHeapBlob(GetVirtualBlobArray(handle, unique: false)); - lazyVirtualHeapBlobs.Table.Add(handle, virtualBlob); + _lazyVirtualHeapBlobs.Table.Add(handle, virtualBlob); } } @@ -467,7 +467,7 @@ internal BlobHandle GetNextHandle(BlobHandle handle) internal byte[] GetVirtualBlobArray(BlobHandle handle, bool unique) { BlobHandle.VirtualIndex index = handle.GetVirtualIndex(); - byte[] result = virtualHeapBlobs[(int)index]; + byte[] result = s_virtualHeapBlobs[(int)index]; switch (index) { diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/NamespaceCache.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/NamespaceCache.cs index 62f9ec2de17cdcf3196e389eb2c13684b1ce9395..1ee3edc449ba24c670d1f57b7452cc3ce23df148 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/NamespaceCache.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/NamespaceCache.cs @@ -10,16 +10,16 @@ namespace System.Reflection.Metadata.Ecma335 { internal class NamespaceCache { - private readonly MetadataReader metadataReader; - private readonly object namespaceTableAndListLock = new object(); - private Dictionary namespaceTable; - private NamespaceData rootNamespace; - private ImmutableArray namespaceList; + private readonly MetadataReader _metadataReader; + private readonly object _namespaceTableAndListLock = new object(); + private Dictionary _namespaceTable; + private NamespaceData _rootNamespace; + private ImmutableArray _namespaceList; internal NamespaceCache(MetadataReader reader) { Debug.Assert(reader != null); - this.metadataReader = reader; + _metadataReader = reader; } /// @@ -28,7 +28,7 @@ internal NamespaceCache(MetadataReader reader) /// internal bool CacheIsRealized { - get { return this.namespaceTable != null; } + get { return _namespaceTable != null; } } internal string GetFullName(NamespaceDefinitionHandle handle) @@ -41,15 +41,15 @@ internal string GetFullName(NamespaceDefinitionHandle handle) internal NamespaceData GetRootNamespace() { EnsureNamespaceTableIsPopulated(); - Debug.Assert(rootNamespace != null); - return rootNamespace; + Debug.Assert(_rootNamespace != null); + return _rootNamespace; } internal NamespaceData GetNamespaceData(NamespaceDefinitionHandle handle) { EnsureNamespaceTableIsPopulated(); NamespaceData result; - if (!namespaceTable.TryGetValue(handle, out result)) + if (!_namespaceTable.TryGetValue(handle, out result)) { ThrowInvalidHandle(); } @@ -87,7 +87,7 @@ private StringHandle GetSimpleName(NamespaceDefinitionHandle fullNamespaceHandle int currentSegment = 0; while (currentSegment < segmentIndex) { - int currentIndex = this.metadataReader.StringStream.IndexOfRaw(lastFoundIndex + 1, '.'); + int currentIndex = _metadataReader.StringStream.IndexOfRaw(lastFoundIndex + 1, '.'); if (currentIndex == -1) { break; @@ -110,9 +110,9 @@ private StringHandle GetSimpleName(NamespaceDefinitionHandle fullNamespaceHandle /// private void PopulateNamespaceTable() { - lock (namespaceTableAndListLock) + lock (_namespaceTableAndListLock) { - if (this.namespaceTable != null) + if (_namespaceTable != null) { return; } @@ -160,8 +160,8 @@ private void PopulateNamespaceTable() } } - this.namespaceTable = namespaceTable; - this.rootNamespace = namespaceTable[rootNamespace]; + _namespaceTable = namespaceTable; + _rootNamespace = namespaceTable[rootNamespace]; } } @@ -331,15 +331,15 @@ private void PopulateTableWithTypeDefinitions(Dictionary private void PopulateNamespaceList() { - lock (namespaceTableAndListLock) + lock (_namespaceTableAndListLock) { - if (this.namespaceList != null) + if (_namespaceList != null) { return; } - Debug.Assert(this.namespaceTable != null); + Debug.Assert(_namespaceTable != null); var namespaceNameSet = new HashSet(); var namespaceListBuilder = ImmutableArray.CreateBuilder(); - foreach (var group in namespaceTable) + foreach (var group in _namespaceTable) { var data = group.Value; if (namespaceNameSet.Add(data.FullName)) @@ -414,7 +414,7 @@ private void PopulateNamespaceList() } } - this.namespaceList = namespaceListBuilder.ToImmutable(); + _namespaceList = namespaceListBuilder.ToImmutable(); } } @@ -424,11 +424,11 @@ private void PopulateNamespaceList() private void EnsureNamespaceTableIsPopulated() { // PERF: Branch will rarely be taken; do work in PopulateNamespaceList() so this can be inlined easily. - if (this.namespaceTable == null) + if (_namespaceTable == null) { PopulateNamespaceTable(); } - Debug.Assert(this.namespaceTable != null); + Debug.Assert(_namespaceTable != null); } /// @@ -436,11 +436,11 @@ private void EnsureNamespaceTableIsPopulated() /// private void EnsureNamespaceListIsPopulated() { - if (this.namespaceList == null) + if (_namespaceList == null) { PopulateNamespaceList(); } - Debug.Assert(this.namespaceList != null); + Debug.Assert(_namespaceList != null); } /// @@ -463,7 +463,7 @@ private class NamespaceDataBuilder public ImmutableArray.Builder TypeDefinitions; public ImmutableArray.Builder ExportedTypes; - private NamespaceData frozen; + private NamespaceData _frozen; public NamespaceDataBuilder(NamespaceDefinitionHandle handle, StringHandle name, string fullName) { @@ -484,7 +484,7 @@ public NamespaceData Freeze() { // It is not an error to call this function multiple times. We cache the result // because it's immutable. - if (frozen == null) + if (_frozen == null) { var namespaces = Namespaces.ToImmutable(); Namespaces = null; @@ -495,10 +495,10 @@ public NamespaceData Freeze() var exportedTypes = ExportedTypes.ToImmutable(); ExportedTypes = null; - frozen = new NamespaceData(Name, FullName, Parent, namespaces, typeDefinitions, exportedTypes); + _frozen = new NamespaceData(Name, FullName, Parent, namespaces, typeDefinitions, exportedTypes); } - return frozen; + return _frozen; } public void MergeInto(NamespaceDataBuilder other) diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Tables.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Tables.cs index 36d353046ce9c68d39269188acb98802613a4ce2..a7d1dbaa87de0c6ac6d7c96f92447f2f2d636c9b 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Tables.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Internal/Tables.cs @@ -9,13 +9,13 @@ namespace System.Reflection.Metadata.Ecma335 internal struct ModuleTableReader { internal readonly uint NumberOfRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsGUIDHeapRefSizeSmall; - private readonly int GenerationOffset; - private readonly int NameOffset; - private readonly int MVIdOffset; - private readonly int EnCIdOffset; - private readonly int EnCBaseIdOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsGUIDHeapRefSizeSmall; + private readonly int _GenerationOffset; + private readonly int _NameOffset; + private readonly int _MVIdOffset; + private readonly int _EnCIdOffset; + private readonly int _EnCBaseIdOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -28,56 +28,56 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsGUIDHeapRefSizeSmall = guidHeapRefSize == 2; - this.GenerationOffset = 0; - this.NameOffset = this.GenerationOffset + sizeof(UInt16); - this.MVIdOffset = this.NameOffset + stringHeapRefSize; - this.EnCIdOffset = this.MVIdOffset + guidHeapRefSize; - this.EnCBaseIdOffset = this.EnCIdOffset + guidHeapRefSize; - this.RowSize = this.EnCBaseIdOffset + guidHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsGUIDHeapRefSizeSmall = guidHeapRefSize == 2; + _GenerationOffset = 0; + _NameOffset = _GenerationOffset + sizeof(UInt16); + _MVIdOffset = _NameOffset + stringHeapRefSize; + _EnCIdOffset = _MVIdOffset + guidHeapRefSize; + _EnCBaseIdOffset = _EnCIdOffset + guidHeapRefSize; + this.RowSize = _EnCBaseIdOffset + guidHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, this.RowSize * (int)numberOfRows); } internal ushort GetGeneration() { Debug.Assert(NumberOfRows > 0); - return this.Block.PeekUInt16(this.GenerationOffset); + return this.Block.PeekUInt16(_GenerationOffset); } internal StringHandle GetName() { Debug.Assert(NumberOfRows > 0); - return StringHandle.FromIndex(this.Block.PeekReference(this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(_NameOffset, _IsStringHeapRefSizeSmall)); } internal GuidHandle GetMvid() { Debug.Assert(NumberOfRows > 0); - return GuidHandle.FromIndex(this.Block.PeekReference(this.MVIdOffset, this.IsGUIDHeapRefSizeSmall)); + return GuidHandle.FromIndex(this.Block.PeekReference(_MVIdOffset, _IsGUIDHeapRefSizeSmall)); } internal GuidHandle GetEncId() { Debug.Assert(NumberOfRows > 0); - return GuidHandle.FromIndex(this.Block.PeekReference(this.EnCIdOffset, this.IsGUIDHeapRefSizeSmall)); + return GuidHandle.FromIndex(this.Block.PeekReference(_EnCIdOffset, _IsGUIDHeapRefSizeSmall)); } internal GuidHandle GetEncBaseId() { Debug.Assert(NumberOfRows > 0); - return GuidHandle.FromIndex(this.Block.PeekReference(this.EnCBaseIdOffset, this.IsGUIDHeapRefSizeSmall)); + return GuidHandle.FromIndex(this.Block.PeekReference(_EnCBaseIdOffset, _IsGUIDHeapRefSizeSmall)); } } internal struct TypeRefTableReader { internal readonly uint NumberOfRows; - private readonly bool IsResolutionScopeRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int ResolutionScopeOffset; - private readonly int NameOffset; - private readonly int NamespaceOffset; + private readonly bool _IsResolutionScopeRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _ResolutionScopeOffset; + private readonly int _NameOffset; + private readonly int _NamespaceOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -90,47 +90,47 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsResolutionScopeRefSizeSmall = resolutionScopeRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.ResolutionScopeOffset = 0; - this.NameOffset = this.ResolutionScopeOffset + resolutionScopeRefSize; - this.NamespaceOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.NamespaceOffset + stringHeapRefSize; + _IsResolutionScopeRefSizeSmall = resolutionScopeRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _ResolutionScopeOffset = 0; + _NameOffset = _ResolutionScopeOffset + resolutionScopeRefSize; + _NamespaceOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _NamespaceOffset + stringHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal Handle GetResolutionScope(TypeReferenceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return ResolutionScopeTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ResolutionScopeOffset, this.IsResolutionScopeRefSizeSmall)); + return ResolutionScopeTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ResolutionScopeOffset, _IsResolutionScopeRefSizeSmall)); } internal StringHandle GetName(TypeReferenceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal StringHandle GetNamespace(TypeReferenceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NamespaceOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NamespaceOffset, _IsStringHeapRefSizeSmall)); } } internal struct TypeDefTableReader { internal readonly uint NumberOfRows; - private readonly bool IsFieldRefSizeSmall; - private readonly bool IsMethodRefSizeSmall; - private readonly bool IsTypeDefOrRefRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int NameOffset; - private readonly int NamespaceOffset; - private readonly int ExtendsOffset; - private readonly int FieldListOffset; - private readonly int MethodListOffset; + private readonly bool _IsFieldRefSizeSmall; + private readonly bool _IsMethodRefSizeSmall; + private readonly bool _IsTypeDefOrRefRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _NameOffset; + private readonly int _NamespaceOffset; + private readonly int _ExtendsOffset; + private readonly int _FieldListOffset; + private readonly int _MethodListOffset; internal readonly int RowSize; internal MemoryBlock Block; @@ -144,66 +144,66 @@ internal struct TypeDefTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsFieldRefSizeSmall = fieldRefSize == 2; - this.IsMethodRefSizeSmall = methodRefSize == 2; - this.IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.FlagsOffset = 0; - this.NameOffset = this.FlagsOffset + sizeof(UInt32); - this.NamespaceOffset = this.NameOffset + stringHeapRefSize; - this.ExtendsOffset = this.NamespaceOffset + stringHeapRefSize; - this.FieldListOffset = this.ExtendsOffset + typeDefOrRefRefSize; - this.MethodListOffset = this.FieldListOffset + fieldRefSize; - this.RowSize = this.MethodListOffset + methodRefSize; + _IsFieldRefSizeSmall = fieldRefSize == 2; + _IsMethodRefSizeSmall = methodRefSize == 2; + _IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _FlagsOffset = 0; + _NameOffset = _FlagsOffset + sizeof(UInt32); + _NamespaceOffset = _NameOffset + stringHeapRefSize; + _ExtendsOffset = _NamespaceOffset + stringHeapRefSize; + _FieldListOffset = _ExtendsOffset + typeDefOrRefRefSize; + _MethodListOffset = _FieldListOffset + fieldRefSize; + this.RowSize = _MethodListOffset + methodRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal TypeAttributes GetFlags(TypeDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (TypeAttributes)this.Block.PeekUInt32(rowOffset + this.FlagsOffset); + return (TypeAttributes)this.Block.PeekUInt32(rowOffset + _FlagsOffset); } internal NamespaceDefinitionHandle GetNamespace(TypeDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return NamespaceDefinitionHandle.FromIndexOfFullName(this.Block.PeekReference(rowOffset + this.NamespaceOffset, this.IsStringHeapRefSizeSmall)); + return NamespaceDefinitionHandle.FromIndexOfFullName(this.Block.PeekReference(rowOffset + _NamespaceOffset, _IsStringHeapRefSizeSmall)); } internal StringHandle GetNamespaceString(TypeDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NamespaceOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NamespaceOffset, _IsStringHeapRefSizeSmall)); } internal StringHandle GetName(TypeDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal Handle GetExtends(TypeDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ExtendsOffset, this.IsTypeDefOrRefRefSizeSmall)); + return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ExtendsOffset, _IsTypeDefOrRefRefSizeSmall)); } internal uint GetFieldStart(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekReference(rowOffset + this.FieldListOffset, this.IsFieldRefSizeSmall); + return this.Block.PeekReference(rowOffset + _FieldListOffset, _IsFieldRefSizeSmall); } internal uint GetMethodStart(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekReference(rowOffset + this.MethodListOffset, this.IsMethodRefSizeSmall); + return this.Block.PeekReference(rowOffset + _MethodListOffset, _IsMethodRefSizeSmall); } internal TypeDefinitionHandle FindTypeContainingMethod(uint methodDefOrPtrRowId, int numberOfMethods) { uint numOfRows = this.NumberOfRows; - int slot = this.Block.BinarySearchForSlot(numOfRows, this.RowSize, this.MethodListOffset, methodDefOrPtrRowId, this.IsMethodRefSizeSmall); + int slot = this.Block.BinarySearchForSlot(numOfRows, this.RowSize, _MethodListOffset, methodDefOrPtrRowId, _IsMethodRefSizeSmall); uint row = (uint)(slot + 1); if (row == 0) return default(TypeDefinitionHandle); @@ -234,7 +234,7 @@ internal TypeDefinitionHandle FindTypeContainingMethod(uint methodDefOrPtrRowId, internal TypeDefinitionHandle FindTypeContainingField(uint fieldDefOrPtrRowId, int numberOfFields) { uint numOfRows = this.NumberOfRows; - int slot = this.Block.BinarySearchForSlot(numOfRows, this.RowSize, this.FieldListOffset, fieldDefOrPtrRowId, this.IsFieldRefSizeSmall); + int slot = this.Block.BinarySearchForSlot(numOfRows, this.RowSize, _FieldListOffset, fieldDefOrPtrRowId, _IsFieldRefSizeSmall); uint row = (uint)(slot + 1); if (row == 0) return default(TypeDefinitionHandle); @@ -266,8 +266,8 @@ internal TypeDefinitionHandle FindTypeContainingField(uint fieldDefOrPtrRowId, i internal struct FieldPtrTableReader { internal readonly uint NumberOfRows; - private readonly bool IsFieldTableRowRefSizeSmall; - private readonly int FieldOffset; + private readonly bool _IsFieldTableRowRefSizeSmall; + private readonly int _FieldOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -279,32 +279,32 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsFieldTableRowRefSizeSmall = fieldTableRowRefSize == 2; - this.FieldOffset = 0; - this.RowSize = this.FieldOffset + fieldTableRowRefSize; + _IsFieldTableRowRefSizeSmall = fieldTableRowRefSize == 2; + _FieldOffset = 0; + this.RowSize = _FieldOffset + fieldTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal FieldDefinitionHandle GetFieldFor(int rowId) { int rowOffset = (rowId - 1) * this.RowSize; - return FieldDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.FieldOffset, this.IsFieldTableRowRefSizeSmall)); + return FieldDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _FieldOffset, _IsFieldTableRowRefSizeSmall)); } internal uint GetRowIdForFieldDefRow(uint fieldDefRowId) { - return (uint)(this.Block.LinearSearchReference(this.RowSize, this.FieldOffset, fieldDefRowId, this.IsFieldTableRowRefSizeSmall) + 1); + return (uint)(this.Block.LinearSearchReference(this.RowSize, _FieldOffset, fieldDefRowId, _IsFieldTableRowRefSizeSmall) + 1); } } internal struct FieldTableReader { internal readonly uint NumberOfRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int NameOffset; - private readonly int SignatureOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _NameOffset; + private readonly int _SignatureOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -317,39 +317,39 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.FlagsOffset = 0; - this.NameOffset = this.FlagsOffset + sizeof(UInt16); - this.SignatureOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.SignatureOffset + blobHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _FlagsOffset = 0; + _NameOffset = _FlagsOffset + sizeof(UInt16); + _SignatureOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _SignatureOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal StringHandle GetName(FieldDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal FieldAttributes GetFlags(FieldDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (FieldAttributes)this.Block.PeekUInt16(rowOffset + this.FlagsOffset); + return (FieldAttributes)this.Block.PeekUInt16(rowOffset + _FlagsOffset); } internal BlobHandle GetSignature(FieldDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.SignatureOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _SignatureOffset, _IsBlobHeapRefSizeSmall)); } } internal struct MethodPtrTableReader { internal readonly uint NumberOfRows; - private readonly bool IsMethodTableRowRefSizeSmall; - private readonly int MethodOffset; + private readonly bool _IsMethodTableRowRefSizeSmall; + private readonly int _MethodOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -361,9 +361,9 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsMethodTableRowRefSizeSmall = methodTableRowRefSize == 2; - this.MethodOffset = 0; - this.RowSize = this.MethodOffset + methodTableRowRefSize; + _IsMethodTableRowRefSizeSmall = methodTableRowRefSize == 2; + _MethodOffset = 0; + this.RowSize = _MethodOffset + methodTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } @@ -371,27 +371,27 @@ int containingBlockOffset internal MethodDefinitionHandle GetMethodFor(int rowId) { int rowOffset = (rowId - 1) * this.RowSize; - return MethodDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.MethodOffset, this.IsMethodTableRowRefSizeSmall)); ; + return MethodDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _MethodOffset, _IsMethodTableRowRefSizeSmall)); ; } internal uint GetRowIdForMethodDefRow(uint methodDefRowId) { - return (uint)(this.Block.LinearSearchReference(this.RowSize, this.MethodOffset, methodDefRowId, this.IsMethodTableRowRefSizeSmall) + 1); + return (uint)(this.Block.LinearSearchReference(this.RowSize, _MethodOffset, methodDefRowId, _IsMethodTableRowRefSizeSmall) + 1); } } internal struct MethodTableReader { internal readonly uint NumberOfRows; - private readonly bool IsParamRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int RVAOffset; - private readonly int ImplFlagsOffset; - private readonly int FlagsOffset; - private readonly int NameOffset; - private readonly int SignatureOffset; - private readonly int ParamListOffset; + private readonly bool _IsParamRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _RVAOffset; + private readonly int _ImplFlagsOffset; + private readonly int _FlagsOffset; + private readonly int _NameOffset; + private readonly int _SignatureOffset; + private readonly int _ParamListOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -405,53 +405,53 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsParamRefSizeSmall = paramRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.RVAOffset = 0; - this.ImplFlagsOffset = this.RVAOffset + sizeof(UInt32); - this.FlagsOffset = this.ImplFlagsOffset + sizeof(UInt16); - this.NameOffset = this.FlagsOffset + sizeof(UInt16); - this.SignatureOffset = this.NameOffset + stringHeapRefSize; - this.ParamListOffset = this.SignatureOffset + blobHeapRefSize; - this.RowSize = this.ParamListOffset + paramRefSize; + _IsParamRefSizeSmall = paramRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _RVAOffset = 0; + _ImplFlagsOffset = _RVAOffset + sizeof(UInt32); + _FlagsOffset = _ImplFlagsOffset + sizeof(UInt16); + _NameOffset = _FlagsOffset + sizeof(UInt16); + _SignatureOffset = _NameOffset + stringHeapRefSize; + _ParamListOffset = _SignatureOffset + blobHeapRefSize; + this.RowSize = _ParamListOffset + paramRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal uint GetParamStart(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekReference(rowOffset + this.ParamListOffset, this.IsParamRefSizeSmall); + return this.Block.PeekReference(rowOffset + _ParamListOffset, _IsParamRefSizeSmall); } internal BlobHandle GetSignature(MethodDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.SignatureOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _SignatureOffset, _IsBlobHeapRefSizeSmall)); } internal int GetRva(MethodDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return this.Block.PeekInt32(rowOffset + this.RVAOffset); + return this.Block.PeekInt32(rowOffset + _RVAOffset); } internal StringHandle GetName(MethodDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal MethodAttributes GetFlags(MethodDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (MethodAttributes)this.Block.PeekUInt16(rowOffset + this.FlagsOffset); + return (MethodAttributes)this.Block.PeekUInt16(rowOffset + _FlagsOffset); } internal MethodImplAttributes GetImplFlags(MethodDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (MethodImplAttributes)this.Block.PeekUInt16(rowOffset + this.ImplFlagsOffset); + return (MethodImplAttributes)this.Block.PeekUInt16(rowOffset + _ImplFlagsOffset); } internal int GetNextRVA( @@ -460,7 +460,7 @@ int rva { int nextRVA = int.MaxValue; int endOffset = (int)this.NumberOfRows * this.RowSize; - for (int iterOffset = this.RVAOffset; iterOffset < endOffset; iterOffset += this.RowSize) + for (int iterOffset = _RVAOffset; iterOffset < endOffset; iterOffset += this.RowSize) { int currentRVA = this.Block.PeekInt32(iterOffset); if (currentRVA > rva && currentRVA < nextRVA) @@ -476,8 +476,8 @@ int rva internal struct ParamPtrTableReader { internal readonly uint NumberOfRows; - private readonly bool IsParamTableRowRefSizeSmall; - private readonly int ParamOffset; + private readonly bool _IsParamTableRowRefSizeSmall; + private readonly int _ParamOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -489,26 +489,26 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsParamTableRowRefSizeSmall = paramTableRowRefSize == 2; - this.ParamOffset = 0; - this.RowSize = this.ParamOffset + paramTableRowRefSize; + _IsParamTableRowRefSizeSmall = paramTableRowRefSize == 2; + _ParamOffset = 0; + this.RowSize = _ParamOffset + paramTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal ParameterHandle GetParamFor(int rowId) { int rowOffset = (rowId - 1) * this.RowSize; - return ParameterHandle.FromRowId(this.Block.PeekReference(rowOffset + this.ParamOffset, this.IsParamTableRowRefSizeSmall)); + return ParameterHandle.FromRowId(this.Block.PeekReference(rowOffset + _ParamOffset, _IsParamTableRowRefSizeSmall)); } } internal struct ParamTableReader { internal readonly uint NumberOfRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int SequenceOffset; - private readonly int NameOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _SequenceOffset; + private readonly int _NameOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -520,40 +520,40 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.FlagsOffset = 0; - this.SequenceOffset = this.FlagsOffset + sizeof(UInt16); - this.NameOffset = this.SequenceOffset + sizeof(UInt16); - this.RowSize = this.NameOffset + stringHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _FlagsOffset = 0; + _SequenceOffset = _FlagsOffset + sizeof(UInt16); + _NameOffset = _SequenceOffset + sizeof(UInt16); + this.RowSize = _NameOffset + stringHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal ParameterAttributes GetFlags(ParameterHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (ParameterAttributes)this.Block.PeekUInt16(rowOffset + this.FlagsOffset); + return (ParameterAttributes)this.Block.PeekUInt16(rowOffset + _FlagsOffset); } internal ushort GetSequence(ParameterHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return this.Block.PeekUInt16(rowOffset + this.SequenceOffset); + return this.Block.PeekUInt16(rowOffset + _SequenceOffset); } internal StringHandle GetName(ParameterHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } } internal struct InterfaceImplTableReader { internal readonly uint NumberOfRows; - private readonly bool IsTypeDefTableRowRefSizeSmall; - private readonly bool IsTypeDefOrRefRefSizeSmall; - private readonly int ClassOffset; - private readonly int InterfaceOffset; + private readonly bool _IsTypeDefTableRowRefSizeSmall; + private readonly bool _IsTypeDefOrRefRefSizeSmall; + private readonly int _ClassOffset; + private readonly int _InterfaceOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -567,11 +567,11 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; - this.IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; - this.ClassOffset = 0; - this.InterfaceOffset = this.ClassOffset + typeDefTableRowRefSize; - this.RowSize = this.InterfaceOffset + typeDefOrRefRefSize; + _IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; + _IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; + _ClassOffset = 0; + _InterfaceOffset = _ClassOffset + typeDefTableRowRefSize; + this.RowSize = _InterfaceOffset + typeDefOrRefRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -582,7 +582,7 @@ int containingBlockOffset private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.ClassOffset, this.IsTypeDefTableRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _ClassOffset, _IsTypeDefTableRowRefSizeSmall); } internal void GetInterfaceImplRange( @@ -596,9 +596,9 @@ private bool CheckSorted() this.Block.BinarySearchReferenceRange( this.NumberOfRows, this.RowSize, - this.ClassOffset, + _ClassOffset, typeDefRid, - this.IsTypeDefTableRowRefSizeSmall, + _IsTypeDefTableRowRefSizeSmall, out startRowNumber, out endRowNumber ); @@ -618,19 +618,19 @@ out endRowNumber internal Handle GetInterface(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.InterfaceOffset, this.IsTypeDefOrRefRefSizeSmall)); + return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _InterfaceOffset, _IsTypeDefOrRefRefSizeSmall)); } } internal struct MemberRefTableReader { internal uint NumberOfRows; - private readonly bool IsMemberRefParentRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int ClassOffset; - private readonly int NameOffset; - private readonly int SignatureOffset; + private readonly bool _IsMemberRefParentRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _ClassOffset; + private readonly int _NameOffset; + private readonly int _SignatureOffset; internal readonly int RowSize; internal MemoryBlock Block; @@ -644,43 +644,43 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsMemberRefParentRefSizeSmall = memberRefParentRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.ClassOffset = 0; - this.NameOffset = this.ClassOffset + memberRefParentRefSize; - this.SignatureOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.SignatureOffset + blobHeapRefSize; + _IsMemberRefParentRefSizeSmall = memberRefParentRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _ClassOffset = 0; + _NameOffset = _ClassOffset + memberRefParentRefSize; + _SignatureOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _SignatureOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal BlobHandle GetSignature(MemberReferenceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.SignatureOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _SignatureOffset, _IsBlobHeapRefSizeSmall)); } internal StringHandle GetName(MemberReferenceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal Handle GetClass(MemberReferenceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return MemberRefParentTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ClassOffset, this.IsMemberRefParentRefSizeSmall)); + return MemberRefParentTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ClassOffset, _IsMemberRefParentRefSizeSmall)); } } internal struct ConstantTableReader { internal readonly uint NumberOfRows; - private readonly bool IsHasConstantRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int TypeOffset; - private readonly int ParentOffset; - private readonly int ValueOffset; + private readonly bool _IsHasConstantRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _TypeOffset; + private readonly int _ParentOffset; + private readonly int _ValueOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -694,12 +694,12 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsHasConstantRefSizeSmall = hasConstantRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.TypeOffset = 0; - this.ParentOffset = this.TypeOffset + sizeof(Byte) + 1; // Alignment here (+1)... - this.ValueOffset = this.ParentOffset + hasConstantRefSize; - this.RowSize = this.ValueOffset + blobHeapRefSize; + _IsHasConstantRefSizeSmall = hasConstantRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _TypeOffset = 0; + _ParentOffset = _TypeOffset + sizeof(Byte) + 1; // Alignment here (+1)... + _ValueOffset = _ParentOffset + hasConstantRefSize; + this.RowSize = _ValueOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -711,19 +711,19 @@ int containingBlockOffset internal ConstantTypeCode GetType(ConstantHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (ConstantTypeCode)this.Block.PeekByte(rowOffset + this.TypeOffset); + return (ConstantTypeCode)this.Block.PeekByte(rowOffset + _TypeOffset); } internal BlobHandle GetValue(ConstantHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.ValueOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _ValueOffset, _IsBlobHeapRefSizeSmall)); } internal Handle GetParent(ConstantHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return HasConstantTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ParentOffset, this.IsHasConstantRefSizeSmall)); + return HasConstantTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ParentOffset, _IsHasConstantRefSizeSmall)); } internal ConstantHandle FindConstant( @@ -734,28 +734,28 @@ Handle parentToken this.Block.BinarySearchReference( this.NumberOfRows, this.RowSize, - this.ParentOffset, + _ParentOffset, HasConstantTag.ConvertToTag(parentToken), - this.IsHasConstantRefSizeSmall + _IsHasConstantRefSizeSmall ); return ConstantHandle.FromRowId((uint)(foundRowNumber + 1)); } private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.ParentOffset, this.IsHasConstantRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _ParentOffset, _IsHasConstantRefSizeSmall); } } internal struct CustomAttributeTableReader { internal readonly uint NumberOfRows; - private readonly bool IsHasCustomAttributeRefSizeSmall; - private readonly bool IsCustomAttriubuteTypeRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int ParentOffset; - private readonly int TypeOffset; - private readonly int ValueOffset; + private readonly bool _IsHasCustomAttributeRefSizeSmall; + private readonly bool _IsCustomAttriubuteTypeRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _ParentOffset; + private readonly int _TypeOffset; + private readonly int _ValueOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -773,13 +773,13 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsHasCustomAttributeRefSizeSmall = hasCustomAttributeRefSize == 2; - this.IsCustomAttriubuteTypeRefSizeSmall = customAttributeTypeRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.ParentOffset = 0; - this.TypeOffset = this.ParentOffset + hasCustomAttributeRefSize; - this.ValueOffset = this.TypeOffset + customAttributeTypeRefSize; - this.RowSize = this.ValueOffset + blobHeapRefSize; + _IsHasCustomAttributeRefSizeSmall = hasCustomAttributeRefSize == 2; + _IsCustomAttriubuteTypeRefSizeSmall = customAttributeTypeRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _ParentOffset = 0; + _TypeOffset = _ParentOffset + hasCustomAttributeRefSize; + _ValueOffset = _TypeOffset + customAttributeTypeRefSize; + this.RowSize = _ValueOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); this.PtrTable = null; @@ -788,32 +788,32 @@ int containingBlockOffset this.PtrTable = this.Block.BuildPtrTable( (int)numberOfRows, this.RowSize, - this.ParentOffset, - this.IsHasCustomAttributeRefSizeSmall); + _ParentOffset, + _IsHasCustomAttributeRefSizeSmall); } } internal Handle GetParent(CustomAttributeHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return HasCustomAttributeTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ParentOffset, this.IsHasCustomAttributeRefSizeSmall)); + return HasCustomAttributeTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ParentOffset, _IsHasCustomAttributeRefSizeSmall)); } internal Handle GetConstructor(CustomAttributeHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return CustomAttributeTypeTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.TypeOffset, this.IsCustomAttriubuteTypeRefSizeSmall)); + return CustomAttributeTypeTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _TypeOffset, _IsCustomAttriubuteTypeRefSizeSmall)); } internal BlobHandle GetValue(CustomAttributeHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.ValueOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _ValueOffset, _IsBlobHeapRefSizeSmall)); } private uint GetParentTag(int index) { - return this.Block.PeekReference(index * this.RowSize + this.ParentOffset, this.IsHasCustomAttributeRefSizeSmall); + return this.Block.PeekReference(index * this.RowSize + _ParentOffset, _IsHasCustomAttributeRefSizeSmall); } internal void GetAttributeRange(Handle parentHandle, out int firstImplRowId, out int lastImplRowId) @@ -825,9 +825,9 @@ internal void GetAttributeRange(Handle parentHandle, out int firstImplRowId, out this.Block.BinarySearchReferenceRange( this.PtrTable, this.RowSize, - this.ParentOffset, + _ParentOffset, HasCustomAttributeTag.ConvertToTag(parentHandle), - this.IsHasCustomAttributeRefSizeSmall, + _IsHasCustomAttributeRefSizeSmall, out startRowNumber, out endRowNumber ); @@ -837,9 +837,9 @@ out endRowNumber this.Block.BinarySearchReferenceRange( this.NumberOfRows, this.RowSize, - this.ParentOffset, + _ParentOffset, HasCustomAttributeTag.ConvertToTag(parentHandle), - this.IsHasCustomAttributeRefSizeSmall, + _IsHasCustomAttributeRefSizeSmall, out startRowNumber, out endRowNumber ); @@ -859,17 +859,17 @@ out endRowNumber private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.ParentOffset, this.IsHasCustomAttributeRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _ParentOffset, _IsHasCustomAttributeRefSizeSmall); } } internal struct FieldMarshalTableReader { internal readonly uint NumberOfRows; - private readonly bool IsHasFieldMarshalRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int ParentOffset; - private readonly int NativeTypeOffset; + private readonly bool _IsHasFieldMarshalRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _ParentOffset; + private readonly int _NativeTypeOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -883,11 +883,11 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsHasFieldMarshalRefSizeSmall = hasFieldMarshalRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.ParentOffset = 0; - this.NativeTypeOffset = this.ParentOffset + hasFieldMarshalRefSize; - this.RowSize = this.NativeTypeOffset + blobHeapRefSize; + _IsHasFieldMarshalRefSizeSmall = hasFieldMarshalRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _ParentOffset = 0; + _NativeTypeOffset = _ParentOffset + hasFieldMarshalRefSize; + this.RowSize = _NativeTypeOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -899,13 +899,13 @@ int containingBlockOffset internal Handle GetParent(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return HasFieldMarshalTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ParentOffset, this.IsHasFieldMarshalRefSizeSmall)); + return HasFieldMarshalTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ParentOffset, _IsHasFieldMarshalRefSizeSmall)); } internal BlobHandle GetNativeType(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NativeTypeOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _NativeTypeOffset, _IsBlobHeapRefSizeSmall)); } internal uint FindFieldMarshalRowId(Handle handle) @@ -914,27 +914,27 @@ internal uint FindFieldMarshalRowId(Handle handle) this.Block.BinarySearchReference( this.NumberOfRows, this.RowSize, - this.ParentOffset, + _ParentOffset, HasFieldMarshalTag.ConvertToTag(handle), - this.IsHasFieldMarshalRefSizeSmall + _IsHasFieldMarshalRefSizeSmall ); return (uint)(foundRowNumber + 1); } private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.ParentOffset, this.IsHasFieldMarshalRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _ParentOffset, _IsHasFieldMarshalRefSizeSmall); } } internal struct DeclSecurityTableReader { internal readonly uint NumberOfRows; - private readonly bool IsHasDeclSecurityRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int ActionOffset; - private readonly int ParentOffset; - private readonly int PermissionSetOffset; + private readonly bool _IsHasDeclSecurityRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _ActionOffset; + private readonly int _ParentOffset; + private readonly int _PermissionSetOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -948,12 +948,12 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsHasDeclSecurityRefSizeSmall = hasDeclSecurityRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.ActionOffset = 0; - this.ParentOffset = this.ActionOffset + sizeof(UInt16); - this.PermissionSetOffset = this.ParentOffset + hasDeclSecurityRefSize; - this.RowSize = this.PermissionSetOffset + blobHeapRefSize; + _IsHasDeclSecurityRefSizeSmall = hasDeclSecurityRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _ActionOffset = 0; + _ParentOffset = _ActionOffset + sizeof(UInt16); + _PermissionSetOffset = _ParentOffset + hasDeclSecurityRefSize; + this.RowSize = _PermissionSetOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -965,19 +965,19 @@ int containingBlockOffset internal DeclarativeSecurityAction GetAction(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return (DeclarativeSecurityAction)this.Block.PeekUInt16(rowOffset + this.ActionOffset); + return (DeclarativeSecurityAction)this.Block.PeekUInt16(rowOffset + _ActionOffset); } internal Handle GetParent(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return HasDeclSecurityTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ParentOffset, this.IsHasDeclSecurityRefSizeSmall)); + return HasDeclSecurityTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ParentOffset, _IsHasDeclSecurityRefSizeSmall)); } internal BlobHandle GetPermissionSet(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.PermissionSetOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _PermissionSetOffset, _IsBlobHeapRefSizeSmall)); } internal void GetAttributeRange(Handle parentToken, out int firstImplRowId, out int lastImplRowId) @@ -987,9 +987,9 @@ internal void GetAttributeRange(Handle parentToken, out int firstImplRowId, out this.Block.BinarySearchReferenceRange( this.NumberOfRows, this.RowSize, - this.ParentOffset, + _ParentOffset, HasDeclSecurityTag.ConvertToTag(parentToken), - this.IsHasDeclSecurityRefSizeSmall, + _IsHasDeclSecurityRefSizeSmall, out startRowNumber, out endRowNumber); @@ -1007,17 +1007,17 @@ internal void GetAttributeRange(Handle parentToken, out int firstImplRowId, out private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.ParentOffset, this.IsHasDeclSecurityRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _ParentOffset, _IsHasDeclSecurityRefSizeSmall); } } internal struct ClassLayoutTableReader { internal uint NumberOfRows; - private readonly bool IsTypeDefTableRowRefSizeSmall; - private readonly int PackagingSizeOffset; - private readonly int ClassSizeOffset; - private readonly int ParentOffset; + private readonly bool _IsTypeDefTableRowRefSizeSmall; + private readonly int _PackagingSizeOffset; + private readonly int _ClassSizeOffset; + private readonly int _ParentOffset; internal readonly int RowSize; internal MemoryBlock Block; @@ -1029,11 +1029,11 @@ internal struct ClassLayoutTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; - this.PackagingSizeOffset = 0; - this.ClassSizeOffset = this.PackagingSizeOffset + sizeof(UInt16); - this.ParentOffset = this.ClassSizeOffset + sizeof(UInt32); - this.RowSize = this.ParentOffset + typeDefTableRowRefSize; + _IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; + _PackagingSizeOffset = 0; + _ClassSizeOffset = _PackagingSizeOffset + sizeof(UInt16); + _ParentOffset = _ClassSizeOffset + sizeof(UInt32); + this.RowSize = _ParentOffset + typeDefTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -1045,39 +1045,39 @@ internal struct ClassLayoutTableReader internal TypeDefinitionHandle GetParent(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.ParentOffset, this.IsTypeDefTableRowRefSizeSmall)); + return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _ParentOffset, _IsTypeDefTableRowRefSizeSmall)); } internal ushort GetPackingSize(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekUInt16(rowOffset + this.PackagingSizeOffset); + return this.Block.PeekUInt16(rowOffset + _PackagingSizeOffset); } internal uint GetClassSize(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekUInt32(rowOffset + this.ClassSizeOffset); + return this.Block.PeekUInt32(rowOffset + _ClassSizeOffset); } // Returns RowId (0 means we there is no record in this table corresponding to the specified type). internal uint FindRow(TypeDefinitionHandle typeDef) { - return (uint)(1 + this.Block.BinarySearchReference(this.NumberOfRows, this.RowSize, this.ParentOffset, typeDef.RowId, this.IsTypeDefTableRowRefSizeSmall)); + return (uint)(1 + this.Block.BinarySearchReference(this.NumberOfRows, this.RowSize, _ParentOffset, typeDef.RowId, _IsTypeDefTableRowRefSizeSmall)); } private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.ParentOffset, this.IsTypeDefTableRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _ParentOffset, _IsTypeDefTableRowRefSizeSmall); } } internal struct FieldLayoutTableReader { internal readonly uint NumberOfRows; - private readonly bool IsFieldTableRowRefSizeSmall; - private readonly int OffsetOffset; - private readonly int FieldOffset; + private readonly bool _IsFieldTableRowRefSizeSmall; + private readonly int _OffsetOffset; + private readonly int _FieldOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1089,10 +1089,10 @@ internal struct FieldLayoutTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsFieldTableRowRefSizeSmall = fieldTableRowRefSize == 2; - this.OffsetOffset = 0; - this.FieldOffset = this.OffsetOffset + sizeof(UInt32); - this.RowSize = this.FieldOffset + fieldTableRowRefSize; + _IsFieldTableRowRefSizeSmall = fieldTableRowRefSize == 2; + _OffsetOffset = 0; + _FieldOffset = _OffsetOffset + sizeof(UInt32); + this.RowSize = _FieldOffset + fieldTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -1110,9 +1110,9 @@ internal uint FindFieldLayoutRowId(FieldDefinitionHandle handle) this.Block.BinarySearchReference( this.NumberOfRows, this.RowSize, - this.FieldOffset, + _FieldOffset, handle.RowId, - this.IsFieldTableRowRefSizeSmall + _IsFieldTableRowRefSizeSmall ); return (uint)(rowNumber + 1); @@ -1121,26 +1121,26 @@ internal uint FindFieldLayoutRowId(FieldDefinitionHandle handle) internal uint GetOffset(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekUInt32(rowOffset + this.OffsetOffset); + return this.Block.PeekUInt32(rowOffset + _OffsetOffset); } internal FieldDefinitionHandle GetField(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return FieldDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.FieldOffset, this.IsFieldTableRowRefSizeSmall)); + return FieldDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _FieldOffset, _IsFieldTableRowRefSizeSmall)); } private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.FieldOffset, this.IsFieldTableRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _FieldOffset, _IsFieldTableRowRefSizeSmall); } } internal struct StandAloneSigTableReader { internal readonly uint NumberOfRows; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int SignatureOffset; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _SignatureOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1151,26 +1151,26 @@ internal struct StandAloneSigTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.SignatureOffset = 0; - this.RowSize = this.SignatureOffset + blobHeapRefSize; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _SignatureOffset = 0; + this.RowSize = _SignatureOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal BlobHandle GetSignature(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.SignatureOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _SignatureOffset, _IsBlobHeapRefSizeSmall)); } } internal struct EventMapTableReader { internal readonly uint NumberOfRows; - private readonly bool IsTypeDefTableRowRefSizeSmall; - private readonly bool IsEventRefSizeSmall; - private readonly int ParentOffset; - private readonly int EventListOffset; + private readonly bool _IsTypeDefTableRowRefSizeSmall; + private readonly bool _IsEventRefSizeSmall; + private readonly int _ParentOffset; + private readonly int _EventListOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1182,11 +1182,11 @@ internal struct EventMapTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; - this.IsEventRefSizeSmall = eventRefSize == 2; - this.ParentOffset = 0; - this.EventListOffset = this.ParentOffset + typeDefTableRowRefSize; - this.RowSize = this.EventListOffset + eventRefSize; + _IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; + _IsEventRefSizeSmall = eventRefSize == 2; + _ParentOffset = 0; + _EventListOffset = _ParentOffset + typeDefTableRowRefSize; + this.RowSize = _EventListOffset + eventRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } @@ -1198,9 +1198,9 @@ internal uint FindEventMapRowIdFor(TypeDefinitionHandle typeDef) int rowNumber = this.Block.LinearSearchReference( this.RowSize, - this.ParentOffset, + _ParentOffset, typeDef.RowId, - this.IsTypeDefTableRowRefSizeSmall + _IsTypeDefTableRowRefSizeSmall ); return (uint)(rowNumber + 1); } @@ -1208,21 +1208,21 @@ internal uint FindEventMapRowIdFor(TypeDefinitionHandle typeDef) internal TypeDefinitionHandle GetParentType(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.ParentOffset, this.IsTypeDefTableRowRefSizeSmall)); + return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _ParentOffset, _IsTypeDefTableRowRefSizeSmall)); } internal uint GetEventListStartFor(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekReference(rowOffset + this.EventListOffset, this.IsEventRefSizeSmall); + return this.Block.PeekReference(rowOffset + _EventListOffset, _IsEventRefSizeSmall); } } internal struct EventPtrTableReader { internal readonly uint NumberOfRows; - private readonly bool IsEventTableRowRefSizeSmall; - private readonly int EventOffset; + private readonly bool _IsEventTableRowRefSizeSmall; + private readonly int _EventOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1234,27 +1234,27 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsEventTableRowRefSizeSmall = eventTableRowRefSize == 2; - this.EventOffset = 0; - this.RowSize = this.EventOffset + eventTableRowRefSize; + _IsEventTableRowRefSizeSmall = eventTableRowRefSize == 2; + _EventOffset = 0; + this.RowSize = _EventOffset + eventTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal EventDefinitionHandle GetEventFor(int rowId) { int rowOffset = (rowId - 1) * this.RowSize; - return EventDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.EventOffset, this.IsEventTableRowRefSizeSmall)); + return EventDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _EventOffset, _IsEventTableRowRefSizeSmall)); } } internal struct EventTableReader { internal uint NumberOfRows; - private readonly bool IsTypeDefOrRefRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int NameOffset; - private readonly int EventTypeOffset; + private readonly bool _IsTypeDefOrRefRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _NameOffset; + private readonly int _EventTypeOffset; internal readonly int RowSize; internal MemoryBlock Block; @@ -1266,41 +1266,41 @@ internal struct EventTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.FlagsOffset = 0; - this.NameOffset = this.FlagsOffset + sizeof(UInt16); - this.EventTypeOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.EventTypeOffset + typeDefOrRefRefSize; + _IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _FlagsOffset = 0; + _NameOffset = _FlagsOffset + sizeof(UInt16); + _EventTypeOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _EventTypeOffset + typeDefOrRefRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal EventAttributes GetFlags(EventDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (EventAttributes)this.Block.PeekUInt16(rowOffset + this.FlagsOffset); + return (EventAttributes)this.Block.PeekUInt16(rowOffset + _FlagsOffset); } internal StringHandle GetName(EventDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal Handle GetEventType(EventDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.EventTypeOffset, this.IsTypeDefOrRefRefSizeSmall)); + return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _EventTypeOffset, _IsTypeDefOrRefRefSizeSmall)); } } internal struct PropertyMapTableReader { internal readonly uint NumberOfRows; - private readonly bool IsTypeDefTableRowRefSizeSmall; - private readonly bool IsPropertyRefSizeSmall; - private readonly int ParentOffset; - private readonly int PropertyListOffset; + private readonly bool _IsTypeDefTableRowRefSizeSmall; + private readonly bool _IsPropertyRefSizeSmall; + private readonly int _ParentOffset; + private readonly int _PropertyListOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1313,11 +1313,11 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; - this.IsPropertyRefSizeSmall = propertyRefSize == 2; - this.ParentOffset = 0; - this.PropertyListOffset = this.ParentOffset + typeDefTableRowRefSize; - this.RowSize = this.PropertyListOffset + propertyRefSize; + _IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; + _IsPropertyRefSizeSmall = propertyRefSize == 2; + _ParentOffset = 0; + _PropertyListOffset = _ParentOffset + typeDefTableRowRefSize; + this.RowSize = _PropertyListOffset + propertyRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } @@ -1329,9 +1329,9 @@ internal uint FindPropertyMapRowIdFor(TypeDefinitionHandle typeDef) int rowNumber = this.Block.LinearSearchReference( this.RowSize, - this.ParentOffset, + _ParentOffset, typeDef.RowId, - this.IsTypeDefTableRowRefSizeSmall + _IsTypeDefTableRowRefSizeSmall ); return (uint)(rowNumber + 1); } @@ -1339,13 +1339,13 @@ internal uint FindPropertyMapRowIdFor(TypeDefinitionHandle typeDef) internal TypeDefinitionHandle GetParentType(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.ParentOffset, this.IsTypeDefTableRowRefSizeSmall)); + return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _ParentOffset, _IsTypeDefTableRowRefSizeSmall)); } internal uint GetPropertyListStartFor(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - uint propertyList = this.Block.PeekReference(rowOffset + this.PropertyListOffset, this.IsPropertyRefSizeSmall); + uint propertyList = this.Block.PeekReference(rowOffset + _PropertyListOffset, _IsPropertyRefSizeSmall); return propertyList; } } @@ -1353,8 +1353,8 @@ internal uint GetPropertyListStartFor(uint rowId) internal struct PropertyPtrTableReader { internal readonly uint NumberOfRows; - private readonly bool IsPropertyTableRowRefSizeSmall; - private readonly int PropertyOffset; + private readonly bool _IsPropertyTableRowRefSizeSmall; + private readonly int _PropertyOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1366,9 +1366,9 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsPropertyTableRowRefSizeSmall = propertyTableRowRefSize == 2; - this.PropertyOffset = 0; - this.RowSize = this.PropertyOffset + propertyTableRowRefSize; + _IsPropertyTableRowRefSizeSmall = propertyTableRowRefSize == 2; + _PropertyOffset = 0; + this.RowSize = _PropertyOffset + propertyTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } @@ -1378,18 +1378,18 @@ int rowId // ^ requires rowId <= this.NumberOfRows; { int rowOffset = (rowId - 1) * this.RowSize; - return PropertyDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.PropertyOffset, this.IsPropertyTableRowRefSizeSmall)); + return PropertyDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _PropertyOffset, _IsPropertyTableRowRefSizeSmall)); } } internal struct PropertyTableReader { internal readonly uint NumberOfRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int NameOffset; - private readonly int SignatureOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _NameOffset; + private readonly int _SignatureOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1402,42 +1402,42 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.FlagsOffset = 0; - this.NameOffset = this.FlagsOffset + sizeof(UInt16); - this.SignatureOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.SignatureOffset + blobHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _FlagsOffset = 0; + _NameOffset = _FlagsOffset + sizeof(UInt16); + _SignatureOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _SignatureOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal PropertyAttributes GetFlags(PropertyDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (PropertyAttributes)this.Block.PeekUInt16(rowOffset + this.FlagsOffset); + return (PropertyAttributes)this.Block.PeekUInt16(rowOffset + _FlagsOffset); } internal StringHandle GetName(PropertyDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal BlobHandle GetSignature(PropertyDefinitionHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.SignatureOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _SignatureOffset, _IsBlobHeapRefSizeSmall)); } } internal struct MethodSemanticsTableReader { internal readonly uint NumberOfRows; - private readonly bool IsMethodTableRowRefSizeSmall; - private readonly bool IsHasSemanticRefSizeSmall; - private readonly int SemanticsFlagOffset; - private readonly int MethodOffset; - private readonly int AssociationOffset; + private readonly bool _IsMethodTableRowRefSizeSmall; + private readonly bool _IsHasSemanticRefSizeSmall; + private readonly int _SemanticsFlagOffset; + private readonly int _MethodOffset; + private readonly int _AssociationOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1451,12 +1451,12 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsMethodTableRowRefSizeSmall = methodTableRowRefSize == 2; - this.IsHasSemanticRefSizeSmall = hasSemanticRefSize == 2; - this.SemanticsFlagOffset = 0; - this.MethodOffset = this.SemanticsFlagOffset + sizeof(UInt16); - this.AssociationOffset = this.MethodOffset + methodTableRowRefSize; - this.RowSize = this.AssociationOffset + hasSemanticRefSize; + _IsMethodTableRowRefSizeSmall = methodTableRowRefSize == 2; + _IsHasSemanticRefSizeSmall = hasSemanticRefSize == 2; + _SemanticsFlagOffset = 0; + _MethodOffset = _SemanticsFlagOffset + sizeof(UInt16); + _AssociationOffset = _MethodOffset + methodTableRowRefSize; + this.RowSize = _AssociationOffset + hasSemanticRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -1468,19 +1468,19 @@ int containingBlockOffset internal MethodDefinitionHandle GetMethod(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return MethodDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.MethodOffset, this.IsMethodTableRowRefSizeSmall)); + return MethodDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _MethodOffset, _IsMethodTableRowRefSizeSmall)); } internal MethodSemanticsAttributes GetSemantics(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return (MethodSemanticsAttributes)this.Block.PeekUInt16(rowOffset + this.SemanticsFlagOffset); + return (MethodSemanticsAttributes)this.Block.PeekUInt16(rowOffset + _SemanticsFlagOffset); } internal Handle GetAssociation(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return HasSemanticsTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.AssociationOffset, this.IsHasSemanticRefSizeSmall)); + return HasSemanticsTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _AssociationOffset, _IsHasSemanticRefSizeSmall)); } // returns rowID @@ -1504,9 +1504,9 @@ private uint BinarySearchTag(uint searchCodedTag, ref ushort methodCount) this.Block.BinarySearchReferenceRange( this.NumberOfRows, this.RowSize, - this.AssociationOffset, + _AssociationOffset, searchCodedTag, - this.IsHasSemanticRefSizeSmall, + _IsHasSemanticRefSizeSmall, out startRowNumber, out endRowNumber ); @@ -1523,18 +1523,18 @@ out endRowNumber private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.AssociationOffset, this.IsHasSemanticRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _AssociationOffset, _IsHasSemanticRefSizeSmall); } } internal struct MethodImplTableReader { internal readonly uint NumberOfRows; - private readonly bool IsTypeDefTableRowRefSizeSmall; - private readonly bool IsMethodDefOrRefRefSizeSmall; - private readonly int ClassOffset; - private readonly int MethodBodyOffset; - private readonly int MethodDeclarationOffset; + private readonly bool _IsTypeDefTableRowRefSizeSmall; + private readonly bool _IsMethodDefOrRefRefSizeSmall; + private readonly int _ClassOffset; + private readonly int _MethodBodyOffset; + private readonly int _MethodDeclarationOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1548,12 +1548,12 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; - this.IsMethodDefOrRefRefSizeSmall = methodDefOrRefRefSize == 2; - this.ClassOffset = 0; - this.MethodBodyOffset = this.ClassOffset + typeDefTableRowRefSize; - this.MethodDeclarationOffset = this.MethodBodyOffset + methodDefOrRefRefSize; - this.RowSize = this.MethodDeclarationOffset + methodDefOrRefRefSize; + _IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; + _IsMethodDefOrRefRefSizeSmall = methodDefOrRefRefSize == 2; + _ClassOffset = 0; + _MethodBodyOffset = _ClassOffset + typeDefTableRowRefSize; + _MethodDeclarationOffset = _MethodBodyOffset + methodDefOrRefRefSize; + this.RowSize = _MethodDeclarationOffset + methodDefOrRefRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -1565,19 +1565,19 @@ int containingBlockOffset internal TypeDefinitionHandle GetClass(MethodImplementationHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.ClassOffset, this.IsTypeDefTableRowRefSizeSmall)); + return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _ClassOffset, _IsTypeDefTableRowRefSizeSmall)); } internal Handle GetMethodBody(MethodImplementationHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return MethodDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.MethodBodyOffset, this.IsMethodDefOrRefRefSizeSmall)); + return MethodDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _MethodBodyOffset, _IsMethodDefOrRefRefSizeSmall)); } internal Handle GetMethodDeclaration(MethodImplementationHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return MethodDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.MethodDeclarationOffset, this.IsMethodDefOrRefRefSizeSmall)); + return MethodDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _MethodDeclarationOffset, _IsMethodDefOrRefRefSizeSmall)); } internal void GetMethodImplRange( @@ -1591,9 +1591,9 @@ internal Handle GetMethodDeclaration(MethodImplementationHandle handle) this.Block.BinarySearchReferenceRange( this.NumberOfRows, this.RowSize, - this.ClassOffset, + _ClassOffset, typeDefRid, - this.IsTypeDefTableRowRefSizeSmall, + _IsTypeDefTableRowRefSizeSmall, out startRowNumber, out endRowNumber ); @@ -1612,15 +1612,15 @@ out endRowNumber private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.ClassOffset, this.IsTypeDefTableRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _ClassOffset, _IsTypeDefTableRowRefSizeSmall); } } internal struct ModuleRefTableReader { internal readonly uint NumberOfRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int NameOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _NameOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1632,24 +1632,24 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.NameOffset = 0; - this.RowSize = this.NameOffset + stringHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _NameOffset = 0; + this.RowSize = _NameOffset + stringHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal StringHandle GetName(ModuleReferenceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } } internal struct TypeSpecTableReader { internal readonly uint NumberOfRows; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int SignatureOffset; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _SignatureOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1661,29 +1661,29 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.SignatureOffset = 0; - this.RowSize = this.SignatureOffset + blobHeapRefSize; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _SignatureOffset = 0; + this.RowSize = _SignatureOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal BlobHandle GetSignature(TypeSpecificationHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.SignatureOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _SignatureOffset, _IsBlobHeapRefSizeSmall)); } } internal struct ImplMapTableReader { internal readonly uint NumberOfRows; - private readonly bool IsModuleRefTableRowRefSizeSmall; - private readonly bool IsMemberForwardRowRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int MemberForwardedOffset; - private readonly int ImportNameOffset; - private readonly int ImportScopeOffset; + private readonly bool _IsModuleRefTableRowRefSizeSmall; + private readonly bool _IsMemberForwardRowRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _MemberForwardedOffset; + private readonly int _ImportNameOffset; + private readonly int _ImportScopeOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1698,14 +1698,14 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsModuleRefTableRowRefSizeSmall = moduleRefTableRowRefSize == 2; - this.IsMemberForwardRowRefSizeSmall = memberForwardedRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.FlagsOffset = 0; - this.MemberForwardedOffset = this.FlagsOffset + sizeof(UInt16); - this.ImportNameOffset = this.MemberForwardedOffset + memberForwardedRefSize; - this.ImportScopeOffset = this.ImportNameOffset + stringHeapRefSize; - this.RowSize = this.ImportScopeOffset + moduleRefTableRowRefSize; + _IsModuleRefTableRowRefSizeSmall = moduleRefTableRowRefSize == 2; + _IsMemberForwardRowRefSizeSmall = memberForwardedRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _FlagsOffset = 0; + _MemberForwardedOffset = _FlagsOffset + sizeof(UInt16); + _ImportNameOffset = _MemberForwardedOffset + memberForwardedRefSize; + _ImportScopeOffset = _ImportNameOffset + stringHeapRefSize; + this.RowSize = _ImportScopeOffset + moduleRefTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -1719,9 +1719,9 @@ int containingBlockOffset get { int rowOffset = (int)(rowId - 1) * this.RowSize; - var pInvokeMapFlags = (MethodImportAttributes)Block.PeekUInt16(rowOffset + this.FlagsOffset); - var importName = StringHandle.FromIndex(Block.PeekReference(rowOffset + this.ImportNameOffset, this.IsStringHeapRefSizeSmall)); - var importScope = ModuleReferenceHandle.FromRowId(Block.PeekReference(rowOffset + this.ImportScopeOffset, this.IsModuleRefTableRowRefSizeSmall)); + var pInvokeMapFlags = (MethodImportAttributes)Block.PeekUInt16(rowOffset + _FlagsOffset); + var importName = StringHandle.FromIndex(Block.PeekReference(rowOffset + _ImportNameOffset, _IsStringHeapRefSizeSmall)); + var importScope = ModuleReferenceHandle.FromRowId(Block.PeekReference(rowOffset + _ImportScopeOffset, _IsModuleRefTableRowRefSizeSmall)); return new MethodImport(pInvokeMapFlags, importName, importScope); } } @@ -1729,7 +1729,7 @@ int containingBlockOffset internal Handle GetMemberForwarded(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return MemberForwardedTag.ConvertToToken(Block.PeekTaggedReference(rowOffset + this.MemberForwardedOffset, this.IsMemberForwardRowRefSizeSmall)); + return MemberForwardedTag.ConvertToToken(Block.PeekTaggedReference(rowOffset + _MemberForwardedOffset, _IsMemberForwardRowRefSizeSmall)); } internal uint FindImplForMethod(MethodDefinitionHandle methodDef) @@ -1744,25 +1744,25 @@ private uint BinarySearchTag(uint searchCodedTag) this.Block.BinarySearchReference( this.NumberOfRows, this.RowSize, - this.MemberForwardedOffset, + _MemberForwardedOffset, searchCodedTag, - this.IsMemberForwardRowRefSizeSmall + _IsMemberForwardRowRefSizeSmall ); return (uint)(foundRowNumber + 1); } private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.MemberForwardedOffset, this.IsMemberForwardRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _MemberForwardedOffset, _IsMemberForwardRowRefSizeSmall); } } internal struct FieldRVATableReader { internal readonly uint NumberOfRows; - private readonly bool IsFieldTableRowRefSizeSmall; - private readonly int RVAOffset; - private readonly int FieldOffset; + private readonly bool _IsFieldTableRowRefSizeSmall; + private readonly int _RVAOffset; + private readonly int _FieldOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1775,10 +1775,10 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsFieldTableRowRefSizeSmall = fieldTableRowRefSize == 2; - this.RVAOffset = 0; - this.FieldOffset = this.RVAOffset + sizeof(UInt32); - this.RowSize = this.FieldOffset + fieldTableRowRefSize; + _IsFieldTableRowRefSizeSmall = fieldTableRowRefSize == 2; + _RVAOffset = 0; + _FieldOffset = _RVAOffset + sizeof(UInt32); + this.RowSize = _FieldOffset + fieldTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -1790,7 +1790,7 @@ int containingBlockOffset internal int GetRVA(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return Block.PeekInt32(rowOffset + this.RVAOffset); + return Block.PeekInt32(rowOffset + _RVAOffset); } internal uint FindFieldRVARowId(uint fieldDefRowId) @@ -1798,9 +1798,9 @@ internal uint FindFieldRVARowId(uint fieldDefRowId) int foundRowNumber = Block.BinarySearchReference( this.NumberOfRows, this.RowSize, - this.FieldOffset, + _FieldOffset, fieldDefRowId, - this.IsFieldTableRowRefSizeSmall + _IsFieldTableRowRefSizeSmall ); return (uint)(foundRowNumber + 1); @@ -1808,15 +1808,15 @@ internal uint FindFieldRVARowId(uint fieldDefRowId) private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.FieldOffset, this.IsFieldTableRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _FieldOffset, _IsFieldTableRowRefSizeSmall); } } internal struct EnCLogTableReader { internal readonly uint NumberOfRows; - private readonly int TokenOffset; - private readonly int FuncCodeOffset; + private readonly int _TokenOffset; + private readonly int _FuncCodeOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1831,30 +1831,30 @@ internal struct EnCLogTableReader // the CLR includes the EnCLog table into the snapshot (but not EnCMap). We pretend EnCLog is empty. this.NumberOfRows = (metadataStreamKind == MetadataStreamKind.Compressed) ? 0 : numberOfRows; - this.TokenOffset = 0; - this.FuncCodeOffset = this.TokenOffset + sizeof(uint); - this.RowSize = this.FuncCodeOffset + sizeof(uint); + _TokenOffset = 0; + _FuncCodeOffset = _TokenOffset + sizeof(uint); + this.RowSize = _FuncCodeOffset + sizeof(uint); this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal uint GetToken(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekUInt32(rowOffset + this.TokenOffset); + return this.Block.PeekUInt32(rowOffset + _TokenOffset); } #pragma warning disable 618 // Edit and continue API marked obsolete to give us more time to refactor internal EditAndContinueOperation GetFuncCode(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return (EditAndContinueOperation)this.Block.PeekUInt32(rowOffset + this.FuncCodeOffset); + return (EditAndContinueOperation)this.Block.PeekUInt32(rowOffset + _FuncCodeOffset); } } internal struct EnCMapTableReader { internal readonly uint NumberOfRows; - private readonly int TokenOffset; + private readonly int _TokenOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1864,15 +1864,15 @@ internal struct EnCMapTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.TokenOffset = 0; - this.RowSize = this.TokenOffset + sizeof(uint); + _TokenOffset = 0; + this.RowSize = _TokenOffset + sizeof(uint); this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal uint GetToken(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekUInt32(rowOffset + this.TokenOffset); + return this.Block.PeekUInt32(rowOffset + _TokenOffset); } } #pragma warning restore 618 // Edit and continue API marked obsolete to give us more time to refactor @@ -1880,17 +1880,17 @@ internal uint GetToken(uint rowId) internal struct AssemblyTableReader { internal readonly uint NumberOfRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int HashAlgIdOffset; - private readonly int MajorVersionOffset; - private readonly int MinorVersionOffset; - private readonly int BuildNumberOffset; - private readonly int RevisionNumberOffset; - private readonly int FlagsOffset; - private readonly int PublicKeyOffset; - private readonly int NameOffset; - private readonly int CultureOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _HashAlgIdOffset; + private readonly int _MajorVersionOffset; + private readonly int _MinorVersionOffset; + private readonly int _BuildNumberOffset; + private readonly int _RevisionNumberOffset; + private readonly int _FlagsOffset; + private readonly int _PublicKeyOffset; + private readonly int _NameOffset; + private readonly int _CultureOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1906,66 +1906,66 @@ int containingBlockOffset // we ignore all rows but the first one this.NumberOfRows = numberOfRows > 1 ? 1 : numberOfRows; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.HashAlgIdOffset = 0; - this.MajorVersionOffset = this.HashAlgIdOffset + sizeof(UInt32); - this.MinorVersionOffset = this.MajorVersionOffset + sizeof(UInt16); - this.BuildNumberOffset = this.MinorVersionOffset + sizeof(UInt16); - this.RevisionNumberOffset = this.BuildNumberOffset + sizeof(UInt16); - this.FlagsOffset = this.RevisionNumberOffset + sizeof(UInt16); - this.PublicKeyOffset = this.FlagsOffset + sizeof(UInt32); - this.NameOffset = this.PublicKeyOffset + blobHeapRefSize; - this.CultureOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.CultureOffset + stringHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _HashAlgIdOffset = 0; + _MajorVersionOffset = _HashAlgIdOffset + sizeof(UInt32); + _MinorVersionOffset = _MajorVersionOffset + sizeof(UInt16); + _BuildNumberOffset = _MinorVersionOffset + sizeof(UInt16); + _RevisionNumberOffset = _BuildNumberOffset + sizeof(UInt16); + _FlagsOffset = _RevisionNumberOffset + sizeof(UInt16); + _PublicKeyOffset = _FlagsOffset + sizeof(UInt32); + _NameOffset = _PublicKeyOffset + blobHeapRefSize; + _CultureOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _CultureOffset + stringHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal AssemblyHashAlgorithm GetHashAlgorithm() { Debug.Assert(NumberOfRows == 1); - return (AssemblyHashAlgorithm)this.Block.PeekUInt32(this.HashAlgIdOffset); + return (AssemblyHashAlgorithm)this.Block.PeekUInt32(_HashAlgIdOffset); } internal Version GetVersion() { Debug.Assert(NumberOfRows == 1); return new Version( - this.Block.PeekUInt16(this.MajorVersionOffset), - this.Block.PeekUInt16(this.MinorVersionOffset), - this.Block.PeekUInt16(this.BuildNumberOffset), - this.Block.PeekUInt16(this.RevisionNumberOffset)); + this.Block.PeekUInt16(_MajorVersionOffset), + this.Block.PeekUInt16(_MinorVersionOffset), + this.Block.PeekUInt16(_BuildNumberOffset), + this.Block.PeekUInt16(_RevisionNumberOffset)); } internal AssemblyFlags GetFlags() { Debug.Assert(NumberOfRows == 1); - return (AssemblyFlags)this.Block.PeekUInt32(this.FlagsOffset); + return (AssemblyFlags)this.Block.PeekUInt32(_FlagsOffset); } internal BlobHandle GetPublicKey() { Debug.Assert(NumberOfRows == 1); - return BlobHandle.FromIndex(this.Block.PeekReference(this.PublicKeyOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(_PublicKeyOffset, _IsBlobHeapRefSizeSmall)); } internal StringHandle GetName() { Debug.Assert(NumberOfRows == 1); - return StringHandle.FromIndex(this.Block.PeekReference(this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(_NameOffset, _IsStringHeapRefSizeSmall)); } internal StringHandle GetCulture() { Debug.Assert(NumberOfRows == 1); - return StringHandle.FromIndex(this.Block.PeekReference(this.CultureOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(_CultureOffset, _IsStringHeapRefSizeSmall)); } } internal struct AssemblyProcessorTableReader { internal readonly uint NumberOfRows; - private readonly int ProcessorOffset; + private readonly int _ProcessorOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1976,8 +1976,8 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.ProcessorOffset = 0; - this.RowSize = this.ProcessorOffset + sizeof(UInt32); + _ProcessorOffset = 0; + this.RowSize = _ProcessorOffset + sizeof(UInt32); this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } } @@ -1985,9 +1985,9 @@ int containingBlockOffset internal struct AssemblyOSTableReader { internal readonly uint NumberOfRows; - private readonly int OSPlatformIdOffset; - private readonly int OSMajorVersionIdOffset; - private readonly int OSMinorVersionIdOffset; + private readonly int _OSPlatformIdOffset; + private readonly int _OSMajorVersionIdOffset; + private readonly int _OSMinorVersionIdOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -1998,10 +1998,10 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.OSPlatformIdOffset = 0; - this.OSMajorVersionIdOffset = this.OSPlatformIdOffset + sizeof(UInt32); - this.OSMinorVersionIdOffset = this.OSMajorVersionIdOffset + sizeof(UInt32); - this.RowSize = this.OSMinorVersionIdOffset + sizeof(UInt32); + _OSPlatformIdOffset = 0; + _OSMajorVersionIdOffset = _OSPlatformIdOffset + sizeof(UInt32); + _OSMinorVersionIdOffset = _OSMajorVersionIdOffset + sizeof(UInt32); + this.RowSize = _OSMinorVersionIdOffset + sizeof(UInt32); this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } } @@ -2015,17 +2015,17 @@ internal struct AssemblyRefTableReader internal readonly int NumberOfNonVirtualRows; internal readonly int NumberOfVirtualRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int MajorVersionOffset; - private readonly int MinorVersionOffset; - private readonly int BuildNumberOffset; - private readonly int RevisionNumberOffset; - private readonly int FlagsOffset; - private readonly int PublicKeyOrTokenOffset; - private readonly int NameOffset; - private readonly int CultureOffset; - private readonly int HashValueOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _MajorVersionOffset; + private readonly int _MinorVersionOffset; + private readonly int _BuildNumberOffset; + private readonly int _RevisionNumberOffset; + private readonly int _FlagsOffset; + private readonly int _PublicKeyOrTokenOffset; + private readonly int _NameOffset; + private readonly int _CultureOffset; + private readonly int _HashValueOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2040,18 +2040,18 @@ internal struct AssemblyRefTableReader this.NumberOfNonVirtualRows = numberOfRows; this.NumberOfVirtualRows = (metadataKind == MetadataKind.Ecma335) ? 0 : (int)AssemblyReferenceHandle.VirtualIndex.Count; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.MajorVersionOffset = 0; - this.MinorVersionOffset = this.MajorVersionOffset + sizeof(UInt16); - this.BuildNumberOffset = this.MinorVersionOffset + sizeof(UInt16); - this.RevisionNumberOffset = this.BuildNumberOffset + sizeof(UInt16); - this.FlagsOffset = this.RevisionNumberOffset + sizeof(UInt16); - this.PublicKeyOrTokenOffset = this.FlagsOffset + sizeof(UInt32); - this.NameOffset = this.PublicKeyOrTokenOffset + blobHeapRefSize; - this.CultureOffset = this.NameOffset + stringHeapRefSize; - this.HashValueOffset = this.CultureOffset + stringHeapRefSize; - this.RowSize = this.HashValueOffset + blobHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _MajorVersionOffset = 0; + _MinorVersionOffset = _MajorVersionOffset + sizeof(UInt16); + _BuildNumberOffset = _MinorVersionOffset + sizeof(UInt16); + _RevisionNumberOffset = _BuildNumberOffset + sizeof(UInt16); + _FlagsOffset = _RevisionNumberOffset + sizeof(UInt16); + _PublicKeyOrTokenOffset = _FlagsOffset + sizeof(UInt32); + _NameOffset = _PublicKeyOrTokenOffset + blobHeapRefSize; + _CultureOffset = _NameOffset + stringHeapRefSize; + _HashValueOffset = _CultureOffset + stringHeapRefSize; + this.RowSize = _HashValueOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, this.RowSize * numberOfRows); } @@ -2059,49 +2059,49 @@ internal Version GetVersion(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; return new Version( - this.Block.PeekUInt16(rowOffset + this.MajorVersionOffset), - this.Block.PeekUInt16(rowOffset + this.MinorVersionOffset), - this.Block.PeekUInt16(rowOffset + this.BuildNumberOffset), - this.Block.PeekUInt16(rowOffset + this.RevisionNumberOffset)); + this.Block.PeekUInt16(rowOffset + _MajorVersionOffset), + this.Block.PeekUInt16(rowOffset + _MinorVersionOffset), + this.Block.PeekUInt16(rowOffset + _BuildNumberOffset), + this.Block.PeekUInt16(rowOffset + _RevisionNumberOffset)); } internal AssemblyFlags GetFlags(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return (AssemblyFlags)this.Block.PeekUInt32(rowOffset + this.FlagsOffset); + return (AssemblyFlags)this.Block.PeekUInt32(rowOffset + _FlagsOffset); } internal BlobHandle GetPublicKeyOrToken(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.PublicKeyOrTokenOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _PublicKeyOrTokenOffset, _IsBlobHeapRefSizeSmall)); } internal StringHandle GetName(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal StringHandle GetCulture(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.CultureOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _CultureOffset, _IsStringHeapRefSizeSmall)); } internal BlobHandle GetHashValue(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.HashValueOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _HashValueOffset, _IsBlobHeapRefSizeSmall)); } } internal struct AssemblyRefProcessorTableReader { internal readonly uint NumberOfRows; - private readonly bool IsAssemblyRefTableRowSizeSmall; - private readonly int ProcessorOffset; - private readonly int AssemblyRefOffset; + private readonly bool _IsAssemblyRefTableRowSizeSmall; + private readonly int _ProcessorOffset; + private readonly int _AssemblyRefOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2113,10 +2113,10 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsAssemblyRefTableRowSizeSmall = assembyRefTableRowRefSize == 2; - this.ProcessorOffset = 0; - this.AssemblyRefOffset = this.ProcessorOffset + sizeof(UInt32); - this.RowSize = this.AssemblyRefOffset + assembyRefTableRowRefSize; + _IsAssemblyRefTableRowSizeSmall = assembyRefTableRowRefSize == 2; + _ProcessorOffset = 0; + _AssemblyRefOffset = _ProcessorOffset + sizeof(UInt32); + this.RowSize = _AssemblyRefOffset + assembyRefTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } } @@ -2124,11 +2124,11 @@ int containingBlockOffset internal struct AssemblyRefOSTableReader { internal readonly uint NumberOfRows; - private readonly bool IsAssemblyRefTableRowRefSizeSmall; - private readonly int OSPlatformIdOffset; - private readonly int OSMajorVersionIdOffset; - private readonly int OSMinorVersionIdOffset; - private readonly int AssemblyRefOffset; + private readonly bool _IsAssemblyRefTableRowRefSizeSmall; + private readonly int _OSPlatformIdOffset; + private readonly int _OSMajorVersionIdOffset; + private readonly int _OSMinorVersionIdOffset; + private readonly int _AssemblyRefOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2139,12 +2139,12 @@ internal struct AssemblyRefOSTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsAssemblyRefTableRowRefSizeSmall = assembyRefTableRowRefSize == 2; - this.OSPlatformIdOffset = 0; - this.OSMajorVersionIdOffset = this.OSPlatformIdOffset + sizeof(UInt32); - this.OSMinorVersionIdOffset = this.OSMajorVersionIdOffset + sizeof(UInt32); - this.AssemblyRefOffset = this.OSMinorVersionIdOffset + sizeof(UInt32); - this.RowSize = this.AssemblyRefOffset + assembyRefTableRowRefSize; + _IsAssemblyRefTableRowRefSizeSmall = assembyRefTableRowRefSize == 2; + _OSPlatformIdOffset = 0; + _OSMajorVersionIdOffset = _OSPlatformIdOffset + sizeof(UInt32); + _OSMinorVersionIdOffset = _OSMajorVersionIdOffset + sizeof(UInt32); + _AssemblyRefOffset = _OSMinorVersionIdOffset + sizeof(UInt32); + this.RowSize = _AssemblyRefOffset + assembyRefTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } } @@ -2152,11 +2152,11 @@ internal struct AssemblyRefOSTableReader internal struct FileTableReader { internal readonly uint NumberOfRows; - private readonly bool IsStringHeapRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int NameOffset; - private readonly int HashValueOffset; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _NameOffset; + private readonly int _HashValueOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2168,44 +2168,44 @@ internal struct FileTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.FlagsOffset = 0; - this.NameOffset = this.FlagsOffset + sizeof(UInt32); - this.HashValueOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.HashValueOffset + blobHeapRefSize; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _FlagsOffset = 0; + _NameOffset = _FlagsOffset + sizeof(UInt32); + _HashValueOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _HashValueOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal BlobHandle GetHashValue(AssemblyFileHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.HashValueOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _HashValueOffset, _IsBlobHeapRefSizeSmall)); } internal uint GetFlags(AssemblyFileHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return this.Block.PeekUInt32(rowOffset + this.FlagsOffset); + return this.Block.PeekUInt32(rowOffset + _FlagsOffset); } internal StringHandle GetName(AssemblyFileHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } } internal struct ExportedTypeTableReader { internal readonly uint NumberOfRows; - private readonly bool IsImplementationRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int FlagsOffset; - private readonly int TypeDefIdOffset; - private readonly int TypeNameOffset; - private readonly int TypeNamespaceOffset; - private readonly int ImplementationOffset; + private readonly bool _IsImplementationRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _FlagsOffset; + private readonly int _TypeDefIdOffset; + private readonly int _TypeNameOffset; + private readonly int _TypeNamespaceOffset; + private readonly int _ImplementationOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2218,57 +2218,57 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsImplementationRefSizeSmall = implementationRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.FlagsOffset = 0; - this.TypeDefIdOffset = this.FlagsOffset + sizeof(UInt32); - this.TypeNameOffset = this.TypeDefIdOffset + sizeof(UInt32); - this.TypeNamespaceOffset = this.TypeNameOffset + stringHeapRefSize; - this.ImplementationOffset = this.TypeNamespaceOffset + stringHeapRefSize; - this.RowSize = this.ImplementationOffset + implementationRefSize; + _IsImplementationRefSizeSmall = implementationRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _FlagsOffset = 0; + _TypeDefIdOffset = _FlagsOffset + sizeof(UInt32); + _TypeNameOffset = _TypeDefIdOffset + sizeof(UInt32); + _TypeNamespaceOffset = _TypeNameOffset + stringHeapRefSize; + _ImplementationOffset = _TypeNamespaceOffset + stringHeapRefSize; + this.RowSize = _ImplementationOffset + implementationRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal StringHandle GetTypeName(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.TypeNameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _TypeNameOffset, _IsStringHeapRefSizeSmall)); } internal StringHandle GetTypeNamespaceString(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.TypeNamespaceOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _TypeNamespaceOffset, _IsStringHeapRefSizeSmall)); } internal NamespaceDefinitionHandle GetTypeNamespace(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return NamespaceDefinitionHandle.FromIndexOfFullName(this.Block.PeekReference(rowOffset + this.TypeNamespaceOffset, this.IsStringHeapRefSizeSmall)); + return NamespaceDefinitionHandle.FromIndexOfFullName(this.Block.PeekReference(rowOffset + _TypeNamespaceOffset, _IsStringHeapRefSizeSmall)); } internal Handle GetImplementation(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return ImplementationTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ImplementationOffset, this.IsImplementationRefSizeSmall)); + return ImplementationTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ImplementationOffset, _IsImplementationRefSizeSmall)); } internal TypeAttributes GetFlags(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return (TypeAttributes)this.Block.PeekUInt32(rowOffset + this.FlagsOffset); + return (TypeAttributes)this.Block.PeekUInt32(rowOffset + _FlagsOffset); } internal uint GetTypeDefId(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return this.Block.PeekUInt32(rowOffset + this.TypeDefIdOffset); + return this.Block.PeekUInt32(rowOffset + _TypeDefIdOffset); } internal uint GetNamespace(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - uint typeNamespace = this.Block.PeekReference(rowOffset + this.TypeNamespaceOffset, this.IsStringHeapRefSizeSmall); + uint typeNamespace = this.Block.PeekReference(rowOffset + _TypeNamespaceOffset, _IsStringHeapRefSizeSmall); return typeNamespace; } } @@ -2276,12 +2276,12 @@ internal uint GetNamespace(uint rowId) internal struct ManifestResourceTableReader { internal readonly uint NumberOfRows; - private readonly bool IsImplementationRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int OffsetOffset; - private readonly int FlagsOffset; - private readonly int NameOffset; - private readonly int ImplementationOffset; + private readonly bool _IsImplementationRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _OffsetOffset; + private readonly int _FlagsOffset; + private readonly int _NameOffset; + private readonly int _ImplementationOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2294,47 +2294,47 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsImplementationRefSizeSmall = implementationRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.OffsetOffset = 0; - this.FlagsOffset = this.OffsetOffset + sizeof(UInt32); - this.NameOffset = this.FlagsOffset + sizeof(UInt32); - this.ImplementationOffset = this.NameOffset + stringHeapRefSize; - this.RowSize = this.ImplementationOffset + implementationRefSize; + _IsImplementationRefSizeSmall = implementationRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _OffsetOffset = 0; + _FlagsOffset = _OffsetOffset + sizeof(UInt32); + _NameOffset = _FlagsOffset + sizeof(UInt32); + _ImplementationOffset = _NameOffset + stringHeapRefSize; + this.RowSize = _ImplementationOffset + implementationRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal StringHandle GetName(ManifestResourceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal Handle GetImplementation(ManifestResourceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return ImplementationTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ImplementationOffset, this.IsImplementationRefSizeSmall)); + return ImplementationTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ImplementationOffset, _IsImplementationRefSizeSmall)); } internal uint GetOffset(ManifestResourceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return this.Block.PeekUInt32(rowOffset + this.OffsetOffset); + return this.Block.PeekUInt32(rowOffset + _OffsetOffset); } internal ManifestResourceAttributes GetFlags(ManifestResourceHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (ManifestResourceAttributes)this.Block.PeekUInt32(rowOffset + this.FlagsOffset); + return (ManifestResourceAttributes)this.Block.PeekUInt32(rowOffset + _FlagsOffset); } } internal struct NestedClassTableReader { internal readonly uint NumberOfRows; - private readonly bool IsTypeDefTableRowRefSizeSmall; - private readonly int NestedClassOffset; - private readonly int EnclosingClassOffset; + private readonly bool _IsTypeDefTableRowRefSizeSmall; + private readonly int _NestedClassOffset; + private readonly int _EnclosingClassOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2347,10 +2347,10 @@ int containingBlockOffset ) { this.NumberOfRows = numberOfRows; - this.IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; - this.NestedClassOffset = 0; - this.EnclosingClassOffset = this.NestedClassOffset + typeDefTableRowRefSize; - this.RowSize = this.EnclosingClassOffset + typeDefTableRowRefSize; + _IsTypeDefTableRowRefSizeSmall = typeDefTableRowRefSize == 2; + _NestedClassOffset = 0; + _EnclosingClassOffset = _NestedClassOffset + typeDefTableRowRefSize; + this.RowSize = _EnclosingClassOffset + typeDefTableRowRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -2362,13 +2362,13 @@ int containingBlockOffset internal TypeDefinitionHandle GetNestedClass(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.NestedClassOffset, this.IsTypeDefTableRowRefSizeSmall)); + return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _NestedClassOffset, _IsTypeDefTableRowRefSizeSmall)); } internal TypeDefinitionHandle GetEnclosingClass(uint rowId) { int rowOffset = (int)(rowId - 1) * this.RowSize; - return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + this.EnclosingClassOffset, this.IsTypeDefTableRowRefSizeSmall)); + return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowOffset + _EnclosingClassOffset, _IsTypeDefTableRowRefSizeSmall)); } internal TypeDefinitionHandle FindEnclosingType(TypeDefinitionHandle nestedTypeDef) @@ -2377,31 +2377,31 @@ internal TypeDefinitionHandle FindEnclosingType(TypeDefinitionHandle nestedTypeD this.Block.BinarySearchReference( this.NumberOfRows, this.RowSize, - this.NestedClassOffset, + _NestedClassOffset, nestedTypeDef.RowId, - this.IsTypeDefTableRowRefSizeSmall); + _IsTypeDefTableRowRefSizeSmall); if (rowNumber == -1) return default(TypeDefinitionHandle); - return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowNumber * this.RowSize + this.EnclosingClassOffset, this.IsTypeDefTableRowRefSizeSmall)); + return TypeDefinitionHandle.FromRowId(this.Block.PeekReference(rowNumber * this.RowSize + _EnclosingClassOffset, _IsTypeDefTableRowRefSizeSmall)); } private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.NestedClassOffset, this.IsTypeDefTableRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _NestedClassOffset, _IsTypeDefTableRowRefSizeSmall); } } internal struct GenericParamTableReader { internal readonly uint NumberOfRows; - private readonly bool IsTypeOrMethodDefRefSizeSmall; - private readonly bool IsStringHeapRefSizeSmall; - private readonly int NumberOffset; - private readonly int FlagsOffset; - private readonly int OwnerOffset; - private readonly int NameOffset; + private readonly bool _IsTypeOrMethodDefRefSizeSmall; + private readonly bool _IsStringHeapRefSizeSmall; + private readonly int _NumberOffset; + private readonly int _FlagsOffset; + private readonly int _OwnerOffset; + private readonly int _NameOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2414,13 +2414,13 @@ internal struct GenericParamTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsTypeOrMethodDefRefSizeSmall = typeOrMethodDefRefSize == 2; - this.IsStringHeapRefSizeSmall = stringHeapRefSize == 2; - this.NumberOffset = 0; - this.FlagsOffset = this.NumberOffset + sizeof(UInt16); - this.OwnerOffset = this.FlagsOffset + sizeof(UInt16); - this.NameOffset = this.OwnerOffset + typeOrMethodDefRefSize; - this.RowSize = this.NameOffset + stringHeapRefSize; + _IsTypeOrMethodDefRefSizeSmall = typeOrMethodDefRefSize == 2; + _IsStringHeapRefSizeSmall = stringHeapRefSize == 2; + _NumberOffset = 0; + _FlagsOffset = _NumberOffset + sizeof(UInt16); + _OwnerOffset = _FlagsOffset + sizeof(UInt16); + _NameOffset = _OwnerOffset + typeOrMethodDefRefSize; + this.RowSize = _NameOffset + stringHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -2432,25 +2432,25 @@ internal struct GenericParamTableReader internal ushort GetNumber(GenericParameterHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return this.Block.PeekUInt16(rowOffset + this.NumberOffset); + return this.Block.PeekUInt16(rowOffset + _NumberOffset); } internal GenericParameterAttributes GetFlags(GenericParameterHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return (GenericParameterAttributes)this.Block.PeekUInt16(rowOffset + this.FlagsOffset); + return (GenericParameterAttributes)this.Block.PeekUInt16(rowOffset + _FlagsOffset); } internal StringHandle GetName(GenericParameterHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + this.NameOffset, this.IsStringHeapRefSizeSmall)); + return StringHandle.FromIndex(this.Block.PeekReference(rowOffset + _NameOffset, _IsStringHeapRefSizeSmall)); } internal Handle GetOwner(GenericParameterHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return TypeOrMethodDefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.OwnerOffset, this.IsTypeOrMethodDefRefSizeSmall)); + return TypeOrMethodDefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _OwnerOffset, _IsTypeOrMethodDefRefSizeSmall)); } internal GenericParameterHandleCollection FindGenericParametersForType(TypeDefinitionHandle typeDef) @@ -2477,9 +2477,9 @@ private uint BinarySearchTag(uint searchCodedTag, ref ushort genericParamCount) this.Block.BinarySearchReferenceRange( this.NumberOfRows, this.RowSize, - this.OwnerOffset, + _OwnerOffset, searchCodedTag, - this.IsTypeOrMethodDefRefSizeSmall, + _IsTypeOrMethodDefRefSizeSmall, out startRowNumber, out endRowNumber); @@ -2495,17 +2495,17 @@ private uint BinarySearchTag(uint searchCodedTag, ref ushort genericParamCount) private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.OwnerOffset, this.IsTypeOrMethodDefRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _OwnerOffset, _IsTypeOrMethodDefRefSizeSmall); } } internal struct MethodSpecTableReader { internal readonly uint NumberOfRows; - private readonly bool IsMethodDefOrRefRefSizeSmall; - private readonly bool IsBlobHeapRefSizeSmall; - private readonly int MethodOffset; - private readonly int InstantiationOffset; + private readonly bool _IsMethodDefOrRefRefSizeSmall; + private readonly bool _IsBlobHeapRefSizeSmall; + private readonly int _MethodOffset; + private readonly int _InstantiationOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2517,34 +2517,34 @@ internal struct MethodSpecTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsMethodDefOrRefRefSizeSmall = methodDefOrRefRefSize == 2; - this.IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; - this.MethodOffset = 0; - this.InstantiationOffset = this.MethodOffset + methodDefOrRefRefSize; - this.RowSize = this.InstantiationOffset + blobHeapRefSize; + _IsMethodDefOrRefRefSizeSmall = methodDefOrRefRefSize == 2; + _IsBlobHeapRefSizeSmall = blobHeapRefSize == 2; + _MethodOffset = 0; + _InstantiationOffset = _MethodOffset + methodDefOrRefRefSize; + this.RowSize = _InstantiationOffset + blobHeapRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); } internal Handle GetMethod(MethodSpecificationHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return MethodDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.MethodOffset, this.IsMethodDefOrRefRefSizeSmall)); + return MethodDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _MethodOffset, _IsMethodDefOrRefRefSizeSmall)); } internal BlobHandle GetInstantiation(MethodSpecificationHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + this.InstantiationOffset, this.IsBlobHeapRefSizeSmall)); + return BlobHandle.FromIndex(this.Block.PeekReference(rowOffset + _InstantiationOffset, _IsBlobHeapRefSizeSmall)); } } internal struct GenericParamConstraintTableReader { internal readonly uint NumberOfRows; - private readonly bool IsGenericParamTableRowRefSizeSmall; - private readonly bool IsTypeDefOrRefRefSizeSmall; - private readonly int OwnerOffset; - private readonly int ConstraintOffset; + private readonly bool _IsGenericParamTableRowRefSizeSmall; + private readonly bool _IsTypeDefOrRefRefSizeSmall; + private readonly int _OwnerOffset; + private readonly int _ConstraintOffset; internal readonly int RowSize; internal readonly MemoryBlock Block; @@ -2557,11 +2557,11 @@ internal struct GenericParamConstraintTableReader int containingBlockOffset) { this.NumberOfRows = numberOfRows; - this.IsGenericParamTableRowRefSizeSmall = genericParamTableRowRefSize == 2; - this.IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; - this.OwnerOffset = 0; - this.ConstraintOffset = this.OwnerOffset + genericParamTableRowRefSize; - this.RowSize = this.ConstraintOffset + typeDefOrRefRefSize; + _IsGenericParamTableRowRefSizeSmall = genericParamTableRowRefSize == 2; + _IsTypeDefOrRefRefSizeSmall = typeDefOrRefRefSize == 2; + _OwnerOffset = 0; + _ConstraintOffset = _OwnerOffset + genericParamTableRowRefSize; + this.RowSize = _ConstraintOffset + typeDefOrRefRefSize; this.Block = containingBlock.GetMemoryBlockAt(containingBlockOffset, (int)(this.RowSize * numberOfRows)); if (!declaredSorted && !CheckSorted()) @@ -2576,9 +2576,9 @@ internal GenericParameterConstraintHandleCollection FindConstraintsForGenericPar this.Block.BinarySearchReferenceRange( this.NumberOfRows, this.RowSize, - this.OwnerOffset, + _OwnerOffset, genericParameter.RowId, - this.IsGenericParamTableRowRefSizeSmall, + _IsGenericParamTableRowRefSizeSmall, out startRowNumber, out endRowNumber); @@ -2594,19 +2594,19 @@ internal GenericParameterConstraintHandleCollection FindConstraintsForGenericPar private bool CheckSorted() { - return this.Block.IsOrderedByReferenceAscending(this.RowSize, this.OwnerOffset, this.IsGenericParamTableRowRefSizeSmall); + return this.Block.IsOrderedByReferenceAscending(this.RowSize, _OwnerOffset, _IsGenericParamTableRowRefSizeSmall); } internal Handle GetConstraint(GenericParameterConstraintHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + this.ConstraintOffset, this.IsTypeDefOrRefRefSizeSmall)); + return TypeDefOrRefTag.ConvertToToken(this.Block.PeekTaggedReference(rowOffset + _ConstraintOffset, _IsTypeDefOrRefRefSizeSmall)); } internal GenericParameterHandle GetOwner(GenericParameterConstraintHandle handle) { int rowOffset = (int)(handle.RowId - 1) * this.RowSize; - return GenericParameterHandle.FromRowId(this.Block.PeekReference(rowOffset + this.OwnerOffset, this.IsGenericParamTableRowRefSizeSmall)); + return GenericParameterHandle.FromRowId(this.Block.PeekReference(rowOffset + _OwnerOffset, _IsGenericParamTableRowRefSizeSmall)); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ManifestResource.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ManifestResource.cs index 2314a32ea82d6aec7422dbd30d3c166fbac2d0e8..cd13d5a622564b06ae4c37e810cda7815ee86b96 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ManifestResource.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ManifestResource.cs @@ -7,23 +7,23 @@ namespace System.Reflection.Metadata { public struct ManifestResource { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal ManifestResource(MetadataReader reader, ManifestResourceHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private ManifestResourceHandle Handle { - get { return ManifestResourceHandle.FromRowId(rowId); } + get { return ManifestResourceHandle.FromRowId(_rowId); } } /// @@ -34,7 +34,7 @@ private ManifestResourceHandle Handle /// public long Offset { - get { return reader.ManifestResourceTable.GetOffset(Handle); } + get { return _reader.ManifestResourceTable.GetOffset(Handle); } } /// @@ -45,7 +45,7 @@ public long Offset /// public ManifestResourceAttributes Attributes { - get { return reader.ManifestResourceTable.GetFlags(Handle); } + get { return _reader.ManifestResourceTable.GetFlags(Handle); } } /// @@ -56,7 +56,7 @@ public ManifestResourceAttributes Attributes /// public StringHandle Name { - get { return reader.ManifestResourceTable.GetName(Handle); } + get { return _reader.ManifestResourceTable.GetName(Handle); } } /// @@ -70,12 +70,12 @@ public StringHandle Name /// public Handle Implementation { - get { return reader.ManifestResourceTable.GetImplementation(Handle); } + get { return _reader.ManifestResourceTable.GetImplementation(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MemberReference.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MemberReference.cs index b85d533b26e3dc21f32dda01de9e3133e2f36cfb..18eb3aa8a1e36ca49baf2abfbee3f75ec43253c3 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MemberReference.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MemberReference.cs @@ -8,28 +8,28 @@ namespace System.Reflection.Metadata { public struct MemberReference { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint treatmentAndRowId; + private readonly uint _treatmentAndRowId; internal MemberReference(MetadataReader reader, uint treatmentAndRowId) { Debug.Assert(reader != null); Debug.Assert(treatmentAndRowId != 0); - this.reader = reader; - this.treatmentAndRowId = treatmentAndRowId; + _reader = reader; + _treatmentAndRowId = treatmentAndRowId; } private uint RowId { - get { return treatmentAndRowId & TokenTypeIds.RIDMask; } + get { return _treatmentAndRowId & TokenTypeIds.RIDMask; } } private MemberRefTreatment Treatment { - get { return (MemberRefTreatment)(treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } + get { return (MemberRefTreatment)(_treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } } private MemberReferenceHandle Handle @@ -46,7 +46,7 @@ public Handle Parent { if (Treatment == 0) { - return reader.MemberRefTable.GetClass(Handle); + return _reader.MemberRefTable.GetClass(Handle); } return GetProjectedParent(); @@ -59,7 +59,7 @@ public StringHandle Name { if (Treatment == 0) { - return reader.MemberRefTable.GetName(Handle); + return _reader.MemberRefTable.GetName(Handle); } return GetProjectedName(); @@ -72,7 +72,7 @@ public BlobHandle Signature { if (Treatment == 0) { - return reader.MemberRefTable.GetSignature(Handle); + return _reader.MemberRefTable.GetSignature(Handle); } return GetProjectedSignature(); @@ -84,7 +84,7 @@ public BlobHandle Signature /// public MemberReferenceKind GetKind() { - BlobReader blobReader = reader.GetBlobReader(this.Signature); + BlobReader blobReader = _reader.GetBlobReader(this.Signature); SignatureHeader header = blobReader.ReadSignatureHeader(); switch (header.Kind) @@ -102,7 +102,7 @@ public MemberReferenceKind GetKind() public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } #region Projections @@ -110,7 +110,7 @@ public CustomAttributeHandleCollection GetCustomAttributes() private Handle GetProjectedParent() { // no change - return reader.MemberRefTable.GetClass(Handle); + return _reader.MemberRefTable.GetClass(Handle); } private StringHandle GetProjectedName() @@ -120,13 +120,13 @@ private StringHandle GetProjectedName() return StringHandle.FromVirtualIndex(StringHandle.VirtualIndex.Dispose); } - return reader.MemberRefTable.GetName(Handle); + return _reader.MemberRefTable.GetName(Handle); } private BlobHandle GetProjectedSignature() { // no change - return reader.MemberRefTable.GetSignature(Handle); + return _reader.MemberRefTable.GetSignature(Handle); } #endregion } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataAggregator.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataAggregator.cs index 2ac9cb865748cd6c1d3d8d9c1509dc901f9652f7..59b74f24bd699ee319a58bf69913cd849a133467 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataAggregator.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataAggregator.cs @@ -11,9 +11,9 @@ public sealed class MetadataAggregator { // For each heap handle and each delta contains aggregate heap lengths. // heapSizes[heap kind][reader index] == Sum { 0..index | reader[i].XxxHeapLength } - private readonly ImmutableArray> heapSizes; + private readonly ImmutableArray> _heapSizes; - private readonly ImmutableArray> rowCounts; + private readonly ImmutableArray> _rowCounts; // internal for testing internal struct RowCounts : IComparable @@ -101,15 +101,15 @@ public MetadataAggregator(MetadataReader baseReader, IReadOnlyList= 0) @@ -288,7 +288,7 @@ public Handle GetGenerationHandle(Handle handle, out int generation) } else { - var sizes = rowCounts[(int)handle.value >> TokenTypeIds.RowIdBitCount]; + var sizes = _rowCounts[(int)handle.value >> TokenTypeIds.RowIdBitCount]; generation = sizes.BinarySearch(new RowCounts { AggregateInserts = rowId }); if (generation >= 0) diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.WinMD.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.WinMD.cs index 869e4911d3c272772f035d8f07597f1eeb7bfb76..2176188656f4192bc7358ef44fb5e56c2efcbcad 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.WinMD.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.WinMD.cs @@ -25,8 +25,8 @@ partial class MetadataReader // Maps names of projected types to projection information for each type. // Both arrays are of the same length and sorted by the type name. - private static string[] projectedTypeNames; - private static ProjectionInfo[] projectionInfos; + private static string[] s_projectedTypeNames; + private static ProjectionInfo[] s_projectionInfos; private struct ProjectionInfo { @@ -60,22 +60,22 @@ private TypeDefTreatment GetWellKnownTypeDefinitionTreatment(TypeDefinitionHandl StringHandle name = TypeDefTable.GetName(typeDef); - int index = StringStream.BinarySearchRaw(projectedTypeNames, name); + int index = StringStream.BinarySearchRaw(s_projectedTypeNames, name); if (index < 0) { return TypeDefTreatment.None; } StringHandle namespaceName = TypeDefTable.GetNamespaceString(typeDef); - if (StringStream.EqualsRaw(namespaceName, StringStream.GetVirtualValue(projectionInfos[index].ClrNamespace))) + if (StringStream.EqualsRaw(namespaceName, StringStream.GetVirtualValue(s_projectionInfos[index].ClrNamespace))) { - return projectionInfos[index].Treatment; + return s_projectionInfos[index].Treatment; } // TODO: we can avoid this comparison if info.DotNetNamespace == info.WinRtNamespace - if (StringStream.EqualsRaw(namespaceName, projectionInfos[index].WinRTNamespace)) + if (StringStream.EqualsRaw(namespaceName, s_projectionInfos[index].WinRTNamespace)) { - return projectionInfos[index].Treatment | TypeDefTreatment.MarkInternalFlag; + return s_projectionInfos[index].Treatment | TypeDefTreatment.MarkInternalFlag; } return TypeDefTreatment.None; @@ -85,10 +85,10 @@ private int GetProjectionIndexForTypeReference(TypeReferenceHandle typeRef, out { InitializeProjectedTypes(); - int index = StringStream.BinarySearchRaw(projectedTypeNames, TypeRefTable.GetName(typeRef)); - if (index >= 0 && StringStream.EqualsRaw(TypeRefTable.GetNamespace(typeRef), projectionInfos[index].WinRTNamespace)) + int index = StringStream.BinarySearchRaw(s_projectedTypeNames, TypeRefTable.GetName(typeRef)); + if (index >= 0 && StringStream.EqualsRaw(TypeRefTable.GetNamespace(typeRef), s_projectionInfos[index].WinRTNamespace)) { - isIDisposable = projectionInfos[index].IsIDisposable; + isIDisposable = s_projectionInfos[index].IsIDisposable; return index; } @@ -98,25 +98,25 @@ private int GetProjectionIndexForTypeReference(TypeReferenceHandle typeRef, out internal static AssemblyReferenceHandle GetProjectedAssemblyRef(int projectionIndex) { - Debug.Assert(projectionInfos != null && projectionIndex >= 0 && projectionIndex < projectionInfos.Length); - return AssemblyReferenceHandle.FromVirtualIndex(projectionInfos[projectionIndex].AssemblyRef); + Debug.Assert(s_projectionInfos != null && projectionIndex >= 0 && projectionIndex < s_projectionInfos.Length); + return AssemblyReferenceHandle.FromVirtualIndex(s_projectionInfos[projectionIndex].AssemblyRef); } internal static StringHandle GetProjectedName(int projectionIndex) { - Debug.Assert(projectionInfos != null && projectionIndex >= 0 && projectionIndex < projectionInfos.Length); - return StringHandle.FromVirtualIndex(projectionInfos[projectionIndex].ClrName); + Debug.Assert(s_projectionInfos != null && projectionIndex >= 0 && projectionIndex < s_projectionInfos.Length); + return StringHandle.FromVirtualIndex(s_projectionInfos[projectionIndex].ClrName); } internal static StringHandle GetProjectedNamespace(int projectionIndex) { - Debug.Assert(projectionInfos != null && projectionIndex >= 0 && projectionIndex < projectionInfos.Length); - return StringHandle.FromVirtualIndex(projectionInfos[projectionIndex].ClrNamespace); + Debug.Assert(s_projectionInfos != null && projectionIndex >= 0 && projectionIndex < s_projectionInfos.Length); + return StringHandle.FromVirtualIndex(s_projectionInfos[projectionIndex].ClrNamespace); } private static void InitializeProjectedTypes() { - if (projectedTypeNames == null || projectionInfos == null) + if (s_projectedTypeNames == null || s_projectionInfos == null) { var systemRuntimeWindowsRuntime = AssemblyReferenceHandle.VirtualIndex.System_Runtime_WindowsRuntime; var systemRuntime = AssemblyReferenceHandle.VirtualIndex.System_Runtime; @@ -186,8 +186,8 @@ private static void InitializeProjectedTypes() Debug.Assert(k == keys.Length && v == keys.Length && k == v); AssertSorted(keys); - projectedTypeNames = keys; - projectionInfos = values; + s_projectedTypeNames = keys; + s_projectionInfos = values; } } @@ -204,7 +204,7 @@ private static void AssertSorted(string[] keys) internal static string[] GetProjectedTypeNames() { InitializeProjectedTypes(); - return projectedTypeNames; + return s_projectedTypeNames; } #endregion @@ -219,7 +219,7 @@ private static uint TreatmentAndRowId(byte treatment, uint rowId) [MethodImplAttribute(MethodImplOptions.NoInlining)] internal uint CalculateTypeDefTreatmentAndRowId(TypeDefinitionHandle handle) { - Debug.Assert(metadataKind != MetadataKind.Ecma335); + Debug.Assert(_metadataKind != MetadataKind.Ecma335); TypeDefTreatment treatment; @@ -228,7 +228,7 @@ internal uint CalculateTypeDefTreatmentAndRowId(TypeDefinitionHandle handle) if ((flags & TypeAttributes.WindowsRuntime) != 0) { - if (metadataKind == MetadataKind.WindowsMetadata) + if (_metadataKind == MetadataKind.WindowsMetadata) { treatment = GetWellKnownTypeDefinitionTreatment(handle); if (treatment != TypeDefTreatment.None) @@ -246,7 +246,7 @@ internal uint CalculateTypeDefTreatmentAndRowId(TypeDefinitionHandle handle) treatment = TypeDefTreatment.NormalNonAttribute; } } - else if (metadataKind == MetadataKind.ManagedWindowsMetadata && NeedsWinRTPrefix(flags, extends)) + else if (_metadataKind == MetadataKind.ManagedWindowsMetadata && NeedsWinRTPrefix(flags, extends)) { // WinMDExp emits two versions of RuntimeClasses and Enums: // @@ -284,7 +284,7 @@ internal uint CalculateTypeDefTreatmentAndRowId(TypeDefinitionHandle handle) } } } - else if (metadataKind == MetadataKind.ManagedWindowsMetadata && IsClrImplementationType(handle)) + else if (_metadataKind == MetadataKind.ManagedWindowsMetadata && IsClrImplementationType(handle)) { // implementation classes are not marked WindowsRuntime, but still need to be modified // by the adapter. @@ -316,7 +316,7 @@ private bool IsClrImplementationType(TypeDefinitionHandle typeDef) internal uint CalculateTypeRefTreatmentAndRowId(TypeReferenceHandle handle) { - Debug.Assert(metadataKind != MetadataKind.Ecma335); + Debug.Assert(_metadataKind != MetadataKind.Ecma335); bool isIDisposable; int projectionIndex = GetProjectionIndexForTypeReference(handle, out isIDisposable); @@ -414,7 +414,7 @@ private uint CalculateMethodDefTreatmentAndRowId(MethodDefinitionHandle methodDe { treatment = MethodDefTreatment.InterfaceMethod; } - else if (metadataKind == MetadataKind.ManagedWindowsMetadata && (parentFlags & TypeAttributes.Public) == 0) + else if (_metadataKind == MetadataKind.ManagedWindowsMetadata && (parentFlags & TypeAttributes.Public) == 0) { treatment = MethodDefTreatment.Implementation; } @@ -670,7 +670,7 @@ private uint FindMscorlibAssemblyRefNoProjection() internal CustomAttributeValueTreatment CalculateCustomAttributeValueTreatment(CustomAttributeHandle handle) { - Debug.Assert(metadataKind != MetadataKind.Ecma335); + Debug.Assert(_metadataKind != MetadataKind.Ecma335); var parent = CustomAttributeTable.GetParent(handle); diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.cs index c6994367b4c1368a1164c431f795576306448be1..658a881b2d82e49e37da56a4afc2e6dc09fd6dbb 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataReader.cs @@ -17,10 +17,10 @@ namespace System.Reflection.Metadata /// public sealed partial class MetadataReader { - private readonly MetadataReaderOptions options; + private readonly MetadataReaderOptions _options; internal readonly MetadataStringDecoder utf8Decoder; internal readonly NamespaceCache namespaceCache; - private Dictionary> lazyNestedTypesMap; + private Dictionary> _lazyNestedTypesMap; internal readonly MemoryBlock Block; // A row id of "mscorlib" AssemblyRef in a WinMD file (each WinMD file must have such a reference). @@ -89,7 +89,7 @@ public unsafe MetadataReader(byte* metadata, int length, MetadataReaderOptions o this.Block = new MemoryBlock(metadata, length); - this.options = options; + _options = options; this.utf8Decoder = utf8Decoder; BlobReader memReader = new BlobReader(this.Block); @@ -122,7 +122,7 @@ public unsafe MetadataReader(byte* metadata, int length, MetadataReaderOptions o // read this.namespaceCache = new NamespaceCache(this); - if (this.metadataKind != MetadataKind.Ecma335) + if (_metadataKind != MetadataKind.Ecma335) { this.WinMDMscorlibRef = FindMscorlibAssemblyRefNoProjection(); } @@ -132,9 +132,9 @@ public unsafe MetadataReader(byte* metadata, int length, MetadataReaderOptions o #region Metadata Headers - private MetadataHeader metadataHeader; - private MetadataKind metadataKind; - private MetadataStreamKind metadataStreamKind; + private MetadataHeader _metadataHeader; + private MetadataKind _metadataKind; + private MetadataStreamKind _metadataStreamKind; internal StringStreamReader StringStream; internal BlobStreamReader BlobStream; @@ -164,31 +164,31 @@ private void ReadMetadataHeader(ref BlobReader memReader) throw new BadImageFormatException(MetadataResources.MetadataHeaderTooSmall); } - this.metadataHeader.Signature = memReader.ReadUInt32(); - if (this.metadataHeader.Signature != COR20Constants.COR20MetadataSignature) + _metadataHeader.Signature = memReader.ReadUInt32(); + if (_metadataHeader.Signature != COR20Constants.COR20MetadataSignature) { throw new BadImageFormatException(MetadataResources.MetadataSignature); } - this.metadataHeader.MajorVersion = memReader.ReadUInt16(); - this.metadataHeader.MinorVersion = memReader.ReadUInt16(); - this.metadataHeader.ExtraData = memReader.ReadUInt32(); - this.metadataHeader.VersionStringSize = memReader.ReadInt32(); - if (memReader.RemainingBytes < this.metadataHeader.VersionStringSize) + _metadataHeader.MajorVersion = memReader.ReadUInt16(); + _metadataHeader.MinorVersion = memReader.ReadUInt16(); + _metadataHeader.ExtraData = memReader.ReadUInt32(); + _metadataHeader.VersionStringSize = memReader.ReadInt32(); + if (memReader.RemainingBytes < _metadataHeader.VersionStringSize) { throw new BadImageFormatException(MetadataResources.NotEnoughSpaceForVersionString); } int numberOfBytesRead; - this.metadataHeader.VersionString = memReader.GetMemoryBlockAt(0, this.metadataHeader.VersionStringSize).PeekUtf8NullTerminated(0, null, utf8Decoder, out numberOfBytesRead, '\0'); - memReader.SkipBytes(this.metadataHeader.VersionStringSize); - this.metadataKind = GetMetadataKind(metadataHeader.VersionString); + _metadataHeader.VersionString = memReader.GetMemoryBlockAt(0, _metadataHeader.VersionStringSize).PeekUtf8NullTerminated(0, null, utf8Decoder, out numberOfBytesRead, '\0'); + memReader.SkipBytes(_metadataHeader.VersionStringSize); + _metadataKind = GetMetadataKind(_metadataHeader.VersionString); } private MetadataKind GetMetadataKind(string versionString) { // Treat metadata as CLI raw metadata if the client doesn't want to see projections. - if ((options & MetadataReaderOptions.ApplyWindowsRuntimeProjections) == 0) + if ((_options & MetadataReaderOptions.ApplyWindowsRuntimeProjections) == 0) { return MetadataKind.Ecma335; } @@ -252,7 +252,7 @@ private void InitializeStreamReaders(ref MemoryBlock metadataRoot, StreamHeader[ throw new BadImageFormatException(MetadataResources.NotEnoughSpaceForStringStream); } - this.StringStream = new StringStreamReader(metadataRoot.GetMemoryBlockAt((int)streamHeader.Offset, streamHeader.Size), this.metadataKind); + this.StringStream = new StringStreamReader(metadataRoot.GetMemoryBlockAt((int)streamHeader.Offset, streamHeader.Size), _metadataKind); break; case COR20Constants.BlobStreamName: @@ -261,7 +261,7 @@ private void InitializeStreamReaders(ref MemoryBlock metadataRoot, StreamHeader[ throw new BadImageFormatException(MetadataResources.NotEnoughSpaceForBlobStream); } - this.BlobStream = new BlobStreamReader(metadataRoot.GetMemoryBlockAt((int)streamHeader.Offset, streamHeader.Size), this.metadataKind); + this.BlobStream = new BlobStreamReader(metadataRoot.GetMemoryBlockAt((int)streamHeader.Offset, streamHeader.Size), _metadataKind); break; case COR20Constants.GUIDStreamName: @@ -288,7 +288,7 @@ private void InitializeStreamReaders(ref MemoryBlock metadataRoot, StreamHeader[ throw new BadImageFormatException(MetadataResources.NotEnoughSpaceForMetadataStream); } - this.metadataStreamKind = MetadataStreamKind.Compressed; + _metadataStreamKind = MetadataStreamKind.Compressed; metadataTableStream = metadataRoot.GetMemoryBlockAt((int)streamHeader.Offset, streamHeader.Size); break; @@ -298,7 +298,7 @@ private void InitializeStreamReaders(ref MemoryBlock metadataRoot, StreamHeader[ throw new BadImageFormatException(MetadataResources.NotEnoughSpaceForMetadataStream); } - this.metadataStreamKind = MetadataStreamKind.Uncompressed; + _metadataStreamKind = MetadataStreamKind.Uncompressed; metadataTableStream = metadataRoot.GetMemoryBlockAt((int)streamHeader.Offset, streamHeader.Size); break; @@ -318,7 +318,7 @@ private void InitializeStreamReaders(ref MemoryBlock metadataRoot, StreamHeader[ } } - if (IsMinimalDelta && metadataStreamKind != MetadataStreamKind.Uncompressed) + if (IsMinimalDelta && _metadataStreamKind != MetadataStreamKind.Uncompressed) { throw new BadImageFormatException(MetadataResources.InvalidMetadataStreamFormat); } @@ -328,7 +328,7 @@ private void InitializeStreamReaders(ref MemoryBlock metadataRoot, StreamHeader[ #region Tables and Heaps - private MetadataTableHeader MetadataTableHeader; + private MetadataTableHeader _MetadataTableHeader; /// /// A row count for each possible table. May be indexed by . @@ -388,14 +388,14 @@ private void ReadMetadataTableHeader(ref BlobReader memReader, out uint[] metada throw new BadImageFormatException(MetadataResources.MetadataTableHeaderTooSmall); } - this.MetadataTableHeader.Reserved = memReader.ReadUInt32(); - this.MetadataTableHeader.MajorVersion = memReader.ReadByte(); - this.MetadataTableHeader.MinorVersion = memReader.ReadByte(); - this.MetadataTableHeader.HeapSizeFlags = (HeapSizeFlag)memReader.ReadByte(); - this.MetadataTableHeader.RowId = memReader.ReadByte(); - this.MetadataTableHeader.ValidTables = (TableMask)memReader.ReadUInt64(); - this.MetadataTableHeader.SortedTables = (TableMask)memReader.ReadUInt64(); - ulong presentTables = (ulong)this.MetadataTableHeader.ValidTables; + _MetadataTableHeader.Reserved = memReader.ReadUInt32(); + _MetadataTableHeader.MajorVersion = memReader.ReadByte(); + _MetadataTableHeader.MinorVersion = memReader.ReadByte(); + _MetadataTableHeader.HeapSizeFlags = (HeapSizeFlag)memReader.ReadByte(); + _MetadataTableHeader.RowId = memReader.ReadByte(); + _MetadataTableHeader.ValidTables = (TableMask)memReader.ReadUInt64(); + _MetadataTableHeader.SortedTables = (TableMask)memReader.ReadUInt64(); + ulong presentTables = (ulong)_MetadataTableHeader.ValidTables; // According to ECMA-335, MajorVersion and MinorVersion have fixed values and, // based on recommendation in 24.1 Fixed fields: When writing these fields it @@ -409,7 +409,7 @@ private void ReadMetadataTableHeader(ref BlobReader memReader, out uint[] metada throw new BadImageFormatException(string.Format(MetadataResources.UnknownTables, presentTables)); } - if (this.metadataStreamKind == MetadataStreamKind.Compressed) + if (_metadataStreamKind == MetadataStreamKind.Compressed) { // In general Ptr tables and EnC tables are not allowed in a compressed stream. // However when asked for a snapshot of the current metadata after an EnC change has been applied @@ -421,7 +421,7 @@ private void ReadMetadataTableHeader(ref BlobReader memReader, out uint[] metada } } - int numberOfTables = this.MetadataTableHeader.GetNumberOfTablesPresent(); + int numberOfTables = _MetadataTableHeader.GetNumberOfTablesPresent(); if (memReader.RemainingBytes < numberOfTables * sizeof(int)) { throw new BadImageFormatException(MetadataResources.TableRowCountSpaceTooSmall); @@ -448,7 +448,7 @@ private void InitializeTableReaders(MemoryBlock metadataTablesMemoryBlock, uint[ // Size of reference tags in each table. int[] referenceSizes = new int[TableIndexExtensions.Count]; - ulong validTables = (ulong)this.MetadataTableHeader.ValidTables; + ulong validTables = (ulong)_MetadataTableHeader.ValidTables; int compressedRowCountIndex = 0; for (int i = 0; i < TableIndexExtensions.Count; i++) { @@ -494,9 +494,9 @@ private void InitializeTableReaders(MemoryBlock metadataTablesMemoryBlock, uint[ int typeOrMethodDefRefSize = ComputeCodedTokenSize(TypeOrMethodDefTag.LargeRowSize, rowCounts, TypeOrMethodDefTag.TablesReferenced); // Compute HeapRef Sizes - int stringHeapRefSize = (this.MetadataTableHeader.HeapSizeFlags & HeapSizeFlag.StringHeapLarge) == HeapSizeFlag.StringHeapLarge ? LargeIndexSize : SmallIndexSize; - int guidHeapRefSize = (this.MetadataTableHeader.HeapSizeFlags & HeapSizeFlag.GuidHeapLarge) == HeapSizeFlag.GuidHeapLarge ? LargeIndexSize : SmallIndexSize; - int blobHeapRefSize = (this.MetadataTableHeader.HeapSizeFlags & HeapSizeFlag.BlobHeapLarge) == HeapSizeFlag.BlobHeapLarge ? LargeIndexSize : SmallIndexSize; + int stringHeapRefSize = (_MetadataTableHeader.HeapSizeFlags & HeapSizeFlag.StringHeapLarge) == HeapSizeFlag.StringHeapLarge ? LargeIndexSize : SmallIndexSize; + int guidHeapRefSize = (_MetadataTableHeader.HeapSizeFlags & HeapSizeFlag.GuidHeapLarge) == HeapSizeFlag.GuidHeapLarge ? LargeIndexSize : SmallIndexSize; + int blobHeapRefSize = (_MetadataTableHeader.HeapSizeFlags & HeapSizeFlag.BlobHeapLarge) == HeapSizeFlag.BlobHeapLarge ? LargeIndexSize : SmallIndexSize; // Populate the Table blocks int totalRequiredSize = 0; @@ -596,7 +596,7 @@ private void InitializeTableReaders(MemoryBlock metadataTablesMemoryBlock, uint[ this.FieldRvaTable = new FieldRVATableReader(rowCounts[(int)TableIndex.FieldRva], IsDeclaredSorted(TableMask.FieldRva), referenceSizes[(int)TableIndex.Field], metadataTablesMemoryBlock, totalRequiredSize); totalRequiredSize += this.FieldRvaTable.Block.Length; - this.EncLogTable = new EnCLogTableReader(rowCounts[(int)TableIndex.EncLog], metadataTablesMemoryBlock, totalRequiredSize, this.metadataStreamKind); + this.EncLogTable = new EnCLogTableReader(rowCounts[(int)TableIndex.EncLog], metadataTablesMemoryBlock, totalRequiredSize, _metadataStreamKind); totalRequiredSize += this.EncLogTable.Block.Length; this.EncMapTable = new EnCMapTableReader(rowCounts[(int)TableIndex.EncMap], metadataTablesMemoryBlock, totalRequiredSize); @@ -611,7 +611,7 @@ private void InitializeTableReaders(MemoryBlock metadataTablesMemoryBlock, uint[ this.AssemblyOSTable = new AssemblyOSTableReader(rowCounts[(int)TableIndex.AssemblyOS], metadataTablesMemoryBlock, totalRequiredSize); totalRequiredSize += this.AssemblyOSTable.Block.Length; - this.AssemblyRefTable = new AssemblyRefTableReader((int)rowCounts[(int)TableIndex.AssemblyRef], stringHeapRefSize, blobHeapRefSize, metadataTablesMemoryBlock, totalRequiredSize, this.metadataKind); + this.AssemblyRefTable = new AssemblyRefTableReader((int)rowCounts[(int)TableIndex.AssemblyRef], stringHeapRefSize, blobHeapRefSize, metadataTablesMemoryBlock, totalRequiredSize, _metadataKind); totalRequiredSize += this.AssemblyRefTable.Block.Length; this.AssemblyRefProcessorTable = new AssemblyRefProcessorTableReader(rowCounts[(int)TableIndex.AssemblyRefProcessor], referenceSizes[(int)TableIndex.AssemblyRef], metadataTablesMemoryBlock, totalRequiredSize); @@ -671,7 +671,7 @@ private int ComputeCodedTokenSize(uint largeRowSize, uint[] rowCountArray, Table private bool IsDeclaredSorted(TableMask index) { - return (this.MetadataTableHeader.SortedTables & index) != 0; + return (_MetadataTableHeader.SortedTables & index) != 0; } #endregion @@ -829,17 +829,17 @@ internal static void ThrowTableNotSorted(TableIndex tableIndex) public MetadataReaderOptions Options { - get { return this.options; } + get { return _options; } } public string MetadataVersion { - get { return metadataHeader.VersionString; } + get { return _metadataHeader.VersionString; } } public MetadataKind MetadataKind { - get { return metadataKind; } + get { return _metadataKind; } } public MetadataStringComparer StringComparer @@ -1000,7 +1000,7 @@ public NamespaceDefinition GetNamespaceDefinition(NamespaceDefinitionHandle hand private uint GetTypeDefTreatmentAndRowId(TypeDefinitionHandle handle) { // PERF: This code pattern is JIT friendly and results in very efficient code. - if (this.metadataKind == MetadataKind.Ecma335) + if (_metadataKind == MetadataKind.Ecma335) { return handle.RowId; } @@ -1017,7 +1017,7 @@ public TypeReference GetTypeReference(TypeReferenceHandle handle) private uint GetTypeRefTreatmentAndRowId(TypeReferenceHandle handle) { // PERF: This code pattern is JIT friendly and results in very efficient code. - if (this.metadataKind == MetadataKind.Ecma335) + if (_metadataKind == MetadataKind.Ecma335) { return handle.RowId; } @@ -1045,7 +1045,7 @@ public CustomAttribute GetCustomAttribute(CustomAttributeHandle handle) private uint GetCustomAttributeTreatmentAndRowId(CustomAttributeHandle handle) { // PERF: This code pattern is JIT friendly and results in very efficient code. - if (this.metadataKind == MetadataKind.Ecma335) + if (_metadataKind == MetadataKind.Ecma335) { return handle.RowId; } @@ -1073,7 +1073,7 @@ public MethodDefinition GetMethodDefinition(MethodDefinitionHandle handle) private uint GetMethodDefTreatmentAndRowId(MethodDefinitionHandle handle) { // PERF: This code pattern is JIT friendly and results in very efficient code. - if (this.metadataKind == MetadataKind.Ecma335) + if (_metadataKind == MetadataKind.Ecma335) { return handle.RowId; } @@ -1090,7 +1090,7 @@ public FieldDefinition GetFieldDefinition(FieldDefinitionHandle handle) private uint GetFieldDefTreatmentAndRowId(FieldDefinitionHandle handle) { // PERF: This code pattern is JIT friendly and results in very efficient code. - if (this.metadataKind == MetadataKind.Ecma335) + if (_metadataKind == MetadataKind.Ecma335) { return handle.RowId; } @@ -1122,7 +1122,7 @@ public MemberReference GetMemberReference(MemberReferenceHandle handle) private uint GetMemberRefTreatmentAndRowId(MemberReferenceHandle handle) { // PERF: This code pattern is JIT friendly and results in very efficient code. - if (this.metadataKind == MetadataKind.Ecma335) + if (_metadataKind == MetadataKind.Ecma335) { return handle.RowId; } @@ -1252,7 +1252,7 @@ private void InitializeNestedTypesMap() nestedTypesMap.Add(group.Key, group.Value.ToImmutable()); } - this.lazyNestedTypesMap = nestedTypesMap; + _lazyNestedTypesMap = nestedTypesMap; } /// @@ -1260,13 +1260,13 @@ private void InitializeNestedTypesMap() /// internal ImmutableArray GetNestedTypes(TypeDefinitionHandle typeDef) { - if (this.lazyNestedTypesMap == null) + if (_lazyNestedTypesMap == null) { InitializeNestedTypesMap(); } ImmutableArray nestedTypes; - if (this.lazyNestedTypesMap.TryGetValue(typeDef, out nestedTypes)) + if (_lazyNestedTypesMap.TryGetValue(typeDef, out nestedTypes)) { return nestedTypes; } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringComparer.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringComparer.cs index 36f2964255fa8c4afb4860d81855d308a5ef4a9a..701da19256e7dfb4182d9ff77ec2c6c58b333c9f 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringComparer.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringComparer.cs @@ -43,12 +43,12 @@ namespace System.Reflection.Metadata /// public struct MetadataStringComparer { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; internal MetadataStringComparer(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; + _reader = reader; } public bool Equals(StringHandle handle, string value) @@ -58,7 +58,7 @@ public bool Equals(StringHandle handle, string value) ThrowValueArgumentNull(); } - return reader.StringStream.Equals(handle, value, reader.utf8Decoder); + return _reader.StringStream.Equals(handle, value, _reader.utf8Decoder); } public bool Equals(NamespaceDefinitionHandle handle, string value) @@ -70,10 +70,10 @@ public bool Equals(NamespaceDefinitionHandle handle, string value) if (handle.HasFullName) { - return reader.StringStream.Equals(handle.GetFullName(), value, reader.utf8Decoder); + return _reader.StringStream.Equals(handle.GetFullName(), value, _reader.utf8Decoder); } - return value == reader.namespaceCache.GetFullName(handle); + return value == _reader.namespaceCache.GetFullName(handle); } public bool StartsWith(StringHandle handle, string value) @@ -83,7 +83,7 @@ public bool StartsWith(StringHandle handle, string value) ThrowValueArgumentNull(); } - return reader.StringStream.StartsWith(handle, value, reader.utf8Decoder); + return _reader.StringStream.StartsWith(handle, value, _reader.utf8Decoder); } [MethodImpl(MethodImplOptions.NoInlining)] diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringDecoder.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringDecoder.cs index 8175086042cc351c0c73521efbcb5436939e1680..eb183a68a736196217de2a2fe5f0c558d119c06c 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringDecoder.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MetadataStringDecoder.cs @@ -23,8 +23,8 @@ namespace System.Reflection.Metadata /// public class MetadataStringDecoder { - private static readonly MetadataStringDecoder defaultUTF8 = new MetadataStringDecoder(Encoding.UTF8); - private readonly Encoding encoding; + private static readonly MetadataStringDecoder s_defaultUTF8 = new MetadataStringDecoder(Encoding.UTF8); + private readonly Encoding _encoding; /// /// The default decoder used by to decode UTF-8 when @@ -32,7 +32,7 @@ public class MetadataStringDecoder /// public static MetadataStringDecoder DefaultUTF8 { - get { return defaultUTF8; } + get { return s_defaultUTF8; } } /// @@ -59,7 +59,7 @@ public MetadataStringDecoder(Encoding encoding) // encoding. I'm more comfortable sharing that hack than having the reflection over internal // CreateStringFromEncoding spread. - this.encoding = encoding; + _encoding = encoding; } /// @@ -67,7 +67,7 @@ public MetadataStringDecoder(Encoding encoding) /// public Encoding Encoding { - get { return this.encoding; } + get { return _encoding; } } /// @@ -81,11 +81,11 @@ public Encoding Encoding /// The decoded string. public unsafe virtual String GetString(byte* bytes, int byteCount) { - Debug.Assert(this.encoding != null); + Debug.Assert(_encoding != null); // Note that this call is currently wired to the light-up extension in EncodingHelper // for portability. - return this.encoding.GetString(bytes, byteCount); + return _encoding.GetString(bytes, byteCount); } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodBodyBlock.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodBodyBlock.cs index 7e8313462259f0af3b51f39efb26193c3ead727a..30b51796cbfdc1b468212ba46ebdd1b48b630bfd 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodBodyBlock.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodBodyBlock.cs @@ -11,12 +11,12 @@ namespace System.Reflection.Metadata { public sealed class MethodBodyBlock { - private readonly MemoryBlock il; - private readonly int size; - private readonly ushort maxStack; - private readonly bool localVariablesInitialized; - private readonly StandaloneSignatureHandle localSignature; - private readonly ImmutableArray exceptionRegions; + private readonly MemoryBlock _il; + private readonly int _size; + private readonly ushort _maxStack; + private readonly bool _localVariablesInitialized; + private readonly StandaloneSignatureHandle _localSignature; + private readonly ImmutableArray _exceptionRegions; private MethodBodyBlock( bool localVariablesInitialized, @@ -28,12 +28,12 @@ public sealed class MethodBodyBlock { Debug.Assert(!exceptionRegions.IsDefault); - this.localVariablesInitialized = localVariablesInitialized; - this.maxStack = maxStack; - this.localSignature = localSignatureHandle; - this.il = il; - this.exceptionRegions = exceptionRegions; - this.size = size; + _localVariablesInitialized = localVariablesInitialized; + _maxStack = maxStack; + _localSignature = localSignatureHandle; + _il = il; + _exceptionRegions = exceptionRegions; + _size = size; } /// @@ -41,32 +41,32 @@ public sealed class MethodBodyBlock /// public int Size { - get { return size; } + get { return _size; } } public int MaxStack { - get { return maxStack; } + get { return _maxStack; } } public bool LocalVariablesInitialized { - get { return localVariablesInitialized; } + get { return _localVariablesInitialized; } } public StandaloneSignatureHandle LocalSignature { - get { return localSignature; } + get { return _localSignature; } } public ImmutableArray ExceptionRegions { - get { return exceptionRegions; } + get { return _exceptionRegions; } } public byte[] GetILBytes() { - return il.ToArray(); + return _il.ToArray(); } public ImmutableArray GetILContent() @@ -77,7 +77,7 @@ public ImmutableArray GetILContent() public BlobReader GetILReader() { - return new BlobReader(il); + return new BlobReader(_il); } private const byte ILTinyFormat = 0x02; diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodDefinition.cs index 6ccfd2d783d272293232c4f48ab377c63277a9a5..4b48209e13ee694dedd5563b6371a239054f7e96 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodDefinition.cs @@ -8,28 +8,28 @@ namespace System.Reflection.Metadata { public struct MethodDefinition { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint treatmentAndRowId; + private readonly uint _treatmentAndRowId; internal MethodDefinition(MetadataReader reader, uint treatmentAndRowId) { Debug.Assert(reader != null); Debug.Assert(treatmentAndRowId != 0); - this.reader = reader; - this.treatmentAndRowId = treatmentAndRowId; + _reader = reader; + _treatmentAndRowId = treatmentAndRowId; } private uint RowId { - get { return treatmentAndRowId & TokenTypeIds.RIDMask; } + get { return _treatmentAndRowId & TokenTypeIds.RIDMask; } } private MethodDefTreatment Treatment { - get { return (MethodDefTreatment)(treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } + get { return (MethodDefTreatment)(_treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } } private MethodDefinitionHandle Handle @@ -43,7 +43,7 @@ public StringHandle Name { if (Treatment == 0) { - return reader.MethodDefTable.GetName(Handle); + return _reader.MethodDefTable.GetName(Handle); } return GetProjectedName(); @@ -56,7 +56,7 @@ public BlobHandle Signature { if (Treatment == 0) { - return reader.MethodDefTable.GetSignature(Handle); + return _reader.MethodDefTable.GetSignature(Handle); } return GetProjectedSignature(); @@ -69,7 +69,7 @@ public int RelativeVirtualAddress { if (Treatment == 0) { - return reader.MethodDefTable.GetRva(Handle); + return _reader.MethodDefTable.GetRva(Handle); } return GetProjectedRelativeVirtualAddress(); @@ -82,7 +82,7 @@ public MethodAttributes Attributes { if (Treatment == 0) { - return reader.MethodDefTable.GetFlags(Handle); + return _reader.MethodDefTable.GetFlags(Handle); } return GetProjectedFlags(); @@ -95,7 +95,7 @@ public MethodImplAttributes ImplAttributes { if (Treatment == 0) { - return reader.MethodDefTable.GetImplFlags(Handle); + return _reader.MethodDefTable.GetImplFlags(Handle); } return GetProjectedImplFlags(); @@ -104,38 +104,38 @@ public MethodImplAttributes ImplAttributes public TypeDefinitionHandle GetDeclaringType() { - return reader.GetDeclaringType(Handle); + return _reader.GetDeclaringType(Handle); } public ParameterHandleCollection GetParameters() { - return new ParameterHandleCollection(reader, Handle); + return new ParameterHandleCollection(_reader, Handle); } public GenericParameterHandleCollection GetGenericParameters() { - return reader.GenericParamTable.FindGenericParametersForMethod(Handle); + return _reader.GenericParamTable.FindGenericParametersForMethod(Handle); } public MethodImport GetImport() { - uint implMapRid = reader.ImplMapTable.FindImplForMethod(Handle); + uint implMapRid = _reader.ImplMapTable.FindImplForMethod(Handle); if (implMapRid == 0) { return default(MethodImport); } - return reader.ImplMapTable[implMapRid]; + return _reader.ImplMapTable[implMapRid]; } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } public DeclarativeSecurityAttributeHandleCollection GetDeclarativeSecurityAttributes() { - return new DeclarativeSecurityAttributeHandleCollection(reader, Handle); + return new DeclarativeSecurityAttributeHandleCollection(_reader, Handle); } #region Projections @@ -147,12 +147,12 @@ private StringHandle GetProjectedName() return StringHandle.FromVirtualIndex(StringHandle.VirtualIndex.Dispose); } - return reader.MethodDefTable.GetName(Handle); + return _reader.MethodDefTable.GetName(Handle); } private MethodAttributes GetProjectedFlags() { - MethodAttributes flags = reader.MethodDefTable.GetFlags(Handle); + MethodAttributes flags = _reader.MethodDefTable.GetFlags(Handle); MethodDefTreatment treatment = Treatment; if ((treatment & MethodDefTreatment.KindMask) == MethodDefTreatment.HiddenInterfaceImplementation) @@ -176,7 +176,7 @@ private MethodAttributes GetProjectedFlags() private MethodImplAttributes GetProjectedImplFlags() { - MethodImplAttributes flags = reader.MethodDefTable.GetImplFlags(Handle); + MethodImplAttributes flags = _reader.MethodDefTable.GetImplFlags(Handle); switch (Treatment & MethodDefTreatment.KindMask) { @@ -198,7 +198,7 @@ private MethodImplAttributes GetProjectedImplFlags() private BlobHandle GetProjectedSignature() { - return reader.MethodDefTable.GetSignature(Handle); + return _reader.MethodDefTable.GetSignature(Handle); } private int GetProjectedRelativeVirtualAddress() diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImplementation.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImplementation.cs index d4d49435ca281548da305eb6866858962d613789..97bbf06e843e924d9ad33d863505a4140986fc3b 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImplementation.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImplementation.cs @@ -7,30 +7,30 @@ namespace System.Reflection.Metadata { public struct MethodImplementation { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal MethodImplementation(MetadataReader reader, MethodImplementationHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private MethodImplementationHandle Handle { - get { return MethodImplementationHandle.FromRowId(rowId); } + get { return MethodImplementationHandle.FromRowId(_rowId); } } public TypeDefinitionHandle Type { get { - return reader.MethodImplTable.GetClass(Handle); + return _reader.MethodImplTable.GetClass(Handle); } } @@ -38,7 +38,7 @@ public Handle MethodBody { get { - return reader.MethodImplTable.GetMethodBody(Handle); + return _reader.MethodImplTable.GetMethodBody(Handle); } } @@ -46,13 +46,13 @@ public Handle MethodDeclaration { get { - return reader.MethodImplTable.GetMethodDeclaration(Handle); + return _reader.MethodImplTable.GetMethodDeclaration(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImport.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImport.cs index ffbcc5181268c99a12f7114691a104f5a561bd6c..f7b3c2ebe177524f5bbd406e1ede2dd8356baf5b 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImport.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodImport.cs @@ -5,19 +5,19 @@ namespace System.Reflection.Metadata { public struct MethodImport { - private readonly MethodImportAttributes attributes; - private readonly StringHandle name; - private readonly ModuleReferenceHandle module; + private readonly MethodImportAttributes _attributes; + private readonly StringHandle _name; + private readonly ModuleReferenceHandle _module; internal MethodImport(MethodImportAttributes attributes, StringHandle name, ModuleReferenceHandle module) { - this.attributes = attributes; - this.name = name; - this.module = module; + _attributes = attributes; + _name = name; + _module = module; } - public MethodImportAttributes Attributes { get { return attributes; } } - public StringHandle Name { get { return name; } } - public ModuleReferenceHandle Module { get { return module; } } + public MethodImportAttributes Attributes { get { return _attributes; } } + public StringHandle Name { get { return _name; } } + public ModuleReferenceHandle Module { get { return _module; } } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodSpecification.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodSpecification.cs index 72bb478e4e9d9fd8f30aef1114f142f67887b6ac..347f7740192a45383817be100fae5f8e8c8a9aae 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodSpecification.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/MethodSpecification.cs @@ -7,23 +7,23 @@ namespace System.Reflection.Metadata { public struct MethodSpecification { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal MethodSpecification(MetadataReader reader, MethodSpecificationHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private MethodSpecificationHandle Handle { - get { return MethodSpecificationHandle.FromRowId(rowId); } + get { return MethodSpecificationHandle.FromRowId(_rowId); } } /// @@ -34,7 +34,7 @@ public Handle Method { get { - return reader.MethodSpecTable.GetMethod(Handle); + return _reader.MethodSpecTable.GetMethod(Handle); } } @@ -45,13 +45,13 @@ public BlobHandle Signature { get { - return reader.MethodSpecTable.GetInstantiation(Handle); + return _reader.MethodSpecTable.GetInstantiation(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleDefinition.cs index 7ac6987bfb06f3d783fdf49c9029adbf770b1839..3d3afad2b72ce3303521a69cb83b135ef9d083e3 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleDefinition.cs @@ -7,19 +7,19 @@ namespace System.Reflection.Metadata { public struct ModuleDefinition { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; internal ModuleDefinition(MetadataReader reader) { Debug.Assert(reader != null); - this.reader = reader; + _reader = reader; } public int Generation { get { - return (int)reader.ModuleTable.GetGeneration(); + return (int)_reader.ModuleTable.GetGeneration(); } } @@ -27,7 +27,7 @@ public StringHandle Name { get { - return reader.ModuleTable.GetName(); + return _reader.ModuleTable.GetName(); } } @@ -35,7 +35,7 @@ public GuidHandle Mvid { get { - return reader.ModuleTable.GetMvid(); + return _reader.ModuleTable.GetMvid(); } } @@ -43,7 +43,7 @@ public GuidHandle GenerationId { get { - return reader.ModuleTable.GetEncId(); + return _reader.ModuleTable.GetEncId(); } } @@ -51,7 +51,7 @@ public GuidHandle BaseGenerationId { get { - return reader.ModuleTable.GetEncBaseId(); + return _reader.ModuleTable.GetEncBaseId(); } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleReference.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleReference.cs index 93d85bc301b019fee62110199afcec04c5c3a129..e3a62620dd1ffc5fd01f209f0b970d1a96a5b8c7 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleReference.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/ModuleReference.cs @@ -7,33 +7,33 @@ namespace System.Reflection.Metadata { public struct ModuleReference { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal ModuleReference(MetadataReader reader, ModuleReferenceHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private ModuleReferenceHandle Handle { - get { return ModuleReferenceHandle.FromRowId(rowId); } + get { return ModuleReferenceHandle.FromRowId(_rowId); } } public StringHandle Name { - get { return reader.ModuleRefTable.GetName(Handle); } + get { return _reader.ModuleRefTable.GetName(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/NamespaceDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/NamespaceDefinition.cs index ac5e4ebdf844b184d0510199bda9cd981727ab24..4b607f060d1eb149f86ec86111d12afe8ea30bbd 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/NamespaceDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/NamespaceDefinition.cs @@ -9,12 +9,12 @@ namespace System.Reflection.Metadata { public struct NamespaceDefinition { - private NamespaceData data; + private NamespaceData _data; internal NamespaceDefinition(NamespaceData data) { Debug.Assert(data != null); - this.data = data; + _data = data; } /// @@ -22,7 +22,7 @@ internal NamespaceDefinition(NamespaceData data) /// public StringHandle Name { - get { return data.Name; } + get { return _data.Name; } } /// @@ -30,7 +30,7 @@ public StringHandle Name /// public NamespaceDefinitionHandle Parent { - get { return data.Parent; } + get { return _data.Parent; } } /// @@ -43,7 +43,7 @@ public NamespaceDefinitionHandle Parent /// public ImmutableArray NamespaceDefinitions { - get { return data.NamespaceDefinitions; } + get { return _data.NamespaceDefinitions; } } /// @@ -51,7 +51,7 @@ public ImmutableArray NamespaceDefinitions /// public ImmutableArray TypeDefinitions { - get { return data.TypeDefinitions; } + get { return _data.TypeDefinitions; } } /// @@ -59,7 +59,7 @@ public ImmutableArray TypeDefinitions /// public ImmutableArray ExportedTypes { - get { return data.ExportedTypes; } + get { return _data.ExportedTypes; } } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Parameter.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Parameter.cs index 6884b742585deeb097ce9f56ec696d16e15dc7d5..2d379bea9f0a6e6d46671dc59dcd75a6b7d48652 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Parameter.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/Parameter.cs @@ -7,30 +7,30 @@ namespace System.Reflection.Metadata { public struct Parameter { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal Parameter(MetadataReader reader, ParameterHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private ParameterHandle Handle { - get { return ParameterHandle.FromRowId(rowId); } + get { return ParameterHandle.FromRowId(_rowId); } } public ParameterAttributes Attributes { get { - return reader.ParamTable.GetFlags(Handle); + return _reader.ParamTable.GetFlags(Handle); } } @@ -38,7 +38,7 @@ public int SequenceNumber { get { - return reader.ParamTable.GetSequence(Handle); + return _reader.ParamTable.GetSequence(Handle); } } @@ -46,29 +46,29 @@ public StringHandle Name { get { - return reader.ParamTable.GetName(Handle); + return _reader.ParamTable.GetName(Handle); } } public ConstantHandle GetDefaultValue() { - return reader.ConstantTable.FindConstant(Handle); + return _reader.ConstantTable.FindConstant(Handle); } public BlobHandle GetMarshallingDescriptor() { - uint marshalRowId = reader.FieldMarshalTable.FindFieldMarshalRowId(Handle); + uint marshalRowId = _reader.FieldMarshalTable.FindFieldMarshalRowId(Handle); if (marshalRowId == 0) { return default(BlobHandle); } - return reader.FieldMarshalTable.GetNativeType(marshalRowId); + return _reader.FieldMarshalTable.GetNativeType(marshalRowId); } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PropertyDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PropertyDefinition.cs index 257b8d2d730caede673fde7854c9a3f0eff32c00..b3dc905d2f3e2799711623e697cd1b0e75169109 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PropertyDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/PropertyDefinition.cs @@ -7,30 +7,30 @@ namespace System.Reflection.Metadata { public struct PropertyDefinition { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal PropertyDefinition(MetadataReader reader, PropertyDefinitionHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private PropertyDefinitionHandle Handle { - get { return PropertyDefinitionHandle.FromRowId(rowId); } + get { return PropertyDefinitionHandle.FromRowId(_rowId); } } public StringHandle Name { get { - return reader.PropertyTable.GetName(Handle); + return _reader.PropertyTable.GetName(Handle); } } @@ -38,7 +38,7 @@ public PropertyAttributes Attributes { get { - return reader.PropertyTable.GetFlags(Handle); + return _reader.PropertyTable.GetFlags(Handle); } } @@ -46,18 +46,18 @@ public BlobHandle Signature { get { - return reader.PropertyTable.GetSignature(Handle); + return _reader.PropertyTable.GetSignature(Handle); } } public ConstantHandle GetDefaultValue() { - return reader.ConstantTable.FindConstant(Handle); + return _reader.ConstantTable.FindConstant(Handle); } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } public PropertyAccessors GetAccessors() @@ -66,18 +66,18 @@ public PropertyAccessors GetAccessors() uint setter = 0; ushort methodCount; - var firstRowId = reader.MethodSemanticsTable.FindSemanticMethodsForProperty(Handle, out methodCount); + var firstRowId = _reader.MethodSemanticsTable.FindSemanticMethodsForProperty(Handle, out methodCount); for (ushort i = 0; i < methodCount; i++) { uint rowId = firstRowId + i; - switch (reader.MethodSemanticsTable.GetSemantics(rowId)) + switch (_reader.MethodSemanticsTable.GetSemantics(rowId)) { case MethodSemanticsAttributes.Getter: - getter = reader.MethodSemanticsTable.GetMethod(rowId).RowId; + getter = _reader.MethodSemanticsTable.GetMethod(rowId).RowId; break; case MethodSemanticsAttributes.Setter: - setter = reader.MethodSemanticsTable.GetMethod(rowId).RowId; + setter = _reader.MethodSemanticsTable.GetMethod(rowId).RowId; break; // TODO: expose 'Other' collection on PropertyAccessors for completeness. } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/SignatureHeader.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/SignatureHeader.cs index 72130845e4b809a0493450ccf9619160e0343897..4d0ebe07af74eadc34414847e9d7f870111e40f5 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/SignatureHeader.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/SignatureHeader.cs @@ -14,25 +14,25 @@ namespace System.Reflection.Metadata /// public struct SignatureHeader : IEquatable { - private byte rawValue; + private byte _rawValue; public const byte CallingConventionOrKindMask = 0x0F; private const byte maxCallingConvention = (byte)SignatureCallingConvention.VarArgs; public SignatureHeader(byte rawValue) { - this.rawValue = rawValue; + _rawValue = rawValue; } public byte RawValue { - get { return rawValue; } + get { return _rawValue; } } public SignatureCallingConvention CallingConvention { get { - int callingConventionOrKind = rawValue & CallingConventionOrKindMask; + int callingConventionOrKind = _rawValue & CallingConventionOrKindMask; if (callingConventionOrKind > maxCallingConvention) { @@ -47,7 +47,7 @@ public SignatureKind Kind { get { - int callingCoventionOrKind = rawValue & CallingConventionOrKindMask; + int callingCoventionOrKind = _rawValue & CallingConventionOrKindMask; if (callingCoventionOrKind <= maxCallingConvention) { @@ -60,22 +60,22 @@ public SignatureKind Kind public SignatureAttributes Attributes { - get { return (SignatureAttributes)(rawValue & ~CallingConventionOrKindMask); } + get { return (SignatureAttributes)(_rawValue & ~CallingConventionOrKindMask); } } public bool HasExplicitThis { - get { return (rawValue & (byte)SignatureAttributes.ExplicitThis) != 0; } + get { return (_rawValue & (byte)SignatureAttributes.ExplicitThis) != 0; } } public bool IsInstance { - get { return (rawValue & (byte)SignatureAttributes.Instance) != 0; } + get { return (_rawValue & (byte)SignatureAttributes.Instance) != 0; } } public bool IsGeneric { - get { return (rawValue & (byte)SignatureAttributes.Generic) != 0; } + get { return (_rawValue & (byte)SignatureAttributes.Generic) != 0; } } public override bool Equals(object obj) @@ -85,22 +85,22 @@ public override bool Equals(object obj) public bool Equals(SignatureHeader other) { - return rawValue == other.rawValue; + return _rawValue == other._rawValue; } public override int GetHashCode() { - return rawValue; + return _rawValue; } public static bool operator ==(SignatureHeader left, SignatureHeader right) { - return left.rawValue == right.rawValue; + return left._rawValue == right._rawValue; } public static bool operator !=(SignatureHeader left, SignatureHeader right) { - return left.rawValue != right.rawValue; + return left._rawValue != right._rawValue; } public override string ToString() diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/StandaloneSignature.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/StandaloneSignature.cs index 52eb6751c24a69799e6d689705d0faf31e9bd96b..e4a5ac04d4b5f0e75ac94fcb1290f2f457b6f659 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/StandaloneSignature.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/StandaloneSignature.cs @@ -7,33 +7,33 @@ namespace System.Reflection.Metadata { public struct StandaloneSignature { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal StandaloneSignature(MetadataReader reader, StandaloneSignatureHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private StandaloneSignatureHandle Handle { - get { return StandaloneSignatureHandle.FromRowId(rowId); } + get { return StandaloneSignatureHandle.FromRowId(_rowId); } } public BlobHandle Signature { - get { return reader.StandAloneSigTable.GetSignature(rowId); } + get { return _reader.StandAloneSigTable.GetSignature(_rowId); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeDefinition.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeDefinition.cs index fa7dd924058b6010eb73534e5d8e13fc3a946072..99e2ac95b103a9ee367742ff83a9613e0629265a 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeDefinition.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeDefinition.cs @@ -9,28 +9,28 @@ namespace System.Reflection.Metadata { public struct TypeDefinition { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint treatmentAndRowId; + private readonly uint _treatmentAndRowId; internal TypeDefinition(MetadataReader reader, uint treatmentAndRowId) { Debug.Assert(reader != null); Debug.Assert(treatmentAndRowId != 0); - this.reader = reader; - this.treatmentAndRowId = treatmentAndRowId; + _reader = reader; + _treatmentAndRowId = treatmentAndRowId; } private uint RowId { - get { return treatmentAndRowId & TokenTypeIds.RIDMask; } + get { return _treatmentAndRowId & TokenTypeIds.RIDMask; } } private TypeDefTreatment Treatment { - get { return (TypeDefTreatment)(treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } + get { return (TypeDefTreatment)(_treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } } private TypeDefinitionHandle Handle @@ -44,7 +44,7 @@ public TypeAttributes Attributes { if (Treatment == 0) { - return reader.TypeDefTable.GetFlags(Handle); + return _reader.TypeDefTable.GetFlags(Handle); } return GetProjectedFlags(); @@ -60,7 +60,7 @@ public StringHandle Name { if (Treatment == 0) { - return reader.TypeDefTable.GetName(Handle); + return _reader.TypeDefTable.GetName(Handle); } return GetProjectedName(); @@ -76,7 +76,7 @@ public NamespaceDefinitionHandle Namespace { if (Treatment == 0) { - return reader.TypeDefTable.GetNamespace(Handle); + return _reader.TypeDefTable.GetNamespace(Handle); } return GetProjectedNamespace(); @@ -93,7 +93,7 @@ public Handle BaseType { if (Treatment == 0) { - return reader.TypeDefTable.GetExtends(Handle); + return _reader.TypeDefTable.GetExtends(Handle); } return GetProjectedBaseType(); @@ -102,7 +102,7 @@ public Handle BaseType public TypeLayout GetLayout() { - uint classLayoutRowId = reader.ClassLayoutTable.FindRow(Handle); + uint classLayoutRowId = _reader.ClassLayoutTable.FindRow(Handle); if (classLayoutRowId == 0) { // NOTE: We don't need a bool/TryGetLayout because zero also means use default: @@ -119,8 +119,8 @@ public TypeLayout GetLayout() return default(TypeLayout); } - int size = (int)reader.ClassLayoutTable.GetClassSize(classLayoutRowId); - int packingSize = reader.ClassLayoutTable.GetPackingSize(classLayoutRowId); + int size = (int)_reader.ClassLayoutTable.GetClassSize(classLayoutRowId); + int packingSize = _reader.ClassLayoutTable.GetPackingSize(classLayoutRowId); return new TypeLayout(size, packingSize); } @@ -129,32 +129,32 @@ public TypeLayout GetLayout() /// public TypeDefinitionHandle GetDeclaringType() { - return reader.NestedClassTable.FindEnclosingType(Handle); + return _reader.NestedClassTable.FindEnclosingType(Handle); } public GenericParameterHandleCollection GetGenericParameters() { - return reader.GenericParamTable.FindGenericParametersForType(Handle); + return _reader.GenericParamTable.FindGenericParametersForType(Handle); } public MethodDefinitionHandleCollection GetMethods() { - return new MethodDefinitionHandleCollection(reader, Handle); + return new MethodDefinitionHandleCollection(_reader, Handle); } public FieldDefinitionHandleCollection GetFields() { - return new FieldDefinitionHandleCollection(reader, Handle); + return new FieldDefinitionHandleCollection(_reader, Handle); } public PropertyDefinitionHandleCollection GetProperties() { - return new PropertyDefinitionHandleCollection(reader, Handle); + return new PropertyDefinitionHandleCollection(_reader, Handle); } public EventDefinitionHandleCollection GetEvents() { - return new EventDefinitionHandleCollection(reader, Handle); + return new EventDefinitionHandleCollection(_reader, Handle); } /// @@ -162,34 +162,34 @@ public EventDefinitionHandleCollection GetEvents() /// public ImmutableArray GetNestedTypes() { - return reader.GetNestedTypes(Handle); + return _reader.GetNestedTypes(Handle); } public MethodImplementationHandleCollection GetMethodImplementations() { - return new MethodImplementationHandleCollection(reader, Handle); + return new MethodImplementationHandleCollection(_reader, Handle); } public InterfaceImplementationHandleCollection GetInterfaceImplementations() { - return new InterfaceImplementationHandleCollection(reader, Handle); + return new InterfaceImplementationHandleCollection(_reader, Handle); } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } public DeclarativeSecurityAttributeHandleCollection GetDeclarativeSecurityAttributes() { - return new DeclarativeSecurityAttributeHandleCollection(reader, Handle); + return new DeclarativeSecurityAttributeHandleCollection(_reader, Handle); } #region Projections private TypeAttributes GetProjectedFlags() { - var flags = reader.TypeDefTable.GetFlags(Handle); + var flags = _reader.TypeDefTable.GetFlags(Handle); var treatment = Treatment; switch (treatment & TypeDefTreatment.KindMask) @@ -234,7 +234,7 @@ private TypeAttributes GetProjectedFlags() private StringHandle GetProjectedName() { - var name = reader.TypeDefTable.GetName(Handle); + var name = _reader.TypeDefTable.GetName(Handle); switch (Treatment & TypeDefTreatment.KindMask) { @@ -254,13 +254,13 @@ private NamespaceDefinitionHandle GetProjectedNamespace() // to a virtual namespace name, then that assumption will need to be removed. // no change: - return reader.TypeDefTable.GetNamespace(Handle); + return _reader.TypeDefTable.GetNamespace(Handle); } private Handle GetProjectedBaseType() { // no change: - return reader.TypeDefTable.GetExtends(Handle); + return _reader.TypeDefTable.GetExtends(Handle); } #endregion } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeLayout.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeLayout.cs index 0179215afe3019b159ccf3abcf41c18edd34d581..edafdaf3b3035326db9bdbf872a4495654bc4f8d 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeLayout.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeLayout.cs @@ -5,28 +5,28 @@ namespace System.Reflection.Metadata { public struct TypeLayout { - private readonly int size; - private readonly int packingSize; + private readonly int _size; + private readonly int _packingSize; public TypeLayout(int size, int packingSize) { - this.size = size; - this.packingSize = packingSize; + _size = size; + _packingSize = packingSize; } public int Size { - get { return size; } + get { return _size; } } public int PackingSize { - get { return packingSize; } + get { return _packingSize; } } public bool IsDefault { - get { return size == 0 && packingSize == 0; } + get { return _size == 0 && _packingSize == 0; } } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeReference.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeReference.cs index 61dab4b5958022ddb5d67f9cfc2481cba284f09c..bf3a2b6e46de491477d84b4f5815badd74dd2272 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeReference.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeReference.cs @@ -8,28 +8,28 @@ namespace System.Reflection.Metadata { public struct TypeReference { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint treatmentAndRowId; + private readonly uint _treatmentAndRowId; internal TypeReference(MetadataReader reader, uint treatmentAndRowId) { Debug.Assert(reader != null); Debug.Assert(treatmentAndRowId != 0); - this.reader = reader; - this.treatmentAndRowId = treatmentAndRowId; + _reader = reader; + _treatmentAndRowId = treatmentAndRowId; } private uint RowId { - get { return treatmentAndRowId & TokenTypeIds.RIDMask; } + get { return _treatmentAndRowId & TokenTypeIds.RIDMask; } } private TypeRefTreatment Treatment { - get { return (TypeRefTreatment)(treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } + get { return (TypeRefTreatment)(_treatmentAndRowId >> TokenTypeIds.RowIdBitCount); } } private TypeReferenceHandle Handle @@ -56,7 +56,7 @@ public Handle ResolutionScope { if (Treatment == 0) { - return reader.TypeRefTable.GetResolutionScope(Handle); + return _reader.TypeRefTable.GetResolutionScope(Handle); } return GetProjectedResolutionScope(); @@ -72,7 +72,7 @@ public StringHandle Name { if (Treatment == 0) { - return reader.TypeRefTable.GetName(Handle); + return _reader.TypeRefTable.GetName(Handle); } return GetProjectedName(); @@ -88,7 +88,7 @@ public StringHandle Namespace { if (Treatment == 0) { - return reader.TypeRefTable.GetNamespace(Handle); + return _reader.TypeRefTable.GetNamespace(Handle); } return GetProjectedNamespace(); @@ -121,7 +121,7 @@ private StringHandle GetProjectedName() } else { - return reader.TypeRefTable.GetName(Handle); + return _reader.TypeRefTable.GetName(Handle); } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSpecification.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSpecification.cs index 6eb88e4a9566102f9a104c41eaee00954fd2a77a..04648c4040525c6ad55023a1349127a6c54310a2 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSpecification.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeSpecification.cs @@ -7,33 +7,33 @@ namespace System.Reflection.Metadata { public struct TypeSpecification { - private readonly MetadataReader reader; + private readonly MetadataReader _reader; // Workaround: JIT doesn't generate good code for nested structures, so use RowId. - private readonly uint rowId; + private readonly uint _rowId; internal TypeSpecification(MetadataReader reader, TypeSpecificationHandle handle) { Debug.Assert(reader != null); Debug.Assert(!handle.IsNil); - this.reader = reader; - this.rowId = handle.RowId; + _reader = reader; + _rowId = handle.RowId; } private TypeSpecificationHandle Handle { - get { return TypeSpecificationHandle.FromRowId(rowId); } + get { return TypeSpecificationHandle.FromRowId(_rowId); } } public BlobHandle Signature { - get { return reader.TypeSpecTable.GetSignature(Handle); } + get { return _reader.TypeSpecTable.GetSignature(Handle); } } public CustomAttributeHandleCollection GetCustomAttributes() { - return new CustomAttributeHandleCollection(reader, Handle); + return new CustomAttributeHandleCollection(_reader, Handle); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEBinaryReader.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEBinaryReader.cs index 7ec8c0225336bb5c339d4632430e8f72d91a59c9..0c2c02a5f9569cc841a006eeceb15c3133dc6eda 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEBinaryReader.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEBinaryReader.cs @@ -19,70 +19,70 @@ namespace System.Reflection.PortableExecutable /// internal struct PEBinaryReader { - private readonly long startOffset; - private readonly long maxOffset; - private readonly BinaryReader reader; + private readonly long _startOffset; + private readonly long _maxOffset; + private readonly BinaryReader _reader; public PEBinaryReader(Stream stream, int size) { Debug.Assert(size >= 0 && size <= (stream.Length - stream.Position)); - this.startOffset = stream.Position; - this.maxOffset = this.startOffset + (uint)size; - this.reader = new BinaryReader(stream, Encoding.UTF8, leaveOpen: true); + _startOffset = stream.Position; + _maxOffset = _startOffset + (uint)size; + _reader = new BinaryReader(stream, Encoding.UTF8, leaveOpen: true); } public int CurrentOffset { - get { return (int)(reader.BaseStream.Position - startOffset); } + get { return (int)(_reader.BaseStream.Position - _startOffset); } } public void Seek(int offset) { - CheckBounds(startOffset, offset); - reader.BaseStream.Seek(offset, SeekOrigin.Begin); + CheckBounds(_startOffset, offset); + _reader.BaseStream.Seek(offset, SeekOrigin.Begin); } public byte[] ReadBytes(int count) { - CheckBounds(reader.BaseStream.Position, count); - return reader.ReadBytes(count); + CheckBounds(_reader.BaseStream.Position, count); + return _reader.ReadBytes(count); } public Byte ReadByte() { CheckBounds(sizeof(Byte)); - return reader.ReadByte(); + return _reader.ReadByte(); } public Int16 ReadInt16() { CheckBounds(sizeof(Int16)); - return reader.ReadInt16(); + return _reader.ReadInt16(); } public UInt16 ReadUInt16() { CheckBounds(sizeof(UInt16)); - return reader.ReadUInt16(); + return _reader.ReadUInt16(); } public Int32 ReadInt32() { CheckBounds(sizeof(Int32)); - return reader.ReadInt32(); + return _reader.ReadInt32(); } public UInt32 ReadUInt32() { CheckBounds(sizeof(UInt32)); - return reader.ReadUInt32(); + return _reader.ReadUInt32(); } public ulong ReadUInt64() { CheckBounds(sizeof(UInt64)); - return reader.ReadUInt64(); + return _reader.ReadUInt64(); } public string ReadUTF8(int byteCount) @@ -124,10 +124,10 @@ public static int GetAndValidateSize(Stream peStream, int? size) private void CheckBounds(uint count) { Debug.Assert(count <= sizeof(Int64)); // Error message assumes we're trying to read constant small number of bytes. - Debug.Assert(reader.BaseStream.Position >= 0 && this.maxOffset >= 0); + Debug.Assert(_reader.BaseStream.Position >= 0 && _maxOffset >= 0); // Add cannot overflow because the worst case is (ulong)long.MaxValue + uint.MaxValue < ulong.MaxValue. - if ((ulong)reader.BaseStream.Position + count > (ulong)this.maxOffset) + if ((ulong)_reader.BaseStream.Position + count > (ulong)_maxOffset) { ThrowImageTooSmall(); } @@ -135,11 +135,11 @@ private void CheckBounds(uint count) private void CheckBounds(long startPosition, int count) { - Debug.Assert(startPosition >= 0 && this.maxOffset >= 0); + Debug.Assert(startPosition >= 0 && _maxOffset >= 0); // Add cannot overflow because the worst case is (ulong)long.MaxValue + uint.MaxValue < ulong.MaxValue. // Negative count is handled by overflow to greater than maximum size = int.MaxValue. - if ((ulong)startPosition + unchecked((uint)count) > (ulong)this.maxOffset) + if ((ulong)startPosition + unchecked((uint)count) > (ulong)_maxOffset) { ThrowImageTooSmallOrContainsInvalidOffsetOrCount(); } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaders.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaders.cs index ef2e59031d4ee33cb4d52cc01703d20b6768e704..3dea3a902ee97c6698b96f5ac72c25dab367266f 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaders.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEHeaders.cs @@ -13,15 +13,15 @@ namespace System.Reflection.PortableExecutable /// public sealed class PEHeaders { - private readonly CoffHeader coffHeader; - private readonly PEHeader peHeader; - private readonly ImmutableArray sectionHeaders; - private readonly CorHeader corHeader; - private readonly int metadataStartOffset = -1; - private readonly int metadataSize; - private readonly int coffHeaderStartOffset = -1; - private readonly int corHeaderStartOffset = -1; - private readonly int peHeaderStartOffset = -1; + private readonly CoffHeader _coffHeader; + private readonly PEHeader _peHeader; + private readonly ImmutableArray _sectionHeaders; + private readonly CorHeader _corHeader; + private readonly int _metadataStartOffset = -1; + private readonly int _metadataSize; + private readonly int _coffHeaderStartOffset = -1; + private readonly int _corHeaderStartOffset = -1; + private readonly int _peHeaderStartOffset = -1; /// /// Reads PE headers from the current location in the stream. @@ -69,29 +69,29 @@ private PEHeaders(Stream peStream, int? sizeOpt) bool isCoffOnly; SkipDosHeader(ref reader, out isCoffOnly); - this.coffHeaderStartOffset = reader.CurrentOffset; - this.coffHeader = new CoffHeader(ref reader); + _coffHeaderStartOffset = reader.CurrentOffset; + _coffHeader = new CoffHeader(ref reader); if (!isCoffOnly) { - this.peHeaderStartOffset = reader.CurrentOffset; - this.peHeader = new PEHeader(ref reader); + _peHeaderStartOffset = reader.CurrentOffset; + _peHeader = new PEHeader(ref reader); } - this.sectionHeaders = this.ReadSectionHeaders(ref reader); + _sectionHeaders = this.ReadSectionHeaders(ref reader); if (!isCoffOnly) { int offset; if (TryCalculateCorHeaderOffset(size, out offset)) { - this.corHeaderStartOffset = offset; + _corHeaderStartOffset = offset; reader.Seek(offset); - this.corHeader = new CorHeader(ref reader); + _corHeader = new CorHeader(ref reader); } } - CalculateMetadataLocation(size, out this.metadataStartOffset, out this.metadataSize); + CalculateMetadataLocation(size, out _metadataStartOffset, out _metadataSize); } /// @@ -100,7 +100,7 @@ private PEHeaders(Stream peStream, int? sizeOpt) /// public int MetadataStartOffset { - get { return metadataStartOffset; } + get { return _metadataStartOffset; } } /// @@ -108,7 +108,7 @@ public int MetadataStartOffset /// public int MetadataSize { - get { return metadataSize; } + get { return _metadataSize; } } /// @@ -116,7 +116,7 @@ public int MetadataSize /// public CoffHeader CoffHeader { - get { return coffHeader; } + get { return _coffHeader; } } /// @@ -124,7 +124,7 @@ public CoffHeader CoffHeader /// public int CoffHeaderStartOffset { - get { return coffHeaderStartOffset; } + get { return _coffHeaderStartOffset; } } /// @@ -132,7 +132,7 @@ public int CoffHeaderStartOffset /// public bool IsCoffOnly { - get { return this.peHeader == null; } + get { return _peHeader == null; } } /// @@ -140,7 +140,7 @@ public bool IsCoffOnly /// public PEHeader PEHeader { - get { return peHeader; } + get { return _peHeader; } } /// @@ -148,7 +148,7 @@ public PEHeader PEHeader /// public int PEHeaderStartOffset { - get { return peHeaderStartOffset; } + get { return _peHeaderStartOffset; } } /// @@ -156,7 +156,7 @@ public int PEHeaderStartOffset /// public ImmutableArray SectionHeaders { - get { return sectionHeaders; } + get { return _sectionHeaders; } } /// @@ -164,7 +164,7 @@ public ImmutableArray SectionHeaders /// public CorHeader CorHeader { - get { return corHeader; } + get { return _corHeader; } } /// @@ -172,7 +172,7 @@ public CorHeader CorHeader /// public int CorHeaderStartOffset { - get { return corHeaderStartOffset; } + get { return _corHeaderStartOffset; } } /// @@ -182,7 +182,7 @@ public bool IsConsoleApplication { get { - return peHeader != null && peHeader.Subsystem == Subsystem.WindowsCui; + return _peHeader != null && _peHeader.Subsystem == Subsystem.WindowsCui; } } @@ -193,7 +193,7 @@ public bool IsDll { get { - return (coffHeader.Characteristics & Characteristics.Dll) != 0; + return (_coffHeader.Characteristics & Characteristics.Dll) != 0; } } @@ -204,19 +204,19 @@ public bool IsExe { get { - return (coffHeader.Characteristics & Characteristics.Dll) == 0; + return (_coffHeader.Characteristics & Characteristics.Dll) == 0; } } private bool TryCalculateCorHeaderOffset(long peStreamSize, out int startOffset) { - if (!TryGetDirectoryOffset(peHeader.CorHeaderTableDirectory, out startOffset)) + if (!TryGetDirectoryOffset(_peHeader.CorHeaderTableDirectory, out startOffset)) { startOffset = -1; return false; } - int length = peHeader.CorHeaderTableDirectory.Size; + int length = _peHeader.CorHeaderTableDirectory.Size; if (length < COR20Constants.SizeOfCorHeader) { throw new BadImageFormatException(MetadataResources.InvalidCorHeaderSize); @@ -271,7 +271,7 @@ private void SkipDosHeader(ref PEBinaryReader reader, out bool isCOFFOnly) private ImmutableArray ReadSectionHeaders(ref PEBinaryReader reader) { - int numberOfSections = this.coffHeader.NumberOfSections; + int numberOfSections = _coffHeader.NumberOfSections; if (numberOfSections < 0) { throw new BadImageFormatException(MetadataResources.InvalidNumberOfSections); @@ -303,13 +303,13 @@ public bool TryGetDirectoryOffset(DirectoryEntry directory, out int offset) return false; } - int relativeOffset = directory.RelativeVirtualAddress - sectionHeaders[sectionIndex].VirtualAddress; - if (directory.Size > sectionHeaders[sectionIndex].VirtualSize - relativeOffset) + int relativeOffset = directory.RelativeVirtualAddress - _sectionHeaders[sectionIndex].VirtualAddress; + if (directory.Size > _sectionHeaders[sectionIndex].VirtualSize - relativeOffset) { throw new BadImageFormatException(MetadataResources.SectionTooSmall); } - offset = sectionHeaders[sectionIndex].PointerToRawData + relativeOffset; + offset = _sectionHeaders[sectionIndex].PointerToRawData + relativeOffset; return true; } @@ -323,10 +323,10 @@ public bool TryGetDirectoryOffset(DirectoryEntry directory, out int offset) /// public int GetContainingSectionIndex(int relativeVirtualAddress) { - for (int i = 0; i < sectionHeaders.Length; i++) + for (int i = 0; i < _sectionHeaders.Length; i++) { - if (sectionHeaders[i].VirtualAddress <= relativeVirtualAddress && - relativeVirtualAddress < sectionHeaders[i].VirtualAddress + sectionHeaders[i].VirtualSize) + if (_sectionHeaders[i].VirtualAddress <= relativeVirtualAddress && + relativeVirtualAddress < _sectionHeaders[i].VirtualAddress + _sectionHeaders[i].VirtualSize) { return i; } @@ -363,7 +363,7 @@ private void CalculateMetadataLocation(long peImageSize, out int start, out int start = SectionHeaders[cormeta].PointerToRawData; size = SectionHeaders[cormeta].SizeOfRawData; } - else if (corHeader == null) + else if (_corHeader == null) { start = 0; size = 0; @@ -371,12 +371,12 @@ private void CalculateMetadataLocation(long peImageSize, out int start, out int } else { - if (!TryGetDirectoryOffset(corHeader.MetadataDirectory, out start)) + if (!TryGetDirectoryOffset(_corHeader.MetadataDirectory, out start)) { throw new BadImageFormatException(MetadataResources.MissingDataDirectory); } - size = corHeader.MetadataDirectory.Size; + size = _corHeader.MetadataDirectory.Size; } if (start < 0 || diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEMemoryBlock.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEMemoryBlock.cs index 88674469c069711712b336ae21074bd411adc7c8..346cf93e36b4079211a62c7422c85bd7448b4e77 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEMemoryBlock.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEMemoryBlock.cs @@ -9,23 +9,23 @@ namespace System.Reflection.PortableExecutable { public struct PEMemoryBlock { - private readonly AbstractMemoryBlock block; - private readonly int offset; + private readonly AbstractMemoryBlock _block; + private readonly int _offset; internal PEMemoryBlock(AbstractMemoryBlock block, int offset = 0) { Debug.Assert(block != null); Debug.Assert(offset >= 0 && offset < block.Size); - this.block = block; - this.offset = offset; + _block = block; + _offset = offset; } public unsafe byte* Pointer { get { - return (block != null) ? block.Pointer + offset : null; + return (_block != null) ? _block.Pointer + _offset : null; } } @@ -33,7 +33,7 @@ public int Length { get { - return (block != null) ? block.Size - offset : 0; + return (_block != null) ? _block.Size - _offset : 0; } } @@ -41,7 +41,7 @@ public int Length public ImmutableArray GetContent() { - return (block != null) ? block.GetContent(offset) : ImmutableArray.Empty; + return (_block != null) ? _block.GetContent(_offset) : ImmutableArray.Empty; } } } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.cs index 71a60e919bb13653140e7dd0475795ad649b77ca..e9e8ec54eb95b6e2a8d72bf9870ee4d503c270eb 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/PEReader.cs @@ -22,14 +22,14 @@ public sealed class PEReader : IDisposable // May be null in the event that the entire image is not // deemed necessary and we have been instructed to read // the image contents without being lazy. - private MemoryBlockProvider peImage; + private MemoryBlockProvider _peImage; // If we read the data from the image lazily (peImage != null) we defer reading the PE headers. - private PEHeaders lazyPEHeaders; + private PEHeaders _lazyPEHeaders; - private AbstractMemoryBlock lazyMetadataBlock; - private AbstractMemoryBlock lazyImageBlock; - private AbstractMemoryBlock[] lazyPESectionBlocks; + private AbstractMemoryBlock _lazyMetadataBlock; + private AbstractMemoryBlock _lazyImageBlock; + private AbstractMemoryBlock[] _lazyPESectionBlocks; /// /// Creates a Portable Executable reader over a PE image stored in memory. @@ -55,7 +55,7 @@ public unsafe PEReader(byte* peImage, int size) throw new ArgumentOutOfRangeException("size"); } - this.peImage = new ExternalMemoryBlockProvider(peImage, size); + _peImage = new ExternalMemoryBlockProvider(peImage, size); } /// @@ -158,7 +158,7 @@ private unsafe PEReader(Stream peStream, PEStreamOptions options, int? sizeOpt) if ((options & (PEStreamOptions.PrefetchMetadata | PEStreamOptions.PrefetchEntireImage)) == 0) { - this.peImage = new StreamMemoryBlockProvider(peStream, start, size, isFileStream, (options & PEStreamOptions.LeaveOpen) != 0); + _peImage = new StreamMemoryBlockProvider(peStream, start, size, isFileStream, (options & PEStreamOptions.LeaveOpen) != 0); closeStream = false; } else @@ -167,8 +167,8 @@ private unsafe PEReader(Stream peStream, PEStreamOptions options, int? sizeOpt) if ((options & PEStreamOptions.PrefetchEntireImage) != 0) { var imageBlock = StreamMemoryBlockProvider.ReadMemoryBlockNoLock(peStream, isFileStream, 0, (int)Math.Min(peStream.Length, int.MaxValue)); - this.lazyImageBlock = imageBlock; - this.peImage = new ExternalMemoryBlockProvider(imageBlock.Pointer, imageBlock.Size); + _lazyImageBlock = imageBlock; + _peImage = new ExternalMemoryBlockProvider(imageBlock.Pointer, imageBlock.Size); // if the caller asked for metadata initialize the PE headers (calculates metadata offset): if ((options & PEStreamOptions.PrefetchMetadata) != 0) @@ -179,8 +179,8 @@ private unsafe PEReader(Stream peStream, PEStreamOptions options, int? sizeOpt) else { // The peImage is left null, but the lazyMetadataBlock is initialized up front. - this.lazyPEHeaders = new PEHeaders(peStream); - this.lazyMetadataBlock = StreamMemoryBlockProvider.ReadMemoryBlockNoLock(peStream, isFileStream, lazyPEHeaders.MetadataStartOffset, lazyPEHeaders.MetadataSize); + _lazyPEHeaders = new PEHeaders(peStream); + _lazyMetadataBlock = StreamMemoryBlockProvider.ReadMemoryBlockNoLock(peStream, isFileStream, _lazyPEHeaders.MetadataStartOffset, _lazyPEHeaders.MetadataSize); } // We read all we need, the stream is going to be closed. } @@ -209,7 +209,7 @@ public PEReader(ImmutableArray peImage) throw new ArgumentNullException("peImage"); } - this.peImage = new ByteArrayMemoryProvider(peImage); + _peImage = new ByteArrayMemoryProvider(peImage); } /// @@ -222,28 +222,28 @@ public PEReader(ImmutableArray peImage) /// public void Dispose() { - var image = peImage; + var image = _peImage; if (image != null) { image.Dispose(); - peImage = null; + _peImage = null; } - var imageBlock = lazyImageBlock; + var imageBlock = _lazyImageBlock; if (imageBlock != null) { imageBlock.Dispose(); - lazyImageBlock = null; + _lazyImageBlock = null; } - var metadataBlock = lazyMetadataBlock; + var metadataBlock = _lazyMetadataBlock; if (metadataBlock != null) { metadataBlock.Dispose(); - lazyMetadataBlock = null; + _lazyMetadataBlock = null; } - var peSectionBlocks = lazyPESectionBlocks; + var peSectionBlocks = _lazyPESectionBlocks; if (peSectionBlocks != null) { foreach (var block in peSectionBlocks) @@ -254,7 +254,7 @@ public void Dispose() } } - lazyPESectionBlocks = null; + _lazyPESectionBlocks = null; } } @@ -266,21 +266,21 @@ public PEHeaders PEHeaders { get { - if (lazyPEHeaders == null) + if (_lazyPEHeaders == null) { InitializePEHeaders(); } - return lazyPEHeaders; + return _lazyPEHeaders; } } private void InitializePEHeaders() { - Debug.Assert(peImage != null); + Debug.Assert(_peImage != null); StreamConstraints constraints; - Stream stream = peImage.GetStream(out constraints); + Stream stream = _peImage.GetStream(out constraints); PEHeaders headers; if (constraints.GuardOpt != null) @@ -295,7 +295,7 @@ private void InitializePEHeaders() headers = ReadPEHeadersNoLock(stream, constraints.ImageStart, constraints.ImageSize); } - Interlocked.CompareExchange(ref lazyPEHeaders, headers, null); + Interlocked.CompareExchange(ref _lazyPEHeaders, headers, null); } private static PEHeaders ReadPEHeadersNoLock(Stream stream, long imageStartPosition, int imageSize) @@ -311,22 +311,22 @@ private static PEHeaders ReadPEHeadersNoLock(Stream stream, long imageStartPosit /// PE image not available. private AbstractMemoryBlock GetEntireImageBlock() { - if (lazyImageBlock == null) + if (_lazyImageBlock == null) { - if (peImage == null) + if (_peImage == null) { throw new InvalidOperationException(MetadataResources.PEImageNotAvailable); } - var newBlock = peImage.GetMemoryBlock(); - if (Interlocked.CompareExchange(ref lazyImageBlock, newBlock, null) != null) + var newBlock = _peImage.GetMemoryBlock(); + if (Interlocked.CompareExchange(ref _lazyImageBlock, newBlock, null) != null) { // another thread created the block already, we need to dispose ours: newBlock.Dispose(); } } - return lazyImageBlock; + return _lazyImageBlock; } private AbstractMemoryBlock GetMetadataBlock() @@ -336,42 +336,42 @@ private AbstractMemoryBlock GetMetadataBlock() throw new InvalidOperationException(MetadataResources.PEImageDoesNotHaveMetadata); } - if (lazyMetadataBlock == null) + if (_lazyMetadataBlock == null) { - Debug.Assert(peImage != null, "We always have metadata if peImage is not available."); + Debug.Assert(_peImage != null, "We always have metadata if peImage is not available."); - var newBlock = peImage.GetMemoryBlock(PEHeaders.MetadataStartOffset, PEHeaders.MetadataSize); - if (Interlocked.CompareExchange(ref lazyMetadataBlock, newBlock, null) != null) + var newBlock = _peImage.GetMemoryBlock(PEHeaders.MetadataStartOffset, PEHeaders.MetadataSize); + if (Interlocked.CompareExchange(ref _lazyMetadataBlock, newBlock, null) != null) { // another thread created the block already, we need to dispose ours: newBlock.Dispose(); } } - return lazyMetadataBlock; + return _lazyMetadataBlock; } private AbstractMemoryBlock GetPESectionBlock(int index) { Debug.Assert(index >= 0 && index < PEHeaders.SectionHeaders.Length); - Debug.Assert(peImage != null); + Debug.Assert(_peImage != null); - if (lazyPESectionBlocks == null) + if (_lazyPESectionBlocks == null) { - Interlocked.CompareExchange(ref lazyPESectionBlocks, new AbstractMemoryBlock[PEHeaders.SectionHeaders.Length], null); + Interlocked.CompareExchange(ref _lazyPESectionBlocks, new AbstractMemoryBlock[PEHeaders.SectionHeaders.Length], null); } - var newBlock = peImage.GetMemoryBlock( + var newBlock = _peImage.GetMemoryBlock( PEHeaders.SectionHeaders[index].PointerToRawData, PEHeaders.SectionHeaders[index].SizeOfRawData); - if (Interlocked.CompareExchange(ref lazyPESectionBlocks[index], newBlock, null) != null) + if (Interlocked.CompareExchange(ref _lazyPESectionBlocks[index], newBlock, null) != null) { // another thread created the block already, we need to dispose ours: newBlock.Dispose(); } - return lazyPESectionBlocks[index]; + return _lazyPESectionBlocks[index]; } /// @@ -382,7 +382,7 @@ private AbstractMemoryBlock GetPESectionBlock(int index) /// public bool IsEntireImageAvailable { - get { return lazyImageBlock != null || peImage != null; } + get { return _lazyImageBlock != null || _peImage != null; } } /// @@ -434,7 +434,7 @@ public PEMemoryBlock GetSectionData(int relativeVirtualAddress) int size = PEHeaders.SectionHeaders[sectionIndex].VirtualSize - relativeOffset; AbstractMemoryBlock block; - if (peImage != null) + if (_peImage != null) { block = GetPESectionBlock(sectionIndex); } diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/SectionHeader.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/SectionHeader.cs index db23d0482387e0c58cc5ebacd590955c772b6a2e..64a375c723b1c49ea9ba101e4eb55013a6fee6c4 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/SectionHeader.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/PortableExecutable/SectionHeader.cs @@ -5,28 +5,28 @@ namespace System.Reflection.PortableExecutable { public struct SectionHeader { - private readonly int virtualSize; - private readonly string name; - private readonly int virtualAddress; - private readonly int sizeOfRawData; - private readonly int pointerToRawData; - private readonly int pointerToRelocations; - private readonly int pointerToLineNumbers; - private readonly ushort numberOfRelocations; - private readonly ushort numberOfLineNumbers; - private readonly SectionCharacteristics sectionCharacteristics; + private readonly int _virtualSize; + private readonly string _name; + private readonly int _virtualAddress; + private readonly int _sizeOfRawData; + private readonly int _pointerToRawData; + private readonly int _pointerToRelocations; + private readonly int _pointerToLineNumbers; + private readonly ushort _numberOfRelocations; + private readonly ushort _numberOfLineNumbers; + private readonly SectionCharacteristics _sectionCharacteristics; /// /// An 8-byte, null-padded UTF-8 encoded string. If the string is exactly 8 characters long, there is no terminating null. /// - public string Name { get { return name; } } + public string Name { get { return _name; } } /// /// The total size of the section when loaded into memory. /// If this value is greater than , the section is zero-padded. /// This field is valid only for PE images and should be set to zero for object files. /// - public int VirtualSize { get { return virtualSize; } } + public int VirtualSize { get { return _virtualSize; } } /// /// For PE images, the address of the first byte of the section relative to the image base when the @@ -34,7 +34,7 @@ public struct SectionHeader /// relocation is applied; for simplicity, compilers should set this to zero. Otherwise, /// it is an arbitrary value that is subtracted from offsets during relocation. /// - public int VirtualAddress { get { return virtualAddress; } } + public int VirtualAddress { get { return _virtualAddress; } } /// /// The size of the section (for object files) or the size of the initialized data on disk (for image files). @@ -44,7 +44,7 @@ public struct SectionHeader /// it is possible for to be greater than as well. /// When a section contains only uninitialized data, this field should be zero. /// - public int SizeOfRawData { get { return sizeOfRawData; } } + public int SizeOfRawData { get { return _sizeOfRawData; } } /// /// The file pointer to the first page of the section within the COFF file. @@ -52,49 +52,49 @@ public struct SectionHeader /// For object files, the value should be aligned on a 4 byte boundary for best performance. /// When a section contains only uninitialized data, this field should be zero. /// - public int PointerToRawData { get { return pointerToRawData; } } + public int PointerToRawData { get { return _pointerToRawData; } } /// /// The file pointer to the beginning of relocation entries for the section. /// This is set to zero for PE images or if there are no relocations. /// - public int PointerToRelocations { get { return pointerToRelocations; } } + public int PointerToRelocations { get { return _pointerToRelocations; } } /// /// The file pointer to the beginning of line-number entries for the section. /// This is set to zero if there are no COFF line numbers. /// This value should be zero for an image because COFF debugging information is deprecated. /// - public int PointerToLineNumbers { get { return pointerToLineNumbers; } } + public int PointerToLineNumbers { get { return _pointerToLineNumbers; } } /// /// The number of relocation entries for the section. This is set to zero for PE images. /// - public ushort NumberOfRelocations { get { return numberOfRelocations; } } + public ushort NumberOfRelocations { get { return _numberOfRelocations; } } /// /// The number of line-number entries for the section. /// This value should be zero for an image because COFF debugging information is deprecated. /// - public ushort NumberOfLineNumbers { get { return numberOfLineNumbers; } } + public ushort NumberOfLineNumbers { get { return _numberOfLineNumbers; } } /// /// The flags that describe the characteristics of the section. /// - public SectionCharacteristics SectionCharacteristics { get { return sectionCharacteristics; } } + public SectionCharacteristics SectionCharacteristics { get { return _sectionCharacteristics; } } internal SectionHeader(ref PEBinaryReader reader) { - name = reader.ReadUTF8(PEFileConstants.SizeofSectionName); - virtualSize = reader.ReadInt32(); - virtualAddress = reader.ReadInt32(); - sizeOfRawData = reader.ReadInt32(); - pointerToRawData = reader.ReadInt32(); - pointerToRelocations = reader.ReadInt32(); - pointerToLineNumbers = reader.ReadInt32(); - numberOfRelocations = reader.ReadUInt16(); - numberOfLineNumbers = reader.ReadUInt16(); - sectionCharacteristics = (SectionCharacteristics)reader.ReadUInt32(); + _name = reader.ReadUTF8(PEFileConstants.SizeofSectionName); + _virtualSize = reader.ReadInt32(); + _virtualAddress = reader.ReadInt32(); + _sizeOfRawData = reader.ReadInt32(); + _pointerToRawData = reader.ReadInt32(); + _pointerToRelocations = reader.ReadInt32(); + _pointerToLineNumbers = reader.ReadInt32(); + _numberOfRelocations = reader.ReadUInt16(); + _numberOfLineNumbers = reader.ReadUInt16(); + _sectionCharacteristics = (SectionCharacteristics)reader.ReadUInt32(); } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/tests/Metadata/Ecma335/MetadataTokensTests.cs b/src/libraries/System.Reflection.Metadata/tests/Metadata/Ecma335/MetadataTokensTests.cs index aef1a8d56b6bcbbad11081c03979399a2029a0aa..c3a93aa1e46f8d06ce5e6e6ae6bb3cab4344a7e3 100644 --- a/src/libraries/System.Reflection.Metadata/tests/Metadata/Ecma335/MetadataTokensTests.cs +++ b/src/libraries/System.Reflection.Metadata/tests/Metadata/Ecma335/MetadataTokensTests.cs @@ -8,64 +8,64 @@ namespace System.Reflection.Metadata.Tests { public class MetadataTokensTests { - private static readonly Handle assemblyRefHandle = AssemblyReferenceHandle.FromRowId(1); - private static readonly Handle virtualAssemblyRefHandle = AssemblyReferenceHandle.FromVirtualIndex(AssemblyReferenceHandle.VirtualIndex.System_Runtime); - private static readonly Handle virtualBlobHandle = BlobHandle.FromVirtualIndex(BlobHandle.VirtualIndex.AttributeUsage_AllowSingle, 0); - private static readonly Handle userStringHandle = UserStringHandle.FromIndex(1); - private static readonly Handle stringHandle = StringHandle.FromIndex(1); - private static readonly Handle winrtPrefixedStringHandle = StringHandle.FromIndex(1).WithWinRTPrefix(); - private static readonly Handle blobHandle = BlobHandle.FromIndex(1); - private static readonly Handle guidHandle = GuidHandle.FromIndex(16); - private static readonly Handle exportedTypeHandle = ExportedTypeHandle.FromRowId(42); + private static readonly Handle s_assemblyRefHandle = AssemblyReferenceHandle.FromRowId(1); + private static readonly Handle s_virtualAssemblyRefHandle = AssemblyReferenceHandle.FromVirtualIndex(AssemblyReferenceHandle.VirtualIndex.System_Runtime); + private static readonly Handle s_virtualBlobHandle = BlobHandle.FromVirtualIndex(BlobHandle.VirtualIndex.AttributeUsage_AllowSingle, 0); + private static readonly Handle s_userStringHandle = UserStringHandle.FromIndex(1); + private static readonly Handle s_stringHandle = StringHandle.FromIndex(1); + private static readonly Handle s_winrtPrefixedStringHandle = StringHandle.FromIndex(1).WithWinRTPrefix(); + private static readonly Handle s_blobHandle = BlobHandle.FromIndex(1); + private static readonly Handle s_guidHandle = GuidHandle.FromIndex(16); + private static readonly Handle s_exportedTypeHandle = ExportedTypeHandle.FromRowId(42); [Fact] public void GetRowNumber() { - Assert.Equal(1, MetadataTokens.GetRowNumber(assemblyRefHandle)); - Assert.Equal(-1, MetadataTokens.GetRowNumber(virtualAssemblyRefHandle)); + Assert.Equal(1, MetadataTokens.GetRowNumber(s_assemblyRefHandle)); + Assert.Equal(-1, MetadataTokens.GetRowNumber(s_virtualAssemblyRefHandle)); - Assert.Throws(() => MetadataTokens.GetRowNumber(virtualBlobHandle)); - Assert.Throws(() => MetadataTokens.GetRowNumber(userStringHandle)); - Assert.Throws(() => MetadataTokens.GetRowNumber(stringHandle)); - Assert.Throws(() => MetadataTokens.GetRowNumber(winrtPrefixedStringHandle)); - Assert.Throws(() => MetadataTokens.GetRowNumber(blobHandle)); - Assert.Throws(() => MetadataTokens.GetRowNumber(guidHandle)); + Assert.Throws(() => MetadataTokens.GetRowNumber(s_virtualBlobHandle)); + Assert.Throws(() => MetadataTokens.GetRowNumber(s_userStringHandle)); + Assert.Throws(() => MetadataTokens.GetRowNumber(s_stringHandle)); + Assert.Throws(() => MetadataTokens.GetRowNumber(s_winrtPrefixedStringHandle)); + Assert.Throws(() => MetadataTokens.GetRowNumber(s_blobHandle)); + Assert.Throws(() => MetadataTokens.GetRowNumber(s_guidHandle)); } [Fact] public void GetHeapOffset() { - Assert.Equal(-1, MetadataTokens.GetHeapOffset(virtualBlobHandle)); - Assert.Equal(1, MetadataTokens.GetHeapOffset(userStringHandle)); - Assert.Equal(1, MetadataTokens.GetHeapOffset(stringHandle)); - Assert.Equal(-1, MetadataTokens.GetHeapOffset(winrtPrefixedStringHandle)); - Assert.Equal(1, MetadataTokens.GetHeapOffset(blobHandle)); - Assert.Equal(16, MetadataTokens.GetHeapOffset(guidHandle)); + Assert.Equal(-1, MetadataTokens.GetHeapOffset(s_virtualBlobHandle)); + Assert.Equal(1, MetadataTokens.GetHeapOffset(s_userStringHandle)); + Assert.Equal(1, MetadataTokens.GetHeapOffset(s_stringHandle)); + Assert.Equal(-1, MetadataTokens.GetHeapOffset(s_winrtPrefixedStringHandle)); + Assert.Equal(1, MetadataTokens.GetHeapOffset(s_blobHandle)); + Assert.Equal(16, MetadataTokens.GetHeapOffset(s_guidHandle)); - Assert.Throws(() => MetadataTokens.GetHeapOffset(assemblyRefHandle)); - Assert.Throws(() => MetadataTokens.GetHeapOffset(virtualAssemblyRefHandle)); + Assert.Throws(() => MetadataTokens.GetHeapOffset(s_assemblyRefHandle)); + Assert.Throws(() => MetadataTokens.GetHeapOffset(s_virtualAssemblyRefHandle)); } [Fact] public void GetToken() { - Assert.Equal(0x23000001, MetadataTokens.GetToken(assemblyRefHandle)); - Assert.Equal(0, MetadataTokens.GetToken(virtualAssemblyRefHandle)); - Assert.Equal(0x70000001, MetadataTokens.GetToken(userStringHandle)); + Assert.Equal(0x23000001, MetadataTokens.GetToken(s_assemblyRefHandle)); + Assert.Equal(0, MetadataTokens.GetToken(s_virtualAssemblyRefHandle)); + Assert.Equal(0x70000001, MetadataTokens.GetToken(s_userStringHandle)); - Assert.Throws(() => MetadataTokens.GetToken(virtualBlobHandle)); - Assert.Throws(() => MetadataTokens.GetToken(stringHandle)); - Assert.Throws(() => MetadataTokens.GetToken(winrtPrefixedStringHandle)); - Assert.Throws(() => MetadataTokens.GetToken(blobHandle)); - Assert.Throws(() => MetadataTokens.GetToken(guidHandle)); + Assert.Throws(() => MetadataTokens.GetToken(s_virtualBlobHandle)); + Assert.Throws(() => MetadataTokens.GetToken(s_stringHandle)); + Assert.Throws(() => MetadataTokens.GetToken(s_winrtPrefixedStringHandle)); + Assert.Throws(() => MetadataTokens.GetToken(s_blobHandle)); + Assert.Throws(() => MetadataTokens.GetToken(s_guidHandle)); } [Fact] public void CreateHandle() { - Assert.Equal(assemblyRefHandle, MetadataTokens.Handle(0x23000001)); - Assert.Equal(userStringHandle, MetadataTokens.Handle(0x70000001)); - Assert.Equal(exportedTypeHandle, MetadataTokens.ExportedTypeHandle((int)(TokenTypeIds.ExportedType | exportedTypeHandle.RowId))); + Assert.Equal(s_assemblyRefHandle, MetadataTokens.Handle(0x23000001)); + Assert.Equal(s_userStringHandle, MetadataTokens.Handle(0x70000001)); + Assert.Equal(s_exportedTypeHandle, MetadataTokens.ExportedTypeHandle((int)(TokenTypeIds.ExportedType | s_exportedTypeHandle.RowId))); Assert.Throws(() => MetadataTokens.Handle(-1)); Assert.Throws(() => MetadataTokens.Handle(0x71000001)); diff --git a/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/StreamExtensionsTests.cs b/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/StreamExtensionsTests.cs index 2b29fd7a985a499f5a3454e77de91b04b1cb6bf5..62d3edb4b75fc236115951dfc720de5e0f05a190 100644 --- a/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/StreamExtensionsTests.cs +++ b/src/libraries/System.Reflection.Metadata/tests/PortableExecutable/StreamExtensionsTests.cs @@ -98,12 +98,12 @@ public unsafe void CopyTo2() private class TestStream : Stream { - private readonly byte[] buffer; - private int position; + private readonly byte[] _buffer; + private int _position; public TestStream(byte[] buffer) { - this.buffer = buffer; + _buffer = buffer; } public override bool CanRead { get { throw new NotImplementedException(); } } @@ -123,8 +123,8 @@ public override int Read(byte[] buffer, int offset, int count) return 0; } - buffer[offset] = this.buffer[position]; - position++; + buffer[offset] = _buffer[_position]; + _position++; return 1; } } diff --git a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/AssertEx.cs b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/AssertEx.cs index f45d4a20964af8f4055cbcf0d9048f2eb618a65f..ac3b57a9fec003b5e118fefb078e78801bcd2cde 100644 --- a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/AssertEx.cs +++ b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/AssertEx.cs @@ -19,7 +19,7 @@ public static class AssertEx #region AssertEqualityComparer private class AssertEqualityComparer : IEqualityComparer { - private readonly static IEqualityComparer instance = new AssertEqualityComparer(); + private readonly static IEqualityComparer s_instance = new AssertEqualityComparer(); private static bool CanBeNull() { @@ -40,7 +40,7 @@ public static bool IsNull(T @object) public static bool Equals(T left, T right) { - return instance.Equals(left, right); + return s_instance.Equals(left, right); } bool IEqualityComparer.Equals(T x, T y) diff --git a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/DiffUtil.cs b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/DiffUtil.cs index 8ce96c5b85d18b68739ac8247d31172536b90395..464fd4068377230f7f44199d7bfdd6ff4dc92fca 100644 --- a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/DiffUtil.cs +++ b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/DiffUtil.cs @@ -37,16 +37,16 @@ private class LCS : LongestCommonSubsequence> { public static readonly LCS Default = new LCS(EqualityComparer.Default); - private readonly IEqualityComparer comparer; + private readonly IEqualityComparer _comparer; public LCS(IEqualityComparer comparer) { - this.comparer = comparer; + _comparer = comparer; } protected override bool ItemsEqual(IList sequenceA, int indexA, IList sequenceB, int indexB) { - return comparer.Equals(sequenceA[indexA], sequenceB[indexB]); + return _comparer.Equals(sequenceA[indexA], sequenceB[indexB]); } public IEnumerable CalculateDiff(IList sequenceA, IList sequenceB, Func toString) @@ -82,11 +82,11 @@ public static string DiffReport(IEnumerable expected, IEnumerable actua return string.Join(separator, lcs.CalculateDiff(expectedList, actualList, toString)); } - private static readonly char[] LineSplitChars = new[] { '\r', '\n' }; + private static readonly char[] s_LineSplitChars = new[] { '\r', '\n' }; public static string[] Lines(string s) { - return s.Split(LineSplitChars, StringSplitOptions.RemoveEmptyEntries); + return s.Split(s_LineSplitChars, StringSplitOptions.RemoveEmptyEntries); } public static string DiffReport(string expected, string actual) diff --git a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/WorkItemAttribute.cs b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/WorkItemAttribute.cs index fc25ac140668538753c6c19e18818767a39c7042..0eac6ea8831dbd3b150e409915d74c9c461c3d2a 100644 --- a/src/libraries/System.Reflection.Metadata/tests/TestUtilities/WorkItemAttribute.cs +++ b/src/libraries/System.Reflection.Metadata/tests/TestUtilities/WorkItemAttribute.cs @@ -14,17 +14,17 @@ public sealed class WorkItemAttribute : TraitAttribute { public const string WorkItemAttributeName = "WorkItem"; - private readonly int id; - private readonly string description; + private readonly int _id; + private readonly string _description; public int Id { - get { return id; } + get { return _id; } } public string Description { - get { return description; } + get { return _description; } } public WorkItemAttribute(int id) @@ -35,8 +35,8 @@ public WorkItemAttribute(int id) public WorkItemAttribute(int id, string description) : base(WorkItemAttributeName, id.ToString()) { - this.id = id; - this.description = description; + _id = id; + _description = description; } } } \ No newline at end of file diff --git a/src/libraries/System.Reflection.Metadata/tests/Utilities/MemoryBlockTests.cs b/src/libraries/System.Reflection.Metadata/tests/Utilities/MemoryBlockTests.cs index aebf30cd82904f9027403d904f1bfacd7b0e9bad..0db1f7b8586f629de35aa0a07c60a7e174f06fee 100644 --- a/src/libraries/System.Reflection.Metadata/tests/Utilities/MemoryBlockTests.cs +++ b/src/libraries/System.Reflection.Metadata/tests/Utilities/MemoryBlockTests.cs @@ -152,16 +152,16 @@ public unsafe void LightUpTrickFromDifferentAssemblyWorks() sealed class CustomDecoder : MetadataStringDecoder { - GetString getString; + private GetString _getString; public CustomDecoder(Encoding encoding, GetString getString) : base(encoding) { - this.getString = getString; + _getString = getString; } public override unsafe string GetString(byte* bytes, int byteCount) { - return getString(bytes, byteCount); + return _getString(bytes, byteCount); } }