uulib 0.9.12 → 0.9.13

raw patch · 10 files changed

+35/−8 lines, 10 files

Files

src/UU/Parsing/CharParser.hs +4/−0
src/UU/Parsing/Interface.hs +4/−1
src/UU/Parsing/Machine.hs +4/−0
src/UU/Parsing/MachineInterface.hs +2/−1
src/UU/Parsing/Offside.hs +4/−0
src/UU/Parsing/Perms.hs +5/−4
src/UU/Parsing/StateParser.hs +4/−0
src/UU/Scanner/GenTokenParser.hs +4/−0
src/UU/Scanner/GenTokenSymbol.hs +2/−0
uulib.cabal +2/−2

src/UU/Parsing/CharParser.hs view

@@ -1,3 +1,7 @@+{-# LANGUAGE  MagicHash,+              UnboxedTuples,+              ScopedTypeVariables #-}+ module UU.Parsing.CharParser where import GHC.Prim import UU.Parsing.Interface

src/UU/Parsing/Interface.hs view

@@ -1,4 +1,7 @@-{-# OPTIONS -fglasgow-exts  #-}+{-# LANGUAGE  MagicHash,+              UnboxedTuples,+              ScopedTypeVariables #-}+ module UU.Parsing.Interface         ( AnaParser, pWrap, pMap        , module UU.Parsing.MachineInterface

src/UU/Parsing/Machine.hs view

@@ -1,3 +1,7 @@+{-# LANGUAGE  MagicHash,+              UnboxedTuples,+              ScopedTypeVariables #-}+ module UU.Parsing.Machine where import GHC.Prim import UU.Util.BinaryTrees

src/UU/Parsing/MachineInterface.hs view

@@ -1,4 +1,5 @@-+{-# LANGUAGE  MagicHash,+              UnboxedTuples #-}  module UU.Parsing.MachineInterface where import GHC.Prim

src/UU/Parsing/Offside.hs view

@@ -1,3 +1,7 @@+{-# LANGUAGE  MagicHash,+              UnboxedTuples,+              ScopedTypeVariables #-}+ module UU.Parsing.Offside( parseOffside                           , pBlock                           , pBlock1

src/UU/Parsing/Perms.hs view

@@ -1,4 +1,5 @@-{-# OPTIONS -fglasgow-exts  #-}+{-# LANGUAGE ScopedTypeVariables #-}+ module UU.Parsing.Perms(Perms(), pPerms, pPermsSep, succeedPerms, (~*~), (~$~)) where  import UU.Parsing@@ -49,9 +50,9 @@  pPermsSep :: IsParser p s => p x -> Perms p a -> p a pPermsSep (sep :: p z) perm = p2p (pSucceed ()) perm- where  p2p :: IsParser p s => p x -> Perms p a -> p a+ where  p2p ::  p () -> Perms p a -> p a         p2p fsep (Perms (mbempty, nonempties)) =                  let empty          = fromMaybe  pFail mbempty-                    pars (Br t p)  = flip ($) <$ fsep <*> p <*> p2p sep t+                    pars (Br t p)  = flip ($) <$ fsep <*> p <*> p2p_sep t                 in foldr (<|>) empty (map pars nonempties)              -        p2p_sep =  p2p sep                   +        p2p_sep =  p2p (()<$ sep)

src/UU/Parsing/StateParser.hs view

@@ -1,3 +1,7 @@+{-# LANGUAGE  MagicHash,+              UnboxedTuples,+              ScopedTypeVariables #-}+ module UU.Parsing.StateParser(StateParser(..)) where import GHC.Prim import UU.Parsing.MachineInterface

src/UU/Scanner/GenTokenParser.hs view

@@ -1,3 +1,7 @@+{-# LANGUAGE  MagicHash,+              UnboxedTuples,+              ScopedTypeVariables #-}+ module UU.Scanner.GenTokenParser where import GHC.Base import UU.Parsing.Interface(IsParser(pCostSym, pSym, (<$>)))

src/UU/Scanner/GenTokenSymbol.hs view

@@ -1,3 +1,5 @@+{-# LANGUAGE  MagicHash #-}+ module UU.Scanner.GenTokenSymbol() where import GHC.Prim import UU.Scanner.GenToken(GenToken(..))

uulib.cabal view

@@ -1,7 +1,7 @@ cabal-version: >=1.1 build-type: Simple name: uulib-version: 0.9.12+version: 0.9.13 license: LGPL license-file: COPYRIGHT maintainer: Arie Middelkoop <ariem@cs.uu.nl>@@ -11,6 +11,7 @@ category: Parsing stability: Stable copyright: Universiteit Utrecht+cabal-version: >= 1.2 extra-source-files: README, LICENSE-LGPL,                     examples/bibtex/Bibtex.hs,                     examples/parser/Example.hs,@@ -37,6 +38,5 @@                    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-  ghc-options: -fglasgow-exts   hs-source-dirs: src