update

nalchevanidze · Jun 19, 2024 · 6aa8f6b · 6aa8f6b
1 parent 8a7abdd
commit 6aa8f6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/hconf/src/HConf/Core/Bounds.hs b/hconf/src/HConf/Core/Bounds.hs
@@ -26,7 +26,7 @@ import HConf.Utils.Chalk (Color (Yellow), chalk)
 import HConf.Utils.Class (Parse (..))
 import HConf.Utils.Core (Name)
 import HConf.Utils.Log (Log, field)
-import HConf.Utils.Source (getHead, sepByAnd, unconsM)
+import HConf.Utils.Source (removeHead, sepByAnd, unconsM)
 import Relude hiding
   ( Undefined,
     break,
@@ -73,7 +73,7 @@ instance Parse Bound where
   parse txt = do
     (char, str) <- unconsM "unsorted bound type" txt
     res <- parseRestriction char
-    let (isStrict, value) = first (Just '=' ==) (getHead str)
+    let (isStrict, value) = removeHead '=' str
     Bound res isStrict <$> parse value
 
 newtype Bounds = Bounds [Bound]

diff --git a/hconf/src/HConf/Utils/Source.hs b/hconf/src/HConf/Utils/Source.hs
@@ -8,7 +8,7 @@ module HConf.Utils.Source
     fromByteString,
     breakOnSpace,
     sepByAnd,
-    getHead,
+    removeHead,
     unconsM,
   )
 where
@@ -54,12 +54,16 @@ breakOnSpace = trimBimap . break isSeparator
 sepByAnd :: Text -> [Text]
 sepByAnd = T.splitOn "&&" . T.filter (not . isSeparator)
 
-getHead :: Text -> (Maybe Char, Text)
-getHead txt = maybe (Nothing, txt) (first Just) (uncons txt)
+removeHead :: Char -> Text -> (Bool, Text)
+removeHead should txt = maybe (False, txt) has (uncons txt)
+  where
+    has (x, xs)
+      | x == should = (True, xs)
+      | otherwise = (False, txt)
 
 unconsM :: (MonadFail m) => String -> Text -> m (Char, Text)
 unconsM msg x =
   maybe
     (fail (msg <> "<>: " <> toString x))
     pure
-    (uncons x)
+    (uncons x)