Merge pull request #1345 from forki/blittest

Changing Array.blit to be just an alias for Array.Copy

Author: dsyme

src/absil/ilsupp.fs

@@ -535,8 +535,8 @@ type ResFormatNode(tid:int32, nid:int32, lid:int32, dataOffset:int32, pbLinkedRe
         let SaveChunk(p : byte[], sz : int) =
             if Unchecked.defaultof<byte[]> <>  pUnlinkedResource then
                 Bytes.blit p 0 pUnlinkedResource (!unlinkedResourceOffset + offset) sz
-                unlinkedResourceOffset := !unlinkedResourceOffset + sz ;
-            size := !size + sz ;
+                unlinkedResourceOffset := !unlinkedResourceOffset + sz
+            size := !size + sz
 
             ()
 
@@ -846,10 +846,10 @@ let unlinkResource (ulLinkedResourceBaseRVA:int32) (pbLinkedResource:byte[]) =
         let rfh = ResFormatHeader()
         let rfhBytes = rfh.toBytes()
         Bytes.blit rfhBytes 0 pResBuffer 0 ResFormatHeader.Width
-        resBufferOffset <- resBufferOffset + ResFormatHeader.Width ;
+        resBufferOffset <- resBufferOffset + ResFormatHeader.Width
 
         for i = 0 to (nResNodes - 1) do
-            resBufferOffset <- resBufferOffset + pResNodes.[i].Save(ulLinkedResourceBaseRVA, pbLinkedResource, pResBuffer, resBufferOffset) ;
+            resBufferOffset <- resBufferOffset + pResNodes.[i].Save(ulLinkedResourceBaseRVA, pbLinkedResource, pResBuffer, resBufferOffset)
 
     pResBuffer
 #endif

src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/ArrayProperties.fs

@@ -6,6 +6,7 @@ open System
 open System.Collections.Generic
 open NUnit.Framework
 open FsCheck
+open Utils
 
 let isStable sorted = sorted |> Seq.pairwise |> Seq.forall (fun ((ia, a),(ib, b)) -> if a = b then ia < ib else true)
 
@@ -15,6 +16,18 @@ let distinctByStable<'a when 'a : comparison> (xs : 'a []) =
     isStable sorted
 
 [<Test>]
-let ``Seq.distinctBy is stable`` () =
+let ``Array.distinctBy is stable`` () =
     Check.QuickThrowOnFailure distinctByStable<int>
     Check.QuickThrowOnFailure distinctByStable<string>
+    
+let blitWorksLikeCopy<'a when 'a : comparison> (source : 'a [], sourceIndex, target : 'a [], targetIndex, count) =
+    let target1 = Array.copy target
+    let target2 = Array.copy target
+    let a = runAndCheckIfAnyError (fun () -> Array.blit source sourceIndex target1 targetIndex count)
+    let b = runAndCheckIfAnyError (fun () -> Array.Copy(source, sourceIndex, target2, targetIndex, count))
+    a = b && target1 = target2
+    
+[<Test>]
+let ``Array.blit works like Array.Copy`` () =
+    Check.QuickThrowOnFailure blitWorksLikeCopy<int>
+    Check.QuickThrowOnFailure blitWorksLikeCopy<string>

src/fsharp/FSharp.Core/array.fs

@@ -83,17 +83,8 @@ namespace Microsoft.FSharp.Collections
 
         [<CodeAnalysis.SuppressMessage("Microsoft.Naming","CA1704:IdentifiersShouldBeSpelledCorrectly")>]
         [<CompiledName("CopyTo")>]
-        let blit (source : 'T[]) sourceIndex (target: 'T[]) targetIndex count = 
-            checkNonNull "source" source
-            checkNonNull "target" target
-            if sourceIndex < 0 then invalidArg "sourceIndex" (SR.GetString(SR.inputMustBeNonNegative))
-            if count < 0 then invalidArg "count" (SR.GetString(SR.inputMustBeNonNegative))
-            if targetIndex < 0 then invalidArg "targetIndex" (SR.GetString(SR.inputMustBeNonNegative))
-            if sourceIndex + count > source.Length then invalidArg "count" (SR.GetString(SR.outOfRange))
-            if targetIndex + count > target.Length then invalidArg "count" (SR.GetString(SR.outOfRange))
+        let inline blit (source : 'T[]) (sourceIndex:int) (target: 'T[]) (targetIndex:int) (count:int) = 
             Array.Copy(source, sourceIndex, target, targetIndex, count)
-            // for i = 0 to count - 1 do 
-            //    target.[targetIndex+i] <- source.[sourceIndex + i]
 
         let rec concatAddLengths (arrs:'T[][]) i acc =
             if i >= arrs.Length then acc 

src/fsharp/FSharp.Core/array.fsi

@@ -62,7 +62,7 @@ namespace Microsoft.FSharp.Collections
         /// <exception cref="System.ArgumentException">Thrown when any of sourceIndex, targetIndex or count are negative,
         /// or when there aren't enough elements in source or target.</exception>
         [<CompiledName("CopyTo")>]
-        val blit: source:'T[] -> sourceIndex:int -> target:'T[] -> targetIndex:int -> count:int -> unit
+        val inline blit: source:'T[] -> sourceIndex:int -> target:'T[] -> targetIndex:int -> count:int -> unit
 
         /// <summary>For each element of the array, applies the given function. Concatenates all the results and return the combined array.</summary>
         /// <param name="mapping">The function to create sub-arrays from the input array elements.</param>

src/utils/prim-lexing.fs

@@ -74,28 +74,27 @@ namespace Internal.Utilities.Text.Lexing
     and [<Sealed>]
         internal LexBuffer<'Char>(filler: LexBufferFiller<'Char>) = 
         let context = new Dictionary<string,obj>(1) 
-        let mutable buffer=[||];
+        let mutable buffer = [||]
         /// number of valid characters beyond bufferScanStart.
-        let mutable bufferMaxScanLength=0;
+        let mutable bufferMaxScanLength = 0
         /// count into the buffer when scanning.
-        let mutable bufferScanStart=0;
+        let mutable bufferScanStart = 0
         /// number of characters scanned so far.
-        let mutable bufferScanLength=0;
+        let mutable bufferScanLength = 0
         /// length of the scan at the last accepting state.
-        let mutable lexemeLength=0;
+        let mutable lexemeLength = 0
         /// action related to the last accepting state.
-        let mutable bufferAcceptAction=0;
-        let mutable eof = false;
-        let mutable startPos = Position.Empty ;
+        let mutable bufferAcceptAction = 0
+        let mutable eof = false
+        let mutable startPos = Position.Empty
         let mutable endPos = Position.Empty
 
-        // Throw away all the input besides the lexeme 
-              
+        // Throw away all the input besides the lexeme
         let discardInput () = 
             let keep = Array.sub buffer bufferScanStart bufferScanLength
             let nkeep = keep.Length 
-            Array.blit keep 0 buffer 0 nkeep;
-            bufferScanStart <- 0;
+            Array.blit keep 0 buffer 0 nkeep
+            bufferScanStart <- 0
             bufferMaxScanLength <- nkeep
 
 
@@ -142,7 +141,7 @@ namespace Internal.Utilities.Text.Lexing
         member lexbuf.EnsureBufferSize n = 
             if lexbuf.BufferScanPos + n >= buffer.Length then 
                 let repl = Array.zeroCreate (lexbuf.BufferScanPos + n) 
-                Array.blit buffer bufferScanStart repl bufferScanStart bufferScanLength;
+                Array.blit buffer bufferScanStart repl bufferScanStart bufferScanLength
                 buffer <- repl
 
 
@@ -151,8 +150,8 @@ namespace Internal.Utilities.Text.Lexing
             let extension= Array.zeroCreate 4096
             let filler (lexBuffer: LexBuffer<'Char>) =
                  let n = f (extension,0,extension.Length)
-                 lexBuffer.EnsureBufferSize n;
-                 Array.blit extension 0 lexBuffer.Buffer lexBuffer.BufferScanPos n;
+                 lexBuffer.EnsureBufferSize n
+                 Array.blit extension 0 lexBuffer.Buffer lexBuffer.BufferScanPos n
                  lexBuffer.BufferMaxScanLength <- lexBuffer.BufferScanLength + n
             new LexBuffer<'Char>(filler)
 

src/utils/prim-parsing.fs

@@ -83,8 +83,8 @@ type Stack<'a>(n)  =
         let oldSize = contents.Length
         if newSize > oldSize then 
             let old = contents
-            contents <- Array.zeroCreate (max newSize (oldSize * 2));
-            Array.blit old 0 contents 0 count;
+            contents <- Array.zeroCreate (max newSize (oldSize * 2))
+            Array.blit old 0 contents 0 count
 
     member buf.Count = count
     member buf.Pop() = count <- count - 1