From 173b86de453e296273f4f07528619e272e25ca3c Mon Sep 17 00:00:00 2001 From: Stephen Diehl Date: Wed, 8 Jun 2016 23:02:57 -0400 Subject: [PATCH] Read actions for Strict text in scope by default. --- src/Base.hs | 2 +- src/Protolude.hs | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Base.hs b/src/Base.hs index 8be368503..67d6b14b3 100644 --- a/src/Base.hs +++ b/src/Base.hs @@ -9,7 +9,7 @@ module Base ( ($!), ) where --- Glorious Glashgow Haskell Compiler +-- Glorious Glasgow Haskell Compiler #if defined(__GLASGOW_HASKELL__) && ( __GLASGOW_HASKELL__ >= 600 ) -- Base GHC types diff --git a/src/Protolude.hs b/src/Protolude.hs index 8ec142b5b..54435ace8 100644 --- a/src/Protolude.hs +++ b/src/Protolude.hs @@ -31,16 +31,16 @@ import Conv as X import Panic as X import Base as Base hiding ( - putStr - , putStrLn - , print - , show - , error - , undefined + putStr -- Overriden by Show.putStr + , putStrLn -- Overriden by Show.putStrLn + , print -- Overriden by Protolude.print + , show -- Overriden by Protolude.show + , error -- Overriden by Debug.error + , undefined -- Overriden by Debug.undefined ) import qualified Base as PBase --- Used for 'show' +-- Used for 'show', not exported. import Data.String (String) -- Maybe'ized version of partial functions @@ -276,6 +276,12 @@ import Data.Text as X (Text) import qualified Data.Text.Lazy import qualified Data.Text.IO +import Data.Text.IO as X ( + getLine + , getContents + , interact + ) + import Data.Text.Lazy ( toStrict , fromStrict