f81a471 · text · git.iko.soy

git.iko.soy/text

on master help sign in

Fix uses of errorEmptyList to have correct module names

f81a471Bryan O'Sullivan18 years ago

Data/Text.hs+5−3

compare with master

unifiedsplit

@@ -52,7 +52,7 @@ module Data.Text

52 ) where

54import Prelude (Char,Bool,Int,Maybe,String,

55− Eq,(==),

55+ Eq,(==),(++),error,

56 Show,showsPrec,

57 Read,readsPrec,

58 (&&),(||),(+),(-),($),(<),(>),(<=),(>=),(.),(>>=),

@@ -72,8 +72,7 @@ import Data.String (IsString(..))

73import qualified Data.Text.Fusion as S

74import Data.Text.Fusion (Stream(..),Step(..),Encoding(..),

75− stream,unstream,stream_bs,unstream_bs,restream,

75+ stream,unstream,stream_bs,unstream_bs,restream)

76− errorEmptyList)

77import Data.Text.Internal(Text(..),empty)

76import Data.Text.Internal(Text(..),empty)

78import qualified Prelude as P

77import qualified Prelude as P

79import Data.Text.UnsafeChar(unsafeChr)

78import Data.Text.UnsafeChar(unsafeChr)

@@ -525,3 +524,6 @@ words (Text arr off len) = loop0 off off

525 where

524 where

526 c = arr `unsafeAt` n

525 c = arr `unsafeAt` n

527{-# INLINE words #-}

526{-# INLINE words #-}

527+

528+errorEmptyList :: String -> a

529+errorEmptyList fun = error ("Data.Text." ++ fun ++ ": empty list")

Data/Text/Fusion.hs+1−3

@@ -10,7 +10,6 @@ module Data.Text.Fusion

10 , stream_bs

11 , unstream_bs

12 , restream

13− , errorEmptyList

14 , eq

13 , eq

15 , cons

14 , cons

16 , snoc

15 , snoc

@@ -939,5 +938,4 @@ zipWith f (Stream next0 sa0 len1) (Stream next1 sb0 len2) = Stream next (sa0 :!:

939{-# INLINE [0] zipWith #-}

938{-# INLINE [0] zipWith #-}

940

939

941errorEmptyList :: String -> a

940errorEmptyList :: String -> a

942−errorEmptyList fun =

941+errorEmptyList fun = error ("Data.Text.Fusion." ++ fun ++ ": empty list")

943− error ("Prelude." ++ fun ++ ": empty list")