Update inflectors

Author: flbulgarelli

mulang.cabal

@@ -126,7 +126,8 @@ library
     containers                ,
     hashable                  ,
     haskell-src               ,
-    inflections               <= 0.2.0.1,
+    inflections               <= 0.4.0.7,
+    megaparsec                ,
     language-c                ,
     language-java             ,
     language-javascript       ,

src/Text/Inflections/Tokenizer.hs

@@ -6,22 +6,25 @@ module Text.Inflections.Tokenizer (
   canTokenize,
   tokenize) where
 
+import Data.Text (Text, pack, unpack)
 import Data.Char (toLower, isDigit, isLower)
 import Data.Either (isRight)
+import Data.Void (Void)
+
+import Text.Megaparsec.Error (ParseErrorBundle)
 
 import Text.Inflections
-import Text.Inflections.Parse.Types
 import Text.Parsec.Error (ParseError)
 
 import Control.Fallible
 
-type CaseStyle = String -> Either Text.Parsec.Error.ParseError [Text.Inflections.Parse.Types.Word]
+type CaseStyle = String -> Either (ParseErrorBundle Text Void) [SomeWord]
 
 camelCase      :: CaseStyle
-camelCase      = parseCamelCase [] . filter (not.isDigit)
+camelCase      = parseCamelCase [] . pack . filter (not.isDigit)
 
 snakeCase      :: CaseStyle
-snakeCase      = parseSnakeCase []
+snakeCase      = parseSnakeCase [] . pack
 
 rubyCase       :: CaseStyle
 rubyCase word@(i:_) | i == '_' = snakeCase . unprivatize $ baseWord
@@ -48,7 +51,7 @@ tokenize style s | Just words <- (wordsOrNothing . style) s = concatMap toToken
                  | otherwise = []
                   where toToken = return . map toLower
 
-
-wordsOrNothing = fmap (concatMap c) . orNothing
-                where c (Word w) = [w]
+wordsOrNothing :: Either (ParseErrorBundle Text Void) [SomeWord] -> Maybe [String]
+wordsOrNothing = fmap (concatMap c ) . orNothing
+                where c (SomeWord w) = [unpack . unWord $ w]
                       c _        = []

stack.yaml

@@ -3,7 +3,7 @@ allow-newer: true
 packages:
 - "."
 extra-deps:
-- inflections-0.2.0.1
+- inflections-0.4.0.7
 - github: mumuki/language-javascript
   commit: 7cadfa30838c69d165df39a5c1524dae5a0fc81f
 - github: bjpop/language-python

stack.yaml.lock

@@ -5,12 +5,12 @@
 
 packages:
 - completed:
-    hackage: inflections-0.2.0.1@sha256:f486f8caad1a9d1d11d8cbb4275369bffbd80e87d1df0241ddb17ebb01e6e80f,2227
+    hackage: inflections-0.4.0.7@sha256:1fd4a14864f24d643c0f19d5c47ad022c8c9748d5842ebb2ec892ba98394de53,3551
     pantry-tree:
-      sha256: 8471af52b2b16017e541ea9084f563913845112e2cef02d22b797343fcf3de9a
-      size: 1716
+      sha256: d566a6956df9a1b9e04b5a85e9bbf69921d362a70fa7c145fe4963dfdf0ca942
+      size: 2077
   original:
-    hackage: inflections-0.2.0.1
+    hackage: inflections-0.4.0.7
 - completed:
     name: language-javascript
     pantry-tree: