Skip to content

Commit 6a728c3

Browse files
committed
Bring type of reverseIter in line with iter
1 parent 1db73d5 commit 6a728c3

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Data/Text.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,7 @@ takeWhileEnd p t@(Text arr off len) = loop (len-1) len
11631163
where loop !i !l | l <= 0 = t
11641164
| p c = loop (i+d) (l+d)
11651165
| otherwise = text arr (off+l) (len-l)
1166-
where (c,d) = reverseIter t i
1166+
where Iter c d = reverseIter t i
11671167
{-# INLINE [1] takeWhileEnd #-}
11681168

11691169
-- | /O(n)/ 'dropWhile' @p@ @t@ returns the suffix remaining after
@@ -1189,7 +1189,7 @@ dropWhileEnd p t@(Text arr off len) = loop (len-1) len
11891189
where loop !i !l | l <= 0 = empty
11901190
| p c = loop (i+d) (l+d)
11911191
| otherwise = Text arr off l
1192-
where (c,d) = reverseIter t i
1192+
where Iter c d = reverseIter t i
11931193
{-# INLINE [1] dropWhileEnd #-}
11941194

11951195
-- | /O(n)/ 'dropAround' @p@ @t@ returns the substring remaining after

src/Data/Text/Unsafe.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ iter_ (Text arr off _len) i | m < 0xD800 || m > 0xDBFF = 1
8989
-- | /O(1)/ Iterate one step backwards through a UTF-16 array,
9090
-- returning the current character and the delta to add (i.e. a
9191
-- negative number) to give the next offset to iterate at.
92-
reverseIter :: Text -> Int -> (Char,Int)
92+
reverseIter :: Text -> Int -> Iter
9393
reverseIter (Text arr off _len) i
94-
| m < 0xDC00 || m > 0xDFFF = (unsafeChr m, -1)
95-
| otherwise = (chr2 n m, -2)
94+
| m < 0xDC00 || m > 0xDFFF = Iter (unsafeChr m) (-1)
95+
| otherwise = Iter (chr2 n m) (-2)
9696
where m = A.unsafeIndex arr j
9797
n = A.unsafeIndex arr k
9898
j = off + i

0 commit comments

Comments
 (0)