refactor!: use megaparsec-utils for posNumParser

Author: drlkf

megaparsec-time.cabal

@@ -40,6 +40,7 @@ library
   build-depends:
       base >=4.7 && <5
     , megaparsec >=9.0 && <10
+    , megaparsec-utils >=0.1 && <1
     , parser-combinators >=1.0 && <2
     , time >=1.10 && <2
   default-language: Haskell2010
@@ -59,6 +60,7 @@ test-suite megaparsec-time-test
     , hspec
     , megaparsec >=9.0 && <10
     , megaparsec-time
+    , megaparsec-utils >=0.1 && <1
     , parser-combinators >=1.0 && <2
     , time >=1.10 && <2
   default-language: Haskell2010

package.yaml

@@ -25,6 +25,7 @@ description: |
 dependencies:
   - base >= 4.7 && < 5
   - megaparsec >= 9.0 && < 10
+  - megaparsec-utils >= 0.1 && < 1
   - parser-combinators >= 1.0 && < 2
   - time >= 1.10 && < 2
 

src/Text/Megaparsec/Time.hs

@@ -51,12 +51,7 @@ import Text.Megaparsec.Char (
   string',
  )
 import Text.Printf (printf)
-
-_posNumParser
-  :: Ord e
-  => Read a
-  => Parsec e String a
-_posNumParser = read <$> some digitChar
+import Text.Megaparsec.Utils (posNumParser)
 
 -- | Representation of a parser result with either a number of days relative to
 -- the current day, or a 'DayOfWeek'.
@@ -131,19 +126,19 @@ gregorianDayParser = do
 hoursParser
   :: Ord e
   => Parsec e String NominalDiffTime
-hoursParser = secondsToNominalDiffTime . (* 3600) <$> _posNumParser <* char 'h'
+hoursParser = secondsToNominalDiffTime . (* 3600) <$> posNumParser <* char 'h'
 
 -- | Parse a 'NominalDiffTime' from a number of minutes from a string like @1m@.
 minutesParser
   :: Ord e
   => Parsec e String NominalDiffTime
-minutesParser = secondsToNominalDiffTime . (* 60) <$> _posNumParser <* char 'm'
+minutesParser = secondsToNominalDiffTime . (* 60) <$> posNumParser <* char 'm'
 
 -- | Parse a 'NominalDiffTime' from a number of seconds from a string like @1s@.
 secondsParser
   :: Ord e
   => Parsec e String NominalDiffTime
-secondsParser = secondsToNominalDiffTime <$> _posNumParser <* optional (char 's')
+secondsParser = secondsToNominalDiffTime <$> posNumParser <* optional (char 's')
 
 -- | Parse a 'TimeOfDay' from a string like @01:23@.
 timeParser

stack.yaml

@@ -3,3 +3,6 @@ resolver:
 
 packages:
 - .
+
+extra-deps:
+- megaparsec-utils-0.1.0.0@sha256:9c2e136b553486fcea3c3c7ae19ee829def7fe9ba22fcfc1ed553181b6c60046,2028

stack.yaml.lock

@@ -1,9 +1,16 @@
 # This file was autogenerated by Stack.
 # You should not edit this file by hand.
 # For more information, please see the documentation at:
-#   https://docs.haskellstack.org/en/stable/lock_files
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
-packages: []
+packages:
+- completed:
+    hackage: megaparsec-utils-0.1.0.0@sha256:9c2e136b553486fcea3c3c7ae19ee829def7fe9ba22fcfc1ed553181b6c60046,2028
+    pantry-tree:
+      sha256: d16978d575cab9c4268d40b2de479ee8184df60de7493401bf8954c395dcf4f9
+      size: 410
+  original:
+    hackage: megaparsec-utils-0.1.0.0@sha256:9c2e136b553486fcea3c3c7ae19ee829def7fe9ba22fcfc1ed553181b6c60046,2028
 snapshots:
 - completed:
     sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd