Add "The input must be positive." error message and use it in windowed

Fix #266
dotnet · Feb 23, 2015 · c6bbef5 · c6bbef5
1 parent 4267370
commit c6bbef5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/src/fsharp/FSharp.Core/FSCore.resx b/src/fsharp/FSharp.Core/FSCore.resx
@@ -180,6 +180,9 @@
   <data name="inputMustBeNonNegative" xml:space="preserve">
     <value>The input must be non-negative.</value>
   </data>
+  <data name="inputMustBePositive" xml:space="preserve">
+    <value>The input must be positive.</value>
+  </data>
   <data name="inputSequenceEmpty" xml:space="preserve">
     <value>The input sequence was empty.</value>
   </data>

diff --git a/src/fsharp/FSharp.Core/SR.fs b/src/fsharp/FSharp.Core/SR.fs
@@ -24,6 +24,7 @@ module internal SR =
     let pickElementNotFound = "pickElementNotFound"            
     let notEnoughElements = "notEnoughElements"
     let inputMustBeNonNegative = "inputMustBeNonNegative"
+    let inputMustBePositive = "inputMustBePositive"
     let enumerationPastIntMaxValue = "enumerationPastIntMaxValue"
     let inputSequenceEmpty = "inputSequenceEmpty"
     let inputSequenceTooLong = "inputSequenceTooLong"

diff --git a/src/fsharp/FSharp.Core/array.fs b/src/fsharp/FSharp.Core/array.fs
@@ -549,7 +549,7 @@ namespace Microsoft.FSharp.Collections
         [<CompiledName("Windowed")>]
         let windowed windowSize (array:'T[]) =
             checkNonNull "array" array
-            if windowSize <= 0 then invalidArg "windowSize" (SR.GetString(SR.inputMustBeNonNegative))
+            if windowSize <= 0 then invalidArg "windowSize" (SR.GetString(SR.inputMustBePositive))
             let len = array.Length
             if windowSize > len then
                 [| |]

diff --git a/src/fsharp/FSharp.Core/local.fs b/src/fsharp/FSharp.Core/local.fs
@@ -538,7 +538,7 @@ module internal List =
             windowedToFreshConsTail cons2 windowSize i t arr
 
     let windowed windowSize list =
-        if windowSize <= 0 then invalidArg "windowSize" (SR.GetString(SR.inputMustBeNonNegative))
+        if windowSize <= 0 then invalidArg "windowSize" (SR.GetString(SR.inputMustBePositive))
         match list with
         | [] -> []
         | _ ->

diff --git a/src/fsharp/FSharp.Core/seq.fs b/src/fsharp/FSharp.Core/seq.fs
@@ -1362,7 +1362,7 @@ namespace Microsoft.FSharp.Collections
         [<CompiledName("Windowed")>]
         let windowed windowSize (source: seq<_>) =    
             checkNonNull "source" source
-            if windowSize <= 0 then invalidArg "windowSize" (SR.GetString(SR.inputMustBeNonNegative))
+            if windowSize <= 0 then invalidArg "windowSize" (SR.GetString(SR.inputMustBePositive))
             seq { 
                 let arr = Array.zeroCreateUnchecked windowSize
                 let r = ref (windowSize - 1)