yaml 0.7.0.1 → 0.7.0.2

raw patch · 3 files changed

+21/−11 lines, 3 files

Files

• Data/Yaml.hs +13/−10
• test/main.hs +7/−0
• yaml.cabal +1/−1

@@ -147,21 +147,24 @@     requireEvent EventStreamEnd
     return res
 
-parseScalar :: ByteString -> Anchor
+parseScalar :: ByteString -> Anchor -> Style
             -> C.Sink Event Parse Text
-parseScalar v a = do
+parseScalar v a style = do
     let res = decodeUtf8With lenientDecode v
     case a of
         Nothing -> return res
         Just an -> do
-            lift $ modify (Map.insert an $ textToValue res)
+            lift $ modify (Map.insert an $ textToValue style res)
             return res
 
-textToValue :: Text -> Value -- FIXME check for quoting style?
-textToValue "true" = Bool True
-textToValue "false" = Bool False
-textToValue "null" = Null
-textToValue t
+textToValue :: Style -> Text -> Value
+textToValue SingleQuoted t = String t
+textToValue DoubleQuoted t = String t
+textToValue Folded t = String t
+textToValue _ "true" = Bool True
+textToValue _ "false" = Bool False
+textToValue _ "null" = Null
+textToValue _ t
     | Right (x, "") <- signed decimal t = Number $ I x
     | Right (x, "") <- double t = Number $ D x
     | otherwise = String t
@@ -170,7 +173,7 @@ parseO = do
     me <- CL.head
     case me of
-        Just (EventScalar v _t _s a) -> fmap textToValue $ parseScalar v a
+        Just (EventScalar v _t style a) -> fmap (textToValue style) $ parseScalar v a style
         Just (EventSequenceStart a) -> parseS a id
         Just (EventMappingStart a) -> parseM a M.empty
         Just (EventAlias an) -> do
@@ -215,7 +218,7 @@         _ -> do
             CL.drop 1
             s <- case me of
-                    Just (EventScalar v _ _ a') -> parseScalar v a'
+                    Just (EventScalar v _ style a') -> parseScalar v a' style
                     _ -> liftIO $ throwIO $ UnexpectedEvent me Nothing
             o <- parseO
 

@@ -53,6 +53,9 @@         it "test uniqueness of keys" caseAllKeysShouldBeUnique
         it "test mapping merge" caseSimpleMappingMerge
         it "test sequence of mappings merging" caseMergeSequence
+    describe "numbers" $ do
+        it "parses as string when quoted" caseQuotedNumber
+        it "parses as number when unquoted" caseUnquotedNumber
 
 counter :: Monad m => (Y.Event -> Bool) -> C.Sink Y.Event m Int
 counter pred' =
@@ -301,3 +304,7 @@         , ("false", D.Bool False)
         , ("null", D.Null)
         ]
+
+caseQuotedNumber, caseUnquotedNumber :: Assertion
+caseQuotedNumber = D.decode "foo: \"1234\"" @?= Just (object [("foo", D.String "1234")])
+caseUnquotedNumber = D.decode "foo: 1234" @?= Just (object [("foo", D.Number 1234)])

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