git.iko.soy/typeable/pandoc
on master help sign in
Markdown Reader: rename yamlToMeta to yamlToMetaValue
commit700f7a141f94616734b08df291b44e7a7ae64991 authormb21 <mb21@users.noreply.github.com> dateSat 15 Sep 2018, 12:46 (8 years ago) parentbd5500b
1 file changed+9−9
src/Text/Pandoc/Readers/Markdown.hs+9−9
src/Text/Pandoc/Readers/Markdown.hs+9−9
@@ -249,7 +249,7 @@ yamlMetaBlock = try $ do
249249 if ignorable k
250250 then return ()
251251 else do
252− v' <- yamlToMeta v
252+ v' <- yamlToMetaValue v
253253 let k' = T.unpack k
254254 updateState $ \st -> st{ stateMeta' =
255255 do m <- stateMeta' st
@@ -309,9 +309,9 @@ checkBoolean t =
309309 then Just False
310310 else Nothing
311311
312−yamlToMeta :: PandocMonad m
313− => YAML.Node -> MarkdownParser m (F MetaValue)
314−yamlToMeta (YAML.Scalar x) =
312+yamlToMetaValue :: PandocMonad m
313+ => YAML.Node -> MarkdownParser m (F MetaValue)
314+yamlToMetaValue (YAML.Scalar x) =
315315 case x of
316316 YAML.SStr t -> toMetaValue t
317317 YAML.SBool b -> return $ return $ MetaBool b
@@ -322,25 +322,25 @@ yamlToMeta (YAML.Scalar x) =
322322 Just b -> return $ return $ MetaBool b
323323 Nothing -> toMetaValue t
324324 YAML.SNull -> return $ return $ MetaString ""
325−yamlToMeta (YAML.Sequence _ xs) = do
326− xs' <- mapM yamlToMeta xs
325+yamlToMetaValue (YAML.Sequence _ xs) = do
326+ xs' <- mapM yamlToMetaValue xs
327327 return $ do
328328 xs'' <- sequence xs'
329329 return $ B.toMetaValue xs''
330−yamlToMeta (YAML.Mapping _ o) =
330+yamlToMetaValue (YAML.Mapping _ o) =
331331 foldM (\m (key, v) -> do
332332 k <- nodeToKey key
333333 if ignorable k
334334 then return m
335335 else do
336− v' <- yamlToMeta v
336+ v' <- yamlToMetaValue v
337337 return $ do
338338 MetaMap m' <- m
339339 v'' <- v'
340340 return (MetaMap $ M.insert (T.unpack k) v'' m'))
341341 (return $ MetaMap M.empty)
342342 (M.toList o)
343−yamlToMeta _ = return $ return $ MetaString ""
343+yamlToMetaValue _ = return $ return $ MetaString ""
344344
345345stopLine :: PandocMonad m => MarkdownParser m ()
346346stopLine = try $ (string "---" <|> string "...") >> blankline >> return ()