X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FParser.hs;h=912237c7eda8db5b2f7de3ca79e7ad5d257be6fd;hb=7f0d3161b737e778977fbee52541660ee38fcbb3;hp=4d936f95f2995929ae22b03d9a3a90ed08bddc35;hpb=fa3a9d0aecede2431e669ef33885a116f7d5f0be;p=Rakka.git

diff --git a/Rakka/Wiki/Parser.hs b/Rakka/Wiki/Parser.hs
index 4d936f9..912237c 100644
--- a/Rakka/Wiki/Parser.hs
+++ b/Rakka/Wiki/Parser.hs
@@ -5,9 +5,9 @@ module Rakka.Wiki.Parser
     where
 
 import           Data.Maybe
-import           Network.URI
+import           Network.URI hiding (fragment)
 import           Rakka.Wiki
-import           Text.ParserCombinators.Parsec
+import           Text.ParserCombinators.Parsec hiding (label)
 
 
 type CommandTypeOf = String -> Maybe CommandType
@@ -104,6 +104,7 @@ listElement cmdTypeOf = listElement' []
       toType :: Char -> ListType
       toType '*' = Bullet
       toType '#' = Numbered
+      toType _   = undefined
 
 
 definitionList :: CommandTypeOf -> Parser BlockElement
@@ -186,10 +187,6 @@ leadingSpaced cmdTypeOf = (char ' ' >> leadingSpaced' >>= return . Preformatted)
                        return []
 
 
-blockCommand :: Parser BlockElement
-blockCommand = pzero -- not implemented
-
-
 paragraph :: CommandTypeOf -> Parser BlockElement
 paragraph cmdTypeOf = paragraph' >>= return . Paragraph
     where
@@ -346,11 +343,11 @@ apostrophes cmdTypeOf = foldr (<|>) pzero (map try [apos1, apos2, apos3, apos4,
 
 objLink :: Parser InlineElement
 objLink = do try (string "[[[")
-             page <- many1 (noneOf "|]")
-             text <- option Nothing
-                     (char '|' >> many1 (satisfy (/= ']')) >>= return . Just)
+             page  <- many1 (noneOf "|]")
+             label <- option Nothing
+                      (char '|' >> many1 (satisfy (/= ']')) >>= return . Just)
              string "]]]"
-             return $ ObjectLink page text
+             return $ ObjectLink page label
           <?>
           "object link"
 
@@ -361,7 +358,7 @@ pageLink = do try (string "[[")
                           (many1 (noneOf "#|]") >>= return . Just)
               fragment <- option Nothing
                           (char '#' >> many1 (noneOf "|]") >>= return . Just)
-              text     <- option Nothing
+              label    <- option Nothing
                           (char '|' >> many1 (satisfy (/= ']')) >>= return . Just)
 
               case (page, fragment) of
@@ -369,7 +366,7 @@ pageLink = do try (string "[[")
                 (_, _)             -> return ()
 
               string "]]"
-              return $ PageLink page fragment text
+              return $ PageLink page fragment label
            <?>
            "page link"
 
@@ -378,11 +375,11 @@ extLink :: Parser InlineElement
 extLink = do char '['
              uriStr <- many1 (noneOf " \t]")
              skipMany (oneOf " \t")
-             text <- option Nothing
-                     (many1 (noneOf "]") >>= return . Just)
+             label  <- option Nothing
+                       (many1 (noneOf "]") >>= return . Just)
              
              case parseURI uriStr of
-               Just uri -> char ']' >> return (ExternalLink uri text)
+               Just uri -> char ']' >> return (ExternalLink uri label)
                Nothing  -> pzero <?> "absolute URI"
           <?>
           "external link"