DomTree

1 files changed, 6 insertions, 6 deletions

diff --git a/bbcode/src/Text/BBCode/Lexer.hs b/bbcode/src/Text/BBCode/Lexer.hs
index 03f57d2..560324b 100644
--- a/bbcode/src/Text/BBCode/Lexer.hs
+++ b/bbcode/src/Text/BBCode/Lexer.hs
@@ -21,7 +21,7 @@ import Control.Applicative
 import Prelude hiding (takeWhile)
 
 -- | Our lexicographical unit
-data BBToken = BBOpen Text [(Text, Maybe Text)] -- ^ Tag open with attributes
+data BBToken = BBOpen Text [(Text, Text)] -- ^ Tag open with attributes
              | BBClose Text -- ^ Tag close
              | BBStr Text -- ^ Content of a tag
              deriving (Eq, Show)
@@ -32,18 +32,18 @@ token = BBClose <$> ("[/" *> escapedText' [']'] <* "]")
         <|> uncurry BBOpen <$ "[" <*> openTag <* "]"
         <|> BBStr <$> escapedText ['[']
 
-openTag :: Parser (Text, [(Text, Maybe Text)])
+openTag :: Parser (Text, [(Text, Text)])
 openTag = (,) <$> escapedText' [']', ' ', '='] <*> attrs'
 
-attrs :: Parser [(Text, Maybe Text)]
+attrs :: Parser [(Text, Text)]
 attrs = (:) <$> (namedAttr <|> plainValue) <* takeWhile isSpace <*> attrs'
   where
-    namedAttr = (,) <$ takeWhile isSpace <*> escapedText ['=', ']', ' '] <*> optional ("=" *> attrArg)
-    plainValue = (,) <$> pure "" <* "=" <*> (Just <$> attrArg)
+    namedAttr = (,) <$ takeWhile isSpace <*> escapedText ['=', ']', ' '] <*> option "" ("=" *> attrArg)
+    plainValue = (,) <$> pure "" <* "=" <*> attrArg
     attrArg = "\"" *> escapedText ['"'] <* "\""
               <|> escapedText [']', ' ']
 
-attrs' :: Parser [(Text, Maybe Text)]
+attrs' :: Parser [(Text, Text)]
 attrs' = option [] attrs
 
 escapedText :: [Char] -> Parser Text