d16fa34 · typeable/yaml

git.iko.soy/typeable/yaml

on master help sign in

Reorder imports

d16fa34Matej Kollar11 years ago

Data/Yaml.hs+9−9

compare with master

unifiedsplit

@@ -53,31 +53,31 @@ module Data.Yaml

53 , decodeHelper

54 ) where

56−import qualified Text.Libyaml as Y

56+import Control.Applicative((<$>))

57+import Control.Exception

58+import Control.Monad.Trans.Resource (runResourceT)

57import Data.Aeson

59import Data.Aeson

58 ( Value (..), ToJSON (..), FromJSON (..), object

60 ( Value (..), ToJSON (..), FromJSON (..), object

59 , (.=) , (.:) , (.:?) , (.!=)

61 , (.=) , (.:) , (.:?) , (.!=)

60 , Object, Array

62 , Object, Array

61 )

63 )

64+import Data.Aeson.Encode (encodeToTextBuilder)

62import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)

65import Data.Aeson.Types (Pair, parseMaybe, parseEither, Parser)

63−import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)

64import Data.ByteString (ByteString)

66import Data.ByteString (ByteString)

65−import System.IO.Unsafe (unsafePerformIO)

66−import Control.Exception

67import qualified Data.Conduit as C

68import qualified Data.Conduit.List as CL

69−import qualified Data.Vector as V

70−import Data.Text.Encoding (encodeUtf8)

71import qualified Data.HashMap.Strict as M

69import qualified Data.HashMap.Strict as M

72import qualified Data.HashSet as HashSet

70import qualified Data.HashSet as HashSet

71+import Data.Text.Encoding (encodeUtf8)

73import qualified Data.Text.Encoding as TE

72import qualified Data.Text.Encoding as TE

74import qualified Data.Text.Lazy as TL

73import qualified Data.Text.Lazy as TL

75import Data.Text.Lazy.Builder (toLazyText)

74import Data.Text.Lazy.Builder (toLazyText)

76−import Data.Aeson.Encode (encodeToTextBuilder)

75+import qualified Data.Vector as V

77−import Control.Monad.Trans.Resource (runResourceT)

76+import System.IO.Unsafe (unsafePerformIO)

78−import Control.Applicative((<$>))

80import Data.Yaml.Internal

78import Data.Yaml.Internal

79+import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)

80+import qualified Text.Libyaml as Y

82encode :: ToJSON a => a -> ByteString

83encode obj = unsafePerformIO $

Data/Yaml/Builder.hs+14−12

@@ -18,24 +18,26 @@ module Data.Yaml.Builder

18 , (.=)

19 ) where

21−import Data.Conduit

21+import Prelude hiding (null)

22−import Data.ByteString (ByteString)

22+

23−import Text.Libyaml

23+import Control.Arrow (second)

24−import Data.Yaml.Internal

24+import Control.Monad.Trans.Resource (runResourceT)

25−import Data.Text (Text)

25+import Data.Aeson.Encode (encodeToTextBuilder)

26−import Data.Scientific (Scientific)

27import Data.Aeson.Types (Value(..))

26import Data.Aeson.Types (Value(..))

27+import Data.ByteString (ByteString)

28+import qualified Data.ByteString.Char8 as S8

29+import Data.Conduit

28import qualified Data.HashSet as HashSet

30import qualified Data.HashSet as HashSet

31+import Data.Scientific (Scientific)

32+import Data.Text (Text)

29import Data.Text.Encoding (encodeUtf8)

33import 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)

34import qualified Data.Text.Encoding as TE

35import qualified Data.Text.Lazy as TL

36import Data.Text.Lazy.Builder (toLazyText)

37−import Data.Aeson.Encode (encodeToTextBuilder)

37+import System.IO.Unsafe (unsafePerformIO)

38−import Prelude hiding (null)

38+

39+import Data.Yaml.Internal

40+import Text.Libyaml

40(.=) :: ToYaml a => Text -> a -> (Text, YamlBuilder)

42(.=) :: ToYaml a => Text -> a -> (Text, YamlBuilder)

41k .= v = (k, toYaml v)

43k .= v = (k, toYaml v)

Data/Yaml/Include.hs+6−5

@@ -1,17 +1,18 @@

