git.iko.soy/typeable/yaml
on master help sign in
try to come up with a more intuitive name
215d680Dwight Guth
src/Data/Yaml/Builder.hs+26−26
compare with master
unifiedsplit
@@ -7,17 +7,17 @@ module Data.Yaml.Builder
7 ( YamlBuilder (..)
7 ( YamlBuilder (..)
8 , ToYaml (..)
8 , ToYaml (..)
9 , mapping
9 , mapping
10− , namedMapping
10+ , maybeNamedMapping
11 , array
11 , array
12− , namedArray
12+ , maybeNamedArray
13 , string
13 , string
14− , namedString
14+ , maybeNamedString
15 , bool
15 , bool
16− , namedBool
16+ , maybeNamedBool
17 , null
17 , null
18− , namedNull
18+ , maybeNamedNull
19 , scientific
19 , scientific
20− , namedScientific
20+ , maybeNamedScientific
21 , alias
21 , alias
22 , number
22 , number
23 , toByteString
23 , toByteString
@@ -71,8 +71,8 @@ instance ToYaml Text where
71instance ToYaml Int where
71instance ToYaml Int where
72 toYaml i = YamlBuilder (EventScalar (S8.pack $ show i) IntTag PlainNoTag Nothing:)
72 toYaml i = YamlBuilder (EventScalar (S8.pack $ show i) IntTag PlainNoTag Nothing:)
73
73
74−namedMapping :: Maybe Text -> [(Text, YamlBuilder)] -> YamlBuilder
74+maybeNamedMapping :: Maybe Text -> [(Text, YamlBuilder)] -> YamlBuilder
75−namedMapping anchor pairs = YamlBuilder $ \rest ->
75+maybeNamedMapping anchor pairs = YamlBuilder $ \rest ->
76 EventMappingStart NoTag AnyMapping (unpack <$> anchor) : foldr addPair (EventMappingEnd : rest) pairs
76 EventMappingStart NoTag AnyMapping (unpack <$> anchor) : foldr addPair (EventMappingEnd : rest) pairs
77 where
77 where
78 addPair (key, YamlBuilder value) after
78 addPair (key, YamlBuilder value) after
@@ -80,22 +80,22 @@ namedMapping anchor pairs = YamlBuilder $ \rest ->
80 : value after
80 : value after
81
81
82mapping :: [(Text, YamlBuilder)] -> YamlBuilder
82mapping :: [(Text, YamlBuilder)] -> YamlBuilder
83−mapping = namedMapping Nothing
83+mapping = maybeNamedMapping Nothing
84
84
85−namedArray :: Maybe Text -> [YamlBuilder] -> YamlBuilder
85+maybeNamedArray :: Maybe Text -> [YamlBuilder] -> YamlBuilder
86−namedArray anchor bs =
86+maybeNamedArray anchor bs =
87 YamlBuilder $ (EventSequenceStart NoTag AnySequence (unpack <$> anchor):) . flip (foldr go) bs . (EventSequenceEnd:)
87 YamlBuilder $ (EventSequenceStart NoTag AnySequence (unpack <$> anchor):) . flip (foldr go) bs . (EventSequenceEnd:)
88 where
88 where
89 go (YamlBuilder b) = b
89 go (YamlBuilder b) = b
90
90
91array :: [YamlBuilder] -> YamlBuilder
91array :: [YamlBuilder] -> YamlBuilder
92−array = namedArray Nothing
92+array = maybeNamedArray Nothing
93
93
94−namedString :: Maybe Text -> Text -> YamlBuilder
94+maybeNamedString :: Maybe Text -> Text -> YamlBuilder
95-- Empty strings need special handling to ensure they get quoted. This avoids:
95-- Empty strings need special handling to ensure they get quoted. This avoids:
96-- https://github.com/snoyberg/yaml/issues/24
96-- https://github.com/snoyberg/yaml/issues/24
97−namedString anchor "" = YamlBuilder (EventScalar "" NoTag SingleQuoted (unpack <$> anchor) :)
97+maybeNamedString anchor "" = YamlBuilder (EventScalar "" NoTag SingleQuoted (unpack <$> anchor) :)
98−namedString anchor s =
98+maybeNamedString anchor s =
99 YamlBuilder (event :)
99 YamlBuilder (event :)
100 where
100 where
101 event
101 event
@@ -105,31 +105,31 @@ namedString anchor s =
105 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag $ unpack <$> anchor
105 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag $ unpack <$> anchor
106
106
107string :: Text -> YamlBuilder
107string :: Text -> YamlBuilder
108−string = namedString Nothing
108+string = maybeNamedString Nothing
109
109
110-- Use aeson's implementation which gets rid of annoying decimal points
110-- Use aeson's implementation which gets rid of annoying decimal points
111−namedScientific :: Maybe Text -> Scientific -> YamlBuilder
111+maybeNamedScientific :: Maybe Text -> Scientific -> YamlBuilder
112−namedScientific anchor n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag (unpack <$> anchor) :)
112+maybeNamedScientific anchor n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag (unpack <$> anchor) :)
113
113
114scientific :: Scientific -> YamlBuilder
114scientific :: Scientific -> YamlBuilder
115−scientific = namedScientific Nothing
115+scientific = maybeNamedScientific Nothing
116
116
117{-# DEPRECATED number "Use scientific" #-}
117{-# DEPRECATED number "Use scientific" #-}
118number :: Scientific -> YamlBuilder
118number :: Scientific -> YamlBuilder
119number = scientific
119number = scientific
120
120
121−namedBool :: Maybe Text -> Bool -> YamlBuilder
121+maybeNamedBool :: Maybe Text -> Bool -> YamlBuilder
122−namedBool anchor True = YamlBuilder (EventScalar "true" BoolTag PlainNoTag (unpack <$> anchor) :)
122+maybeNamedBool anchor True = YamlBuilder (EventScalar "true" BoolTag PlainNoTag (unpack <$> anchor) :)
123−namedBool anchor False = YamlBuilder (EventScalar "false" BoolTag PlainNoTag (unpack <$> anchor) :)
123+maybeNamedBool anchor False = YamlBuilder (EventScalar "false" BoolTag PlainNoTag (unpack <$> anchor) :)
124
124
125bool :: Bool -> YamlBuilder
125bool :: Bool -> YamlBuilder
126−bool = namedBool Nothing
126+bool = maybeNamedBool Nothing
127
127
128−namedNull :: Maybe Text -> YamlBuilder
128+maybeNamedNull :: Maybe Text -> YamlBuilder
129−namedNull anchor = YamlBuilder (EventScalar "null" NullTag PlainNoTag (unpack <$> anchor) :)
129+maybeNamedNull anchor = YamlBuilder (EventScalar "null" NullTag PlainNoTag (unpack <$> anchor) :)
130
130
131null :: YamlBuilder
131null :: YamlBuilder
132−null = namedNull Nothing
132+null = maybeNamedNull Nothing
133
133
134alias :: Text -> YamlBuilder
134alias :: Text -> YamlBuilder
135alias anchor = YamlBuilder (EventAlias (unpack anchor) :)
135alias anchor = YamlBuilder (EventAlias (unpack anchor) :)