#11, use newer foundation features

ndmitchell · Jul 5, 2017 · 16a3440 · 16a3440
1 parent 60eed19
commit 16a3440
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 28 deletions.
diff --git a/str/Str-Foundation-Unsafe.hs b/str/Str-Foundation-Unsafe.hs
@@ -1,8 +1,7 @@
-{-# LANGUAGE ViewPatterns #-}
 
 module Str(
     Str,
-    linesCR, stripPrefix,
+    linesCR, S.stripPrefix,
     readFileUTF8,
     S.null, S.isPrefixOf, S.drop, S.span, S.length, S.toList, S.all, S.uncons,
     ugly
@@ -11,27 +10,16 @@ module Str(
 import qualified Foundation as S
 import qualified Foundation.String as S
 import qualified Foundation.IO as S
-import qualified Foundation.Conduit as C
-import qualified Foundation.Conduit.Textual as C
 import Data.Tuple.Extra
 
 
 type Str = S.String
 
-stripPrefix :: Str -> Str -> Maybe Str
-stripPrefix (S.toBytes S.UTF8 -> pre) (S.toBytes S.UTF8 -> x) =
-    if pre `S.isPrefixOf` x then Just $ S.fromBytesUnsafe $ S.drop (S.length pre) x else Nothing
-
-removeR :: Str -> Str
-removeR s | Just (s, c) <- S.unsnoc s, c == '\r' = s
-          | otherwise = s
-
 linesCR :: Str -> [Str]
-linesCR s = map removeR $ C.runConduitPure (C.yield s C..| C.lines C..| C.sinkList)
+linesCR = S.lines
 
 ugly :: S.Integral a => Integer -> a
 ugly = S.fromInteger
 
-
 readFileUTF8 :: FilePath -> IO Str
 readFileUTF8 = fmap S.fromBytesUnsafe . S.readFile . S.fromString
diff --git a/str/Str-Foundation.hs b/str/Str-Foundation.hs
@@ -1,8 +1,7 @@
-{-# LANGUAGE ViewPatterns #-}
 
 module Str(
     Str,
-    linesCR, stripPrefix,
+    linesCR, S.stripPrefix,
     readFileUTF8,
     S.null, S.isPrefixOf, S.drop, S.span, S.length, S.toList, S.all, S.uncons,
     ugly
@@ -11,27 +10,16 @@ module Str(
 import qualified Foundation as S
 import qualified Foundation.String as S
 import qualified Foundation.IO as S
-import qualified Foundation.Conduit as C
-import qualified Foundation.Conduit.Textual as C
 import Data.Tuple.Extra
 
 
 type Str = S.String
 
-stripPrefix :: Str -> Str -> Maybe Str
-stripPrefix (S.toBytes S.UTF8 -> pre) (S.toBytes S.UTF8 -> x) =
-    if pre `S.isPrefixOf` x then Just $ S.fromBytesUnsafe $ S.drop (S.length pre) x else Nothing
-
-removeR :: Str -> Str
-removeR s | Just (s, c) <- S.unsnoc s, c == '\r' = s
-          | otherwise = s
-
 linesCR :: Str -> [Str]
-linesCR s = map removeR $ C.runConduitPure (C.yield s C..| C.lines C..| C.sinkList)
+linesCR = S.lines
 
 ugly :: S.Integral a => Integer -> a
 ugly = S.fromInteger
 
-
 readFileUTF8 :: FilePath -> IO Str
 readFileUTF8 = fmap (fst3 . S.fromBytes S.UTF8) . S.readFile . S.fromString