git.iko.soy/typeable/yaml
on master help sign in
Reorder imports

(mostly sort)

commitd16fa340544a7447e47905a6e70999f5c0ac1d2e authorMatej Kollar <208115@mail.muni.cz> dateSun 6 Sep 2015, 17:51 (11 years ago) parentc0c7d39
9 files changed+89−79
compare with master
unifiedsplit
Data/Yaml.hs+9−9 Data/Yaml/Builder.hs+14−12 Data/Yaml/Include.hs+6−5 Data/Yaml/Internal.hs+20−19 Data/Yaml/Parser.hs+10−9 Data/Yaml/Pretty.hs+9−7 Text/Libyaml.hs+10−10 exe/json2yaml.hs+4−3 exe/yaml2json.hs+7−5
Data/Yaml.hs+9−9
@@ -53,31 +53,31 @@ module Data.Yaml
5353 , decodeHelper
5454 ) where
5555
56−import qualified Text.Libyaml as Y
56+import Control.Applicative((<$>))
57+import Control.Exception
58+import Control.Monad.Trans.Resource (runResourceT)
5759import Data.Aeson
5860 ( Value (..), ToJSON (..), FromJSON (..), object
5961 , (.=) , (.:) , (.:?) , (.!=)
6062 , Object, Array
6163 )
64+import Data.Aeson.Encode (encodeToTextBuilder)
6265import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)
63−import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
6466import Data.ByteString (ByteString)
65−import System.IO.Unsafe (unsafePerformIO)
66−import Control.Exception
6767import qualified Data.Conduit as C
6868import qualified Data.Conduit.List as CL
69−import qualified Data.Vector as V
70−import Data.Text.Encoding (encodeUtf8)
7169import qualified Data.HashMap.Strict as M
7270import qualified Data.HashSet as HashSet
71+import Data.Text.Encoding (encodeUtf8)
7372import qualified Data.Text.Encoding as TE
7473import qualified Data.Text.Lazy as TL
7574import Data.Text.Lazy.Builder (toLazyText)
76−import Data.Aeson.Encode (encodeToTextBuilder)
77−import Control.Monad.Trans.Resource (runResourceT)
78−import Control.Applicative((<$>))
75+import qualified Data.Vector as V
76+import System.IO.Unsafe (unsafePerformIO)
7977
8078import Data.Yaml.Internal
79+import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
80+import qualified Text.Libyaml as Y
8181
8282encode :: ToJSON a => a -> ByteString
8383encode obj = unsafePerformIO $
Data/Yaml/Builder.hs+14−12
@@ -18,24 +18,26 @@ module Data.Yaml.Builder
1818 , (.=)
1919 ) where
2020
21−import Data.Conduit
22−import Data.ByteString (ByteString)
23−import Text.Libyaml
24−import Data.Yaml.Internal
25−import Data.Text (Text)
26−import Data.Scientific (Scientific)
21+import Prelude hiding (null)
22+
23+import Control.Arrow (second)
24+import Control.Monad.Trans.Resource (runResourceT)
25+import Data.Aeson.Encode (encodeToTextBuilder)
2726import Data.Aeson.Types (Value(..))
27+import Data.ByteString (ByteString)
28+import qualified Data.ByteString.Char8 as S8
29+import Data.Conduit
2830import qualified Data.HashSet as HashSet
31+import Data.Scientific (Scientific)
32+import Data.Text (Text)
2933import Data.Text.Encoding (encodeUtf8)
30−import System.IO.Unsafe (unsafePerformIO)
31−import Control.Arrow (second)
32−import qualified Data.ByteString.Char8 as S8
33−import Control.Monad.Trans.Resource (runResourceT)
3434import qualified Data.Text.Encoding as TE
3535import qualified Data.Text.Lazy as TL
3636import Data.Text.Lazy.Builder (toLazyText)
37−import Data.Aeson.Encode (encodeToTextBuilder)
38−import Prelude hiding (null)
37+import System.IO.Unsafe (unsafePerformIO)
38+
39+import Data.Yaml.Internal
40+import Text.Libyaml
3941
4042(.=) :: ToYaml a => Text -> a -> (Text, YamlBuilder)
4143k .= v = (k, toYaml v)
Data/Yaml/Include.hs+6−5
@@ -1,17 +1,18 @@
11{-# LANGUAGE RankNTypes #-}
22module Data.Yaml.Include (decodeFile, decodeFileEither) where
33
4−import Control.Monad (when)
54import Control.Exception (throwIO)
5+import Control.Monad (when)
66import Control.Monad.IO.Class (liftIO)
77import Control.Monad.Trans.Resource (MonadResource)
8−import System.Directory
9−import System.FilePath
10−import Data.Text (unpack)
11−import Data.Text.Encoding (decodeUtf8)
128import Data.Aeson (FromJSON)
139import Data.Conduit
1410import qualified Data.Conduit.List as CL
11+import Data.Text (unpack)
12+import Data.Text.Encoding (decodeUtf8)
13+import System.Directory
14+import System.FilePath
15+
1516import Data.Yaml.Internal (ParseException(..), decodeHelper_, decodeHelper)
1617import Text.Libyaml hiding (decodeFile)
1718import qualified Text.Libyaml as Y
Data/Yaml/Internal.hs+20−19
@@ -13,35 +13,36 @@ module Data.Yaml.Internal
1313 , isNumeric
1414 ) where
1515
16−import qualified Text.Libyaml as Y
17−import Data.Aeson
18−import Data.Aeson.Types hiding (parse)
19−import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
20−import Data.ByteString (ByteString)
21−import qualified Data.Map as Map
16+#if !MIN_VERSION_base(4,8,0)
17+import Control.Applicative ((<$>), Applicative(..))
18+#endif
2219import Control.Exception
2320import Control.Exception.Enclosed
21+import Control.Monad (liftM, ap, unless)
22+import Control.Monad.IO.Class (MonadIO, liftIO)
23+import Control.Monad.Trans.Class (MonadTrans, lift)
24+import Control.Monad.Trans.Resource (ResourceT, runResourceT)
2425import Control.Monad.Trans.State
26+import Data.Aeson
27+import Data.Aeson.Types hiding (parse)
28+import qualified Data.Attoparsec.Text as Atto
29+import Data.ByteString (ByteString)
30+import Data.Char (toUpper)
2531import qualified Data.Conduit as C
2632import qualified Data.Conduit.List as CL
27−import Control.Monad.Trans.Class (MonadTrans, lift)
28−import Control.Monad.IO.Class (MonadIO, liftIO)
29−import Control.Monad (liftM, ap, unless)
30−#if !MIN_VERSION_base(4,8,0)
31−import Control.Applicative ((<$>), Applicative(..))
32−#endif
33−import Data.Char (toUpper)
34−import qualified Data.Vector as V
33+import qualified Data.HashMap.Strict as M
34+import qualified Data.HashSet as HashSet
35+import qualified Data.Map as Map
36+import Data.Scientific (Scientific)
3537import Data.Text (Text, pack)
3638import qualified Data.Text as T
3739import Data.Text.Encoding (decodeUtf8With)
3840import Data.Text.Encoding.Error (lenientDecode)
39−import qualified Data.HashMap.Strict as M
4041import Data.Typeable
41−import qualified Data.Attoparsec.Text as Atto
42−import Data.Scientific (Scientific)
43−import Control.Monad.Trans.Resource (ResourceT, runResourceT)
44−import qualified Data.HashSet as HashSet
42+import qualified Data.Vector as V
43+
44+import qualified Text.Libyaml as Y
45+import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)
4546
4647data ParseException = NonScalarKey
4748 | UnknownAlias { _anchorName :: Y.AnchorName }
Data/Yaml/Parser.hs+10−9
@@ -5,16 +5,13 @@
55-- drastically, or be entirely removed, in a future release.
66module Data.Yaml.Parser where
77
8−import Text.Libyaml
98import Control.Applicative
10−#if !MIN_VERSION_base(4,8,0)
11−import Data.Monoid (Monoid (..))
12−#endif
9+import Control.Exception (Exception)
1310import Control.Monad (MonadPlus (..), liftM, ap)
14−import Control.Monad.Trans.Writer.Strict (tell, WriterT)
1511import Control.Monad.Trans.Class (lift)
1612import Control.Monad.Trans.Resource (MonadThrow, monadThrow, runResourceT)
17−import qualified Data.Map as Map
13+import Control.Monad.Trans.Writer.Strict (tell, WriterT)
14+import Data.ByteString (ByteString)
1815import Data.Conduit
1916#if MIN_VERSION_conduit(1,1,0)
2017import Data.Conduit.Lift (runWriterC)
@@ -22,12 +19,16 @@ import Data.Conduit.Lift (runWriterC)
2219#else
2320import Data.Conduit.Lift (runWriterSC)
2421#endif
22+import qualified Data.Map as Map
23+#if !MIN_VERSION_base(4,8,0)
24+import Data.Monoid (Monoid (..))
25+#endif
2526import Data.Text (Text, pack, unpack)
2627import Data.Text.Encoding (decodeUtf8)
27−import Data.ByteString (ByteString)
28−import Control.Exception (Exception)
29−import Data.Typeable (Typeable)
3028import Data.Text.Read (signed, decimal)
29+import Data.Typeable (Typeable)
30+
31+import Text.Libyaml
3132
3233newtype YamlParser a = YamlParser
3334 { unYamlParser :: AnchorMap -> Either Text a
Data/Yaml/Pretty.hs+9−7
@@ -9,17 +9,19 @@ module Data.Yaml.Pretty
99 , defConfig
1010 ) where
1111
12+import Prelude hiding (null)
13+
1214import Control.Applicative ((<$>))
13−import Data.Yaml.Builder
1415import Data.Aeson.Types
15−import Data.Text (Text)
16−import Data.Monoid
17−import qualified Data.Vector as V
18−import qualified Data.HashMap.Strict as HM
16+import Data.ByteString (ByteString)
1917import Data.Function (on)
18+import qualified Data.HashMap.Strict as HM
2019import Data.List (sortBy)
21−import Data.ByteString (ByteString)
22−import Prelude hiding (null)
20+import Data.Monoid
21+import Data.Text (Text)
22+import qualified Data.Vector as V
23+
24+import Data.Yaml.Builder
2325
2426-- |
2527-- Since 0.8.13
Text/Libyaml.hs+10−10
@@ -29,12 +29,6 @@ module Text.Libyaml
2929
3030import Prelude hiding (pi)
3131
32−import qualified Data.ByteString.Internal as B
33−import qualified Data.ByteString.Char8 as B8
34−import qualified Data.ByteString
35−import qualified Data.ByteString.Unsafe as BU
36−import Data.ByteString (ByteString, packCStringLen)
37−import Control.Monad
3832import Foreign.C
3933import Foreign.Ptr
4034import Foreign.ForeignPtr
@@ -42,16 +36,22 @@ import Foreign.ForeignPtr
4236import Foreign.ForeignPtr.Unsafe
4337#endif
4438import Foreign.Marshal.Alloc
45−import Data.Data
4639
47−import Control.Monad.IO.Class
48−
49−import Control.Exception (mask_, throwIO, Exception, finally)
5040#if !MIN_VERSION_base(4,8,0)
5141import Control.Applicative
5242#endif
43+import Control.Exception (mask_, throwIO, Exception, finally)
44+import Control.Monad
45+import Control.Monad.IO.Class
5346import Control.Monad.Trans.Resource
5447import Data.Conduit hiding (Source, Sink, Conduit)
48+import Data.Data
49+
50+import Data.ByteString (ByteString, packCStringLen)
51+import qualified Data.ByteString
52+import qualified Data.ByteString.Char8 as B8
53+import qualified Data.ByteString.Internal as B
54+import qualified Data.ByteString.Unsafe as BU
5555
5656data Event =
5757 EventStreamStart
exe/json2yaml.hs+4−3
@@ -1,9 +1,10 @@
1−import System.Environment (getArgs)
2−import qualified Data.Aeson as J
3−import qualified Data.Yaml as Y
41import Control.Monad (when)
2+import qualified Data.Aeson as J
53import qualified Data.ByteString as S
64import qualified Data.ByteString.Lazy as L
5+import System.Environment (getArgs)
6+
7+import qualified Data.Yaml as Y
78
89main :: IO ()
910main = do
exe/yaml2json.hs+7−5
@@ -1,10 +1,12 @@
1−import Data.Yaml (decodeFileEither, decodeEither')
2−import System.Environment (getArgs)
3−import System.Exit
4−import Data.Aeson (encode, Value)
51import Prelude hiding (putStr, getContents)
6−import Data.ByteString.Lazy (putStr)
2+
3+import Data.Aeson (encode, Value)
74import Data.ByteString (getContents)
5+import Data.ByteString.Lazy (putStr)
6+import System.Environment (getArgs)
7+import System.Exit
8+
9+import Data.Yaml (decodeFileEither, decodeEither')
810
911helpMessage :: IO ()
1012helpMessage = putStrLn "yaml2json FILE\n use - as FILE to indicate stdin" >> exitFailure