Exodus to GHC 6.8.1

[Rakka.git] / Rakka / Wiki / Interpreter / Base.hs

diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs
index 9a02ae255668be349716a141300996bbe74aba1c..70951e6884ab1d43936d0d830d35e41e3ac16a50 100644 (file)
--- a/Rakka/Wiki/Interpreter/Base.hs
+++ b/Rakka/Wiki/Interpreter/Base.hs
@@ -78,7 +78,7 @@ otherLangsInterp
             in
               case linkTable of
                 [] -> return EmptyBlock
-                xs -> do Languages langTable <- getSysConf (ctxSysConf ctx)
+                _  -> do Languages langTable <- getSysConf (ctxSysConf ctx)
                          let merged = mergeTables langTable linkTable
                          return $ mkLangList merged
       }
@@ -87,17 +87,17 @@ otherLangsInterp
                   -> [(LanguageTag, PageName)]
                   -> [(LanguageName, PageName)]
       mergeTables _ []     = []
-      mergeTables m (x:xs) = let (langTag, pageName) = x
-                                 langName            = fromMaybe langTag (M.lookup langTag m)
+      mergeTables m (x:xs) = let (langTag, name) = x
+                                 langName        = fromMaybe langTag (M.lookup langTag m)
                              in
-                               (langName, pageName) : mergeTables m xs
+                               (langName, name) : mergeTables m xs
 
       mkLangList :: [(LanguageName, PageName)] -> BlockElement
       mkLangList xs = List Bullet (map mkLangLink xs)
 
       mkLangLink :: (LanguageName, PageName) -> ListItem
-      mkLangLink (langName, pageName)
-          = [Inline (PageLink (Just pageName) Nothing (Just langName))]
+      mkLangLink (langName, name)
+          = [Inline (PageLink (Just name) Nothing (Just langName))]
 
 
 -- <input type="button"
@@ -112,14 +112,14 @@ editPageInterp
           = \ ctx (InlineCommand _ args _) ->
             do BaseURI baseURI <- getSysConf (ctxSysConf ctx)
 
-               let pageName = fromMaybe (ctxPageName ctx) (lookup "page" args)
-                   label    = fromMaybe "Edit this page" (lookup "label" args)
-                   uri      = uriToString id baseURI ""
-                   attrs    = [ ("type"   , "button")
-                              , ("value"  , label)
-                              , ("onclick", "Rakka.editPage(\"" ++ uri ++ "\", \"" ++ pageName ++ "\")")
-                              , ("class"  , "editButton")
-                              ]
+               let name  = fromMaybe (ctxPageName ctx) (lookup "page" args)
+                   label = fromMaybe "Edit this page" (lookup "label" args)
+                   uri   = uriToString id baseURI ""
+                   attrs = [ ("type"   , "button")
+                           , ("value"  , label)
+                           , ("onclick", "Rakka.editPage(\"" ++ uri ++ "\", \"" ++ name ++ "\")")
+                           , ("class"  , "editButton")
+                           ]
 
                return (Input attrs)
       }