yaml 0.8.13 → 0.8.14

raw patch · 4 files changed

+37/−24 lines, 4 files

Files

• ChangeLog.md +4/−0
• Data/Yaml.hs +1/−1
• Data/Yaml/Internal.hs +31/−22
• yaml.cabal +1/−1

@@ -1,3 +1,7 @@+## 0.8.14++* Pretty print improvements for exceptions [#67](https://github.com/snoyberg/yaml/pull/67)+ ## 0.8.13  * Pretty module [#66](https://github.com/snoyberg/yaml/pull/66)

@@ -167,7 +167,7 @@  decodeEither :: FromJSON a => ByteString -> Either String a decodeEither bs = unsafePerformIO-                $ fmap (either (Left . show) id)+                $ fmap (either (Left . prettyPrintParseException) id)                 $ decodeHelper (Y.decode bs)  -- | More helpful version of 'decodeEither' which returns the 'YamlException'.

@@ -19,6 +19,7 @@ import Text.Libyaml hiding (encode, decode, encodeFile, decodeFile) import Data.ByteString (ByteString) import qualified Data.Map as Map+import Data.Maybe (isNothing) import Control.Exception import Control.Exception.Enclosed import Control.Monad.Trans.State@@ -66,36 +67,44 @@ --   Instead of displaying the data constructors applied to their arguments, --   a more textual output is returned. For example, instead of printing: ----- > AesonException "The key \"foo\" was not found"+-- > InvalidYaml (Just (YamlParseException {yamlProblem = "did not find expected ',' or '}'", yamlContext = "while parsing a flow mapping", yamlProblemMark = YamlMark {yamlIndex = 42, yamlLine = 2, yamlColumn = 12}}))) -- --   It looks more pleasant to print: ----- > Aeson exception: The key "foo" was not found+-- > YAML parse exception at line 2, column 12,+-- > while parsing a flow mapping:+-- > did not find expected ',' or '}' -- -- Since 0.8.11 prettyPrintParseException :: ParseException -> String-prettyPrintParseException NonScalarKey = "Non scalar key"-prettyPrintParseException (UnknownAlias n) =-  "Unknown alias: " ++ n-prettyPrintParseException (UnexpectedEvent r e) = unlines-  [ "Unexpected event:"-  , "  Received: " ++ maybe "None" show r-  , "  Expected: " ++ maybe "None" show e+prettyPrintParseException pe = case pe of+  NonScalarKey -> "Non scalar key"+  UnknownAlias anchor -> "Unknown alias `" ++ anchor ++ "`"+  UnexpectedEvent mbExpected mbUnexpected -> unlines+    [ "Unexpected event: expected"+    , "  " ++ show mbExpected+    , "but received"+    , "  " ++ show mbUnexpected     ]-prettyPrintParseException (InvalidYaml mye) =-  case mye of-    Just ye -> "Invalid yaml: " ++ show ye-    _ -> "Invalid yaml"-prettyPrintParseException (AesonException e) =-  "Aeson exception: " ++ e-prettyPrintParseException (OtherParseException e) =-  "Parse exception: " ++ show e-prettyPrintParseException (NonStringKeyAlias n v) = unlines-  [ "Non-string key alias:"-  , "  Anchor name: " ++ n-  , "  Value: " ++ show v +  InvalidYaml mbYamlError -> case mbYamlError of+    Nothing -> "Unspecified YAML error"+    Just yamlError -> case yamlError of+      YamlException s -> "YAML exception:\n" ++ s+      YamlParseException problem context mark -> unlines+        [ "YAML parse exception at line " ++ show (yamlLine mark) +++          ", column " ++ show (yamlColumn mark) ++ ","+        -- The context seems to include a leading "while" or similar.+        , context ++ ":"+        , problem+        ]+  AesonException s -> "Aeson exception:\n" ++ s+  OtherParseException exc -> "Generic parse exception:\n" ++ show exc+  NonStringKeyAlias anchor value -> unlines+    [ "Non-string key alias:"+    , "  Anchor name: " ++ anchor+    , "  Value: " ++ show value     ]-prettyPrintParseException CyclicIncludes = "Cyclic includes"+  CyclicIncludes -> "Cyclic includes"  newtype PErrorT m a = PErrorT { runPErrorT :: m (Either ParseException a) } instance Monad m => Functor (PErrorT m) where

@@ -1,5 +1,5 @@ name:            yaml-version:         0.8.13+version:         0.8.14 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>, Anton Ageev <antage@gmail.com>,Kirill Simonov