ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-29 04:04:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

king: simplify parser types to avoid invalid existential newtype

Browse Source
This commit is contained in:
Brendan Hay 2020-10-27 13:05:42 +01:00
parent 2b74a8edd6
commit 74db584ad7
No known key found for this signature in database
GPG Key ID: 80E915C54A7C457D
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/hs/urbit-noun-core/lib/Urbit/Noun/Convert.hs
View File

@ -12,10 +12,9 @@ module Urbit.Noun.Convert
import ClassyPrelude hiding (hash)
import Control.Monad.Fail (MonadFail (fail))
import Urbit.Noun.Core
import qualified Control.Monad.Fail as Fail
-- Types -----------------------------------------------------------------------
@ -24,11 +23,11 @@ type ParseStack = [Text]
-- "Parser" --------------------------------------------------------------------
type Failure f r = ParseStack -> String -> f r
type Success a f r = a -> f r
type Failure a = ParseStack -> String -> a
type Success a b = a -> b
newtype Parser a = Parser {
runParser :: forall f r. ParseStack -> Failure f r -> Success a f r -> f r
runParser :: forall r. ParseStack -> Failure r -> Success a r -> r
}
named :: Text -> Parser a -> Parser a
@ -39,9 +38,8 @@ instance Monad Parser where
m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks
in runParser m path kf ks'
return = pure
fail = Fail.fail
instance Fail.MonadFail Parser where
instance MonadFail Parser where
fail msg = Parser $ \path kf _ks -> kf (reverse path) msg
instance Functor Parser where