1{-# LANGUAGE RankNTypes #-}

2module Data.Yaml.Include (decodeFile, decodeFileEither) where

4−import Control.Monad (when)

5import Control.Exception (throwIO)

4import Control.Exception (throwIO)

5+import Control.Monad (when)

6import Control.Monad.IO.Class (liftIO)

7import Control.Monad.Trans.Resource (MonadResource)

8−import System.Directory

9−import System.FilePath

10−import Data.Text (unpack)

11−import Data.Text.Encoding (decodeUtf8)

12import Data.Aeson (FromJSON)

8import Data.Aeson (FromJSON)

13import Data.Conduit

9import Data.Conduit

14import qualified Data.Conduit.List as CL

10import 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+

15import Data.Yaml.Internal (ParseException(..), decodeHelper_, decodeHelper)

16import Data.Yaml.Internal (ParseException(..), decodeHelper_, decodeHelper)

16import Text.Libyaml hiding (decodeFile)

17import Text.Libyaml hiding (decodeFile)

17import qualified Text.Libyaml as Y

18import qualified Text.Libyaml as Y

Data/Yaml/Internal.hs+20−19

@@ -13,35 +13,36 @@ module Data.Yaml.Internal

13 , isNumeric

14 ) where

16−import qualified Text.Libyaml as Y

16+#if !MIN_VERSION_base(4,8,0)

17−import Data.Aeson

17+import Control.Applicative ((<$>), Applicative(..))

18−import Data.Aeson.Types hiding (parse)

18+#endif

19−import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)

20−import Data.ByteString (ByteString)

21−import qualified Data.Map as Map

22import Control.Exception

19import Control.Exception

23import Control.Exception.Enclosed

20import 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)

24import Control.Monad.Trans.State

25import 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)

25import qualified Data.Conduit as C

31import qualified Data.Conduit as C

26import qualified Data.Conduit.List as CL

32import qualified Data.Conduit.List as CL

27−import Control.Monad.Trans.Class (MonadTrans, lift)

33+import qualified Data.HashMap.Strict as M

28−import Control.Monad.IO.Class (MonadIO, liftIO)

34+import qualified Data.HashSet as HashSet

29−import Control.Monad (liftM, ap, unless)

35+import qualified Data.Map as Map

30−#if !MIN_VERSION_base(4,8,0)

36+import Data.Scientific (Scientific)

31−import Control.Applicative ((<$>), Applicative(..))

32−#endif

33−import Data.Char (toUpper)

34−import qualified Data.Vector as V

35import Data.Text (Text, pack)

37import Data.Text (Text, pack)

36import qualified Data.Text as T

38import qualified Data.Text as T

37import Data.Text.Encoding (decodeUtf8With)

39import Data.Text.Encoding (decodeUtf8With)

38import Data.Text.Encoding.Error (lenientDecode)

40import Data.Text.Encoding.Error (lenientDecode)

39−import qualified Data.HashMap.Strict as M

40import Data.Typeable

41import Data.Typeable

41−import qualified Data.Attoparsec.Text as Atto

42+import qualified Data.Vector as V

42−import Data.Scientific (Scientific)

43+

43−import Control.Monad.Trans.Resource (ResourceT, runResourceT)

44+import qualified Text.Libyaml as Y

44−import qualified Data.HashSet as HashSet

45+import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile)

46data ParseException = NonScalarKey

47data ParseException = NonScalarKey

47 | UnknownAlias { _anchorName :: Y.AnchorName }

48 | UnknownAlias { _anchorName :: Y.AnchorName }

Data/Yaml/Parser.hs+10−9

@@ -5,16 +5,13 @@

5-- drastically, or be entirely removed, in a future release.

6module Data.Yaml.Parser where

8−import Text.Libyaml

9import Control.Applicative

8import Control.Applicative

10−#if !MIN_VERSION_base(4,8,0)

9+import Control.Exception (Exception)

11−import Data.Monoid (Monoid (..))

12−#endif

13import Control.Monad (MonadPlus (..), liftM, ap)

10import Control.Monad (MonadPlus (..), liftM, ap)

14−import Control.Monad.Trans.Writer.Strict (tell, WriterT)

15import Control.Monad.Trans.Class (lift)

11import Control.Monad.Trans.Class (lift)

16import Control.Monad.Trans.Resource (MonadThrow, monadThrow, runResourceT)

12import 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)

18import Data.Conduit

15import Data.Conduit

19#if MIN_VERSION_conduit(1,1,0)

16#if MIN_VERSION_conduit(1,1,0)

20import Data.Conduit.Lift (runWriterC)

17import Data.Conduit.Lift (runWriterC)

@@ -22,12 +19,16 @@ import Data.Conduit.Lift (runWriterC)

22#else

19#else

