about summary refs log tree commit diff
diff options
context:
space:
mode:
authorlukasepple <git@lukasepple.de>2015-10-31 21:51:50 +0100
committerlukasepple <git@lukasepple.de>2015-10-31 21:51:50 +0100
commit9869e5095800766622170d0a18ce8693efeca63c (patch)
tree9f5a08678fdaf31526144cc7f407c264c3f4f8b7
parenta6231d0ce720097555fb4000f86d616ee7e21e48 (diff)
Parse Version and name correctly
-rw-r--r--src/Text/Emoji/DataParser.hs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Text/Emoji/DataParser.hs b/src/Text/Emoji/DataParser.hs
index 1f2f5ae..900e9e7 100644
--- a/src/Text/Emoji/DataParser.hs
+++ b/src/Text/Emoji/DataParser.hs
@@ -31,8 +31,12 @@ emojiDataEntry = do
   level <- sumTypeField emojiLevels
   modifier <- sumTypeField emojiModifierStati
   sourceList <- sources
-  char '\t'
-  comment <- emojiComment
+
+  string "\t# "
+
+  version <- many (noneOf " ")
+  space >> char '(' >> manyTill anyChar (char ')') >> space
+  name <- manyTill anyChar (try lineTerminated)
 
   return . Right $ MkEmoji
     { _code           = code
@@ -40,8 +44,8 @@ emojiDataEntry = do
     , _emojiLevel     = level
     , _emojiModifier  = modifier
     , _emojiSources   = sourceList
-    , _name           = comment -- TODO
-    , _version        = comment -- TODO
+    , _name           = version
+    , _version        = name
     }
 
 sources :: Parser EmojiSources