From 26d679e25775db94762b1bd583497268d849b240 Mon Sep 17 00:00:00 2001
From: Stephen Diehl <stephen.m.diehl@gmail.com>
Date: Wed, 13 Apr 2016 16:12:55 -0400
Subject: [PATCH] explicit base types, IsString export, Proxy

---
 src/Base.hs      | 23 ++++++++++++++++-------
 src/Protolude.hs | 16 ++++++++++++----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/Base.hs b/src/Base.hs
index 280c7b11f..791592322 100644
--- a/src/Base.hs
+++ b/src/Base.hs
@@ -16,17 +16,21 @@ import GHC.Num as X
 import GHC.Enum as X
 import GHC.Real as X
 import GHC.Float as X
-import GHC.Show as X
+import GHC.Show as X (
+    Show(..)
+  )
 import GHC.Exts as X (
     Constraint
   , Ptr
   , FunPtr
-  , the
   )
 import GHC.Base as X (
     (++)
   , seq
   , asTypeOf
+  , ord
+  , maxInt
+  , minInt
   )
 import System.IO as X (
     print
@@ -34,11 +38,15 @@ import System.IO as X (
   , putStrLn
   )
 
-#if ( __GLASGOW_HASKELL__ >= 800 )
-import GHC.Types as X hiding (Any)
-#else
-import GHC.Types as X
-#endif
+import GHC.Types as X (
+    Bool
+  , Char
+  , Int
+  , Word
+  , Ordering
+  , IO
+  , Coercible
+  )
 
 infixr 0 $!
 
@@ -47,6 +55,7 @@ f $! x  = let !vx = x in f vx
 
 #endif
 
+
 -- Simple Haskell Compiler
 #if defined(__SHC_HASKELL__)
 
diff --git a/src/Protolude.hs b/src/Protolude.hs
index 04bddec92..1ccbf0978 100644
--- a/src/Protolude.hs
+++ b/src/Protolude.hs
@@ -16,8 +16,6 @@ module Protolude (
   LByteString,
 ) where
 
-{-import qualified Prelude as P-}
-
 import List as X
 import Show as X
 import Bool as X
@@ -130,6 +128,9 @@ import Data.Set as X (Set)
 import Data.Sequence as X (Seq)
 import Data.IntMap as X (IntMap)
 import Data.IntSet as X (IntSet)
+import Data.Proxy as X (
+    Proxy(..)
+  )
 
 -- Monad transformers
 import Control.Monad.State as X (
@@ -183,10 +184,15 @@ import Data.Int as X
 import Data.Bits as X
 import Data.Word as X
 import Data.Bool as X hiding (bool)
-import Data.Char as X (Char)
+import Data.Char as X (chr)
 import Data.Maybe as X hiding (fromJust)
 import Data.Either as X
 import Data.Complex as X
+import Data.Void as X (
+    Void
+  , absurd
+  , vacuous
+  )
 
 import Data.Function as X (
     const
@@ -197,7 +203,6 @@ import Data.Function as X (
   , on
   )
 
-
 -- Genericss
 import GHC.Generics (
     Generic(..)
@@ -239,6 +244,8 @@ import Data.String.Conv as X (
   , StringConv
   )
 
+import Data.String as X (IsString)
+
 -- Printf
 import Text.Printf as X (
     PrintfArg
@@ -248,6 +255,7 @@ import Text.Printf as X (
 
 -- IO
 import System.Exit as X
+--import System.Info as X
 import System.Environment as X (getArgs)
 import System.IO as X (
     Handle