Browse Source

A bit more cleaning up imports

Getty Ritter 10 years ago
parent
commit
cdd8813c89
3 changed files with 31 additions and 12 deletions
  1. 10 3
      Data/SCargot/Basic.hs
  2. 12 5
      Data/SCargot/Comments.hs
  3. 9 4
      Data/SCargot/General.hs

+ 10 - 3
Data/SCargot/Basic.hs

@@ -12,11 +12,18 @@ module Data.SCargot.Basic
 
 import           Control.Applicative ((<$>))
 import           Data.Char (isAlphaNum)
-import           Text.Parsec -- (Parser, takeWhile1)
+import           Text.Parsec (many1, satisfy)
 import           Data.Text (Text, pack)
 
-import           Data.SCargot.Repr.Basic
-import           Data.SCargot.General
+import           Data.SCargot.Repr.Basic (SExpr)
+import           Data.SCargot.General ( SExprSpec
+                                      , mkSpec
+                                      , asRich
+                                      , asWellFormed
+                                      , addReader
+                                      , setComment
+                                      , withQuote
+                                      )
 import           Data.SCargot.Comments (withLispComments)
 
 isAtomChar :: Char -> Bool

+ 12 - 5
Data/SCargot/Comments.hs

@@ -26,11 +26,18 @@ module Data.SCargot.Comments
 
 import           Control.Monad (void)
 import           Data.Text (Text)
-import           Text.Parsec
-
-import           Prelude hiding (takeWhile)
-
-import Data.SCargot.General
+import           Text.Parsec ( (<|>)
+                             , anyChar
+                             , manyTill
+                             , noneOf
+                             , skipMany
+                             , string
+                             )
+
+import Data.SCargot.General ( Comment
+                            , SExprSpec
+                            , setComment
+                            )
 
 -- | Given a string, produce a comment parser that matches that
 --   initial string and ignores everything until the end of the

+ 9 - 4
Data/SCargot/General.hs

@@ -31,11 +31,16 @@ import           Data.Monoid ((<>))
 import           Data.String (IsString)
 import           Data.Text (Text, pack, unpack)
 import qualified Data.Text as T
-import           Text.Parsec
+import           Text.Parsec ( (<|>)
+                             , char
+                             , eof
+                             , lookAhead
+                             , many1
+                             , runParser
+                             , skipMany
+                             )
 import           Text.Parsec.Char (anyChar, space)
-import           Text.Parsec.Text
-
-import           Prelude hiding (takeWhile)
+import           Text.Parsec.Text (Parser)
 
 import           Data.SCargot.Repr