uulib 0.9.24 → 0.9.25
raw patch · 9 files changed
+10/−16 lines, 9 filesdep −ghc-primPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependencies removed: ghc-prim
API changes (from Hackage documentation)
- UU.PPrint: instance UU.PPrint.Pretty GHC.Integer.Type.Integer
- UU.Parsing.Interface: instance (GHC.Classes.Ord s, UU.Parsing.MachineInterface.Symbol s, UU.Parsing.MachineInterface.InputState state s p, UU.Parsing.MachineInterface.OutputState result, GHC.Base.Applicative (UU.Parsing.Machine.AnaParser state result s p)) => GHC.Base.Functor (UU.Parsing.Machine.AnaParser state result s p)
+ UU.PPrint: instance UU.PPrint.Pretty GHC.Num.Integer.Integer
+ UU.Parsing.Interface: instance (GHC.Classes.Ord s, UU.Parsing.MachineInterface.Symbol s, UU.Parsing.MachineInterface.InputState state s p, UU.Parsing.MachineInterface.OutputState result) => GHC.Base.Functor (UU.Parsing.Machine.AnaParser state result s p)
- UU.PPrint: text :: [Char] -> Doc
+ UU.PPrint: text :: String -> Doc
- UU.Parsing.Interface: handleEof :: (InputState a s p, Symbol s) => a -> Steps (Pair a ()) s p
+ UU.Parsing.Interface: handleEof :: (Symbol s, InputState a s p) => a -> Steps (Pair a ()) s p
- UU.Parsing.Machine: anaCostRange :: (InputState b s p, OutputState a, Symbol s, Ord s) => Int# -> s -> SymbolR s -> AnaParser b a s p s
+ UU.Parsing.Machine: anaCostRange :: forall {a :: Type -> Type -> Type} {b} {d} {p}. (OutputState a, InputState b d p, Symbol d, Ord d) => Int# -> d -> SymbolR d -> AnaParser b a d p d
- UU.Parsing.Machine: anaDynE :: () => ParsRec state result s p a -> AnaParser state result s p a
+ UU.Parsing.Machine: anaDynE :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a}. ParsRec state result s p a -> AnaParser state result s p a
- UU.Parsing.Machine: anaDynL :: () => ParsRec state result s p a -> AnaParser state result s p a
+ UU.Parsing.Machine: anaDynL :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a}. ParsRec state result s p a -> AnaParser state result s p a
- UU.Parsing.Machine: anaGetFirsts :: () => AnaParser state result s p a -> Expecting s
+ UU.Parsing.Machine: anaGetFirsts :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a}. AnaParser state result s p a -> Expecting s
- UU.Parsing.Machine: anaLow :: OutputState result => a -> AnaParser state result s p a
+ UU.Parsing.Machine: anaLow :: forall {result :: Type -> Type -> Type} {a} {state} {s} {p}. OutputState result => a -> AnaParser state result s p a
- UU.Parsing.Machine: anaOr :: (InputState state s p, Symbol s, OutputState result, Ord s) => AnaParser state result s p a -> AnaParser state result s p a -> AnaParser state result s p a
+ UU.Parsing.Machine: anaOr :: forall {state} {s} {p} {result :: Type -> Type -> Type} {a}. (InputState state s p, Symbol s, OutputState result, Ord s) => AnaParser state result s p a -> AnaParser state result s p a -> AnaParser state result s p a
- UU.Parsing.Machine: anaSeq :: (InputState state1 s p1, Symbol s, OutputState result1, Ord s, OutputState result2) => (a1 -> ParsRec state2 result2 s p2 a2 -> ParsRec state1 result1 s p1 a3) -> (ParsRec state3 result3 s p3 a1 -> ParsRec state2 result2 s p2 a2 -> ParsRec state1 result1 s p1 a3) -> (a1 -> a2 -> a3) -> AnaParser state3 result3 s p3 a1 -> AnaParser state2 result2 s p2 a2 -> AnaParser state1 result1 s p1 a3
+ UU.Parsing.Machine: anaSeq :: forall {state} {s} {p} {result :: Type -> Type -> Type} {result :: Type -> Type -> Type} {a} {state} {p} {a} {a} {state} {result :: Type -> Type -> Type} {p}. (InputState state s p, Symbol s, Ord s, OutputState result, OutputState result) => (a -> ParsRec state result s p a -> ParsRec state result s p a) -> (ParsRec state result s p a -> ParsRec state result s p a -> ParsRec state result s p a) -> (a -> a -> a) -> AnaParser state result s p a -> AnaParser state result s p a -> AnaParser state result s p a
- UU.Parsing.Machine: anaSetFirsts :: (InputState state s p, Symbol s, Ord s, OutputState result) => Expecting s -> AnaParser state result s p a -> AnaParser state result s p a
+ UU.Parsing.Machine: anaSetFirsts :: forall {state} {s} {p} {result :: Type -> Type -> Type} {a}. (InputState state s p, Symbol s, Ord s, OutputState result) => Expecting s -> AnaParser state result s p a -> AnaParser state result s p a
- UU.Parsing.Machine: anaSucceed :: OutputState result => a -> AnaParser state result s p a
+ UU.Parsing.Machine: anaSucceed :: forall {result :: Type -> Type -> Type} {a} {state} {s} {p}. OutputState result => a -> AnaParser state result s p a
- UU.Parsing.Machine: getStart :: () => Message sym pos -> Expecting sym
+ UU.Parsing.Machine: getStart :: Message sym pos -> Expecting sym
- UU.Parsing.Machine: libDollar :: OutputState result1 => (a1 -> a2) -> ParsRec state result2 s p a1 -> ParsRec state result1 s p a2
+ UU.Parsing.Machine: libDollar :: forall {result :: Type -> Type -> Type} {a} {a} {state} {result :: Type -> Type -> Type} {s} {p}. OutputState result => (a -> a) -> ParsRec state result s p a -> ParsRec state result s p a
- UU.Parsing.Machine: libDollarL :: OutputState result1 => a1 -> ParsRec state result2 s p a2 -> ParsRec state result1 s p a1
+ UU.Parsing.Machine: libDollarL :: forall {result :: Type -> Type -> Type} {a} {state} {result :: Type -> Type -> Type} {s} {p} {a}. OutputState result => a -> ParsRec state result s p a -> ParsRec state result s p a
- UU.Parsing.Machine: libDollarR :: OutputState result1 => p1 -> ParsRec state result2 s p2 a -> ParsRec state result1 s p2 a
+ UU.Parsing.Machine: libDollarR :: forall {result :: Type -> Type -> Type} {p} {state} {result :: Type -> Type -> Type} {s} {p} {a}. OutputState result => p -> ParsRec state result s p a -> ParsRec state result s p a
- UU.Parsing.Machine: libInsert :: (OutputState result, InputState state s1 p, InputState state a p, InputState state s2 p) => Int# -> a -> Expecting a -> ParsRec state result a p a
+ UU.Parsing.Machine: libInsert :: forall {result :: Type -> Type -> Type} {state} {a} {p}. (OutputState result, InputState state a p) => Int# -> a -> Expecting a -> ParsRec state result a p a
- UU.Parsing.Machine: libOr :: (OutputState result1, Ord s) => ParsRec state result2 s p a -> ParsRec state result3 s p a -> ParsRec state result1 s p a
+ UU.Parsing.Machine: libOr :: forall {result :: Type -> Type -> Type} {s} {state} {result :: Type -> Type -> Type} {p} {a} {result :: Type -> Type -> Type}. (OutputState result, Ord s) => ParsRec state result s p a -> ParsRec state result s p a -> ParsRec state result s p a
- UU.Parsing.Machine: libSeq :: (OutputState result1, OutputState result2) => ParsRec state result3 s p (a1 -> a2) -> ParsRec state result2 s p a1 -> ParsRec state result1 s p a2
+ UU.Parsing.Machine: libSeq :: forall {result :: Type -> Type -> Type} {result :: Type -> Type -> Type} {state} {result :: Type -> Type -> Type} {s} {p} {b} {a}. (OutputState result, OutputState result) => ParsRec state result s p (b -> a) -> ParsRec state result s p b -> ParsRec state result s p a
- UU.Parsing.Machine: libSeqL :: OutputState result1 => ParsRec state result2 s p a1 -> ParsRec state result3 s p a2 -> ParsRec state result1 s p a1
+ UU.Parsing.Machine: libSeqL :: forall {result :: Type -> Type -> Type} {state} {result :: Type -> Type -> Type} {s} {p} {a} {result :: Type -> Type -> Type} {a}. OutputState result => ParsRec state result s p a -> ParsRec state result s p a -> ParsRec state result s p a
- UU.Parsing.Machine: libSeqR :: OutputState result1 => ParsRec state result2 s p a1 -> ParsRec state result3 s p a2 -> ParsRec state result1 s p a2
+ UU.Parsing.Machine: libSeqR :: forall {result :: Type -> Type -> Type} {state} {result :: Type -> Type -> Type} {s} {p} {a} {result :: Type -> Type -> Type} {a}. OutputState result => ParsRec state result s p a -> ParsRec state result s p a -> ParsRec state result s p a
- UU.Parsing.Machine: libSucceed :: OutputState result => a -> ParsRec state result s p a
+ UU.Parsing.Machine: libSucceed :: forall {result :: Type -> Type -> Type} {a} {state} {s} {p}. OutputState result => a -> ParsRec state result s p a
- UU.Parsing.Machine: mapOnePars :: () => (ParsRec state1 result1 s p1 a1 -> ParsRec state2 result2 s p2 a2) -> OneDescr state1 result1 s p1 a1 -> OneDescr state2 result2 s p2 a2
+ UU.Parsing.Machine: mapOnePars :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a} {state} {result :: Type -> Type -> Type} {p} {a}. (ParsRec state result s p a -> ParsRec state result s p a) -> OneDescr state result s p a -> OneDescr state result s p a
- UU.Parsing.Machine: mergeTables :: (Ord a1, Symbol a1, OutputState result, Ord s) => [(SymbolR a1, ParsRec state result s p a2)] -> [(SymbolR a1, ParsRec state result s p a2)] -> [(SymbolR a1, ParsRec state result s p a2)]
+ UU.Parsing.Machine: mergeTables :: forall {a} {result :: Type -> Type -> Type} {s} {state} {p} {a}. (Symbol a, OutputState result, Ord a, Ord s) => [(SymbolR a, ParsRec state result s p a)] -> [(SymbolR a, ParsRec state result s p a)] -> [(SymbolR a, ParsRec state result s p a)]
- UU.Parsing.Machine: mkPR :: OutputState result => (RealParser state s p a, RealRecogn state s p) -> ParsRec state result s p a
+ UU.Parsing.Machine: mkPR :: forall {result :: Type -> Type -> Type} {state} {s} {p} {a}. OutputState result => (RealParser state s p a, RealRecogn state s p) -> ParsRec state result s p a
- UU.Parsing.Machine: nat_min :: () => Nat -> Nat -> (Nat, (b -> b -> c) -> b -> b -> c)
+ UU.Parsing.Machine: nat_min :: Nat -> Nat -> (Nat, (b -> b -> c) -> b -> b -> c)
- UU.Parsing.Machine: noOneParser :: () => OneDescr state result s p a
+ UU.Parsing.Machine: noOneParser :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a}. OneDescr state result s p a
- UU.Parsing.Machine: orOneOneDescr :: Ord s => OneDescr state result s p a -> OneDescr state result s p a -> Bool -> OneDescr state result s p a
+ UU.Parsing.Machine: orOneOneDescr :: forall {s} {state} {result :: Type -> Type -> Type} {p} {a}. Ord s => OneDescr state result s p a -> OneDescr state result s p a -> Bool -> OneDescr state result s p a
- UU.Parsing.Machine: pDynE :: () => ParsRec state result s p a -> AnaParser state result s p a
+ UU.Parsing.Machine: pDynE :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a}. ParsRec state result s p a -> AnaParser state result s p a
- UU.Parsing.Machine: pDynL :: () => ParsRec state result s p a -> AnaParser state result s p a
+ UU.Parsing.Machine: pDynL :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a}. ParsRec state result s p a -> AnaParser state result s p a
- UU.Parsing.Machine: pEmpty :: () => ParsRec state result s p a -> (Bool, Either a (ParsRec state result s p a)) -> AnaParser state result s p a
+ UU.Parsing.Machine: pEmpty :: forall {state} {result :: Type -> Type -> Type} {s} {p} {a}. ParsRec state result s p a -> (Bool, Either a (ParsRec state result s p a)) -> AnaParser state result s p a
- UU.Parsing.Machine: seqZeroZero :: OutputState result => Maybe (Bool, Either t1 t2) -> Maybe (Bool, Either a1 (ParsRec state result s p a1)) -> (t1 -> ParsRec state result s p a1 -> b) -> (t2 -> ParsRec state result s p a1 -> b) -> (t1 -> a1 -> a2) -> Maybe (Bool, Either a2 b)
+ UU.Parsing.Machine: seqZeroZero :: forall {result :: Type -> Type -> Type} {t} {t} {a} {state} {s} {p} {b} {a}. OutputState result => Maybe (Bool, Either t t) -> Maybe (Bool, Either a (ParsRec state result s p a)) -> (t -> ParsRec state result s p a -> b) -> (t -> ParsRec state result s p a -> b) -> (t -> a -> a) -> Maybe (Bool, Either a b)
- UU.Parsing.Machine: unP :: () => RealParser state s p a -> (a -> r'' -> r') -> (state -> Steps r'' s p) -> state -> Steps r' s p
+ UU.Parsing.Machine: unP :: RealParser state s p a -> (a -> r'' -> r') -> (state -> Steps r'' s p) -> state -> Steps r' s p
- UU.Parsing.Machine: unR :: () => RealRecogn state s p -> (state -> Steps r s p) -> state -> Steps r s p
+ UU.Parsing.Machine: unR :: RealRecogn state s p -> (state -> Steps r s p) -> state -> Steps r s p
- UU.Parsing.MachineInterface: except :: (Foldable t, Ord s, Symbol s) => SymbolR s -> t s -> [SymbolR s]
+ UU.Parsing.MachineInterface: except :: (Foldable t, Ord a, Symbol a) => SymbolR a -> t a -> [SymbolR a]
- UU.Parsing.MachineInterface: systemerror :: () => [Char] -> [Char] -> a
+ UU.Parsing.MachineInterface: systemerror :: [Char] -> [Char] -> a
- UU.Parsing.MachineInterface: usererror :: () => [Char] -> a
+ UU.Parsing.MachineInterface: usererror :: [Char] -> a
- UU.Pretty.Ext: pp_block :: (Foldable t1, PP (t1 a1), PP (t2 a2), Foldable t2, Foldable t3, PP (t3 a3)) => t2 a2 -> t1 a1 -> t3 a3 -> [PP_Doc] -> PP_Doc
+ UU.Pretty.Ext: pp_block :: (Foldable t, Foldable t, Foldable t, PP (t a), PP (t a), PP (t a)) => t a -> t a -> t a -> [PP_Doc] -> PP_Doc
- UU.Pretty.Ext: pp_ite :: (PP a1, PP b1, PP a2, PP b2, PP a3, PP b3, PP a4) => a1 -> a2 -> a3 -> a4 -> b1 -> b2 -> b3 -> PP_Doc
+ UU.Pretty.Ext: pp_ite :: (PP a, PP b, PP a, PP b, PP a, PP b, PP a) => a -> a -> a -> a -> b -> b -> b -> PP_Doc
- UU.Pretty.Ext: wide_text :: Int -> String -> PP_Doc
+ UU.Pretty.Ext: wide_text :: Int -> [Char] -> PP_Doc
Files
- src/UU/Parsing/CharParser.hs +0/−1
- src/UU/Parsing/Interface.hs +2/−2
- src/UU/Parsing/Machine.hs +1/−4
- src/UU/Parsing/MachineInterface.hs +1/−1
- src/UU/Parsing/Offside.hs +0/−1
- src/UU/Parsing/StateParser.hs +0/−1
- src/UU/Scanner/GenTokenParser.hs +1/−1
- src/UU/Scanner/GenTokenSymbol.hs +0/−1
- uulib.cabal +5/−4
src/UU/Parsing/CharParser.hs view
@@ -3,7 +3,6 @@ ScopedTypeVariables #-} module UU.Parsing.CharParser where-import GHC.Prim import UU.Parsing.Interface import UU.Scanner.Position
src/UU/Parsing/Interface.hs view
@@ -9,7 +9,7 @@ , (<*>), (<*), (*>), (<$>), (<$), (<|>) ) where -import GHC.Prim+import GHC.Exts ( Int# ) import UU.Parsing.Machine import UU.Parsing.MachineInterface --import IOExts@@ -158,7 +158,7 @@ empty = anaFail {-# INLINE empty #-} -instance (Ord s, Symbol s, InputState state s p, OutputState result, Applicative (AnaParser state result s p)) => Functor (AnaParser state result s p) where+instance (Ord s, Symbol s, InputState state s p, OutputState result) => Functor (AnaParser state result s p) where fmap f p = pure f <*> p {-# INLINE fmap #-}
src/UU/Parsing/Machine.hs view
@@ -8,10 +8,7 @@ import Prelude hiding ( traverse ) #endif -import GHC.Prim-#if __GLASGOW_HASKELL__ >= 708-import GHC.Types (isTrue#)-#endif+import GHC.Exts ( Int#, (+#), (-#), (>#), (<#), (<=#), (>=#), (==#), isTrue# ) import UU.Util.BinaryTrees import UU.Parsing.MachineInterface
src/UU/Parsing/MachineInterface.hs view
@@ -2,7 +2,7 @@ UnboxedTuples #-} module UU.Parsing.MachineInterface where-import GHC.Prim+import GHC.Exts ( Int# ) -- | The 'InputState' class contains the interface that the AnaParser -- parsers expect for the input. A minimal complete instance definition
src/UU/Parsing/Offside.hs view
@@ -19,7 +19,6 @@ , OffsideParser(..) ) where -import GHC.Prim import Data.Maybe import Control.Applicative import UU.Parsing.Interface
src/UU/Parsing/StateParser.hs view
@@ -3,7 +3,6 @@ ScopedTypeVariables #-} module UU.Parsing.StateParser(StateParser(..)) where-import GHC.Prim import UU.Parsing.MachineInterface import UU.Parsing.Machine(AnaParser, ParsRec(..),RealParser(..),RealRecogn(..), mkPR, anaDynE)
src/UU/Scanner/GenTokenParser.hs view
@@ -4,7 +4,7 @@ module UU.Scanner.GenTokenParser where -import GHC.Base+import GHC.Exts ( Int(..) ) import UU.Parsing.Interface(IsParser(pCostSym, pSym), (<$>)) import UU.Scanner.GenToken(GenToken(..)) import UU.Scanner.Position(Pos, noPos)
src/UU/Scanner/GenTokenSymbol.hs view
@@ -1,7 +1,6 @@ {-# LANGUAGE MagicHash #-} module UU.Scanner.GenTokenSymbol() where-import GHC.Prim import UU.Scanner.GenToken(GenToken(..)) import UU.Parsing.MachineInterface(Symbol(..))
uulib.cabal view
@@ -1,5 +1,5 @@ name: uulib-version: 0.9.24+version: 0.9.25 license: BSD3 license-file: COPYRIGHT @@ -12,7 +12,7 @@ stability: Stable copyright: Universiteit Utrecht-cabal-version: >= 1.6+cabal-version: >= 1.10 build-type: Simple extra-source-files: README.md,@@ -28,7 +28,8 @@ location: https://github.com/UU-ComputerScience/uulib.git library- build-depends: base>=4 && <5, ghc-prim >= 0.2.0.0+ default-language: Haskell2010+ build-depends: base>=4 && <5 exposed-modules: UU.Parsing.CharParser UU.Parsing.Derived UU.Parsing.Interface UU.Parsing.MachineInterface UU.Parsing.Merge UU.Parsing.Offside UU.Parsing.Perms@@ -40,5 +41,5 @@ UU.Scanner.Token UU.Scanner.TokenParser UU.Scanner.TokenShow UU.Scanner UU.Util.BinaryTrees UU.Util.PermTree UU.Util.Utils UU.Pretty.Basic UU.Parsing.Machine- extensions: RankNTypes FunctionalDependencies TypeSynonymInstances UndecidableInstances FlexibleInstances MultiParamTypeClasses FlexibleContexts CPP ExistentialQuantification+ default-extensions: RankNTypes FunctionalDependencies TypeSynonymInstances UndecidableInstances FlexibleInstances MultiParamTypeClasses FlexibleContexts CPP ExistentialQuantification hs-source-dirs: src