Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-charset for openSUSE:Factory checked in at 2021-03-10 08:54:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-charset (Old) and /work/SRC/openSUSE:Factory/.ghc-charset.new.2378 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-charset" Wed Mar 10 08:54:35 2021 rev:6 rq:877618 version:0.3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-charset/ghc-charset.changes 2021-01-20 18:26:06.139442325 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-charset.new.2378/ghc-charset.changes 2021-03-10 08:56:39.226851730 +0100 @@ -1,0 +2,8 @@ +Sat Feb 20 00:08:08 UTC 2021 - [email protected] + +- Update charset to version 0.3.8. + Upstream added a new change log file in this release. With no + previous version to compare against, the automatic updater cannot + reliable determine the relevante entries for this release. + +------------------------------------------------------------------- Old: ---- charset-0.3.7.1.tar.gz charset.cabal New: ---- charset-0.3.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-charset.spec ++++++ --- /var/tmp/diff_new_pack.HJA1rT/_old 2021-03-10 08:56:39.762852284 +0100 +++ /var/tmp/diff_new_pack.HJA1rT/_new 2021-03-10 08:56:39.766852287 +0100 @@ -18,19 +18,17 @@ %global pkg_name charset Name: ghc-%{pkg_name} -Version: 0.3.7.1 +Version: 0.3.8 Release: 0 Summary: Fast unicode character sets based on complemented PATRICIA tries License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-rpm-macros -BuildRequires: ghc-semigroups-devel BuildRequires: ghc-unordered-containers-devel ExcludeArch: %{ix86} @@ -49,7 +47,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -67,5 +64,6 @@ %license LICENSE %files devel -f %{name}-devel.files +%doc CHANGELOG.markdown README.markdown %changelog ++++++ charset-0.3.7.1.tar.gz -> charset-0.3.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.7.1/.travis.yml new/charset-0.3.8/.travis.yml --- old/charset-0.3.7.1/.travis.yml 2015-04-01 19:10:45.000000000 +0200 +++ new/charset-0.3.8/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -language: haskell diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.7.1/CHANGELOG.markdown new/charset-0.3.8/CHANGELOG.markdown --- old/charset-0.3.7.1/CHANGELOG.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/charset-0.3.8/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,28 @@ +0.3.8 [2021.02.17] +------------------ +* Add an `IsString CharSet` instance. + +0.3.7.1 +------- +* Minor haddock fixup. + +0.3.7 +----- +* Switched to derived Typeable for GHC 7.8 compatibility + +0.3.6 +----- +* Removed some duplicated blocks in `Data.CharSet.Unicode.Block.blocks`, see issue #3. + +0.3.5.1 +------- +* Updated dependencies to support GHC 7.8 + +0.3.5 +----- +* Claim to be Trustworthy. + +0.3.3 +----- +* Removed upper bounds on my other packages + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.7.1/README.markdown new/charset-0.3.8/README.markdown --- old/charset-0.3.7.1/README.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/charset-0.3.8/README.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -0,0 +1,15 @@ +charsets +======== + +[](https://hackage.haskell.org/package/charset) [](https://github.com/ekmett/charset/actions?query=workflow%3AHaskell-CI) + +Fast utf-8 character sets for Haskell represented as complemented PATRICIA tries. + +Contact Information +------------------- + +Contributions and bug reports are welcome! + +Please feel free to contact me through github or on the #haskell IRC channel on irc.freenode.net. + +-Edward Kmett diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.7.1/charset.cabal new/charset-0.3.8/charset.cabal --- old/charset-0.3.7.1/charset.cabal 2015-04-01 19:10:45.000000000 +0200 +++ new/charset-0.3.8/charset.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,35 +1,50 @@ name: charset -version: 0.3.7.1 +version: 0.3.8 license: BSD3 license-File: LICENSE copyright: (c) Edward Kmett 2010-2012 author: Edward Kmett maintainer: [email protected] -cabal-version: >= 1.6 +cabal-version: >= 1.10 stability: Experimental category: Data homepage: http://github.com/ekmett/charset bug-reports: http://github.com/ekmett/charset/issues synopsis: Fast unicode character sets based on complemented PATRICIA tries -description: Fast unicode character sets based on complemented PATRICIA tries +description: Fast unicode character sets based on complemented PATRICIA tries. build-type: Simple -extra-source-files: .travis.yml +extra-source-files: CHANGELOG.markdown, README.markdown + +tested-with: + GHC ==7.0.4 + || ==7.2.2 + || ==7.4.2 + || ==7.6.3 + || ==7.8.4 + || ==7.10.3 + || ==8.0.2 + || ==8.2.2 + || ==8.4.4 + || ==8.6.5 + || ==8.8.3 + || ==8.10.1 source-repository head type: git location: git://github.com/ekmett/charset.git library - extensions: CPP + default-extensions: CPP other-extensions: MagicHash, BangPatterns build-depends: base >= 4 && < 5, array >= 0.2 && < 0.6, - bytestring >= 0.9 && < 0.11, - containers >= 0.2 && < 0.6, - semigroups >= 0.8.3.1 && < 1, + bytestring >= 0.9 && < 0.12, + containers >= 0.2 && < 0.7, unordered-containers >= 0.1.4.6 && < 0.3 + if impl(ghc < 8.0) + build-depends: semigroups >= 0.8.3.1 && < 1 exposed-modules: Data.CharSet @@ -44,3 +59,4 @@ hs-source-dirs: src ghc-options: -Wall -fspec-constr -fdicts-cheap -O2 + default-language: Haskell2010 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.7.1/src/Data/CharSet/ByteSet.hs new/charset-0.3.8/src/Data/CharSet/ByteSet.hs --- old/charset-0.3.7.1/src/Data/CharSet/ByteSet.hs 2015-04-01 19:10:45.000000000 +0200 +++ new/charset-0.3.8/src/Data/CharSet/ByteSet.hs 2001-09-09 03:46:40.000000000 +0200 @@ -14,9 +14,11 @@ -- Stability : experimental -- Portability : non-portable (BangPatterns, MagicHash) -- --- Fast set membership tests for byte values, The set representation is --- unboxed for efficiency and uses a lookup table. This is a fairly minimal --- API. You probably want to use CharSet. +-- Fast set membership tests for byte values. The set representation is +-- unboxed for efficiency and uses one bit per byte to represent the presence +-- or absence of a byte in the set. +-- +-- This is a fairly minimal API. You probably want to use CharSet. ----------------------------------------------------------------------------- module Data.CharSet.ByteSet ( @@ -38,7 +40,11 @@ newtype ByteSet = ByteSet B.ByteString deriving (Eq, Ord, Show) -data I = I {-# UNPACK #-} !Int {-# UNPACK #-} !Word8 +-- | Representation of the index of a bit inside a bytestring +-- in terms of a byte index and a bit index inside the byte +data I = I + {-# UNPACK #-} !Int -- byte index + {-# UNPACK #-} !Word8 -- bit index shiftR :: Int -> Int -> Int shiftR (I# x#) (I# i#) = I# (x# `iShiftRA#` i#) @@ -46,6 +52,7 @@ shiftL :: Word8 -> Int -> Word8 shiftL (W8# x#) (I# i#) = W8# (narrow8Word# (x# `shiftL#` i#)) +-- | Convert a bit index to a byte index and bit index inside the byte index :: Int -> I index i = I (i `shiftR` 3) (1 `shiftL` (i .&. 7)) {-# INLINE index #-} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.7.1/src/Data/CharSet.hs new/charset-0.3.8/src/Data/CharSet.hs --- old/charset-0.3.7.1/src/Data/CharSet.hs 2015-04-01 19:10:45.000000000 +0200 +++ new/charset-0.3.8/src/Data/CharSet.hs 2001-09-09 03:46:40.000000000 +0200 @@ -13,12 +13,12 @@ -- Stability : experimental -- Portability : portable -- --- Fast set membership tests for 'Char' values +-- A CharSet is an /efficient/ representation of a set of 'Char' values +-- designed for fast membership tests. -- --- Stored as a (possibly negated) IntMap and a fast set used for the head byte. --- --- The set of valid (possibly negated) head bytes is stored unboxed as a 32-byte --- bytestring-based lookup table. +-- As an example @build isAlpha@ will create a set of alphabetic characters. +-- We can then use 'member' on the generated set to /efficiently/ test if a +-- given @Char@ represents an alphabetic character. -- -- Designed to be imported qualified: -- @@ -75,6 +75,11 @@ , toArray ) where +#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 608 +import Data.String (IsString(..)) +-- <<< -XOverloadedStrings >>> was introduced by GHC 6.8.1 +#endif + import Data.Array.Unboxed hiding (range) import Data.Data import Data.Function (on) @@ -91,9 +96,22 @@ import qualified Prelude as P import Text.Read -data CharSet = CharSet !Bool {-# UNPACK #-} !ByteSet !IntSet +-- | Stored as a (possibly negated) IntSet and a fast set used for the head byte. +-- +-- The set of valid (possibly negated) head bytes is stored unboxed as a 32-byte +-- bytestring-based lookup table. +data CharSet = CharSet + !Bool -- Whether ByteSet and IntSet are negated + !ByteSet -- Set of head bytes, unboxed + !IntSet -- Set of characters in the charset deriving Typeable +#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 608 +-- | @= CharSet.`fromList`@ +instance IsString CharSet where + fromString = fromList +#endif + charSet :: Bool -> IntSet -> CharSet charSet b s = CharSet b (ByteSet.fromList (fmap headByte (I.toAscList s))) s @@ -113,6 +131,11 @@ (\\) :: CharSet -> CharSet -> CharSet (\\) = difference +-- | Applies a predicate across the whole range of possible character values +-- to create a set of only those characters which satisfy the predicate. +-- +-- As an example @build isAlpha@ will generate a CharSet of all +-- alphabetic characters. build :: (Char -> Bool) -> CharSet build p = fromDistinctAscList $ P.filter p [minBound .. maxBound] {-# INLINE build #-}
