Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-attoparsec-aeson for
openSUSE:Factory checked in at 2024-07-22 17:16:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-attoparsec-aeson (Old)
and /work/SRC/openSUSE:Factory/.ghc-attoparsec-aeson.new.17339 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-attoparsec-aeson"
Mon Jul 22 17:16:03 2024 rev:2 rq:1188621 version:2.2.2.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-attoparsec-aeson/ghc-attoparsec-aeson.changes
2024-03-20 21:15:26.476394365 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-attoparsec-aeson.new.17339/ghc-attoparsec-aeson.changes
2024-07-22 17:16:35.513901636 +0200
@@ -1,0 +2,6 @@
+Fri May 17 00:08:28 UTC 2024 - Peter Simons <[email protected]>
+
+- Update attoparsec-aeson to version 2.2.2.0.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
attoparsec-aeson-2.2.0.1.tar.gz
New:
----
attoparsec-aeson-2.2.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-attoparsec-aeson.spec ++++++
--- /var/tmp/diff_new_pack.Q3fX8B/_old 2024-07-22 17:16:36.249931251 +0200
+++ /var/tmp/diff_new_pack.Q3fX8B/_new 2024-07-22 17:16:36.253931411 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-attoparsec-aeson
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name attoparsec-aeson
%global pkgver %{pkg_name}-%{version}
Name: ghc-%{pkg_name}
-Version: 2.2.0.1
+Version: 2.2.2.0
Release: 0
Summary: Parsing of aeson's Value with attoparsec
License: BSD-3-Clause
@@ -34,6 +34,8 @@
BuildRequires: ghc-base-prof
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-bytestring-prof
+BuildRequires: ghc-character-ps-devel
+BuildRequires: ghc-character-ps-prof
BuildRequires: ghc-integer-conversion-devel
BuildRequires: ghc-integer-conversion-prof
BuildRequires: ghc-primitive-devel
++++++ attoparsec-aeson-2.2.0.1.tar.gz -> attoparsec-aeson-2.2.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/attoparsec-aeson-2.2.0.1/attoparsec-aeson.cabal
new/attoparsec-aeson-2.2.2.0/attoparsec-aeson.cabal
--- old/attoparsec-aeson-2.2.0.1/attoparsec-aeson.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/attoparsec-aeson-2.2.2.0/attoparsec-aeson.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,11 +1,11 @@
-cabal-version: 1.12
+cabal-version: 2.2
name: attoparsec-aeson
-version: 2.2.0.1
+version: 2.2.2.0
synopsis: Parsing of aeson's Value with attoparsec
description:
Parsing of aeson's Value with attoparsec, originally from aeson.
-license: BSD3
+license: BSD-3-Clause
license-file: LICENSE
category: Parsing
copyright:
@@ -19,16 +19,15 @@
bug-reports: https://github.com/haskell/aeson/issues
build-type: Simple
tested-with:
- GHC ==8.2.2
- || ==8.4.4
- || ==8.6.5
+ GHC ==8.6.5
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.8
- || ==9.4.7
- || ==9.6.3
- || ==9.8.1
+ || ==9.4.8
+ || ==9.6.5
+ || ==9.8.2
+ || ==9.10.1
library
hs-source-dirs: src
@@ -41,13 +40,13 @@
other-modules:
Data.Aeson.Internal.ByteString
Data.Aeson.Internal.Text
- Data.Aeson.Internal.Word8
build-depends:
- aeson >=2.2.0.0 && <2.3
+ , aeson >=2.2.2.0 && <2.3
, attoparsec >=0.14.2 && <0.15
- , base >=4.10.0.0 && <5
+ , base >=4.12.0.0 && <5
, bytestring >=0.10.8.2 && <0.13
+ , character-ps ^>=0.1
, integer-conversion >=0.1 && <0.2
, primitive >=0.8.0.0 && <0.10
, scientific >=0.3.7.0 && <0.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Internal/Word8.hs
new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Internal/Word8.hs
--- old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Internal/Word8.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Internal/Word8.hs
1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-{-# LANGUAGE PatternSynonyms #-}
-module Data.Aeson.Internal.Word8 where
-
-import Data.Word (Word8)
-
--------------------------------------------------------------------------------
--- Word8 ASCII codes as patterns
--------------------------------------------------------------------------------
-
--- GHC-8.0 doesn't support giving multiple pattern synonyms type signature at
once
-
--- spaces
-pattern W8_SPACE :: Word8
-pattern W8_NL :: Word8
-pattern W8_CR :: Word8
-pattern W8_TAB :: Word8
-
-pattern W8_SPACE = 0x20
-pattern W8_NL = 0x0a
-pattern W8_CR = 0x0d
-pattern W8_TAB = 0x09
-
--- punctuation
-pattern W8_BACKSLASH :: Word8
-pattern W8_DOUBLE_QUOTE :: Word8
-pattern W8_DOT :: Word8
-pattern W8_COMMA :: Word8
-pattern W8_COLON :: Word8
-
-pattern W8_BACKSLASH = 92
-pattern W8_COMMA = 44
-pattern W8_DOT = 46
-pattern W8_DOUBLE_QUOTE = 34
-pattern W8_COLON = 58
-
--- parentheses
-pattern W8_CLOSE_CURLY :: Word8
-pattern W8_CLOSE_SQUARE :: Word8
-pattern W8_OPEN_SQUARE :: Word8
-pattern W8_OPEN_CURLY :: Word8
-
-pattern W8_OPEN_CURLY = 123
-pattern W8_OPEN_SQUARE = 91
-pattern W8_CLOSE_CURLY = 125
-pattern W8_CLOSE_SQUARE = 93
-
--- operators
-pattern W8_MINUS :: Word8
-pattern W8_PLUS :: Word8
-
-pattern W8_PLUS = 43
-pattern W8_MINUS = 45
-
--- digits
-pattern W8_0 :: Word8
-pattern W8_9 :: Word8
-
-pattern W8_0 = 48
-pattern W8_9 = 57
-
--- lower case
-pattern W8_e :: Word8
-pattern W8_f :: Word8
-pattern W8_n :: Word8
-pattern W8_t :: Word8
-
-pattern W8_e = 101
-pattern W8_f = 102
-pattern W8_n = 110
-pattern W8_t = 116
-
--- upper case
-pattern W8_E :: Word8
-pattern W8_E = 69
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Parser/Internal.hs
new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Parser/Internal.hs
--- old/attoparsec-aeson-2.2.0.1/src/Data/Aeson/Parser/Internal.hs
2001-09-09 03:46:40.000000000 +0200
+++ new/attoparsec-aeson-2.2.2.0/src/Data/Aeson/Parser/Internal.hs
2001-09-09 03:46:40.000000000 +0200
@@ -70,11 +70,11 @@
import qualified Data.ByteString.Unsafe as B
import qualified Data.Scientific as Sci
import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse)
+import qualified Data.Word8.Patterns as W8
import Data.Aeson.Types (IResult(..), JSONPath, Object, Result(..), Value(..),
Key)
import Data.Aeson.Internal.Text
import Data.Aeson.Decoding (unescapeText)
-import Data.Aeson.Internal.Word8
-- $setup
-- >>> :set -XOverloadedStrings
@@ -142,7 +142,7 @@
objectValues mkObject str val = do
skipSpace
w <- A.peekWord8'
- if w == W8_CLOSE_CURLY
+ if w == W8.RIGHT_CURLY
then A.anyWord8 >> return KM.empty
else loop []
where
@@ -153,9 +153,9 @@
loop acc = do
k <- (str A.<?> "object key") <* skipSpace <* (char ':' A.<?> "':'")
v <- (val A.<?> "object value") <* skipSpace
- ch <- A.satisfy (\w -> w == W8_COMMA || w == W8_CLOSE_CURLY) A.<?> "',' or
'}'"
+ ch <- A.satisfy (\w -> w == W8.COMMA || w == W8.RIGHT_CURLY) A.<?> "',' or
'}'"
let acc' = (k, v) : acc
- if ch == W8_COMMA
+ if ch == W8.COMMA
then skipSpace >> loop acc'
else case mkObject acc' of
Left err -> fail err
@@ -176,14 +176,14 @@
arrayValues val = do
skipSpace
w <- A.peekWord8'
- if w == W8_CLOSE_SQUARE
+ if w == W8.RIGHT_SQUARE
then A.anyWord8 >> return Vector.empty
else loop [] 1
where
loop acc !len = do
v <- (val A.<?> "json list value") <* skipSpace
- ch <- A.satisfy (\w -> w == W8_COMMA || w == W8_CLOSE_SQUARE) A.<?> "','
or ']'"
- if ch == W8_COMMA
+ ch <- A.satisfy (\w -> w == W8.COMMA || w == W8.RIGHT_SQUARE) A.<?> "','
or ']'"
+ if ch == W8.COMMA
then skipSpace >> loop (v:acc) (len+1)
else return (Vector.reverse (Vector.fromListN len (v:acc)))
{-# INLINE arrayValues #-}
@@ -230,13 +230,13 @@
skipSpace
w <- A.peekWord8'
case w of
- W8_DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)
- W8_OPEN_CURLY -> A.anyWord8 *> object_ mkObject value_
- W8_OPEN_SQUARE -> A.anyWord8 *> array_ value_
- W8_f -> string "false" $> Bool False
- W8_t -> string "true" $> Bool True
- W8_n -> string "null" $> Null
- _ | w >= W8_0 && w <= W8_9 || w == W8_MINUS
+ W8.DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)
+ W8.LEFT_CURLY -> A.anyWord8 *> object_ mkObject value_
+ W8.LEFT_SQUARE -> A.anyWord8 *> array_ value_
+ W8.LOWER_F -> string "false" $> Bool False
+ W8.LOWER_T -> string "true" $> Bool True
+ W8.LOWER_N -> string "null" $> Null
+ _ | w >= W8.DIGIT_0 && w <= W8.DIGIT_9 || w == W8.HYPHEN
-> Number <$> scientific
| otherwise -> fail "not a valid json value"
{-# INLINE jsonWith #-}
@@ -282,15 +282,15 @@
skipSpace
w <- A.peekWord8'
case w of
- W8_DOUBLE_QUOTE -> do
+ W8.DOUBLE_QUOTE -> do
!s <- A.anyWord8 *> jstring_
return (String s)
- W8_OPEN_CURLY -> A.anyWord8 *> object_' mkObject value_
- W8_OPEN_SQUARE -> A.anyWord8 *> array_' value_
- W8_f -> string "false" $> Bool False
- W8_t -> string "true" $> Bool True
- W8_n -> string "null" $> Null
- _ | w >= W8_0 && w <= W8_9 || w == W8_MINUS
+ W8.LEFT_CURLY -> A.anyWord8 *> object_' mkObject value_
+ W8.LEFT_SQUARE -> A.anyWord8 *> array_' value_
+ W8.LOWER_F -> string "false" $> Bool False
+ W8.LOWER_T -> string "true" $> Bool True
+ W8.LOWER_N -> string "null" $> Null
+ _ | w >= W8.DIGIT_0 && w <= W8.DIGIT_9 || w == W8.HYPHEN
-> do
!n <- scientific
return (Number n)
@@ -312,7 +312,7 @@
-- | Parse a quoted JSON string.
jstring :: Parser Text
-jstring = A.word8 W8_DOUBLE_QUOTE *> jstring_
+jstring = A.word8 W8.DOUBLE_QUOTE *> jstring_
-- | Parse a JSON Key
key :: Parser Key
@@ -322,11 +322,11 @@
jstring_ :: Parser Text
{-# INLINE jstring_ #-}
jstring_ = do
- s <- A.takeWhile (\w -> w /= W8_DOUBLE_QUOTE && w /= W8_BACKSLASH && w >=
0x20 && w < 0x80)
+ s <- A.takeWhile (\w -> w /= W8.DOUBLE_QUOTE && w /= W8.BACKSLASH && w >=
0x20 && w < 0x80)
mw <- A.peekWord8
case mw of
Nothing -> fail "string without end"
- Just W8_DOUBLE_QUOTE -> A.anyWord8 $> unsafeDecodeASCII s
+ Just W8.DOUBLE_QUOTE -> A.anyWord8 $> unsafeDecodeASCII s
Just w | w < 0x20 -> fail "unescaped control character"
_ -> jstringSlow s
@@ -341,8 +341,8 @@
startState = False
go a c
| a = Just False
- | c == W8_DOUBLE_QUOTE = Nothing
- | otherwise = let a' = c == W8_BACKSLASH
+ | c == W8.DOUBLE_QUOTE = Nothing
+ | otherwise = let a' = c == W8.BACKSLASH
in Just a'
decodeWith :: Parser Value -> (Value -> Result a) -> L.ByteString -> Maybe a
@@ -438,7 +438,7 @@
-- | The only valid whitespace in a JSON document is space, newline,
-- carriage return, and tab.
skipSpace :: Parser ()
-skipSpace = A.skipWhile $ \w -> w == W8_SPACE || w == W8_NL || w == W8_CR || w
== W8_TAB
+skipSpace = A.skipWhile $ \w -> w == W8.SPACE || w == W8.LF || w == W8.CR || w
== W8.TAB
{-# INLINE skipSpace #-}
------------------ Copy-pasted and adapted from attoparsec ------------------
@@ -449,7 +449,7 @@
decimal0 :: Parser Integer
decimal0 = do
digits <- A.takeWhile1 isDigit_w8
- if B.length digits > 1 && B.unsafeHead digits == W8_0
+ if B.length digits > 1 && B.unsafeHead digits == W8.DIGIT_0
then fail "leading zero"
else return (byteStringToInteger digits)
@@ -457,25 +457,25 @@
scientific :: Parser Scientific
scientific = do
sign <- A.peekWord8'
- let !positive = not (sign == W8_MINUS)
- when (sign == W8_PLUS || sign == W8_MINUS) $
+ let !positive = not (sign == W8.HYPHEN)
+ when (sign == W8.PLUS || sign == W8.HYPHEN) $
void A.anyWord8
n <- decimal0
let f fracDigits = SP (B.foldl' step n fracDigits)
(negate $ B.length fracDigits)
- step a w = a * 10 + fromIntegral (w - W8_0)
+ step a w = a * 10 + fromIntegral (w - W8.DIGIT_0)
dotty <- A.peekWord8
SP c e <- case dotty of
- Just W8_DOT -> A.anyWord8 *> (f <$> A.takeWhile1 isDigit_w8)
- _ -> pure (SP n 0)
+ Just W8.PERIOD -> A.anyWord8 *> (f <$> A.takeWhile1 isDigit_w8)
+ _ -> pure (SP n 0)
let !signedCoeff | positive = c
| otherwise = -c
- (A.satisfy (\ex -> case ex of W8_e -> True; W8_E -> True; _ -> False) *>
+ (A.satisfy (\ex -> case ex of W8.LOWER_E -> True; W8.UPPER_E -> True; _ ->
False) *>
fmap (Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
return (Sci.scientific signedCoeff e)
{-# INLINE scientific #-}
