git.iko.soy/typeable/pandoc
on master help sign in
Markdown Reader: rename yamlToMeta to yamlToMetaValue
700f7a1mb21
src/Text/Pandoc/Readers/Markdown.hs+9−9
@@ -249,7 +249,7 @@ yamlMetaBlock = try $ do
249 if ignorable k
249 if ignorable k
250 then return ()
250 then return ()
251 else do
251 else do
252− v' <- yamlToMeta v
252+ v' <- yamlToMetaValue v
253 let k' = T.unpack k
253 let k' = T.unpack k
254 updateState $ \st -> st{ stateMeta' =
254 updateState $ \st -> st{ stateMeta' =
255 do m <- stateMeta' st
255 do m <- stateMeta' st
@@ -309,9 +309,9 @@ checkBoolean t =
309 then Just False
309 then Just False
310 else Nothing
310 else Nothing
311
311
312−yamlToMeta :: PandocMonad m
312+yamlToMetaValue :: PandocMonad m
313− => YAML.Node -> MarkdownParser m (F MetaValue)
313+ => YAML.Node -> MarkdownParser m (F MetaValue)
314−yamlToMeta (YAML.Scalar x) =
314+yamlToMetaValue (YAML.Scalar x) =
315 case x of
315 case x of
316 YAML.SStr t -> toMetaValue t
316 YAML.SStr t -> toMetaValue t
317 YAML.SBool b -> return $ return $ MetaBool b
317 YAML.SBool b -> return $ return $ MetaBool b
@@ -322,25 +322,25 @@ yamlToMeta (YAML.Scalar x) =
322 Just b -> return $ return $ MetaBool b
322 Just b -> return $ return $ MetaBool b
323 Nothing -> toMetaValue t
323 Nothing -> toMetaValue t
324 YAML.SNull -> return $ return $ MetaString ""
324 YAML.SNull -> return $ return $ MetaString ""
325−yamlToMeta (YAML.Sequence _ xs) = do
325+yamlToMetaValue (YAML.Sequence _ xs) = do
326− xs' <- mapM yamlToMeta xs
326+ xs' <- mapM yamlToMetaValue xs
327 return $ do
327 return $ do
328 xs'' <- sequence xs'
328 xs'' <- sequence xs'
329 return $ B.toMetaValue xs''
329 return $ B.toMetaValue xs''
330−yamlToMeta (YAML.Mapping _ o) =
330+yamlToMetaValue (YAML.Mapping _ o) =
331 foldM (\m (key, v) -> do
331 foldM (\m (key, v) -> do
332 k <- nodeToKey key
332 k <- nodeToKey key
333 if ignorable k
333 if ignorable k
334 then return m
334 then return m
335 else do
335 else do
336− v' <- yamlToMeta v
336+ v' <- yamlToMetaValue v
337 return $ do
337 return $ do
338 MetaMap m' <- m
338 MetaMap m' <- m
339 v'' <- v'
339 v'' <- v'
340 return (MetaMap $ M.insert (T.unpack k) v'' m'))
340 return (MetaMap $ M.insert (T.unpack k) v'' m'))
341 (return $ MetaMap M.empty)
341 (return $ MetaMap M.empty)
342 (M.toList o)
342 (M.toList o)
343−yamlToMeta _ = return $ return $ MetaString ""
343+yamlToMetaValue _ = return $ return $ MetaString ""
344
344
345stopLine :: PandocMonad m => MarkdownParser m ()
345stopLine :: PandocMonad m => MarkdownParser m ()
346stopLine = try $ (string "---" <|> string "...") >> blankline >> return ()
346stopLine = try $ (string "---" <|> string "...") >> blankline >> return ()