[Pkg-haskell-commits] r994 - in /packages/haskell-uulib/branches/upstream/current: ./ src/ src/UU/ src/UU/DData/ src/UU/Parsing/ src/UU/Pretty/ src/UU/Scanner/ src/UU/Util/
arjan at users.alioth.debian.org
arjan at users.alioth.debian.org
Sat Jan 19 16:41:07 UTC 2008
Author: arjan
Date: Sat Jan 19 16:41:07 2008
New Revision: 994
URL: http://svn.debian.org/wsvn/pkg-haskell/?sc=1&rev=994
Log:
[svn-upgrade] Integrating new upstream version, haskell-uulib (0.9.5)
Added:
packages/haskell-uulib/branches/upstream/current/uulib.cabal
Removed:
packages/haskell-uulib/branches/upstream/current/Makefile.in
packages/haskell-uulib/branches/upstream/current/VERSION
packages/haskell-uulib/branches/upstream/current/configure.in
packages/haskell-uulib/branches/upstream/current/src/DDataProps.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/Examples.hs
packages/haskell-uulib/branches/upstream/current/uulib.cabal.in
Modified:
packages/haskell-uulib/branches/upstream/current/src/UU/DData/IntSet.hs
packages/haskell-uulib/branches/upstream/current/src/UU/DData/Queue.hs
packages/haskell-uulib/branches/upstream/current/src/UU/DData/Scc.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Parsing.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/CharParser.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/Interface.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Pretty.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Pretty/Ext.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Scanner.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenToken.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenOrd.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenParser.hs
packages/haskell-uulib/branches/upstream/current/src/UU/Util/Utils.hs
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/DData/IntSet.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/DData/IntSet.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/DData/IntSet.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/DData/IntSet.hs Sat Jan 19 16:41:07 2008
@@ -848,4 +848,5 @@
prop_List :: [Int] -> Bool
prop_List xs
= (sort (nub xs) == toAscList (fromList xs))
--}
+-}
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/DData/Queue.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/DData/Queue.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/DData/Queue.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/DData/Queue.hs Sat Jan 19 16:41:07 2008
@@ -277,4 +277,5 @@
prop_TailValid :: [Int] -> Bool
prop_TailValid xs
= valid (tail (foldr insert empty (1:xs)))
--}
+-}
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/DData/Scc.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/DData/Scc.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/DData/Scc.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/DData/Scc.hs Sat Jan 19 16:41:07 2008
@@ -305,4 +305,5 @@
paths xs x
= all (\y -> path x y g) xs
--}
+-}
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Parsing.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Parsing.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Parsing.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Parsing.hs Sat Jan 19 16:41:07 2008
@@ -16,4 +16,5 @@
Delete t -> "at " ++ show t
in "\n?? Error : " ++ pos ++
"\n?? Expecting : " ++ show expecting ++
- "\n?? Repaired by: " ++ show action ++ "\n"
+ "\n?? Repaired by: " ++ show action ++ "\n"
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/CharParser.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/CharParser.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/CharParser.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/CharParser.hs Sat Jan 19 16:41:07 2008
@@ -20,7 +20,7 @@
('\LF' : _ ) -> Left' '\CR' (Input xs pos)
_ -> Left' '\CR' (Input xs (newl pos))
('\LF': xs) -> Left' '\LF' (Input xs (newl pos))
- ('\n' : xs) -> Left' '\n' (Input xs (newl pos))
+-- ('\n' : xs) -> Left' '\n' (Input xs (newl pos)) -- \n already captured above
('\t' : xs) -> Left' '\t' (Input xs (tab pos))
(x : xs) -> Left' x (Input xs (advc 1 pos))
[] -> Right' (Input [] pos)
@@ -31,7 +31,7 @@
('\LF' : _ ) -> ('\CR', Input xs pos)
_ -> ('\CR', Input xs (newl pos))
('\LF': xs) -> ( '\LF', Input xs (newl pos))
- ('\n' : xs) -> ( '\n' , Input xs (newl pos))
+-- ('\n' : xs) -> ( '\n' , Input xs (newl pos)) -- \n already captured above
('\t' : xs) -> ( '\t' , Input xs (tab pos))
(x : xs) -> ( x , Input xs (advc 1 pos))
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/Interface.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/Interface.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/Interface.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Parsing/Interface.hs Sat Jan 19 16:41:07 2008
@@ -29,8 +29,7 @@
-- | The 'IsParser' class contains the base combinators with which
-- to write parsers. A minimal complete instance definition consists of
-- definitions for '(<*>)', '(<|>)', 'pSucceed', 'pLow', 'pFail',
--- 'pCostRange', 'pCostSym', 'getfirsts', 'setfirsts', 'getzerop'
--- and 'setzerop'.
+-- 'pCostRange', 'pCostSym', 'getfirsts', 'setfirsts', and 'getzerop'.
class IsParser p s | p -> s where
-- | Sequential composition. Often used in combination with <$>.
-- The function returned by parsing the left-hand side is applied
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Pretty.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Pretty.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Pretty.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Pretty.hs Sat Jan 19 16:41:07 2008
@@ -1,4 +1,5 @@
module UU.Pretty(module UU.Pretty.Basic, module UU.Pretty.Ext ) where
import UU.Pretty.Basic
-import UU.Pretty.Ext
+import UU.Pretty.Ext
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Pretty/Ext.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Pretty/Ext.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Pretty/Ext.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Pretty/Ext.hs Sat Jan 19 16:41:07 2008
@@ -186,4 +186,5 @@
-- pp_parens_list: idem pp_list, with parenthesis and comma separator
pp_parens_list :: Int -> [PP_Doc] -> PP_Doc
-pp_parens_list mpw = pp_list mpw "(" ")" ", "
+pp_parens_list mpw = pp_list mpw "(" ")" ", "
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Scanner.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Scanner.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Scanner.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Scanner.hs Sat Jan 19 16:41:07 2008
@@ -14,4 +14,5 @@
-- instances
import UU.Scanner.TokenShow()
import UU.Scanner.GenTokenOrd()
-import UU.Scanner.GenTokenSymbol()
+import UU.Scanner.GenTokenSymbol()
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenToken.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenToken.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenToken.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenToken.hs Sat Jan 19 16:41:07 2008
@@ -8,4 +8,5 @@
position :: GenToken k t v -> Pos
position tok = case tok of
Reserved _ p -> p
- ValToken _ _ p -> p
+ ValToken _ _ p -> p
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenOrd.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenOrd.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenOrd.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenOrd.hs Sat Jan 19 16:41:07 2008
@@ -11,4 +11,5 @@
compare (Reserved x _) (Reserved y _) = compare x y
compare (Reserved _ _) _ = LT
compare (ValToken tx _ _) (ValToken ty _ _) = compare tx ty
- compare _ _ = GT
+ compare _ _ = GT
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenParser.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenParser.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenParser.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Scanner/GenTokenParser.hs Sat Jan 19 16:41:07 2008
@@ -50,4 +50,5 @@
pValTokenNoPos :: IsParser p (GenToken key tp val)
=> tp -> val -> p val
-pValTokenNoPos tp val = fst <$> pValToken tp val
+pValTokenNoPos tp val = fst <$> pValToken tp val
+
Modified: packages/haskell-uulib/branches/upstream/current/src/UU/Util/Utils.hs
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/src/UU/Util/Utils.hs?rev=994&op=diff
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/src/UU/Util/Utils.hs (original)
+++ packages/haskell-uulib/branches/upstream/current/src/UU/Util/Utils.hs Sat Jan 19 16:41:07 2008
@@ -15,4 +15,5 @@
snd3 (_,b,_) = b
thd3 :: (a,b,c) -> c
-thd3 (_,_,c) = c
+thd3 (_,_,c) = c
+
Added: packages/haskell-uulib/branches/upstream/current/uulib.cabal
URL: http://svn.debian.org/wsvn/pkg-haskell/packages/haskell-uulib/branches/upstream/current/uulib.cabal?rev=994&op=file
==============================================================================
--- packages/haskell-uulib/branches/upstream/current/uulib.cabal (added)
+++ packages/haskell-uulib/branches/upstream/current/uulib.cabal Sat Jan 19 16:41:07 2008
@@ -1,0 +1,31 @@
+cabal-version: >=1.1
+build-type: Simple
+name: uulib
+version: 0.9.5
+license: LGPL
+license-file: COPYRIGHT
+maintainer: Arie Middelkoop <ariem at cs.uu.nl>
+homepage: http://www.cs.uu.nl/wiki/HUT/WebHome
+description: Fast Parser Combinators and Pretty Printing Combinators
+synopsis: Haskell Utrecht Tools Library
+category: Parsing
+stability: Stable
+copyright: Universiteit Utrecht
+build-depends: base, haskell98
+exposed-modules: UU.Parsing.CharParser UU.Parsing.Derived
+ UU.Parsing.Interface UU.Parsing.MachineInterface
+ UU.Parsing.Merge UU.Parsing.Offside UU.Parsing.Perms
+ UU.Parsing.StateParser UU.Parsing UU.DData.IntBag
+ UU.DData.Map UU.DData.MultiSet UU.DData.Queue
+ UU.DData.Scc UU.DData.Seq UU.DData.Set UU.PPrint
+ UU.Pretty.Ext UU.Pretty UU.Scanner.GenToken UU.Scanner.GenTokenOrd
+ UU.Scanner.GenTokenParser UU.Scanner.GenTokenSymbol
+ UU.Scanner.Position UU.Scanner.Scanner
+ 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
+ UU.DData.IntMap
+ UU.DData.IntSet
+extensions: RankNTypes FunctionalDependencies TypeSynonymInstances UndecidableInstances FlexibleInstances MultiParamTypeClasses FlexibleContexts CPP ExistentialQuantification
+hs-source-dirs: src
+extra-source-files: README, LICENSE-LGPL
More information about the Pkg-haskell-commits
mailing list