master GHC-9.12.2

Author: yaitskov

Data/Attoparsec/ByteString/Char8.hs

@@ -130,10 +130,12 @@ module Data.Attoparsec.ByteString.Char8
 
 import Control.Applicative (Alternative ((<|>)))
 import Control.Monad (void, when)
-import Debug.TraceEmbrace
+import Debug.TraceEmbrace ( tw )
 import Data.Attoparsec.ByteString.FastSet (charClass, memberChar)
 import Data.Attoparsec.ByteString.Internal (DirParser, Parser, BackParser, DirectedTuple (..))
 import Data.Attoparsec.Combinator
+    ( many1', many', many1, try, (<?>), choice, option, sepBy, sepBy', sepBy1,
+      sepBy1', manyTill, manyTill', skipMany, skipMany1, count, eitherP )
 import Data.Bits (Bits, (.|.), shiftL)
 import Data.ByteString.Internal (c2w, w2c)
 import Data.Int (Int8, Int16, Int32, Int64)

Data/Attoparsec/ByteString/Internal.hs

@@ -96,7 +96,7 @@ import Data.List (intercalate)
 import Data.Tagged (Tagged(..), untag)
 import Data.Tuple (swap)
 import Data.Word (Word8)
-import Debug.TraceEmbrace
+import Debug.TraceEmbrace ( tr, tw )
 import qualified Foreign.ForeignPtr as FP
 import Foreign.Ptr (Ptr, castPtr)
 import qualified Foreign.Ptr as FP

Data/Attoparsec/Internal/Types.hs

@@ -45,7 +45,7 @@ import Data.Tagged (Tagged(..), untag)
 import Data.Text (Text)
 import qualified Data.Text as Text
 import Data.Text.Unsafe (Iter(..))
-import Debug.TraceEmbrace
+import Debug.TraceEmbrace (tw)
 import Prelude hiding (succ)
 import Data.Attoparsec.ByteString.Buffer (Dir (..))
 import qualified Data.Attoparsec.ByteString.Buffer as B

Data/Attoparsec/Number.hs

@@ -23,7 +23,6 @@ module Data.Attoparsec.Number
 import Control.DeepSeq (NFData(rnf))
 import Data.Data (Data)
 import Data.Function (on)
-import Data.Typeable (Typeable)
 
 -- | A numeric type that can represent integers accurately, and
 -- floating point numbers to the precision of a 'Double'.
@@ -32,7 +31,7 @@ import Data.Typeable (Typeable)
 -- major release.  Use the 'Data.Scientific.Scientific' type instead.
 data Number = I !Integer
             | D {-# UNPACK #-} !Double
-              deriving (Typeable, Data)
+              deriving (Data)
 {-# DEPRECATED Number "Use Scientific instead." #-}
 
 instance Show Number where

attoparsec-isotropic.cabal

@@ -1,6 +1,6 @@
 cabal-version:   3.0
 name:            attoparsec-isotropic
-version:         0.14.4
+version:         0.14.5
 license:         BSD-3-Clause
 license-file:    LICENSE
 category:        Text, Parsing
@@ -71,7 +71,7 @@ description:
     >                       go (Just (unconsumed, iBlock')) unconsumed
 
 tested-with:
-  GHC == 9.10.1
+  GHC == 9.10.1, GHC == 9.12.2
 
 extra-source-files:
     benchmarks/*.txt
@@ -112,7 +112,7 @@ common base
     , semigroups < 0.21
     , tagged < 1
     , text < 3
-    , trace-embrace < 3
+    , trace-embrace >= 1.2 && < 3
     , transformers < 1
 
 -- We need to test and benchmark these modules,

attoparsec-isotropic.cabal.template

@@ -1,6 +1,6 @@
 cabal-version:   3.0
 name:            attoparsec-isotropic
-version:         0.14.4
+version:         0.14.5
 license:         BSD-3-Clause
 license-file:    LICENSE
 category:        Text, Parsing
@@ -14,7 +14,7 @@ build-type:      Simple
 description:
 
 tested-with:
-  GHC == 9.10.1
+  GHC == 9.10.1, GHC == 9.12.2
 
 extra-source-files:
     benchmarks/*.txt
@@ -55,7 +55,7 @@ common base
     , semigroups < 0.21
     , tagged < 1
     , text < 3
-    , trace-embrace < 3
+    , trace-embrace >= 1.2 && < 3
     , transformers < 1
 
 -- We need to test and benchmark these modules,

changelog.md

@@ -1,3 +1,8 @@
+# 0.14.5
+
+* Fork from attoparsec
+* Clean support of GHC-9.12.2
+
 # 0.14.4
 
 * Fix a segmentation fault when built against `text-2.0`

default.nix

@@ -1,5 +1,5 @@
 { system ? builtins.currentSystem or "x86_64-linux"
-, ghc ? "ghc9101"
+, ghc ? "ghc9122"
 }:
 
 let

internal/Data/Attoparsec/ByteString/Buffer.hs

@@ -63,15 +63,15 @@ import Control.Exception (assert)
 import Data.ByteString.Internal (ByteString(..), nullForeignPtr)
 import qualified Data.ByteString as B
 import Data.Attoparsec.Internal.Fhthagn (inlinePerformIO)
-import Data.Attoparsec.Internal.Compat
+import Data.Attoparsec.Internal.Compat ( mkPS, withPS )
 import Data.List (foldl1')
 import Data.Monoid as Mon (Monoid(..))
-import Data.Proxy
+import Data.Proxy ( Proxy )
 #if !MIN_VERSION_base(4,20,0)
 import Data.Semigroup (Semigroup(..))
 #endif
 import Data.Word (Word8)
-import Debug.TraceEmbrace
+import Debug.TraceEmbrace ( tr, tw', ShowTrace(ShowTrace) )
 import Foreign.ForeignPtr (ForeignPtr, withForeignPtr)
 import Foreign.Marshal.Utils (copyBytes)
 import Foreign.Ptr (castPtr, plusPtr)

internal/Data/Attoparsec/Text/Buffer.hs

@@ -52,7 +52,7 @@ import Data.Text.Internal.Unsafe.Char (unsafeChr)
 import Data.Text.Unsafe (lengthWord16)
 #endif
 import Data.Text.Unsafe (Iter(..))
-import Debug.TraceEmbrace
+import Debug.TraceEmbrace ( ShowTrace(ShowTrace) )
 import Foreign.Storable (sizeOf)
 import GHC.Exts (Int(..), indexIntArray#, unsafeCoerce#, writeIntArray#)
 import GHC.ST (ST(..), runST)