Cleaned up Reader/Writer Project (#2156)

dotnet · Mar 12, 2018 · d2264af · d2264af
1 parent fd72e1a
commit d2264af
Show file tree

Hide file tree

Showing 32 changed files with 103 additions and 83 deletions.
diff --git a/src/System.Azure.Experimental/System/Azure/CosmosDbAuthorizationHeader.cs b/src/System.Azure.Experimental/System/Azure/CosmosDbAuthorizationHeader.cs
@@ -5,6 +5,7 @@
 using System.Buffers;
 using System.Buffers.Cryptography;
 using System.Buffers.Text;
+using System.Buffers.Writer;
 using System.Text.Encodings.Web.Utf8;
 using System.Text.Utf8;
 using static System.Buffers.Text.Encodings;

diff --git a/src/System.Azure.Experimental/System/Azure/StorageAccessSignature.cs b/src/System.Azure.Experimental/System/Azure/StorageAccessSignature.cs
@@ -5,9 +5,9 @@
 using System.Buffers.Cryptography;
 using System.Text.Utf8;
 using System.Binary.Base64Experimental;
-using System.Buffers.Text;
 using System.Buffers;
-using System.Buffers.Transformations;
+using System.Buffers.Operations;
+using System.Buffers.Writer;
 
 namespace System.Azure.Authentication
 {
@@ -20,7 +20,7 @@ public struct StorageAuthorizationHeader : IWritable
         public ReadOnlyMemory<byte> HttpVerb;
         public string AccountName;
         public string CanonicalizedResource;
-        public WritableBytes CanonicalizedHeaders;
+        public ReadOnlyMemory<byte> CanonicalizedHeaders;
         public long ContentLength;
 
         public bool TryWrite(Span<byte> buffer, out int written, StandardFormat format = default)

diff --git a/src/System.Binary.Base64/Base64Decoder.cs b/src/System.Binary.Base64/Base64Decoder.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 using System.Buffers;
+using System.Buffers.Operations;
 using System.Buffers.Text;
 
 namespace System.Binary.Base64Experimental

diff --git a/src/System.Binary.Base64/Base64Encoder.cs b/src/System.Binary.Base64/Base64Encoder.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Buffers;
+using System.Buffers.Operations;
 using System.Buffers.Text;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;

diff --git a/src/System.Buffers.Experimental/System/Buffers/BufferExtensions.cs b/src/System.Buffers.Experimental/System/Buffers/BufferExtensions.cs
@@ -6,6 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Numerics;
 using System.Runtime.InteropServices;
+using System.Buffers.Operations;
 
 namespace System.Buffers
 {

diff --git a/src/System.Buffers.Primitives/System/Buffers/IBufferOperation.cs b/src/System.Buffers.Primitives/System/Buffers/IBufferOperation.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace System.Buffers
+namespace System.Buffers.Operations
 {
     public interface IBufferOperation
     {

diff --git a/src/System.Buffers.Primitives/System/Buffers/IBufferTransformation.cs b/src/System.Buffers.Primitives/System/Buffers/IBufferTransformation.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace System.Buffers
+namespace System.Buffers.Operations
 {
     public interface IBufferTransformation : IBufferOperation
     {

diff --git a/...em/Buffers/Reader/ReadOnlyBufferReader.cs → ...ter/System/Buffers/Reader/BufferReader.cs b/...em/Buffers/Reader/ReadOnlyBufferReader.cs → ...ter/System/Buffers/Reader/BufferReader.cs
@@ -1,23 +1,11 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Sequences;
 using System.Runtime.CompilerServices;
 
-namespace System.Buffers
+namespace System.Buffers.Reader
 {
-    public class BufferReader
-    {
-        public static ByteBufferReader Create(ReadOnlySequence<byte> buffer)
-        {
-            return new ByteBufferReader(buffer);
-        }
-
-        public static int Peek(ByteBufferReader reader, Span<byte> destination)
-            => ByteBufferReader.Peek(reader, destination);
-    }
-
-    public ref struct ByteBufferReader
+    public ref struct BufferReader
     {
         private ReadOnlySpan<byte> _currentSpan;
         private int _index;
@@ -29,7 +17,7 @@ public ref struct ByteBufferReader
         private int _consumedBytes;
         private bool _end;
 
-        public ByteBufferReader(ReadOnlySequence<byte> buffer)
+        public BufferReader(ReadOnlySequence<byte> buffer)
         {
             _end = false;
             _index = 0;
@@ -41,6 +29,11 @@ public ByteBufferReader(ReadOnlySequence<byte> buffer)
             MoveNext();
         }
 
+        public static BufferReader Create(ReadOnlySequence<byte> buffer)
+        {
+            return new BufferReader(buffer);
+        }
+
         public bool End => _end;
 
         public int CurrentSegmentIndex => _index;
@@ -134,7 +127,7 @@ public void Advance(int byteCount)
             }
         }
 
-        internal static int Peek(ByteBufferReader bytes, Span<byte> destination)
+        internal static int Peek(BufferReader bytes, Span<byte> destination)
         {
             var first = bytes.UnreadSegment;
             if (first.Length > destination.Length)

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Reader/BufferReader_binary.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Reader/BufferReader_binary.cs
@@ -2,13 +2,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Buffers.Binary;
-using System.Collections.Sequences;
 
-namespace System.Buffers
+namespace System.Buffers.Reader
 {
     public static partial class BufferReaderExtensions
     {
-        public static bool TryRead(ref ByteBufferReader reader, out int value, bool littleEndian = false)
+        public static bool TryRead(ref BufferReader reader, out int value, bool littleEndian = false)
         {
             var unread = reader.UnreadSegment;
             if (littleEndian)
@@ -26,7 +25,7 @@ public static bool TryRead(ref ByteBufferReader reader, out int value, bool litt
             }
 
             Span<byte> tempSpan = stackalloc byte[4];
-            var copied = BufferReader.Peek(reader, tempSpan);
+            var copied = BufferReaderExtensions.Peek(reader, tempSpan);
             if (copied < 4)
             {
                 value = default;
@@ -45,4 +44,10 @@ public static bool TryRead(ref ByteBufferReader reader, out int value, bool litt
             return true;
         }
     }
+
+    public static partial class BufferReaderExtensions
+    {
+        public static int Peek(BufferReader reader, Span<byte> destination)
+            => BufferReader.Peek(reader, destination);
+    }
 }
diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Reader/BufferReader_search.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Reader/BufferReader_search.cs
@@ -3,12 +3,12 @@
 
 using System.Collections.Sequences;
 
-namespace System.Buffers
+namespace System.Buffers.Reader
 {
     // TODO: the TryReadUntill methods are very inneficient. We need to fix that.
     public static partial class BufferReaderExtensions
     {
-        public static bool TryReadUntill(ref ByteBufferReader reader, out ReadOnlySequence<byte> bytes, byte delimiter)
+        public static bool TryReadUntill(ref BufferReader reader, out ReadOnlySequence<byte> bytes, byte delimiter)
         {
             var copy = reader;
             var start = reader.Position;
@@ -26,7 +26,7 @@ public static bool TryReadUntill(ref ByteBufferReader reader, out ReadOnlySequen
             return false;
         }
 
-        public static bool TryReadUntill(ref ByteBufferReader reader, out ReadOnlySequence<byte> bytes, ReadOnlySpan<byte> delimiter)
+        public static bool TryReadUntill(ref BufferReader reader, out ReadOnlySequence<byte> bytes, ReadOnlySpan<byte> delimiter)
         {
             if (delimiter.Length == 0)
             {

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Reader/BufferReader_text.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Reader/BufferReader_text.cs
@@ -2,13 +2,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Buffers.Text;
-using System.Collections.Sequences;
 
-namespace System.Buffers
+namespace System.Buffers.Reader
 {
     public static partial class BufferReaderExtensions 
     {
-        public static bool TryParse(ref ByteBufferReader reader, out bool value) 
+        public static bool TryParse(ref BufferReader reader, out bool value) 
         {
             var unread = reader.UnreadSegment;
             if (Utf8Parser.TryParse(unread, out value, out int consumed))
@@ -21,7 +20,7 @@ public static bool TryParse(ref ByteBufferReader reader, out bool value)
             }
 
             Span<byte> tempSpan = stackalloc byte[5];
-            var copied = BufferReader.Peek(reader, tempSpan);
+            var copied = BufferReaderExtensions.Peek(reader, tempSpan);
             if (Utf8Parser.TryParse(tempSpan.Slice(0, copied), out value, out consumed))
             {
                 reader.Advance(consumed);
@@ -31,7 +30,7 @@ public static bool TryParse(ref ByteBufferReader reader, out bool value)
             return false;
         }
 
-        public static bool TryParse(ref ByteBufferReader reader, out int value)
+        public static bool TryParse(ref BufferReader reader, out int value)
         {
             var unread = reader.UnreadSegment;
             if (Utf8Parser.TryParse(unread, out value, out int consumed))
@@ -44,7 +43,7 @@ public static bool TryParse(ref ByteBufferReader reader, out int value)
             }
 
             Span<byte> tempSpan = stackalloc byte[15];
-            var copied = BufferReader.Peek(reader, tempSpan);
+            var copied = BufferReaderExtensions.Peek(reader, tempSpan);
             if (Utf8Parser.TryParse(tempSpan.Slice(0, copied), out value, out consumed))
             {
                 reader.Advance(consumed);
@@ -54,7 +53,7 @@ public static bool TryParse(ref ByteBufferReader reader, out int value)
             return false;
         }
 
-        public static bool TryParse(ref ByteBufferReader reader, out ulong value)
+        public static bool TryParse(ref BufferReader reader, out ulong value)
         {
             var unread = reader.UnreadSegment;
             if (Utf8Parser.TryParse(unread, out value, out int consumed))
@@ -67,7 +66,7 @@ public static bool TryParse(ref ByteBufferReader reader, out ulong value)
             }
 
             Span<byte> tempSpan = stackalloc byte[30];
-            var copied = BufferReader.Peek(reader, tempSpan);
+            var copied = BufferReaderExtensions.Peek(reader, tempSpan);
             if (Utf8Parser.TryParse(tempSpan.Slice(0, copied), out value, out consumed))
             {
                 reader.Advance(consumed);

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Transformations/RemoveTranstomation.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Transformations/RemoveTranstomation.cs
@@ -1,31 +1,8 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace System.Buffers.Transformations
+namespace System.Buffers.Operations
 {
-    public struct WritableBytes : IWritable
-    {
-        readonly ReadOnlyMemory<byte> _bytes;
-
-        public WritableBytes(ReadOnlyMemory<byte> bytes)
-        {
-            _bytes = bytes;
-        }
-
-        public bool TryWrite(Span<byte> buffer, out int written, StandardFormat format = default)
-        {
-            if (format != default) throw new InvalidOperationException();
-
-            if (!_bytes.Span.TryCopyTo(buffer))
-            {
-                written = 0;
-                return false;
-            }
-            written = _bytes.Length;
-            return true;
-        }
-    }
-
     public class RemoveTransformation : IBufferTransformation
     {
         byte _value;

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter.cs
@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 
-namespace System.Buffers.Text
+using System.Buffers.Text;
+
+namespace System.Buffers.Writer
 {
     public ref partial struct BufferWriter
     {

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_datetime.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_datetime.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace System.Buffers.Text
+using System.Buffers.Text;
+
+namespace System.Buffers.Writer
 {
     public ref partial struct BufferWriter
     {

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_ints.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_ints.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace System.Buffers.Text
+using System.Buffers.Text;
+
+namespace System.Buffers.Writer
 {
     public ref partial struct BufferWriter
     {

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_sequence.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_sequence.cs
@@ -2,11 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Buffers.Text;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace System.Buffers.Text
+namespace System.Buffers.Writer
 {
     public ref struct BufferWriter<TOutput> where TOutput : IBufferWriter<byte>
     {

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_strings.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_strings.cs
@@ -2,9 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Buffers.Text;
 using System.Text.Utf8;
 
-namespace System.Buffers.Text
+namespace System.Buffers.Writer
 {
     public ref partial struct BufferWriter
     {

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_writable.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/BufferWriter_writable.cs
@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 
-namespace System.Buffers.Text
+using System.Buffers.Text;
+
+namespace System.Buffers.Writer
 {
     public ref partial struct BufferWriter
     {
@@ -35,6 +37,28 @@ public bool TryWriteBytes(ReadOnlyMemory<byte> bytes)
         public void WriteBytes(ReadOnlyMemory<byte> bytes)
             => WriteBytes(bytes.Span);
 
+        public bool TryWriteBytes(ReadOnlyMemory<byte> bytes, TransformationFormat format)
+        {
+            if (!TryWriteBytes(bytes.Span))
+            {
+                return false;
+            }
+
+            int written = bytes.Length;
+            if (format.TryTransform(Free, ref written))
+            {
+                _written += written;
+                return true;
+            }
+
+            return false;
+        }
+
+        public void WriteBytes(ReadOnlyMemory<byte> bytes, TransformationFormat format)
+        {
+            while (!TryWriteBytes(bytes, format)) Resize();
+        }
+
         #endregion
 
         #region IWritable

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/OutputExtensions.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/OutputExtensions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-namespace System.Buffers
+namespace System.Buffers.Writer
 {
     public static class OutputExtensions
     {

diff --git a/src/System.Buffers.ReaderWriter/System/Buffers/Writer/OutputWriter.cs b/src/System.Buffers.ReaderWriter/System/Buffers/Writer/OutputWriter.cs
@@ -4,7 +4,7 @@
 
 using System.Runtime.CompilerServices;
 
-namespace System.Buffers
+namespace System.Buffers.Writer
 {
     public static class OutputWriter
     {