c505144 · typeable/yaml

Data/Yaml/Internal.hs+2

compare with master

unifiedsplit

@@ -27,7 +27,9 @@ import qualified Data.Conduit.List as CL

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

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

29import Control.Monad (liftM, ap)

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

30import Control.Applicative (Applicative(..))

31import Control.Applicative (Applicative(..))

32+#endif

31import Data.Char (toUpper)

33import Data.Char (toUpper)

32import qualified Data.Vector as V

34import qualified Data.Vector as V

33import Data.Text (Text, pack)

35import Data.Text (Text, pack)

Data/Yaml/Parser.hs+3−1

@@ -6,8 +6,10 @@

6module Data.Yaml.Parser where

7

8import Text.Libyaml

9−import Control.Applicative ((<$>), Applicative (..), Alternative (..))

9+import Control.Applicative

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

10import Data.Monoid (Monoid (..))

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

12+#endif

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

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

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

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

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

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

Text/Libyaml.hs+2

@@ -49,7 +49,9 @@ import Data.Data

49import Control.Monad.IO.Class

50

51import Control.Exception (throwIO, Exception, finally)

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

52import Control.Applicative

53import Control.Applicative

54+#endif

53import Control.Monad.Trans.Resource

55import Control.Monad.Trans.Resource

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

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

55import Control.Exception (mask_)

57import Control.Exception (mask_)

exe/json2yaml.hs+1−2

@@ -6,14 +6,13 @@ import qualified Data.Yaml as Y

6import Control.Monad (when)

7import qualified Data.ByteString as S

8import qualified Data.ByteString.Lazy as L

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

10

9

11main :: IO ()

10main :: IO ()

12main = do

11main = do

13 args <- getArgs

12 args <- getArgs

14 when (length args > 2) $ error "Usage: json2yaml [in] [out]"

13 when (length args > 2) $ error "Usage: json2yaml [in] [out]"

15 let (input:output:_) = args ++ repeat "-"

14 let (input:output:_) = args ++ repeat "-"

16− mval <- J.decode <$>

15+ mval <- fmap J.decode $

17 case input of

16 case input of

18 "-" -> L.getContents

17 "-" -> L.getContents

19 _ -> L.readFile input

18 _ -> L.readFile input