on master help sign in
try to come up with a more intuitive name
commit215d680d8888738450a4748fb6d95cfb4699b43c authorDwight Guth <dwight.guth@runtimeverification.com> dateTue 25 Sep 2018, 10:35 (8 years ago) parent6c21d3f
1 file changed+26−26
src/Data/Yaml/Builder.hs+26−26
src/Data/Yaml/Builder.hs+26−26
@@ -7,17 +7,17 @@ module Data.Yaml.Builder
77 ( YamlBuilder (..)
88 , ToYaml (..)
99 , mapping
10− , namedMapping
10+ , maybeNamedMapping
1111 , array
12− , namedArray
12+ , maybeNamedArray
1313 , string
14− , namedString
14+ , maybeNamedString
1515 , bool
16− , namedBool
16+ , maybeNamedBool
1717 , null
18− , namedNull
18+ , maybeNamedNull
1919 , scientific
20− , namedScientific
20+ , maybeNamedScientific
2121 , alias
2222 , number
2323 , toByteString
@@ -71,8 +71,8 @@ instance ToYaml Text where
7171instance ToYaml Int where
7272 toYaml i = YamlBuilder (EventScalar (S8.pack $ show i) IntTag PlainNoTag Nothing:)
7373
74−namedMapping :: Maybe Text -> [(Text, YamlBuilder)] -> YamlBuilder
75−namedMapping anchor pairs = YamlBuilder $ \rest ->
74+maybeNamedMapping :: Maybe Text -> [(Text, YamlBuilder)] -> YamlBuilder
75+maybeNamedMapping anchor pairs = YamlBuilder $ \rest ->
7676 EventMappingStart NoTag AnyMapping (unpack <$> anchor) : foldr addPair (EventMappingEnd : rest) pairs
7777 where
7878 addPair (key, YamlBuilder value) after
@@ -80,22 +80,22 @@ namedMapping anchor pairs = YamlBuilder $ \rest ->
8080 : value after
8181
8282mapping :: [(Text, YamlBuilder)] -> YamlBuilder
83−mapping = namedMapping Nothing
83+mapping = maybeNamedMapping Nothing
8484
85−namedArray :: Maybe Text -> [YamlBuilder] -> YamlBuilder
86−namedArray anchor bs =
85+maybeNamedArray :: Maybe Text -> [YamlBuilder] -> YamlBuilder
86+maybeNamedArray anchor bs =
8787 YamlBuilder $ (EventSequenceStart NoTag AnySequence (unpack <$> anchor):) . flip (foldr go) bs . (EventSequenceEnd:)
8888 where
8989 go (YamlBuilder b) = b
9090
9191array :: [YamlBuilder] -> YamlBuilder
92−array = namedArray Nothing
92+array = maybeNamedArray Nothing
9393
94−namedString :: Maybe Text -> Text -> YamlBuilder
94+maybeNamedString :: Maybe Text -> Text -> YamlBuilder
9595-- Empty strings need special handling to ensure they get quoted. This avoids:
9696-- https://github.com/snoyberg/yaml/issues/24
97−namedString anchor "" = YamlBuilder (EventScalar "" NoTag SingleQuoted (unpack <$> anchor) :)
98−namedString anchor s =
97+maybeNamedString anchor "" = YamlBuilder (EventScalar "" NoTag SingleQuoted (unpack <$> anchor) :)
98+maybeNamedString anchor s =
9999 YamlBuilder (event :)
100100 where
101101 event
@@ -105,31 +105,31 @@ namedString anchor s =
105105 | otherwise = EventScalar (encodeUtf8 s) StrTag PlainNoTag $ unpack <$> anchor
106106
107107string :: Text -> YamlBuilder
108−string = namedString Nothing
108+string = maybeNamedString Nothing
109109
110110-- Use aeson's implementation which gets rid of annoying decimal points
111−namedScientific :: Maybe Text -> Scientific -> YamlBuilder
112−namedScientific anchor n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag (unpack <$> anchor) :)
111+maybeNamedScientific :: Maybe Text -> Scientific -> YamlBuilder
112+maybeNamedScientific anchor n = YamlBuilder (EventScalar (TE.encodeUtf8 $ TL.toStrict $ toLazyText $ encodeToTextBuilder (Number n)) IntTag PlainNoTag (unpack <$> anchor) :)
113113
114114scientific :: Scientific -> YamlBuilder
115−scientific = namedScientific Nothing
115+scientific = maybeNamedScientific Nothing
116116
117117{-# DEPRECATED number "Use scientific" #-}
118118number :: Scientific -> YamlBuilder
119119number = scientific
120120
121−namedBool :: Maybe Text -> Bool -> YamlBuilder
122−namedBool anchor True = YamlBuilder (EventScalar "true" BoolTag PlainNoTag (unpack <$> anchor) :)
123−namedBool anchor False = YamlBuilder (EventScalar "false" BoolTag PlainNoTag (unpack <$> anchor) :)
121+maybeNamedBool :: Maybe Text -> Bool -> YamlBuilder
122+maybeNamedBool anchor True = YamlBuilder (EventScalar "true" BoolTag PlainNoTag (unpack <$> anchor) :)
123+maybeNamedBool anchor False = YamlBuilder (EventScalar "false" BoolTag PlainNoTag (unpack <$> anchor) :)
124124
125125bool :: Bool -> YamlBuilder
126−bool = namedBool Nothing
126+bool = maybeNamedBool Nothing
127127
128−namedNull :: Maybe Text -> YamlBuilder
129−namedNull anchor = YamlBuilder (EventScalar "null" NullTag PlainNoTag (unpack <$> anchor) :)
128+maybeNamedNull :: Maybe Text -> YamlBuilder
129+maybeNamedNull anchor = YamlBuilder (EventScalar "null" NullTag PlainNoTag (unpack <$> anchor) :)
130130
131131null :: YamlBuilder
132−null = namedNull Nothing
132+null = maybeNamedNull Nothing
133133
134134alias :: Text -> YamlBuilder
135135alias anchor = YamlBuilder (EventAlias (unpack anchor) :)