- PR comments

Author: BorisDog

src/MongoDB.Bson/IO/BsonBinaryReader.cs

@@ -17,7 +17,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 
 namespace MongoDB.Bson.IO
 {
@@ -32,7 +31,7 @@ public class BsonBinaryReader : BsonReader
 #pragma warning restore CA2213 // Disposable never disposed
         private readonly BsonStream _bsonStream;
         private BsonBinaryReaderContext _context;
-        private readonly Stack<BsonBinaryReaderContext> _contexts = new(4);
+        private readonly Stack<BsonBinaryReaderContext> _contextStack = new(4);
 
         // constructors
         /// <summary>
@@ -113,7 +112,7 @@ public override void Close()
         /// </summary>
         /// <returns>A bookmark.</returns>
         public override BsonReaderBookmark GetBookmark() =>
-            new BsonBinaryReaderBookmark(State, CurrentBsonType, CurrentName, _context, _contexts, _bsonStream.Position);
+            new BsonBinaryReaderBookmark(State, CurrentBsonType, CurrentName, _context, _contextStack, _bsonStream.Position);
 
         /// <summary>
         /// Determines whether this reader is at end of file.
@@ -673,7 +672,7 @@ public override void ReturnToBookmark(BsonReaderBookmark bookmark)
             State = binaryReaderBookmark.State;
             CurrentBsonType = binaryReaderBookmark.CurrentBsonType;
             CurrentName = binaryReaderBookmark.CurrentName;
-            _context = binaryReaderBookmark.RestoreContext(_contexts);
+            _context = binaryReaderBookmark.RestoreContext(_contextStack);
             _bsonStream.Position = binaryReaderBookmark.Position;
         }
 
@@ -782,7 +781,7 @@ private string GenerateDottedElementName()
                 elementName = "?";
             }
 
-            return GenerateDottedElementName(_contexts.ToArray(), 0, elementName);
+            return GenerateDottedElementName(_contextStack.ToArray(), 0, elementName);
         }
 
         private string GenerateDottedElementName(BsonBinaryReaderContext[] contexts, int currentContextIndex, string elementName)
@@ -827,6 +826,23 @@ private BsonReaderState GetNextState()
             }
         }
 
+        private void PopContext()
+        {
+            var actualSize = _bsonStream.Position - _context.StartPosition;
+            if (actualSize != _context.Size)
+            {
+                throw new FormatException($"Expected size to be {_context.Size}, not {actualSize}.");
+            }
+
+            _context =_contextStack.Pop();
+        }
+
+        private void PushContext(BsonBinaryReaderContext newContext)
+        {
+            _contextStack.Push(_context);
+            _context = newContext;
+        }
+
         private int ReadSize()
         {
             int size = _bsonStream.ReadInt32();
@@ -842,22 +858,5 @@ private int ReadSize()
             }
             return size;
         }
-
-        private void PopContext()
-        {
-            var actualSize = _bsonStream.Position - _context.StartPosition;
-            if (actualSize != _context.Size)
-            {
-                throw new FormatException($"Expected size to be {_context.Size}, not {actualSize}.");
-            }
-
-            _context =_contexts.Pop();
-        }
-
-        private void PushContext(BsonBinaryReaderContext newContext)
-        {
-            _contexts.Push(_context);
-            _context = newContext;
-        }
     }
 }

src/MongoDB.Bson/IO/BsonBinaryReaderBookmark.cs

@@ -30,12 +30,12 @@ internal BsonBinaryReaderBookmark(
         BsonType currentBsonType,
         string currentName,
         BsonBinaryReaderContext currentContext,
-        Stack<BsonBinaryReaderContext> contextsStack,
+        Stack<BsonBinaryReaderContext> contextStack,
         long position)
         : base(state, currentBsonType, currentName)
     {
         _context = currentContext;
-        _contextArray = contextsStack.ToArray();
+        _contextArray = contextStack.ToArray();
         _position = position;
     }
 

src/MongoDB.Bson/IO/BsonBinaryWriter.cs

@@ -30,7 +30,7 @@ public class BsonBinaryWriter : BsonWriter
 #pragma warning restore CA2213 // Disposable never disposed
         private readonly BsonStream _bsonStream;
         private BsonBinaryWriterContext _context;
-        private readonly Stack<BsonBinaryWriterContext> _contexts = new(4);
+        private readonly Stack<BsonBinaryWriterContext> _contextStack = new(4);
 
         // constructors
         /// <summary>
@@ -717,6 +717,17 @@ private BsonWriterState GetNextState()
             }
         }
 
+        private void PopContext()
+        {
+            _context = _contextStack.Pop();
+        }
+
+        private void PushContext(BsonBinaryWriterContext newContext)
+        {
+            _contextStack.Push(_context);
+            _context = newContext;
+        }
+
         private void WriteNameHelper()
         {
             if (_context.ContextType == ContextType.Array)
@@ -730,16 +741,5 @@ private void WriteNameHelper()
                 _bsonStream.WriteCString(Name);
             }
         }
-
-        private void PopContext()
-        {
-            _context = _contexts.Pop();
-        }
-
-        private void PushContext(BsonBinaryWriterContext newContext)
-        {
-            _contexts.Push(_context);
-            _context = newContext;
-        }
     }
 }