From b53ea23b3f56a120937922f88f5f1fc3244067d9 Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Wed, 19 Jun 2013 09:05:30 -0700
Subject: Improved code readability.

---
 src/Text/Pandoc/Readers/Markdown.hs | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/Text/Pandoc')

diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index 47b1cbbaa..58495d024 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -1549,31 +1549,35 @@ referenceLink constructor (lab, raw) = do
   let labIsRef = raw' == "" || raw' == "[]"
   let key = toKey $ if labIsRef then raw else raw'
   parsedRaw <- parseFromString (mconcat <$> many inline) raw'
-  let dropRB (']':xs) = xs
-      dropRB xs = xs
-  let dropLB ('[':xs) = xs
-      dropLB xs = xs
-  let dropBrackets = reverse . dropRB . reverse . dropLB
   fallback <- parseFromString (mconcat <$> many inline) $ dropBrackets raw
   implicitHeaderRefs <- option False $
                          True <$ guardEnabled Ext_implicit_header_references
+  let makeFallback = do
+       parsedRaw' <- parsedRaw
+       fallback' <- fallback
+       return $ B.str "[" <> fallback' <> B.str "]" <>
+                (if sp && not (null raw) then B.space else mempty) <>
+                parsedRaw'
   return $ do
     keys <- asksF stateKeys
     case M.lookup key keys of
        Nothing        -> do
          headers <- asksF stateHeaders
          ref' <- if labIsRef then lab else ref
-         parsedRaw' <- parsedRaw
-         fallback' <- fallback
-         let fallback'' = B.str "[" <> fallback' <> B.str "]" <>
-              (if sp && not (null raw) then B.space else mempty) <> parsedRaw'
          if implicitHeaderRefs
             then case M.lookup ref' headers of
                    Just ident -> constructor ('#':ident) "" <$> lab
-                   Nothing    -> return fallback''
-            else return fallback''
+                   Nothing    -> makeFallback
+            else makeFallback
        Just (src,tit) -> constructor src tit <$> lab
 
+dropBrackets :: String -> String
+dropBrackets = reverse . dropRB . reverse . dropLB
+  where dropRB (']':xs) = xs
+        dropRB xs = xs
+        dropLB ('[':xs) = xs
+        dropLB xs = xs
+
 bareURL :: MarkdownParser (F Inlines)
 bareURL = try $ do
   guardEnabled Ext_autolink_bare_uris
-- 
cgit v1.2.3