23import Data.Conduit.Lift (runWriterSC)

20import Data.Conduit.Lift (runWriterSC)

24#endif

21#endif

22+import qualified Data.Map as Map

23+#if !MIN_VERSION_base(4,8,0)

24+import Data.Monoid (Monoid (..))

25+#endif

25import Data.Text (Text, pack, unpack)

26import Data.Text (Text, pack, unpack)

26import Data.Text.Encoding (decodeUtf8)

27import Data.Text.Encoding (decodeUtf8)

27−import Data.ByteString (ByteString)

28−import Control.Exception (Exception)

29−import Data.Typeable (Typeable)

30import Data.Text.Read (signed, decimal)

28import Data.Text.Read (signed, decimal)

29+import Data.Typeable (Typeable)

30+

31+import Text.Libyaml

32newtype YamlParser a = YamlParser

33newtype YamlParser a = YamlParser

33 { unYamlParser :: AnchorMap -> Either Text a

34 { unYamlParser :: AnchorMap -> Either Text a

Data/Yaml/Pretty.hs+9−7

@@ -9,17 +9,19 @@ module Data.Yaml.Pretty

9 , defConfig

10 ) where

12+import Prelude hiding (null)

13+

12import Control.Applicative ((<$>))

14import Control.Applicative ((<$>))

13−import Data.Yaml.Builder

14import Data.Aeson.Types

15import Data.Aeson.Types

15−import Data.Text (Text)

16+import Data.ByteString (ByteString)

16−import Data.Monoid

17−import qualified Data.Vector as V

18−import qualified Data.HashMap.Strict as HM

19import Data.Function (on)

17import Data.Function (on)

18+import qualified Data.HashMap.Strict as HM

20import Data.List (sortBy)

19import Data.List (sortBy)

21−import Data.ByteString (ByteString)

20+import Data.Monoid

22−import Prelude hiding (null)

21+import Data.Text (Text)

22+import qualified Data.Vector as V

23+

24+import Data.Yaml.Builder

24-- |

26-- |

25-- Since 0.8.13

27-- Since 0.8.13

Text/Libyaml.hs+10−10

@@ -29,12 +29,6 @@ module Text.Libyaml

30import Prelude hiding (pi)

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

38import Foreign.C

32import Foreign.C

39import Foreign.Ptr

33import Foreign.Ptr

40import Foreign.ForeignPtr

34import Foreign.ForeignPtr

@@ -42,16 +36,22 @@ import Foreign.ForeignPtr

42import Foreign.ForeignPtr.Unsafe

36import Foreign.ForeignPtr.Unsafe

43#endif

37#endif

44import Foreign.Marshal.Alloc

38import Foreign.Marshal.Alloc

45−import Data.Data

47−import Control.Monad.IO.Class

48−

49−import Control.Exception (mask_, throwIO, Exception, finally)

50#if !MIN_VERSION_base(4,8,0)

40#if !MIN_VERSION_base(4,8,0)

51import Control.Applicative

41import Control.Applicative

52#endif

42#endif

43+import Control.Exception (mask_, throwIO, Exception, finally)

44+import Control.Monad

45+import Control.Monad.IO.Class

53import Control.Monad.Trans.Resource

46import Control.Monad.Trans.Resource

54import Data.Conduit hiding (Source, Sink, Conduit)

47import 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

56data Event =

57 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

4import Control.Monad (when)

1import Control.Monad (when)

2+import qualified Data.Aeson as J

5import qualified Data.ByteString as S

3import qualified Data.ByteString as S

6import qualified Data.ByteString.Lazy as L

4import qualified Data.ByteString.Lazy as L

5+import System.Environment (getArgs)

7+import qualified Data.Yaml as Y

8main :: IO ()

9main :: IO ()

9main = do

10main = 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)

5import Prelude hiding (putStr, getContents)

1import Prelude hiding (putStr, getContents)

6−import Data.ByteString.Lazy (putStr)

3+import Data.Aeson (encode, Value)

7import Data.ByteString (getContents)

4import Data.ByteString (getContents)

5+import Data.ByteString.Lazy (putStr)

6+import System.Environment (getArgs)

7+import System.Exit

9+import Data.Yaml (decodeFileEither, decodeEither')

9helpMessage :: IO ()

11helpMessage :: IO ()

10helpMessage = putStrLn "yaml2json FILE\n use - as FILE to indicate stdin" >> exitFailure

12helpMessage = putStrLn "yaml2json FILE\n use - as FILE to indicate stdin" >> exitFailure