git.iko.soy/typeable/yaml
on master help sign in
conduit 1.0
dee4776Michael Snoyman
Text/Libyaml.hs+54−4
compare with master
unifiedsplit
@@ -8,6 +8,7 @@
8{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9{-# LANGUAGE RankNTypes #-}
9{-# LANGUAGE RankNTypes #-}
10{-# LANGUAGE CPP #-}
10{-# LANGUAGE CPP #-}
11+{-# LANGUAGE TypeFamilies #-}
11
12
12-- | Low-level, streaming YAML interface. For a higher-level interface, see
13-- | Low-level, streaming YAML interface. For a higher-level interface, see
13-- "Data.Yaml".
14-- "Data.Yaml".
@@ -464,7 +465,12 @@ newtype ToEventRawException = ToEventRawException CInt
464 deriving (Show, Typeable)
465 deriving (Show, Typeable)
465instance Exception ToEventRawException
466instance Exception ToEventRawException
466
467
467−decode :: MonadResource m => B.ByteString -> GSource m Event
468+decode :: MonadResource m => B.ByteString
469+#if MIN_VERSION_conduit(1, 0, 0)
470+ -> MonadSource m Event
471+#else
472+ -> GSource m Event
473+#endif
468decode bs | B8.null bs = return ()
474decode bs | B8.null bs = return ()
469decode bs =
475decode bs =
470 bracketP alloc cleanup (runParser . fst)
476 bracketP alloc cleanup (runParser . fst)
@@ -488,7 +494,12 @@ decode bs =
488 c_yaml_parser_delete ptr
494 c_yaml_parser_delete ptr
489 free ptr
495 free ptr
490
496
491−decodeFile :: MonadResource m => FilePath -> GSource m Event
497+decodeFile :: MonadResource m => FilePath
498+#if MIN_VERSION_conduit(1, 0, 0)
499+ -> MonadSource m Event
500+#else
501+ -> GSource m Event
502+#endif
492decodeFile file =
503decodeFile file =
493 bracketP alloc cleanup (runParser . fst)
504 bracketP alloc cleanup (runParser . fst)
494 where
505 where
@@ -519,11 +530,24 @@ decodeFile file =
519 c_yaml_parser_delete ptr
530 c_yaml_parser_delete ptr
520 free ptr
531 free ptr
521
532
522−runParser :: MonadResource m => Parser -> GSource m Event
533+runParser :: MonadResource m => Parser
534+#if MIN_VERSION_conduit(1, 0, 0)
535+ -> MonadSource m Event
536+#else
537+ -> GSource m Event
538+#endif
523runParser parser = do
539runParser parser = do
540+#if MIN_VERSION_conduit(1, 0, 0)
541+ e <- liftStreamIO $ parserParseOne' parser
542+#else
524 e <- liftIO $ parserParseOne' parser
543 e <- liftIO $ parserParseOne' parser
544+#endif
525 case e of
545 case e of
546+#if MIN_VERSION_conduit(1, 0, 0)
547+ Left err -> liftStreamIO $ throwIO err
548+#else
526 Left err -> liftIO $ throwIO err
549 Left err -> liftIO $ throwIO err
550+#endif
527 Right Nothing -> return ()
551 Right Nothing -> return ()
528 Right (Just ev) -> yield ev >> runParser parser
552 Right (Just ev) -> yield ev >> runParser parser
529
553
@@ -543,7 +567,12 @@ parserParseOne' parser = allocaBytes eventSize $ \er -> do
543 return $ Left $ YamlParseException problem context problemMark
567 return $ Left $ YamlParseException problem context problemMark
544 else Right <$> getEvent er
568 else Right <$> getEvent er
545
569
570+encode :: MonadResource m
571+#if MIN_VERSION_conduit(1, 0, 0)
572+ => MonadSink Event m ByteString
573+#else
546−encode :: MonadResource m => GSink Event m ByteString
574+ => GSink Event m ByteString
575+#endif
547encode =
576encode =
548 runEmitter alloc close
577 runEmitter alloc close
549 where
578 where
@@ -560,7 +589,11 @@ encode =
560
589
561encodeFile :: MonadResource m
590encodeFile :: MonadResource m
562 => FilePath
591 => FilePath
592+#if MIN_VERSION_conduit(1, 0, 0)
593+ -> MonadSink Event m ()
594+#else
563 -> GInfSink Event m
595 -> GInfSink Event m
596+#endif
564encodeFile filePath =
597encodeFile filePath =
565 bracketP getFile c_fclose $ \file -> runEmitter (alloc file) (\u _ -> return u)
598 bracketP getFile c_fclose $ \file -> runEmitter (alloc file) (\u _ -> return u)
566 where
599 where
@@ -576,8 +609,13 @@ encodeFile filePath =
576
609
577runEmitter :: MonadResource m
610runEmitter :: MonadResource m
578 => (Emitter -> IO a) -- ^ alloc
611 => (Emitter -> IO a) -- ^ alloc
612+#if MIN_VERSION_conduit(1, 0, 0)
613+ -> (() -> a -> IO b) -- ^ close
614+ -> MonadSink Event m b
615+#else
579 -> (u -> a -> IO b) -- ^ close
616 -> (u -> a -> IO b) -- ^ close
580 -> Pipe l Event o u m b
617 -> Pipe l Event o u m b
618+#endif
581runEmitter allocI closeI =
619runEmitter allocI closeI =
582 bracketP alloc cleanup go
620 bracketP alloc cleanup go
583 where
621 where
@@ -594,11 +632,23 @@ runEmitter allocI closeI =
594 go (emitter, a) =
632 go (emitter, a) =
595 loop
633 loop
596 where
634 where
635+#if MIN_VERSION_conduit(1, 0, 0)
636+ loop = await >>= maybe (close ()) push
637+#else
597 loop = awaitE >>= either close push
638 loop = awaitE >>= either close push
639+#endif
640+
641+#if MIN_VERSION_conduit(1, 0, 0)
642+ push e = do
643+ _ <- liftStreamIO $ toEventRaw e $ c_yaml_emitter_emit emitter
644+ loop
645+ close u = liftStreamIO $ closeI u a
646+#else
598 push e = do
647 push e = do
599 _ <- liftIO $ toEventRaw e $ c_yaml_emitter_emit emitter
648 _ <- liftIO $ toEventRaw e $ c_yaml_emitter_emit emitter
600 loop
649 loop
601 close u = liftIO $ closeI u a
650 close u = liftIO $ closeI u a
651+#endif
602
652
603-- | The pointer position
653-- | The pointer position
604data YamlMark = YamlMark { yamlIndex :: Int, yamlLine :: Int, yamlColumn :: Int }
654data YamlMark = YamlMark { yamlIndex :: Int, yamlLine :: Int, yamlColumn :: Int }
yaml.cabal+1−1
@@ -36,7 +36,7 @@ library
36 build-depends: base >= 4 && < 5
36 build-depends: base >= 4 && < 5
37 , transformers >= 0.1 && < 0.4
37 , transformers >= 0.1 && < 0.4
38 , bytestring >= 0.9.1.4
38 , bytestring >= 0.9.1.4
39− , conduit >= 0.5 && < 0.6
39+ , conduit >= 0.5 && < 1.1
40 , resourcet >= 0.3 && < 0.5
40 , resourcet >= 0.3 && < 0.5
41 , aeson >= 0.5
41 , aeson >= 0.5
42 , containers
42 , containers