Rename count to countPrefix #81

Author: garyb

src/Data/String.js

@@ -139,7 +139,7 @@ exports._slice = function (b) {
   };
 };
 
-exports.count = function (p) {
+exports.countPrefix = function (p) {
   return function (s) {
     var i = 0;
     while (i < s.length && p(s.charAt(i))) i++;

src/Data/String.purs

@@ -29,7 +29,7 @@ module Data.String
   , slice
   , stripPrefix
   , stripSuffix
-  , count
+  , countPrefix
   , split
   , splitAt
   , toCharArray
@@ -162,7 +162,7 @@ uncons s  = Just { head: U.charAt zero s, tail: drop one s }
 -- | ```
 -- |
 takeWhile :: (Char -> Boolean) -> String -> String
-takeWhile p s = take (count p s) s
+takeWhile p s = take (countPrefix p s) s
 
 -- | Returns the suffix remaining after `takeWhile`.
 -- |
@@ -171,7 +171,7 @@ takeWhile p s = take (count p s) s
 -- | ```
 -- |
 dropWhile :: (Char -> Boolean) -> String -> String
-dropWhile p s = drop (count p s) s
+dropWhile p s = drop (countPrefix p s) s
 
 -- | Returns the substring at indices `[begin, end)`.
 -- | If either index is negative, it is normalised to `length s - index`,
@@ -407,10 +407,10 @@ dropRight i s = take (length s - i) s
 -- | of the string for which the predicate holds.
 -- |
 -- | ```purescript
--- | count (_ /= ' ') "Hello World" == 5 -- since length "Hello" == 5
+-- | countPrefix (_ /= ' ') "Hello World" == 5 -- since length "Hello" == 5
 -- | ```
 -- |
-foreign import count :: (Char -> Boolean) -> String -> Int
+foreign import countPrefix :: (Char -> Boolean) -> String -> Int
 
 -- | Returns the substrings of the second string separated along occurences
 -- | of the first string.

src/Data/String/CodePoints.js

@@ -40,7 +40,7 @@ exports._codePointAt = function (fallback) {
   };
 };
 
-exports._count = function (fallback) {
+exports._countPrefix = function (fallback) {
   return function (unsafeCodePointAt0) {
     if (hasStringIterator) {
       return function (pred) {

src/Data/String/CodePoints.purs

@@ -9,7 +9,7 @@ module Data.String.CodePoints
   , codePointFromInt
   , codePointToInt
   , codePointFromChar
-  , count
+  , countPrefix
   , drop
   , dropWhile
   , fromCodePointArray
@@ -168,14 +168,14 @@ codePointAtFallback n s = case uncons s of
 -- | time linear to the length of the string.
 -- |
 -- | ```purescript
--- | >>> count (\c -> codePointToInt c == 0x1D400) "𝐀𝐀 b c 𝐀"
+-- | >>> countPrefix (\c -> codePointToInt c == 0x1D400) "𝐀𝐀 b c 𝐀"
 -- | 2
 -- | ```
 -- |
-count :: (CodePoint -> Boolean) -> String -> Int
-count = _count countFallback unsafeCodePointAt0
+countPrefix :: (CodePoint -> Boolean) -> String -> Int
+countPrefix = _countPrefix countFallback unsafeCodePointAt0
 
-foreign import _count
+foreign import _countPrefix
   :: ((CodePoint -> Boolean) -> String -> Int)
   -> (String -> CodePoint)
   -> (CodePoint -> Boolean)
@@ -217,7 +217,7 @@ drop n s = String.drop (String.length (take n s)) s
 -- | ```
 -- |
 dropWhile :: (CodePoint -> Boolean) -> String -> String
-dropWhile p s = drop (count p s) s
+dropWhile p s = drop (countPrefix p s) s
 
 
 -- | Creates a string from an array of code points. Operates in space and time
@@ -402,7 +402,7 @@ takeFallback n s = case uncons s of
 -- | ```
 -- |
 takeWhile :: (CodePoint -> Boolean) -> String -> String
-takeWhile p s = take (count p s) s
+takeWhile p s = take (countPrefix p s) s
 
 
 -- | Creates an array of code points from a string. Operates in space and time

src/Data/String/NonEmpty.purs

@@ -41,7 +41,7 @@ module Data.String.NonEmpty
   , dropWhile
   , stripPrefix
   , stripSuffix
-  , count
+  , countPrefix
   , splitAt
   , toLower
   , toUpper
@@ -409,10 +409,10 @@ dropRight i (NonEmptyString s)
 -- | for which the predicate holds.
 -- |
 -- | ```purescript
--- | count (_ /= 'o') (NonEmptyString "Hello World") == 4
+-- | countPrefix (_ /= 'o') (NonEmptyString "Hello World") == 4
 -- | ```
-count :: (Char -> Boolean) -> NonEmptyString -> Int
-count = liftS <<< String.count
+countPrefix :: (Char -> Boolean) -> NonEmptyString -> Int
+countPrefix = liftS <<< String.countPrefix
 
 -- | Returns the substrings of a split at the given index, if the index is
 -- | within bounds.

test/Test/Data/String.purs

@@ -160,11 +160,11 @@ testString = do
   assert $ dropRight 3 "ab" == ""
   assert $ dropRight (-1) "ab" == "ab"
 
-  log "count"
-  assert $ count (_ == 'a') "" == 0
-  assert $ count (_ == 'a') "ab" == 1
-  assert $ count (_ == 'a') "aaab" == 3
-  assert $ count (_ == 'a') "abaa" == 1
+  log "countPrefix"
+  assert $ countPrefix (_ == 'a') "" == 0
+  assert $ countPrefix (_ == 'a') "ab" == 1
+  assert $ countPrefix (_ == 'a') "aaab" == 3
+  assert $ countPrefix (_ == 'a') "abaa" == 1
 
   log "split"
   assert $ split (Pattern "") "" == []

test/Test/Data/String/CodePoints.purs

@@ -41,12 +41,12 @@ testStringCodePoints = do
   assert $ Just (codePointFromChar $ fromCharCode 0) == codePointFromInt 0
   assert $ Just (codePointFromChar $ fromCharCode 0xFFFF) == codePointFromInt 0xFFFF
 
-  log "count"
-  assert $ count (\_ -> true) "" == 0
-  assert $ count (\_ -> false) str == 0
-  assert $ count (\_ -> true) str == 7
-  assert $ count (\x -> codePointToInt x < 0xFFFF) str == 4
-  assert $ count (\x -> codePointToInt x < 0xDC00) str == 1
+  log "countPrefix"
+  assert $ countPrefix (\_ -> true) "" == 0
+  assert $ countPrefix (\_ -> false) str == 0
+  assert $ countPrefix (\_ -> true) str == 7
+  assert $ countPrefix (\x -> codePointToInt x < 0xFFFF) str == 4
+  assert $ countPrefix (\x -> codePointToInt x < 0xDC00) str == 1
 
   log "drop"
   assert $ drop (-1) str == str

test/Test/Data/String/NonEmpty.purs

@@ -201,11 +201,11 @@ testNonEmptyString = do
   assert $ dropRight 3 (nes "ab") == Nothing
   assert $ dropRight (-1) (nes "ab") == Just (nes "ab")
 
-  log "count"
-  assert $ count (_ == 'a') (nes "ab") == 1
-  assert $ count (_ == 'a') (nes "aaab") == 3
-  assert $ count (_ == 'a') (nes "abaa") == 1
-  assert $ count (_ == 'c') (nes "abaa") == 0
+  log "countPrefix"
+  assert $ countPrefix (_ == 'a') (nes "ab") == 1
+  assert $ countPrefix (_ == 'a') (nes "aaab") == 3
+  assert $ countPrefix (_ == 'a') (nes "abaa") == 1
+  assert $ countPrefix (_ == 'c') (nes "abaa") == 0
 
   log "splitAt"
   let